@dxos/network-manager 0.1.16 → 0.1.18

package/dist/lib/browser/index.mjs

@@ -33,6 +33,7 @@ var ConnectionState;
   ConnectionState4["INITIAL"] = "INITIAL";
   ConnectionState4["CONNECTING"] = "CONNECTING";
   ConnectionState4["CONNECTED"] = "CONNECTED";
+  ConnectionState4["CLOSING"] = "CLOSING";
   ConnectionState4["CLOSED"] = "CLOSED";
 })(ConnectionState || (ConnectionState = {}));
 var Connection = class {
@@ -88,7 +89,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);
     }
@@ -99,11 +104,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,
+      line: 142,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -112,7 +118,7 @@ var Connection = class {
     } catch (err) {
       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)
       });
@@ -122,7 +128,7 @@ var Connection = class {
     } catch (err1) {
       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)
       });
@@ -131,7 +137,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)
     });
@@ -143,7 +149,7 @@ var Connection = class {
     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,
+        line: 165,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -159,7 +165,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)
       });
@@ -173,7 +179,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)
     });
@@ -580,14 +586,7 @@ var Peer = class {
         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;
@@ -602,7 +601,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)
     });
@@ -612,7 +611,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)
     });
@@ -623,7 +622,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)
       });
@@ -638,7 +637,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)
     });
@@ -1010,9 +1009,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);
@@ -1029,17 +1027,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,
+      line: 75,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1058,32 +1051,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,
+      line: 116,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1127,13 +1100,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);
@@ -1146,32 +1118,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) {
@@ -1188,7 +1134,7 @@ import { log as log6 } from "@dxos/log";
 import { Messenger } from "@dxos/messaging";
 import { ComplexMap as ComplexMap5 } from "@dxos/util";
 var NetworkManager = class {
-  constructor({ transportFactory, signalManager, log: log14 }) {
+  constructor({ transportFactory, signalManager, log: log13 }) {
     this._swarms = new ComplexMap5(PublicKey6.hash);
     this._mappers = new ComplexMap5(PublicKey6.hash);
     this.topicsUpdated = new Event5();
@@ -1205,7 +1151,7 @@ var NetworkManager = class {
       join: (opts) => this._signalManager.join(opts),
       leave: (opts) => this._signalManager.leave(opts)
     };
-    if (log14) {
+    if (log13) {
       this._connectionLog = new ConnectionLog();
     }
   }
@@ -1229,7 +1175,7 @@ var NetworkManager = class {
       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,
+          line: 122,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -1237,7 +1183,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));
@@ -1252,7 +1198,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)
     });
@@ -1262,7 +1208,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)
       });
@@ -1273,11 +1219,11 @@ var NetworkManager = class {
       peerId
     }).catch((error) => log6.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);
     log6("joined", {
@@ -1285,7 +1231,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)
     });
@@ -1300,7 +1246,7 @@ var NetworkManager = class {
         topic: PublicKey6.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)
       });
@@ -1310,7 +1256,7 @@ var NetworkManager = class {
       topic: PublicKey6.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)
     });
@@ -1331,85 +1277,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
-import assert6 from "@dxos/node-std/assert";
-import { discoveryKey } from "@dxos/crypto";
-import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log7 } from "@dxos/log";
-import { Protocol } from "@dxos/mesh-protocol";
-var protocolFactory = ({ session = {}, plugins = [], getTopics }) => {
-  assert6(getTopics);
-  return ({ channel, initiator }) => {
-    log7("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) => discoveryKey(topic).equals(dk));
-        if (publicKey) {
-          protocol.setContext({
-            topic: PublicKey7.stringify(publicKey)
-          });
-        }
-        assert6(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: PublicKey7.stringify(peerId.asBuffer())
-  },
-  plugins
-});
-var transportProtocolProvider = (rendezvousKey, peerId, protocolPlugin) => {
-  return protocolFactory({
-    getTopics: () => [
-      rendezvousKey
-    ],
-    session: {
-      peerId: PublicKey7.stringify(peerId)
-    },
-    plugins: [
-      protocolPlugin
-    ]
-  });
-};
-
 // packages/core/mesh/network-manager/src/topology/fully-connected-topology.ts
-import assert7 from "@dxos/node-std/assert";
+import assert6 from "@dxos/node-std/assert";
 var FullyConnectedTopology = class {
   toString() {
     return "FullyConnectedTopology";
   }
   init(controller) {
-    assert7(!this._controller, "Already initialized");
+    assert6(!this._controller, "Already initialized");
     this._controller = controller;
   }
   update() {
-    assert7(this._controller, "Not initialized");
+    assert6(this._controller, "Not initialized");
     const { candidates: discovered } = this._controller.getState();
     for (const peer of discovered) {
       this._controller.connect(peer);
@@ -1423,9 +1309,9 @@ var FullyConnectedTopology = class {
 };
 
 // packages/core/mesh/network-manager/src/topology/mmst-topology.ts
-import assert8 from "@dxos/node-std/assert";
+import assert7 from "@dxos/node-std/assert";
 import distance from "xor-distance";
-import { log as log8 } from "@dxos/log";
+import { log as log7 } from "@dxos/log";
 var MMSTTopology = class {
   constructor({ originateConnections = 2, maxPeers = 4, sampleSize = 10 } = {}) {
     this._sampleCollected = false;
@@ -1434,14 +1320,14 @@ var MMSTTopology = class {
     this._sampleSize = sampleSize;
   }
   init(controller) {
-    assert8(!this._controller, "Already initialized");
+    assert7(!this._controller, "Already initialized");
     this._controller = controller;
   }
   update() {
-    assert8(this._controller, "Not initialized");
+    assert7(this._controller, "Not initialized");
     const { connected, candidates } = this._controller.getState();
     if (this._sampleCollected || connected.length > this._maxPeers || candidates.length > 0) {
-      log8("Running the algorithm.", {}, {
+      log7("Running the algorithm.", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts",
         line: 55,
         scope: this,
@@ -1452,10 +1338,10 @@ var MMSTTopology = class {
     }
   }
   async onOffer(peer) {
-    assert8(this._controller, "Not initialized");
+    assert7(this._controller, "Not initialized");
     const { connected } = this._controller.getState();
     const accept = connected.length < this._maxPeers;
-    log8(`Offer ${peer} accept=${accept}`, {}, {
+    log7(`Offer ${peer} accept=${accept}`, {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts",
       line: 65,
       scope: this,
@@ -1466,12 +1352,12 @@ var MMSTTopology = class {
   async destroy() {
   }
   _runAlgorithm() {
-    assert8(this._controller, "Not initialized");
+    assert7(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) {
-        log8(`Disconnect ${peer}.`, {}, {
+        log7(`Disconnect ${peer}.`, {}, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts",
           line: 83,
           scope: this,
@@ -1483,7 +1369,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) {
-        log8(`Connect ${peer1}.`, {}, {
+        log7(`Connect ${peer1}.`, {}, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/mmst-topology.ts",
           line: 91,
           scope: this,
@@ -1500,8 +1386,8 @@ var MMSTTopology = class {
 var sortByXorDistance = (keys, reference) => keys.sort((a, b) => distance.gt(distance(a.asBuffer(), reference.asBuffer()), distance(b.asBuffer(), reference.asBuffer())));
 
 // packages/core/mesh/network-manager/src/topology/star-topology.ts
-import assert9 from "@dxos/node-std/assert";
-import { log as log9 } from "@dxos/log";
+import assert8 from "@dxos/node-std/assert";
+import { log as log8 } from "@dxos/log";
 var StarTopology = class {
   constructor(_centralPeer) {
     this._centralPeer = _centralPeer;
@@ -1510,14 +1396,14 @@ var StarTopology = class {
     return `StarTopology(${this._centralPeer.truncate()})`;
   }
   init(controller) {
-    assert9(!this._controller, "Already initialized.");
+    assert8(!this._controller, "Already initialized.");
     this._controller = controller;
   }
   update() {
-    assert9(this._controller, "Not initialized.");
+    assert8(this._controller, "Not initialized.");
     const { candidates, connected, ownPeerId } = this._controller.getState();
     if (!ownPeerId.equals(this._centralPeer)) {
-      log9("leaf peer dropping all connections apart from central peer.", {}, {
+      log8("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,
@@ -1525,7 +1411,7 @@ var StarTopology = class {
       });
       for (const peer of connected) {
         if (!peer.equals(this._centralPeer)) {
-          log9("dropping connection", {
+          log8("dropping connection", {
             peer
           }, {
             file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts",
@@ -1539,7 +1425,7 @@ var StarTopology = class {
     }
     for (const peer1 of candidates) {
       if (peer1.equals(this._centralPeer) || ownPeerId.equals(this._centralPeer)) {
-        log9("connecting to peer", {
+        log8("connecting to peer", {
           peer: peer1
         }, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts",
@@ -1552,9 +1438,9 @@ var StarTopology = class {
     }
   }
   async onOffer(peer) {
-    assert9(this._controller, "Not initialized.");
+    assert8(this._controller, "Not initialized.");
     const { ownPeerId } = this._controller.getState();
-    log9("offer", {
+    log8("offer", {
       peer,
       isCentral: peer.equals(this._centralPeer),
       isSelfCentral: ownPeerId.equals(this._centralPeer)
@@ -1571,13 +1457,23 @@ var StarTopology = class {
 };
 
 // packages/core/mesh/network-manager/src/transport/memory-transport.ts
-import assert10 from "@dxos/node-std/assert";
+import assert9 from "@dxos/node-std/assert";
 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 PublicKey8 } from "@dxos/keys";
-import { log as log10 } from "@dxos/log";
+import { PublicKey as PublicKey7 } from "@dxos/keys";
+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({
@@ -1597,34 +1493,30 @@ var _MemoryTransport = class {
     this.closed = new Event6();
     this.connected = new Event6();
     this.errors = new ErrorStream3();
-    this._id = PublicKey8.random();
     this._remote = new Trigger();
     this._outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._destroyed = false;
-    log10("creating", {
-      id: this._id
-    }, {
+    this._instanceId = PublicKey7.random();
+    log9("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)
     });
-    assert10(!_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 () => {
-        log10("sending signal", {
-          transportId: this._id
-        }, {
+        log9("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()
           }
         });
       });
@@ -1635,22 +1527,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;
         }
-        assert10(!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;
-        log10("connected", {
-          id: this._id,
-          remote: this._remoteId
-        }, {
+        this._remoteConnection._remoteInstanceId = this._instanceId;
+        log9("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)
         });
@@ -1666,80 +1555,77 @@ var _MemoryTransport = class {
     }
   }
   async destroy() {
-    log10("closing", {
-      id: this._id
-    }, {
+    log9("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) {
-      log10("closing", {
-        id: this._remoteId
-      }, {
+      log9("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;
-      log10("closed", {
-        id: this._remoteId
-      }, {
+      log9("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();
-    log10("closed", {
-      id: this._id
-    }, {
+    log9("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 = PublicKey8.fromHex(transportId);
-        log10("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: "/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 = PublicKey7.fromHex(transportId);
+      this._remote.wake(remoteId);
     }
   }
 };
 var MemoryTransport = _MemoryTransport;
-MemoryTransport._connections = new ComplexMap6(PublicKey8.hash);
+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 assert11 from "@dxos/node-std/assert";
+import assert10 from "@dxos/node-std/assert";
 import SimplePeerConstructor from "simple-peer";
 import { Event as Event7 } from "@dxos/async";
 import { ErrorStream as ErrorStream4, raise as raise2 } from "@dxos/debug";
-import { log as log11 } from "@dxos/log";
+import { log as log10 } from "@dxos/log";
 
 // packages/core/mesh/network-manager/src/transport/webrtc.ts
 var wrtc = null;
@@ -1756,7 +1642,7 @@ var WebRTCTransport = class {
     this.closed = new Event7();
     this.connected = new Event7();
     this.errors = new ErrorStream4();
-    log11("created connection", params, {
+    log10("created connection", params, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
       line: 34,
       scope: this,
@@ -1768,7 +1654,7 @@ var WebRTCTransport = class {
       config: this.params.webrtcConfig
     });
     this._peer.on("signal", async (data) => {
-      log11("signal", data, {
+      log10("signal", data, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
         line: 42,
         scope: this,
@@ -1781,7 +1667,7 @@ var WebRTCTransport = class {
       });
     });
     this._peer.on("connect", () => {
-      log11("connected", {}, {
+      log10("connected", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
         line: 47,
         scope: this,
@@ -1791,7 +1677,7 @@ var WebRTCTransport = class {
       this.connected.emit();
     });
     this._peer.on("close", async () => {
-      log11("closed", {}, {
+      log10("closed", {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
         line: 53,
         scope: this,
@@ -1806,7 +1692,7 @@ var WebRTCTransport = class {
     });
   }
   async destroy() {
-    log11("closing...", {}, {
+    log10("closing...", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
       line: 65,
       scope: this,
@@ -1815,7 +1701,7 @@ var WebRTCTransport = class {
     await this._disconnectStreams();
     this._peer.destroy();
     this.closed.emit();
-    log11("closed", {}, {
+    log10("closed", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport.ts",
       line: 69,
       scope: this,
@@ -1823,8 +1709,8 @@ var WebRTCTransport = class {
     });
   }
   signal(signal) {
-    assert11(this._peer, "Connection not ready to accept signals.");
-    assert11(signal.payload.data, "Signal message must contain signal data.");
+    assert10(this._peer, "Connection not ready to accept signals.");
+    assert10(signal.payload.data, "Signal message must contain signal data.");
     this._peer.signal(signal.payload.data);
   }
   async _disconnectStreams() {
@@ -1840,17 +1726,17 @@ var createWebRTCTransportFactory = (webrtcConfig) => ({
 });
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts
-import assert12 from "@dxos/node-std/assert";
+import assert11 from "@dxos/node-std/assert";
 import { Duplex } from "@dxos/node-std/stream";
 import { Stream } from "@dxos/codec-protobuf";
-import { PublicKey as PublicKey9 } from "@dxos/keys";
-import { log as log12 } from "@dxos/log";
+import { PublicKey as PublicKey8 } from "@dxos/keys";
+import { log as log11 } from "@dxos/log";
 import { ConnectionState as ConnectionState2 } from "@dxos/protocols/proto/dxos/mesh/bridge";
 import { ComplexMap as ComplexMap7 } from "@dxos/util";
 var WebRTCTransportService = class {
   constructor(_webrtcConfig) {
     this._webrtcConfig = _webrtcConfig;
-    this.transports = new ComplexMap7(PublicKey9.hash);
+    this.transports = new ComplexMap7(PublicKey8.hash);
   }
   open(request) {
     const rpcStream = new Stream(({ ready, next, close }) => {
@@ -1915,11 +1801,11 @@ var WebRTCTransportService = class {
     return rpcStream;
   }
   async sendSignal({ proxyId, signal }) {
-    assert12(this.transports.has(proxyId));
+    assert11(this.transports.has(proxyId));
     await this.transports.get(proxyId).transport.signal(signal);
   }
   async sendData({ proxyId, payload }) {
-    assert12(this.transports.has(proxyId));
+    assert11(this.transports.has(proxyId));
     await this.transports.get(proxyId).stream.push(payload);
   }
   async close({ proxyId }) {
@@ -1927,7 +1813,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);
-    log12("Closed.", {}, {
+    log11("Closed.", {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts",
       line: 108,
       scope: this,
@@ -1937,11 +1823,11 @@ var WebRTCTransportService = class {
 };
 
 // packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts
-import assert13 from "@dxos/node-std/assert";
+import assert12 from "@dxos/node-std/assert";
 import { Event as Event8 } from "@dxos/async";
 import { ErrorStream as ErrorStream5 } from "@dxos/debug";
-import { PublicKey as PublicKey10 } from "@dxos/keys";
-import { log as log13 } from "@dxos/log";
+import { PublicKey as PublicKey9 } from "@dxos/keys";
+import { log as log12 } from "@dxos/log";
 import { ConnectionState as ConnectionState3 } from "@dxos/protocols/proto/dxos/mesh/bridge";
 var WebRTCTransportProxy = class {
   constructor(_params) {
@@ -1950,14 +1836,14 @@ var WebRTCTransportProxy = class {
     this._closed = false;
     this.connected = new Event8();
     this.errors = new ErrorStream5();
-    this._proxyId = PublicKey10.random();
+    this._proxyId = PublicKey9.random();
     this._serviceStream = this._params.bridgeService.open({
       proxyId: this._proxyId,
       initiator: this._params.initiator
     });
     this._serviceStream.waitUntilReady().then(() => {
       this._serviceStream.subscribe(async (event) => {
-        log13("WebRTCTransportProxy: event", event, {
+        log12("WebRTCTransportProxy: event", event, {
           file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
           line: 46,
           scope: this,
@@ -1978,7 +1864,7 @@ var WebRTCTransportProxy = class {
             payload: data
           });
         } catch (err) {
-          log13.catch(err, {}, {
+          log12.catch(err, {}, {
             file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
             line: 63,
             scope: this,
@@ -1986,7 +1872,7 @@ var WebRTCTransportProxy = class {
           });
         }
       });
-    }, (error) => log13.catch(error, {}, {
+    }, (error) => log12.catch(error, {}, {
       file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
       line: 67,
       scope: this,
@@ -2030,7 +1916,7 @@ var WebRTCTransportProxy = class {
         proxyId: this._proxyId
       });
     } catch (err) {
-      log13.catch(err, {}, {
+      log12.catch(err, {}, {
         file: "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts",
         line: 117,
         scope: this,
@@ -2058,7 +1944,7 @@ var WebRTCTransportProxyFactory = class {
     return this;
   }
   createTransport(options) {
-    assert13(this._bridgeService, "WebRTCTransportProxyFactory is not ready to open connections");
+    assert12(this._bridgeService, "WebRTCTransportProxyFactory is not ready to open connections");
     const transport = new WebRTCTransportProxy({
       ...options,
       bridgeService: this._bridgeService
@@ -2070,20 +1956,7 @@ var WebRTCTransportProxyFactory = class {
 };
 
 // packages/core/mesh/network-manager/src/wire-protocol.ts
-import { discoveryKey as discoveryKey2 } from "@dxos/crypto";
 import { Teleport } from "@dxos/teleport";
-var adaptProtocolProvider = (factory) => ({ initiator, localPeerId, remotePeerId, topic }) => {
-  const protocol = factory({
-    channel: discoveryKey2(topic),
-    initiator
-  });
-  return {
-    initialize: () => protocol.open(),
-    destroy: () => protocol.close(),
-    stream: protocol.stream,
-    protocol
-  };
-};
 var createTeleportProtocolFactory = (onConnection) => {
   return (params) => {
     const teleport = new Teleport(params);
@@ -2117,11 +1990,6 @@ export {
   WebRTCTransportProxy,
   WebRTCTransportProxyFactory,
   WebRTCTransportService,
-  adaptProtocolProvider,
-  createProtocolFactory,
   createTeleportProtocolFactory,
-  createWebRTCTransportFactory,
-  protocolFactory,
-  transportProtocolProvider
+  createWebRTCTransportFactory
 };
-//# sourceMappingURL=index.mjs.map