fix: remove global override of fetch

Ticket: 1193
near · Oct 27, 2023 · c1d9090 · c1d9090
1 parent 53ba3f2
commit c1d9090
Show file tree

Hide file tree

Showing 4 changed files with 1,670 additions and 1,523 deletions.
diff --git a/.changeset/wet-jars-attend.md b/.changeset/wet-jars-attend.md
@@ -0,0 +1,6 @@
+---
+"near-api-js": patch
+"@near-js/providers": patch
+---
+
+fixes override of global fetch property
diff --git a/packages/near-api-js/src/connect.ts b/packages/near-api-js/src/connect.ts
@@ -25,11 +25,8 @@
 import { readKeyFile } from './key_stores/unencrypted_file_system_keystore';
 import { InMemoryKeyStore, MergeKeyStore } from './key_stores';
 import { Near, NearConfig } from './near';
-import fetch from './utils/setup-node-fetch';
 import { logWarning } from './utils';
 
-global.fetch = fetch;
-
 export interface ConnectConfig extends NearConfig {
     /**
      * Initialize an {@link key_stores/in_memory_key_store!InMemoryKeyStore} by reading the file at keyPath.

diff --git a/packages/providers/src/fetch_json.ts b/packages/providers/src/fetch_json.ts
@@ -28,11 +28,8 @@ export async function fetchJson(connectionInfoOrUrl: string | ConnectionInfo, js
 
     const response = await exponentialBackoff(START_WAIT_TIME_MS, RETRY_NUMBER, BACKOFF_MULTIPLIER, async () => {
         try {
-            if (!global.fetch) {
-                global.fetch = (await import('./fetch')).default;
-            }
 
-            const response = await global.fetch(connectionInfo.url, {
+            const response = await (global.fetch ?? (await import('./fetch')).default)(connectionInfo.url, {
                 method: json ? 'POST' : 'GET',
                 body: json ? json : undefined,
                 headers: { ...connectionInfo.headers, 'Content-Type': 'application/json' }