events: define abort on prototype

benjamingr · danielleadams · commit ff59fcdf7bd3 · 2020-11-09T13:35:02.000-05:00
PR-URL: #35931 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
@@ -48,6 +48,8 @@ ObjectDefineProperties(AbortSignal.prototype, {
 aborted: { enumerable: true }
 });
 
+defineEventHandler(AbortSignal.prototype, 'abort');
+
 function abortSignal(signal) {
 if (signal[kAborted]) return;
 signal[kAborted] = true;
@@ -65,7 +67,6 @@ class AbortController {
 constructor() {
 this[kSignal] = new AbortSignal();
 emitExperimentalWarning('AbortController');
- defineEventHandler(this[kSignal], 'abort');
 }
 
 get signal() { return this[kSignal]; }
diff --git a/lib/internal/event_target.js b/lib/internal/event_target.js
@@ -4,17 +4,16 @@ const {
 ArrayFrom,
 Boolean,
 Error,
- Map,
 NumberIsInteger,
 ObjectAssign,
 ObjectDefineProperties,
 ObjectDefineProperty,
 ObjectGetOwnPropertyDescriptor,
+ SafeMap,
 String,
 Symbol,
 SymbolFor,
 SymbolToStringTag,
- SafeWeakMap,
 SafeWeakSet,
 } = primordials;
 
@@ -36,6 +35,7 @@ const kIsEventTarget = SymbolFor('nodejs.event_target');
 const kEvents = Symbol('kEvents');
 const kStop = Symbol('kStop');
 const kTarget = Symbol('kTarget');
+const kHandlers = Symbol('khandlers');
 
 const kHybridDispatch = SymbolFor('nodejs.internal.kHybridDispatch');
 const kCreateEvent = Symbol('kCreateEvent');
@@ -219,7 +219,7 @@ class Listener {
 }
 
 function initEventTarget(self) {
- self[kEvents] = new Map();
+ self[kEvents] = new SafeMap();
 }
 
 class EventTarget {
@@ -578,27 +578,24 @@ function emitUnhandledRejectionOrErr(that, err, event) {
 process.emit('error', err, event);
 }
 
-// A map of emitter -> map of name -> handler
-const eventHandlerValueMap = new SafeWeakMap();
-
 function defineEventHandler(emitter, name) {
 // 8.1.5.1 Event handlers - basically `on[eventName]` attributes
 ObjectDefineProperty(emitter, `on${name}`, {
 get() {
- return eventHandlerValueMap.get(this)?.get(name);
+ return this[kHandlers]?.get(name);
 },
 set(value) {
- const oldValue = eventHandlerValueMap.get(this)?.get(name);
+ const oldValue = this[kHandlers]?.get(name);
 if (oldValue) {
 this.removeEventListener(name, oldValue);
 }
 if (typeof value === 'function') {
 this.addEventListener(name, value);
 }
- if (!eventHandlerValueMap.has(this)) {
- eventHandlerValueMap.set(this, new Map());
+ if (!this[kHandlers]) {
+ this[kHandlers] = new SafeMap();
 }
- eventHandlerValueMap.get(this).set(name, value);
+ this[kHandlers].set(name, value);
 },
 configurable: true,
 enumerable: true
diff --git a/lib/internal/worker/io.js b/lib/internal/worker/io.js
@@ -146,8 +146,6 @@ ObjectDefineProperty(
 // This is called from inside the `MessagePort` constructor.
 function oninit() {
 initNodeEventTarget(this);
- defineEventHandler(this, 'message');
- defineEventHandler(this, 'messageerror');
 setupPortReferencing(this, this, 'message');
 }
 

-Original file line number
+Diff line change
 aborted: {enumerable: true}
 });
 +defineEventHandler(AbortSignal.prototype,'abort');
++
 functionabortSignal(signal){
 if(signal[kAborted])return;
 signal[kAborted]=true;
 constructor(){
 this[kSignal]=newAbortSignal();
 emitExperimentalWarning('AbortController');
 -defineEventHandler(this[kSignal],'abort');
+}
 getsignal(){returnthis[kSignal];}
-Original file line number
+Diff line change
  ArrayFrom,
  Boolean,
  Error,
 - Map,
  NumberIsInteger,
  ObjectAssign,
  ObjectDefineProperties,
  ObjectDefineProperty,
  ObjectGetOwnPropertyDescriptor,
 + SafeMap,
  String,
  Symbol,
  SymbolFor,
  SymbolToStringTag,
 - SafeWeakMap,
  SafeWeakSet,
 }=primordials;
 constkEvents=Symbol('kEvents');
 constkStop=Symbol('kStop');
 constkTarget=Symbol('kTarget');
 +constkHandlers=Symbol('khandlers');
 constkHybridDispatch=SymbolFor('nodejs.internal.kHybridDispatch');
 constkCreateEvent=Symbol('kCreateEvent');
+}
 functioninitEventTarget(self){
 -self[kEvents]=newMap();
 +self[kEvents]=newSafeMap();
+}
 classEventTarget{
 process.emit('error',err,event);
+}
 -// A map of emitter -> map of name -> handler
 -consteventHandlerValueMap=newSafeWeakMap();
+-
 functiondefineEventHandler(emitter,name){
 // 8.1.5.1 Event handlers - basically `on[eventName]` attributes
 ObjectDefineProperty(emitter,`on${name}`,{
 get(){
 -returneventHandlerValueMap.get(this)?.get(name);
 +returnthis[kHandlers]?.get(name);
 },
 set(value){
 -constoldValue=eventHandlerValueMap.get(this)?.get(name);
 +constoldValue=this[kHandlers]?.get(name);
 if(oldValue){
 this.removeEventListener(name,oldValue);
+}
 if(typeofvalue==='function'){
 this.addEventListener(name,value);
+}
 -if(!eventHandlerValueMap.has(this)){
 -eventHandlerValueMap.set(this,newMap());
 +if(!this[kHandlers]){
 +this[kHandlers]=newSafeMap();
+}
 -eventHandlerValueMap.get(this).set(name,value);
 +this[kHandlers].set(name,value);
 },
 configurable: true,
 enumerable: true
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,6 @@ ObjectDefineProperty(`
`146`	`146`	// This is called from inside the `MessagePort` constructor.
`147`	`147`	`functiononinit(){`
`148`	`148`	`initNodeEventTarget(this);`
`149`		`-defineEventHandler(this,'message');`
`150`		`-defineEventHandler(this,'messageerror');`
`151`	`149`	`setupPortReferencing(this,this,'message');`
`152`	`150`	`}`
`153`	`151`