@dxos/network-manager 0.6.1-main.e985410 → 0.6.1-main.faf01b2

package/dist/lib/browser/{chunk-VCGCTQ7O.mjs → chunk-3UBXH53L.mjs}

@@ -275,7 +275,9 @@ var Connection = class {
     }
     await this._ctx.dispose();
     try {
-      await this._closeProtocol();
+      await this._closeProtocol({
+        abort: true
+      });
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
@@ -327,80 +329,63 @@ var Connection = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    if (lastState === "CONNECTED") {
-      try {
-        await this._closeProtocol();
-      } catch (err2) {
-        log.catch(err2, void 0, {
-          F: __dxlog_file,
-          L: 327,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-      try {
-        await this._closeTransport();
-      } catch (err2) {
-        log.catch(err2, void 0, {
-          F: __dxlog_file,
-          L: 334,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-    } else {
+    let abortProtocol = false;
+    if (lastState !== "CONNECTED") {
       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) {
+      log.catch(err2, void 0, {
+        F: __dxlog_file,
+        L: 330,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    try {
+      await this._closeTransport();
+    } catch (err2) {
+      log.catch(err2, void 0, {
+        F: __dxlog_file,
+        L: 336,
         S: this,
         C: (f, a) => f(...a)
       });
-      try {
-        await this._closeProtocol();
-      } catch (err2) {
-        log.catch(err2, void 0, {
-          F: __dxlog_file,
-          L: 341,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
-      try {
-        await this._closeTransport();
-      } catch (err2) {
-        log.catch(err2, void 0, {
-          F: __dxlog_file,
-          L: 346,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-      }
     }
     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() {
-    log("closing protocol", void 0, {
+  async _closeProtocol(options) {
+    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()
     ]);
-    log("protocol closed", void 0, {
+    log("protocol closed", options, {
       F: __dxlog_file,
-      L: 358,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -408,7 +393,7 @@ var Connection = class {
   async _closeTransport() {
     log("closing transport", void 0, {
       F: __dxlog_file,
-      L: 362,
+      L: 351,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -418,7 +403,7 @@ var Connection = class {
     ]);
     log("transport closed", void 0, {
       F: __dxlog_file,
-      L: 364,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -459,7 +444,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 400,
+        L: 389,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -472,7 +457,7 @@ var Connection = class {
   async signal(msg) {
     invariant(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 409,
+      L: 398,
       S: this,
       A: [
         "msg.sessionId",
@@ -482,7 +467,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 411,
+        L: 400,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -490,7 +475,7 @@ var Connection = class {
     }
     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",
@@ -499,7 +484,7 @@ var Connection = class {
     });
     invariant(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 415,
+      L: 404,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -508,7 +493,7 @@ var Connection = class {
     });
     invariant(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 416,
+      L: 405,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -532,7 +517,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 425,
+          L: 414,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -540,7 +525,7 @@ var Connection = class {
       } else {
         invariant(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 428,
+          L: 417,
           S: this,
           A: [
             "this._transport",
@@ -553,7 +538,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 429,
+          L: 418,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -571,13 +556,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 440,
+      L: 429,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 441,
+      L: 430,
       S: this,
       A: [
         "state !== this._state",
@@ -1316,7 +1301,7 @@ var Peer = class {
     }
     await this.connection.signal(message);
   }
-  async destroy(reason) {
+  async safeDestroy(reason) {
     await this._ctx.dispose();
     log3("Destroying peer", {
       peerId: this.id,
@@ -1332,7 +1317,7 @@ var Peer = class {
 };
 _ts_decorate2([
   synchronized2
-], Peer.prototype, "destroy", null);
+], Peer.prototype, "safeDestroy", null);
 var increaseInterval = (interval) => {
   if (interval === 0) {
     return 50;
@@ -1526,15 +1511,15 @@ var Swarm = class {
     }
     if (swarmEvent.peerAvailable) {
       const peerId = PublicKey4.from(swarmEvent.peerAvailable.peer);
-      log4("new peer", {
-        peerId
-      }, {
-        F: __dxlog_file4,
-        L: 180,
-        S: this,
-        C: (f, a) => f(...a)
-      });
       if (!peerId.equals(this._ownPeerId)) {
+        log4("new peer", {
+          peerId
+        }, {
+          F: __dxlog_file4,
+          L: 181,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         const peer = this._getOrCreatePeer(peerId);
         peer.advertizing = true;
       }
@@ -1696,6 +1681,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");
           }
@@ -1703,12 +1691,12 @@ var Swarm = class {
           this._topology.update();
         },
         onRejected: () => {
-          if (this._peers.has(peerId)) {
+          if (!this._isUnregistered(peer)) {
             log4("peer rejected connection", {
               peerId
             }, {
               F: __dxlog_file4,
-              L: 286,
+              L: 289,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1730,17 +1718,18 @@ var Swarm = class {
     return peer;
   }
   async _destroyPeer(peerId, reason) {
-    invariant4(this._peers.has(peerId), void 0, {
+    const peer = this._peers.get(peerId);
+    invariant4(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 {
@@ -1760,7 +1749,7 @@ var Swarm = class {
           } catch (err) {
             log4("initiation error", err, {
               F: __dxlog_file4,
-              L: 335,
+              L: 339,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1789,7 +1778,7 @@ var Swarm = class {
         remoteId
       }, {
         F: __dxlog_file4,
-        L: 363,
+        L: 367,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1798,7 +1787,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) {
@@ -1808,7 +1797,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 379,
+      L: 383,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1818,7 +1807,7 @@ var Swarm = class {
       remoteId
     }, {
       F: __dxlog_file4,
-      L: 382,
+      L: 386,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1830,6 +1819,9 @@ var Swarm = class {
     }
     await peer.closeConnection();
   }
+  _isUnregistered(peer) {
+    return !peer || this._peers.get(peer.id) !== peer;
+  }
 };
 _ts_decorate3([
   logInfo2
@@ -2313,7 +2305,7 @@ var SwarmNetworkManager = class {
     this._connectionLog?.leftSwarm(swarm);
     await swarm.destroy();
     this._swarms.delete(topic);
-    await this.topicsUpdated.emit();
+    this.topicsUpdated.emit();
     log7("left", {
       topic: PublicKey8.from(topic),
       count: this._swarms.size
@@ -4087,4 +4079,4 @@ export {
   TcpTransport,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-VCGCTQ7O.mjs.map
+//# sourceMappingURL=chunk-3UBXH53L.mjs.map