@dxos/network-manager 0.1.20 → 0.1.21

package/dist/lib/browser/index.mjs

@@ -29,12 +29,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) {
@@ -60,6 +86,10 @@ var Connection = class {
   get protocol() {
     return this._protocol;
   }
+  /**
+  * Create an underlying transport and prepares it for the connection.
+  */
+  // TODO(burdon): Make async?
   openConnection() {
     assert(this._state === ConnectionState.INITIAL, "Invalid state.");
     this._changeState(ConnectionState.CONNECTING);
@@ -197,7 +227,7 @@ __decorate([
 
 // packages/core/mesh/network-manager/src/swarm/swarm.ts
 import assert4 from "@dxos/node-std/assert";
-import { Event as Event2, scheduleTask, sleep } from "@dxos/async";
+import { Event as Event2, scheduleTask, sleep, synchronized as synchronized3 } from "@dxos/async";
 import { Context } from "@dxos/context";
 import { ErrorStream as ErrorStream2 } from "@dxos/debug";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
@@ -283,6 +313,7 @@ var MessageRouter = class {
     var _a;
     const networkMessage = {
       ...message,
+      // Setting unique message_id if it not specified yet.
       messageId: (_a = message.messageId) != null ? _a : PublicKey.random()
     };
     log2("sending", {
@@ -395,17 +426,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()) {
-        log3.info("closing local connection and accepting remote peer's offer", {
+        log3("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)
         });
@@ -432,7 +466,7 @@ var Peer = class {
             err
           }, {
             file: "peer.ts",
-            line: 107,
+            line: 108,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -447,6 +481,9 @@ var Peer = class {
       accept: false
     };
   }
+  /**
+  * Initiate a connection to the remote peer.
+  */
   async initiateConnection() {
     assert3(!this.initiating, "Initiation in progress.");
     assert3(!this.connection, "Already connected.");
@@ -458,7 +495,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 125,
+      line: 126,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -481,14 +518,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) {
         log3("ignoring response", {}, {
           file: "peer.ts",
-          line: 139,
+          line: 140,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -508,7 +545,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 150,
+        line: 151,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -518,6 +555,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) {
     log3("creating connection", {
       topic: this.topic,
@@ -527,7 +568,7 @@ var Peer = class {
       sessionId
     }, {
       file: "peer.ts",
-      line: 164,
+      line: 165,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -539,6 +580,7 @@ var Peer = class {
       sessionId,
       initiator,
       this._signalMessaging,
+      // TODO(dmaretskyi): Init only when connection is established.
       this._protocolProvider({
         initiator,
         localPeerId: this.localPeerId,
@@ -562,7 +604,7 @@ var Peer = class {
             initiator
           }, {
             file: "peer.ts",
-            line: 193,
+            line: 194,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -582,7 +624,7 @@ var Peer = class {
         err
       }, {
         file: "peer.ts",
-        line: 203,
+        line: 204,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -601,7 +643,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 219,
+      line: 220,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -611,7 +653,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "peer.ts",
-      line: 225,
+      line: 226,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -622,7 +664,7 @@ var Peer = class {
         message
       }, {
         file: "peer.ts",
-        line: 230,
+        line: 231,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -637,7 +679,7 @@ var Peer = class {
       topic: this.topic
     }, {
       file: "peer.ts",
-      line: 238,
+      line: 239,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -662,6 +704,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;
@@ -709,12 +753,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() {
     log4("destroying...", {}, {
       file: "swarm.ts",
@@ -733,6 +781,7 @@ var Swarm = class {
     });
   }
   async setTopology(topology) {
+    assert4(!this._ctx.disposed, "Swarm is offline");
     if (topology === this._topology) {
       return;
     }
@@ -741,7 +790,7 @@ var Swarm = class {
       topology: getClassName(topology)
     }, {
       file: "swarm.ts",
-      line: 135,
+      line: 136,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -750,69 +799,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) {
-    assert4(this._peers.has(peerId));
-    await this._peers.get(peerId).destroy();
-    this._peers.delete(peerId);
-  }
   onSwarmEvent(swarmEvent) {
     log4("swarm event", {
       swarmEvent
     }, {
       file: "swarm.ts",
-      line: 199,
+      line: 149,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    if (this._ctx.disposed) {
-      log4.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) {
+        log4.warn("ignored for offline swarm", {}, {
+          file: "swarm.ts",
+          line: 153,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+        return;
+      }
       const peerId = PublicKey3.from(swarmEvent.peerAvailable.peer);
       log4("new peer", {
         peerId
       }, {
         file: "swarm.ts",
-        line: 207,
+        line: 157,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -824,8 +835,13 @@ var Swarm = class {
       const peer1 = this._peers.get(PublicKey3.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) => log4.catch(err, {}, {
+            file: "swarm.ts",
+            line: 168,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          }));
         }
       }
     }
@@ -837,14 +853,14 @@ var Swarm = class {
       message
     }, {
       file: "swarm.ts",
-      line: 226,
+      line: 178,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
-      log4.info("ignored for destroyed swarm", {}, {
+      log4.info("ignored for offline swarm", {}, {
         file: "swarm.ts",
-        line: 228,
+        line: 180,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -858,7 +874,7 @@ var Swarm = class {
         message
       }, {
         file: "swarm.ts",
-        line: 235,
+        line: 187,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -871,7 +887,7 @@ var Swarm = class {
         message
       }, {
         file: "swarm.ts",
-        line: 239,
+        line: 191,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -890,14 +906,14 @@ var Swarm = class {
       message
     }, {
       file: "swarm.ts",
-      line: 250,
+      line: 202,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
-      log4.info("ignored for destroyed swarm", {}, {
+      log4.info("ignored for offline swarm", {}, {
         file: "swarm.ts",
-        line: 252,
+        line: 204,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -909,6 +925,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 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) {
+    assert4(this._peers.has(peerId));
+    await this._peers.get(peerId).destroy();
+    this._peers.delete(peerId);
+  }
   _getSwarmController() {
     return {
       getState: () => ({
@@ -926,7 +1002,7 @@ var Swarm = class {
           } catch (err) {
             log4.warn("initiation error", err, {
               file: "swarm.ts",
-              line: 287,
+              line: 311,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -944,13 +1020,16 @@ var Swarm = class {
       }
     };
   }
+  /**
+  * Creates a connection then sends message over signal network.
+  */
   async _initiateConnection(remoteId) {
     if (remoteId.toHex() < this._ownPeerId.toHex()) {
       log4("initiation delay", {
         remoteId
       }, {
         file: "swarm.ts",
-        line: 312,
+        line: 336,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -967,7 +1046,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 326,
+      line: 350,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -977,7 +1056,7 @@ var Swarm = class {
       remoteId
     }, {
       file: "swarm.ts",
-      line: 329,
+      line: 353,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -999,6 +1078,15 @@ __decorate3([
 __decorate3([
   logInfo
 ], Swarm.prototype, "topic", null);
+__decorate3([
+  synchronized3
+], Swarm.prototype, "onSwarmEvent", null);
+__decorate3([
+  synchronized3
+], Swarm.prototype, "onOffer", null);
+__decorate3([
+  synchronized3
+], Swarm.prototype, "goOnline", null);
 
 // packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts
 import { Event as Event3, EventSubscriptions } from "@dxos/async";
@@ -1009,6 +1097,7 @@ var SwarmMapper = class {
   get peers() {
     return Array.from(this._peers.values());
   }
+  // prettier-ignore
   constructor(_swarm) {
     this._swarm = _swarm;
     this._subscriptions = new EventSubscriptions();
@@ -1062,6 +1151,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();
@@ -1079,6 +1169,9 @@ var EventType;
 })(EventType || (EventType = {}));
 var ConnectionLog = class {
   constructor() {
+    /**
+    * SwarmId => info
+    */
     this._swarms = new ComplexMap4(PublicKey5.hash);
     this.update = new Event4();
   }
@@ -1132,11 +1225,14 @@ import { Event as Event5 } from "@dxos/async";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log6 } from "@dxos/log";
 import { Messenger } from "@dxos/messaging";
+import { ConnectionState as ConnectionState2 } from "@dxos/protocols/proto/dxos/client/services";
 import { ComplexMap as ComplexMap5 } from "@dxos/util";
 var NetworkManager = class {
   constructor({ transportFactory, signalManager, log: log13 }) {
     this._swarms = new ComplexMap5(PublicKey6.hash);
     this._mappers = new ComplexMap5(PublicKey6.hash);
+    this._connectionState = ConnectionState2.ONLINE;
+    this.connectionStateChanged = new Event5();
     this.topicsUpdated = new Event5();
     this._transportFactory = transportFactory;
     this._signalManager = signalManager;
@@ -1155,12 +1251,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());
   }
@@ -1170,19 +1272,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) => {
         log6(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;
     assert5(PublicKey6.isPublicKey(topic));
@@ -1198,7 +1308,7 @@ var NetworkManager = class {
       topology: topology.toString()
     }, {
       file: "network-manager.ts",
-      line: 148,
+      line: 162,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1208,7 +1318,7 @@ var NetworkManager = class {
         error
       }, {
         file: "network-manager.ts",
-        line: 151,
+        line: 165,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1219,7 +1329,7 @@ var NetworkManager = class {
       peerId
     }).catch((error) => log6.catch(error, {}, {
       file: "network-manager.ts",
-      line: 155,
+      line: 169,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
@@ -1231,7 +1341,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "network-manager.ts",
-      line: 160,
+      line: 174,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1239,14 +1349,17 @@ var NetworkManager = class {
       close: () => this.leaveSwarm(topic)
     };
   }
+  /**
+  * Close the connection.
+  */
   async leaveSwarm(topic) {
     var _a;
     if (!this._swarms.has(topic)) {
       log6.warn("swarm not open", {
-        topic: PublicKey6.from(topic)
+        topic: PublicKey6.from(topic).truncate()
       }, {
         file: "network-manager.ts",
-        line: 172,
+        line: 186,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1256,7 +1369,7 @@ var NetworkManager = class {
       topic: PublicKey6.from(topic)
     }, {
       file: "network-manager.ts",
-      line: 176,
+      line: 190,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1277,11 +1390,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 ConnectionState2.OFFLINE: {
+        this._connectionState = state;
+        await this._messenger.close();
+        await this._signalManager.close();
+        await Promise.all([
+          ...this._swarms.values()
+        ].map((swarm) => swarm.goOffline()));
+        break;
+      }
+      case ConnectionState2.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
@@ -1389,6 +1528,7 @@ var sortByXorDistance = (keys, reference) => keys.sort((a, b) => distance.gt(dis
 import assert8 from "@dxos/node-std/assert";
 import { log as log8 } from "@dxos/log";
 var StarTopology = class {
+  // prettier-ignore
   constructor(_centralPeer) {
     this._centralPeer = _centralPeer;
   }
@@ -1612,6 +1752,7 @@ var _MemoryTransport = class {
   }
 };
 var MemoryTransport = _MemoryTransport;
+// TODO(burdon): Remove static properties (inject context into constructor).
 MemoryTransport._connections = new ComplexMap6(PublicKey7.hash);
 __decorate4([
   logInfo2
@@ -1639,12 +1780,13 @@ var WebRTCTransport = class {
   constructor(params) {
     var _a;
     this.params = params;
+    this._closed = false;
     this.closed = new Event7();
     this.connected = new Event7();
     this.errors = new ErrorStream4();
     log10("created connection", params, {
       file: "webrtc-transport.ts",
-      line: 34,
+      line: 35,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1656,7 +1798,7 @@ var WebRTCTransport = class {
     this._peer.on("signal", async (data) => {
       log10("signal", data, {
         file: "webrtc-transport.ts",
-        line: 42,
+        line: 43,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1669,7 +1811,7 @@ var WebRTCTransport = class {
     this._peer.on("connect", () => {
       log10("connected", {}, {
         file: "webrtc-transport.ts",
-        line: 47,
+        line: 48,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1679,7 +1821,7 @@ var WebRTCTransport = class {
     this._peer.on("close", async () => {
       log10("closed", {}, {
         file: "webrtc-transport.ts",
-        line: 53,
+        line: 54,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1694,22 +1836,25 @@ var WebRTCTransport = class {
   async destroy() {
     log10("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();
     log10("closed", {}, {
       file: "webrtc-transport.ts",
-      line: 69,
+      line: 71,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
   signal(signal) {
-    assert10(this._peer, "Connection not ready to accept signals.");
+    if (this._closed) {
+      return;
+    }
     assert10(signal.payload.data, "Signal message must contain signal data.");
     this._peer.signal(signal.payload.data);
   }
@@ -1731,9 +1876,10 @@ import { Duplex } from "@dxos/node-std/stream";
 import { Stream } from "@dxos/codec-protobuf";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
 import { log as log11 } from "@dxos/log";
-import { ConnectionState as ConnectionState2 } from "@dxos/protocols/proto/dxos/mesh/bridge";
+import { ConnectionState as ConnectionState3 } from "@dxos/protocols/proto/dxos/mesh/bridge";
 import { ComplexMap as ComplexMap7 } from "@dxos/util";
 var WebRTCTransportService = class {
+  // prettier-ignore
   constructor(_webrtcConfig) {
     this._webrtcConfig = _webrtcConfig;
     this.transports = new ComplexMap7(PublicKey8.hash);
@@ -1765,20 +1911,20 @@ var WebRTCTransportService = class {
       });
       next({
         connection: {
-          state: ConnectionState2.CONNECTING
+          state: ConnectionState3.CONNECTING
         }
       });
       transport.connected.on(() => {
         next({
           connection: {
-            state: ConnectionState2.CONNECTED
+            state: ConnectionState3.CONNECTED
           }
         });
       });
       transport.errors.handle((err) => {
         next({
           connection: {
-            state: ConnectionState2.CLOSED,
+            state: ConnectionState3.CLOSED,
             error: err.toString()
           }
         });
@@ -1787,7 +1933,7 @@ var WebRTCTransportService = class {
       transport.closed.on(() => {
         next({
           connection: {
-            state: ConnectionState2.CLOSED
+            state: ConnectionState3.CLOSED
           }
         });
         close();
@@ -1825,18 +1971,21 @@ var WebRTCTransportService = class {
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts
 import assert12 from "@dxos/node-std/assert";
 import { Event as Event8 } from "@dxos/async";
+import { Context as Context2 } from "@dxos/context";
 import { ErrorStream as ErrorStream5 } from "@dxos/debug";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
 import { log as log12 } from "@dxos/log";
-import { ConnectionState as ConnectionState3 } from "@dxos/protocols/proto/dxos/mesh/bridge";
+import { ConnectionState as ConnectionState4 } from "@dxos/protocols/proto/dxos/mesh/bridge";
 var WebRTCTransportProxy = class {
+  // prettier-ignore
   constructor(_params) {
     this._params = _params;
+    this._proxyId = PublicKey9.random();
+    this._ctx = new Context2();
     this.closed = new Event8();
     this._closed = false;
     this.connected = new Event8();
     this.errors = new ErrorStream5();
-    this._proxyId = PublicKey9.random();
     this._serviceStream = this._params.bridgeService.open({
       proxyId: this._proxyId,
       initiator: this._params.initiator
@@ -1845,7 +1994,7 @@ var WebRTCTransportProxy = class {
       this._serviceStream.subscribe(async (event) => {
         log12("WebRTCTransportProxy: event", event, {
           file: "webrtc-transport-proxy.ts",
-          line: 46,
+          line: 49,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1857,7 +2006,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,
@@ -1866,15 +2015,19 @@ var WebRTCTransportProxy = class {
         } catch (err) {
           log12.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) => log12.catch(error, {}, {
       file: "webrtc-transport-proxy.ts",
-      line: 67,
+      line: 72,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
@@ -1884,11 +2037,11 @@ var WebRTCTransportProxy = class {
       this.errors.raise(new Error(connectionEvent.error));
     }
     switch (connectionEvent.state) {
-      case ConnectionState3.CONNECTED: {
+      case ConnectionState4.CONNECTED: {
         this.connected.emit();
         break;
       }
-      case ConnectionState3.CLOSED: {
+      case ConnectionState4.CLOSED: {
         await this.destroy();
         break;
       }
@@ -1906,7 +2059,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;
     }
@@ -1918,7 +2073,7 @@ var WebRTCTransportProxy = class {
     } catch (err) {
       log12.catch(err, {}, {
         file: "webrtc-transport-proxy.ts",
-        line: 117,
+        line: 123,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1926,6 +2081,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();
@@ -1936,6 +2095,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) {