fix: quickjs reports errors when promises are used

Author: rot1024

src/index.test.ts

@@ -186,7 +186,7 @@ describe("evalCode", () => {
     expect(await promise).toBe("hoge!");
 
     arena.dispose();
-    // ctx.dispose(); // reports an error
+    ctx.dispose();
   });
 
   test("promise2", async () => {
@@ -198,15 +198,15 @@ describe("evalCode", () => {
       deferred.resolve = resolve;
     });
     const res = vi.fn();
-    arena.evalCode(`(p, r) => { p.then(d => r(d + "!")); }`)(promise, res);
+    arena.evalCode(`(p, r) => { p.then(d => { r(d + "!"); }); }`)(promise, res);
 
     deferred.resolve?.("hoge");
     await promise;
     expect(arena.executePendingJobs()).toBe(1);
     expect(res).toBeCalledWith("hoge!");
 
     arena.dispose();
-    // ctx.dispose(); // reports an error
+    ctx.dispose();
   });
 });
 

src/index.ts

@@ -305,7 +305,7 @@ export class Arena {
 
     let wrappedT = this._wrap(t);
     const [wrappedH] = this._wrapHandle(h);
-    const isPromise = wrappedT instanceof Promise;
+    const isPromise = t instanceof Promise;
     if (!wrappedH || (!wrappedT && !isPromise)) return; // t or h is not an object
     if (isPromise) wrappedT = t;
 

src/wrapper.test.ts

@@ -240,6 +240,13 @@ test("wrapHandle, unwrapHandle, isHandleWrapped", async () => {
   );
   expect(wrapped2 === wrapped).toBe(true);
 
+  // promise cannot be wrapped
+  const deferred = ctx.newPromise();
+  expect(isHandleWrapped(ctx, deferred.handle, proxyKeySymbolHandle)).toBe(
+    true
+  );
+
+  deferred.dispose();
   wrapped.dispose();
   handle.dispose();
   proxyKeySymbolHandle.dispose();

src/wrapper.ts

@@ -15,6 +15,7 @@ export function wrap<T = any>(
   marshal: (target: any) => [QuickJSHandle, boolean],
   syncMode?: (target: T) => SyncMode | undefined
 ): Wrapped<T> | undefined {
+  // promise cannot be wrapped
   if (!isObject(target) || target instanceof Promise) return undefined;
   if (isWrapped(target, proxyKeySymbol)) return target;
 
@@ -181,7 +182,8 @@ export function isHandleWrapped(
   return !!ctx.dump(
     call(
       ctx,
-      `(a, s) => (typeof a === "object" && a !== null || typeof a === "function") && !!a[s]`,
+      // promise cannot be wrapped
+      `(a, s) => (a instanceof Promise) || (typeof a === "object" && a !== null || typeof a === "function") && !!a[s]`,
       undefined,
       handle,
       key