Merge branch 'master' into biometric-handling-null

near · Oct 30, 2023 · b3617f9 · b3617f9
2 parents e9005e4 + 695220e
commit b3617f9
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 13 deletions.
diff --git a/.changeset/funny-jars-camp.md b/.changeset/funny-jars-camp.md
@@ -0,0 +1,8 @@
+---
+"@near-js/accounts": patch
+"near-api-js": patch
+"@near-js/providers": patch
+"@near-js/utils": patch
+---
+
+add check for global 'process' object
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/accounts/src/account.ts b/packages/accounts/src/account.ts
@@ -363,7 +363,7 @@ export class Account {
      * @param beneficiaryId The NEAR account that will receive the remaining Ⓝ balance from the account being deleted
      */
     async deleteAccount(beneficiaryId: string) {
-        if (!process.env['NEAR_NO_LOGS']) {
+        if (!(typeof process === 'object' && process.env['NEAR_NO_LOGS'])) {
             console.log('Deleting an account does not automatically transfer NFTs and FTs to the beneficiary address. Ensure to transfer assets before deleting.');
         }
         return this.signAndSendTransaction({

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.
@@ -57,7 +54,7 @@ export async function connect(config: ConnectConfig): Promise<Near> {
                     keyPathStore,
                     config.keyStore || config.deps?.keyStore
                 ], { writeKeyStoreIndex: 1 });
-                if (!process.env['NEAR_NO_LOGS']) {
+                if (!(typeof process === 'object' && process.env['NEAR_NO_LOGS'])) {
                     console.log(`Loaded master account ${accountKeyFile[0]} key from ${config.keyPath} with public key = ${keyPair.getPublicKey()}`);
                 }
             }

diff --git a/packages/providers/src/fetch_json.ts b/packages/providers/src/fetch_json.ts
@@ -16,7 +16,7 @@ export interface ConnectionInfo {
     headers?: { [key: string]: string | number };
 }
 
-const logWarning = (...args) => !process.env['NEAR_NO_LOGS'] && console.warn(...args);
+const logWarning = (...args) => !(typeof process === 'object' && process.env['NEAR_NO_LOGS']) && console.warn(...args);
 
 export async function fetchJson(connectionInfoOrUrl: string | ConnectionInfo, json?: string): Promise<any> {
     let connectionInfo: ConnectionInfo = { url: null };
@@ -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' }

diff --git a/packages/providers/src/json-rpc-provider.ts b/packages/providers/src/json-rpc-provider.ts
@@ -372,7 +372,7 @@ export class JsonRpcProvider extends Provider {
                 return response;
             } catch (error) {
                 if (error.type === 'TimeoutError') {
-                    if (!process.env['NEAR_NO_LOGS']) {
+                    if (!(typeof process === 'object' && process.env['NEAR_NO_LOGS'])) {
                         console.warn(`Retrying request to ${method} as it has timed out`, params);
                     }
                     return null;

diff --git a/packages/utils/src/errors/errors.ts b/packages/utils/src/errors/errors.ts
@@ -1,5 +1,5 @@
 export function logWarning(...args: any[]): void {
-    if (!process.env['NEAR_NO_LOGS']){
+    if (!(typeof process === 'object' && process.env['NEAR_NO_LOGS'])){
         console.warn(...args);
     }
 }
diff --git a/packages/utils/src/logging.ts b/packages/utils/src/logging.ts
@@ -2,7 +2,7 @@ import { FinalExecutionOutcome } from '@near-js/types';
 
 import { parseRpcError } from './errors';
 
-const SUPPRESS_LOGGING = !!process.env.NEAR_NO_LOGS;
+const SUPPRESS_LOGGING = !!(typeof process === 'object' && process.env.NEAR_NO_LOGS);
 
 /**
  * Parse and print details from a query execution response