@dxos/rpc 0.5.1-main.851eea2 → 0.5.1-main.85b05df

package/dist/lib/browser/meta.json

@@ -1 +1 @@
-{"inputs":{"inject-globals:@inject-globals":{"bytes":384,"imports":[{"path":"@dxos/node-std/inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/errors.ts":{"bytes":1482,"imports":[{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/rpc.ts":{"bytes":59849,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/rpc/src/errors.ts","kind":"import-statement","original":"./errors"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/service.ts":{"bytes":22257,"imports":[{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"packages/core/mesh/rpc/src/rpc.ts","kind":"import-statement","original":"./rpc"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/testing.ts":{"bytes":2972,"imports":[{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/trace.ts":{"bytes":3543,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/rpc","kind":"import-statement","external":true},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/index.ts":{"bytes":786,"imports":[{"path":"packages/core/mesh/rpc/src/rpc.ts","kind":"import-statement","original":"./rpc"},{"path":"packages/core/mesh/rpc/src/errors.ts","kind":"import-statement","original":"./errors"},{"path":"packages/core/mesh/rpc/src/service.ts","kind":"import-statement","original":"./service"},{"path":"packages/core/mesh/rpc/src/testing.ts","kind":"import-statement","original":"./testing"},{"path":"packages/core/mesh/rpc/src/trace.ts","kind":"import-statement","original":"./trace"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"}},"outputs":{"packages/core/mesh/rpc/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":41822},"packages/core/mesh/rpc/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/node-std/inject-globals","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/rpc","kind":"import-statement","external":true}],"exports":["PortTracer","ProtoRpcPeer","RpcPeer","createBundledRpcClient","createBundledRpcServer","createLinkedPorts","createProtoRpcPeer","createRpcClient","createRpcServer","createServiceBundle","decodeRpcError","parseMethodName"],"entryPoint":"packages/core/mesh/rpc/src/index.ts","inputs":{"inject-globals:@inject-globals":{"bytesInOutput":79},"packages/core/mesh/rpc/src/rpc.ts":{"bytesInOutput":17637},"packages/core/mesh/rpc/src/errors.ts":{"bytesInOutput":228},"packages/core/mesh/rpc/src/index.ts":{"bytesInOutput":0},"packages/core/mesh/rpc/src/service.ts":{"bytesInOutput":4206},"packages/core/mesh/rpc/src/testing.ts":{"bytesInOutput":528},"packages/core/mesh/rpc/src/trace.ts":{"bytesInOutput":732}},"bytes":23999}}}
+{"inputs":{"inject-globals:@inject-globals":{"bytes":384,"imports":[{"path":"@dxos/node-std/inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/errors.ts":{"bytes":1482,"imports":[{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/rpc.ts":{"bytes":61305,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"packages/core/mesh/rpc/src/errors.ts","kind":"import-statement","original":"./errors"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/service.ts":{"bytes":22389,"imports":[{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"packages/core/mesh/rpc/src/rpc.ts","kind":"import-statement","original":"./rpc"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/testing.ts":{"bytes":2972,"imports":[{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/trace.ts":{"bytes":3543,"imports":[{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/rpc","kind":"import-statement","external":true},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"},"packages/core/mesh/rpc/src/index.ts":{"bytes":786,"imports":[{"path":"packages/core/mesh/rpc/src/rpc.ts","kind":"import-statement","original":"./rpc"},{"path":"packages/core/mesh/rpc/src/errors.ts","kind":"import-statement","original":"./errors"},{"path":"packages/core/mesh/rpc/src/service.ts","kind":"import-statement","original":"./service"},{"path":"packages/core/mesh/rpc/src/testing.ts","kind":"import-statement","original":"./testing"},{"path":"packages/core/mesh/rpc/src/trace.ts","kind":"import-statement","original":"./trace"},{"path":"@inject-globals","kind":"import-statement","external":true}],"format":"esm"}},"outputs":{"packages/core/mesh/rpc/dist/lib/browser/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":42635},"packages/core/mesh/rpc/dist/lib/browser/index.mjs":{"imports":[{"path":"@dxos/node-std/inject-globals","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/codec-protobuf","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/log","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@dxos/debug","kind":"import-statement","external":true},{"path":"@dxos/protocols","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/async","kind":"import-statement","external":true},{"path":"@dxos/protocols/proto/dxos/rpc","kind":"import-statement","external":true}],"exports":["PortTracer","ProtoRpcPeer","RpcPeer","createBundledRpcClient","createBundledRpcServer","createLinkedPorts","createProtoRpcPeer","createRpcClient","createRpcServer","createServiceBundle","decodeRpcError","parseMethodName"],"entryPoint":"packages/core/mesh/rpc/src/index.ts","inputs":{"inject-globals:@inject-globals":{"bytesInOutput":79},"packages/core/mesh/rpc/src/rpc.ts":{"bytesInOutput":17929},"packages/core/mesh/rpc/src/errors.ts":{"bytesInOutput":228},"packages/core/mesh/rpc/src/index.ts":{"bytesInOutput":0},"packages/core/mesh/rpc/src/service.ts":{"bytesInOutput":4242},"packages/core/mesh/rpc/src/testing.ts":{"bytesInOutput":528},"packages/core/mesh/rpc/src/trace.ts":{"bytesInOutput":732}},"bytes":24327}}}

package/dist/lib/node/index.cjs

@@ -62,6 +62,7 @@ function _ts_decorate(decorators, target, key, desc) {
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/rpc/src/rpc.ts";
 var DEFAULT_TIMEOUT = 3e3;
 var BYE_SEND_TIMEOUT = 2e3;
+var DEBUG_CALLS = true;
 var CLOSE_TIMEOUT = 3e3;
 var PendingRpcRequest = class {
   constructor(resolve, reject, stream) {
@@ -112,7 +113,7 @@ var RpcPeer = class {
       } catch (err) {
         import_log.log.catch(err, void 0, {
           F: __dxlog_file,
-          L: 146,
+          L: 153,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -124,9 +125,11 @@ var RpcPeer = class {
       this._remoteOpenTrigger.wake();
       return;
     }
-    (0, import_log.log)("sending open message", void 0, {
+    (0, import_log.log)("sending open message", {
+      state: this._state
+    }, {
       F: __dxlog_file,
-      L: 158,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -141,7 +144,7 @@ var RpcPeer = class {
         open: true
       }).catch((err) => import_log.log.warn(err, void 0, {
         F: __dxlog_file,
-        L: 167,
+        L: 174,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -151,13 +154,14 @@ var RpcPeer = class {
       this._closingTrigger.wait()
     ]);
     this._clearOpenInterval?.();
-    this._state = "OPENED";
     if (this._state !== "OPENED") {
       return;
     }
-    (0, import_log.log)("sending second open message", void 0, {
+    (0, import_log.log)("sending second open message", {
+      state: this._state
+    }, {
       F: __dxlog_file,
-      L: 182,
+      L: 188,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -187,7 +191,7 @@ var RpcPeer = class {
           err
         }, {
           F: __dxlog_file,
-          L: 204,
+          L: 210,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -195,7 +199,7 @@ var RpcPeer = class {
       try {
         (0, import_log.log)("closing waiting on bye", void 0, {
           F: __dxlog_file,
-          L: 207,
+          L: 213,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -207,7 +211,7 @@ var RpcPeer = class {
           err
         }, {
           F: __dxlog_file,
-          L: 210,
+          L: 216,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -247,11 +251,11 @@ var RpcPeer = class {
     const decoded = RpcMessage.decode(msg, {
       preserveAny: true
     });
-    (0, import_log.log)("received message", {
+    DEBUG_CALLS && (0, import_log.log)("received message", {
       type: Object.keys(decoded)[0]
     }, {
       F: __dxlog_file,
-      L: 254,
+      L: 260,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -259,7 +263,7 @@ var RpcPeer = class {
       if (this._state !== "OPENED" && this._state !== "OPENING") {
         (0, import_log.log)("received request while closed", void 0, {
           F: __dxlog_file,
-          L: 258,
+          L: 264,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -277,7 +281,7 @@ var RpcPeer = class {
           method: req.method
         }, {
           F: __dxlog_file,
-          L: 270,
+          L: 276,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -289,7 +293,7 @@ var RpcPeer = class {
             close: response.close
           }, {
             F: __dxlog_file,
-            L: 272,
+            L: 278,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -298,29 +302,29 @@ var RpcPeer = class {
           }).catch((err) => {
             import_log.log.warn("failed during close", err, {
               F: __dxlog_file,
-              L: 280,
+              L: 286,
               S: this,
               C: (f, a) => f(...a)
             });
           });
         });
       } else {
-        (0, import_log.log)("request", {
+        DEBUG_CALLS && (0, import_log.log)("request", {
           method: req.method
         }, {
           F: __dxlog_file,
-          L: 284,
+          L: 290,
           S: this,
           C: (f, a) => f(...a)
         });
         const response = await this._callHandler(req);
-        (0, import_log.log)("sending response", {
+        DEBUG_CALLS && (0, import_log.log)("sending response", {
           method: req.method,
           response: response.payload?.type_url,
           error: response.error
         }, {
           F: __dxlog_file,
-          L: 287,
+          L: 293,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -332,7 +336,7 @@ var RpcPeer = class {
       if (this._state !== "OPENED") {
         (0, import_log.log)("received response while closed", void 0, {
           F: __dxlog_file,
-          L: 296,
+          L: 302,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -341,7 +345,7 @@ var RpcPeer = class {
       const responseId = decoded.response.id;
       (0, import_invariant.invariant)(typeof responseId === "number", void 0, {
         F: __dxlog_file,
-        L: 301,
+        L: 307,
         S: this,
         A: [
           "typeof responseId === 'number'",
@@ -353,7 +357,7 @@ var RpcPeer = class {
           responseId
         }, {
           F: __dxlog_file,
-          L: 303,
+          L: 309,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -363,19 +367,21 @@ var RpcPeer = class {
       if (!item.stream) {
         this._outgoingRequests.delete(responseId);
       }
-      (0, import_log.log)("response", {
+      DEBUG_CALLS && (0, import_log.log)("response", {
         type_url: decoded.response.payload?.type_url
       }, {
         F: __dxlog_file,
-        L: 313,
+        L: 319,
         S: this,
         C: (f, a) => f(...a)
       });
       item.resolve(decoded.response);
     } else if (decoded.open) {
-      (0, import_log.log)("received open message", void 0, {
+      (0, import_log.log)("received open message", {
+        state: this._state
+      }, {
         F: __dxlog_file,
-        L: 316,
+        L: 322,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -386,21 +392,24 @@ var RpcPeer = class {
         openAck: true
       });
     } else if (decoded.openAck) {
-      (0, import_log.log)("received openAck message", void 0, {
+      (0, import_log.log)("received openAck message", {
+        state: this._state
+      }, {
         F: __dxlog_file,
-        L: 323,
+        L: 329,
         S: this,
         C: (f, a) => f(...a)
       });
       if (this._params.noHandshake) {
         return;
       }
+      this._state = "OPENED";
       this._remoteOpenTrigger.wake();
     } else if (decoded.streamClose) {
       if (this._state !== "OPENED") {
         (0, import_log.log)("received stream close while closed", void 0, {
           F: __dxlog_file,
-          L: 331,
+          L: 338,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -410,13 +419,13 @@ var RpcPeer = class {
         id: decoded.streamClose.id
       }, {
         F: __dxlog_file,
-        L: 335,
+        L: 342,
         S: this,
         C: (f, a) => f(...a)
       });
       (0, import_invariant.invariant)(typeof decoded.streamClose.id === "number", void 0, {
         F: __dxlog_file,
-        L: 336,
+        L: 343,
         S: this,
         A: [
           "typeof decoded.streamClose.id === 'number'",
@@ -429,7 +438,7 @@ var RpcPeer = class {
           id: decoded.streamClose.id
         }, {
           F: __dxlog_file,
-          L: 339,
+          L: 346,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -442,7 +451,7 @@ var RpcPeer = class {
       if (this._state !== "CLOSING" && this._state !== "CLOSED") {
         (0, import_log.log)("replying to bye", void 0, {
           F: __dxlog_file,
-          L: 349,
+          L: 356,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -458,7 +467,7 @@ var RpcPeer = class {
         msg
       }, {
         F: __dxlog_file,
-        L: 357,
+        L: 364,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -470,11 +479,11 @@ var RpcPeer = class {
   * Peer should be open before making this call.
   */
   async call(method, request, options) {
-    (0, import_log.log)("calling", {
+    DEBUG_CALLS && (0, import_log.log)("calling", {
       method
     }, {
       F: __dxlog_file,
-      L: 367,
+      L: 374,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -501,7 +510,7 @@ var RpcPeer = class {
       response = await waiting;
       (0, import_invariant.invariant)(response.id === id, void 0, {
         F: __dxlog_file,
-        L: 392,
+        L: 399,
         S: this,
         A: [
           "response.id === id",
@@ -580,7 +589,7 @@ ${stack.getStack()}`;
         }).catch((err) => {
           import_log.log.catch(err, void 0, {
             F: __dxlog_file,
-            L: 465,
+            L: 472,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -589,11 +598,11 @@ ${stack.getStack()}`;
     });
   }
   async _sendMessage(message, timeout) {
-    (0, import_log.log)("sending message", {
+    DEBUG_CALLS && (0, import_log.log)("sending message", {
       type: Object.keys(message)[0]
     }, {
       F: __dxlog_file,
-      L: 472,
+      L: 479,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -605,7 +614,7 @@ ${stack.getStack()}`;
     try {
       (0, import_invariant.invariant)(typeof req.id === "number", void 0, {
         F: __dxlog_file,
-        L: 478,
+        L: 485,
         S: this,
         A: [
           "typeof req.id === 'number'",
@@ -614,7 +623,7 @@ ${stack.getStack()}`;
       });
       (0, import_invariant.invariant)(req.payload, void 0, {
         F: __dxlog_file,
-        L: 479,
+        L: 486,
         S: this,
         A: [
           "req.payload",
@@ -623,14 +632,14 @@ ${stack.getStack()}`;
       });
       (0, import_invariant.invariant)(req.method, void 0, {
         F: __dxlog_file,
-        L: 480,
+        L: 487,
         S: this,
         A: [
           "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
@@ -646,7 +655,7 @@ ${stack.getStack()}`;
     try {
       (0, import_invariant.invariant)(this._params.streamHandler, "Requests with streaming responses are not supported.", {
         F: __dxlog_file,
-        L: 497,
+        L: 504,
         S: this,
         A: [
           "this._params.streamHandler",
@@ -655,7 +664,7 @@ ${stack.getStack()}`;
       });
       (0, import_invariant.invariant)(typeof req.id === "number", void 0, {
         F: __dxlog_file,
-        L: 498,
+        L: 505,
         S: this,
         A: [
           "typeof req.id === 'number'",
@@ -664,7 +673,7 @@ ${stack.getStack()}`;
       });
       (0, import_invariant.invariant)(req.payload, void 0, {
         F: __dxlog_file,
-        L: 499,
+        L: 506,
         S: this,
         A: [
           "req.payload",
@@ -673,14 +682,14 @@ ${stack.getStack()}`;
       });
       (0, import_invariant.invariant)(req.method, void 0, {
         F: __dxlog_file,
-        L: 500,
+        L: 507,
         S: this,
         A: [
           "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,
@@ -767,19 +776,19 @@ var createProtoRpcPeer = ({ requested, exposed, handlers, encodingOptions, ...re
   }
   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);
     }
   });
   const requestedRpcs = {};