@dxos/network-manager 0.6.1-main.ff751ec → 0.6.1-next.f8e935e

package/dist/lib/node/{chunk-KVS6UT25.cjs → chunk-VXLEPDWN.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_KVS6UT25_exports = {};
-__export(chunk_KVS6UT25_exports, {
+var chunk_VXLEPDWN_exports = {};
+__export(chunk_VXLEPDWN_exports, {
   Connection: () => Connection,
   ConnectionLimiter: () => ConnectionLimiter,
   ConnectionLog: () => ConnectionLog,
@@ -55,7 +55,7 @@ __export(chunk_KVS6UT25_exports, {
   createSimplePeerTransportFactory: () => createSimplePeerTransportFactory,
   createTeleportProtocolFactory: () => createTeleportProtocolFactory
 });
-module.exports = __toCommonJS(chunk_KVS6UT25_exports);
+module.exports = __toCommonJS(chunk_VXLEPDWN_exports);
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
@@ -413,7 +413,9 @@ var Connection = class {
     }
     await this._ctx.dispose();
     try {
-      await this._closeProtocol();
+      await this._closeProtocol({
+        abort: true
+      });
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
@@ -465,80 +467,63 @@ var Connection = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    if (lastState === "CONNECTED") {
-      try {
-        await this._closeProtocol();
-      } catch (err2) {
-        import_log.log.catch(err2, void 0, {
-          F: __dxlog_file,
-          L: 327,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-      try {
-        await this._closeTransport();
-      } catch (err2) {
-        import_log.log.catch(err2, void 0, {
-          F: __dxlog_file,
-          L: 334,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    } else {
+    let abortProtocol = false;
+    if (lastState !== "CONNECTED") {
       (0, import_log.log)(`graceful close requested when we were in ${lastState} state? aborting`, void 0, {
         F: __dxlog_file,
-        L: 337,
+        L: 324,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      abortProtocol = true;
+    }
+    try {
+      await this._closeProtocol({
+        abort: abortProtocol
+      });
+    } catch (err2) {
+      import_log.log.catch(err2, void 0, {
+        F: __dxlog_file,
+        L: 330,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    try {
+      await this._closeTransport();
+    } catch (err2) {
+      import_log.log.catch(err2, void 0, {
+        F: __dxlog_file,
+        L: 336,
         S: this,
         C: (f, a) => f(...a)
       });
-      try {
-        await this._closeProtocol();
-      } catch (err2) {
-        import_log.log.catch(err2, void 0, {
-          F: __dxlog_file,
-          L: 341,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-      try {
-        await this._closeTransport();
-      } catch (err2) {
-        import_log.log.catch(err2, void 0, {
-          F: __dxlog_file,
-          L: 346,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
     }
     (0, import_log.log)("closed", {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 350,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
     this._changeState("CLOSED");
     this._callbacks?.onClosed?.(err);
   }
-  async _closeProtocol() {
-    (0, import_log.log)("closing protocol", void 0, {
+  async _closeProtocol(options) {
+    (0, import_log.log)("closing protocol", options, {
       F: __dxlog_file,
-      L: 356,
+      L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
     await Promise.race([
-      this._protocol.close(),
+      options?.abort ? this._protocol.abort() : this._protocol.close(),
       this._protocolClosed.wait()
     ]);
-    (0, import_log.log)("protocol closed", void 0, {
+    (0, import_log.log)("protocol closed", options, {
       F: __dxlog_file,
-      L: 358,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -546,7 +531,7 @@ var Connection = class {
   async _closeTransport() {
     (0, import_log.log)("closing transport", void 0, {
       F: __dxlog_file,
-      L: 362,
+      L: 351,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -556,7 +541,7 @@ var Connection = class {
     ]);
     (0, import_log.log)("transport closed", void 0, {
       F: __dxlog_file,
-      L: 364,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -597,7 +582,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 400,
+        L: 389,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -610,7 +595,7 @@ var Connection = class {
   async signal(msg) {
     (0, import_invariant.invariant)(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 409,
+      L: 398,
       S: this,
       A: [
         "msg.sessionId",
@@ -620,7 +605,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: 411,
+        L: 400,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -628,7 +613,7 @@ var Connection = class {
     }
     (0, import_invariant.invariant)(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 414,
+      L: 403,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -637,7 +622,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 415,
+      L: 404,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -646,7 +631,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 416,
+      L: 405,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -670,7 +655,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 425,
+          L: 414,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -678,7 +663,7 @@ var Connection = class {
       } else {
         (0, import_invariant.invariant)(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 428,
+          L: 417,
           S: this,
           A: [
             "this._transport",
@@ -691,7 +676,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 429,
+          L: 418,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -709,13 +694,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 440,
+      L: 429,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant.invariant)(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 441,
+      L: 430,
       S: this,
       A: [
         "state !== this._state",
@@ -1428,7 +1413,7 @@ var Peer = class {
     }
     await this.connection.signal(message);
   }
-  async destroy(reason) {
+  async safeDestroy(reason) {
     await this._ctx.dispose();
     (0, import_log4.log)("Destroying peer", {
       peerId: this.id,
@@ -1444,7 +1429,7 @@ var Peer = class {
 };
 _ts_decorate2([
   import_async3.synchronized
-], Peer.prototype, "destroy", null);
+], Peer.prototype, "safeDestroy", null);
 var increaseInterval = (interval) => {
   if (interval === 0) {
     return 50;
@@ -1636,15 +1621,15 @@ var Swarm = class {
     }
     if (swarmEvent.peerAvailable) {
       const peerId = import_keys3.PublicKey.from(swarmEvent.peerAvailable.peer);
-      (0, import_log3.log)("new peer", {
-        peerId
-      }, {
-        F: __dxlog_file4,
-        L: 180,
-        S: this,
-        C: (f, a) => f(...a)
-      });
       if (!peerId.equals(this._ownPeerId)) {
+        (0, import_log3.log)("new peer", {
+          peerId
+        }, {
+          F: __dxlog_file4,
+          L: 181,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         const peer = this._getOrCreatePeer(peerId);
         peer.advertizing = true;
       }
@@ -1806,6 +1791,9 @@ var Swarm = class {
           this.connected.emit(peerId);
         },
         onDisconnected: async () => {
+          if (this._isUnregistered(peer)) {
+            return;
+          }
           if (!peer.advertizing) {
             await this._destroyPeer(peer.id, "peer disconnected");
           }
@@ -1813,12 +1801,12 @@ var Swarm = class {
           this._topology.update();
         },
         onRejected: () => {
-          if (this._peers.has(peerId)) {
+          if (!this._isUnregistered(peer)) {
             (0, import_log3.log)("peer rejected connection", {
               peerId
             }, {
               F: __dxlog_file4,
-              L: 286,
+              L: 289,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1840,17 +1828,18 @@ var Swarm = class {
     return peer;
   }
   async _destroyPeer(peerId, reason) {
-    (0, import_invariant3.invariant)(this._peers.has(peerId), void 0, {
+    const peer = this._peers.get(peerId);
+    (0, import_invariant3.invariant)(peer, void 0, {
       F: __dxlog_file4,
-      L: 308,
+      L: 312,
       S: this,
       A: [
-        "this._peers.has(peerId)",
+        "peer",
         ""
       ]
     });
-    await this._peers.get(peerId).destroy(new Error(reason));
     this._peers.delete(peerId);
+    await peer.safeDestroy(new Error(reason));
   }
   _getSwarmController() {
     return {
@@ -1870,7 +1859,7 @@ var Swarm = class {
           } catch (err) {
             (0, import_log3.log)("initiation error", err, {
               F: __dxlog_file4,
-              L: 335,
+              L: 339,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1899,7 +1888,7 @@ var Swarm = class {
         remoteId
       }, {
         F: __dxlog_file4,
-        L: 363,
+        L: 367,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1908,7 +1897,7 @@ var Swarm = class {
     if (ctx.disposed) {
       return;
     }
-    if (this._peers.get(remoteId) == null) {
+    if (this._isUnregistered(peer)) {
       throw new Error("Peer left during initiation delay");
     }
     if (peer.connection) {
@@ -1918,7 +1907,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 379,
+      L: 383,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1928,7 +1917,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 382,
+      L: 386,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1940,6 +1929,9 @@ var Swarm = class {
     }
     await peer.closeConnection();
   }
+  _isUnregistered(peer) {
+    return !peer || this._peers.get(peer.id) !== peer;
+  }
 };
 _ts_decorate3([
   import_log3.logInfo
@@ -2383,7 +2375,7 @@ var SwarmNetworkManager = class {
     this._connectionLog?.leftSwarm(swarm);
     await swarm.destroy();
     this._swarms.delete(topic);
-    await this.topicsUpdated.emit();
+    this.topicsUpdated.emit();
     (0, import_log7.log)("left", {
       topic: import_keys8.PublicKey.from(topic),
       count: this._swarms.size
@@ -4203,4 +4195,4 @@ var createTeleportProtocolFactory = (onConnection, defaultParams) => {
   createSimplePeerTransportFactory,
   createTeleportProtocolFactory
 });
-//# sourceMappingURL=chunk-KVS6UT25.cjs.map
+//# sourceMappingURL=chunk-VXLEPDWN.cjs.map