@dxos/rpc 0.8.4-staging.ac66bdf99f → 0.9.0

package/LICENSE

@@ -1,8 +1,105 @@
-MIT License 
-Copyright (c) 2022 DXOS
+# Functional Source License, Version 1.1, ALv2 Future License
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+## Abbreviation
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+FSL-1.1-Apache-2.0
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+## Notice
+
+Copyright 2026 DXOS
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/dist/lib/neutral/index.mjs

@@ -19,13 +19,13 @@ import { log } from "@dxos/log";
 import { RpcClosedError, RpcNotOpenError, encodeError } from "@dxos/protocols";
 import { schema } from "@dxos/protocols/proto";
 import { exponentialBackoffInterval } from "@dxos/util";
+var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/rpc/src/rpc.ts";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   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 = 3e4;
 var BYE_SEND_TIMEOUT = 2e3;
 var DEBUG_CALLS = true;
@@ -80,12 +80,7 @@ var RpcPeer = class {
       try {
         await this._receive(msg);
       } catch (err) {
-        log.catch(err, void 0, {
-          F: __dxlog_file,
-          L: 157,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 100, S: this });
       }
     });
     this._state = "OPENING";
@@ -96,12 +91,7 @@ var RpcPeer = class {
     }
     log("sending open message", {
       state: this._state
-    }, {
-      F: __dxlog_file,
-      L: 169,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 109, S: this });
     await this._sendMessage({
       open: true
     });
@@ -111,12 +101,7 @@ var RpcPeer = class {
     this._clearOpenInterval = exponentialBackoffInterval(() => {
       void this._sendMessage({
         open: true
-      }).catch((err) => log.warn(err, void 0, {
-        F: __dxlog_file,
-        L: 178,
-        S: this,
-        C: (f, a) => f(...a)
-      }));
+      }).catch((err) => log.warn(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 122, S: this }));
     }, 50);
     await Promise.race([
       this._remoteOpenTrigger.wait(),
@@ -128,12 +113,7 @@ var RpcPeer = class {
     }
     log("resending open message", {
       state: this._state
-    }, {
-      F: __dxlog_file,
-      L: 192,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 135, S: this });
     await this._sendMessage({
       openAck: true
     });
@@ -158,32 +138,17 @@ var RpcPeer = class {
       } catch (err) {
         log("error closing peer, sending bye", {
           err
-        }, {
-          F: __dxlog_file,
-          L: 214,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 159, S: this });
       }
       try {
-        log("closing waiting on bye", void 0, {
-          F: __dxlog_file,
-          L: 217,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log("closing waiting on bye", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 164, S: this });
         await this._byeTrigger.wait({
           timeout
         });
       } catch (err) {
         log("error closing peer", {
           err
-        }, {
-          F: __dxlog_file,
-          L: 220,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 169, S: this });
         return;
       }
     }
@@ -220,22 +185,12 @@ var RpcPeer = class {
     const decoded = getRpcMessageCodec().decode(msg, {
       preserveAny: true
     });
-    DEBUG_CALLS && log("received message", {
+    DEBUG_CALLS && log.trace("received message", {
       type: Object.keys(decoded)[0]
-    }, {
-      F: __dxlog_file,
-      L: 264,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 208, S: this });
     if (decoded.request) {
       if (this._state !== "OPENED" && this._state !== "OPENING") {
-        log("received request while closed", void 0, {
-          F: __dxlog_file,
-          L: 268,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log("received request while closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 213, S: this });
         await this._sendMessage({
           response: {
             id: decoded.request.id,
@@ -248,112 +203,59 @@ var RpcPeer = class {
       if (req.stream) {
         log("stream request", {
           method: req.method
-        }, {
-          F: __dxlog_file,
-          L: 280,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 224, S: this });
         this._callStreamHandler(req, (response) => {
-          log("sending stream response", {
+          log.trace("sending stream response", {
             method: req.method,
             response: response.payload?.type_url,
             error: response.error,
             close: response.close
-          }, {
-            F: __dxlog_file,
-            L: 282,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 228, S: this });
           void this._sendMessage({
             response
           }).catch((err) => {
-            log.warn("failed during close", err, {
-              F: __dxlog_file,
-              L: 290,
-              S: this,
-              C: (f, a) => f(...a)
-            });
+            log.warn("failed during close", err, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 237, S: this });
           });
         });
       } else {
-        DEBUG_CALLS && log("requesting...", {
+        DEBUG_CALLS && log.trace("requesting...", {
           method: req.method
-        }, {
-          F: __dxlog_file,
-          L: 294,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 241, S: this });
         const response = await this._callHandler(req);
-        DEBUG_CALLS && log("sending response", {
+        DEBUG_CALLS && log.trace("sending response", {
           method: req.method,
           response: response.payload?.type_url,
           error: response.error
-        }, {
-          F: __dxlog_file,
-          L: 297,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 245, S: this });
         await this._sendMessage({
           response
         });
       }
     } else if (decoded.response) {
       if (this._state !== "OPENED") {
-        log("received response while closed", void 0, {
-          F: __dxlog_file,
-          L: 306,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log("received response while closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 256, S: this });
         return;
       }
       const responseId = decoded.response.id;
-      invariant(typeof responseId === "number", void 0, {
-        F: __dxlog_file,
-        L: 311,
-        S: this,
-        A: [
-          "typeof responseId === 'number'",
-          ""
-        ]
-      });
+      invariant(typeof responseId === "number", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 260, S: this, A: ["typeof responseId === 'number'", ""] });
       if (!this._outgoingRequests.has(responseId)) {
-        log("received response with invalid id", {
+        log.trace("received response with invalid id", {
           responseId
-        }, {
-          F: __dxlog_file,
-          L: 313,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 262, S: this });
         return;
       }
       const item = this._outgoingRequests.get(responseId);
       if (!item.stream) {
         this._outgoingRequests.delete(responseId);
       }
-      DEBUG_CALLS && log("response", {
+      DEBUG_CALLS && log.trace("response", {
         type_url: decoded.response.payload?.type_url
-      }, {
-        F: __dxlog_file,
-        L: 323,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 272, S: this });
       item.resolve(decoded.response);
     } else if (decoded.open) {
       log("received open message", {
         state: this._state
-      }, {
-        F: __dxlog_file,
-        L: 326,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 277, S: this });
       if (this._params.noHandshake) {
         return;
       }
@@ -363,12 +265,7 @@ var RpcPeer = class {
     } else if (decoded.openAck) {
       log("received openAck message", {
         state: this._state
-      }, {
-        F: __dxlog_file,
-        L: 333,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 287, S: this });
       if (this._params.noHandshake) {
         return;
       }
@@ -376,41 +273,18 @@ var RpcPeer = class {
       this._remoteOpenTrigger.wake();
     } else if (decoded.streamClose) {
       if (this._state !== "OPENED") {
-        log("received stream close while closed", void 0, {
-          F: __dxlog_file,
-          L: 342,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log("received stream close while closed", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 297, S: this });
         return;
       }
       log("received stream close", {
         id: decoded.streamClose.id
-      }, {
-        F: __dxlog_file,
-        L: 346,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      invariant(typeof decoded.streamClose.id === "number", void 0, {
-        F: __dxlog_file,
-        L: 347,
-        S: this,
-        A: [
-          "typeof decoded.streamClose.id === 'number'",
-          ""
-        ]
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 300, S: this });
+      invariant(typeof decoded.streamClose.id === "number", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 303, S: this, A: ["typeof decoded.streamClose.id === 'number'", ""] });
       const stream = this._localStreams.get(decoded.streamClose.id);
       if (!stream) {
         log("no local stream", {
           id: decoded.streamClose.id
-        }, {
-          F: __dxlog_file,
-          L: 350,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 306, S: this });
         return;
       }
       this._localStreams.delete(decoded.streamClose.id);
@@ -418,12 +292,7 @@ var RpcPeer = class {
     } else if (decoded.bye) {
       this._byeTrigger.wake();
       if (this._state !== "CLOSING" && this._state !== "CLOSED") {
-        log("replying to bye", void 0, {
-          F: __dxlog_file,
-          L: 360,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        log("replying to bye", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 317, S: this });
         this._state = "CLOSING";
         await this._sendMessage({
           bye: {}
@@ -434,12 +303,7 @@ var RpcPeer = class {
     } else {
       log.error("received malformed message", {
         msg
-      }, {
-        F: __dxlog_file,
-        L: 368,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 326, S: this });
       throw new Error("Malformed message.");
     }
   }
@@ -448,14 +312,9 @@ var RpcPeer = class {
   * Peer should be open before making this call.
   */
   async call(method, request, options) {
-    DEBUG_CALLS && log("calling...", {
+    DEBUG_CALLS && log.trace("calling...", {
       method
-    }, {
-      F: __dxlog_file,
-      L: 378,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 336, S: this });
     throwIfNotOpen(this._state);
     let response;
     try {
@@ -469,12 +328,7 @@ var RpcPeer = class {
       } catch (err) {
         log.warn("failed to encode trace context", {
           err
-        }, {
-          F: __dxlog_file,
-          L: 393,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 351, S: this });
       }
       const sending = this._sendMessage({
         request: {
@@ -494,15 +348,7 @@ var RpcPeer = class {
         waiting
       ]);
       response = await waiting;
-      invariant(response.id === id, void 0, {
-        F: __dxlog_file,
-        L: 414,
-        S: this,
-        A: [
-          "response.id === id",
-          ""
-        ]
-      });
+      invariant(response.id === id, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 375, S: this, A: ["response.id === id", ""] });
     } catch (err) {
       if (err instanceof RpcClosedError) {
         const error = new RpcClosedError();
@@ -563,12 +409,7 @@ ${stack.getStack()}`;
       } catch (err) {
         log.warn("failed to encode trace context", {
           err
-        }, {
-          F: __dxlog_file,
-          L: 476,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 429, S: this });
       }
       try {
         this._sendMessage({
@@ -595,26 +436,16 @@ ${stack.getStack()}`;
             id
           }
         }).catch((err) => {
-          log.catch(err, void 0, {
-            F: __dxlog_file,
-            L: 501,
-            S: this,
-            C: (f, a) => f(...a)
-          });
+          log.catch(err, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 458, S: this });
         });
         this._outgoingRequests.delete(id);
       };
     });
   }
   async _sendMessage(message, timeout) {
-    DEBUG_CALLS && log("sending message", {
+    DEBUG_CALLS && log.trace("sending message", {
       type: Object.keys(message)[0]
-    }, {
-      F: __dxlog_file,
-      L: 509,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 465, S: this });
     await this._params.port.send(getRpcMessageCodec().encode(message, {
       preserveAny: true
     }), timeout);
@@ -628,12 +459,7 @@ ${stack.getStack()}`;
         log.warn("failed to decode trace context", {
           traceContext: req.traceContext,
           err
-        }, {
-          F: __dxlog_file,
-          L: 519,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 478, S: this });
       }
     }
     if (!traceCtx && !this._params.handlerRpcOptions) {
@@ -648,33 +474,9 @@ ${stack.getStack()}`;
   }
   async _callHandler(req) {
     try {
-      invariant(typeof req.id === "number", void 0, {
-        F: __dxlog_file,
-        L: 530,
-        S: this,
-        A: [
-          "typeof req.id === 'number'",
-          ""
-        ]
-      });
-      invariant(req.payload, void 0, {
-        F: __dxlog_file,
-        L: 531,
-        S: this,
-        A: [
-          "req.payload",
-          ""
-        ]
-      });
-      invariant(req.method, void 0, {
-        F: __dxlog_file,
-        L: 532,
-        S: this,
-        A: [
-          "req.method",
-          ""
-        ]
-      });
+      invariant(typeof req.id === "number", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 496, S: this, A: ["typeof req.id === 'number'", ""] });
+      invariant(req.payload, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 497, S: this, A: ["req.payload", ""] });
+      invariant(req.method, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 498, S: this, A: ["req.method", ""] });
       const response = await this._params.callHandler(req.method, req.payload, this._getHandlerRpcOptions(req));
       return {
         id: req.id,
@@ -689,42 +491,10 @@ ${stack.getStack()}`;
   }
   _callStreamHandler(req, callback) {
     try {
-      invariant(this._params.streamHandler, "Requests with streaming responses are not supported.", {
-        F: __dxlog_file,
-        L: 549,
-        S: this,
-        A: [
-          "this._params.streamHandler",
-          "'Requests with streaming responses are not supported.'"
-        ]
-      });
-      invariant(typeof req.id === "number", void 0, {
-        F: __dxlog_file,
-        L: 550,
-        S: this,
-        A: [
-          "typeof req.id === 'number'",
-          ""
-        ]
-      });
-      invariant(req.payload, void 0, {
-        F: __dxlog_file,
-        L: 551,
-        S: this,
-        A: [
-          "req.payload",
-          ""
-        ]
-      });
-      invariant(req.method, void 0, {
-        F: __dxlog_file,
-        L: 552,
-        S: this,
-        A: [
-          "req.method",
-          ""
-        ]
-      });
+      invariant(this._params.streamHandler, "Requests with streaming responses are not supported.", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 513, S: this, A: ["this._params.streamHandler", "'Requests with streaming responses are not supported.'"] });
+      invariant(typeof req.id === "number", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 514, S: this, A: ["typeof req.id === 'number'", ""] });
+      invariant(req.payload, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 515, S: this, A: ["req.payload", ""] });
+      invariant(req.method, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 516, S: this, A: ["req.method", ""] });
       const responseStream = this._params.streamHandler(req.method, req.payload, this._getHandlerRpcOptions(req));
       responseStream.onReady(() => {
         callback({
@@ -800,15 +570,7 @@ var ProtoRpcPeer = class {
 var createProtoRpcPeer = ({ requested, exposed, handlers, encodingOptions, ...rest }) => {
   const exposedRpcs = {};
   if (exposed) {
-    invariant2(handlers, void 0, {
-      F: __dxlog_file2,
-      L: 93,
-      S: void 0,
-      A: [
-        "handlers",
-        ""
-      ]
-    });
+    invariant2(handlers, void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 37, S: void 0, A: ["handlers", ""] });
     for (const serviceName of Object.keys(exposed)) {
       const serviceFqn = exposed[serviceName].serviceProto.fullName.slice(1);
       const serviceProvider = handlers[serviceName];