fixup! fixup! event: simplify domain conditions

Author: Trott

lib/events.js

@@ -335,49 +335,49 @@ EventEmitter.prototype.emit = function emit(type, ...args) {
   } else if (!doError)
     return false;
 
-  const domain = this.domain;
-
   // If there is no 'error' event listener then throw.
   if (doError) {
     let er;
     if (args.length > 0)
       er = args[0];
-    if (domain) {
+    if (!this.domain) {
+      if (er instanceof Error) {
+        try {
+          const capture = {};
+          ErrorCaptureStackTrace(capture, EventEmitter.prototype.emit);
+          ObjectDefineProperty(er, kEnhanceStackBeforeInspector, {
+            value: enhanceStackTrace.bind(this, er, capture),
+            configurable: true
+          });
+        } catch {}
+
+        // Note: The comments on the `throw` lines are intentional, they show
+        // up in Node's output if this results in an unhandled exception.
+        throw er; // Unhandled 'error' event
+      } else {
+        let stringifiedEr;
+        const { inspect } = require('internal/util/inspect');
+        try {
+          stringifiedEr = inspect(er);
+        } catch {
+          stringifiedEr = er;
+        }
+
+        // At least give some kind of context to the user
+        const err = new ERR_UNHANDLED_ERROR(stringifiedEr);
+        err.context = er;
+        throw err; // Unhandled 'error' event
+      }
+    } else {
       if (!er) {
         er = new ERR_UNHANDLED_ERROR();
       }
       if (typeof er === 'object') {
         er.domainEmitter = this;
-        er.domain = domain;
+        er.domain = this.domain;
         er.domainThrown = false;
       }
-      domain.emit('error', er);
-    } else if (er instanceof Error) {
-      try {
-        const capture = {};
-        ErrorCaptureStackTrace(capture, EventEmitter.prototype.emit);
-        ObjectDefineProperty(er, kEnhanceStackBeforeInspector, {
-          value: enhanceStackTrace.bind(this, er, capture),
-          configurable: true
-        });
-      } catch {}
-
-      // Note: The comments on the `throw` lines are intentional, they show
-      // up in Node's output if this results in an unhandled exception.
-      throw er; // Unhandled 'error' event
-    } else {
-      let stringifiedEr;
-      const { inspect } = require('internal/util/inspect');
-      try {
-        stringifiedEr = inspect(er);
-      } catch {
-        stringifiedEr = er;
-      }
-
-      // At least give some kind of context to the user
-      const err = new ERR_UNHANDLED_ERROR(stringifiedEr);
-      err.context = er;
-      throw err; // Unhandled 'error' event
+      this.domain.emit('error', er);
     }
 
     return false;
@@ -389,8 +389,8 @@ EventEmitter.prototype.emit = function emit(type, ...args) {
     return false;
 
   let needDomainExit = false;
-  if (domain && this !== process) {
-    domain.enter();
+  if (this.domain && this !== process) {
+    this.domain.enter();
     needDomainExit = true;
   }
 
@@ -421,7 +421,7 @@ EventEmitter.prototype.emit = function emit(type, ...args) {
   }
 
   if (needDomainExit)
-    domain.exit();
+    this.domain.exit();
 
   return true;
 };

test/message/events_unhandled_error_common_trace.out

@@ -1,6 +1,6 @@
 node:events:*
-      throw er; // Unhandled 'error' event
-      ^
+        throw er; // Unhandled 'error' event
+        ^
 
 Error: foo:bar
     at bar (*events_unhandled_error_common_trace.js:*:*)

test/message/events_unhandled_error_nexttick.out

@@ -1,6 +1,6 @@
 node:events:*
-      throw er; // Unhandled 'error' event
-      ^
+        throw er; // Unhandled 'error' event
+        ^
 
 Error
     at Object.<anonymous> (*events_unhandled_error_nexttick.js:*:*)

test/message/events_unhandled_error_sameline.out

@@ -1,6 +1,6 @@
 node:events:*
-      throw er; // Unhandled 'error' event
-      ^
+        throw er; // Unhandled 'error' event
+        ^
 
 Error
     at Object.<anonymous> (*events_unhandled_error_sameline.js:*:*)

test/message/events_unhandled_error_subclass.out

@@ -1,6 +1,6 @@
 node:events:*
-      throw er; // Unhandled 'error' event
-      ^
+        throw er; // Unhandled 'error' event
+        ^
 
 Error
     at Object.<anonymous> (*events_unhandled_error_subclass.js:*:*)