2.0.20

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,16 +1,16 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "2.0.10",
+  "version": "2.0.20",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartrequest",
-      "version": "2.0.10",
+      "version": "2.0.20",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/smartpromise": "^3.1.7",
-        "@pushrocks/smarturl": "^3.0.3",
+        "@pushrocks/smarturl": "^3.0.5",
         "agentkeepalive": "^4.2.1",
         "form-data": "^4.0.0"
       },
@@ -19,7 +19,7 @@
         "@gitzone/tsrun": "^1.2.37",
         "@gitzone/tstest": "^1.0.73",
         "@pushrocks/tapbundle": "^5.0.4",
-        "@types/node": "^18.6.4"
+        "@types/node": "^18.7.8"
       }
     },
     "node_modules/@adobe/helix-fetch": {
@@ -1242,9 +1242,9 @@
       }
     },
     "node_modules/@pushrocks/smarturl": {
-      "version": "3.0.3",
+      "version": "3.0.5",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarturl/-/smarturl-3.0.3.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarturl/-/smarturl-3.0.5.tgz",
-      "integrity": "sha512-vhDve6S8d5mlQuO5Fk41d+MTpu8s11oxMLvX6OVlHHIPPD2PCkFrBihlcVe/PWudbNBBMYS0CC2t9J8iQvM0BA==",
+      "integrity": "sha512-XKS+GpIOvMhxr855PmO39SOvv/hdhBbLZ45dkAA6uGL3XdW036jAp61nu7qeB3c6FPShCyhJzo2z5x51wW7OwQ==",
       "license": "MIT"
     },
     "node_modules/@pushrocks/smartxml": {
@@ -1833,9 +1833,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "18.6.4",
+      "version": "18.7.8",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-18.6.4.tgz",
+      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-18.7.8.tgz",
-      "integrity": "sha512-I4BD3L+6AWiUobfxZ49DlU43gtI+FTHSv9pE2Zekg6KjMpre4ByusaljW3vYSLJrvQ1ck1hUaeVu8HVlY3vzHg==",
+      "integrity": "sha512-/YP55EMK2341JkODUb8DM9O0x1SIz2aBvyF33Uf1c76St3VpsMXEIW0nxuKkq/5cxnbz0RD9cfwNZHEAZQD3ag==",
       "dev": true,
       "license": "MIT"
     },
@@ -9001,9 +9001,9 @@
       }
     },
     "@pushrocks/smarturl": {
-      "version": "3.0.3",
+      "version": "3.0.5",
-      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarturl/-/smarturl-3.0.3.tgz",
+      "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmarturl/-/smarturl-3.0.5.tgz",
-      "integrity": "sha512-vhDve6S8d5mlQuO5Fk41d+MTpu8s11oxMLvX6OVlHHIPPD2PCkFrBihlcVe/PWudbNBBMYS0CC2t9J8iQvM0BA=="
+      "integrity": "sha512-XKS+GpIOvMhxr855PmO39SOvv/hdhBbLZ45dkAA6uGL3XdW036jAp61nu7qeB3c6FPShCyhJzo2z5x51wW7OwQ=="
     },
     "@pushrocks/smartxml": {
       "version": "1.0.6",
@@ -9524,9 +9524,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "18.6.4",
+      "version": "18.7.8",
-      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-18.6.4.tgz",
+      "resolved": "https://verdaccio.lossless.one/@types%2fnode/-/node-18.7.8.tgz",
-      "integrity": "sha512-I4BD3L+6AWiUobfxZ49DlU43gtI+FTHSv9pE2Zekg6KjMpre4ByusaljW3vYSLJrvQ1ck1hUaeVu8HVlY3vzHg==",
+      "integrity": "sha512-/YP55EMK2341JkODUb8DM9O0x1SIz2aBvyF33Uf1c76St3VpsMXEIW0nxuKkq/5cxnbz0RD9cfwNZHEAZQD3ag==",
       "dev": true
     },
     "@types/parse5": {

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartrequest",
+  "name": "@push.rocks/smartrequest",
-  "version": "2.0.10",
+  "version": "2.0.20",
   "private": false,
   "description": "dropin replacement for request",
   "main": "dist_ts/index.js",
@@ -25,17 +25,17 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartrequest#README",
   "dependencies": {
-    "@pushrocks/smartpromise": "^3.1.7",
+    "@push.rocks/smartpromise": "^4.0.2",
-    "@pushrocks/smarturl": "^3.0.3",
+    "@push.rocks/smarturl": "^3.0.6",
-    "agentkeepalive": "^4.2.1",
+    "agentkeepalive": "^4.3.0",
     "form-data": "^4.0.0"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tsrun": "^1.2.39",
-    "@gitzone/tstest": "^1.0.73",
+    "@gitzone/tstest": "^1.0.74",
     "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.6.4"
+    "@types/node": "^18.15.11"
   },
   "files": [
     "ts/**/*",

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',
+  name: '@push.rocks/smartrequest',
-  version: '2.0.10',
+  version: '2.0.20',
   description: 'dropin replacement for request'
 }

ts/index.ts

@@ -1,7 +1,8 @@
-export { request } from './smartrequest.request.js';
+export { request, safeGet } from './smartrequest.request.js';
 export type { IExtendedIncomingMessage } from './smartrequest.request.js';
 export type { ISmartRequestOptions } from './smartrequest.interfaces.js';
 
 export * from './smartrequest.jsonrest.js';
 export * from './smartrequest.binaryrest.js';
 export * from './smartrequest.formdata.js';
+export * from './smartrequest.stream.js';

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.plugins.ts

@@ -7,8 +7,8 @@ import * as path from 'path';
 export { http, https, fs, path };
 
 // pushrocks scope
-import * as smartpromise from '@pushrocks/smartpromise';
+import * as smartpromise from '@push.rocks/smartpromise';
-import * as smarturl from '@pushrocks/smarturl';
+import * as smarturl from '@push.rocks/smarturl';
 
 export { smartpromise, smarturl };
 

ts/smartrequest.request.ts

@@ -1,14 +1,12 @@
 import * as plugins from './smartrequest.plugins.js';
 import * as interfaces from './smartrequest.interfaces.js';
 
-import { IncomingMessage } from 'http';
+export interface IExtendedIncomingMessage extends plugins.http.IncomingMessage {
-
-export interface IExtendedIncomingMessage extends IncomingMessage {
   body: any;
 }
 
 const buildUtf8Response = (
-  incomingMessageArg: IncomingMessage,
+  incomingMessageArg: plugins.http.IncomingMessage,
   autoJsonParse = true
 ): Promise<IExtendedIncomingMessage> => {
   const done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
@@ -70,7 +68,7 @@ const httpAgent = new plugins.agentkeepalive({
  */
 const httpAgentKeepAliveFalse = new plugins.agentkeepalive({
   keepAlive: false,
-  timeout: 60000
+  timeout: 60000,
 });
 
 /**
@@ -81,7 +79,7 @@ const httpsAgent = new plugins.agentkeepalive.HttpsAgent({
   maxFreeSockets: 10,
   maxSockets: 100,
   maxTotalSockets: 1000,
-  timeout: 60000
+  timeout: 60000,
 });
 
 /**
@@ -89,7 +87,7 @@ const httpsAgent = new plugins.agentkeepalive.HttpsAgent({
  */
 const httpsAgentKeepAliveFalse = new plugins.agentkeepalive.HttpsAgent({
   keepAlive: false,
-  timeout: 60000
+  timeout: 60000,
 });
 
 export let request = async (
@@ -132,20 +130,30 @@ export let request = async (
 
   // TODO: support tcp sockets
 
+  // lets determine agent
+  switch (true) {
+    case !!optionsArg.agent:
+      break;
+    case parsedUrl.protocol === 'https:' && optionsArg.keepAlive:
+      optionsArg.agent = httpsAgent;
+      break;
+    case parsedUrl.protocol === 'https:' && !optionsArg.keepAlive:
+      optionsArg.agent = httpsAgentKeepAliveFalse;
+      break;
+    case parsedUrl.protocol === 'http:' && optionsArg.keepAlive:
+      optionsArg.agent = httpAgent;
+      break;
+    case parsedUrl.protocol === 'http:' && !optionsArg.keepAlive:
+      optionsArg.agent = httpAgentKeepAliveFalse;
+      break;
+  }
+
   // lets determine the request module to use
   const requestModule = (() => {
     switch (true) {
-      case parsedUrl.protocol === 'https:' && optionsArg.keepAlive:
+      case parsedUrl.protocol === 'https:':
-        optionsArg.agent = httpsAgent;
         return plugins.https;
-      case parsedUrl.protocol === 'https:' && !optionsArg.keepAlive:
+      case parsedUrl.protocol === 'http:':
-        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;
@@ -156,11 +164,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);
     }
   });
@@ -194,6 +209,23 @@ export let request = async (
   response.on('error', (err) => {
     console.log(err);
     response.destroy();
-  })
+  });
   return response;
 };
+
+export const safeGet = async (urlArg: string) => {
+  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;
+  } catch (err) {
+    console.log(err);
+    return null;
+  }
+};

ts/smartrequest.stream.ts

@@ -0,0 +1,17 @@
+import * as plugins from './smartrequest.plugins.js';
+import * as interfaces from './smartrequest.interfaces.js';
+import { request } from './smartrequest.request.js';
+
+export const getStream = async (
+  urlArg: string,
+  optionsArg: interfaces.ISmartRequestOptions = {}
+): Promise<plugins.http.IncomingMessage> => {
+  try {
+    // Call the existing request function with responseStreamArg set to true.
+    const responseStream = await request(urlArg, optionsArg, true);
+    return responseStream;
+  } catch (err) {
+    console.error('An error occurred while getting the stream:', err);
+    throw err; // Rethrow the error to be handled by the caller.
+  }
+};