@dxos/messaging 0.8.4-main.937b3ca → 0.8.4-main.9be5663bfe

package/dist/lib/{browser → neutral}/index.mjs

@@ -4,7 +4,7 @@ import {
   MemorySignalManagerContext,
   Messenger,
   PeerInfoHash
-} from "./chunk-5MOQVHHI.mjs";
+} from "./chunk-ZNKR3G44.mjs";
 
 // src/signal-client/signal-client.ts
 import { DeferredTask, Event as Event2, Trigger as Trigger2, scheduleTask, scheduleTaskInterval as scheduleTaskInterval2, sleep } from "@dxos/async";
@@ -191,7 +191,7 @@ var SignalLocalState = class {
       peerId
     }, {
       F: __dxlog_file,
-      L: 80,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -243,7 +243,7 @@ var SignalLocalState = class {
             swarmEvent
           }, {
             F: __dxlog_file,
-            L: 116,
+            L: 115,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -629,7 +629,7 @@ var SignalClient = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 97,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -647,7 +647,7 @@ var SignalClient = class extends Resource {
         }));
         invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
           F: __dxlog_file3,
-          L: 107,
+          L: 106,
           S: this,
           A: [
             "this._state === SignalState.CONNECTED",
@@ -690,7 +690,7 @@ var SignalClient = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 140,
+      L: 139,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -702,7 +702,7 @@ var SignalClient = class extends Resource {
     if (this._state === SignalState.CONNECTED && !this._lastReconciliationFailed) {
       log3.warn("SignalClient error:", err, {
         F: __dxlog_file3,
-        L: 149,
+        L: 148,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -712,7 +712,7 @@ var SignalClient = class extends Resource {
   async _close() {
     log3("closing...", void 0, {
       F: __dxlog_file3,
-      L: 155,
+      L: 154,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -725,7 +725,7 @@ var SignalClient = class extends Resource {
     await this._safeResetClient();
     log3("closed", void 0, {
       F: __dxlog_file3,
-      L: 163,
+      L: 162,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -739,13 +739,13 @@ var SignalClient = class extends Resource {
       ...this._monitor.getRecordedTimestamps()
     };
   }
-  async join(args) {
+  async join(_ctx, args) {
     log3("joining", {
       topic: args.topic,
       peerId: args.peer.peerKey
     }, {
       F: __dxlog_file3,
-      L: 177,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -756,13 +756,13 @@ var SignalClient = class extends Resource {
     });
     this._reconcileTask?.schedule();
   }
-  async leave(args) {
+  async leave(_ctx, args) {
     log3("leaving", {
       topic: args.topic,
       peerId: args.peer.peerKey
     }, {
       F: __dxlog_file3,
-      L: 184,
+      L: 183,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -772,15 +772,15 @@ var SignalClient = class extends Resource {
       peerId: PublicKey3.from(args.peer.peerKey)
     });
   }
-  async query(params) {
+  async query(_ctx, params) {
     throw new Error("Not implemented");
   }
-  async sendMessage(msg) {
+  async sendMessage(_ctx, msg) {
     return this._monitor.recordMessageSending(msg, async () => {
       await this._clientReady.wait();
       invariant2(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
         F: __dxlog_file3,
-        L: 196,
+        L: 195,
         S: this,
         A: [
           "this._state === SignalState.CONNECTED",
@@ -789,7 +789,7 @@ var SignalClient = class extends Resource {
       });
       invariant2(msg.author.peerKey, "Author key required", {
         F: __dxlog_file3,
-        L: 197,
+        L: 196,
         S: this,
         A: [
           "msg.author.peerKey",
@@ -798,7 +798,7 @@ var SignalClient = class extends Resource {
       });
       invariant2(msg.recipient.peerKey, "Recipient key required", {
         F: __dxlog_file3,
-        L: 198,
+        L: 197,
         S: this,
         A: [
           "msg.recipient.peerKey",
@@ -815,7 +815,7 @@ var SignalClient = class extends Resource {
   async subscribeMessages(peer) {
     invariant2(peer.peerKey, "Peer key required", {
       F: __dxlog_file3,
-      L: 208,
+      L: 207,
       S: this,
       A: [
         "peer.peerKey",
@@ -826,7 +826,7 @@ var SignalClient = class extends Resource {
       peer
     }, {
       F: __dxlog_file3,
-      L: 209,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -836,7 +836,7 @@ var SignalClient = class extends Resource {
   async unsubscribeMessages(peer) {
     invariant2(peer.peerKey, "Peer key required", {
       F: __dxlog_file3,
-      L: 215,
+      L: 214,
       S: this,
       A: [
         "peer.peerKey",
@@ -847,7 +847,7 @@ var SignalClient = class extends Resource {
       peer
     }, {
       F: __dxlog_file3,
-      L: 216,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -862,13 +862,13 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 225,
+      L: 224,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._client, "Client already created", {
       F: __dxlog_file3,
-      L: 226,
+      L: 225,
       S: this,
       A: [
         "!this._client",
@@ -880,7 +880,7 @@ var SignalClient = class extends Resource {
     this._connectionCtx.onDispose(async () => {
       log3("connection context disposed", void 0, {
         F: __dxlog_file3,
-        L: 233,
+        L: 232,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -895,7 +895,7 @@ var SignalClient = class extends Resource {
             if (client === this._client) {
               log3("socket connected", void 0, {
                 F: __dxlog_file3,
-                L: 244,
+                L: 243,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -910,7 +910,7 @@ var SignalClient = class extends Resource {
               state: this._state
             }, {
               F: __dxlog_file3,
-              L: 253,
+              L: 252,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -927,7 +927,7 @@ var SignalClient = class extends Resource {
                 state: this._state
               }, {
                 F: __dxlog_file3,
-                L: 265,
+                L: 264,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -952,14 +952,14 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 280,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === SignalState.RECONNECTING) {
       log3.info("Signal api already reconnecting.", void 0, {
         F: __dxlog_file3,
-        L: 283,
+        L: 282,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1001,7 +1001,7 @@ var SignalClient = class extends Resource {
       status: this.getStatus()
     }, {
       F: __dxlog_file3,
-      L: 324,
+      L: 323,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1078,7 +1078,7 @@ var WebsocketSignalManager = class extends Resource2 {
       hosts: this._hosts
     }, {
       F: __dxlog_file4,
-      L: 59,
+      L: 58,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1100,7 +1100,7 @@ var WebsocketSignalManager = class extends Resource2 {
       hosts: this._hosts
     }, {
       F: __dxlog_file4,
-      L: 79,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1108,7 +1108,7 @@ var WebsocketSignalManager = class extends Resource2 {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 80,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1117,7 +1117,7 @@ var WebsocketSignalManager = class extends Resource2 {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 84,
+      L: 83,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1130,13 +1130,13 @@ var WebsocketSignalManager = class extends Resource2 {
       serverName
     }, {
       F: __dxlog_file4,
-      L: 92,
+      L: 91,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file4,
-      L: 93,
+      L: 92,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1146,7 +1146,7 @@ var WebsocketSignalManager = class extends Resource2 {
     const server = this._servers.get(serverName);
     invariant3(server, "server not found", {
       F: __dxlog_file4,
-      L: 96,
+      L: 95,
       S: this,
       A: [
         "server",
@@ -1160,69 +1160,69 @@ var WebsocketSignalManager = class extends Resource2 {
   getStatus() {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
-  async join({ topic, peer }) {
+  async join(_ctx, { topic, peer }) {
     log4("join", {
       topic,
       peer
     }, {
       F: __dxlog_file4,
-      L: 109,
+      L: 108,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file4,
-      L: 110,
+      L: 109,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    await this._forEachServer((server) => server.join({
+    await this._forEachServer((server) => server.join(_ctx, {
       topic,
       peer
     }));
   }
-  async leave({ topic, peer }) {
+  async leave(_ctx, { topic, peer }) {
     log4("leaving", {
       topic,
       peer
     }, {
       F: __dxlog_file4,
-      L: 116,
+      L: 115,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file4,
-      L: 117,
+      L: 116,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
         ""
       ]
     });
-    await this._forEachServer((server) => server.leave({
+    await this._forEachServer((server) => server.leave(_ctx, {
       topic,
       peer
     }));
   }
-  async query({ topic }) {
+  async query(_ctx, { topic }) {
     throw new Error("Not implemented");
   }
-  async sendMessage({ author, recipient, payload }) {
+  async sendMessage(_ctx, { author, recipient, payload }) {
     log4("signal", {
       recipient
     }, {
       F: __dxlog_file4,
-      L: 126,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file4,
-      L: 127,
+      L: 126,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1230,7 +1230,7 @@ var WebsocketSignalManager = class extends Resource2 {
       ]
     });
     void this._forEachServer(async (server, serverName, index) => {
-      void server.sendMessage({
+      void server.sendMessage(_ctx, {
         author,
         recipient,
         payload
@@ -1240,7 +1240,7 @@ var WebsocketSignalManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file4,
-            L: 135,
+            L: 134,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1250,7 +1250,7 @@ var WebsocketSignalManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file4,
-            L: 138,
+            L: 137,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1260,7 +1260,7 @@ var WebsocketSignalManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file4,
-            L: 141,
+            L: 140,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1283,7 +1283,7 @@ var WebsocketSignalManager = class extends Resource2 {
           failureCount
         }, {
           F: __dxlog_file4,
-          L: 155,
+          L: 154,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1301,7 +1301,7 @@ var WebsocketSignalManager = class extends Resource2 {
         serverName
       }, {
         F: __dxlog_file4,
-        L: 168,
+        L: 167,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1314,13 +1314,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file4,
-      L: 175,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file4,
-      L: 176,
+      L: 175,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1334,13 +1334,13 @@ var WebsocketSignalManager = class extends Resource2 {
       peer
     }, {
       F: __dxlog_file4,
-      L: 182,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(this._lifecycleState === LifecycleState.OPEN, void 0, {
       F: __dxlog_file4,
-      L: 183,
+      L: 182,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1401,7 +1401,7 @@ var EdgeSignalManager = class extends Resource3 {
   /**
   * Warning: PeerInfo is inferred from edgeConnection.
   */
-  async join({ topic, peer }) {
+  async join(ctx, { topic, peer }) {
     if (!this._matchSelfPeerInfo(peer)) {
       log5.warn("ignoring peer info on join request", {
         peer,
@@ -1411,7 +1411,7 @@ var EdgeSignalManager = class extends Resource3 {
         }
       }, {
         F: __dxlog_file5,
-        L: 66,
+        L: 65,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1422,7 +1422,7 @@ var EdgeSignalManager = class extends Resource3 {
       lastState: peer.state,
       joinedPeers: new ComplexSet2(PeerInfoHash)
     });
-    await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
+    await this._edgeConnection.send(ctx, protocol.createMessage(SwarmRequestSchema, {
       serviceId: EdgeService.SWARM,
       source: createMessageSource(topic, peer),
       payload: {
@@ -1433,10 +1433,10 @@ var EdgeSignalManager = class extends Resource3 {
       }
     }));
   }
-  async leave({ topic, peer }) {
+  async leave(ctx, { topic, peer }) {
     this._swarmPeers.delete(topic);
     try {
-      await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
+      await this._edgeConnection.send(ctx, protocol.createMessage(SwarmRequestSchema, {
         serviceId: EdgeService.SWARM,
         source: createMessageSource(topic, peer),
         payload: {
@@ -1453,9 +1453,9 @@ var EdgeSignalManager = class extends Resource3 {
       throw err;
     }
   }
-  async query({ topic }) {
+  async query(ctx, { topic }) {
     const response = cancelWithContext3(this._ctx, this.swarmState.waitFor((state) => state.swarmKey === topic.toHex()));
-    await this._edgeConnection.send(protocol.createMessage(SwarmRequestSchema, {
+    await this._edgeConnection.send(ctx, protocol.createMessage(SwarmRequestSchema, {
       serviceId: EdgeService.SWARM,
       source: createMessageSource(topic, {
         peerKey: this._edgeConnection.peerKey,
@@ -1470,7 +1470,7 @@ var EdgeSignalManager = class extends Resource3 {
     }));
     return response;
   }
-  async sendMessage(message) {
+  async sendMessage(ctx, message) {
     if (!this._matchSelfPeerInfo(message.author)) {
       log5.warn("ignoring author on send request", {
         author: message.author,
@@ -1480,12 +1480,12 @@ var EdgeSignalManager = class extends Resource3 {
         }
       }, {
         F: __dxlog_file5,
-        L: 131,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    await this._edgeConnection.send(protocol.createMessage(bufWkt.AnySchema, {
+    await this._edgeConnection.send(ctx, protocol.createMessage(bufWkt.AnySchema, {
       serviceId: EdgeService.SIGNAL,
       source: message.author,
       target: [
@@ -1515,7 +1515,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processSwarmResponse(message) {
     invariant4(protocol.getPayloadType(message) === SwarmResponseSchema.typeName, "Wrong payload type", {
       F: __dxlog_file5,
-      L: 168,
+      L: 171,
       S: this,
       A: [
         "protocol.getPayloadType(message) === SwarmResponseSchema.typeName",
@@ -1559,7 +1559,7 @@ var EdgeSignalManager = class extends Resource3 {
   _processMessage(message) {
     invariant4(protocol.getPayloadType(message) === bufWkt.AnySchema.typeName, "Wrong payload type", {
       F: __dxlog_file5,
-      L: 206,
+      L: 209,
       S: this,
       A: [
         "protocol.getPayloadType(message) === bufWkt.AnySchema.typeName",
@@ -1569,7 +1569,7 @@ var EdgeSignalManager = class extends Resource3 {
     const payload = protocol.getPayload(message, bufWkt.AnySchema);
     invariant4(message.source, "source is missing", {
       F: __dxlog_file5,
-      L: 208,
+      L: 211,
       S: this,
       A: [
         "message.source",
@@ -1578,7 +1578,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant4(message.target, "target is missing", {
       F: __dxlog_file5,
-      L: 209,
+      L: 212,
       S: this,
       A: [
         "message.target",
@@ -1587,7 +1587,7 @@ var EdgeSignalManager = class extends Resource3 {
     });
     invariant4(message.target.length === 1, "target should have exactly one item", {
       F: __dxlog_file5,
-      L: 210,
+      L: 213,
       S: this,
       A: [
         "message.target.length === 1",
@@ -1611,12 +1611,12 @@ var EdgeSignalManager = class extends Resource3 {
       swarms: Array.from(this._swarmPeers.keys())
     }, {
       F: __dxlog_file5,
-      L: 229,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
     for (const [topic, { lastState }] of this._swarmPeers.entries()) {
-      await this.join({
+      await this.join(this._ctx, {
         topic,
         peer: {
           peerKey: this._edgeConnection.peerKey,