@dxos/network-manager 0.3.9-main.b7e6a67 → 0.3.9-main.c7cd0ec

package/dist/types/src/transport/simplepeer-transport-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simplepeer-transport-service.d.ts","sourceRoot":"","sources":["../../../../src/transport/simplepeer-transport-service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAI9C,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,WAAW,EAEhB,KAAK,YAAY,EAClB,MAAM,wCAAwC,CAAC;AAYhD,qBAAa,0BAA2B,YAAW,aAAa;IAGlD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAF3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6D;gBAE3D,aAAa,CAAC,KAAK;IAEhD,IAAI,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC;IA2E/C,UAAU,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7D,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAc1D,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,YAAY;CAQtC"}
+{"version":3,"file":"simplepeer-transport-service.d.ts","sourceRoot":"","sources":["../../../../src/transport/simplepeer-transport-service.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAI9C,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,WAAW,EAEhB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,YAAY,EACjB,KAAK,aAAa,EACnB,MAAM,wCAAwC,CAAC;AAYhD,qBAAa,0BAA2B,YAAW,aAAa;IAGlD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAF3C,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA6D;gBAE3D,aAAa,CAAC,KAAK;IAEhD,IAAI,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC;IA2E/C,UAAU,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7D,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAKjE,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAK3D,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAc1D,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,YAAY;CAQtC"}

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

@@ -2,7 +2,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 } from './transport';
+import { type Transport, type TransportFactory, type TransportStats } from './transport';
 export type SimplePeerTransportParams = {
     initiator: boolean;
     stream: NodeJS.ReadWriteStream;
@@ -21,7 +21,13 @@ export declare class SimplePeerTransport implements Transport {
     readonly connected: Event<void>;
     readonly errors: ErrorStream;
     private readonly _instanceId;
+    /**
+     * @params opts.config formatted as per https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/RTCPeerConnection
+     */
     constructor(params: SimplePeerTransportParams);
+    getStats(): Promise<TransportStats>;
+    _getStats(): Promise<any>;
+    getDetails(): Promise<string>;
     destroy(): Promise<void>;
     signal(signal: Signal): void;
     private _disconnectStreams;

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

@@ -1 +1 @@
-{"version":3,"file":"simplepeer-transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/simplepeer-transport.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAS,MAAM,aAAa,CAAC;AAIjD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpE,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAoB,YAAW,SAAS;IAWvC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAVnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAS;IAEvB,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;gBAE7B,MAAM,EAAE,yBAAyB;IAqFxD,OAAO;IAYb,MAAM,CAAC,MAAM,EAAE,MAAM;IASrB,OAAO,CAAC,kBAAkB;CAM3B;AAED,eAAO,MAAM,gCAAgC,kBAAmB,GAAG,KAAG,gBAMpE,CAAC"}
+{"version":3,"file":"simplepeer-transport.d.ts","sourceRoot":"","sources":["../../../../src/transport/simplepeer-transport.ts"],"names":[],"mappings":";AAQA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAS,MAAM,aAAa,CAAC;AAIjD,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAGzF,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,qBAAa,mBAAoB,YAAW,SAAS;IAcvC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAbnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IACnC,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,MAAM,CAAS;IAEvB,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAA8B;IAE1D;;OAEG;gBAC0B,MAAM,EAAE,yBAAyB;IAyFxD,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;IAsBnC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC;IAwBzB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAa7B,OAAO;IAYb,MAAM,CAAC,MAAM,EAAE,MAAM;IASrB,OAAO,CAAC,kBAAkB;CAM3B;AAED,eAAO,MAAM,gCAAgC,kBAAmB,GAAG,KAAG,gBAMpE,CAAC"}

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.b7e6a67",
+  "version": "0.3.9-main.c7cd0ec",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -24,28 +24,28 @@
     "@koush/wrtc": "^0.5.3",
     "isomorphic-ws": "^4.0.1",
     "nanomessage-rpc": "^3.0.0",
-    "node-datachannel": "^0.4.3",
+    "node-datachannel": "^0.5.2",
     "p-defer": "^3.0.0",
     "simple-peer": "9.11.1",
     "stream": "^0.0.2",
     "tiny-invariant": "^1.3.1",
     "ws": "^8.14.2",
     "xor-distance": "^2.0.0",
-    "@dxos/async": "0.3.9-main.b7e6a67",
-    "@dxos/codec-protobuf": "0.3.9-main.b7e6a67",
-    "@dxos/context": "0.3.9-main.b7e6a67",
-    "@dxos/credentials": "0.3.9-main.b7e6a67",
-    "@dxos/crypto": "0.3.9-main.b7e6a67",
-    "@dxos/debug": "0.3.9-main.b7e6a67",
-    "@dxos/invariant": "0.3.9-main.b7e6a67",
-    "@dxos/keys": "0.3.9-main.b7e6a67",
-    "@dxos/log": "0.3.9-main.b7e6a67",
-    "@dxos/messaging": "0.3.9-main.b7e6a67",
-    "@dxos/node-std": "0.3.9-main.b7e6a67",
-    "@dxos/protocols": "0.3.9-main.b7e6a67",
-    "@dxos/rpc": "0.3.9-main.b7e6a67",
-    "@dxos/teleport": "0.3.9-main.b7e6a67",
-    "@dxos/util": "0.3.9-main.b7e6a67"
+    "@dxos/async": "0.3.9-main.c7cd0ec",
+    "@dxos/context": "0.3.9-main.c7cd0ec",
+    "@dxos/codec-protobuf": "0.3.9-main.c7cd0ec",
+    "@dxos/credentials": "0.3.9-main.c7cd0ec",
+    "@dxos/crypto": "0.3.9-main.c7cd0ec",
+    "@dxos/debug": "0.3.9-main.c7cd0ec",
+    "@dxos/invariant": "0.3.9-main.c7cd0ec",
+    "@dxos/keys": "0.3.9-main.c7cd0ec",
+    "@dxos/log": "0.3.9-main.c7cd0ec",
+    "@dxos/messaging": "0.3.9-main.c7cd0ec",
+    "@dxos/node-std": "0.3.9-main.c7cd0ec",
+    "@dxos/protocols": "0.3.9-main.c7cd0ec",
+    "@dxos/rpc": "0.3.9-main.c7cd0ec",
+    "@dxos/teleport": "0.3.9-main.c7cd0ec",
+    "@dxos/util": "0.3.9-main.c7cd0ec"
   },
   "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.b7e6a67"
+    "@dxos/signal": "0.3.9-main.c7cd0ec"
   },
   "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/topology/mmst-topology.ts

@@ -10,6 +10,9 @@ import { log } from '@dxos/log';
 
 import { type SwarmController, type Topology } from './topology';
 
+const MIN_UPDATE_INTERVAL = 1000 * 10;
+const MAX_CHANGES_PER_UPDATE = 1;
+
 export interface MMSTTopologyOptions {
   /**
    * Number of connections the peer will originate by itself.
@@ -36,6 +39,8 @@ export class MMSTTopology implements Topology {
 
   private _sampleCollected = false;
 
+  private _lastAction = new Date(0);
+
   constructor({ originateConnections = 2, maxPeers = 4, sampleSize = 10 }: MMSTTopologyOptions = {}) {
     this._originateConnections = originateConnections;
     this._maxPeers = maxPeers;
@@ -74,22 +79,45 @@ export class MMSTTopology implements Topology {
     invariant(this._controller, 'Not initialized');
     const { connected, candidates, ownPeerId } = this._controller.getState();
 
+    // TODO(nf): does this rate limiting/flap dampening logic belong here or in the SwarmController?
     if (connected.length > this._maxPeers) {
       // Disconnect extra peers.
+      log(`disconnect ${connected.length - this._maxPeers} peers.`);
       const sorted = sortByXorDistance(connected, ownPeerId)
         .reverse()
         .slice(0, this._maxPeers - connected.length);
-      for (const peer of sorted) {
-        log(`Disconnect ${peer}.`);
-        this._controller.disconnect(peer);
+      invariant(sorted.length === 0);
+
+      if (sorted.length > MAX_CHANGES_PER_UPDATE) {
+        log(`want to disconnect ${sorted.length} peers but limited to ${MAX_CHANGES_PER_UPDATE}`);
+      }
+
+      if (Date.now() - this._lastAction.getTime() > MIN_UPDATE_INTERVAL) {
+        for (const peer of sorted.slice(0, MAX_CHANGES_PER_UPDATE)) {
+          log(`Disconnect ${peer}.`);
+          this._controller.disconnect(peer);
+        }
+        this._lastAction = new Date();
+      } else {
+        log('rate limited discconnect');
       }
     } else if (connected.length < this._originateConnections) {
       // Connect new peers to reach desired quota.
+      log(`connect ${this._originateConnections - connected.length} peers.`);
       const sample = candidates.sort(() => Math.random() - 0.5).slice(0, this._sampleSize);
       const sorted = sortByXorDistance(sample, ownPeerId).slice(0, this._originateConnections - connected.length);
-      for (const peer of sorted) {
-        log(`Connect ${peer}.`);
-        this._controller.connect(peer);
+
+      if (sorted.length > MAX_CHANGES_PER_UPDATE) {
+        log(`want to connect ${sorted.length} peers but limited to ${MAX_CHANGES_PER_UPDATE}`);
+      }
+      if (Date.now() - this._lastAction.getTime() > MIN_UPDATE_INTERVAL) {
+        for (const peer of sorted.slice(0, MAX_CHANGES_PER_UPDATE)) {
+          log(`Connect ${peer}.`);
+          this._controller.connect(peer);
+        }
+        this._lastAction = new Date();
+      } else {
+        log('rate limited connect');
       }
     }
   }

package/src/transport/index.ts

@@ -7,6 +7,5 @@ export * from './transport';
 export * from './simplepeer-transport';
 export * from './simplepeer-transport-service';
 export * from './simplepeer-transport-proxy';
-export * from './datachannel';
 export * from './libdatachannel-transport';
 export * from './tcp-transport';

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

@@ -9,8 +9,7 @@ import { ErrorStream } from '@dxos/debug';
 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;
@@ -34,7 +33,7 @@ export class LibDataChannelTransport implements Transport {
   private _connected = false;
   readonly connected = new Event();
   readonly errors = new ErrorStream();
-  private readonly _peer: Promise<PeerConnection>;
+  private readonly _peer: Promise<RTCPeerConnection>;
   private _channel!: RTCDataChannel;
   private _stream!: Duplex;
 
@@ -43,11 +42,20 @@ export class LibDataChannelTransport implements Transport {
 
   constructor(private readonly params: LibDataChannelTransportParams) {
     this._peer = (async () => {
-      const { RTCPeerConnection: PeerConnection } = await import('./datachannel');
+      /* eslint-disable @typescript-eslint/consistent-type-imports */
+      const { RTCPeerConnection } = (await importESM('node-datachannel/polyfill'))
+        .default as typeof import('node-datachannel/polyfill');
+      /* eslint-enable @typescript-eslint/consistent-type-imports */
       if (this._closed) {
         this.errors.raise(new Error('connection already closed'));
       }
-      const peer = new PeerConnection(params.webrtcConfig);
+      // workaround https://github.com/murat-dogan/node-datachannel/pull/207
+      if (params.webrtcConfig) {
+        params.webrtcConfig.iceServers = params.webrtcConfig.iceServers ?? [];
+      } else {
+        params.webrtcConfig = { iceServers: [] };
+      }
+      const peer = new RTCPeerConnection(params.webrtcConfig);
 
       peer.onicecandidateerror = (event) => {
         log.error('peer.onicecandidateerror', { event });
@@ -84,10 +92,14 @@ export class LibDataChannelTransport implements Transport {
           }
         }
       };
+
       if (params.initiator) {
         peer
           .createOffer()
           .then(async (offer) => {
+            if (this._closed) {
+              return;
+            }
             if (peer.connectionState !== 'connecting') {
               log.error('i am initiator but peer not in state connecting', { peer });
               this.errors.raise(new Error('invalid state: peer is initiator, but other peer not in state connecting'));
@@ -126,14 +138,18 @@ export class LibDataChannelTransport implements Transport {
       log.debug('dataChannel.onopen');
       const duplex = new Duplex({
         read: () => {},
-        write: (chunk, encoding, callback) => {
+        write: async (chunk, encoding, callback) => {
           // todo wait to open
 
           if (chunk.length > MAX_MESSAGE_SIZE) {
             this.errors.raise(new Error(`message too large: ${chunk.length} > ${MAX_MESSAGE_SIZE}`));
           }
-          dataChannel.send(chunk);
-
+          try {
+            dataChannel.send(chunk);
+          } catch (err: any) {
+            this.errors.raise(err);
+            await this._close();
+          }
           if (this._channel.bufferedAmount > MAX_BUFFERED_AMOUNT) {
             if (this._writeCallback !== null) {
               log.error("consumer trying to write before we're ready for more data");
@@ -180,6 +196,12 @@ export class LibDataChannelTransport implements Transport {
       return;
     }
     await this._disconnectStreams();
+    const peer = await this._peer;
+    try {
+      peer.close();
+    } catch (err: any) {
+      this.errors.raise(err);
+    }
     this._closed = true;
     this.closed.emit();
   }
@@ -233,6 +255,63 @@ export class LibDataChannelTransport implements Transport {
       });
   }
 
+  async getDetails(): Promise<string> {
+    const stats = await this._getStats();
+    const rc = stats?.remoteCandidate;
+    if (!rc) {
+      return 'unavailable';
+    }
+
+    if (rc.candidateType === 'relay') {
+      return `${rc.ip}:${rc.port} relay for ${rc.relatedAddress}:${rc.relatedPort}`;
+    }
+    return `${rc.ip}:${rc.port} ${rc.candidateType}`;
+  }
+
+  async _getStats(): Promise<any> {
+    return this._peer.then(async (peer) => {
+      const stats = await peer.getStats();
+
+      const statsEntries = Array.from((stats as any).entries() as any[]);
+      const transport = statsEntries.filter((s) => 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 {
+        transport,
+        selectedCandidatePair,
+        remoteCandidate,
+        raw: Object.fromEntries(stats as any),
+      };
+    });
+  }
+
+  async getStats(): Promise<TransportStats> {
+    const stats = await this._getStats();
+    if (!stats) {
+      return {
+        bytesSent: 0,
+        bytesReceived: 0,
+        packetsSent: 0,
+        packetsReceived: 0,
+        rawStats: {},
+      };
+    }
+
+    return {
+      bytesSent: stats.transport.bytesSent,
+      bytesReceived: stats.transport.bytesReceived,
+      packetsSent: 0,
+      packetsReceived: 0,
+      rawStats: stats.raw,
+    };
+  }
+
   // TODO(nf): add classmethod to call node-datachannel.cleanup() when all instances have been destroyed?
   async destroy(): Promise<void> {
     await this._close();
@@ -250,3 +329,6 @@ export const createLibDataChannelTransportFactory = (webrtcConfig?: any): Transp
       webrtcConfig,
     }),
 });
+
+// eslint-disable-next-line no-new-func
+const importESM = Function('path', 'return import(path)');

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,
+    };
+  }
 }