clean

Author: bigfluffycookie

packages/server/shared/src/lib/logger/log-cleaner.ts

@@ -24,6 +24,10 @@ const SENSITIVE_FIELDS = [
   'passphrase',
 ];
 
+const SENSITIVE_FIELD_PATTERNS = SENSITIVE_FIELDS.map(
+  (field) => new RegExp(`"${field}"\\s*:\\s*"[^"]*"`, 'gi'),
+);
+
 const isSensitiveField = (key: string): boolean => {
   return SENSITIVE_FIELDS.includes(key.toLowerCase());
 };
@@ -67,9 +71,9 @@ const redactSensitiveDataInString = (
     return value;
   }
   let result = value;
-  SENSITIVE_FIELDS.forEach((field) => {
+  SENSITIVE_FIELDS.forEach((field, index) => {
     result = result.replace(
-      new RegExp(`"${field}"\\s*:\\s*"[^"]*"`, 'gi'),
+      SENSITIVE_FIELD_PATTERNS[index],
       `"${field}":"${REDACTED}"`,
     );
   });
@@ -173,9 +177,5 @@ function extractErrorFields(
 }
 
 function stringify(value: any) {
-  try {
-    return truncate(JSON.stringify(value));
-  } catch (error) {
-    return `Logger error - could not stringify object. ${error}`;
-  }
+  return truncate(JSON.stringify(value));
 }

packages/server/shared/test/log-cleaner.test.ts

@@ -129,10 +129,7 @@ describe('log-cleaner', () => {
 
     expect(result).toEqual({
       event: {
-        circularObject:
-          'Logger error - could not stringify object. TypeError: Converting circular structure to JSON\n' +
-          "    --> starting at object with constructor 'Object'\n" +
-          "    --- property 'circular' closes the circle",
+        circularObject: '{"key":"value","circular":"[Circular]"}',
       },
     });
   });
@@ -337,8 +334,8 @@ describe('log-cleaner', () => {
 
       const result = cleanLogEvent(logEvent);
 
-      expect(result.event.errorContext).toMatch(
-        /^Logger error - could not stringify object\./,
+      expect(result.event.errorContext).toBe(
+        '{"key":"value","circular":{"key":"value","circular":"[Circular]"}}',
       );
     });
 
@@ -361,8 +358,8 @@ describe('log-cleaner', () => {
 
       const result = cleanLogEvent(logEvent);
 
-      expect(result.event.errorParams).toMatch(
-        /^Logger error - could not stringify object\./,
+      expect(result.event.errorParams).toBe(
+        '{"message":"test","data":{"circular":"[Circular]"}}',
       );
     });