Merge branch 'main' into fix-crypto

subquery · May 12, 2024 · 1785448 · 1785448
2 parents 32869ce + f09eecb
commit 1785448
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/.yarn/versions/8f3f4961.yml b/.yarn/versions/8f3f4961.yml
diff --git a/packages/network-support/package.json b/packages/network-support/package.json
@@ -23,5 +23,5 @@
   "browser": {
     "node-fetch": false
   },
-  "stableVersion": "1.1.0"
+  "stableVersion": "1.2.2"
 }
diff --git a/packages/network-support/src/fetch.ts b/packages/network-support/src/fetch.ts
@@ -33,7 +33,8 @@ export class FetchError extends Error {
 export function createFetch(
   orderManager: OrderManager,
   maxRetries = 5,
-  logger?: Logger
+  logger?: Logger,
+  overrideFetch?: typeof fetch
 ): (init: RequestInit) => Promise<Response> {
   let retries = 0;
   let triedFallback = false;
@@ -64,14 +65,18 @@ export function createFetch(
       }
       const { url, headers, type, runner, channelId } = requestParams;
       try {
-        const _res = await customFetch(url, {
-          headers: {
-            ...(init.headers || {}),
-            ...headers,
+        const _res = await customFetch(
+          url,
+          {
+            headers: {
+              ...(init.headers || {}),
+              ...headers,
+            },
+            method: 'post',
+            body: init.body,
           },
-          method: 'post',
-          body: init.body,
-        });
+          overrideFetch
+        );
         let res: object;
         if (type === OrderType.flexPlan) {
           [res] = orderManager.extractChannelState(

diff --git a/packages/network-support/src/utils/query.ts b/packages/network-support/src/utils/query.ts
@@ -20,9 +20,11 @@ export const timeoutController = () => {
 
 export const customFetch = (
   input: URL | RequestInfo,
-  init?: RequestInit | undefined
+  init?: RequestInit | undefined,
+  overrideFetch?: typeof fetch
 ): Promise<Response> => {
-  return fetch(input, {
+  overrideFetch = overrideFetch ?? fetch;
+  return overrideFetch(input, {
     signal: timeoutController().signal,
     ...init,
   });