@dxos/network-manager 0.1.2 → 0.1.4
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/src/connection-log.d.ts +1 -1
- package/dist/src/connection-log.d.ts.map +1 -1
- package/dist/src/network-manager.test.js +10 -13
- package/dist/src/network-manager.test.js.map +1 -1
- package/dist/src/swarm/connection.d.ts.map +1 -1
- package/dist/src/swarm/connection.js +14 -10
- package/dist/src/swarm/connection.js.map +1 -1
- package/dist/src/transport/memory-transport.d.ts +6 -13
- package/dist/src/transport/memory-transport.d.ts.map +1 -1
- package/dist/src/transport/memory-transport.js +41 -35
- package/dist/src/transport/memory-transport.js.map +1 -1
- package/dist/src/transport/memory-transport.test.js +14 -3
- package/dist/src/transport/memory-transport.test.js.map +1 -1
- package/dist/src/transport/transport.d.ts +1 -7
- package/dist/src/transport/transport.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport-proxy.d.ts +3 -9
- package/dist/src/transport/webrtc-transport-proxy.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport-proxy.js +12 -17
- package/dist/src/transport/webrtc-transport-proxy.js.map +1 -1
- package/dist/src/transport/webrtc-transport-proxy.test.js +14 -40
- package/dist/src/transport/webrtc-transport-proxy.test.js.map +1 -1
- package/dist/src/transport/webrtc-transport-service.d.ts +1 -4
- package/dist/src/transport/webrtc-transport-service.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport-service.js +32 -36
- package/dist/src/transport/webrtc-transport-service.js.map +1 -1
- package/dist/src/transport/webrtc-transport.d.ts +8 -13
- package/dist/src/transport/webrtc-transport.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport.js +18 -44
- package/dist/src/transport/webrtc-transport.js.map +1 -1
- package/dist/src/transport/webrtc-transport.test.js +25 -14
- package/dist/src/transport/webrtc-transport.test.js.map +1 -1
- package/package.json +16 -16
- package/src/connection-log.ts +1 -1
- package/src/network-manager.test.ts +0 -3
- package/src/swarm/connection.ts +9 -5
- package/src/transport/memory-transport.test.ts +14 -15
- package/src/transport/memory-transport.ts +48 -49
- package/src/transport/transport.ts +1 -9
- package/src/transport/webrtc-transport-proxy.test.ts +16 -51
- package/src/transport/webrtc-transport-proxy.ts +13 -23
- package/src/transport/webrtc-transport-service.ts +34 -39
- package/src/transport/webrtc-transport.test.ts +17 -30
- package/src/transport/webrtc-transport.ts +22 -54
|
@@ -27,15 +27,16 @@ class WebRTCTransportProxy {
|
|
|
27
27
|
initiator: this._params.initiator
|
|
28
28
|
});
|
|
29
29
|
this._serviceStream.waitUntilReady().then(() => {
|
|
30
|
-
this._serviceStream.subscribe(async (
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
this._serviceStream.subscribe(async (event) => {
|
|
31
|
+
(0, log_1.log)('WebRTCTransportProxy: event', event, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 45 });
|
|
32
|
+
if (event.connection) {
|
|
33
|
+
await this._handleConnection(event.connection);
|
|
33
34
|
}
|
|
34
|
-
else if (
|
|
35
|
-
this._handleData(
|
|
35
|
+
else if (event.data) {
|
|
36
|
+
this._handleData(event.data);
|
|
36
37
|
}
|
|
37
|
-
else if (
|
|
38
|
-
await this._handleSignal(
|
|
38
|
+
else if (event.signal) {
|
|
39
|
+
await this._handleSignal(event.signal);
|
|
39
40
|
}
|
|
40
41
|
});
|
|
41
42
|
this._params.stream.on('data', async (data) => {
|
|
@@ -46,10 +47,10 @@ class WebRTCTransportProxy {
|
|
|
46
47
|
});
|
|
47
48
|
}
|
|
48
49
|
catch (err) {
|
|
49
|
-
log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line:
|
|
50
|
+
log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 62 });
|
|
50
51
|
}
|
|
51
52
|
});
|
|
52
|
-
}, (error) => log_1.log.catch(error, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line:
|
|
53
|
+
}, (error) => log_1.log.catch(error, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 66 }));
|
|
53
54
|
}
|
|
54
55
|
async _handleConnection(connectionEvent) {
|
|
55
56
|
if (connectionEvent.error) {
|
|
@@ -71,13 +72,7 @@ class WebRTCTransportProxy {
|
|
|
71
72
|
this._params.stream.write(Buffer.from(dataEvent.payload));
|
|
72
73
|
}
|
|
73
74
|
async _handleSignal(signalEvent) {
|
|
74
|
-
await this._params.sendSignal(
|
|
75
|
-
author: this._params.ownId,
|
|
76
|
-
recipient: this._params.remoteId,
|
|
77
|
-
topic: this._params.topic,
|
|
78
|
-
sessionId: this._params.sessionId,
|
|
79
|
-
data: { signal: signalEvent.payload }
|
|
80
|
-
});
|
|
75
|
+
await this._params.sendSignal(signalEvent.payload);
|
|
81
76
|
}
|
|
82
77
|
async signal(signal) {
|
|
83
78
|
await this._params.bridgeService.sendSignal({
|
|
@@ -94,7 +89,7 @@ class WebRTCTransportProxy {
|
|
|
94
89
|
await this._params.bridgeService.close({ proxyId: this._proxyId });
|
|
95
90
|
}
|
|
96
91
|
catch (err) {
|
|
97
|
-
log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line:
|
|
92
|
+
log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-proxy.ts", line: 111 });
|
|
98
93
|
}
|
|
99
94
|
this.closed.emit();
|
|
100
95
|
this._closed = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport-proxy.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAE5B,uCAAoC;AAEpC,uCAA0C;AAC1C,qCAAuC;AACvC,mCAAgC;AAChC,mEAAqG;
|
|
1
|
+
{"version":3,"file":"webrtc-transport-proxy.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,11 +21,12 @@ const testing_1 = require("../testing");
|
|
|
21
21
|
const webrtc_transport_proxy_1 = require("./webrtc-transport-proxy");
|
|
22
22
|
const webrtc_transport_service_1 = require("./webrtc-transport-service");
|
|
23
23
|
describe('WebRTCTransportProxy', function () {
|
|
24
|
-
const setupProxy = async ({ initiator = true,
|
|
24
|
+
const setupProxy = async ({ initiator = true, stream = new stream_1.Duplex({ write: () => { }, read: () => { } }), sendSignal = async () => { } } = {}) => {
|
|
25
25
|
const [port1, port2] = (0, rpc_1.createLinkedPorts)();
|
|
26
|
+
// Starting BridgeService
|
|
26
27
|
const webRTCTransportService = new webrtc_transport_service_1.WebRTCTransportService();
|
|
27
28
|
// Starting BridgeService
|
|
28
|
-
const
|
|
29
|
+
const rpcService = (0, rpc_1.createProtoRpcPeer)({
|
|
29
30
|
requested: {},
|
|
30
31
|
exposed: {
|
|
31
32
|
BridgeService: protocols_1.schema.getService('dxos.mesh.bridge.BridgeService')
|
|
@@ -37,15 +38,13 @@ describe('WebRTCTransportProxy', function () {
|
|
|
37
38
|
preserveAny: true
|
|
38
39
|
}
|
|
39
40
|
});
|
|
40
|
-
await
|
|
41
|
-
(0, testutils_1.afterTest)(() =>
|
|
41
|
+
await rpcService.open();
|
|
42
|
+
(0, testutils_1.afterTest)(() => rpcService.close());
|
|
42
43
|
// Starting RPC client
|
|
43
44
|
const rpcClient = (0, rpc_1.createProtoRpcPeer)({
|
|
44
45
|
requested: {
|
|
45
46
|
BridgeService: protocols_1.schema.getService('dxos.mesh.bridge.BridgeService')
|
|
46
47
|
},
|
|
47
|
-
exposed: {},
|
|
48
|
-
handlers: {},
|
|
49
48
|
port: port2,
|
|
50
49
|
noHandshake: true,
|
|
51
50
|
encodingOptions: {
|
|
@@ -57,15 +56,11 @@ describe('WebRTCTransportProxy', function () {
|
|
|
57
56
|
const webRTCTransportProxy = new webrtc_transport_proxy_1.WebRTCTransportProxy({
|
|
58
57
|
initiator,
|
|
59
58
|
stream,
|
|
60
|
-
ownId,
|
|
61
|
-
remoteId,
|
|
62
|
-
sessionId,
|
|
63
|
-
topic,
|
|
64
59
|
sendSignal,
|
|
65
60
|
bridgeService: rpcClient.rpc.BridgeService
|
|
66
61
|
});
|
|
67
62
|
(0, testutils_1.afterTest)(async () => await webRTCTransportProxy.close());
|
|
68
|
-
return { webRTCService, webRTCTransportProxy };
|
|
63
|
+
return { webRTCService: rpcService, webRTCTransportProxy };
|
|
69
64
|
};
|
|
70
65
|
// This doesn't clean up correctly and crashes with SIGSEGV / SIGABRT at the end. Probably an issue with wrtc package.
|
|
71
66
|
it('open and close', async function () {
|
|
@@ -89,7 +84,6 @@ describe('WebRTCTransportProxy', function () {
|
|
|
89
84
|
const topic = keys_1.PublicKey.random();
|
|
90
85
|
const peer1Id = keys_1.PublicKey.random();
|
|
91
86
|
const peer2Id = keys_1.PublicKey.random();
|
|
92
|
-
const sessionId = keys_1.PublicKey.random();
|
|
93
87
|
const plugin1 = new testing_1.TestProtocolPlugin(peer1Id.asBuffer());
|
|
94
88
|
const protocolProvider1 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
|
|
95
89
|
const { webRTCTransportProxy: connection1 } = await setupProxy({
|
|
@@ -98,13 +92,9 @@ describe('WebRTCTransportProxy', function () {
|
|
|
98
92
|
channel: (0, crypto_1.discoveryKey)(topic),
|
|
99
93
|
initiator: true
|
|
100
94
|
}).stream,
|
|
101
|
-
|
|
102
|
-
remoteId: peer2Id,
|
|
103
|
-
sessionId,
|
|
104
|
-
topic,
|
|
105
|
-
sendSignal: async (msg) => {
|
|
95
|
+
sendSignal: async (signal) => {
|
|
106
96
|
await (0, async_1.sleep)(10);
|
|
107
|
-
await connection2.signal(
|
|
97
|
+
await connection2.signal(signal);
|
|
108
98
|
}
|
|
109
99
|
});
|
|
110
100
|
(0, testutils_1.afterTest)(() => connection1.errors.assertNoUnhandledErrors());
|
|
@@ -116,13 +106,9 @@ describe('WebRTCTransportProxy', function () {
|
|
|
116
106
|
channel: (0, crypto_1.discoveryKey)(topic),
|
|
117
107
|
initiator: false
|
|
118
108
|
}).stream,
|
|
119
|
-
|
|
120
|
-
remoteId: peer1Id,
|
|
121
|
-
sessionId,
|
|
122
|
-
topic,
|
|
123
|
-
sendSignal: async (msg) => {
|
|
109
|
+
sendSignal: async (signal) => {
|
|
124
110
|
await (0, async_1.sleep)(10);
|
|
125
|
-
await connection1.signal(
|
|
111
|
+
await connection1.signal(signal);
|
|
126
112
|
}
|
|
127
113
|
});
|
|
128
114
|
(0, testutils_1.afterTest)(() => connection2.errors.assertNoUnhandledErrors());
|
|
@@ -150,7 +136,6 @@ describe('WebRTCTransportProxy', function () {
|
|
|
150
136
|
const [port1, port2] = (0, rpc_1.createLinkedPorts)();
|
|
151
137
|
const webRTCTransportService = new webrtc_transport_service_1.WebRTCTransportService();
|
|
152
138
|
service = (0, rpc_1.createProtoRpcPeer)({
|
|
153
|
-
requested: {},
|
|
154
139
|
exposed: {
|
|
155
140
|
BridgeService: protocols_1.schema.getService('dxos.mesh.bridge.BridgeService')
|
|
156
141
|
},
|
|
@@ -166,8 +151,6 @@ describe('WebRTCTransportProxy', function () {
|
|
|
166
151
|
requested: {
|
|
167
152
|
BridgeService: protocols_1.schema.getService('dxos.mesh.bridge.BridgeService')
|
|
168
153
|
},
|
|
169
|
-
exposed: {},
|
|
170
|
-
handlers: {},
|
|
171
154
|
port: port2,
|
|
172
155
|
noHandshake: true,
|
|
173
156
|
encodingOptions: {
|
|
@@ -184,7 +167,6 @@ describe('WebRTCTransportProxy', function () {
|
|
|
184
167
|
const topic = keys_1.PublicKey.random();
|
|
185
168
|
const peer1Id = keys_1.PublicKey.random();
|
|
186
169
|
const peer2Id = keys_1.PublicKey.random();
|
|
187
|
-
const sessionId = keys_1.PublicKey.random();
|
|
188
170
|
const plugin1 = new testing_1.TestProtocolPlugin(peer1Id.asBuffer());
|
|
189
171
|
const protocolProvider1 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
|
|
190
172
|
const proxy1 = new webrtc_transport_proxy_1.WebRTCTransportProxy({
|
|
@@ -193,13 +175,9 @@ describe('WebRTCTransportProxy', function () {
|
|
|
193
175
|
channel: (0, crypto_1.discoveryKey)(topic),
|
|
194
176
|
initiator: true
|
|
195
177
|
}).stream,
|
|
196
|
-
|
|
197
|
-
remoteId: peer2Id,
|
|
198
|
-
sessionId,
|
|
199
|
-
topic,
|
|
200
|
-
sendSignal: async (msg) => {
|
|
178
|
+
sendSignal: async (signal) => {
|
|
201
179
|
await (0, async_1.sleep)(10);
|
|
202
|
-
await proxy2.signal(
|
|
180
|
+
await proxy2.signal(signal);
|
|
203
181
|
},
|
|
204
182
|
bridgeService: rpcClient.rpc.BridgeService
|
|
205
183
|
});
|
|
@@ -212,13 +190,9 @@ describe('WebRTCTransportProxy', function () {
|
|
|
212
190
|
channel: (0, crypto_1.discoveryKey)(topic),
|
|
213
191
|
initiator: false
|
|
214
192
|
}).stream,
|
|
215
|
-
|
|
216
|
-
remoteId: peer1Id,
|
|
217
|
-
sessionId,
|
|
218
|
-
topic,
|
|
219
|
-
sendSignal: async (msg) => {
|
|
193
|
+
sendSignal: async (signal) => {
|
|
220
194
|
await (0, async_1.sleep)(10);
|
|
221
|
-
await proxy1.signal(
|
|
195
|
+
await proxy1.signal(signal);
|
|
222
196
|
},
|
|
223
197
|
bridgeService: rpcClient.rpc.BridgeService
|
|
224
198
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport-proxy.test.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,8BAA8B;AAE9B,oDAA4B;AAC5B,mCAAgC;AAChC,sEAA4C;AAE5C,uCAAoC;AACpC,yCAA4C;AAC5C,qCAAuC;AACvC,uDAA+C;AAC/C,+CAAyC;
|
|
1
|
+
{"version":3,"file":"webrtc-transport-proxy.test.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
|
-
import SimplePeerConstructor from 'simple-peer';
|
|
2
1
|
import { Stream } from '@dxos/codec-protobuf';
|
|
3
|
-
import { PublicKey } from '@dxos/keys';
|
|
4
2
|
import { BridgeService, ConnectionRequest, SignalRequest, DataRequest, BridgeEvent, CloseRequest } from '@dxos/protocols/proto/dxos/mesh/bridge';
|
|
5
|
-
import { ComplexMap } from '@dxos/util';
|
|
6
3
|
export declare class WebRTCTransportService implements BridgeService {
|
|
7
4
|
private readonly _webrtcConfig?;
|
|
8
|
-
|
|
5
|
+
private readonly transports;
|
|
9
6
|
constructor(_webrtcConfig?: any);
|
|
10
7
|
open(request: ConnectionRequest): Stream<BridgeEvent>;
|
|
11
8
|
sendSignal({ proxyId, signal }: SignalRequest): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport-service.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webrtc-transport-service.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-service.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAG9C,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,aAAa,EACb,WAAW,EACX,WAAW,EAEX,YAAY,EACb,MAAM,wCAAwC,CAAC;AAKhD,qBAAa,sBAAuB,YAAW,aAAa;IAOxD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IANjC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAEzB;gBAIiB,aAAa,CAAC,KAAK;IAGtC,IAAI,CAAC,OAAO,EAAE,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC;IA4D/C,UAAU,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7D,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAK1D,KAAK,CAAC,EAAE,OAAO,EAAE,EAAE,YAAY;CAMtC"}
|
|
@@ -8,55 +8,50 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.WebRTCTransportService = void 0;
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
|
-
const
|
|
11
|
+
const stream_1 = require("stream");
|
|
12
12
|
const codec_protobuf_1 = require("@dxos/codec-protobuf");
|
|
13
|
-
const debug_1 = require("@dxos/debug");
|
|
14
13
|
const keys_1 = require("@dxos/keys");
|
|
15
14
|
const log_1 = require("@dxos/log");
|
|
16
15
|
const bridge_1 = require("@dxos/protocols/proto/dxos/mesh/bridge");
|
|
17
16
|
const util_1 = require("@dxos/util");
|
|
18
|
-
const
|
|
17
|
+
const webrtc_transport_1 = require("./webrtc-transport");
|
|
19
18
|
class WebRTCTransportService {
|
|
20
19
|
// prettier-ignore
|
|
21
20
|
constructor(_webrtcConfig) {
|
|
22
21
|
this._webrtcConfig = _webrtcConfig;
|
|
23
|
-
this.
|
|
22
|
+
this.transports = new util_1.ComplexMap(keys_1.PublicKey.hash);
|
|
24
23
|
}
|
|
25
24
|
open(request) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
const rpcStream = new codec_protobuf_1.Stream(({ ready, next, close }) => {
|
|
26
|
+
const duplex = new stream_1.Duplex({
|
|
27
|
+
read: () => { },
|
|
28
|
+
write: function (chunk, _, callback) {
|
|
29
|
+
next({ data: { payload: chunk } });
|
|
30
|
+
callback();
|
|
31
|
+
}
|
|
32
|
+
});
|
|
33
|
+
const transport = new webrtc_transport_1.WebRTCTransport({
|
|
29
34
|
initiator: request.initiator,
|
|
30
|
-
|
|
31
|
-
|
|
35
|
+
stream: duplex,
|
|
36
|
+
sendSignal: async (signal) => {
|
|
37
|
+
next({
|
|
38
|
+
signal: { payload: signal }
|
|
39
|
+
});
|
|
40
|
+
}
|
|
32
41
|
});
|
|
33
42
|
next({
|
|
34
43
|
connection: {
|
|
35
44
|
state: bridge_1.ConnectionState.CONNECTING
|
|
36
45
|
}
|
|
37
46
|
});
|
|
38
|
-
|
|
39
|
-
next({
|
|
40
|
-
data: {
|
|
41
|
-
payload
|
|
42
|
-
}
|
|
43
|
-
});
|
|
44
|
-
});
|
|
45
|
-
peer.on('signal', async (data) => {
|
|
46
|
-
next({
|
|
47
|
-
signal: {
|
|
48
|
-
payload: { json: JSON.stringify(data) }
|
|
49
|
-
}
|
|
50
|
-
});
|
|
51
|
-
});
|
|
52
|
-
peer.on('connect', () => {
|
|
47
|
+
transport.connected.on(() => {
|
|
53
48
|
next({
|
|
54
49
|
connection: {
|
|
55
50
|
state: bridge_1.ConnectionState.CONNECTED
|
|
56
51
|
}
|
|
57
52
|
});
|
|
58
53
|
});
|
|
59
|
-
|
|
54
|
+
transport.errors.handle((err) => {
|
|
60
55
|
next({
|
|
61
56
|
connection: {
|
|
62
57
|
state: bridge_1.ConnectionState.CLOSED,
|
|
@@ -65,7 +60,7 @@ class WebRTCTransportService {
|
|
|
65
60
|
});
|
|
66
61
|
close(err);
|
|
67
62
|
});
|
|
68
|
-
|
|
63
|
+
transport.closed.on(() => {
|
|
69
64
|
next({
|
|
70
65
|
connection: {
|
|
71
66
|
state: bridge_1.ConnectionState.CLOSED
|
|
@@ -73,24 +68,25 @@ class WebRTCTransportService {
|
|
|
73
68
|
});
|
|
74
69
|
close();
|
|
75
70
|
});
|
|
76
|
-
this.peers.set(request.proxyId, peer);
|
|
77
71
|
ready();
|
|
72
|
+
this.transports.set(request.proxyId, { transport, stream: duplex });
|
|
78
73
|
});
|
|
74
|
+
return rpcStream;
|
|
79
75
|
}
|
|
80
76
|
async sendSignal({ proxyId, signal }) {
|
|
81
|
-
(0, assert_1.default)(this.
|
|
82
|
-
|
|
83
|
-
this.peers.get(proxyId).signal(JSON.parse(signal.json));
|
|
77
|
+
(0, assert_1.default)(this.transports.has(proxyId));
|
|
78
|
+
await this.transports.get(proxyId).transport.signal(signal);
|
|
84
79
|
}
|
|
85
80
|
async sendData({ proxyId, payload }) {
|
|
86
|
-
(0, assert_1.default)(this.
|
|
87
|
-
this.
|
|
81
|
+
(0, assert_1.default)(this.transports.has(proxyId));
|
|
82
|
+
await this.transports.get(proxyId).stream.push(payload);
|
|
88
83
|
}
|
|
89
84
|
async close({ proxyId }) {
|
|
90
|
-
var _a;
|
|
91
|
-
(_a = this.
|
|
92
|
-
this.
|
|
93
|
-
|
|
85
|
+
var _a, _b;
|
|
86
|
+
await ((_a = this.transports.get(proxyId)) === null || _a === void 0 ? void 0 : _a.transport.close());
|
|
87
|
+
await ((_b = this.transports.get(proxyId)) === null || _b === void 0 ? void 0 : _b.stream.end());
|
|
88
|
+
this.transports.delete(proxyId);
|
|
89
|
+
(0, log_1.log)('Closed.', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport-service.ts", line: 108 });
|
|
94
90
|
}
|
|
95
91
|
}
|
|
96
92
|
exports.WebRTCTransportService = WebRTCTransportService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport-service.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-service.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"webrtc-transport-service.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,29 +2,24 @@
|
|
|
2
2
|
import SimplePeerConstructor from 'simple-peer';
|
|
3
3
|
import { Event } from '@dxos/async';
|
|
4
4
|
import { ErrorStream } from '@dxos/debug';
|
|
5
|
-
import { PublicKey } from '@dxos/keys';
|
|
6
5
|
import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
|
|
7
|
-
import { SignalMessage } from '../signal';
|
|
8
6
|
import { Transport, TransportFactory } from './transport';
|
|
7
|
+
export declare type WebRTCTransportParams = {
|
|
8
|
+
initiator: boolean;
|
|
9
|
+
stream: NodeJS.ReadWriteStream;
|
|
10
|
+
webrtcConfig?: any;
|
|
11
|
+
sendSignal: (signal: Signal) => Promise<void>;
|
|
12
|
+
};
|
|
9
13
|
/**
|
|
10
14
|
* Implements Transport for WebRTC. Uses simple-peer under the hood.
|
|
11
15
|
*/
|
|
12
16
|
export declare class WebRTCTransport implements Transport {
|
|
13
|
-
private readonly
|
|
14
|
-
private readonly _stream;
|
|
15
|
-
private readonly _ownId;
|
|
16
|
-
private readonly _remoteId;
|
|
17
|
-
private readonly _sessionId;
|
|
18
|
-
private readonly _topic;
|
|
19
|
-
private readonly _sendSignal;
|
|
20
|
-
private readonly _webrtcConfig?;
|
|
17
|
+
private readonly params;
|
|
21
18
|
private readonly _peer;
|
|
22
19
|
readonly closed: Event<void>;
|
|
23
20
|
readonly connected: Event<void>;
|
|
24
21
|
readonly errors: ErrorStream;
|
|
25
|
-
constructor(
|
|
26
|
-
get remoteId(): PublicKey;
|
|
27
|
-
get sessionId(): PublicKey;
|
|
22
|
+
constructor(params: WebRTCTransportParams);
|
|
28
23
|
get peer(): SimplePeerConstructor.Instance;
|
|
29
24
|
close(): Promise<void>;
|
|
30
25
|
signal(signal: Signal): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":";AAKA,OAAO,qBAAiD,MAAM,aAAa,CAAC;AAE5E,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAS,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"webrtc-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":";AAKA,OAAO,qBAAiD,MAAM,aAAa,CAAC;AAE5E,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAS,MAAM,aAAa,CAAC;AAEjD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAG1D,oBAAY,qBAAqB,GAAG;IAClC,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF;;GAEG;AACH,qBAAa,eAAgB,YAAW,SAAS;IAOnC,OAAO,CAAC,QAAQ,CAAC,MAAM;IANnC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAa;IAEnC,QAAQ,CAAC,MAAM,cAAe;IAC9B,QAAQ,CAAC,SAAS,cAAe;IACjC,QAAQ,CAAC,MAAM,cAAqB;gBAEP,MAAM,EAAE,qBAAqB;IA+B1D,IAAI,IAAI,mCAEP;IAEK,KAAK;IAQL,MAAM,CAAC,MAAM,EAAE,MAAM;YAMb,kBAAkB;CAIjC;AAGD,eAAO,MAAM,4BAA4B,kBAAmB,GAAG,KAAG,gBAMhE,CAAC"}
|
|
@@ -17,51 +17,28 @@ const webrtc_1 = require("./webrtc");
|
|
|
17
17
|
* Implements Transport for WebRTC. Uses simple-peer under the hood.
|
|
18
18
|
*/
|
|
19
19
|
class WebRTCTransport {
|
|
20
|
-
constructor(
|
|
21
|
-
this.
|
|
22
|
-
this._stream = _stream;
|
|
23
|
-
this._ownId = _ownId;
|
|
24
|
-
this._remoteId = _remoteId;
|
|
25
|
-
this._sessionId = _sessionId;
|
|
26
|
-
this._topic = _topic;
|
|
27
|
-
this._sendSignal = _sendSignal;
|
|
28
|
-
this._webrtcConfig = _webrtcConfig;
|
|
20
|
+
constructor(params) {
|
|
21
|
+
this.params = params;
|
|
29
22
|
this.closed = new async_1.Event();
|
|
30
23
|
this.connected = new async_1.Event();
|
|
31
24
|
this.errors = new debug_1.ErrorStream();
|
|
32
|
-
(0, log_1.log)('created connection', {
|
|
33
|
-
id: this._ownId,
|
|
34
|
-
topic: this._topic,
|
|
35
|
-
remoteId: this._remoteId,
|
|
36
|
-
initiator: this._initiator,
|
|
37
|
-
config: this._webrtcConfig
|
|
38
|
-
}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 38 });
|
|
25
|
+
(0, log_1.log)('created connection', params, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 34 });
|
|
39
26
|
this._peer = new simple_peer_1.default({
|
|
40
|
-
initiator: this.
|
|
27
|
+
initiator: this.params.initiator,
|
|
41
28
|
wrtc: simple_peer_1.default.WEBRTC_SUPPORT ? undefined : webrtc_1.wrtc !== null && webrtc_1.wrtc !== void 0 ? webrtc_1.wrtc : (0, debug_1.raise)(new Error('wrtc not available')),
|
|
42
|
-
config: this.
|
|
29
|
+
config: this.params.webrtcConfig
|
|
43
30
|
});
|
|
44
31
|
this._peer.on('signal', async (data) => {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
author: this._ownId,
|
|
48
|
-
recipient: this._remoteId,
|
|
49
|
-
sessionId: this._sessionId,
|
|
50
|
-
topic: this._topic,
|
|
51
|
-
data: { signal: { json: JSON.stringify(data) } }
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
catch (err) {
|
|
55
|
-
this.errors.raise(err);
|
|
56
|
-
}
|
|
32
|
+
(0, log_1.log)('signal', data, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 42 });
|
|
33
|
+
await this.params.sendSignal({ json: JSON.stringify(data) });
|
|
57
34
|
});
|
|
58
35
|
this._peer.on('connect', () => {
|
|
59
|
-
(0, log_1.log)('connected', {
|
|
60
|
-
this.
|
|
36
|
+
(0, log_1.log)('connected', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 47 });
|
|
37
|
+
this.params.stream.pipe(this._peer).pipe(this.params.stream);
|
|
61
38
|
this.connected.emit();
|
|
62
39
|
});
|
|
63
40
|
this._peer.on('close', async () => {
|
|
64
|
-
(0, log_1.log)('closed', {
|
|
41
|
+
(0, log_1.log)('closed', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 53 });
|
|
65
42
|
await this._disconnectStreams();
|
|
66
43
|
this.closed.emit();
|
|
67
44
|
});
|
|
@@ -70,20 +47,15 @@ class WebRTCTransport {
|
|
|
70
47
|
await this.close();
|
|
71
48
|
});
|
|
72
49
|
}
|
|
73
|
-
get remoteId() {
|
|
74
|
-
return this._remoteId;
|
|
75
|
-
}
|
|
76
|
-
get sessionId() {
|
|
77
|
-
return this._sessionId;
|
|
78
|
-
}
|
|
79
50
|
get peer() {
|
|
80
51
|
return this._peer;
|
|
81
52
|
}
|
|
82
53
|
async close() {
|
|
83
|
-
(0, log_1.log)('closing...', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line:
|
|
54
|
+
(0, log_1.log)('closing...', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 69 });
|
|
84
55
|
await this._disconnectStreams();
|
|
85
56
|
this._peer.destroy();
|
|
86
|
-
|
|
57
|
+
this.closed.emit();
|
|
58
|
+
(0, log_1.log)('closed', {}, { file: "packages/core/mesh/network-manager/src/transport/webrtc-transport.ts", line: 73 });
|
|
87
59
|
}
|
|
88
60
|
async signal(signal) {
|
|
89
61
|
(0, node_assert_1.default)(this._peer, 'Connection not ready to accept signals.');
|
|
@@ -93,14 +65,16 @@ class WebRTCTransport {
|
|
|
93
65
|
async _disconnectStreams() {
|
|
94
66
|
var _a, _b, _c, _d;
|
|
95
67
|
// TODO(rzadp): Find a way of unpiping this?
|
|
96
|
-
(_d = (_c = (_b = (_a = this.
|
|
68
|
+
(_d = (_c = (_b = (_a = this.params.stream).unpipe) === null || _b === void 0 ? void 0 : _b.call(_a, this._peer)) === null || _c === void 0 ? void 0 : _c.unpipe) === null || _d === void 0 ? void 0 : _d.call(_c, this.params.stream);
|
|
97
69
|
}
|
|
98
70
|
}
|
|
99
71
|
exports.WebRTCTransport = WebRTCTransport;
|
|
100
72
|
// TODO(dmaretskyi): Convert to class.
|
|
101
73
|
const createWebRTCTransportFactory = (webrtcConfig) => ({
|
|
102
|
-
create: (
|
|
103
|
-
|
|
74
|
+
create: (params) => new WebRTCTransport({
|
|
75
|
+
...params,
|
|
76
|
+
webrtcConfig
|
|
77
|
+
})
|
|
104
78
|
});
|
|
105
79
|
exports.createWebRTCTransportFactory = createWebRTCTransportFactory;
|
|
106
80
|
//# sourceMappingURL=webrtc-transport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,8DAAiC;AACjC,8DAA4E;AAE5E,uCAAoC;AACpC,uCAAiD;
|
|
1
|
+
{"version":3,"file":"webrtc-transport.js","sourceRoot":"","sources":["../../../src/transport/webrtc-transport.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,8DAAiC;AACjC,8DAA4E;AAE5E,uCAAoC;AACpC,uCAAiD;AACjD,mCAAgC;AAIhC,qCAAgC;AAShC;;GAEG;AACH,MAAa,eAAe;IAO1B,YAA6B,MAA6B;QAA7B,WAAM,GAAN,MAAM,CAAuB;QAJjD,WAAM,GAAG,IAAI,aAAK,EAAE,CAAC;QACrB,cAAS,GAAG,IAAI,aAAK,EAAE,CAAC;QACxB,WAAM,GAAG,IAAI,mBAAW,EAAE,CAAC;QAGlC,IAAA,SAAG,EAAC,oBAAoB,EAAE,MAAM,6FAAC,CAAC;QAClC,IAAI,CAAC,KAAK,GAAG,IAAI,qBAAqB,CAAC;YACrC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;YAChC,IAAI,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAI,aAAJ,aAAI,cAAJ,aAAI,GAAI,IAAA,aAAK,EAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACvG,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrC,IAAA,SAAG,EAAC,QAAQ,EAAE,IAAI,6FAAC,CAAC;YACpB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YAC5B,IAAA,SAAG,EAAC,WAAW,iGAAC,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC9D,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACxB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAChC,IAAA,SAAG,EAAC,QAAQ,iGAAC,CAAC;YACd,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACvB,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACrB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAA,SAAG,EAAC,YAAY,iGAAC,CAAC;QAClB,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAChC,IAAI,CAAC,KAAM,CAAC,OAAO,EAAE,CAAC;QACtB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QACnB,IAAA,SAAG,EAAC,QAAQ,iGAAC,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,MAAc;QACzB,IAAA,qBAAM,EAAC,IAAI,CAAC,KAAK,EAAE,yCAAyC,CAAC,CAAC;QAC9D,IAAA,qBAAM,EAAC,MAAM,CAAC,IAAI,EAAE,0CAA0C,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,CAAC;IAEO,KAAK,CAAC,kBAAkB;;QAC9B,4CAA4C;QAC5C,MAAA,MAAA,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,MAAM,EAAC,MAAM,mDAAG,IAAI,CAAC,KAAK,CAAC,0CAAE,MAAM,mDAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxE,CAAC;CACF;AA5DD,0CA4DC;AAED,sCAAsC;AAC/B,MAAM,4BAA4B,GAAG,CAAC,YAAkB,EAAoB,EAAE,CAAC,CAAC;IACrF,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CACjB,IAAI,eAAe,CAAC;QAClB,GAAG,MAAM;QACT,YAAY;KACb,CAAC;CACL,CAAC,CAAC;AANU,QAAA,4BAA4B,gCAMtC"}
|