async_hooks: eliminate native PromiseHook

lib/domain.js

@@ -36,6 +36,7 @@ const {
   Error,
   FunctionPrototypeCall,
   ObjectDefineProperty,
+  Promise,
   ReflectApply,
   SafeMap,
   Symbol,
@@ -73,12 +74,16 @@ const asyncHook = createHook({
     if (process.domain !== null && process.domain !== undefined) {
       // If this operation is created while in a domain, let's mark it
       pairing.set(asyncId, process.domain[kWeak]);
-      ObjectDefineProperty(resource, 'domain', {
-        configurable: true,
-        enumerable: false,
-        value: process.domain,
-        writable: true
-      });
+      // Promises from other contexts, such as with the VM module, should not
+      // have a domain property as it can be used to escape the sandbox.
+      if (type !== 'PROMISE' || resource instanceof Promise) {
+        ObjectDefineProperty(resource, 'domain', {
+          configurable: true,
+          enumerable: false,
+          value: process.domain,
+          writable: true
+        });
+      }
     }
   },
   before(asyncId) {

lib/internal/async_hooks.js

@@ -52,7 +52,7 @@ const {
   clearAsyncIdStack,
 } = async_wrap;
 // For performance reasons, only track Promises when a hook is enabled.
-const { enablePromiseHook, disablePromiseHook, setPromiseHooks } = async_wrap;
+const { setPromiseHooks } = async_wrap;
 // Properties in active_hooks are used to keep track of the set of hooks being
 // executed in case another hook is enabled/disabled. The new set of hooks is
 // then restored once the active set of hooks is finished executing.
@@ -307,9 +307,13 @@ function trackPromise(promise, parent) {
     return;
   }
 
-  promise[async_id_symbol] = newAsyncId();
-  promise[trigger_async_id_symbol] = parent ? getOrSetAsyncId(parent) :
+  // Get trigger id from parent async id before making the async id of the
+  // child so if a new one must be made it will be lower than the child.
+  const triggerAsyncId = parent ? getOrSetAsyncId(parent) :
     getDefaultTriggerAsyncId();
+
+  promise[async_id_symbol] = newAsyncId();
+  promise[trigger_async_id_symbol] = triggerAsyncId;
 }
 
 function promiseInitHook(promise, parent) {
@@ -319,6 +323,21 @@ function promiseInitHook(promise, parent) {
   emitInitScript(asyncId, 'PROMISE', triggerAsyncId, promise);
 }
 
+function promiseInitHookWithDestroyTracking(promise, parent) {
+  promiseInitHook(promise, parent);
+  destroyTracking(promise, parent);
+}
+
+const destroyedSymbol = Symbol('destroyed');
+
+function destroyTracking(promise, parent) {
+  trackPromise(promise, parent);
+  const asyncId = promise[async_id_symbol];
+  const destroyed = { destroyed: false };
+  promise[destroyedSymbol] = destroyed;
+  registerDestroyHook(promise, asyncId, destroyed);
+}
+
 function promiseBeforeHook(promise) {
   trackPromise(promise);
   const asyncId = promise[async_id_symbol];
@@ -355,18 +374,19 @@ function enableHooks() {
 
 function updatePromiseHookMode() {
   wantPromiseHook = true;
-  if (destroyHooksExist()) {
-    enablePromiseHook();
-    setPromiseHooks(undefined, undefined, undefined, undefined);
-  } else {
-    disablePromiseHook();
-    setPromiseHooks(
-      initHooksExist() ? promiseInitHook : undefined,
-      promiseBeforeHook,
-      promiseAfterHook,
-      promiseResolveHooksExist() ? promiseResolveHook : undefined,
-    );
+  let initHook;
+  if (initHooksExist()) {
+    initHook = destroyHooksExist() ? promiseInitHookWithDestroyTracking :
+      promiseInitHook;
+  } else if (destroyHooksExist()) {
+    initHook = destroyTracking;
   }
+  setPromiseHooks(
+    initHook,
+    promiseBeforeHook,
+    promiseAfterHook,
+    promiseResolveHooksExist() ? promiseResolveHook : undefined,
+  );
 }
 
 function disableHooks() {
@@ -381,7 +401,6 @@ function disableHooks() {
 
 function disablePromiseHookIfNecessary() {
   if (!wantPromiseHook) {
-    disablePromiseHook();
     setPromiseHooks(undefined, undefined, undefined, undefined);
   }
 }

lib/internal/trace_events_async_hooks.js

@@ -32,6 +32,9 @@ const kEnabled = Symbol('enabled');
 const nativeProviders = new SafeSet(ObjectKeys(async_wrap.Providers));
 const typeMemory = new SafeMap();
 
+// Promises are not AsyncWrap resources so they should emit trace_events here.
+nativeProviders.delete('PROMISE');
+
 function createHook() {
   // In traceEvents it is not only the id but also the name that needs to be
   // repeated. Since async_hooks doesn't expose the provider type in the