1.1.20

.gitignore

@@ -1,4 +1,22 @@
-node_modules/
+.nogit/
+
+# artifacts
 coverage/
 public/
-pages/
+pages/
+
+# installs
+node_modules/
+
+# caches
+.yarn/
+.cache/
+.rpt2_cache
+
+# builds
+dist/
+dist_web/
+dist_serve/
+dist_ts_web/
+
+# custom

.gitlab-ci.yml

@@ -1,5 +1,5 @@
-# gitzone standard
+# gitzone ci_default
-image: hosttoday/ht-docker-node:npmci
+image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
 
 cache:
   paths:
@@ -48,15 +48,15 @@ testLTS:
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
-  - notpriv
+  - priv
-    
+
-testSTABLE:
+testBuild:
   stage: test
   script:
   - npmci npm prepare
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm install
-  - npmci npm test
+  - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
   - docker
@@ -65,7 +65,7 @@ testSTABLE:
 release:
   stage: release
   script:
-  - npmci node install stable
+  - npmci node install lts
   - npmci npm publish
   only:
   - tags
@@ -78,19 +78,11 @@ release:
 # ====================
 codequality:
   stage: metadata
-  image: docker:stable
   allow_failure: true
-  services:
-    - docker:stable-dind
   script:
-    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - npmci command npm install -g tslint typescript
-    - docker run
+    - npmci npm install
-        --env SOURCE_CODE="$PWD"
+    - npmci command "tslint -c tslint.json ./ts/**/*.ts"
-        --volume "$PWD":/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
-  artifacts:
-    paths: [codeclimate.json]
   tags:
   - docker
   - priv
@@ -106,13 +98,15 @@ trigger:
   - notpriv
 
 pages:
-  image: hosttoday/ht-docker-node:npmci
+  image: hosttoday/ht-docker-dbase:npmci
+  services:
+   - docker:18-dind
   stage: metadata
   script:
-    - npmci command npm install -g typedoc typescript
+    - npmci command npm install -g @gitzone/tsdoc
     - npmci npm prepare
     - npmci npm install
-    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
+    - npmci command tsdoc
   tags:
     - docker
     - notpriv

README.md

@@ -64,6 +64,6 @@ smartrequest.get('https://example.com/bigfile.mp4', optionsArg, true).then(res =
 For further information read the linked docs at the top of this readme.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy)
 
-[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://maintainedby.lossless.com)
+[![repo-footer](https://lossless.gitlab.io/publicrelations/repofooter.svg)](https://maintainedby.lossless.com)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "1.1.15",
+  "version": "1.1.20",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "1.1.15",
+  "version": "1.1.20",
   "private": false,
   "description": "dropin replacement for request",
   "main": "dist/index.js",
@@ -33,5 +33,16 @@
     "@gitzone/tstest": "^1.0.20",
     "@pushrocks/tapbundle": "^3.0.9",
     "@types/node": "^11.13.6"
-  }
+  },
+  "files": [
+    "ts/*",
+    "ts_web/*",
+    "dist/*",
+    "dist_web/*",
+    "dist_ts_web/*",
+    "assets/*",
+    "cli.js",
+    "npmextra.json",
+    "readme.md"
+  ]
 }

ts/smartrequest.interfaces.ts

@@ -3,4 +3,5 @@ import * as https from 'https';
 
 export interface ISmartRequestOptions extends https.RequestOptions {
   requestBody?: any;
+  autoJsonParse?: boolean;
 }

ts/smartrequest.request.ts

@@ -9,7 +9,8 @@ export interface IExtendedIncomingMessage extends IncomingMessage {
 }
 
 const buildUtf8Response = (
-  incomingMessageArg: IncomingMessage
+  incomingMessageArg: IncomingMessage,
+  autoJsonParse = true
 ): Promise<IExtendedIncomingMessage> => {
   let done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
   // Continuously update stream with data
@@ -19,9 +20,13 @@ const buildUtf8Response = (
   });
 
   incomingMessageArg.on('end', function() {
-    try {
+    if (autoJsonParse) {
-      (incomingMessageArg as IExtendedIncomingMessage).body = JSON.parse(body);
+      try {
-    } catch (err) {
+        (incomingMessageArg as IExtendedIncomingMessage).body = JSON.parse(body);
+      } catch (err) {
+        (incomingMessageArg as IExtendedIncomingMessage).body = body;
+      }
+    } else {
       (incomingMessageArg as IExtendedIncomingMessage).body = body;
     }
     done.resolve(incomingMessageArg as IExtendedIncomingMessage);
@@ -50,6 +55,16 @@ const parseSocketPathAndRoute = (stringToParseArg: string) => {
   };
 };
 
+const httpAgent = new plugins.http.Agent({
+  keepAlive: true,
+  keepAliveMsecs: 600000
+});
+
+const httpsAgent = new plugins.https.Agent({
+  keepAlive: true,
+  keepAliveMsecs: 600000
+});
+
 export let request = async (
   domainArg: string,
   optionsArg: interfaces.ISmartRequestOptions = {},
@@ -57,6 +72,17 @@ export let request = async (
 ): Promise<IExtendedIncomingMessage> => {
   let done = plugins.smartpromise.defer<any>();
 
+  // merge options
+  const defaultOptions: interfaces.ISmartRequestOptions = {
+    // agent: agent,
+    autoJsonParse: true
+  };
+
+  optionsArg = {
+    ...defaultOptions,
+    ...optionsArg
+  };
+
   // parse url
   let parsedUrl: plugins.url.Url;
   parsedUrl = plugins.url.parse(domainArg);
@@ -73,11 +99,15 @@ export let request = async (
     optionsArg.path = detailedUnixPath.path;
   }
 
+  // TODO: support tcp sockets
+
   // 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}`);
@@ -114,7 +144,7 @@ export let request = async (
     if (streamArg) {
       done.resolve(response);
     } else {
-      const builtResponse = await buildUtf8Response(response);
+      const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
       done.resolve(builtResponse);
     }
   });