Merge pull request #1420 from log4js-node/1417-typeerror-cannot-convert-object-to-primitive-value-in-cluster-mode

lamweili · web-flow · commit 4027fc798d8f · 2024-04-04T15:34:47.000+08:00
fix(LoggingEvent): serde for object with null prototype
diff --git a/lib/LoggingEvent.js b/lib/LoggingEvent.js
@@ -22,7 +22,11 @@ class SerDe {
 
   canSerialise(key) {
     if (typeof key === 'string') return false;
-    return key in this.serMap;
+    try {
+      return key in this.serMap;
+    } catch (e) {
+      return false;
+    }
   }
 
   serialise(key) {
diff --git a/test/tap/LoggingEvent-test.js b/test/tap/LoggingEvent-test.js
@@ -20,6 +20,8 @@ test('LoggingEvent', (batch) => {
   });
 
   batch.test('should serialise to flatted', (t) => {
+    const nullPrototype = Object.create(null);
+    nullPrototype.hello = 'world';
     const event = new LoggingEvent(
       'cheese',
       levels.DEBUG,
@@ -33,6 +35,7 @@ test('LoggingEvent', (batch) => {
         '-Infinity',
         undefined,
         'undefined',
+        nullPrototype,
       ],
       {
         user: 'bob',
@@ -44,7 +47,7 @@ test('LoggingEvent', (batch) => {
     t.equal(rehydratedEvent.startTime, '2018-02-04T18:30:23.010Z');
     t.equal(rehydratedEvent.categoryName, 'cheese');
     t.equal(rehydratedEvent.level.levelStr, 'DEBUG');
-    t.equal(rehydratedEvent.data.length, 9);
+    t.equal(rehydratedEvent.data.length, 10);
     t.equal(rehydratedEvent.data[0], 'log message');
     t.equal(rehydratedEvent.data[1], '__LOG4JS_NaN__');
     t.equal(rehydratedEvent.data[2], 'NaN');
@@ -54,6 +57,11 @@ test('LoggingEvent', (batch) => {
     t.equal(rehydratedEvent.data[6], '-Infinity');
     t.equal(rehydratedEvent.data[7], '__LOG4JS_undefined__');
     t.equal(rehydratedEvent.data[8], 'undefined');
+    t.equal(
+      Object.entries(rehydratedEvent.data[9]).length,
+      Object.entries(nullPrototype).length
+    );
+    t.equal(rehydratedEvent.data[9].hello, 'world');
     t.equal(rehydratedEvent.context.user, 'bob');
     t.end();
   });
