@dxos/messaging 0.4.10-main.99ef736 → 0.4.10-main.fa5a270

package/dist/lib/browser/index.mjs

@@ -393,7 +393,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file2,
-      L: 55,
+      L: 54,
       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: 74,
+              L: 73,
               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: 95,
+          L: 94,
           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: 116,
+        L: 115,
         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: 134,
+          L: 133,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -486,7 +486,7 @@ var SignalRPCClient = class {
         url: this._url
       }, {
         F: __dxlog_file2,
-        L: 138,
+        L: 137,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -495,7 +495,7 @@ var SignalRPCClient = class {
       id: traceId
     }), {
       F: __dxlog_file2,
-      L: 141,
+      L: 140,
       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: 156,
+        L: 155,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -526,14 +526,14 @@ var SignalRPCClient = class {
       peerId
     }, {
       F: __dxlog_file2,
-      L: 161,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._connectTrigger.wait();
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
-      L: 163,
+      L: 162,
       S: this,
       A: [
         "!this._closed",
@@ -542,7 +542,7 @@ var SignalRPCClient = class {
     });
     invariant2(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
-      L: 164,
+      L: 163,
       S: this,
       A: [
         "this._rpc",
@@ -551,8 +551,7 @@ var SignalRPCClient = class {
     });
     const swarmStream = this._rpc.rpc.Signal.join({
       swarm: topic.asUint8Array(),
-      peer: peerId.asUint8Array(),
-      metadata: this._callbacks?.getMetadata?.()
+      peer: peerId.asUint8Array()
     });
     await swarmStream.waitUntilReady();
     return swarmStream;
@@ -562,13 +561,13 @@ var SignalRPCClient = class {
       peerId
     }, {
       F: __dxlog_file2,
-      L: 175,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
-      L: 176,
+      L: 174,
       S: this,
       A: [
         "!this._closed",
@@ -578,7 +577,7 @@ var SignalRPCClient = class {
     await this._connectTrigger.wait();
     invariant2(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
-      L: 178,
+      L: 176,
       S: this,
       A: [
         "this._rpc",
@@ -598,13 +597,13 @@ var SignalRPCClient = class {
       payload
     }, {
       F: __dxlog_file2,
-      L: 187,
+      L: 185,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(!this._closed, "SignalRPCClient is closed", {
       F: __dxlog_file2,
-      L: 188,
+      L: 186,
       S: this,
       A: [
         "!this._closed",
@@ -614,7 +613,7 @@ var SignalRPCClient = class {
     await this._connectTrigger.wait();
     invariant2(this._rpc, "Rpc is not initialized", {
       F: __dxlog_file2,
-      L: 190,
+      L: 188,
       S: this,
       A: [
         "this._rpc",
@@ -624,8 +623,7 @@ var SignalRPCClient = class {
     await this._rpc.rpc.Signal.sendMessage({
       author: author.asUint8Array(),
       recipient: recipient.asUint8Array(),
-      payload,
-      metadata: this._callbacks?.getMetadata?.()
+      payload
     });
   }
 };
@@ -641,11 +639,10 @@ var SignalClient = class {
   * @param _host Signal server websocket URL.
   * @param _onMessage
   */
-  constructor(_host, _onMessage, _onSwarmEvent, _getMetadata) {
+  constructor(_host, _onMessage, _onSwarmEvent) {
     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();
@@ -675,7 +672,7 @@ var SignalClient = class {
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 136,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -693,7 +690,7 @@ var SignalClient = class {
         if (this._state === SignalState.CONNECTED) {
           log3.warn("SignalClient error:", err, {
             F: __dxlog_file3,
-            L: 148,
+            L: 147,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -720,7 +717,7 @@ var SignalClient = class {
       id: this._instanceId
     }), {
       F: __dxlog_file3,
-      L: 177,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -728,7 +725,7 @@ var SignalClient = class {
   async close() {
     log3("closing...", void 0, {
       F: __dxlog_file3,
-      L: 181,
+      L: 180,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -744,7 +741,7 @@ var SignalClient = class {
     this._setState(SignalState.CLOSED);
     log3("closed", void 0, {
       F: __dxlog_file3,
-      L: 192,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -765,7 +762,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 207,
+      L: 206,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -783,7 +780,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 215,
+      L: 214,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -805,7 +802,7 @@ var SignalClient = class {
     await this._clientReady.wait();
     invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 225,
+      L: 224,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -819,7 +816,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 230,
+      L: 229,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -833,7 +830,7 @@ var SignalClient = class {
       peerId
     }, {
       F: __dxlog_file3,
-      L: 236,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -855,7 +852,7 @@ var SignalClient = class {
       status: this.getStatus()
     }, {
       F: __dxlog_file3,
-      L: 255,
+      L: 254,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -867,13 +864,13 @@ var SignalClient = class {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 260,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this._client, "Client already created", {
       F: __dxlog_file3,
-      L: 261,
+      L: 260,
       S: this,
       A: [
         "!this._client",
@@ -885,7 +882,7 @@ var SignalClient = class {
     this._connectionCtx.onDispose(async () => {
       log3("connection context disposed", void 0, {
         F: __dxlog_file3,
-        L: 268,
+        L: 267,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -901,7 +898,7 @@ var SignalClient = class {
           onConnected: () => {
             log3("socket connected", void 0, {
               F: __dxlog_file3,
-              L: 280,
+              L: 279,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -916,7 +913,7 @@ var SignalClient = class {
               state: this._state
             }, {
               F: __dxlog_file3,
-              L: 289,
+              L: 288,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -936,7 +933,7 @@ var SignalClient = class {
               state: this._state
             }, {
               F: __dxlog_file3,
-              L: 304,
+              L: 303,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -946,8 +943,7 @@ var SignalClient = class {
             }
             this._setState(SignalState.ERROR);
             this._reconnectTask.schedule();
-          },
-          getMetadata: this._getMetadata
+          }
         }
       });
     } catch (err) {
@@ -968,7 +964,7 @@ var SignalClient = class {
       state: this._state
     }, {
       F: __dxlog_file3,
-      L: 332,
+      L: 330,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -976,7 +972,7 @@ var SignalClient = class {
     if (this._state === SignalState.RECONNECTING) {
       log3.warn("Signal api already reconnecting.", void 0, {
         F: __dxlog_file3,
-        L: 336,
+        L: 334,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -999,7 +995,7 @@ var SignalClient = class {
     const client = this._client;
     invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 361,
+      L: 359,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -1038,7 +1034,7 @@ var SignalClient = class {
           swarmEvent
         }, {
           F: __dxlog_file3,
-          L: 388,
+          L: 386,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1058,7 +1054,7 @@ var SignalClient = class {
     const client = this._client;
     invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
       F: __dxlog_file3,
-      L: 401,
+      L: 399,
       S: this,
       A: [
         "this._state === SignalState.CONNECTED",
@@ -1376,9 +1372,8 @@ 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, _getMetadata) {
+  constructor(_hosts) {
     this._hosts = _hosts;
-    this._getMetadata = _getMetadata;
     this._servers = /* @__PURE__ */ new Map();
     this._opened = false;
     this.failureCount = /* @__PURE__ */ new Map();
@@ -1391,7 +1386,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 49,
+      L: 46,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1399,7 +1394,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), this._getMetadata);
+      const server = new SignalClient(host.server, async (message) => this.onMessage.emit(message), async (data) => this.swarmEvent.emit(data));
       server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
       this._servers.set(host.server, server);
       this.failureCount.set(host.server, 0);
@@ -1414,7 +1409,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file5,
-      L: 73,
+      L: 69,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1422,7 +1417,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 74,
+      L: 70,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1435,7 +1430,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file5,
-      L: 81,
+      L: 77,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1453,13 +1448,13 @@ var WebsocketSignalManager = class {
       serverName
     }, {
       F: __dxlog_file5,
-      L: 97,
+      L: 93,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "server already closed", {
       F: __dxlog_file5,
-      L: 98,
+      L: 94,
       S: this,
       A: [
         "this._opened",
@@ -1469,7 +1464,7 @@ var WebsocketSignalManager = class {
     const server = this._servers.get(serverName);
     invariant5(server, "server not found", {
       F: __dxlog_file5,
-      L: 101,
+      L: 97,
       S: this,
       A: [
         "server",
@@ -1489,13 +1484,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 114,
+      L: 110,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 115,
+      L: 111,
       S: this,
       A: [
         "this._opened",
@@ -1513,13 +1508,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file5,
-      L: 121,
+      L: 117,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 122,
+      L: 118,
       S: this,
       A: [
         "this._opened",
@@ -1534,13 +1529,13 @@ var WebsocketSignalManager = class {
   async sendMessage({ author, recipient, payload }) {
     log5(`Signal ${recipient.truncate()}`, void 0, {
       F: __dxlog_file5,
-      L: 136,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 137,
+      L: 133,
       S: this,
       A: [
         "this._opened",
@@ -1558,7 +1553,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 142,
+            L: 138,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1567,7 +1562,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 144,
+            L: 140,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1577,7 +1572,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file5,
-            L: 147,
+            L: 143,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1591,7 +1586,7 @@ var WebsocketSignalManager = class {
     if (failureCount > MAX_SERVER_FAILURES) {
       log5.warn(`Too many failures sending to ${serverName} (${failureCount} > ${MAX_SERVER_FAILURES}), restarting`, void 0, {
         F: __dxlog_file5,
-        L: 158,
+        L: 154,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1604,13 +1599,13 @@ var WebsocketSignalManager = class {
   async subscribeMessages(peerId) {
     log5(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 167,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 168,
+      L: 164,
       S: this,
       A: [
         "this._opened",
@@ -1622,13 +1617,13 @@ var WebsocketSignalManager = class {
   async unsubscribeMessages(peerId) {
     log5(`Subscribed for message stream peerId=${peerId}`, void 0, {
       F: __dxlog_file5,
-      L: 174,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file5,
-      L: 175,
+      L: 171,
       S: this,
       A: [
         "this._opened",
@@ -1641,7 +1636,7 @@ var WebsocketSignalManager = class {
     this._ctx = new Context5({
       onError: (err) => log5.catch(err, void 0, {
         F: __dxlog_file5,
-        L: 182,
+        L: 178,
         S: this,
         C: (f, a) => f(...a)
       })
@@ -1666,69 +1661,11 @@ _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,
-  setIdentityTags
+  WebsocketSignalManager
 };
 //# sourceMappingURL=index.mjs.map