@dxos/network-manager 0.1.17 → 0.1.19

package/dist/lib/browser/testing/index.mjs

@@ -8,11 +8,11 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // packages/core/mesh/network-manager/src/testing/test-builder.ts
-import { PublicKey as PublicKey12 } from "@dxos/keys";
+import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from "@dxos/messaging";
 import { schema as schema2 } from "@dxos/protocols";
 import { createLinkedPorts, createProtoRpcPeer } from "@dxos/rpc";
-import { ComplexMap as ComplexMap8 } from "@dxos/util";
+import { ComplexMap as ComplexMap9 } from "@dxos/util";
 
 // packages/core/mesh/network-manager/src/network-manager.ts
 import assert5 from "@dxos/node-std/assert";
@@ -48,6 +48,7 @@ var ConnectionState;
   ConnectionState4["INITIAL"] = "INITIAL";
   ConnectionState4["CONNECTING"] = "CONNECTING";
   ConnectionState4["CONNECTED"] = "CONNECTED";
+  ConnectionState4["CLOSING"] = "CLOSING";
   ConnectionState4["CLOSED"] = "CLOSED";
 })(ConnectionState || (ConnectionState = {}));
 var Connection = class {
@@ -103,7 +104,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);
     }
@@ -114,11 +119,12 @@ var Connection = class {
     if (this._state === ConnectionState.CLOSED) {
       return;
     }
+    this._changeState(ConnectionState.CLOSING);
     log("closing...", {
       peerId: this.ownId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-      line: 131,
+      file: "connection.ts",
+      line: 142,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -126,8 +132,8 @@ var Connection = class {
       await this._protocol.destroy();
     } catch (err) {
       log.catch(err, {}, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-        line: 137,
+        file: "connection.ts",
+        line: 148,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -136,8 +142,8 @@ var Connection = class {
       await ((_a = this._transport) == null ? void 0 : _a.destroy());
     } catch (err1) {
       log.catch(err1, {}, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-        line: 144,
+        file: "connection.ts",
+        line: 155,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -145,8 +151,8 @@ var Connection = class {
     log("closed", {
       peerId: this.ownId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-      line: 147,
+      file: "connection.ts",
+      line: 158,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -157,8 +163,8 @@ var Connection = class {
     assert(msg.sessionId);
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", {}, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-        line: 154,
+        file: "connection.ts",
+        line: 165,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -173,8 +179,8 @@ var Connection = class {
         remoteId: this.remoteId,
         msg: msg.data
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-        line: 162,
+        file: "connection.ts",
+        line: 173,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -187,8 +193,8 @@ var Connection = class {
       remoteId: this.remoteId,
       msg: msg.data
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection.ts",
-      line: 168,
+      file: "connection.ts",
+      line: 179,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -241,7 +247,7 @@ var MessageRouter = class {
       to: recipient,
       msg: message
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/message-router.ts",
+      file: "message-router.ts",
       line: 67,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -299,7 +305,7 @@ var MessageRouter = class {
       to: recipient,
       msg: networkMessage
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/message-router.ts",
+      file: "message-router.ts",
       line: 117,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -330,7 +336,7 @@ var MessageRouter = class {
       log2("resolving", {
         answer: message.data.answer
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/signal/message-router.ts",
+        file: "message-router.ts",
         line: 146,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -413,7 +419,7 @@ var Peer = class {
           topic: this.topic,
           peerId: this.localPeerId
         }, {
-          file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
+          file: "peer.ts",
           line: 83,
           scope: this,
           callSite: (f, a) => f(...a)
@@ -440,7 +446,7 @@ var Peer = class {
             remoteId: this.id,
             err
           }, {
-            file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
+            file: "peer.ts",
             line: 107,
             scope: this,
             callSite: (f, a) => f(...a)
@@ -466,7 +472,7 @@ var Peer = class {
       peerId: this.id,
       sessionId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
+      file: "peer.ts",
       line: 125,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -489,14 +495,14 @@ var Peer = class {
         ownId: this.localPeerId,
         remoteId: this.id
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
+        file: "peer.ts",
         line: 137,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         log3("ignoring response", {}, {
-          file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
+          file: "peer.ts",
           line: 139,
           scope: this,
           callSite: (f, a) => f(...a)
@@ -516,7 +522,7 @@ var Peer = class {
         remoteId: this.id,
         err
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
+        file: "peer.ts",
         line: 150,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -535,7 +541,7 @@ var Peer = class {
       initiator,
       sessionId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
+      file: "peer.ts",
       line: 164,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -570,7 +576,7 @@ var Peer = class {
             remoteId: this.id,
             initiator
           }, {
-            file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
+            file: "peer.ts",
             line: 193,
             scope: this,
             callSite: (f, a) => f(...a)
@@ -590,19 +596,12 @@ var Peer = class {
         initiator,
         err
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
+        file: "peer.ts",
         line: 203,
         scope: this,
         callSite: (f, a) => f(...a)
       });
-      void this.closeConnection().catch(() => {
-        log3.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;
@@ -616,8 +615,8 @@ var Peer = class {
       peerId: this.id,
       sessionId: connection.sessionId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
-      line: 221,
+      file: "peer.ts",
+      line: 219,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -626,8 +625,8 @@ var Peer = class {
       peerId: this.id,
       sessionId: connection.sessionId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
-      line: 227,
+      file: "peer.ts",
+      line: 225,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -637,8 +636,8 @@ var Peer = class {
       log3("dropping signal message for non-existent connection", {
         message
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
-        line: 232,
+        file: "peer.ts",
+        line: 230,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -652,8 +651,8 @@ var Peer = class {
       peerId: this.id,
       topic: this.topic
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts",
-      line: 240,
+      file: "peer.ts",
+      line: 238,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -696,7 +695,7 @@ var Swarm = class {
     log4("creating swarm", {
       peerId: _ownPeerId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 80,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -713,7 +712,7 @@ var Swarm = class {
       payloadType: "dxos.mesh.swarm.SwarmMessage",
       onMessage: async (message) => await this._swarmMessenger.receiveMessage(message)
     }).catch((error) => log4.catch(error, {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 96,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -733,7 +732,7 @@ var Swarm = class {
   }
   async destroy() {
     log4("destroying...", {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 124,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -742,7 +741,7 @@ var Swarm = class {
     await this._topology.destroy();
     await Promise.all(Array.from(this._peers.keys()).map((key) => this._destroyPeer(key)));
     log4("destroyed", {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 128,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -756,7 +755,7 @@ var Swarm = class {
       previous: getClassName(this._topology),
       topology: getClassName(topology)
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 135,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -808,14 +807,14 @@ var Swarm = class {
     log4("swarm event", {
       swarmEvent
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 199,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       log4.warn("ignored for destroyed swarm", {}, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+        file: "swarm.ts",
         line: 201,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -827,7 +826,7 @@ var Swarm = class {
       log4("new peer", {
         peerId
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+        file: "swarm.ts",
         line: 207,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -852,14 +851,14 @@ var Swarm = class {
     log4("offer", {
       message
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 226,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       log4.info("ignored for destroyed swarm", {}, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+        file: "swarm.ts",
         line: 228,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -873,7 +872,7 @@ var Swarm = class {
       log4("rejecting offer with incorrect peerId", {
         message
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+        file: "swarm.ts",
         line: 235,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -886,7 +885,7 @@ var Swarm = class {
       log4("rejecting offer with incorrect topic", {
         message
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+        file: "swarm.ts",
         line: 239,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -905,14 +904,14 @@ var Swarm = class {
     log4("signal", {
       message
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 250,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       log4.info("ignored for destroyed swarm", {}, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+        file: "swarm.ts",
         line: 252,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -941,7 +940,7 @@ var Swarm = class {
             await this._initiateConnection(peer);
           } catch (err) {
             log4.warn("initiation error", err, {
-              file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+              file: "swarm.ts",
               line: 287,
               scope: this,
               callSite: (f, a) => f(...a)
@@ -965,7 +964,7 @@ var Swarm = class {
       log4("initiation delay", {
         remoteId
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+        file: "swarm.ts",
         line: 312,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -982,7 +981,7 @@ var Swarm = class {
     log4("initiating connection...", {
       remoteId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 326,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -992,7 +991,7 @@ var Swarm = class {
     log4("initiated", {
       remoteId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm.ts",
+      file: "swarm.ts",
       line: 329,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -1025,9 +1024,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 EventSubscriptions();
     this._connectionSubscriptions = new ComplexMap3(PublicKey4.hash);
     this._peers = new ComplexMap3(PublicKey4.hash);
@@ -1044,17 +1042,12 @@ var SwarmMapper = class {
       this._connectionSubscriptions.delete(peerId);
       this._update();
     }));
-    if (_presence) {
-      this._subscriptions.add(_presence.graphUpdated.on(() => {
-        this._update();
-      }));
-    }
     this._update();
   }
   _update() {
     log5("updating swarm", {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts",
-      line: 77,
+      file: "swarm-mapper.ts",
+      line: 75,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1073,32 +1066,12 @@ var SwarmMapper = class {
         ]
       });
     }
-    if (this._presence) {
-      this._presence.graph.forEachNode((node) => {
-        const id = PublicKey4.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 = PublicKey4.from(link.fromId);
-        const to = PublicKey4.from(link.toId);
-        if (!from.equals(this._swarm.ownPeerId) && !to.equals(this._swarm.ownPeerId)) {
-          this._peers.get(from).connections.push(to);
-        }
-      });
-    }
     log5("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,
+      file: "swarm-mapper.ts",
+      line: 116,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1142,13 +1115,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);
@@ -1161,32 +1133,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) {
@@ -1197,7 +1143,7 @@ var ConnectionLog = class {
 
 // packages/core/mesh/network-manager/src/network-manager.ts
 var NetworkManager = class {
-  constructor({ transportFactory, signalManager, log: log15 }) {
+  constructor({ transportFactory, signalManager, log: log14 }) {
     this._swarms = new ComplexMap5(PublicKey6.hash);
     this._mappers = new ComplexMap5(PublicKey6.hash);
     this.topicsUpdated = new Event5();
@@ -1214,7 +1160,7 @@ var NetworkManager = class {
       join: (opts) => this._signalManager.join(opts),
       leave: (opts) => this._signalManager.leave(opts)
     };
-    if (log15) {
+    if (log14) {
       this._connectionLog = new ConnectionLog();
     }
   }
@@ -1237,8 +1183,8 @@ var NetworkManager = class {
     for (const topic of this._swarms.keys()) {
       await this.leaveSwarm(topic).catch((err) => {
         log6(err, {}, {
-          file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-          line: 128,
+          file: "network-manager.ts",
+          line: 122,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1246,7 +1192,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;
     assert5(PublicKey6.isPublicKey(topic));
     assert5(PublicKey6.isPublicKey(peerId));
@@ -1260,8 +1206,8 @@ var NetworkManager = class {
       peerId,
       topology: topology.toString()
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 155,
+      file: "network-manager.ts",
+      line: 148,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1270,8 +1216,8 @@ var NetworkManager = class {
       log6("swarm error", {
         error
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-        line: 158,
+        file: "network-manager.ts",
+        line: 151,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1281,20 +1227,20 @@ var NetworkManager = class {
       topic,
       peerId
     }).catch((error) => log6.catch(error, {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 162,
+      file: "network-manager.ts",
+      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);
     log6("joined", {
       topic: PublicKey6.from(topic),
       count: this._swarms.size
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 167,
+      file: "network-manager.ts",
+      line: 160,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1308,8 +1254,8 @@ var NetworkManager = class {
       log6.warn("swarm not open", {
         topic: PublicKey6.from(topic)
       }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-        line: 179,
+        file: "network-manager.ts",
+        line: 172,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1318,8 +1264,8 @@ var NetworkManager = class {
     log6("leaving", {
       topic: PublicKey6.from(topic)
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 183,
+      file: "network-manager.ts",
+      line: 176,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1339,8 +1285,8 @@ var NetworkManager = class {
       topic: PublicKey6.from(topic),
       count: this._swarms.size
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/network-manager.ts",
-      line: 197,
+      file: "network-manager.ts",
+      line: 190,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1386,8 +1332,18 @@ import { Transform } from "@dxos/node-std/stream";
 import { Event as Event6, Trigger } from "@dxos/async";
 import { ErrorStream as ErrorStream3 } from "@dxos/debug";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
+import { log as log9, logInfo as logInfo2 } from "@dxos/log";
 import { ComplexMap as ComplexMap6 } from "@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 Transform({
@@ -1407,34 +1363,30 @@ var _MemoryTransport = class {
     this.closed = new Event6();
     this.connected = new Event6();
     this.errors = new ErrorStream3();
-    this._id = PublicKey7.random();
     this._remote = new Trigger();
     this._outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._destroyed = false;
-    log9("creating", {
-      id: this._id
-    }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-      line: 59,
+    this._instanceId = PublicKey7.random();
+    log9("creating", {}, {
+      file: "memory-transport.ts",
+      line: 64,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    assert9(!_MemoryTransport._connections.has(this._id), "Duplicate memory connection");
-    _MemoryTransport._connections.set(this._id, this);
+    assert9(!_MemoryTransport._connections.has(this._instanceId), "Duplicate memory connection");
+    _MemoryTransport._connections.set(this._instanceId, this);
     if (this.options.initiator) {
       setTimeout(async () => {
-        log9("sending signal", {
-          transportId: this._id
-        }, {
-          file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-          line: 68,
+        log9("sending signal", {}, {
+          file: "memory-transport.ts",
+          line: 73,
           scope: this,
           callSite: (f, a) => f(...a)
         });
         void this.options.sendSignal({
           payload: {
-            transportId: this._id.toHex()
+            transportId: this._instanceId.toHex()
           }
         });
       });
@@ -1445,22 +1397,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;
         }
-        assert9(!this._remoteConnection._remoteConnection, new Error(`Remote already connected: ${this._remoteId}`));
+        assert9(!this._remoteConnection._remoteConnection, new Error(`Remote already connected: ${this._remoteInstanceId}`));
         this._remoteConnection._remoteConnection = this;
-        this._remoteConnection._remoteId = this._id;
-        log9("connected", {
-          id: this._id,
-          remote: this._remoteId
-        }, {
-          file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-          line: 94,
+        this._remoteConnection._remoteInstanceId = this._instanceId;
+        log9("connected", {}, {
+          file: "memory-transport.ts",
+          line: 102,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1476,73 +1425,70 @@ var _MemoryTransport = class {
     }
   }
   async destroy() {
-    log9("closing", {
-      id: this._id
-    }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-      line: 115,
+    log9("closing", {}, {
+      file: "memory-transport.ts",
+      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) {
-      log9("closing", {
-        id: this._remoteId
-      }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-        line: 120,
+      log9("closing", {}, {
+        file: "memory-transport.ts",
+        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;
-      log9("closed", {
-        id: this._remoteId
-      }, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-        line: 138,
+      log9("closed", {}, {
+        file: "memory-transport.ts",
+        line: 146,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     }
     this.closed.emit();
-    log9("closed", {
-      id: this._id
-    }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/memory-transport.ts",
-      line: 142,
+    log9("closed", {}, {
+      file: "memory-transport.ts",
+      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 = PublicKey7.fromHex(transportId);
-        log9("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 }) {
+    log9("received signal", {
+      payload
+    }, {
+      file: "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 = PublicKey7.fromHex(transportId);
+      this._remote.wake(remoteId);
     }
   }
 };
 var MemoryTransport = _MemoryTransport;
 MemoryTransport._connections = new ComplexMap6(PublicKey7.hash);
+__decorate4([
+  logInfo2
+], MemoryTransport.prototype, "_instanceId", void 0);
+__decorate4([
+  logInfo2
+], MemoryTransport.prototype, "_remoteInstanceId", void 0);
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport.ts
 import assert10 from "@dxos/node-std/assert";
@@ -1567,7 +1513,7 @@ var WebRTCTransport = class {
     this.connected = new Event7();
     this.errors = new ErrorStream4();
     log10("created connection", params, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
+      file: "webrtc-transport.ts",
       line: 34,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -1579,7 +1525,7 @@ var WebRTCTransport = class {
     });
     this._peer.on("signal", async (data) => {
       log10("signal", data, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
+        file: "webrtc-transport.ts",
         line: 42,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -1592,7 +1538,7 @@ var WebRTCTransport = class {
     });
     this._peer.on("connect", () => {
       log10("connected", {}, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
+        file: "webrtc-transport.ts",
         line: 47,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -1602,7 +1548,7 @@ var WebRTCTransport = class {
     });
     this._peer.on("close", async () => {
       log10("closed", {}, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
+        file: "webrtc-transport.ts",
         line: 53,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -1617,7 +1563,7 @@ var WebRTCTransport = class {
   }
   async destroy() {
     log10("closing...", {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
+      file: "webrtc-transport.ts",
       line: 65,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -1626,7 +1572,7 @@ var WebRTCTransport = class {
     this._peer.destroy();
     this.closed.emit();
     log10("closed", {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
+      file: "webrtc-transport.ts",
       line: 69,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -1732,7 +1678,7 @@ var WebRTCTransportService = class {
     await ((_b = this.transports.get(proxyId)) == null ? void 0 : _b.stream.end());
     this.transports.delete(proxyId);
     log11("Closed.", {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts",
+      file: "webrtc-transport-service.ts",
       line: 108,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -1762,7 +1708,7 @@ var WebRTCTransportProxy = class {
     this._serviceStream.waitUntilReady().then(() => {
       this._serviceStream.subscribe(async (event) => {
         log12("WebRTCTransportProxy: event", event, {
-          file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
+          file: "webrtc-transport-proxy.ts",
           line: 46,
           scope: this,
           callSite: (f, a) => f(...a)
@@ -1783,7 +1729,7 @@ var WebRTCTransportProxy = class {
           });
         } catch (err) {
           log12.catch(err, {}, {
-            file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
+            file: "webrtc-transport-proxy.ts",
             line: 63,
             scope: this,
             callSite: (f, a) => f(...a)
@@ -1791,7 +1737,7 @@ var WebRTCTransportProxy = class {
         }
       });
     }, (error) => log12.catch(error, {}, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
+      file: "webrtc-transport-proxy.ts",
       line: 67,
       scope: this,
       callSite: (f, a) => f(...a)
@@ -1835,7 +1781,7 @@ var WebRTCTransportProxy = class {
       });
     } catch (err) {
       log12.catch(err, {}, {
-        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
+        file: "webrtc-transport-proxy.ts",
         line: 117,
         scope: this,
         callSite: (f, a) => f(...a)
@@ -1873,205 +1819,74 @@ var WebRTCTransportProxyFactory = class {
   }
 };
 
-// packages/core/mesh/network-manager/src/wire-protocol.ts
-import { discoveryKey } from "@dxos/crypto";
-import { Teleport } from "@dxos/teleport";
-var adaptProtocolProvider = (factory) => ({ initiator, localPeerId, remotePeerId, topic }) => {
-  const protocol = factory({
-    channel: discoveryKey(topic),
-    initiator
-  });
-  return {
-    initialize: () => protocol.open(),
-    destroy: () => protocol.close(),
-    stream: protocol.stream,
-    protocol
-  };
-};
-
-// packages/core/mesh/network-manager/src/testing/test-protocol.ts
-import assert14 from "@dxos/node-std/assert";
-import { EventEmitter } from "@dxos/node-std/events";
-import { PublicKey as PublicKey11 } from "@dxos/keys";
-import { log as log14 } from "@dxos/log";
-import { Extension } from "@dxos/mesh-protocol";
-
-// packages/core/mesh/network-manager/src/protocol-factory.ts
-import assert13 from "@dxos/node-std/assert";
-import { discoveryKey as discoveryKey2 } from "@dxos/crypto";
+// packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts
+import { Event as Event9 } from "@dxos/async";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log13 } from "@dxos/log";
-import { Protocol } from "@dxos/mesh-protocol";
-var protocolFactory = ({ session = {}, plugins = [], getTopics }) => {
-  assert13(getTopics);
-  return ({ channel, initiator }) => {
-    log13("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 Protocol({
-      streamOptions: {
-        live: true
-      },
-      discoveryToPublicKey: (dk) => {
-        const publicKey = getTopics().find((topic) => discoveryKey2(topic).equals(dk));
-        if (publicKey) {
-          protocol.setContext({
-            topic: PublicKey10.stringify(publicKey)
-          });
-        }
-        assert13(publicKey, "PublicKey not found in discovery.");
-        return publicKey;
+import { TestExtension } from "@dxos/teleport";
+import { ComplexMap as ComplexMap8 } from "@dxos/util";
+
+// packages/core/mesh/network-manager/src/wire-protocol.ts
+import { Teleport } from "@dxos/teleport";
+var createTeleportProtocolFactory = (onConnection) => {
+  return (params) => {
+    const teleport = new Teleport(params);
+    return {
+      stream: teleport.stream,
+      initialize: async () => {
+        await teleport.open();
+        await onConnection(teleport);
       },
-      initiator,
-      userSession: session,
-      discoveryKey: channel
-    });
-    protocol.setExtensions(plugins.map((plugin) => plugin.createExtension())).init();
-    return protocol;
+      destroy: async () => {
+        await teleport.close();
+      }
+    };
   };
 };
 
-// packages/core/mesh/network-manager/src/testing/test-protocol.ts
-var EXTENSION_NAME = "test";
-var getPeerId = (protocol) => {
-  var _a;
-  const { peerId } = (_a = protocol.getSession()) != null ? _a : {};
-  if (!peerId) {
-    return void 0;
-  }
-  return PublicKey11.bufferize(peerId);
-};
-var testProtocolProvider = (topic, peerId, protocolPlugin) => {
-  log14("creating protocol-factory", {
-    topic: PublicKey11.from(topic),
-    peerId
-  }, {
-    file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-protocol.ts",
-    line: 34,
-    scope: void 0,
-    callSite: (f, a) => f(...a)
-  });
-  return protocolFactory({
-    getTopics: () => [
-      topic
-    ],
-    session: {
-      peerId: peerId.toHex()
-    },
-    plugins: [
-      protocolPlugin
-    ]
-  });
-};
-var TestProtocolPlugin = class extends EventEmitter {
-  constructor(peerId, uppercase = false) {
-    super();
-    this._peers = /* @__PURE__ */ new Map();
-    this.initCalled = false;
-    assert14(Buffer.isBuffer(peerId));
-    this._peerId = peerId;
-    this._uppercase = uppercase;
-  }
-  get peerId() {
-    return this._peerId;
-  }
-  get peers() {
-    return Array.from(this._peers.values());
-  }
-  createExtension() {
-    log14("creating extension", {
-      peerId: PublicKey11.from(this.peerId)
-    }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-protocol.ts",
-      line: 92,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    return new Extension(EXTENSION_NAME, {
-      binary: true
-    }).setInitHandler(this._init.bind(this)).setMessageHandler(this._receive.bind(this)).setHandshakeHandler(this._onPeerConnect.bind(this)).setCloseHandler(this._onPeerDisconnect.bind(this));
-  }
-  async _init(protocol) {
-    this.initCalled = true;
-  }
-  async send(peerId, payload) {
-    assert14(Buffer.isBuffer(peerId));
-    const peerIdStr = PublicKey11.stringify(peerId);
-    const peer = this._peers.get(peerIdStr);
-    if (!peer) {
-      throw new Error(`peer not found: ${PublicKey11.from(peerId).truncate()}`);
-    }
-    const extension = peer.getExtension(EXTENSION_NAME);
-    const encoded = Buffer.from(payload);
-    log14("sending", {
-      peerId: PublicKey11.from(peerId),
-      payload
-    }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-protocol.ts",
-      line: 124,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    return await extension.send(encoded, {
-      oneway: true
+// packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts
+var TestWireProtocol = class {
+  constructor(peerId) {
+    this.peerId = peerId;
+    this.connections = new ComplexMap8(PublicKey10.hash);
+    this.connected = new Event9();
+    this.factory = createTeleportProtocolFactory(async (teleport) => {
+      log13("create", {
+        remotePeerId: teleport.remotePeerId
+      }, {
+        file: "test-wire-protocol.ts",
+        line: 20,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      const extension = new TestExtension({
+        onClose: async () => {
+          this.connections.delete(teleport.remotePeerId);
+        }
+      });
+      this.connections.set(teleport.remotePeerId, extension);
+      teleport.addExtension("test", extension);
+      this.connected.emit(teleport.remotePeerId);
     });
   }
-  async _receive(protocol, data) {
-    const peerId = getPeerId(protocol);
-    assert14(peerId !== void 0);
-    let payload = data.data.toString();
-    if (this._uppercase) {
-      payload = payload.toUpperCase();
+  async waitForConnection(peerId) {
+    if (this.connections.has(peerId)) {
+      return this.connections.get(peerId);
     }
-    log14("received", {
-      peerId: PublicKey11.from(peerId),
-      payload
+    log13("waitForConnection", {
+      peerId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-protocol.ts",
-      line: 136,
+      file: "test-wire-protocol.ts",
+      line: 35,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    this.emit("receive", protocol, payload);
+    await this.connected.waitFor((connectedId) => connectedId.equals(peerId));
+    return this.connections.get(peerId);
   }
-  async _onPeerConnect(protocol) {
-    log14("connecting", {
-      id: PublicKey11.from(protocol.id)
-    }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-protocol.ts",
-      line: 141,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    const peerId = getPeerId(protocol);
-    if (peerId === void 0) {
-      return;
-    }
-    const peerIdStr = PublicKey11.stringify(peerId);
-    if (this._peers.has(peerIdStr)) {
-      return;
-    }
-    this._peers.set(peerIdStr, protocol);
-    this.emit("connect", protocol);
-  }
-  async _onPeerDisconnect(protocol) {
-    log14("disconnecting", {
-      id: PublicKey11.from(protocol.id)
-    }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-protocol.ts",
-      line: 157,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    const peerId = getPeerId(protocol);
-    if (peerId === void 0) {
-      return;
-    }
-    this._peers.delete(PublicKey11.stringify(peerId));
-    this.emit("disconnect", peerId);
+  async testConnection(peerId) {
+    const connection = await this.waitForConnection(peerId);
+    await connection.test();
   }
 };
 
@@ -2095,8 +1910,8 @@ var TestBuilder = class {
 var TestPeer = class {
   constructor(testBuilder) {
     this.testBuilder = testBuilder;
-    this.peerId = PublicKey12.random();
-    this._swarms = new ComplexMap8(PublicKey12.hash);
+    this.peerId = PublicKey11.random();
+    this._swarms = new ComplexMap9(PublicKey11.hash);
     this._networkManager = this.createNetworkManager();
   }
   createNetworkManager() {
@@ -2169,13 +1984,13 @@ var TestSwarmConnection = class {
   constructor(peer, topic) {
     this.peer = peer;
     this.topic = topic;
-    this.plugin = new TestProtocolPlugin(this.peer.peerId.asBuffer());
+    this.protocol = new TestWireProtocol(this.peer.peerId);
   }
   async join(topology = new FullyConnectedTopology()) {
     await this.peer._networkManager.joinSwarm({
       topic: this.topic,
       peerId: this.peer.peerId,
-      protocolProvider: adaptProtocolProvider(testProtocolProvider(this.topic.asBuffer(), this.peer.peerId, this.plugin)),
+      protocolProvider: this.protocol.factory,
       topology
     });
     return this;
@@ -2189,9 +2004,6 @@ export {
   TEST_SIGNAL_URL,
   TestBuilder,
   TestPeer,
-  TestProtocolPlugin,
-  TestSwarmConnection,
-  getPeerId,
-  testProtocolProvider
+  TestSwarmConnection
 };
 //# sourceMappingURL=index.mjs.map