@lidofinance/api-logger 0.11.0 → 0.12.0

package/dist/index.cjs

@@ -1,5 +1,3 @@
-var $dDFU1$darkobitsmaskstring = require("@darkobits/mask-string");
-
 function $parcel$exportWildcard(dest, source) {
   Object.keys(source).forEach(function(key) {
     if (key === 'default' || key === '__esModule' || dest.hasOwnProperty(key)) {
@@ -16,18 +14,36 @@ function $parcel$exportWildcard(dest, source) {
 
   return dest;
 }
-function $parcel$interopDefault(a) {
-  return a && a.__esModule ? a.default : a;
-}
 function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
 }
 var $2b0676a8d7ac44c3$exports = {};
 
 $parcel$export($2b0676a8d7ac44c3$exports, "serverLoggerFactory", () => $2b0676a8d7ac44c3$export$937ae38af6b48c0f);
+var $adb32885d633c259$exports = {};
+
+$parcel$export($adb32885d633c259$exports, "maskString", () => $adb32885d633c259$export$d03f901feec039d7);
+// Escape string to be safely used in RegExp constructor
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
+const $adb32885d633c259$var$escapeRegExp = (string)=>string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // $& means the whole matched string
+;
+// Need to make regex global to work with MatchAll
+const $adb32885d633c259$var$patternToRegex = (pattern)=>pattern instanceof RegExp ? new RegExp(pattern.source, "g") : new RegExp($adb32885d633c259$var$escapeRegExp(pattern), "g");
+const $adb32885d633c259$var$matchIndexes = (regex, input)=>Array.from(input.matchAll(regex)).filter((item)=>item != null)// Need to force types, because ts doesn't know it is exactly the match
+    .map((match)=>[
+            match.index,
+            match.index + match[0].length
+        ]);
+const $adb32885d633c259$var$getMask = (length)=>Array.from({
+        length: length
+    }).fill("*").join("");
+const $adb32885d633c259$var$maskFactory = (patterns)=>(message)=>patterns.map($adb32885d633c259$var$patternToRegex).flatMap((regex)=>$adb32885d633c259$var$matchIndexes(regex, message)).reduce((acc, [start, end])=>acc.slice(0, start) + $adb32885d633c259$var$getMask(end - start) + acc.slice(end), message);
+function $adb32885d633c259$export$d03f901feec039d7(patterns, ...args) {
+    if (args.length === 1) return $adb32885d633c259$var$maskFactory(patterns)(args[0]);
+    return $adb32885d633c259$var$maskFactory(patterns);
+}
+
 
-const $2b0676a8d7ac44c3$var$anyHex = new RegExp("0x[a-fA-F0-9]+", "ig");
-const $2b0676a8d7ac44c3$var$anyEthAddress = new RegExp("[a-zA-Z0-9.]+\\.eth", "ig");
 let $2b0676a8d7ac44c3$var$LEVEL;
 (function(LEVEL) {
     LEVEL["error"] = "error";
@@ -36,37 +52,43 @@ let $2b0676a8d7ac44c3$var$LEVEL;
     LEVEL["debug"] = "debug";
     LEVEL["log"] = "log";
 })($2b0676a8d7ac44c3$var$LEVEL || ($2b0676a8d7ac44c3$var$LEVEL = {}));
-const $2b0676a8d7ac44c3$var$stringify = (data)=>data instanceof Error ? JSON.stringify({
-        message: data.message,
-        stack: data.stack
-    }) : JSON.stringify(data);
+const $2b0676a8d7ac44c3$var$anyHex = new RegExp("0x[a-fA-F0-9]+");
+const $2b0676a8d7ac44c3$var$anyEthAddress = new RegExp("[a-zA-Z0-9.]+\\.eth");
+const $2b0676a8d7ac44c3$var$errorToObj = (error)=>Object.getOwnPropertyNames(error).reduce((acc, cur)=>({
+            ...acc,
+            [cur]: error[cur]
+        }), {});
+const $2b0676a8d7ac44c3$var$stringify = (data)=>JSON.stringify(data instanceof Error ? $2b0676a8d7ac44c3$var$errorToObj(data) : data);
 const $2b0676a8d7ac44c3$export$937ae38af6b48c0f = (secrets)=>{
     const patterns = [
         ...secrets,
         $2b0676a8d7ac44c3$var$anyHex,
         $2b0676a8d7ac44c3$var$anyEthAddress
     ].filter(Boolean);
-    // TODO: replace not with *** but with name of masked pattern e.g. https://example.com/{INFURA_KEY}
-    const mask = (message)=>(0, ($parcel$interopDefault($dDFU1$darkobitsmaskstring)))(patterns, message);
+    const mask = (0, $adb32885d633c259$export$d03f901feec039d7)(patterns);
     const log = (level)=>(...output)=>{
             try {
-                console[level](...output.map($2b0676a8d7ac44c3$var$stringify).map(mask));
+                console[level](// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                ...output.map($2b0676a8d7ac44c3$var$stringify).map(mask)// can't pass just JSON.parse because it takes second argument
+                .map((masked)=>JSON.parse(masked)));
             } catch (error) {
-                console.error(error);
-                console.warn("Failed to sanitize output");
+                // We can't show an actual error here because it may contain secrets
+                console.error("Failed to sanitize output");
             }
         };
     return process.env.NODE_ENV === "production" ? {
-        error: log($2b0676a8d7ac44c3$var$LEVEL.error),
-        warn: log($2b0676a8d7ac44c3$var$LEVEL.warn),
-        info: log($2b0676a8d7ac44c3$var$LEVEL.info),
-        debug: log($2b0676a8d7ac44c3$var$LEVEL.debug),
-        log: log($2b0676a8d7ac44c3$var$LEVEL.log)
+        error: log("error"),
+        warn: log("warn"),
+        info: log("info"),
+        debug: log("debug"),
+        log: log("log")
     } : console;
 };
 
 
+
 $parcel$exportWildcard(module.exports, $2b0676a8d7ac44c3$exports);
+$parcel$exportWildcard(module.exports, $adb32885d633c259$exports);
 
 
 //# sourceMappingURL=index.cjs.map

package/dist/index.cjs.map

@@ -1 +1 @@
-{"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;ACAA;AAEA,MAAM,+BAAS,IAAI,OAAO,kBAAkB;AAC5C,MAAM,sCAAgB,IAAI,OAAO,uBAAuB;IAExD;UAAK,KAAK;IAAL,MACH,WAAA;IADG,MAEH,UAAA;IAFG,MAGH,UAAA;IAHG,MAIH,WAAA;IAJG,MAKH,SAAA;GALG,gCAAA;AAQL,MAAM,kCAAY,CAAC,OACjB,gBAAgB,QAEZ,KAAK,SAAS,CAAC;QACb,SAAS,KAAK,OAAO;QACrB,OAAO,KAAK,KAAK;IACnB,KACA,KAAK,SAAS,CAAC,KAAK;AAWnB,MAAM,4CAAsB,CAAC,UAAkD;IACpF,MAAM,WAAW;WAAI;QAAS;QAAQ;KAAc,CAAC,MAAM,CAAC;IAC5D,mGAAmG;IACnG,MAAM,OAAO,CAAC,UAA4B,CAAA,GAAA,oDAAS,EAAE,UAAU;IAE/D,MAAM,MACJ,CAAC,QACD,CAAC,GAAG,SAA4B;YAC9B,IAAI;gBACF,OAAO,CAAC,MAAM,IAAI,OAAO,GAAG,CAAC,iCAAW,GAAG,CAAC;YAC9C,EAAE,OAAO,OAAO;gBACd,QAAQ,KAAK,CAAC;gBACd,QAAQ,IAAI,CAAC;YACf;QACF;IACF,OAAO,QAAQ,GAAG,CAAC,QAAQ,KAAK,eAC5B;QACE,OAAO,IAAI,4BAAM,KAAK;QACtB,MAAM,IAAI,4BAAM,IAAI;QACpB,MAAM,IAAI,4BAAM,IAAI;QACpB,OAAO,IAAI,4BAAM,KAAK;QACtB,KAAK,IAAI,4BAAM,GAAG;IACpB,IACA,OAAO;AACb;;ADvDA","sources":["packages/api/logger/src/index.ts","packages/api/logger/src/serverLoggerFactory.ts"],"sourcesContent":["export * from './serverLoggerFactory'\n","import maskString from '@darkobits/mask-string'\n\nconst anyHex = new RegExp('0x[a-fA-F0-9]+', 'ig')\nconst anyEthAddress = new RegExp('[a-zA-Z0-9.]+\\\\.eth', 'ig')\n\nenum LEVEL {\n  error = 'error',\n  warn = 'warn',\n  info = 'info',\n  debug = 'debug',\n  log = 'log',\n}\n\nconst stringify = (data: unknown) =>\n  data instanceof Error\n    ? // extract Error's non-enumerable props before stringifying\n      JSON.stringify({\n        message: data.message,\n        stack: data.stack,\n      })\n    : JSON.stringify(data)\n\nexport type Logger = (...messages: unknown[]) => void\nexport type ServerLogger = {\n  error: Logger\n  warn: Logger\n  info: Logger\n  debug: Logger\n  log: Logger\n}\n\nexport const serverLoggerFactory = (secrets: Array<RegExp | string>): ServerLogger => {\n  const patterns = [...secrets, anyHex, anyEthAddress].filter(Boolean)\n  // TODO: replace not with *** but with name of masked pattern e.g. https://example.com/{INFURA_KEY}\n  const mask = (message: string): string => maskString(patterns, message)\n\n  const log =\n    (level: LEVEL) =>\n    (...output: unknown[]): void => {\n      try {\n        console[level](...output.map(stringify).map(mask))\n      } catch (error) {\n        console.error(error)\n        console.warn('Failed to sanitize output')\n      }\n    }\n  return process.env.NODE_ENV === 'production'\n    ? {\n        error: log(LEVEL.error),\n        warn: log(LEVEL.warn),\n        info: log(LEVEL.info),\n        debug: log(LEVEL.debug),\n        log: log(LEVEL.log),\n      }\n    : console\n}\n"],"names":[],"version":3,"file":"index.cjs.map","sourceRoot":"../../../../"}
+{"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AEAA,wDAAwD;AACxD,6FAA6F;AAC7F,MAAM,qCAAe,CAAC,SAA2B,OAAO,OAAO,CAAC,uBAAuB,QAAQ,oCAAoC;;AAInI,kDAAkD;AAClD,MAAM,uCAAiB,CAAC,UACtB,mBAAmB,SAAS,IAAI,OAAO,QAAQ,MAAM,EAAE,OAAO,IAAI,OAAO,mCAAa,UAAU,IAAI;AAEtG,MAAM,qCAAe,CAAC,OAAe,QACnC,MAAM,IAAI,CAAC,MAAM,QAAQ,CAAC,QACvB,MAAM,CAAC,CAAC,OAAS,QAAQ,IAAI,CAC9B,uEAAuE;KACtE,GAAG,CAAC,CAAC,QAAU;YAAC,MAAM,KAAK;YAAa,MAAM,KAAK,GAAc,KAAK,CAAC,EAAE,CAAC,MAAM;SAAC;AAEtF,MAAM,gCAAU,CAAC,SAAmB,MAAM,IAAI,CAAC;gBAAE;IAAO,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC;AAE1E,MAAM,oCAAc,CAAC,WAAwB,CAAC,UAC5C,SACG,GAAG,CAAC,sCACJ,OAAO,CAAC,CAAC,QAAU,mCAAa,OAAO,UACvC,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,GAAK,IAAI,KAAK,CAAC,GAAG,SAAS,8BAAQ,MAAM,SAAS,IAAI,KAAK,CAAC,MAAM;AAKzF,SAAS,0CAAW,QAAmB,EAAE,GAAG,IAAmB,EAAE;IACtE,IAAI,KAAK,MAAM,KAAK,GAClB,OAAO,kCAAY,UAAU,IAAI,CAAC,EAAE;IAEtC,OAAO,kCAAY;AACrB;;ADhCA;IAYA;UAAW,KAAK;IAAL,MACT,WAAA;IADS,MAET,UAAA;IAFS,MAGT,UAAA;IAHS,MAIT,WAAA;IAJS,MAKT,SAAA;GALS,gCAAA;AAQX,MAAM,+BAAS,IAAI,OAAO;AAC1B,MAAM,sCAAgB,IAAI,OAAO;AAEjC,MAAM,mCAAa,CAAkB,QACnC,OAAO,mBAAmB,CAAC,OAAO,MAAM,CAAC,CAAC,KAAK,MAAS,CAAA;YAAE,GAAG,GAAG;YAAE,CAAC,IAAI,EAAE,KAAK,CAAC,IAAe;QAAC,CAAA,GAAI,CAAC;AAEtG,MAAM,kCAAY,CAAC,OAAkB,KAAK,SAAS,CAAC,gBAAgB,QAAQ,iCAAW,QAAQ,IAAI;AAE5F,MAAM,4CAAsB,CAAC,UAAkD;IACpF,MAAM,WAAW;WAAI;QAAS;QAAQ;KAAc,CAAC,MAAM,CAAC;IAC5D,MAAM,OAAO,CAAA,GAAA,yCAAS,EAAE;IAExB,MAAM,MACJ,CAAC,QACD,CAAC,GAAG,SAA4B;YAC9B,IAAI;gBACF,OAAO,CAAC,MAAM,CACZ,iEAAiE;mBAC9D,OACA,GAAG,CAAC,iCACJ,GAAG,CAAC,KACL,8DAA8D;iBAC7D,GAAG,CAAC,CAAC,SAAoB,KAAK,KAAK,CAAC;YAE3C,EAAE,OAAO,OAAO;gBACd,oEAAoE;gBACpE,QAAQ,KAAK,CAAC;YAChB;QACF;IACF,OAAO,QAAQ,GAAG,CAAC,QAAQ,KAAK,eAC5B;QACE,OAAO,IAtCL;QAuCF,MAAM,IAtCL;QAuCD,MAAM,IAtCL;QAuCD,OAAO,IAtCL;QAuCF,KAAK,IAtCL;IAuCF,IACA,OAAO;AACb;;AD1DA","sources":["packages/api/logger/src/index.ts","packages/api/logger/src/serverLoggerFactory.ts","packages/api/logger/src/maskString.ts"],"sourcesContent":["export * from './serverLoggerFactory'\nexport * from './maskString'\n","import { maskString } from './maskString'\n\nexport type Logger = (...messages: unknown[]) => void\n\nexport type ServerLogger = {\n  error: Logger\n  warn: Logger\n  info: Logger\n  debug: Logger\n  log: Logger\n}\n\nconst enum LEVEL {\n  error = 'error',\n  warn = 'warn',\n  info = 'info',\n  debug = 'debug',\n  log = 'log',\n}\n\nconst anyHex = new RegExp('0x[a-fA-F0-9]+')\nconst anyEthAddress = new RegExp('[a-zA-Z0-9.]+\\\\.eth')\n\nconst errorToObj = <T extends Error>(error: T) =>\n  Object.getOwnPropertyNames(error).reduce((acc, cur) => ({ ...acc, [cur]: error[cur as keyof T] }), {})\n\nconst stringify = (data: unknown) => JSON.stringify(data instanceof Error ? errorToObj(data) : data)\n\nexport const serverLoggerFactory = (secrets: Array<RegExp | string>): ServerLogger => {\n  const patterns = [...secrets, anyHex, anyEthAddress].filter(Boolean)\n  const mask = maskString(patterns)\n\n  const log =\n    (level: LEVEL) =>\n    (...output: unknown[]): void => {\n      try {\n        console[level](\n          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n          ...output\n            .map(stringify)\n            .map(mask)\n            // can't pass just JSON.parse because it takes second argument\n            .map((masked): unknown => JSON.parse(masked)),\n        )\n      } catch (error) {\n        // We can't show an actual error here because it may contain secrets\n        console.error('Failed to sanitize output')\n      }\n    }\n  return process.env.NODE_ENV === 'production'\n    ? {\n        error: log(LEVEL.error),\n        warn: log(LEVEL.warn),\n        info: log(LEVEL.info),\n        debug: log(LEVEL.debug),\n        log: log(LEVEL.log),\n      }\n    : console\n}\n","// Escape string to be safely used in RegExp constructor\n// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping\nconst escapeRegExp = (string: string): string => string.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&') // $& means the whole matched string\n\nexport type Pattern = RegExp | string\n\n// Need to make regex global to work with MatchAll\nconst patternToRegex = (pattern: Pattern): RegExp =>\n  pattern instanceof RegExp ? new RegExp(pattern.source, 'g') : new RegExp(escapeRegExp(pattern), 'g')\n\nconst matchIndexes = (regex: RegExp, input: string) =>\n  Array.from(input.matchAll(regex))\n    .filter((item) => item != null)\n    // Need to force types, because ts doesn't know it is exactly the match\n    .map((match) => [match.index as number, (match.index as number) + match[0].length])\n\nconst getMask = (length: number) => Array.from({ length }).fill('*').join('')\n\nconst maskFactory = (patterns: Pattern[]) => (message: string) =>\n  patterns\n    .map(patternToRegex)\n    .flatMap((regex) => matchIndexes(regex, message))\n    .reduce((acc, [start, end]) => acc.slice(0, start) + getMask(end - start) + acc.slice(end), message)\n\n// overload type definition to accept both types of call\nexport function maskString(pattern: Pattern[]): (input: string) => string\nexport function maskString(pattern: Pattern[], input: string): string\nexport function maskString(patterns: Pattern[], ...args: [] | [string]) {\n  if (args.length === 1) {\n    return maskFactory(patterns)(args[0])\n  }\n  return maskFactory(patterns)\n}\n"],"names":[],"version":3,"file":"index.cjs.map","sourceRoot":"../../../../"}

package/dist/index.d.ts

@@ -1,3 +1,6 @@
+export type Pattern = RegExp | string;
+export function maskString(pattern: Pattern[]): (input: string) => string;
+export function maskString(pattern: Pattern[], input: string): string;
 export type Logger = (...messages: unknown[]) => void;
 export type ServerLogger = {
     error: Logger;

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"mappings":"AAsBA,qBAAqB,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAA;AACrD,2BAA2B;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,OAAO,MAAM,+BAAgC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAG,YAwBrE,CAAA","sources":["packages/api/logger/src/src/serverLoggerFactory.ts","packages/api/logger/src/src/index.ts","packages/api/logger/src/index.ts"],"sourcesContent":[null,null,"export * from './serverLoggerFactory'\n"],"names":[],"version":3,"file":"index.d.ts.map","sourceRoot":"../../../../"}
+{"mappings":"AAIA,sBAAsB,MAAM,GAAG,MAAM,CAAA;AAqBrC,2BAA2B,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;AACzE,2BAA2B,OAAO,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;ACxBrE,qBAAqB,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAA;AAErD,2BAA2B;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;IACb,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAkBD,OAAO,MAAM,+BAAgC,MAAM,MAAM,GAAG,MAAM,CAAC,KAAG,YA8BrE,CAAA","sources":["packages/api/logger/src/src/maskString.ts","packages/api/logger/src/src/serverLoggerFactory.ts","packages/api/logger/src/src/index.ts","packages/api/logger/src/index.ts"],"sourcesContent":[null,null,null,"export * from './serverLoggerFactory'\nexport * from './maskString'\n"],"names":[],"version":3,"file":"index.d.ts.map","sourceRoot":"../../../../"}

package/dist/index.mjs

@@ -1,14 +1,33 @@
-import $2Az7d$darkobitsmaskstring from "@darkobits/mask-string";
-
 function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
 }
 var $3e685537995feb8a$exports = {};
 
 $parcel$export($3e685537995feb8a$exports, "serverLoggerFactory", () => $3e685537995feb8a$export$937ae38af6b48c0f);
+var $4b57be4bc5b1d261$exports = {};
+
+$parcel$export($4b57be4bc5b1d261$exports, "maskString", () => $4b57be4bc5b1d261$export$d03f901feec039d7);
+// Escape string to be safely used in RegExp constructor
+// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
+const $4b57be4bc5b1d261$var$escapeRegExp = (string)=>string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // $& means the whole matched string
+;
+// Need to make regex global to work with MatchAll
+const $4b57be4bc5b1d261$var$patternToRegex = (pattern)=>pattern instanceof RegExp ? new RegExp(pattern.source, "g") : new RegExp($4b57be4bc5b1d261$var$escapeRegExp(pattern), "g");
+const $4b57be4bc5b1d261$var$matchIndexes = (regex, input)=>Array.from(input.matchAll(regex)).filter((item)=>item != null)// Need to force types, because ts doesn't know it is exactly the match
+    .map((match)=>[
+            match.index,
+            match.index + match[0].length
+        ]);
+const $4b57be4bc5b1d261$var$getMask = (length)=>Array.from({
+        length: length
+    }).fill("*").join("");
+const $4b57be4bc5b1d261$var$maskFactory = (patterns)=>(message)=>patterns.map($4b57be4bc5b1d261$var$patternToRegex).flatMap((regex)=>$4b57be4bc5b1d261$var$matchIndexes(regex, message)).reduce((acc, [start, end])=>acc.slice(0, start) + $4b57be4bc5b1d261$var$getMask(end - start) + acc.slice(end), message);
+function $4b57be4bc5b1d261$export$d03f901feec039d7(patterns, ...args) {
+    if (args.length === 1) return $4b57be4bc5b1d261$var$maskFactory(patterns)(args[0]);
+    return $4b57be4bc5b1d261$var$maskFactory(patterns);
+}
+
 
-const $3e685537995feb8a$var$anyHex = new RegExp("0x[a-fA-F0-9]+", "ig");
-const $3e685537995feb8a$var$anyEthAddress = new RegExp("[a-zA-Z0-9.]+\\.eth", "ig");
 let $3e685537995feb8a$var$LEVEL;
 (function(LEVEL) {
     LEVEL["error"] = "error";
@@ -17,37 +36,42 @@ let $3e685537995feb8a$var$LEVEL;
     LEVEL["debug"] = "debug";
     LEVEL["log"] = "log";
 })($3e685537995feb8a$var$LEVEL || ($3e685537995feb8a$var$LEVEL = {}));
-const $3e685537995feb8a$var$stringify = (data)=>data instanceof Error ? JSON.stringify({
-        message: data.message,
-        stack: data.stack
-    }) : JSON.stringify(data);
+const $3e685537995feb8a$var$anyHex = new RegExp("0x[a-fA-F0-9]+");
+const $3e685537995feb8a$var$anyEthAddress = new RegExp("[a-zA-Z0-9.]+\\.eth");
+const $3e685537995feb8a$var$errorToObj = (error)=>Object.getOwnPropertyNames(error).reduce((acc, cur)=>({
+            ...acc,
+            [cur]: error[cur]
+        }), {});
+const $3e685537995feb8a$var$stringify = (data)=>JSON.stringify(data instanceof Error ? $3e685537995feb8a$var$errorToObj(data) : data);
 const $3e685537995feb8a$export$937ae38af6b48c0f = (secrets)=>{
     const patterns = [
         ...secrets,
         $3e685537995feb8a$var$anyHex,
         $3e685537995feb8a$var$anyEthAddress
     ].filter(Boolean);
-    // TODO: replace not with *** but with name of masked pattern e.g. https://example.com/{INFURA_KEY}
-    const mask = (message)=>(0, $2Az7d$darkobitsmaskstring)(patterns, message);
+    const mask = (0, $4b57be4bc5b1d261$export$d03f901feec039d7)(patterns);
     const log = (level)=>(...output)=>{
             try {
-                console[level](...output.map($3e685537995feb8a$var$stringify).map(mask));
+                console[level](// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                ...output.map($3e685537995feb8a$var$stringify).map(mask)// can't pass just JSON.parse because it takes second argument
+                .map((masked)=>JSON.parse(masked)));
             } catch (error) {
-                console.error(error);
-                console.warn("Failed to sanitize output");
+                // We can't show an actual error here because it may contain secrets
+                console.error("Failed to sanitize output");
             }
         };
     return process.env.NODE_ENV === "production" ? {
-        error: log($3e685537995feb8a$var$LEVEL.error),
-        warn: log($3e685537995feb8a$var$LEVEL.warn),
-        info: log($3e685537995feb8a$var$LEVEL.info),
-        debug: log($3e685537995feb8a$var$LEVEL.debug),
-        log: log($3e685537995feb8a$var$LEVEL.log)
+        error: log("error"),
+        warn: log("warn"),
+        info: log("info"),
+        debug: log("debug"),
+        log: log("log")
     } : console;
 };
 
 
 
 
-export {$3e685537995feb8a$export$937ae38af6b48c0f as serverLoggerFactory};
+
+export {$3e685537995feb8a$export$937ae38af6b48c0f as serverLoggerFactory, $4b57be4bc5b1d261$export$d03f901feec039d7 as maskString};
 //# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -1 +1 @@
-{"mappings":";;;;;;;;ACAA;AAEA,MAAM,+BAAS,IAAI,OAAO,kBAAkB;AAC5C,MAAM,sCAAgB,IAAI,OAAO,uBAAuB;IAExD;UAAK,KAAK;IAAL,MACH,WAAA;IADG,MAEH,UAAA;IAFG,MAGH,UAAA;IAHG,MAIH,WAAA;IAJG,MAKH,SAAA;GALG,gCAAA;AAQL,MAAM,kCAAY,CAAC,OACjB,gBAAgB,QAEZ,KAAK,SAAS,CAAC;QACb,SAAS,KAAK,OAAO;QACrB,OAAO,KAAK,KAAK;IACnB,KACA,KAAK,SAAS,CAAC,KAAK;AAWnB,MAAM,4CAAsB,CAAC,UAAkD;IACpF,MAAM,WAAW;WAAI;QAAS;QAAQ;KAAc,CAAC,MAAM,CAAC;IAC5D,mGAAmG;IACnG,MAAM,OAAO,CAAC,UAA4B,CAAA,GAAA,0BAAS,EAAE,UAAU;IAE/D,MAAM,MACJ,CAAC,QACD,CAAC,GAAG,SAA4B;YAC9B,IAAI;gBACF,OAAO,CAAC,MAAM,IAAI,OAAO,GAAG,CAAC,iCAAW,GAAG,CAAC;YAC9C,EAAE,OAAO,OAAO;gBACd,QAAQ,KAAK,CAAC;gBACd,QAAQ,IAAI,CAAC;YACf;QACF;IACF,OAAO,QAAQ,GAAG,CAAC,QAAQ,KAAK,eAC5B;QACE,OAAO,IAAI,4BAAM,KAAK;QACtB,MAAM,IAAI,4BAAM,IAAI;QACpB,MAAM,IAAI,4BAAM,IAAI;QACpB,OAAO,IAAI,4BAAM,KAAK;QACtB,KAAK,IAAI,4BAAM,GAAG;IACpB,IACA,OAAO;AACb;;ADvDA","sources":["packages/api/logger/src/index.ts","packages/api/logger/src/serverLoggerFactory.ts"],"sourcesContent":["export * from './serverLoggerFactory'\n","import maskString from '@darkobits/mask-string'\n\nconst anyHex = new RegExp('0x[a-fA-F0-9]+', 'ig')\nconst anyEthAddress = new RegExp('[a-zA-Z0-9.]+\\\\.eth', 'ig')\n\nenum LEVEL {\n  error = 'error',\n  warn = 'warn',\n  info = 'info',\n  debug = 'debug',\n  log = 'log',\n}\n\nconst stringify = (data: unknown) =>\n  data instanceof Error\n    ? // extract Error's non-enumerable props before stringifying\n      JSON.stringify({\n        message: data.message,\n        stack: data.stack,\n      })\n    : JSON.stringify(data)\n\nexport type Logger = (...messages: unknown[]) => void\nexport type ServerLogger = {\n  error: Logger\n  warn: Logger\n  info: Logger\n  debug: Logger\n  log: Logger\n}\n\nexport const serverLoggerFactory = (secrets: Array<RegExp | string>): ServerLogger => {\n  const patterns = [...secrets, anyHex, anyEthAddress].filter(Boolean)\n  // TODO: replace not with *** but with name of masked pattern e.g. https://example.com/{INFURA_KEY}\n  const mask = (message: string): string => maskString(patterns, message)\n\n  const log =\n    (level: LEVEL) =>\n    (...output: unknown[]): void => {\n      try {\n        console[level](...output.map(stringify).map(mask))\n      } catch (error) {\n        console.error(error)\n        console.warn('Failed to sanitize output')\n      }\n    }\n  return process.env.NODE_ENV === 'production'\n    ? {\n        error: log(LEVEL.error),\n        warn: log(LEVEL.warn),\n        info: log(LEVEL.info),\n        debug: log(LEVEL.debug),\n        log: log(LEVEL.log),\n      }\n    : console\n}\n"],"names":[],"version":3,"file":"index.mjs.map","sourceRoot":"../../../../"}
+{"mappings":";;;;;;;;;AEAA,wDAAwD;AACxD,6FAA6F;AAC7F,MAAM,qCAAe,CAAC,SAA2B,OAAO,OAAO,CAAC,uBAAuB,QAAQ,oCAAoC;;AAInI,kDAAkD;AAClD,MAAM,uCAAiB,CAAC,UACtB,mBAAmB,SAAS,IAAI,OAAO,QAAQ,MAAM,EAAE,OAAO,IAAI,OAAO,mCAAa,UAAU,IAAI;AAEtG,MAAM,qCAAe,CAAC,OAAe,QACnC,MAAM,IAAI,CAAC,MAAM,QAAQ,CAAC,QACvB,MAAM,CAAC,CAAC,OAAS,QAAQ,IAAI,CAC9B,uEAAuE;KACtE,GAAG,CAAC,CAAC,QAAU;YAAC,MAAM,KAAK;YAAa,MAAM,KAAK,GAAc,KAAK,CAAC,EAAE,CAAC,MAAM;SAAC;AAEtF,MAAM,gCAAU,CAAC,SAAmB,MAAM,IAAI,CAAC;gBAAE;IAAO,GAAG,IAAI,CAAC,KAAK,IAAI,CAAC;AAE1E,MAAM,oCAAc,CAAC,WAAwB,CAAC,UAC5C,SACG,GAAG,CAAC,sCACJ,OAAO,CAAC,CAAC,QAAU,mCAAa,OAAO,UACvC,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,GAAK,IAAI,KAAK,CAAC,GAAG,SAAS,8BAAQ,MAAM,SAAS,IAAI,KAAK,CAAC,MAAM;AAKzF,SAAS,0CAAW,QAAmB,EAAE,GAAG,IAAmB,EAAE;IACtE,IAAI,KAAK,MAAM,KAAK,GAClB,OAAO,kCAAY,UAAU,IAAI,CAAC,EAAE;IAEtC,OAAO,kCAAY;AACrB;;ADhCA;IAYA;UAAW,KAAK;IAAL,MACT,WAAA;IADS,MAET,UAAA;IAFS,MAGT,UAAA;IAHS,MAIT,WAAA;IAJS,MAKT,SAAA;GALS,gCAAA;AAQX,MAAM,+BAAS,IAAI,OAAO;AAC1B,MAAM,sCAAgB,IAAI,OAAO;AAEjC,MAAM,mCAAa,CAAkB,QACnC,OAAO,mBAAmB,CAAC,OAAO,MAAM,CAAC,CAAC,KAAK,MAAS,CAAA;YAAE,GAAG,GAAG;YAAE,CAAC,IAAI,EAAE,KAAK,CAAC,IAAe;QAAC,CAAA,GAAI,CAAC;AAEtG,MAAM,kCAAY,CAAC,OAAkB,KAAK,SAAS,CAAC,gBAAgB,QAAQ,iCAAW,QAAQ,IAAI;AAE5F,MAAM,4CAAsB,CAAC,UAAkD;IACpF,MAAM,WAAW;WAAI;QAAS;QAAQ;KAAc,CAAC,MAAM,CAAC;IAC5D,MAAM,OAAO,CAAA,GAAA,yCAAS,EAAE;IAExB,MAAM,MACJ,CAAC,QACD,CAAC,GAAG,SAA4B;YAC9B,IAAI;gBACF,OAAO,CAAC,MAAM,CACZ,iEAAiE;mBAC9D,OACA,GAAG,CAAC,iCACJ,GAAG,CAAC,KACL,8DAA8D;iBAC7D,GAAG,CAAC,CAAC,SAAoB,KAAK,KAAK,CAAC;YAE3C,EAAE,OAAO,OAAO;gBACd,oEAAoE;gBACpE,QAAQ,KAAK,CAAC;YAChB;QACF;IACF,OAAO,QAAQ,GAAG,CAAC,QAAQ,KAAK,eAC5B;QACE,OAAO,IAtCL;QAuCF,MAAM,IAtCL;QAuCD,MAAM,IAtCL;QAuCD,OAAO,IAtCL;QAuCF,KAAK,IAtCL;IAuCF,IACA,OAAO;AACb;;AD1DA","sources":["packages/api/logger/src/index.ts","packages/api/logger/src/serverLoggerFactory.ts","packages/api/logger/src/maskString.ts"],"sourcesContent":["export * from './serverLoggerFactory'\nexport * from './maskString'\n","import { maskString } from './maskString'\n\nexport type Logger = (...messages: unknown[]) => void\n\nexport type ServerLogger = {\n  error: Logger\n  warn: Logger\n  info: Logger\n  debug: Logger\n  log: Logger\n}\n\nconst enum LEVEL {\n  error = 'error',\n  warn = 'warn',\n  info = 'info',\n  debug = 'debug',\n  log = 'log',\n}\n\nconst anyHex = new RegExp('0x[a-fA-F0-9]+')\nconst anyEthAddress = new RegExp('[a-zA-Z0-9.]+\\\\.eth')\n\nconst errorToObj = <T extends Error>(error: T) =>\n  Object.getOwnPropertyNames(error).reduce((acc, cur) => ({ ...acc, [cur]: error[cur as keyof T] }), {})\n\nconst stringify = (data: unknown) => JSON.stringify(data instanceof Error ? errorToObj(data) : data)\n\nexport const serverLoggerFactory = (secrets: Array<RegExp | string>): ServerLogger => {\n  const patterns = [...secrets, anyHex, anyEthAddress].filter(Boolean)\n  const mask = maskString(patterns)\n\n  const log =\n    (level: LEVEL) =>\n    (...output: unknown[]): void => {\n      try {\n        console[level](\n          // eslint-disable-next-line @typescript-eslint/no-unsafe-argument\n          ...output\n            .map(stringify)\n            .map(mask)\n            // can't pass just JSON.parse because it takes second argument\n            .map((masked): unknown => JSON.parse(masked)),\n        )\n      } catch (error) {\n        // We can't show an actual error here because it may contain secrets\n        console.error('Failed to sanitize output')\n      }\n    }\n  return process.env.NODE_ENV === 'production'\n    ? {\n        error: log(LEVEL.error),\n        warn: log(LEVEL.warn),\n        info: log(LEVEL.info),\n        debug: log(LEVEL.debug),\n        log: log(LEVEL.log),\n      }\n    : console\n}\n","// Escape string to be safely used in RegExp constructor\n// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping\nconst escapeRegExp = (string: string): string => string.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\$&') // $& means the whole matched string\n\nexport type Pattern = RegExp | string\n\n// Need to make regex global to work with MatchAll\nconst patternToRegex = (pattern: Pattern): RegExp =>\n  pattern instanceof RegExp ? new RegExp(pattern.source, 'g') : new RegExp(escapeRegExp(pattern), 'g')\n\nconst matchIndexes = (regex: RegExp, input: string) =>\n  Array.from(input.matchAll(regex))\n    .filter((item) => item != null)\n    // Need to force types, because ts doesn't know it is exactly the match\n    .map((match) => [match.index as number, (match.index as number) + match[0].length])\n\nconst getMask = (length: number) => Array.from({ length }).fill('*').join('')\n\nconst maskFactory = (patterns: Pattern[]) => (message: string) =>\n  patterns\n    .map(patternToRegex)\n    .flatMap((regex) => matchIndexes(regex, message))\n    .reduce((acc, [start, end]) => acc.slice(0, start) + getMask(end - start) + acc.slice(end), message)\n\n// overload type definition to accept both types of call\nexport function maskString(pattern: Pattern[]): (input: string) => string\nexport function maskString(pattern: Pattern[], input: string): string\nexport function maskString(patterns: Pattern[], ...args: [] | [string]) {\n  if (args.length === 1) {\n    return maskFactory(patterns)(args[0])\n  }\n  return maskFactory(patterns)\n}\n"],"names":[],"version":3,"file":"index.mjs.map","sourceRoot":"../../../../"}

package/package.json

@@ -3,7 +3,7 @@
   "description": "API logger, which hides secrets",
   "repository": "git@github.com:lidofinance/warehouse.git",
   "license": "MIT",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "files": [
     "dist"
   ],
@@ -21,11 +21,8 @@
     "types": "tsc --noEmit",
     "test": "jest"
   },
-  "dependencies": {
-    "@darkobits/mask-string": "^2.0.1"
-  },
   "devDependencies": {
-    "@lidofinance/config-prettier": "~0.11.0",
+    "@lidofinance/config-prettier": "~0.12.0",
     "@types/jest": "^29.2.4",
     "@types/node": "^18.11.17",
     "jest": "^29.3.1",