@naturalcycles/js-lib 14.153.1 → 14.153.3

package/dist/http/fetcher.js

@@ -9,6 +9,7 @@ const number_util_1 = require("../number/number.util");
 const object_util_1 = require("../object/object.util");
 const pDelay_1 = require("../promise/pDelay");
 const json_util_1 = require("../string/json.util");
+const stringifyAny_1 = require("../string/stringifyAny");
 const time_util_1 = require("../time/time.util");
 const http_model_1 = require("./http.model");
 const defRetryOptions = {
@@ -315,7 +316,9 @@ class Fetcher {
                 (0, time_util_1._since)(res.req.started),
             ]
                 .filter(Boolean)
-                .join(' '), res.err.cause || res.err);
+                .join(' ') + '\n', 
+            // We're stringifying the error here, otherwise Sentry shows it as [object Object]
+            (0, stringifyAny_1._stringifyAny)(res.err.cause || res.err));
         }
         if (retryStatus.retryStopped)
             return;
@@ -444,9 +447,10 @@ class Fetcher {
                 method: cfg.method || 'GET',
                 headers: cfg.headers || {},
                 credentials: cfg.credentials,
+                redirect: cfg.redirect,
             },
             hooks: {},
-        }, (0, object_util_1._omit)(cfg, ['method', 'credentials', 'headers', 'logger']));
+        }, (0, object_util_1._omit)(cfg, ['method', 'credentials', 'headers', 'redirect', 'logger']));
         norm.init.headers = (0, object_util_1._mapKeys)(norm.init.headers, k => k.toLowerCase());
         return norm;
     }
@@ -477,7 +481,7 @@ class Fetcher {
                 ...this.cfg.init,
                 method: opt.method || this.cfg.init.method,
                 credentials: opt.credentials || this.cfg.init.credentials,
-                redirect: opt.redirect || 'follow',
+                redirect: opt.redirect || this.cfg.init.redirect || 'follow',
             }, {
                 headers: (0, object_util_1._mapKeys)(opt.headers || {}, k => k.toLowerCase()),
             }),

package/dist/http/fetcher.model.d.ts

@@ -2,7 +2,7 @@ import type { CommonLogger } from '../log/commonLogger';
 import type { Promisable } from '../typeFest';
 import type { Reviver, UnixTimestampMillisNumber } from '../types';
 import type { HttpMethod, HttpStatusFamily } from './http.model';
-export interface FetcherNormalizedCfg extends Required<FetcherCfg>, Omit<FetcherRequest, 'started' | 'fullUrl' | 'logRequest' | 'logRequestBody' | 'logResponse' | 'logResponseBody'> {
+export interface FetcherNormalizedCfg extends Required<FetcherCfg>, Omit<FetcherRequest, 'started' | 'fullUrl' | 'logRequest' | 'logRequestBody' | 'logResponse' | 'logResponseBody' | 'redirect' | 'credentials'> {
     logger: CommonLogger;
     searchParams: Record<string, any>;
 }

package/dist-esm/http/fetcher.js

@@ -6,6 +6,7 @@ import { _clamp } from '../number/number.util';
 import { _filterNullishValues, _filterUndefinedValues, _mapKeys, _merge, _omit, _pick, } from '../object/object.util';
 import { pDelay } from '../promise/pDelay';
 import { _jsonParse, _jsonParseIfPossible } from '../string/json.util';
+import { _stringifyAny } from '../string/stringifyAny';
 import { _since } from '../time/time.util';
 import { HTTP_METHODS } from './http.model';
 const defRetryOptions = {
@@ -302,7 +303,9 @@ export class Fetcher {
                 _since(res.req.started),
             ]
                 .filter(Boolean)
-                .join(' '), res.err.cause || res.err);
+                .join(' ') + '\n', 
+            // We're stringifying the error here, otherwise Sentry shows it as [object Object]
+            _stringifyAny(res.err.cause || res.err));
         }
         if (retryStatus.retryStopped)
             return;
@@ -434,9 +437,10 @@ export class Fetcher {
                 method: cfg.method || 'GET',
                 headers: cfg.headers || {},
                 credentials: cfg.credentials,
+                redirect: cfg.redirect,
             },
             hooks: {},
-        }, _omit(cfg, ['method', 'credentials', 'headers', 'logger']));
+        }, _omit(cfg, ['method', 'credentials', 'headers', 'redirect', 'logger']));
         norm.init.headers = _mapKeys(norm.init.headers, k => k.toLowerCase());
         return norm;
     }
@@ -453,7 +457,7 @@ export class Fetcher {
             'logRequestBody',
             'logResponse',
             'logResponseBody',
-        ])), { started: Date.now() }), _omit(opt, ['method', 'headers', 'credentials'])), { inputUrl: opt.url || '', fullUrl: opt.url || '', retry: Object.assign(Object.assign({}, this.cfg.retry), _filterUndefinedValues(opt.retry || {})), init: _merge(Object.assign(Object.assign({}, this.cfg.init), { method: opt.method || this.cfg.init.method, credentials: opt.credentials || this.cfg.init.credentials, redirect: opt.redirect || 'follow' }), {
+        ])), { started: Date.now() }), _omit(opt, ['method', 'headers', 'credentials'])), { inputUrl: opt.url || '', fullUrl: opt.url || '', retry: Object.assign(Object.assign({}, this.cfg.retry), _filterUndefinedValues(opt.retry || {})), init: _merge(Object.assign(Object.assign({}, this.cfg.init), { method: opt.method || this.cfg.init.method, credentials: opt.credentials || this.cfg.init.credentials, redirect: opt.redirect || this.cfg.init.redirect || 'follow' }), {
                 headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),
             }) });
         // setup url

package/package.json

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

package/src/http/fetcher.model.ts

@@ -7,7 +7,14 @@ export interface FetcherNormalizedCfg
   extends Required<FetcherCfg>,
     Omit<
       FetcherRequest,
-      'started' | 'fullUrl' | 'logRequest' | 'logRequestBody' | 'logResponse' | 'logResponseBody'
+      | 'started'
+      | 'fullUrl'
+      | 'logRequest'
+      | 'logRequestBody'
+      | 'logResponse'
+      | 'logResponseBody'
+      | 'redirect'
+      | 'credentials'
     > {
   logger: CommonLogger
   searchParams: Record<string, any>

package/src/http/fetcher.ts

@@ -15,6 +15,7 @@ import {
 } from '../object/object.util'
 import { pDelay } from '../promise/pDelay'
 import { _jsonParse, _jsonParseIfPossible } from '../string/json.util'
+import { _stringifyAny } from '../string/stringifyAny'
 import { _since } from '../time/time.util'
 import { NumberOfMilliseconds } from '../types'
 import type {
@@ -405,8 +406,9 @@ export class Fetcher {
           _since(res.req.started),
         ]
           .filter(Boolean)
-          .join(' '),
-        res.err.cause || res.err,
+          .join(' ') + '\n',
+        // We're stringifying the error here, otherwise Sentry shows it as [object Object]
+        _stringifyAny(res.err.cause || res.err),
       )
     }
 
@@ -546,10 +548,11 @@ export class Fetcher {
           method: cfg.method || 'GET',
           headers: cfg.headers || {},
           credentials: cfg.credentials,
+          redirect: cfg.redirect,
         },
         hooks: {},
       },
-      _omit(cfg, ['method', 'credentials', 'headers', 'logger']),
+      _omit(cfg, ['method', 'credentials', 'headers', 'redirect', 'logger']),
     )
 
     norm.init.headers = _mapKeys(norm.init.headers, k => k.toLowerCase())
@@ -585,7 +588,7 @@ export class Fetcher {
           ...this.cfg.init,
           method: opt.method || this.cfg.init.method,
           credentials: opt.credentials || this.cfg.init.credentials,
-          redirect: opt.redirect || 'follow',
+          redirect: opt.redirect || this.cfg.init.redirect || 'follow',
         },
         {
           headers: _mapKeys(opt.headers || {}, k => k.toLowerCase()),