feat: replace globalThis in misc used to retrieve litCore config with a function and module scoped variable

Author: FedericoAmura

packages/core/src/lib/lit-core.ts

@@ -50,6 +50,7 @@ import {
   logWithRequestId,
   mostCommonString,
   sendRequest,
+  setMiscLitConfig,
 } from '@lit-protocol/misc';
 import {
   AuthSig,
@@ -197,8 +198,8 @@ export class LitCore {
     // -- set bootstrapUrls to match the network litNetwork unless it's set to custom
     this.setCustomBootstrapUrls();
 
-    // -- set global variables
-    globalThis.litConfig = this.config;
+    // -- set misc global variables
+    setMiscLitConfig(this.config);
     bootstrapLogManager('core');
 
     // -- configure local storage if not present
@@ -387,7 +388,7 @@ export class LitCore {
 
     this._stopListeningForNewEpoch();
     // this._stopNetworkPolling();
-    if (globalThis.litConfig) delete globalThis.litConfig;
+    setMiscLitConfig(undefined);
   }
 
   // _stopNetworkPolling() {
@@ -532,9 +533,6 @@ export class LitCore {
     // this._scheduleNetworkSync();
     this._listenForNewEpoch();
 
-    // FIXME: don't create global singleton; multiple instances of `core` should not all write to global
-    // @ts-expect-error typeof globalThis is not defined. We're going to get rid of the global soon.
-    globalThis.litNodeClient = this;
     this.ready = true;
 
     log(`🔥 lit is ready. "litNodeClient" variable is ready to use globally.`);

packages/misc/src/lib/misc.ts

@@ -1,3 +1,4 @@
+import { LitNodeClientConfig } from '@lit-protocol/types';
 import { Contract } from '@ethersproject/contracts';
 import { JsonRpcProvider } from '@ethersproject/providers';
 import Ajv, { JSONSchemaType } from 'ajv';
@@ -31,6 +32,13 @@ import {
 const logBuffer: any[][] = [];
 const ajv = new Ajv();
 
+// Module scoped variable to store the LitNodeClientConfig passed to LitCore
+let litConfig: LitNodeClientConfig | undefined;
+
+export const setMiscLitConfig = (config: LitNodeClientConfig | undefined) => {
+  litConfig = config;
+};
+
 /**
  *
  * Print error message based on Error interface
@@ -95,7 +103,6 @@ export const findMostCommonResponse = (responses: object[]): object => {
 };
 
 declare global {
-  var litConfig: any;
   var wasmExport: any;
   var wasmECDSA: any;
   var logger: any;
@@ -148,13 +155,13 @@ export const log = (...args: any): void => {
   }
 
   // check if config is loaded yet
-  if (!globalThis?.litConfig) {
+  if (!litConfig) {
     // config isn't loaded yet, push into buffer
     logBuffer.push(args);
     return;
   }
 
-  if (globalThis?.litConfig?.debug !== true) {
+  if (litConfig?.debug !== true) {
     return;
   }
   // config is loaded, and debug is true
@@ -176,13 +183,13 @@ export const logWithRequestId = (id: string, ...args: any) => {
   }
 
   // check if config is loaded yet
-  if (!globalThis?.litConfig) {
+  if (!litConfig) {
     // config isn't loaded yet, push into buffer
     logBuffer.push(args);
     return;
   }
 
-  if (globalThis?.litConfig?.debug !== true) {
+  if (litConfig?.debug !== true) {
     return;
   }
   // config is loaded, and debug is true
@@ -206,13 +213,13 @@ export const logErrorWithRequestId = (id: string, ...args: any) => {
   }
 
   // check if config is loaded yet
-  if (!globalThis?.litConfig) {
+  if (!litConfig) {
     // config isn't loaded yet, push into buffer
     logBuffer.push(args);
     return;
   }
 
-  if (globalThis?.litConfig?.debug !== true) {
+  if (litConfig?.debug !== true) {
     return;
   }
   // config is loaded, and debug is true
@@ -236,13 +243,13 @@ export const logError = (...args: any) => {
   }
 
   // check if config is loaded yet
-  if (!globalThis?.litConfig) {
+  if (!litConfig) {
     // config isn't loaded yet, push into buffer
     logBuffer.push(args);
     return;
   }
 
-  if (globalThis?.litConfig?.debug !== true) {
+  if (litConfig?.debug !== true) {
     return;
   }
   // config is loaded, and debug is true