open-rpc
diff --git a/‎src/RequestManager.test.ts‎
Lines changed: 22 additions & 0 deletions b/‎src/RequestManager.test.ts‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎src/RequestManager.ts‎
Lines changed: 18 additions & 4 deletions b/‎src/RequestManager.ts‎
Lines changed: 18 additions & 4 deletions
diff --git a/‎src/index.test.ts‎
Lines changed: 0 additions & 1 deletion b/‎src/index.test.ts‎
Lines changed: 0 additions & 1 deletion
@@ -39,4 +39,26 @@ describe("client-js", () => {
     c.request("foo", []);
   });
 
+  it("can send a request and error", () => {
+    const transport = new EventEmitterTransport("foo://unique-uri");
+    const c = new RequestManager([transport]);
+    transport.onData = (fn) => {
+      transport.connection.on("message", () => {
+        fn(JSON.stringify({
+          jsonrpc: "2.0",
+          id: 1,
+          error: {
+            code: 0,
+            message: "out of order",
+            data: {
+              foo: "bar",
+            },
+          },
+        }));
+      });
+    };
+    c.connect();
+    expect(c.request("foo", [])).rejects.toThrow();
+  });
+
 });
@@ -33,7 +33,10 @@ class RequestManager {
       const i = id++;
       // naively grab first transport and use it
       const transport = this.transports[0];
-      this.requests[i] = resolve;
+      this.requests[i] = {
+        resolve,
+        reject,
+      };
       transport.sendData(JSON.stringify({
         jsonrpc: "2.0",
         id: i,
@@ -49,12 +52,23 @@ class RequestManager {
   }
   private onData(data: string): void {
     const parsedData = JSON.parse(data);
-    if (typeof parsedData.result === "undefined") {
+    if (typeof parsedData.result === "undefined" && typeof parsedData.error === "undefined") {
       return;
     }
+    const req = this.requests[parsedData.id];
     // call request callback for id
-    if (this.requests[parsedData.id]) {
-      this.requests[parsedData.id](parsedData);
+    if (req) {
+      if (parsedData.error) {
+        req.reject(new Error(
+          [
+            `code: ${parsedData.error.code}`,
+            `message: ${parsedData.error.message}`,
+            `data: ${JSON.stringify(parsedData.error.data)}`,
+          ].join("\n"),
+        ));
+      } else {
+        req.resolve(parsedData);
+      }
       delete this.requests[parsedData.id];
     }
   }
 
@@ -10,7 +10,6 @@ describe("client-js", () => {
 
   it("has a request method that returns a promise", () => {
     const c = new Client(new RequestManager([new EventEmitterTransport("foo://unique")]));
-    console.log("test city before"); // tslint:disable-line
     expect(typeof c.request).toEqual("function");
     expect(typeof c.request("my_method", null).then).toEqual("function");
   });