@dxos/rpc 0.8.4-main.40e3dcdf1b → 0.8.4-main.422d1c7879

package/dist/lib/neutral/index.mjs

@@ -12,6 +12,7 @@ var decodeRpcError = (err, rpcMethod) => decodeError(err, {
 // src/rpc.ts
 import { Trigger, asyncTimeout, synchronized } from "@dxos/async";
 import { Stream } from "@dxos/codec-protobuf";
+import { ContextRpcCodec } from "@dxos/context";
 import { StackTrace as StackTrace2 } from "@dxos/debug";
 import { invariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
@@ -25,7 +26,7 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/rpc/src/rpc.ts";
-var DEFAULT_TIMEOUT = 3e3;
+var DEFAULT_TIMEOUT = 3e4;
 var BYE_SEND_TIMEOUT = 2e3;
 var DEBUG_CALLS = true;
 var CLOSE_TIMEOUT = 3e3;
@@ -81,7 +82,7 @@ var RpcPeer = class {
       } catch (err) {
         log.catch(err, void 0, {
           F: __dxlog_file,
-          L: 156,
+          L: 157,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -97,7 +98,7 @@ var RpcPeer = class {
       state: this._state
     }, {
       F: __dxlog_file,
-      L: 168,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -112,7 +113,7 @@ var RpcPeer = class {
         open: true
       }).catch((err) => log.warn(err, void 0, {
         F: __dxlog_file,
-        L: 177,
+        L: 178,
         S: this,
         C: (f, a) => f(...a)
       }));
@@ -129,7 +130,7 @@ var RpcPeer = class {
       state: this._state
     }, {
       F: __dxlog_file,
-      L: 191,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -159,7 +160,7 @@ var RpcPeer = class {
           err
         }, {
           F: __dxlog_file,
-          L: 213,
+          L: 214,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -167,7 +168,7 @@ var RpcPeer = class {
       try {
         log("closing waiting on bye", void 0, {
           F: __dxlog_file,
-          L: 216,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -179,7 +180,7 @@ var RpcPeer = class {
           err
         }, {
           F: __dxlog_file,
-          L: 219,
+          L: 220,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -223,7 +224,7 @@ var RpcPeer = class {
       type: Object.keys(decoded)[0]
     }, {
       F: __dxlog_file,
-      L: 263,
+      L: 264,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -231,7 +232,7 @@ var RpcPeer = class {
       if (this._state !== "OPENED" && this._state !== "OPENING") {
         log("received request while closed", void 0, {
           F: __dxlog_file,
-          L: 267,
+          L: 268,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -249,7 +250,7 @@ var RpcPeer = class {
           method: req.method
         }, {
           F: __dxlog_file,
-          L: 279,
+          L: 280,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -261,7 +262,7 @@ var RpcPeer = class {
             close: response.close
           }, {
             F: __dxlog_file,
-            L: 281,
+            L: 282,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -270,7 +271,7 @@ var RpcPeer = class {
           }).catch((err) => {
             log.warn("failed during close", err, {
               F: __dxlog_file,
-              L: 289,
+              L: 290,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -281,7 +282,7 @@ var RpcPeer = class {
           method: req.method
         }, {
           F: __dxlog_file,
-          L: 293,
+          L: 294,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -292,7 +293,7 @@ var RpcPeer = class {
           error: response.error
         }, {
           F: __dxlog_file,
-          L: 296,
+          L: 297,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -304,7 +305,7 @@ var RpcPeer = class {
       if (this._state !== "OPENED") {
         log("received response while closed", void 0, {
           F: __dxlog_file,
-          L: 305,
+          L: 306,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -313,7 +314,7 @@ var RpcPeer = class {
       const responseId = decoded.response.id;
       invariant(typeof responseId === "number", void 0, {
         F: __dxlog_file,
-        L: 310,
+        L: 311,
         S: this,
         A: [
           "typeof responseId === 'number'",
@@ -325,7 +326,7 @@ var RpcPeer = class {
           responseId
         }, {
           F: __dxlog_file,
-          L: 312,
+          L: 313,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -339,7 +340,7 @@ var RpcPeer = class {
         type_url: decoded.response.payload?.type_url
       }, {
         F: __dxlog_file,
-        L: 322,
+        L: 323,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -349,7 +350,7 @@ var RpcPeer = class {
         state: this._state
       }, {
         F: __dxlog_file,
-        L: 325,
+        L: 326,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -364,7 +365,7 @@ var RpcPeer = class {
         state: this._state
       }, {
         F: __dxlog_file,
-        L: 332,
+        L: 333,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -377,7 +378,7 @@ var RpcPeer = class {
       if (this._state !== "OPENED") {
         log("received stream close while closed", void 0, {
           F: __dxlog_file,
-          L: 341,
+          L: 342,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -387,13 +388,13 @@ var RpcPeer = class {
         id: decoded.streamClose.id
       }, {
         F: __dxlog_file,
-        L: 345,
+        L: 346,
         S: this,
         C: (f, a) => f(...a)
       });
       invariant(typeof decoded.streamClose.id === "number", void 0, {
         F: __dxlog_file,
-        L: 346,
+        L: 347,
         S: this,
         A: [
           "typeof decoded.streamClose.id === 'number'",
@@ -406,7 +407,7 @@ var RpcPeer = class {
           id: decoded.streamClose.id
         }, {
           F: __dxlog_file,
-          L: 349,
+          L: 350,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -419,7 +420,7 @@ var RpcPeer = class {
       if (this._state !== "CLOSING" && this._state !== "CLOSED") {
         log("replying to bye", void 0, {
           F: __dxlog_file,
-          L: 359,
+          L: 360,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -435,7 +436,7 @@ var RpcPeer = class {
         msg
       }, {
         F: __dxlog_file,
-        L: 367,
+        L: 368,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -451,7 +452,7 @@ var RpcPeer = class {
       method
     }, {
       F: __dxlog_file,
-      L: 377,
+      L: 378,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -462,12 +463,28 @@ var RpcPeer = class {
       const responseReceived = new Promise((resolve, reject) => {
         this._outgoingRequests.set(id, new PendingRpcRequest(resolve, reject, false));
       });
+      let traceContext;
+      try {
+        traceContext = options?.ctx ? ContextRpcCodec.encode(options.ctx) : void 0;
+      } catch (err) {
+        log.warn("failed to encode trace context", {
+          err
+        }, {
+          F: __dxlog_file,
+          L: 393,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
       const sending = this._sendMessage({
         request: {
           id,
           method,
           payload: request,
-          stream: false
+          stream: false,
+          ...traceContext ? {
+            traceContext
+          } : {}
         }
       });
       const timeout = options?.timeout ?? this._params.timeout;
@@ -479,7 +496,7 @@ var RpcPeer = class {
       response = await waiting;
       invariant(response.id === id, void 0, {
         F: __dxlog_file,
-        L: 405,
+        L: 414,
         S: this,
         A: [
           "response.id === id",
@@ -540,16 +557,38 @@ ${stack.getStack()}`;
         }
       };
       this._outgoingRequests.set(id, new PendingRpcRequest(onResponse, closeStream, true));
-      this._sendMessage({
-        request: {
-          id,
-          method,
-          payload: request,
-          stream: true
-        }
-      }).catch((err) => {
-        close(err);
-      });
+      let traceContext;
+      try {
+        traceContext = options?.ctx ? ContextRpcCodec.encode(options.ctx) : void 0;
+      } catch (err) {
+        log.warn("failed to encode trace context", {
+          err
+        }, {
+          F: __dxlog_file,
+          L: 476,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      try {
+        this._sendMessage({
+          request: {
+            id,
+            method,
+            payload: request,
+            stream: true,
+            ...traceContext ? {
+              traceContext
+            } : {}
+          }
+        }).catch((err) => {
+          this._outgoingRequests.delete(id);
+          close(err);
+        });
+      } catch (err) {
+        this._outgoingRequests.delete(id);
+        throw err;
+      }
       return () => {
         this._sendMessage({
           streamClose: {
@@ -558,7 +597,7 @@ ${stack.getStack()}`;
         }).catch((err) => {
           log.catch(err, void 0, {
             F: __dxlog_file,
-            L: 478,
+            L: 501,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -572,7 +611,7 @@ ${stack.getStack()}`;
       type: Object.keys(message)[0]
     }, {
       F: __dxlog_file,
-      L: 486,
+      L: 509,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -580,11 +619,38 @@ ${stack.getStack()}`;
       preserveAny: true
     }), timeout);
   }
+  _getHandlerRpcOptions(req) {
+    let traceCtx;
+    if (req.traceContext) {
+      try {
+        traceCtx = ContextRpcCodec.decode(req.traceContext);
+      } catch (err) {
+        log.warn("failed to decode trace context", {
+          traceContext: req.traceContext,
+          err
+        }, {
+          F: __dxlog_file,
+          L: 519,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    }
+    if (!traceCtx && !this._params.handlerRpcOptions) {
+      return void 0;
+    }
+    return {
+      ...this._params.handlerRpcOptions,
+      ...traceCtx ? {
+        ctx: traceCtx
+      } : {}
+    };
+  }
   async _callHandler(req) {
     try {
       invariant(typeof req.id === "number", void 0, {
         F: __dxlog_file,
-        L: 492,
+        L: 530,
         S: this,
         A: [
           "typeof req.id === 'number'",
@@ -593,7 +659,7 @@ ${stack.getStack()}`;
       });
       invariant(req.payload, void 0, {
         F: __dxlog_file,
-        L: 493,
+        L: 531,
         S: this,
         A: [
           "req.payload",
@@ -602,14 +668,14 @@ ${stack.getStack()}`;
       });
       invariant(req.method, void 0, {
         F: __dxlog_file,
-        L: 494,
+        L: 532,
         S: this,
         A: [
           "req.method",
           ""
         ]
       });
-      const response = await this._params.callHandler(req.method, req.payload, this._params.handlerRpcOptions);
+      const response = await this._params.callHandler(req.method, req.payload, this._getHandlerRpcOptions(req));
       return {
         id: req.id,
         payload: response
@@ -625,7 +691,7 @@ ${stack.getStack()}`;
     try {
       invariant(this._params.streamHandler, "Requests with streaming responses are not supported.", {
         F: __dxlog_file,
-        L: 511,
+        L: 549,
         S: this,
         A: [
           "this._params.streamHandler",
@@ -634,7 +700,7 @@ ${stack.getStack()}`;
       });
       invariant(typeof req.id === "number", void 0, {
         F: __dxlog_file,
-        L: 512,
+        L: 550,
         S: this,
         A: [
           "typeof req.id === 'number'",
@@ -643,7 +709,7 @@ ${stack.getStack()}`;
       });
       invariant(req.payload, void 0, {
         F: __dxlog_file,
-        L: 513,
+        L: 551,
         S: this,
         A: [
           "req.payload",
@@ -652,14 +718,14 @@ ${stack.getStack()}`;
       });
       invariant(req.method, void 0, {
         F: __dxlog_file,
-        L: 514,
+        L: 552,
         S: this,
         A: [
           "req.method",
           ""
         ]
       });
-      const responseStream = this._params.streamHandler(req.method, req.payload, this._params.handlerRpcOptions);
+      const responseStream = this._params.streamHandler(req.method, req.payload, this._getHandlerRpcOptions(req));
       responseStream.onReady(() => {
         callback({
           id: req.id,