@dxos/network-manager 0.6.13 → 0.6.14-main.1366248

package/dist/types/src/transport/webrtc/rtc-transport-channel.d.ts

@@ -0,0 +1,33 @@
+import { Event as AsyncEvent } from '@dxos/async';
+import { Resource } from '@dxos/context';
+import { ErrorStream } from '@dxos/debug';
+import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
+import { type RtcPeerConnection } from './rtc-peer-connection';
+import { type Transport, type TransportOptions, type TransportStats } from '../transport';
+/**
+ * A WebRTC connection data channel.
+ * Manages a WebRTC connection to a remote peer using an abstract signalling mechanism.
+ */
+export declare class RtcTransportChannel extends Resource implements Transport {
+    private readonly _connection;
+    private readonly _options;
+    readonly closed: AsyncEvent<void>;
+    readonly connected: AsyncEvent<void>;
+    readonly errors: ErrorStream;
+    private _channel;
+    private _stream;
+    private _streamDataFlushedCallback;
+    private _isChannelCreationInProgress;
+    constructor(_connection: RtcPeerConnection, _options: TransportOptions);
+    get isRtcChannelCreationInProgress(): boolean;
+    onConnectionError(error: Error): void;
+    protected _open(): Promise<void>;
+    protected _close(): Promise<void>;
+    private _initChannel;
+    private _handleChannelWrite;
+    private _safeCloseChannel;
+    onSignal(signal: Signal): Promise<void>;
+    getDetails(): Promise<string>;
+    getStats(): Promise<TransportStats>;
+}
+//# sourceMappingURL=rtc-transport-channel.d.ts.map

package/dist/types/src/transport/webrtc/rtc-transport-channel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rtc-transport-channel.d.ts","sourceRoot":"","sources":["../../../../../src/transport/webrtc/rtc-transport-channel.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,IAAI,UAAU,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI1C,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAO1F;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,QAAS,YAAW,SAAS;IAWlE,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAX3B,SAAgB,MAAM,mBAAoB;IAC1C,SAAgB,SAAS,mBAAoB;IAC7C,SAAgB,MAAM,cAAqB;IAE3C,OAAO,CAAC,QAAQ,CAA6B;IAC7C,OAAO,CAAC,OAAO,CAAqB;IACpC,OAAO,CAAC,0BAA0B,CAA6C;IAC/E,OAAO,CAAC,4BAA4B,CAAS;gBAG1B,WAAW,EAAE,iBAAiB,EAC9B,QAAQ,EAAE,gBAAgB;IAK7C,IAAW,8BAA8B,YAExC;IAEM,iBAAiB,CAAC,KAAK,EAAE,KAAK;cAMZ,KAAK;cAuBL,MAAM;IAW/B,OAAO,CAAC,YAAY;YAsDN,mBAAmB;IA+BjC,OAAO,CAAC,iBAAiB;IAQlB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAI7B,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;CAG1C"}

package/dist/types/src/transport/webrtc/rtc-transport-channel.test.d.ts

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

package/dist/types/src/transport/webrtc/rtc-transport-channel.test.d.ts.map

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

package/dist/types/src/transport/webrtc/rtc-transport-factory.d.ts

@@ -0,0 +1,4 @@
+import type { IceProvider } from '../../signal';
+import type { TransportFactory } from '../transport';
+export declare const createRtcTransportFactory: (webrtcConfig?: RTCConfiguration, iceProvider?: IceProvider) => TransportFactory;
+//# sourceMappingURL=rtc-transport-factory.d.ts.map

package/dist/types/src/transport/webrtc/rtc-transport-factory.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rtc-transport-factory.d.ts","sourceRoot":"","sources":["../../../../../src/transport/webrtc/rtc-transport-factory.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,eAAO,MAAM,yBAAyB,kBACrB,gBAAgB,gBACjB,WAAW,KACxB,gBAeF,CAAC"}

package/dist/types/src/transport/{simplepeer-transport-proxy.d.ts → webrtc/rtc-transport-proxy.d.ts}

@@ -1,37 +1,35 @@
 import { Event } from '@dxos/async';
+import { Resource } from '@dxos/context';
 import { ErrorStream } from '@dxos/debug';
 import { type BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
-import { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from './transport';
-export type SimplePeerTransportProxyOptions = TransportOptions & {
+import { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from '../transport';
+export type RtcTransportProxyOptions = TransportOptions & {
     bridgeService: BridgeService;
 };
-export declare class SimplePeerTransportProxy implements Transport {
+export declare class RtcTransportProxy extends Resource implements Transport {
     private readonly _options;
     private readonly _proxyId;
-    private readonly _ctx;
-    private _timeoutCount;
     readonly closed: Event<void>;
     readonly connected: Event<void>;
     readonly errors: ErrorStream;
-    private _closed;
     private _serviceStream;
-    constructor(_options: SimplePeerTransportProxyOptions);
-    get isOpen(): boolean;
-    open(): Promise<void>;
-    close(): Promise<void>;
+    constructor(_options: RtcTransportProxyOptions);
+    protected _open(): Promise<void>;
+    protected _close(): Promise<void>;
     onSignal(signal: Signal): Promise<void>;
     private _handleConnection;
     private _handleData;
     private _handleSignal;
     getDetails(): Promise<string>;
     getStats(): Promise<TransportStats>;
+    private _raiseIfOpen;
     /**
      * Called when underlying proxy service becomes unavailable.
      */
     forceClose(): void;
 }
-export declare class SimplePeerTransportProxyFactory implements TransportFactory {
+export declare class RtcTransportProxyFactory implements TransportFactory {
     private _bridgeService;
     private _connections;
     /**
@@ -41,4 +39,4 @@ export declare class SimplePeerTransportProxyFactory implements TransportFactory
     setBridgeService(bridgeService: BridgeService | undefined): this;
     createTransport(options: TransportOptions): Transport;
 }
-//# sourceMappingURL=simplepeer-transport-proxy.d.ts.map
+//# sourceMappingURL=rtc-transport-proxy.d.ts.map

package/dist/types/src/transport/webrtc/rtc-transport-proxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rtc-transport-proxy.d.ts","sourceRoot":"","sources":["../../../../../src/transport/webrtc/rtc-transport-proxy.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAElD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAK1C,OAAO,EAAoB,KAAK,aAAa,EAAmB,MAAM,wCAAwC,CAAC;AAC/G,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAGpE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,gBAAgB,EAAE,KAAK,gBAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAMjH,MAAM,MAAM,wBAAwB,GAAG,gBAAgB,GAAG;IACxD,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,QAAS,YAAW,SAAS;IAStD,OAAO,CAAC,QAAQ,CAAC,QAAQ;IARrC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAE/C,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,cAAc,CAAkC;gBAE3B,QAAQ,EAAE,wBAAwB;cAItC,KAAK;cAiFL,MAAM;IAiBzB,QAAQ,CAAC,MAAM,EAAE,MAAM;YAMf,iBAAiB;IAkB/B,OAAO,CAAC,WAAW;YASL,aAAa;IAWrB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC;IAY7B,QAAQ,IAAI,OAAO,CAAC,cAAc,CAAC;IAezC,OAAO,CAAC,YAAY;IAQpB;;OAEG;IACH,UAAU;CAIX;AAED,qBAAa,wBAAyB,YAAW,gBAAgB;IAC/D,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,YAAY,CAAgC;IAEpD;;;OAGG;IACH,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IAQhE,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS;CAOtD"}

package/dist/types/src/transport/webrtc/rtc-transport-proxy.test.d.ts

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

package/dist/types/src/transport/webrtc/rtc-transport-proxy.test.d.ts.map

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

package/dist/types/src/transport/{simplepeer-transport-service.d.ts → webrtc/rtc-transport-service.d.ts}

@@ -1,16 +1,18 @@
 import { Stream } from '@dxos/codec-protobuf';
 import { type BridgeService, type ConnectionRequest, type SignalRequest, type DataRequest, type BridgeEvent, type CloseRequest, type DetailsRequest, type DetailsResponse, type StatsRequest, type StatsResponse } from '@dxos/protocols/proto/dxos/mesh/bridge';
-import { type IceProvider } from '../signal';
-export declare class SimplePeerTransportService implements BridgeService {
-    private readonly _webrtcConfig?;
-    private readonly _iceProvider?;
-    private readonly transports;
-    constructor(_webrtcConfig?: RTCConfiguration | undefined, _iceProvider?: IceProvider | undefined);
+import { type IceProvider } from '../../signal';
+import { type TransportFactory } from '../transport';
+export declare class RtcTransportService implements BridgeService {
+    private readonly _transportFactory;
+    private readonly _openTransports;
+    constructor(webrtcConfig?: RTCConfiguration, iceProvider?: IceProvider, _transportFactory?: TransportFactory);
+    hasOpenTransports(): boolean;
     open(request: ConnectionRequest): Stream<BridgeEvent>;
     sendSignal({ proxyId, signal }: SignalRequest): Promise<void>;
     getDetails({ proxyId }: DetailsRequest): Promise<DetailsResponse>;
     getStats({ proxyId }: StatsRequest): Promise<StatsResponse>;
     sendData({ proxyId, payload }: DataRequest): Promise<void>;
     close({ proxyId }: CloseRequest): Promise<void>;
+    private _safeCloseTransport;
 }
-//# sourceMappingURL=simplepeer-transport-service.d.ts.map
+//# sourceMappingURL=rtc-transport-service.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"rtc-transport-service.d.ts","sourceRoot":"","sources":["../../../../../src/transport/webrtc/rtc-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;AAIhD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAkB,KAAK,gBAAgB,EAAE,MAAM,cAAc,CAAC;AASrE,qBAAa,mBAAoB,YAAW,aAAa;IAMrD,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IALpC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAA6D;gBAG3F,YAAY,CAAC,EAAE,gBAAgB,EAC/B,WAAW,CAAC,EAAE,WAAW,EACR,iBAAiB,GAAE,gBAAuE;IAGtG,iBAAiB;IAIxB,IAAI,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC;IAqE/C,UAAU,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7D,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC;IAOjE,QAAQ,CAAC,EAAE,OAAO,EAAE,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAO3D,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAY1D,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,YAAY;YAUvB,mBAAmB;CAmBlC"}

package/dist/types/src/transport/webrtc/rtc-transport-stats.d.ts

@@ -0,0 +1,4 @@
+import type { TransportStats } from '../transport';
+export declare const describeSelectedRemoteCandidate: (connection?: RTCPeerConnection) => Promise<string>;
+export declare const createRtcTransportStats: (connection: RTCPeerConnection | undefined, topic: string) => Promise<TransportStats>;
+//# sourceMappingURL=rtc-transport-stats.d.ts.map

package/dist/types/src/transport/webrtc/rtc-transport-stats.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rtc-transport-stats.d.ts","sourceRoot":"","sources":["../../../../../src/transport/webrtc/rtc-transport-stats.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnD,eAAO,MAAM,+BAA+B,gBAAuB,iBAAiB,KAAG,OAAO,CAAC,MAAM,CAYpG,CAAC;AAEF,eAAO,MAAM,uBAAuB,eACtB,iBAAiB,GAAG,SAAS,SAClC,MAAM,KACZ,OAAO,CAAC,cAAc,CAmBxB,CAAC"}

package/dist/types/src/transport/webrtc/rtc-transport.test.d.ts

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

package/dist/types/src/transport/webrtc/rtc-transport.test.d.ts.map

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

package/dist/types/src/transport/webrtc/test-utils.d.ts

@@ -0,0 +1,5 @@
+import { type Transport } from '../transport';
+export declare const handleChannelErrors: (channel: Transport) => {
+    expectErrorRaised: () => Promise<void>;
+};
+//# sourceMappingURL=test-utils.d.ts.map

package/dist/types/src/transport/webrtc/test-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-utils.d.ts","sourceRoot":"","sources":["../../../../../src/transport/webrtc/test-utils.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,eAAO,MAAM,mBAAmB,YAAa,SAAS;;CAWrD,CAAC"}

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

@@ -0,0 +1,3 @@
+export declare const chooseInitiatorPeer: (peer1Key: string, peer2Key: string) => string;
+export declare const areSdpEqual: (sdp1: string, sdp2: string) => boolean;
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/transport/webrtc/utils.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB,aAAc,MAAM,YAAY,MAAM,WAAgD,CAAC;AAEvH,eAAO,MAAM,WAAW,SAAU,MAAM,QAAQ,MAAM,YAOrD,CAAC"}

package/package.json

@@ -1,36 +1,59 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.6.13",
+  "version": "0.6.14-main.1366248",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
+  "sideEffects": true,
+  "imports": {
+    "#node-datachannel": {
+      "browser": "./module-stub.js",
+      "workerd": "./module-stub.js",
+      "default": "node-datachannel"
+    },
+    "#node-datachannel/*": {
+      "browser": "./module-stub.js",
+      "workerd": "./module-stub.js",
+      "default": "node-datachannel/*"
+    },
+    "#tcp-transport": {
+      "browser": "./dist/lib/browser/transport/tcp/index.mjs",
+      "node": "./dist/lib/node/transport/tcp/index.cjs",
+      "import": "./dist/lib/browser/transport/tcp/index.mjs",
+      "require": "./dist/lib/node/transport/tcp/index.cjs",
+      "types": "./dist/types/src/transport/tcp/index.d.ts"
+    }
+  },
   "exports": {
     ".": {
+      "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": {
-        "default": "./dist/lib/node/index.cjs"
-      },
-      "types": "./dist/types/src/index.d.ts"
+      "node": "./dist/lib/node-esm/index.mjs"
     },
     "./testing": {
+      "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": {
-        "default": "./dist/lib/node/testing/index.cjs"
-      },
-      "types": "./dist/types/src/testing/index.d.ts"
+      "node": "./dist/lib/node-esm/testing/index.mjs"
+    },
+    "./transport/tcp": {
+      "types": "./dist/types/src/transport/tcp/index.d.ts",
+      "browser": "./dist/lib/browser/transport/tcp/index.mjs",
+      "node": "./dist/lib/node-esm/transport/tcp/index.mjs"
     }
   },
   "browser": {
-    "./src/transport/tcp-transport.ts": "./src/transport/tcp-transport.browser.ts",
-    "./src/transport/datachannel/index.ts": "./src/transport/datachannel/index.browser.ts"
+    "./src/transport/tcp/tcp-transport.ts": "./src/transport/tcp/tcp-transport.browser.ts"
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
       "testing": [
         "dist/types/src/testing/index.d.ts"
+      ],
+      "transport/tcp": [
+        "dist/types/src/transport/tcp/index.d.ts"
       ]
     }
   },
@@ -41,43 +64,37 @@
     "src"
   ],
   "dependencies": {
-    "@koush/wrtc": "^0.5.3",
     "isomorphic-ws": "^5.0.0",
     "nanomessage-rpc": "^3.0.0",
-    "node-datachannel": "^0.5.5",
+    "node-datachannel": "^0.9.2",
     "p-defer": "^3.0.0",
-    "simple-peer": "9.11.1",
-    "stream": "^0.0.2",
+    "stream": "^0.0.3",
     "tiny-invariant": "^1.3.1",
     "ws": "^8.14.2",
     "xor-distance": "^2.0.0",
-    "@dxos/codec-protobuf": "0.6.13",
-    "@dxos/async": "0.6.13",
-    "@dxos/config": "0.6.13",
-    "@dxos/context": "0.6.13",
-    "@dxos/crypto": "0.6.13",
-    "@dxos/credentials": "0.6.13",
-    "@dxos/debug": "0.6.13",
-    "@dxos/edge-client": "0.6.13",
-    "@dxos/keys": "0.6.13",
-    "@dxos/invariant": "0.6.13",
-    "@dxos/log": "0.6.13",
-    "@dxos/messaging": "0.6.13",
-    "@dxos/node-std": "0.6.13",
-    "@dxos/rpc": "0.6.13",
-    "@dxos/util": "0.6.13",
-    "@dxos/protocols": "0.6.13",
-    "@dxos/teleport": "0.6.13"
+    "@dxos/async": "0.6.14-main.1366248",
+    "@dxos/codec-protobuf": "0.6.14-main.1366248",
+    "@dxos/context": "0.6.14-main.1366248",
+    "@dxos/debug": "0.6.14-main.1366248",
+    "@dxos/invariant": "0.6.14-main.1366248",
+    "@dxos/keys": "0.6.14-main.1366248",
+    "@dxos/log": "0.6.14-main.1366248",
+    "@dxos/messaging": "0.6.14-main.1366248",
+    "@dxos/node-std": "0.6.14-main.1366248",
+    "@dxos/protocols": "0.6.14-main.1366248",
+    "@dxos/rpc": "0.6.14-main.1366248",
+    "@dxos/teleport": "0.6.14-main.1366248",
+    "@dxos/tracing": "0.6.14-main.1366248",
+    "@dxos/util": "0.6.14-main.1366248"
   },
   "devDependencies": {
     "@swc-node/register": "1.9.1",
-    "@types/simple-peer": "9.11.3",
     "@types/ws": "^7.4.0",
-    "earljs": "~0.1.10",
     "fast-check": "^3.19.0",
     "fetch-mock": "^11.0.0",
-    "typescript": "^5.5.4",
-    "@dxos/signal": "0.6.13"
+    "@dxos/edge-client": "0.6.14-main.1366248",
+    "@dxos/keyring": "0.6.14-main.1366248",
+    "@dxos/signal": "0.6.14-main.1366248"
   },
   "publishConfig": {
     "access": "public"

package/src/network-manager.ts

@@ -152,31 +152,23 @@ export class SwarmNetworkManager {
    */
   @synchronized
   async joinSwarm({
-    topic,
-    peerInfo,
+    topic, //
     topology,
     protocolProvider: protocol,
     label,
   }: SwarmOptions): Promise<SwarmConnection> {
     invariant(PublicKey.isPublicKey(topic));
-    if (!peerInfo) {
-      peerInfo = {
-        peerKey: this._peerInfo?.peerKey ?? PublicKey.random().toHex(),
-        identityKey: this._peerInfo?.identityKey ?? PublicKey.random().toHex(),
-      };
-    }
-    invariant(PublicKey.from(peerInfo.peerKey));
-    invariant(PublicKey.from(peerInfo.identityKey!));
     invariant(topology);
+    invariant(this._peerInfo);
     invariant(typeof protocol === 'function');
     if (this._swarms.has(topic)) {
       throw new Error(`Already connected to swarm: ${PublicKey.from(topic)}`);
     }
 
-    log('joining', { topic: PublicKey.from(topic), peerInfo, topology: topology.toString() }); // TODO(burdon): Log peerId.
+    log('joining', { topic: PublicKey.from(topic), peerInfo: this._peerInfo, topology: topology.toString() }); // TODO(burdon): Log peerId.
     const swarm = new Swarm(
       topic,
-      peerInfo,
+      this._peerInfo,
       topology,
       protocol,
       this._messenger,
@@ -195,7 +187,7 @@ export class SwarmNetworkManager {
     // Open before joining.
     await swarm.open();
 
-    this._signalConnection.join({ topic, peer: peerInfo }).catch((error) => log.catch(error));
+    this._signalConnection.join({ topic, peer: this._peerInfo }).catch((error) => log.catch(error));
 
     this.topicsUpdated.emit();
     this._connectionLog?.joinedSwarm(swarm);

package/src/signal/ice.test.ts

@@ -2,10 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
-import { expect } from 'chai';
 import fetchMock from 'fetch-mock';
-
-import { test, describe } from '@dxos/test';
+import { afterEach, test, expect, describe } from 'vitest';
 
 import { createIceProvider } from './ice';
 

package/src/signal/ice.ts

@@ -24,7 +24,12 @@ export const createIceProvider = (iceProviders: Runtime.Services.IceProvider[]):
           iceProviders.map(({ urls }) =>
             asyncTimeout(fetch(urls, { method: 'GET' }), 10_000)
               .then((response) => response.json())
-              .catch((err) => log.error('Failed to fetch ICE servers from provider', { urls, err })),
+              .catch((err) => {
+                const isDev = typeof window !== 'undefined' && window.location.href.includes('localhost');
+                if (!isDev) {
+                  log.error('Failed to fetch ICE servers from provider', { urls, err });
+                }
+              }),
           ),
         )
       )

package/src/signal/{integration.test.ts → integration.node.test.ts}

@@ -2,15 +2,11 @@
 // Copyright 2022 DXOS.org
 //
 
-// @dxos/test platform=nodejs
-
-import { expect } from 'earljs';
-import waitForExpect from 'wait-for-expect';
+import { afterAll, onTestFinished, beforeAll, describe, expect, test } from 'vitest';
 
 import { PublicKey } from '@dxos/keys';
 import { Messenger, type PeerInfo, WebsocketSignalManager } from '@dxos/messaging';
 import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
-import { afterAll, afterTest, beforeAll, describe, test } from '@dxos/test';
 
 import { type SignalMessage } from './signal-messenger';
 import { SwarmMessenger } from './swarm-messenger';
@@ -35,13 +31,15 @@ describe('Signal Integration Test', () => {
   }) => {
     const signalManager = new WebsocketSignalManager([{ server: broker.url() }]);
     await signalManager.open();
-    afterTest(() => signalManager.close());
+    onTestFinished(async () => {
+      await signalManager.close();
+    });
 
     const messenger = new Messenger({
       signalManager,
     });
     messenger.open();
-    afterTest(() => messenger.close());
+    onTestFinished(() => messenger.close());
     await messenger.listen({
       peer,
       onMessage: async (message) => await messageRouter.receiveMessage(message),
@@ -96,7 +94,7 @@ describe('Signal Integration Test', () => {
           offer: {},
         },
       }),
-    ).toBeAnObjectWith({ accept: true });
+    ).toEqual(expect.objectContaining({ accept: true }));
 
     expect(
       await peerNetworking2.messageRouter.offer({
@@ -108,7 +106,7 @@ describe('Signal Integration Test', () => {
           offer: {},
         },
       }),
-    ).toBeAnObjectWith({ accept: true });
+    ).toEqual(expect.objectContaining({ accept: true }));
 
     {
       const message: SignalMessage = {
@@ -123,9 +121,7 @@ describe('Signal Integration Test', () => {
       };
       await peerNetworking1.messageRouter.signal(message);
 
-      await waitForExpect(() => {
-        expect(peerNetworking2.receivedSignals[0]).toBeAnObjectWith(message);
-      });
+      await expect.poll(() => peerNetworking2.receivedSignals[0]).toEqual(expect.objectContaining(message));
     }
 
     {
@@ -141,9 +137,7 @@ describe('Signal Integration Test', () => {
       };
       await peerNetworking2.messageRouter.signal(message);
 
-      await waitForExpect(() => {
-        expect(peerNetworking1.receivedSignals[0]).toBeAnObjectWith(message);
-      });
+      await expect.poll(() => peerNetworking1.receivedSignals[0]).toEqual(expect.objectContaining(message));
     }
   });
 });

package/src/signal/{swarm-messenger.test.ts → swarm-messenger.node.test.ts}

@@ -2,22 +2,18 @@
 // Copyright 2022 DXOS.org
 //
 
-// @dxos/test platform=nodejs
-
-import { expect } from 'earljs';
-import waitForExpect from 'wait-for-expect';
+import { afterAll, beforeAll, beforeEach, describe, expect, test, onTestFinished } from 'vitest';
 
 import { type Awaited } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { Messenger, WebsocketSignalManager } from '@dxos/messaging';
 import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { runTestSignalServer } from '@dxos/signal';
-import { afterAll, beforeAll, describe, test, afterTest } from '@dxos/test';
 
 import { type OfferMessage, type SignalMessage } from './signal-messenger';
 import { SwarmMessenger } from './swarm-messenger';
 
-describe('SwarmMessenger', () => {
+describe('SwarmMessenger', { timeout: 7000 }, () => {
   let topic: PublicKey;
 
   let broker1: Awaited<ReturnType<typeof runTestSignalServer>>;
@@ -48,7 +44,9 @@ describe('SwarmMessenger', () => {
     const peer = { peerKey: PublicKey.random().toHex() };
     const signalManager = new WebsocketSignalManager([{ server: signalApiUrl }]);
     await signalManager.open();
-    afterTest(() => signalManager.close());
+    onTestFinished(async () => {
+      await signalManager.close();
+    });
 
     const messenger = new Messenger({ signalManager });
     await messenger.listen({
@@ -106,10 +104,8 @@ describe('SwarmMessenger', () => {
     };
     await router2.signal(msg);
 
-    await waitForExpect(() => {
-      expect(received[0]).toBeAnObjectWith(msg);
-    }, 4_000);
-  }).timeout(5_000);
+    await expect.poll(() => received[0]).toEqual(expect.objectContaining(msg));
+  });
 
   test('offer/answer', async () => {
     const {
@@ -139,7 +135,7 @@ describe('SwarmMessenger', () => {
       data: { offer: {} },
     });
     expect(answer.accept).toEqual(true);
-  }).timeout(5_000);
+  });
 
   test('signaling between 3 clients', async () => {
     const received1: SignalMessage[] = [];
@@ -198,9 +194,7 @@ describe('SwarmMessenger', () => {
       data: { signal: { payload: { msg: '1to3' } }, signalBatch: undefined },
     };
     await router1.signal(msg1to3);
-    await waitForExpect(() => {
-      expect(received3[0]).toBeAnObjectWith(msg1to3);
-    }, 4_000);
+    await expect.poll(() => received3[0]).toEqual(expect.objectContaining(msg1to3));
 
     // sending signal from peer2 to peer3.
     const msg2to3: SignalMessage = {
@@ -211,9 +205,7 @@ describe('SwarmMessenger', () => {
       data: { signal: { payload: { msg: '2to3' } }, signalBatch: undefined },
     };
     await router2.signal(msg2to3);
-    await waitForExpect(() => {
-      expect(received3[1]).toBeAnObjectWith(msg2to3);
-    }, 4_000);
+    await expect.poll(() => received3[1]).toEqual(expect.objectContaining(msg2to3));
 
     // sending signal from peer3 to peer1.
     const msg3to1: SignalMessage = {
@@ -224,10 +216,8 @@ describe('SwarmMessenger', () => {
       data: { signal: { payload: { msg: '3to1' } }, signalBatch: undefined },
     };
     await router3.signal(msg3to1);
-    await waitForExpect(() => {
-      expect(received1[0]).toBeAnObjectWith(msg3to1);
-    }, 4_000);
-  }).timeout(5_000);
+    await expect.poll(() => received1[0]).toEqual(expect.objectContaining(msg3to1));
+  });
 
   test('two offers', async () => {
     const {
@@ -273,5 +263,5 @@ describe('SwarmMessenger', () => {
       data: { offer: {} },
     });
     expect(answer2.accept).toEqual(true);
-  }).timeout(5_000);
+  });
 });

package/src/swarm/connection-limiter.test.ts

@@ -1,17 +1,14 @@
 //
 // Copyright 2023 DXOS.org
 //
-import chai, { expect } from 'chai';
-import chaiAsPromised from 'chai-as-promised';
+
+import { describe, expect, test } from 'vitest';
 
 import { asyncTimeout } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
-import { describe, test } from '@dxos/test';
 
 import { ConnectionLimiter } from './connection-limiter';
 
-chai.use(chaiAsPromised);
-
 describe('ConnectionLimiter', () => {
   function* setupPeers(
     limiter: ConnectionLimiter,
@@ -37,7 +34,7 @@ describe('ConnectionLimiter', () => {
   test('rejects if done is called', async () => {
     const limiter = new ConnectionLimiter({ maxConcurrentInitConnections: 1 });
     const [first] = setupPeers(limiter);
-    const testPromise = expect(first.connecting()).to.be.rejected;
+    const testPromise = expect(first.connecting()).rejects.toBeInstanceOf(Error);
     first.doneConnecting();
     await testPromise;
   });