@dxos/rpc 0.5.1-next.ed1615e → 0.5.2-main.16cd857

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/rpc",
-  "version": "0.5.1-next.ed1615e",
+  "version": "0.5.2-main.16cd857",
   "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-next.ed1615e",
-    "@dxos/codec-protobuf": "0.5.1-next.ed1615e",
-    "@dxos/invariant": "0.5.1-next.ed1615e",
-    "@dxos/debug": "0.5.1-next.ed1615e",
-    "@dxos/log": "0.5.1-next.ed1615e",
-    "@dxos/node-std": "0.5.1-next.ed1615e",
-    "@dxos/protocols": "0.5.1-next.ed1615e",
-    "@dxos/util": "0.5.1-next.ed1615e"
+    "@dxos/codec-protobuf": "0.5.2-main.16cd857",
+    "@dxos/debug": "0.5.2-main.16cd857",
+    "@dxos/async": "0.5.2-main.16cd857",
+    "@dxos/invariant": "0.5.2-main.16cd857",
+    "@dxos/node-std": "0.5.2-main.16cd857",
+    "@dxos/util": "0.5.2-main.16cd857",
+    "@dxos/protocols": "0.5.2-main.16cd857",
+    "@dxos/log": "0.5.2-main.16cd857"
   },
   "devDependencies": {
     "earljs": "~0.1.10",

package/src/rpc.ts

@@ -28,13 +28,18 @@ export interface RpcPeerOptions {
    */
   timeout?: number;
 
-  callHandler: (method: string, request: Any) => MaybePromise<Any>;
-  streamHandler?: (method: string, request: Any) => Stream<Any>;
+  callHandler: (method: string, request: Any, options?: RequestOptions) => MaybePromise<Any>;
+  streamHandler?: (method: string, request: Any, options?: RequestOptions) => Stream<Any>;
 
   /**
    * Do not require or send handshake messages.
    */
   noHandshake?: boolean;
+
+  /**
+   * What options get passed to the `callHandler` and `streamHandler`.
+   */
+  handlerRpcOptions?: RequestOptions;
 }
 
 /**
@@ -388,7 +393,10 @@ export class RpcPeer {
       });
 
       // Wait until send completes or throws an error (or response throws a timeout), the resume waiting.
-      const waiting = asyncTimeout<any>(responseReceived, options?.timeout ?? this._params.timeout ?? DEFAULT_TIMEOUT);
+      const timeout = options?.timeout ?? this._params.timeout;
+      const waiting =
+        timeout === 0 ? responseReceived : asyncTimeout<any>(responseReceived, timeout ?? DEFAULT_TIMEOUT);
+
       await Promise.race([sending, waiting]);
       response = await waiting;
       invariant(response.id === id);
@@ -481,7 +489,7 @@ export class RpcPeer {
       invariant(req.payload);
       invariant(req.method);
 
-      const response = await this._params.callHandler(req.method, req.payload);
+      const response = await this._params.callHandler(req.method, req.payload, this._params.handlerRpcOptions);
       return {
         id: req.id,
         payload: response,
@@ -501,7 +509,7 @@ export class RpcPeer {
       invariant(req.payload);
       invariant(req.method);
 
-      const responseStream = this._params.streamHandler(req.method, req.payload);
+      const responseStream = this._params.streamHandler(req.method, req.payload, this._params.handlerRpcOptions);
       responseStream.onReady(() => {
         callback({
           id: req.id,

package/src/service.ts

@@ -103,22 +103,22 @@ export const createProtoRpcPeer = <Client = {}, Server = {}>({
   const peer = new RpcPeer({
     ...rest,
 
-    callHandler: (method, request) => {
+    callHandler: (method, request, options) => {
       const [serviceName, methodName] = parseMethodName(method);
       if (!exposedRpcs[serviceName]) {
         throw new Error(`Service not supported: ${serviceName}`);
       }
 
-      return exposedRpcs[serviceName].call(methodName, request);
+      return exposedRpcs[serviceName].call(methodName, request, options);
     },
 
-    streamHandler: (method, request) => {
+    streamHandler: (method, request, options) => {
       const [serviceName, methodName] = parseMethodName(method);
       if (!exposedRpcs[serviceName]) {
         throw new Error(`Service not supported: ${serviceName}`);
       }
 
-      return exposedRpcs[serviceName].callStream(methodName, request);
+      return exposedRpcs[serviceName].callStream(methodName, request, options);
     },
   });