@dxos/messaging 0.4.10-main.fa5a270 → 0.4.10-main.fd8ea31

package/dist/lib/browser/index.mjs

@@ -393,7 +393,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file2,
-      L: 54,
+      L: 55,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -415,7 +415,7 @@ var SignalRPCClient = class {
           } catch (err) {
             log2.warn("send error", err, {
               F: __dxlog_file2,
-              L: 73,
+              L: 74,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -440,7 +440,7 @@ var SignalRPCClient = class {
         await this._rpc.open();
         log2(`RPC open ${this._url}`, void 0, {
           F: __dxlog_file2,
-          L: 94,
+          L: 95,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -457,7 +457,7 @@ var SignalRPCClient = class {
     this._socket.onclose = async () => {
       log2(`Disconnected ${this._url}`, void 0, {
         F: __dxlog_file2,
-        L: 115,
+        L: 116,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -476,7 +476,7 @@ var SignalRPCClient = class {
       } catch (err) {
         log2.catch(err, void 0, {
           F: __dxlog_file2,
-          L: 133,
+          L: 134,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -486,7 +486,7 @@ var SignalRPCClient = class {
         url: this._url
       }, {
         F: __dxlog_file2,
-        L: 137,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -495,7 +495,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file2,
-      L: 140,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -514,7 +514,7 @@ var SignalRPCClient = class {
     } catch (err) {
       log2.warn("close error", err, {
         F: __dxlog_file2,
-        L: 155,
+        L: 156,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -526,14 +526,14 @@ var SignalRPCClient = class {
       peerId
     }, {
       F: __dxlog_file2,
-      L: 160,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._connectTrigger.wait();
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
-      L: 162,
+      L: 163,
       S: this,
       A: [
         "!this._closed",
@@ -542,7 +542,7 @@ var SignalRPCClient = class {
     });
     invariant2(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
-      L: 163,
+      L: 164,
       S: this,
       A: [
         "this._rpc",
@@ -551,7 +551,8 @@ var SignalRPCClient = class {
     });
     const swarmStream = this._rpc.rpc.Signal.join({
       swarm: topic.asUint8Array(),
-      peer: peerId.asUint8Array()
+      peer: peerId.asUint8Array(),
+      metadata: this._callbacks?.getMetadata?.()
     });
     await swarmStream.waitUntilReady();
     return swarmStream;
@@ -561,13 +562,13 @@ var SignalRPCClient = class {
       peerId
     }, {
       F: __dxlog_file2,
-      L: 173,
+      L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
-      L: 174,
+      L: 176,
       S: this,
       A: [
         "!this._closed",
@@ -577,7 +578,7 @@ var SignalRPCClient = class {
     await this._connectTrigger.wait();
     invariant2(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
-      L: 176,
+      L: 178,
       S: this,
       A: [
         "this._rpc",
@@ -597,13 +598,13 @@ var SignalRPCClient = class {
       payload
     }, {
       F: __dxlog_file2,
-      L: 185,
+      L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
-      L: 186,
+      L: 188,
       S: this,
       A: [
         "!this._closed",
@@ -613,7 +614,7 @@ var SignalRPCClient = class {
     await this._connectTrigger.wait();
     invariant2(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
-      L: 188,
+      L: 190,
       S: this,
       A: [
         "this._rpc",
@@ -623,7 +624,8 @@ var SignalRPCClient = class {
     await this._rpc.rpc.Signal.sendMessage({
       author: author.asUint8Array(),
       recipient: recipient.asUint8Array(),
-      payload
+      payload,
+      metadata: this._callbacks?.getMetadata?.()
     });
   }
 };
@@ -637,12 +639,12 @@ var RECONCILE_INTERVAL = 5e3;
 var SignalClient = class {
   /**
   * @param _host Signal server websocket URL.
-  * @param _onMessage
   */
-  constructor(_host, _onMessage, _onSwarmEvent) {
+  constructor(_host, _onMessage, _onSwarmEvent, _getMetadata) {
     this._host = _host;
     this._onMessage = _onMessage;
     this._onSwarmEvent = _onSwarmEvent;
+    this._getMetadata = _getMetadata;
     this._state = SignalState.CLOSED;
     this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
     this._connectionStarted = /* @__PURE__ */ new Date();
@@ -667,12 +669,12 @@ var SignalClient = class {
       throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
     }
   }
-  open() {
+  async open() {
     log3.trace("dxos.mesh.signal-client.open", trace3.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 135,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -690,7 +692,7 @@ var SignalClient = class {
         if (this._state === SignalState.CONNECTED) {
           log3.warn("SignalClient error:", err, {
             F: __dxlog_file3,
-            L: 147,
+            L: 140,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -717,7 +719,7 @@ var SignalClient = class {
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 176,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -725,7 +727,7 @@ var SignalClient = class {
   async close() {
     log3("closing...", void 0, {
       F: __dxlog_file3,
-      L: 180,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -741,7 +743,7 @@ var SignalClient = class {
     this._setState(SignalState.CLOSED);
     log3("closed", void 0, {
       F: __dxlog_file3,
-      L: 191,
+      L: 184,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -762,7 +764,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 206,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -780,7 +782,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 214,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -802,7 +804,7 @@ var SignalClient = class {
     await this._clientReady.wait();
     invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 224,
+      L: 216,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -816,7 +818,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 229,
+      L: 221,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -830,7 +832,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 235,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -852,7 +854,7 @@ var SignalClient = class {
       status: this.getStatus()
     }, {
       F: __dxlog_file3,
-      L: 254,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -864,13 +866,13 @@ var SignalClient = class {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 259,
+      L: 251,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this._client, "Client already created", {
       F: __dxlog_file3,
-      L: 260,
+      L: 252,
       S: this,
       A: [
         "!this._client",
@@ -882,7 +884,7 @@ var SignalClient = class {
     this._connectionCtx.onDispose(async () => {
       log3("connection context disposed", void 0, {
         F: __dxlog_file3,
-        L: 267,
+        L: 259,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -898,7 +900,7 @@ var SignalClient = class {
           onConnected: () => {
             log3("socket connected", void 0, {
               F: __dxlog_file3,
-              L: 279,
+              L: 271,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -913,7 +915,7 @@ var SignalClient = class {
               state: this._state
             }, {
               F: __dxlog_file3,
-              L: 288,
+              L: 280,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -933,7 +935,7 @@ var SignalClient = class {
               state: this._state
             }, {
               F: __dxlog_file3,
-              L: 303,
+              L: 295,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -943,7 +945,8 @@ var SignalClient = class {
             }
             this._setState(SignalState.ERROR);
             this._reconnectTask.schedule();
-          }
+          },
+          getMetadata: this._getMetadata
         }
       });
     } catch (err) {
@@ -964,7 +967,7 @@ var SignalClient = class {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 330,
+      L: 323,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -972,7 +975,7 @@ var SignalClient = class {
     if (this._state === SignalState.RECONNECTING) {
       log3.warn("Signal api already reconnecting.", void 0, {
         F: __dxlog_file3,
-        L: 334,
+        L: 327,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -995,7 +998,7 @@ var SignalClient = class {
     const client = this._client;
     invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 359,
+      L: 352,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -1034,7 +1037,7 @@ var SignalClient = class {
           swarmEvent
         }, {
           F: __dxlog_file3,
-          L: 386,
+          L: 379,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1054,7 +1057,7 @@ var SignalClient = class {
     const client = this._client;
     invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 399,
+      L: 392,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -1148,7 +1151,7 @@ var MemorySignalManager = class {
   async join({ topic, peerId }) {
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 101,
+      L: 102,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1189,7 +1192,7 @@ var MemorySignalManager = class {
   async leave({ topic, peerId }) {
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 137,
+      L: 138,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1221,13 +1224,13 @@ var MemorySignalManager = class {
       ...dec(payload)
     }, {
       F: __dxlog_file4,
-      L: 157,
+      L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant4(recipient, void 0, {
       F: __dxlog_file4,
-      L: 159,
+      L: 160,
       S: this,
       A: [
         "recipient",
@@ -1236,7 +1239,7 @@ var MemorySignalManager = class {
     });
     invariant4(!this._ctx.disposed, "Closed", {
       F: __dxlog_file4,
-      L: 160,
+      L: 161,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1251,7 +1254,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file4,
-        L: 166,
+        L: 167,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1263,7 +1266,7 @@ var MemorySignalManager = class {
         recipient
       }, {
         F: __dxlog_file4,
-        L: 171,
+        L: 172,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1276,7 +1279,7 @@ var MemorySignalManager = class {
           recipient
         }, {
           F: __dxlog_file4,
-          L: 179,
+          L: 180,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1288,7 +1291,7 @@ var MemorySignalManager = class {
         ...dec(payload)
       }, {
         F: __dxlog_file4,
-        L: 183,
+        L: 184,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1302,7 +1305,7 @@ var MemorySignalManager = class {
         err
       }, {
         F: __dxlog_file4,
-        L: 188,
+        L: 189,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1313,7 +1316,7 @@ var MemorySignalManager = class {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 193,
+      L: 194,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1324,7 +1327,7 @@ var MemorySignalManager = class {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 198,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1372,8 +1375,9 @@ var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/sr
 var MAX_SERVER_FAILURES = 5;
 var WSS_SIGNAL_SERVER_REBOOT_DELAY = 3e3;
 var WebsocketSignalManager = class {
-  constructor(_hosts) {
+  constructor(_hosts, _getMetadata) {
     this._hosts = _hosts;
+    this._getMetadata = _getMetadata;
     this._servers = /* @__PURE__ */ new Map();
     this._opened = false;
     this.failureCount = /* @__PURE__ */ new Map();
@@ -1386,7 +1390,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 46,
+      L: 51,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1394,7 +1398,7 @@ var WebsocketSignalManager = class {
       if (this._servers.has(host.server)) {
         continue;
       }
-      const server = new SignalClient(host.server, async (message) => this.onMessage.emit(message), async (data) => this.swarmEvent.emit(data));
+      const server = new SignalClient(host.server, async (message) => this.onMessage.emit(message), async (data) => this.swarmEvent.emit(data), this._getMetadata);
       server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
       this._servers.set(host.server, server);
       this.failureCount.set(host.server, 0);
@@ -1409,7 +1413,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 69,
+      L: 78,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1417,7 +1421,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 70,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1430,7 +1434,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 77,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1444,17 +1448,17 @@ var WebsocketSignalManager = class {
     await Promise.all(Array.from(this._servers.values()).map((server) => server.close()));
   }
   async restartServer(serverName) {
-    log5("Restarting server", {
+    log5("restarting server", {
       serverName
     }, {
       F: __dxlog_file5,
-      L: 93,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "server already closed", {
       F: __dxlog_file5,
-      L: 94,
+      L: 104,
       S: this,
       A: [
         "this._opened",
@@ -1464,7 +1468,7 @@ var WebsocketSignalManager = class {
     const server = this._servers.get(serverName);
     invariant5(server, "server not found", {
       F: __dxlog_file5,
-      L: 97,
+      L: 107,
       S: this,
       A: [
         "server",
@@ -1479,18 +1483,18 @@ var WebsocketSignalManager = class {
     return Array.from(this._servers.values()).map((server) => server.getStatus());
   }
   async join({ topic, peerId }) {
-    log5("Join", {
+    log5("join", {
       topic,
       peerId
     }, {
       F: __dxlog_file5,
-      L: 110,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 111,
+      L: 121,
       S: this,
       A: [
         "this._opened",
@@ -1508,13 +1512,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 117,
+      L: 127,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 118,
+      L: 128,
       S: this,
       A: [
         "this._opened",
@@ -1527,15 +1531,17 @@ var WebsocketSignalManager = class {
     }));
   }
   async sendMessage({ author, recipient, payload }) {
-    log5(`Signal ${recipient.truncate()}`, void 0, {
+    log5("signal", {
+      recipient
+    }, {
       F: __dxlog_file5,
-      L: 132,
+      L: 142,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 133,
+      L: 143,
       S: this,
       A: [
         "this._opened",
@@ -1553,7 +1559,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 138,
+            L: 148,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1562,7 +1568,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 140,
+            L: 150,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1572,7 +1578,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 143,
+            L: 153,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1584,9 +1590,9 @@ var WebsocketSignalManager = class {
   async checkServerFailure(serverName) {
     const failureCount = this.failureCount.get(serverName) ?? 0;
     if (failureCount > MAX_SERVER_FAILURES) {
-      log5.warn(`Too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`, void 0, {
+      log5.warn(`too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`, void 0, {
         F: __dxlog_file5,
-        L: 154,
+        L: 164,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1597,15 +1603,17 @@ var WebsocketSignalManager = class {
     this.failureCount.set(serverName, (this.failureCount.get(serverName) ?? 0) + 1);
   }
   async subscribeMessages(peerId) {
-    log5(`Subscribed for message stream peerId=${peerId}`, void 0, {
+    log5("subscribed for message stream", {
+      peerId
+    }, {
       F: __dxlog_file5,
-      L: 163,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 164,
+      L: 175,
       S: this,
       A: [
         "this._opened",
@@ -1615,15 +1623,17 @@ var WebsocketSignalManager = class {
     await this._forEachServer(async (server) => server.subscribeMessages(peerId));
   }
   async unsubscribeMessages(peerId) {
-    log5(`Subscribed for message stream peerId=${peerId}`, void 0, {
+    log5("subscribed for message stream", {
+      peerId
+    }, {
       F: __dxlog_file5,
-      L: 170,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 171,
+      L: 182,
       S: this,
       A: [
         "this._opened",
@@ -1636,7 +1646,7 @@ var WebsocketSignalManager = class {
     this._ctx = new Context5({
       onError: (err) => log5.catch(err, void 0, {
         F: __dxlog_file5,
-        L: 178,
+        L: 189,
         S: this,
         C: (f, a) => f(...a)
       })
@@ -1661,11 +1671,69 @@ _ts_decorate([
 _ts_decorate([
   synchronized
 ], WebsocketSignalManager.prototype, "checkServerFailure", null);
+
+// packages/core/mesh/messaging/src/signal-manager/utils.ts
+import { invariant as invariant6 } from "@dxos/invariant";
+import { log as log6 } from "@dxos/log";
+import { DeviceKind } from "@dxos/protocols/proto/dxos/client/services";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/signal-manager/utils.ts";
+var setIdentityTags = ({ identityService, devicesService, setTag }) => {
+  identityService.queryIdentity().subscribe((idqr) => {
+    if (!idqr?.identity?.identityKey) {
+      log6("empty response from identity service", {
+        idqr
+      }, {
+        F: __dxlog_file6,
+        L: 21,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    setTag("identityKey", idqr.identity.identityKey.truncate());
+  });
+  devicesService.queryDevices().subscribe((dqr) => {
+    if (!dqr || !dqr.devices || dqr.devices.length === 0) {
+      log6("empty response from device service", {
+        device: dqr
+      }, {
+        F: __dxlog_file6,
+        L: 30,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    invariant6(dqr, "empty response from device service", {
+      F: __dxlog_file6,
+      L: 33,
+      S: void 0,
+      A: [
+        "dqr",
+        "'empty response from device service'"
+      ]
+    });
+    const thisDevice = dqr.devices.find((device) => device.kind === DeviceKind.CURRENT);
+    if (!thisDevice) {
+      log6("no current device", {
+        device: dqr
+      }, {
+        F: __dxlog_file6,
+        L: 37,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    setTag("deviceKey", thisDevice.deviceKey.truncate());
+  });
+};
 export {
   MemorySignalManager,
   MemorySignalManagerContext,
   Messenger,
   SignalClient,
-  WebsocketSignalManager
+  WebsocketSignalManager,
+  setIdentityTags
 };
 //# sourceMappingURL=index.mjs.map