@dxos/network-manager 0.1.58-main.3349da8 → 0.1.58-main.385b5e4

package/dist/lib/browser/{chunk-PSWNMALH.mjs → chunk-JIGWYM5K.mjs}

@@ -7,11 +7,10 @@ import {
 import { DeferredTask, Event, sleep, synchronized } from "@dxos/async";
 import { Context, cancelWithContext } from "@dxos/context";
 import { ErrorStream } from "@dxos/debug";
-import { CancelledError, ProtocolError, ConnectionResetError, ConnectivityError, UnknownProtocolError } from "@dxos/errors";
 import { invariant } from "@dxos/invariant";
 import { PublicKey } from "@dxos/keys";
 import { log } from "@dxos/log";
-import { trace } from "@dxos/protocols";
+import { CancelledError, ProtocolError, ConnectionResetError, ConnectivityError, UnknownProtocolError, trace } from "@dxos/protocols";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -771,10 +770,10 @@ import { ComplexMap as ComplexMap2, isNotNullOrUndefined } from "@dxos/util";
 // packages/core/mesh/network-manager/src/swarm/peer.ts
 import { Event as Event2, scheduleTask, synchronized as synchronized2 } from "@dxos/async";
 import { Context as Context3 } from "@dxos/context";
-import { CancelledError as CancelledError2, SystemError, TimeoutError } from "@dxos/errors";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
+import { CancelledError as CancelledError2, SystemError, TimeoutError } from "@dxos/protocols";
 function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -815,6 +814,20 @@ var Peer = class {
   */
   async onOffer(message) {
     const remoteId = message.author;
+    if (this.connection && ![
+      ConnectionState.CREATED,
+      ConnectionState.INITIAL
+    ].includes(this.connection.state)) {
+      log3.info(`received offer when connection already in ${this.connection.state} state`, void 0, {
+        F: __dxlog_file3,
+        L: 112,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return {
+        accept: false
+      };
+    }
     if (this.connection || this.initiating) {
       if (remoteId.toHex() < this.localPeerId.toHex()) {
         log3("close local connection", {
@@ -824,7 +837,7 @@ var Peer = class {
           sessionId: this.connection?.sessionId
         }, {
           F: __dxlog_file3,
-          L: 117,
+          L: 121,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -841,7 +854,7 @@ var Peer = class {
       if (!this.connection) {
         invariant3(message.sessionId, void 0, {
           F: __dxlog_file3,
-          L: 137,
+          L: 141,
           S: this,
           A: [
             "message.sessionId",
@@ -862,7 +875,7 @@ var Peer = class {
               err
             }, {
               F: __dxlog_file3,
-              L: 147,
+              L: 151,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -884,7 +897,7 @@ var Peer = class {
   async initiateConnection() {
     invariant3(!this.initiating, "Initiation in progress.", {
       F: __dxlog_file3,
-      L: 164,
+      L: 168,
       S: this,
       A: [
         "!this.initiating",
@@ -893,7 +906,7 @@ var Peer = class {
     });
     invariant3(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 165,
+      L: 169,
       S: this,
       A: [
         "!this.connection",
@@ -908,7 +921,7 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 167,
+      L: 171,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -933,14 +946,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 183,
+        L: 187,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         log3("ignoring response", void 0, {
           F: __dxlog_file3,
-          L: 185,
+          L: 189,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -960,7 +973,7 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file3,
-        L: 196,
+        L: 200,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -986,13 +999,13 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 213,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 220,
+      L: 224,
       S: this,
       A: [
         "!this.connection",
@@ -1028,7 +1041,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 239,
+            L: 243,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1041,14 +1054,14 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 248,
+            L: 252,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
           invariant3(this.connection === connection, "Connection mismatch (race condition).", {
             F: __dxlog_file3,
-            L: 253,
+            L: 257,
             S: this,
             A: [
               "this.connection === connection",
@@ -1063,7 +1076,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 255,
+            L: 259,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1098,7 +1111,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 295,
+        L: 299,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1111,7 +1124,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 296,
+        L: 300,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1130,7 +1143,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 321,
+      L: 325,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1140,7 +1153,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 327,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1151,7 +1164,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 332,
+        L: 336,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1166,7 +1179,7 @@ var Peer = class {
       topic: this.topic
     }, {
       F: __dxlog_file3,
-      L: 342,
+      L: 346,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1679,7 +1692,6 @@ var SwarmMapper = class {
   get peers() {
     return Array.from(this._peers.values());
   }
-  // prettier-ignore
   constructor(_swarm) {
     this._swarm = _swarm;
     this._subscriptions = new EventSubscriptions();
@@ -1702,7 +1714,7 @@ var SwarmMapper = class {
   _update() {
     log5("updating swarm", void 0, {
       F: __dxlog_file5,
-      L: 75,
+      L: 72,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1726,7 +1738,7 @@ var SwarmMapper = class {
       totalPeersInSwarm: this._peers.size
     }, {
       F: __dxlog_file5,
-      L: 116,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1742,13 +1754,13 @@ var SwarmMapper = class {
 // packages/core/mesh/network-manager/src/swarm/connection-limiter.ts
 import { DeferredTask as DeferredTask2 } from "@dxos/async";
 import { Context as Context5 } from "@dxos/context";
-import { CancelledError as CancelledError3 } from "@dxos/errors";
 import { invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log6 } from "@dxos/log";
+import { CancelledError as CancelledError3 } from "@dxos/protocols";
 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 = 10;
+var MAX_CONCURRENT_INITIATING_CONNECTIONS = 50;
 var ConnectionLimiter = class {
   constructor({ maxConcurrentInitConnections = MAX_CONCURRENT_INITIATING_CONNECTIONS } = {}) {
     this._ctx = new Context5();
@@ -2290,7 +2302,6 @@ import { invariant as invariant9 } from "@dxos/invariant";
 import { log as log9 } from "@dxos/log";
 var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/topology/star-topology.ts";
 var StarTopology = class {
-  // prettier-ignore
   constructor(_centralPeer) {
     this._centralPeer = _centralPeer;
   }
@@ -2300,7 +2311,7 @@ var StarTopology = class {
   init(controller) {
     invariant9(!this._controller, "Already initialized.", {
       F: __dxlog_file10,
-      L: 24,
+      L: 21,
       S: this,
       A: [
         "!this._controller",
@@ -2312,7 +2323,7 @@ var StarTopology = class {
   update() {
     invariant9(this._controller, "Not initialized.", {
       F: __dxlog_file10,
-      L: 29,
+      L: 26,
       S: this,
       A: [
         "this._controller",
@@ -2323,7 +2334,7 @@ var StarTopology = class {
     if (!ownPeerId.equals(this._centralPeer)) {
       log9("leaf peer dropping all connections apart from central peer.", void 0, {
         F: __dxlog_file10,
-        L: 32,
+        L: 29,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2333,7 +2344,7 @@ var StarTopology = class {
             peer
           }, {
             F: __dxlog_file10,
-            L: 37,
+            L: 34,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2347,7 +2358,7 @@ var StarTopology = class {
           peer
         }, {
           F: __dxlog_file10,
-          L: 46,
+          L: 43,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2358,7 +2369,7 @@ var StarTopology = class {
   async onOffer(peer) {
     invariant9(this._controller, "Not initialized.", {
       F: __dxlog_file10,
-      L: 53,
+      L: 50,
       S: this,
       A: [
         "this._controller",
@@ -2372,7 +2383,7 @@ var StarTopology = class {
       isSelfCentral: ownPeerId.equals(this._centralPeer)
     }, {
       F: __dxlog_file10,
-      L: 55,
+      L: 52,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2583,10 +2594,9 @@ import SimplePeerConstructor from "simple-peer";
 import invariant11 from "tiny-invariant";
 import { Event as Event8 } from "@dxos/async";
 import { ErrorStream as ErrorStream4, raise as raise2 } from "@dxos/debug";
-import { ConnectionResetError as ConnectionResetError2, ConnectivityError as ConnectivityError2, ProtocolError as ProtocolError2, UnknownProtocolError as UnknownProtocolError2 } from "@dxos/errors";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log11 } from "@dxos/log";
-import { trace as trace4 } from "@dxos/protocols";
+import { ConnectionResetError as ConnectionResetError2, ConnectivityError as ConnectivityError2, ProtocolError as ProtocolError2, UnknownProtocolError as UnknownProtocolError2, trace as trace4 } from "@dxos/protocols";
 
 // packages/core/mesh/network-manager/src/transport/webrtc.ts
 var wrtc = null;
@@ -2609,13 +2619,13 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 41,
+      L: 40,
       S: this,
       C: (f, a) => f(...a)
     });
     log11("created connection", params, {
       F: __dxlog_file12,
-      L: 42,
+      L: 41,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2628,7 +2638,7 @@ var SimplePeerTransport = class {
     this._peer.on("signal", async (data) => {
       log11("signal", data, {
         F: __dxlog_file12,
-        L: 51,
+        L: 50,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2641,7 +2651,7 @@ var SimplePeerTransport = class {
     this._peer.on("connect", () => {
       log11("connected", void 0, {
         F: __dxlog_file12,
-        L: 56,
+        L: 55,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2651,7 +2661,7 @@ var SimplePeerTransport = class {
     this._peer.on("close", async () => {
       log11("closed", void 0, {
         F: __dxlog_file12,
-        L: 62,
+        L: 61,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2665,9 +2675,13 @@ var SimplePeerTransport = class {
         } else {
           this.errors.raise(new UnknownProtocolError2("unknown RTCError", err));
         }
-      } else if (err.name === "InvalidStateError") {
-        this.errors.raise(new ConnectionResetError2("safari WebRTC error", err));
       } else if ("code" in err) {
+        log11.info("simple-peer error", err, {
+          F: __dxlog_file12,
+          L: 77,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         switch (err.code) {
           case "ERR_WEBRTC_SUPPORT":
             this.errors.raise(new ProtocolError2("WebRTC not supported", err));
@@ -2686,17 +2700,23 @@ var SimplePeerTransport = class {
             this.errors.raise(new Error("unknown simple-peer error"));
         }
       } else {
+        log11.info("unknown peer connection error", err, {
+          F: __dxlog_file12,
+          L: 96,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         this.errors.raise(err);
       }
       try {
-        if (typeof this._peer?._pc.getStats === "function") {
+        if (typeof this._peer?._pc?.getStats === "function") {
           this._peer._pc.getStats().then((stats) => {
             log11.warn("report after webrtc error", {
               config: this.params.webrtcConfig,
               stats
             }, {
               F: __dxlog_file12,
-              L: 107,
+              L: 104,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2705,7 +2725,7 @@ var SimplePeerTransport = class {
       } catch (err2) {
         log11.catch(err2, void 0, {
           F: __dxlog_file12,
-          L: 114,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2716,7 +2736,7 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 119,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2724,7 +2744,7 @@ var SimplePeerTransport = class {
   async destroy() {
     log11("closing...", void 0, {
       F: __dxlog_file12,
-      L: 123,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2734,7 +2754,7 @@ var SimplePeerTransport = class {
     this.closed.emit();
     log11("closed", void 0, {
       F: __dxlog_file12,
-      L: 128,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2767,7 +2787,6 @@ import { ConnectionState as ConnectionState3 } from "@dxos/protocols/proto/dxos/
 import { ComplexMap as ComplexMap8 } from "@dxos/util";
 var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-service.ts";
 var SimplePeerTransportService = class {
-  // prettier-ignore
   constructor(_webrtcConfig) {
     this._webrtcConfig = _webrtcConfig;
     this.transports = new ComplexMap8(PublicKey11.hash);
@@ -2847,7 +2866,7 @@ var SimplePeerTransportService = class {
   async sendSignal({ proxyId, signal }) {
     invariant12(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 113,
+      L: 110,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -2859,7 +2878,7 @@ var SimplePeerTransportService = class {
   async sendData({ proxyId, payload }) {
     invariant12(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 118,
+      L: 115,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -2880,7 +2899,7 @@ var SimplePeerTransportService = class {
     this.transports.delete(proxyId);
     log12("Closed.", void 0, {
       F: __dxlog_file13,
-      L: 132,
+      L: 129,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2892,15 +2911,14 @@ import { Writable } from "@dxos/node-std/stream";
 import { Event as Event9 } from "@dxos/async";
 import { Context as Context6 } from "@dxos/context";
 import { ErrorStream as ErrorStream5 } from "@dxos/debug";
-import { ConnectionResetError as ConnectionResetError3, TimeoutError as TimeoutError2, ProtocolError as ProtocolError3, ConnectivityError as ConnectivityError3, UnknownProtocolError as UnknownProtocolError3 } from "@dxos/errors";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
 import { log as log13 } from "@dxos/log";
+import { ConnectionResetError as ConnectionResetError3, TimeoutError as TimeoutError2, ProtocolError as ProtocolError3, ConnectivityError as ConnectivityError3, UnknownProtocolError as UnknownProtocolError3 } from "@dxos/protocols";
 import { ConnectionState as ConnectionState4 } from "@dxos/protocols/proto/dxos/mesh/bridge";
 import { arrayToBuffer } from "@dxos/util";
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts";
 var SimplePeerTransportProxy = class {
-  // prettier-ignore
   constructor(_params) {
     this._params = _params;
     this._proxyId = PublicKey12.random();
@@ -2917,7 +2935,7 @@ var SimplePeerTransportProxy = class {
       this._serviceStream.subscribe(async (event) => {
         log13("SimplePeerTransportProxy: event", event, {
           F: __dxlog_file14,
-          L: 58,
+          L: 55,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2946,7 +2964,7 @@ var SimplePeerTransportProxy = class {
       }));
     }, (error) => log13.catch(error, void 0, {
       F: __dxlog_file14,
-      L: 82,
+      L: 83,
       S: this,
       C: (f, a) => f(...a)
     }));
@@ -2992,7 +3010,7 @@ var SimplePeerTransportProxy = class {
     } catch (err) {
       log13.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 133,
+        L: 134,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3028,7 +3046,7 @@ var SimplePeerTransportProxyFactory = class {
   createTransport(options) {
     invariant13(this._bridgeService, "SimplePeerTransportProxyFactory is not ready to open connections", {
       F: __dxlog_file14,
-      L: 170,
+      L: 171,
       S: this,
       A: [
         "this._bridgeService",
@@ -3046,15 +3064,15 @@ var SimplePeerTransportProxyFactory = class {
 };
 var decodeError = (err) => {
   const message = typeof err === "string" ? err : err.message;
-  if (message.includes("ConnectionResetError")) {
+  if (message.includes("CONNECTION_RESET")) {
     return new ConnectionResetError3(message);
-  } else if (message.includes("TimeoutError")) {
+  } else if (message.includes("TIMEOUT")) {
     return new TimeoutError2(message);
-  } else if (message.includes("ProtocolError")) {
+  } else if (message.includes("PROTOCOL_ERROR")) {
     return new ProtocolError3(message);
-  } else if (message.includes("ConnectivityError")) {
+  } else if (message.includes("CONNECTIVITY_ERROR")) {
     return new ConnectivityError3(message);
-  } else if (message.includes("UnknownProtocolError")) {
+  } else if (message.includes("UNKNOWN_PROTOCOL_ERROR")) {
     return new UnknownProtocolError3(message);
   } else {
     return typeof err === "string" ? new Error(err) : err;
@@ -3447,4 +3465,4 @@ export {
   createLibDataChannelTransportFactory,
   createTeleportProtocolFactory
 };
-//# sourceMappingURL=chunk-PSWNMALH.mjs.map
+//# sourceMappingURL=chunk-JIGWYM5K.mjs.map