@dxos/network-manager 0.1.58-main.e4cedde → 0.1.58-main.eedac7a

package/dist/lib/node/testing/index.cjs

@@ -515,7 +515,7 @@ module.exports = __toCommonJS(testing_exports);
 var import_keys14 = require("@dxos/keys");
 var import_log17 = require("@dxos/log");
 var import_messaging2 = require("@dxos/messaging");
-var import_protocols6 = require("@dxos/protocols");
+var import_protocols9 = require("@dxos/protocols");
 var import_services2 = require("@dxos/protocols/proto/dxos/client/services");
 var import_rpc = require("@dxos/rpc");
 var import_util11 = require("@dxos/util");
@@ -526,7 +526,7 @@ var import_invariant6 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
 var import_log7 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
-var import_protocols4 = require("@dxos/protocols");
+var import_protocols6 = require("@dxos/protocols");
 var import_services = require("@dxos/protocols/proto/dxos/client/services");
 var import_util6 = require("@dxos/util");
 
@@ -540,7 +540,6 @@ var import_util5 = require("@dxos/util");
 var import_async = require("@dxos/async");
 var import_context = require("@dxos/context");
 var import_debug = require("@dxos/debug");
-var import_errors = require("@dxos/errors");
 var import_invariant = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
 var import_log = require("@dxos/log");
@@ -688,7 +687,7 @@ var Connection = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      this.close(new import_errors.ProtocolError("protocol stream closed")).catch((err) => this.errors.raise(err));
+      this.close(new import_protocols.ProtocolError("protocol stream closed")).catch((err) => this.errors.raise(err));
     });
     (0, import_invariant.invariant)(!this._transport, void 0, {
       F: __dxlog_file,
@@ -730,7 +729,7 @@ var Connection = class {
       if (!this.closeReason) {
         this.closeReason = err?.message;
       }
-      if (err instanceof import_errors.ConnectionResetError) {
+      if (err instanceof import_protocols.ConnectionResetError) {
         (0, import_log.log)("aborting due to transport ConnectionResetError", void 0, {
           F: __dxlog_file,
           L: 197,
@@ -738,7 +737,7 @@ var Connection = class {
           C: (f, a) => f(...a)
         });
         this.abort().catch((err2) => this.errors.raise(err2));
-      } else if (err instanceof import_errors.ConnectivityError) {
+      } else if (err instanceof import_protocols.ConnectivityError) {
         (0, import_log.log)("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
           L: 200,
@@ -746,7 +745,7 @@ var Connection = class {
           C: (f, a) => f(...a)
         });
         this.abort().catch((err2) => this.errors.raise(err2));
-      } else if (err instanceof import_errors.UnknownProtocolError) {
+      } else if (err instanceof import_protocols.UnknownProtocolError) {
         (0, import_log.log)("unsure what to do for UnknownProtocolError", {
           err
         }, {
@@ -916,7 +915,7 @@ var Connection = class {
         }
       });
     } catch (err) {
-      if (err instanceof import_errors.CancelledError) {
+      if (err instanceof import_protocols.CancelledError) {
         return;
       }
       import_log.log.warn("signal failed", {
@@ -1066,7 +1065,7 @@ var import_debug2 = require("@dxos/debug");
 var import_invariant4 = require("@dxos/invariant");
 var import_keys4 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
-var import_protocols3 = require("@dxos/protocols");
+var import_protocols4 = require("@dxos/protocols");
 var import_util2 = require("@dxos/util");
 
 // packages/core/mesh/network-manager/src/signal/swarm-messenger.ts
@@ -1304,10 +1303,10 @@ var SwarmMessenger = class {
 // packages/core/mesh/network-manager/src/swarm/peer.ts
 var import_async2 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
-var import_errors2 = require("@dxos/errors");
 var import_invariant3 = require("@dxos/invariant");
 var import_keys3 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
+var import_protocols3 = require("@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")
@@ -1319,7 +1318,7 @@ function _ts_decorate2(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/swarm/peer.ts";
-var ConnectionDisplacedError = class extends import_errors2.SystemError {
+var ConnectionDisplacedError = class extends import_protocols3.SystemError {
   constructor() {
     super("Connection displaced by remote initiator.");
   }
@@ -1387,7 +1386,7 @@ var Peer = class {
           connection.initiate();
           await connection.openConnection();
         } catch (err) {
-          if (!(err instanceof import_errors2.CancelledError)) {
+          if (!(err instanceof import_protocols3.CancelledError)) {
             import_log3.log.warn("connection error", {
               topic: this.topic,
               peerId: this.localPeerId,
@@ -1497,7 +1496,7 @@ var Peer = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      if (err instanceof import_errors2.TimeoutError) {
+      if (err instanceof import_protocols3.TimeoutError) {
         await connection.abort(err);
       }
       await this.closeConnection(err);
@@ -1757,7 +1756,7 @@ var Swarm = class {
     this.disconnected = new import_async3.Event();
     this.connected = new import_async3.Event();
     this.errors = new import_debug2.ErrorStream();
-    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.begin({
+    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols4.trace.begin({
       id: this._instanceId,
       data: {
         topic: this._topic.toHex(),
@@ -1784,7 +1783,7 @@ var Swarm = class {
       onOffer: async (msg) => await this.onOffer(msg),
       topic: this._topic
     });
-    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols3.trace.end({
+    import_log4.log.trace("dxos.mesh.swarm.constructor", import_protocols4.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file4,
@@ -2275,13 +2274,13 @@ var SwarmMapper = class {
 // packages/core/mesh/network-manager/src/swarm/connection-limiter.ts
 var import_async5 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
-var import_errors3 = require("@dxos/errors");
 var import_invariant5 = require("@dxos/invariant");
 var import_keys6 = require("@dxos/keys");
 var import_log6 = require("@dxos/log");
+var import_protocols5 = require("@dxos/protocols");
 var import_util4 = require("@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 import_context5.Context();
@@ -2348,7 +2347,7 @@ var ConnectionLimiter = class {
     if (!this._waitingPromises.has(sessionId)) {
       return;
     }
-    this._waitingPromises.get(sessionId).reject(new import_errors3.CancelledError());
+    this._waitingPromises.get(sessionId).reject(new import_protocols5.CancelledError());
     this._waitingPromises.delete(sessionId);
     this.resolveWaitingPromises.schedule();
   }
@@ -2466,7 +2465,7 @@ var NetworkManager = class {
     return this._swarms.get(topic);
   }
   async open() {
-    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.begin({
+    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols6.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file7,
@@ -2476,7 +2475,7 @@ var NetworkManager = class {
     });
     await this._messenger.open();
     await this._signalManager.open();
-    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols4.trace.end({
+    import_log7.log.trace("dxos.mesh.network-manager.open", import_protocols6.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file7,
@@ -2906,10 +2905,9 @@ var import_simple_peer = __toESM(require("simple-peer"));
 var import_tiny_invariant = __toESM(require("tiny-invariant"));
 var import_async9 = require("@dxos/async");
 var import_debug5 = require("@dxos/debug");
-var import_errors4 = require("@dxos/errors");
 var import_keys10 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
-var import_protocols5 = require("@dxos/protocols");
+var import_protocols7 = require("@dxos/protocols");
 
 // packages/core/mesh/network-manager/src/transport/webrtc.ts
 var wrtc = null;
@@ -2928,17 +2926,17 @@ var SimplePeerTransport = class {
     this.connected = new import_async9.Event();
     this.errors = new import_debug5.ErrorStream();
     this._instanceId = import_keys10.PublicKey.random().toHex();
-    import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.begin({
+    import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols7.trace.begin({
       id: this._instanceId
     }), {
       F: __dxlog_file10,
-      L: 41,
+      L: 40,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log11.log)("created connection", params, {
       F: __dxlog_file10,
-      L: 42,
+      L: 41,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2951,7 +2949,7 @@ var SimplePeerTransport = class {
     this._peer.on("signal", async (data) => {
       (0, import_log11.log)("signal", data, {
         F: __dxlog_file10,
-        L: 51,
+        L: 50,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2964,7 +2962,7 @@ var SimplePeerTransport = class {
     this._peer.on("connect", () => {
       (0, import_log11.log)("connected", void 0, {
         F: __dxlog_file10,
-        L: 56,
+        L: 55,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2974,7 +2972,7 @@ var SimplePeerTransport = class {
     this._peer.on("close", async () => {
       (0, import_log11.log)("closed", void 0, {
         F: __dxlog_file10,
-        L: 62,
+        L: 61,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2984,42 +2982,52 @@ var SimplePeerTransport = class {
     this._peer.on("error", async (err) => {
       if (typeof RTCError !== "undefined" && err instanceof RTCError) {
         if (err.errorDetail === "sctp-failure") {
-          this.errors.raise(new import_errors4.ConnectionResetError("sctp-failure from RTCError", err));
+          this.errors.raise(new import_protocols7.ConnectionResetError("sctp-failure from RTCError", err));
         } else {
-          this.errors.raise(new import_errors4.UnknownProtocolError("unknown RTCError", err));
+          this.errors.raise(new import_protocols7.UnknownProtocolError("unknown RTCError", err));
         }
-      } else if (err.name === "InvalidStateError") {
-        this.errors.raise(new import_errors4.ConnectionResetError("safari WebRTC error", err));
       } else if ("code" in err) {
+        import_log11.log.info("simple-peer error", err, {
+          F: __dxlog_file10,
+          L: 77,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         switch (err.code) {
           case "ERR_WEBRTC_SUPPORT":
-            this.errors.raise(new import_errors4.ProtocolError("WebRTC not supported", err));
+            this.errors.raise(new import_protocols7.ProtocolError("WebRTC not supported", err));
           case "ERR_ICE_CONNECTION_FAILURE":
           case "ERR_DATA_CHANNEL":
           case "ERR_CONNECTION_FAILURE":
           case "ERR_SIGNALING":
-            this.errors.raise(new import_errors4.ConnectivityError("unknown communication failure", err));
+            this.errors.raise(new import_protocols7.ConnectivityError("unknown communication failure", err));
           case "ERR_CREATE_OFFER":
           case "ERR_CREATE_ANSWER":
           case "ERR_SET_LOCAL_DESCRIPTION":
           case "ERR_SET_REMOTE_DESCRIPTION":
           case "ERR_ADD_ICE_CANDIDATE":
-            this.errors.raise(new import_errors4.UnknownProtocolError("unknown simple-peer library failure", err));
+            this.errors.raise(new import_protocols7.UnknownProtocolError("unknown simple-peer library failure", err));
           default:
             this.errors.raise(new Error("unknown simple-peer error"));
         }
       } else {
+        import_log11.log.info("unknown peer connection error", err, {
+          F: __dxlog_file10,
+          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) => {
             import_log11.log.warn("report after webrtc error", {
               config: this.params.webrtcConfig,
               stats
             }, {
               F: __dxlog_file10,
-              L: 107,
+              L: 104,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3028,18 +3036,18 @@ var SimplePeerTransport = class {
       } catch (err2) {
         import_log11.log.catch(err2, void 0, {
           F: __dxlog_file10,
-          L: 114,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
       }
       await this.destroy();
     });
-    import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols5.trace.end({
+    import_log11.log.trace("dxos.mesh.webrtc-transport.constructor", import_protocols7.trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file10,
-      L: 119,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3047,7 +3055,7 @@ var SimplePeerTransport = class {
   async destroy() {
     (0, import_log11.log)("closing...", void 0, {
       F: __dxlog_file10,
-      L: 123,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3057,7 +3065,7 @@ var SimplePeerTransport = class {
     this.closed.emit();
     (0, import_log11.log)("closed", void 0, {
       F: __dxlog_file10,
-      L: 128,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3215,10 +3223,10 @@ var import_node_stream3 = require("node:stream");
 var import_async10 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
 var import_debug6 = require("@dxos/debug");
-var import_errors5 = require("@dxos/errors");
 var import_invariant12 = require("@dxos/invariant");
 var import_keys12 = require("@dxos/keys");
 var import_log13 = require("@dxos/log");
+var import_protocols8 = require("@dxos/protocols");
 var import_bridge2 = require("@dxos/protocols/proto/dxos/mesh/bridge");
 var import_util9 = require("@dxos/util");
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/simplepeer-transport-proxy.ts";
@@ -3369,16 +3377,16 @@ var SimplePeerTransportProxyFactory = class {
 };
 var decodeError = (err) => {
   const message = typeof err === "string" ? err : err.message;
-  if (message.includes("ConnectionResetError")) {
-    return new import_errors5.ConnectionResetError(message);
-  } else if (message.includes("TimeoutError")) {
-    return new import_errors5.TimeoutError(message);
-  } else if (message.includes("ProtocolError")) {
-    return new import_errors5.ProtocolError(message);
-  } else if (message.includes("ConnectivityError")) {
-    return new import_errors5.ConnectivityError(message);
-  } else if (message.includes("UnknownProtocolError")) {
-    return new import_errors5.UnknownProtocolError(message);
+  if (message.includes("CONNECTION_RESET")) {
+    return new import_protocols8.ConnectionResetError(message);
+  } else if (message.includes("TIMEOUT")) {
+    return new import_protocols8.TimeoutError(message);
+  } else if (message.includes("PROTOCOL_ERROR")) {
+    return new import_protocols8.ProtocolError(message);
+  } else if (message.includes("CONNECTIVITY_ERROR")) {
+    return new import_protocols8.ConnectivityError(message);
+  } else if (message.includes("UNKNOWN_PROTOCOL_ERROR")) {
+    return new import_protocols8.UnknownProtocolError(message);
   } else {
     return typeof err === "string" ? new Error(err) : err;
   }
@@ -4035,7 +4043,7 @@ var TestPeer = class {
             this._proxy = (0, import_rpc.createProtoRpcPeer)({
               port: proxyPort,
               requested: {
-                BridgeService: import_protocols6.schema.getService("dxos.mesh.bridge.BridgeService")
+                BridgeService: import_protocols9.schema.getService("dxos.mesh.bridge.BridgeService")
               },
               noHandshake: true,
               encodingOptions: {
@@ -4045,7 +4053,7 @@ var TestPeer = class {
             this._service = (0, import_rpc.createProtoRpcPeer)({
               port: servicePort,
               exposed: {
-                BridgeService: import_protocols6.schema.getService("dxos.mesh.bridge.BridgeService")
+                BridgeService: import_protocols9.schema.getService("dxos.mesh.bridge.BridgeService")
               },
               handlers: {
                 BridgeService: new SimplePeerTransportService()