Merge pull request #253 from WalletConnect/fix/pino-export

fix: update pino to v10

Author: ganchoradkov

misc/history/package.json

@@ -46,7 +46,7 @@
     "@walletconnect/jsonrpc-types": "^1.0.3",
     "@walletconnect/jsonrpc-provider": "^1.0.13",
     "@walletconnect/keyvaluestorage": "^1.0.2",
-    "@walletconnect/logger": "^2.0.1",
+    "@walletconnect/logger": "^3.0.0",
     "@walletconnect/relay-api": "^1.0.9",
     "@walletconnect/relay-auth": "^1.0.4",
     "@walletconnect/safe-json": "^1.0.2",

misc/identity-keys/package.json

@@ -47,7 +47,7 @@
     "@walletconnect/heartbeat": "^1.2.1",
     "@walletconnect/jsonrpc-provider": "^1.0.13",
     "@walletconnect/keyvaluestorage": "^1.1.1",
-    "@walletconnect/logger": "^2.0.1",
+    "@walletconnect/logger": "^3.0.0",
     "webpack-cli": "^5.0.1"
   },
   "dependencies": {

misc/logger/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@walletconnect/logger",
   "description": "Logger Utils",
-  "version": "2.1.3",
+  "version": "3.0.0",
   "author": "WalletConnect, Inc. <walletconnect.com>",
   "license": "MIT",
   "homepage": "https://github.com/WalletConnect/walletconnect-utils/",
@@ -45,15 +45,15 @@
   "devDependencies": {
     "@types/jest": "^26.0.15",
     "@types/node": "^14.14.7",
-    "@types/pino": "^6.3.3",
+    "@types/pino": "^7.0.4",
     "@types/sinon": "^17.0.3",
-    "pino-pretty": "^7.6.0",
+    "pino-pretty": "^13.1.1",
     "sinon": "^17.0.1",
     "webpack": "^4.41.6",
     "webpack-cli": "^3.3.11"
   },
   "dependencies": {
     "@walletconnect/safe-json": "^1.0.2",
-    "pino": "7.11.0"
+    "pino": "10.0.0"
   }
 }

misc/logger/src/index.ts

@@ -1,6 +1,4 @@
-import * as Pino from "pino";
-const defaultPino = Pino.default ?? Pino;
+export { pino } from "pino";
 export * from "./constants";
 export * from "./utils";
 export type { Logger } from "pino";
-export { defaultPino as pino };

misc/logger/src/utils.ts

@@ -18,14 +18,7 @@ export function getDefaultLoggerOptions(opts?: LoggerOptions): LoggerOptions {
   };
 }
 
-export function getBrowserLoggerContext(
-  logger: Logger,
-  customContextKey: string = PINO_CUSTOM_CONTEXT_KEY,
-): string {
-  return (logger as any)[customContextKey] || "";
-}
-
-export function setBrowserLoggerContext(
+export function setLoggerContext(
   logger: Logger,
   context: string,
   customContextKey: string = PINO_CUSTOM_CONTEXT_KEY,
@@ -38,14 +31,7 @@ export function getLoggerContext(
   logger: Logger,
   customContextKey: string = PINO_CUSTOM_CONTEXT_KEY,
 ): string {
-  let context = "";
-  // logger.bindings is undefined in browser
-  if (typeof logger.bindings === "undefined") {
-    context = getBrowserLoggerContext(logger, customContextKey);
-  } else {
-    context = logger.bindings().context || "";
-  }
-  return context;
+  return (logger as any)[customContextKey] || "";
 }
 
 export function formatChildLoggerContext(
@@ -65,11 +51,11 @@ export function generateChildLogger(
 ): Logger {
   const context = formatChildLoggerContext(logger, childContext, customContextKey);
   const child = logger.child({ context });
-  return setBrowserLoggerContext(child, context, customContextKey);
+  return setLoggerContext(child, context, customContextKey);
 }
 
 export function generateClientLogger(params: { opts?: LoggerOptions; maxSizeInBytes?: number }): {
-  logger: Logger<any>;
+  logger: Logger;
   chunkLoggerController: ClientChunkLogger;
 } {
   const clientLogger = new ClientChunkLogger(params.opts?.level, params.maxSizeInBytes);
@@ -86,7 +72,7 @@ export function generateClientLogger(params: { opts?: LoggerOptions; maxSizeInBy
 }
 
 export function generateServerLogger(params: { maxSizeInBytes?: number; opts?: LoggerOptions }): {
-  logger: Logger<any>;
+  logger: Logger;
   chunkLoggerController: ServerChunkLogger;
 } {
   const serverLogger = new ServerChunkLogger(params.opts?.level, params.maxSizeInBytes);
@@ -104,9 +90,9 @@ export function generateServerLogger(params: { maxSizeInBytes?: number; opts?: L
 export function generatePlatformLogger(params: {
   maxSizeInBytes?: number;
   opts?: LoggerOptions;
-  loggerOverride?: string | Logger<any>;
+  loggerOverride?: string | Logger;
 }): {
-  logger: Logger<any>;
+  logger: Logger;
   chunkLoggerController: ChunkLoggerController | null;
 } {
   if (typeof params.loggerOverride !== "undefined" && typeof params.loggerOverride !== "string") {