@dxos/network-manager 0.1.3 → 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/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 +15 -35
- 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/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 +17 -46
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE3D;;GAEG;AACH,oBAAY,eAAe;IACzB;;;OAGG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,qBAAqB,0BAA0B;IAE/C;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,qBAAa,UAAU;aASH,KAAK,EAAE,SAAS;aAChB,KAAK,EAAE,SAAS;aAChB,QAAQ,EAAE,SAAS;aACnB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,OAAO;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAfpC,OAAO,CAAC,MAAM,CAA4C;IAC1D,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IAExC,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;gBAGlB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAAE,wBAAwB;IAC1C,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,gBAAgB,EAAE,eAAe,EACjC,SAAS,EAAE,QAAQ,EACnB,iBAAiB,EAAE,gBAAgB;IAGtD,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,aAEX;IAGD,QAAQ;IAmCR,IAAI;
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAG/C,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAE3D;;GAEG;AACH,oBAAY,eAAe;IACzB;;;OAGG;IACH,OAAO,YAAY;IAEnB;;OAEG;IACH,qBAAqB,0BAA0B;IAE/C;;OAEG;IACH,UAAU,eAAe;IAEzB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,QAAQ,aAAa;IAErB;;OAEG;IACH,SAAS,cAAc;IAEvB;;OAEG;IACH,MAAM,WAAW;CAClB;AAED;;GAEG;AACH,qBAAa,UAAU;aASH,KAAK,EAAE,SAAS;aAChB,KAAK,EAAE,SAAS;aAChB,QAAQ,EAAE,SAAS;aACnB,SAAS,EAAE,SAAS;aACpB,SAAS,EAAE,OAAO;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAfpC,OAAO,CAAC,MAAM,CAA4C;IAC1D,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,gBAAgB,CAAgB;IAExC,QAAQ,CAAC,YAAY,yBAAgC;IACrD,QAAQ,CAAC,MAAM,cAAqB;gBAGlB,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,EAAE,wBAAwB;IAC1C,QAAQ,EAAE,SAAS,EACnB,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,EACjB,gBAAgB,EAAE,eAAe,EACjC,SAAS,EAAE,QAAQ,EACnB,iBAAiB,EAAE,gBAAgB;IAGtD,IAAI,KAAK,oBAER;IAED,IAAI,SAAS,0BAEZ;IAED,IAAI,QAAQ,aAEX;IAGD,QAAQ;IAmCR,IAAI;IAuCE,KAAK;IAkBL,MAAM,CAAC,GAAG,EAAE,aAAa;IAqB/B,OAAO,CAAC,YAAY;CAIrB"}
|
|
@@ -120,13 +120,17 @@ class Connection {
|
|
|
120
120
|
this._changeState(this.initiator ? ConnectionState.INITIATING_CONNECTION : ConnectionState.CONNECTING);
|
|
121
121
|
(0, node_assert_1.default)(!this._transport);
|
|
122
122
|
this._transport = this._transportFactory.create({
|
|
123
|
-
topic: this.topic,
|
|
124
|
-
ownId: this.ownId,
|
|
125
|
-
remoteId: this.remoteId,
|
|
126
|
-
sessionId: this.sessionId,
|
|
127
123
|
initiator: this.initiator,
|
|
128
124
|
stream: this._protocol.stream,
|
|
129
|
-
sendSignal:
|
|
125
|
+
sendSignal: async (signal) => {
|
|
126
|
+
await this._signalMessaging.signal({
|
|
127
|
+
author: this.ownId,
|
|
128
|
+
recipient: this.remoteId,
|
|
129
|
+
sessionId: this.sessionId,
|
|
130
|
+
topic: this.topic,
|
|
131
|
+
data: { signal }
|
|
132
|
+
});
|
|
133
|
+
}
|
|
130
134
|
});
|
|
131
135
|
this._transport.connected.once(() => {
|
|
132
136
|
this._changeState(ConnectionState.CONNECTED);
|
|
@@ -148,31 +152,31 @@ class Connection {
|
|
|
148
152
|
return;
|
|
149
153
|
}
|
|
150
154
|
// TODO(dmaretskyi): CLOSING state.
|
|
151
|
-
(0, log_1.log)('closing', { peerId: this.ownId }, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line:
|
|
155
|
+
(0, log_1.log)('closing', { peerId: this.ownId }, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line: 173 });
|
|
152
156
|
// This will try to gracefull close the stream flushing any unsent data packets.
|
|
153
157
|
await this._protocol.close();
|
|
154
158
|
// After the transport is closed streams are disconnected.
|
|
155
159
|
await ((_a = this._transport) === null || _a === void 0 ? void 0 : _a.close());
|
|
156
160
|
this._changeState(ConnectionState.CLOSED);
|
|
157
|
-
(0, log_1.log)('closed', { peerId: this.ownId }, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line:
|
|
161
|
+
(0, log_1.log)('closed', { peerId: this.ownId }, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line: 182 });
|
|
158
162
|
}
|
|
159
163
|
async signal(msg) {
|
|
160
164
|
var _a, _b;
|
|
161
165
|
(0, node_assert_1.default)(msg.sessionId);
|
|
162
166
|
if (!msg.sessionId.equals(this.sessionId)) {
|
|
163
|
-
(0, log_1.log)('dropping signal for incorrect session id', {}, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line:
|
|
167
|
+
(0, log_1.log)('dropping signal for incorrect session id', {}, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line: 188 });
|
|
164
168
|
return;
|
|
165
169
|
}
|
|
166
170
|
(0, node_assert_1.default)(msg.data.signal);
|
|
167
171
|
(0, node_assert_1.default)((_a = msg.author) === null || _a === void 0 ? void 0 : _a.equals(this.remoteId));
|
|
168
172
|
(0, node_assert_1.default)((_b = msg.recipient) === null || _b === void 0 ? void 0 : _b.equals(this.ownId));
|
|
169
173
|
if (this._state === ConnectionState.INITIAL) {
|
|
170
|
-
(0, log_1.log)('buffered signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data }, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line:
|
|
174
|
+
(0, log_1.log)('buffered signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data }, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line: 196 });
|
|
171
175
|
this._bufferedSignals.push(msg.data.signal);
|
|
172
176
|
return;
|
|
173
177
|
}
|
|
174
178
|
(0, node_assert_1.default)(this._transport, 'Connection not ready to accept signals.');
|
|
175
|
-
(0, log_1.log)('received signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data }, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line:
|
|
179
|
+
(0, log_1.log)('received signal', { peerId: this.ownId, remoteId: this.remoteId, msg: msg.data }, { file: "packages/core/mesh/network-manager/src/swarm/connection.ts", line: 202 });
|
|
176
180
|
await this._transport.signal(msg.data.signal);
|
|
177
181
|
}
|
|
178
182
|
_changeState(state) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,30 +1,23 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { Event } from '@dxos/async';
|
|
3
2
|
import { ErrorStream } from '@dxos/debug';
|
|
4
|
-
import { PublicKey } from '@dxos/keys';
|
|
5
3
|
import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
|
|
6
|
-
import { Transport, TransportFactory } from './transport';
|
|
4
|
+
import { Transport, TransportFactory, TransportOptions } from './transport';
|
|
7
5
|
/**
|
|
8
6
|
* Fake transport.
|
|
9
7
|
*/
|
|
10
8
|
export declare class MemoryTransport implements Transport {
|
|
11
|
-
private readonly
|
|
12
|
-
private readonly _remoteId;
|
|
13
|
-
private readonly _sessionId;
|
|
14
|
-
private readonly _topic;
|
|
15
|
-
private readonly _stream;
|
|
9
|
+
private readonly params;
|
|
16
10
|
private static readonly _connections;
|
|
17
11
|
readonly closed: Event<void>;
|
|
18
12
|
readonly connected: Event<void>;
|
|
19
13
|
readonly errors: ErrorStream;
|
|
20
|
-
private readonly
|
|
21
|
-
private
|
|
14
|
+
private readonly _ownId;
|
|
15
|
+
private _remoteId;
|
|
16
|
+
private readonly _remote;
|
|
22
17
|
private readonly _outgoingDelay;
|
|
23
18
|
private readonly _incomingDelay;
|
|
24
19
|
private _remoteConnection?;
|
|
25
|
-
constructor(
|
|
26
|
-
get remoteId(): PublicKey;
|
|
27
|
-
get sessionId(): PublicKey;
|
|
20
|
+
constructor(params: TransportOptions);
|
|
28
21
|
signal(signal: Signal): Promise<void>;
|
|
29
22
|
close(): Promise<void>;
|
|
30
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/memory-transport.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"memory-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/memory-transport.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAW,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAG/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAgB5E;;GAEG;AAEH,qBAAa,eAAgB,YAAW,SAAS;IAiBnC,OAAO,CAAC,QAAQ,CAAC,MAAM;IAfnC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAA8D;IAElG,SAAgB,MAAM,cAAqB;IAC3C,SAAgB,SAAS,cAAqB;IAC9C,SAAgB,MAAM,cAAqB;IAE3C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,SAAS,CAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA4B;IAEpD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAC5E,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6C;IAE5E,OAAO,CAAC,iBAAiB,CAAC,CAAkB;gBAEf,MAAM,EAAE,gBAAgB;IAmC/C,MAAM,CAAC,MAAM,EAAE,MAAM;IAUrB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CA0B7B;AAED,eAAO,MAAM,sBAAsB,EAAE,gBAEpC,CAAC"}
|
|
@@ -11,6 +11,7 @@ const node_assert_1 = __importDefault(require("node:assert"));
|
|
|
11
11
|
const stream_1 = require("stream");
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const debug_1 = require("@dxos/debug");
|
|
14
|
+
const keys_1 = require("@dxos/keys");
|
|
14
15
|
const log_1 = require("@dxos/log");
|
|
15
16
|
const util_1 = require("@dxos/util");
|
|
16
17
|
// Delay (in milliseconds) for data being sent through in-memory connections to simulate network latency.
|
|
@@ -29,49 +30,54 @@ const createStreamDelay = (delay) => new stream_1.Transform({
|
|
|
29
30
|
*/
|
|
30
31
|
// TODO(burdon): Remove static variables.
|
|
31
32
|
class MemoryTransport {
|
|
32
|
-
constructor(
|
|
33
|
-
this.
|
|
34
|
-
this._remoteId = _remoteId;
|
|
35
|
-
this._sessionId = _sessionId;
|
|
36
|
-
this._topic = _topic;
|
|
37
|
-
this._stream = _stream;
|
|
33
|
+
constructor(params) {
|
|
34
|
+
this.params = params;
|
|
38
35
|
this.closed = new async_1.Event();
|
|
39
36
|
this.connected = new async_1.Event();
|
|
40
37
|
this.errors = new debug_1.ErrorStream();
|
|
38
|
+
this._ownId = keys_1.PublicKey.random();
|
|
39
|
+
this._remote = new async_1.Trigger();
|
|
41
40
|
this._outgoingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
|
|
42
41
|
this._incomingDelay = createStreamDelay(MEMORY_TRANSPORT_DELAY);
|
|
43
|
-
(0, log_1.log)('creating',
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
(0, node_assert_1.default)(!MemoryTransport._connections.has(this._ownKey), 'Duplicate memory connection');
|
|
47
|
-
MemoryTransport._connections.set(this._ownKey, this);
|
|
48
|
-
this._remoteConnection = MemoryTransport._connections.get(this._remoteKey);
|
|
49
|
-
if (this._remoteConnection) {
|
|
50
|
-
this._remoteConnection._remoteConnection = this;
|
|
51
|
-
(0, log_1.log)('connected', { topic: this._topic, peerId: this._ownId, remoteId: this._remoteId }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 74 });
|
|
52
|
-
this._stream
|
|
53
|
-
.pipe(this._outgoingDelay)
|
|
54
|
-
.pipe(this._remoteConnection._stream)
|
|
55
|
-
.pipe(this._incomingDelay)
|
|
56
|
-
.pipe(this._stream);
|
|
57
|
-
this.connected.emit();
|
|
58
|
-
this._remoteConnection.connected.emit();
|
|
42
|
+
(0, log_1.log)('creating', this._ownId, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 53 });
|
|
43
|
+
if (this.params.initiator) {
|
|
44
|
+
setTimeout(async () => this.params.sendSignal({ json: JSON.stringify({ transportId: this._ownId.toHex() }) }));
|
|
59
45
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
46
|
+
(0, node_assert_1.default)(!MemoryTransport._connections.has(this._ownId), 'Duplicate memory connection');
|
|
47
|
+
MemoryTransport._connections.set(this._ownId, this);
|
|
48
|
+
this._remote.wait().then((remoteId) => {
|
|
49
|
+
this._remoteId = remoteId;
|
|
50
|
+
this._remoteConnection = MemoryTransport._connections.get(this._remoteId);
|
|
51
|
+
if (this._remoteConnection) {
|
|
52
|
+
this._remoteConnection._remoteConnection = this;
|
|
53
|
+
this._remoteConnection._remoteId = this._ownId;
|
|
54
|
+
(0, log_1.log)('connected', { ownId: this._ownId, remoteId: this._remoteId }, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 70 });
|
|
55
|
+
this.params.stream
|
|
56
|
+
.pipe(this._outgoingDelay)
|
|
57
|
+
.pipe(this._remoteConnection.params.stream)
|
|
58
|
+
.pipe(this._incomingDelay)
|
|
59
|
+
.pipe(this.params.stream);
|
|
60
|
+
this.connected.emit();
|
|
61
|
+
this._remoteConnection.connected.emit();
|
|
62
|
+
}
|
|
63
|
+
}, async (err) => {
|
|
64
|
+
log_1.log.catch(err, {}, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 82 });
|
|
65
|
+
});
|
|
66
66
|
}
|
|
67
67
|
async signal(signal) {
|
|
68
|
-
|
|
68
|
+
const { json } = signal;
|
|
69
|
+
if (json) {
|
|
70
|
+
const { transportId } = JSON.parse(json);
|
|
71
|
+
if (transportId) {
|
|
72
|
+
this._remote.wake(keys_1.PublicKey.from(transportId));
|
|
73
|
+
}
|
|
74
|
+
}
|
|
69
75
|
}
|
|
70
76
|
async close() {
|
|
71
|
-
(0, log_1.log)('closing',
|
|
72
|
-
MemoryTransport._connections.delete(this.
|
|
77
|
+
(0, log_1.log)('closing', this._ownId, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 98 });
|
|
78
|
+
MemoryTransport._connections.delete(this._ownId);
|
|
73
79
|
if (this._remoteConnection) {
|
|
74
|
-
MemoryTransport._connections.delete(this.
|
|
80
|
+
MemoryTransport._connections.delete(this._remoteId);
|
|
75
81
|
// TODO(dmaretskyi): Hypercore streams do not seem to have the unpipe method.
|
|
76
82
|
// NOTE(burdon): Using readable-stream.wrap() might help (see feed-store).
|
|
77
83
|
// code this._stream
|
|
@@ -86,13 +92,13 @@ class MemoryTransport {
|
|
|
86
92
|
this._remoteConnection = undefined;
|
|
87
93
|
}
|
|
88
94
|
this.closed.emit();
|
|
89
|
-
(0, log_1.log)('closed', {
|
|
95
|
+
(0, log_1.log)('closed', {}, { file: "packages/core/mesh/network-manager/src/transport/memory-transport.ts", line: 121 });
|
|
90
96
|
}
|
|
91
97
|
}
|
|
92
98
|
exports.MemoryTransport = MemoryTransport;
|
|
93
99
|
// TODO(burdon): Remove global properties.
|
|
94
|
-
MemoryTransport._connections = new util_1.ComplexMap(
|
|
100
|
+
MemoryTransport._connections = new util_1.ComplexMap(keys_1.PublicKey.hash);
|
|
95
101
|
exports.MemoryTransportFactory = {
|
|
96
|
-
create: (
|
|
102
|
+
create: (params) => new MemoryTransport(params)
|
|
97
103
|
};
|
|
98
104
|
//# sourceMappingURL=memory-transport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-transport.js","sourceRoot":"","sources":["../../../src/transport/memory-transport.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,8DAAiC;AACjC,mCAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"memory-transport.js","sourceRoot":"","sources":["../../../src/transport/memory-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,15 +22,26 @@ const createPair = () => {
|
|
|
22
22
|
const topic = keys_1.PublicKey.random();
|
|
23
23
|
const peer1Id = keys_1.PublicKey.random();
|
|
24
24
|
const peer2Id = keys_1.PublicKey.random();
|
|
25
|
-
const sessionId = keys_1.PublicKey.random();
|
|
26
25
|
const plugin1 = new testing_1.TestProtocolPlugin(peer1Id.asBuffer());
|
|
27
26
|
const protocolProvider1 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
|
|
28
|
-
const connection1 = new memory_transport_1.MemoryTransport(
|
|
27
|
+
const connection1 = new memory_transport_1.MemoryTransport({
|
|
28
|
+
stream: protocolProvider1({ channel: (0, crypto_1.discoveryKey)(topic), initiator: true }).stream,
|
|
29
|
+
sendSignal: async (signal) => {
|
|
30
|
+
await connection2.signal(signal);
|
|
31
|
+
},
|
|
32
|
+
initiator: true
|
|
33
|
+
});
|
|
29
34
|
(0, testutils_1.afterTest)(() => connection1.close());
|
|
30
35
|
(0, testutils_1.afterTest)(() => connection1.errors.assertNoUnhandledErrors());
|
|
31
36
|
const plugin2 = new testing_1.TestProtocolPlugin(peer2Id.asBuffer());
|
|
32
37
|
const protocolProvider2 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer2Id.asBuffer(), plugin2);
|
|
33
|
-
const connection2 = new memory_transport_1.MemoryTransport(
|
|
38
|
+
const connection2 = new memory_transport_1.MemoryTransport({
|
|
39
|
+
stream: protocolProvider2({ channel: (0, crypto_1.discoveryKey)(topic), initiator: false }).stream,
|
|
40
|
+
sendSignal: async (signal) => {
|
|
41
|
+
await connection1.signal(signal);
|
|
42
|
+
},
|
|
43
|
+
initiator: false
|
|
44
|
+
});
|
|
34
45
|
(0, testutils_1.afterTest)(() => connection2.close());
|
|
35
46
|
(0, testutils_1.afterTest)(() => connection2.errors.assertNoUnhandledErrors());
|
|
36
47
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-transport.test.js","sourceRoot":"","sources":["../../../src/transport/memory-transport.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,oDAA4B;AAC5B,sEAA4C;AAE5C,yCAA4C;AAC5C,qCAAuC;AACvC,uDAA+C;AAC/C,+CAA4C;AAC5C,qCAAmC;AAEnC,wCAAsE;AACtE,yDAAqD;AAErD,4BAA4B;AAC5B,6FAA6F;AAC7F,2DAA2D;AAE3D,MAAM,UAAU,GAAG,GAAG,EAAE;IACtB,MAAM,KAAK,GAAG,gBAAS,CAAC,MAAM,EAAE,CAAC;IACjC,MAAM,OAAO,GAAG,gBAAS,CAAC,MAAM,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,gBAAS,CAAC,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"memory-transport.test.js","sourceRoot":"","sources":["../../../src/transport/memory-transport.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Event } from '@dxos/async';
|
|
3
3
|
import { ErrorStream } from '@dxos/debug';
|
|
4
|
-
import { PublicKey } from '@dxos/keys';
|
|
5
4
|
import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
|
|
6
|
-
import { SignalMessage } from '../signal';
|
|
7
5
|
/**
|
|
8
6
|
* Abstraction over a P2P connection transport. Currently either WebRTC or in-memory.
|
|
9
7
|
*/
|
|
@@ -19,10 +17,6 @@ export declare type TransportOptions = {
|
|
|
19
17
|
* Did local node initiate this connection.
|
|
20
18
|
*/
|
|
21
19
|
initiator: boolean;
|
|
22
|
-
ownId: PublicKey;
|
|
23
|
-
remoteId: PublicKey;
|
|
24
|
-
sessionId: PublicKey;
|
|
25
|
-
topic: PublicKey;
|
|
26
20
|
/**
|
|
27
21
|
* Wire protocol.
|
|
28
22
|
*/
|
|
@@ -30,7 +24,7 @@ export declare type TransportOptions = {
|
|
|
30
24
|
/**
|
|
31
25
|
* Send a signal message to remote peer.
|
|
32
26
|
*/
|
|
33
|
-
sendSignal: (
|
|
27
|
+
sendSignal: (signal: Signal) => Promise<void>;
|
|
34
28
|
};
|
|
35
29
|
export interface TransportFactory {
|
|
36
30
|
create(options: TransportOptions): Transport;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/transport/transport.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"transport.d.ts","sourceRoot":"","sources":["../../../src/transport/transport.ts"],"names":[],"mappings":";AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,KAAK,CAAC;IACd,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,EAAE,WAAW,CAAC;IACpB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,oBAAY,gBAAgB,GAAG;IAC7B;;OAEG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAE/B;;OAEG;IACH,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS,CAAC;CAC9C"}
|
|
@@ -1,21 +1,15 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { Event } from '@dxos/async';
|
|
3
3
|
import { ErrorStream } from '@dxos/debug';
|
|
4
|
-
import { PublicKey } from '@dxos/keys';
|
|
5
4
|
import { BridgeService } from '@dxos/protocols/proto/dxos/mesh/bridge';
|
|
6
5
|
import { Signal } from '@dxos/protocols/proto/dxos/mesh/swarm';
|
|
7
|
-
import { SignalMessage } from '../signal';
|
|
8
6
|
import { Transport, TransportFactory, TransportOptions } from './transport';
|
|
9
|
-
export
|
|
7
|
+
export declare type WebRTCTransportProxyParams = {
|
|
10
8
|
initiator: boolean;
|
|
11
9
|
stream: NodeJS.ReadWriteStream;
|
|
12
|
-
ownId: PublicKey;
|
|
13
|
-
remoteId: PublicKey;
|
|
14
|
-
sessionId: PublicKey;
|
|
15
|
-
topic: PublicKey;
|
|
16
|
-
sendSignal: (msg: SignalMessage) => void;
|
|
17
10
|
bridgeService: BridgeService;
|
|
18
|
-
|
|
11
|
+
sendSignal: (signal: Signal) => Promise<void>;
|
|
12
|
+
};
|
|
19
13
|
export declare class WebRTCTransportProxy implements Transport {
|
|
20
14
|
private readonly _params;
|
|
21
15
|
readonly closed: Event<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webrtc-transport-proxy.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"webrtc-transport-proxy.d.ts","sourceRoot":"","sources":["../../../src/transport/webrtc-transport-proxy.ts"],"names":[],"mappings":";AAMA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,OAAO,EAAgC,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACrG,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE5E,oBAAY,0BAA0B,GAAG;IACvC,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC,eAAe,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;IAC7B,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C,CAAC;AAEF,qBAAa,oBAAqB,YAAW,SAAS;IAYlD,OAAO,CAAC,QAAQ,CAAC,OAAO;IAX1B,QAAQ,CAAC,MAAM,cAAe;IAC9B,OAAO,CAAC,OAAO,CAAS;IACxB,QAAQ,CAAC,SAAS,cAAe;IAEjC,QAAQ,CAAC,MAAM,cAAqB;IAEpC,OAAO,CAAC,cAAc,CAAuB;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;gBAI5B,OAAO,EAAE,0BAA0B;YAkCxC,iBAAiB;IAiB/B,OAAO,CAAC,WAAW;YAKL,aAAa;IAIrB,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOrC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAc5B;;OAEG;IACH,UAAU;CAKX;AAED,qBAAa,2BAA4B,YAAW,gBAAgB;IAClE,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,YAAY,CAAmC;IAEvD;;;OAGG;IACH,gBAAgB,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,GAAG,IAAI;IAShE,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,SAAS;CAa7C"}
|
|
@@ -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,13 @@ 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)({
|
|
30
|
+
requested: {},
|
|
29
31
|
exposed: {
|
|
30
32
|
BridgeService: protocols_1.schema.getService('dxos.mesh.bridge.BridgeService')
|
|
31
33
|
},
|
|
@@ -36,8 +38,8 @@ describe('WebRTCTransportProxy', function () {
|
|
|
36
38
|
preserveAny: true
|
|
37
39
|
}
|
|
38
40
|
});
|
|
39
|
-
await
|
|
40
|
-
(0, testutils_1.afterTest)(() =>
|
|
41
|
+
await rpcService.open();
|
|
42
|
+
(0, testutils_1.afterTest)(() => rpcService.close());
|
|
41
43
|
// Starting RPC client
|
|
42
44
|
const rpcClient = (0, rpc_1.createProtoRpcPeer)({
|
|
43
45
|
requested: {
|
|
@@ -54,15 +56,11 @@ describe('WebRTCTransportProxy', function () {
|
|
|
54
56
|
const webRTCTransportProxy = new webrtc_transport_proxy_1.WebRTCTransportProxy({
|
|
55
57
|
initiator,
|
|
56
58
|
stream,
|
|
57
|
-
ownId,
|
|
58
|
-
remoteId,
|
|
59
|
-
sessionId,
|
|
60
|
-
topic,
|
|
61
59
|
sendSignal,
|
|
62
60
|
bridgeService: rpcClient.rpc.BridgeService
|
|
63
61
|
});
|
|
64
62
|
(0, testutils_1.afterTest)(async () => await webRTCTransportProxy.close());
|
|
65
|
-
return { webRTCService, webRTCTransportProxy };
|
|
63
|
+
return { webRTCService: rpcService, webRTCTransportProxy };
|
|
66
64
|
};
|
|
67
65
|
// This doesn't clean up correctly and crashes with SIGSEGV / SIGABRT at the end. Probably an issue with wrtc package.
|
|
68
66
|
it('open and close', async function () {
|
|
@@ -86,7 +84,6 @@ describe('WebRTCTransportProxy', function () {
|
|
|
86
84
|
const topic = keys_1.PublicKey.random();
|
|
87
85
|
const peer1Id = keys_1.PublicKey.random();
|
|
88
86
|
const peer2Id = keys_1.PublicKey.random();
|
|
89
|
-
const sessionId = keys_1.PublicKey.random();
|
|
90
87
|
const plugin1 = new testing_1.TestProtocolPlugin(peer1Id.asBuffer());
|
|
91
88
|
const protocolProvider1 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
|
|
92
89
|
const { webRTCTransportProxy: connection1 } = await setupProxy({
|
|
@@ -95,13 +92,9 @@ describe('WebRTCTransportProxy', function () {
|
|
|
95
92
|
channel: (0, crypto_1.discoveryKey)(topic),
|
|
96
93
|
initiator: true
|
|
97
94
|
}).stream,
|
|
98
|
-
|
|
99
|
-
remoteId: peer2Id,
|
|
100
|
-
sessionId,
|
|
101
|
-
topic,
|
|
102
|
-
sendSignal: async (msg) => {
|
|
95
|
+
sendSignal: async (signal) => {
|
|
103
96
|
await (0, async_1.sleep)(10);
|
|
104
|
-
await connection2.signal(
|
|
97
|
+
await connection2.signal(signal);
|
|
105
98
|
}
|
|
106
99
|
});
|
|
107
100
|
(0, testutils_1.afterTest)(() => connection1.errors.assertNoUnhandledErrors());
|
|
@@ -113,13 +106,9 @@ describe('WebRTCTransportProxy', function () {
|
|
|
113
106
|
channel: (0, crypto_1.discoveryKey)(topic),
|
|
114
107
|
initiator: false
|
|
115
108
|
}).stream,
|
|
116
|
-
|
|
117
|
-
remoteId: peer1Id,
|
|
118
|
-
sessionId,
|
|
119
|
-
topic,
|
|
120
|
-
sendSignal: async (msg) => {
|
|
109
|
+
sendSignal: async (signal) => {
|
|
121
110
|
await (0, async_1.sleep)(10);
|
|
122
|
-
await connection1.signal(
|
|
111
|
+
await connection1.signal(signal);
|
|
123
112
|
}
|
|
124
113
|
});
|
|
125
114
|
(0, testutils_1.afterTest)(() => connection2.errors.assertNoUnhandledErrors());
|
|
@@ -178,7 +167,6 @@ describe('WebRTCTransportProxy', function () {
|
|
|
178
167
|
const topic = keys_1.PublicKey.random();
|
|
179
168
|
const peer1Id = keys_1.PublicKey.random();
|
|
180
169
|
const peer2Id = keys_1.PublicKey.random();
|
|
181
|
-
const sessionId = keys_1.PublicKey.random();
|
|
182
170
|
const plugin1 = new testing_1.TestProtocolPlugin(peer1Id.asBuffer());
|
|
183
171
|
const protocolProvider1 = (0, testing_1.testProtocolProvider)(topic.asBuffer(), peer1Id.asBuffer(), plugin1);
|
|
184
172
|
const proxy1 = new webrtc_transport_proxy_1.WebRTCTransportProxy({
|
|
@@ -187,13 +175,9 @@ describe('WebRTCTransportProxy', function () {
|
|
|
187
175
|
channel: (0, crypto_1.discoveryKey)(topic),
|
|
188
176
|
initiator: true
|
|
189
177
|
}).stream,
|
|
190
|
-
|
|
191
|
-
remoteId: peer2Id,
|
|
192
|
-
sessionId,
|
|
193
|
-
topic,
|
|
194
|
-
sendSignal: async (msg) => {
|
|
178
|
+
sendSignal: async (signal) => {
|
|
195
179
|
await (0, async_1.sleep)(10);
|
|
196
|
-
await proxy2.signal(
|
|
180
|
+
await proxy2.signal(signal);
|
|
197
181
|
},
|
|
198
182
|
bridgeService: rpcClient.rpc.BridgeService
|
|
199
183
|
});
|
|
@@ -206,13 +190,9 @@ describe('WebRTCTransportProxy', function () {
|
|
|
206
190
|
channel: (0, crypto_1.discoveryKey)(topic),
|
|
207
191
|
initiator: false
|
|
208
192
|
}).stream,
|
|
209
|
-
|
|
210
|
-
remoteId: peer1Id,
|
|
211
|
-
sessionId,
|
|
212
|
-
topic,
|
|
213
|
-
sendSignal: async (msg) => {
|
|
193
|
+
sendSignal: async (signal) => {
|
|
214
194
|
await (0, async_1.sleep)(10);
|
|
215
|
-
await proxy1.signal(
|
|
195
|
+
await proxy1.signal(signal);
|
|
216
196
|
},
|
|
217
197
|
bridgeService: rpcClient.rpc.BridgeService
|
|
218
198
|
});
|