1.1.28

.gitlab-ci.yml

@@ -38,11 +38,11 @@ snyk:
 # test stage
 # ====================
 
-testLTS:
+testStable:
   stage: test
   script:
   - npmci npm prepare
-  - npmci node install lts
+  - npmci node install stable
   - npmci npm install
   - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
@@ -100,7 +100,7 @@ trigger:
 pages:
   image: hosttoday/ht-docker-dbase:npmci
   services:
-   - docker:18-dind
+   - docker:stable-dind
   stage: metadata
   script:
     - npmci command npm install -g @gitzone/tsdoc

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "1.1.23",
+  "version": "1.1.28",
   "private": false,
   "description": "dropin replacement for request",
   "main": "dist/index.js",
@@ -28,10 +28,10 @@
     "form-data": "^2.3.3"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.8",
-    "@gitzone/tsrun": "^1.2.5",
-    "@gitzone/tstest": "^1.0.20",
-    "@pushrocks/tapbundle": "^3.0.9",
+    "@gitzone/tsbuild": "^2.1.17",
+    "@gitzone/tsrun": "^1.2.8",
+    "@gitzone/tstest": "^1.0.24",
+    "@pushrocks/tapbundle": "^3.0.13",
     "@types/node": "^11.13.6",
     "tslint": "^5.19.0",
     "tslint-config-prettier": "^1.18.0"

ts/smartrequest.interfaces.ts

@@ -2,6 +2,7 @@ import * as plugins from './smartrequest.plugins';
 import * as https from 'https';
 
 export interface ISmartRequestOptions extends https.RequestOptions {
+  keepAlive?: boolean;
   requestBody?: any;
   autoJsonParse?: boolean;
 }

ts/smartrequest.plugins.ts

@@ -1,4 +1,4 @@
-import * as formData from 'form-data';
+import formData from 'form-data';
 import * as fs from 'fs';
 import * as http from 'http';
 import * as https from 'https';

ts/smartrequest.request.ts

@@ -14,7 +14,7 @@ const buildUtf8Response = (
   const done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
   // Continuously update stream with data
   let body = '';
-  incomingMessageArg.on('data', (chunkArg) => {
+  incomingMessageArg.on('data', chunkArg => {
     body += chunkArg;
   });
 
@@ -62,6 +62,15 @@ const httpAgent = new plugins.http.Agent({
   keepAliveMsecs: 600000
 });
 
+/**
+ * a custom http agent to make sure we can set custom keepAlive options for speedy subsequent calls
+ */
+const httpAgentKeepAliveFalse = new plugins.http.Agent({
+  maxFreeSockets: 0,
+  keepAlive: false,
+  keepAliveMsecs: 0
+});
+
 /**
  * a custom https agent to make sure we can set custom keepAlive options for speedy subsequent calls
  */
@@ -70,6 +79,15 @@ const httpsAgent = new plugins.https.Agent({
   keepAliveMsecs: 600000
 });
 
+/**
+ * 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,
+  keepAlive: false,
+  keepAliveMsecs: 0
+});
+
 export let request = async (
   domainArg: string,
   optionsArg: interfaces.ISmartRequestOptions = {},
@@ -80,7 +98,8 @@ export let request = async (
   // merge options
   const defaultOptions: interfaces.ISmartRequestOptions = {
     // agent: agent,
-    autoJsonParse: true
+    autoJsonParse: true,
+    keepAlive: true
   };
 
   optionsArg = {
@@ -107,32 +126,44 @@ export let request = async (
 
   // lets determine the request module to use
   const requestModule = (() => {
-    if (parsedUrl.protocol === 'https:') {
-      optionsArg.agent = httpsAgent;
-      return plugins.https;
-    } else if (parsedUrl.protocol === 'http:') {
-      optionsArg.agent = httpAgent;
-      return plugins.http;
-    } else {
-      throw new Error(`unsupported protocol: ${parsedUrl.protocol}`);
+    switch (true) {
+      case parsedUrl.protocol === 'https:' && optionsArg.keepAlive:
+        optionsArg.agent = httpsAgent;
+        return plugins.https;
+      case parsedUrl.protocol === 'https:' && (!optionsArg.keepAlive):
+        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;
 
   // lets perform the actual request
-  const requestToFire = requestModule.request(optionsArg);
+  const requestToFire = requestModule.request(optionsArg, async response => {
+    if (streamArg) {
+      done.resolve(response);
+    } else {
+      const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
+      done.resolve(builtResponse);
+    }
+  });
 
   // lets write the requestBody
   if (optionsArg.requestBody) {
-    if (!(optionsArg.requestBody instanceof plugins.formData)) {
+    if (optionsArg.requestBody instanceof plugins.formData) {
+      optionsArg.requestBody.pipe(requestToFire).on('finish', event => {
+        requestToFire.end();
+      });
+    } else {
       if (typeof optionsArg.requestBody !== 'string') {
         optionsArg.requestBody = JSON.stringify(optionsArg.requestBody);
       }
       requestToFire.write(optionsArg.requestBody);
       requestToFire.end();
-    } else if (optionsArg.requestBody instanceof plugins.formData) {
-      optionsArg.requestBody.pipe(requestToFire).on('finish', event => {
-        requestToFire.end();
-      });
     }
   } else {
     requestToFire.end();
@@ -143,16 +174,6 @@ export let request = async (
     console.error(e);
   });
 
-  // lets handle the response
-  requestToFire.on('response', async response => {
-    if (streamArg) {
-      done.resolve(response);
-    } else {
-      const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
-      done.resolve(builtResponse);
-    }
-  });
-
   const result = await done.promise;
   return result;
 };