@dxos/network-manager 0.5.1-main.ff7d242 → 0.5.1-next.1634f4d

package/dist/lib/node/{chunk-ZULA2NNI.cjs → chunk-3ZJXMDGK.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_ZULA2NNI_exports = {};
-__export(chunk_ZULA2NNI_exports, {
+var chunk_3ZJXMDGK_exports = {};
+__export(chunk_3ZJXMDGK_exports, {
   Connection: () => Connection,
   ConnectionLimiter: () => ConnectionLimiter,
   ConnectionLog: () => ConnectionLog,
@@ -55,7 +55,7 @@ __export(chunk_ZULA2NNI_exports, {
   createSimplePeerTransportFactory: () => createSimplePeerTransportFactory,
   createTeleportProtocolFactory: () => createTeleportProtocolFactory
 });
-module.exports = __toCommonJS(chunk_ZULA2NNI_exports);
+module.exports = __toCommonJS(chunk_3ZJXMDGK_exports);
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
@@ -199,6 +199,8 @@ var Connection = class {
     this._callbacks = _callbacks;
     this._ctx = new import_context.Context();
     this.connectedTimeoutContext = new import_context.Context();
+    this._protocolClosed = new import_async.Trigger();
+    this._transportClosed = new import_async.Trigger();
     this._state = "CREATED";
     this._incomingSignalBuffer = [];
     this._outgoingSignalBuffer = [];
@@ -218,7 +220,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 134,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -241,7 +243,7 @@ var Connection = class {
   async openConnection() {
     (0, import_invariant.invariant)(this._state === "INITIAL", "Invalid state.", {
       F: __dxlog_file,
-      L: 164,
+      L: 167,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -252,7 +254,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 165,
+      L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -264,7 +266,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 166,
+      L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -275,16 +277,17 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       (0, import_log.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 import_protocols.ProtocolError("protocol stream closed")).catch((err) => this.errors.raise(err));
     });
     (0, import_async.scheduleTask)(this.connectedTimeoutContext, async () => {
       import_log.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)
       });
@@ -292,7 +295,7 @@ var Connection = class {
     }, TRANSPORT_CONNECTION_TIMEOUT);
     (0, import_invariant.invariant)(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 198,
+      L: 202,
       S: this,
       A: [
         "!this._transport",
@@ -314,9 +317,10 @@ var Connection = class {
     });
     this._transport.closed.once(() => {
       this._transport = void 0;
+      this._transportClosed.wake();
       (0, import_log.log)("abort triggered by transport close", void 0, {
         F: __dxlog_file,
-        L: 218,
+        L: 223,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -327,7 +331,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 223,
+        L: 228,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -337,7 +341,7 @@ var Connection = class {
       if (err instanceof import_protocols.ConnectionResetError) {
         import_log.log.info("aborting due to transport ConnectionResetError", void 0, {
           F: __dxlog_file,
-          L: 230,
+          L: 235,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -345,7 +349,7 @@ var Connection = class {
       } else if (err instanceof import_protocols.ConnectivityError) {
         import_log.log.info("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
-          L: 233,
+          L: 238,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -355,7 +359,7 @@ var Connection = class {
           err
         }, {
           F: __dxlog_file,
-          L: 236,
+          L: 241,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -373,7 +377,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 252,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -383,14 +387,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") {
       (0, import_log.log)(`abort ignored: already ${this._state}`, this.closeReason, {
         F: __dxlog_file,
-        L: 261,
+        L: 266,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -403,27 +407,21 @@ var Connection = class {
     }
     await this._ctx.dispose();
     try {
-      (0, import_log.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) {
       import_log.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) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 285,
+        L: 289,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -433,7 +431,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 291,
+        L: 295,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -457,27 +455,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) {
         import_log.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) {
         import_log.log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 330,
+          L: 334,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -485,26 +483,26 @@ var Connection = class {
     } else {
       (0, import_log.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) {
         import_log.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) {
         import_log.log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 342,
+          L: 346,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -514,13 +512,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() {
+    (0, import_log.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()
+    ]);
+    (0, import_log.log)("protocol closed", void 0, {
+      F: __dxlog_file,
+      L: 358,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+  async _closeTransport() {
+    (0, import_log.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()
+    ]);
+    (0, import_log.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();
@@ -557,7 +591,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 384,
+        L: 400,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -570,7 +604,7 @@ var Connection = class {
   async signal(msg) {
     (0, import_invariant.invariant)(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 393,
+      L: 409,
       S: this,
       A: [
         "msg.sessionId",
@@ -580,7 +614,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       (0, import_log.log)("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 395,
+        L: 411,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -588,7 +622,7 @@ var Connection = class {
     }
     (0, import_invariant.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",
@@ -597,7 +631,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 399,
+      L: 415,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -606,7 +640,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 400,
+      L: 416,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -630,7 +664,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 409,
+          L: 425,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -638,7 +672,7 @@ var Connection = class {
       } else {
         (0, import_invariant.invariant)(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 412,
+          L: 428,
           S: this,
           A: [
             "this._transport",
@@ -651,7 +685,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 413,
+          L: 429,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -669,13 +703,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 424,
+      L: 440,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant.invariant)(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 425,
+      L: 441,
       S: this,
       A: [
         "state !== this._state",
@@ -1077,9 +1111,9 @@ var Peer = class {
     });
     const sessionId = import_keys4.PublicKey.random();
     (0, import_log4.log)("initiating...", {
-      id: this.id,
+      ownPeerId: this.localPeerId,
       topic: this.topic,
-      peerId: this.id,
+      remotePeerId: this.id,
       sessionId
     }, {
       F: __dxlog_file3,
@@ -1805,7 +1839,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) {
@@ -1817,7 +1852,7 @@ var Swarm = class {
           } catch (err) {
             (0, import_log3.log)("initiation error", err, {
               F: __dxlog_file4,
-              L: 334,
+              L: 335,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1840,12 +1875,13 @@ var Swarm = class {
   */
   async _initiateConnection(remoteId) {
     const ctx = this._ctx;
+    const peer = this._getOrCreatePeer(remoteId);
     if (remoteId.toHex() < this._ownPeerId.toHex()) {
       (0, import_log3.log)("initiation delay", {
         remoteId
       }, {
         F: __dxlog_file4,
-        L: 361,
+        L: 363,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1854,7 +1890,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;
     }
@@ -1862,7 +1900,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 375,
+      L: 379,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1872,7 +1910,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 378,
+      L: 382,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4071,9 +4109,12 @@ var TcpTransport = class {
     this.options.stream.pipe(this._socket).pipe(this.options.stream);
   }
 };
-var createTeleportProtocolFactory = (onConnection) => {
+var createTeleportProtocolFactory = (onConnection, defaultParams) => {
   return (params) => {
-    const teleport = new import_teleport.Teleport(params);
+    const teleport = new import_teleport.Teleport({
+      ...defaultParams,
+      ...params
+    });
     return {
       stream: teleport.stream,
       open: async (sessionId) => {
@@ -4118,4 +4159,4 @@ var createTeleportProtocolFactory = (onConnection) => {
   createSimplePeerTransportFactory,
   createTeleportProtocolFactory
 });
-//# sourceMappingURL=chunk-ZULA2NNI.cjs.map
+//# sourceMappingURL=chunk-3ZJXMDGK.cjs.map