@dxos/network-manager 0.4.10-main.fd4f2a3 → 0.4.10-main.fe71b4c

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

@@ -2,12 +2,17 @@ import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { type Transport, type TransportFactory, type TransportStats } from './transport';
 export declare const TcpTransportFactory: TransportFactory;
+/**
+ * NOTE: Browser stub.
+ */
 export declare class TcpTransport implements Transport {
     readonly closed: Event<void>;
     readonly connected: Event<void>;
     readonly errors: ErrorStream;
-    destroy(): Promise<void>;
-    signal(): void;
+    get isOpen(): boolean;
+    open(): Promise<void>;
+    close(): Promise<void>;
+    onSignal(): Promise<void>;
     getStats(): Promise<TransportStats>;
     getDetails(): Promise<string>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"tcp-transport.browser.d.ts","sourceRoot":"","sources":["../../../../src/transport/tcp-transport.browser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAIzF,eAAO,MAAM,mBAAmB,EAAE,gBAEjC,CAAC;AAEF,qBAAa,YAAa,YAAW,SAAS;IAC5C,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;IAErC,OAAO;IAIb,MAAM;IAIA,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;IAInC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAGpC"}
+{"version":3,"file":"tcp-transport.browser.d.ts","sourceRoot":"","sources":["../../../../src/transport/tcp-transport.browser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAEzF,eAAO,MAAM,mBAAmB,EAAE,gBAEjC,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAa,YAAW,SAAS;IAC5C,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;IAE3C,IAAI,MAAM,YAET;IAEK,IAAI;IAEJ,KAAK;IAEL,QAAQ;IAIR,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;IAInC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;CAGpC"}

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

@@ -10,14 +10,16 @@ export declare class TcpTransport implements Transport {
     private readonly options;
     private _server?;
     private _socket?;
+    private _connected;
+    private _closed;
     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;
+    get isOpen(): boolean;
+    open(): Promise<void>;
+    close(): Promise<void>;
+    onSignal({ payload }: Signal): Promise<void>;
     getDetails(): Promise<string>;
     getStats(): Promise<TransportStats>;
     private _handleSocket;

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

@@ -1 +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,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAEhH,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;IAWpB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAS7B,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;IASzC,OAAO,CAAC,aAAa;CAiBtB"}
+{"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,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAEhH,eAAO,MAAM,mBAAmB,EAAE,gBAEjC,CAAC;AAEF;;GAEG;AACH,qBAAa,YAAa,YAAW,SAAS;IAWhC,OAAO,CAAC,QAAQ,CAAC,OAAO;IAVpC,OAAO,CAAC,OAAO,CAAC,CAAqB;IACrC,OAAO,CAAC,OAAO,CAAC,CAAqB;IAErC,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,OAAO,CAAS;IAExB,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;gBAEd,OAAO,EAAE,gBAAgB;IAEtD,IAAI,MAAM,YAET;IAEK,IAAI;IAuCJ,KAAK;IAOL,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM;IAW5B,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAU7B,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;IASzC,OAAO,CAAC,aAAa;CAoBtB"}

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

@@ -5,48 +5,54 @@ import { type PublicKey } from '@dxos/keys';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 export declare enum TransportKind {
     SIMPLE_PEER = "SIMPLE_PEER",
-    LIBDATACHANNEL = "LIBDATACHANNEL",
     SIMPLE_PEER_PROXY = "SIMPLE_PEER_PROXY",
+    LIBDATACHANNEL = "LIBDATACHANNEL",
     MEMORY = "MEMORY",
     TCP = "TCP"
 }
 /**
- * Abstraction over a P2P connection transport. Currently either WebRTC or in-memory.
+ * Abstraction over a P2P connection transport.
+ * Currently, WebRTC or in-memory.
  */
 export interface Transport {
     closed: Event;
     connected: Event;
     errors: ErrorStream;
+    open(): Promise<void>;
+    close(): Promise<void>;
+    get isOpen(): boolean;
     /**
-     * Transport-specfic stats.
+     * Handle message from signaling.
+     */
+    onSignal(signal: Signal): Promise<void>;
+    /**
+     * Transport-specific stats.
      */
     getStats(): Promise<TransportStats>;
     /**
-     * Transport-specfic connection details.
+     * Transport-specific connection details.
      */
     getDetails(): Promise<string>;
-    destroy(): Promise<void>;
-    signal(signal: Signal): void;
 }
+/**
+ * Common options for all transports.
+ */
 export type TransportOptions = {
     /**
      * Did local node initiate this connection.
      */
     initiator: boolean;
     /**
-     * Wire protocol.
+     * Wire protocol for data stream.
      */
     stream: NodeJS.ReadWriteStream;
     /**
-     * Send a signal message to remote peer.
+     * Sends signal message to remote peer.
      */
     sendSignal: (signal: Signal) => Promise<void>;
-    timeout?: number;
     sessionId?: PublicKey;
+    timeout?: number;
 };
-/**
- *
- */
 export interface TransportFactory {
     createTransport(options: TransportOptions): Transport;
 }

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,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,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;;OAEG;IACH,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IACpC;;OAEG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9B,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;IAEjB,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACvD;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC"}
+{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/transport.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,oBAAY,aAAa;IACvB,WAAW,gBAAgB;IAC3B,iBAAiB,sBAAsB;IACvC,cAAc,mBAAmB;IACjC,MAAM,WAAW;IACjB,GAAG,QAAQ;CACZ;AAED;;;GAGG;AAEH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,KAAK,CAAC;IACd,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IAEpB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEvB,IAAI,MAAM,IAAI,OAAO,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExC;;OAEG;IACH,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC;IAEpC;;OAEG;IACH,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;CAC/B;AAED;;GAEG;AACH,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,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;CACvD;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,GAAG,CAAC;CAChB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.4.10-main.fd4f2a3",
+  "version": "0.4.10-main.fe71b4c",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -31,21 +31,21 @@
     "tiny-invariant": "^1.3.1",
     "ws": "^8.14.2",
     "xor-distance": "^2.0.0",
-    "@dxos/async": "0.4.10-main.fd4f2a3",
-    "@dxos/codec-protobuf": "0.4.10-main.fd4f2a3",
-    "@dxos/context": "0.4.10-main.fd4f2a3",
-    "@dxos/crypto": "0.4.10-main.fd4f2a3",
-    "@dxos/debug": "0.4.10-main.fd4f2a3",
-    "@dxos/keys": "0.4.10-main.fd4f2a3",
-    "@dxos/credentials": "0.4.10-main.fd4f2a3",
-    "@dxos/invariant": "0.4.10-main.fd4f2a3",
-    "@dxos/log": "0.4.10-main.fd4f2a3",
-    "@dxos/messaging": "0.4.10-main.fd4f2a3",
-    "@dxos/protocols": "0.4.10-main.fd4f2a3",
-    "@dxos/teleport": "0.4.10-main.fd4f2a3",
-    "@dxos/rpc": "0.4.10-main.fd4f2a3",
-    "@dxos/node-std": "0.4.10-main.fd4f2a3",
-    "@dxos/util": "0.4.10-main.fd4f2a3"
+    "@dxos/async": "0.4.10-main.fe71b4c",
+    "@dxos/codec-protobuf": "0.4.10-main.fe71b4c",
+    "@dxos/credentials": "0.4.10-main.fe71b4c",
+    "@dxos/crypto": "0.4.10-main.fe71b4c",
+    "@dxos/debug": "0.4.10-main.fe71b4c",
+    "@dxos/context": "0.4.10-main.fe71b4c",
+    "@dxos/log": "0.4.10-main.fe71b4c",
+    "@dxos/invariant": "0.4.10-main.fe71b4c",
+    "@dxos/keys": "0.4.10-main.fe71b4c",
+    "@dxos/messaging": "0.4.10-main.fe71b4c",
+    "@dxos/node-std": "0.4.10-main.fe71b4c",
+    "@dxos/protocols": "0.4.10-main.fe71b4c",
+    "@dxos/rpc": "0.4.10-main.fe71b4c",
+    "@dxos/util": "0.4.10-main.fe71b4c",
+    "@dxos/teleport": "0.4.10-main.fe71b4c"
   },
   "devDependencies": {
     "@swc-node/register": "1.6.8",
@@ -54,7 +54,7 @@
     "earljs": "~0.1.10",
     "fast-check": "^3.15.1",
     "typescript": "^5.2.2",
-    "@dxos/signal": "0.4.10-main.fd4f2a3"
+    "@dxos/signal": "0.4.10-main.fe71b4c"
   },
   "publishConfig": {
     "access": "public"

package/src/swarm/connection.ts

@@ -203,6 +203,8 @@ export class Connection {
       sessionId: this.sessionId,
     });
 
+    await this._transport.open();
+
     this._transport.connected.once(async () => {
       this._changeState(ConnectionState.CONNECTED);
       await this.connectedTimeoutContext.dispose();
@@ -242,7 +244,7 @@ export class Connection {
 
     // Replay signals that were received before transport was created.
     for (const signal of this._incomingSignalBuffer) {
-      void this._transport.signal(signal); // TODO(burdon): Remove async?
+      void this._transport.onSignal(signal); // TODO(burdon): Remove async?
     }
 
     this._incomingSignalBuffer = [];
@@ -278,7 +280,7 @@ export class Connection {
 
     try {
       // After the transport is closed streams are disconnected.
-      await this._transport?.destroy();
+      await this._transport?.close();
     } catch (err: any) {
       log.catch(err);
     }
@@ -323,7 +325,7 @@ export class Connection {
 
       try {
         // After the transport is closed streams are disconnected.
-        await this._transport?.destroy();
+        await this._transport?.close();
       } catch (err: any) {
         log.catch(err);
       }
@@ -335,7 +337,7 @@ export class Connection {
         log.catch(err);
       }
       try {
-        await this._transport?.destroy();
+        await this._transport?.close();
       } catch (err: any) {
         log.catch(err);
       }
@@ -409,7 +411,7 @@ export class Connection {
       } else {
         invariant(this._transport, 'Connection not ready to accept signals.');
         log('received signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data });
-        await this._transport.signal(signal);
+        await this._transport.onSignal(signal);
       }
     }
   }

package/src/swarm/peer.ts

@@ -90,7 +90,6 @@ export class Peer {
 
   public readonly connectionDisplaced = new Event<Connection>();
 
-  // TODO(burdon): Convert to map?
   constructor(
     public readonly id: PublicKey,
     public readonly topic: PublicKey,

package/src/transport/libdatachannel-transport.test.ts

@@ -19,8 +19,9 @@ describe('LibDataChannelTransport', () => {
       sendSignal: async () => {},
     });
 
+    await connection.open();
     const wait = connection.closed.waitForCount(1);
-    await connection.destroy();
+    await connection.close();
     await wait;
   })
     .onlyEnvironments('nodejs')
@@ -34,10 +35,11 @@ describe('LibDataChannelTransport', () => {
       stream: stream1,
       sendSignal: async (signal) => {
         await sleep(10);
-        await connection2.signal(signal);
+        await connection2.onSignal(signal);
       },
     });
-    afterTest(() => connection1.destroy());
+    await connection1.open();
+    afterTest(() => connection1.close());
     afterTest(() => connection1.errors.assertNoUnhandledErrors());
 
     const stream2 = new TestStream();
@@ -46,10 +48,11 @@ describe('LibDataChannelTransport', () => {
       stream: stream2,
       sendSignal: async (signal) => {
         await sleep(10);
-        await connection1.signal(signal);
+        await connection1.onSignal(signal);
       },
     });
-    afterTest(() => connection2.destroy());
+    await connection2.open();
+    afterTest(() => connection2.close());
     afterTest(() => connection2.errors.assertNoUnhandledErrors());
 
     await TestStream.assertConnectivity(stream1, stream2, { timeout: 2_000 });
@@ -67,10 +70,11 @@ describe('LibDataChannelTransport', () => {
         log.debug('signal', signal);
 
         await sleep(10);
-        await connection2.signal(signal);
+        await connection2.onSignal(signal);
       },
     });
-    afterTest(() => connection1.destroy());
+    await connection1.open();
+    afterTest(() => connection1.close());
     afterTest(() => connection1.errors.assertNoUnhandledErrors());
 
     const stream2 = new TestStream();
@@ -81,10 +85,11 @@ describe('LibDataChannelTransport', () => {
         log.debug('signal', signal);
 
         await sleep(10);
-        await connection1.signal(signal);
+        await connection1.onSignal(signal);
       },
     });
-    afterTest(() => connection2.destroy());
+    await connection2.open();
+    afterTest(() => connection2.close());
     afterTest(() => connection2.errors.assertNoUnhandledErrors());
 
     await TestStream.assertConnectivity(stream1, stream2, { timeout: 2_000 });