fix: remove ev origin guard for postmessage + ignore non JSON-RPC mes…

…sages
open-rpc · Apr 8, 2021 · ef2dc2f · ef2dc2f
1 parent 7909cd9
commit ef2dc2f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 17 deletions.
diff --git a/src/transports/PostMessageIframeTransport.ts b/src/transports/PostMessageIframeTransport.ts
@@ -28,9 +28,6 @@ class PostMessageIframeTransport extends Transport {
     });
   }
   private messageHandler = (ev: MessageEvent) => {
-    if (ev.origin === window.origin) {
-      return;
-    }
     this.transportRequestManager.resolveResponse(JSON.stringify(ev.data));
   }
   public connect(): Promise<any> {

diff --git a/src/transports/PostMessageWindowTransport.ts b/src/transports/PostMessageWindowTransport.ts
@@ -36,9 +36,6 @@ class PostMessageTransport extends Transport {
   }
 
   private messageHandler = (ev: MessageEvent) => {
-    if (ev.origin === window.origin) {
-      return;
-    }
     this.transportRequestManager.resolveResponse(JSON.stringify(ev.data));
   }
 

diff --git a/src/transports/TransportRequestManager.test.ts b/src/transports/TransportRequestManager.test.ts
@@ -78,17 +78,9 @@ describe("Transport Request Manager", () => {
     transportReqMan.settlePendingRequest([request], new Error("rejecting"));
   });
 
-  it("should emit error on bad format for resolving a response", (done) => {
-    transportReqMan.transportEventChannel.on("error", (err) => {
-      expect(err.message).toContain("Bad response format");
-      done();
-    });
+  it("should not error on bad format for resolving a response", (done) => {
     transportReqMan.resolveResponse("{}");
-  });
-
-  it("should not emit error on bad format for resolving a response", () => {
-    const err = transportReqMan.resolveResponse("{}", false) as Error;
-    expect(err.message).toContain("Bad response format");
+    done();
   });
 
   it("should emit response on response && resolve response", (done) => {

diff --git a/src/transports/TransportRequestManager.ts b/src/transports/TransportRequestManager.ts
@@ -52,7 +52,7 @@ export class TransportRequestManager {
     try {
       data = JSON.parse(payload);
       if (this.checkJSONRPC(data) === false) {
-        throw new Error("Bad response format");
+        return; // ignore messages that are not conforming to JSON-RPC
       }
       if (data instanceof Array) {
         return this.resolveBatch(data, emitError);