@streamr/trackerless-network 100.0.0-testnet-two.1 → 100.0.0-testnet-two.3
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/package.json +6 -6
- package/dist/src/NetworkNode.d.ts +3 -4
- package/dist/src/NetworkNode.js.map +1 -1
- package/dist/src/NetworkStack.js +1 -1
- package/dist/src/NetworkStack.js.map +1 -1
- package/dist/src/exports.d.ts +0 -1
- package/dist/src/exports.js.map +1 -1
- package/dist/src/logic/DeliveryRpcLocal.d.ts +4 -5
- package/dist/src/logic/DeliveryRpcLocal.js +3 -3
- package/dist/src/logic/DeliveryRpcLocal.js.map +1 -1
- package/dist/src/logic/DeliveryRpcRemote.d.ts +2 -1
- package/dist/src/logic/DeliveryRpcRemote.js +2 -2
- package/dist/src/logic/DeliveryRpcRemote.js.map +1 -1
- package/dist/src/logic/EntryPointDiscovery.d.ts +5 -5
- package/dist/src/logic/EntryPointDiscovery.js +4 -5
- package/dist/src/logic/EntryPointDiscovery.js.map +1 -1
- package/dist/src/logic/Layer0Node.d.ts +4 -4
- package/dist/src/logic/NodeList.d.ts +12 -13
- package/dist/src/logic/NodeList.js +4 -4
- package/dist/src/logic/NodeList.js.map +1 -1
- package/dist/src/logic/RandomGraphNode.d.ts +6 -7
- package/dist/src/logic/RandomGraphNode.js +9 -9
- package/dist/src/logic/RandomGraphNode.js.map +1 -1
- package/dist/src/logic/StreamrNode.d.ts +3 -4
- package/dist/src/logic/StreamrNode.js +4 -4
- package/dist/src/logic/StreamrNode.js.map +1 -1
- package/dist/src/logic/createRandomGraphNode.js +1 -3
- package/dist/src/logic/createRandomGraphNode.js.map +1 -1
- package/dist/src/logic/inspect/InspectSession.d.ts +3 -3
- package/dist/src/logic/inspect/InspectSession.js.map +1 -1
- package/dist/src/logic/inspect/Inspector.d.ts +3 -4
- package/dist/src/logic/inspect/Inspector.js +3 -3
- package/dist/src/logic/inspect/Inspector.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.d.ts +4 -5
- package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.js +11 -10
- package/dist/src/logic/neighbor-discovery/HandshakeRpcLocal.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.d.ts +3 -3
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.js +7 -8
- package/dist/src/logic/neighbor-discovery/HandshakeRpcRemote.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/Handshaker.d.ts +3 -4
- package/dist/src/logic/neighbor-discovery/Handshaker.js +12 -12
- package/dist/src/logic/neighbor-discovery/Handshaker.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborFinder.d.ts +3 -3
- package/dist/src/logic/neighbor-discovery/NeighborFinder.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js +4 -4
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.js +6 -7
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.js.map +1 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.d.ts +2 -1
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.js +3 -4
- package/dist/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.js.map +1 -1
- package/dist/src/logic/propagation/Propagation.d.ts +4 -4
- package/dist/src/logic/propagation/Propagation.js.map +1 -1
- package/dist/src/logic/propagation/PropagationTaskStore.d.ts +2 -2
- package/dist/src/logic/proxy/ProxyClient.d.ts +3 -4
- package/dist/src/logic/proxy/ProxyClient.js +8 -9
- package/dist/src/logic/proxy/ProxyClient.js.map +1 -1
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.d.ts +6 -7
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js +4 -4
- package/dist/src/logic/proxy/ProxyConnectionRpcLocal.js.map +1 -1
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.d.ts +0 -2
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.js +3 -3
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcLocal.js.map +1 -1
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcRemote.js +1 -2
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcRemote.js.map +1 -1
- package/dist/test/benchmark/first-message.js +2 -3
- package/dist/test/benchmark/first-message.js.map +1 -1
- package/dist/test/utils/utils.d.ts +2 -3
- package/dist/test/utils/utils.js +4 -4
- package/dist/test/utils/utils.js.map +1 -1
- package/package.json +6 -6
- package/src/NetworkNode.ts +3 -4
- package/src/NetworkStack.ts +1 -1
- package/src/exports.ts +0 -1
- package/src/logic/DeliveryRpcLocal.ts +4 -5
- package/src/logic/DeliveryRpcRemote.ts +3 -2
- package/src/logic/EntryPointDiscovery.ts +11 -9
- package/src/logic/Layer0Node.ts +4 -4
- package/src/logic/NodeList.ts +15 -16
- package/src/logic/RandomGraphNode.ts +16 -17
- package/src/logic/StreamrNode.ts +8 -6
- package/src/logic/createRandomGraphNode.ts +2 -4
- package/src/logic/inspect/InspectSession.ts +4 -4
- package/src/logic/inspect/Inspector.ts +4 -6
- package/src/logic/neighbor-discovery/HandshakeRpcLocal.ts +20 -12
- package/src/logic/neighbor-discovery/HandshakeRpcRemote.ts +11 -10
- package/src/logic/neighbor-discovery/Handshaker.ts +14 -15
- package/src/logic/neighbor-discovery/NeighborFinder.ts +4 -4
- package/src/logic/neighbor-discovery/NeighborUpdateManager.ts +2 -4
- package/src/logic/neighbor-discovery/NeighborUpdateRpcLocal.ts +6 -9
- package/src/logic/neighbor-discovery/NeighborUpdateRpcRemote.ts +4 -4
- package/src/logic/propagation/Propagation.ts +6 -6
- package/src/logic/propagation/PropagationTaskStore.ts +2 -2
- package/src/logic/proxy/ProxyClient.ts +20 -21
- package/src/logic/proxy/ProxyConnectionRpcLocal.ts +10 -12
- package/src/logic/temporary-connection/TemporaryConnectionRpcLocal.ts +1 -5
- package/src/logic/temporary-connection/TemporaryConnectionRpcRemote.ts +1 -2
- package/test/benchmark/first-message.ts +2 -3
- package/test/end-to-end/proxy-connections.test.ts +2 -2
- package/test/end-to-end/webrtc-full-node-network.test.ts +1 -2
- package/test/end-to-end/websocket-full-node-network.test.ts +1 -1
- package/test/integration/DeliveryRpcRemote.test.ts +2 -5
- package/test/integration/HandshakeRpcRemote.test.ts +2 -2
- package/test/integration/Handshakes.test.ts +2 -6
- package/test/integration/NeighborUpdateRpcRemote.test.ts +1 -2
- package/test/unit/HandshakeRpcLocal.test.ts +9 -11
- package/test/unit/Handshaker.test.ts +1 -2
- package/test/unit/InspectSession.test.ts +3 -3
- package/test/unit/Inspector.test.ts +1 -2
- package/test/unit/NeighborFinder.test.ts +2 -2
- package/test/unit/NodeList.test.ts +12 -13
- package/test/unit/Propagation.test.ts +9 -9
- package/test/unit/ProxyConnectionRpcRemote.test.ts +0 -2
- package/test/unit/RandomGraphNode.test.ts +1 -1
- package/test/utils/mock/MockHandshaker.ts +3 -3
- package/test/utils/utils.ts +15 -7
- package/dist/src/identifiers.d.ts +0 -4
- package/dist/src/identifiers.js +0 -9
- package/dist/src/identifiers.js.map +0 -1
- package/src/identifiers.ts +0 -8
|
@@ -6,7 +6,6 @@ const protocol_1 = require("@streamr/protocol");
|
|
|
6
6
|
const utils_1 = require("@streamr/utils");
|
|
7
7
|
const eventemitter3_1 = require("eventemitter3");
|
|
8
8
|
const lodash_1 = require("lodash");
|
|
9
|
-
const identifiers_1 = require("../identifiers");
|
|
10
9
|
const EntryPointDiscovery_1 = require("./EntryPointDiscovery");
|
|
11
10
|
const createRandomGraphNode_1 = require("./createRandomGraphNode");
|
|
12
11
|
const ProxyClient_1 = require("./proxy/ProxyClient");
|
|
@@ -31,7 +30,7 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
|
|
|
31
30
|
if (this.started || this.destroyed) {
|
|
32
31
|
return;
|
|
33
32
|
}
|
|
34
|
-
logger.info(`Starting new StreamrNode with id ${(0,
|
|
33
|
+
logger.info(`Starting new StreamrNode with id ${(0, dht_1.getNodeIdFromPeerDescriptor)(startedAndJoinedLayer0Node.getLocalPeerDescriptor())}`);
|
|
35
34
|
this.started = true;
|
|
36
35
|
this.layer0Node = startedAndJoinedLayer0Node;
|
|
37
36
|
this.transport = transport;
|
|
@@ -52,6 +51,7 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
|
|
|
52
51
|
}
|
|
53
52
|
broadcast(msg) {
|
|
54
53
|
const streamPartId = (0, protocol_1.toStreamPartID)(msg.messageId.streamId, msg.messageId.streamPartition);
|
|
54
|
+
logger.debug(`Broadcasting to stream part ${streamPartId}`);
|
|
55
55
|
this.joinStreamPart(streamPartId);
|
|
56
56
|
this.streamParts.get(streamPartId).broadcast(msg);
|
|
57
57
|
this.metrics.broadcastMessagesPerSecond.record(1);
|
|
@@ -65,11 +65,11 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
|
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
joinStreamPart(streamPartId) {
|
|
68
|
-
logger.debug(`Join stream part ${streamPartId}`);
|
|
69
68
|
let streamPart = this.streamParts.get(streamPartId);
|
|
70
69
|
if (streamPart !== undefined) {
|
|
71
70
|
return;
|
|
72
71
|
}
|
|
72
|
+
logger.debug(`Join stream part ${streamPartId}`);
|
|
73
73
|
const layer1Node = this.createLayer1Node(streamPartId, this.knownStreamPartEntryPoints.get(streamPartId) ?? []);
|
|
74
74
|
const entryPointDiscovery = new EntryPointDiscovery_1.EntryPointDiscovery({
|
|
75
75
|
streamPartId,
|
|
@@ -222,7 +222,7 @@ class StreamrNode extends eventemitter3_1.EventEmitter {
|
|
|
222
222
|
return this.layer0Node.getLocalPeerDescriptor();
|
|
223
223
|
}
|
|
224
224
|
getNodeId() {
|
|
225
|
-
return (0,
|
|
225
|
+
return (0, dht_1.getNodeIdFromPeerDescriptor)(this.layer0Node.getLocalPeerDescriptor());
|
|
226
226
|
}
|
|
227
227
|
getNeighbors(streamPartId) {
|
|
228
228
|
const streamPart = this.streamParts.get(streamPartId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamrNode.js","sourceRoot":"","sources":["../../../src/logic/StreamrNode.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"StreamrNode.js","sourceRoot":"","sources":["../../../src/logic/StreamrNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,9 @@ const Propagation_1 = require("./propagation/Propagation");
|
|
|
11
11
|
const ProxyConnectionRpcLocal_1 = require("./proxy/ProxyConnectionRpcLocal");
|
|
12
12
|
const Inspector_1 = require("./inspect/Inspector");
|
|
13
13
|
const TemporaryConnectionRpcLocal_1 = require("./temporary-connection/TemporaryConnectionRpcLocal");
|
|
14
|
-
const identifiers_1 = require("../identifiers");
|
|
15
14
|
const formStreamPartDeliveryServiceId_1 = require("./formStreamPartDeliveryServiceId");
|
|
16
15
|
const createConfigWithDefaults = (config) => {
|
|
17
|
-
const ownNodeId = (0,
|
|
16
|
+
const ownNodeId = (0, dht_1.getNodeIdFromPeerDescriptor)(config.localPeerDescriptor);
|
|
18
17
|
const rpcCommunicator = config.rpcCommunicator ?? new dht_1.ListeningRpcCommunicator((0, formStreamPartDeliveryServiceId_1.formStreamPartDeliveryServiceId)(config.streamPartId), config.transport);
|
|
19
18
|
const numOfTargetNeighbors = config.numOfTargetNeighbors ?? 4;
|
|
20
19
|
const maxNumberOfContacts = config.maxNumberOfContacts ?? 20;
|
|
@@ -25,7 +24,6 @@ const createConfigWithDefaults = (config) => {
|
|
|
25
24
|
const randomNodeView = config.randomNodeView ?? new NodeList_1.NodeList(ownNodeId, maxNumberOfContacts);
|
|
26
25
|
const targetNeighbors = config.targetNeighbors ?? new NodeList_1.NodeList(ownNodeId, maxNumberOfContacts);
|
|
27
26
|
const temporaryConnectionRpcLocal = new TemporaryConnectionRpcLocal_1.TemporaryConnectionRpcLocal({
|
|
28
|
-
streamPartId: config.streamPartId,
|
|
29
27
|
rpcCommunicator,
|
|
30
28
|
localPeerDescriptor: config.localPeerDescriptor
|
|
31
29
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createRandomGraphNode.js","sourceRoot":"","sources":["../../../src/logic/createRandomGraphNode.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"createRandomGraphNode.js","sourceRoot":"","sources":["../../../src/logic/createRandomGraphNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { EventEmitter } from 'eventemitter3';
|
|
2
|
-
import { NodeID } from '../../identifiers';
|
|
3
2
|
import { MessageID } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
3
|
+
import { DhtAddress } from '@streamr/dht';
|
|
4
4
|
export interface Events {
|
|
5
5
|
done: () => void;
|
|
6
6
|
}
|
|
7
7
|
interface InspectSessionConfig {
|
|
8
|
-
inspectedNode:
|
|
8
|
+
inspectedNode: DhtAddress;
|
|
9
9
|
}
|
|
10
10
|
export declare class InspectSession extends EventEmitter<Events> {
|
|
11
11
|
private readonly inspectionMessages;
|
|
12
12
|
private readonly inspectedNode;
|
|
13
13
|
constructor(config: InspectSessionConfig);
|
|
14
|
-
markMessage(senderId:
|
|
14
|
+
markMessage(senderId: DhtAddress, messageId: MessageID): void;
|
|
15
15
|
getInspectedMessageCount(): number;
|
|
16
16
|
stop(): void;
|
|
17
17
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InspectSession.js","sourceRoot":"","sources":["../../../../src/logic/inspect/InspectSession.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;
|
|
1
|
+
{"version":3,"file":"InspectSession.js","sourceRoot":"","sources":["../../../../src/logic/inspect/InspectSession.ts"],"names":[],"mappings":";;;AAAA,iDAA4C;AAE5C,0CAA4C;AAW5C,MAAM,gBAAgB,GAAG,CAAC,SAAoB,EAAU,EAAE;IACtD,OAAO,GAAG,IAAA,mBAAW,EAAC,SAAS,CAAC,WAAW,CAAC,IAAI,SAAS,CAAC,cAAc,IAAI,SAAS,CAAC,SAAS,IAAI,SAAS,CAAC,cAAc,EAAE,CAAA;AACjI,CAAC,CAAA;AACD,MAAa,cAAe,SAAQ,4BAAoB;IAMpD,YAAY,MAA4B;QACpC,KAAK,EAAE,CAAA;QALX,2EAA2E;QAC1D,uBAAkB,GAAyB,IAAI,GAAG,EAAE,CAAA;QAKjE,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAA;IAC7C,CAAC;IAED,WAAW,CAAC,QAAoB,EAAE,SAAoB;QAClD,MAAM,UAAU,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAA;QAC9C,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAC1C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,KAAK,IAAI,CAAC,aAAa,CAAC,CAAA;SAC3E;aAAM,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC;eAC3C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,KAAK;eACjD,QAAQ,KAAK,IAAI,CAAC,aAAa,EACpC;YACE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;SACpB;aAAM,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC;eAC3C,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE;YACrD,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;SACpB;IACL,CAAC;IAED,wBAAwB;QACpB,OAAO,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAA;IACvC,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACrB,CAAC;CACJ;AAjCD,wCAiCC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { PeerDescriptor, ConnectionLocker, LockID } from '@streamr/dht';
|
|
1
|
+
import { PeerDescriptor, ConnectionLocker, LockID, DhtAddress } from '@streamr/dht';
|
|
2
2
|
import { MessageID } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
3
3
|
import { RpcCommunicator } from '@streamr/proto-rpc';
|
|
4
|
-
import { NodeID } from '../../identifiers';
|
|
5
4
|
import { StreamPartID } from '@streamr/protocol';
|
|
6
5
|
interface InspectorConfig {
|
|
7
6
|
localPeerDescriptor: PeerDescriptor;
|
|
@@ -22,8 +21,8 @@ export declare class Inspector {
|
|
|
22
21
|
constructor(config: InspectorConfig);
|
|
23
22
|
defaultOpenInspectConnection(peerDescriptor: PeerDescriptor, lockId: LockID): Promise<void>;
|
|
24
23
|
inspect(peerDescriptor: PeerDescriptor): Promise<boolean>;
|
|
25
|
-
markMessage(sender:
|
|
26
|
-
isInspected(nodeId:
|
|
24
|
+
markMessage(sender: DhtAddress, messageId: MessageID): void;
|
|
25
|
+
isInspected(nodeId: DhtAddress): boolean;
|
|
27
26
|
stop(): void;
|
|
28
27
|
}
|
|
29
28
|
export {};
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Inspector = void 0;
|
|
4
|
+
const dht_1 = require("@streamr/dht");
|
|
4
5
|
const InspectSession_1 = require("./InspectSession");
|
|
5
6
|
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
6
7
|
const utils_1 = require("@streamr/utils");
|
|
7
8
|
const TemporaryConnectionRpcRemote_1 = require("../temporary-connection/TemporaryConnectionRpcRemote");
|
|
8
|
-
const identifiers_1 = require("../../identifiers");
|
|
9
9
|
const logger = new utils_1.Logger(module);
|
|
10
10
|
const DEFAULT_TIMEOUT = 60 * 1000;
|
|
11
11
|
class Inspector {
|
|
@@ -19,12 +19,12 @@ class Inspector {
|
|
|
19
19
|
this.openInspectConnection = config.openInspectConnection ?? this.defaultOpenInspectConnection;
|
|
20
20
|
}
|
|
21
21
|
async defaultOpenInspectConnection(peerDescriptor, lockId) {
|
|
22
|
-
const rpcRemote = new TemporaryConnectionRpcRemote_1.TemporaryConnectionRpcRemote(this.localPeerDescriptor, peerDescriptor, this.
|
|
22
|
+
const rpcRemote = new TemporaryConnectionRpcRemote_1.TemporaryConnectionRpcRemote(this.localPeerDescriptor, peerDescriptor, this.rpcCommunicator, NetworkRpc_client_1.TemporaryConnectionRpcClient);
|
|
23
23
|
await rpcRemote.openConnection();
|
|
24
24
|
this.connectionLocker.lockConnection(peerDescriptor, lockId);
|
|
25
25
|
}
|
|
26
26
|
async inspect(peerDescriptor) {
|
|
27
|
-
const nodeId = (0,
|
|
27
|
+
const nodeId = (0, dht_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
|
|
28
28
|
const session = new InspectSession_1.InspectSession({
|
|
29
29
|
inspectedNode: nodeId
|
|
30
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../../src/logic/inspect/Inspector.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Inspector.js","sourceRoot":"","sources":["../../../../src/logic/inspect/Inspector.ts"],"names":[],"mappings":";;;AAAA,sCAAgH;AAEhH,qDAAiF;AACjF,yGAAgH;AAEhH,0CAAsD;AACtD,uGAAmG;AAYnG,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AACjC,MAAM,eAAe,GAAG,EAAE,GAAG,IAAI,CAAA;AAEjC,MAAa,SAAS;IAUlB,YAAY,MAAuB;QARlB,aAAQ,GAAoC,IAAI,GAAG,EAAE,CAAA;QASlE,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAA;QACvC,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,mBAAmB,CAAA;QACrD,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAA;QAC7C,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAA;QAC/C,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,IAAI,eAAe,CAAA;QACpE,IAAI,CAAC,qBAAqB,GAAG,MAAM,CAAC,qBAAqB,IAAI,IAAI,CAAC,4BAA4B,CAAA;IAClG,CAAC;IAED,KAAK,CAAC,4BAA4B,CAAC,cAA8B,EAAE,MAAc;QAC7E,MAAM,SAAS,GAAG,IAAI,2DAA4B,CAC9C,IAAI,CAAC,mBAAmB,EACxB,cAAc,EACd,IAAI,CAAC,eAAe,EACpB,gDAA4B,CAC/B,CAAA;QACD,MAAM,SAAS,CAAC,cAAc,EAAE,CAAA;QAChC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;IAChE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,cAA8B;QACxC,MAAM,MAAM,GAAG,IAAA,iCAA2B,EAAC,cAAc,CAAC,CAAA;QAC1D,MAAM,OAAO,GAAG,IAAI,+BAAc,CAAC;YAC/B,aAAa,EAAE,MAAM;SACxB,CAAC,CAAA;QACF,MAAM,MAAM,GAAG,aAAa,IAAI,CAAC,YAAY,EAAE,CAAA;QAC/C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAClC,MAAM,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;QACxD,IAAI,OAAO,GAAG,KAAK,CAAA;QACnB,IAAI;YACA,MAAM,IAAA,qBAAa,EAAuB,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAA;YAClF,OAAO,GAAG,IAAI,CAAA;SACjB;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAA;SACtD;gBAAS;YACN,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;YAC5B,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;SACjE;QACD,OAAO,OAAO,IAAI,OAAO,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAA;IAC5D,CAAC;IAED,WAAW,CAAC,MAAkB,EAAE,SAAoB;QAChD,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;IAC9E,CAAC;IAED,WAAW,CAAC,MAAkB;QAC1B,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC;IAED,IAAI;QACA,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9B,OAAO,CAAC,IAAI,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAA;IACzB,CAAC;CAEJ;AAlED,8BAkEC"}
|
|
@@ -1,22 +1,21 @@
|
|
|
1
1
|
import { InterleaveRequest, InterleaveResponse, StreamPartHandshakeRequest, StreamPartHandshakeResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
2
2
|
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
3
3
|
import { NodeList } from '../NodeList';
|
|
4
|
-
import { ConnectionLocker, PeerDescriptor } from '@streamr/dht';
|
|
4
|
+
import { ConnectionLocker, DhtAddress, PeerDescriptor } from '@streamr/dht';
|
|
5
5
|
import { IHandshakeRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
|
|
6
6
|
import { HandshakeRpcRemote } from './HandshakeRpcRemote';
|
|
7
7
|
import { DeliveryRpcRemote } from '../DeliveryRpcRemote';
|
|
8
|
-
import { NodeID } from '../../identifiers';
|
|
9
8
|
import { StreamPartID } from '@streamr/protocol';
|
|
10
9
|
interface HandshakeRpcLocalConfig {
|
|
11
10
|
streamPartId: StreamPartID;
|
|
12
11
|
targetNeighbors: NodeList;
|
|
13
12
|
connectionLocker: ConnectionLocker;
|
|
14
|
-
ongoingHandshakes: Set<
|
|
15
|
-
ongoingInterleaves: Set<
|
|
13
|
+
ongoingHandshakes: Set<DhtAddress>;
|
|
14
|
+
ongoingInterleaves: Set<DhtAddress>;
|
|
16
15
|
maxNeighborCount: number;
|
|
17
16
|
createRpcRemote: (target: PeerDescriptor) => HandshakeRpcRemote;
|
|
18
17
|
createDeliveryRpcRemote: (peerDescriptor: PeerDescriptor) => DeliveryRpcRemote;
|
|
19
|
-
handshakeWithInterleaving: (target: PeerDescriptor, senderId:
|
|
18
|
+
handshakeWithInterleaving: (target: PeerDescriptor, senderId: DhtAddress) => Promise<boolean>;
|
|
20
19
|
}
|
|
21
20
|
export declare class HandshakeRpcLocal implements IHandshakeRpc {
|
|
22
21
|
private readonly config;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.HandshakeRpcLocal = void 0;
|
|
4
|
-
const
|
|
4
|
+
const dht_1 = require("@streamr/dht");
|
|
5
5
|
const utils_1 = require("@streamr/utils");
|
|
6
6
|
const logger = new utils_1.Logger(module);
|
|
7
7
|
class HandshakeRpcLocal {
|
|
@@ -13,12 +13,13 @@ class HandshakeRpcLocal {
|
|
|
13
13
|
}
|
|
14
14
|
handleRequest(request, context) {
|
|
15
15
|
const senderDescriptor = context.incomingSourceDescriptor;
|
|
16
|
-
const getInterleaveSourceIds = () => (request.interleaveSourceId !== undefined) ? [(0,
|
|
17
|
-
|
|
16
|
+
const getInterleaveSourceIds = () => (request.interleaveSourceId !== undefined) ? [(0, dht_1.getDhtAddressFromRaw)(request.interleaveSourceId)] : [];
|
|
17
|
+
const senderNodeId = (0, dht_1.getNodeIdFromPeerDescriptor)(senderDescriptor);
|
|
18
|
+
if (this.config.ongoingInterleaves.has(senderNodeId)) {
|
|
18
19
|
return this.rejectHandshake(request);
|
|
19
20
|
}
|
|
20
21
|
else if (this.config.targetNeighbors.hasNode(senderDescriptor)
|
|
21
|
-
|| this.config.ongoingHandshakes.has(
|
|
22
|
+
|| this.config.ongoingHandshakes.has(senderNodeId)) {
|
|
22
23
|
return this.acceptHandshake(request, senderDescriptor);
|
|
23
24
|
}
|
|
24
25
|
else if (this.config.targetNeighbors.size() + this.config.ongoingHandshakes.size < this.config.maxNeighborCount) {
|
|
@@ -52,16 +53,16 @@ class HandshakeRpcLocal {
|
|
|
52
53
|
}
|
|
53
54
|
acceptHandshakeWithInterleaving(request, requester) {
|
|
54
55
|
const exclude = [];
|
|
55
|
-
request.neighborIds.forEach((id) => exclude.push((0,
|
|
56
|
+
request.neighborIds.forEach((id) => exclude.push((0, dht_1.getDhtAddressFromRaw)(id)));
|
|
56
57
|
this.config.ongoingInterleaves.forEach((id) => exclude.push(id));
|
|
57
|
-
exclude.push((0,
|
|
58
|
+
exclude.push((0, dht_1.getNodeIdFromPeerDescriptor)(requester));
|
|
58
59
|
if (request.interleaveSourceId !== undefined) {
|
|
59
|
-
exclude.push((0,
|
|
60
|
+
exclude.push((0, dht_1.getDhtAddressFromRaw)(request.interleaveSourceId));
|
|
60
61
|
}
|
|
61
62
|
const furthest = this.config.targetNeighbors.getFurthest(exclude);
|
|
62
63
|
const furthestPeerDescriptor = furthest ? furthest.getPeerDescriptor() : undefined;
|
|
63
64
|
if (furthest) {
|
|
64
|
-
const nodeId = (0,
|
|
65
|
+
const nodeId = (0, dht_1.getNodeIdFromPeerDescriptor)(furthest.getPeerDescriptor());
|
|
65
66
|
const remote = this.config.createRpcRemote(furthest.getPeerDescriptor());
|
|
66
67
|
this.config.ongoingInterleaves.add(nodeId);
|
|
67
68
|
// Run this with then catch instead of setImmediate to avoid changes in state
|
|
@@ -91,7 +92,7 @@ class HandshakeRpcLocal {
|
|
|
91
92
|
}
|
|
92
93
|
async interleaveRequest(message, context) {
|
|
93
94
|
const senderPeerDescriptor = context.incomingSourceDescriptor;
|
|
94
|
-
const senderId = (0,
|
|
95
|
+
const senderId = (0, dht_1.getNodeIdFromPeerDescriptor)(senderPeerDescriptor);
|
|
95
96
|
try {
|
|
96
97
|
await this.config.handshakeWithInterleaving(message.interleaveTargetDescriptor, senderId);
|
|
97
98
|
if (this.config.targetNeighbors.hasNodeById(senderId)) {
|
|
@@ -101,7 +102,7 @@ class HandshakeRpcLocal {
|
|
|
101
102
|
return { accepted: true };
|
|
102
103
|
}
|
|
103
104
|
catch (err) {
|
|
104
|
-
logger.debug(`interleaveRequest to ${(0,
|
|
105
|
+
logger.debug(`interleaveRequest to ${(0, dht_1.getNodeIdFromPeerDescriptor)(message.interleaveTargetDescriptor)} failed: ${err}`);
|
|
105
106
|
return { accepted: false };
|
|
106
107
|
}
|
|
107
108
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HandshakeRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/HandshakeRpcLocal.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"HandshakeRpcLocal.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/HandshakeRpcLocal.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,14 @@
|
|
|
1
|
-
import { PeerDescriptor, RpcRemote } from '@streamr/dht';
|
|
2
|
-
import { NodeID } from '../../identifiers';
|
|
1
|
+
import { DhtAddress, PeerDescriptor, RpcRemote } from '@streamr/dht';
|
|
3
2
|
import { InterleaveResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
4
3
|
import { HandshakeRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
|
|
4
|
+
import { StreamPartID } from '@streamr/protocol';
|
|
5
5
|
interface HandshakeResponse {
|
|
6
6
|
accepted: boolean;
|
|
7
7
|
interleaveTargetDescriptor?: PeerDescriptor;
|
|
8
8
|
}
|
|
9
9
|
export declare const INTERLEAVE_REQUEST_TIMEOUT = 15000;
|
|
10
10
|
export declare class HandshakeRpcRemote extends RpcRemote<HandshakeRpcClient> {
|
|
11
|
-
handshake(neighborIds:
|
|
11
|
+
handshake(streamPartId: StreamPartID, neighborIds: DhtAddress[], concurrentHandshakeTargetId?: DhtAddress, interleaveSourceId?: DhtAddress): Promise<HandshakeResponse>;
|
|
12
12
|
interleaveRequest(originatorDescriptor: PeerDescriptor): Promise<InterleaveResponse>;
|
|
13
13
|
}
|
|
14
14
|
export {};
|
|
@@ -4,17 +4,16 @@ exports.HandshakeRpcRemote = exports.INTERLEAVE_REQUEST_TIMEOUT = void 0;
|
|
|
4
4
|
const dht_1 = require("@streamr/dht");
|
|
5
5
|
const utils_1 = require("@streamr/utils");
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
|
-
const identifiers_1 = require("../../identifiers");
|
|
8
7
|
const logger = new utils_1.Logger(module);
|
|
9
8
|
exports.INTERLEAVE_REQUEST_TIMEOUT = 15000;
|
|
10
9
|
class HandshakeRpcRemote extends dht_1.RpcRemote {
|
|
11
|
-
async handshake(neighborIds, concurrentHandshakeTargetId, interleaveSourceId) {
|
|
10
|
+
async handshake(streamPartId, neighborIds, concurrentHandshakeTargetId, interleaveSourceId) {
|
|
12
11
|
const request = {
|
|
13
|
-
streamPartId
|
|
12
|
+
streamPartId,
|
|
14
13
|
requestId: (0, uuid_1.v4)(),
|
|
15
|
-
neighborIds: neighborIds.map((id) => (0,
|
|
16
|
-
concurrentHandshakeTargetId: (concurrentHandshakeTargetId !== undefined) ? (0,
|
|
17
|
-
interleaveSourceId: (interleaveSourceId !== undefined) ? (0,
|
|
14
|
+
neighborIds: neighborIds.map((id) => (0, dht_1.getRawFromDhtAddress)(id)),
|
|
15
|
+
concurrentHandshakeTargetId: (concurrentHandshakeTargetId !== undefined) ? (0, dht_1.getRawFromDhtAddress)(concurrentHandshakeTargetId) : undefined,
|
|
16
|
+
interleaveSourceId: (interleaveSourceId !== undefined) ? (0, dht_1.getRawFromDhtAddress)(interleaveSourceId) : undefined
|
|
18
17
|
};
|
|
19
18
|
try {
|
|
20
19
|
const response = await this.getClient().handshake(request, this.formDhtRpcOptions());
|
|
@@ -24,7 +23,7 @@ class HandshakeRpcRemote extends dht_1.RpcRemote {
|
|
|
24
23
|
};
|
|
25
24
|
}
|
|
26
25
|
catch (err) {
|
|
27
|
-
logger.debug(`handshake to ${(0,
|
|
26
|
+
logger.debug(`handshake to ${(0, dht_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} failed: ${err}`);
|
|
28
27
|
return {
|
|
29
28
|
accepted: false
|
|
30
29
|
};
|
|
@@ -45,7 +44,7 @@ class HandshakeRpcRemote extends dht_1.RpcRemote {
|
|
|
45
44
|
};
|
|
46
45
|
}
|
|
47
46
|
catch (err) {
|
|
48
|
-
logger.debug(`interleaveRequest to ${(0,
|
|
47
|
+
logger.debug(`interleaveRequest to ${(0, dht_1.getNodeIdFromPeerDescriptor)(this.getPeerDescriptor())} failed: ${err}`);
|
|
49
48
|
return {
|
|
50
49
|
accepted: false
|
|
51
50
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HandshakeRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/HandshakeRpcRemote.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"HandshakeRpcRemote.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/HandshakeRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAuH;AACvH,0CAAuC;AACvC,+BAAyB;AAKzB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOpB,QAAA,0BAA0B,GAAG,KAAK,CAAA;AAE/C,MAAa,kBAAmB,SAAQ,eAA6B;IAEjE,KAAK,CAAC,SAAS,CACX,YAA0B,EAC1B,WAAyB,EACzB,2BAAwC,EACxC,kBAA+B;QAE/B,MAAM,OAAO,GAA+B;YACxC,YAAY;YACZ,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,WAAW,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,0BAAoB,EAAC,EAAE,CAAC,CAAC;YAC9D,2BAA2B,EAAE,CAAC,2BAA2B,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,0BAAoB,EAAC,2BAA2B,CAAC,CAAC,CAAC,CAAC,SAAS;YACxI,kBAAkB,EAAE,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,0BAAoB,EAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,SAAS;SAChH,CAAA;QACD,IAAI;YACA,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACpF,OAAO;gBACH,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,0BAA0B,EAAE,QAAQ,CAAC,0BAA0B;aAClE,CAAA;SACJ;QAAC,OAAO,GAAQ,EAAE;YACf,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAA,iCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YACpG,OAAO;gBACH,QAAQ,EAAE,KAAK;aAClB,CAAA;SACJ;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,oBAAoC;QACxD,MAAM,OAAO,GAAsB;YAC/B,0BAA0B,EAAE,oBAAoB;SACnD,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,kCAA0B;SACtC,CAAC,CAAA;QACF,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO;gBACH,QAAQ,EAAE,GAAG,CAAC,QAAQ;aACzB,CAAA;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,CAAC,KAAK,CAAC,wBAAwB,IAAA,iCAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,YAAY,GAAG,EAAE,CAAC,CAAA;YAC5G,OAAO;gBACH,QAAQ,EAAE,KAAK;aAClB,CAAA;SACJ;IAEL,CAAC;CACJ;AAlDD,gDAkDC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { ConnectionLocker, PeerDescriptor } from '@streamr/dht';
|
|
1
|
+
import { ConnectionLocker, DhtAddress, PeerDescriptor } from '@streamr/dht';
|
|
2
2
|
import { NodeList } from '../NodeList';
|
|
3
3
|
import { RpcCommunicator } from '@streamr/proto-rpc';
|
|
4
|
-
import { NodeID } from '../../identifiers';
|
|
5
4
|
import { StreamPartID } from '@streamr/protocol';
|
|
6
5
|
interface HandshakerConfig {
|
|
7
6
|
localPeerDescriptor: PeerDescriptor;
|
|
@@ -19,7 +18,7 @@ export declare class Handshaker {
|
|
|
19
18
|
private config;
|
|
20
19
|
private readonly rpcLocal;
|
|
21
20
|
constructor(config: HandshakerConfig);
|
|
22
|
-
attemptHandshakesOnContacts(excludedIds:
|
|
21
|
+
attemptHandshakesOnContacts(excludedIds: DhtAddress[]): Promise<DhtAddress[]>;
|
|
23
22
|
private selectParallelTargetsAndHandshake;
|
|
24
23
|
private selectParallelTargets;
|
|
25
24
|
private doParallelHandshakes;
|
|
@@ -28,6 +27,6 @@ export declare class Handshaker {
|
|
|
28
27
|
private handshakeWithInterleaving;
|
|
29
28
|
private createRpcRemote;
|
|
30
29
|
private createDeliveryRpcRemote;
|
|
31
|
-
getOngoingHandshakes(): Set<
|
|
30
|
+
getOngoingHandshakes(): Set<DhtAddress>;
|
|
32
31
|
}
|
|
33
32
|
export {};
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Handshaker = void 0;
|
|
4
|
+
const dht_1 = require("@streamr/dht");
|
|
4
5
|
const DeliveryRpcRemote_1 = require("../DeliveryRpcRemote");
|
|
5
6
|
const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
6
7
|
const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
7
8
|
const utils_1 = require("@streamr/utils");
|
|
8
9
|
const HandshakeRpcRemote_1 = require("./HandshakeRpcRemote");
|
|
9
10
|
const HandshakeRpcLocal_1 = require("./HandshakeRpcLocal");
|
|
10
|
-
const identifiers_1 = require("../../identifiers");
|
|
11
11
|
const logger = new utils_1.Logger(module);
|
|
12
12
|
const PARALLEL_HANDSHAKE_COUNT = 2;
|
|
13
13
|
class Handshaker {
|
|
@@ -43,7 +43,7 @@ class Handshaker {
|
|
|
43
43
|
async selectParallelTargetsAndHandshake(excludedIds) {
|
|
44
44
|
const exclude = excludedIds.concat(this.config.targetNeighbors.getIds());
|
|
45
45
|
const targetNeighbors = this.selectParallelTargets(exclude);
|
|
46
|
-
targetNeighbors.forEach((contact) => this.ongoingHandshakes.add((0,
|
|
46
|
+
targetNeighbors.forEach((contact) => this.ongoingHandshakes.add((0, dht_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())));
|
|
47
47
|
return this.doParallelHandshakes(targetNeighbors, exclude);
|
|
48
48
|
}
|
|
49
49
|
selectParallelTargets(excludedIds) {
|
|
@@ -60,12 +60,12 @@ class Handshaker {
|
|
|
60
60
|
const results = await Promise.allSettled(Array.from(targets.values()).map(async (target, i) => {
|
|
61
61
|
const otherNode = i === 0 ? targets[1] : targets[0];
|
|
62
62
|
// TODO better check (currently this condition is always true)
|
|
63
|
-
const otherNodeId = otherNode ? (0,
|
|
63
|
+
const otherNodeId = otherNode ? (0, dht_1.getNodeIdFromPeerDescriptor)(otherNode.getPeerDescriptor()) : undefined;
|
|
64
64
|
return this.handshakeWithTarget(target, otherNodeId);
|
|
65
65
|
}));
|
|
66
|
-
results.
|
|
66
|
+
results.forEach((res, i) => {
|
|
67
67
|
if (res.status !== 'fulfilled' || !res.value) {
|
|
68
|
-
excludedIds.push((0,
|
|
68
|
+
excludedIds.push((0, dht_1.getNodeIdFromPeerDescriptor)(targets[i].getPeerDescriptor()));
|
|
69
69
|
}
|
|
70
70
|
});
|
|
71
71
|
return excludedIds;
|
|
@@ -76,15 +76,15 @@ class Handshaker {
|
|
|
76
76
|
if (targetNeighbor) {
|
|
77
77
|
const accepted = await this.handshakeWithTarget(this.createRpcRemote(targetNeighbor.getPeerDescriptor()));
|
|
78
78
|
if (!accepted) {
|
|
79
|
-
excludedIds.push((0,
|
|
79
|
+
excludedIds.push((0, dht_1.getNodeIdFromPeerDescriptor)(targetNeighbor.getPeerDescriptor()));
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
return excludedIds;
|
|
83
83
|
}
|
|
84
84
|
async handshakeWithTarget(targetNeighbor, concurrentNodeId) {
|
|
85
|
-
const targetNodeId = (0,
|
|
85
|
+
const targetNodeId = (0, dht_1.getNodeIdFromPeerDescriptor)(targetNeighbor.getPeerDescriptor());
|
|
86
86
|
this.ongoingHandshakes.add(targetNodeId);
|
|
87
|
-
const result = await targetNeighbor.handshake(this.config.targetNeighbors.getIds(), concurrentNodeId);
|
|
87
|
+
const result = await targetNeighbor.handshake(this.config.streamPartId, this.config.targetNeighbors.getIds(), concurrentNodeId);
|
|
88
88
|
if (result.accepted) {
|
|
89
89
|
this.config.targetNeighbors.add(this.createDeliveryRpcRemote(targetNeighbor.getPeerDescriptor()));
|
|
90
90
|
this.config.connectionLocker.lockConnection(targetNeighbor.getPeerDescriptor(), this.config.streamPartId);
|
|
@@ -97,9 +97,9 @@ class Handshaker {
|
|
|
97
97
|
}
|
|
98
98
|
async handshakeWithInterleaving(target, interleaveSourceId) {
|
|
99
99
|
const targetNeighbor = this.createRpcRemote(target);
|
|
100
|
-
const targetNodeId = (0,
|
|
100
|
+
const targetNodeId = (0, dht_1.getNodeIdFromPeerDescriptor)(targetNeighbor.getPeerDescriptor());
|
|
101
101
|
this.ongoingHandshakes.add(targetNodeId);
|
|
102
|
-
const result = await targetNeighbor.handshake(this.config.targetNeighbors.getIds(), undefined, interleaveSourceId);
|
|
102
|
+
const result = await targetNeighbor.handshake(this.config.streamPartId, this.config.targetNeighbors.getIds(), undefined, interleaveSourceId);
|
|
103
103
|
if (result.accepted) {
|
|
104
104
|
this.config.targetNeighbors.add(this.createDeliveryRpcRemote(targetNeighbor.getPeerDescriptor()));
|
|
105
105
|
this.config.connectionLocker.lockConnection(targetNeighbor.getPeerDescriptor(), this.config.streamPartId);
|
|
@@ -108,10 +108,10 @@ class Handshaker {
|
|
|
108
108
|
return result.accepted;
|
|
109
109
|
}
|
|
110
110
|
createRpcRemote(targetPeerDescriptor) {
|
|
111
|
-
return new HandshakeRpcRemote_1.HandshakeRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.
|
|
111
|
+
return new HandshakeRpcRemote_1.HandshakeRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.rpcCommunicator, NetworkRpc_client_1.HandshakeRpcClient, this.config.rpcRequestTimeout);
|
|
112
112
|
}
|
|
113
113
|
createDeliveryRpcRemote(targetPeerDescriptor) {
|
|
114
|
-
return new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.
|
|
114
|
+
return new DeliveryRpcRemote_1.DeliveryRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, this.config.rpcCommunicator, NetworkRpc_client_1.DeliveryRpcClient, this.config.rpcRequestTimeout);
|
|
115
115
|
}
|
|
116
116
|
getOngoingHandshakes() {
|
|
117
117
|
return this.ongoingHandshakes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/Handshaker.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"Handshaker.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/Handshaker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { NodeList } from '../NodeList';
|
|
2
|
-
import {
|
|
2
|
+
import { DhtAddress } from '@streamr/dht';
|
|
3
3
|
interface FindNeighborsSessionConfig {
|
|
4
4
|
targetNeighbors: NodeList;
|
|
5
5
|
nearbyNodeView: NodeList;
|
|
6
|
-
doFindNeighbors: (excludedNodes:
|
|
6
|
+
doFindNeighbors: (excludedNodes: DhtAddress[]) => Promise<DhtAddress[]>;
|
|
7
7
|
minCount: number;
|
|
8
8
|
}
|
|
9
9
|
export declare class NeighborFinder {
|
|
@@ -13,7 +13,7 @@ export declare class NeighborFinder {
|
|
|
13
13
|
constructor(config: FindNeighborsSessionConfig);
|
|
14
14
|
private findNeighbors;
|
|
15
15
|
isRunning(): boolean;
|
|
16
|
-
start(excluded?:
|
|
16
|
+
start(excluded?: DhtAddress[]): void;
|
|
17
17
|
stop(): void;
|
|
18
18
|
}
|
|
19
19
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAWpD,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAA;AAEpB,MAAa,cAAc;IAKvB,YAAY,MAAkC;QAFtC,YAAO,GAAG,KAAK,CAAA;QAGnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAWpD,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAA;AAEpB,MAAa,cAAc;IAKvB,YAAY,MAAkC;QAFtC,YAAO,GAAG,KAAK,CAAA;QAGnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,EAAE;YACrH,mDAAmD;YACnD,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SACpG;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;SACvB;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,WAAyB,EAAE;QAC7B,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,mDAAmD;QACnD,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACtG,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AA3CD,wCA2CC"}
|