@dxos/network-manager 0.1.56-main.fd2d497 → 0.1.56-next.71eb10c

package/dist/lib/browser/{chunk-5TRIVLI6.mjs → chunk-WQ3YXGWP.mjs}

@@ -92,7 +92,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 95,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -112,7 +112,7 @@ var Connection = class {
   async openConnection() {
     invariant(this._state === ConnectionState.INITIAL, "Invalid state.", {
       F: __dxlog_file,
-      L: 120,
+      L: 121,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -123,7 +123,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 121,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -135,7 +135,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 122,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -146,7 +146,7 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       log("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 139,
+        L: 140,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -154,7 +154,7 @@ var Connection = class {
     });
     invariant(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 143,
+      L: 144,
       S: this,
       A: [
         "!this._transport",
@@ -174,6 +174,9 @@ var Connection = class {
       this.close().catch((err) => this.errors.raise(err));
     });
     this._transport.errors.handle((err) => {
+      if (!this.closeReason) {
+        this.closeReason = err?.message;
+      }
       if (this._state !== ConnectionState.CLOSED && this._state !== ConnectionState.CLOSING) {
         this.errors.raise(err);
       }
@@ -186,12 +189,15 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 172,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
+  async close(err) {
+    if (!this.closeReason) {
+      this.closeReason = err?.message;
+    }
     if (this._state === ConnectionState.CLOSED) {
       return;
     }
@@ -201,26 +207,26 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 184,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
     try {
       await this._protocol.destroy();
-    } catch (err) {
-      log.catch(err, void 0, {
+    } catch (err2) {
+      log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 190,
+        L: 197,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     try {
       await this._transport?.destroy();
-    } catch (err) {
-      log.catch(err, void 0, {
+    } catch (err2) {
+      log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 197,
+        L: 204,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -229,7 +235,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 200,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -244,8 +250,10 @@ var Connection = class {
       return;
     }
     try {
-      await cancelWithContext(this._ctx, sleep(this._signallingDelay));
-      this._signallingDelay = Math.min(this._signallingDelay * 2, MAX_SIGNALLING_DELAY);
+      if (true) {
+        await cancelWithContext(this._ctx, sleep(this._signallingDelay));
+        this._signallingDelay = Math.min(this._signallingDelay * 2, MAX_SIGNALLING_DELAY);
+      }
       const signals = [
         ...this._outgoingSignalBuffer
       ];
@@ -269,7 +277,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 234,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -282,7 +290,7 @@ var Connection = class {
   async signal(msg) {
     invariant(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 243,
+      L: 252,
       S: this,
       A: [
         "msg.sessionId",
@@ -292,7 +300,7 @@ var Connection = class {
     if (!msg.sessionId.equals(this.sessionId)) {
       log("dropping signal for incorrect session id", void 0, {
         F: __dxlog_file,
-        L: 245,
+        L: 254,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -300,7 +308,7 @@ var Connection = class {
     }
     invariant(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 248,
+      L: 257,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -309,7 +317,7 @@ var Connection = class {
     });
     invariant(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 249,
+      L: 258,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -318,7 +326,7 @@ var Connection = class {
     });
     invariant(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 250,
+      L: 259,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -339,7 +347,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 259,
+          L: 268,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -347,7 +355,7 @@ var Connection = class {
       } else {
         invariant(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 262,
+          L: 271,
           S: this,
           A: [
             "this._transport",
@@ -360,7 +368,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 263,
+          L: 272,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -375,13 +383,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 270,
+      L: 279,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 271,
+      L: 280,
       S: this,
       A: [
         "state !== this._state",
@@ -658,6 +666,7 @@ function _ts_decorate2(decorators, target, key, desc) {
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
 var CONNECTION_COUNTS_STABLE_AFTER = 5e3;
 var Peer = class {
+  // TODO(burdon): Convert to map?
   constructor(id, topic, localPeerId, _signalMessaging, _protocolProvider, _transportFactory, _connectionLimiter, _callbacks) {
     this.id = id;
     this.topic = topic;
@@ -687,12 +696,12 @@ var Peer = class {
           sessionId: this.connection?.sessionId
         }, {
           F: __dxlog_file3,
-          L: 106,
+          L: 108,
           S: this,
           C: (f, a) => f(...a)
         });
         if (this.connection) {
-          await this.closeConnection();
+          await this.closeConnection(new Error("Connection displaced by remote initiator."));
         }
       } else {
         return {
@@ -704,7 +713,7 @@ var Peer = class {
       if (!this.connection) {
         invariant3(message.sessionId, void 0, {
           F: __dxlog_file3,
-          L: 126,
+          L: 128,
           S: this,
           A: [
             "message.sessionId",
@@ -724,12 +733,12 @@ var Peer = class {
               err
             }, {
               F: __dxlog_file3,
-              L: 134,
+              L: 136,
               S: this,
               C: (f, a) => f(...a)
             });
           }
-          await this.closeConnection();
+          await this.closeConnection(err);
         }
         return {
           accept: true
@@ -746,7 +755,7 @@ var Peer = class {
   async initiateConnection() {
     invariant3(!this.initiating, "Initiation in progress.", {
       F: __dxlog_file3,
-      L: 151,
+      L: 153,
       S: this,
       A: [
         "!this.initiating",
@@ -755,7 +764,7 @@ var Peer = class {
     });
     invariant3(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 152,
+      L: 154,
       S: this,
       A: [
         "!this.connection",
@@ -770,7 +779,7 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 154,
+      L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -794,14 +803,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 169,
+        L: 171,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         log3("ignoring response", void 0, {
           F: __dxlog_file3,
-          L: 171,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -821,11 +830,11 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 182,
+        L: 184,
         S: this,
         C: (f, a) => f(...a)
       });
-      await this.closeConnection();
+      await this.closeConnection(err);
       throw err;
     } finally {
       this.initiating = false;
@@ -844,13 +853,13 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 196,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 203,
+      L: 205,
       S: this,
       A: [
         "!this.connection",
@@ -891,7 +900,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 229,
+            L: 231,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -905,13 +914,13 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 240,
+            L: 242,
             S: this,
             C: (f, a) => f(...a)
           });
           invariant3(this.connection === connection, "Connection mismatch (race condition).", {
             F: __dxlog_file3,
-            L: 241,
+            L: 243,
             S: this,
             A: [
               "this.connection === connection",
@@ -926,7 +935,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 243,
+            L: 245,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -956,7 +965,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 277,
+        L: 279,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -969,16 +978,16 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 278,
+        L: 280,
         S: this,
         C: (f, a) => f(...a)
       });
-      void this.closeConnection();
+      void this.closeConnection(err);
     });
     this.connection = connection;
     return connection;
   }
-  async closeConnection() {
+  async closeConnection(err) {
     if (!this.connection) {
       return;
     }
@@ -988,17 +997,17 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 301,
+      L: 303,
       S: this,
       C: (f, a) => f(...a)
     });
-    await connection.close();
+    await connection.close(err);
     log3("closed", {
       peerId: this.id,
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 307,
+      L: 309,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1009,7 +1018,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 312,
+        L: 314,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1024,7 +1033,7 @@ var Peer = class {
       topic: this.topic
     }, {
       F: __dxlog_file3,
-      L: 322,
+      L: 324,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1073,9 +1082,9 @@ var Swarm = class {
     this._transportFactory = _transportFactory;
     this._label = _label;
     this._connectionLimiter = _connectionLimiter;
-    this._peers = new ComplexMap2(PublicKey4.hash);
     this._ctx = new Context4();
     this._listeningHandle = void 0;
+    this._peers = new ComplexMap2(PublicKey4.hash);
     this._instanceId = PublicKey4.random().toHex();
     this.connectionAdded = new Event2();
     this.disconnected = new Event2();
@@ -1605,7 +1614,7 @@ import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log6 } from "@dxos/log";
 import { ComplexMap as ComplexMap4 } from "@dxos/util";
 var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/connection-limiter.ts";
-var MAX_CONCURRENT_INITIATING_CONNECTIONS = 3;
+var MAX_CONCURRENT_INITIATING_CONNECTIONS = 10;
 var ConnectionLimiter = class {
   constructor({ maxConcurrentInitConnections = MAX_CONCURRENT_INITIATING_CONNECTIONS } = {}) {
     this._ctx = new Context5();
@@ -1718,6 +1727,7 @@ var ConnectionLog = class {
     swarm.connectionAdded.on((connection) => {
       const connectionInfo = {
         state: ConnectionState.INITIAL,
+        closeReason: connection.closeReason,
         remotePeerId: connection.remoteId,
         sessionId: connection.sessionId,
         transport: connection.transport && Object.getPrototypeOf(connection.transport).constructor.name,
@@ -1728,6 +1738,7 @@ var ConnectionLog = class {
       this.update.emit();
       connection.stateChanged.on((state) => {
         connectionInfo.state = state;
+        connectionInfo.closeReason = connection.closeReason;
         connectionInfo.events.push({
           type: EventType.CONNECTION_STATE_CHANGED,
           newState: state
@@ -2444,34 +2455,39 @@ var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-man
 var WebRTCTransport = class {
   constructor(params) {
     this.params = params;
+    this._instanceId = PublicKey10.random().toHex();
     this._closed = false;
     this.closed = new Event7();
     this.connected = new Event7();
     this.errors = new ErrorStream4();
-    this._instanceId = PublicKey10.random().toHex();
     log11.trace("dxos.mesh.webrtc-transport.constructor", trace4.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 39,
+      L: 44,
       S: this,
       C: (f, a) => f(...a)
     });
     log11("created connection", params, {
       F: __dxlog_file12,
-      L: 40,
+      L: 45,
       S: this,
       C: (f, a) => f(...a)
     });
     this._peer = new SimplePeerConstructor({
       initiator: this.params.initiator,
-      wrtc: SimplePeerConstructor.WEBRTC_SUPPORT ? void 0 : wrtc ?? raise2(new Error("wrtc not available")),
-      config: this.params.webrtcConfig
+      config: this.params.webrtcConfig,
+      // https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/createDataChannel
+      channelConfig: {
+        protocol: "dxos.mesh"
+      },
+      // Custom WebRTC implementation (for Node); otherwise get-browser-rtc.
+      wrtc: SimplePeerConstructor.WEBRTC_SUPPORT ? void 0 : wrtc ?? raise2(new Error("wrtc not available"))
     });
     this._peer.on("signal", async (data) => {
       log11("signal", data, {
         F: __dxlog_file12,
-        L: 48,
+        L: 62,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2484,7 +2500,7 @@ var WebRTCTransport = class {
     this._peer.on("connect", () => {
       log11("connected", void 0, {
         F: __dxlog_file12,
-        L: 53,
+        L: 67,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2494,7 +2510,7 @@ var WebRTCTransport = class {
     this._peer.on("close", async () => {
       log11("closed", void 0, {
         F: __dxlog_file12,
-        L: 59,
+        L: 73,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2511,7 +2527,7 @@ var WebRTCTransport = class {
               stats
             }, {
               F: __dxlog_file12,
-              L: 71,
+              L: 85,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2525,7 +2541,7 @@ var WebRTCTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 81,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2533,7 +2549,7 @@ var WebRTCTransport = class {
   async destroy() {
     log11("closing...", void 0, {
       F: __dxlog_file12,
-      L: 85,
+      L: 99,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2543,7 +2559,7 @@ var WebRTCTransport = class {
     this.closed.emit();
     log11("closed", void 0, {
       F: __dxlog_file12,
-      L: 90,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2554,7 +2570,7 @@ var WebRTCTransport = class {
     }
     invariant11(signal.payload.data, "Signal message must contain signal data.", {
       F: __dxlog_file12,
-      L: 98,
+      L: 112,
       S: this,
       A: [
         "signal.payload.data",
@@ -2722,9 +2738,9 @@ var WebRTCTransportProxy = class {
     this._proxyId = PublicKey12.random();
     this._ctx = new Context6();
     this.closed = new Event8();
-    this._closed = false;
     this.connected = new Event8();
     this.errors = new ErrorStream5();
+    this._closed = false;
     this._serviceStream = this._params.bridgeService.open({
       proxyId: this._proxyId,
       initiator: this._params.initiator
@@ -2800,7 +2816,7 @@ var WebRTCTransportProxy = class {
     if (this._closed) {
       return;
     }
-    this._serviceStream.close();
+    await this._serviceStream.close();
     try {
       await this._params.bridgeService.close({
         proxyId: this._proxyId
@@ -2821,7 +2837,7 @@ var WebRTCTransportProxy = class {
   */
   // TODO(burdon): Option on close method.
   forceClose() {
-    this._serviceStream.close();
+    void this._serviceStream.close();
     this.closed.emit();
     this._closed = true;
   }
@@ -2902,4 +2918,4 @@ export {
   WebRTCTransportProxyFactory,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-5TRIVLI6.mjs.map
+//# sourceMappingURL=chunk-WQ3YXGWP.mjs.map