@dxos/network-manager 0.8.1-main.ba2dec9 → 0.8.1-staging.31c3ee1

package/dist/lib/node/{chunk-FNZNGA6E.cjs → chunk-D2HGDGMO.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_FNZNGA6E_exports = {};
-__export(chunk_FNZNGA6E_exports, {
+var chunk_D2HGDGMO_exports = {};
+__export(chunk_D2HGDGMO_exports, {
   Connection: () => Connection,
   ConnectionLimiter: () => ConnectionLimiter,
   ConnectionLog: () => ConnectionLog,
@@ -51,7 +51,7 @@ __export(chunk_FNZNGA6E_exports, {
   createRtcTransportFactory: () => createRtcTransportFactory,
   createTeleportProtocolFactory: () => createTeleportProtocolFactory
 });
-module.exports = __toCommonJS(chunk_FNZNGA6E_exports);
+module.exports = __toCommonJS(chunk_D2HGDGMO_exports);
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
@@ -275,7 +275,9 @@ var Connection = class {
         C: (f, a) => f(...a)
       });
       this._protocolClosed.wake();
-      this.close(new import_protocols.ProtocolError("protocol stream closed")).catch((err) => this.errors.raise(err));
+      this.close({
+        error: 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, {
@@ -370,7 +372,7 @@ var Connection = class {
     });
   }
   async abort(err) {
-    (0, import_log.log)("aborting...", {
+    (0, import_log.log)("abort", {
       err
     }, {
       F: __dxlog_file,
@@ -393,6 +395,15 @@ var Connection = class {
       this.closeReason = err?.message;
     }
     await this._ctx.dispose();
+    (0, import_log.log)("aborting...", {
+      peerId: this.localInfo,
+      err
+    }, {
+      F: __dxlog_file,
+      L: 279,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     try {
       await this._closeProtocol({
         abort: true
@@ -400,7 +411,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 283,
+        L: 285,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -410,7 +421,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 290,
+        L: 292,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -420,62 +431,81 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 296,
+        L: 298,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     this._changeState("ABORTED");
   }
-  async close(err) {
+  async close({ error, reason } = {}) {
+    (0, import_log.log)("close", {
+      error
+    }, {
+      F: __dxlog_file,
+      L: 305,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     if (!this.closeReason) {
-      this.closeReason = err?.message;
+      this.closeReason = reason ?? error?.message;
     } else {
-      this.closeReason += `; ${err?.message}`;
+      this.closeReason += `; ${reason ?? error?.message}`;
     }
     if (this._state === "CLOSED" || this._state === "ABORTING" || this._state === "ABORTED") {
+      (0, import_log.log)("close ignored: already in progress", {
+        state: this._state,
+        error
+      }, {
+        F: __dxlog_file,
+        L: 316,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       return;
     }
     const lastState = this._state;
     this._changeState("CLOSING");
     await this.connectedTimeoutContext.dispose();
     await this._ctx.dispose();
-    (0, import_log.log)("closing...", {
-      peerId: this.localInfo
-    }, {
-      F: __dxlog_file,
-      L: 321,
-      S: this,
-      C: (f, a) => f(...a)
-    });
     let abortProtocol = false;
-    if (lastState !== "CONNECTED") {
+    if (lastState !== "CONNECTED" || error != null) {
       (0, import_log.log)(`graceful close requested when we were in ${lastState} state? aborting`, void 0, {
         F: __dxlog_file,
-        L: 325,
+        L: 327,
         S: this,
         C: (f, a) => f(...a)
       });
       abortProtocol = true;
     }
+    (0, import_log.log)("closing...", {
+      peerId: this.localInfo,
+      abortProtocol,
+      error
+    }, {
+      F: __dxlog_file,
+      L: 331,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     try {
       await this._closeProtocol({
         abort: abortProtocol
       });
-    } catch (err2) {
-      import_log.log.catch(err2, void 0, {
+    } catch (err) {
+      import_log.log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 331,
+        L: 336,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     try {
       await this._closeTransport();
-    } catch (err2) {
-      import_log.log.catch(err2, void 0, {
+    } catch (err) {
+      import_log.log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 337,
+        L: 342,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -484,17 +514,17 @@ var Connection = class {
       peerId: this.localInfo
     }, {
       F: __dxlog_file,
-      L: 340,
+      L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
     this._changeState("CLOSED");
-    this._callbacks?.onClosed?.(err);
+    this._callbacks?.onClosed?.(error);
   }
   async _closeProtocol(options) {
     (0, import_log.log)("closing protocol", options, {
       F: __dxlog_file,
-      L: 346,
+      L: 351,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -504,7 +534,7 @@ var Connection = class {
     ]);
     (0, import_log.log)("protocol closed", options, {
       F: __dxlog_file,
-      L: 348,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -512,7 +542,7 @@ var Connection = class {
   async _closeTransport() {
     (0, import_log.log)("closing transport", void 0, {
       F: __dxlog_file,
-      L: 352,
+      L: 357,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -522,7 +552,7 @@ var Connection = class {
     ]);
     (0, import_log.log)("transport closed", void 0, {
       F: __dxlog_file,
-      L: 354,
+      L: 359,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -563,11 +593,13 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 394,
+        L: 399,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this.close(new import_protocols.ConnectivityError("signal message failed to deliver", err));
+      await this.close({
+        error: new import_protocols.ConnectivityError("signal message failed to deliver", err)
+      });
     }
   }
   /**
@@ -576,7 +608,7 @@ var Connection = class {
   async signal(msg) {
     (0, import_invariant.invariant)(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 403,
+      L: 408,
       S: this,
       A: [
         "msg.sessionId",
@@ -586,7 +618,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: 405,
+        L: 410,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -594,7 +626,7 @@ var Connection = class {
     }
     (0, import_invariant.invariant)(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 408,
+      L: 413,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -603,7 +635,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.author.peerKey === this.remoteInfo.peerKey, void 0, {
       F: __dxlog_file,
-      L: 409,
+      L: 414,
       S: this,
       A: [
         "msg.author.peerKey === this.remoteInfo.peerKey",
@@ -612,7 +644,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.recipient.peerKey === this.localInfo.peerKey, void 0, {
       F: __dxlog_file,
-      L: 410,
+      L: 415,
       S: this,
       A: [
         "msg.recipient.peerKey === this.localInfo.peerKey",
@@ -636,7 +668,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 419,
+          L: 424,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -644,7 +676,7 @@ var Connection = class {
       } else {
         (0, import_invariant.invariant)(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 422,
+          L: 427,
           S: this,
           A: [
             "this._transport",
@@ -657,7 +689,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 423,
+          L: 428,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -675,13 +707,13 @@ var Connection = class {
       peerId: this.localInfo
     }, {
       F: __dxlog_file,
-      L: 434,
+      L: 439,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant.invariant)(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 435,
+      L: 440,
       S: this,
       A: [
         "state !== this._state",
@@ -1400,7 +1432,9 @@ var Peer = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    await connection.close(err);
+    await connection.close({
+      error: err
+    });
     (0, import_log5.log)("closed", {
       peerId: this.remoteInfo,
       sessionId: connection.sessionId
@@ -1436,7 +1470,9 @@ var Peer = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    await this?.connection?.close(reason);
+    await this?.connection?.close({
+      reason
+    });
   }
 };
 _ts_decorate2([
@@ -1730,24 +1766,34 @@ var Swarm = class {
         accept: false
       };
     }
-    const peer = this._getOrCreatePeer(message.author);
+    const peer = this._getOfferSenderPeer(message.author);
     const answer = await peer.onOffer(message);
     this._topology.update();
     return answer;
   }
+  _getOfferSenderPeer(senderInfo) {
+    const peer = this._getOrCreatePeer(senderInfo);
+    const connectionState = peer.connection?.state;
+    if (connectionState === ConnectionState.CLOSING || connectionState === ConnectionState.ABORTING) {
+      this._peers.delete(peer.remoteInfo);
+      this.disconnected.emit(peer.remoteInfo);
+      return this._getOrCreatePeer(peer.remoteInfo);
+    }
+    return peer;
+  }
   async onSignal(message) {
     (0, import_log4.log)("signal", {
       message
     }, {
       F: __dxlog_file5,
-      L: 232,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       import_log4.log.info("ignored for offline swarm", void 0, {
         F: __dxlog_file5,
-        L: 234,
+        L: 248,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1755,7 +1801,7 @@ var Swarm = class {
     }
     (0, import_invariant3.invariant)(message.recipient.peerKey === this._ownPeer.peerKey, `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.recipient}`, {
       F: __dxlog_file5,
-      L: 237,
+      L: 251,
       S: this,
       A: [
         "message.recipient.peerKey === this._ownPeer.peerKey",
@@ -1764,7 +1810,7 @@ var Swarm = class {
     });
     (0, import_invariant3.invariant)(message.topic?.equals(this._topic), void 0, {
       F: __dxlog_file5,
-      L: 241,
+      L: 255,
       S: this,
       A: [
         "message.topic?.equals(this._topic)",
@@ -1773,7 +1819,7 @@ var Swarm = class {
     });
     (0, import_invariant3.invariant)(message.author, void 0, {
       F: __dxlog_file5,
-      L: 242,
+      L: 256,
       S: this,
       A: [
         "message.author",
@@ -1794,13 +1840,13 @@ var Swarm = class {
   async goOnline() {
     this._ctx = new import_context3.Context(void 0, {
       F: __dxlog_file5,
-      L: 258
+      L: 272
     });
   }
   _getOrCreatePeer(peerInfo) {
     (0, import_invariant3.invariant)(peerInfo.peerKey, "PeerInfo.peerKey is required", {
       F: __dxlog_file5,
-      L: 262,
+      L: 276,
       S: this,
       A: [
         "peerInfo.peerKey",
@@ -1820,7 +1866,7 @@ var Swarm = class {
           if (this._isUnregistered(peer)) {
             import_log4.log.verbose("ignored onDisconnected for unregistered peer", void 0, {
               F: __dxlog_file5,
-              L: 282,
+              L: 296,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1838,7 +1884,7 @@ var Swarm = class {
               peerInfo
             }, {
               F: __dxlog_file5,
-              L: 296,
+              L: 310,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1865,14 +1911,14 @@ var Swarm = class {
       reason
     }, {
       F: __dxlog_file5,
-      L: 318,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
     const peer = this._peers.get(peerInfo);
     (0, import_invariant3.invariant)(peer, void 0, {
       F: __dxlog_file5,
-      L: 320,
+      L: 334,
       S: this,
       A: [
         "peer",
@@ -1880,7 +1926,7 @@ var Swarm = class {
       ]
     });
     this._peers.delete(peerInfo);
-    await peer.safeDestroy(new Error(reason));
+    await peer.safeDestroy(reason);
   }
   _getSwarmController() {
     return {
@@ -1902,7 +1948,7 @@ var Swarm = class {
           } catch (err) {
             (0, import_log4.log)("initiation error", err, {
               F: __dxlog_file5,
-              L: 347,
+              L: 361,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1933,7 +1979,7 @@ var Swarm = class {
         remotePeer
       }, {
         F: __dxlog_file5,
-        L: 375,
+        L: 389,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1952,7 +1998,7 @@ var Swarm = class {
       remotePeer
     }, {
       F: __dxlog_file5,
-      L: 391,
+      L: 405,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1962,7 +2008,7 @@ var Swarm = class {
       remotePeer
     }, {
       F: __dxlog_file5,
-      L: 394,
+      L: 408,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2016,7 +2062,7 @@ var SwarmMapper = class {
   }
   constructor(_swarm) {
     this._swarm = _swarm;
-    this._subscriptions = new import_async5.EventSubscriptions();
+    this._subscriptions = new import_async5.SubscriptionList();
     this._connectionSubscriptions = new import_util4.ComplexMap(import_messaging2.PeerInfoHash);
     this._peers = new import_util4.ComplexMap(import_messaging2.PeerInfoHash);
     this.mapUpdated = new import_async5.Event();
@@ -2036,7 +2082,7 @@ var SwarmMapper = class {
   _update() {
     (0, import_log6.log)("updating swarm", void 0, {
       F: __dxlog_file6,
-      L: 73,
+      L: 71,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2060,7 +2106,7 @@ var SwarmMapper = class {
       totalPeersInSwarm: this._peers.size
     }, {
       F: __dxlog_file6,
-      L: 114,
+      L: 112,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2069,6 +2115,7 @@ var SwarmMapper = class {
   // TODO(burdon): Async open/close.
   destroy() {
     Array.from(this._connectionSubscriptions.values()).forEach((cb) => cb());
+    this._connectionSubscriptions.clear();
     this._subscriptions.clear();
   }
 };
@@ -4422,4 +4469,4 @@ var createTeleportProtocolFactory = (onConnection, defaultParams) => {
   createRtcTransportFactory,
   createTeleportProtocolFactory
 });
-//# sourceMappingURL=chunk-FNZNGA6E.cjs.map
+//# sourceMappingURL=chunk-D2HGDGMO.cjs.map