2.0.19

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.12",
+  "version": "2.0.19",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartrequest",
-      "version": "2.0.12",
+      "version": "2.0.19",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/smartpromise": "^3.1.7",

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pushrocks/smartrequest",
-  "version": "2.0.12",
+  "name": "@push.rocks/smartrequest",
+  "version": "2.0.19",
   "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"
   },

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.12',
+  name: '@push.rocks/smartrequest',
+  version: '2.0.19',
   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 smarturl from '@pushrocks/smarturl';
+import * as smartpromise from '@push.rocks/smartpromise';
+import * as smarturl from '@push.rocks/smarturl';
 
 export { smartpromise, smarturl };
 

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,11 +216,13 @@ export let request = async (
 };
 
 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: plugins.http.globalAgent,
+      agent: agentToUse,
       timeout: 5000,
+      hardDataCuttingTimeout: 5000,
       autoJsonParse: false,
     });
     return response;

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.
+  }
+};