@dxos/network-manager 2.17.0 → 2.17.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/browser-mocha/bundle.js +402 -360
- package/dist/src/connection-log.js +1 -1
- package/dist/src/connection-log.js.map +1 -1
- package/dist/src/network-manager.blueprint-test.js +31 -31
- package/dist/src/network-manager.blueprint-test.js.map +1 -1
- package/dist/src/network-manager.browser-test.js +2 -2
- package/dist/src/network-manager.browser-test.js.map +1 -1
- package/dist/src/network-manager.js +7 -7
- package/dist/src/network-manager.js.map +1 -1
- package/dist/src/network-manager.test.js +3 -3
- package/dist/src/network-manager.test.js.map +1 -1
- package/dist/src/presence.test.js +10 -10
- package/dist/src/presence.test.js.map +1 -1
- package/dist/src/protocol-factory.js +9 -9
- package/dist/src/protocol-factory.js.map +1 -1
- package/dist/src/signal/in-memory-signal-manager.js +2 -2
- package/dist/src/signal/in-memory-signal-manager.js.map +1 -1
- package/dist/src/signal/signal-api.js +1 -1
- package/dist/src/signal/signal-api.js.map +1 -1
- package/dist/src/signal/signal-api.test.js +25 -25
- package/dist/src/signal/signal-api.test.js.map +1 -1
- package/dist/src/signal/websocket-rpc.js +6 -6
- package/dist/src/signal/websocket-rpc.js.map +1 -1
- package/dist/src/signal/websocket-signal-manager.js +2 -2
- package/dist/src/signal/websocket-signal-manager.js.map +1 -1
- package/dist/src/swarm/connection.js +6 -6
- package/dist/src/swarm/connection.js.map +1 -1
- package/dist/src/swarm/swarm-mapper.js +1 -1
- package/dist/src/swarm/swarm-mapper.js.map +1 -1
- package/dist/src/swarm/swarm.js +7 -7
- package/dist/src/swarm/swarm.js.map +1 -1
- package/dist/src/swarm/swarm.test.js +26 -26
- package/dist/src/swarm/swarm.test.js.map +1 -1
- package/dist/src/testing/test-protocol.js +12 -12
- package/dist/src/testing/test-protocol.js.map +1 -1
- package/dist/src/topology/fully-connected-topology.js +2 -2
- package/dist/src/topology/fully-connected-topology.js.map +1 -1
- package/dist/src/topology/mmst-topology.js +6 -6
- package/dist/src/topology/mmst-topology.js.map +1 -1
- package/dist/src/topology/star-topology.js +4 -4
- package/dist/src/topology/star-topology.js.map +1 -1
- package/dist/src/transport/in-memory-transport.js +2 -2
- package/dist/src/transport/in-memory-transport.js.map +1 -1
- package/dist/src/transport/in-memory-transport.test.js +17 -17
- package/dist/src/transport/in-memory-transport.test.js.map +1 -1
- package/dist/src/transport/webrtc-transport.js +2 -2
- package/dist/src/transport/webrtc-transport.js.map +1 -1
- package/dist/src/transport/webrtc-transport.test.js +19 -19
- package/dist/src/transport/webrtc-transport.test.js.map +1 -1
- package/dist/src/transport/wrtc-simple-peer.test.js +1 -1
- package/dist/src/transport/wrtc-simple-peer.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +9 -9
- package/src/connection-log.ts +1 -1
- package/src/signal/signal-api.ts +1 -1
- package/src/signal/websocket-rpc.ts +5 -5
- package/src/swarm/swarm.ts +2 -2
- package/src/transport/webrtc-transport.ts +1 -1
|
@@ -14,20 +14,20 @@ const crypto_1 = require("@dxos/crypto");
|
|
|
14
14
|
const signal_1 = require("@dxos/signal");
|
|
15
15
|
const util_1 = require("@dxos/util");
|
|
16
16
|
const signal_api_1 = require("./signal-api");
|
|
17
|
-
mocha_1.describe('SignalApi', () => {
|
|
17
|
+
(0, mocha_1.describe)('SignalApi', () => {
|
|
18
18
|
let topic;
|
|
19
19
|
let peer1;
|
|
20
20
|
let peer2;
|
|
21
21
|
let api;
|
|
22
22
|
let api2;
|
|
23
23
|
let broker;
|
|
24
|
-
const signalApiPort = util_1.randomInt(10000, 50000);
|
|
24
|
+
const signalApiPort = (0, util_1.randomInt)(10000, 50000);
|
|
25
25
|
const signalApiUrl = 'http://0.0.0.0:' + signalApiPort;
|
|
26
26
|
// code let broker2: ReturnType<typeof createBroker>;
|
|
27
|
-
const signalApiPort2 = util_1.randomInt(10000, 50000);
|
|
27
|
+
const signalApiPort2 = (0, util_1.randomInt)(10000, 50000);
|
|
28
28
|
const signalApiUrl2 = 'http://0.0.0.0:' + signalApiPort2;
|
|
29
29
|
before(async function () {
|
|
30
|
-
broker = await signal_1.createTestBroker(signalApiPort);
|
|
30
|
+
broker = await (0, signal_1.createTestBroker)(signalApiPort);
|
|
31
31
|
// code broker2 = await createTestBroker(signalApiPort2);
|
|
32
32
|
});
|
|
33
33
|
beforeEach(() => {
|
|
@@ -41,15 +41,15 @@ mocha_1.describe('SignalApi', () => {
|
|
|
41
41
|
await broker.stop();
|
|
42
42
|
// code await broker2.stop();
|
|
43
43
|
});
|
|
44
|
-
mocha_1.it('join', async () => {
|
|
44
|
+
(0, mocha_1.it)('join', async () => {
|
|
45
45
|
api = new signal_api_1.SignalApi(signalApiUrl, (async () => { }), async () => { });
|
|
46
46
|
const join = await api.join(topic, peer1);
|
|
47
|
-
earljs_1.expect(join).toEqual([peer1]);
|
|
47
|
+
(0, earljs_1.expect)(join).toEqual([peer1]);
|
|
48
48
|
const join2 = await api.join(topic, peer2);
|
|
49
|
-
earljs_1.expect(join2).toEqual([peer1, peer2]);
|
|
49
|
+
(0, earljs_1.expect)(join2).toEqual([peer1, peer2]);
|
|
50
50
|
}).timeout(1000);
|
|
51
|
-
mocha_1.it('offer', async () => {
|
|
52
|
-
const offerMock = earljs_1.mockFn()
|
|
51
|
+
(0, mocha_1.it)('offer', async () => {
|
|
52
|
+
const offerMock = (0, earljs_1.mockFn)()
|
|
53
53
|
.resolvesTo({ accept: true });
|
|
54
54
|
api = new signal_api_1.SignalApi(signalApiUrl, offerMock, async () => { });
|
|
55
55
|
await api.join(topic, peer1);
|
|
@@ -61,11 +61,11 @@ mocha_1.describe('SignalApi', () => {
|
|
|
61
61
|
topic
|
|
62
62
|
};
|
|
63
63
|
const offerResult = await api.offer(offer);
|
|
64
|
-
earljs_1.expect(offerResult).toEqual({ accept: true });
|
|
65
|
-
earljs_1.expect(offerMock).toHaveBeenCalledWith([offer]);
|
|
64
|
+
(0, earljs_1.expect)(offerResult).toEqual({ accept: true });
|
|
65
|
+
(0, earljs_1.expect)(offerMock).toHaveBeenCalledWith([offer]);
|
|
66
66
|
}).timeout(5000);
|
|
67
|
-
mocha_1.it('signal', async () => {
|
|
68
|
-
const signalMock = earljs_1.mockFn()
|
|
67
|
+
(0, mocha_1.it)('signal', async () => {
|
|
68
|
+
const signalMock = (0, earljs_1.mockFn)()
|
|
69
69
|
.resolvesTo();
|
|
70
70
|
api = new signal_api_1.SignalApi(signalApiUrl, (async () => { }), signalMock);
|
|
71
71
|
await api.join(topic, peer1);
|
|
@@ -77,8 +77,8 @@ mocha_1.describe('SignalApi', () => {
|
|
|
77
77
|
data: { foo: 'bar' }
|
|
78
78
|
};
|
|
79
79
|
await api.signal(msg);
|
|
80
|
-
await wait_for_expect_1.default(() => {
|
|
81
|
-
earljs_1.expect(signalMock).toHaveBeenCalledWith([msg]);
|
|
80
|
+
await (0, wait_for_expect_1.default)(() => {
|
|
81
|
+
(0, earljs_1.expect)(signalMock).toHaveBeenCalledWith([msg]);
|
|
82
82
|
}, 4000);
|
|
83
83
|
}).timeout(5000);
|
|
84
84
|
mocha_1.it.skip('join across multiple signal servers', async () => {
|
|
@@ -87,25 +87,25 @@ mocha_1.describe('SignalApi', () => {
|
|
|
87
87
|
api2 = new signal_api_1.SignalApi(signalApiUrl2, (async () => { }), async () => { });
|
|
88
88
|
await api.join(topic, peer1);
|
|
89
89
|
await api2.join(topic, peer2);
|
|
90
|
-
await wait_for_expect_1.default(async () => {
|
|
90
|
+
await (0, wait_for_expect_1.default)(async () => {
|
|
91
91
|
const peers = await api2.lookup(topic);
|
|
92
|
-
earljs_1.expect(peers.length).toEqual(2);
|
|
92
|
+
(0, earljs_1.expect)(peers.length).toEqual(2);
|
|
93
93
|
}, 4000);
|
|
94
|
-
await wait_for_expect_1.default(async () => {
|
|
94
|
+
await (0, wait_for_expect_1.default)(async () => {
|
|
95
95
|
const peers = await api.lookup(topic);
|
|
96
|
-
earljs_1.expect(peers.length).toEqual(2);
|
|
96
|
+
(0, earljs_1.expect)(peers.length).toEqual(2);
|
|
97
97
|
}, 4000);
|
|
98
98
|
}).timeout(5000);
|
|
99
99
|
// Skip because communication between signal servers is not yet implemented.
|
|
100
100
|
mocha_1.it.skip('newly joined peer can receive signals from other signal servers', async () => {
|
|
101
|
-
const offerMock = earljs_1.mockFn()
|
|
101
|
+
const offerMock = (0, earljs_1.mockFn)()
|
|
102
102
|
.resolvesTo({ accept: true });
|
|
103
|
-
const signalMock = earljs_1.mockFn()
|
|
103
|
+
const signalMock = (0, earljs_1.mockFn)()
|
|
104
104
|
.resolvesTo();
|
|
105
105
|
api = new signal_api_1.SignalApi(signalApiUrl, offerMock, async () => { });
|
|
106
106
|
api2 = new signal_api_1.SignalApi(signalApiUrl2, (async () => { }), signalMock);
|
|
107
107
|
await api.join(topic, peer1);
|
|
108
|
-
await async_1.sleep(3000);
|
|
108
|
+
await (0, async_1.sleep)(3000);
|
|
109
109
|
await api2.join(topic, peer2);
|
|
110
110
|
const sessionId = crypto_1.PublicKey.random();
|
|
111
111
|
const answer = await api2.offer({
|
|
@@ -115,7 +115,7 @@ mocha_1.describe('SignalApi', () => {
|
|
|
115
115
|
sessionId,
|
|
116
116
|
data: {}
|
|
117
117
|
});
|
|
118
|
-
earljs_1.expect(answer).toEqual({ accept: true });
|
|
118
|
+
(0, earljs_1.expect)(answer).toEqual({ accept: true });
|
|
119
119
|
const msg = {
|
|
120
120
|
id: peer2,
|
|
121
121
|
remoteId: peer1,
|
|
@@ -124,8 +124,8 @@ mocha_1.describe('SignalApi', () => {
|
|
|
124
124
|
data: { foo: 'bar' }
|
|
125
125
|
};
|
|
126
126
|
await api.signal(msg);
|
|
127
|
-
await wait_for_expect_1.default(() => {
|
|
128
|
-
earljs_1.expect(signalMock).toHaveBeenCalledWith([msg]);
|
|
127
|
+
await (0, wait_for_expect_1.default)(() => {
|
|
128
|
+
(0, earljs_1.expect)(signalMock).toHaveBeenCalledWith([msg]);
|
|
129
129
|
}, 4000);
|
|
130
130
|
}).timeout(5000);
|
|
131
131
|
}).timeout(10000);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signal-api.test.js","sourceRoot":"","sources":["../../../src/signal/signal-api.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,mCAAwC;AACxC,iCAA6C;AAC7C,sEAA4C;AAE5C,uCAA6C;AAC7C,yCAAyC;AACzC,yCAAgD;AAChD,qCAAuC;AAEvC,6CAAyC;AAEzC,gBAAQ,
|
|
1
|
+
{"version":3,"file":"signal-api.test.js","sourceRoot":"","sources":["../../../src/signal/signal-api.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ const isomorphic_ws_1 = __importDefault(require("isomorphic-ws"));
|
|
|
13
13
|
const nanomessage_rpc_1 = __importDefault(require("nanomessage-rpc"));
|
|
14
14
|
const util_1 = require("util");
|
|
15
15
|
const async_1 = require("@dxos/async");
|
|
16
|
-
const log = debug_1.default('dxos:network-manager:websocket-rpc');
|
|
16
|
+
const log = (0, debug_1.default)('dxos:network-manager:websocket-rpc');
|
|
17
17
|
const RPC_TIMEOUT = 3000;
|
|
18
18
|
/**
|
|
19
19
|
* A websocket connection paired with nanomessage-rpc endpoint.
|
|
@@ -62,15 +62,15 @@ class WebsocketRpc {
|
|
|
62
62
|
log(`Signal socket error ${this._host} ${e.message}`);
|
|
63
63
|
this.error.emit((_a = e.error) !== null && _a !== void 0 ? _a : new Error(e.message));
|
|
64
64
|
};
|
|
65
|
-
this._rpc = nanomessage_rpc_1.default({
|
|
65
|
+
this._rpc = (0, nanomessage_rpc_1.default)({
|
|
66
66
|
send: async (data) => {
|
|
67
67
|
await this._connectTrigger.wait();
|
|
68
|
-
assert_1.default(this._socket, 'No socket');
|
|
69
|
-
await util_1.promisify(this._socket.send.bind(this._socket))(data);
|
|
68
|
+
(0, assert_1.default)(this._socket, 'No socket');
|
|
69
|
+
await (0, util_1.promisify)(this._socket.send.bind(this._socket))(data);
|
|
70
70
|
},
|
|
71
71
|
subscribe: (next) => {
|
|
72
72
|
void this._connectTrigger.wait().then(() => {
|
|
73
|
-
assert_1.default(this._socket, 'No socket');
|
|
73
|
+
(0, assert_1.default)(this._socket, 'No socket');
|
|
74
74
|
this._socket.onmessage = async (e) => {
|
|
75
75
|
try {
|
|
76
76
|
// `e.data` is Buffer in node, and Blob in chrome.
|
|
@@ -114,7 +114,7 @@ class WebsocketRpc {
|
|
|
114
114
|
await this._connectTrigger.wait();
|
|
115
115
|
return this._rpc.call(method, payload);
|
|
116
116
|
})(),
|
|
117
|
-
async_1.sleep(RPC_TIMEOUT).then(() => Promise.reject(new Error(`Signal RPC call timed out in ${RPC_TIMEOUT} ms`)))
|
|
117
|
+
(0, async_1.sleep)(RPC_TIMEOUT).then(() => Promise.reject(new Error(`Signal RPC call timed out in ${RPC_TIMEOUT} ms`)))
|
|
118
118
|
]);
|
|
119
119
|
this.commandTrace.emit({
|
|
120
120
|
messageId: `${this._host}-${this._messageId++}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-rpc.js","sourceRoot":"","sources":["../../../src/signal/websocket-rpc.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAC1B,kEAAsC;AACtC,sEAA6C;AAC7C,+BAAiC;AAEjC,uCAAoD;AAIpD,MAAM,GAAG,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"websocket-rpc.js","sourceRoot":"","sources":["../../../src/signal/websocket-rpc.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,7 +18,7 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
18
18
|
const async_1 = require("@dxos/async");
|
|
19
19
|
const util_1 = require("@dxos/util");
|
|
20
20
|
const signal_api_1 = require("./signal-api");
|
|
21
|
-
const log = debug_1.default('dxos:network-manager:websocket-signal-manager');
|
|
21
|
+
const log = (0, debug_1.default)('dxos:network-manager:websocket-signal-manager');
|
|
22
22
|
class WebsocketSignalManager {
|
|
23
23
|
constructor(_hosts, _onOffer) {
|
|
24
24
|
this._hosts = _hosts;
|
|
@@ -32,7 +32,7 @@ class WebsocketSignalManager {
|
|
|
32
32
|
this.peerCandidatesChanged = new async_1.Event();
|
|
33
33
|
this.onSignal = new async_1.Event();
|
|
34
34
|
log(`Created WebsocketSignalManager with signal servers: ${_hosts}`);
|
|
35
|
-
assert_1.default(_hosts.length === 1, 'Only a single signaling server connection is supported');
|
|
35
|
+
(0, assert_1.default)(_hosts.length === 1, 'Only a single signaling server connection is supported');
|
|
36
36
|
for (const host of this._hosts) {
|
|
37
37
|
const server = new signal_api_1.SignalApi(host, async (msg) => this._onOffer(msg), async (msg) => {
|
|
38
38
|
this.onSignal.emit(msg);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocket-signal-manager.js","sourceRoot":"","sources":["../../../src/signal/websocket-signal-manager.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAkD;AAElD,qCAAwC;AAGxC,6CAAyC;AAEzC,MAAM,GAAG,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"websocket-signal-manager.js","sourceRoot":"","sources":["../../../src/signal/websocket-signal-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
17
17
|
const debug_1 = __importDefault(require("debug"));
|
|
18
18
|
const async_1 = require("@dxos/async");
|
|
19
19
|
const debug_2 = require("@dxos/debug");
|
|
20
|
-
const log = debug_1.default('dxos:network-manager:swarm:connection');
|
|
20
|
+
const log = (0, debug_1.default)('dxos:network-manager:swarm:connection');
|
|
21
21
|
/**
|
|
22
22
|
* State machine for each connection.
|
|
23
23
|
*/
|
|
@@ -69,10 +69,10 @@ class Connection {
|
|
|
69
69
|
return this._protocol;
|
|
70
70
|
}
|
|
71
71
|
connect() {
|
|
72
|
-
assert_1.default(this._state === ConnectionState.INITIAL, 'Invalid state.');
|
|
72
|
+
(0, assert_1.default)(this._state === ConnectionState.INITIAL, 'Invalid state.');
|
|
73
73
|
this._state = this.initiator ? ConnectionState.INITIATING_CONNECTION : ConnectionState.WAITING_FOR_CONNECTION;
|
|
74
74
|
this.stateChanged.emit(this._state);
|
|
75
|
-
assert_1.default(!this._transport);
|
|
75
|
+
(0, assert_1.default)(!this._transport);
|
|
76
76
|
this._transport = this._transportFactory({
|
|
77
77
|
topic: this.topic,
|
|
78
78
|
ownId: this.ownId,
|
|
@@ -105,14 +105,14 @@ class Connection {
|
|
|
105
105
|
if (msg.data.type === 'offer' && this._state === ConnectionState.INITIATING_CONNECTION) {
|
|
106
106
|
throw new Error('Invalid state: Cannot send offer to an initiating peer.');
|
|
107
107
|
}
|
|
108
|
-
assert_1.default(msg.id.equals(this.remoteId));
|
|
109
|
-
assert_1.default(msg.remoteId.equals(this.ownId));
|
|
108
|
+
(0, assert_1.default)(msg.id.equals(this.remoteId));
|
|
109
|
+
(0, assert_1.default)(msg.remoteId.equals(this.ownId));
|
|
110
110
|
if (this._state === ConnectionState.INITIAL) {
|
|
111
111
|
log(`${this.ownId} buffered signal from ${this.remoteId}: ${msg.data.type}`);
|
|
112
112
|
this._bufferedSignals.push(msg);
|
|
113
113
|
return;
|
|
114
114
|
}
|
|
115
|
-
assert_1.default(this._transport, 'Connection not ready to accept signals.');
|
|
115
|
+
(0, assert_1.default)(this._transport, 'Connection not ready to accept signals.');
|
|
116
116
|
log(`${this.ownId} received signal from ${this.remoteId}: ${msg.data.type}`);
|
|
117
117
|
this._transport.signal(msg);
|
|
118
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAkD;AAElD,uCAA0C;AAM1C,MAAM,GAAG,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
11
11
|
const async_1 = require("@dxos/async");
|
|
12
12
|
const crypto_1 = require("@dxos/crypto");
|
|
13
13
|
const util_1 = require("@dxos/util");
|
|
14
|
-
const log = debug_1.default('dxos:network-manager:swarm-mapper');
|
|
14
|
+
const log = (0, debug_1.default)('dxos:network-manager:swarm-mapper');
|
|
15
15
|
class SwarmMapper {
|
|
16
16
|
constructor(_swarm, _presence) {
|
|
17
17
|
this._swarm = _swarm;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm-mapper.js","sourceRoot":"","sources":["../../../src/swarm/swarm-mapper.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,kDAA0B;AAE1B,uCAAoC;AACpC,yCAAyC;AAEzC,qCAA2D;AAqB3D,MAAM,GAAG,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"swarm-mapper.js","sourceRoot":"","sources":["../../../src/swarm/swarm-mapper.ts"],"names":[],"mappings":"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"}
|
package/dist/src/swarm/swarm.js
CHANGED
|
@@ -14,7 +14,7 @@ const crypto_1 = require("@dxos/crypto");
|
|
|
14
14
|
const debug_2 = require("@dxos/debug");
|
|
15
15
|
const util_1 = require("@dxos/util");
|
|
16
16
|
const connection_1 = require("./connection");
|
|
17
|
-
const log = debug_1.default('dxos:network-manager:swarm');
|
|
17
|
+
const log = (0, debug_1.default)('dxos:network-manager:swarm');
|
|
18
18
|
/**
|
|
19
19
|
* A single peer's view of the swarm.
|
|
20
20
|
* Manages a set of connections implemented by simple-peer instances.
|
|
@@ -85,8 +85,8 @@ class Swarm {
|
|
|
85
85
|
log(`Offer from ${message.id} topic=${this._topic}`);
|
|
86
86
|
// Id of the peer offering us the connection.
|
|
87
87
|
const remoteId = message.id;
|
|
88
|
-
assert_1.default(message.remoteId.equals(this._ownPeerId));
|
|
89
|
-
assert_1.default(message.topic.equals(this._topic));
|
|
88
|
+
(0, assert_1.default)(message.remoteId.equals(this._ownPeerId));
|
|
89
|
+
(0, assert_1.default)(message.topic.equals(this._topic));
|
|
90
90
|
// Check if we are already trying to connect to that peer.
|
|
91
91
|
if (this._connections.has(remoteId)) {
|
|
92
92
|
// Peer with the highest Id closes it's connection, and accepts remote peer's offer.
|
|
@@ -120,8 +120,8 @@ class Swarm {
|
|
|
120
120
|
}
|
|
121
121
|
async onSignal(message) {
|
|
122
122
|
log(`Signal ${this._topic} ${JSON.stringify(message)}`);
|
|
123
|
-
assert_1.default(message.remoteId.equals(this._ownPeerId), `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.remoteId}`);
|
|
124
|
-
assert_1.default(message.topic.equals(this._topic));
|
|
123
|
+
(0, assert_1.default)(message.remoteId.equals(this._ownPeerId), `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.remoteId}`);
|
|
124
|
+
(0, assert_1.default)(message.topic.equals(this._topic));
|
|
125
125
|
const connection = this._connections.get(message.id);
|
|
126
126
|
if (!connection) {
|
|
127
127
|
log(`Dropping signal message for non-existent connection: topic=${this._topic}, peerId=${message.id}`);
|
|
@@ -207,8 +207,8 @@ class Swarm {
|
|
|
207
207
|
}
|
|
208
208
|
_createConnection(initiator, remoteId, sessionId) {
|
|
209
209
|
log(`Create connection topic=${this._topic} remoteId=${remoteId} initiator=${initiator}`);
|
|
210
|
-
assert_1.default(!this._connections.has(remoteId), 'Peer already connected');
|
|
211
|
-
const connection = new connection_1.Connection(this._topic, this._ownPeerId, remoteId, sessionId, initiator, this._sendSignal, this._protocol({ channel: crypto_1.discoveryKey(this._topic), initiator }), this._transportFactory);
|
|
210
|
+
(0, assert_1.default)(!this._connections.has(remoteId), 'Peer already connected');
|
|
211
|
+
const connection = new connection_1.Connection(this._topic, this._ownPeerId, remoteId, sessionId, initiator, this._sendSignal, this._protocol({ channel: (0, crypto_1.discoveryKey)(this._topic), initiator }), this._transportFactory);
|
|
212
212
|
this._connections.set(remoteId, connection);
|
|
213
213
|
this.connectionAdded.emit(connection);
|
|
214
214
|
connection.errors.handle(error => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm.js","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAoC;AACpC,yCAAuD;AACvD,uCAA0C;AAC1C,qCAAoD;AAOpD,6CAA2D;AAE3D,MAAM,GAAG,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"swarm.js","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,kDAA0B;AAE1B,uCAAoC;AACpC,yCAAuD;AACvD,uCAA0C;AAC1C,qCAAoD;AAOpD,6CAA2D;AAE3D,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,4BAA4B,CAAC,CAAC;AAEhD;;;;GAIG;AACH,MAAa,KAAK;IAiChB,YACmB,MAAiB,EACjB,UAAqB,EAC9B,SAAmB,EACV,SAA2B,EAC3B,UAA2E,EAC3E,WAAgE,EAChE,OAAmB,EACnB,iBAAmC,EACnC,MAA0B;QAR1B,WAAM,GAAN,MAAM,CAAW;QACjB,eAAU,GAAV,UAAU,CAAW;QAC9B,cAAS,GAAT,SAAS,CAAU;QACV,cAAS,GAAT,SAAS,CAAkB;QAC3B,eAAU,GAAV,UAAU,CAAiE;QAC3E,gBAAW,GAAX,WAAW,CAAqD;QAChE,YAAO,GAAP,OAAO,CAAY;QACnB,sBAAiB,GAAjB,iBAAiB,CAAkB;QACnC,WAAM,GAAN,MAAM,CAAoB;QAzC7C;;WAEG;QACM,OAAE,GAAG,kBAAS,CAAC,MAAM,EAAE,CAAC;QAEhB,iBAAY,GAAG,IAAI,iBAAU,CAAwB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAErE,qBAAgB,GAAG,IAAI,iBAAU,CAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAE7D,2BAAsB,GAAG,IAAI,aAAK,EAAE,CAAC;QAMtD;;WAEG;QACM,oBAAe,GAAG,IAAI,aAAK,EAAc,CAAC;QAEnD;;WAEG;QACM,sBAAiB,GAAG,IAAI,aAAK,EAAc,CAAC;QAErD;;WAEG;QACM,cAAS,GAAG,IAAI,aAAK,EAAa,CAAC;QAEnC,WAAM,GAAG,IAAI,mBAAW,EAAE,CAAC;QAalC,GAAG,CAAC,wBAAwB,MAAM,WAAW,UAAU,EAAE,CAAC,CAAC;QAC3D,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;IAC7C,CAAC;IAlCD,IAAI,WAAW;QACb,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,CAAC;IAkCD,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;OAEG;IACH,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,uBAAuB,CAAE,UAAuB;QAC9C,GAAG,CAAC,iBAAiB,IAAI,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC,CAAC;QAClD,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC9B,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;YAClC,IAAI,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;gBACrC,SAAS;aACV;YACD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;SACtC;QACD,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,OAAgC;QAC7C,GAAG,CAAC,cAAc,OAAO,CAAC,EAAE,UAAU,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACrD,6CAA6C;QAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,EAAE,CAAC;QAC5B,IAAA,gBAAM,EAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QACjD,IAAA,gBAAM,EAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAE1C,0DAA0D;QAC1D,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACnC,oFAAoF;YACpF,IAAI,QAAQ,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE;gBAC9C,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,+DAA+D,CAAC,CAAC;gBACxF,4DAA4D;gBAC5D,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;oBAChD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;aACJ;iBAAM;gBACL,qGAAqG;gBACrG,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;aACzB;SACF;QAED,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC1C,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,kDAAkD;gBACxF,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBAChF,IAAI;oBACF,UAAU,CAAC,OAAO,EAAE,CAAC;iBACtB;gBAAC,OAAO,GAAQ,EAAE;oBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,MAAM,GAAG,IAAI,CAAC;aACf;SACF;QACD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAE,OAAgC;QAC9C,GAAG,CAAC,UAAU,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACxD,IAAA,gBAAM,EAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,mCAAmC,IAAI,CAAC,SAAS,YAAY,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClI,IAAA,gBAAM,EAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACrD,IAAI,CAAC,UAAU,EAAE;YACf,GAAG,CAAC,8DAA8D,IAAI,CAAC,MAAM,YAAY,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YACvG,OAAO;SACR;QACD,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,WAAW,CAAE,WAAqB;QACtC,GAAG,CAAC,oBAAoB,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,IAAI,IAAI,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QACxJ,IAAI,WAAW,KAAK,IAAI,CAAC,SAAS,EAAE;YAClC,OAAO;SACR;QACD,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,SAAS,GAAG,WAAW,CAAC;QAC7B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,GAAG,CAAC,iBAAiB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACpC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAC/B,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACjG,CAAC;IAEO,mBAAmB;QACzB,OAAO;YACL,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC;gBACf,SAAS,EAAE,IAAI,CAAC,UAAU;gBAC1B,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;gBAC/C,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;aAChG,CAAC;YACF,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC;YAC/C,UAAU,EAAE,KAAK,EAAC,IAAI,EAAC,EAAE;gBACvB,IAAI;oBACF,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;iBACnC;gBAAC,OAAO,GAAQ,EAAE;oBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACxB;gBACD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YAC1B,CAAC;YACD,MAAM,EAAE,GAAG,EAAE;gBACX,IAAI,CAAC,OAAO,EAAE,CAAC;YACjB,CAAC;SACF,CAAC;IACJ,CAAC;IAEO,mBAAmB,CAAE,QAAmB;QAC9C,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;YACnC,2CAA2C;YAC3C,OAAO;SACR;QAED,MAAM,SAAS,GAAG,kBAAS,CAAC,MAAM,EAAE,CAAC;QAErC,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;QACrE,IAAI,CAAC,UAAU,CAAC;YACd,EAAE,EAAE,IAAI,CAAC,UAAU;YACnB,QAAQ;YACR,SAAS;YACT,KAAK,EAAE,IAAI,CAAC,MAAM;YAClB,IAAI,EAAE,EAAE;SACT,CAAC;aACC,IAAI,CAAC,MAAM,CAAC,EAAE;YACb,GAAG,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,IAAI,CAAC,MAAM,UAAU,IAAI,CAAC,UAAU,aAAa,QAAQ,EAAE,CAAC,CAAC;YACrH,IAAI,UAAU,CAAC,KAAK,KAAK,4BAAe,CAAC,OAAO,EAAE;gBAChD,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBACvB,OAAO;aACR;YAED,IAAI,MAAM,CAAC,MAAM,EAAE;gBACjB,IAAI;oBACF,UAAU,CAAC,OAAO,EAAE,CAAC;iBACtB;gBAAC,OAAO,GAAQ,EAAE;oBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;iBACxB;aACF;iBAAM;gBACL,4EAA4E;gBAC5E,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aACxC;YACD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAC1B,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QACL,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IAC1B,CAAC;IAEO,iBAAiB,CAAE,SAAkB,EAAE,QAAmB,EAAE,SAAoB;QACtF,GAAG,CAAC,2BAA2B,IAAI,CAAC,MAAM,aAAa,QAAQ,cAAc,SAAS,EAAE,CAAC,CAAC;QAC1F,IAAA,gBAAM,EAAC,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,wBAAwB,CAAC,CAAC;QAEnE,MAAM,UAAU,GAAG,IAAI,uBAAU,CAC/B,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU,EACf,QAAQ,EACR,SAAS,EACT,SAAS,EACT,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,IAAA,qBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC,EACjE,IAAI,CAAC,iBAAiB,CACvB,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAC5C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEtC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YAC/B,GAAG,CAAC,0BAA0B,IAAI,CAAC,MAAM,aAAa,QAAQ,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;YACjF,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,KAAK,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,4BAAe,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAErH,KAAK,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,4BAAe,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;;YAChF,GAAG,CAAC,2BAA2B,IAAI,CAAC,MAAM,aAAa,QAAQ,cAAc,SAAS,EAAE,CAAC,CAAC;YAC1F,qIAAqI;YACrI,IAAI,MAAA,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,0CAAE,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;gBAChE,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACnC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACzC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAE,MAAiB;QAC/C,GAAG,CAAC,0BAA0B,IAAI,CAAC,MAAM,aAAa,MAAM,EAAE,CAAC,CAAC;QAChE,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,UAAU,EAAE;YACf,OAAO;SACR;QACD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;CACF;AA3PD,sBA2PC"}
|
|
@@ -17,38 +17,38 @@ const testutils_1 = require("@dxos/testutils");
|
|
|
17
17
|
const topology_1 = require("../topology");
|
|
18
18
|
const transport_1 = require("../transport");
|
|
19
19
|
const swarm_1 = require("./swarm");
|
|
20
|
-
const log = debug_1.default('dxos:network-manager:swarm:test');
|
|
20
|
+
const log = (0, debug_1.default)('dxos:network-manager:swarm:test');
|
|
21
21
|
const setup = () => {
|
|
22
22
|
const topic = crypto_1.PublicKey.random();
|
|
23
23
|
const peerId1 = crypto_1.PublicKey.random();
|
|
24
24
|
const peerId2 = crypto_1.PublicKey.random();
|
|
25
25
|
const swarm1 = new swarm_1.Swarm(topic, peerId1, new topology_1.FullyConnectedTopology(), () => new protocol_1.Protocol(), async (msg) => {
|
|
26
|
-
await async_1.sleep(10); // Simulating network delay.
|
|
26
|
+
await (0, async_1.sleep)(10); // Simulating network delay.
|
|
27
27
|
return swarm2.onOffer(msg);
|
|
28
28
|
}, async (msg) => {
|
|
29
|
-
await async_1.sleep(10); // Simulating network delay.
|
|
29
|
+
await (0, async_1.sleep)(10); // Simulating network delay.
|
|
30
30
|
await swarm2.onSignal(msg);
|
|
31
|
-
}, () => { }, transport_1.createWebRtcTransportFactory(), undefined);
|
|
31
|
+
}, () => { }, (0, transport_1.createWebRtcTransportFactory)(), undefined);
|
|
32
32
|
const swarm2 = new swarm_1.Swarm(topic, peerId2, new topology_1.FullyConnectedTopology(), () => new protocol_1.Protocol(), async (msg) => {
|
|
33
|
-
await async_1.sleep(10); // Simulating network delay.
|
|
33
|
+
await (0, async_1.sleep)(10); // Simulating network delay.
|
|
34
34
|
return swarm1.onOffer(msg);
|
|
35
35
|
}, async (msg) => {
|
|
36
|
-
await async_1.sleep(10); // Simulating network delay.
|
|
36
|
+
await (0, async_1.sleep)(10); // Simulating network delay.
|
|
37
37
|
await swarm1.onSignal(msg);
|
|
38
|
-
}, () => { }, transport_1.createWebRtcTransportFactory(), undefined);
|
|
39
|
-
testutils_1.afterTest(async () => {
|
|
38
|
+
}, () => { }, (0, transport_1.createWebRtcTransportFactory)(), undefined);
|
|
39
|
+
(0, testutils_1.afterTest)(async () => {
|
|
40
40
|
await swarm1.destroy();
|
|
41
41
|
await swarm2.destroy();
|
|
42
42
|
});
|
|
43
43
|
return { swarm1, swarm2, peerId1, peerId2 };
|
|
44
44
|
};
|
|
45
|
-
mocha_1.it('connects two peers in a swarm', async () => {
|
|
45
|
+
(0, mocha_1.it)('connects two peers in a swarm', async () => {
|
|
46
46
|
const { swarm1, swarm2, peerId2 } = setup();
|
|
47
|
-
earljs_1.expect(swarm1.connections.length).toEqual(0);
|
|
48
|
-
earljs_1.expect(swarm2.connections.length).toEqual(0);
|
|
47
|
+
(0, earljs_1.expect)(swarm1.connections.length).toEqual(0);
|
|
48
|
+
(0, earljs_1.expect)(swarm2.connections.length).toEqual(0);
|
|
49
49
|
const promise = Promise.all([
|
|
50
|
-
async_1.promiseTimeout(swarm1.connected.waitForCount(1), 3000, 'Swarm1 connect timeout.'),
|
|
51
|
-
async_1.promiseTimeout(swarm2.connected.waitForCount(1), 3000, 'Swarm2 connect timeout.')
|
|
50
|
+
(0, async_1.promiseTimeout)(swarm1.connected.waitForCount(1), 3000, 'Swarm1 connect timeout.'),
|
|
51
|
+
(0, async_1.promiseTimeout)(swarm2.connected.waitForCount(1), 3000, 'Swarm2 connect timeout.')
|
|
52
52
|
]);
|
|
53
53
|
swarm1.onPeerCandidatesChanged([peerId2]);
|
|
54
54
|
log('Candidates changed');
|
|
@@ -56,18 +56,18 @@ mocha_1.it('connects two peers in a swarm', async () => {
|
|
|
56
56
|
log('Swarms connected');
|
|
57
57
|
const swarm1Connection = swarm1.connections[0];
|
|
58
58
|
const swarm2Connection = swarm2.connections[0];
|
|
59
|
-
const onData = earljs_1.mockFn().returns(undefined);
|
|
59
|
+
const onData = (0, earljs_1.mockFn)().returns(undefined);
|
|
60
60
|
swarm2Connection.transport.peer.on('data', onData);
|
|
61
61
|
const data = Buffer.from('1234');
|
|
62
62
|
swarm1Connection.transport.peer.send(data);
|
|
63
|
-
await wait_for_expect_1.default(() => {
|
|
64
|
-
earljs_1.expect(onData).toHaveBeenCalledWith([data]);
|
|
63
|
+
await (0, wait_for_expect_1.default)(() => {
|
|
64
|
+
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
65
65
|
});
|
|
66
66
|
}).timeout(5000);
|
|
67
|
-
mocha_1.it('two peers try to originate connections to each other simultaneously', async () => {
|
|
67
|
+
(0, mocha_1.it)('two peers try to originate connections to each other simultaneously', async () => {
|
|
68
68
|
const { swarm1, swarm2, peerId1, peerId2 } = setup();
|
|
69
|
-
earljs_1.expect(swarm1.connections.length).toEqual(0);
|
|
70
|
-
earljs_1.expect(swarm2.connections.length).toEqual(0);
|
|
69
|
+
(0, earljs_1.expect)(swarm1.connections.length).toEqual(0);
|
|
70
|
+
(0, earljs_1.expect)(swarm2.connections.length).toEqual(0);
|
|
71
71
|
swarm1.onPeerCandidatesChanged([peerId2]);
|
|
72
72
|
swarm2.onPeerCandidatesChanged([peerId1]);
|
|
73
73
|
await Promise.all([
|
|
@@ -75,12 +75,12 @@ mocha_1.it('two peers try to originate connections to each other simultaneously'
|
|
|
75
75
|
swarm2.connected.waitForCount(1)
|
|
76
76
|
]);
|
|
77
77
|
}).timeout(5000);
|
|
78
|
-
mocha_1.it('second peer discovered after delay', async () => {
|
|
78
|
+
(0, mocha_1.it)('second peer discovered after delay', async () => {
|
|
79
79
|
const { swarm1, swarm2, peerId1, peerId2 } = setup();
|
|
80
|
-
earljs_1.expect(swarm1.connections.length).toEqual(0);
|
|
81
|
-
earljs_1.expect(swarm2.connections.length).toEqual(0);
|
|
80
|
+
(0, earljs_1.expect)(swarm1.connections.length).toEqual(0);
|
|
81
|
+
(0, earljs_1.expect)(swarm2.connections.length).toEqual(0);
|
|
82
82
|
swarm1.onPeerCandidatesChanged([peerId2]);
|
|
83
|
-
await async_1.sleep(15);
|
|
83
|
+
await (0, async_1.sleep)(15);
|
|
84
84
|
swarm2.onPeerCandidatesChanged([peerId1]);
|
|
85
85
|
await Promise.all([
|
|
86
86
|
swarm1.connected.waitForCount(1),
|
|
@@ -88,12 +88,12 @@ mocha_1.it('second peer discovered after delay', async () => {
|
|
|
88
88
|
]);
|
|
89
89
|
const swarm1Connection = swarm1.connections[0];
|
|
90
90
|
const swarm2Connection = swarm2.connections[0];
|
|
91
|
-
const onData = earljs_1.mockFn().returns(undefined);
|
|
91
|
+
const onData = (0, earljs_1.mockFn)().returns(undefined);
|
|
92
92
|
swarm2Connection.transport.peer.on('data', onData);
|
|
93
93
|
const data = Buffer.from('1234');
|
|
94
94
|
swarm1Connection.transport.peer.send(data);
|
|
95
|
-
await wait_for_expect_1.default(() => {
|
|
96
|
-
earljs_1.expect(onData).toHaveBeenCalledWith([data]);
|
|
95
|
+
await (0, wait_for_expect_1.default)(() => {
|
|
96
|
+
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
97
97
|
});
|
|
98
98
|
}).timeout(5000);
|
|
99
99
|
//# sourceMappingURL=swarm.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm.test.js","sourceRoot":"","sources":["../../../src/swarm/swarm.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;AAEF,kDAA0B;AAC1B,mCAAwC;AACxC,iCAAmC;AACnC,sEAA4C;AAE5C,uCAAoD;AACpD,yCAAyC;AACzC,6CAA0C;AAC1C,+CAA4C;AAE5C,0CAAqD;AACrD,4CAA6E;AAC7E,mCAAgC;AAEhC,MAAM,GAAG,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"swarm.test.js","sourceRoot":"","sources":["../../../src/swarm/swarm.test.ts"],"names":[],"mappings":"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"}
|