2.0.13

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "2.0.2",
+  "version": "2.0.13",
   "private": false,
   "description": "dropin replacement for request",
   "main": "dist_ts/index.js",
@@ -25,16 +25,17 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartrequest#README",
   "dependencies": {
-    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/smarturl": "^3.0.2",
+    "@pushrocks/smarturl": "^3.0.6",
+    "agentkeepalive": "^4.3.0",
     "form-data": "^4.0.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tsrun": "^1.2.39",
-    "@gitzone/tstest": "^1.0.72",
+    "@gitzone/tstest": "^1.0.74",
     "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.6.2"
+    "@types/node": "^18.15.11"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/smartrequest',
-  version: '2.0.2',
+  version: '2.0.13',
   description: 'dropin replacement for request'
 }

ts/index.ts

@@ -1,4 +1,4 @@
-export { request } from './smartrequest.request.js';
+export { request, safeGet } from './smartrequest.request.js';
 export type { IExtendedIncomingMessage } from './smartrequest.request.js';
 export type { ISmartRequestOptions } from './smartrequest.interfaces.js';
 

ts/smartrequest.plugins.ts

@@ -13,6 +13,7 @@ import * as smarturl from '@pushrocks/smarturl';
 export { smartpromise, smarturl };
 
 // third party scope
+import agentkeepalive from 'agentkeepalive';
 import formData from 'form-data';
 
-export { formData };
+export { agentkeepalive, formData };

ts/smartrequest.request.ts

@@ -57,39 +57,39 @@ const parseSocketPathAndRoute = (stringToParseArg: string) => {
 /**
  * a custom http agent to make sure we can set custom keepAlive options for speedy subsequent calls
  */
-const httpAgent = new plugins.http.Agent({
+const httpAgent = new plugins.agentkeepalive({
   keepAlive: true,
-  maxFreeSockets: 1,
+  maxFreeSockets: 10,
   maxSockets: 100,
   maxTotalSockets: 1000,
+  timeout: 60000,
 });
 
 /**
  * a custom http agent to make sure we can set custom keepAlive options for speedy subsequent calls
  */
-const httpAgentKeepAliveFalse = new plugins.https.Agent({
+const httpAgentKeepAliveFalse = new plugins.agentkeepalive({
-  maxFreeSockets: 0,
   keepAlive: false,
-  keepAliveMsecs: 0,
+  timeout: 60000,
 });
 
 /**
  * a custom https agent to make sure we can set custom keepAlive options for speedy subsequent calls
  */
-const httpsAgent = new plugins.https.Agent({
+const httpsAgent = new plugins.agentkeepalive.HttpsAgent({
   keepAlive: true,
-  maxFreeSockets: 1,
+  maxFreeSockets: 10,
   maxSockets: 100,
   maxTotalSockets: 1000,
+  timeout: 60000,
 });
 
 /**
  * a custom https agent to make sure we can set custom keepAlive options for speedy subsequent calls
  */
-const httpsAgentKeepAliveFalse = new plugins.https.Agent({
+const httpsAgentKeepAliveFalse = new plugins.agentkeepalive.HttpsAgent({
-  maxFreeSockets: 0,
   keepAlive: false,
-  keepAliveMsecs: 0,
+  timeout: 60000,
 });
 
 export let request = async (
@@ -98,7 +98,7 @@ export let request = async (
   responseStreamArg: boolean = false,
   requestDataFunc: (req: plugins.http.ClientRequest) => void = null
 ): Promise<IExtendedIncomingMessage> => {
-  const done = plugins.smartpromise.defer<any>();
+  const done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
 
   // merge options
   const defaultOptions: interfaces.ISmartRequestOptions = {
@@ -132,20 +132,30 @@ export let request = async (
 
   // TODO: support tcp sockets
 
+  // lets determine agent
+  switch (true) {
+    case !!optionsArg.agent:
+      break;
+    case parsedUrl.protocol === 'https:' && optionsArg.keepAlive:
+      optionsArg.agent = httpsAgent;
+      break;
+    case parsedUrl.protocol === 'https:' && !optionsArg.keepAlive:
+      optionsArg.agent = httpsAgentKeepAliveFalse;
+      break;
+    case parsedUrl.protocol === 'http:' && optionsArg.keepAlive:
+      optionsArg.agent = httpAgent;
+      break;
+    case parsedUrl.protocol === 'http:' && !optionsArg.keepAlive:
+      optionsArg.agent = httpAgentKeepAliveFalse;
+      break;
+  }
+
   // lets determine the request module to use
   const requestModule = (() => {
     switch (true) {
-      case parsedUrl.protocol === 'https' && optionsArg.keepAlive:
+      case parsedUrl.protocol === 'https:':
-        optionsArg.agent = httpsAgent;
         return plugins.https;
-      case parsedUrl.protocol === 'https' && !optionsArg.keepAlive:
+      case parsedUrl.protocol === 'http:':
-        optionsArg.agent = httpsAgentKeepAliveFalse;
-        return plugins.https;
-      case parsedUrl.protocol === 'http' && optionsArg.keepAlive:
-        optionsArg.agent = httpAgent;
-        return plugins.http;
-      case parsedUrl.protocol === 'http' && !optionsArg.keepAlive:
-        optionsArg.agent = httpAgentKeepAliveFalse;
         return plugins.http;
     }
   })() as typeof plugins.https;
@@ -158,7 +168,7 @@ export let request = async (
   // lets perform the actual request
   const requestToFire = requestModule.request(optionsArg, async (response) => {
     if (responseStreamArg) {
-      done.resolve(response);
+      done.resolve(response as IExtendedIncomingMessage);
     } else {
       const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
       done.resolve(builtResponse);
@@ -187,8 +197,28 @@ export let request = async (
   // lets handle an error
   requestToFire.on('error', (e) => {
     console.error(e);
+    requestToFire.destroy();
   });
 
-  const result = await done.promise;
+  const response = await done.promise;
-  return result;
+  response.on('error', (err) => {
+    console.log(err);
+    response.destroy();
+  });
+  return response;
+};
+
+export const safeGet = async (urlArg: string) => {
+  try {
+    const response = await request(urlArg, {
+      method: 'GET',
+      agent: plugins.http.globalAgent,
+      timeout: 5000,
+      autoJsonParse: false,
+    });
+    return response;
+  } catch (err) {
+    console.log(err);
+    return null;
+  }
 };