Fix passing the error for a promise reject.

ltonetwork · Mar 10, 2023 · 2f8c4ff · 2f8c4ff
1 parent 62a3414
commit 2f8c4ff
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/src/listener.ts b/src/listener.ts
@@ -6,14 +6,18 @@ export default class Listener {
 
     constructor(private readonly methods: {[fn: string]: (...args: any[]) => any}) {}
 
+    private send(event: MessageEvent<RPCRequest>, resultOrPromise: any): void {
+        Promise.resolve(resultOrPromise)
+            .then(result => this.sendResult(event, result))
+            .catch(error => this.sendError(event, error));
+    }
+
     private sendResult(event: MessageEvent<RPCRequest>, result: any): void {
         const {channel, id} = event.data;
         const source: MessageTarget = (event.source as MessageTarget) || this.fallbackSource;
         const targetOrigin = event.origin && event.origin !== "null" ? event.origin : "*";
 
-        Promise.resolve(result).then(r => {
-            source.postMessage({'@rpc': RESPONSE_TYPE, channel, id, result: r}, targetOrigin);
-        });
+        source.postMessage({'@rpc': RESPONSE_TYPE, channel, id, result}, targetOrigin);
     }
 
     private sendError(event: MessageEvent<RPCRequest>, error: any): void {
@@ -39,8 +43,7 @@ export default class Listener {
             }
 
             try {
-                const response = this.methods[fn](...args);
-                this.sendResult(event, response);
+                this.send(event, this.methods[fn](...args));
             } catch (error) {
                 this.sendError(event, error);
             }

diff --git a/test/index.spec.ts b/test/index.spec.ts
@@ -5,7 +5,8 @@ import {connect, Listener} from "../src";
 type MathRPC = {
     add: (a: number, b: number) => Promise<number>;
     sub: (a: number, b: number) => Promise<number>;
-    err: () => Promise<void>;
+    err: () => Promise<never>;
+    reject: () => Promise<never>;
     unknown: () => Promise<never>;
 }
 
@@ -20,7 +21,8 @@ describe("simple-iframe-rpc", () => {
         client = new Listener({
             add: (a, b) => a + b,
             sub: (a, b) => Promise.resolve(a - b),
-            err: () => { throw new Error("Oops"); }
+            err: () => { throw new Error("Oops"); },
+            reject: () => Promise.reject("Denied"),
         });
         client.listen(child, "*");
     });
@@ -46,22 +48,22 @@ describe("simple-iframe-rpc", () => {
         assert.equal(result, 1);
     });
 
-    it("throws an error", async () => {
-        try {
-            await rpc.err();
-            assert.fail("No error was thrown");
-        } catch (e) {
-            assert.equal(e.message || e, 'Oops');
-        }
+    it("throws an error", () => {
+        rpc.err()
+            .then(() => assert.fail("No error was thrown"))
+            .catch(e => assert.equal(e.message, 'Oops'));
     });
 
-    it("throws an error if an undefined method is called", async () => {
-        try {
-            await rpc.unknown();
-            assert.fail("No error was thrown");
-        } catch (e) {
-            assert.equal(e.message || e, "RPC method 'unknown' is not defined");
-        }
+    it("throws an error for a rejected promise", () => {
+        rpc.reject()
+            .then(() => assert.fail("No error was thrown"))
+            .catch(e => assert.equal(e, 'Denied'));
+    });
+
+    it("throws an error if an undefined method is called", () => {
+        rpc.unknown()
+            .then(() => assert.fail("No error was thrown"))
+            .catch(e => assert.equal(e.message, "RPC method 'unknown' is not defined"));
     });
 
     it("gives a timeout when there's no response", async () => {