@dxos/network-manager 0.3.9-main.dd8d283 → 0.3.9-main.e6215fc

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

@@ -1,6 +1,6 @@
 import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
-import { type Transport, type TransportFactory } from './transport';
+import { type Transport, type TransportFactory, type TransportStats } from './transport';
 export declare const TcpTransportFactory: TransportFactory;
 export declare class TcpTransport implements Transport {
     readonly closed: Event<void>;
@@ -8,5 +8,7 @@ export declare class TcpTransport implements Transport {
     readonly errors: ErrorStream;
     destroy(): Promise<void>;
     signal(): void;
+    getStats(): Promise<TransportStats>;
+    getDetails(): Promise<string>;
 }
 //# sourceMappingURL=tcp-transport.browser.d.ts.map

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,MAAM,aAAa,CAAC;AAIpE,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;CAGP"}
+{"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"}

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

@@ -1,7 +1,7 @@
 import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
-import { type Transport, type TransportFactory, type TransportOptions } from './transport';
+import { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from './transport';
 export declare const TcpTransportFactory: TransportFactory;
 /**
  * Fake transport.
@@ -18,6 +18,8 @@ export declare class TcpTransport implements Transport {
     constructor(options: TransportOptions);
     destroy(): Promise<void>;
     signal({ payload }: Signal): void;
+    getDetails(): Promise<string>;
+    getStats(): Promise<TransportStats>;
     private _handleSocket;
 }
 //# sourceMappingURL=tcp-transport.d.ts.map

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,MAAM,aAAa,CAAC;AAE3F,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"}
+{"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"}

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

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { type Event } from '@dxos/async';
 import { type ErrorStream } from '@dxos/debug';
+import { type PublicKey } from '@dxos/keys';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 export declare enum TransportKind {
     SIMPLE_PEER = "SIMPLE_PEER",
@@ -16,6 +17,14 @@ export interface Transport {
     closed: Event;
     connected: Event;
     errors: ErrorStream;
+    /**
+     * Transport-specfic stats.
+     */
+    getStats(): Promise<TransportStats>;
+    /**
+     * Transport-specfic connection details.
+     */
+    getDetails(): Promise<string>;
     destroy(): Promise<void>;
     signal(signal: Signal): void;
 }
@@ -33,6 +42,7 @@ export type TransportOptions = {
      */
     sendSignal: (signal: Signal) => Promise<void>;
     timeout?: number;
+    sessionId?: PublicKey;
 };
 /**
  *
@@ -40,4 +50,11 @@ export type TransportOptions = {
 export interface TransportFactory {
     createTransport(options: TransportOptions): Transport;
 }
+export type TransportStats = {
+    bytesSent: number;
+    bytesReceived: number;
+    packetsSent: number;
+    packetsReceived: number;
+    rawStats?: any;
+};
 //# sourceMappingURL=transport.d.ts.map

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,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,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,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"}

package/dist/types/src/wire-protocol.d.ts

@@ -15,7 +15,7 @@ export type WireProtocolProvider = (params: WireProtocolParams) => WireProtocol;
  */
 export interface WireProtocol {
     stream: Duplex;
-    open(): Promise<void>;
+    open(sessionId?: PublicKey): Promise<void>;
     close(): Promise<void>;
     abort(): Promise<void>;
 }

package/dist/types/src/wire-protocol.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wire-protocol.d.ts","sourceRoot":"","sources":["../../../src/wire-protocol.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,SAAS,CAAC;IACxB,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,YAAY,CAAC;AAEhF;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,4BACf,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAClD,oBAiBF,CAAC"}
+{"version":3,"file":"wire-protocol.d.ts","sourceRoot":"","sources":["../../../src/wire-protocol.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,SAAS,CAAC;IACvB,YAAY,EAAE,SAAS,CAAC;IACxB,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,CAAC,MAAM,EAAE,kBAAkB,KAAK,YAAY,CAAC;AAEhF;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IAEf,IAAI,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;;GAIG;AACH,eAAO,MAAM,6BAA6B,4BACf,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAClD,oBAiBF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.3.9-main.dd8d283",
+  "version": "0.3.9-main.e6215fc",
   "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.3.9-main.dd8d283",
-    "@dxos/codec-protobuf": "0.3.9-main.dd8d283",
-    "@dxos/context": "0.3.9-main.dd8d283",
-    "@dxos/crypto": "0.3.9-main.dd8d283",
-    "@dxos/credentials": "0.3.9-main.dd8d283",
-    "@dxos/debug": "0.3.9-main.dd8d283",
-    "@dxos/invariant": "0.3.9-main.dd8d283",
-    "@dxos/keys": "0.3.9-main.dd8d283",
-    "@dxos/log": "0.3.9-main.dd8d283",
-    "@dxos/rpc": "0.3.9-main.dd8d283",
-    "@dxos/protocols": "0.3.9-main.dd8d283",
-    "@dxos/teleport": "0.3.9-main.dd8d283",
-    "@dxos/messaging": "0.3.9-main.dd8d283",
-    "@dxos/util": "0.3.9-main.dd8d283",
-    "@dxos/node-std": "0.3.9-main.dd8d283"
+    "@dxos/async": "0.3.9-main.e6215fc",
+    "@dxos/context": "0.3.9-main.e6215fc",
+    "@dxos/credentials": "0.3.9-main.e6215fc",
+    "@dxos/codec-protobuf": "0.3.9-main.e6215fc",
+    "@dxos/crypto": "0.3.9-main.e6215fc",
+    "@dxos/debug": "0.3.9-main.e6215fc",
+    "@dxos/invariant": "0.3.9-main.e6215fc",
+    "@dxos/log": "0.3.9-main.e6215fc",
+    "@dxos/keys": "0.3.9-main.e6215fc",
+    "@dxos/messaging": "0.3.9-main.e6215fc",
+    "@dxos/node-std": "0.3.9-main.e6215fc",
+    "@dxos/protocols": "0.3.9-main.e6215fc",
+    "@dxos/teleport": "0.3.9-main.e6215fc",
+    "@dxos/rpc": "0.3.9-main.e6215fc",
+    "@dxos/util": "0.3.9-main.e6215fc"
   },
   "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.3.9-main.dd8d283"
+    "@dxos/signal": "0.3.9-main.e6215fc"
   },
   "publishConfig": {
     "access": "public"

package/src/connection-log.ts

@@ -64,7 +64,7 @@ export class ConnectionLog {
       info.connections!.push(connectionInfo);
       this.update.emit();
 
-      connection.stateChanged.on((state) => {
+      connection.stateChanged.on(async (state) => {
         connectionInfo.state = state;
         connectionInfo.closeReason = connection.closeReason;
         connectionInfo.lastUpdate = new Date();
@@ -72,6 +72,12 @@ export class ConnectionLog {
           type: EventType.CONNECTION_STATE_CHANGED,
           newState: state,
         });
+
+        if (state === ConnectionState.CONNECTED) {
+          const details = await connection.transport?.getDetails();
+          connectionInfo.transportDetails = details;
+        }
+
         this.update.emit();
       });
 
@@ -83,6 +89,13 @@ export class ConnectionLog {
         this.update.emit();
       });
 
+      connection.transportStats?.on((stats) => {
+        connectionInfo.transportBytesSent = stats.bytesSent;
+        connectionInfo.transportBytesReceived = stats.bytesReceived;
+        connectionInfo.transportPacketsSent = stats.packetsSent;
+        connectionInfo.transportPacketsReceived = stats.packetsReceived;
+      });
+
       gcSwarm(info);
 
       // connection.protocol.protocol?.error.on((error) => {

package/src/swarm/connection.ts

@@ -2,24 +2,25 @@
 // Copyright 2021 DXOS.org
 //
 
-import { DeferredTask, Event, sleep, scheduleTask, synchronized } from '@dxos/async';
+import { DeferredTask, Event, sleep, scheduleTask, scheduleTaskInterval, synchronized } from '@dxos/async';
 import { Context, cancelWithContext } from '@dxos/context';
 import { ErrorStream } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
-import { log } from '@dxos/log';
+import { log, logInfo } from '@dxos/log';
 import {
   CancelledError,
   ProtocolError,
   ConnectionResetError,
   ConnectivityError,
+  TimeoutError,
   UnknownProtocolError,
   trace,
 } from '@dxos/protocols';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 import { type SignalMessage, type SignalMessenger } from '../signal';
-import { type Transport, type TransportFactory } from '../transport';
+import { type Transport, type TransportFactory, type TransportStats } from '../transport';
 import { type WireProtocol } from '../wire-protocol';
 
 /**
@@ -33,6 +34,8 @@ const STARTING_SIGNALLING_DELAY = 10;
  */
 const TRANSPORT_CONNECTION_TIMEOUT = 10_000;
 
+const TRANSPORT_STATS_INTERVAL = 5_000;
+
 /**
  * Maximum delay between signal batches.
  */
@@ -109,6 +112,8 @@ export class Connection {
 
   public _instanceId = PublicKey.random().toHex();
 
+  public readonly transportStats = new Event<TransportStats>();
+
   private readonly _signalSendTask = new DeferredTask(this._ctx, async () => {
     await this._flushSignalBuffer();
   });
@@ -135,6 +140,11 @@ export class Connection {
     });
   }
 
+  @logInfo
+  get sessionIdString(): string {
+    return this.sessionId.truncate();
+  }
+
   get state() {
     return this._state;
   }
@@ -164,7 +174,7 @@ export class Connection {
     this._changeState(ConnectionState.CONNECTING);
 
     // TODO(dmaretskyi): Initialize only after the transport has established connection.
-    this._protocol.open().catch((err) => {
+    this._protocol.open(this.sessionId).catch((err) => {
       this.errors.raise(err);
     });
 
@@ -177,8 +187,10 @@ export class Connection {
     scheduleTask(
       this.connectedTimeoutContext,
       async () => {
-        log.info('timeout waiting for transport to connect, aborting');
-        await this.abort().catch((err) => this.errors.raise(err));
+        log.info(`timeout waiting ${TRANSPORT_CONNECTION_TIMEOUT / 1000}s for transport to connect, aborting`);
+        await this.abort(new TimeoutError(`${TRANSPORT_CONNECTION_TIMEOUT / 1000}s for transport to connect`)).catch(
+          (err) => this.errors.raise(err),
+        );
       },
       TRANSPORT_CONNECTION_TIMEOUT,
     );
@@ -188,12 +200,15 @@ export class Connection {
       initiator: this.initiator,
       stream: this._protocol.stream,
       sendSignal: async (signal) => this._sendSignal(signal),
+      sessionId: this.sessionId,
     });
 
     this._transport.connected.once(async () => {
       this._changeState(ConnectionState.CONNECTED);
       await this.connectedTimeoutContext.dispose();
       this._callbacks?.onConnected?.();
+
+      scheduleTaskInterval(this._ctx, async () => this._emitTransportStats(), TRANSPORT_STATS_INTERVAL);
     });
 
     this._transport.closed.once(() => {
@@ -312,6 +327,18 @@ export class Connection {
       } catch (err: any) {
         log.catch(err);
       }
+    } else {
+      log.info(`graceful close requested when we were in ${lastState} state? aborting`);
+      try {
+        await this._protocol.abort();
+      } catch (err: any) {
+        log.catch(err);
+      }
+      try {
+        await this._transport?.destroy();
+      } catch (err: any) {
+        log.catch(err);
+      }
     }
 
     log('closed', { peerId: this.ownId });
@@ -397,4 +424,11 @@ export class Connection {
     this._state = state;
     this.stateChanged.emit(state);
   }
+
+  private async _emitTransportStats() {
+    const stats = await this.transport?.getStats();
+    if (stats) {
+      this.transportStats.emit(stats);
+    }
+  }
 }

package/src/transport/datachannel/rtc-peer-connection.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import node from 'node-datachannel';
+import node, { type SelectedCandidateInfo } from 'node-datachannel';
 import defer, { type DeferredPromise } from 'p-defer';
 
 import { DataChannel } from './rtc-data-channel';
@@ -45,21 +45,17 @@ export class PeerConnection extends EventTarget implements RTCPeerConnection {
     const iceServers = init.iceServers ?? [];
 
     this.#peerConnection = new node.PeerConnection(`peer-${Math.random()}`, {
+      // convert https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/RTCPeerConnection#iceservers to the format expected by https://github.com/murat-dogan/node-datachannel/blob/master/src/peer-connection-wrapper.cpp#L101
       iceServers: iceServers
         .map((server) => {
-          const urls = (Array.isArray(server.urls) ? server.urls : [server.urls]).map((str) => new URL(str));
+          const urls = Array.isArray(server.urls) ? server.urls : [server.urls];
 
           return urls.map((url) => {
-            /** @type {import('../lib/index.js').IceServer} */
-            const iceServer = {
-              hostname: url.hostname,
-              port: parseInt(url.port, 10),
-              username: server.username,
-              password: server.credential,
-              // relayType - how to specify?
-            };
-
-            return iceServer;
+            if (server.username && server.credential) {
+              const [protocol, rest] = url.split(/:(.*)/);
+              return `${protocol}:${server.username}:${server.credential}@${rest}`;
+            }
+            return url;
           });
         })
         .flat(),
@@ -188,6 +184,10 @@ export class PeerConnection extends EventTarget implements RTCPeerConnection {
     this.#peerConnection.addRemoteCandidate(candidate.candidate, candidate.sdpMid ?? '0');
   }
 
+  getSelectedCandidatePair(): { local: SelectedCandidateInfo; remote: SelectedCandidateInfo } | null {
+    return this.#peerConnection.getSelectedCandidatePair();
+  }
+
   addTrack(track: MediaStreamTrack, ...streams: MediaStream[]): RTCRtpSender {
     throw new Error('addTrack Not implemented');
   }
@@ -206,6 +206,14 @@ export class PeerConnection extends EventTarget implements RTCPeerConnection {
     this.#peerConnection.destroy();
   }
 
+  bytesSent(): number {
+    return this.#peerConnection.bytesSent();
+  }
+
+  bytesReceived(): number {
+    return this.#peerConnection.bytesReceived();
+  }
+
   createDataChannel(label: string, dataChannelDict: RTCDataChannelInit = {}): RTCDataChannel {
     const channel = this.#peerConnection.createDataChannel(label, dataChannelDict);
     const dataChannel = new DataChannel(channel, dataChannelDict);

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

@@ -2,10 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-//
-// Copyright 2020 DXOS.org
-//
-
 import { Duplex } from 'stream';
 
 import { sleep, TestStream } from '@dxos/async';

package/src/transport/libdatachannel-transport.ts

@@ -10,7 +10,7 @@ import { log } from '@dxos/log';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
 import { type PeerConnection } from './datachannel/rtc-peer-connection';
-import { type Transport, type TransportFactory } from './transport';
+import { type Transport, type TransportFactory, type TransportStats } from './transport';
 
 export type LibDataChannelTransportParams = {
   initiator: boolean;
@@ -237,6 +237,42 @@ export class LibDataChannelTransport implements Transport {
       });
   }
 
+  async getDetails(): Promise<string> {
+    return this._peer
+      .then(async (peer) => {
+        const cp = await peer.getSelectedCandidatePair();
+        if (!cp) {
+          return 'unavailable';
+        }
+        return `${cp.remote.address}:${cp.remote.port}/${cp.remote.transportType} ${cp.remote.type}`;
+      })
+      .catch((err) => {
+        log.catch(err);
+        return 'unavailable';
+      });
+  }
+
+  async getStats(): Promise<TransportStats> {
+    return this._peer
+      .then((peer) => {
+        return {
+          bytesSent: peer.bytesSent(),
+          bytesReceived: peer.bytesReceived(),
+          packetsSent: 0,
+          packetsReceived: 0,
+        };
+      })
+      .catch((err) => {
+        log.catch(err);
+        return {
+          bytesSent: 0,
+          bytesReceived: 0,
+          packetsSent: 0,
+          packetsReceived: 0,
+        };
+      });
+  }
+
   // TODO(nf): add classmethod to call node-datachannel.cleanup() when all instances have been destroyed?
   async destroy(): Promise<void> {
     await this._close();

package/src/transport/memory-transport.ts

@@ -12,7 +12,7 @@ import { log, logInfo } from '@dxos/log';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { ComplexMap } from '@dxos/util';
 
-import { type Transport, type TransportFactory, type TransportOptions } from './transport';
+import { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from './transport';
 
 // TODO(burdon): Make configurable.
 // Delay (in milliseconds) for data being sent through in-memory connections to simulate network latency.
@@ -166,4 +166,17 @@ export class MemoryTransport implements Transport {
       this._remote.wake(remoteId);
     }
   }
+
+  async getDetails(): Promise<string> {
+    return this._instanceId.toHex();
+  }
+
+  async getStats(): Promise<TransportStats> {
+    return {
+      bytesSent: 0,
+      bytesReceived: 0,
+      packetsSent: 0,
+      packetsReceived: 0,
+    };
+  }
 }

package/src/transport/simplepeer-transport-proxy.ts

@@ -22,7 +22,7 @@ import { ConnectionState, type BridgeEvent, type BridgeService } from '@dxos/pro
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { arrayToBuffer } from '@dxos/util';
 
-import { type Transport, type TransportFactory, type TransportOptions } from './transport';
+import { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from './transport';
 
 const RESP_MIN_THRESHOLD = 500;
 const TIMEOUT_THRESHOLD = 10;
@@ -145,6 +145,14 @@ export class SimplePeerTransportProxy implements Transport {
       .catch((err) => this.errors.raise(decodeError(err)));
   }
 
+  async getDetails(): Promise<string> {
+    return (await this._params.bridgeService.getDetails({ proxyId: this._proxyId })).details;
+  }
+
+  async getStats(): Promise<TransportStats> {
+    return (await this._params.bridgeService.getStats({ proxyId: this._proxyId })).stats as TransportStats;
+  }
+
   // TODO(burdon): Move open from constructor.
   async destroy(): Promise<void> {
     await this._ctx.dispose();

package/src/transport/simplepeer-transport-service.ts

@@ -16,6 +16,10 @@ import {
   type BridgeEvent,
   ConnectionState,
   type CloseRequest,
+  type DetailsRequest,
+  type DetailsResponse,
+  type StatsRequest,
+  type StatsResponse,
 } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { ComplexMap } from '@dxos/util';
 
@@ -113,6 +117,16 @@ export class SimplePeerTransportService implements BridgeService {
     await this.transports.get(proxyId)!.transport.signal(signal);
   }
 
+  async getDetails({ proxyId }: DetailsRequest): Promise<DetailsResponse> {
+    invariant(this.transports.has(proxyId));
+    return { details: await this.transports.get(proxyId)!.transport.getDetails() };
+  }
+
+  async getStats({ proxyId }: StatsRequest): Promise<StatsResponse> {
+    invariant(this.transports.has(proxyId));
+    return { stats: await this.transports.get(proxyId)!.transport.getStats() };
+  }
+
   async sendData({ proxyId, payload }: DataRequest): Promise<void> {
     if (this.transports.get(proxyId)?.state !== 'OPEN') {
       log.debug('transport is closed');

package/src/transport/simplepeer-transport.ts

@@ -13,7 +13,7 @@ import { log } from '@dxos/log';
 import { ConnectionResetError, ConnectivityError, ProtocolError, UnknownProtocolError, trace } from '@dxos/protocols';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
-import { type Transport, type TransportFactory } from './transport';
+import { type Transport, type TransportFactory, type TransportStats } from './transport';
 import { wrtc } from './webrtc';
 
 export type SimplePeerTransportParams = {
@@ -37,6 +37,9 @@ export class SimplePeerTransport implements Transport {
 
   private readonly _instanceId = PublicKey.random().toHex();
 
+  /**
+   * @params opts.config formatted as per https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/RTCPeerConnection
+   */
   constructor(private readonly params: SimplePeerTransportParams) {
     log.trace('dxos.mesh.webrtc-transport.constructor', trace.begin({ id: this._instanceId }));
     log('created connection', params);
@@ -71,6 +74,7 @@ export class SimplePeerTransport implements Transport {
         if (err.errorDetail === 'sctp-failure') {
           this.errors.raise(new ConnectionResetError('sctp-failure from RTCError', err));
         } else {
+          log.info('unknown RTCError', { err });
           this.errors.raise(new UnknownProtocolError('unknown RTCError', err));
         }
         // catch more generic simple-peer errors: https://github.com/feross/simple-peer/blob/master/README.md#error-codes
@@ -80,10 +84,12 @@ export class SimplePeerTransport implements Transport {
           case 'ERR_WEBRTC_SUPPORT':
             this.errors.raise(new ProtocolError('WebRTC not supported', err));
             break;
+          case 'ERR_SIGNALING':
+            this.errors.raise(new ConnectivityError('signaling failure', err));
+            break;
           case 'ERR_ICE_CONNECTION_FAILURE':
           case 'ERR_DATA_CHANNEL':
           case 'ERR_CONNECTION_FAILURE':
-          case 'ERR_SIGNALING':
             this.errors.raise(new ConnectivityError('unknown communication failure', err));
             break;
           // errors due to library issues or improper API usage
@@ -109,7 +115,7 @@ export class SimplePeerTransport implements Transport {
           (this._peer as any)._pc.getStats().then((stats: any) => {
             log.info('report after webrtc error', {
               config: this.params.webrtcConfig,
-              stats,
+              stats: Object.fromEntries((stats as any).entries()),
             });
           });
         }
@@ -119,9 +125,69 @@ export class SimplePeerTransport implements Transport {
 
       await this.destroy();
     });
+
     log.trace('dxos.mesh.webrtc-transport.constructor', trace.end({ id: this._instanceId }));
   }
 
+  async getStats(): Promise<TransportStats> {
+    const stats = await this._getStats();
+    if (!stats) {
+      return {
+        bytesSent: 0,
+        bytesReceived: 0,
+        packetsSent: 0,
+        packetsReceived: 0,
+        rawStats: {},
+      };
+    }
+
+    // TODO(nf): transport or candidatePair?
+    return {
+      bytesSent: stats.transport.bytesSent,
+      bytesReceived: stats.transport.bytesReceived,
+      packetsSent: stats.transport.messagesSent,
+      packetsReceived: stats.transport.messagesReceived,
+      rawStats: stats.raw,
+    };
+  }
+
+  async _getStats(): Promise<any> {
+    if (typeof (this._peer as any)?._pc?.getStats !== 'function') {
+      return null;
+    }
+    return await (this._peer as any)._pc.getStats().then((stats: any) => {
+      const statsEntries = Array.from(stats.entries() as any[]);
+      const transport = statsEntries.filter((s: any) => s[1].type === 'transport')[0][1];
+      const candidatePair = statsEntries.filter((s: any) => s[0] === transport.selectedCandidatePairId);
+      let selectedCandidatePair: any;
+      let remoteCandidate: any;
+      if (candidatePair.length > 0) {
+        selectedCandidatePair = candidatePair[0][1];
+        remoteCandidate = statsEntries.filter((s: any) => s[0] === selectedCandidatePair.remoteCandidateId)[0][1];
+      }
+      return {
+        datachannel: statsEntries.filter((s: any) => s[1].type === 'data-channel')[0][1],
+        transport,
+        selectedCandidatePair,
+        remoteCandidate,
+        raw: Object.fromEntries(stats.entries()),
+      };
+    });
+  }
+
+  async getDetails(): Promise<string> {
+    const stats = await this._getStats();
+    const rc = stats?.remoteCandidate;
+    if (!rc) {
+      return 'unavailable';
+    }
+
+    if (rc.relay) {
+      return `${rc.ip}:${rc.port}/${rc.protocol} relay for XXX ${rc.candidateType}`;
+    }
+    return `${rc.ip}:${rc.port}/${rc.protocol} ${rc.candidateType}`;
+  }
+
   async destroy() {
     log('closing...');
     if (this._closed) {
@@ -130,6 +196,7 @@ export class SimplePeerTransport implements Transport {
     this._closed = true;
     this._disconnectStreams();
     this._peer!.destroy();
+    this._closed = true;
     this.closed.emit();
     log('closed');
   }