promise: emit error on domain unhandled rejections

PR-URL: #36082
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

Author: benjamingr

lib/internal/process/promises.js

@@ -117,7 +117,8 @@ function unhandledRejection(promise, reason) {
 maybeUnhandledPromises.set(promise,{
  reason,
 uid: ++lastPromiseId,
-warned: false
+warned: false,
+domain: process.domain
 });
 // This causes the promise to be referenced at least for one tick.
 pendingUnhandledRejections.push(promise);
@@ -192,26 +193,32 @@ function processPromiseRejections() {
 }
 promiseInfo.warned=true;
 const{ reason, uid }=promiseInfo;
+functionemit(reason,promise,promiseInfo){
+if(promiseInfo.domain){
+returnpromiseInfo.domain.emit('error',reason);
+}
+returnprocess.emit('unhandledRejection',reason,promise);
+}
 switch(unhandledRejectionsMode){
 casekStrictUnhandledRejections: {
 consterr=reasoninstanceofError ?
 reason : generateUnhandledRejectionError(reason);
 triggerUncaughtException(err,true/* fromPromise */);
-consthandled=process.emit('unhandledRejection',reason,promise);
+consthandled=emit(reason,promise,promiseInfo);
 if(!handled)emitUnhandledRejectionWarning(uid,reason);
 break;
 }
 casekIgnoreUnhandledRejections: {
-process.emit('unhandledRejection',reason,promise);
+emit(reason,promise,promiseInfo);
 break;
 }
 casekAlwaysWarnUnhandledRejections: {
-process.emit('unhandledRejection',reason,promise);
+emit(reason,promise,promiseInfo);
 emitUnhandledRejectionWarning(uid,reason);
 break;
 }
 casekThrowUnhandledRejections: {
-consthandled=process.emit('unhandledRejection',reason,promise);
+consthandled=emit(reason,promise,promiseInfo);
 if(!handled){
 consterr=reasoninstanceofError ?
 reason : generateUnhandledRejectionError(reason);
@@ -220,7 +227,7 @@ function processPromiseRejections() {
 break;
 }
 casekWarnWithErrorCodeUnhandledRejections: {
-consthandled=process.emit('unhandledRejection',reason,promise);
+consthandled=emit(reason,promise,promiseInfo);
 if(!handled){
 emitUnhandledRejectionWarning(uid,reason);
 process.exitCode=1;
@@ -266,10 +273,9 @@ function generateUnhandledRejectionError(reason) {
 functionlistenForRejections(){
 setPromiseRejectCallback(promiseRejectHandler);
 }
-
 module.exports={
  hasRejectionToWarn,
  setHasRejectionToWarn,
  listenForRejections,
- processPromiseRejections
+ processPromiseRejections,
 };

test/parallel/test-domain-promise.js

@@ -126,3 +126,13 @@ process.on('warning', common.mustNotCall());
 }));
 }));
 }
+{
+// Unhandled rejections become errors on the domain
+constd=domain.create();
+d.on('error',common.mustCall((e)=>{
+assert.strictEqual(e.message,'foo');
+}));
+d.run(common.mustCall(()=>{
+Promise.reject(newError('foo'));
+}));
+}

test/parallel/test-promises-unhandled-rejections.js

@@ -1,7 +1,6 @@
 'use strict';
 constcommon=require('../common');
 constassert=require('assert');
-constdomain=require('domain');
 const{ inspect }=require('util');
 
 common.disableCrashOnUnhandledRejection();
@@ -622,30 +621,6 @@ asyncTest('setImmediate + promise microtasks is too late to attach a catch' +
 });
 });
 
-asyncTest(
-'Promise unhandledRejection handler does not interfere with domain'+
-' error handlers being given exceptions thrown from nextTick.',
-function(done){
-constd=domain.create();
-letdomainReceivedError;
-d.on('error',function(e){
-domainReceivedError=e;
-});
-d.run(function(){
-conste=newError('error');
-constdomainError=newError('domain error');
-onUnhandledSucceed(done,function(reason,promise){
-assert.strictEqual(reason,e);
-assert.strictEqual(domainReceivedError,domainError);
-});
-Promise.reject(e);
-process.nextTick(function(){
-throwdomainError;
-});
-});
-}
-);
-
 asyncTest('nextTick is immediately scheduled when called inside an event'+
 ' handler',function(done){
 clean();