@dxos/network-manager 0.1.16 → 0.1.18

package/dist/lib/node/index.cjs

@@ -43,12 +43,8 @@ __export(src_exports, {
   WebRTCTransportProxy: () => WebRTCTransportProxy,
   WebRTCTransportProxyFactory: () => WebRTCTransportProxyFactory,
   WebRTCTransportService: () => WebRTCTransportService,
-  adaptProtocolProvider: () => adaptProtocolProvider,
-  createProtocolFactory: () => createProtocolFactory,
   createTeleportProtocolFactory: () => createTeleportProtocolFactory,
-  createWebRTCTransportFactory: () => createWebRTCTransportFactory,
-  protocolFactory: () => protocolFactory,
-  transportProtocolProvider: () => transportProtocolProvider
+  createWebRTCTransportFactory: () => createWebRTCTransportFactory
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -78,6 +74,7 @@ var ConnectionState;
   ConnectionState4["INITIAL"] = "INITIAL";
   ConnectionState4["CONNECTING"] = "CONNECTING";
   ConnectionState4["CONNECTED"] = "CONNECTED";
+  ConnectionState4["CLOSING"] = "CLOSING";
   ConnectionState4["CLOSED"] = "CLOSED";
 })(ConnectionState || (ConnectionState = {}));
 var Connection = class {
@@ -133,7 +130,11 @@ var Connection = class {
       this._transport = void 0;
       this.close().catch((err) => this.errors.raise(err));
     });
-    this._transport.errors.pipeTo(this.errors);
+    this._transport.errors.handle((err) => {
+      if (this._state !== ConnectionState.CLOSED && this._state !== ConnectionState.CLOSING) {
+        this.errors.raise(err);
+      }
+    });
     for (const signal of this._bufferedSignals) {
       void this._transport.signal(signal);
     }
@@ -144,11 +145,12 @@ var Connection = class {
     if (this._state === ConnectionState.CLOSED) {
       return;
     }
+    this._changeState(ConnectionState.CLOSING);
     (0, import_log.log)("closing...", {
       peerId: this.ownId
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-      line: 131,
+      line: 142,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -157,7 +159,7 @@ var Connection = class {
     } catch (err) {
       import_log.log.catch(err, {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-        line: 137,
+        line: 148,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -167,7 +169,7 @@ var Connection = class {
     } catch (err1) {
       import_log.log.catch(err1, {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-        line: 144,
+        line: 155,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -176,7 +178,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-      line: 147,
+      line: 158,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -188,7 +190,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       (0, import_log.log)("dropping signal for incorrect session id", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-        line: 154,
+        line: 165,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -204,7 +206,7 @@ var Connection = class {
         msg: msg.data
       }, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-        line: 162,
+        line: 173,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -218,7 +220,7 @@ var Connection = class {
       msg: msg.data
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-      line: 168,
+      line: 179,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -625,14 +627,7 @@ var Peer = class {
         scope: this,
         callSite: (f, a) => f(...a)
       });
-      void this.closeConnection().catch(() => {
-        import_log3.log.catch(err, {}, {
-          file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
-          line: 207,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        });
-      });
+      void this.closeConnection();
     });
     this.connection = connection;
     return connection;
@@ -647,7 +642,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
-      line: 221,
+      line: 219,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -657,7 +652,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
-      line: 227,
+      line: 225,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -668,7 +663,7 @@ var Peer = class {
         message
       }, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
-        line: 232,
+        line: 230,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -683,7 +678,7 @@ var Peer = class {
       topic: this.topic
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
-      line: 240,
+      line: 238,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1055,9 +1050,8 @@ var SwarmMapper = class {
   get peers() {
     return Array.from(this._peers.values());
   }
-  constructor(_swarm, _presence) {
+  constructor(_swarm) {
     this._swarm = _swarm;
-    this._presence = _presence;
     this._subscriptions = new import_async4.EventSubscriptions();
     this._connectionSubscriptions = new import_util3.ComplexMap(import_keys4.PublicKey.hash);
     this._peers = new import_util3.ComplexMap(import_keys4.PublicKey.hash);
@@ -1074,17 +1068,12 @@ var SwarmMapper = class {
       this._connectionSubscriptions.delete(peerId);
       this._update();
     }));
-    if (_presence) {
-      this._subscriptions.add(_presence.graphUpdated.on(() => {
-        this._update();
-      }));
-    }
     this._update();
   }
   _update() {
     (0, import_log5.log)("updating swarm", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts",
-      line: 77,
+      line: 75,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1103,32 +1092,12 @@ var SwarmMapper = class {
         ]
       });
     }
-    if (this._presence) {
-      this._presence.graph.forEachNode((node) => {
-        const id = import_keys4.PublicKey.fromHex(node.id);
-        if (this._peers.has(id)) {
-          return;
-        }
-        this._peers.set(id, {
-          id,
-          state: "INDIRECTLY_CONNECTED",
-          connections: []
-        });
-      });
-      this._presence.graph.forEachLink((link) => {
-        const from = import_keys4.PublicKey.from(link.fromId);
-        const to = import_keys4.PublicKey.from(link.toId);
-        if (!from.equals(this._swarm.ownPeerId) && !to.equals(this._swarm.ownPeerId)) {
-          this._peers.get(from).connections.push(to);
-        }
-      });
-    }
     (0, import_log5.log)("graph changed", {
       directConnections: this._swarm.connections.length,
       totalPeersInSwarm: this._peers.size
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts",
-      line: 118,
+      line: 116,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1172,13 +1141,12 @@ var ConnectionLog = class {
     this._swarms.set(swarm.instanceId, info);
     this.update.emit();
     swarm.connectionAdded.on((connection) => {
-      var _a, _b, _c, _d, _e;
       const connectionInfo = {
         state: ConnectionState.INITIAL,
         remotePeerId: connection.remoteId,
         sessionId: connection.sessionId,
         transport: connection.transport && Object.getPrototypeOf(connection.transport).constructor.name,
-        protocolExtensions: (_a = connection.protocol.protocol) == null ? void 0 : _a.extensionNames,
+        protocolExtensions: [],
         events: []
       };
       info.connections.push(connectionInfo);
@@ -1191,32 +1159,6 @@ var ConnectionLog = class {
         });
         this.update.emit();
       });
-      (_b = connection.protocol.protocol) == null ? void 0 : _b.error.on((error) => {
-        var _a2;
-        connectionInfo.events.push({
-          type: EventType.PROTOCOL_ERROR,
-          error: (_a2 = error.stack) != null ? _a2 : error.message
-        });
-        this.update.emit();
-      });
-      (_c = connection.protocol.protocol) == null ? void 0 : _c.extensionsInitialized.on(() => {
-        connectionInfo.events.push({
-          type: EventType.PROTOCOL_EXTENSIONS_INITIALIZED
-        });
-        this.update.emit();
-      });
-      (_d = connection.protocol.protocol) == null ? void 0 : _d.extensionsHandshake.on(() => {
-        connectionInfo.events.push({
-          type: EventType.PROTOCOL_EXTENSIONS_HANDSHAKE
-        });
-        this.update.emit();
-      });
-      (_e = connection.protocol.protocol) == null ? void 0 : _e.handshake.on(() => {
-        connectionInfo.events.push({
-          type: EventType.PROTOCOL_HANDSHAKE
-        });
-        this.update.emit();
-      });
     });
   }
   swarmLeft(swarm) {
@@ -1233,7 +1175,7 @@ var import_log6 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_util5 = require("@dxos/util");
 var NetworkManager = class {
-  constructor({ transportFactory, signalManager, log: log14 }) {
+  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.topicsUpdated = new import_async6.Event();
@@ -1250,7 +1192,7 @@ var NetworkManager = class {
       join: (opts) => this._signalManager.join(opts),
       leave: (opts) => this._signalManager.leave(opts)
     };
-    if (log14) {
+    if (log13) {
       this._connectionLog = new ConnectionLog();
     }
   }
@@ -1274,7 +1216,7 @@ var NetworkManager = class {
       await this.leaveSwarm(topic).catch((err) => {
         (0, import_log6.log)(err, {}, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-          line: 128,
+          line: 122,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1282,7 +1224,7 @@ var NetworkManager = class {
     }
     await this._signalManager.destroy();
   }
-  async joinSwarm({ topic, peerId, topology, protocolProvider: protocol, presence, label }) {
+  async joinSwarm({ topic, peerId, topology, protocolProvider: protocol, label }) {
     var _a;
     (0, import_node_assert5.default)(import_keys6.PublicKey.isPublicKey(topic));
     (0, import_node_assert5.default)(import_keys6.PublicKey.isPublicKey(peerId));
@@ -1297,7 +1239,7 @@ var NetworkManager = class {
       topology: topology.toString()
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 155,
+      line: 148,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1307,7 +1249,7 @@ var NetworkManager = class {
         error
       }, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-        line: 158,
+        line: 151,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1318,11 +1260,11 @@ var NetworkManager = class {
       peerId
     }).catch((error) => import_log6.log.catch(error, {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 162,
+      line: 155,
       scope: this,
       callSite: (f, a) => f(...a)
     }));
-    this._mappers.set(topic, new SwarmMapper(swarm, presence));
+    this._mappers.set(topic, new SwarmMapper(swarm));
     this.topicsUpdated.emit();
     (_a = this._connectionLog) == null ? void 0 : _a.swarmJoined(swarm);
     (0, import_log6.log)("joined", {
@@ -1330,7 +1272,7 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 167,
+      line: 160,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1345,7 +1287,7 @@ var NetworkManager = class {
         topic: import_keys6.PublicKey.from(topic)
       }, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-        line: 179,
+        line: 172,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1355,7 +1297,7 @@ var NetworkManager = class {
       topic: import_keys6.PublicKey.from(topic)
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 183,
+      line: 176,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1376,85 +1318,25 @@ var NetworkManager = class {
       count: this._swarms.size
     }, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 197,
+      line: 190,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
 };
 
-// packages/core/mesh/network-manager/src/protocol-factory.ts
-var import_node_assert6 = __toESM(require("node:assert"));
-var import_crypto = require("@dxos/crypto");
-var import_keys7 = require("@dxos/keys");
-var import_log7 = require("@dxos/log");
-var import_mesh_protocol = require("@dxos/mesh-protocol");
-var protocolFactory = ({ session = {}, plugins = [], getTopics }) => {
-  (0, import_node_assert6.default)(getTopics);
-  return ({ channel, initiator }) => {
-    (0, import_log7.log)("creating protocol", {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/protocol-factory.ts",
-      line: 41,
-      scope: void 0,
-      callSite: (f, a) => f(...a)
-    });
-    const protocol = new import_mesh_protocol.Protocol({
-      streamOptions: {
-        live: true
-      },
-      discoveryToPublicKey: (dk) => {
-        const publicKey = getTopics().find((topic) => (0, import_crypto.discoveryKey)(topic).equals(dk));
-        if (publicKey) {
-          protocol.setContext({
-            topic: import_keys7.PublicKey.stringify(publicKey)
-          });
-        }
-        (0, import_node_assert6.default)(publicKey, "PublicKey not found in discovery.");
-        return publicKey;
-      },
-      initiator,
-      userSession: session,
-      discoveryKey: channel
-    });
-    protocol.setExtensions(plugins.map((plugin) => plugin.createExtension())).init();
-    return protocol;
-  };
-};
-var createProtocolFactory = (topic, peerId, plugins) => protocolFactory({
-  getTopics: () => [
-    topic.asBuffer()
-  ],
-  session: {
-    peerId: import_keys7.PublicKey.stringify(peerId.asBuffer())
-  },
-  plugins
-});
-var transportProtocolProvider = (rendezvousKey, peerId, protocolPlugin) => {
-  return protocolFactory({
-    getTopics: () => [
-      rendezvousKey
-    ],
-    session: {
-      peerId: import_keys7.PublicKey.stringify(peerId)
-    },
-    plugins: [
-      protocolPlugin
-    ]
-  });
-};
-
 // packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts
-var import_node_assert7 = __toESM(require("node:assert"));
+var import_node_assert6 = __toESM(require("node:assert"));
 var FullyConnectedTopology = class {
   toString() {
     return "FullyConnectedTopology";
   }
   init(controller) {
-    (0, import_node_assert7.default)(!this._controller, "Already initialized");
+    (0, import_node_assert6.default)(!this._controller, "Already initialized");
     this._controller = controller;
   }
   update() {
-    (0, import_node_assert7.default)(this._controller, "Not initialized");
+    (0, import_node_assert6.default)(this._controller, "Not initialized");
     const { candidates: discovered } = this._controller.getState();
     for (const peer of discovered) {
       this._controller.connect(peer);
@@ -1468,9 +1350,9 @@ var FullyConnectedTopology = class {
 };
 
 // packages/core/mesh/network-manager/src/topology/mmst-topology.ts
-var import_node_assert8 = __toESM(require("node:assert"));
+var import_node_assert7 = __toESM(require("node:assert"));
 var import_xor_distance = __toESM(require("xor-distance"));
-var import_log8 = require("@dxos/log");
+var import_log7 = require("@dxos/log");
 var MMSTTopology = class {
   constructor({ originateConnections = 2, maxPeers = 4, sampleSize = 10 } = {}) {
     this._sampleCollected = false;
@@ -1479,14 +1361,14 @@ var MMSTTopology = class {
     this._sampleSize = sampleSize;
   }
   init(controller) {
-    (0, import_node_assert8.default)(!this._controller, "Already initialized");
+    (0, import_node_assert7.default)(!this._controller, "Already initialized");
     this._controller = controller;
   }
   update() {
-    (0, import_node_assert8.default)(this._controller, "Not initialized");
+    (0, import_node_assert7.default)(this._controller, "Not initialized");
     const { connected, candidates } = this._controller.getState();
     if (this._sampleCollected || connected.length > this._maxPeers || candidates.length > 0) {
-      (0, import_log8.log)("Running the algorithm.", {}, {
+      (0, import_log7.log)("Running the algorithm.", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts",
         line: 55,
         scope: this,
@@ -1497,10 +1379,10 @@ var MMSTTopology = class {
     }
   }
   async onOffer(peer) {
-    (0, import_node_assert8.default)(this._controller, "Not initialized");
+    (0, import_node_assert7.default)(this._controller, "Not initialized");
     const { connected } = this._controller.getState();
     const accept = connected.length < this._maxPeers;
-    (0, import_log8.log)(`Offer ${peer} accept=${accept}`, {}, {
+    (0, import_log7.log)(`Offer ${peer} accept=${accept}`, {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts",
       line: 65,
       scope: this,
@@ -1511,12 +1393,12 @@ var MMSTTopology = class {
   async destroy() {
   }
   _runAlgorithm() {
-    (0, import_node_assert8.default)(this._controller, "Not initialized");
+    (0, import_node_assert7.default)(this._controller, "Not initialized");
     const { connected, candidates, ownPeerId } = this._controller.getState();
     if (connected.length > this._maxPeers) {
       const sorted = sortByXorDistance(connected, ownPeerId).reverse().slice(0, this._maxPeers - connected.length);
       for (const peer of sorted) {
-        (0, import_log8.log)(`Disconnect ${peer}.`, {}, {
+        (0, import_log7.log)(`Disconnect ${peer}.`, {}, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts",
           line: 83,
           scope: this,
@@ -1528,7 +1410,7 @@ var MMSTTopology = class {
       const sample = candidates.sort(() => Math.random() - 0.5).slice(0, this._sampleSize);
       const sorted1 = sortByXorDistance(sample, ownPeerId).slice(0, this._originateConnections - connected.length);
       for (const peer1 of sorted1) {
-        (0, import_log8.log)(`Connect ${peer1}.`, {}, {
+        (0, import_log7.log)(`Connect ${peer1}.`, {}, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts",
           line: 91,
           scope: this,
@@ -1545,8 +1427,8 @@ var MMSTTopology = class {
 var sortByXorDistance = (keys, reference) => keys.sort((a, b) => import_xor_distance.default.gt((0, import_xor_distance.default)(a.asBuffer(), reference.asBuffer()), (0, import_xor_distance.default)(b.asBuffer(), reference.asBuffer())));
 
 // packages/core/mesh/network-manager/src/topology/star-topology.ts
-var import_node_assert9 = __toESM(require("node:assert"));
-var import_log9 = require("@dxos/log");
+var import_node_assert8 = __toESM(require("node:assert"));
+var import_log8 = require("@dxos/log");
 var StarTopology = class {
   constructor(_centralPeer) {
     this._centralPeer = _centralPeer;
@@ -1555,14 +1437,14 @@ var StarTopology = class {
     return `StarTopology(${this._centralPeer.truncate()})`;
   }
   init(controller) {
-    (0, import_node_assert9.default)(!this._controller, "Already initialized.");
+    (0, import_node_assert8.default)(!this._controller, "Already initialized.");
     this._controller = controller;
   }
   update() {
-    (0, import_node_assert9.default)(this._controller, "Not initialized.");
+    (0, import_node_assert8.default)(this._controller, "Not initialized.");
     const { candidates, connected, ownPeerId } = this._controller.getState();
     if (!ownPeerId.equals(this._centralPeer)) {
-      (0, import_log9.log)("leaf peer dropping all connections apart from central peer.", {}, {
+      (0, import_log8.log)("leaf peer dropping all connections apart from central peer.", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts",
         line: 33,
         scope: this,
@@ -1570,7 +1452,7 @@ var StarTopology = class {
       });
       for (const peer of connected) {
         if (!peer.equals(this._centralPeer)) {
-          (0, import_log9.log)("dropping connection", {
+          (0, import_log8.log)("dropping connection", {
             peer
           }, {
             file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts",
@@ -1584,7 +1466,7 @@ var StarTopology = class {
     }
     for (const peer1 of candidates) {
       if (peer1.equals(this._centralPeer) || ownPeerId.equals(this._centralPeer)) {
-        (0, import_log9.log)("connecting to peer", {
+        (0, import_log8.log)("connecting to peer", {
           peer: peer1
         }, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts",
@@ -1597,9 +1479,9 @@ var StarTopology = class {
     }
   }
   async onOffer(peer) {
-    (0, import_node_assert9.default)(this._controller, "Not initialized.");
+    (0, import_node_assert8.default)(this._controller, "Not initialized.");
     const { ownPeerId } = this._controller.getState();
-    (0, import_log9.log)("offer", {
+    (0, import_log8.log)("offer", {
       peer,
       isCentral: peer.equals(this._centralPeer),
       isSelfCentral: ownPeerId.equals(this._centralPeer)
@@ -1616,13 +1498,23 @@ var StarTopology = class {
 };
 
 // packages/core/mesh/network-manager/src/transport/memory-transport.ts
-var import_node_assert10 = __toESM(require("node:assert"));
+var import_node_assert9 = __toESM(require("node:assert"));
 var import_node_stream = require("node:stream");
 var import_async7 = require("@dxos/async");
 var import_debug4 = require("@dxos/debug");
-var import_keys8 = require("@dxos/keys");
-var import_log10 = require("@dxos/log");
+var import_keys7 = require("@dxos/keys");
+var import_log9 = require("@dxos/log");
 var import_util6 = require("@dxos/util");
+var __decorate4 = function(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var MEMORY_TRANSPORT_DELAY = 1;
 var createStreamDelay = (delay) => {
   return new import_node_stream.Transform({
@@ -1642,34 +1534,30 @@ var _MemoryTransport = class {
     this.closed = new import_async7.Event();
     this.connected = new import_async7.Event();
     this.errors = new import_debug4.ErrorStream();
-    this._id = import_keys8.PublicKey.random();
     this._remote = new import_async7.Trigger();
     this._outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._destroyed = false;
-    (0, import_log10.log)("creating", {
-      id: this._id
-    }, {
+    this._instanceId = import_keys7.PublicKey.random();
+    (0, import_log9.log)("creating", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-      line: 59,
+      line: 64,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    (0, import_node_assert10.default)(!_MemoryTransport._connections.has(this._id), "Duplicate memory connection");
-    _MemoryTransport._connections.set(this._id, this);
+    (0, import_node_assert9.default)(!_MemoryTransport._connections.has(this._instanceId), "Duplicate memory connection");
+    _MemoryTransport._connections.set(this._instanceId, this);
     if (this.options.initiator) {
       setTimeout(async () => {
-        (0, import_log10.log)("sending signal", {
-          transportId: this._id
-        }, {
+        (0, import_log9.log)("sending signal", {}, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-          line: 68,
+          line: 73,
           scope: this,
           callSite: (f, a) => f(...a)
         });
         void this.options.sendSignal({
           payload: {
-            transportId: this._id.toHex()
+            transportId: this._instanceId.toHex()
           }
         });
       });
@@ -1680,22 +1568,19 @@ var _MemoryTransport = class {
         if (this._destroyed) {
           return;
         }
-        this._remoteId = remoteId;
-        this._remoteConnection = _MemoryTransport._connections.get(this._remoteId);
+        this._remoteInstanceId = remoteId;
+        this._remoteConnection = _MemoryTransport._connections.get(this._remoteInstanceId);
         if (!this._remoteConnection) {
           this._destroyed = true;
           this.closed.emit();
           return;
         }
-        (0, import_node_assert10.default)(!this._remoteConnection._remoteConnection, new Error(`Remote already connected: ${this._remoteId}`));
+        (0, import_node_assert9.default)(!this._remoteConnection._remoteConnection, new Error(`Remote already connected: ${this._remoteInstanceId}`));
         this._remoteConnection._remoteConnection = this;
-        this._remoteConnection._remoteId = this._id;
-        (0, import_log10.log)("connected", {
-          id: this._id,
-          remote: this._remoteId
-        }, {
+        this._remoteConnection._remoteInstanceId = this._instanceId;
+        (0, import_log9.log)("connected", {}, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-          line: 94,
+          line: 102,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1711,80 +1596,77 @@ var _MemoryTransport = class {
     }
   }
   async destroy() {
-    (0, import_log10.log)("closing", {
-      id: this._id
-    }, {
+    (0, import_log9.log)("closing", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-      line: 115,
+      line: 123,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     this._destroyed = true;
-    _MemoryTransport._connections.delete(this._id);
+    _MemoryTransport._connections.delete(this._instanceId);
     if (this._remoteConnection) {
-      (0, import_log10.log)("closing", {
-        id: this._remoteId
-      }, {
+      (0, import_log9.log)("closing", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-        line: 120,
+        line: 128,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       this._remoteConnection._destroyed = true;
-      _MemoryTransport._connections.delete(this._remoteId);
+      _MemoryTransport._connections.delete(this._remoteInstanceId);
       this._outgoingDelay.unpipe();
       this._incomingDelay.unpipe();
       this._remoteConnection.closed.emit();
       this._remoteConnection._remoteConnection = void 0;
       this._remoteConnection = void 0;
-      (0, import_log10.log)("closed", {
-        id: this._remoteId
-      }, {
+      (0, import_log9.log)("closed", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-        line: 138,
+        line: 146,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     }
     this.closed.emit();
-    (0, import_log10.log)("closed", {
-      id: this._id
-    }, {
+    (0, import_log9.log)("closed", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-      line: 142,
+      line: 150,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
-  signal(signal) {
-    const { payload: json } = signal;
-    if (json && json.transportId) {
-      const transportId = json.transportId;
-      if (transportId) {
-        const remoteId = import_keys8.PublicKey.fromHex(transportId);
-        (0, import_log10.log)("received signal", {
-          id: this._id,
-          remoteId
-        }, {
-          file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-          line: 152,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        });
-        this._remote.wake(remoteId);
-      }
+  signal({ payload }) {
+    (0, import_log9.log)("received signal", {
+      payload
+    }, {
+      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
+      line: 154,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    if (!(payload == null ? void 0 : payload.transportId)) {
+      return;
+    }
+    const transportId = payload.transportId;
+    if (transportId) {
+      const remoteId = import_keys7.PublicKey.fromHex(transportId);
+      this._remote.wake(remoteId);
     }
   }
 };
 var MemoryTransport = _MemoryTransport;
-MemoryTransport._connections = new import_util6.ComplexMap(import_keys8.PublicKey.hash);
+MemoryTransport._connections = new import_util6.ComplexMap(import_keys7.PublicKey.hash);
+__decorate4([
+  import_log9.logInfo
+], MemoryTransport.prototype, "_instanceId", void 0);
+__decorate4([
+  import_log9.logInfo
+], MemoryTransport.prototype, "_remoteInstanceId", void 0);
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport.ts
-var import_node_assert11 = __toESM(require("node:assert"));
+var import_node_assert10 = __toESM(require("node:assert"));
 var import_simple_peer = __toESM(require("simple-peer"));
 var import_async8 = require("@dxos/async");
 var import_debug5 = require("@dxos/debug");
-var import_log11 = require("@dxos/log");
+var import_log10 = require("@dxos/log");
 
 // packages/core/mesh/network-manager/src/transport/webrtc.ts
 var wrtc = null;
@@ -1801,7 +1683,7 @@ var WebRTCTransport = class {
     this.closed = new import_async8.Event();
     this.connected = new import_async8.Event();
     this.errors = new import_debug5.ErrorStream();
-    (0, import_log11.log)("created connection", params, {
+    (0, import_log10.log)("created connection", params, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
       line: 34,
       scope: this,
@@ -1813,7 +1695,7 @@ var WebRTCTransport = class {
       config: this.params.webrtcConfig
     });
     this._peer.on("signal", async (data) => {
-      (0, import_log11.log)("signal", data, {
+      (0, import_log10.log)("signal", data, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
         line: 42,
         scope: this,
@@ -1826,7 +1708,7 @@ var WebRTCTransport = class {
       });
     });
     this._peer.on("connect", () => {
-      (0, import_log11.log)("connected", {}, {
+      (0, import_log10.log)("connected", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
         line: 47,
         scope: this,
@@ -1836,7 +1718,7 @@ var WebRTCTransport = class {
       this.connected.emit();
     });
     this._peer.on("close", async () => {
-      (0, import_log11.log)("closed", {}, {
+      (0, import_log10.log)("closed", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
         line: 53,
         scope: this,
@@ -1851,7 +1733,7 @@ var WebRTCTransport = class {
     });
   }
   async destroy() {
-    (0, import_log11.log)("closing...", {}, {
+    (0, import_log10.log)("closing...", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
       line: 65,
       scope: this,
@@ -1860,7 +1742,7 @@ var WebRTCTransport = class {
     await this._disconnectStreams();
     this._peer.destroy();
     this.closed.emit();
-    (0, import_log11.log)("closed", {}, {
+    (0, import_log10.log)("closed", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
       line: 69,
       scope: this,
@@ -1868,8 +1750,8 @@ var WebRTCTransport = class {
     });
   }
   signal(signal) {
-    (0, import_node_assert11.default)(this._peer, "Connection not ready to accept signals.");
-    (0, import_node_assert11.default)(signal.payload.data, "Signal message must contain signal data.");
+    (0, import_node_assert10.default)(this._peer, "Connection not ready to accept signals.");
+    (0, import_node_assert10.default)(signal.payload.data, "Signal message must contain signal data.");
     this._peer.signal(signal.payload.data);
   }
   async _disconnectStreams() {
@@ -1885,17 +1767,17 @@ var createWebRTCTransportFactory = (webrtcConfig) => ({
 });
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts
-var import_node_assert12 = __toESM(require("node:assert"));
+var import_node_assert11 = __toESM(require("node:assert"));
 var import_node_stream2 = require("node:stream");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
-var import_keys9 = require("@dxos/keys");
-var import_log12 = require("@dxos/log");
+var import_keys8 = require("@dxos/keys");
+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 {
   constructor(_webrtcConfig) {
     this._webrtcConfig = _webrtcConfig;
-    this.transports = new import_util7.ComplexMap(import_keys9.PublicKey.hash);
+    this.transports = new import_util7.ComplexMap(import_keys8.PublicKey.hash);
   }
   open(request) {
     const rpcStream = new import_codec_protobuf.Stream(({ ready, next, close }) => {
@@ -1960,11 +1842,11 @@ var WebRTCTransportService = class {
     return rpcStream;
   }
   async sendSignal({ proxyId, signal }) {
-    (0, import_node_assert12.default)(this.transports.has(proxyId));
+    (0, import_node_assert11.default)(this.transports.has(proxyId));
     await this.transports.get(proxyId).transport.signal(signal);
   }
   async sendData({ proxyId, payload }) {
-    (0, import_node_assert12.default)(this.transports.has(proxyId));
+    (0, import_node_assert11.default)(this.transports.has(proxyId));
     await this.transports.get(proxyId).stream.push(payload);
   }
   async close({ proxyId }) {
@@ -1972,7 +1854,7 @@ var WebRTCTransportService = class {
     await ((_a = this.transports.get(proxyId)) == null ? void 0 : _a.transport.destroy());
     await ((_b = this.transports.get(proxyId)) == null ? void 0 : _b.stream.end());
     this.transports.delete(proxyId);
-    (0, import_log12.log)("Closed.", {}, {
+    (0, import_log11.log)("Closed.", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts",
       line: 108,
       scope: this,
@@ -1982,11 +1864,11 @@ var WebRTCTransportService = class {
 };
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts
-var import_node_assert13 = __toESM(require("node:assert"));
+var import_node_assert12 = __toESM(require("node:assert"));
 var import_async9 = require("@dxos/async");
 var import_debug6 = require("@dxos/debug");
-var import_keys10 = require("@dxos/keys");
-var import_log13 = require("@dxos/log");
+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 {
   constructor(_params) {
@@ -1995,14 +1877,14 @@ var WebRTCTransportProxy = class {
     this._closed = false;
     this.connected = new import_async9.Event();
     this.errors = new import_debug6.ErrorStream();
-    this._proxyId = import_keys10.PublicKey.random();
+    this._proxyId = import_keys9.PublicKey.random();
     this._serviceStream = this._params.bridgeService.open({
       proxyId: this._proxyId,
       initiator: this._params.initiator
     });
     this._serviceStream.waitUntilReady().then(() => {
       this._serviceStream.subscribe(async (event) => {
-        (0, import_log13.log)("WebRTCTransportProxy: event", event, {
+        (0, import_log12.log)("WebRTCTransportProxy: event", event, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
           line: 46,
           scope: this,
@@ -2023,7 +1905,7 @@ var WebRTCTransportProxy = class {
             payload: data
           });
         } catch (err) {
-          import_log13.log.catch(err, {}, {
+          import_log12.log.catch(err, {}, {
             file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
             line: 63,
             scope: this,
@@ -2031,7 +1913,7 @@ var WebRTCTransportProxy = class {
           });
         }
       });
-    }, (error) => import_log13.log.catch(error, {}, {
+    }, (error) => import_log12.log.catch(error, {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
       line: 67,
       scope: this,
@@ -2075,7 +1957,7 @@ var WebRTCTransportProxy = class {
         proxyId: this._proxyId
       });
     } catch (err) {
-      import_log13.log.catch(err, {}, {
+      import_log12.log.catch(err, {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
         line: 117,
         scope: this,
@@ -2103,7 +1985,7 @@ var WebRTCTransportProxyFactory = class {
     return this;
   }
   createTransport(options) {
-    (0, import_node_assert13.default)(this._bridgeService, "WebRTCTransportProxyFactory is not ready to open connections");
+    (0, import_node_assert12.default)(this._bridgeService, "WebRTCTransportProxyFactory is not ready to open connections");
     const transport = new WebRTCTransportProxy({
       ...options,
       bridgeService: this._bridgeService
@@ -2115,20 +1997,7 @@ var WebRTCTransportProxyFactory = class {
 };
 
 // packages/core/mesh/network-manager/src/wire-protocol.ts
-var import_crypto2 = require("@dxos/crypto");
 var import_teleport = require("@dxos/teleport");
-var adaptProtocolProvider = (factory) => ({ initiator, localPeerId, remotePeerId, topic }) => {
-  const protocol = factory({
-    channel: (0, import_crypto2.discoveryKey)(topic),
-    initiator
-  });
-  return {
-    initialize: () => protocol.open(),
-    destroy: () => protocol.close(),
-    stream: protocol.stream,
-    protocol
-  };
-};
 var createTeleportProtocolFactory = (onConnection) => {
   return (params) => {
     const teleport = new import_teleport.Teleport(params);
@@ -2163,11 +2032,6 @@ var createTeleportProtocolFactory = (onConnection) => {
   WebRTCTransportProxy,
   WebRTCTransportProxyFactory,
   WebRTCTransportService,
-  adaptProtocolProvider,
-  createProtocolFactory,
   createTeleportProtocolFactory,
-  createWebRTCTransportFactory,
-  protocolFactory,
-  transportProtocolProvider
+  createWebRTCTransportFactory
 });
-//# sourceMappingURL=index.cjs.map