@dxos/network-manager 0.1.17 → 0.1.18

package/dist/lib/node/testing/index.cjs

@@ -29,19 +29,16 @@ __export(testing_exports, {
   TEST_SIGNAL_URL: () => TEST_SIGNAL_URL,
   TestBuilder: () => TestBuilder,
   TestPeer: () => TestPeer,
-  TestProtocolPlugin: () => TestProtocolPlugin,
-  TestSwarmConnection: () => TestSwarmConnection,
-  getPeerId: () => getPeerId,
-  testProtocolProvider: () => testProtocolProvider
+  TestSwarmConnection: () => TestSwarmConnection
 });
 module.exports = __toCommonJS(testing_exports);
 
 // packages/core/mesh/network-manager/src/testing/test-builder.ts
-var import_keys12 = require("@dxos/keys");
+var import_keys11 = require("@dxos/keys");
 var import_messaging2 = require("@dxos/messaging");
 var import_protocols2 = require("@dxos/protocols");
 var import_rpc = require("@dxos/rpc");
-var import_util8 = require("@dxos/util");
+var import_util9 = require("@dxos/util");
 
 // packages/core/mesh/network-manager/src/network-manager.ts
 var import_node_assert5 = __toESM(require("node:assert"));
@@ -77,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 {
@@ -132,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);
     }
@@ -143,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)
     });
@@ -156,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)
       });
@@ -166,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)
       });
@@ -175,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)
     });
@@ -187,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)
       });
@@ -203,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)
       });
@@ -217,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)
     });
@@ -624,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;
@@ -646,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)
     });
@@ -656,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)
     });
@@ -667,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)
       });
@@ -682,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)
     });
@@ -1054,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);
@@ -1073,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)
     });
@@ -1102,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)
     });
@@ -1171,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);
@@ -1190,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) {
@@ -1226,7 +1169,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 import_util5.ComplexMap(import_keys6.PublicKey.hash);
     this._mappers = new import_util5.ComplexMap(import_keys6.PublicKey.hash);
     this.topicsUpdated = new import_async6.Event();
@@ -1243,7 +1186,7 @@ var NetworkManager = class {
       join: (opts) => this._signalManager.join(opts),
       leave: (opts) => this._signalManager.leave(opts)
     };
-    if (log15) {
+    if (log14) {
       this._connectionLog = new ConnectionLog();
     }
   }
@@ -1267,7 +1210,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)
         });
@@ -1275,7 +1218,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));
@@ -1290,7 +1233,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)
     });
@@ -1300,7 +1243,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)
       });
@@ -1311,11 +1254,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", {
@@ -1323,7 +1266,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)
     });
@@ -1338,7 +1281,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)
       });
@@ -1348,7 +1291,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)
     });
@@ -1369,7 +1312,7 @@ 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)
     });
@@ -1415,6 +1358,16 @@ var import_debug4 = require("@dxos/debug");
 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({
@@ -1434,34 +1387,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_keys7.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_log9.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_assert7.default)(!_MemoryTransport._connections.has(this._id), "Duplicate memory connection");
-    _MemoryTransport._connections.set(this._id, this);
+    (0, import_node_assert7.default)(!_MemoryTransport._connections.has(this._instanceId), "Duplicate memory connection");
+    _MemoryTransport._connections.set(this._instanceId, this);
     if (this.options.initiator) {
       setTimeout(async () => {
-        (0, import_log9.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()
           }
         });
       });
@@ -1472,22 +1421,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_assert7.default)(!this._remoteConnection._remoteConnection, new Error(`Remote already connected: ${this._remoteId}`));
+        (0, import_node_assert7.default)(!this._remoteConnection._remoteConnection, new Error(`Remote already connected: ${this._remoteInstanceId}`));
         this._remoteConnection._remoteConnection = this;
-        this._remoteConnection._remoteId = this._id;
-        (0, import_log9.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)
         });
@@ -1503,73 +1449,70 @@ var _MemoryTransport = class {
     }
   }
   async destroy() {
-    (0, import_log9.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_log9.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_log9.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_log9.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_keys7.PublicKey.fromHex(transportId);
-        (0, import_log9.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_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_assert8 = __toESM(require("node:assert"));
@@ -1900,205 +1843,74 @@ var WebRTCTransportProxyFactory = class {
   }
 };
 
-// packages/core/mesh/network-manager/src/wire-protocol.ts
-var import_crypto = require("@dxos/crypto");
-var import_teleport = require("@dxos/teleport");
-var adaptProtocolProvider = (factory) => ({ initiator, localPeerId, remotePeerId, topic }) => {
-  const protocol = factory({
-    channel: (0, import_crypto.discoveryKey)(topic),
-    initiator
-  });
-  return {
-    initialize: () => protocol.open(),
-    destroy: () => protocol.close(),
-    stream: protocol.stream,
-    protocol
-  };
-};
-
-// packages/core/mesh/network-manager/src/testing/test-protocol.ts
-var import_node_assert12 = __toESM(require("node:assert"));
-var import_node_events = require("node:events");
-var import_keys11 = require("@dxos/keys");
-var import_log14 = require("@dxos/log");
-var import_mesh_protocol2 = require("@dxos/mesh-protocol");
-
-// packages/core/mesh/network-manager/src/protocol-factory.ts
-var import_node_assert11 = __toESM(require("node:assert"));
-var import_crypto2 = require("@dxos/crypto");
+// packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts
+var import_async10 = require("@dxos/async");
 var import_keys10 = require("@dxos/keys");
 var import_log13 = require("@dxos/log");
-var import_mesh_protocol = require("@dxos/mesh-protocol");
-var protocolFactory = ({ session = {}, plugins = [], getTopics }) => {
-  (0, import_node_assert11.default)(getTopics);
-  return ({ channel, initiator }) => {
-    (0, import_log13.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_crypto2.discoveryKey)(topic).equals(dk));
-        if (publicKey) {
-          protocol.setContext({
-            topic: import_keys10.PublicKey.stringify(publicKey)
-          });
-        }
-        (0, import_node_assert11.default)(publicKey, "PublicKey not found in discovery.");
-        return publicKey;
+var import_teleport2 = require("@dxos/teleport");
+var import_util8 = require("@dxos/util");
+
+// packages/core/mesh/network-manager/src/wire-protocol.ts
+var import_teleport = require("@dxos/teleport");
+var createTeleportProtocolFactory = (onConnection) => {
+  return (params) => {
+    const teleport = new import_teleport.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 import_keys11.PublicKey.bufferize(peerId);
-};
-var testProtocolProvider = (topic, peerId, protocolPlugin) => {
-  (0, import_log14.log)("creating protocol-factory", {
-    topic: import_keys11.PublicKey.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 import_node_events.EventEmitter {
-  constructor(peerId, uppercase = false) {
-    super();
-    this._peers = /* @__PURE__ */ new Map();
-    this.initCalled = false;
-    (0, import_node_assert12.default)(Buffer.isBuffer(peerId));
-    this._peerId = peerId;
-    this._uppercase = uppercase;
-  }
-  get peerId() {
-    return this._peerId;
-  }
-  get peers() {
-    return Array.from(this._peers.values());
-  }
-  createExtension() {
-    (0, import_log14.log)("creating extension", {
-      peerId: import_keys11.PublicKey.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 import_mesh_protocol2.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) {
-    (0, import_node_assert12.default)(Buffer.isBuffer(peerId));
-    const peerIdStr = import_keys11.PublicKey.stringify(peerId);
-    const peer = this._peers.get(peerIdStr);
-    if (!peer) {
-      throw new Error(`peer not found: ${import_keys11.PublicKey.from(peerId).truncate()}`);
-    }
-    const extension = peer.getExtension(EXTENSION_NAME);
-    const encoded = Buffer.from(payload);
-    (0, import_log14.log)("sending", {
-      peerId: import_keys11.PublicKey.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 import_util8.ComplexMap(import_keys10.PublicKey.hash);
+    this.connected = new import_async10.Event();
+    this.factory = createTeleportProtocolFactory(async (teleport) => {
+      (0, import_log13.log)("create", {
+        remotePeerId: teleport.remotePeerId
+      }, {
+        file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-wire-protocol.ts",
+        line: 20,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+      const extension = new import_teleport2.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);
-    (0, import_node_assert12.default)(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);
     }
-    (0, import_log14.log)("received", {
-      peerId: import_keys11.PublicKey.from(peerId),
-      payload
+    (0, import_log13.log)("waitForConnection", {
+      peerId
     }, {
-      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/test-protocol.ts",
-      line: 136,
+      file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/testing/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) {
-    (0, import_log14.log)("connecting", {
-      id: import_keys11.PublicKey.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 = import_keys11.PublicKey.stringify(peerId);
-    if (this._peers.has(peerIdStr)) {
-      return;
-    }
-    this._peers.set(peerIdStr, protocol);
-    this.emit("connect", protocol);
-  }
-  async _onPeerDisconnect(protocol) {
-    (0, import_log14.log)("disconnecting", {
-      id: import_keys11.PublicKey.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(import_keys11.PublicKey.stringify(peerId));
-    this.emit("disconnect", peerId);
+  async testConnection(peerId) {
+    const connection = await this.waitForConnection(peerId);
+    await connection.test();
   }
 };
 
@@ -2122,8 +1934,8 @@ var TestBuilder = class {
 var TestPeer = class {
   constructor(testBuilder) {
     this.testBuilder = testBuilder;
-    this.peerId = import_keys12.PublicKey.random();
-    this._swarms = new import_util8.ComplexMap(import_keys12.PublicKey.hash);
+    this.peerId = import_keys11.PublicKey.random();
+    this._swarms = new import_util9.ComplexMap(import_keys11.PublicKey.hash);
     this._networkManager = this.createNetworkManager();
   }
   createNetworkManager() {
@@ -2196,13 +2008,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;
@@ -2217,9 +2029,5 @@ var TestSwarmConnection = class {
   TEST_SIGNAL_URL,
   TestBuilder,
   TestPeer,
-  TestProtocolPlugin,
-  TestSwarmConnection,
-  getPeerId,
-  testProtocolProvider
+  TestSwarmConnection
 });
-//# sourceMappingURL=index.cjs.map