Merge branch 'master' into staging/v7

Author: Ansonhkg

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

@@ -21,6 +21,7 @@ import {
   LIT_CURVE,
   LIT_CURVE_VALUES,
   LIT_ENDPOINT,
+  LIT_ERROR,
   LIT_ERROR_CODE,
   LIT_NETWORK,
   LIT_NETWORKS,
@@ -74,6 +75,7 @@ import {
 } from '@lit-protocol/types';
 
 import { composeLitUrl } from './endpoint-version';
+import { LogLevel } from '@lit-protocol/logger';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type Listener = (...args: any[]) => void;
@@ -199,7 +201,10 @@ export class LitCore {
 
     // -- set global variables
     globalThis.litConfig = this.config;
-    bootstrapLogManager('core');
+    bootstrapLogManager(
+      'core',
+      this.config.debug ? LogLevel.DEBUG : LogLevel.OFF
+    );
 
     // -- configure local storage if not present
     // LitNodeClientNodejs is a base for LitNodeClient
@@ -674,7 +679,17 @@ export class LitCore {
             this.config.bootstrapUrls.length
           } nodes. Please check your network connection and try again. Note that you can control this timeout with the connectTimeout config option which takes milliseconds.`;
 
-          reject(new InitError({}, msg));
+          try {
+            // TODO: Kludge, replace with standard error construction
+            throwError({
+              message: msg,
+              errorKind: LIT_ERROR.INIT_ERROR.kind,
+              errorCode: LIT_ERROR.INIT_ERROR.name,
+            });
+          } catch (e) {
+            logErrorWithRequestId(requestId, e);
+            reject(e);
+          }
         }, this.config.connectTimeout);
       }),
       Promise.all(

packages/logger/src/lib/logger.spec.ts

@@ -111,6 +111,18 @@ describe('logger', () => {
     }
 
     expect(lm.getLogsForId('foo7').length).toEqual(count);
-    expect(lm.LoggerIds.size).toEqual(1);
+    expect(lm.LoggerIds.length).toEqual(10);
+  });
+
+  it('should order logs based on logger creation timestamp', async () => {
+    const loggerA = lm.get('a', '1');
+    await new Promise((res) => setTimeout(res, 100));
+    const loggerB = lm.get('b', '2');
+
+    const requestIds = lm.LoggerIds;
+
+    expect(requestIds.length).toBe(2);
+    expect(loggerA.timestamp).toEqual(requestIds[0]);
+    expect(loggerB.timestamp).toEqual(requestIds[1]);
   });
 });

packages/logger/src/lib/logger.ts

@@ -1,7 +1,17 @@
 import { version, LOG_LEVEL, LOG_LEVEL_VALUES } from '@lit-protocol/constants';
 import { hashMessage } from 'ethers/lib/utils';
 
-export { LOG_LEVEL };
+
+export enum LogLevel {
+  OFF = -1,
+  ERROR = 0,
+  INFO = 1,
+  DEBUG = 2,
+  WARN = 3,
+  FATAL = 4,
+  TIMING_START = 5,
+  TIMING_END = 6,
+}
 
 const colours = {
   reset: '\x1b[0m',
@@ -197,6 +207,7 @@ export class Logger {
   private _config: Record<string, any> | undefined;
   private _isParent: boolean;
   private _children: Map<string, Logger>;
+  private _timestamp: number;
 
   public static createLogger(
     category: string,
@@ -222,6 +233,7 @@ export class Logger {
     this._config = config;
     this._children = new Map();
     this._isParent = isParent;
+    this._timestamp = Date.now();
   }
 
   get id(): string {
@@ -232,6 +244,10 @@ export class Logger {
     return this._category;
   }
 
+  get timestamp(): number {
+    return this._timestamp;
+  }
+
   get Logs(): Log[] {
     return this._logs;
   }
@@ -305,14 +321,17 @@ export class Logger {
 
     const arrayLog = log.toArray();
     if (this._config?.['condenseLogs'] && !this._checkHash(log)) {
-      (this._level >= level || level === LOG_LEVEL.ERROR) &&
+      (this._level >= level || level === LogLevel.ERROR) &&
+        this._consoleHandler &&
         this._consoleHandler(...arrayLog);
       (this._level >= level || level === LOG_LEVEL.ERROR) &&
         this._handler &&
         this._handler(log);
-      (this._level >= level || level === LOG_LEVEL.ERROR) && this._addLog(log);
+
+      (this._level >= level || level === LogLevel.ERROR) && this._addLog(log);
     } else if (!this._config?.['condenseLogs']) {
-      (this._level >= level || level === LOG_LEVEL.ERROR) &&
+      (this._level >= level || level === LogLevel.ERROR) &&
+        this._consoleHandler &&
         this._consoleHandler(...arrayLog);
       (this._level >= level || level === LOG_LEVEL.ERROR) &&
         this._handler &&
@@ -336,7 +355,6 @@ export class Logger {
 
   private _addLog(log: Log) {
     this._logs.push(log);
-
     // TODO: currently we are not deleting old request id's which over time will fill local storage as the maximum storage size is 10mb
     // we should be deleting keys from the front of the collection of `Object.keys(category)` such that the first keys entered are deleted when we reach a pre defined key threshold
     // this implementation assumes that serialization / deserialization from `localStorage` keeps the same key ordering in each `category` object as we will asssume the array produced from `Object.keys` will always be the same ordering.
@@ -421,14 +439,20 @@ export class LogManager {
   }
 
   get LoggerIds(): string[] {
-    const keys: string[] = [];
+    const keys: [string, number][] = [];
     for (const category of this._loggers.entries()) {
       for (const child of category[1].Children) {
-        keys.push(child[0]);
+        keys.push([child[0], child[1].timestamp]);
       }
     }
 
-    return keys;
+    return keys
+      .sort((a: [string, number], b: [string, number]) => {
+        return a[1] - b[1];
+      })
+      .map((value: [string, number]) => {
+        return value[0];
+      });
   }
 
   // if a logger is given an id it will persist logs under its logger instance

packages/misc/src/lib/misc.ts

@@ -154,11 +154,6 @@ export const log = (...args: any): void => {
     return;
   }
 
-  if (globalThis?.litConfig?.debug !== true) {
-    return;
-  }
-  // config is loaded, and debug is true
-
   // if there are there are logs in buffer, print them first and empty the buffer.
   while (logBuffer.length > 0) {
     const log = logBuffer.shift() ?? '';
@@ -182,11 +177,6 @@ export const logWithRequestId = (id: string, ...args: any) => {
     return;
   }
 
-  if (globalThis?.litConfig?.debug !== true) {
-    return;
-  }
-  // config is loaded, and debug is true
-
   // if there are there are logs in buffer, print them first and empty the buffer.
   while (logBuffer.length > 0) {
     const log = logBuffer.shift() ?? '';
@@ -212,11 +202,6 @@ export const logErrorWithRequestId = (id: string, ...args: any) => {
     return;
   }
 
-  if (globalThis?.litConfig?.debug !== true) {
-    return;
-  }
-  // config is loaded, and debug is true
-
   // if there are there are logs in buffer, print them first and empty the buffer.
   while (logBuffer.length > 0) {
     const log = logBuffer.shift() ?? '';
@@ -242,11 +227,6 @@ export const logError = (...args: any) => {
     return;
   }
 
-  if (globalThis?.litConfig?.debug !== true) {
-    return;
-  }
-  // config is loaded, and debug is true
-
   // if there are there are logs in buffer, print them first and empty the buffer.
   while (logBuffer.length > 0) {
     const log = logBuffer.shift() ?? '';