@naturalcycles/js-lib 14.153.3 → 14.153.4

package/dist/http/fetcher.js

@@ -8,6 +8,7 @@ const httpRequestError_1 = require("../error/httpRequestError");
 const number_util_1 = require("../number/number.util");
 const object_util_1 = require("../object/object.util");
 const pDelay_1 = require("../promise/pDelay");
+const pTimeout_1 = require("../promise/pTimeout");
 const json_util_1 = require("../string/json.util");
 const stringifyAny_1 = require("../string/stringifyAny");
 const time_util_1 = require("../time/time.util");
@@ -119,7 +120,11 @@ class Fetcher {
             const abortController = new AbortController();
             req.init.signal = abortController.signal;
             timeout = setTimeout(() => {
-                abortController.abort(`timeout of ${timeoutSeconds} sec`);
+                // Apparently, providing a `string` reason to abort() causes Undici to throw `invalid_argument` error,
+                // so, we're wrapping it in a TimeoutError instance
+                abortController.abort(new pTimeout_1.TimeoutError(`request timed out after ${timeoutSeconds} sec`));
+                // abortController.abort(`timeout of ${timeoutSeconds} sec`)
+                // abortController.abort()
             }, timeoutSeconds * 1000);
         }
         for (const hook of this.cfg.hooks.beforeRequest || []) {
@@ -246,7 +251,7 @@ class Fetcher {
             ]
                 .filter(Boolean)
                 .join(' '));
-            if (this.cfg.logResponseBody) {
+            if (this.cfg.logResponseBody && res.body !== undefined) {
                 logger.log(res.body);
             }
         }

package/dist-esm/http/fetcher.js

@@ -5,6 +5,7 @@ import { HttpRequestError } from '../error/httpRequestError';
 import { _clamp } from '../number/number.util';
 import { _filterNullishValues, _filterUndefinedValues, _mapKeys, _merge, _omit, _pick, } from '../object/object.util';
 import { pDelay } from '../promise/pDelay';
+import { TimeoutError } from '../promise/pTimeout';
 import { _jsonParse, _jsonParseIfPossible } from '../string/json.util';
 import { _stringifyAny } from '../string/stringifyAny';
 import { _since } from '../time/time.util';
@@ -104,7 +105,11 @@ export class Fetcher {
             const abortController = new AbortController();
             req.init.signal = abortController.signal;
             timeout = setTimeout(() => {
-                abortController.abort(`timeout of ${timeoutSeconds} sec`);
+                // Apparently, providing a `string` reason to abort() causes Undici to throw `invalid_argument` error,
+                // so, we're wrapping it in a TimeoutError instance
+                abortController.abort(new TimeoutError(`request timed out after ${timeoutSeconds} sec`));
+                // abortController.abort(`timeout of ${timeoutSeconds} sec`)
+                // abortController.abort()
             }, timeoutSeconds * 1000);
         }
         for (const hook of this.cfg.hooks.beforeRequest || []) {
@@ -231,7 +236,7 @@ export class Fetcher {
             ]
                 .filter(Boolean)
                 .join(' '));
-            if (this.cfg.logResponseBody) {
+            if (this.cfg.logResponseBody && res.body !== undefined) {
                 logger.log(res.body);
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/js-lib",
-  "version": "14.153.3",
+  "version": "14.153.4",
   "scripts": {
     "prepare": "husky install",
     "build-prod": "build-prod-esm-cjs",

package/src/http/fetcher.ts

@@ -14,6 +14,7 @@ import {
   _pick,
 } from '../object/object.util'
 import { pDelay } from '../promise/pDelay'
+import { TimeoutError } from '../promise/pTimeout'
 import { _jsonParse, _jsonParseIfPossible } from '../string/json.util'
 import { _stringifyAny } from '../string/stringifyAny'
 import { _since } from '../time/time.util'
@@ -177,7 +178,11 @@ export class Fetcher {
       const abortController = new AbortController()
       req.init.signal = abortController.signal
       timeout = setTimeout(() => {
-        abortController.abort(`timeout of ${timeoutSeconds} sec`)
+        // Apparently, providing a `string` reason to abort() causes Undici to throw `invalid_argument` error,
+        // so, we're wrapping it in a TimeoutError instance
+        abortController.abort(new TimeoutError(`request timed out after ${timeoutSeconds} sec`))
+        // abortController.abort(`timeout of ${timeoutSeconds} sec`)
+        // abortController.abort()
       }, timeoutSeconds * 1000) as any as number
     }
 
@@ -319,7 +324,7 @@ export class Fetcher {
           .join(' '),
       )
 
-      if (this.cfg.logResponseBody) {
+      if (this.cfg.logResponseBody && res.body !== undefined) {
         logger.log(res.body)
       }
     }