2.0.9

package-lock.json

@@ -1,16 +1,17 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "2.0.3",
+  "version": "2.0.9",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartrequest",
-      "version": "2.0.3",
+      "version": "2.0.9",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/smartpromise": "^3.1.7",
         "@pushrocks/smarturl": "^3.0.2",
+        "agentkeepalive": "^4.2.1",
         "form-data": "^4.0.0"
       },
       "devDependencies": {
@@ -2593,7 +2594,6 @@
       "version": "4.2.1",
       "resolved": "https://verdaccio.lossless.one/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
       "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "debug": "^4.1.0",
@@ -3663,7 +3663,6 @@
       "version": "4.3.3",
       "resolved": "https://verdaccio.lossless.one/debug/-/debug-4.3.3.tgz",
       "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
@@ -3756,7 +3755,6 @@
       "version": "1.1.2",
       "resolved": "https://verdaccio.lossless.one/depd/-/depd-1.1.2.tgz",
       "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">= 0.6"
@@ -5284,7 +5282,6 @@
       "version": "1.2.1",
       "resolved": "https://verdaccio.lossless.one/humanize-ms/-/humanize-ms-1.2.1.tgz",
       "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "ms": "^2.0.0"
@@ -6396,7 +6393,6 @@
       "version": "2.1.2",
       "resolved": "https://verdaccio.lossless.one/ms/-/ms-2.1.2.tgz",
       "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/nan": {
@@ -10863,7 +10859,6 @@
       "version": "4.2.1",
       "resolved": "https://verdaccio.lossless.one/agentkeepalive/-/agentkeepalive-4.2.1.tgz",
       "integrity": "sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==",
-      "dev": true,
       "requires": {
         "debug": "^4.1.0",
         "depd": "^1.1.2",
@@ -11618,7 +11613,6 @@
       "version": "4.3.3",
       "resolved": "https://verdaccio.lossless.one/debug/-/debug-4.3.3.tgz",
       "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
-      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -11678,8 +11672,7 @@
     "depd": {
       "version": "1.1.2",
       "resolved": "https://verdaccio.lossless.one/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
     },
     "dependency-graph": {
       "version": "0.11.0",
@@ -12652,7 +12645,6 @@
       "version": "1.2.1",
       "resolved": "https://verdaccio.lossless.one/humanize-ms/-/humanize-ms-1.2.1.tgz",
       "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=",
-      "dev": true,
       "requires": {
         "ms": "^2.0.0"
       }
@@ -13461,8 +13453,7 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://verdaccio.lossless.one/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "nan": {
       "version": "2.14.2",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "2.0.3",
+  "version": "2.0.9",
   "private": false,
   "description": "dropin replacement for request",
   "main": "dist_ts/index.js",
@@ -27,6 +27,7 @@
   "dependencies": {
     "@pushrocks/smartpromise": "^3.1.7",
     "@pushrocks/smarturl": "^3.0.2",
+    "agentkeepalive": "^4.2.1",
     "form-data": "^4.0.0"
   },
   "devDependencies": {

ts/00_commitinfo_data.ts

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

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,38 +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({
-  maxFreeSockets: 0,
-  keepAlive: false
+const httpAgentKeepAliveFalse = new plugins.agentkeepalive({
+  keepAlive: false,
+  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({
-  maxFreeSockets: 0,
+const httpsAgentKeepAliveFalse = new plugins.agentkeepalive.HttpsAgent({
   keepAlive: false,
-  keepAliveMsecs: 0,
+  timeout: 60000
 });
 
 export let request = async (
@@ -97,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 = {
@@ -157,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);
@@ -186,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;
 };