@dxos/network-manager 0.1.57-main.6b5f268 → 0.1.57-main.b6e249b

package/dist/lib/browser/{chunk-WQ3YXGWP.mjs → chunk-UAB4ONRL.mjs}

@@ -64,7 +64,7 @@ var ConnectionState;
   ] = "CLOSED";
 })(ConnectionState || (ConnectionState = {}));
 var Connection = class {
-  constructor(topic, ownId, remoteId, sessionId, initiator, _signalMessaging, _protocol, _transportFactory) {
+  constructor(topic, ownId, remoteId, sessionId, initiator, _signalMessaging, _protocol, _transportFactory, _callbacks) {
     this.topic = topic;
     this.ownId = ownId;
     this.remoteId = remoteId;
@@ -73,6 +73,7 @@ var Connection = class {
     this._signalMessaging = _signalMessaging;
     this._protocol = _protocol;
     this._transportFactory = _transportFactory;
+    this._callbacks = _callbacks;
     this._ctx = new Context();
     this._state = ConnectionState.INITIAL;
     this._incomingSignalBuffer = [];
@@ -92,7 +93,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 96,
+      L: 109,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -112,7 +113,7 @@ var Connection = class {
   async openConnection() {
     invariant(this._state === ConnectionState.INITIAL, "Invalid state.", {
       F: __dxlog_file,
-      L: 121,
+      L: 134,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -123,7 +124,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 122,
+      L: 135,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -135,7 +136,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 123,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -146,7 +147,7 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       log("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 140,
+        L: 153,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -154,7 +155,7 @@ var Connection = class {
     });
     invariant(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 144,
+      L: 157,
       S: this,
       A: [
         "!this._transport",
@@ -168,6 +169,7 @@ var Connection = class {
     });
     this._transport.connected.once(() => {
       this._changeState(ConnectionState.CONNECTED);
+      this._callbacks?.onConnected?.();
     });
     this._transport.closed.once(() => {
       this._transport = void 0;
@@ -189,7 +191,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 176,
+      L: 190,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -207,7 +209,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 191,
+      L: 205,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -216,7 +218,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 197,
+        L: 211,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -226,7 +228,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 204,
+        L: 218,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -235,11 +237,12 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 207,
+      L: 221,
       S: this,
       C: (f, a) => f(...a)
     });
     this._changeState(ConnectionState.CLOSED);
+    this._callbacks?.onClosed?.(err);
   }
   _sendSignal(signal) {
     this._outgoingSignalBuffer.push(signal);
@@ -277,7 +280,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 243,
+        L: 258,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -290,7 +293,7 @@ var Connection = class {
   async signal(msg) {
     invariant(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 252,
+      L: 267,
       S: this,
       A: [
         "msg.sessionId",
@@ -300,7 +303,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 254,
+        L: 269,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -308,7 +311,7 @@ var Connection = class {
     }
     invariant(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 257,
+      L: 272,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -317,7 +320,7 @@ var Connection = class {
     });
     invariant(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 258,
+      L: 273,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -326,7 +329,7 @@ var Connection = class {
     });
     invariant(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 259,
+      L: 274,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -347,7 +350,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 268,
+          L: 283,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -355,7 +358,7 @@ var Connection = class {
       } else {
         invariant(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 271,
+          L: 286,
           S: this,
           A: [
             "this._transport",
@@ -368,7 +371,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 272,
+          L: 287,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -383,13 +386,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 279,
+      L: 294,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 280,
+      L: 295,
       S: this,
       A: [
         "state !== this._state",
@@ -637,7 +640,7 @@ var SwarmMessenger = class {
 };
 
 // packages/core/mesh/network-manager/src/swarm/swarm.ts
-import { Event as Event2, scheduleTask as scheduleTask2, sleep as sleep2, synchronized as synchronized3 } from "@dxos/async";
+import { Event as Event3, scheduleTask as scheduleTask2, sleep as sleep2, synchronized as synchronized3 } from "@dxos/async";
 import { Context as Context4 } from "@dxos/context";
 import { ErrorStream as ErrorStream2 } from "@dxos/debug";
 import { invariant as invariant4 } from "@dxos/invariant";
@@ -647,9 +650,9 @@ import { trace as trace2 } from "@dxos/protocols";
 import { ComplexMap as ComplexMap2, isNotNullOrUndefined } from "@dxos/util";
 
 // packages/core/mesh/network-manager/src/swarm/peer.ts
-import { scheduleTask, synchronized as synchronized2 } from "@dxos/async";
+import { Event as Event2, scheduleTask, synchronized as synchronized2 } from "@dxos/async";
 import { Context as Context3 } from "@dxos/context";
-import { CancelledError as CancelledError2 } from "@dxos/errors";
+import { CancelledError as CancelledError2, SystemError } from "@dxos/errors";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
@@ -664,6 +667,11 @@ function _ts_decorate2(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
+var ConnectionDisplacedError = class extends SystemError {
+  constructor() {
+    super("Connection displaced by remote initiator.");
+  }
+};
 var CONNECTION_COUNTS_STABLE_AFTER = 5e3;
 var Peer = class {
   // TODO(burdon): Convert to map?
@@ -681,6 +689,7 @@ var Peer = class {
     this._ctx = new Context3();
     this.advertizing = false;
     this.initiating = false;
+    this.connectionDisplaced = new Event2();
   }
   /**
   * Respond to remote offer.
@@ -696,12 +705,12 @@ var Peer = class {
           sessionId: this.connection?.sessionId
         }, {
           F: __dxlog_file3,
-          L: 108,
+          L: 116,
           S: this,
           C: (f, a) => f(...a)
         });
         if (this.connection) {
-          await this.closeConnection(new Error("Connection displaced by remote initiator."));
+          await this.closeConnection(new ConnectionDisplacedError());
         }
       } else {
         return {
@@ -713,7 +722,7 @@ var Peer = class {
       if (!this.connection) {
         invariant3(message.sessionId, void 0, {
           F: __dxlog_file3,
-          L: 128,
+          L: 136,
           S: this,
           A: [
             "message.sessionId",
@@ -733,7 +742,7 @@ var Peer = class {
               err
             }, {
               F: __dxlog_file3,
-              L: 136,
+              L: 144,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -755,7 +764,7 @@ var Peer = class {
   async initiateConnection() {
     invariant3(!this.initiating, "Initiation in progress.", {
       F: __dxlog_file3,
-      L: 153,
+      L: 161,
       S: this,
       A: [
         "!this.initiating",
@@ -764,7 +773,7 @@ var Peer = class {
     });
     invariant3(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 154,
+      L: 162,
       S: this,
       A: [
         "!this.connection",
@@ -779,7 +788,7 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 156,
+      L: 164,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -803,14 +812,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 171,
+        L: 179,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         log3("ignoring response", void 0, {
           F: __dxlog_file3,
-          L: 173,
+          L: 181,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -830,7 +839,7 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 184,
+        L: 192,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -853,13 +862,13 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 198,
+      L: 206,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 205,
+      L: 213,
       S: this,
       A: [
         "!this.connection",
@@ -880,14 +889,9 @@ var Peer = class {
         remotePeerId: this.id,
         topic: this.topic
       }),
-      this._transportFactory
-    );
-    this._callbacks.onInitiated(connection);
-    void this._connectionCtx?.dispose();
-    this._connectionCtx = this._ctx.derive();
-    connection.stateChanged.on((state) => {
-      switch (state) {
-        case ConnectionState.CONNECTED: {
+      this._transportFactory,
+      {
+        onConnected: () => {
           this.availableToConnect = true;
           this._lastConnectionTime = Date.now();
           this._callbacks.onConnected();
@@ -900,13 +904,12 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 231,
+            L: 232,
             S: this,
             C: (f, a) => f(...a)
           });
-          break;
-        }
-        case ConnectionState.CLOSED: {
+        },
+        onClosed: (err) => {
           log3("connection closed", {
             topic: this.topic,
             peerId: this.localPeerId,
@@ -914,13 +917,14 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 242,
+            L: 241,
             S: this,
             C: (f, a) => f(...a)
           });
+          this._connectionLimiter.doneConnecting(sessionId);
           invariant3(this.connection === connection, "Connection mismatch (race condition).", {
             F: __dxlog_file3,
-            L: 243,
+            L: 246,
             S: this,
             A: [
               "this.connection === connection",
@@ -935,27 +939,32 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 245,
+            L: 248,
             S: this,
             C: (f, a) => f(...a)
           });
-          if (this._lastConnectionTime && this._lastConnectionTime + CONNECTION_COUNTS_STABLE_AFTER < Date.now()) {
-            this._availableAfter = 0;
+          if (err instanceof ConnectionDisplacedError) {
+            this.connectionDisplaced.emit(this.connection);
           } else {
-            this.availableToConnect = false;
-            this._availableAfter = increaseInterval(this._availableAfter);
+            if (this._lastConnectionTime && this._lastConnectionTime + CONNECTION_COUNTS_STABLE_AFTER < Date.now()) {
+              this._availableAfter = 0;
+            } else {
+              this.availableToConnect = false;
+              this._availableAfter = increaseInterval(this._availableAfter);
+            }
+            this._callbacks.onDisconnected();
+            scheduleTask(this._connectionCtx, () => {
+              this.availableToConnect = true;
+              this._callbacks.onPeerAvailable();
+            }, this._availableAfter);
           }
           this.connection = void 0;
-          this._callbacks.onDisconnected();
-          this._connectionLimiter.doneConnecting(sessionId);
-          scheduleTask(this._connectionCtx, () => {
-            this.availableToConnect = true;
-            this._callbacks.onPeerAvailable();
-          }, this._availableAfter);
-          break;
         }
       }
-    });
+    );
+    this._callbacks.onInitiated(connection);
+    void this._connectionCtx?.dispose();
+    this._connectionCtx = this._ctx.derive();
     connection.errors.handle((err) => {
       log3.warn("connection error", {
         topic: this.topic,
@@ -965,7 +974,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 279,
+        L: 288,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -978,7 +987,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 280,
+        L: 289,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -997,7 +1006,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 303,
+      L: 314,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1007,7 +1016,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 309,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1018,7 +1027,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 314,
+        L: 325,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1033,7 +1042,7 @@ var Peer = class {
       topic: this.topic
     }, {
       F: __dxlog_file3,
-      L: 324,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1073,7 +1082,7 @@ var getClassName = (obj) => Object.getPrototypeOf(obj).constructor.name;
 var Swarm = class {
   // TODO(burdon): Swarm => Peer.create/destroy =< Connection.open/close
   // TODO(burdon): Split up properties.
-  constructor(_topic, _ownPeerId, _topology, _protocolProvider, _messenger, _transportFactory, _label, _connectionLimiter) {
+  constructor(_topic, _ownPeerId, _topology, _protocolProvider, _messenger, _transportFactory, _label, _connectionLimiter, _initiationDelay = INITIATION_DELAY) {
     this._topic = _topic;
     this._ownPeerId = _ownPeerId;
     this._topology = _topology;
@@ -1082,13 +1091,14 @@ var Swarm = class {
     this._transportFactory = _transportFactory;
     this._label = _label;
     this._connectionLimiter = _connectionLimiter;
+    this._initiationDelay = _initiationDelay;
     this._ctx = new Context4();
     this._listeningHandle = void 0;
     this._peers = new ComplexMap2(PublicKey4.hash);
     this._instanceId = PublicKey4.random().toHex();
-    this.connectionAdded = new Event2();
-    this.disconnected = new Event2();
-    this.connected = new Event2();
+    this.connectionAdded = new Event3();
+    this.disconnected = new Event3();
+    this.connected = new Event3();
     this.errors = new ErrorStream2();
     log4.trace("dxos.mesh.swarm.constructor", trace2.begin({
       id: this._instanceId,
@@ -1098,7 +1108,7 @@ var Swarm = class {
       }
     }), {
       F: __dxlog_file4,
-      L: 87,
+      L: 88,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1106,7 +1116,7 @@ var Swarm = class {
       peerId: _ownPeerId
     }, {
       F: __dxlog_file4,
-      L: 91,
+      L: 92,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1121,7 +1131,7 @@ var Swarm = class {
       id: this._instanceId
     }), {
       F: __dxlog_file4,
-      L: 100,
+      L: 101,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1144,7 +1154,7 @@ var Swarm = class {
   async open() {
     invariant4(!this._listeningHandle, void 0, {
       F: __dxlog_file4,
-      L: 127,
+      L: 128,
       S: this,
       A: [
         "!this._listeningHandle",
@@ -1159,7 +1169,7 @@ var Swarm = class {
           err
         }, {
           F: __dxlog_file4,
-          L: 134,
+          L: 135,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -1169,7 +1179,7 @@ var Swarm = class {
   async destroy() {
     log4("destroying...", void 0, {
       F: __dxlog_file4,
-      L: 140,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1180,7 +1190,7 @@ var Swarm = class {
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key)));
     log4("destroyed", void 0, {
       F: __dxlog_file4,
-      L: 147,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1188,7 +1198,7 @@ var Swarm = class {
   async setTopology(topology) {
     invariant4(!this._ctx.disposed, "Swarm is offline", {
       F: __dxlog_file4,
-      L: 151,
+      L: 152,
       S: this,
       A: [
         "!this._ctx.disposed",
@@ -1203,7 +1213,7 @@ var Swarm = class {
       topology: getClassName(topology)
     }, {
       F: __dxlog_file4,
-      L: 155,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1217,14 +1227,14 @@ var Swarm = class {
       swarmEvent
     }, {
       F: __dxlog_file4,
-      L: 168,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       log4("swarm event ignored for disposed swarm", void 0, {
         F: __dxlog_file4,
-        L: 171,
+        L: 172,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1236,7 +1246,7 @@ var Swarm = class {
         peerId
       }, {
         F: __dxlog_file4,
-        L: 177,
+        L: 178,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1251,7 +1261,7 @@ var Swarm = class {
         if (peer.connection?.state !== ConnectionState.CONNECTED) {
           void this._destroyPeer(peer.id).catch((err) => log4.catch(err, void 0, {
             F: __dxlog_file4,
-            L: 188,
+            L: 189,
             S: this,
             C: (f, a) => f(...a)
           }));
@@ -1265,14 +1275,14 @@ var Swarm = class {
       message
     }, {
       F: __dxlog_file4,
-      L: 198,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       log4("ignored for disposed swarm", void 0, {
         F: __dxlog_file4,
-        L: 200,
+        L: 201,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1282,7 +1292,7 @@ var Swarm = class {
     }
     invariant4(message.author, void 0, {
       F: __dxlog_file4,
-      L: 205,
+      L: 206,
       S: this,
       A: [
         "message.author",
@@ -1294,7 +1304,7 @@ var Swarm = class {
         message
       }, {
         F: __dxlog_file4,
-        L: 207,
+        L: 208,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1307,7 +1317,7 @@ var Swarm = class {
         message
       }, {
         F: __dxlog_file4,
-        L: 211,
+        L: 212,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1325,14 +1335,14 @@ var Swarm = class {
       message
     }, {
       F: __dxlog_file4,
-      L: 222,
+      L: 223,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       log4.info("ignored for offline swarm", void 0, {
         F: __dxlog_file4,
-        L: 224,
+        L: 225,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1340,7 +1350,7 @@ var Swarm = class {
     }
     invariant4(message.recipient?.equals(this._ownPeerId), `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
       F: __dxlog_file4,
-      L: 227,
+      L: 228,
       S: this,
       A: [
         "message.recipient?.equals(this._ownPeerId)",
@@ -1349,7 +1359,7 @@ var Swarm = class {
     });
     invariant4(message.topic?.equals(this._topic), void 0, {
       F: __dxlog_file4,
-      L: 231,
+      L: 232,
       S: this,
       A: [
         "message.topic?.equals(this._topic)",
@@ -1358,7 +1368,7 @@ var Swarm = class {
     });
     invariant4(message.author, void 0, {
       F: __dxlog_file4,
-      L: 232,
+      L: 233,
       S: this,
       A: [
         "message.author",
@@ -1418,7 +1428,7 @@ var Swarm = class {
   async _destroyPeer(peerId) {
     invariant4(this._peers.has(peerId), void 0, {
       F: __dxlog_file4,
-      L: 302,
+      L: 303,
       S: this,
       A: [
         "this._peers.has(peerId)",
@@ -1445,7 +1455,7 @@ var Swarm = class {
           } catch (err) {
             log4("initiation error", err, {
               F: __dxlog_file4,
-              L: 328,
+              L: 329,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1473,11 +1483,11 @@ var Swarm = class {
         remoteId
       }, {
         F: __dxlog_file4,
-        L: 355,
+        L: 356,
         S: this,
         C: (f, a) => f(...a)
       });
-      await sleep2(INITIATION_DELAY);
+      await sleep2(this._initiationDelay);
     }
     if (ctx.disposed) {
       return;
@@ -1490,7 +1500,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 369,
+      L: 370,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1500,7 +1510,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 372,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1536,7 +1546,7 @@ _ts_decorate3([
 ], Swarm.prototype, "goOnline", null);
 
 // packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts
-import { Event as Event3, EventSubscriptions } from "@dxos/async";
+import { Event as Event4, EventSubscriptions } from "@dxos/async";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
 import { ComplexMap as ComplexMap3 } from "@dxos/util";
@@ -1551,7 +1561,7 @@ var SwarmMapper = class {
     this._subscriptions = new EventSubscriptions();
     this._connectionSubscriptions = new ComplexMap3(PublicKey5.hash);
     this._peers = new ComplexMap3(PublicKey5.hash);
-    this.mapUpdated = new Event3();
+    this.mapUpdated = new Event4();
     this._subscriptions.add(_swarm.connectionAdded.on((connection) => {
       this._update();
       this._connectionSubscriptions.set(connection.remoteId, connection.stateChanged.on(() => {
@@ -1688,7 +1698,7 @@ var ConnectionLimiter = class {
 };
 
 // packages/core/mesh/network-manager/src/connection-log.ts
-import { Event as Event4 } from "@dxos/async";
+import { Event as Event5 } from "@dxos/async";
 import { raise } from "@dxos/debug";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { ComplexMap as ComplexMap5 } from "@dxos/util";
@@ -1706,7 +1716,7 @@ var ConnectionLog = class {
     * SwarmId => info
     */
     this._swarms = new ComplexMap5(PublicKey7.hash);
-    this.update = new Event4();
+    this.update = new Event5();
   }
   getSwarmInfo(swarmId) {
     return this._swarms.get(swarmId) ?? raise(new Error(`Swarm not found: ${swarmId}`));
@@ -1758,7 +1768,7 @@ var ConnectionLog = class {
 };
 
 // packages/core/mesh/network-manager/src/network-manager.ts
-import { Event as Event5 } from "@dxos/async";
+import { Event as Event6 } from "@dxos/async";
 import { invariant as invariant6 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
@@ -1775,8 +1785,8 @@ var NetworkManager = class {
     this._swarms = new ComplexMap6(PublicKey8.hash);
     this._mappers = new ComplexMap6(PublicKey8.hash);
     this._connectionState = ConnectionState2.ONLINE;
-    this.connectionStateChanged = new Event5();
-    this.topicsUpdated = new Event5();
+    this.connectionStateChanged = new Event6();
+    this.topicsUpdated = new Event6();
     this._instanceId = PublicKey8.random().toHex();
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
@@ -2250,7 +2260,7 @@ var StarTopology = class {
 
 // packages/core/mesh/network-manager/src/transport/memory-transport.ts
 import { Transform } from "@dxos/node-std/stream";
-import { Event as Event6, Trigger } from "@dxos/async";
+import { Event as Event7, Trigger } from "@dxos/async";
 import { ErrorStream as ErrorStream3 } from "@dxos/debug";
 import { invariant as invariant10 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
@@ -2286,8 +2296,8 @@ var MemoryTransport = class _MemoryTransport {
   }
   constructor(options) {
     this.options = options;
-    this.closed = new Event6();
-    this.connected = new Event6();
+    this.closed = new Event7();
+    this.connected = new Event7();
     this.errors = new ErrorStream3();
     this._instanceId = PublicKey9.random();
     this._remote = new Trigger();
@@ -2436,7 +2446,7 @@ _ts_decorate4([
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport.ts
 import SimplePeerConstructor from "simple-peer";
-import { Event as Event7 } from "@dxos/async";
+import { Event as Event8 } from "@dxos/async";
 import { ErrorStream as ErrorStream4, raise as raise2 } from "@dxos/debug";
 import { invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
@@ -2457,8 +2467,8 @@ var WebRTCTransport = class {
     this.params = params;
     this._instanceId = PublicKey10.random().toHex();
     this._closed = false;
-    this.closed = new Event7();
-    this.connected = new Event7();
+    this.closed = new Event8();
+    this.connected = new Event8();
     this.errors = new ErrorStream4();
     log11.trace("dxos.mesh.webrtc-transport.constructor", trace4.begin({
       id: this._instanceId
@@ -2722,7 +2732,7 @@ var WebRTCTransportService = class {
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts
 import { Writable } from "@dxos/node-std/stream";
-import { Event as Event8 } from "@dxos/async";
+import { Event as Event9 } from "@dxos/async";
 import { Context as Context6 } from "@dxos/context";
 import { ErrorStream as ErrorStream5 } from "@dxos/debug";
 import { invariant as invariant13 } from "@dxos/invariant";
@@ -2737,8 +2747,8 @@ var WebRTCTransportProxy = class {
     this._params = _params;
     this._proxyId = PublicKey12.random();
     this._ctx = new Context6();
-    this.closed = new Event8();
-    this.connected = new Event8();
+    this.closed = new Event9();
+    this.connected = new Event9();
     this.errors = new ErrorStream5();
     this._closed = false;
     this._serviceStream = this._params.bridgeService.open({
@@ -2918,4 +2928,4 @@ export {
   WebRTCTransportProxyFactory,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-WQ3YXGWP.mjs.map
+//# sourceMappingURL=chunk-UAB4ONRL.mjs.map