2.0.16

npmextra.json

@@ -10,10 +10,10 @@
     "projectType": "npm",
     "module": {
       "githost": "gitlab.com",
-      "gitscope": "pushrocks",
+      "gitscope": "push.rocks",
       "gitrepo": "smartrequest",
       "description": "dropin replacement for request",
-      "npmPackagename": "@pushrocks/smartrequest",
+      "npmPackagename": "@push.rocks/smartrequest",
       "license": "MIT"
     }
   }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartrequest",
-      "version": "2.0.14",
+      "version": "2.0.16",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/smartpromise": "^3.1.7",

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartrequest",
-  "version": "2.0.14",
+  "name": "@push.rocks/smartrequest",
+  "version": "2.0.16",
   "private": false,
   "description": "dropin replacement for request",
   "main": "dist_ts/index.js",
@@ -25,8 +25,8 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartrequest#README",
   "dependencies": {
-    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/smarturl": "^3.0.6",
+    "@push.rocks/smartpromise": "^4.0.2",
+    "@push.rocks/smarturl": "^3.0.6",
     "agentkeepalive": "^4.3.0",
     "form-data": "^4.0.0"
   },

pnpm-lock.yaml

@@ -1,12 +1,16 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 dependencies:
-  '@pushrocks/smartpromise':
+  '@push.rocks/smartpromise':
     specifier: ^4.0.2
-    version: 4.0.2
-  '@pushrocks/smarturl':
+    version: 4.0.3
+  '@push.rocks/smarturl':
     specifier: ^3.0.6
-    version: 3.0.6
+    version: 3.0.7
   agentkeepalive:
     specifier: ^4.3.0
     version: 4.3.0
@@ -311,6 +315,14 @@ packages:
       - utf-8-validate
     dev: true
 
+  /@push.rocks/smartpromise@4.0.3:
+    resolution: {integrity: sha512-z3lIso4/6KK3c6NFTVGZ7AOBsGURf8ha3qQtX/OxjZFk5dqS//8PLd0XqghVdIaUlRGmJ7Sfds/efZERWn1tAg==}
+    dev: false
+
+  /@push.rocks/smarturl@3.0.7:
+    resolution: {integrity: sha512-nx4EWjQD9JeO7QVbOsxd1PFeDQYoSQOOOYCZ+r7QWXHLJG52iYzgvJDCQyX6p705HDkYMJWozW2ZzhR22qLKbw==}
+    dev: false
+
   /@pushrocks/consolecolor@2.0.1:
     resolution: {integrity: sha512-iOFCHVeFZ2OywbdwSxVI4/wokkcLrXVdHLgvMmkNhJ220eeLgjNZWx3EJo3vNW3zq5ybCSCUIq0878djBxrWpw==}
     dependencies:
@@ -637,10 +649,6 @@ packages:
     resolution: {integrity: sha512-VeTurbZ1+ZMxBDJk1Y1LV8SN9xLI+oDXKVeCFw41FAGEKOUEqordqFpi6t+7Vhe/TXUZzCVpZ5bXxAxrGf8yTQ==}
     dev: true
 
-  /@pushrocks/smartpromise@4.0.2:
-    resolution: {integrity: sha512-bqorOaGXPOuiOSV81luTKrTghg4O4NBRD0zyv7TIqmrMGf4a0uoozaUMp1X8vQdZW+y0gTzUJP9wkzAE6Cci0g==}
-    dev: false
-
   /@pushrocks/smartpuppeteer@2.0.2:
     resolution: {integrity: sha512-l3tqnD6Evseofq1avHsMy2FXXEmCd4Z+nm3xmMWS7nWvP9qTbJIn0XguOBaUIAhR8zE53UKPXs5/qBqXVNZDDQ==}
     dependencies:
@@ -800,6 +808,7 @@ packages:
 
   /@pushrocks/smarturl@3.0.6:
     resolution: {integrity: sha512-YHWnYE1mm8WIJk1usSXg+kNM7s7ByM+PKApO9cgl0T/oGybjzAJiO3clGNDro4ysP0TD+WuvJuiVue02bErEBQ==}
+    dev: true
 
   /@pushrocks/smartxml@1.0.6:
     resolution: {integrity: sha512-Cy//pxzdpplqE64h9/sAwvAkUBv9t3Nw9v6k2c+erXH779iOtuyGiiyWqgbRTX1wo2CRhMJqWGJx6xd2Ljq5kw==}
@@ -1339,6 +1348,11 @@ packages:
       - utf-8-validate
     dev: true
 
+  /@xmldom/xmldom@0.8.8:
+    resolution: {integrity: sha512-0LNz4EY8B/8xXY86wMrQ4tz6zEHZv9ehFMJPm8u2gq5lQ71cfRKdaKyxfJAx5aUoyzx0qzgURblTisPGgz3d+Q==}
+    engines: {node: '>=10.0.0'}
+    dev: true
+
   /accepts@1.3.8:
     resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
     engines: {node: '>= 0.6'}
@@ -3491,6 +3505,8 @@ packages:
     resolution: {integrity: sha512-mXF9AIgnvq1DP/ZM2R28tAfxP2wKZHYa2DjV0R1KCwcqSzm5Iqh1XQq9rdfAt6dp2DuPP0VHZIaCALc2v1cL5A==}
     engines: {node: '>=14.18.0', npm: '>=6.14.15'}
     hasBin: true
+    dependencies:
+      '@xmldom/xmldom': 0.8.8
     dev: true
     bundledDependencies:
       - '@xmldom/xmldom'

test/test.ts

@@ -13,13 +13,18 @@ tap.test('should request a JSON document over https', async () => {
     .toEqual(1);
 });
 
-tap.skip.test('should post a JSON document over http', async () => {
+tap.test('should post a JSON document over http', async () => {
   await expectAsync(smartrequest.postJson('http://md5.jsontest.com/?text=example_text'))
     .property('body')
     .property('md5')
     .toEqual('fa4c6baa0812e5b5c80ed8885e55a8a6');
 });
 
+tap.test('should safe get stuff', async () => {
+  smartrequest.safeGet('http://coffee.link/');
+  smartrequest.safeGet('https://coffee.link/');
+});
+
 tap.skip.test('should deal with unix socks', async () => {
   const socketResponse = await smartrequest.request(
     'http://unix:/var/run/docker.sock:/containers/json',

ts/00_commitinfo_data.ts

@@ -2,7 +2,7 @@
  * autocreated commitinfo by @pushrocks/commitinfo
  */
 export const commitinfo = {
-  name: '@pushrocks/smartrequest',
-  version: '2.0.14',
+  name: '@push.rocks/smartrequest',
+  version: '2.0.16',
   description: 'dropin replacement for request'
 }

ts/smartrequest.interfaces.ts

@@ -6,4 +6,5 @@ export interface ISmartRequestOptions extends https.RequestOptions {
   requestBody?: any;
   autoJsonParse?: boolean;
   queryParams?: { [key: string]: string };
+  hardDataCuttingTimeout?: number;
 }

ts/smartrequest.request.ts

@@ -166,11 +166,18 @@ export let request = async (
   }
 
   // lets perform the actual request
-  const requestToFire = requestModule.request(optionsArg, async (response) => {
+  const requestToFire = requestModule.request(optionsArg, async (resArg) => {
+    if (optionsArg.hardDataCuttingTimeout) {
+      setTimeout(() => {
+        resArg.destroy();
+        done.reject(new Error('Request timed out'));
+      }, optionsArg.hardDataCuttingTimeout)
+    }
+
     if (responseStreamArg) {
-      done.resolve(response as IExtendedIncomingMessage);
+      done.resolve(resArg as IExtendedIncomingMessage);
     } else {
-      const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
+      const builtResponse = await buildUtf8Response(resArg, optionsArg.autoJsonParse);
       done.resolve(builtResponse);
     }
   });
@@ -209,12 +216,13 @@ export let request = async (
 };
 
 export const safeGet = async (urlArg: string) => {
-  const agentToUse = urlArg.startsWith('http') ? plugins.http.globalAgent : plugins.https.globalAgent;
+  const agentToUse = urlArg.startsWith('http://') ? new plugins.http.Agent() : new plugins.https.Agent();
   try {
     const response = await request(urlArg, {
       method: 'GET',
       agent: agentToUse,
       timeout: 5000,
+      hardDataCuttingTimeout: 5000,
       autoJsonParse: false,
     });
     return response;