@dxos/network-manager 0.5.1-main.c37e119 → 0.5.1-main.c4f37e4

package/dist/lib/browser/{chunk-TVNVOM33.mjs → chunk-66SM4LDV.mjs}

@@ -15,7 +15,7 @@ import {
 } from "@dxos/node-std/inject-globals";
 
 // packages/core/mesh/network-manager/src/swarm/connection.ts
-import { DeferredTask, Event, sleep, scheduleTask, scheduleTaskInterval, synchronized } from "@dxos/async";
+import { DeferredTask, Event, sleep, scheduleTask, scheduleTaskInterval, synchronized, Trigger } from "@dxos/async";
 import { Context, cancelWithContext } from "@dxos/context";
 import { ErrorStream } from "@dxos/debug";
 import { invariant } from "@dxos/invariant";
@@ -61,6 +61,8 @@ var Connection = class {
     this._callbacks = _callbacks;
     this._ctx = new Context();
     this.connectedTimeoutContext = new Context();
+    this._protocolClosed = new Trigger();
+    this._transportClosed = new Trigger();
     this._state = "CREATED";
     this._incomingSignalBuffer = [];
     this._outgoingSignalBuffer = [];
@@ -80,7 +82,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 134,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -103,7 +105,7 @@ var Connection = class {
   async openConnection() {
     invariant(this._state === "INITIAL", "Invalid state.", {
       F: __dxlog_file,
-      L: 164,
+      L: 167,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -114,7 +116,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 165,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -126,7 +128,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 166,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -137,16 +139,17 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       log("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 183,
+        L: 186,
         S: this,
         C: (f, a) => f(...a)
       });
+      this._protocolClosed.wake();
       this.close(new ProtocolError("protocol stream closed")).catch((err) => this.errors.raise(err));
     });
     scheduleTask(this.connectedTimeoutContext, async () => {
       log.info(`timeout waiting ${TRANSPORT_CONNECTION_TIMEOUT / 1e3}s for transport to connect, aborting`, void 0, {
         F: __dxlog_file,
-        L: 190,
+        L: 194,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -154,7 +157,7 @@ var Connection = class {
     }, TRANSPORT_CONNECTION_TIMEOUT);
     invariant(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 198,
+      L: 202,
       S: this,
       A: [
         "!this._transport",
@@ -176,9 +179,10 @@ var Connection = class {
     });
     this._transport.closed.once(() => {
       this._transport = void 0;
+      this._transportClosed.wake();
       log("abort triggered by transport close", void 0, {
         F: __dxlog_file,
-        L: 218,
+        L: 223,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -189,7 +193,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 223,
+        L: 228,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -199,7 +203,7 @@ var Connection = class {
       if (err instanceof ConnectionResetError) {
         log.info("aborting due to transport ConnectionResetError", void 0, {
           F: __dxlog_file,
-          L: 230,
+          L: 235,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -207,7 +211,7 @@ var Connection = class {
       } else if (err instanceof ConnectivityError) {
         log.info("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
-          L: 233,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -217,7 +221,7 @@ var Connection = class {
           err
         }, {
           F: __dxlog_file,
-          L: 236,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -235,7 +239,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 252,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -245,14 +249,14 @@ var Connection = class {
       err
     }, {
       F: __dxlog_file,
-      L: 259,
+      L: 264,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === "CLOSED" || this._state === "ABORTED") {
       log(`abort ignored: already ${this._state}`, this.closeReason, {
         F: __dxlog_file,
-        L: 261,
+        L: 266,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -265,27 +269,21 @@ var Connection = class {
     }
     await this._ctx.dispose();
     try {
-      log("aborting protocol... ", void 0, {
-        F: __dxlog_file,
-        L: 275,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._protocol.abort();
+      await this._closeProtocol();
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 278,
+        L: 282,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     try {
-      await this._transport?.close();
+      await this._closeTransport();
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 285,
+        L: 289,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -295,7 +293,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 291,
+        L: 295,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -319,27 +317,27 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 316,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
     if (lastState === "CONNECTED") {
       try {
-        await this._protocol.close();
+        await this._closeProtocol();
       } catch (err2) {
         log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 323,
+          L: 327,
           S: this,
           C: (f, a) => f(...a)
         });
       }
       try {
-        await this._transport?.close();
+        await this._closeTransport();
       } catch (err2) {
         log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 330,
+          L: 334,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -347,26 +345,26 @@ var Connection = class {
     } else {
       log(`graceful close requested when we were in ${lastState} state? aborting`, void 0, {
         F: __dxlog_file,
-        L: 333,
+        L: 337,
         S: this,
         C: (f, a) => f(...a)
       });
       try {
-        await this._protocol.abort();
+        await this._closeProtocol();
       } catch (err2) {
         log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 337,
+          L: 341,
           S: this,
           C: (f, a) => f(...a)
         });
       }
       try {
-        await this._transport?.close();
+        await this._closeTransport();
       } catch (err2) {
         log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 342,
+          L: 346,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -376,13 +374,49 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 346,
+      L: 350,
       S: this,
       C: (f, a) => f(...a)
     });
     this._changeState("CLOSED");
     this._callbacks?.onClosed?.(err);
   }
+  async _closeProtocol() {
+    log("closing protocol", void 0, {
+      F: __dxlog_file,
+      L: 356,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await Promise.race([
+      this._protocol.close(),
+      this._protocolClosed.wait()
+    ]);
+    log("protocol closed", void 0, {
+      F: __dxlog_file,
+      L: 358,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+  async _closeTransport() {
+    log("closing transport", void 0, {
+      F: __dxlog_file,
+      L: 362,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    await Promise.race([
+      this._transport?.close(),
+      this._transportClosed.wait()
+    ]);
+    log("transport closed", void 0, {
+      F: __dxlog_file,
+      L: 364,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   _sendSignal(signal) {
     this._outgoingSignalBuffer.push(signal);
     this._signalSendTask.schedule();
@@ -419,7 +453,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 384,
+        L: 400,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -432,7 +466,7 @@ var Connection = class {
   async signal(msg) {
     invariant(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 393,
+      L: 409,
       S: this,
       A: [
         "msg.sessionId",
@@ -442,7 +476,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 395,
+        L: 411,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -450,7 +484,7 @@ var Connection = class {
     }
     invariant(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 398,
+      L: 414,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -459,7 +493,7 @@ var Connection = class {
     });
     invariant(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 399,
+      L: 415,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -468,7 +502,7 @@ var Connection = class {
     });
     invariant(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 400,
+      L: 416,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -492,7 +526,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 409,
+          L: 425,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -500,7 +534,7 @@ var Connection = class {
       } else {
         invariant(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 412,
+          L: 428,
           S: this,
           A: [
             "this._transport",
@@ -513,7 +547,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 413,
+          L: 429,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -531,13 +565,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 424,
+      L: 440,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 425,
+      L: 441,
       S: this,
       A: [
         "state !== this._state",
@@ -965,9 +999,9 @@ var Peer = class {
     });
     const sessionId = PublicKey3.random();
     log3("initiating...", {
-      id: this.id,
+      ownPeerId: this.localPeerId,
       topic: this.topic,
-      peerId: this.id,
+      remotePeerId: this.id,
       sessionId
     }, {
       F: __dxlog_file3,
@@ -1695,7 +1729,8 @@ var Swarm = class {
       getState: () => ({
         ownPeerId: this._ownPeerId,
         connected: Array.from(this._peers.values()).filter((peer) => peer.connection).map((peer) => peer.id),
-        candidates: Array.from(this._peers.values()).filter((peer) => !peer.connection && peer.advertizing && peer.availableToConnect).map((peer) => peer.id)
+        candidates: Array.from(this._peers.values()).filter((peer) => !peer.connection && peer.advertizing && peer.availableToConnect).map((peer) => peer.id),
+        allPeers: Array.from(this._peers.values()).map((peer) => peer.id)
       }),
       connect: (peer) => {
         if (this._ctx.disposed) {
@@ -1707,7 +1742,7 @@ var Swarm = class {
           } catch (err) {
             log4("initiation error", err, {
               F: __dxlog_file4,
-              L: 334,
+              L: 335,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1730,12 +1765,13 @@ var Swarm = class {
   */
   async _initiateConnection(remoteId) {
     const ctx = this._ctx;
+    const peer = this._getOrCreatePeer(remoteId);
     if (remoteId.toHex() < this._ownPeerId.toHex()) {
       log4("initiation delay", {
         remoteId
       }, {
         F: __dxlog_file4,
-        L: 361,
+        L: 363,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1744,7 +1780,9 @@ var Swarm = class {
     if (ctx.disposed) {
       return;
     }
-    const peer = this._getOrCreatePeer(remoteId);
+    if (this._peers.get(remoteId) == null) {
+      throw new Error("Peer left during initiation delay");
+    }
     if (peer.connection) {
       return;
     }
@@ -1752,7 +1790,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 375,
+      L: 379,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1762,7 +1800,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 378,
+      L: 382,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2592,7 +2630,7 @@ var StarTopology = class {
 
 // packages/core/mesh/network-manager/src/transport/memory-transport.ts
 import { Transform } from "@dxos/node-std/stream";
-import { Event as Event7, Trigger } from "@dxos/async";
+import { Event as Event7, Trigger as Trigger2 } from "@dxos/async";
 import { ErrorStream as ErrorStream3 } from "@dxos/debug";
 import { invariant as invariant10 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
@@ -2629,7 +2667,7 @@ var MemoryTransport = class _MemoryTransport {
   constructor(_options) {
     this._options = _options;
     this._instanceId = PublicKey9.random();
-    this._remote = new Trigger();
+    this._remote = new Trigger2();
     this._outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
     this._closed = false;
@@ -3476,7 +3514,7 @@ var decodeError = (err) => {
 
 // packages/core/mesh/network-manager/src/transport/libdatachannel-transport.ts
 import { Duplex as Duplex2 } from "stream";
-import { Event as Event10, Trigger as Trigger2, synchronized as synchronized4 } from "@dxos/async";
+import { Event as Event10, Trigger as Trigger3, synchronized as synchronized4 } from "@dxos/async";
 import { ErrorStream as ErrorStream6 } from "@dxos/debug";
 import { invariant as invariant14 } from "@dxos/invariant";
 import { log as log14 } from "@dxos/log";
@@ -3509,7 +3547,7 @@ var LibDataChannelTransport = class _LibDataChannelTransport {
     this._closed = false;
     this._connected = false;
     this._writeCallback = null;
-    this._readyForCandidates = new Trigger2();
+    this._readyForCandidates = new Trigger3();
     this.closed = new Event10();
     this.connected = new Event10();
     this.errors = new ErrorStream6();
@@ -3954,9 +3992,12 @@ var TcpTransport = class {
 
 // packages/core/mesh/network-manager/src/wire-protocol.ts
 import { Teleport } from "@dxos/teleport";
-var createTeleportProtocolFactory = (onConnection) => {
+var createTeleportProtocolFactory = (onConnection, defaultParams) => {
   return (params) => {
-    const teleport = new Teleport(params);
+    const teleport = new Teleport({
+      ...defaultParams,
+      ...params
+    });
     return {
       stream: teleport.stream,
       open: async (sessionId) => {
@@ -4002,4 +4043,4 @@ export {
   TcpTransport,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-TVNVOM33.mjs.map
+//# sourceMappingURL=chunk-66SM4LDV.mjs.map