async_hooks: ensure event after been emitted on runInAsyncScope

lib/async_hooks.js

@@ -22,6 +22,7 @@ const {
   executionAsyncId,
   triggerAsyncId,
   // Private API
+  hasAsyncIdStack,
   getHookArrays,
   enableHooks,
   disableHooks,
@@ -179,12 +180,16 @@ class AsyncResource {
     const asyncId = this[async_id_symbol];
     emitBefore(asyncId, this[trigger_async_id_symbol], this);
 
-    const ret = thisArg === undefined ?
-      fn(...args) :
-      ReflectApply(fn, thisArg, args);
+    try {
+      const ret = thisArg === undefined ?
+        fn(...args) :
+        ReflectApply(fn, thisArg, args);
 
-    emitAfter(asyncId);
-    return ret;
+      return ret;
+    } finally {
+      if (hasAsyncIdStack())
+        emitAfter(asyncId);
+    }
   }
 
   emitDestroy() {

test/parallel/test-async-hooks-run-in-async-scope-caught-exception.js

@@ -0,0 +1,9 @@
+'use strict';
+
+require('../common');
+const { AsyncResource } = require('async_hooks');
+
+try {
+  new AsyncResource('foo').runInAsyncScope(() => { throw new Error('bar'); });
+} catch {}
+// Should abort (fail the case) if async id is not matching.