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

package/dist/lib/browser/{chunk-WXFQML2V.mjs → chunk-BHB7ZFZF.mjs}

@@ -132,7 +132,9 @@ var Connection = class {
         C: (f, a) => f(...a)
       });
       this._protocolClosed.wake();
-      this.close(new ProtocolError("protocol stream closed")).catch((err) => this.errors.raise(err));
+      this.close({
+        error: 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, {
@@ -227,7 +229,7 @@ var Connection = class {
     });
   }
   async abort(err) {
-    log("aborting...", {
+    log("abort", {
       err
     }, {
       F: __dxlog_file,
@@ -250,6 +252,15 @@ var Connection = class {
       this.closeReason = err?.message;
     }
     await this._ctx.dispose();
+    log("aborting...", {
+      peerId: this.localInfo,
+      err
+    }, {
+      F: __dxlog_file,
+      L: 279,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     try {
       await this._closeProtocol({
         abort: true
@@ -257,7 +268,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 283,
+        L: 285,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -267,7 +278,7 @@ var Connection = class {
     } catch (err2) {
       log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 290,
+        L: 292,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -277,62 +288,81 @@ var Connection = class {
     } catch (err2) {
       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 } = {}) {
+    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") {
+      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();
-    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) {
       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;
     }
+    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) {
-      log.catch(err2, void 0, {
+    } catch (err) {
+      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) {
-      log.catch(err2, void 0, {
+    } catch (err) {
+      log.catch(err, void 0, {
         F: __dxlog_file,
-        L: 337,
+        L: 342,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -341,17 +371,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) {
     log("closing protocol", options, {
       F: __dxlog_file,
-      L: 346,
+      L: 351,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -361,7 +391,7 @@ var Connection = class {
     ]);
     log("protocol closed", options, {
       F: __dxlog_file,
-      L: 348,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -369,7 +399,7 @@ var Connection = class {
   async _closeTransport() {
     log("closing transport", void 0, {
       F: __dxlog_file,
-      L: 352,
+      L: 357,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -379,7 +409,7 @@ var Connection = class {
     ]);
     log("transport closed", void 0, {
       F: __dxlog_file,
-      L: 354,
+      L: 359,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -420,11 +450,13 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 394,
+        L: 399,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this.close(new ConnectivityError("signal message failed to deliver", err));
+      await this.close({
+        error: new ConnectivityError("signal message failed to deliver", err)
+      });
     }
   }
   /**
@@ -433,7 +465,7 @@ var Connection = class {
   async signal(msg) {
     invariant(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 403,
+      L: 408,
       S: this,
       A: [
         "msg.sessionId",
@@ -443,7 +475,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 405,
+        L: 410,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -451,7 +483,7 @@ var Connection = class {
     }
     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",
@@ -460,7 +492,7 @@ var Connection = class {
     });
     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",
@@ -469,7 +501,7 @@ var Connection = class {
     });
     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",
@@ -493,7 +525,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 419,
+          L: 424,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -501,7 +533,7 @@ var Connection = class {
       } else {
         invariant(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 422,
+          L: 427,
           S: this,
           A: [
             "this._transport",
@@ -514,7 +546,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 423,
+          L: 428,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -532,13 +564,13 @@ var Connection = class {
       peerId: this.localInfo
     }, {
       F: __dxlog_file,
-      L: 434,
+      L: 439,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 435,
+      L: 440,
       S: this,
       A: [
         "state !== this._state",
@@ -1290,7 +1322,9 @@ var Peer = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    await connection.close(err);
+    await connection.close({
+      error: err
+    });
     log4("closed", {
       peerId: this.remoteInfo,
       sessionId: connection.sessionId
@@ -1326,7 +1360,9 @@ var Peer = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    await this?.connection?.close(reason);
+    await this?.connection?.close({
+      reason
+    });
   }
 };
 _ts_decorate2([
@@ -1622,24 +1658,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) {
     log5("signal", {
       message
     }, {
       F: __dxlog_file5,
-      L: 232,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._ctx.disposed) {
       log5.info("ignored for offline swarm", void 0, {
         F: __dxlog_file5,
-        L: 234,
+        L: 248,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1647,7 +1693,7 @@ var Swarm = class {
     }
     invariant4(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",
@@ -1656,7 +1702,7 @@ var Swarm = class {
     });
     invariant4(message.topic?.equals(this._topic), void 0, {
       F: __dxlog_file5,
-      L: 241,
+      L: 255,
       S: this,
       A: [
         "message.topic?.equals(this._topic)",
@@ -1665,7 +1711,7 @@ var Swarm = class {
     });
     invariant4(message.author, void 0, {
       F: __dxlog_file5,
-      L: 242,
+      L: 256,
       S: this,
       A: [
         "message.author",
@@ -1686,13 +1732,13 @@ var Swarm = class {
   async goOnline() {
     this._ctx = new Context4(void 0, {
       F: __dxlog_file5,
-      L: 258
+      L: 272
     });
   }
   _getOrCreatePeer(peerInfo) {
     invariant4(peerInfo.peerKey, "PeerInfo.peerKey is required", {
       F: __dxlog_file5,
-      L: 262,
+      L: 276,
       S: this,
       A: [
         "peerInfo.peerKey",
@@ -1712,7 +1758,7 @@ var Swarm = class {
           if (this._isUnregistered(peer)) {
             log5.verbose("ignored onDisconnected for unregistered peer", void 0, {
               F: __dxlog_file5,
-              L: 282,
+              L: 296,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1730,7 +1776,7 @@ var Swarm = class {
               peerInfo
             }, {
               F: __dxlog_file5,
-              L: 296,
+              L: 310,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1757,14 +1803,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);
     invariant4(peer, void 0, {
       F: __dxlog_file5,
-      L: 320,
+      L: 334,
       S: this,
       A: [
         "peer",
@@ -1772,7 +1818,7 @@ var Swarm = class {
       ]
     });
     this._peers.delete(peerInfo);
-    await peer.safeDestroy(new Error(reason));
+    await peer.safeDestroy(reason);
   }
   _getSwarmController() {
     return {
@@ -1794,7 +1840,7 @@ var Swarm = class {
           } catch (err) {
             log5("initiation error", err, {
               F: __dxlog_file5,
-              L: 347,
+              L: 361,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1825,7 +1871,7 @@ var Swarm = class {
         remotePeer
       }, {
         F: __dxlog_file5,
-        L: 375,
+        L: 389,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1844,7 +1890,7 @@ var Swarm = class {
       remotePeer
     }, {
       F: __dxlog_file5,
-      L: 391,
+      L: 405,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1854,7 +1900,7 @@ var Swarm = class {
       remotePeer
     }, {
       F: __dxlog_file5,
-      L: 394,
+      L: 408,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1903,7 +1949,7 @@ _ts_decorate3([
 ], Swarm.prototype, "goOnline", null);
 
 // packages/core/mesh/network-manager/src/swarm/swarm-mapper.ts
-import { Event as Event4, EventSubscriptions } from "@dxos/async";
+import { Event as Event4, SubscriptionList } from "@dxos/async";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log6 } from "@dxos/log";
 import { PeerInfoHash as PeerInfoHash2 } from "@dxos/messaging";
@@ -1915,7 +1961,7 @@ var SwarmMapper = class {
   }
   constructor(_swarm) {
     this._swarm = _swarm;
-    this._subscriptions = new EventSubscriptions();
+    this._subscriptions = new SubscriptionList();
     this._connectionSubscriptions = new ComplexMap3(PeerInfoHash2);
     this._peers = new ComplexMap3(PeerInfoHash2);
     this.mapUpdated = new Event4();
@@ -1935,7 +1981,7 @@ var SwarmMapper = class {
   _update() {
     log6("updating swarm", void 0, {
       F: __dxlog_file6,
-      L: 73,
+      L: 71,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1959,7 +2005,7 @@ var SwarmMapper = class {
       totalPeersInSwarm: this._peers.size
     }, {
       F: __dxlog_file6,
-      L: 114,
+      L: 112,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1968,6 +2014,7 @@ var SwarmMapper = class {
   // TODO(burdon): Async open/close.
   destroy() {
     Array.from(this._connectionSubscriptions.values()).forEach((cb) => cb());
+    this._connectionSubscriptions.clear();
     this._subscriptions.clear();
   }
 };
@@ -4431,4 +4478,4 @@ export {
   RtcTransportService,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-WXFQML2V.mjs.map
+//# sourceMappingURL=chunk-BHB7ZFZF.mjs.map