fixuP

Author: ronag

lib/events.js

@@ -87,6 +87,7 @@ const {
 
 const kCapture = Symbol('kCapture');
 const kErrorMonitor = Symbol('events.errorMonitor');
+const kShapeMode = Symbol('shapeMode');
 const kMaxEventTargetListeners = Symbol('events.maxEventTargetListeners');
 const kMaxEventTargetListenersWarned =
   Symbol('events.maxEventTargetListenersWarned');
@@ -344,6 +345,9 @@ EventEmitter.init = function(opts) {
       this._events === ObjectGetPrototypeOf(this)._events) {
     this._events = { __proto__: null };
     this._eventsCount = 0;
+    this[kShapeMode] = false;
+  } else {
+    this[kShapeMode] = true;
   }
 
   this._maxListeners = this._maxListeners || undefined;
@@ -686,10 +690,18 @@ EventEmitter.prototype.removeListener =
         return this;
 
       if (list === listener || list.listener === listener) {
-        if (--this._eventsCount === 0)
-          this._events = { __proto__: null };
-        else {
-          delete events[type];
+        if (--this._eventsCount === 0) {
+          if (this[kShapeMode]) {
+            events[type] = undefined;
+          } else {
+            this._events = { __proto__: null };
+          }
+        } else {
+          if (this[kShapeMode]) {
+            events[type] = undefined;
+          } else {
+            delete events[type];
+          }
           if (events.removeListener)
             this.emit('removeListener', type, list.listener || listener);
         }
@@ -741,7 +753,12 @@ EventEmitter.prototype.removeAllListeners =
 
       // Not listening for removeListener, no need to emit
       if (events.removeListener === undefined) {
-        if (arguments.length === 0) {
+        if (this[kShapeMode]) {
+          for (const key of Object.keys(this._events)) {
+            this._events[key] = undefined;
+          }
+          this._eventsCount = 0;
+        } else if (arguments.length === 0) {
           this._events = { __proto__: null };
           this._eventsCount = 0;
         } else if (events[type] !== undefined) {
@@ -760,8 +777,15 @@ EventEmitter.prototype.removeAllListeners =
           this.removeAllListeners(key);
         }
         this.removeAllListeners('removeListener');
-        this._events = { __proto__: null };
-        this._eventsCount = 0;
+        if (this[kShapeMode]) {
+          for (const key of Object.keys(this._events)) {
+            this._events[key] = undefined;
+          }
+          this._eventsCount = 0;
+        } else {
+          this._events = { __proto__: null };
+          this._eventsCount = 0;
+        }
         return this;
       }
 

lib/internal/streams/duplex.js

@@ -76,6 +76,8 @@ function Duplex(options) {
     readable: undefined,
     pipe: undefined,
     unpipe: undefined,
+    [destroyImpl.kConstruct]: undefined,
+    [destroyImpl.kDestroy]: undefined,
   };
 
   this._readableState = new Readable.ReadableState(options, this, true);

lib/internal/streams/readable.js

@@ -326,6 +326,8 @@ function Readable(options) {
     readable: undefined,
     pipe: undefined,
     unpipe: undefined,
+    [destroyImpl.kConstruct]: undefined,
+    [destroyImpl.kDestroy]: undefined,
   };
 
   this._readableState = new ReadableState(options, this, false);

lib/internal/streams/writable.js

@@ -388,6 +388,8 @@ function Writable(options) {
     prefinish: undefined,
     finish: undefined,
     drain: undefined,
+    [destroyImpl.kConstruct]: undefined,
+    [destroyImpl.kDestroy]: undefined,
   };
 
   this._writableState = new WritableState(options, this, false);