1.1.35

.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.20",
+  "version": "1.1.35",
   "private": false,
   "description": "dropin replacement for request",
   "main": "dist/index.js",
@@ -23,16 +23,19 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartrequest#README",
   "dependencies": {
-    "@pushrocks/smartpromise": "^3.0.2",
+    "@pushrocks/smartpromise": "^3.0.5",
-    "@types/form-data": "^2.2.1",
+    "@types/form-data": "^2.5.0",
-    "form-data": "^2.3.3"
+    "agentkeepalive": "^4.0.2",
+    "form-data": "^2.5.1"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.8",
+    "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tsrun": "^1.2.5",
+    "@gitzone/tsrun": "^1.2.8",
-    "@gitzone/tstest": "^1.0.20",
+    "@gitzone/tstest": "^1.0.24",
-    "@pushrocks/tapbundle": "^3.0.9",
+    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/node": "^11.13.6"
+    "@types/node": "^12.7.8",
+    "tslint": "^5.20.0",
+    "tslint-config-prettier": "^1.18.0"
   },
   "files": [
     "ts/*",

test/test.ts

@@ -6,6 +6,12 @@ tap.test('should request a html document over https', async () => {
   await expect(smartrequest.getJson('https://encrypted.google.com/'))
     .to.eventually.property('body')
     .be.a('string');
+  await expect(smartrequest.getJson('https://encrypted.google.com/'))
+    .to.eventually.property('body')
+    .be.a('string');
+  await expect(smartrequest.getJson('https://encrypted.google.com/'))
+    .to.eventually.property('body')
+    .be.a('string');
 });
 
 tap.test('should request a JSON document over https', async () => {
@@ -15,7 +21,7 @@ tap.test('should request a JSON document over https', async () => {
     .equal(1);
 });
 
-tap.test('should post a JSON document over http', async () => {
+tap.skip.test('should post a JSON document over http', async () => {
   await expect(smartrequest.postJson('http://md5.jsontest.com/?text=example_text'))
     .to.eventually.property('body')
     .property('md5')

ts/smartrequest.formdata.ts

@@ -13,7 +13,7 @@ export interface IFormField {
 
 const appendFormField = async (formDataArg: plugins.formData, formDataField: IFormField) => {
   if (formDataField.type === 'filePath') {
-    let fileData = plugins.fs.readFileSync(plugins.path.join(process.cwd(), formDataField.payload));
+    const fileData = plugins.fs.readFileSync(plugins.path.join(process.cwd(), formDataField.payload));
     formDataArg.append('file', fileData, {
       filename: 'upload.pdf',
       contentType: 'application/pdf'
@@ -30,14 +30,13 @@ export const postFormData = async (
   for (const formField of payloadArg) {
     await appendFormField(form, formField);
   }
-  const requestOptions = Object.assign({}, optionsArg, {
+  const requestOptions = {...optionsArg, 
     method: 'POST',
     headers: {
       ...optionsArg.headers,
       ...form.getHeaders()
     },
-    requestBody: form
+    requestBody: form};
-  });
 
   // lets fire the actual request for sending the formdata
   const response = await request(urlArg, requestOptions);

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';
@@ -8,3 +8,10 @@ import * as url from 'url';
 import * as smartpromise from '@pushrocks/smartpromise';
 
 export { formData, http, https, fs, path, url, smartpromise };
+
+// third party scope
+import * as agentkeepalive from 'agentkeepalive';
+
+export {
+  agentkeepalive
+};

ts/smartrequest.request.ts

@@ -1,4 +1,3 @@
-import * as https from 'https';
 import * as plugins from './smartrequest.plugins';
 import * as interfaces from './smartrequest.interfaces';
 
@@ -12,14 +11,14 @@ const buildUtf8Response = (
   incomingMessageArg: IncomingMessage,
   autoJsonParse = true
 ): Promise<IExtendedIncomingMessage> => {
-  let done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
+  const done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
   // Continuously update stream with data
   let body = '';
-  incomingMessageArg.on('data', function(chunkArg) {
+  incomingMessageArg.on('data', chunkArg => {
     body += chunkArg;
   });
 
-  incomingMessageArg.on('end', function() {
+  incomingMessageArg.on('end', () => {
     if (autoJsonParse) {
       try {
         (incomingMessageArg as IExtendedIncomingMessage).body = JSON.parse(body);
@@ -55,27 +54,47 @@ const parseSocketPathAndRoute = (stringToParseArg: string) => {
   };
 };
 
-const httpAgent = new plugins.http.Agent({
+/**
-  keepAlive: true,
+ * a custom http agent to make sure we can set custom keepAlive options for speedy subsequent calls
-  keepAliveMsecs: 600000
+ */
+const httpAgent = new plugins.agentkeepalive.default();
+
+/**
+ * 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
 });
 
-const httpsAgent = new plugins.https.Agent({
+/**
-  keepAlive: true,
+ * a custom https agent to make sure we can set custom keepAlive options for speedy subsequent calls
-  keepAliveMsecs: 600000
+ */
+const httpsAgent = new plugins.agentkeepalive.HttpsAgent();
+
+/**
+ * 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 = {},
-  streamArg: boolean = false
+  responseStreamArg: boolean = false,
+  requestDataFunc: (req: plugins.http.ClientRequest) => void = null
 ): Promise<IExtendedIncomingMessage> => {
-  let done = plugins.smartpromise.defer<any>();
+  const done = plugins.smartpromise.defer<any>();
 
   // merge options
   const defaultOptions: interfaces.ISmartRequestOptions = {
     // agent: agent,
-    autoJsonParse: true
+    autoJsonParse: true,
+    keepAlive: true
   };
 
   optionsArg = {
@@ -84,11 +103,10 @@ export let request = async (
   };
 
   // parse url
-  let parsedUrl: plugins.url.Url;
+  const parsedUrl = plugins.url.parse(domainArg);
-  parsedUrl = plugins.url.parse(domainArg);
   optionsArg.hostname = parsedUrl.hostname;
   if (parsedUrl.port) {
-    optionsArg.port = parseInt(parsedUrl.port);
+    optionsArg.port = parseInt(parsedUrl.port, 10);
   }
   optionsArg.path = parsedUrl.path;
 
@@ -103,45 +121,25 @@ export let request = async (
 
   // lets determine the request module to use
   const requestModule = (() => {
-    if (parsedUrl.protocol === 'https:') {
+    switch (true) {
+      case parsedUrl.protocol === 'https:' && optionsArg.keepAlive:
         optionsArg.agent = httpsAgent;
         return plugins.https;
-    } else if (parsedUrl.protocol === 'http:') {
+      case parsedUrl.protocol === 'https:' && (!optionsArg.keepAlive):
+        optionsArg.agent = httpsAgentKeepAliveFalse;
+        return plugins.https;
+      case parsedUrl.protocol === 'http:' && optionsArg.keepAlive:
         optionsArg.agent = httpAgent;
         return plugins.http;
-    } else {
+      case parsedUrl.protocol === 'http:' && (!optionsArg.keepAlive):
-      throw new Error(`unsupported protocol: ${parsedUrl.protocol}`);
+        optionsArg.agent = httpAgentKeepAliveFalse;
+        return plugins.http;
     }
   })() as typeof plugins.https;
 
   // lets perform the actual request
-  let request = requestModule.request(optionsArg);
+  const requestToFire = requestModule.request(optionsArg, async response => {
-
+    if (responseStreamArg) {
-  // lets write the requestBody
-  if (optionsArg.requestBody) {
-    if (!(optionsArg.requestBody instanceof plugins.formData)) {
-      if (typeof optionsArg.requestBody !== 'string') {
-        optionsArg.requestBody = JSON.stringify(optionsArg.requestBody);
-      }
-      request.write(optionsArg.requestBody);
-      request.end();
-    } else if (optionsArg.requestBody instanceof plugins.formData) {
-      optionsArg.requestBody.pipe(request).on('finish', event => {
-        request.end();
-      });
-    }
-  } else {
-    request.end();
-  }
-
-  // lets handle an error
-  request.on('error', e => {
-    console.error(e);
-  });
-
-  // lets handle the response
-  request.on('response', async response => {
-    if (streamArg) {
       done.resolve(response);
     } else {
       const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
@@ -149,6 +147,30 @@ export let request = async (
     }
   });
 
+  // lets write the requestBody
+  if (optionsArg.requestBody) {
+    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 (requestDataFunc) {
+    requestDataFunc(requestToFire);
+  } else {
+    requestToFire.end();
+  }
+
+  // lets handle an error
+  requestToFire.on('error', e => {
+    console.error(e);
+  });
+
   const result = await done.promise;
   return result;
 };