fix: onNotification not firing bug

open-rpc · Jul 17, 2020 · 0b62f9c · 0b62f9c
1 parent a638062
commit 0b62f9c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/RequestManager.ts b/src/RequestManager.ts
@@ -102,7 +102,7 @@ class RequestManager {
   }
 
   private handleNotification(data: any) {
-    this.requestChannel.emit(data);
+    this.requestChannel.emit("notification", data);
   }
 
 }

diff --git a/src/__mocks__/requestData.ts b/src/__mocks__/requestData.ts
@@ -3,7 +3,6 @@ import url from "url";
 
 export const generateMockNotificationRequest = (method: string, params: any[]): req.IJSONRPCNotification => {
   return {
-    id: null,
     jsonrpc: "2.0",
     method,
     params,

diff --git a/src/index.test.ts b/src/index.test.ts
@@ -30,8 +30,8 @@ describe("client-js", () => {
     const emitter = new EventEmitter();
     const c = new Client(new RequestManager([new EventEmitterTransport(emitter, "from1", "to1")]));
     addMockServerTransport(emitter, "from1", "to1://asdf/rpc-notification");
-    c.onNotification(done);
-    emitter.emit("to1", generateMockNotificationRequest("foo", ["bar"]));
+    c.onNotification(() => done());
+    emitter.emit("to1", JSON.stringify(generateMockNotificationRequest("foo", ["bar"])));
   });
 
   it("can register error and subscription handlers", () => {

diff --git a/src/transports/TransportRequestManager.ts b/src/transports/TransportRequestManager.ts
@@ -89,7 +89,7 @@ export class TransportRequestManager {
     if (data instanceof Array) {
       payload = data;
     }
-    return payload.every((datum) => (datum.result !== undefined || datum.error !== undefined));
+    return payload.every((datum) => (datum.result !== undefined || datum.error !== undefined || datum.method !== undefined));
   }
 
   private processResult(payload: any, prom: IRequestPromise) {