@dxos/network-manager 2.33.9-dev.7d11f506 → 2.33.9-dev.9bbef4e2
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/network-manager.blueprint-test.d.ts +3 -1
- package/dist/src/network-manager.blueprint-test.d.ts.map +1 -1
- package/dist/src/network-manager.blueprint-test.js +46 -17
- package/dist/src/network-manager.blueprint-test.js.map +1 -1
- package/dist/src/network-manager.browser-test.js +1 -1
- package/dist/src/network-manager.browser-test.js.map +1 -1
- package/dist/src/network-manager.d.ts.map +1 -1
- package/dist/src/network-manager.js +13 -12
- package/dist/src/network-manager.js.map +1 -1
- package/dist/src/network-manager.test.js +5 -4
- package/dist/src/network-manager.test.js.map +1 -1
- package/dist/src/proto/gen/dxos/credentials.d.ts +39 -0
- package/dist/src/proto/gen/dxos/credentials.d.ts.map +1 -1
- package/dist/src/proto/gen/dxos/halo/keys.d.ts +44 -2
- package/dist/src/proto/gen/dxos/halo/keys.d.ts.map +1 -1
- package/dist/src/proto/gen/dxos/halo/keys.js +4 -0
- package/dist/src/proto/gen/dxos/halo/keys.js.map +1 -1
- package/dist/src/proto/gen/dxos/mesh/signal.d.ts +74 -16
- package/dist/src/proto/gen/dxos/mesh/signal.d.ts.map +1 -1
- package/dist/src/proto/gen/dxos/mesh/signalMessage.d.ts +79 -0
- package/dist/src/proto/gen/dxos/mesh/signalMessage.d.ts.map +1 -0
- package/dist/src/proto/gen/dxos/mesh/signalMessage.js +3 -0
- package/dist/src/proto/gen/dxos/mesh/signalMessage.js.map +1 -0
- package/dist/src/proto/gen/google/protobuf.d.ts +8 -2
- package/dist/src/proto/gen/google/protobuf.d.ts.map +1 -1
- package/dist/src/proto/gen/index.d.ts +17 -4
- package/dist/src/proto/gen/index.d.ts.map +1 -1
- package/dist/src/proto/gen/index.js +1 -1
- package/dist/src/proto/gen/index.js.map +1 -1
- package/dist/src/proto/substitutions.d.ts +4 -0
- package/dist/src/proto/substitutions.d.ts.map +1 -1
- package/dist/src/proto/substitutions.js +3 -1
- package/dist/src/proto/substitutions.js.map +1 -1
- package/dist/src/protocol-factory.js +3 -3
- package/dist/src/protocol-factory.js.map +1 -1
- package/dist/src/signal/in-memory-signal-manager.d.ts +7 -7
- package/dist/src/signal/in-memory-signal-manager.d.ts.map +1 -1
- package/dist/src/signal/in-memory-signal-manager.js +34 -13
- package/dist/src/signal/in-memory-signal-manager.js.map +1 -1
- package/dist/src/signal/index.d.ts +1 -2
- package/dist/src/signal/index.d.ts.map +1 -1
- package/dist/src/signal/index.js +1 -2
- package/dist/src/signal/index.js.map +1 -1
- package/dist/src/signal/integration.test.d.ts +2 -0
- package/dist/src/signal/integration.test.d.ts.map +1 -0
- package/dist/src/signal/integration.test.js +102 -0
- package/dist/src/signal/integration.test.js.map +1 -0
- package/dist/src/signal/message-router.d.ts +20 -8
- package/dist/src/signal/message-router.d.ts.map +1 -1
- package/dist/src/signal/message-router.js +96 -17
- package/dist/src/signal/message-router.js.map +1 -1
- package/dist/src/signal/message-router.test.js +125 -22
- package/dist/src/signal/message-router.test.js.map +1 -1
- package/dist/src/signal/signal-client.d.ts +33 -17
- package/dist/src/signal/signal-client.d.ts.map +1 -1
- package/dist/src/signal/signal-client.js +102 -82
- package/dist/src/signal/signal-client.js.map +1 -1
- package/dist/src/signal/signal-client.test.js +60 -75
- package/dist/src/signal/signal-client.test.js.map +1 -1
- package/dist/src/signal/{websocket-signal-manager.d.ts → signal-manager-impl.d.ts} +13 -11
- package/dist/src/signal/signal-manager-impl.d.ts.map +1 -0
- package/dist/src/signal/signal-manager-impl.js +151 -0
- package/dist/src/signal/signal-manager-impl.js.map +1 -0
- package/dist/src/signal/signal-manager.d.ts +12 -11
- package/dist/src/signal/signal-manager.d.ts.map +1 -1
- package/dist/src/signal/signal-rpc-client.d.ts +19 -0
- package/dist/src/signal/signal-rpc-client.d.ts.map +1 -0
- package/dist/src/signal/signal-rpc-client.js +108 -0
- package/dist/src/signal/signal-rpc-client.js.map +1 -0
- package/dist/src/signal/signal-rpc-client.test.d.ts +2 -0
- package/dist/src/signal/signal-rpc-client.test.d.ts.map +1 -0
- package/dist/src/signal/signal-rpc-client.test.js +74 -0
- package/dist/src/signal/signal-rpc-client.test.js.map +1 -0
- package/dist/src/swarm/connection.d.ts +3 -3
- package/dist/src/swarm/connection.d.ts.map +1 -1
- package/dist/src/swarm/connection.js +8 -11
- package/dist/src/swarm/connection.js.map +1 -1
- package/dist/src/swarm/swarm.d.ts +6 -7
- package/dist/src/swarm/swarm.d.ts.map +1 -1
- package/dist/src/swarm/swarm.js +29 -25
- package/dist/src/swarm/swarm.js.map +1 -1
- package/dist/src/swarm/swarm.test.js +156 -115
- package/dist/src/swarm/swarm.test.js.map +1 -1
- package/dist/src/testing/test-protocol.d.ts.map +1 -1
- package/dist/src/testing/test-protocol.js +3 -3
- package/dist/src/testing/test-protocol.js.map +1 -1
- package/dist/src/topology/fully-connected-topology.d.ts +0 -1
- package/dist/src/topology/fully-connected-topology.d.ts.map +1 -1
- package/dist/src/topology/fully-connected-topology.js +4 -9
- package/dist/src/topology/fully-connected-topology.js.map +1 -1
- package/dist/src/topology/mmst-topology.d.ts +0 -1
- package/dist/src/topology/mmst-topology.d.ts.map +1 -1
- package/dist/src/topology/mmst-topology.js +6 -11
- package/dist/src/topology/mmst-topology.js.map +1 -1
- package/dist/src/topology/star-topology.d.ts +0 -1
- package/dist/src/topology/star-topology.d.ts.map +1 -1
- package/dist/src/topology/star-topology.js +5 -10
- package/dist/src/topology/star-topology.js.map +1 -1
- package/dist/src/topology/topology.d.ts +0 -6
- package/dist/src/topology/topology.d.ts.map +1 -1
- package/dist/src/transport/in-memory-transport.d.ts +2 -2
- package/dist/src/transport/in-memory-transport.d.ts.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/transport.d.ts +3 -3
- package/dist/src/transport/transport.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport.d.ts +3 -3
- package/dist/src/transport/webrtc-transport.d.ts.map +1 -1
- package/dist/src/transport/webrtc-transport.js +3 -3
- package/dist/src/transport/webrtc-transport.js.map +1 -1
- package/dist/tests-setup.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +17 -12
- package/src/network-manager.blueprint-test.ts +57 -22
- package/src/network-manager.browser-test.ts +1 -1
- package/src/network-manager.test.ts +8 -7
- package/src/network-manager.ts +10 -10
- package/src/proto/defs/dxos/mesh/signal.proto +54 -23
- package/src/proto/defs/dxos/mesh/signalMessage.proto +51 -0
- package/src/proto/gen/dxos/credentials.ts +40 -0
- package/src/proto/gen/dxos/halo/keys.ts +45 -2
- package/src/proto/gen/dxos/mesh/signal.ts +73 -16
- package/src/proto/gen/dxos/mesh/signalMessage.ts +83 -0
- package/src/proto/gen/google/protobuf.ts +9 -2
- package/src/proto/gen/index.ts +18 -5
- package/src/proto/substitutions.ts +3 -1
- package/src/protocol-factory.ts +1 -1
- package/src/signal/in-memory-signal-manager.ts +38 -13
- package/src/signal/index.ts +1 -2
- package/src/signal/integration.test.ts +117 -0
- package/src/signal/message-router.test.ts +169 -58
- package/src/signal/message-router.ts +120 -27
- package/src/signal/signal-client.test.ts +70 -90
- package/src/signal/signal-client.ts +120 -87
- package/src/signal/signal-manager-impl.ts +166 -0
- package/src/signal/signal-manager.ts +12 -12
- package/src/signal/signal-rpc-client.test.ts +86 -0
- package/src/signal/signal-rpc-client.ts +121 -0
- package/src/swarm/connection.ts +6 -9
- package/src/swarm/swarm.test.ts +208 -167
- package/src/swarm/swarm.ts +26 -22
- package/src/testing/test-protocol.ts +1 -1
- package/src/topology/fully-connected-topology.ts +2 -10
- package/src/topology/mmst-topology.ts +2 -10
- package/src/topology/star-topology.ts +2 -8
- package/src/topology/topology.ts +0 -7
- package/src/transport/in-memory-transport.ts +3 -3
- package/src/transport/transport.ts +3 -3
- package/src/transport/webrtc-transport.ts +4 -4
- package/dist/src/signal/websocket-rpc.d.ts +0 -30
- package/dist/src/signal/websocket-rpc.d.ts.map +0 -1
- package/dist/src/signal/websocket-rpc.js +0 -203
- package/dist/src/signal/websocket-rpc.js.map +0 -1
- package/dist/src/signal/websocket-signal-manager.d.ts.map +0 -1
- package/dist/src/signal/websocket-signal-manager.js +0 -134
- package/dist/src/signal/websocket-signal-manager.js.map +0 -1
- package/src/signal/websocket-rpc.ts +0 -208
- package/src/signal/websocket-signal-manager.ts +0 -158
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../../../src/swarm/connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,8 @@ import { Event } from '@dxos/async';
|
|
|
2
2
|
import { ErrorStream } from '@dxos/debug';
|
|
3
3
|
import { PublicKey } from '@dxos/protocols';
|
|
4
4
|
import { ProtocolProvider } from '../network-manager';
|
|
5
|
-
import {
|
|
5
|
+
import { SwarmEvent } from '../proto/gen/dxos/mesh/signal';
|
|
6
|
+
import { Answer, SignalMessage } from '../proto/gen/dxos/mesh/signalMessage';
|
|
6
7
|
import { SignalMessaging } from '../signal';
|
|
7
8
|
import { Topology } from '../topology';
|
|
8
9
|
import { TransportFactory } from '../transport';
|
|
@@ -19,7 +20,6 @@ export declare class Swarm {
|
|
|
19
20
|
private _topology;
|
|
20
21
|
private readonly _protocolProvider;
|
|
21
22
|
private readonly _signalMessaging;
|
|
22
|
-
private readonly _lookupPeers;
|
|
23
23
|
private readonly _transportFactory;
|
|
24
24
|
private readonly _label;
|
|
25
25
|
/**
|
|
@@ -28,7 +28,6 @@ export declare class Swarm {
|
|
|
28
28
|
readonly id: PublicKey;
|
|
29
29
|
private readonly _connections;
|
|
30
30
|
private readonly _discoveredPeers;
|
|
31
|
-
private readonly _peerCandidatesUpdated;
|
|
32
31
|
get connections(): Connection[];
|
|
33
32
|
/**
|
|
34
33
|
* New connection to a peer is started.
|
|
@@ -43,16 +42,16 @@ export declare class Swarm {
|
|
|
43
42
|
*/
|
|
44
43
|
readonly connected: Event<PublicKey>;
|
|
45
44
|
readonly errors: ErrorStream;
|
|
46
|
-
constructor(_topic: PublicKey, _ownPeerId: PublicKey, _topology: Topology, _protocolProvider: ProtocolProvider, _signalMessaging: SignalMessaging,
|
|
45
|
+
constructor(_topic: PublicKey, _ownPeerId: PublicKey, _topology: Topology, _protocolProvider: ProtocolProvider, _signalMessaging: SignalMessaging, _transportFactory: TransportFactory, _label: string | undefined);
|
|
47
46
|
get ownPeerId(): PublicKey;
|
|
48
47
|
/**
|
|
49
48
|
* Custom label assigned to this swarm. Used in devtools to display human-readable names for swarms.
|
|
50
49
|
*/
|
|
51
50
|
get label(): string | undefined;
|
|
52
51
|
get topic(): Topic;
|
|
53
|
-
|
|
54
|
-
onOffer(message:
|
|
55
|
-
onSignal(message:
|
|
52
|
+
onSwarmEvent(swarmEvent: SwarmEvent): void;
|
|
53
|
+
onOffer(message: SignalMessage): Promise<Answer>;
|
|
54
|
+
onSignal(message: SignalMessage): Promise<void>;
|
|
56
55
|
setTopology(newTopology: Topology): Promise<void>;
|
|
57
56
|
destroy(): Promise<void>;
|
|
58
57
|
private _getSwarmController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"swarm.d.ts","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAmB,QAAQ,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAmB,MAAM,cAAc,CAAC;AAI3D;;;;GAIG;AACH,qBAAa,KAAK;IAgCd,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAClC,OAAO,CAAC,QAAQ,CAAC,MAAM;IArCzB;;OAEG;IACH,QAAQ,CAAC,EAAE,YAAsB;IAEjC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyD;IACtF,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA6C;IAE9E,IAAI,WAAW,iBAEd;IAED;;OAEG;IACH,QAAQ,CAAC,eAAe,oBAA2B;IAEnD;;OAEG;IACH,QAAQ,CAAC,iBAAiB,oBAA2B;IAErD;;OAEG;IACH,QAAQ,CAAC,SAAS,mBAA0B;IAE5C,QAAQ,CAAC,MAAM,cAAqB;gBAIjB,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,SAAS,EAC9B,SAAS,EAAE,QAAQ,EACV,iBAAiB,EAAE,gBAAgB,EACnC,gBAAgB,EAAE,eAAe,EACjC,iBAAiB,EAAE,gBAAgB,EACnC,MAAM,EAAE,MAAM,GAAG,SAAS;IAM7C,IAAI,SAAS,cAEZ;IAED;;OAEG;IACH,IAAI,KAAK,IAAK,MAAM,GAAG,SAAS,CAE/B;IAED,IAAI,KAAK,IAAK,KAAK,CAElB;IAED,YAAY,CAAE,UAAU,EAAE,UAAU;IAc9B,OAAO,CAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IA8CjD,QAAQ,CAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAchD,WAAW,CAAE,WAAW,EAAE,QAAQ;IAWlC,OAAO;IAMb,OAAO,CAAC,mBAAmB;IAmB3B,OAAO,CAAC,mBAAmB;IA2C3B,OAAO,CAAC,iBAAiB;YAsCX,gBAAgB;CAU/B"}
|
package/dist/src/swarm/swarm.js
CHANGED
|
@@ -7,8 +7,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
7
7
|
};
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.Swarm = void 0;
|
|
10
|
-
const assert_1 = __importDefault(require("assert"));
|
|
11
10
|
const debug_1 = __importDefault(require("debug"));
|
|
11
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
12
12
|
const async_1 = require("@dxos/async");
|
|
13
13
|
const crypto_1 = require("@dxos/crypto");
|
|
14
14
|
const debug_2 = require("@dxos/debug");
|
|
@@ -23,13 +23,12 @@ const log = (0, debug_1.default)('dxos:network-manager:swarm');
|
|
|
23
23
|
*/
|
|
24
24
|
class Swarm {
|
|
25
25
|
// TODO(burdon): Split up properties.
|
|
26
|
-
constructor(_topic, _ownPeerId, _topology, _protocolProvider, _signalMessaging,
|
|
26
|
+
constructor(_topic, _ownPeerId, _topology, _protocolProvider, _signalMessaging, _transportFactory, _label) {
|
|
27
27
|
this._topic = _topic;
|
|
28
28
|
this._ownPeerId = _ownPeerId;
|
|
29
29
|
this._topology = _topology;
|
|
30
30
|
this._protocolProvider = _protocolProvider;
|
|
31
31
|
this._signalMessaging = _signalMessaging;
|
|
32
|
-
this._lookupPeers = _lookupPeers;
|
|
33
32
|
this._transportFactory = _transportFactory;
|
|
34
33
|
this._label = _label;
|
|
35
34
|
/**
|
|
@@ -38,7 +37,6 @@ class Swarm {
|
|
|
38
37
|
this.id = protocols_1.PublicKey.random();
|
|
39
38
|
this._connections = new util_1.ComplexMap(x => x.toHex());
|
|
40
39
|
this._discoveredPeers = new util_1.ComplexSet(x => x.toHex());
|
|
41
|
-
this._peerCandidatesUpdated = new async_1.Event();
|
|
42
40
|
/**
|
|
43
41
|
* New connection to a peer is started.
|
|
44
42
|
*/
|
|
@@ -70,26 +68,34 @@ class Swarm {
|
|
|
70
68
|
get topic() {
|
|
71
69
|
return this._topic;
|
|
72
70
|
}
|
|
73
|
-
|
|
74
|
-
log(`
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
71
|
+
onSwarmEvent(swarmEvent) {
|
|
72
|
+
log(`Swarm event ${JSON.stringify(swarmEvent)}`);
|
|
73
|
+
if (swarmEvent.peerAvailable) {
|
|
74
|
+
const peerId = protocols_1.PublicKey.from(swarmEvent.peerAvailable.peer);
|
|
75
|
+
log(`New peer for ${this._topic} ${peerId}`);
|
|
76
|
+
if (!peerId.equals(this._ownPeerId)) {
|
|
77
|
+
this._discoveredPeers.add(peerId);
|
|
79
78
|
}
|
|
80
|
-
this._discoveredPeers.add(candidate);
|
|
81
79
|
}
|
|
82
|
-
|
|
80
|
+
else if (swarmEvent.peerLeft) {
|
|
81
|
+
this._discoveredPeers.delete(protocols_1.PublicKey.from(swarmEvent.peerLeft.peer));
|
|
82
|
+
}
|
|
83
83
|
this._topology.update();
|
|
84
84
|
}
|
|
85
85
|
async onOffer(message) {
|
|
86
86
|
var _a, _b;
|
|
87
|
-
log(`Offer from ${message
|
|
87
|
+
log(`Offer from ${JSON.stringify(message)}`);
|
|
88
88
|
// Id of the peer offering us the connection.
|
|
89
|
-
(0,
|
|
89
|
+
(0, node_assert_1.default)(message.id);
|
|
90
90
|
const remoteId = message.id;
|
|
91
|
-
|
|
92
|
-
|
|
91
|
+
if (!((_a = message.remoteId) === null || _a === void 0 ? void 0 : _a.equals(this._ownPeerId))) {
|
|
92
|
+
log(`Rejecting offer with incorrect peerId: ${message.remoteId}`);
|
|
93
|
+
return { accept: false };
|
|
94
|
+
}
|
|
95
|
+
if (!((_b = message.topic) === null || _b === void 0 ? void 0 : _b.equals(this._topic))) {
|
|
96
|
+
log(`Rejecting offer with incorrect topic: ${message.topic}`);
|
|
97
|
+
return { accept: false };
|
|
98
|
+
}
|
|
93
99
|
// Check if we are already trying to connect to that peer.
|
|
94
100
|
if (this._connections.has(remoteId)) {
|
|
95
101
|
// Peer with the highest Id closes it's connection, and accepts remote peer's offer.
|
|
@@ -108,7 +114,7 @@ class Swarm {
|
|
|
108
114
|
let accept = false;
|
|
109
115
|
if (await this._topology.onOffer(remoteId)) {
|
|
110
116
|
if (!this._connections.has(remoteId)) { // Connection might have been already established.
|
|
111
|
-
(0,
|
|
117
|
+
(0, node_assert_1.default)(message.sessionId);
|
|
112
118
|
const connection = this._createConnection(false, message.id, message.sessionId);
|
|
113
119
|
try {
|
|
114
120
|
connection.connect();
|
|
@@ -125,9 +131,9 @@ class Swarm {
|
|
|
125
131
|
async onSignal(message) {
|
|
126
132
|
var _a, _b;
|
|
127
133
|
log(`Signal ${this._topic} ${JSON.stringify(message)}`);
|
|
128
|
-
(0,
|
|
129
|
-
(0,
|
|
130
|
-
(0,
|
|
134
|
+
(0, node_assert_1.default)((_a = message.remoteId) === null || _a === void 0 ? void 0 : _a.equals(this._ownPeerId), `Invalid signal peer id expected=${this.ownPeerId}, actual=${message.remoteId}`);
|
|
135
|
+
(0, node_assert_1.default)((_b = message.topic) === null || _b === void 0 ? void 0 : _b.equals(this._topic));
|
|
136
|
+
(0, node_assert_1.default)(message.id);
|
|
131
137
|
const connection = this._connections.get(message.id);
|
|
132
138
|
if (!connection) {
|
|
133
139
|
log(`Dropping signal message for non-existent connection: topic=${this._topic}, peerId=${message.id}`);
|
|
@@ -166,9 +172,6 @@ class Swarm {
|
|
|
166
172
|
this.errors.raise(err);
|
|
167
173
|
}
|
|
168
174
|
this._topology.update();
|
|
169
|
-
},
|
|
170
|
-
lookup: () => {
|
|
171
|
-
this._lookupPeers(this._topic);
|
|
172
175
|
}
|
|
173
176
|
};
|
|
174
177
|
}
|
|
@@ -178,6 +181,7 @@ class Swarm {
|
|
|
178
181
|
return;
|
|
179
182
|
}
|
|
180
183
|
const sessionId = protocols_1.PublicKey.random();
|
|
184
|
+
log(`Initiate connection: topic=${this._topic} peerId=${remoteId} sessionId=${sessionId}`);
|
|
181
185
|
const connection = this._createConnection(true, remoteId, sessionId);
|
|
182
186
|
this._signalMessaging.offer({
|
|
183
187
|
id: this._ownPeerId,
|
|
@@ -212,8 +216,8 @@ class Swarm {
|
|
|
212
216
|
this._topology.update();
|
|
213
217
|
}
|
|
214
218
|
_createConnection(initiator, remoteId, sessionId) {
|
|
215
|
-
log(`Create connection topic=${this._topic} remoteId=${remoteId} initiator=${initiator}`);
|
|
216
|
-
(0,
|
|
219
|
+
log(`Create connection topic=${this._topic} ownId=${this._ownPeerId} remoteId=${remoteId} initiator=${initiator}`);
|
|
220
|
+
(0, node_assert_1.default)(!this._connections.has(remoteId), 'Peer already connected.');
|
|
217
221
|
const connection = new connection_1.Connection(this._topic, this._ownPeerId, remoteId, sessionId, initiator, (msg) => this._signalMessaging.signal(msg), this._protocolProvider({ channel: (0, crypto_1.discoveryKey)(this._topic), initiator }), this._transportFactory);
|
|
218
222
|
this._connections.set(remoteId, connection);
|
|
219
223
|
this.connectionAdded.emit(connection);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swarm.js","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,
|
|
1
|
+
{"version":3,"file":"swarm.js","sourceRoot":"","sources":["../../../src/swarm/swarm.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,122 +19,163 @@ const topology_1 = require("../topology");
|
|
|
19
19
|
const transport_1 = require("../transport");
|
|
20
20
|
const swarm_1 = require("./swarm");
|
|
21
21
|
const log = (0, debug_1.default)('dxos:network-manager:swarm:test');
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
22
|
+
describe('Swarm', () => {
|
|
23
|
+
class MockSignalConnection {
|
|
24
|
+
constructor(_swarm, _delay = 10) {
|
|
25
|
+
this._swarm = _swarm;
|
|
26
|
+
this._delay = _delay;
|
|
27
|
+
}
|
|
28
|
+
async offer(msg) {
|
|
29
|
+
await (0, async_1.sleep)(this._delay);
|
|
30
|
+
return this._swarm().onOffer(msg);
|
|
31
|
+
}
|
|
32
|
+
async signal(msg) {
|
|
33
|
+
await (0, async_1.sleep)(this._delay);
|
|
34
|
+
await this._swarm().onSignal(msg);
|
|
35
|
+
}
|
|
26
36
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
37
|
+
const setup = ({ router = false } = {}) => {
|
|
38
|
+
const topic = protocols_1.PublicKey.random();
|
|
39
|
+
const peerId1 = protocols_1.PublicKey.random();
|
|
40
|
+
const peerId2 = protocols_1.PublicKey.random();
|
|
41
|
+
// eslint-disable-next-line prefer-const
|
|
42
|
+
let swarm1;
|
|
43
|
+
// eslint-disable-next-line prefer-const
|
|
44
|
+
let swarm2;
|
|
45
|
+
const mr1 = new message_router_1.MessageRouter({
|
|
46
|
+
sendMessage: msg => mr2.receiveMessage(msg),
|
|
47
|
+
onSignal: msg => swarm1.onSignal(msg),
|
|
48
|
+
onOffer: msg => swarm1.onOffer(msg)
|
|
49
|
+
});
|
|
50
|
+
(0, testutils_1.afterTest)(() => mr1.destroy());
|
|
51
|
+
const mr2 = new message_router_1.MessageRouter({
|
|
52
|
+
sendMessage: msg => mr1.receiveMessage(msg),
|
|
53
|
+
onSignal: msg => swarm2.onSignal(msg),
|
|
54
|
+
onOffer: msg => swarm2.onOffer(msg)
|
|
55
|
+
});
|
|
56
|
+
(0, testutils_1.afterTest)(() => mr2.destroy());
|
|
57
|
+
const sm1 = router ? mr1 : new MockSignalConnection(() => swarm2);
|
|
58
|
+
const sm2 = router ? mr2 : new MockSignalConnection(() => swarm1);
|
|
59
|
+
swarm1 = new swarm_1.Swarm(topic, peerId1, new topology_1.FullyConnectedTopology(), () => new mesh_protocol_1.Protocol(), sm1, (0, transport_1.createWebRTCTransportFactory)(), undefined);
|
|
60
|
+
swarm2 = new swarm_1.Swarm(topic, peerId2, new topology_1.FullyConnectedTopology(), () => new mesh_protocol_1.Protocol(), sm2, (0, transport_1.createWebRTCTransportFactory)(), undefined);
|
|
61
|
+
(0, testutils_1.afterTest)(async () => {
|
|
62
|
+
await swarm1.destroy();
|
|
63
|
+
await swarm2.destroy();
|
|
64
|
+
});
|
|
65
|
+
return { swarm1, swarm2, peerId1, peerId2 };
|
|
66
|
+
};
|
|
67
|
+
(0, mocha_1.it)('connects two peers in a swarm', async () => {
|
|
68
|
+
const { swarm1, swarm2, peerId1, peerId2 } = setup();
|
|
69
|
+
(0, earljs_1.expect)(swarm1.connections.length).toEqual(0);
|
|
70
|
+
(0, earljs_1.expect)(swarm2.connections.length).toEqual(0);
|
|
71
|
+
const promise = Promise.all([
|
|
72
|
+
(0, async_1.promiseTimeout)(swarm1.connected.waitForCount(1), 3000, new Error('Swarm1 connect timeout.')),
|
|
73
|
+
(0, async_1.promiseTimeout)(swarm2.connected.waitForCount(1), 3000, new Error('Swarm2 connect timeout.'))
|
|
74
|
+
]);
|
|
75
|
+
// Behavior of the Signal Server.
|
|
76
|
+
swarm1.onSwarmEvent({
|
|
77
|
+
peerAvailable: {
|
|
78
|
+
peer: peerId1.asUint8Array(),
|
|
79
|
+
since: new Date()
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
swarm1.onSwarmEvent({
|
|
83
|
+
peerAvailable: {
|
|
84
|
+
peer: peerId2.asUint8Array(),
|
|
85
|
+
since: new Date()
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
log('Candidates changed');
|
|
89
|
+
await promise;
|
|
90
|
+
log('Swarms connected');
|
|
91
|
+
const swarm1Connection = swarm1.connections[0];
|
|
92
|
+
const swarm2Connection = swarm2.connections[0];
|
|
93
|
+
const onData = (0, earljs_1.mockFn)().returns(undefined);
|
|
94
|
+
swarm2Connection.transport.peer.on('data', onData);
|
|
95
|
+
const data = Buffer.from('1234');
|
|
96
|
+
swarm1Connection.transport.peer.send(data);
|
|
97
|
+
await (0, wait_for_expect_1.default)(() => {
|
|
98
|
+
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
99
|
+
});
|
|
100
|
+
}).timeout(5000);
|
|
101
|
+
(0, mocha_1.it)('two peers try to originate connections to each other simultaneously', async () => {
|
|
102
|
+
const { swarm1, swarm2, peerId1, peerId2 } = setup();
|
|
103
|
+
(0, earljs_1.expect)(swarm1.connections.length).toEqual(0);
|
|
104
|
+
(0, earljs_1.expect)(swarm2.connections.length).toEqual(0);
|
|
105
|
+
swarm1.onSwarmEvent({
|
|
106
|
+
peerAvailable: {
|
|
107
|
+
peer: peerId2.asUint8Array(),
|
|
108
|
+
since: new Date()
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
swarm2.onSwarmEvent({
|
|
112
|
+
peerAvailable: {
|
|
113
|
+
peer: peerId1.asUint8Array(),
|
|
114
|
+
since: new Date()
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
await Promise.all([
|
|
118
|
+
swarm1.connected.waitForCount(1),
|
|
119
|
+
swarm2.connected.waitForCount(1)
|
|
120
|
+
]);
|
|
121
|
+
}).timeout(5000);
|
|
122
|
+
(0, mocha_1.it)('second peer discovered after delay', async () => {
|
|
123
|
+
const { swarm1, swarm2, peerId1, peerId2 } = setup();
|
|
124
|
+
(0, earljs_1.expect)(swarm1.connections.length).toEqual(0);
|
|
125
|
+
(0, earljs_1.expect)(swarm2.connections.length).toEqual(0);
|
|
126
|
+
swarm1.onSwarmEvent({
|
|
127
|
+
peerAvailable: {
|
|
128
|
+
peer: peerId2.asUint8Array(),
|
|
129
|
+
since: new Date()
|
|
130
|
+
}
|
|
131
|
+
});
|
|
132
|
+
await (0, async_1.sleep)(15);
|
|
133
|
+
swarm2.onSwarmEvent({
|
|
134
|
+
peerAvailable: {
|
|
135
|
+
peer: peerId1.asUint8Array(),
|
|
136
|
+
since: new Date()
|
|
137
|
+
}
|
|
138
|
+
});
|
|
139
|
+
await Promise.all([
|
|
140
|
+
swarm1.connected.waitForCount(1),
|
|
141
|
+
swarm1.connected.waitForCount(1)
|
|
142
|
+
]);
|
|
143
|
+
const swarm1Connection = swarm1.connections[0];
|
|
144
|
+
const swarm2Connection = swarm2.connections[0];
|
|
145
|
+
const onData = (0, earljs_1.mockFn)().returns(undefined);
|
|
146
|
+
swarm2Connection.transport.peer.on('data', onData);
|
|
147
|
+
const data = Buffer.from('1234');
|
|
148
|
+
swarm1Connection.transport.peer.send(data);
|
|
149
|
+
await (0, wait_for_expect_1.default)(() => {
|
|
150
|
+
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
151
|
+
});
|
|
152
|
+
}).timeout(5000);
|
|
153
|
+
(0, mocha_1.it)('swarming with message router', async () => {
|
|
154
|
+
const { swarm1, swarm2, peerId2 } = setup({ router: true });
|
|
155
|
+
const promise = Promise.all([
|
|
156
|
+
(0, async_1.promiseTimeout)(swarm1.connected.waitForCount(1), 3000, new Error('Swarm1 connect timeout.')),
|
|
157
|
+
(0, async_1.promiseTimeout)(swarm2.connected.waitForCount(1), 3000, new Error('Swarm2 connect timeout.'))
|
|
158
|
+
]);
|
|
159
|
+
swarm1.onSwarmEvent({
|
|
160
|
+
peerAvailable: {
|
|
161
|
+
peer: peerId2.asUint8Array(),
|
|
162
|
+
since: new Date()
|
|
163
|
+
}
|
|
164
|
+
});
|
|
165
|
+
log('Candidates changed');
|
|
166
|
+
await promise;
|
|
167
|
+
log('Swarms connected');
|
|
168
|
+
const swarm1Connection = swarm1.connections[0];
|
|
169
|
+
const swarm2Connection = swarm2.connections[0];
|
|
170
|
+
const onData = (0, earljs_1.mockFn)().returns(undefined);
|
|
171
|
+
swarm2Connection.transport.peer.on('data', onData);
|
|
172
|
+
const data = Buffer.from('1234');
|
|
173
|
+
swarm1Connection.transport.peer.send(data);
|
|
174
|
+
await (0, wait_for_expect_1.default)(() => {
|
|
175
|
+
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
176
|
+
});
|
|
59
177
|
await swarm1.destroy();
|
|
60
178
|
await swarm2.destroy();
|
|
61
|
-
});
|
|
62
|
-
|
|
63
|
-
};
|
|
64
|
-
(0, mocha_1.it)('connects two peers in a swarm', async () => {
|
|
65
|
-
const { swarm1, swarm2, peerId2 } = setup();
|
|
66
|
-
(0, earljs_1.expect)(swarm1.connections.length).toEqual(0);
|
|
67
|
-
(0, earljs_1.expect)(swarm2.connections.length).toEqual(0);
|
|
68
|
-
const promise = Promise.all([
|
|
69
|
-
(0, async_1.promiseTimeout)(swarm1.connected.waitForCount(1), 3000, new Error('Swarm1 connect timeout.')),
|
|
70
|
-
(0, async_1.promiseTimeout)(swarm2.connected.waitForCount(1), 3000, new Error('Swarm2 connect timeout.'))
|
|
71
|
-
]);
|
|
72
|
-
swarm1.onPeerCandidatesChanged([peerId2]);
|
|
73
|
-
log('Candidates changed');
|
|
74
|
-
await promise;
|
|
75
|
-
log('Swarms connected');
|
|
76
|
-
const swarm1Connection = swarm1.connections[0];
|
|
77
|
-
const swarm2Connection = swarm2.connections[0];
|
|
78
|
-
const onData = (0, earljs_1.mockFn)().returns(undefined);
|
|
79
|
-
swarm2Connection.transport.peer.on('data', onData);
|
|
80
|
-
const data = Buffer.from('1234');
|
|
81
|
-
swarm1Connection.transport.peer.send(data);
|
|
82
|
-
await (0, wait_for_expect_1.default)(() => {
|
|
83
|
-
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
84
|
-
});
|
|
85
|
-
}).timeout(5000);
|
|
86
|
-
(0, mocha_1.it)('two peers try to originate connections to each other simultaneously', async () => {
|
|
87
|
-
const { swarm1, swarm2, peerId1, peerId2 } = setup();
|
|
88
|
-
(0, earljs_1.expect)(swarm1.connections.length).toEqual(0);
|
|
89
|
-
(0, earljs_1.expect)(swarm2.connections.length).toEqual(0);
|
|
90
|
-
swarm1.onPeerCandidatesChanged([peerId2]);
|
|
91
|
-
swarm2.onPeerCandidatesChanged([peerId1]);
|
|
92
|
-
await Promise.all([
|
|
93
|
-
swarm1.connected.waitForCount(1),
|
|
94
|
-
swarm2.connected.waitForCount(1)
|
|
95
|
-
]);
|
|
96
|
-
}).timeout(5000);
|
|
97
|
-
(0, mocha_1.it)('second peer discovered after delay', async () => {
|
|
98
|
-
const { swarm1, swarm2, peerId1, peerId2 } = setup();
|
|
99
|
-
(0, earljs_1.expect)(swarm1.connections.length).toEqual(0);
|
|
100
|
-
(0, earljs_1.expect)(swarm2.connections.length).toEqual(0);
|
|
101
|
-
swarm1.onPeerCandidatesChanged([peerId2]);
|
|
102
|
-
await (0, async_1.sleep)(15);
|
|
103
|
-
swarm2.onPeerCandidatesChanged([peerId1]);
|
|
104
|
-
await Promise.all([
|
|
105
|
-
swarm1.connected.waitForCount(1),
|
|
106
|
-
swarm1.connected.waitForCount(1)
|
|
107
|
-
]);
|
|
108
|
-
const swarm1Connection = swarm1.connections[0];
|
|
109
|
-
const swarm2Connection = swarm2.connections[0];
|
|
110
|
-
const onData = (0, earljs_1.mockFn)().returns(undefined);
|
|
111
|
-
swarm2Connection.transport.peer.on('data', onData);
|
|
112
|
-
const data = Buffer.from('1234');
|
|
113
|
-
swarm1Connection.transport.peer.send(data);
|
|
114
|
-
await (0, wait_for_expect_1.default)(() => {
|
|
115
|
-
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
116
|
-
});
|
|
117
|
-
}).timeout(5000);
|
|
118
|
-
(0, mocha_1.it)('swarming with message router', async () => {
|
|
119
|
-
const { swarm1, swarm2, peerId2 } = setup({ router: true });
|
|
120
|
-
const promise = Promise.all([
|
|
121
|
-
(0, async_1.promiseTimeout)(swarm1.connected.waitForCount(1), 3000, new Error('Swarm1 connect timeout.')),
|
|
122
|
-
(0, async_1.promiseTimeout)(swarm2.connected.waitForCount(1), 3000, new Error('Swarm2 connect timeout.'))
|
|
123
|
-
]);
|
|
124
|
-
swarm1.onPeerCandidatesChanged([peerId2]);
|
|
125
|
-
log('Candidates changed');
|
|
126
|
-
await promise;
|
|
127
|
-
log('Swarms connected');
|
|
128
|
-
const swarm1Connection = swarm1.connections[0];
|
|
129
|
-
const swarm2Connection = swarm2.connections[0];
|
|
130
|
-
const onData = (0, earljs_1.mockFn)().returns(undefined);
|
|
131
|
-
swarm2Connection.transport.peer.on('data', onData);
|
|
132
|
-
const data = Buffer.from('1234');
|
|
133
|
-
swarm1Connection.transport.peer.send(data);
|
|
134
|
-
await (0, wait_for_expect_1.default)(() => {
|
|
135
|
-
(0, earljs_1.expect)(onData).toHaveBeenCalledWith([data]);
|
|
136
|
-
});
|
|
137
|
-
await swarm1.destroy();
|
|
138
|
-
await swarm2.destroy();
|
|
139
|
-
}).timeout(5000);
|
|
179
|
+
}).timeout(5000);
|
|
180
|
+
});
|
|
140
181
|
//# 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,uDAA+C;AAC/C,+CAA4C;AAC5C,+CAA4C;AAI5C,6DAAyD;AACzD,0CAAqD;AACrD,4CAA6E;AAC7E,mCAAgC;AAEhC,MAAM,GAAG,GAAG,IAAA,eAAK,EAAC,iCAAiC,CAAC,CAAC;AAErD,MAAM,oBAAoB;
|
|
1
|
+
{"version":3,"file":"swarm.test.js","sourceRoot":"","sources":["../../../src/swarm/swarm.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-protocol.d.ts","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"test-protocol.d.ts","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":";;AAOA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAU1D,eAAO,MAAM,SAAS,aAAc,QAAQ,WAG3C,CAAC;AAEF;;;;GAIG;AACH,qBAAa,kBAAmB,SAAQ,YAAY;IAClD,sCAAsC;IACtC,MAAM,gBAAC;IAEP,qBAAqB;IACrB,OAAO,SAAC;IAER,sBAAsB;IACtB,UAAU,UAAC;IAEX,UAAU,UAAS;IAEnB;;;;;;OAMG;gBACU,MAAM,EAAE,MAAM,EAAE,SAAS,UAAQ;IAU9C;;;OAGG;IACH,IAAI,MAAM,WAET;IAED;;;OAGG;IACH,IAAI,KAAK,UAER;IAED;;;;OAIG;IACH,eAAe;IAWf;;;;;OAKG;IACG,IAAI,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAW/C,KAAK;IAIb,QAAQ,CAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG;IAUvC,cAAc,CAAE,QAAQ,EAAE,QAAQ;IAclC,iBAAiB,CAAE,QAAQ,EAAE,QAAQ;CAS5C;AAED;;GAEG;AAEH,eAAO,MAAM,oBAAoB,aAAc,MAAM,UAAU,MAAM,kBAAkB,GAAG,kCAIxF,CAAC"}
|
|
@@ -8,9 +8,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.testProtocolProvider = exports.TestProtocolPlugin = exports.getPeerId = void 0;
|
|
10
10
|
// Test/mock Protocol implementation used in network-manager tests.
|
|
11
|
-
const assert_1 = __importDefault(require("assert"));
|
|
12
11
|
const debug_1 = __importDefault(require("debug"));
|
|
13
12
|
const events_1 = require("events");
|
|
13
|
+
const node_assert_1 = __importDefault(require("node:assert"));
|
|
14
14
|
const mesh_protocol_1 = require("@dxos/mesh-protocol");
|
|
15
15
|
const protocols_1 = require("@dxos/protocols");
|
|
16
16
|
const protocol_factory_1 = require("../protocol-factory");
|
|
@@ -39,7 +39,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
39
39
|
constructor(peerId, uppercase = false) {
|
|
40
40
|
super();
|
|
41
41
|
this.initCalled = false;
|
|
42
|
-
(0,
|
|
42
|
+
(0, node_assert_1.default)(Buffer.isBuffer(peerId));
|
|
43
43
|
// TODO(dboreham): Mis-named because this is OUR node ID, not the id of any peer.
|
|
44
44
|
this._peerId = peerId;
|
|
45
45
|
this._uppercase = uppercase;
|
|
@@ -80,7 +80,7 @@ class TestProtocolPlugin extends events_1.EventEmitter {
|
|
|
80
80
|
* @return Message received from peer in response to our request.
|
|
81
81
|
*/
|
|
82
82
|
async send(peerId, payload) {
|
|
83
|
-
(0,
|
|
83
|
+
(0, node_assert_1.default)(Buffer.isBuffer(peerId));
|
|
84
84
|
const peerIdStr = protocols_1.PublicKey.stringify(peerId);
|
|
85
85
|
const peer = this._peers.get(peerIdStr);
|
|
86
86
|
// TODO(dboreham): Throw fatal error if peer not found.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-protocol.js","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,mEAAmE;AAEnE,
|
|
1
|
+
{"version":3,"file":"test-protocol.js","sourceRoot":"","sources":["../../../src/testing/test-protocol.ts"],"names":[],"mappings":"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"}
|