@dxos/network-manager 0.1.58-main.afe71a8 → 0.1.58-main.b2aa5cf

package/dist/types/src/testing/test-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EACL,mBAAmB,EAGnB,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAI5D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAOL,aAAa,EACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,gBAAgB,EAAE,KAAK,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAI3F,eAAO,MAAM,iBAAiB,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAEtD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACxC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAW;aAGM,OAAO,EAAE,kBAAkB;IAFvD,OAAO,CAAC,cAAc,CAAoC;gBAE9B,OAAO,GAAE,kBAAuB;IAE5D,mBAAmB;IAQnB,UAAU,CAAC,MAAM,GAAE,SAA8B;CAGlD;AAED;;GAEG;AACH,qBAAa,QAAQ;IAiBjB,OAAO,CAAC,QAAQ,CAAC,WAAW;aACZ,MAAM,EAAE,SAAS;aACjB,SAAS,CAAC;IAlB5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkE;IAY1F,OAAO,CAAC,MAAM,CAAC,CAAoB;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAoB;gBAGlB,WAAW,EAAE,WAAW,EACzB,MAAM,EAAE,SAAS,EACjB,SAAS,CAAC,2BAAe;IAc3C,oBAAoB,CAAC,SAAS,EAAE,aAAa;IA6DvC,IAAI;IAMJ,KAAK;IASX,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,mBAAmB;IAS/C,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,gBAAgB,GAAE,4BAAuC,GAAG,mBAAmB;IAWvG,SAAS;IAIT,QAAQ;CAGf;AAGD,qBAAa,mBAAmB;IAI5B,QAAQ,CAAC,IAAI,EAAE,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS;IACzB,QAAQ,CAAC,gBAAgB,EAAE,4BAA4B;IALzD,QAAQ,EAAE,gBAAgB,CAAC;gBAGhB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,gBAAgB,EAAE,4BAA4B;IASnD,IAAI,CAAC,QAAQ,yBAA+B;IAW5C,KAAK;CAIZ"}
+{"version":3,"file":"test-builder.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-builder.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EACL,mBAAmB,EAGnB,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAI5D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAOL,aAAa,EACd,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,gBAAgB,EAAE,KAAK,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AAI3F,eAAO,MAAM,iBAAiB,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAEtD,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IACxC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,aAAa,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,qBAAa,WAAW;aAGM,OAAO,EAAE,kBAAkB;IAFvD,OAAO,CAAC,cAAc,CAAoC;gBAE9B,OAAO,GAAE,kBAAuB;IAE5D,mBAAmB;IAQnB,UAAU,CAAC,MAAM,GAAE,SAA8B;CAGlD;AAED;;GAEG;AACH,qBAAa,QAAQ;IAiBjB,OAAO,CAAC,QAAQ,CAAC,WAAW;aACZ,MAAM,EAAE,SAAS;aACjB,SAAS,CAAC;IAlB5B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAkE;IAY1F,OAAO,CAAC,MAAM,CAAC,CAAoB;IACnC,OAAO,CAAC,QAAQ,CAAC,CAAoB;gBAGlB,WAAW,EAAE,WAAW,EACzB,MAAM,EAAE,SAAS,EACjB,SAAS,CAAC,2BAAe;IAc3C,oBAAoB,CAAC,SAAS,EAAE,aAAa;IAgEvC,IAAI;IAMJ,KAAK;IASX,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,mBAAmB;IAS/C,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,gBAAgB,GAAE,4BAAuC,GAAG,mBAAmB;IAWvG,SAAS;IAIT,QAAQ;CAGf;AAGD,qBAAa,mBAAmB;IAI5B,QAAQ,CAAC,IAAI,EAAE,QAAQ;IACvB,QAAQ,CAAC,KAAK,EAAE,SAAS;IACzB,QAAQ,CAAC,gBAAgB,EAAE,4BAA4B;IALzD,QAAQ,EAAE,gBAAgB,CAAC;gBAGhB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,gBAAgB,EAAE,4BAA4B;IASnD,IAAI,CAAC,QAAQ,yBAA+B;IAW5C,KAAK;CAIZ"}

package/dist/types/src/tests/tcp-transport.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tcp-transport.test.d.ts.map

package/dist/types/src/tests/tcp-transport.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tcp-transport.test.d.ts","sourceRoot":"","sources":["../../../../src/tests/tcp-transport.test.ts"],"names":[],"mappings":""}

package/dist/types/src/transport/tcp-transport.d.ts

@@ -0,0 +1,23 @@
+import { Event } from '@dxos/async';
+import { ErrorStream } from '@dxos/debug';
+import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { Transport, TransportFactory, TransportOptions } from './transport';
+export declare const TcpTransportFactory: TransportFactory;
+/**
+ * Fake transport.
+ */
+export declare class TcpTransport implements Transport {
+    private readonly options;
+    private _server?;
+    private _socket?;
+    readonly closed: Event<void>;
+    readonly connected: Event<void>;
+    readonly errors: ErrorStream;
+    private _destroyed;
+    private _connected;
+    constructor(options: TransportOptions);
+    destroy(): Promise<void>;
+    signal({ payload }: Signal): void;
+    private _handleSocket;
+}
+//# sourceMappingURL=tcp-transport.d.ts.map

package/dist/types/src/transport/tcp-transport.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tcp-transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/tcp-transport.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE5E,eAAO,MAAM,mBAAmB,EAAE,gBAEjC,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAa,YAAW,SAAS;IAYhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAXpC,OAAO,CAAC,OAAO,CAAC,CAAqB;IACrC,OAAO,CAAC,OAAO,CAAC,CAAqB;IAErC,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;IAE3C,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO,CAAC,UAAU,CAAS;gBAEE,OAAO,EAAE,gBAAgB;IAsChD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM;IAW1B,OAAO,CAAC,aAAa;CAiBtB"}

package/dist/types/src/transport/transport.d.ts

@@ -6,7 +6,8 @@ export declare enum TransportKind {
     SIMPLE_PEER = "SIMPLE_PEER",
     LIBDATACHANNEL = "LIBDATACHANNEL",
     SIMPLE_PEER_PROXY = "SIMPLE_PEER_PROXY",
-    MEMORY = "MEMORY"
+    MEMORY = "MEMORY",
+    TCP = "TCP"
 }
 /**
  * Abstraction over a P2P connection transport. Currently either WebRTC or in-memory.

package/dist/types/src/transport/transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/transport.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,oBAAY,aAAa;IACvB,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,iBAAiB,sBAAsB;IACvC,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,KAAK,CAAC;IACd,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IAEpB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAE/B;;OAEG;IACH,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACvD"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/transport.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,oBAAY,aAAa;IACvB,WAAW,gBAAgB;IAC3B,cAAc,mBAAmB;IACjC,iBAAiB,sBAAsB;IACvC,MAAM,WAAW;IACjB,GAAG,QAAQ;CACZ;AAED;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,KAAK,CAAC;IACd,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IAEpB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAE/B;;OAEG;IACH,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACvD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.1.58-main.afe71a8",
+  "version": "0.1.58-main.b2aa5cf",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -30,22 +30,22 @@
     "tiny-invariant": "^1.3.1",
     "ws": "^7.4.4",
     "xor-distance": "^2.0.0",
-    "@dxos/async": "0.1.58-main.afe71a8",
-    "@dxos/codec-protobuf": "0.1.58-main.afe71a8",
-    "@dxos/context": "0.1.58-main.afe71a8",
-    "@dxos/credentials": "0.1.58-main.afe71a8",
-    "@dxos/crypto": "0.1.58-main.afe71a8",
-    "@dxos/debug": "0.1.58-main.afe71a8",
-    "@dxos/errors": "0.1.58-main.afe71a8",
-    "@dxos/invariant": "0.1.58-main.afe71a8",
-    "@dxos/keys": "0.1.58-main.afe71a8",
-    "@dxos/log": "0.1.58-main.afe71a8",
-    "@dxos/messaging": "0.1.58-main.afe71a8",
-    "@dxos/node-std": "0.1.58-main.afe71a8",
-    "@dxos/protocols": "0.1.58-main.afe71a8",
-    "@dxos/rpc": "0.1.58-main.afe71a8",
-    "@dxos/teleport": "0.1.58-main.afe71a8",
-    "@dxos/util": "0.1.58-main.afe71a8"
+    "@dxos/async": "0.1.58-main.b2aa5cf",
+    "@dxos/codec-protobuf": "0.1.58-main.b2aa5cf",
+    "@dxos/context": "0.1.58-main.b2aa5cf",
+    "@dxos/credentials": "0.1.58-main.b2aa5cf",
+    "@dxos/crypto": "0.1.58-main.b2aa5cf",
+    "@dxos/debug": "0.1.58-main.b2aa5cf",
+    "@dxos/errors": "0.1.58-main.b2aa5cf",
+    "@dxos/invariant": "0.1.58-main.b2aa5cf",
+    "@dxos/keys": "0.1.58-main.b2aa5cf",
+    "@dxos/log": "0.1.58-main.b2aa5cf",
+    "@dxos/messaging": "0.1.58-main.b2aa5cf",
+    "@dxos/node-std": "0.1.58-main.b2aa5cf",
+    "@dxos/protocols": "0.1.58-main.b2aa5cf",
+    "@dxos/rpc": "0.1.58-main.b2aa5cf",
+    "@dxos/teleport": "0.1.58-main.b2aa5cf",
+    "@dxos/util": "0.1.58-main.b2aa5cf"
   },
   "devDependencies": {
     "@swc-node/register": "1.5.4",
@@ -55,7 +55,7 @@
     "earljs": "~0.1.10",
     "fast-check": "~3.3.0",
     "typescript": "^5.2.2",
-    "@dxos/signal": "0.1.58-main.afe71a8"
+    "@dxos/signal": "0.1.58-main.b2aa5cf"
   },
   "publishConfig": {
     "access": "public"

package/src/testing/test-builder.ts

@@ -27,6 +27,7 @@ import {
   createLibDataChannelTransportFactory,
   TransportKind,
 } from '../transport';
+import { TcpTransportFactory } from '../transport/tcp-transport';
 import { TestWireProtocol, type TestTeleportExtensionFactory } from './test-wire-protocol';
 
 // Signal server will be started by the setup script.
@@ -105,6 +106,9 @@ export class TestPeer {
       switch (transport) {
         case TransportKind.MEMORY:
           throw new Error('Memory transport not supported with signal server.');
+        case TransportKind.TCP:
+          transportFactory = TcpTransportFactory;
+          break;
         case TransportKind.SIMPLE_PEER:
           transportFactory = createSimplePeerTransportFactory();
           break;
@@ -146,7 +150,7 @@ export class TestPeer {
           throw new Error(`Unsupported transport: ${transport}`);
       }
     } else {
-      if (transport !== TransportKind.MEMORY) {
+      if (transport !== TransportKind.MEMORY && transport !== TransportKind.TCP) {
         log.warn(`specified transport ${transport} but no signalling configured, using memory transport instead`);
       }
       log.info(`using ${transport} transport without signal server.`);

package/src/tests/tcp-transport.test.ts

@@ -0,0 +1,67 @@
+//
+// Copyright 2021 DXOS.org
+//
+
+import { randomBytes } from 'crypto';
+
+import { PublicKey } from '@dxos/keys';
+import { test } from '@dxos/test';
+import { range } from '@dxos/util';
+
+import { TestBuilder } from '../testing';
+import { FullyConnectedTopology } from '../topology';
+import { TransportKind } from '../transport';
+import { basicTestSuite } from './basic-test-suite';
+import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
+
+describe('Tcp transport', () => {
+  const testBuilder = new TestBuilder({
+    transport: TransportKind.TCP,
+  });
+
+  basicTestSuite(testBuilder);
+
+  test
+    .skip('load', async () => {
+      const NUM_PAIRS = 100;
+      const NUM_ROUNDS = 10_000;
+      const PACKET_SIZE = 1_000;
+
+      const pairs = await Promise.all(
+        range(NUM_PAIRS).map(async () => {
+          const peer1 = testBuilder.createPeer();
+          const peer2 = testBuilder.createPeer();
+          await openAndCloseAfterTest([peer1, peer2]);
+
+          const topic = PublicKey.random();
+          const [swarm1, swarm2] = await joinSwarm([peer1, peer2], topic, () => new FullyConnectedTopology());
+
+          return {
+            peer1,
+            peer2,
+            topic,
+            swarm1,
+            swarm2,
+          };
+        }),
+      );
+
+      const message = randomBytes(PACKET_SIZE / 2).toString('hex');
+
+      for (let i = 0; i < NUM_ROUNDS; i++) {
+        // console.log(`Round ${i}/${NUM_ROUNDS}`);
+        await Promise.all(
+          pairs.map(async ({ swarm1, swarm2 }) => {
+            await exchangeMessages(swarm1, swarm2, message);
+          }),
+        );
+      }
+
+      await Promise.all(
+        pairs.map(async ({ peer1, peer2, topic }) => {
+          await leaveSwarm([peer1, peer2], topic);
+        }),
+      );
+    })
+    .timeout(1_000_000);
+});

package/src/transport/tcp-transport.ts

@@ -0,0 +1,107 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import { AddressInfo, Socket, type Server } from 'node:net';
+
+import { Event } from '@dxos/async';
+import { ErrorStream } from '@dxos/debug';
+import { log } from '@dxos/log';
+import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+
+import { Transport, TransportFactory, TransportOptions } from './transport';
+
+export const TcpTransportFactory: TransportFactory = {
+  createTransport: (params) => new TcpTransport(params),
+};
+
+/**
+ * Fake transport.
+ */
+export class TcpTransport implements Transport {
+  private _server?: Server = undefined;
+  private _socket?: Socket = undefined;
+
+  public readonly closed = new Event<void>();
+  public readonly connected = new Event<void>();
+  public readonly errors = new ErrorStream();
+
+  private _destroyed = false;
+
+  private _connected = false;
+
+  constructor(private readonly options: TransportOptions) {
+    log('creating');
+
+    // Initiator will send a signal, the receiver will receive the unique ID and connect the streams.
+    if (this.options.initiator) {
+      // prettier-ignore
+      setTimeout(async () => {
+        const { Server } = await import('node:net');
+        this._server = new Server(socket => {
+          log('new connection');
+          if (this._connected) {
+            socket.destroy();
+          }
+          this._handleSocket(socket);
+        });
+
+        this._server.on('listening', () => {
+          const { port } = this._server!.address() as AddressInfo;
+          log('listening', { port });
+          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(): Promise<void> {
+    log('closing');
+    this._socket?.destroy();
+    this._server?.close();
+
+    this._destroyed = true;
+  }
+
+  signal({ payload }: Signal) {
+    log('received signal', { payload });
+    if (this.options.initiator || this._connected) {
+      return;
+    }
+
+    const socket = new Socket();
+    this._handleSocket(socket);
+    socket.connect({ port: payload.port, host: 'localhost' });
+  }
+
+  private _handleSocket(socket: Socket) {
+    log('handling socket', { remotePort: socket.remotePort, localPort: socket.localPort });
+    this._socket = socket;
+    this.connected.emit();
+    this.options.stream.pipe(this._socket!).pipe(this.options.stream);
+
+    this._socket.on('connect', () => {
+      log('connected to', { port: this._socket?.remotePort });
+      this._connected = true;
+    });
+    this._socket.on('error', (err) => {
+      this.errors.raise(err);
+    });
+    this._socket.on('close', () => {
+      this.closed.emit();
+    });
+  }
+}

package/src/transport/transport.ts

@@ -11,6 +11,7 @@ export enum TransportKind {
   LIBDATACHANNEL = 'LIBDATACHANNEL',
   SIMPLE_PEER_PROXY = 'SIMPLE_PEER_PROXY',
   MEMORY = 'MEMORY',
+  TCP = 'TCP',
 }
 
 /**