@dxos/network-manager 0.1.58-main.ffbb8a1 → 0.1.58-next.3349da8

package/dist/lib/node/index.cjs

@@ -602,6 +602,8 @@ var ConnectionState;
     */
     "CLOSED"
   ] = "CLOSED";
+  ConnectionState5["ABORTING"] = "ABORTING";
+  ConnectionState5["ABORTED"] = "ABORTED";
 })(ConnectionState || (ConnectionState = {}));
 var Connection = class {
   constructor(topic, ownId, remoteId, sessionId, initiator, _signalMessaging, _protocol, _transportFactory, _callbacks) {
@@ -633,7 +635,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 114,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -653,7 +655,7 @@ var Connection = class {
   async openConnection() {
     (0, import_invariant.invariant)(this._state === ConnectionState.INITIAL, "Invalid state.", {
       F: __dxlog_file,
-      L: 139,
+      L: 148,
       S: this,
       A: [
         "this._state === ConnectionState.INITIAL",
@@ -664,7 +666,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 140,
+      L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -676,7 +678,7 @@ var Connection = class {
       initiator: this.initiator
     }, {
       F: __dxlog_file,
-      L: 141,
+      L: 150,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -687,15 +689,15 @@ var Connection = class {
     this._protocol.stream.on("close", () => {
       (0, import_log.log)("protocol stream closed", void 0, {
         F: __dxlog_file,
-        L: 158,
+        L: 167,
         S: this,
         C: (f, a) => f(...a)
       });
-      this.close().catch((err) => this.errors.raise(err));
+      this.close(new import_errors.ProtocolError("protocol stream closed")).catch((err) => this.errors.raise(err));
     });
     (0, import_invariant.invariant)(!this._transport, void 0, {
       F: __dxlog_file,
-      L: 162,
+      L: 171,
       S: this,
       A: [
         "!this._transport",
@@ -715,7 +717,7 @@ var Connection = class {
       this._transport = void 0;
       (0, import_log.log)("abort triggered by transport close", void 0, {
         F: __dxlog_file,
-        L: 176,
+        L: 185,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -726,21 +728,38 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 181,
+        L: 190,
         S: this,
         C: (f, a) => f(...a)
       });
       if (!this.closeReason) {
         this.closeReason = err?.message;
       }
-      if (err?.message.includes("OperationError")) {
-        (0, import_log.log)("aborting due to transport OperationError", void 0, {
+      if (err instanceof import_errors.ConnectionResetError) {
+        (0, import_log.log)("aborting due to transport ConnectionResetError", void 0, {
           F: __dxlog_file,
-          L: 187,
+          L: 197,
           S: this,
           C: (f, a) => f(...a)
         });
         this.abort().catch((err2) => this.errors.raise(err2));
+      } else if (err instanceof import_errors.ConnectivityError) {
+        (0, import_log.log)("aborting due to transport ConnectivityError", void 0, {
+          F: __dxlog_file,
+          L: 200,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        this.abort().catch((err2) => this.errors.raise(err2));
+      } else if (err instanceof import_errors.UnknownProtocolError) {
+        (0, import_log.log)("unsure what to do for UnknownProtocolError", {
+          err
+        }, {
+          F: __dxlog_file,
+          L: 203,
+          S: this,
+          C: (f, a) => f(...a)
+        });
       }
       if (this._state !== ConnectionState.CLOSED && this._state !== ConnectionState.CLOSING) {
         this.errors.raise(err);
@@ -754,7 +773,7 @@ var Connection = class {
       id: this._instanceId
     }), {
       F: __dxlog_file,
-      L: 203,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -764,30 +783,30 @@ var Connection = class {
       err
     }, {
       F: __dxlog_file,
-      L: 209,
+      L: 224,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (!this.closeReason) {
-      this.closeReason = err?.message;
-    }
-    if (this._state === ConnectionState.CLOSED) {
-      (0, import_log.log)("abort ignored: already closed", this.closeReason, {
+    if (this._state === ConnectionState.CLOSED || this._state === ConnectionState.ABORTED) {
+      (0, import_log.log)(`abort ignored: already ${this._state}`, this.closeReason, {
         F: __dxlog_file,
-        L: 214,
+        L: 226,
         S: this,
         C: (f, a) => f(...a)
       });
       return;
     }
-    this._changeState(ConnectionState.CLOSING);
+    this._changeState(ConnectionState.ABORTING);
+    if (!this.closeReason) {
+      this.closeReason = err?.message;
+    }
     await this._ctx.dispose();
     try {
       (0, import_log.log)("aborting protocol... ", {
         proto: this._protocol
       }, {
         F: __dxlog_file,
-        L: 224,
+        L: 239,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -795,7 +814,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 227,
+        L: 242,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -805,56 +824,68 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 234,
+        L: 249,
         S: this,
         C: (f, a) => f(...a)
       });
     }
-    this._changeState(ConnectionState.CLOSED);
-    this._callbacks?.onClosed?.(err);
+    try {
+      this._callbacks?.onClosed?.(err);
+    } catch (err2) {
+      import_log.log.catch(err2, void 0, {
+        F: __dxlog_file,
+        L: 255,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+    this._changeState(ConnectionState.ABORTED);
   }
   async close(err) {
     if (!this.closeReason) {
       this.closeReason = err?.message;
     }
-    if (this._state === ConnectionState.CLOSED) {
+    if (this._state === ConnectionState.CLOSED || this._state === ConnectionState.ABORTING || this._state === ConnectionState.ABORTED) {
       return;
     }
+    const lastState = this._state;
     this._changeState(ConnectionState.CLOSING);
     await this._ctx.dispose();
     (0, import_log.log)("closing...", {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 253,
+      L: 277,
       S: this,
       C: (f, a) => f(...a)
     });
-    try {
-      await this._protocol.close();
-    } catch (err2) {
-      import_log.log.catch(err2, void 0, {
-        F: __dxlog_file,
-        L: 259,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-    try {
-      await this._transport?.destroy();
-    } catch (err2) {
-      import_log.log.catch(err2, void 0, {
-        F: __dxlog_file,
-        L: 266,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+    if (lastState === ConnectionState.CONNECTED) {
+      try {
+        await this._protocol.close();
+      } catch (err2) {
+        import_log.log.catch(err2, void 0, {
+          F: __dxlog_file,
+          L: 284,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+      try {
+        await this._transport?.destroy();
+      } catch (err2) {
+        import_log.log.catch(err2, void 0, {
+          F: __dxlog_file,
+          L: 291,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
     }
     (0, import_log.log)("closed", {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 269,
+      L: 295,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -897,7 +928,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 306,
+        L: 332,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -910,7 +941,7 @@ var Connection = class {
   async signal(msg) {
     (0, import_invariant.invariant)(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 315,
+      L: 341,
       S: this,
       A: [
         "msg.sessionId",
@@ -920,7 +951,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: 317,
+        L: 343,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -928,7 +959,7 @@ var Connection = class {
     }
     (0, import_invariant.invariant)(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 320,
+      L: 346,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -937,7 +968,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 321,
+      L: 347,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -946,7 +977,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 322,
+      L: 348,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -970,7 +1001,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 331,
+          L: 357,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -978,7 +1009,7 @@ var Connection = class {
       } else {
         (0, import_invariant.invariant)(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 334,
+          L: 360,
           S: this,
           A: [
             "this._transport",
@@ -991,7 +1022,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 335,
+          L: 361,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1005,17 +1036,17 @@ var Connection = class {
   _changeState(state) {
     (0, import_log.log)("stateChanged", {
       from: this._state,
-      too: state,
+      to: state,
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 346,
+      L: 372,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant.invariant)(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 347,
+      L: 373,
       S: this,
       A: [
         "state !== this._state",
@@ -1471,6 +1502,9 @@ var Peer = class {
         S: this,
         C: (f, a) => f(...a)
       });
+      if (err instanceof import_errors2.TimeoutError) {
+        await connection.abort(err);
+      }
       await this.closeConnection(err);
       throw err;
     } finally {
@@ -1490,13 +1524,13 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file3,
-      L: 210,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant3.invariant)(!this.connection, "Already connected.", {
       F: __dxlog_file3,
-      L: 217,
+      L: 220,
       S: this,
       A: [
         "!this.connection",
@@ -1532,7 +1566,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 236,
+            L: 239,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1545,14 +1579,14 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 245,
+            L: 248,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
           (0, import_invariant3.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
             F: __dxlog_file3,
-            L: 250,
+            L: 253,
             S: this,
             A: [
               "this.connection === connection",
@@ -1567,7 +1601,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file3,
-            L: 252,
+            L: 255,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1602,7 +1636,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 292,
+        L: 295,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1615,7 +1649,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file3,
-        L: 293,
+        L: 296,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1634,7 +1668,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 318,
+      L: 321,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1644,7 +1678,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file3,
-      L: 324,
+      L: 327,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1655,7 +1689,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file3,
-        L: 329,
+        L: 332,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1670,7 +1704,7 @@ var Peer = class {
       topic: this.topic
     }, {
       F: __dxlog_file3,
-      L: 339,
+      L: 342,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3075,6 +3109,7 @@ var TransportKind;
   TransportKind2["LIBDATACHANNEL"] = "LIBDATACHANNEL";
   TransportKind2["SIMPLE_PEER_PROXY"] = "SIMPLE_PEER_PROXY";
   TransportKind2["MEMORY"] = "MEMORY";
+  TransportKind2["TCP"] = "TCP";
 })(TransportKind || (TransportKind = {}));
 
 // packages/core/mesh/network-manager/src/transport/simplepeer-transport.ts
@@ -3082,6 +3117,7 @@ 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");
@@ -3107,13 +3143,13 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 39,
+      L: 41,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log11.log)("created connection", params, {
       F: __dxlog_file12,
-      L: 40,
+      L: 42,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3126,7 +3162,7 @@ var SimplePeerTransport = class {
     this._peer.on("signal", async (data) => {
       (0, import_log11.log)("signal", data, {
         F: __dxlog_file12,
-        L: 49,
+        L: 51,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3139,7 +3175,7 @@ var SimplePeerTransport = class {
     this._peer.on("connect", () => {
       (0, import_log11.log)("connected", void 0, {
         F: __dxlog_file12,
-        L: 54,
+        L: 56,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3149,7 +3185,7 @@ var SimplePeerTransport = class {
     this._peer.on("close", async () => {
       (0, import_log11.log)("closed", void 0, {
         F: __dxlog_file12,
-        L: 60,
+        L: 62,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3157,7 +3193,35 @@ var SimplePeerTransport = class {
       this.closed.emit();
     });
     this._peer.on("error", async (err) => {
-      this.errors.raise(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));
+        } else {
+          this.errors.raise(new import_errors4.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) {
+        switch (err.code) {
+          case "ERR_WEBRTC_SUPPORT":
+            this.errors.raise(new import_errors4.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));
+          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));
+          default:
+            this.errors.raise(new Error("unknown simple-peer error"));
+        }
+      } else {
+        this.errors.raise(err);
+      }
       try {
         if (typeof this._peer?._pc.getStats === "function") {
           this._peer._pc.getStats().then((stats) => {
@@ -3166,13 +3230,19 @@ var SimplePeerTransport = class {
               stats
             }, {
               F: __dxlog_file12,
-              L: 72,
+              L: 107,
               S: this,
               C: (f, a) => f(...a)
             });
           });
         }
-      } catch {
+      } catch (err2) {
+        import_log11.log.catch(err2, void 0, {
+          F: __dxlog_file12,
+          L: 114,
+          S: this,
+          C: (f, a) => f(...a)
+        });
       }
       await this.destroy();
     });
@@ -3180,7 +3250,7 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 82,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3188,7 +3258,7 @@ var SimplePeerTransport = class {
   async destroy() {
     (0, import_log11.log)("closing...", void 0, {
       F: __dxlog_file12,
-      L: 86,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3198,7 +3268,7 @@ var SimplePeerTransport = class {
     this.closed.emit();
     (0, import_log11.log)("closed", void 0, {
       F: __dxlog_file12,
-      L: 91,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3356,6 +3426,7 @@ 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");
@@ -3380,7 +3451,7 @@ var SimplePeerTransportProxy = class {
       this._serviceStream.subscribe(async (event) => {
         (0, import_log13.log)("SimplePeerTransportProxy: event", event, {
           F: __dxlog_file14,
-          L: 51,
+          L: 58,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3400,7 +3471,7 @@ var SimplePeerTransportProxy = class {
           }).then(() => callback(), (err) => {
             import_log13.log.catch(err, void 0, {
               F: __dxlog_file14,
-              L: 69,
+              L: 76,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3409,14 +3480,14 @@ var SimplePeerTransportProxy = class {
       }));
     }, (error) => import_log13.log.catch(error, void 0, {
       F: __dxlog_file14,
-      L: 75,
+      L: 82,
       S: this,
       C: (f, a) => f(...a)
     }));
   }
   async _handleConnection(connectionEvent) {
     if (connectionEvent.error) {
-      this.errors.raise(new Error(connectionEvent.error));
+      this.errors.raise(decodeError(connectionEvent.error));
     }
     switch (connectionEvent.state) {
       case import_bridge2.ConnectionState.CONNECTED: {
@@ -3439,7 +3510,7 @@ var SimplePeerTransportProxy = class {
     this._params.bridgeService.sendSignal({
       proxyId: this._proxyId,
       signal
-    }).catch((err) => this.errors.raise(err));
+    }).catch((err) => this.errors.raise(decodeError(err)));
   }
   // TODO(burdon): Move open from constructor.
   async destroy() {
@@ -3455,7 +3526,7 @@ var SimplePeerTransportProxy = class {
     } catch (err) {
       import_log13.log.catch(err, void 0, {
         F: __dxlog_file14,
-        L: 126,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3491,7 +3562,7 @@ var SimplePeerTransportProxyFactory = class {
   createTransport(options) {
     (0, import_invariant12.invariant)(this._bridgeService, "SimplePeerTransportProxyFactory is not ready to open connections", {
       F: __dxlog_file14,
-      L: 163,
+      L: 170,
       S: this,
       A: [
         "this._bridgeService",
@@ -3507,6 +3578,22 @@ var SimplePeerTransportProxyFactory = class {
     return transport;
   }
 };
+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);
+  } else {
+    return typeof err === "string" ? new Error(err) : err;
+  }
+};
 
 // packages/core/mesh/network-manager/src/transport/index.ts
 init_datachannel();