2.0.15

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartrequest",
-  "version": "2.0.7",
+  "version": "2.0.15",
   "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",
+    "@pushrocks/smartpromise": "^4.0.2",
-    "@pushrocks/smarturl": "^3.0.2",
+    "@pushrocks/smarturl": "^3.0.6",
-    "agentkeepalive": "^4.2.1",
+    "agentkeepalive": "^4.3.0",
     "form-data": "^4.0.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.63",
+    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tsrun": "^1.2.39",
-    "@gitzone/tstest": "^1.0.72",
+    "@gitzone/tstest": "^1.0.74",
     "@pushrocks/tapbundle": "^5.0.4",
-    "@types/node": "^18.6.2"
+    "@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

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/smartrequest',
-  version: '2.0.7',
+  version: '2.0.15',
   description: 'dropin replacement for request'
 }

ts/index.ts

@@ -1,4 +1,4 @@
-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';
 

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

@@ -70,7 +70,7 @@ const httpAgent = new plugins.agentkeepalive({
  */
 const httpAgentKeepAliveFalse = new plugins.agentkeepalive({
   keepAlive: false,
-  timeout: 60000
+  timeout: 60000,
 });
 
 /**
@@ -81,7 +81,7 @@ const httpsAgent = new plugins.agentkeepalive.HttpsAgent({
   maxFreeSockets: 10,
   maxSockets: 100,
   maxTotalSockets: 1000,
-  timeout: 60000
+  timeout: 60000,
 });
 
 /**
@@ -89,7 +89,7 @@ const httpsAgent = new plugins.agentkeepalive.HttpsAgent({
  */
 const httpsAgentKeepAliveFalse = new plugins.agentkeepalive.HttpsAgent({
   keepAlive: false,
-  timeout: 60000
+  timeout: 60000,
 });
 
 export let request = async (
@@ -98,7 +98,7 @@ export let request = async (
   responseStreamArg: boolean = false,
   requestDataFunc: (req: plugins.http.ClientRequest) => void = null
 ): Promise<IExtendedIncomingMessage> => {
-  const done = plugins.smartpromise.defer<any>();
+  const done = plugins.smartpromise.defer<IExtendedIncomingMessage>();
 
   // merge options
   const defaultOptions: interfaces.ISmartRequestOptions = {
@@ -132,20 +132,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 +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);
+      done.resolve(resArg as IExtendedIncomingMessage);
     } else {
-      const builtResponse = await buildUtf8Response(response, optionsArg.autoJsonParse);
+      const builtResponse = await buildUtf8Response(resArg, optionsArg.autoJsonParse);
       done.resolve(builtResponse);
     }
   });
@@ -190,6 +207,27 @@ export let request = async (
     requestToFire.destroy();
   });
 
-  const result = await done.promise;
+  const response = await done.promise;
-  return result;
+  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;
+  }
 };