@dxos/messaging 0.4.9 → 0.4.10-main.06ef97a

package/dist/lib/node/index.cjs

@@ -32,7 +32,8 @@ __export(node_exports, {
   MemorySignalManagerContext: () => MemorySignalManagerContext,
   Messenger: () => Messenger,
   SignalClient: () => SignalClient,
-  WebsocketSignalManager: () => WebsocketSignalManager
+  WebsocketSignalManager: () => WebsocketSignalManager,
+  setIdentityTags: () => setIdentityTags
 });
 module.exports = __toCommonJS(node_exports);
 var import_async = require("@dxos/async");
@@ -71,6 +72,9 @@ var import_invariant5 = require("@dxos/invariant");
 var import_keys5 = require("@dxos/keys");
 var import_log5 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
+var import_invariant6 = require("@dxos/invariant");
+var import_log6 = require("@dxos/log");
+var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var MESSAGE_TIMEOUT = 1e4;
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/core/mesh/messaging/src/messenger.ts";
 var ReliablePayload = import_protocols.schema.getCodecForType("dxos.mesh.messaging.ReliablePayload");
@@ -420,7 +424,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file2,
-      L: 54,
+      L: 55,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -442,7 +446,7 @@ var SignalRPCClient = class {
           } catch (err) {
             import_log3.log.warn("send error", err, {
               F: __dxlog_file2,
-              L: 73,
+              L: 74,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -467,7 +471,7 @@ var SignalRPCClient = class {
         await this._rpc.open();
         (0, import_log3.log)(`RPC open ${this._url}`, void 0, {
           F: __dxlog_file2,
-          L: 94,
+          L: 95,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -484,7 +488,7 @@ var SignalRPCClient = class {
     this._socket.onclose = async () => {
       (0, import_log3.log)(`Disconnected ${this._url}`, void 0, {
         F: __dxlog_file2,
-        L: 115,
+        L: 116,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -503,7 +507,7 @@ var SignalRPCClient = class {
       } catch (err) {
         import_log3.log.catch(err, void 0, {
           F: __dxlog_file2,
-          L: 133,
+          L: 134,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -513,7 +517,7 @@ var SignalRPCClient = class {
         url: this._url
       }, {
         F: __dxlog_file2,
-        L: 137,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -522,7 +526,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file2,
-      L: 140,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -541,7 +545,7 @@ var SignalRPCClient = class {
     } catch (err) {
       import_log3.log.warn("close error", err, {
         F: __dxlog_file2,
-        L: 155,
+        L: 156,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -553,14 +557,14 @@ var SignalRPCClient = class {
       peerId
     }, {
       F: __dxlog_file2,
-      L: 160,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._connectTrigger.wait();
     (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
-      L: 162,
+      L: 163,
       S: this,
       A: [
         "!this._closed",
@@ -569,7 +573,7 @@ var SignalRPCClient = class {
     });
     (0, import_invariant3.invariant)(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
-      L: 163,
+      L: 164,
       S: this,
       A: [
         "this._rpc",
@@ -578,7 +582,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;
@@ -588,13 +593,13 @@ var SignalRPCClient = class {
       peerId
     }, {
       F: __dxlog_file2,
-      L: 173,
+      L: 175,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
-      L: 174,
+      L: 176,
       S: this,
       A: [
         "!this._closed",
@@ -604,7 +609,7 @@ var SignalRPCClient = class {
     await this._connectTrigger.wait();
     (0, import_invariant3.invariant)(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
-      L: 176,
+      L: 178,
       S: this,
       A: [
         "this._rpc",
@@ -624,13 +629,13 @@ var SignalRPCClient = class {
       payload
     }, {
       F: __dxlog_file2,
-      L: 185,
+      L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant3.invariant)(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
-      L: 186,
+      L: 188,
       S: this,
       A: [
         "!this._closed",
@@ -640,7 +645,7 @@ var SignalRPCClient = class {
     await this._connectTrigger.wait();
     (0, import_invariant3.invariant)(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
-      L: 188,
+      L: 190,
       S: this,
       A: [
         "this._rpc",
@@ -650,7 +655,8 @@ var SignalRPCClient = class {
     await this._rpc.rpc.Signal.sendMessage({
       author: author.asUint8Array(),
       recipient: recipient.asUint8Array(),
-      payload
+      payload,
+      metadata: this._callbacks?.getMetadata?.()
     });
   }
 };
@@ -664,10 +670,11 @@ 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 = import_signal.SignalState.CLOSED;
     this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
     this._connectionStarted = /* @__PURE__ */ new Date();
@@ -697,7 +704,7 @@ var SignalClient = class {
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 135,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -715,7 +722,7 @@ var SignalClient = class {
         if (this._state === import_signal.SignalState.CONNECTED) {
           import_log2.log.warn("SignalClient error:", err, {
             F: __dxlog_file3,
-            L: 147,
+            L: 148,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -742,7 +749,7 @@ var SignalClient = class {
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 176,
+      L: 177,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -750,7 +757,7 @@ var SignalClient = class {
   async close() {
     (0, import_log2.log)("closing...", void 0, {
       F: __dxlog_file3,
-      L: 180,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -766,7 +773,7 @@ var SignalClient = class {
     this._setState(import_signal.SignalState.CLOSED);
     (0, import_log2.log)("closed", void 0, {
       F: __dxlog_file3,
-      L: 191,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -787,7 +794,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 206,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -805,7 +812,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 214,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -827,7 +834,7 @@ var SignalClient = class {
     await this._clientReady.wait();
     (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 224,
+      L: 225,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -841,7 +848,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 229,
+      L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -855,7 +862,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 235,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -877,7 +884,7 @@ var SignalClient = class {
       status: this.getStatus()
     }, {
       F: __dxlog_file3,
-      L: 254,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -889,13 +896,13 @@ var SignalClient = class {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 259,
+      L: 260,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(!this._client, "Client already created", {
       F: __dxlog_file3,
-      L: 260,
+      L: 261,
       S: this,
       A: [
         "!this._client",
@@ -907,7 +914,7 @@ var SignalClient = class {
     this._connectionCtx.onDispose(async () => {
       (0, import_log2.log)("connection context disposed", void 0, {
         F: __dxlog_file3,
-        L: 267,
+        L: 268,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -923,7 +930,7 @@ var SignalClient = class {
           onConnected: () => {
             (0, import_log2.log)("socket connected", void 0, {
               F: __dxlog_file3,
-              L: 279,
+              L: 280,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -938,7 +945,7 @@ var SignalClient = class {
               state: this._state
             }, {
               F: __dxlog_file3,
-              L: 288,
+              L: 289,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -958,7 +965,7 @@ var SignalClient = class {
               state: this._state
             }, {
               F: __dxlog_file3,
-              L: 303,
+              L: 304,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -968,7 +975,8 @@ var SignalClient = class {
             }
             this._setState(import_signal.SignalState.ERROR);
             this._reconnectTask.schedule();
-          }
+          },
+          getMetadata: this._getMetadata
         }
       });
     } catch (err) {
@@ -989,7 +997,7 @@ var SignalClient = class {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 330,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -997,7 +1005,7 @@ var SignalClient = class {
     if (this._state === import_signal.SignalState.RECONNECTING) {
       import_log2.log.warn("Signal api already reconnecting.", void 0, {
         F: __dxlog_file3,
-        L: 334,
+        L: 336,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1020,7 +1028,7 @@ var SignalClient = class {
     const client = this._client;
     (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 359,
+      L: 361,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -1059,7 +1067,7 @@ var SignalClient = class {
           swarmEvent
         }, {
           F: __dxlog_file3,
-          L: 386,
+          L: 388,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1079,7 +1087,7 @@ var SignalClient = class {
     const client = this._client;
     (0, import_invariant2.invariant)(this._state === import_signal.SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 399,
+      L: 401,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -1377,8 +1385,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();
@@ -1391,7 +1400,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 46,
+      L: 49,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1399,7 +1408,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);
@@ -1414,7 +1423,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 69,
+      L: 73,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1422,7 +1431,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 70,
+      L: 74,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1435,7 +1444,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 77,
+      L: 81,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1453,13 +1462,13 @@ var WebsocketSignalManager = class {
       serverName
     }, {
       F: __dxlog_file5,
-      L: 93,
+      L: 97,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "server already closed", {
       F: __dxlog_file5,
-      L: 94,
+      L: 98,
       S: this,
       A: [
         "this._opened",
@@ -1469,7 +1478,7 @@ var WebsocketSignalManager = class {
     const server = this._servers.get(serverName);
     (0, import_invariant5.invariant)(server, "server not found", {
       F: __dxlog_file5,
-      L: 97,
+      L: 101,
       S: this,
       A: [
         "server",
@@ -1489,13 +1498,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 110,
+      L: 114,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 111,
+      L: 115,
       S: this,
       A: [
         "this._opened",
@@ -1513,13 +1522,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 117,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 118,
+      L: 122,
       S: this,
       A: [
         "this._opened",
@@ -1534,13 +1543,13 @@ var WebsocketSignalManager = class {
   async sendMessage({ author, recipient, payload }) {
     (0, import_log5.log)(`Signal ${recipient.truncate()}`, void 0, {
       F: __dxlog_file5,
-      L: 132,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 133,
+      L: 137,
       S: this,
       A: [
         "this._opened",
@@ -1558,7 +1567,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 138,
+            L: 142,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1567,7 +1576,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 140,
+            L: 144,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1577,7 +1586,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 143,
+            L: 147,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1591,7 +1600,7 @@ var WebsocketSignalManager = class {
     if (failureCount > MAX_SERVER_FAILURES) {
       import_log5.log.warn(`Too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`, void 0, {
         F: __dxlog_file5,
-        L: 154,
+        L: 158,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1604,13 +1613,13 @@ var WebsocketSignalManager = class {
   async subscribeMessages(peerId) {
     (0, import_log5.log)(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 163,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 164,
+      L: 168,
       S: this,
       A: [
         "this._opened",
@@ -1622,13 +1631,13 @@ var WebsocketSignalManager = class {
   async unsubscribeMessages(peerId) {
     (0, import_log5.log)(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 170,
+      L: 174,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 171,
+      L: 175,
       S: this,
       A: [
         "this._opened",
@@ -1641,7 +1650,7 @@ var WebsocketSignalManager = class {
     this._ctx = new import_context5.Context({
       onError: (err) => import_log5.log.catch(err, void 0, {
         F: __dxlog_file5,
-        L: 178,
+        L: 182,
         S: this,
         C: (f, a) => f(...a)
       })
@@ -1666,12 +1675,65 @@ _ts_decorate([
 _ts_decorate([
   import_async5.synchronized
 ], WebsocketSignalManager.prototype, "checkServerFailure", null);
+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) {
+      (0, import_log6.log)("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) {
+      (0, import_log6.log)("empty response from device service", {
+        device: dqr
+      }, {
+        F: __dxlog_file6,
+        L: 30,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    (0, import_invariant6.invariant)(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 === import_services.DeviceKind.CURRENT);
+    if (!thisDevice) {
+      (0, import_log6.log)("no current device", {
+        device: dqr
+      }, {
+        F: __dxlog_file6,
+        L: 37,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    setTag("deviceKey", thisDevice.deviceKey.truncate());
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   MemorySignalManager,
   MemorySignalManagerContext,
   Messenger,
   SignalClient,
-  WebsocketSignalManager
+  WebsocketSignalManager,
+  setIdentityTags
 });
 //# sourceMappingURL=index.cjs.map