@naturalcycles/js-lib 14.176.0 → 14.177.0

package/dist/http/fetcher.js

@@ -224,7 +224,7 @@ class Fetcher {
             }
             res.statusFamily = this.getStatusFamily(res);
             res.statusCode = res.fetchResponse?.status;
-            if (res.fetchResponse?.ok) {
+            if (res.fetchResponse?.ok || !req.throwHttpErrors) {
                 try {
                     // We are applying a separate Timeout (as long as original Timeout for now) to "download and parse the body"
                     await (0, pTimeout_1.pTimeout)(async () => await this.onOkResponse(res), {
@@ -293,7 +293,7 @@ class Fetcher {
         }
         res.retryStatus.retryStopped = true;
         // res.err can happen on `failed to fetch` type of error, e.g JSON.parse, CORS, unexpected redirect
-        if (!res.err && this.cfg.logResponse) {
+        if ((!res.err || !req.throwHttpErrors) && this.cfg.logResponse) {
             const { retryAttempt } = res.retryStatus;
             const { logger } = this.cfg;
             logger.log([
@@ -531,6 +531,7 @@ class Fetcher {
                 redirect: cfg.redirect,
             },
             hooks: {},
+            throwHttpErrors: true,
         }, (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;
@@ -549,6 +550,7 @@ class Fetcher {
                 'logResponse',
                 'logResponseBody',
                 'debug',
+                'throwHttpErrors',
             ]),
             started: Date.now(),
             ...(0, object_util_1._omit)(opt, ['method', 'headers', 'credentials']),

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

@@ -4,7 +4,7 @@ import type { CommonLogger } from '../log/commonLogger';
 import type { Promisable } from '../typeFest';
 import type { AnyObject, NumberOfMilliseconds, 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' | 'debug' | 'redirect' | 'credentials'> {
+export interface FetcherNormalizedCfg extends Required<FetcherCfg>, Omit<FetcherRequest, 'started' | 'fullUrl' | 'logRequest' | 'logRequestBody' | 'logResponse' | 'logResponseBody' | 'debug' | 'redirect' | 'credentials' | 'throwHttpErrors'> {
     logger: CommonLogger;
     searchParams: Record<string, any>;
 }
@@ -67,6 +67,7 @@ export interface FetcherCfg {
      * Defaults to `console`.
      */
     logger?: CommonLogger;
+    throwHttpErrors?: boolean;
 }
 export interface FetcherRetryStatus {
     retryAttempt: number;
@@ -182,6 +183,11 @@ export interface FetcherOptions {
      * If provided - will be used instead of static `Fetcher.callNativeFetch`.
      */
     fetchFn?: FetchFunction;
+    /**
+     * Default to true.
+     * Set to false to not throw on `!Response.ok`, but simply return `Response.body` as-is (json parsed, etc).
+     */
+    throwHttpErrors?: boolean;
 }
 export type RequestInitNormalized = Omit<RequestInit, 'method' | 'headers'> & {
     method: HttpMethod;

package/dist-esm/http/fetcher.js

@@ -202,7 +202,7 @@ export class Fetcher {
             }
             res.statusFamily = this.getStatusFamily(res);
             res.statusCode = (_b = res.fetchResponse) === null || _b === void 0 ? void 0 : _b.status;
-            if ((_c = res.fetchResponse) === null || _c === void 0 ? void 0 : _c.ok) {
+            if (((_c = res.fetchResponse) === null || _c === void 0 ? void 0 : _c.ok) || !req.throwHttpErrors) {
                 try {
                     // We are applying a separate Timeout (as long as original Timeout for now) to "download and parse the body"
                     await pTimeout(async () => await this.onOkResponse(res), {
@@ -271,7 +271,7 @@ export class Fetcher {
         }
         res.retryStatus.retryStopped = true;
         // res.err can happen on `failed to fetch` type of error, e.g JSON.parse, CORS, unexpected redirect
-        if (!res.err && this.cfg.logResponse) {
+        if ((!res.err || !req.throwHttpErrors) && this.cfg.logResponse) {
             const { retryAttempt } = res.retryStatus;
             const { logger } = this.cfg;
             logger.log([
@@ -511,6 +511,7 @@ export class Fetcher {
                 redirect: cfg.redirect,
             },
             hooks: {},
+            throwHttpErrors: true,
         }, _omit(cfg, ['method', 'credentials', 'headers', 'redirect', 'logger']));
         norm.init.headers = _mapKeys(norm.init.headers, k => k.toLowerCase());
         return norm;
@@ -529,6 +530,7 @@ export class Fetcher {
             'logResponse',
             'logResponseBody',
             'debug',
+            'throwHttpErrors',
         ])), { 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), { headers: Object.assign({}, this.cfg.init.headers), 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()),
             }) });

package/package.json

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

package/src/http/fetcher.model.ts

@@ -19,6 +19,7 @@ export interface FetcherNormalizedCfg
       | 'debug'
       | 'redirect'
       | 'credentials'
+      | 'throwHttpErrors'
     > {
   logger: CommonLogger
   searchParams: Record<string, any>
@@ -93,6 +94,8 @@ export interface FetcherCfg {
    * Defaults to `console`.
    */
   logger?: CommonLogger
+
+  throwHttpErrors?: boolean
 }
 
 export interface FetcherRetryStatus {
@@ -232,6 +235,12 @@ export interface FetcherOptions {
    * If provided - will be used instead of static `Fetcher.callNativeFetch`.
    */
   fetchFn?: FetchFunction
+
+  /**
+   * Default to true.
+   * Set to false to not throw on `!Response.ok`, but simply return `Response.body` as-is (json parsed, etc).
+   */
+  throwHttpErrors?: boolean
 }
 
 export type RequestInitNormalized = Omit<RequestInit, 'method' | 'headers'> & {

package/src/http/fetcher.ts

@@ -308,7 +308,7 @@ export class Fetcher {
       res.statusFamily = this.getStatusFamily(res)
       res.statusCode = res.fetchResponse?.status
 
-      if (res.fetchResponse?.ok) {
+      if (res.fetchResponse?.ok || !req.throwHttpErrors) {
         try {
           // We are applying a separate Timeout (as long as original Timeout for now) to "download and parse the body"
           await pTimeout(
@@ -384,7 +384,7 @@ export class Fetcher {
     res.retryStatus.retryStopped = true
 
     // res.err can happen on `failed to fetch` type of error, e.g JSON.parse, CORS, unexpected redirect
-    if (!res.err && this.cfg.logResponse) {
+    if ((!res.err || !req.throwHttpErrors) && this.cfg.logResponse) {
       const { retryAttempt } = res.retryStatus
       const { logger } = this.cfg
       logger.log(
@@ -654,6 +654,7 @@ export class Fetcher {
           redirect: cfg.redirect,
         },
         hooks: {},
+        throwHttpErrors: true,
       },
       _omit(cfg, ['method', 'credentials', 'headers', 'redirect', 'logger']),
     )
@@ -677,6 +678,7 @@ export class Fetcher {
         'logResponse',
         'logResponseBody',
         'debug',
+        'throwHttpErrors',
       ]),
       started: Date.now(),
       ..._omit(opt, ['method', 'headers', 'credentials']),