@dxos/network-manager 0.8.4-main.dedc0f3 → 0.8.4-main.dfabb4ec29
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-VAQETEB2.mjs → chunk-LRGOUKHO.mjs} +697 -2383
- package/dist/lib/browser/chunk-LRGOUKHO.mjs.map +7 -0
- package/dist/lib/browser/index.mjs +198 -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 +88 -140
- package/dist/lib/browser/testing/index.mjs.map +3 -3
- package/dist/lib/browser/transport/tcp/index.mjs +2 -48
- 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 +125 -0
- package/dist/lib/browser/transport/tcp/tcp-transport.mjs.map +7 -0
- package/dist/lib/node-esm/{chunk-RAHYLU4N.mjs → chunk-E6G6B72R.mjs} +697 -2383
- package/dist/lib/node-esm/chunk-E6G6B72R.mjs.map +7 -0
- package/dist/lib/node-esm/index.mjs +198 -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 +88 -140
- package/dist/lib/node-esm/testing/index.mjs.map +3 -3
- package/dist/lib/node-esm/transport/tcp/index.mjs +2 -177
- 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-esm/transport/tcp/tcp-transport.mjs +125 -0
- 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/network-manager.d.ts +6 -6
- package/dist/types/src/network-manager.d.ts.map +1 -1
- package/dist/types/src/signal/ice.d.ts.map +1 -1
- package/dist/types/src/signal/signal-connection.d.ts +3 -2
- package/dist/types/src/signal/signal-connection.d.ts.map +1 -1
- package/dist/types/src/signal/signal-messenger.d.ts +3 -2
- package/dist/types/src/signal/signal-messenger.d.ts.map +1 -1
- package/dist/types/src/signal/swarm-messenger.d.ts +7 -7
- package/dist/types/src/signal/swarm-messenger.d.ts.map +1 -1
- package/dist/types/src/swarm/connection-limiter.d.ts.map +1 -1
- package/dist/types/src/swarm/connection.d.ts +2 -2
- package/dist/types/src/swarm/connection.d.ts.map +1 -1
- package/dist/types/src/swarm/peer.d.ts +4 -3
- package/dist/types/src/swarm/peer.d.ts.map +1 -1
- package/dist/types/src/swarm/swarm-mapper.d.ts.map +1 -1
- package/dist/types/src/swarm/swarm.d.ts +3 -5
- package/dist/types/src/swarm/swarm.d.ts.map +1 -1
- package/dist/types/src/testing/test-builder.d.ts.map +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/tests/property-test-suite.d.ts.map +1 -1
- package/dist/types/src/tests/utils.d.ts.map +1 -1
- package/dist/types/src/topology/fully-connected-topology.d.ts.map +1 -1
- package/dist/types/src/topology/mmst-topology.d.ts.map +1 -1
- package/dist/types/src/topology/star-topology.d.ts.map +1 -1
- package/dist/types/src/transport/memory-transport.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/tcp/tcp-transport.browser.d.ts.map +1 -1
- package/dist/types/src/transport/tcp/tcp-transport.d.ts.map +1 -1
- package/dist/types/src/transport/webrtc/rtc-peer-connection.d.ts +4 -4
- 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.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.map +1 -1
- package/dist/types/src/transport/webrtc/rtc-transport-stats.d.ts.map +1 -1
- package/dist/types/src/transport/webrtc/test-utils.d.ts.map +1 -1
- package/dist/types/src/transport/webrtc/utils.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 +33 -43
- package/src/network-manager.ts +21 -19
- package/src/signal/integration.node.test.ts +11 -10
- package/src/signal/signal-connection.ts +3 -2
- package/src/signal/signal-messenger.ts +3 -2
- package/src/signal/swarm-messenger.node.test.ts +25 -24
- package/src/signal/swarm-messenger.ts +65 -55
- package/src/swarm/connection.test.ts +8 -8
- package/src/swarm/connection.ts +15 -22
- package/src/swarm/peer.ts +7 -7
- package/src/swarm/swarm.test.ts +4 -4
- package/src/swarm/swarm.ts +10 -17
- package/src/testing/test-builder.ts +4 -4
- package/src/tests/basic-test-suite.ts +0 -1
- package/src/tests/memory-transport.test.ts +0 -2
- package/src/tests/property-test-suite.ts +4 -3
- package/src/tests/tcp-transport.node.test.ts +0 -2
- package/src/tests/webrtc-transport.test.ts +4 -3
- package/src/transport/tcp/index.ts +1 -1
- package/src/transport/webrtc/rtc-peer-connection.ts +1 -2
- package/src/transport/webrtc/rtc-transport-channel.test.ts +0 -2
- package/src/transport/webrtc/rtc-transport-channel.ts +1 -2
- package/src/transport/webrtc/rtc-transport-factory.ts +0 -1
- package/src/transport/webrtc/rtc-transport-proxy.test.ts +2 -3
- package/src/transport/webrtc/rtc-transport-proxy.ts +6 -4
- package/src/transport/webrtc/rtc-transport-service.ts +0 -1
- package/src/transport/webrtc/rtc-transport.test.ts +2 -2
- package/src/wire-protocol.ts +6 -6
- package/dist/lib/browser/chunk-VAQETEB2.mjs.map +0 -7
- package/dist/lib/node-esm/chunk-RAHYLU4N.mjs.map +0 -7
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import "@dxos/node-std/globals";
|
|
2
|
+
|
|
3
|
+
// src/transport/tcp/tcp-transport.ts
|
|
4
|
+
import { Socket } from "@dxos/node-std/net";
|
|
5
|
+
import { Event } from "@dxos/async";
|
|
6
|
+
import { ErrorStream } from "@dxos/debug";
|
|
7
|
+
import { log } from "@dxos/log";
|
|
8
|
+
var __dxlog_file = "/__w/dxos/dxos/packages/core/mesh/network-manager/src/transport/tcp/tcp-transport.ts";
|
|
9
|
+
var TcpTransportFactory = {
|
|
10
|
+
createTransport: (options) => new TcpTransport(options)
|
|
11
|
+
};
|
|
12
|
+
var TcpTransport = class {
|
|
13
|
+
options;
|
|
14
|
+
_server = void 0;
|
|
15
|
+
_socket = void 0;
|
|
16
|
+
_connected = false;
|
|
17
|
+
_closed = false;
|
|
18
|
+
closed = new Event();
|
|
19
|
+
connected = new Event();
|
|
20
|
+
errors = new ErrorStream();
|
|
21
|
+
constructor(options) {
|
|
22
|
+
this.options = options;
|
|
23
|
+
}
|
|
24
|
+
get isOpen() {
|
|
25
|
+
return this._connected && !this._closed;
|
|
26
|
+
}
|
|
27
|
+
async open() {
|
|
28
|
+
log("opening", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 29, S: this });
|
|
29
|
+
if (this.options.initiator) {
|
|
30
|
+
setTimeout(async () => {
|
|
31
|
+
const { Server } = await import("@dxos/node-std/net");
|
|
32
|
+
this._server = new Server((socket) => {
|
|
33
|
+
log("new connection", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 36, S: this });
|
|
34
|
+
if (this._connected) {
|
|
35
|
+
socket.destroy();
|
|
36
|
+
}
|
|
37
|
+
this._handleSocket(socket);
|
|
38
|
+
});
|
|
39
|
+
this._server.on("listening", () => {
|
|
40
|
+
const { port } = this._server.address();
|
|
41
|
+
log("listening", {
|
|
42
|
+
port
|
|
43
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 44, S: this });
|
|
44
|
+
void this.options.sendSignal({
|
|
45
|
+
payload: {
|
|
46
|
+
port
|
|
47
|
+
}
|
|
48
|
+
}).catch((err) => {
|
|
49
|
+
if (!this._closed) {
|
|
50
|
+
this.errors.raise(err);
|
|
51
|
+
}
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
this._server.on("error", (err) => {
|
|
55
|
+
this.errors.raise(err);
|
|
56
|
+
});
|
|
57
|
+
this._server.listen(0);
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
return this;
|
|
61
|
+
}
|
|
62
|
+
async close() {
|
|
63
|
+
log("closing", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 66, S: this });
|
|
64
|
+
this._socket?.destroy();
|
|
65
|
+
this._server?.close();
|
|
66
|
+
this._closed = true;
|
|
67
|
+
return this;
|
|
68
|
+
}
|
|
69
|
+
async onSignal({ payload }) {
|
|
70
|
+
log("received signal", {
|
|
71
|
+
payload
|
|
72
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 73, S: this });
|
|
73
|
+
if (this.options.initiator || this._connected) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
const socket = new Socket();
|
|
77
|
+
this._handleSocket(socket);
|
|
78
|
+
socket.connect({
|
|
79
|
+
port: payload.port,
|
|
80
|
+
host: "localhost"
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
async getDetails() {
|
|
84
|
+
if (this.options.initiator) {
|
|
85
|
+
const { port: port2, address: address2 } = this._server?.address();
|
|
86
|
+
return `LISTEN ${address2}:${port2}`;
|
|
87
|
+
}
|
|
88
|
+
const { port, address } = this._socket?.address();
|
|
89
|
+
return `ACCEPT ${address}:${port}`;
|
|
90
|
+
}
|
|
91
|
+
async getStats() {
|
|
92
|
+
return {
|
|
93
|
+
bytesSent: 0,
|
|
94
|
+
bytesReceived: 0,
|
|
95
|
+
packetsSent: 0,
|
|
96
|
+
packetsReceived: 0
|
|
97
|
+
};
|
|
98
|
+
}
|
|
99
|
+
_handleSocket(socket) {
|
|
100
|
+
log("handling socket", {
|
|
101
|
+
remotePort: socket.remotePort,
|
|
102
|
+
localPort: socket.localPort
|
|
103
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 103, S: this });
|
|
104
|
+
this._socket = socket;
|
|
105
|
+
this._socket.on("connect", () => {
|
|
106
|
+
log("connected to", {
|
|
107
|
+
port: this._socket?.remotePort
|
|
108
|
+
}, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 109, S: this });
|
|
109
|
+
this._connected = true;
|
|
110
|
+
});
|
|
111
|
+
this._socket.on("error", (err) => {
|
|
112
|
+
this.errors.raise(err);
|
|
113
|
+
});
|
|
114
|
+
this._socket.on("close", () => {
|
|
115
|
+
this.closed.emit();
|
|
116
|
+
});
|
|
117
|
+
this.connected.emit();
|
|
118
|
+
this.options.stream.pipe(this._socket).pipe(this.options.stream);
|
|
119
|
+
}
|
|
120
|
+
};
|
|
121
|
+
export {
|
|
122
|
+
TcpTransport,
|
|
123
|
+
TcpTransportFactory
|
|
124
|
+
};
|
|
125
|
+
//# sourceMappingURL=tcp-transport.mjs.map
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
{
|
|
2
|
+
"version": 3,
|
|
3
|
+
"sources": ["../../../../../src/transport/tcp/tcp-transport.ts"],
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport { type AddressInfo, type Server, Socket } from 'node:net';\n\nimport { Event } from '@dxos/async';\nimport { ErrorStream } from '@dxos/debug';\nimport { log } from '@dxos/log';\nimport { type Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';\n\nimport { type Transport, type TransportFactory, type TransportOptions, type TransportStats } from '../transport';\n\nexport const TcpTransportFactory: TransportFactory = {\n createTransport: (options) => new TcpTransport(options),\n};\n\n/**\n * Fake transport.\n */\nexport class TcpTransport implements Transport {\n private _server?: Server = undefined;\n private _socket?: Socket = undefined;\n\n private _connected = false;\n private _closed = false;\n\n public readonly closed = new Event<void>();\n public readonly connected = new Event<void>();\n public readonly errors = new ErrorStream();\n\n constructor(private readonly options: TransportOptions) {}\n\n get isOpen() {\n return this._connected && !this._closed;\n }\n\n async open(): Promise<this> {\n log('opening');\n\n // Initiator will send a signal, the receiver will receive the unique ID and connect the streams.\n if (this.options.initiator) {\n // TODO(burdon): Why timeout?\n setTimeout(async () => {\n const { Server } = await import('node:net');\n this._server = new Server((socket) => {\n log('new connection');\n if (this._connected) {\n socket.destroy();\n }\n this._handleSocket(socket);\n });\n\n this._server.on('listening', () => {\n const { port } = this._server!.address() as AddressInfo;\n log('listening', { port });\n void this.options\n .sendSignal({\n payload: { port },\n })\n .catch((err) => {\n if (!this._closed) {\n this.errors.raise(err);\n }\n });\n });\n\n this._server.on('error', (err) => {\n this.errors.raise(err);\n });\n\n this._server.listen(0);\n });\n }\n return this;\n }\n\n async close(): Promise<this> {\n log('closing');\n this._socket?.destroy();\n this._server?.close();\n this._closed = true;\n return this;\n }\n\n async onSignal({ payload }: Signal): Promise<void> {\n log('received signal', { payload });\n if (this.options.initiator || this._connected) {\n return;\n }\n\n const socket = new Socket();\n this._handleSocket(socket);\n socket.connect({ port: payload.port, host: 'localhost' });\n }\n\n async getDetails(): Promise<string> {\n if (this.options.initiator) {\n const { port, address } = this._server?.address() as AddressInfo;\n return `LISTEN ${address}:${port}`;\n }\n\n const { port, address } = this._socket?.address() as AddressInfo;\n return `ACCEPT ${address}:${port}`;\n }\n\n async getStats(): Promise<TransportStats> {\n return {\n bytesSent: 0,\n bytesReceived: 0,\n packetsSent: 0,\n packetsReceived: 0,\n };\n }\n\n private _handleSocket(socket: Socket): void {\n log('handling socket', { remotePort: socket.remotePort, localPort: socket.localPort });\n this._socket = socket;\n\n this._socket.on('connect', () => {\n log('connected to', { port: this._socket?.remotePort });\n this._connected = true;\n });\n\n this._socket.on('error', (err) => {\n this.errors.raise(err);\n });\n\n this._socket.on('close', () => {\n this.closed.emit();\n });\n\n this.connected.emit();\n this.options.stream.pipe(this._socket!).pipe(this.options.stream);\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["Socket", "Event", "ErrorStream", "log", "TcpTransportFactory", "_server", "undefined", "_socket", "_connected", "_closed", "closed", "connected", "errors", "options", "isOpen", "open", "initiator", "setTimeout", "socket", "_handleSocket", "port", "listen", "close", "onSignal", "payload", "host", "address", "getStats", "bytesSent", "bytesReceived", "packetsSent", "packetsReceived", "remotePort", "localPort", "on", "emit"]
|
|
7
|
+
}
|