@dxos/messaging 0.6.5 → 0.6.6-main.e1a6e1f

package/dist/lib/browser/index.mjs

@@ -941,7 +941,7 @@ var SignalClient = class extends Resource {
   * @param onSwarmEvent called when a new swarm event is received.
   * @param _getMetadata signal-message metadata provider, called for every message.
   */
-  constructor(_host, onMessage, onSwarmEvent, _getMetadata) {
+  constructor(_host, _getMetadata) {
     super();
     this._host = _host;
     this._getMetadata = _getMetadata;
@@ -952,20 +952,22 @@ var SignalClient = class extends Resource {
     this._reconnectAfter = DEFAULT_RECONNECT_TIMEOUT;
     this._instanceId = PublicKey4.random().toHex();
     this.statusChanged = new Event2();
+    this.onMessage = new Event2();
+    this.swarmEvent = new Event2();
     if (!this._host.startsWith("wss://") && !this._host.startsWith("ws://")) {
       throw new Error(`Signal server requires a websocket URL. Provided: ${this._host}`);
     }
-    this.localState = new SignalLocalState((message) => {
+    this.localState = new SignalLocalState(async (message) => {
       this._monitor.recordMessageReceived(message);
-      return onMessage(message);
-    }, onSwarmEvent);
+      this.onMessage.emit(message);
+    }, async (event) => this.swarmEvent.emit(event));
   }
   async _open() {
     log4.trace("dxos.mesh.signal-client.open", trace6.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 83,
+      L: 86,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -983,7 +985,7 @@ var SignalClient = class extends Resource {
         }));
         invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
           F: __dxlog_file4,
-          L: 93,
+          L: 96,
           S: this,
           A: [
             "this._state === SignalState.CONNECTED",
@@ -1026,7 +1028,7 @@ var SignalClient = class extends Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 126,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1038,7 +1040,7 @@ var SignalClient = class extends Resource {
     if (this._state === SignalState.CONNECTED && !this._lastReconciliationFailed) {
       log4.warn("SignalClient error:", err, {
         F: __dxlog_file4,
-        L: 135,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1048,7 +1050,7 @@ var SignalClient = class extends Resource {
   async _close() {
     log4("closing...", void 0, {
       F: __dxlog_file4,
-      L: 141,
+      L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1061,7 +1063,7 @@ var SignalClient = class extends Resource {
     await this._safeResetClient();
     log4("closed", void 0, {
       F: __dxlog_file4,
-      L: 149,
+      L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1081,7 +1083,7 @@ var SignalClient = class extends Resource {
       peerId: args.peerId
     }, {
       F: __dxlog_file4,
-      L: 163,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1095,7 +1097,7 @@ var SignalClient = class extends Resource {
       peerId: args.peerId
     }, {
       F: __dxlog_file4,
-      L: 170,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1107,7 +1109,7 @@ var SignalClient = class extends Resource {
       await this._clientReady.wait();
       invariant3(this._state === SignalState.CONNECTED, "Not connected to Signal Server", {
         F: __dxlog_file4,
-        L: 178,
+        L: 181,
         S: this,
         A: [
           "this._state === SignalState.CONNECTED",
@@ -1122,7 +1124,7 @@ var SignalClient = class extends Resource {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 184,
+      L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1134,7 +1136,7 @@ var SignalClient = class extends Resource {
       peerId
     }, {
       F: __dxlog_file4,
-      L: 190,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1149,13 +1151,13 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 199,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this._client, "Client already created", {
       F: __dxlog_file4,
-      L: 200,
+      L: 203,
       S: this,
       A: [
         "!this._client",
@@ -1167,7 +1169,7 @@ var SignalClient = class extends Resource {
     this._connectionCtx.onDispose(async () => {
       log4("connection context disposed", void 0, {
         F: __dxlog_file4,
-        L: 207,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1182,7 +1184,7 @@ var SignalClient = class extends Resource {
             if (client === this._client) {
               log4("socket connected", void 0, {
                 F: __dxlog_file4,
-                L: 218,
+                L: 221,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1197,7 +1199,7 @@ var SignalClient = class extends Resource {
               state: this._state
             }, {
               F: __dxlog_file4,
-              L: 227,
+              L: 230,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1214,7 +1216,7 @@ var SignalClient = class extends Resource {
                 state: this._state
               }, {
                 F: __dxlog_file4,
-                L: 239,
+                L: 242,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1239,14 +1241,14 @@ var SignalClient = class extends Resource {
       state: this._state
     }, {
       F: __dxlog_file4,
-      L: 254,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === SignalState.RECONNECTING) {
       log4.info("Signal api already reconnecting.", void 0, {
         F: __dxlog_file4,
-        L: 257,
+        L: 260,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1288,7 +1290,7 @@ var SignalClient = class extends Resource {
       status: this.getStatus()
     }, {
       F: __dxlog_file4,
-      L: 298,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1641,7 +1643,9 @@ 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, this._getMetadata);
+      server.swarmEvent.on((data) => this.swarmEvent.emit(data));
+      server.onMessage.on((data) => this.onMessage.emit(data));
       server.statusChanged.on(() => this.statusChanged.emit(this.getStatus()));
       this._servers.set(host.server, server);
       this.failureCount.set(host.server, 0);
@@ -1656,7 +1660,7 @@ var WebsocketSignalManager = class {
       hosts: this._hosts
     }, {
       F: __dxlog_file6,
-      L: 85,
+      L: 82,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1664,7 +1668,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 86,
+      L: 83,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1675,7 +1679,7 @@ var WebsocketSignalManager = class {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 93,
+      L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1693,13 +1697,13 @@ var WebsocketSignalManager = class {
       serverName
     }, {
       F: __dxlog_file6,
-      L: 107,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "server already closed", {
       F: __dxlog_file6,
-      L: 108,
+      L: 105,
       S: this,
       A: [
         "this._opened",
@@ -1709,7 +1713,7 @@ var WebsocketSignalManager = class {
     const server = this._servers.get(serverName);
     invariant5(server, "server not found", {
       F: __dxlog_file6,
-      L: 111,
+      L: 108,
       S: this,
       A: [
         "server",
@@ -1729,13 +1733,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file6,
-      L: 124,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file6,
-      L: 125,
+      L: 122,
       S: this,
       A: [
         "this._opened",
@@ -1753,13 +1757,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file6,
-      L: 131,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file6,
-      L: 132,
+      L: 129,
       S: this,
       A: [
         "this._opened",
@@ -1776,13 +1780,13 @@ var WebsocketSignalManager = class {
       recipient
     }, {
       F: __dxlog_file6,
-      L: 145,
+      L: 142,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file6,
-      L: 146,
+      L: 143,
       S: this,
       A: [
         "this._opened",
@@ -1800,7 +1804,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file6,
-            L: 154,
+            L: 151,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1810,7 +1814,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file6,
-            L: 157,
+            L: 154,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1820,7 +1824,7 @@ var WebsocketSignalManager = class {
             err
           }, {
             F: __dxlog_file6,
-            L: 160,
+            L: 157,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1843,7 +1847,7 @@ var WebsocketSignalManager = class {
           failureCount
         }, {
           F: __dxlog_file6,
-          L: 174,
+          L: 171,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1861,7 +1865,7 @@ var WebsocketSignalManager = class {
         serverName
       }, {
         F: __dxlog_file6,
-        L: 187,
+        L: 184,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1874,13 +1878,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file6,
-      L: 194,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file6,
-      L: 195,
+      L: 192,
       S: this,
       A: [
         "this._opened",
@@ -1894,13 +1898,13 @@ var WebsocketSignalManager = class {
       peerId
     }, {
       F: __dxlog_file6,
-      L: 201,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._opened, "Closed", {
       F: __dxlog_file6,
-      L: 202,
+      L: 199,
       S: this,
       A: [
         "this._opened",
@@ -1913,13 +1917,13 @@ var WebsocketSignalManager = class {
     this._ctx = new Context4({
       onError: (err) => log6.catch(err, void 0, {
         F: __dxlog_file6,
-        L: 209,
+        L: 206,
         S: this,
         C: (f, a) => f(...a)
       })
     }, {
       F: __dxlog_file6,
-      L: 208
+      L: 205
     });
   }
   async _forEachServer(fn) {