@dxos/network-manager 0.1.20 → 0.1.21

package/dist/lib/node/index.cjs

@@ -18,6 +18,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -70,12 +74,38 @@ var __decorate = function(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var ConnectionState;
-(function(ConnectionState4) {
-  ConnectionState4["INITIAL"] = "INITIAL";
-  ConnectionState4["CONNECTING"] = "CONNECTING";
-  ConnectionState4["CONNECTED"] = "CONNECTED";
-  ConnectionState4["CLOSING"] = "CLOSING";
-  ConnectionState4["CLOSED"] = "CLOSED";
+(function(ConnectionState5) {
+  ConnectionState5[
+    /**
+    * Initial state. Connection is registered but no attempt to connect to the remote peer has been performed.
+    * Might mean that we are waiting for the answer signal from the remote peer.
+    */
+    "INITIAL"
+  ] = "INITIAL";
+  ConnectionState5[
+    /**
+    * Trying to establish connection.
+    */
+    "CONNECTING"
+  ] = "CONNECTING";
+  ConnectionState5[
+    /**
+    * Connection is established.
+    */
+    "CONNECTED"
+  ] = "CONNECTED";
+  ConnectionState5[
+    /**
+    * Connection is being closed.
+    */
+    "CLOSING"
+  ] = "CLOSING";
+  ConnectionState5[
+    /**
+    * Connection closed.
+    */
+    "CLOSED"
+  ] = "CLOSED";
 })(ConnectionState || (ConnectionState = {}));
 var Connection = class {
   constructor(topic, ownId, remoteId, sessionId, initiator, _signalMessaging, _protocol, _transportFactory) {
@@ -101,6 +131,10 @@ var Connection = class {
   get protocol() {
     return this._protocol;
   }
+  /**
+  * Create an underlying transport and prepares it for the connection.
+  */
+  // TODO(burdon): Make async?
   openConnection() {
     (0, import_node_assert.default)(this._state === ConnectionState.INITIAL, "Invalid state.");
     this._changeState(ConnectionState.CONNECTING);
@@ -324,6 +358,7 @@ var MessageRouter = class {
     var _a;
     const networkMessage = {
       ...message,
+      // Setting unique message_id if it not specified yet.
       messageId: (_a = message.messageId) != null ? _a : import_keys.PublicKey.random()
     };
     (0, import_log2.log)("sending", {
@@ -436,17 +471,20 @@ var Peer = class {
     this.advertizing = false;
     this.initiating = false;
   }
+  /**
+  * Respond to remote offer.
+  */
   async onOffer(message) {
     const remoteId = message.author;
     if (this.connection || this.initiating) {
       if (remoteId.toHex() < this.localPeerId.toHex()) {
-        import_log3.log.info("closing local connection and accepting remote peer's offer", {
+        (0, import_log3.log)("closing local connection and accepting remote peer's offer", {
           id: this.id,
           topic: this.topic,
           peerId: this.localPeerId
         }, {
           file: "peer.ts",
-          line: 83,
+          line: 84,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -473,7 +511,7 @@ var Peer = class {
             err
           }, {
             file: "peer.ts",
-            line: 107,
+            line: 108,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -488,6 +526,9 @@ var Peer = class {
       accept: false
     };
   }
+  /**
+  * Initiate a connection to the remote peer.
+  */
   async initiateConnection() {
     (0, import_node_assert3.default)(!this.initiating, "Initiation in progress.");
     (0, import_node_assert3.default)(!this.connection, "Already connected.");
@@ -499,7 +540,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 125,
+      line: 126,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -522,14 +563,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         file: "peer.ts",
-        line: 137,
+        line: 138,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         (0, import_log3.log)("ignoring response", {}, {
           file: "peer.ts",
-          line: 139,
+          line: 140,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -549,7 +590,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 150,
+        line: 151,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -559,6 +600,10 @@ var Peer = class {
       this.initiating = false;
     }
   }
+  /**
+  * Create new connection.
+  * Either we're initiating a connection or creating one in response to an offer from the other peer.
+  */
   _createConnection(initiator, sessionId) {
     (0, import_log3.log)("creating connection", {
       topic: this.topic,
@@ -568,7 +613,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 164,
+      line: 165,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -580,6 +625,7 @@ var Peer = class {
       sessionId,
       initiator,
       this._signalMessaging,
+      // TODO(dmaretskyi): Init only when connection is established.
       this._protocolProvider({
         initiator,
         localPeerId: this.localPeerId,
@@ -603,7 +649,7 @@ var Peer = class {
             initiator
           }, {
             file: "peer.ts",
-            line: 193,
+            line: 194,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -623,7 +669,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 203,
+        line: 204,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -642,7 +688,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 219,
+      line: 220,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -652,7 +698,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 225,
+      line: 226,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -663,7 +709,7 @@ var Peer = class {
         message
       }, {
         file: "peer.ts",
-        line: 230,
+        line: 231,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -678,7 +724,7 @@ var Peer = class {
       topic: this.topic
     }, {
       file: "peer.ts",
-      line: 238,
+      line: 239,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -703,6 +749,8 @@ var __decorate3 = function(decorators, target, key, desc) {
 var INITIATION_DELAY = 100;
 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) {
     this._topic = _topic;
     this._ownPeerId = _ownPeerId;
@@ -750,12 +798,16 @@ var Swarm = class {
   get ownPeerId() {
     return this._ownPeerId;
   }
+  /**
+  * Custom label assigned to this swarm. Used in devtools to display human-readable names for swarms.
+  */
   get label() {
     return this._label;
   }
   get topic() {
     return this._topic;
   }
+  // TODO(burdon): async open?
   async destroy() {
     (0, import_log4.log)("destroying...", {}, {
       file: "swarm.ts",
@@ -774,6 +826,7 @@ var Swarm = class {
     });
   }
   async setTopology(topology) {
+    (0, import_node_assert4.default)(!this._ctx.disposed, "Swarm is offline");
     if (topology === this._topology) {
       return;
     }
@@ -782,7 +835,7 @@ var Swarm = class {
       topology: getClassName(topology)
     }, {
       file: "swarm.ts",
-      line: 135,
+      line: 136,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -791,69 +844,31 @@ var Swarm = class {
     this._topology.init(this._getSwarmController());
     this._topology.update();
   }
-  _getOrCreatePeer(peerId) {
-    let peer = this._peers.get(peerId);
-    if (!peer) {
-      peer = new Peer(peerId, this._topic, this._ownPeerId, this._swarmMessenger, this._protocolProvider, this._transportFactory, {
-        onInitiated: (connection) => {
-          this.connectionAdded.emit(connection);
-        },
-        onConnected: () => {
-          this.connected.emit(peerId);
-        },
-        onDisconnected: async () => {
-          if (!peer.advertizing) {
-            await this._destroyPeer(peer.id);
-          }
-          this.disconnected.emit(peerId);
-          this._topology.update();
-        },
-        onRejected: () => {
-          if (this._peers.has(peerId)) {
-            void this._destroyPeer(peerId);
-          }
-        },
-        onAccepted: () => {
-          this._topology.update();
-        },
-        onOffer: (remoteId) => {
-          return this._topology.onOffer(remoteId);
-        }
-      });
-      this._peers.set(peerId, peer);
-    }
-    return peer;
-  }
-  async _destroyPeer(peerId) {
-    (0, import_node_assert4.default)(this._peers.has(peerId));
-    await this._peers.get(peerId).destroy();
-    this._peers.delete(peerId);
-  }
   onSwarmEvent(swarmEvent) {
     (0, import_log4.log)("swarm event", {
       swarmEvent
     }, {
       file: "swarm.ts",
-      line: 199,
+      line: 149,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    if (this._ctx.disposed) {
-      import_log4.log.warn("ignored for destroyed swarm", {}, {
-        file: "swarm.ts",
-        line: 201,
-        scope: this,
-        callSite: (f, a) => f(...a)
-      });
-      return;
-    }
     if (swarmEvent.peerAvailable) {
+      if (this._ctx.disposed) {
+        import_log4.log.warn("ignored for offline swarm", {}, {
+          file: "swarm.ts",
+          line: 153,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+        return;
+      }
       const peerId = import_keys3.PublicKey.from(swarmEvent.peerAvailable.peer);
       (0, import_log4.log)("new peer", {
         peerId
       }, {
         file: "swarm.ts",
-        line: 207,
+        line: 157,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -865,8 +880,13 @@ var Swarm = class {
       const peer1 = this._peers.get(import_keys3.PublicKey.from(swarmEvent.peerLeft.peer));
       if (peer1) {
         peer1.advertizing = false;
-        if (!peer1.connection) {
-          void this._destroyPeer(peer1.id);
+        if (!peer1.connection || peer1.connection.state !== ConnectionState.CONNECTED) {
+          void this._destroyPeer(peer1.id).catch((err) => import_log4.log.catch(err, {}, {
+            file: "swarm.ts",
+            line: 168,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          }));
         }
       }
     }
@@ -878,14 +898,14 @@ var Swarm = class {
       message
     }, {
       file: "swarm.ts",
-      line: 226,
+      line: 178,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
-      import_log4.log.info("ignored for destroyed swarm", {}, {
+      import_log4.log.info("ignored for offline swarm", {}, {
         file: "swarm.ts",
-        line: 228,
+        line: 180,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -899,7 +919,7 @@ var Swarm = class {
         message
       }, {
         file: "swarm.ts",
-        line: 235,
+        line: 187,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -912,7 +932,7 @@ var Swarm = class {
         message
       }, {
         file: "swarm.ts",
-        line: 239,
+        line: 191,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -931,14 +951,14 @@ var Swarm = class {
       message
     }, {
       file: "swarm.ts",
-      line: 250,
+      line: 202,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
-      import_log4.log.info("ignored for destroyed swarm", {}, {
+      import_log4.log.info("ignored for offline swarm", {}, {
         file: "swarm.ts",
-        line: 252,
+        line: 204,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -950,6 +970,66 @@ var Swarm = class {
     const peer = this._getOrCreatePeer(message.author);
     await peer.onSignal(message);
   }
+  // For debug purposes
+  async goOffline() {
+    await this._ctx.dispose();
+    [
+      ...this._peers.values()
+    ].forEach((peer) => {
+      peer.advertizing = false;
+    });
+    await Promise.all([
+      ...this._peers.keys()
+    ].map((peerId) => this._closeConnection(peerId)));
+  }
+  // For debug purposes
+  async goOnline() {
+    this._ctx = new import_context.Context();
+    [
+      ...this._peers.values()
+    ].forEach((peer) => {
+      peer.advertizing = true;
+    });
+    this._topology.update();
+  }
+  _getOrCreatePeer(peerId) {
+    let peer = this._peers.get(peerId);
+    if (!peer) {
+      peer = new Peer(peerId, this._topic, this._ownPeerId, this._swarmMessenger, this._protocolProvider, this._transportFactory, {
+        onInitiated: (connection) => {
+          this.connectionAdded.emit(connection);
+        },
+        onConnected: () => {
+          this.connected.emit(peerId);
+        },
+        onDisconnected: async () => {
+          if (!peer.advertizing) {
+            await this._destroyPeer(peer.id);
+          }
+          this.disconnected.emit(peerId);
+          this._topology.update();
+        },
+        onRejected: () => {
+          if (this._peers.has(peerId)) {
+            void this._destroyPeer(peerId);
+          }
+        },
+        onAccepted: () => {
+          this._topology.update();
+        },
+        onOffer: (remoteId) => {
+          return this._topology.onOffer(remoteId);
+        }
+      });
+      this._peers.set(peerId, peer);
+    }
+    return peer;
+  }
+  async _destroyPeer(peerId) {
+    (0, import_node_assert4.default)(this._peers.has(peerId));
+    await this._peers.get(peerId).destroy();
+    this._peers.delete(peerId);
+  }
   _getSwarmController() {
     return {
       getState: () => ({
@@ -967,7 +1047,7 @@ var Swarm = class {
           } catch (err) {
             import_log4.log.warn("initiation error", err, {
               file: "swarm.ts",
-              line: 287,
+              line: 311,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -985,13 +1065,16 @@ var Swarm = class {
       }
     };
   }
+  /**
+  * Creates a connection then sends message over signal network.
+  */
   async _initiateConnection(remoteId) {
     if (remoteId.toHex() < this._ownPeerId.toHex()) {
       (0, import_log4.log)("initiation delay", {
         remoteId
       }, {
         file: "swarm.ts",
-        line: 312,
+        line: 336,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1008,7 +1091,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 326,
+      line: 350,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1018,7 +1101,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 329,
+      line: 353,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1040,6 +1123,15 @@ __decorate3([
 __decorate3([
   import_log4.logInfo
 ], Swarm.prototype, "topic", null);
+__decorate3([
+  import_async3.synchronized
+], Swarm.prototype, "onSwarmEvent", null);
+__decorate3([
+  import_async3.synchronized
+], Swarm.prototype, "onOffer", null);
+__decorate3([
+  import_async3.synchronized
+], Swarm.prototype, "goOnline", null);
 
 // packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts
 var import_async4 = require("@dxos/async");
@@ -1050,6 +1142,7 @@ var SwarmMapper = class {
   get peers() {
     return Array.from(this._peers.values());
   }
+  // prettier-ignore
   constructor(_swarm) {
     this._swarm = _swarm;
     this._subscriptions = new import_async4.EventSubscriptions();
@@ -1103,6 +1196,7 @@ var SwarmMapper = class {
     });
     this.mapUpdated.emit(Array.from(this._peers.values()));
   }
+  // TODO(burdon): Async open/close.
   destroy() {
     Array.from(this._connectionSubscriptions.values()).forEach((cb) => cb());
     this._subscriptions.clear();
@@ -1120,6 +1214,9 @@ var EventType;
 })(EventType || (EventType = {}));
 var ConnectionLog = class {
   constructor() {
+    /**
+    * SwarmId => info
+    */
     this._swarms = new import_util4.ComplexMap(import_keys5.PublicKey.hash);
     this.update = new import_async5.Event();
   }
@@ -1173,11 +1270,14 @@ var import_async6 = require("@dxos/async");
 var import_keys6 = require("@dxos/keys");
 var import_log6 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
+var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_util5 = require("@dxos/util");
 var NetworkManager = class {
   constructor({ transportFactory, signalManager, log: log13 }) {
     this._swarms = new import_util5.ComplexMap(import_keys6.PublicKey.hash);
     this._mappers = new import_util5.ComplexMap(import_keys6.PublicKey.hash);
+    this._connectionState = import_services.ConnectionState.ONLINE;
+    this.connectionStateChanged = new import_async6.Event();
     this.topicsUpdated = new import_async6.Event();
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
@@ -1196,12 +1296,18 @@ var NetworkManager = class {
       this._connectionLog = new ConnectionLog();
     }
   }
+  // TODO(burdon): Remove access (Devtools only).
   get connectionLog() {
     return this._connectionLog;
   }
+  // TODO(burdon): Remove access (Devtools only).
   get signalManager() {
     return this._signalManager;
   }
+  get connectionState() {
+    return this._connectionState;
+  }
+  // TODO(burdon): Reconcile with "discovery_key".
   get topics() {
     return Array.from(this._swarms.keys());
   }
@@ -1211,19 +1317,27 @@ var NetworkManager = class {
   getSwarm(topic) {
     return this._swarms.get(topic);
   }
+  async open() {
+    await this._messenger.open();
+    await this._signalManager.open();
+  }
   async close() {
     for (const topic of this._swarms.keys()) {
       await this.leaveSwarm(topic).catch((err) => {
         (0, import_log6.log)(err, {}, {
           file: "network-manager.ts",
-          line: 122,
+          line: 136,
           scope: this,
           callSite: (f, a) => f(...a)
         });
       });
     }
-    await this._signalManager.destroy();
+    await this._messenger.close();
+    await this._signalManager.close();
   }
+  /**
+  * Join the swarm.
+  */
   async joinSwarm({ topic, peerId, topology, protocolProvider: protocol, label }) {
     var _a;
     (0, import_node_assert5.default)(import_keys6.PublicKey.isPublicKey(topic));
@@ -1239,7 +1353,7 @@ var NetworkManager = class {
       topology: topology.toString()
     }, {
       file: "network-manager.ts",
-      line: 148,
+      line: 162,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1249,7 +1363,7 @@ var NetworkManager = class {
         error
       }, {
         file: "network-manager.ts",
-        line: 151,
+        line: 165,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1260,7 +1374,7 @@ var NetworkManager = class {
       peerId
     }).catch((error) => import_log6.log.catch(error, {}, {
       file: "network-manager.ts",
-      line: 155,
+      line: 169,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
@@ -1272,7 +1386,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 160,
+      line: 174,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1280,14 +1394,17 @@ var NetworkManager = class {
       close: () => this.leaveSwarm(topic)
     };
   }
+  /**
+  * Close the connection.
+  */
   async leaveSwarm(topic) {
     var _a;
     if (!this._swarms.has(topic)) {
       import_log6.log.warn("swarm not open", {
-        topic: import_keys6.PublicKey.from(topic)
+        topic: import_keys6.PublicKey.from(topic).truncate()
       }, {
         file: "network-manager.ts",
-        line: 172,
+        line: 186,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1297,7 +1414,7 @@ var NetworkManager = class {
       topic: import_keys6.PublicKey.from(topic)
     }, {
       file: "network-manager.ts",
-      line: 176,
+      line: 190,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1318,11 +1435,37 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 190,
+      line: 204,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
+  async setConnectionState(state) {
+    if (state === this._connectionState) {
+      return;
+    }
+    switch (state) {
+      case import_services.ConnectionState.OFFLINE: {
+        this._connectionState = state;
+        await this._messenger.close();
+        await this._signalManager.close();
+        await Promise.all([
+          ...this._swarms.values()
+        ].map((swarm) => swarm.goOffline()));
+        break;
+      }
+      case import_services.ConnectionState.ONLINE: {
+        this._connectionState = state;
+        this._messenger.open();
+        await this._signalManager.open();
+        await Promise.all([
+          ...this._swarms.values()
+        ].map((swarm) => swarm.goOnline()));
+        break;
+      }
+    }
+    this.connectionStateChanged.emit(this._connectionState);
+  }
 };
 
 // packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts
@@ -1430,6 +1573,7 @@ var sortByXorDistance = (keys, reference) => keys.sort((a, b) => import_xor_dist
 var import_node_assert8 = __toESM(require("node:assert"));
 var import_log8 = require("@dxos/log");
 var StarTopology = class {
+  // prettier-ignore
   constructor(_centralPeer) {
     this._centralPeer = _centralPeer;
   }
@@ -1653,6 +1797,7 @@ var _MemoryTransport = class {
   }
 };
 var MemoryTransport = _MemoryTransport;
+// TODO(burdon): Remove static properties (inject context into constructor).
 MemoryTransport._connections = new import_util6.ComplexMap(import_keys7.PublicKey.hash);
 __decorate4([
   import_log9.logInfo
@@ -1680,12 +1825,13 @@ var WebRTCTransport = class {
   constructor(params) {
     var _a;
     this.params = params;
+    this._closed = false;
     this.closed = new import_async8.Event();
     this.connected = new import_async8.Event();
     this.errors = new import_debug5.ErrorStream();
     (0, import_log10.log)("created connection", params, {
       file: "webrtc-transport.ts",
-      line: 34,
+      line: 35,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1697,7 +1843,7 @@ var WebRTCTransport = class {
     this._peer.on("signal", async (data) => {
       (0, import_log10.log)("signal", data, {
         file: "webrtc-transport.ts",
-        line: 42,
+        line: 43,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1710,7 +1856,7 @@ var WebRTCTransport = class {
     this._peer.on("connect", () => {
       (0, import_log10.log)("connected", {}, {
         file: "webrtc-transport.ts",
-        line: 47,
+        line: 48,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1720,7 +1866,7 @@ var WebRTCTransport = class {
     this._peer.on("close", async () => {
       (0, import_log10.log)("closed", {}, {
         file: "webrtc-transport.ts",
-        line: 53,
+        line: 54,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1735,22 +1881,25 @@ var WebRTCTransport = class {
   async destroy() {
     (0, import_log10.log)("closing...", {}, {
       file: "webrtc-transport.ts",
-      line: 65,
+      line: 66,
       scope: this,
       callSite: (f, a) => f(...a)
     });
+    this._closed = true;
     await this._disconnectStreams();
     this._peer.destroy();
     this.closed.emit();
     (0, import_log10.log)("closed", {}, {
       file: "webrtc-transport.ts",
-      line: 69,
+      line: 71,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
   signal(signal) {
-    (0, import_node_assert10.default)(this._peer, "Connection not ready to accept signals.");
+    if (this._closed) {
+      return;
+    }
     (0, import_node_assert10.default)(signal.payload.data, "Signal message must contain signal data.");
     this._peer.signal(signal.payload.data);
   }
@@ -1775,6 +1924,7 @@ var import_log11 = require("@dxos/log");
 var import_bridge = require("@dxos/protocols/proto/dxos/mesh/bridge");
 var import_util7 = require("@dxos/util");
 var WebRTCTransportService = class {
+  // prettier-ignore
   constructor(_webrtcConfig) {
     this._webrtcConfig = _webrtcConfig;
     this.transports = new import_util7.ComplexMap(import_keys8.PublicKey.hash);
@@ -1866,18 +2016,21 @@ var WebRTCTransportService = class {
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts
 var import_node_assert12 = __toESM(require("node:assert"));
 var import_async9 = require("@dxos/async");
+var import_context2 = require("@dxos/context");
 var import_debug6 = require("@dxos/debug");
 var import_keys9 = require("@dxos/keys");
 var import_log12 = require("@dxos/log");
 var import_bridge2 = require("@dxos/protocols/proto/dxos/mesh/bridge");
 var WebRTCTransportProxy = class {
+  // prettier-ignore
   constructor(_params) {
     this._params = _params;
+    this._proxyId = import_keys9.PublicKey.random();
+    this._ctx = new import_context2.Context();
     this.closed = new import_async9.Event();
     this._closed = false;
     this.connected = new import_async9.Event();
     this.errors = new import_debug6.ErrorStream();
-    this._proxyId = import_keys9.PublicKey.random();
     this._serviceStream = this._params.bridgeService.open({
       proxyId: this._proxyId,
       initiator: this._params.initiator
@@ -1886,7 +2039,7 @@ var WebRTCTransportProxy = class {
       this._serviceStream.subscribe(async (event) => {
         (0, import_log12.log)("WebRTCTransportProxy: event", event, {
           file: "webrtc-transport-proxy.ts",
-          line: 46,
+          line: 49,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1898,7 +2051,7 @@ var WebRTCTransportProxy = class {
           await this._handleSignal(event.signal);
         }
       });
-      this._params.stream.on("data", async (data) => {
+      const dataListener = async (data) => {
         try {
           await this._params.bridgeService.sendData({
             proxyId: this._proxyId,
@@ -1907,15 +2060,19 @@ var WebRTCTransportProxy = class {
         } catch (err) {
           import_log12.log.catch(err, {}, {
             file: "webrtc-transport-proxy.ts",
-            line: 63,
+            line: 66,
             scope: this,
             callSite: (f, a) => f(...a)
           });
         }
+      };
+      this._params.stream.on("data", dataListener);
+      this._ctx.onDispose(() => {
+        this._params.stream.off("data", dataListener);
       });
     }, (error) => import_log12.log.catch(error, {}, {
       file: "webrtc-transport-proxy.ts",
-      line: 67,
+      line: 72,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
@@ -1947,7 +2104,9 @@ var WebRTCTransportProxy = class {
       signal
     }).catch((err) => this.errors.raise(err));
   }
+  // TODO(burdon): Move open from constructor.
   async destroy() {
+    await this._ctx.dispose();
     if (this._closed) {
       return;
     }
@@ -1959,7 +2118,7 @@ var WebRTCTransportProxy = class {
     } catch (err) {
       import_log12.log.catch(err, {}, {
         file: "webrtc-transport-proxy.ts",
-        line: 117,
+        line: 123,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1967,6 +2126,10 @@ var WebRTCTransportProxy = class {
     this.closed.emit();
     this._closed = true;
   }
+  /**
+  * Called when underlying proxy service becomes unavailable.
+  */
+  // TODO(burdon): Option on close method.
   forceClose() {
     this._serviceStream.close();
     this.closed.emit();
@@ -1977,6 +2140,10 @@ var WebRTCTransportProxyFactory = class {
   constructor() {
     this._connections = /* @__PURE__ */ new Set();
   }
+  /**
+  * Sets the current BridgeService to be used to open connections.
+  * Calling this method will close any existing connections.
+  */
   setBridgeService(bridgeService) {
     this._bridgeService = bridgeService;
     for (const connection of this._connections) {