src: run the method getter in the saved frame

Signed-off-by: Nigro Simone <nigro.simone@gmail.com>

Author: nigrosimone

src/api/async_resource.cc

@@ -68,10 +68,15 @@ MaybeLocal<Value> AsyncResource::MakeCallback(Local<String> symbol,
   // Check can_call_into_js() first because calling Get() might do so.
   if (!env_->can_call_into_js()) return {};
   Local<Value> callback;
-  if (!get_resource()
-           ->Get(isolate->GetCurrentContext(), symbol)
-           .ToLocal(&callback)) {
-    return {};
+  {
+    // A getter runs in the saved frame too, so what it enters stays there.
+    async_context_frame::Scope async_context_frame_scope(
+        isolate, context_frame_.Get(isolate));
+    if (!get_resource()
+             ->Get(isolate->GetCurrentContext(), symbol)
+             .ToLocal(&callback)) {
+      return {};
+    }
   }
   if (!callback->IsFunction()) return Undefined(isolate);
   return MakeCallback(callback.As<Function>(), argc, argv);

test/addons/async-resource/test-async-local-storage.js

@@ -20,3 +20,25 @@ binding.callViaFunction(resource);
 binding.callViaString(resource);
 binding.callViaUtf8Name(resource);
 binding.destroyAsyncResource(resource);
+
+// A getter of the method runs in that frame too, and what it enters stays
+// there.
+{
+  let getterStore;
+  const object = Object.defineProperty({}, 'methöd', {
+    get: common.mustCall(() => {
+      getterStore = als.getStore();
+      als.enterWith('getter');
+      return common.mustCall();
+    }),
+  });
+  const resource =
+    als.run('resource', () => binding.createAsyncResource(object));
+  let callerStore;
+  als.run('caller', () => {
+    binding.callViaString(resource);
+    callerStore = als.getStore();
+  });
+  binding.destroyAsyncResource(resource);
+  assert.deepStrictEqual([getterStore, callerStore], ['resource', 'caller']);
+}