1.1.14

npmextra.json

@@ -1,11 +1,9 @@
 {
   "npmts": {
-    "coverageTreshold": 60
+    "coverageTreshold": 50
   },
   "npmci": {
-    "npmGlobalTools": [
+    "npmGlobalTools": [],
-      "npmts"
-    ],
     "npmAccessLevel": "public"
   }
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "1.1.2",
+  "version": "1.1.14",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -14,66 +14,149 @@
         "nan": "^2.9.2"
       }
     },
-    "@gitzone/tsrun": {
+    "@gitzone/tsbuild": {
-      "version": "1.1.9",
+      "version": "2.0.22",
-      "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.9.tgz",
+      "resolved": "https://registry.npmjs.org/@gitzone/tsbuild/-/tsbuild-2.0.22.tgz",
-      "integrity": "sha512-MbCLj4hSK5nY6cMqT0OxY0BrXffmiC1Rjbzan8CmEpB8OttaAJT+zsJErJWhI+pk4s75Te73PyhHYaJAXUoJhw==",
+      "integrity": "sha512-H0rqGVUKXWgxXhkY62kF92WpbS9GSJW27jQXaoyMsQptTQN4HIYKHWZMdO4egkk0/gDmKnBjk8MXg5Rx6efItA==",
       "dev": true,
       "requires": {
-        "@pushrocks/smartfile": "^6.0.3",
+        "@pushrocks/smartfile": "^6.0.6",
+        "@pushrocks/smartlog": "^2.0.1",
+        "@pushrocks/smartpath": "^4.0.1",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "typescript": "^3.0.1"
+      }
+    },
+    "@gitzone/tsrun": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/@gitzone/tsrun/-/tsrun-1.1.12.tgz",
+      "integrity": "sha512-DOxqOg+evoxhgbzhzH4u6LaPF+6bpMsnBVl1QQaHzKPGBlNjaIY4yJ0RsGnWMgX1hlNLvbgHtl0Ky4A2MDvyrg==",
+      "dev": true,
+      "requires": {
+        "@gitzone/tsbuild": "^2.0.22",
+        "@pushrocks/smartfile": "^6.0.6",
         "ts-node": "^7.0.0",
-        "typescript": "^2.9.1"
+        "typescript": "^3.0.1"
+      }
+    },
+    "@gitzone/tstest": {
+      "version": "1.0.15",
+      "resolved": "https://registry.npmjs.org/@gitzone/tstest/-/tstest-1.0.15.tgz",
+      "integrity": "sha512-+t5fvYK4a0JkwwH0Fokh5aOxVzrax5OjDUL4zmhBk7KFmXt7fdvcqsSNaEp9iyqC52dLiDybdAXqHYZypXTIYw==",
+      "dev": true,
+      "requires": {
+        "@gitzone/tsrun": "^1.1.12",
+        "@pushrocks/consolecolor": "^2.0.1",
+        "@pushrocks/smartfile": "^6.0.6",
+        "@pushrocks/smartlog": "^2.0.1",
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@pushrocks/smartshell": "^2.0.6",
+        "@types/figures": "^2.0.0",
+        "figures": "^2.0.0"
+      }
+    },
+    "@pushrocks/consolecolor": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/consolecolor/-/consolecolor-2.0.1.tgz",
+      "integrity": "sha512-iOFCHVeFZ2OywbdwSxVI4/wokkcLrXVdHLgvMmkNhJ220eeLgjNZWx3EJo3vNW3zq5ybCSCUIq0878djBxrWpw==",
+      "dev": true,
+      "requires": {
+        "ansi-256-colors": "^1.1.0"
+      }
+    },
+    "@pushrocks/early": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@pushrocks/early/-/early-3.0.3.tgz",
+      "integrity": "sha512-71/nwxTpqdp1glmHz4YaGusNl/XOOcPelAxC9RA6rpS/6280QyY2u4yx+mRdMrCzn7ruLYF5awbkS8llNZ94Pg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/consolecolor": "^2.0.1",
+        "@pushrocks/smartpromise": "^2.0.5"
       }
     },
     "@pushrocks/smartdelay": {
-      "version": "2.0.1",
+      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@pushrocks/smartdelay/-/smartdelay-2.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartdelay/-/smartdelay-2.0.2.tgz",
-      "integrity": "sha512-olWwh2/JWfhmYdgqrR5RdSsgv1GlXBnbP+XKUrdKVk3dcCzkoqDx9lRE9NfpoCg1cUM2VMxbTVgTW9PWyexEuw==",
+      "integrity": "sha512-4xf6tMKwZcxBynKgXrM4SQKgeASfRvx43LUmR5DkStp26ZHAsarCXUdKJS6y8QIPygEOTOCP8we97JAcCzBuMg==",
       "dev": true,
       "requires": {
         "@pushrocks/smartpromise": "^2.0.5"
       }
     },
     "@pushrocks/smartfile": {
-      "version": "6.0.3",
+      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartfile/-/smartfile-6.0.6.tgz",
-      "integrity": "sha512-oYnLQzY/R6kVNerbWY4WwnPvdxXldrzMPWcB9j0aAdSDSqGwBEO1/ZFTQuNzN5MmPopoYmJrc06ZmI6dm4OJmw==",
+      "integrity": "sha512-vA1+yS6n0kuBZ+Bl30rxOCYvgIj0mo9g303cUpOZR0I781iQVWHcBKRC05FaGDxJD1HuYdvbSK+7vlrzZjVcMw==",
       "dev": true,
       "requires": {
+        "@pushrocks/smartpath": "^4.0.1",
         "@pushrocks/smartpromise": "^2.0.5",
-        "@pushrocks/smartrequest": "^1.0.15",
+        "@pushrocks/smartrequest": "^1.1.12",
-        "@types/fs-extra": "^5.0.3",
+        "@types/fs-extra": "^5.0.4",
         "@types/vinyl": "^2.0.2",
-        "fs-extra": "^6.0.1",
+        "fs-extra": "^7.0.0",
         "glob": "^7.1.2",
         "js-yaml": "^3.10.0",
-        "smartpath": "^3.2.8",
         "vinyl-file": "^3.0.0"
       }
     },
+    "@pushrocks/smartlog": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartlog/-/smartlog-2.0.1.tgz",
+      "integrity": "sha512-GtsDTGIUF3VuWPyF8FV5dF31ZCEIcaJ56ZlvJsWxjnyJq57X25mk5/K0QAaRE9IIeHg6fORcukFomb5C+AOQrg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartlog-interfaces": "^1.0.9"
+      }
+    },
+    "@pushrocks/smartlog-interfaces": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartlog-interfaces/-/smartlog-interfaces-1.0.9.tgz",
+      "integrity": "sha512-0qwpomrRN0kFjmhR9m1iHYXoISoNuXtRP0Wr+JtkYyURLwKHMaW8Xoznf8MzXJptRfqufJi3Fxh5HodpPrIZUA==",
+      "dev": true
+    },
+    "@pushrocks/smartpath": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartpath/-/smartpath-4.0.1.tgz",
+      "integrity": "sha512-MaI0+uLQPCr2V3WGnbdgb0pWa9xkWyrP4qYcbsHIjeismGLbn9s3jmP/HIXU8LkgzRgaVb+BJxmZJHOwl32DyA==",
+      "dev": true
+    },
     "@pushrocks/smartpromise": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@pushrocks/smartpromise/-/smartpromise-2.0.5.tgz",
       "integrity": "sha512-9j/chLtIiNkR0MDw7Mpxg9slxAVvAQwUZuiaPYX5KpHdKxQaHLI1VZ8IN0vPhwlfgNO4i4vGXV0wB8BvSDj03g=="
     },
     "@pushrocks/smartrequest": {
-      "version": "1.0.15",
+      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/@pushrocks/smartrequest/-/smartrequest-1.0.15.tgz",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartrequest/-/smartrequest-1.1.12.tgz",
-      "integrity": "sha512-nM+ctwMOs3gPJvw3cGouBimKQxCM93bnmv2+Jk9cbT29/UVVI/UjIdAU3OnUYFpzq496/QUAQD0kNsmYNkqmhQ==",
+      "integrity": "sha512-8vDpYUADkbJFdxDcHQJyJBpc66+cvsRAJdQ6SwMirz5cIeWNlLSR/PVrdGQ94z5tSusf4mwnODk2Ai9smN6XSA==",
       "dev": true,
       "requires": {
-        "smartq": "^1.1.1"
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@types/form-data": "^2.2.1",
+        "form-data": "^2.3.2"
+      }
+    },
+    "@pushrocks/smartshell": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@pushrocks/smartshell/-/smartshell-2.0.6.tgz",
+      "integrity": "sha512-D48KB3DDqLfMjOXGEutqJi+v3Z4RcWacu5BJXxUwrecvd6oetbKobfmNGxeHSQPmNGb7U3ISfKwV6c5T5EZkJg==",
+      "dev": true,
+      "requires": {
+        "@pushrocks/smartpromise": "^2.0.5",
+        "@types/which": "^1.3.1",
+        "which": "^1.3.1"
       }
     },
     "@pushrocks/tapbundle": {
-      "version": "3.0.1",
+      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/@pushrocks/tapbundle/-/tapbundle-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/@pushrocks/tapbundle/-/tapbundle-3.0.5.tgz",
-      "integrity": "sha512-QWVz5EwB3sjjqHTMa22xuw78TBgVTyqKTF5H6HT9d/rvxL5Ag4ZrTuoadMPcU9hRBx9gtPsKbWq4lEwOHdCmLA==",
+      "integrity": "sha512-7K1y4pyJ5O8XRmnW/ADryEoniGKOW0Un6VZpxMcYTndS5AjwKhjRkAAaSQf4g/a8Ei+uk/q8csI9Twjb9KISLQ==",
       "dev": true,
       "requires": {
-        "@pushrocks/smartdelay": "^2.0.1",
+        "@pushrocks/early": "^3.0.3",
+        "@pushrocks/smartdelay": "^2.0.2",
         "@pushrocks/smartpromise": "^2.0.5",
-        "early": "^2.1.1",
         "leakage": "^0.4.0",
         "smartchai": "^2.0.1"
       }
@@ -102,6 +185,12 @@
         "@types/chai": "*"
       }
     },
+    "@types/figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha512-mcRgJ+ncKuNI+Dwac7omO18B8C8u+YBS+AU/oyLhEyjAnT3cUUThhHgZpbiIvu5ZqSvdD30BXtrqg9nxc3OKMg==",
+      "dev": true
+    },
     "@types/form-data": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/@types/form-data/-/form-data-2.2.1.tgz",
@@ -120,9 +209,9 @@
       }
     },
     "@types/node": {
-      "version": "10.5.2",
+      "version": "10.5.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.2.tgz",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-10.5.8.tgz",
-      "integrity": "sha512-m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q=="
+      "integrity": "sha512-sWSjw+bYW/2W+1V3m8tVsm9PKJcxk3NHN7oRqNUfEdofKg0Imbdu1dQbFvLKjZQXEDXRN6IfSMACjJ7Wv4NGCQ=="
     },
     "@types/vinyl": {
       "version": "2.0.2",
@@ -133,6 +222,12 @@
         "@types/node": "*"
       }
     },
+    "@types/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-ZrJDWpvg75LTGX4XwuneY9s6bF3OeZcGTpoGh3zDV9ytzcHMFsRrMIaLBRJZQMBoGyKs6unBQfVdrLZiYfb1zQ==",
+      "dev": true
+    },
     "ansi-256-colors": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz",
@@ -171,16 +266,6 @@
       "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
       "dev": true
     },
-    "beautycolor": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/beautycolor/-/beautycolor-1.0.11.tgz",
-      "integrity": "sha512-Uxl/39+2uqixPzsrV+0NOHf0sJlWmsKnRTV0oz8+bfwnHPA/E+SZuh3Upn3OXobv0W7LZg5BVoLj1nkMj7m5jA==",
-      "dev": true,
-      "requires": {
-        "ansi-256-colors": "^1.1.0",
-        "typings-global": "^1.0.14"
-      }
-    },
     "bindings": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
@@ -198,9 +283,9 @@
       }
     },
     "buffer-from": {
-      "version": "1.1.0",
+      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==",
+      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
       "dev": true
     },
     "chai": {
@@ -239,9 +324,9 @@
       "dev": true
     },
     "clone": {
-      "version": "2.1.1",
+      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=",
+      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
       "dev": true
     },
     "clone-buffer": {
@@ -296,16 +381,6 @@
         "type-detect": "^4.0.0"
       }
     },
-    "define-properties": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
-      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
-      "dev": true,
-      "requires": {
-        "foreach": "^2.0.5",
-        "object-keys": "^1.0.8"
-      }
-    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -317,53 +392,33 @@
       "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
       "dev": true
     },
-    "early": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/early/-/early-2.1.1.tgz",
-      "integrity": "sha1-hB4jJU6l3FTYr67ugvWrZcAO4jw=",
-      "dev": true,
-      "requires": {
-        "beautycolor": "^1.0.7",
-        "smartq": "^1.1.1",
-        "typings-global": "^1.0.16"
-      }
-    },
-    "es-abstract": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz",
-      "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==",
-      "dev": true,
-      "requires": {
-        "es-to-primitive": "^1.1.1",
-        "function-bind": "^1.1.1",
-        "has": "^1.0.1",
-        "is-callable": "^1.1.3",
-        "is-regex": "^1.0.4"
-      }
-    },
-    "es-to-primitive": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
-      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
-      "dev": true,
-      "requires": {
-        "is-callable": "^1.1.1",
-        "is-date-object": "^1.0.1",
-        "is-symbol": "^1.0.1"
-      }
-    },
     "es6-error": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
       "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
       "dev": true
     },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
     "esprima": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true
     },
+    "figures": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "^1.0.5"
+      }
+    },
     "first-chunk-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz",
@@ -373,12 +428,6 @@
         "readable-stream": "^2.0.2"
       }
     },
-    "foreach": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
-      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=",
-      "dev": true
-    },
     "form-data": {
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
@@ -390,9 +439,9 @@
       }
     },
     "fs-extra": {
-      "version": "6.0.1",
+      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.0.tgz",
-      "integrity": "sha512-GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA==",
+      "integrity": "sha512-EglNDLRpmaTWiD/qraZn6HREAEAHJcJOmxNEYwq6xeMKnVMAy3GUcFB+wXt2C6k4CNvB/mP1y/U3dzvKKj5OtQ==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -406,12 +455,6 @@
       "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
       "dev": true
     },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
     "get-func-name": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
@@ -438,24 +481,6 @@
       "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
       "dev": true
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
-    "home": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/home/-/home-1.0.1.tgz",
-      "integrity": "sha1-lqQjzrSbmDeP9e886uBZpVf53TU=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.1"
-      }
-    },
     "inflight": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
@@ -472,33 +497,6 @@
       "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
       "dev": true
     },
-    "is-callable": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
-      "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
-      "dev": true
-    },
-    "is-date-object": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
-      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
-      "dev": true
-    },
-    "is-regex": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
-      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.1"
-      }
-    },
-    "is-symbol": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
-      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=",
-      "dev": true
-    },
     "is-utf8": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
@@ -511,6 +509,12 @@
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
       "dev": true
     },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
     "js-yaml": {
       "version": "3.12.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
@@ -606,22 +610,6 @@
       "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
       "dev": true
     },
-    "object-keys": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz",
-      "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==",
-      "dev": true
-    },
-    "object.getownpropertydescriptors": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
-      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "es-abstract": "^1.5.1"
-      }
-    },
     "once": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -631,12 +619,6 @@
         "wrappy": "1"
       }
     },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -714,25 +696,6 @@
         "chai-string": "^1.4.0"
       }
     },
-    "smartpath": {
-      "version": "3.2.8",
-      "resolved": "https://registry.npmjs.org/smartpath/-/smartpath-3.2.8.tgz",
-      "integrity": "sha1-SDS9OouuIpW6rK26I8h6UBlS+UA=",
-      "dev": true,
-      "requires": {
-        "home": "^1.0.1",
-        "typings-global": "^1.0.14"
-      }
-    },
-    "smartq": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/smartq/-/smartq-1.1.8.tgz",
-      "integrity": "sha512-FURlYW/C3bLeZjJcBVyw7bxCyQoCXiXbLCZcDUKznhXHaLu35c8m33/a2H8CA0rtb82lvzN8dRLnBZAcNMzNHQ==",
-      "dev": true,
-      "requires": {
-        "util.promisify": "^1.0.0"
-      }
-    },
     "source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -740,9 +703,9 @@
       "dev": true
     },
     "source-map-support": {
-      "version": "0.5.6",
+      "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.8.tgz",
-      "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==",
+      "integrity": "sha512-WqAEWPdb78u25RfKzOF0swBpY0dKrNdjc4GvLwm7ScX/o9bj8Eh/YL8mcMhBHYDGl87UkkSXDOFnW4G7GhWhGg==",
       "dev": true,
       "requires": {
         "buffer-from": "^1.0.0",
@@ -793,9 +756,9 @@
       }
     },
     "ts-node": {
-      "version": "7.0.0",
+      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz",
-      "integrity": "sha512-klJsfswHP0FuOLsvBZ/zzCfUvakOSSxds78mVeK7I+qP76YWtxf16hEZsp3U+b0kIo82R5UatGFeblYMqabb2Q==",
+      "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==",
       "dev": true,
       "requires": {
         "arrify": "^1.0.0",
@@ -815,15 +778,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "2.9.2",
+      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.0.1.tgz",
-      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
+      "integrity": "sha512-zQIMOmC+372pC/CCVLqnQ0zSBiY7HHodU7mpQdjiZddek4GMj31I3dUJ7gAs9o65X7mnRma6OokOkc6f9jjfBg==",
-      "dev": true
-    },
-    "typings-global": {
-      "version": "1.0.28",
-      "resolved": "https://registry.npmjs.org/typings-global/-/typings-global-1.0.28.tgz",
-      "integrity": "sha512-6VOwJWEY2971HOMHu/7sURzUXiD4/LiMJPsMAOqkHHAtS3MVpLFE5gzTiHilsH9KY5VE1mBQirWIgWFsDuo90A==",
       "dev": true
     },
     "universalify": {
@@ -838,16 +795,6 @@
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
       "dev": true
     },
-    "util.promisify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
-      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "object.getownpropertydescriptors": "^2.0.3"
-      }
-    },
     "vinyl": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
@@ -875,6 +822,15 @@
         "vinyl": "^2.0.1"
       }
     },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",

package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "1.1.2",
+  "version": "1.1.14",
   "private": false,
   "description": "dropin replacement for request",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "tsrun test/test.ts",
+    "test": "(tstest test/)",
-    "build": "(npmts)"
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -28,8 +28,10 @@
     "form-data": "^2.3.2"
   },
   "devDependencies": {
-    "@gitzone/tsrun": "^1.1.9",
+    "@gitzone/tsbuild": "^2.0.22",
-    "@pushrocks/tapbundle": "^3.0.1",
+    "@gitzone/tsrun": "^1.1.12",
-    "@types/node": "^10.5.2"
+    "@gitzone/tstest": "^1.0.15",
+    "@pushrocks/tapbundle": "^3.0.5",
+    "@types/node": "^10.5.8"
   }
 }

test/test.ts

@@ -23,13 +23,18 @@ tap.test('should post a JSON document over http', async () => {
 });
 
 tap.skip.test('should deal with unix socks', async () => {
-  const socketResponse = await smartrequest.request('http://unix:/var/run/docker.sock:/containers/json', {
+  const socketResponse = await smartrequest.request(
-    headers: {
+    'http://unix:/var/run/docker.sock:/containers/json',
-      "Content-Type": "application/json",
+    {
-      "Host": "docker.sock"
+      headers: {
+        'Content-Type': 'application/json',
+        Host: 'docker.sock'
+      }
     }
-  });
+  );
   console.log(socketResponse.body);
 });
 
+tap.skip.test('should correctly upload a file using formData', async () => {});
+
 tap.start();

ts/index.ts

@@ -3,3 +3,4 @@ export { ISmartRequestOptions } from './smartrequest.interfaces';
 
 export * from './smartrequest.jsonrest';
 export * from './smartrequest.binaryrest';
+export * from './smartrequest.formdata';

ts/smartrequest.formdata.ts

@@ -1,45 +1,23 @@
-import * as plugins from "./smartrequest.plugins";
+import * as plugins from './smartrequest.plugins';
-import * as interfaces from "./smartrequest.interfaces";
+import * as interfaces from './smartrequest.interfaces';
-import { request } from "./smartrequest.request";
+import { request } from './smartrequest.request';
 
 /**
  * the interfae for FormFieldData
  */
 export interface IFormField {
   name: string;
-  type: "string" | "filePath" | "Buffer";
+  type: 'string' | 'filePath' | 'Buffer';
   payload: string;
 }
 
-/**
+const appendFormField = async (formDataArg: plugins.formData, formDataField: IFormField) => {
- * retrieve the FormData headers in reliable way
+  if (formDataField.type === 'filePath') {
- * @param formDataArg
+    let fileData = plugins.fs.readFileSync(plugins.path.join(process.cwd(), formDataField.payload));
- */
+    formDataArg.append('file', fileData, {
-const getFormDataHeaders = (formDataArg: plugins.formData) => {
+      filename: 'upload.pdf',
-  const done = plugins.smartpromise.defer();
+      contentType: 'application/pdf'
-  formDataArg.getLength((err, length) => {
+    });
-    if (err) {
-      done.reject(err);
-    }
-    const headers = Object.assign(
-      { "Content-Length": length },
-      formDataArg.getHeaders()
-    );
-    done.resolve(headers);
-  });
-  return done.promise;
-};
-
-const appendFormField = async (
-  formDataArg: plugins.formData,
-  formDataField: IFormField
-) => {
-  if (formDataField.type === "filePath") {
-    formDataArg.append("type", "image");
-    let fileData = plugins.fs.createReadStream(
-      plugins.path.join(__dirname, formDataField.payload)
-    );
-    formDataArg.append("media", fileData, "upload.pdf");
   }
 };
 
@@ -52,11 +30,16 @@ export const postFormData = async (
   for (const formField of payloadArg) {
     await appendFormField(form, formField);
   }
-  const pipeLog: any = async (...args) => {
+  const requestOptions = Object.assign({}, optionsArg, {
-    console.log(args);
+    method: 'POST',
-  };
+    headers: {
-  const requestOptions = Object.assign({}, optionsArg, { requestBody: form });
+      ...optionsArg.headers,
+      ...form.getHeaders()
+    },
+    requestBody: form
+  });
 
   // lets fire the actual request for sending the formdata
-  request(urlArg, requestOptions);
+  const response = await request(urlArg, requestOptions);
+  return response;
 };

ts/smartrequest.plugins.ts

@@ -7,4 +7,4 @@ import * as url from 'url';
 
 import * as smartpromise from '@pushrocks/smartpromise';
 
-export {formData, http, https, fs, path, url, smartpromise };
+export { formData, http, https, fs, path, url, smartpromise };

ts/smartrequest.request.ts

@@ -1,8 +1,8 @@
-import * as https from "https";
+import * as https from 'https';
-import * as plugins from "./smartrequest.plugins";
+import * as plugins from './smartrequest.plugins';
-import * as interfaces from "./smartrequest.interfaces";
+import * as interfaces from './smartrequest.interfaces';
 
-import { IncomingMessage } from "http";
+import { IncomingMessage } from 'http';
 
 export interface IExtendedIncomingMessage extends IncomingMessage {
   body: any;
@@ -13,12 +13,12 @@ const buildUtf8Response = (
 ): Promise<IExtendedIncomingMessage> => {
   let done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
   // Continuously update stream with data
-  let body = "";
+  let body = '';
-  incomingMessageArg.on("data", function(chunkArg) {
+  incomingMessageArg.on('data', function(chunkArg) {
     body += chunkArg;
   });
 
-  incomingMessageArg.on("end", function() {
+  incomingMessageArg.on('end', function() {
     try {
       (incomingMessageArg as IExtendedIncomingMessage).body = JSON.parse(body);
     } catch (err) {
@@ -47,8 +47,8 @@ const parseSocketPathAndRoute = (stringToParseArg: string) => {
   return {
     socketPath: result[1],
     path: result[2]
-  }
+  };
-}
+};
 
 export let request = async (
   domainArg: string,
@@ -67,57 +67,58 @@ export let request = async (
   optionsArg.path = parsedUrl.path;
 
   // determine if unixsock
-  if(testForUnixSock(domainArg)) {
+  if (testForUnixSock(domainArg)) {
-    const detailedUnixPath = parseSocketPathAndRoute(optionsArg.path)
+    const detailedUnixPath = parseSocketPathAndRoute(optionsArg.path);
     optionsArg.socketPath = detailedUnixPath.socketPath;
     optionsArg.path = detailedUnixPath.path;
   }
-  
+
   // lets determine the request module to use
   const requestModule = (() => {
-    if (parsedUrl.protocol === "https:") {
+    if (parsedUrl.protocol === 'https:') {
       return plugins.https;
-    } else if (parsedUrl.protocol === "http:") {
+    } else if (parsedUrl.protocol === 'http:') {
       return plugins.http;
     } else {
       throw new Error(`unsupported protocol: ${parsedUrl.protocol}`);
     }
   })() as typeof plugins.https;
 
-
   // lets perform the actual request
   let request = requestModule.request(optionsArg);
 
   // lets write the requestBody
   if (optionsArg.requestBody) {
-    if (
+    if (!(optionsArg.requestBody instanceof plugins.formData)) {
-      typeof optionsArg.requestBody !== "string"
+      if (typeof optionsArg.requestBody !== 'string') {
-      && !(optionsArg.requestBody instanceof plugins.formData)
+        optionsArg.requestBody = JSON.stringify(optionsArg.requestBody);
-    ) {
+      }
-      optionsArg.requestBody = JSON.stringify(optionsArg.requestBody);
       request.write(optionsArg.requestBody);
+      request.end();
     } else if (optionsArg.requestBody instanceof plugins.formData) {
-      optionsArg.requestBody.pipe(request);
+      optionsArg.requestBody.pipe(request).on('finish', event => {
+        request.end();
+      });
     }
+  } else {
+    request.end();
   }
 
   // lets handle an error
-  request.on("error", e => {
+  request.on('error', e => {
     console.error(e);
   });
 
   // lets handle the response
-  request.on("response", async response => {
+  request.on('response', async response => {
     if (streamArg) {
       done.resolve(response);
     } else {
-      const builtResponse = await buildUtf8Response(response)
+      const builtResponse = await buildUtf8Response(response);
       done.resolve(builtResponse);
     }
   });
 
-  request.end();
-
   const result = await done.promise;
   return result;
 };