@dxos/network-manager 0.1.58-main.f4192cb → 0.1.58-main.f69fa2f

package/dist/lib/node/index.cjs

@@ -527,6 +527,8 @@ __export(src_exports, {
   Swarm: () => Swarm,
   SwarmMapper: () => SwarmMapper,
   SwarmMessenger: () => SwarmMessenger,
+  TcpTransport: () => TcpTransport,
+  TcpTransportFactory: () => TcpTransportFactory,
   TransportKind: () => TransportKind,
   cleanup: () => cleanup,
   createLibDataChannelTransportFactory: () => createLibDataChannelTransportFactory,
@@ -735,7 +737,7 @@ var Connection = class {
         this.closeReason = err?.message;
       }
       if (err instanceof import_protocols.ConnectionResetError) {
-        (0, import_log.log)("aborting due to transport ConnectionResetError", void 0, {
+        import_log.log.warn("aborting due to transport ConnectionResetError", void 0, {
           F: __dxlog_file,
           L: 197,
           S: this,
@@ -743,7 +745,7 @@ var Connection = class {
         });
         this.abort().catch((err2) => this.errors.raise(err2));
       } else if (err instanceof import_protocols.ConnectivityError) {
-        (0, import_log.log)("aborting due to transport ConnectivityError", void 0, {
+        import_log.log.warn("aborting due to transport ConnectivityError", void 0, {
           F: __dxlog_file,
           L: 200,
           S: this,
@@ -751,7 +753,7 @@ var Connection = class {
         });
         this.abort().catch((err2) => this.errors.raise(err2));
       } else if (err instanceof import_protocols.UnknownProtocolError) {
-        (0, import_log.log)("unsure what to do for UnknownProtocolError", {
+        import_log.log.warn("unsure what to do with UnknownProtocolError, will keep on truckin", {
           err
         }, {
           F: __dxlog_file,
@@ -782,14 +784,14 @@ var Connection = class {
       err
     }, {
       F: __dxlog_file,
-      L: 224,
+      L: 225,
       S: this,
       C: (f, a) => f(...a)
     });
     if (this._state === ConnectionState.CLOSED || this._state === ConnectionState.ABORTED) {
       (0, import_log.log)(`abort ignored: already ${this._state}`, this.closeReason, {
         F: __dxlog_file,
-        L: 226,
+        L: 227,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -805,7 +807,7 @@ var Connection = class {
         proto: this._protocol
       }, {
         F: __dxlog_file,
-        L: 239,
+        L: 240,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -813,7 +815,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 242,
+        L: 243,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -823,7 +825,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 249,
+        L: 250,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -833,7 +835,7 @@ var Connection = class {
     } catch (err2) {
       import_log.log.catch(err2, void 0, {
         F: __dxlog_file,
-        L: 255,
+        L: 256,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -854,7 +856,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 277,
+      L: 278,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -864,7 +866,7 @@ var Connection = class {
       } catch (err2) {
         import_log.log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 284,
+          L: 285,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -874,7 +876,7 @@ var Connection = class {
       } catch (err2) {
         import_log.log.catch(err2, void 0, {
           F: __dxlog_file,
-          L: 291,
+          L: 292,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -884,7 +886,7 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 295,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -927,7 +929,7 @@ var Connection = class {
         err
       }, {
         F: __dxlog_file,
-        L: 332,
+        L: 333,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -940,7 +942,7 @@ var Connection = class {
   async signal(msg) {
     (0, import_invariant.invariant)(msg.sessionId, void 0, {
       F: __dxlog_file,
-      L: 341,
+      L: 342,
       S: this,
       A: [
         "msg.sessionId",
@@ -950,7 +952,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: 343,
+        L: 344,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -958,7 +960,7 @@ var Connection = class {
     }
     (0, import_invariant.invariant)(msg.data.signal || msg.data.signalBatch, void 0, {
       F: __dxlog_file,
-      L: 346,
+      L: 347,
       S: this,
       A: [
         "msg.data.signal || msg.data.signalBatch",
@@ -967,7 +969,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.author?.equals(this.remoteId), void 0, {
       F: __dxlog_file,
-      L: 347,
+      L: 348,
       S: this,
       A: [
         "msg.author?.equals(this.remoteId)",
@@ -976,7 +978,7 @@ var Connection = class {
     });
     (0, import_invariant.invariant)(msg.recipient?.equals(this.ownId), void 0, {
       F: __dxlog_file,
-      L: 348,
+      L: 349,
       S: this,
       A: [
         "msg.recipient?.equals(this.ownId)",
@@ -1000,7 +1002,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 357,
+          L: 358,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1008,7 +1010,7 @@ var Connection = class {
       } else {
         (0, import_invariant.invariant)(this._transport, "Connection not ready to accept signals.", {
           F: __dxlog_file,
-          L: 360,
+          L: 361,
           S: this,
           A: [
             "this._transport",
@@ -1021,7 +1023,7 @@ var Connection = class {
           msg: msg.data
         }, {
           F: __dxlog_file,
-          L: 361,
+          L: 362,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1039,13 +1041,13 @@ var Connection = class {
       peerId: this.ownId
     }, {
       F: __dxlog_file,
-      L: 372,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant.invariant)(state !== this._state, "Already in this state.", {
       F: __dxlog_file,
-      L: 373,
+      L: 374,
       S: this,
       A: [
         "state !== this._state",
@@ -1120,6 +1122,20 @@ var Peer = class {
   */
   async onOffer(message) {
     const remoteId = message.author;
+    if (this.connection && ![
+      ConnectionState.CREATED,
+      ConnectionState.INITIAL
+    ].includes(this.connection.state)) {
+      import_log2.log.info(`received offer when connection already in ${this.connection.state} state`, void 0, {
+        F: __dxlog_file2,
+        L: 112,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return {
+        accept: false
+      };
+    }
     if (this.connection || this.initiating) {
       if (remoteId.toHex() < this.localPeerId.toHex()) {
         (0, import_log2.log)("close local connection", {
@@ -1129,7 +1145,7 @@ var Peer = class {
           sessionId: this.connection?.sessionId
         }, {
           F: __dxlog_file2,
-          L: 117,
+          L: 121,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1146,7 +1162,7 @@ var Peer = class {
       if (!this.connection) {
         (0, import_invariant2.invariant)(message.sessionId, void 0, {
           F: __dxlog_file2,
-          L: 137,
+          L: 141,
           S: this,
           A: [
             "message.sessionId",
@@ -1167,7 +1183,7 @@ var Peer = class {
               err
             }, {
               F: __dxlog_file2,
-              L: 147,
+              L: 151,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1189,7 +1205,7 @@ var Peer = class {
   async initiateConnection() {
     (0, import_invariant2.invariant)(!this.initiating, "Initiation in progress.", {
       F: __dxlog_file2,
-      L: 164,
+      L: 168,
       S: this,
       A: [
         "!this.initiating",
@@ -1198,7 +1214,7 @@ var Peer = class {
     });
     (0, import_invariant2.invariant)(!this.connection, "Already connected.", {
       F: __dxlog_file2,
-      L: 165,
+      L: 169,
       S: this,
       A: [
         "!this.connection",
@@ -1213,7 +1229,7 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file2,
-      L: 167,
+      L: 171,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1238,14 +1254,14 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file2,
-        L: 183,
+        L: 187,
         S: this,
         C: (f, a) => f(...a)
       });
       if (connection.state !== ConnectionState.INITIAL) {
         (0, import_log2.log)("ignoring response", void 0, {
           F: __dxlog_file2,
-          L: 185,
+          L: 189,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1265,11 +1281,17 @@ var Peer = class {
         remoteId: this.id
       }, {
         F: __dxlog_file2,
-        L: 196,
+        L: 200,
         S: this,
         C: (f, a) => f(...a)
       });
       if (err instanceof import_protocols2.TimeoutError) {
+        import_log2.log.warn("aborting connection due to signalling failure", void 0, {
+          F: __dxlog_file2,
+          L: 202,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         await connection.abort(err);
       }
       await this.closeConnection(err);
@@ -1291,13 +1313,13 @@ var Peer = class {
       sessionId
     }, {
       F: __dxlog_file2,
-      L: 213,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant2.invariant)(!this.connection, "Already connected.", {
       F: __dxlog_file2,
-      L: 220,
+      L: 225,
       S: this,
       A: [
         "!this.connection",
@@ -1333,7 +1355,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file2,
-            L: 239,
+            L: 244,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1346,14 +1368,14 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file2,
-            L: 248,
+            L: 253,
             S: this,
             C: (f, a) => f(...a)
           });
           this._connectionLimiter.doneConnecting(sessionId);
           (0, import_invariant2.invariant)(this.connection === connection, "Connection mismatch (race condition).", {
             F: __dxlog_file2,
-            L: 253,
+            L: 258,
             S: this,
             A: [
               "this.connection === connection",
@@ -1368,7 +1390,7 @@ var Peer = class {
             initiator
           }, {
             F: __dxlog_file2,
-            L: 255,
+            L: 260,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1403,7 +1425,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file2,
-        L: 295,
+        L: 300,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1416,7 +1438,7 @@ var Peer = class {
         err
       }, {
         F: __dxlog_file2,
-        L: 296,
+        L: 301,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1435,7 +1457,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file2,
-      L: 321,
+      L: 326,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1445,7 +1467,7 @@ var Peer = class {
       sessionId: connection.sessionId
     }, {
       F: __dxlog_file2,
-      L: 327,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1456,7 +1478,7 @@ var Peer = class {
         message
       }, {
         F: __dxlog_file2,
-        L: 332,
+        L: 337,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1471,7 +1493,7 @@ var Peer = class {
       topic: this.topic
     }, {
       F: __dxlog_file2,
-      L: 342,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3205,24 +3227,28 @@ var SimplePeerTransport = class {
         switch (err.code) {
           case "ERR_WEBRTC_SUPPORT":
             this.errors.raise(new import_protocols7.ProtocolError("WebRTC not supported", err));
+            break;
           case "ERR_ICE_CONNECTION_FAILURE":
           case "ERR_DATA_CHANNEL":
           case "ERR_CONNECTION_FAILURE":
           case "ERR_SIGNALING":
             this.errors.raise(new import_protocols7.ConnectivityError("unknown communication failure", err));
+            break;
           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_protocols7.UnknownProtocolError("unknown simple-peer library failure", err));
+            break;
           default:
             this.errors.raise(new Error("unknown simple-peer error"));
+            break;
         }
       } else {
         import_log11.log.info("unknown peer connection error", err, {
           F: __dxlog_file12,
-          L: 96,
+          L: 101,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3236,7 +3262,7 @@ var SimplePeerTransport = class {
               stats
             }, {
               F: __dxlog_file12,
-              L: 104,
+              L: 109,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -3245,7 +3271,7 @@ var SimplePeerTransport = class {
       } catch (err2) {
         import_log11.log.catch(err2, void 0, {
           F: __dxlog_file12,
-          L: 111,
+          L: 116,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3256,7 +3282,7 @@ var SimplePeerTransport = class {
       id: this._instanceId
     }), {
       F: __dxlog_file12,
-      L: 116,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3264,7 +3290,7 @@ var SimplePeerTransport = class {
   async destroy() {
     (0, import_log11.log)("closing...", void 0, {
       F: __dxlog_file12,
-      L: 120,
+      L: 125,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3274,7 +3300,7 @@ var SimplePeerTransport = class {
     this.closed.emit();
     (0, import_log11.log)("closed", void 0, {
       F: __dxlog_file12,
-      L: 125,
+      L: 130,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3376,7 +3402,8 @@ var SimplePeerTransportService = class {
       const transportState = {
         transport,
         stream: duplex,
-        writeCallbacks: []
+        writeCallbacks: [],
+        state: "OPEN"
       };
       ready();
       this.transports.set(request.proxyId, transportState);
@@ -3386,7 +3413,7 @@ var SimplePeerTransportService = class {
   async sendSignal({ proxyId, signal }) {
     (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 110,
+      L: 112,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -3396,9 +3423,17 @@ var SimplePeerTransportService = class {
     await this.transports.get(proxyId).transport.signal(signal);
   }
   async sendData({ proxyId, payload }) {
+    if (this.transports.get(proxyId)?.state !== "OPEN") {
+      import_log12.log.debug("transport is closed", void 0, {
+        F: __dxlog_file13,
+        L: 118,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     (0, import_invariant11.invariant)(this.transports.has(proxyId), void 0, {
       F: __dxlog_file13,
-      L: 115,
+      L: 120,
       S: this,
       A: [
         "this.transports.has(proxyId)",
@@ -3416,10 +3451,12 @@ var SimplePeerTransportService = class {
   async close({ proxyId }) {
     await this.transports.get(proxyId)?.transport.destroy();
     await this.transports.get(proxyId)?.stream.end();
-    this.transports.delete(proxyId);
+    if (this.transports.get(proxyId)) {
+      this.transports.get(proxyId).state = "CLOSED";
+    }
     (0, import_log12.log)("Closed.", void 0, {
       F: __dxlog_file13,
-      L: 129,
+      L: 136,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3941,6 +3978,136 @@ var createLibDataChannelTransportFactory = (webrtcConfig) => ({
   })
 });
 
+// packages/core/mesh/network-manager/src/transport/tcp-transport.ts
+var import_node_net = require("node:net");
+var import_async12 = require("@dxos/async");
+var import_debug8 = require("@dxos/debug");
+var import_log15 = require("@dxos/log");
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/core/mesh/network-manager/src/transport/tcp-transport.ts";
+var TcpTransportFactory = {
+  createTransport: (params) => new TcpTransport(params)
+};
+var TcpTransport = class {
+  constructor(options) {
+    this.options = options;
+    this._server = void 0;
+    this._socket = void 0;
+    this.closed = new import_async12.Event();
+    this.connected = new import_async12.Event();
+    this.errors = new import_debug8.ErrorStream();
+    this._destroyed = false;
+    this._connected = false;
+    (0, import_log15.log)("creating", void 0, {
+      F: __dxlog_file16,
+      L: 34,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (this.options.initiator) {
+      setTimeout(async () => {
+        const { Server } = await import("node:net");
+        this._server = new Server((socket) => {
+          (0, import_log15.log)("new connection", void 0, {
+            F: __dxlog_file16,
+            L: 42,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          if (this._connected) {
+            socket.destroy();
+          }
+          this._handleSocket(socket);
+        });
+        this._server.on("listening", () => {
+          const { port } = this._server.address();
+          (0, import_log15.log)("listening", {
+            port
+          }, {
+            F: __dxlog_file16,
+            L: 51,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          void this.options.sendSignal({
+            payload: {
+              port
+            }
+          }).catch((err) => {
+            if (!this._destroyed) {
+              this.errors.raise(err);
+            }
+          });
+        });
+        this._server.on("error", (err) => {
+          this.errors.raise(err);
+        });
+        this._server.listen(0);
+      });
+    }
+  }
+  async destroy() {
+    (0, import_log15.log)("closing", void 0, {
+      F: __dxlog_file16,
+      L: 72,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._socket?.destroy();
+    this._server?.close();
+    this._destroyed = true;
+  }
+  signal({ payload }) {
+    (0, import_log15.log)("received signal", {
+      payload
+    }, {
+      F: __dxlog_file16,
+      L: 80,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (this.options.initiator || this._connected) {
+      return;
+    }
+    const socket = new import_node_net.Socket();
+    this._handleSocket(socket);
+    socket.connect({
+      port: payload.port,
+      host: "localhost"
+    });
+  }
+  _handleSocket(socket) {
+    (0, import_log15.log)("handling socket", {
+      remotePort: socket.remotePort,
+      localPort: socket.localPort
+    }, {
+      F: __dxlog_file16,
+      L: 91,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._socket = socket;
+    this.connected.emit();
+    this.options.stream.pipe(this._socket).pipe(this.options.stream);
+    this._socket.on("connect", () => {
+      (0, import_log15.log)("connected to", {
+        port: this._socket?.remotePort
+      }, {
+        F: __dxlog_file16,
+        L: 97,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._connected = true;
+    });
+    this._socket.on("error", (err) => {
+      this.errors.raise(err);
+    });
+    this._socket.on("close", () => {
+      this.closed.emit();
+    });
+  }
+};
+
 // packages/core/mesh/network-manager/src/wire-protocol.ts
 var import_teleport = require("@dxos/teleport");
 var createTeleportProtocolFactory = (onConnection) => {
@@ -3986,6 +4153,8 @@ var createTeleportProtocolFactory = (onConnection) => {
   Swarm,
   SwarmMapper,
   SwarmMessenger,
+  TcpTransport,
+  TcpTransportFactory,
   TransportKind,
   cleanup,
   createLibDataChannelTransportFactory,