@dxos/network-manager 0.8.3 → 0.8.4-main.1068cf700f
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/browser/{chunk-LFKR6BAF.mjs → chunk-AQSYW43M.mjs} +731 -955
- package/dist/lib/browser/chunk-AQSYW43M.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +342 -4
- package/dist/lib/browser/index.mjs.map +4 -4
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/browser/testing/index.mjs +70 -51
- package/dist/lib/browser/testing/index.mjs.map +3 -3
- package/dist/lib/browser/transport/tcp/index.mjs +2 -35
- package/dist/lib/browser/transport/tcp/index.mjs.map +4 -4
- package/dist/lib/browser/transport/tcp/tcp-transport.browser.mjs +36 -0
- package/dist/lib/browser/transport/tcp/tcp-transport.browser.mjs.map +7 -0
- package/dist/lib/browser/transport/tcp/tcp-transport.mjs +160 -0
- package/dist/lib/{node/transport/tcp/index.cjs.map → browser/transport/tcp/tcp-transport.mjs.map} +3 -3
- package/dist/lib/node-esm/{chunk-QQY4BF6O.mjs → chunk-SCX3PZRE.mjs} +731 -955
- package/dist/lib/node-esm/chunk-SCX3PZRE.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +342 -4
- package/dist/lib/node-esm/index.mjs.map +4 -4
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/lib/node-esm/testing/index.mjs +70 -51
- package/dist/lib/node-esm/testing/index.mjs.map +3 -3
- package/dist/lib/node-esm/transport/tcp/index.mjs +2 -156
- package/dist/lib/node-esm/transport/tcp/index.mjs.map +4 -4
- package/dist/lib/node-esm/transport/tcp/tcp-transport.browser.mjs +36 -0
- package/dist/lib/node-esm/transport/tcp/tcp-transport.browser.mjs.map +7 -0
- package/dist/lib/{node/transport/tcp/index.cjs → node-esm/transport/tcp/tcp-transport.mjs} +27 -58
- package/dist/lib/node-esm/transport/tcp/tcp-transport.mjs.map +7 -0
- package/dist/types/src/connection-log.d.ts.map +1 -1
- package/dist/types/src/index.d.ts +1 -1
- package/dist/types/src/index.d.ts.map +1 -1
- package/dist/types/src/network-manager.d.ts.map +1 -1
- package/dist/types/src/signal/index.d.ts +2 -2
- package/dist/types/src/signal/index.d.ts.map +1 -1
- package/dist/types/src/signal/swarm-messenger.d.ts +1 -1
- package/dist/types/src/signal/swarm-messenger.d.ts.map +1 -1
- package/dist/types/src/swarm/connection.d.ts.map +1 -1
- package/dist/types/src/swarm/peer.d.ts +2 -2
- package/dist/types/src/swarm/peer.d.ts.map +1 -1
- package/dist/types/src/swarm/swarm.d.ts +3 -3
- package/dist/types/src/swarm/swarm.d.ts.map +1 -1
- package/dist/types/src/testing/test-builder.d.ts +1 -1
- package/dist/types/src/testing/test-builder.d.ts.map +1 -1
- package/dist/types/src/testing/test-wire-protocol.d.ts +1 -1
- package/dist/types/src/testing/test-wire-protocol.d.ts.map +1 -1
- package/dist/types/src/tests/basic-test-suite.d.ts.map +1 -1
- package/dist/types/src/topology/index.d.ts +1 -1
- package/dist/types/src/topology/index.d.ts.map +1 -1
- package/dist/types/src/transport/tcp/index.d.ts +1 -1
- package/dist/types/src/transport/tcp/index.d.ts.map +1 -1
- package/dist/types/src/transport/webrtc/rtc-peer-connection.d.ts +2 -2
- package/dist/types/src/transport/webrtc/rtc-peer-connection.d.ts.map +1 -1
- package/dist/types/src/transport/webrtc/rtc-transport-channel.d.ts +1 -1
- package/dist/types/src/transport/webrtc/rtc-transport-channel.d.ts.map +1 -1
- package/dist/types/src/transport/webrtc/rtc-transport-factory.d.ts.map +1 -1
- package/dist/types/src/transport/webrtc/rtc-transport-proxy.d.ts.map +1 -1
- package/dist/types/src/transport/webrtc/rtc-transport-service.d.ts +1 -1
- package/dist/types/src/transport/webrtc/rtc-transport-service.d.ts.map +1 -1
- package/dist/types/src/wire-protocol.d.ts +5 -5
- package/dist/types/src/wire-protocol.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +39 -35
- package/src/connection-log.ts +1 -1
- package/src/index.ts +1 -1
- package/src/network-manager.ts +1 -1
- package/src/signal/ice.test.ts +1 -1
- package/src/signal/index.ts +2 -2
- package/src/signal/integration.node.test.ts +2 -2
- package/src/signal/swarm-messenger.node.test.ts +1 -1
- package/src/signal/swarm-messenger.ts +1 -1
- package/src/swarm/connection.test.ts +4 -2
- package/src/swarm/connection.ts +11 -9
- package/src/swarm/peer.ts +5 -3
- package/src/swarm/swarm-mapper.ts +1 -1
- package/src/swarm/swarm.test.ts +7 -5
- package/src/swarm/swarm.ts +5 -4
- package/src/testing/test-builder.ts +12 -4
- package/src/testing/test-wire-protocol.ts +2 -2
- package/src/tests/basic-test-suite.ts +3 -2
- package/src/tests/memory-transport.test.ts +4 -2
- package/src/tests/tcp-transport.node.test.ts +4 -2
- package/src/tests/webrtc-transport.test.ts +6 -3
- package/src/topology/index.ts +1 -1
- package/src/transport/tcp/index.ts +1 -1
- package/src/transport/tcp/tcp-transport.ts +1 -1
- package/src/transport/webrtc/rtc-connection-factory.ts +1 -1
- package/src/transport/webrtc/rtc-peer-connection.ts +5 -4
- package/src/transport/webrtc/rtc-transport-channel.test.ts +3 -1
- package/src/transport/webrtc/rtc-transport-channel.ts +3 -2
- package/src/transport/webrtc/rtc-transport-factory.ts +3 -2
- package/src/transport/webrtc/rtc-transport-proxy.test.ts +7 -4
- package/src/transport/webrtc/rtc-transport-proxy.ts +6 -4
- package/src/transport/webrtc/rtc-transport-service.ts +6 -5
- package/src/transport/webrtc/rtc-transport.test.ts +6 -4
- package/src/wire-protocol.ts +6 -6
- package/dist/lib/browser/chunk-LFKR6BAF.mjs.map +0 -7
- package/dist/lib/node/chunk-2G6RZMS5.cjs +0 -4460
- package/dist/lib/node/chunk-2G6RZMS5.cjs.map +0 -7
- package/dist/lib/node/index.cjs +0 -71
- package/dist/lib/node/index.cjs.map +0 -7
- package/dist/lib/node/meta.json +0 -1
- package/dist/lib/node/testing/index.cjs +0 -296
- package/dist/lib/node/testing/index.cjs.map +0 -7
- package/dist/lib/node-esm/chunk-QQY4BF6O.mjs.map +0 -7
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
// Copyright 2024 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import { getRtcConnectionFactory } from './rtc-connection-factory';
|
|
6
|
-
import { RtcPeerConnection } from './rtc-peer-connection';
|
|
7
5
|
import type { IceProvider } from '../../signal';
|
|
8
6
|
import type { TransportFactory } from '../transport';
|
|
9
7
|
|
|
8
|
+
import { getRtcConnectionFactory } from './rtc-connection-factory';
|
|
9
|
+
import { RtcPeerConnection } from './rtc-peer-connection';
|
|
10
|
+
|
|
10
11
|
export const createRtcTransportFactory = (
|
|
11
12
|
webrtcConfig?: RTCConfiguration,
|
|
12
13
|
iceProvider?: IceProvider,
|
|
@@ -3,21 +3,24 @@
|
|
|
3
3
|
//
|
|
4
4
|
|
|
5
5
|
import { Duplex } from 'stream';
|
|
6
|
-
|
|
6
|
+
|
|
7
|
+
import { describe, expect, onTestFinished, test } from 'vitest';
|
|
7
8
|
|
|
8
9
|
import { Event as AsyncEvent, TestStream, Trigger, sleep } from '@dxos/async';
|
|
9
10
|
import { ErrorStream } from '@dxos/debug';
|
|
10
11
|
import { PublicKey } from '@dxos/keys';
|
|
11
12
|
import { schema } from '@dxos/protocols/proto';
|
|
12
13
|
import { type BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
|
|
13
|
-
import { createLinkedPorts, createProtoRpcPeer
|
|
14
|
+
import { type RpcPort, createLinkedPorts, createProtoRpcPeer } from '@dxos/rpc';
|
|
15
|
+
|
|
16
|
+
import { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from '../transport';
|
|
14
17
|
|
|
15
18
|
import { RtcTransportProxy } from './rtc-transport-proxy';
|
|
16
19
|
import { RtcTransportService } from './rtc-transport-service';
|
|
17
20
|
import { handleChannelErrors } from './test-utils';
|
|
18
|
-
import { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from '../transport';
|
|
19
21
|
|
|
20
|
-
|
|
22
|
+
// Segfault in node-datachannel.
|
|
23
|
+
describe.skip('RtcPeerTransportProxy', () => {
|
|
21
24
|
test('open and close', async () => {
|
|
22
25
|
const { proxy } = await setupProxy();
|
|
23
26
|
await proxy.open();
|
|
@@ -176,7 +176,9 @@ export class RtcTransportProxy extends Resource implements Transport {
|
|
|
176
176
|
} catch (error) {
|
|
177
177
|
const type = signalEvent.payload.payload.data?.type;
|
|
178
178
|
if (type === 'offer' || type === 'answer') {
|
|
179
|
-
this._raiseIfOpen(
|
|
179
|
+
this._raiseIfOpen(
|
|
180
|
+
new ConnectivityError({ message: `Session establishment failed: ${type} couldn't be sent.` }),
|
|
181
|
+
);
|
|
180
182
|
}
|
|
181
183
|
}
|
|
182
184
|
}
|
|
@@ -255,11 +257,11 @@ export class RtcTransportProxyFactory implements TransportFactory {
|
|
|
255
257
|
const decodeError = (err: Error | string) => {
|
|
256
258
|
const message = typeof err === 'string' ? err : err.message;
|
|
257
259
|
if (message.includes('CONNECTION_RESET')) {
|
|
258
|
-
return new ConnectionResetError(message);
|
|
260
|
+
return new ConnectionResetError({ message });
|
|
259
261
|
} else if (message.includes('TIMEOUT')) {
|
|
260
|
-
return new TimeoutError(message);
|
|
262
|
+
return new TimeoutError({ message });
|
|
261
263
|
} else if (message.includes('CONNECTIVITY_ERROR')) {
|
|
262
|
-
return new ConnectivityError(message);
|
|
264
|
+
return new ConnectivityError({ message });
|
|
263
265
|
} else {
|
|
264
266
|
return typeof err === 'string' ? new Error(err) : err;
|
|
265
267
|
}
|
|
@@ -9,24 +9,25 @@ import { invariant } from '@dxos/invariant';
|
|
|
9
9
|
import { PublicKey } from '@dxos/keys';
|
|
10
10
|
import { log } from '@dxos/log';
|
|
11
11
|
import {
|
|
12
|
+
type BridgeEvent,
|
|
12
13
|
type BridgeService,
|
|
14
|
+
type CloseRequest,
|
|
13
15
|
type ConnectionRequest,
|
|
14
|
-
type SignalRequest,
|
|
15
|
-
type DataRequest,
|
|
16
|
-
type BridgeEvent,
|
|
17
16
|
ConnectionState,
|
|
18
|
-
type
|
|
17
|
+
type DataRequest,
|
|
19
18
|
type DetailsRequest,
|
|
20
19
|
type DetailsResponse,
|
|
20
|
+
type SignalRequest,
|
|
21
21
|
type StatsRequest,
|
|
22
22
|
type StatsResponse,
|
|
23
23
|
} from '@dxos/protocols/proto/dxos/mesh/bridge';
|
|
24
24
|
import { ComplexMap } from '@dxos/util';
|
|
25
25
|
|
|
26
|
-
import { createRtcTransportFactory } from './rtc-transport-factory';
|
|
27
26
|
import { type IceProvider } from '../../signal';
|
|
28
27
|
import { type Transport, type TransportFactory } from '../transport';
|
|
29
28
|
|
|
29
|
+
import { createRtcTransportFactory } from './rtc-transport-factory';
|
|
30
|
+
|
|
30
31
|
type TransportState = {
|
|
31
32
|
proxyId: PublicKey;
|
|
32
33
|
transport: Transport;
|
|
@@ -2,20 +2,22 @@
|
|
|
2
2
|
// Copyright 2020 DXOS.org
|
|
3
3
|
//
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { describe, expect, onTestFinished, test } from 'vitest';
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { TestStream, sleep } from '@dxos/async';
|
|
8
8
|
import { PublicKey } from '@dxos/keys';
|
|
9
9
|
|
|
10
|
+
import { type TransportOptions } from '../transport';
|
|
11
|
+
|
|
10
12
|
import { getRtcConnectionFactory } from './rtc-connection-factory';
|
|
11
13
|
import { RtcPeerConnection } from './rtc-peer-connection';
|
|
12
14
|
import { type RtcTransportChannel } from './rtc-transport-channel';
|
|
13
15
|
import { chooseInitiatorPeer } from './utils';
|
|
14
|
-
import { type TransportOptions } from '../transport';
|
|
15
16
|
|
|
16
17
|
const connectionFactory = getRtcConnectionFactory();
|
|
17
18
|
|
|
18
|
-
|
|
19
|
+
// Segfault in node-datachannel.
|
|
20
|
+
describe.skip('RtcTransport', () => {
|
|
19
21
|
test('channel open and close', async () => {
|
|
20
22
|
const peer = await createConnection();
|
|
21
23
|
const channel = createChannel(peer);
|
package/src/wire-protocol.ts
CHANGED
|
@@ -5,16 +5,16 @@
|
|
|
5
5
|
import { type Duplex } from 'node:stream';
|
|
6
6
|
|
|
7
7
|
import { type PublicKey } from '@dxos/keys';
|
|
8
|
-
import { Teleport, type
|
|
8
|
+
import { Teleport, type TeleportProps } from '@dxos/teleport';
|
|
9
9
|
|
|
10
|
-
export type
|
|
10
|
+
export type WireProtocolProps = {
|
|
11
11
|
initiator: boolean;
|
|
12
12
|
localPeerId: PublicKey;
|
|
13
13
|
remotePeerId: PublicKey;
|
|
14
14
|
topic: PublicKey;
|
|
15
15
|
};
|
|
16
16
|
|
|
17
|
-
export type WireProtocolProvider = (params:
|
|
17
|
+
export type WireProtocolProvider = (params: WireProtocolProps) => WireProtocol;
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
20
|
* Application-specific network protocol that is used when a connection to a peer is established.
|
|
@@ -31,15 +31,15 @@ export interface WireProtocol {
|
|
|
31
31
|
/**
|
|
32
32
|
* Create a wire-protocol provider backed by a teleport instance.
|
|
33
33
|
* @param onConnection Called after teleport is initialized for the session. Protocol extensions could be attached here.
|
|
34
|
-
* @param
|
|
34
|
+
* @param defaultProps Optionally provide default Teleport params that might be overridden by factory callers.
|
|
35
35
|
* @returns
|
|
36
36
|
*/
|
|
37
37
|
export const createTeleportProtocolFactory = (
|
|
38
38
|
onConnection: (teleport: Teleport) => Promise<void>,
|
|
39
|
-
|
|
39
|
+
defaultProps?: Partial<TeleportProps>,
|
|
40
40
|
): WireProtocolProvider => {
|
|
41
41
|
return (params) => {
|
|
42
|
-
const teleport = new Teleport({ ...
|
|
42
|
+
const teleport = new Teleport({ ...defaultProps, ...params });
|
|
43
43
|
return {
|
|
44
44
|
stream: teleport.stream,
|
|
45
45
|
open: async (sessionId?: PublicKey) => {
|