mynth-logger 2.1.2 → 2.1.4

package/dist/src/logging.js

@@ -5,11 +5,11 @@ import DiscordReporter from "./reporters/discord.js";
 const setupLogging = (config = {}) => {
     updateConfig(config);
     const consola = createConsola({ fancy: true, level: 5 });
-    if (process.env.NODE_ENV === "production")
-        consola.setReporters([DatadogReporter]);
     // Set Discord reporter as first so it can remove
     // Discord-related config before other reporters process the
     // log
+    if (process.env.NODE_ENV === "production")
+        consola.setReporters([DiscordReporter, DatadogReporter]);
     else
         consola.setReporters([DiscordReporter, ...consola.options.reporters]);
     consola.wrapConsole();

package/dist/src/redact.js

@@ -2,10 +2,6 @@ import { DeepRedact } from "@hackylabs/deep-redact/index.ts";
 import { validateMnemonic } from "@scure/bip39";
 import { wordlist } from "@scure/bip39/wordlists/english.js";
 const replacement = "[REDACTED]";
-const cloneRegex = (re) => {
-    const flags = re.flags.includes("g") ? re.flags : `${re.flags}g`;
-    return new RegExp(re.source, flags);
-};
 const sliceAround = (value, offset, matchLen, rule) => {
     const before = rule.before ?? 10;
     const after = rule.after ?? 0;
@@ -35,60 +31,54 @@ const getReplaceMeta = (args) => {
         return null;
     return { offset, whole };
 };
-const replaceAllMatchesWithContext = (value, pattern, replacement, allow) => {
-    const re = cloneRegex(pattern);
-    return value.replace(re, (...args) => {
-        const match = args[0];
-        if (typeof match !== "string")
-            return replacement;
-        const meta = getReplaceMeta(args);
-        if (!meta)
-            return replacement;
-        if (shouldAllowByRules(meta.whole, match, meta.offset, allow))
-            return match;
+const replaceAllMatchesWithContext = (value, pattern, replacement, allow) => value.replace(pattern, (...args) => {
+    const match = args[0];
+    if (typeof match !== "string")
         return replacement;
-    });
-};
+    const meta = getReplaceMeta(args);
+    if (!meta)
+        return replacement;
+    if (shouldAllowByRules(meta.whole, match, meta.offset, allow))
+        return match;
+    return replacement;
+});
 /**
  * BIP39 contextual replacer:
  * - Only redacts if the captured phrase validates as a BIP39 mnemonic
  * - Still supports allow-rules (to suppress redaction in “safe” contexts)
  */
-const replaceBip39MnemonicMatchesWithContext = (value, pattern, replacement, allow) => {
-    const re = cloneRegex(pattern);
-    return value.replace(re, (...args) => {
-        const match = args[0];
-        const phrase = args[1];
-        if (typeof match !== "string")
-            return replacement;
-        if (typeof phrase !== "string")
-            return match;
-        const meta = getReplaceMeta(args);
-        if (!meta)
-            return match;
-        if (shouldAllowByRules(meta.whole, match, meta.offset, allow))
-            return match;
-        const normalized = phrase.trim().toLowerCase().replace(/\s+/g, " ");
-        if (!validateMnemonic(normalized, wordlist))
-            return match;
-        return match.replace(phrase, replacement);
-    });
-};
+const replaceBip39MnemonicMatchesWithContext = (value, pattern, replacement, allow) => value.replace(pattern, (...args) => {
+    const match = args[0];
+    const phrase = args[1];
+    if (typeof match !== "string")
+        return replacement;
+    if (typeof phrase !== "string")
+        return match;
+    const meta = getReplaceMeta(args);
+    if (!meta)
+        return match;
+    if (shouldAllowByRules(meta.whole, match, meta.offset, allow))
+        return match;
+    const normalized = phrase.trim().toLowerCase().replace(/\s+/g, " ");
+    if (!validateMnemonic(normalized, wordlist))
+        return match;
+    return match.replace(phrase, replacement);
+});
 const createRedactor = (config = {}) => {
     const HEX_MIN_LEN = 16;
     const BASE64_MIN_BLOCKS = 4;
     const BASE58_MIN_LEN = 16;
-    const HEX = new RegExp(String.raw `(?<![a-fA-F0-9])(?:0x)?[a-fA-F0-9]{${HEX_MIN_LEN},}(?![a-fA-F0-9])`, "g");
+    const HEX = new RegExp(String.raw `(?<![a-fA-F0-9])(?:0x)?[a-fA-F0-9]{${HEX_MIN_LEN},}(?![a-fA-F0-9])`);
     const hexAllow = config.hex?.allow ?? [];
-    const BASE64 = new RegExp(String.raw `(?<![A-Za-z0-9+/=])(?:[A-Za-z0-9+/]{4}){${BASE64_MIN_BLOCKS},}(?:[A-Za-z0-9+/]{2,3})?(?:={0,2})(?![A-Za-z0-9+/=])`, "g");
+    const BASE64 = new RegExp(String.raw `(?<![A-Za-z0-9+/=])(?:[A-Za-z0-9+/]{4}){${BASE64_MIN_BLOCKS},}(?:[A-Za-z0-9+/]{2,3})?(?:={0,2})(?![A-Za-z0-9+/=])`);
     const base64Allow = config.base64?.allow ?? [];
-    const BASE64URL = new RegExp(String.raw `(?<![A-Za-z0-9\-_])[A-Za-z0-9\-_]{16,}(?:={0,2})?(?![A-Za-z0-9\-_])`, "g");
+    const BASE64URL = new RegExp(String.raw `(?<![A-Za-z0-9\-_])[A-Za-z0-9\-_]{16,}(?:={0,2})?(?![A-Za-z0-9\-_])`);
     const base64urlAllow = config.base64url?.allow ?? [];
-    const BASE58 = new RegExp(String.raw `(?<![1-9A-HJ-NP-Za-km-z])[1-9A-HJ-NP-Za-km-z]{${BASE58_MIN_LEN},}(?![1-9A-HJ-NP-Za-km-z])`, "g");
+    const BASE58 = new RegExp(String.raw `(?<![1-9A-HJ-NP-Za-km-z])[1-9A-HJ-NP-Za-km-z]{${BASE58_MIN_LEN},}(?![1-9A-HJ-NP-Za-km-z])`);
     const base58Allow = config.base58?.allow ?? [];
     const WORD = "[a-zA-Z]{2,8}";
     const PHRASE_12_TO_24 = `(?:${WORD}\\s+){11,23}${WORD}`;
-    const MNEMONIC = new RegExp(String.raw `(?<![A-Za-z])(${PHRASE_12_TO_24})(?![A-Za-z])`, "gi");
+    const MNEMONIC = new RegExp(String.raw `(?<![A-Za-z])(${PHRASE_12_TO_24})(?![A-Za-z])`, "i");
     const mnemonicAllow = config.mnemonic?.allow ?? [];
     const stringTests = [
         {

package/dist/tests/redact.test.js

@@ -11,4 +11,16 @@ describe("redact", () => {
         const result = redact("Should redact private key (b49bd63e67e2cd11aba17befead483934939df828cb833a846c58661726d3b00) and API key (djOqmjzVb0GAGdqS0p0NtiEwvb6u1lx509JEkpDJLgnvMhmOMtBc9vqolpktd1OK7Xas)");
         expect(result).toBe("Should redact private key ([REDACTED]) and API key ([REDACTED])");
     });
+    it("allows whitelist each time", () => {
+        const redact = createRedact({ hex: { allow: [{ re: /\b(event)\b/i }] } });
+        for (let i = 0; i < 10; i++) {
+            const result = redact("Pushed event fcc6533b59301096a973b8be3e6518f0cd13f73a9821de558cca77ac9b014d6e.1771865100000");
+            expect(result).toBe("Pushed event fcc6533b59301096a973b8be3e6518f0cd13f73a9821de558cca77ac9b014d6e.1771865100000");
+        }
+    });
+    it("redacts multiple hex in same string", () => {
+        const redact = createRedact({});
+        const result = redact("Pushed event fcc6533b59301096a973b8be3e6518f0cd13f73a9821de558cca77ac9b014d6e.1561338e25f9b57a9babc7ad57a0e0ee0b13a7094a895319883c7daf4a869642 with key d13821711360de832b80be20507912cebe123ebe52240ae91e6a699b72beb26a");
+        expect(result).toBe("Pushed event [REDACTED].[REDACTED] with key [REDACTED]");
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mynth-logger",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "Package to format logs for mynth microservices.",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",

package/src/logging.ts

@@ -8,11 +8,11 @@ const setupLogging = (config: RedactConfig = {}) => {
   updateConfig(config);
   const consola = createConsola({ fancy: true, level: 5 });
 
-  if (process.env.NODE_ENV === "production")
-    consola.setReporters([DatadogReporter]);
   // Set Discord reporter as first so it can remove
   // Discord-related config before other reporters process the
   // log
+  if (process.env.NODE_ENV === "production")
+    consola.setReporters([DiscordReporter, DatadogReporter]);
   else consola.setReporters([DiscordReporter, ...consola.options.reporters]);
 
   consola.wrapConsole();

package/src/redact.ts

@@ -44,11 +44,6 @@ type RedactConfig = {
 
 const replacement = "[REDACTED]";
 
-const cloneRegex = (re: RegExp): RegExp => {
-  const flags = re.flags.includes("g") ? re.flags : `${re.flags}g`;
-  return new RegExp(re.source, flags);
-};
-
 const sliceAround = (
   value: string,
   offset: number,
@@ -100,9 +95,8 @@ const replaceAllMatchesWithContext = (
   pattern: RegExp,
   replacement: string,
   allow?: ContextRule[],
-) => {
-  const re = cloneRegex(pattern);
-  return value.replace(re, (...args: unknown[]) => {
+) =>
+  value.replace(pattern, (...args: unknown[]) => {
     const match = args[0];
     if (typeof match !== "string") return replacement;
 
@@ -112,7 +106,6 @@ const replaceAllMatchesWithContext = (
     if (shouldAllowByRules(meta.whole, match, meta.offset, allow)) return match;
     return replacement;
   });
-};
 
 /**
  * BIP39 contextual replacer:
@@ -124,9 +117,8 @@ const replaceBip39MnemonicMatchesWithContext = (
   pattern: RegExp,
   replacement: string,
   allow?: ContextRule[],
-) => {
-  const re = cloneRegex(pattern);
-  return value.replace(re, (...args: unknown[]) => {
+) =>
+  value.replace(pattern, (...args: unknown[]) => {
     const match = args[0];
     const phrase = args[1];
 
@@ -143,7 +135,6 @@ const replaceBip39MnemonicMatchesWithContext = (
 
     return match.replace(phrase, replacement);
   });
-};
 
 const createRedactor = (config: RedactConfig = {}) => {
   const HEX_MIN_LEN = 16;
@@ -152,25 +143,21 @@ const createRedactor = (config: RedactConfig = {}) => {
 
   const HEX = new RegExp(
     String.raw`(?<![a-fA-F0-9])(?:0x)?[a-fA-F0-9]{${HEX_MIN_LEN},}(?![a-fA-F0-9])`,
-    "g",
   );
   const hexAllow: ContextRule[] = config.hex?.allow ?? [];
 
   const BASE64 = new RegExp(
     String.raw`(?<![A-Za-z0-9+/=])(?:[A-Za-z0-9+/]{4}){${BASE64_MIN_BLOCKS},}(?:[A-Za-z0-9+/]{2,3})?(?:={0,2})(?![A-Za-z0-9+/=])`,
-    "g",
   );
   const base64Allow = config.base64?.allow ?? [];
 
   const BASE64URL = new RegExp(
     String.raw`(?<![A-Za-z0-9\-_])[A-Za-z0-9\-_]{16,}(?:={0,2})?(?![A-Za-z0-9\-_])`,
-    "g",
   );
   const base64urlAllow = config.base64url?.allow ?? [];
 
   const BASE58 = new RegExp(
     String.raw`(?<![1-9A-HJ-NP-Za-km-z])[1-9A-HJ-NP-Za-km-z]{${BASE58_MIN_LEN},}(?![1-9A-HJ-NP-Za-km-z])`,
-    "g",
   );
   const base58Allow = config.base58?.allow ?? [];
 
@@ -178,7 +165,7 @@ const createRedactor = (config: RedactConfig = {}) => {
   const PHRASE_12_TO_24 = `(?:${WORD}\\s+){11,23}${WORD}`;
   const MNEMONIC = new RegExp(
     String.raw`(?<![A-Za-z])(${PHRASE_12_TO_24})(?![A-Za-z])`,
-    "gi",
+    "i",
   );
   const mnemonicAllow = config.mnemonic?.allow ?? [];
 

package/tests/redact.test.ts

@@ -19,4 +19,26 @@ describe("redact", () => {
       "Should redact private key ([REDACTED]) and API key ([REDACTED])",
     );
   });
+
+  it("allows whitelist each time", () => {
+    const redact = createRedact({ hex: { allow: [{ re: /\b(event)\b/i }] } });
+    for (let i = 0; i < 10; i++) {
+      const result = redact(
+        "Pushed event fcc6533b59301096a973b8be3e6518f0cd13f73a9821de558cca77ac9b014d6e.1771865100000",
+      );
+      expect(result).toBe(
+        "Pushed event fcc6533b59301096a973b8be3e6518f0cd13f73a9821de558cca77ac9b014d6e.1771865100000",
+      );
+    }
+  });
+
+  it("redacts multiple hex in same string", () => {
+    const redact = createRedact({});
+    const result = redact(
+      "Pushed event fcc6533b59301096a973b8be3e6518f0cd13f73a9821de558cca77ac9b014d6e.1561338e25f9b57a9babc7ad57a0e0ee0b13a7094a895319883c7daf4a869642 with key d13821711360de832b80be20507912cebe123ebe52240ae91e6a699b72beb26a",
+    );
+    expect(result).toBe(
+      "Pushed event [REDACTED].[REDACTED] with key [REDACTED]",
+    );
+  });
 });