@naturalcycles/js-lib 15.33.0 → 15.33.1

package/dist/http/fetcher.d.ts

@@ -4,7 +4,7 @@
 import type { ReadableStream as WebReadableStream } from 'node:stream/web';
 import { HttpRequestError } from '../error/error.util.js';
 import type { ErrorDataTuple } from '../types.js';
-import type { FetcherAfterResponseHook, FetcherBeforeRequestHook, FetcherBeforeRetryHook, FetcherCfg, FetcherGraphQLOptions, FetcherNormalizedCfg, FetcherOnErrorHook, FetcherOptions, FetcherResponse, RequestInitNormalized } from './fetcher.model.js';
+import type { FetcherAfterResponseHook, FetcherBeforeRequestHook, FetcherBeforeRetryHook, FetcherCfg, FetcherGraphQLOptions, FetcherNormalizedCfg, FetcherOnErrorHook, FetcherOptions, FetcherResponse, FetchFunction, RequestInitNormalized } from './fetcher.model.js';
 /**
  * Experimental wrapper around Fetch.
  * Works in both Browser and Node, using `globalThis.fetch`.
@@ -92,7 +92,7 @@ export declare class Fetcher {
      * This method exists to be able to easily mock it.
      * It is static, so mocking applies to ALL instances (even future ones) of Fetcher at once.
      */
-    static callNativeFetch(url: string, init: RequestInitNormalized): Promise<Response>;
+    static callNativeFetch(url: string, init: RequestInitNormalized, fetchFn?: FetchFunction): Promise<Response>;
     private onNotOkResponse;
     private processRetry;
     private getRetryTimeout;

package/dist/http/fetcher.js

@@ -283,8 +283,7 @@ export class Fetcher {
                 }
             }
             try {
-                // Calls cfg.fetchFn if set, otherwise Fetcher.callNativeFetch
-                res.fetchResponse = await (this.cfg.fetchFn || Fetcher.callNativeFetch)(req.fullUrl, req.init);
+                res.fetchResponse = await Fetcher.callNativeFetch(req.fullUrl, req.init, this.cfg.fetchFn);
                 res.ok = res.fetchResponse.ok;
                 // important to set it to undefined, otherwise it can keep the previous value (from previous try)
                 res.err = undefined;
@@ -400,8 +399,8 @@ export class Fetcher {
      * This method exists to be able to easily mock it.
      * It is static, so mocking applies to ALL instances (even future ones) of Fetcher at once.
      */
-    static async callNativeFetch(url, init) {
-        return await globalThis.fetch(url, init);
+    static async callNativeFetch(url, init, fetchFn = globalThis.fetch) {
+        return (await fetchFn(url, init));
     }
     async onNotOkResponse(res) {
         let cause;

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

@@ -284,7 +284,26 @@ export type FetcherResponseType = 'json' | 'text' | 'void' | 'arrayBuffer' | 'bl
  * Used to be able to override and provide a different implementation,
  * e.g when mocking.
  */
-export type FetchFunction = (url: string, init: RequestInitNormalized) => Promise<Response>;
+export type FetchFunction = (url: string, init: RequestInitCrossPlatform) => Promise<ResponseCrossPlatform>;
+/**
+ * A subset of RequestInit that would match both:
+ *
+ * 1. RequestInit from dom types
+ * 2. RequestInit from undici types
+ */
+export interface RequestInitCrossPlatform {
+    method?: string;
+    referrer?: string;
+    keepalive?: boolean;
+}
+/**
+ * A subset of Response type that matches both dom and undici types.
+ */
+export interface ResponseCrossPlatform {
+    ok: boolean;
+    status: number;
+    statusText: string;
+}
 export type GraphQLResponse<DATA> = GraphQLSuccessResponse<DATA> | GraphQLErrorResponse;
 export interface GraphQLSuccessResponse<DATA> {
     data: DATA;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@naturalcycles/js-lib",
   "type": "module",
-  "version": "15.33.0",
+  "version": "15.33.1",
   "dependencies": {
     "tslib": "^2",
     "undici": "^7",
@@ -13,7 +13,7 @@
     "@types/semver": "^7",
     "crypto-js": "^4",
     "dayjs": "^1",
-    "@naturalcycles/dev-lib": "19.37.0"
+    "@naturalcycles/dev-lib": "18.4.2"
   },
   "exports": {
     ".": "./dist/index.js",

package/src/http/fetcher.model.ts

@@ -364,7 +364,31 @@ export type FetcherResponseType =
  * Used to be able to override and provide a different implementation,
  * e.g when mocking.
  */
-export type FetchFunction = (url: string, init: RequestInitNormalized) => Promise<Response>
+export type FetchFunction = (
+  url: string,
+  init: RequestInitCrossPlatform,
+) => Promise<ResponseCrossPlatform>
+
+/**
+ * A subset of RequestInit that would match both:
+ *
+ * 1. RequestInit from dom types
+ * 2. RequestInit from undici types
+ */
+export interface RequestInitCrossPlatform {
+  method?: string
+  referrer?: string
+  keepalive?: boolean
+}
+
+/**
+ * A subset of Response type that matches both dom and undici types.
+ */
+export interface ResponseCrossPlatform {
+  ok: boolean
+  status: number
+  statusText: string
+}
 
 export type GraphQLResponse<DATA> = GraphQLSuccessResponse<DATA> | GraphQLErrorResponse
 

package/src/http/fetcher.ts

@@ -49,6 +49,7 @@ import type {
   FetcherResponse,
   FetcherResponseType,
   FetcherRetryOptions,
+  FetchFunction,
   GraphQLResponse,
   RequestInitNormalized,
 } from './fetcher.model.js'
@@ -369,11 +370,7 @@ export class Fetcher {
       }
 
       try {
-        // Calls cfg.fetchFn if set, otherwise Fetcher.callNativeFetch
-        res.fetchResponse = await (this.cfg.fetchFn || Fetcher.callNativeFetch)(
-          req.fullUrl,
-          req.init,
-        )
+        res.fetchResponse = await Fetcher.callNativeFetch(req.fullUrl, req.init, this.cfg.fetchFn)
         res.ok = res.fetchResponse.ok
         // important to set it to undefined, otherwise it can keep the previous value (from previous try)
         res.err = undefined
@@ -502,8 +499,12 @@ export class Fetcher {
    * This method exists to be able to easily mock it.
    * It is static, so mocking applies to ALL instances (even future ones) of Fetcher at once.
    */
-  static async callNativeFetch(url: string, init: RequestInitNormalized): Promise<Response> {
-    return await globalThis.fetch(url, init)
+  static async callNativeFetch(
+    url: string,
+    init: RequestInitNormalized,
+    fetchFn: FetchFunction = globalThis.fetch,
+  ): Promise<Response> {
+    return (await fetchFn(url, init)) as Response
   }
 
   private async onNotOkResponse(res: FetcherResponse): Promise<void> {