open-rpc
diff --git a/‎src/RequestManager.test.ts‎
Lines changed: 8 additions & 10 deletions b/‎src/RequestManager.test.ts‎
Lines changed: 8 additions & 10 deletions
diff --git a/‎src/RequestManager.ts‎
Lines changed: 15 additions & 15 deletions b/‎src/RequestManager.ts‎
Lines changed: 15 additions & 15 deletions
diff --git a/‎src/transports/EventEmitterTransport.ts‎
Lines changed: 4 additions & 0 deletions b/‎src/transports/EventEmitterTransport.ts‎
Lines changed: 4 additions & 0 deletions
@@ -3,6 +3,7 @@ import EventEmitterTransport from "./transports/EventEmitterTransport";
 import { EventEmitter } from "events";
 
 describe("client-js", () => {
+
   it("can be constructed", () => {
     const emitter = new EventEmitter();
     const transport = new EventEmitterTransport(emitter, "from1", "to1");
@@ -32,17 +33,15 @@ describe("client-js", () => {
     c.close();
   });
 
-  it("can send a request", (done) => {
+  it("can send a request", async () => {
     const emitter = new EventEmitter();
     const transport = new EventEmitterTransport(emitter, "from1", "to1");
     const serverTransport = new EventEmitterTransport(emitter, "to1", "from1");
     const c = new RequestManager([transport]);
-    c.connect().then(() => {
-      c.request("foo", []).then(() => {
-        done();
-      });
-      serverTransport.sendData(JSON.stringify({ id: 0, result: { foo: "foofoo" } }));
-    });
+    await c.connect();
+    const reqPromise = c.request("foo", []);
+    serverTransport.sendData(JSON.stringify({ id: 0, result: { foo: "foofoo" } }));
+    await expect(reqPromise).resolves.toEqual({ foo: "foofoo" });
   });
 
   it("can error on malformed response", (done) => {
@@ -63,9 +62,8 @@ describe("client-js", () => {
     const emitter = new EventEmitter();
     const transport = new EventEmitterTransport(emitter, "from1", "to1");
     const c = new RequestManager([transport]);
-    return c.connect().then(() => {
-      expect(() => c.stopBatch()).toThrow();
-    });
+    await c.connect();
+    expect(() => c.stopBatch()).toThrow();
   });
 
   it("can return errors on batch requests", (done) => {
 
@@ -46,27 +46,27 @@ class RequestManager {
 
   public connect(): Promise<any> {
     return Promise.all(this.transports.map(async (transport) => {
-      await transport.connect();
       transport.onData(this.onData.bind(this));
+      await transport.connect();
     }));
   }
 
   public async request(method: string, params: any): Promise<any> {
     const i = (++this.lastId).toString();
+
+    // naively grab first transport and use it
+    const transport = this.transports[0];
+
+    const payload: IJSONRPCRequest = {
+      jsonrpc: "2.0",
+      id: i,
+      method,
+      params,
+    };
+
     return new Promise((resolve, reject) => {
-      // naively grab first transport and use it
-      const transport = this.transports[0];
-      this.requests[i] = {
-        resolve,
-        reject,
-      };
-
-      const payload: IJSONRPCRequest = {
-        jsonrpc: "2.0",
-        id: i,
-        method,
-        params,
-      };
+      this.requests[i] = { resolve, reject };
+
       if (this.batchStarted) {
         this.batch.push(payload);
       } else {
@@ -124,7 +124,7 @@ class RequestManager {
       } else if (response.result) {
         promiseForResult.resolve(response.result);
       } else {
-        promiseForResult.reject(new Error(`Malformed JSON-RPC response object: ${response}`));
+        promiseForResult.reject(new Error(`Malformed JSON-RPC response object: ${JSON.stringify(response)}`));
       }
     });
   }
 
@@ -10,17 +10,21 @@ class EventEmitterTransport implements ITransport {
     this.reqUri = reqUri;
     this.resUri = resUri;
   }
+
   public connect(): Promise<any> {
     return Promise.resolve();
   }
+
   public onData(callback: (data: string) => any) {
     this.connection.on(this.reqUri, (data: any) => {
       callback(data);
     });
   }
+
   public sendData(data: string) {
     this.connection.emit(this.resUri, data);
   }
+
   public close() {
     this.connection.removeAllListeners();
   }
Original file line number	Diff line number	Diff line change
`@@ -10,17 +10,21 @@ class EventEmitterTransport implements ITransport {`
`10`	`10`	`this.reqUri = reqUri;`
`11`	`11`	`this.resUri = resUri;`
`12`	`12`	`}`
	`13`	`+`
`13`	`14`	`public connect(): Promise<any> {`
`14`	`15`	`return Promise.resolve();`
`15`	`16`	`}`
	`17`	`+`
`16`	`18`	`public onData(callback: (data: string) => any) {`
`17`	`19`	`this.connection.on(this.reqUri, (data: any) => {`
`18`	`20`	`callback(data);`
`19`	`21`	`});`
`20`	`22`	`}`
	`23`	`+`
`21`	`24`	`public sendData(data: string) {`
`22`	`25`	`this.connection.emit(this.resUri, data);`
`23`	`26`	`}`
	`27`	`+`
`24`	`28`	`public close() {`
`25`	`29`	`this.connection.removeAllListeners();`
`26`	`30`	`}`