2.0.10

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "1.1.57",
+  "version": "2.0.10",
   "private": false,
   "description": "dropin replacement for request",
   "main": "dist_ts/index.js",
@@ -26,18 +26,16 @@
   "homepage": "https://gitlab.com/pushrocks/smartrequest#README",
   "dependencies": {
     "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smarturl": "^3.0.2",
+    "@pushrocks/smarturl": "^3.0.3",
     "agentkeepalive": "^4.2.1",
     "form-data": "^4.0.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tsbuild": "^2.1.65",
     "@gitzone/tsrun": "^1.2.37",
-    "@gitzone/tstest": "^1.0.72",
+    "@gitzone/tstest": "^1.0.73",
     "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.6.2",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
+    "@types/node": "^18.6.4"
   },
   "files": [
     "ts/**/*",

ts/00_commitinfo_data.ts

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

ts/smartrequest.request.ts

@@ -59,33 +59,37 @@ const parseSocketPathAndRoute = (stringToParseArg: string) => {
  */
 const httpAgent = new plugins.agentkeepalive({
   keepAlive: true,
-  freeSocketTimeout: 4000,
-  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.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.agentkeepalive.HttpsAgent();
+const httpsAgent = new plugins.agentkeepalive.HttpsAgent({
+  keepAlive: true,
+  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({
-  maxFreeSockets: 0,
+const httpsAgentKeepAliveFalse = new plugins.agentkeepalive.HttpsAgent({
   keepAlive: false,
-  keepAliveMsecs: 0,
+  timeout: 60000
 });
 
 export let request = async (
@@ -94,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 = {
@@ -131,16 +135,16 @@ export let request = async (
   // lets determine the request module to use
   const requestModule = (() => {
     switch (true) {
-      case parsedUrl.protocol === 'https' && optionsArg.keepAlive:
+      case parsedUrl.protocol === 'https:' && optionsArg.keepAlive:
         optionsArg.agent = httpsAgent;
         return plugins.https;
-      case parsedUrl.protocol === 'https' && !optionsArg.keepAlive:
+      case parsedUrl.protocol === 'https:' && !optionsArg.keepAlive:
         optionsArg.agent = httpsAgentKeepAliveFalse;
         return plugins.https;
-      case parsedUrl.protocol === 'http' && optionsArg.keepAlive:
+      case parsedUrl.protocol === 'http:' && optionsArg.keepAlive:
         optionsArg.agent = httpAgent;
         return plugins.http;
-      case parsedUrl.protocol === 'http' && !optionsArg.keepAlive:
+      case parsedUrl.protocol === 'http:' && !optionsArg.keepAlive:
         optionsArg.agent = httpAgentKeepAliveFalse;
         return plugins.http;
     }
@@ -154,7 +158,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);
@@ -183,8 +187,13 @@ export let request = async (
   // lets handle an error
   requestToFire.on('error', (e) => {
     console.error(e);
+    requestToFire.destroy();
   });
 
-  const result = await done.promise;
-  return result;
+  const response = await done.promise;
+  response.on('error', (err) => {
+    console.log(err);
+    response.destroy();
+  })
+  return response;
 };