@dxos/rpc 0.5.1-main.a6da07c → 0.5.1-main.ac072cc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/rpc",
-  "version": "0.5.1-main.a6da07c",
+  "version": "0.5.1-main.ac072cc",
   "description": "A lightweight, transport-agnostic RPC implementation",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,14 +16,14 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/async": "0.5.1-main.a6da07c",
-    "@dxos/debug": "0.5.1-main.a6da07c",
-    "@dxos/invariant": "0.5.1-main.a6da07c",
-    "@dxos/log": "0.5.1-main.a6da07c",
-    "@dxos/node-std": "0.5.1-main.a6da07c",
-    "@dxos/codec-protobuf": "0.5.1-main.a6da07c",
-    "@dxos/protocols": "0.5.1-main.a6da07c",
-    "@dxos/util": "0.5.1-main.a6da07c"
+    "@dxos/codec-protobuf": "0.5.1-main.ac072cc",
+    "@dxos/async": "0.5.1-main.ac072cc",
+    "@dxos/debug": "0.5.1-main.ac072cc",
+    "@dxos/invariant": "0.5.1-main.ac072cc",
+    "@dxos/log": "0.5.1-main.ac072cc",
+    "@dxos/protocols": "0.5.1-main.ac072cc",
+    "@dxos/util": "0.5.1-main.ac072cc",
+    "@dxos/node-std": "0.5.1-main.ac072cc"
   },
   "devDependencies": {
     "earljs": "~0.1.10",

package/src/rpc.ts

@@ -16,6 +16,8 @@ import { decodeRpcError } from './errors';
 const DEFAULT_TIMEOUT = 3_000;
 const BYE_SEND_TIMEOUT = 2_000;
 
+const DEBUG_CALLS = true;
+
 type MaybePromise<T> = Promise<T> | T;
 
 export interface RpcPeerOptions {
@@ -115,7 +117,7 @@ export class RpcPeer {
   private readonly _byeTrigger = new Trigger();
 
   private _nextId = 0;
-  private _state = RpcState.INITIAL;
+  private _state: RpcState = RpcState.INITIAL;
   private _unsubscribeFromPort: (() => void) | undefined = undefined;
   private _clearOpenInterval: (() => void) | undefined = undefined;
 
@@ -155,7 +157,7 @@ export class RpcPeer {
       return;
     }
 
-    log('sending open message');
+    log('sending open message', { state: this._state });
     await this._sendMessage({ open: true });
 
     if (this._state !== RpcState.OPENING) {
@@ -170,16 +172,15 @@ export class RpcPeer {
     await Promise.race([this._remoteOpenTrigger.wait(), this._closingTrigger.wait()]);
 
     this._clearOpenInterval?.();
-    this._state = RpcState.OPENED;
 
-    if (this._state !== RpcState.OPENED) {
+    if ((this._state as RpcState) !== RpcState.OPENED) {
       // Closed while opening.
       return; // TODO(dmaretskyi): Throw error?
     }
 
     // TODO(burdon): This seems error prone.
     // Send an "open" message in case the other peer has missed our first "open" message and is still waiting.
-    log('sending second open message');
+    log('sending second open message', { state: this._state });
     await this._sendMessage({ openAck: true });
   }
 
@@ -251,7 +252,7 @@ export class RpcPeer {
    */
   private async _receive(msg: Uint8Array): Promise<void> {
     const decoded = RpcMessage.decode(msg, { preserveAny: true });
-    log('received message', { type: Object.keys(decoded)[0] });
+    DEBUG_CALLS && log('received message', { type: Object.keys(decoded)[0] });
 
     if (decoded.request) {
       if (this._state !== RpcState.OPENED && this._state !== RpcState.OPENING) {
@@ -281,14 +282,14 @@ export class RpcPeer {
           });
         });
       } else {
-        log('request', { method: req.method });
+        DEBUG_CALLS && log('request', { method: req.method });
         const response = await this._callHandler(req);
-
-        log('sending response', {
-          method: req.method,
-          response: response.payload?.type_url,
-          error: response.error,
-        });
+        DEBUG_CALLS &&
+          log('sending response', {
+            method: req.method,
+            response: response.payload?.type_url,
+            error: response.error,
+          });
         await this._sendMessage({ response });
       }
     } else if (decoded.response) {
@@ -310,21 +311,22 @@ export class RpcPeer {
         this._outgoingRequests.delete(responseId);
       }
 
-      log('response', { type_url: decoded.response.payload?.type_url });
+      DEBUG_CALLS && log('response', { type_url: decoded.response.payload?.type_url });
       item.resolve(decoded.response);
     } else if (decoded.open) {
-      log('received open message');
+      log('received open message', { state: this._state });
       if (this._params.noHandshake) {
         return;
       }
 
       await this._sendMessage({ openAck: true });
     } else if (decoded.openAck) {
-      log('received openAck message');
+      log('received openAck message', { state: this._state });
       if (this._params.noHandshake) {
         return;
       }
 
+      this._state = RpcState.OPENED;
       this._remoteOpenTrigger.wake();
     } else if (decoded.streamClose) {
       if (this._state !== RpcState.OPENED) {
@@ -364,7 +366,7 @@ export class RpcPeer {
    * Peer should be open before making this call.
    */
   async call(method: string, request: Any, options?: RequestOptions): Promise<Any> {
-    log('calling', { method });
+    DEBUG_CALLS && log('calling', { method });
     throwIfNotOpen(this._state);
 
     let response: Response;
@@ -469,7 +471,7 @@ export class RpcPeer {
   }
 
   private async _sendMessage(message: RpcMessage, timeout?: number) {
-    log('sending message', { type: Object.keys(message)[0] });
+    DEBUG_CALLS && log('sending message', { type: Object.keys(message)[0] });
     await this._params.port.send(RpcMessage.encode(message, { preserveAny: true }), timeout);
   }