Merge pull request #453 from felixfbecker/throw-scalar-bug

GoogleChromeLabs · Apr 27, 2020 · 05ca733 · 05ca733
2 parents cda7b24 + a88f600
commit 05ca733
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 20 deletions.
diff --git a/src/comlink.ts b/src/comlink.ts
@@ -25,7 +25,7 @@ export { Endpoint };
 export const proxyMarker = Symbol("Comlink.proxy");
 export const createEndpoint = Symbol("Comlink.endpoint");
 export const releaseProxy = Symbol("Comlink.releaseProxy");
-const throwSet = new WeakSet();
+const throwMarker = Symbol("Comlink.thrown");
 
 // prettier-ignore
 type Promisify<T> =
@@ -100,24 +100,23 @@ export const transferHandlers = new Map<string, TransferHandler>([
   [
     "throw",
     {
-      canHandle: obj => throwSet.has(obj),
-      serialize(obj) {
-        const isError = obj instanceof Error;
-        let serialized = obj;
+      canHandle: obj => typeof obj === "object" && throwMarker in obj,
+      serialize({ value }) {
+        const isError = value instanceof Error;
+        let serialized = { isError, value };
         if (isError) {
-          serialized = {
-            isError,
-            message: obj.message,
-            stack: obj.stack
+          serialized.value = {
+            message: value.message,
+            stack: value.stack
           };
         }
         return [serialized, []];
       },
-      deserialize(obj) {
-        if ((obj as any).isError) {
-          throw Object.assign(new Error(), obj);
+      deserialize(serialized) {
+        if (serialized.isError) {
+          throw Object.assign(new Error(), serialized.value);
         }
-        throw obj;
+        throw serialized.value;
       }
     }
   ]
@@ -173,14 +172,12 @@ export function expose(obj: any, ep: Endpoint = self as any) {
           }
           break;
       }
-    } catch (e) {
-      returnValue = e;
-      throwSet.add(e);
+    } catch (value) {
+      returnValue = { value, [throwMarker]: 0 };
     }
     Promise.resolve(returnValue)
-      .catch(e => {
-        throwSet.add(e);
-        return e;
+      .catch(value => {
+        return { value, [throwMarker]: 0 };
       })
       .then(returnValue => {
         const [wireValue, transferables] = toWireValue(returnValue);

diff --git a/tests/same_window.comlink.test.js b/tests/same_window.comlink.test.js
@@ -142,11 +142,26 @@ describe("Comlink in the same realm", function() {
       await thing();
       throw "Should have thrown";
     } catch (err) {
-      expect(err).to.not.eq("Should have thrown");
+      expect(err).to.not.equal("Should have thrown");
       expect(err.test).to.equal(true);
     }
   });
 
+  it("can rethrow scalars", async function() {
+    const thing = Comlink.wrap(this.port1);
+    Comlink.expose(_ => {
+      throw "oops";
+    }, this.port2);
+    try {
+      await thing();
+      throw "Should have thrown";
+    } catch (err) {
+      expect(err).to.not.equal("Should have thrown");
+      expect(err).to.equal("oops");
+      expect(typeof err).to.equal("string");
+    }
+  });
+
   it("can work with parameterized functions", async function() {
     const thing = Comlink.wrap(this.port1);
     Comlink.expose((a, b) => a + b, this.port2);