@streamr/dht 100.2.2 → 100.2.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/connection/ConnectionLockStates.js +4 -6
- package/dist/src/connection/ConnectionLockStates.js.map +1 -1
- package/dist/src/connection/ConnectionManager.d.ts +1 -0
- package/dist/src/connection/ConnectionManager.js +8 -1
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ManagedConnection.js +7 -9
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketConnector.js +1 -0
- package/dist/src/connection/websocket/WebsocketConnector.js.map +1 -1
- package/dist/src/dht/DhtNode.d.ts +10 -7
- package/dist/src/dht/DhtNode.js +51 -32
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcLocal.d.ts +2 -2
- package/dist/src/dht/DhtNodeRpcLocal.js +5 -4
- package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcRemote.js +1 -0
- package/dist/src/dht/DhtNodeRpcRemote.js.map +1 -1
- package/dist/src/dht/PeerManager.d.ts +14 -14
- package/dist/src/dht/PeerManager.js +23 -58
- package/dist/src/dht/PeerManager.js.map +1 -1
- package/dist/src/dht/contact/ContactList.d.ts +2 -2
- package/dist/src/dht/contact/RandomContactList.js +2 -2
- package/dist/src/dht/contact/RandomContactList.js.map +1 -1
- package/dist/src/dht/contact/RingContactList.d.ts +2 -5
- package/dist/src/dht/contact/RingContactList.js +3 -11
- package/dist/src/dht/contact/RingContactList.js.map +1 -1
- package/dist/src/dht/contact/SortedContactList.d.ts +4 -1
- package/dist/src/dht/contact/SortedContactList.js +4 -5
- package/dist/src/dht/contact/SortedContactList.js.map +1 -1
- package/dist/src/dht/contact/getClosestContacts.d.ts +7 -0
- package/dist/src/dht/contact/getClosestContacts.js +18 -0
- package/dist/src/dht/contact/getClosestContacts.js.map +1 -0
- package/dist/src/dht/discovery/DiscoverySession.d.ts +8 -8
- package/dist/src/dht/discovery/DiscoverySession.js +30 -35
- package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.d.ts +1 -2
- package/dist/src/dht/discovery/PeerDiscovery.js +6 -8
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/dht/discovery/RingDiscoverySession.d.ts +4 -4
- package/dist/src/dht/discovery/RingDiscoverySession.js +13 -13
- package/dist/src/dht/discovery/RingDiscoverySession.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.d.ts +2 -2
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js +15 -15
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.d.ts +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js +11 -13
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.d.ts +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.js +2 -2
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.js.map +1 -1
- package/dist/src/dht/routing/Router.d.ts +1 -2
- package/dist/src/dht/routing/Router.js +2 -3
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/dht/routing/RoutingSession.d.ts +1 -2
- package/dist/src/dht/routing/RoutingSession.js +2 -2
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/dist/src/dht/store/StoreRpcLocal.js +3 -3
- package/dist/src/dht/store/StoreRpcLocal.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +8 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +4 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +10 -2
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +4 -0
- package/dist/src/transport/ITransport.d.ts +3 -0
- package/dist/src/transport/ITransport.js.map +1 -1
- package/package.json +6 -6
- package/protos/DhtRpc.proto +7 -1
- package/src/connection/ConnectionLockStates.ts +3 -5
- package/src/connection/ConnectionManager.ts +9 -1
- package/src/connection/ManagedConnection.ts +11 -14
- package/src/connection/websocket/WebsocketConnector.ts +1 -0
- package/src/dht/DhtNode.ts +63 -44
- package/src/dht/DhtNodeRpcLocal.ts +7 -6
- package/src/dht/DhtNodeRpcRemote.ts +1 -0
- package/src/dht/PeerManager.ts +38 -72
- package/src/dht/contact/ContactList.ts +2 -2
- package/src/dht/contact/RandomContactList.ts +2 -3
- package/src/dht/contact/RingContactList.ts +6 -16
- package/src/dht/contact/SortedContactList.ts +9 -10
- package/src/dht/contact/getClosestContacts.ts +22 -0
- package/src/dht/discovery/DiscoverySession.ts +35 -45
- package/src/dht/discovery/PeerDiscovery.ts +6 -9
- package/src/dht/discovery/RingDiscoverySession.ts +13 -13
- package/src/dht/recursive-operation/RecursiveOperationManager.ts +16 -16
- package/src/dht/recursive-operation/RecursiveOperationSession.ts +11 -13
- package/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts +1 -1
- package/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.ts +2 -2
- package/src/dht/routing/Router.ts +3 -5
- package/src/dht/routing/RoutingSession.ts +3 -4
- package/src/dht/store/StoreRpcLocal.ts +3 -3
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +8 -0
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +4 -0
- package/src/proto/packages/dht/protos/DhtRpc.ts +11 -3
- package/src/transport/ITransport.ts +3 -0
- package/test/end-to-end/Layer0MixedConnectionTypes.test.ts +3 -5
- package/test/integration/DhtNode.test.ts +81 -0
- package/test/integration/Layer1-scale.test.ts +1 -1
- package/test/integration/ScaleDownDht.test.ts +7 -4
- package/test/unit/DiscoverySession.test.ts +85 -0
- package/test/unit/PeerManager.test.ts +3 -17
- package/test/unit/RecursiveOperationManager.test.ts +5 -3
- package/test/unit/Router.test.ts +2 -2
- package/test/unit/RoutingSession.test.ts +2 -2
- package/test/unit/SortedContactList.test.ts +4 -4
- package/test/unit/getClosestContacts.test.ts +28 -0
- package/test/utils/FakeTransport.ts +34 -7
- package/test/utils/mock/Transport.ts +10 -0
- package/test/utils/topology.ts +80 -0
- package/test/RandomGraphSimulation.ts +0 -53
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SortedContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/SortedContactList.ts"],"names":[],"mappings":";;;;;;AACA,mCAAsC;AACtC,kEAAwC;AACxC,gDAA4C;AAC5C,mDAAoE;
|
|
1
|
+
{"version":3,"file":"SortedContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/SortedContactList.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getClosestContacts = void 0;
|
|
4
|
+
const SortedContactList_1 = require("./SortedContactList");
|
|
5
|
+
const getClosestContacts = (referenceId, contacts, opts) => {
|
|
6
|
+
const list = new SortedContactList_1.SortedContactList({
|
|
7
|
+
referenceId,
|
|
8
|
+
allowToContainReferenceId: true,
|
|
9
|
+
excludedNodeIds: opts?.excludedNodeIds,
|
|
10
|
+
maxSize: opts?.maxCount
|
|
11
|
+
});
|
|
12
|
+
for (const contact of contacts) {
|
|
13
|
+
list.addContact(contact);
|
|
14
|
+
}
|
|
15
|
+
return list.getClosestContacts();
|
|
16
|
+
};
|
|
17
|
+
exports.getClosestContacts = getClosestContacts;
|
|
18
|
+
//# sourceMappingURL=getClosestContacts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getClosestContacts.js","sourceRoot":"","sources":["../../../../src/dht/contact/getClosestContacts.ts"],"names":[],"mappings":";;;AACA,2DAAuD;AAEhD,MAAM,kBAAkB,GAAG,CAC9B,WAAuB,EACvB,QAAqB,EACrB,IAGC,EACE,EAAE;IACL,MAAM,IAAI,GAAG,IAAI,qCAAiB,CAAI;QAClC,WAAW;QACX,yBAAyB,EAAE,IAAI;QAC/B,eAAe,EAAE,IAAI,EAAE,eAAe;QACtC,OAAO,EAAE,IAAI,EAAE,QAAQ;KAC1B,CAAC,CAAA;IACF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;IAC5B,CAAC;IACD,OAAO,IAAI,CAAC,kBAAkB,EAAE,CAAA;AACpC,CAAC,CAAA;AAlBY,QAAA,kBAAkB,sBAkB9B"}
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
|
|
1
|
+
/// <reference types="node" />
|
|
2
2
|
import { DhtAddress } from '../../identifiers';
|
|
3
|
+
import { PeerManager } from '../PeerManager';
|
|
3
4
|
interface DiscoverySessionConfig {
|
|
4
5
|
targetId: DhtAddress;
|
|
5
6
|
parallelism: number;
|
|
6
7
|
noProgressLimit: number;
|
|
7
8
|
peerManager: PeerManager;
|
|
8
9
|
contactedPeers: Set<DhtAddress>;
|
|
10
|
+
abortSignal: AbortSignal;
|
|
9
11
|
}
|
|
10
12
|
export declare class DiscoverySession {
|
|
11
13
|
readonly id: string;
|
|
12
|
-
private stopped;
|
|
13
|
-
private emitter;
|
|
14
14
|
private noProgressCounter;
|
|
15
|
-
private
|
|
15
|
+
private ongoingRequests;
|
|
16
|
+
private doneGate;
|
|
16
17
|
private readonly config;
|
|
17
18
|
constructor(config: DiscoverySessionConfig);
|
|
18
19
|
private addContacts;
|
|
19
|
-
private
|
|
20
|
-
private
|
|
21
|
-
private
|
|
20
|
+
private fetchClosestNeighborsFromRemote;
|
|
21
|
+
private onRequestSucceeded;
|
|
22
|
+
private onRequestFailed;
|
|
22
23
|
private findMoreContacts;
|
|
23
24
|
findClosestNodes(timeout: number): Promise<void>;
|
|
24
|
-
stop(): void;
|
|
25
25
|
}
|
|
26
26
|
export {};
|
|
@@ -1,48 +1,44 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.DiscoverySession = void 0;
|
|
7
4
|
const utils_1 = require("@streamr/utils");
|
|
8
|
-
const eventemitter3_1 = __importDefault(require("eventemitter3"));
|
|
9
5
|
const uuid_1 = require("uuid");
|
|
10
|
-
const PeerManager_1 = require("../PeerManager");
|
|
11
6
|
const identifiers_1 = require("../../identifiers");
|
|
7
|
+
const PeerManager_1 = require("../PeerManager");
|
|
8
|
+
const getClosestContacts_1 = require("../contact/getClosestContacts");
|
|
12
9
|
const logger = new utils_1.Logger(module);
|
|
13
10
|
class DiscoverySession {
|
|
14
11
|
id = (0, uuid_1.v4)();
|
|
15
|
-
stopped = false;
|
|
16
|
-
emitter = new eventemitter3_1.default();
|
|
17
12
|
noProgressCounter = 0;
|
|
18
|
-
|
|
13
|
+
ongoingRequests = new Set();
|
|
14
|
+
doneGate = new utils_1.Gate(false);
|
|
19
15
|
config;
|
|
20
16
|
constructor(config) {
|
|
21
17
|
this.config = config;
|
|
22
18
|
}
|
|
23
19
|
addContacts(contacts) {
|
|
24
|
-
if (this.
|
|
20
|
+
if (this.config.abortSignal.aborted || this.doneGate.isOpen()) {
|
|
25
21
|
return;
|
|
26
22
|
}
|
|
27
23
|
for (const contact of contacts) {
|
|
28
24
|
this.config.peerManager.addContact(contact);
|
|
29
25
|
}
|
|
30
26
|
}
|
|
31
|
-
async
|
|
32
|
-
if (this.
|
|
27
|
+
async fetchClosestNeighborsFromRemote(contact) {
|
|
28
|
+
if (this.config.abortSignal.aborted || this.doneGate.isOpen()) {
|
|
33
29
|
return [];
|
|
34
30
|
}
|
|
35
|
-
logger.trace(`Getting closest
|
|
31
|
+
logger.trace(`Getting closest neighbors from remote: ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())}`);
|
|
36
32
|
this.config.contactedPeers.add(contact.getNodeId());
|
|
37
33
|
const returnedContacts = await contact.getClosestPeers(this.config.targetId);
|
|
38
34
|
this.config.peerManager.setContactActive(contact.getNodeId());
|
|
39
35
|
return returnedContacts;
|
|
40
36
|
}
|
|
41
|
-
|
|
42
|
-
if (!this.
|
|
37
|
+
onRequestSucceeded(nodeId, contacts) {
|
|
38
|
+
if (!this.ongoingRequests.has(nodeId)) {
|
|
43
39
|
return;
|
|
44
40
|
}
|
|
45
|
-
this.
|
|
41
|
+
this.ongoingRequests.delete(nodeId);
|
|
46
42
|
const targetId = (0, identifiers_1.getRawFromDhtAddress)(this.config.targetId);
|
|
47
43
|
const oldClosestNeighbor = this.config.peerManager.getClosestNeighborsTo(this.config.targetId, 1)[0];
|
|
48
44
|
const oldClosestDistance = (0, PeerManager_1.getDistance)(targetId, (0, identifiers_1.getRawFromDhtAddress)(oldClosestNeighbor.getNodeId()));
|
|
@@ -53,32 +49,34 @@ class DiscoverySession {
|
|
|
53
49
|
this.noProgressCounter++;
|
|
54
50
|
}
|
|
55
51
|
}
|
|
56
|
-
|
|
57
|
-
if (!this.
|
|
52
|
+
onRequestFailed(peer) {
|
|
53
|
+
if (!this.ongoingRequests.has(peer.getNodeId())) {
|
|
58
54
|
return;
|
|
59
55
|
}
|
|
60
|
-
this.
|
|
56
|
+
this.ongoingRequests.delete(peer.getNodeId());
|
|
61
57
|
this.config.peerManager.removeContact(peer.getNodeId());
|
|
62
58
|
}
|
|
63
59
|
findMoreContacts() {
|
|
64
|
-
if (this.
|
|
60
|
+
if (this.config.abortSignal.aborted || this.doneGate.isOpen()) {
|
|
65
61
|
return;
|
|
66
62
|
}
|
|
67
|
-
const uncontacted =
|
|
68
|
-
|
|
69
|
-
this.
|
|
70
|
-
|
|
63
|
+
const uncontacted = (0, getClosestContacts_1.getClosestContacts)(this.config.targetId, this.config.peerManager.getClosestContacts().getAllContactsInUndefinedOrder(), {
|
|
64
|
+
maxCount: this.config.parallelism,
|
|
65
|
+
excludedNodeIds: this.config.contactedPeers
|
|
66
|
+
});
|
|
67
|
+
if ((uncontacted.length === 0 && this.ongoingRequests.size === 0) || (this.noProgressCounter >= this.config.noProgressLimit)) {
|
|
68
|
+
this.doneGate.open();
|
|
71
69
|
return;
|
|
72
70
|
}
|
|
73
71
|
for (const nextPeer of uncontacted) {
|
|
74
|
-
if (this.
|
|
72
|
+
if (this.ongoingRequests.size >= this.config.parallelism) {
|
|
75
73
|
break;
|
|
76
74
|
}
|
|
77
|
-
this.
|
|
75
|
+
this.ongoingRequests.add(nextPeer.getNodeId());
|
|
78
76
|
// eslint-disable-next-line promise/catch-or-return
|
|
79
|
-
this.
|
|
80
|
-
.then((contacts) => this.
|
|
81
|
-
.catch(() => this.
|
|
77
|
+
this.fetchClosestNeighborsFromRemote(nextPeer)
|
|
78
|
+
.then((contacts) => this.onRequestSucceeded(nextPeer.getNodeId(), contacts))
|
|
79
|
+
.catch(() => this.onRequestFailed(nextPeer))
|
|
82
80
|
.finally(() => {
|
|
83
81
|
this.findMoreContacts();
|
|
84
82
|
});
|
|
@@ -88,13 +86,10 @@ class DiscoverySession {
|
|
|
88
86
|
if (this.config.peerManager.getContactCount(this.config.contactedPeers) === 0) {
|
|
89
87
|
return;
|
|
90
88
|
}
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
this.stopped = true;
|
|
96
|
-
this.emitter.emit('discoveryCompleted');
|
|
97
|
-
this.emitter.removeAllListeners();
|
|
89
|
+
setImmediate(() => {
|
|
90
|
+
this.findMoreContacts();
|
|
91
|
+
});
|
|
92
|
+
await (0, utils_1.withTimeout)(this.doneGate.waitUntilOpen(), timeout, 'discovery session timed out', this.config.abortSignal);
|
|
98
93
|
}
|
|
99
94
|
}
|
|
100
95
|
exports.DiscoverySession = DiscoverySession;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/DiscoverySession.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/DiscoverySession.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ import { ServiceID } from '../../types/ServiceID';
|
|
|
6
6
|
interface PeerDiscoveryConfig {
|
|
7
7
|
localPeerDescriptor: PeerDescriptor;
|
|
8
8
|
joinNoProgressLimit: number;
|
|
9
|
-
peerDiscoveryQueryBatchSize: number;
|
|
10
9
|
serviceId: ServiceID;
|
|
11
10
|
parallelism: number;
|
|
12
11
|
joinTimeout: number;
|
|
@@ -32,7 +31,7 @@ export declare class PeerDiscovery {
|
|
|
32
31
|
private runRingSessions;
|
|
33
32
|
rejoinDht(entryPoint: PeerDescriptor, contactedPeers?: Set<DhtAddress>, distantJoinContactPeers?: Set<DhtAddress>): Promise<void>;
|
|
34
33
|
private ensureRecoveryIntervalIsRunning;
|
|
35
|
-
private
|
|
34
|
+
private fetchClosestNeighbors;
|
|
36
35
|
isJoinOngoing(): boolean;
|
|
37
36
|
isJoinCalled(): boolean;
|
|
38
37
|
private isStopped;
|
|
@@ -64,7 +64,8 @@ class PeerDiscovery {
|
|
|
64
64
|
parallelism: this.config.parallelism,
|
|
65
65
|
noProgressLimit: this.config.joinNoProgressLimit,
|
|
66
66
|
peerManager: this.config.peerManager,
|
|
67
|
-
contactedPeers
|
|
67
|
+
contactedPeers,
|
|
68
|
+
abortSignal: this.abortController.signal
|
|
68
69
|
};
|
|
69
70
|
return new DiscoverySession_1.DiscoverySession(sessionOptions);
|
|
70
71
|
}
|
|
@@ -144,17 +145,17 @@ class PeerDiscovery {
|
|
|
144
145
|
if (!this.recoveryIntervalStarted) {
|
|
145
146
|
this.recoveryIntervalStarted = true;
|
|
146
147
|
// TODO use config option or named constant?
|
|
147
|
-
await (0, utils_1.scheduleAtInterval)(() => this.
|
|
148
|
+
await (0, utils_1.scheduleAtInterval)(() => this.fetchClosestNeighbors(), 60000, true, this.abortController.signal);
|
|
148
149
|
}
|
|
149
150
|
}
|
|
150
|
-
async
|
|
151
|
+
async fetchClosestNeighbors() {
|
|
151
152
|
if (this.isStopped()) {
|
|
152
153
|
return;
|
|
153
154
|
}
|
|
154
155
|
const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
|
|
155
156
|
const nodes = this.config.peerManager.getClosestNeighborsTo(localNodeId, this.config.parallelism);
|
|
156
|
-
await Promise.allSettled(nodes.map(async (
|
|
157
|
-
const contacts = await
|
|
157
|
+
await Promise.allSettled(nodes.map(async (node) => {
|
|
158
|
+
const contacts = await node.getClosestPeers(localNodeId);
|
|
158
159
|
for (const contact of contacts) {
|
|
159
160
|
this.config.peerManager.addContact(contact);
|
|
160
161
|
}
|
|
@@ -171,9 +172,6 @@ class PeerDiscovery {
|
|
|
171
172
|
}
|
|
172
173
|
stop() {
|
|
173
174
|
this.abortController.abort();
|
|
174
|
-
this.ongoingDiscoverySessions.forEach((session) => {
|
|
175
|
-
session.stop();
|
|
176
|
-
});
|
|
177
175
|
this.ongoingRingDiscoverySessions.forEach((session) => {
|
|
178
176
|
session.stop();
|
|
179
177
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeerDiscovery.js","sourceRoot":"","sources":["../../../../src/dht/discovery/PeerDiscovery.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AAGrD,0CAAgF;AAGhF,mDAAgJ;AAEhJ,iEAA6D;AAC7D,gEAAsF;
|
|
1
|
+
{"version":3,"file":"PeerDiscovery.js","sourceRoot":"","sources":["../../../../src/dht/discovery/PeerDiscovery.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AAGrD,0CAAgF;AAGhF,mDAAgJ;AAEhJ,iEAA6D;AAC7D,gEAAsF;AAY/E,MAAM,uBAAuB,GAAG,CAAC,OAAmB,EAAc,EAAE;IACvE,MAAM,GAAG,GAAG,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAA;IACzC,MAAM,OAAO,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,CAAA;IACtC,OAAO,IAAA,kCAAoB,EAAC,OAAO,CAAC,CAAA;AACxC,CAAC,CAAA;AAJY,QAAA,uBAAuB,2BAInC;AAED,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,aAAa;IAEd,wBAAwB,GAAkC,IAAI,GAAG,EAAE,CAAA;IACnE,4BAA4B,GAAsC,IAAI,GAAG,EAAE,CAAA;IAE3E,aAAa,GAAG,KAAK,CAAA;IACrB,UAAU,GAAG,KAAK,CAAA;IACT,eAAe,CAAiB;IACzC,uBAAuB,GAAG,KAAK,CAAA;IACtB,MAAM,CAAqB;IAE5C,YAAY,MAA2B;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,OAAO,CACT,WAA6B,EAC7B,gCAAgC,GAAG,IAAI,EACvC,KAAK,GAAG,IAAI;QAEZ,MAAM,cAAc,GAAG,IAAI,GAAG,EAAc,CAAA;QAC5C,MAAM,iBAAiB,GAAG,gCAAgC;YACtD,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,GAAG,EAAc,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAW,CAAA;QAC5F,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,qBAAqB,CACxE,UAAU,EACV,cAAc,EACd,iBAAiB,EACjB,KAAK,CACR,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAC/B,oBAAoC;IACpC,oDAAoD;IACpD,cAA+B,EAC/B,qBAA8F,EAC9F,KAAK,GAAG,IAAI;QAEZ,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACnB,OAAM;QACV,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAA;QACtB,MAAM,CAAC,KAAK,CACR,WAAW,IAAI,CAAC,MAAM,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE;cACpH,mBAAmB,IAAA,yCAA2B,EAAC,oBAAoB,CAAC,EAAE,CAC3E,CAAA;QACD,IAAI,IAAA,qCAAuB,EAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACjF,OAAM;QACV,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,cAAc,CAAC,oBAAoB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,WAAW,CAAC,CAAA;QACvG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,oBAAoB,CAAC,CAAA;QACxD,MAAM,QAAQ,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;QAC7E,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAA;QAC/D,IAAI,qBAAqB,CAAC,OAAO,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAA,+BAAuB,EAAC,QAAQ,CAAC,EAAE,qBAAqB,CAAC,cAAc,CAAC,CAAC,CAAA;QAC9G,CAAC;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAA;QAC7D,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,oBAAoB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,WAAW,CAAC,CAAA;IAE7G,CAAC;IAED,KAAK,CAAC,QAAQ;QACV,MAAM,cAAc,GAAG,IAAI,GAAG,EAAc,CAAA;QAC5C,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAA,gDAA8B,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,EAAE,cAAc,CAAC,CAAC,CAAA;QAC1H,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;IACxC,CAAC;IAEO,aAAa,CAAC,QAAoB,EAAE,cAA+B;QACvE,MAAM,cAAc,GAAG;YACnB,QAAQ;YACR,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB;YAChD,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,cAAc;YACd,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM;SAC3C,CAAA;QACD,OAAO,IAAI,mCAAgB,CAAC,cAAc,CAAC,CAAA;IAC/C,CAAC;IAEO,iBAAiB,CAAC,QAAmB,EAAE,cAA+B;QAC1E,MAAM,cAAc,GAAG;YACnB,QAAQ;YACR,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB;YAChD,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;YACpC,cAAc;SACjB,CAAA;QACD,OAAO,IAAI,2CAAoB,CAAC,cAAc,CAAC,CAAA;IACnD,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,QAA4B,EAAE,oBAAoC,EAAE,KAAc;QACxG,IAAI,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC7B,IAAI,CAAC,wBAAwB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;gBACtD,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC3D,CAAC;QACL,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,eAAe,IAAI,CAAC,MAAM,CAAC,SAAS,YAAY,CAAC,CAAA;QAClE,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACpB,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC;oBACnD,IAAI,KAAK,EAAE,CAAC;wBACR,mDAAmD;wBACnD,4CAA4C;wBAC5C,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;oBACtG,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,MAAM,IAAI,CAAC,+BAA+B,EAAE,CAAA;gBAChD,CAAC;YACL,CAAC;YACD,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;QACnF,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,eAAe,CAAC,QAAgC;QAC1D,IAAI,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC7B,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;gBAC1D,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;YAC3D,CAAC;QACL,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACV,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,MAAM,CAAC,SAAS,YAAY,CAAC,CAAA;QACnE,CAAC;gBAAS,CAAC;YACP,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAA;QACnF,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,UAA0B,EAC1B,iBAAkC,IAAI,GAAG,EAAE,EAC3C,0BAA2C,IAAI,GAAG,EAAE;QAEpD,IAAI,IAAI,CAAC,SAAS,EAAE,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACzC,OAAM;QACV,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAA;QACtD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAA;QACzB,IAAI,CAAC;YACD,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,uBAAuB,EAAE,CAAC,CAAA;YACxH,MAAM,CAAC,KAAK,CAAC,6BAA6B,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,CAAC,CAAA;QACvE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,MAAM,CAAC,SAAS,SAAS,CAAC,CAAA;YAC5D,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBACpB,mDAAmD;gBACnD,4CAA4C;gBAC5C,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;YAC5F,CAAC;QACL,CAAC;gBAAS,CAAC;YACP,IAAI,CAAC,aAAa,GAAG,KAAK,CAAA;QAC9B,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,+BAA+B;QACzC,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAChC,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAA;YACnC,4CAA4C;YAC5C,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QAC1G,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,qBAAqB;QAC/B,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACnB,OAAM;QACV,CAAC;QACD,MAAM,WAAW,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAA;QAChF,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CACvD,WAAW,EACX,IAAI,CAAC,MAAM,CAAC,WAAW,CAC1B,CAAA;QACD,MAAM,OAAO,CAAC,UAAU,CACpB,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAsB,EAAE,EAAE;YACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;YACxD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;gBAC7B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YAC/C,CAAC;QACL,CAAC,CAAC,CACL,CAAA;IACL,CAAC;IAEM,aAAa;QAChB,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,wBAAwB,CAAC,IAAI,GAAG,CAAC,CAAA;IAC3E,CAAC;IAEM,YAAY;QACf,OAAO,IAAI,CAAC,UAAU,CAAA;IAC1B,CAAC;IAEO,SAAS;QACb,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAA;IAC9C,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAC5B,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAClD,OAAO,CAAC,IAAI,EAAE,CAAA;QAClB,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAtMD,sCAsMC"}
|
|
@@ -13,15 +13,15 @@ export declare class RingDiscoverySession {
|
|
|
13
13
|
private stopped;
|
|
14
14
|
private emitter;
|
|
15
15
|
private noProgressCounter;
|
|
16
|
-
private
|
|
16
|
+
private ongoingRequests;
|
|
17
17
|
private readonly config;
|
|
18
18
|
private numContactedPeers;
|
|
19
19
|
private targetIdAsRingId;
|
|
20
20
|
constructor(config: RingDiscoverySessionConfig);
|
|
21
21
|
private addContacts;
|
|
22
|
-
private
|
|
23
|
-
private
|
|
24
|
-
private
|
|
22
|
+
private fetchClosestContactsFromRemote;
|
|
23
|
+
private onRequestSucceeded;
|
|
24
|
+
private onRequestFailed;
|
|
25
25
|
private findMoreContacts;
|
|
26
26
|
findClosestNodes(timeout: number): Promise<void>;
|
|
27
27
|
stop(): void;
|
|
@@ -15,7 +15,7 @@ class RingDiscoverySession {
|
|
|
15
15
|
stopped = false;
|
|
16
16
|
emitter = new eventemitter3_1.default();
|
|
17
17
|
noProgressCounter = 0;
|
|
18
|
-
|
|
18
|
+
ongoingRequests = new Set();
|
|
19
19
|
config;
|
|
20
20
|
numContactedPeers = 0;
|
|
21
21
|
targetIdAsRingId;
|
|
@@ -31,7 +31,7 @@ class RingDiscoverySession {
|
|
|
31
31
|
this.config.peerManager.addContact(contact);
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
-
async
|
|
34
|
+
async fetchClosestContactsFromRemote(contact) {
|
|
35
35
|
if (this.stopped) {
|
|
36
36
|
return { left: [], right: [] };
|
|
37
37
|
}
|
|
@@ -42,11 +42,11 @@ class RingDiscoverySession {
|
|
|
42
42
|
this.config.peerManager.setContactActive(contact.getNodeId());
|
|
43
43
|
return returnedContacts;
|
|
44
44
|
}
|
|
45
|
-
|
|
46
|
-
if (!this.
|
|
45
|
+
onRequestSucceeded(nodeId, contacts) {
|
|
46
|
+
if (!this.ongoingRequests.has(nodeId)) {
|
|
47
47
|
return;
|
|
48
48
|
}
|
|
49
|
-
this.
|
|
49
|
+
this.ongoingRequests.delete(nodeId);
|
|
50
50
|
const oldClosestContacts = this.config.peerManager.getClosestRingContactsTo(this.config.targetId, 1);
|
|
51
51
|
const oldClosestLeftDistance = (0, ringIdentifiers_1.getLeftDistance)(this.targetIdAsRingId, (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(oldClosestContacts.left[0].getPeerDescriptor()));
|
|
52
52
|
const oldClosestRightDistance = (0, ringIdentifiers_1.getLeftDistance)(this.targetIdAsRingId, (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(oldClosestContacts.right[0].getPeerDescriptor()));
|
|
@@ -58,11 +58,11 @@ class RingDiscoverySession {
|
|
|
58
58
|
this.noProgressCounter++;
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
|
-
|
|
62
|
-
if (!this.
|
|
61
|
+
onRequestFailed(peer) {
|
|
62
|
+
if (!this.ongoingRequests.has(peer.getNodeId())) {
|
|
63
63
|
return;
|
|
64
64
|
}
|
|
65
|
-
this.
|
|
65
|
+
this.ongoingRequests.delete(peer.getNodeId());
|
|
66
66
|
this.config.peerManager.removeContact(peer.getNodeId());
|
|
67
67
|
}
|
|
68
68
|
findMoreContacts() {
|
|
@@ -95,14 +95,14 @@ class RingDiscoverySession {
|
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
for (const nextPeer of merged) {
|
|
98
|
-
if (this.
|
|
98
|
+
if (this.ongoingRequests.size >= this.config.parallelism) {
|
|
99
99
|
break;
|
|
100
100
|
}
|
|
101
|
-
this.
|
|
101
|
+
this.ongoingRequests.add(nextPeer.getNodeId());
|
|
102
102
|
// eslint-disable-next-line promise/catch-or-return
|
|
103
|
-
this.
|
|
104
|
-
.then((contacts) => this.
|
|
105
|
-
.catch(() => this.
|
|
103
|
+
this.fetchClosestContactsFromRemote(nextPeer)
|
|
104
|
+
.then((contacts) => this.onRequestSucceeded(nextPeer.getNodeId(), contacts))
|
|
105
|
+
.catch(() => this.onRequestFailed(nextPeer))
|
|
106
106
|
.finally(() => {
|
|
107
107
|
this.findMoreContacts();
|
|
108
108
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RingDiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/RingDiscoverySession.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA6D;AAC7D,kEAAwC;AACxC,+BAAyB;AAIzB,mDAA2E;AAC3E,gEAA8H;AAG9H,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAejC,MAAa,oBAAoB;IAEb,EAAE,GAAG,IAAA,SAAE,GAAE,CAAA;IACjB,OAAO,GAAG,KAAK,CAAA;IACf,OAAO,GAAG,IAAI,uBAAY,EAA8B,CAAA;IACxD,iBAAiB,GAAG,CAAC,CAAA;IACrB,
|
|
1
|
+
{"version":3,"file":"RingDiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/RingDiscoverySession.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,12 @@ import { DhtAddress } from '../../identifiers';
|
|
|
9
9
|
interface RecursiveOperationManagerConfig {
|
|
10
10
|
rpcCommunicator: RoutingRpcCommunicator;
|
|
11
11
|
sessionTransport: ITransport;
|
|
12
|
-
connections: Map<DhtAddress, DhtNodeRpcRemote>;
|
|
13
12
|
router: Router;
|
|
14
13
|
localPeerDescriptor: PeerDescriptor;
|
|
15
14
|
serviceId: ServiceID;
|
|
16
15
|
localDataStore: LocalDataStore;
|
|
17
16
|
addContact: (contact: PeerDescriptor) => void;
|
|
17
|
+
createDhtNodeRpcRemote: (peerDescriptor: PeerDescriptor) => DhtNodeRpcRemote;
|
|
18
18
|
}
|
|
19
19
|
export interface RecursiveOperationResult {
|
|
20
20
|
closestNodes: Array<PeerDescriptor>;
|
|
@@ -29,7 +29,7 @@ export declare class RecursiveOperationManager {
|
|
|
29
29
|
execute(targetId: DhtAddress, operation: RecursiveOperation, excludedPeer?: DhtAddress, waitForCompletion?: boolean): Promise<RecursiveOperationResult>;
|
|
30
30
|
private sendResponse;
|
|
31
31
|
private doRouteRequest;
|
|
32
|
-
private
|
|
32
|
+
private getClosestConnectedNodes;
|
|
33
33
|
private isPeerCloserToIdThanSelf;
|
|
34
34
|
stop(): void;
|
|
35
35
|
}
|
|
@@ -48,14 +48,14 @@ class RecursiveOperationManager {
|
|
|
48
48
|
targetId,
|
|
49
49
|
localPeerDescriptor: this.config.localPeerDescriptor,
|
|
50
50
|
// TODO use config option or named constant?
|
|
51
|
-
waitedRoutingPathCompletions: this.config.
|
|
51
|
+
waitedRoutingPathCompletions: this.config.sessionTransport.getConnectionCount() > 1 ? 2 : 1,
|
|
52
52
|
operation,
|
|
53
53
|
// TODO would it make sense to give excludedPeer as one of the fields RecursiveOperationSession?
|
|
54
54
|
doRouteRequest: (routedMessage) => {
|
|
55
55
|
return this.doRouteRequest(routedMessage, excludedPeer);
|
|
56
56
|
}
|
|
57
57
|
});
|
|
58
|
-
if (this.config.
|
|
58
|
+
if (this.config.sessionTransport.getConnectionCount() === 0) {
|
|
59
59
|
const dataEntries = Array.from(this.config.localDataStore.values(targetId));
|
|
60
60
|
session.onResponseReceived((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor), [this.config.localPeerDescriptor], [this.config.localPeerDescriptor], dataEntries, true);
|
|
61
61
|
return session.getResults();
|
|
@@ -90,11 +90,11 @@ class RecursiveOperationManager {
|
|
|
90
90
|
session.stop();
|
|
91
91
|
return session.getResults();
|
|
92
92
|
}
|
|
93
|
-
sendResponse(routingPath, targetPeerDescriptor, serviceId,
|
|
93
|
+
sendResponse(routingPath, targetPeerDescriptor, serviceId, closestConnectedNodes, dataEntries, noCloserNodesFound = false) {
|
|
94
94
|
const isOwnNode = (0, identifiers_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, targetPeerDescriptor);
|
|
95
95
|
if (isOwnNode && this.ongoingSessions.has(serviceId)) {
|
|
96
96
|
this.ongoingSessions.get(serviceId)
|
|
97
|
-
.onResponseReceived((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor), routingPath,
|
|
97
|
+
.onResponseReceived((0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor), routingPath, closestConnectedNodes, dataEntries, noCloserNodesFound);
|
|
98
98
|
}
|
|
99
99
|
else {
|
|
100
100
|
// TODO use config option or named constant?
|
|
@@ -102,7 +102,7 @@ class RecursiveOperationManager {
|
|
|
102
102
|
const rpcRemote = new RecursiveOperationSessionRpcRemote_1.RecursiveOperationSessionRpcRemote(this.config.localPeerDescriptor, targetPeerDescriptor, remoteCommunicator, DhtRpc_client_1.RecursiveOperationSessionRpcClient,
|
|
103
103
|
// TODO use config option or named constant?
|
|
104
104
|
10000);
|
|
105
|
-
rpcRemote.sendResponse(routingPath,
|
|
105
|
+
rpcRemote.sendResponse(routingPath, closestConnectedNodes, dataEntries, noCloserNodesFound);
|
|
106
106
|
remoteCommunicator.destroy();
|
|
107
107
|
}
|
|
108
108
|
}
|
|
@@ -113,7 +113,7 @@ class RecursiveOperationManager {
|
|
|
113
113
|
const targetId = (0, identifiers_1.getDhtAddressFromRaw)(routedMessage.target);
|
|
114
114
|
const request = routedMessage.message.body.recursiveOperationRequest;
|
|
115
115
|
// TODO use config option or named constant?
|
|
116
|
-
const
|
|
116
|
+
const closestConnectedNodes = this.getClosestConnectedNodes(targetId, 5);
|
|
117
117
|
const dataEntries = (request.operation === DhtRpc_1.RecursiveOperation.FETCH_DATA)
|
|
118
118
|
? Array.from(this.config.localDataStore.values(targetId))
|
|
119
119
|
: [];
|
|
@@ -122,30 +122,30 @@ class RecursiveOperationManager {
|
|
|
122
122
|
}
|
|
123
123
|
if ((0, utils_1.areEqualBinaries)(this.config.localPeerDescriptor.nodeId, routedMessage.target)) {
|
|
124
124
|
// TODO this is also very similar case to what we do at line 255, could simplify the code paths?
|
|
125
|
-
this.sendResponse(routedMessage.routingPath, routedMessage.sourcePeer, request.sessionId,
|
|
125
|
+
this.sendResponse(routedMessage.routingPath, routedMessage.sourcePeer, request.sessionId, closestConnectedNodes, dataEntries, true);
|
|
126
126
|
return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage);
|
|
127
127
|
}
|
|
128
128
|
else {
|
|
129
129
|
const ack = this.config.router.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.RECURSIVE, excludedPeer);
|
|
130
130
|
if ((ack.error === undefined) || (ack.error === DhtRpc_1.RouteMessageError.NO_TARGETS)) {
|
|
131
131
|
const noCloserContactsFound = (ack.error === DhtRpc_1.RouteMessageError.NO_TARGETS) ||
|
|
132
|
-
(
|
|
132
|
+
(closestConnectedNodes.length > 0
|
|
133
133
|
&& (0, getPreviousPeer_1.getPreviousPeer)(routedMessage)
|
|
134
|
-
&& !this.isPeerCloserToIdThanSelf(
|
|
135
|
-
this.sendResponse(routedMessage.routingPath, routedMessage.sourcePeer, request.sessionId,
|
|
134
|
+
&& !this.isPeerCloserToIdThanSelf(closestConnectedNodes[0], targetId));
|
|
135
|
+
this.sendResponse(routedMessage.routingPath, routedMessage.sourcePeer, request.sessionId, closestConnectedNodes, dataEntries, noCloserContactsFound);
|
|
136
136
|
}
|
|
137
137
|
return ack;
|
|
138
138
|
}
|
|
139
139
|
}
|
|
140
|
-
|
|
141
|
-
const
|
|
142
|
-
const
|
|
140
|
+
getClosestConnectedNodes(referenceId, limit) {
|
|
141
|
+
const connectedNodes = this.config.sessionTransport.getConnections().map((c) => this.config.createDhtNodeRpcRemote(c));
|
|
142
|
+
const sorted = new SortedContactList_1.SortedContactList({
|
|
143
143
|
referenceId,
|
|
144
144
|
maxSize: limit,
|
|
145
145
|
allowToContainReferenceId: true
|
|
146
146
|
});
|
|
147
|
-
|
|
148
|
-
return
|
|
147
|
+
sorted.addContacts(connectedNodes);
|
|
148
|
+
return sorted.getClosestContacts(limit).map((peer) => peer.getPeerDescriptor());
|
|
149
149
|
}
|
|
150
150
|
isPeerCloserToIdThanSelf(peer, nodeIdOrDataKey) {
|
|
151
151
|
const nodeIdOrDataKeyRaw = (0, identifiers_1.getRawFromDhtAddress)(nodeIdOrDataKey);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationManager.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationManager.ts"],"names":[],"mappings":";;;AAAA,mEAQ+C;AAE/C,8DAAuD;AACvD,0CAAqF;AAErF,6FAAyF;AACzF,2EAAwG;AAIxG,uFAAmF;AACnF,iFAAkG;AAClG,oEAAgE;AAChE,gEAA4D;AAC5D,8DAAiE;AAEjE,6EAAyE;AACzE,mDAAgJ;AAChJ,gDAA4C;AAe5C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,yBAAyB;IAE1B,eAAe,GAA2C,IAAI,GAAG,EAAE,CAAA;IACnE,OAAO,GAAG,KAAK,CAAA;IACN,MAAM,CAAiC;IAExD,YAAY,MAAuC;QAC/C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAEO,uBAAuB;QAC3B,MAAM,QAAQ,GAAG,IAAI,uDAA0B,CAAC;YAC5C,cAAc,EAAE,CAAC,aAAkC,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC;YAC1F,UAAU,EAAE,CAAC,OAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC;YACxE,qBAAqB,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,SAAS,CAAC;YACjG,sBAAsB,EAAE,CAAC,SAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,SAAS,CAAC;SACtG,CAAC,CAAA;QACF,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CACzC,4BAAmB,EACnB,wBAAe,EACf,cAAc,EACd,KAAK,EAAE,aAAkC,EAAE,EAAE;YACzC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;gBACf,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,0BAAiB,CAAC,OAAO,CAAC,CAAA;YAC1E,CAAC;iBAAM,CAAC;gBACJ,OAAO,QAAQ,CAAC,YAAY,CAAC,aAAa,CAAC,CAAA;YAC/C,CAAC;QACL,CAAC,CACJ,CAAA;IACL,CAAC;IAEM,KAAK,CAAC,OAAO,CAChB,QAAoB,EACpB,SAA6B,EAC7B,YAAyB,EACzB,iBAAiB,GAAG,IAAI;QAExB,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,CAAA;QAC/B,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,qDAAyB,CAAC;YAC1C,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,gBAAgB;YACvC,QAAQ;YACR,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,mBAAmB;YACpD,4CAA4C;YAC5C,4BAA4B,EAAE,IAAI,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationManager.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ export declare class RecursiveOperationSession extends EventEmitter<RecursiveOpe
|
|
|
33
33
|
private wrapRequest;
|
|
34
34
|
private isCompleted;
|
|
35
35
|
private hasNonStaleData;
|
|
36
|
-
onResponseReceived(sourceId: DhtAddress, routingPath: PeerDescriptor[],
|
|
36
|
+
onResponseReceived(sourceId: DhtAddress, routingPath: PeerDescriptor[], closestConnectedNodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean): void;
|
|
37
37
|
private addKnownHops;
|
|
38
38
|
private setHopAsReported;
|
|
39
39
|
private processFoundData;
|