@dxos/network-manager 0.8.4-main.ae835ea → 0.8.4-main.bc674ce

package/package.json

@@ -1,12 +1,16 @@
 {
   "name": "@dxos/network-manager",
-  "version": "0.8.4-main.ae835ea",
+  "version": "0.8.4-main.bc674ce",
   "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": {
@@ -26,6 +30,15 @@
       "node": "./dist/lib/node-esm/transport/tcp/index.mjs",
       "import": "./dist/lib/browser/transport/tcp/index.mjs",
       "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": {
@@ -48,9 +61,6 @@
       "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": {
     "*": {
@@ -71,26 +81,26 @@
   ],
   "dependencies": {
     "node-datachannel": "^0.30.0",
-    "@dxos/async": "0.8.4-main.ae835ea",
-    "@dxos/codec-protobuf": "0.8.4-main.ae835ea",
-    "@dxos/invariant": "0.8.4-main.ae835ea",
-    "@dxos/context": "0.8.4-main.ae835ea",
-    "@dxos/keys": "0.8.4-main.ae835ea",
-    "@dxos/debug": "0.8.4-main.ae835ea",
-    "@dxos/log": "0.8.4-main.ae835ea",
-    "@dxos/node-std": "0.8.4-main.ae835ea",
-    "@dxos/protocols": "0.8.4-main.ae835ea",
-    "@dxos/rpc": "0.8.4-main.ae835ea",
-    "@dxos/teleport": "0.8.4-main.ae835ea",
-    "@dxos/messaging": "0.8.4-main.ae835ea",
-    "@dxos/tracing": "0.8.4-main.ae835ea",
-    "@dxos/util": "0.8.4-main.ae835ea"
+    "@dxos/async": "0.8.4-main.bc674ce",
+    "@dxos/context": "0.8.4-main.bc674ce",
+    "@dxos/debug": "0.8.4-main.bc674ce",
+    "@dxos/codec-protobuf": "0.8.4-main.bc674ce",
+    "@dxos/invariant": "0.8.4-main.bc674ce",
+    "@dxos/log": "0.8.4-main.bc674ce",
+    "@dxos/keys": "0.8.4-main.bc674ce",
+    "@dxos/messaging": "0.8.4-main.bc674ce",
+    "@dxos/protocols": "0.8.4-main.bc674ce",
+    "@dxos/node-std": "0.8.4-main.bc674ce",
+    "@dxos/rpc": "0.8.4-main.bc674ce",
+    "@dxos/util": "0.8.4-main.bc674ce",
+    "@dxos/tracing": "0.8.4-main.bc674ce",
+    "@dxos/teleport": "0.8.4-main.bc674ce"
   },
   "devDependencies": {
     "fetch-mock": "^11.0.0",
-    "@dxos/keyring": "0.8.4-main.ae835ea",
-    "@dxos/edge-client": "0.8.4-main.ae835ea",
-    "@dxos/signal": "0.8.4-main.ae835ea"
+    "@dxos/edge-client": "0.8.4-main.bc674ce",
+    "@dxos/keyring": "0.8.4-main.bc674ce",
+    "@dxos/signal": "0.8.4-main.bc674ce"
   },
   "publishConfig": {
     "access": "public"

package/src/swarm/connection.test.ts

@@ -13,7 +13,8 @@ import { chooseInitiatorPeer } from '../transport/webrtc/utils';
 
 import { Connection } from './connection';
 
-describe('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

@@ -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 }) });
     }
   }
 

package/src/swarm/peer.ts

@@ -20,7 +20,7 @@ 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.' });
   }
 }
 
@@ -162,6 +162,7 @@ export class Peer {
         return { accept: true };
       }
     }
+
     return { accept: false };
   }
 

package/src/swarm/swarm.test.ts

@@ -31,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/tests/webrtc-transport.test.ts

@@ -8,12 +8,14 @@ import { TEST_SIGNAL_HOSTS, TestBuilder } from '../testing';
 
 import { basicTestSuite } from './basic-test-suite';
 
-describe('WebRTC transport', { timeout: 10_000 }, () => {
+// 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/transport/tcp/index.ts

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

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

@@ -469,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.ts

@@ -71,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 });

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

@@ -19,7 +19,8 @@ import { RtcTransportProxy } from './rtc-transport-proxy';
 import { RtcTransportService } from './rtc-transport-service';
 import { handleChannelErrors } from './test-utils';
 
-describe('RtcPeerTransportProxy', () => {
+// Segfault in node-datachannel.
+describe.skip('RtcPeerTransportProxy', () => {
   test('open and close', async () => {
     const { proxy } = await setupProxy();
     await proxy.open();

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

@@ -176,7 +176,9 @@ export class RtcTransportProxy extends Resource implements Transport {
     } catch (error) {
       const type = signalEvent.payload.payload.data?.type;
       if (type === 'offer' || type === 'answer') {
-        this._raiseIfOpen(new ConnectivityError(`Session establishment failed: ${type} couldn't be sent.`));
+        this._raiseIfOpen(
+          new ConnectivityError({ message: `Session establishment failed: ${type} couldn't be sent.` }),
+        );
       }
     }
   }
@@ -255,11 +257,11 @@ export class RtcTransportProxyFactory implements TransportFactory {
 const decodeError = (err: Error | string) => {
   const message = typeof err === 'string' ? err : err.message;
   if (message.includes('CONNECTION_RESET')) {
-    return new ConnectionResetError(message);
+    return new ConnectionResetError({ message });
   } else if (message.includes('TIMEOUT')) {
-    return new TimeoutError(message);
+    return new TimeoutError({ message });
   } else if (message.includes('CONNECTIVITY_ERROR')) {
-    return new ConnectivityError(message);
+    return new ConnectivityError({ message });
   } else {
     return typeof err === 'string' ? new Error(err) : err;
   }

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

@@ -16,7 +16,8 @@ import { chooseInitiatorPeer } from './utils';
 
 const connectionFactory = getRtcConnectionFactory();
 
-describe('RtcTransport', () => {
+// Segfault in node-datachannel.
+describe.skip('RtcTransport', () => {
   test('channel open and close', async () => {
     const peer = await createConnection();
     const channel = createChannel(peer);

package/src/wire-protocol.ts

@@ -5,16 +5,16 @@
 import { type Duplex } from 'node:stream';
 
 import { type PublicKey } from '@dxos/keys';
-import { Teleport, type TeleportParams } from '@dxos/teleport';
+import { Teleport, type TeleportProps } from '@dxos/teleport';
 
-export type WireProtocolParams = {
+export type WireProtocolProps = {
   initiator: boolean;
   localPeerId: PublicKey;
   remotePeerId: PublicKey;
   topic: PublicKey;
 };
 
-export type WireProtocolProvider = (params: WireProtocolParams) => WireProtocol;
+export type WireProtocolProvider = (params: WireProtocolProps) => WireProtocol;
 
 /**
  * Application-specific network protocol that is used when a connection to a peer is established.
@@ -31,15 +31,15 @@ export interface WireProtocol {
 /**
  * Create a wire-protocol provider backed by a teleport instance.
  * @param onConnection Called after teleport is initialized for the session. Protocol extensions could be attached here.
- * @param defaultParams Optionally provide default Teleport params that might be overridden by factory callers.
+ * @param defaultProps Optionally provide default Teleport params that might be overridden by factory callers.
  * @returns
  */
 export const createTeleportProtocolFactory = (
   onConnection: (teleport: Teleport) => Promise<void>,
-  defaultParams?: Partial<TeleportParams>,
+  defaultProps?: Partial<TeleportProps>,
 ): WireProtocolProvider => {
   return (params) => {
-    const teleport = new Teleport({ ...defaultParams, ...params });
+    const teleport = new Teleport({ ...defaultProps, ...params });
     return {
       stream: teleport.stream,
       open: async (sessionId?: PublicKey) => {