@dxos/network-manager 0.8.3 → 0.8.4-main.1068cf700f

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.8.3",
+  "version": "0.8.4-main.1068cf700f",
   "description": "Network Manager",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
-  "sideEffects": true,
+  "sideEffects": false,
   "type": "module",
   "imports": {
     "#node-datachannel": {
@@ -20,33 +24,43 @@
       "default": "node-datachannel/*"
     },
     "#tcp-transport": {
+      "source": "./src/transport/tcp/index.ts",
       "types": "./dist/types/src/transport/tcp/index.d.ts",
       "browser": "./dist/lib/browser/transport/tcp/index.mjs",
-      "node": "./dist/lib/node/transport/tcp/index.cjs",
+      "node": "./dist/lib/node-esm/transport/tcp/index.mjs",
       "import": "./dist/lib/browser/transport/tcp/index.mjs",
-      "require": "./dist/lib/node/transport/tcp/index.cjs"
+      "require": "./dist/lib/node-esm/transport/tcp/index.mjs"
+    },
+    "#tcp-transport-impl": {
+      "source": {
+        "browser": "./src/transport/tcp/tcp-transport.browser.ts",
+        "default": "./src/transport/tcp/tcp-transport.ts"
+      },
+      "types": "./dist/types/src/transport/tcp/tcp-transport.d.ts",
+      "browser": "./dist/lib/browser/transport/tcp/tcp-transport.browser.mjs",
+      "default": "./dist/lib/node-esm/transport/tcp/tcp-transport.mjs"
     }
   },
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": "./dist/lib/node-esm/testing/index.mjs"
     },
     "./transport/tcp": {
+      "source": "./src/transport/tcp/index.ts",
       "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/tcp-transport.ts": "./src/transport/tcp/tcp-transport.browser.ts"
-  },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
@@ -66,37 +80,27 @@
     "src"
   ],
   "dependencies": {
-    "isomorphic-ws": "^5.0.0",
-    "nanomessage-rpc": "^3.0.0",
-    "node-datachannel": "^0.9.2",
-    "p-defer": "^3.0.0",
-    "stream": "^0.0.3",
-    "tiny-invariant": "^1.3.1",
-    "ws": "^8.14.2",
-    "xor-distance": "^2.0.0",
-    "@dxos/async": "0.8.3",
-    "@dxos/codec-protobuf": "0.8.3",
-    "@dxos/context": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/messaging": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/node-std": "0.8.3",
-    "@dxos/protocols": "0.8.3",
-    "@dxos/rpc": "0.8.3",
-    "@dxos/teleport": "0.8.3",
-    "@dxos/util": "0.8.3",
-    "@dxos/tracing": "0.8.3"
+    "node-datachannel": "^0.30.0",
+    "@dxos/async": "0.8.4-main.1068cf700f",
+    "@dxos/codec-protobuf": "0.8.4-main.1068cf700f",
+    "@dxos/context": "0.8.4-main.1068cf700f",
+    "@dxos/debug": "0.8.4-main.1068cf700f",
+    "@dxos/invariant": "0.8.4-main.1068cf700f",
+    "@dxos/keys": "0.8.4-main.1068cf700f",
+    "@dxos/messaging": "0.8.4-main.1068cf700f",
+    "@dxos/log": "0.8.4-main.1068cf700f",
+    "@dxos/node-std": "0.8.4-main.1068cf700f",
+    "@dxos/protocols": "0.8.4-main.1068cf700f",
+    "@dxos/rpc": "0.8.4-main.1068cf700f",
+    "@dxos/teleport": "0.8.4-main.1068cf700f",
+    "@dxos/tracing": "0.8.4-main.1068cf700f",
+    "@dxos/util": "0.8.4-main.1068cf700f"
   },
   "devDependencies": {
-    "@swc-node/register": "1.9.1",
-    "@types/ws": "^7.4.0",
-    "fast-check": "^3.19.0",
     "fetch-mock": "^11.0.0",
-    "@dxos/keyring": "0.8.3",
-    "@dxos/signal": "0.8.3",
-    "@dxos/edge-client": "0.8.3"
+    "@dxos/edge-client": "0.8.4-main.1068cf700f",
+    "@dxos/keyring": "0.8.4-main.1068cf700f",
+    "@dxos/signal": "0.8.4-main.1068cf700f"
   },
   "publishConfig": {
     "access": "public"

package/src/connection-log.ts

@@ -5,7 +5,7 @@
 import { Event } from '@dxos/async';
 import { raise } from '@dxos/debug';
 import { PublicKey } from '@dxos/keys';
-import { type SwarmInfo, type ConnectionInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
+import { type ConnectionInfo, type SwarmInfo } from '@dxos/protocols/proto/dxos/devtools/swarm';
 import { type MuxerStats } from '@dxos/teleport';
 import { ComplexMap } from '@dxos/util';
 

package/src/index.ts

@@ -8,5 +8,5 @@ export * from './signal';
 export * from './swarm';
 export * from './topology';
 export * from './transport';
-export * from './types';
+export type * from './types';
 export * from './wire-protocol';

package/src/network-manager.ts

@@ -13,7 +13,7 @@ import { ComplexMap } from '@dxos/util';
 
 import { ConnectionLog } from './connection-log';
 import { type SignalConnection } from './signal';
-import { Swarm, SwarmMapper, ConnectionLimiter } from './swarm';
+import { ConnectionLimiter, Swarm, SwarmMapper } from './swarm';
 import { type Topology } from './topology';
 import { type TransportFactory } from './transport';
 import { type WireProtocolProvider } from './wire-protocol';

package/src/signal/ice.test.ts

@@ -3,7 +3,7 @@
 //
 
 import fetchMock from 'fetch-mock';
-import { afterEach, test, expect, describe } from 'vitest';
+import { afterEach, describe, expect, test } from 'vitest';
 
 import { createIceProvider } from './ice';
 

package/src/signal/index.ts

@@ -4,5 +4,5 @@
 
 export * from './ice';
 export * from './swarm-messenger';
-export * from './signal-connection';
-export * from './signal-messenger';
+export type * from './signal-connection';
+export type * from './signal-messenger';

package/src/signal/integration.node.test.ts

@@ -2,11 +2,11 @@
 // Copyright 2022 DXOS.org
 //
 
-import { afterAll, onTestFinished, beforeAll, describe, expect, test } from 'vitest';
+import { afterAll, beforeAll, describe, expect, onTestFinished, test } from 'vitest';
 
 import { PublicKey } from '@dxos/keys';
 import { Messenger, type PeerInfo, WebsocketSignalManager } from '@dxos/messaging';
-import { runTestSignalServer, type SignalServerRunner } from '@dxos/signal';
+import { type SignalServerRunner, runTestSignalServer } from '@dxos/signal';
 
 import { type SignalMessage } from './signal-messenger';
 import { SwarmMessenger } from './swarm-messenger';

package/src/signal/swarm-messenger.node.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2022 DXOS.org
 //
 
-import { afterAll, beforeAll, beforeEach, describe, expect, test, onTestFinished } from 'vitest';
+import { afterAll, beforeAll, beforeEach, describe, expect, onTestFinished, test } from 'vitest';
 
 import { type Awaited } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';

package/src/signal/swarm-messenger.ts

@@ -7,7 +7,7 @@ import { Context } from '@dxos/context';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { type PeerInfo, type Message } from '@dxos/messaging';
+import { type Message, type PeerInfo } from '@dxos/messaging';
 import { TimeoutError } from '@dxos/protocols';
 import { schema } from '@dxos/protocols/proto';
 import { type Answer, type SwarmMessage } from '@dxos/protocols/proto/dxos/mesh/swarm';

package/src/swarm/connection.test.ts

@@ -7,12 +7,14 @@ import { describe, test } from 'vitest';
 import { sleep } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 
-import { Connection } from './connection';
 import { TestWireProtocol } from '../testing/test-wire-protocol';
 import { createRtcTransportFactory } from '../transport';
 import { chooseInitiatorPeer } from '../transport/webrtc/utils';
 
-describe('Connection', () => {
+import { Connection } from './connection';
+
+// Segfault in node-datachannel.
+describe.skip('Connection', () => {
   test('responder opens after initiator', async () => {
     const { initiator, responder } = createPeerKeys();
     await connectionTest({

package/src/swarm/connection.ts

@@ -2,8 +2,8 @@
 // Copyright 2021 DXOS.org
 //
 
-import { DeferredTask, Event, sleep, scheduleTask, scheduleTaskInterval, synchronized, Trigger } from '@dxos/async';
-import { Context, cancelWithContext, ContextDisposedError } from '@dxos/context';
+import { DeferredTask, Event, Trigger, scheduleTask, scheduleTaskInterval, sleep, synchronized } from '@dxos/async';
+import { Context, ContextDisposedError, cancelWithContext } from '@dxos/context';
 import { ErrorStream } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
@@ -11,9 +11,9 @@ import { log, logInfo } from '@dxos/log';
 import { type PeerInfo } from '@dxos/messaging';
 import {
   CancelledError,
-  ProtocolError,
   ConnectionResetError,
   ConnectivityError,
+  ProtocolError,
   TimeoutError,
   trace,
 } from '@dxos/protocols';
@@ -185,16 +185,18 @@ export class Connection {
     this._protocol.stream.on('close', () => {
       log('protocol stream closed');
       this._protocolClosed.wake();
-      this.close({ error: new ProtocolError('protocol stream closed') }).catch((err) => this.errors.raise(err));
+      this.close({ error: new ProtocolError({ message: 'protocol stream closed' }) }).catch((err) =>
+        this.errors.raise(err),
+      );
     });
 
     scheduleTask(
       this.connectedTimeoutContext,
       async () => {
         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),
-        );
+        await this.abort(
+          new TimeoutError({ message: `${TRANSPORT_CONNECTION_TIMEOUT / 1000}s for transport to connect` }),
+        ).catch((err) => this.errors.raise(err));
       },
       TRANSPORT_CONNECTION_TIMEOUT,
     );
@@ -397,7 +399,7 @@ export class Connection {
 
       // If signal fails treat connection as failed
       log.info('signal message failed to deliver', { err });
-      await this.close({ error: new ConnectivityError('signal message failed to deliver', err) });
+      await this.close({ error: new ConnectivityError({ message: 'signal message failed to deliver', cause: err }) });
     }
   }
 
@@ -414,7 +416,7 @@ export class Connection {
     invariant(msg.author.peerKey === this.remoteInfo.peerKey);
     invariant(msg.recipient.peerKey === this.localInfo.peerKey);
 
-    const signals = msg.data.signalBatch ? msg.data.signalBatch.signals ?? [] : [msg.data.signal];
+    const signals = msg.data.signalBatch ? (msg.data.signalBatch.signals ?? []) : [msg.data.signal];
     for (const signal of signals) {
       if (!signal) {
         continue;

package/src/swarm/peer.ts

@@ -11,15 +11,16 @@ import { type PeerInfo } from '@dxos/messaging';
 import { CancelledError, SystemError } from '@dxos/protocols';
 import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
-import { Connection, ConnectionState } from './connection';
-import { type ConnectionLimiter } from './connection-limiter';
 import { type OfferMessage, type SignalMessage, type SignalMessenger } from '../signal';
 import { type TransportFactory } from '../transport';
 import { type WireProtocolProvider } from '../wire-protocol';
 
+import { Connection, ConnectionState } from './connection';
+import { type ConnectionLimiter } from './connection-limiter';
+
 export class ConnectionDisplacedError extends SystemError {
   constructor() {
-    super('Connection displaced by remote initiator.');
+    super({ message: 'Connection displaced by remote initiator.' });
   }
 }
 
@@ -161,6 +162,7 @@ export class Peer {
         return { accept: true };
       }
     }
+
     return { accept: false };
   }
 

package/src/swarm/swarm-mapper.ts

@@ -5,7 +5,7 @@
 import { type CleanupFn, Event, SubscriptionList } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { PeerInfoHash, type PeerInfo as MessagingPeer } from '@dxos/messaging';
+import { type PeerInfo as MessagingPeer, PeerInfoHash } from '@dxos/messaging';
 import { ComplexMap } from '@dxos/util';
 
 import { type ConnectionState } from './connection';

package/src/swarm/swarm.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { onTestFinished, describe, expect, test } from 'vitest';
+import { describe, expect, onTestFinished, test } from 'vitest';
 
 import { asyncTimeout, sleep } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
@@ -15,13 +15,14 @@ import {
 } from '@dxos/messaging';
 import { ComplexSet } from '@dxos/util';
 
-import { ConnectionState } from './connection';
-import { ConnectionLimiter } from './connection-limiter';
-import { Swarm } from './swarm';
 import { TestWireProtocol } from '../testing/test-wire-protocol';
 import { FullyConnectedTopology } from '../topology';
 import { createRtcTransportFactory } from '../transport';
 
+import { ConnectionState } from './connection';
+import { ConnectionLimiter } from './connection-limiter';
+import { Swarm } from './swarm';
+
 type TestPeer = {
   swarm: Swarm;
   peer: PeerInfo;
@@ -30,7 +31,8 @@ type TestPeer = {
   signalManager: SignalManager;
 };
 
-describe('Swarm', () => {
+// Segfault in node-datachannel.
+describe.skip('Swarm', () => {
   const context = new MemorySignalManagerContext();
 
   const setupSwarm = async ({

package/src/swarm/swarm.ts

@@ -8,20 +8,21 @@ import { ErrorStream } from '@dxos/debug';
 import { invariant } from '@dxos/invariant';
 import { PublicKey } from '@dxos/keys';
 import { log, logInfo } from '@dxos/log';
-import { type SwarmEvent, type ListeningHandle, type Messenger, type PeerInfo, PeerInfoHash } from '@dxos/messaging';
+import { type ListeningHandle, type Messenger, type PeerInfo, PeerInfoHash, type SwarmEvent } from '@dxos/messaging';
 import { trace } from '@dxos/protocols';
 import { type Answer } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { ComplexMap, isNonNullable } from '@dxos/util';
 
-import { type Connection, ConnectionState } from './connection';
-import { type ConnectionLimiter } from './connection-limiter';
-import { Peer } from './peer';
 import { type OfferMessage, type SignalMessage, SwarmMessenger } from '../signal';
 import { type SwarmController, type Topology } from '../topology';
 import { type TransportFactory } from '../transport';
 import { type Topic } from '../types';
 import { type WireProtocolProvider } from '../wire-protocol';
 
+import { type Connection, ConnectionState } from './connection';
+import { type ConnectionLimiter } from './connection-limiter';
+import { Peer } from './peer';
+
 const INITIATION_DELAY = 100;
 
 // TODO(burdon): Factor out.

package/src/testing/test-builder.ts

@@ -13,15 +13,23 @@ import {
 import { schema } from '@dxos/protocols/proto';
 import { ConnectionState } from '@dxos/protocols/proto/dxos/client/services';
 import { type Runtime } from '@dxos/protocols/proto/dxos/config';
-import { createLinkedPorts, createProtoRpcPeer, type ProtoRpcPeer } from '@dxos/rpc';
+import { type ProtoRpcPeer, createLinkedPorts, createProtoRpcPeer } from '@dxos/rpc';
 import { ComplexMap } from '@dxos/util';
 
 import { TcpTransportFactory } from '#tcp-transport';
-import { type TestTeleportExtensionFactory, TestWireProtocol } from './test-wire-protocol';
+
 import { SwarmNetworkManager } from '../network-manager';
 import { FullyConnectedTopology } from '../topology';
-import { MemoryTransportFactory, type TransportFactory, TransportKind } from '../transport';
-import { createRtcTransportFactory, RtcTransportProxyFactory, RtcTransportService } from '../transport';
+import {
+  MemoryTransportFactory,
+  RtcTransportProxyFactory,
+  RtcTransportService,
+  type TransportFactory,
+  TransportKind,
+  createRtcTransportFactory,
+} from '../transport';
+
+import { type TestTeleportExtensionFactory, TestWireProtocol } from './test-wire-protocol';
 
 // Signal server will be started by the setup script.
 const port = process.env.SIGNAL_PORT ?? 4000;

package/src/testing/test-wire-protocol.ts

@@ -2,11 +2,11 @@
 // Copyright 2022 DXOS.org
 //
 
-import { asyncTimeout, Event } from '@dxos/async';
+import { Event, asyncTimeout } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { TestExtension, TestExtensionWithStreams } from '@dxos/teleport';
-import type { TestStreamStats, TeleportExtension } from '@dxos/teleport';
+import type { TeleportExtension, TestStreamStats } from '@dxos/teleport';
 import { ComplexMap } from '@dxos/util';
 
 import { createTeleportProtocolFactory } from '../wire-protocol';

package/src/tests/basic-test-suite.ts

@@ -2,17 +2,18 @@
 // Copyright 2021 DXOS.org
 //
 
-import { onTestFinished, expect, test } from 'vitest';
+import { expect, onTestFinished, test } from 'vitest';
 
 import { asyncTimeout } from '@dxos/async';
 import { PublicKey } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { range } from '@dxos/util';
 
-import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
 import { type TestBuilder } from '../testing';
 import { FullyConnectedTopology, StarTopology } from '../topology';
 
+import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
+
 // TODO(burdon): Use PublicKey throughout (remove conversion to strings, from buffers, etc.)
 
 /**

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

@@ -3,16 +3,18 @@
 //
 
 import { randomBytes } from 'node:crypto';
+
 import { describe, test } from 'vitest';
 
 import { PublicKey } from '@dxos/keys';
 import { range } from '@dxos/util';
 
-import { basicTestSuite } from './basic-test-suite';
-import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
 import { TestBuilder } from '../testing';
 import { FullyConnectedTopology } from '../topology';
 
+import { basicTestSuite } from './basic-test-suite';
+import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
+
 describe('Memory transport', () => {
   const testBuilder = new TestBuilder();
   basicTestSuite(testBuilder);

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

@@ -3,17 +3,19 @@
 //
 
 import { randomBytes } from 'node:crypto';
+
 import { describe, test } from 'vitest';
 
 import { PublicKey } from '@dxos/keys';
 import { range } from '@dxos/util';
 
-import { basicTestSuite } from './basic-test-suite';
-import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
 import { TestBuilder } from '../testing';
 import { FullyConnectedTopology } from '../topology';
 import { TransportKind } from '../transport';
 
+import { basicTestSuite } from './basic-test-suite';
+import { exchangeMessages, joinSwarm, leaveSwarm, openAndCloseAfterTest } from './utils';
+
 describe('Tcp transport', () => {
   const testBuilder = new TestBuilder({
     transport: TransportKind.TCP,

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

@@ -4,15 +4,18 @@
 
 import { describe } from 'vitest';
 
-import { basicTestSuite } from './basic-test-suite';
 import { TEST_SIGNAL_HOSTS, TestBuilder } from '../testing';
 
-describe('WebRTC transport', { timeout: 10_000 }, () => {
+import { basicTestSuite } from './basic-test-suite';
+
+// Segfault in node-datachannel.
+describe.skip('WebRTC transport', { timeout: 10_000 }, () => {
   const testBuilder = new TestBuilder();
   basicTestSuite(testBuilder);
 });
 
-describe('WebRTC transport proxy', { timeout: 10_000 }, () => {
+// Segfault in node-datachannel.
+describe.skip('WebRTC transport proxy', { timeout: 10_000 }, () => {
   const testBuilder = new TestBuilder({ bridge: true });
   basicTestSuite(testBuilder);
 });

package/src/topology/index.ts

@@ -5,4 +5,4 @@
 export * from './fully-connected-topology';
 export * from './mmst-topology';
 export * from './star-topology';
-export * from './topology';
+export type * from './topology';

package/src/transport/tcp/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './tcp-transport';
+export * from '#tcp-transport-impl';

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

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { type AddressInfo, Socket, type Server } from 'node:net';
+import { type AddressInfo, type Server, Socket } from 'node:net';
 
 import { Event } from '@dxos/async';
 import { ErrorStream } from '@dxos/debug';

package/src/transport/webrtc/rtc-connection-factory.ts

@@ -38,7 +38,7 @@ class NodeRtcConnectionFactory implements RtcConnectionFactory {
   private static _cleanupMutex = new Mutex();
 
   // This should be inside the function to avoid triggering `eval` in the global scope.
-  // eslint-disable-next-line no-new-func
+  // eslint-disable-next-line @typescript-eslint/no-implied-eval
 
   // TODO(burdon): Do imports here?
   async initialize(): Promise<void> {}

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

@@ -2,18 +2,19 @@
 // Copyright 2024 DXOS.org
 //
 
-import { synchronized, Trigger, Mutex } from '@dxos/async';
+import { Mutex, Trigger, synchronized } from '@dxos/async';
 import { invariant } from '@dxos/invariant';
 import { log, logInfo } from '@dxos/log';
 import { ConnectivityError } from '@dxos/protocols';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 import { trace } from '@dxos/tracing';
 
+import type { IceProvider } from '../../signal';
+import { type TransportOptions } from '../transport';
+
 import { type RtcConnectionFactory } from './rtc-connection-factory';
 import { RtcTransportChannel } from './rtc-transport-channel';
 import { areSdpEqual, chooseInitiatorPeer } from './utils';
-import type { IceProvider } from '../../signal';
-import { type TransportOptions } from '../transport';
 
 export type RtcPeerChannelFactoryOptions = {
   ownPeerKey: string;
@@ -468,7 +469,7 @@ type IceCandidateErrorDetails = { url: string; errorCode: number; errorText: str
 
 const createIceFailureError = (details: IceCandidateErrorDetails[]) => {
   const candidateErrors = details.map(({ url, errorCode, errorText }) => `${errorCode} ${url}: ${errorText}`);
-  return new ConnectivityError(`ICE failed:\n${candidateErrors.join('\n')}`);
+  return new ConnectivityError({ message: `ICE failed:\n${candidateErrors.join('\n')}` });
 };
 
 type ChannelCreatedCallback = {

package/src/transport/webrtc/rtc-transport-channel.test.ts

@@ -3,14 +3,16 @@
 //
 
 import { Duplex } from 'node:stream';
+
 import { describe, expect, test } from 'vitest';
 
 import { sleep } from '@dxos/async';
 
+import { type TransportOptions } from '../transport';
+
 import { type RtcPeerConnection } from './rtc-peer-connection';
 import { RtcTransportChannel } from './rtc-transport-channel';
 import { handleChannelErrors } from './test-utils';
-import { type TransportOptions } from '../transport';
 
 describe('RtcTransportChannel', () => {
   test('transport error raised if channel creation fails', async () => {

package/src/transport/webrtc/rtc-transport-channel.ts

@@ -12,9 +12,10 @@ import { log } from '@dxos/log';
 import { ConnectivityError } from '@dxos/protocols';
 import { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
 
+import { type Transport, type TransportOptions, type TransportStats } from '../transport';
+
 import { type RtcPeerConnection } from './rtc-peer-connection';
 import { createRtcTransportStats, describeSelectedRemoteCandidate } from './rtc-transport-stats';
-import { type Transport, type TransportOptions, type TransportStats } from '../transport';
 
 // https://viblast.com/blog/2015/2/5/webrtc-data-channel-message-size
 const MAX_MESSAGE_SIZE = 64 * 1024;
@@ -70,7 +71,7 @@ export class RtcTransportChannel extends Resource implements Transport {
           const error =
             err instanceof Error
               ? err
-              : new ConnectivityError(`Failed to create a channel: ${JSON.stringify(err?.message)}`);
+              : new ConnectivityError({ message: `Failed to create a channel: ${JSON.stringify(err?.message)}` });
           this.errors.raise(error);
         } else {
           log.verbose('connection establishment failed after transport was closed', { err });