@streamr/dht 100.2.5-beta.1 → 101.0.0-beta.0
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 +7 -7
- package/dist/src/connection/ConnectionLockRpcLocal.d.ts +3 -3
- package/dist/src/connection/ConnectionLockRpcLocal.js +8 -8
- package/dist/src/connection/ConnectionLockRpcLocal.js.map +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.js +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -1
- package/dist/src/connection/ConnectionManager.d.ts +4 -6
- package/dist/src/connection/ConnectionManager.js +128 -103
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectorFacade.d.ts +15 -14
- package/dist/src/connection/ConnectorFacade.js +70 -52
- package/dist/src/connection/ConnectorFacade.js.map +1 -1
- package/dist/src/connection/Handshaker.d.ts +9 -2
- package/dist/src/connection/Handshaker.js +117 -27
- package/dist/src/connection/Handshaker.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +13 -38
- package/dist/src/connection/ManagedConnection.js +31 -252
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/OutputBuffer.d.ts +9 -0
- package/dist/src/connection/OutputBuffer.js +26 -0
- package/dist/src/connection/OutputBuffer.js.map +1 -0
- package/dist/src/connection/PendingConnection.d.ts +19 -0
- package/dist/src/connection/PendingConnection.js +59 -0
- package/dist/src/connection/PendingConnection.js.map +1 -0
- package/dist/src/connection/connectivityChecker.js +3 -3
- package/dist/src/connection/connectivityChecker.js.map +1 -1
- package/dist/src/connection/connectivityRequestHandler.js +2 -2
- package/dist/src/connection/connectivityRequestHandler.js.map +1 -1
- package/dist/src/connection/simulator/Simulator.d.ts +1 -3
- package/dist/src/connection/simulator/Simulator.js +1 -4
- package/dist/src/connection/simulator/Simulator.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorConnection.js +1 -2
- package/dist/src/connection/simulator/SimulatorConnection.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorConnector.d.ts +3 -3
- package/dist/src/connection/simulator/SimulatorConnector.js +28 -21
- package/dist/src/connection/simulator/SimulatorConnector.js.map +1 -1
- package/dist/src/connection/webrtc/NodeWebrtcConnection.d.ts +1 -6
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js +3 -20
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnector.d.ts +11 -6
- package/dist/src/connection/webrtc/WebrtcConnector.js +57 -42
- package/dist/src/connection/webrtc/WebrtcConnector.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts +8 -10
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js +21 -44
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js.map +1 -1
- package/dist/src/connection/websocket/AbstractWebsocketClientConnection.js +8 -2
- package/dist/src/connection/websocket/AbstractWebsocketClientConnection.js.map +1 -1
- package/dist/src/connection/websocket/AutoCertifierClientFacade.d.ts +3 -3
- package/dist/src/connection/websocket/AutoCertifierClientFacade.js +8 -8
- package/dist/src/connection/websocket/AutoCertifierClientFacade.js.map +1 -1
- package/dist/src/connection/websocket/NodeWebsocketClientConnection.js +1 -1
- package/dist/src/connection/websocket/NodeWebsocketClientConnection.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketClientConnector.d.ts +26 -0
- package/dist/src/connection/websocket/WebsocketClientConnector.js +86 -0
- package/dist/src/connection/websocket/WebsocketClientConnector.js.map +1 -0
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcLocal.d.ts +19 -0
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcLocal.js +23 -0
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcLocal.js.map +1 -0
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcRemote.d.ts +5 -0
- package/dist/src/connection/websocket/{WebsocketConnectorRpcRemote.js → WebsocketClientConnectorRpcRemote.js} +4 -4
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcRemote.js.map +1 -0
- package/dist/src/connection/websocket/WebsocketServer.d.ts +8 -5
- package/dist/src/connection/websocket/WebsocketServer.js +11 -11
- package/dist/src/connection/websocket/WebsocketServer.js.map +1 -1
- package/dist/src/connection/websocket/{WebsocketConnector.d.ts → WebsocketServerConnector.d.ts} +16 -21
- package/dist/src/connection/websocket/{WebsocketConnector.js → WebsocketServerConnector.js} +112 -160
- package/dist/src/connection/websocket/WebsocketServerConnector.js.map +1 -0
- package/dist/src/dht/DhtNode.d.ts +4 -4
- package/dist/src/dht/DhtNode.js +85 -84
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcLocal.d.ts +3 -3
- package/dist/src/dht/DhtNodeRpcLocal.js +9 -9
- package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -1
- package/dist/src/dht/ExternalApiRpcLocal.d.ts +3 -3
- package/dist/src/dht/ExternalApiRpcLocal.js +5 -5
- package/dist/src/dht/ExternalApiRpcLocal.js.map +1 -1
- package/dist/src/dht/ExternalApiRpcRemote.js +2 -2
- package/dist/src/dht/ExternalApiRpcRemote.js.map +1 -1
- package/dist/src/dht/PeerManager.d.ts +4 -4
- package/dist/src/dht/PeerManager.js +22 -22
- package/dist/src/dht/PeerManager.js.map +1 -1
- package/dist/src/dht/contact/SortedContactList.d.ts +3 -3
- package/dist/src/dht/contact/SortedContactList.js +9 -9
- package/dist/src/dht/contact/SortedContactList.js.map +1 -1
- package/dist/src/dht/discovery/DiscoverySession.d.ts +3 -3
- package/dist/src/dht/discovery/DiscoverySession.js +21 -21
- package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.d.ts +3 -3
- package/dist/src/dht/discovery/PeerDiscovery.js +46 -44
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/dht/discovery/RingDiscoverySession.d.ts +3 -3
- package/dist/src/dht/discovery/RingDiscoverySession.js +19 -19
- package/dist/src/dht/discovery/RingDiscoverySession.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.d.ts +3 -3
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js +33 -33
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.d.ts +3 -3
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.js +8 -8
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.d.ts +4 -4
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js +24 -24
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.d.ts +4 -4
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js +5 -5
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js.map +1 -1
- package/dist/src/dht/routing/Router.d.ts +3 -3
- package/dist/src/dht/routing/Router.js +20 -20
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcLocal.d.ts +3 -3
- package/dist/src/dht/routing/RouterRpcLocal.js +16 -16
- package/dist/src/dht/routing/RouterRpcLocal.js.map +1 -1
- package/dist/src/dht/routing/RoutingSession.d.ts +3 -3
- package/dist/src/dht/routing/RoutingSession.js +24 -24
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/dist/src/dht/store/StoreManager.d.ts +3 -3
- package/dist/src/dht/store/StoreManager.js +25 -25
- package/dist/src/dht/store/StoreManager.js.map +1 -1
- package/dist/src/dht/store/StoreRpcLocal.d.ts +3 -3
- package/dist/src/dht/store/StoreRpcLocal.js +12 -12
- package/dist/src/dht/store/StoreRpcLocal.js.map +1 -1
- package/dist/src/exports.d.ts +3 -0
- package/dist/src/exports.js +5 -1
- package/dist/src/exports.js.map +1 -1
- package/dist/src/proto/google/protobuf/any.d.ts +5 -8
- package/dist/src/proto/google/protobuf/any.js.map +1 -1
- package/dist/src/proto/google/protobuf/empty.d.ts +1 -0
- package/dist/src/proto/google/protobuf/empty.js.map +1 -1
- package/dist/src/proto/google/protobuf/timestamp.d.ts +1 -10
- package/dist/src/proto/google/protobuf/timestamp.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +4 -4
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +8 -8
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +3 -3
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +4 -4
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +2 -2
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.js +1 -1
- package/dist/src/transport/ListeningRpcCommunicator.d.ts +2 -2
- package/dist/src/transport/ListeningRpcCommunicator.js +2 -2
- package/dist/src/transport/ListeningRpcCommunicator.js.map +1 -1
- package/dist/src/transport/RoutingRpcCommunicator.d.ts +2 -2
- package/dist/src/transport/RoutingRpcCommunicator.js +2 -2
- package/dist/src/transport/RoutingRpcCommunicator.js.map +1 -1
- package/package.json +7 -7
- package/protos/DhtRpc.proto +1 -1
- package/src/connection/ConnectionLockRpcLocal.ts +9 -9
- package/src/connection/ConnectionLockRpcRemote.ts +1 -1
- package/src/connection/ConnectionManager.ts +153 -111
- package/src/connection/ConnectorFacade.ts +84 -61
- package/src/connection/Handshaker.ts +131 -27
- package/src/connection/ManagedConnection.ts +41 -304
- package/src/connection/OutputBuffer.ts +28 -0
- package/src/connection/PendingConnection.ts +68 -0
- package/src/connection/connectivityChecker.ts +2 -2
- package/src/connection/connectivityRequestHandler.ts +1 -1
- package/src/connection/simulator/Simulator.ts +1 -5
- package/src/connection/simulator/SimulatorConnection.ts +1 -2
- package/src/connection/simulator/SimulatorConnector.ts +34 -33
- package/src/connection/webrtc/BrowserWebrtcConnection.ts +0 -6
- package/src/connection/webrtc/NodeWebrtcConnection.ts +3 -24
- package/src/connection/webrtc/WebrtcConnector.ts +73 -62
- package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +26 -56
- package/src/connection/websocket/AbstractWebsocketClientConnection.ts +8 -2
- package/src/connection/websocket/AutoCertifierClientFacade.ts +11 -11
- package/src/connection/websocket/NodeWebsocketClientConnection.ts +1 -1
- package/src/connection/websocket/WebsocketClientConnector.ts +119 -0
- package/src/connection/websocket/WebsocketClientConnectorRpcLocal.ts +39 -0
- package/src/connection/websocket/{WebsocketConnectorRpcRemote.ts → WebsocketClientConnectorRpcRemote.ts} +2 -2
- package/src/connection/websocket/WebsocketServer.ts +18 -14
- package/src/connection/websocket/{WebsocketConnector.ts → WebsocketServerConnector.ts} +128 -205
- package/src/dht/DhtNode.ts +90 -89
- package/src/dht/DhtNodeRpcLocal.ts +11 -11
- package/src/dht/ExternalApiRpcLocal.ts +6 -6
- package/src/dht/ExternalApiRpcRemote.ts +2 -2
- package/src/dht/PeerManager.ts +24 -24
- package/src/dht/contact/SortedContactList.ts +10 -10
- package/src/dht/discovery/DiscoverySession.ts +24 -24
- package/src/dht/discovery/PeerDiscovery.ts +47 -45
- package/src/dht/discovery/RingDiscoverySession.ts +23 -23
- package/src/dht/recursive-operation/RecursiveOperationManager.ts +36 -36
- package/src/dht/recursive-operation/RecursiveOperationRpcLocal.ts +9 -9
- package/src/dht/recursive-operation/RecursiveOperationSession.ts +25 -25
- package/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts +7 -7
- package/src/dht/routing/Router.ts +21 -21
- package/src/dht/routing/RouterRpcLocal.ts +17 -17
- package/src/dht/routing/RoutingSession.ts +26 -26
- package/src/dht/store/StoreManager.ts +27 -27
- package/src/dht/store/StoreRpcLocal.ts +13 -13
- package/src/exports.ts +3 -0
- package/src/proto/google/protobuf/any.ts +6 -9
- package/src/proto/google/protobuf/empty.ts +2 -1
- package/src/proto/google/protobuf/timestamp.ts +2 -11
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +9 -9
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +3 -3
- package/src/proto/packages/dht/protos/DhtRpc.ts +4 -4
- package/src/proto/packages/proto-rpc/protos/ProtoRpc.ts +1 -1
- package/src/transport/ListeningRpcCommunicator.ts +3 -3
- package/src/transport/RoutingRpcCommunicator.ts +3 -3
- package/test/end-to-end/Layer0Webrtc.test.ts +0 -10
- package/test/integration/ConnectionManager.test.ts +3 -2
- package/test/integration/GeoIpConnectivityChecking.test.ts +1 -1
- package/test/integration/SimultaneousConnections.test.ts +2 -2
- package/test/integration/WebrtcConnectionManagement.test.ts +2 -10
- package/test/integration/{WebsocketConnectorRpc.test.ts → WebsocketClientConnectorRpc.test.ts} +9 -9
- package/test/integration/WebsocketConnectionManagement.test.ts +11 -29
- package/test/unit/ConnectionManager.test.ts +64 -0
- package/test/unit/DiscoverySession.test.ts +1 -1
- package/test/unit/Handshaker.test.ts +169 -0
- package/test/unit/ManagedConnection.test.ts +58 -0
- package/test/unit/PendingConnection.test.ts +57 -0
- package/test/unit/WebrtcConnector.test.ts +56 -0
- package/test/unit/{WebsocketConnector.test.ts → WebsocketClientConnector.test.ts} +56 -11
- package/test/unit/WebsocketServerConnector.test.ts +102 -0
- package/test/utils/FakeConnectorFacade.ts +41 -0
- package/test/utils/mock/MockConnection.ts +26 -0
- package/test/utils/utils.ts +2 -2
- package/dist/src/connection/IConnectionSource.d.ts +0 -4
- package/dist/src/connection/IConnectionSource.js +0 -3
- package/dist/src/connection/IConnectionSource.js.map +0 -1
- package/dist/src/connection/webrtc/ManagedWebrtcConnection.d.ts +0 -7
- package/dist/src/connection/webrtc/ManagedWebrtcConnection.js +0 -20
- package/dist/src/connection/webrtc/ManagedWebrtcConnection.js.map +0 -1
- package/dist/src/connection/websocket/WebsocketConnector.js.map +0 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.d.ts +0 -19
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js +0 -23
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js.map +0 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.d.ts +0 -5
- package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js.map +0 -1
- package/src/connection/IConnectionSource.ts +0 -6
- package/src/connection/webrtc/ManagedWebrtcConnection.ts +0 -27
- package/src/connection/websocket/WebsocketConnectorRpcLocal.ts +0 -39
|
@@ -8,9 +8,9 @@ import { RandomContactList } from './contact/RandomContactList';
|
|
|
8
8
|
import { RingContactList } from './contact/RingContactList';
|
|
9
9
|
import { ReadonlySortedContactList } from './contact/SortedContactList';
|
|
10
10
|
import { RingIdRaw } from './contact/ringIdentifiers';
|
|
11
|
-
interface
|
|
11
|
+
interface PeerManagerOptions {
|
|
12
12
|
numberOfNodesPerKBucket: number;
|
|
13
|
-
|
|
13
|
+
maxContactCount: number;
|
|
14
14
|
localNodeId: DhtAddress;
|
|
15
15
|
localPeerDescriptor: PeerDescriptor;
|
|
16
16
|
connectionLocker?: ConnectionLocker;
|
|
@@ -35,8 +35,8 @@ export declare class PeerManager extends EventEmitter<PeerManagerEvents> {
|
|
|
35
35
|
private ringContacts;
|
|
36
36
|
private randomContacts;
|
|
37
37
|
private stopped;
|
|
38
|
-
private readonly
|
|
39
|
-
constructor(
|
|
38
|
+
private readonly options;
|
|
39
|
+
constructor(options: PeerManagerOptions);
|
|
40
40
|
private onKBucketPing;
|
|
41
41
|
private onKBucketRemoved;
|
|
42
42
|
private onKBucketAdded;
|
|
@@ -44,16 +44,16 @@ class PeerManager extends eventemitter3_1.default {
|
|
|
44
44
|
ringContacts;
|
|
45
45
|
randomContacts;
|
|
46
46
|
stopped = false;
|
|
47
|
-
|
|
48
|
-
constructor(
|
|
47
|
+
options;
|
|
48
|
+
constructor(options) {
|
|
49
49
|
super();
|
|
50
|
-
this.
|
|
50
|
+
this.options = options;
|
|
51
51
|
this.neighbors = new k_bucket_1.default({
|
|
52
|
-
localNodeId: (0, identifiers_1.getRawFromDhtAddress)(this.
|
|
53
|
-
numberOfNodesPerKBucket: this.
|
|
54
|
-
numberOfNodesToPing: this.
|
|
52
|
+
localNodeId: (0, identifiers_1.getRawFromDhtAddress)(this.options.localNodeId),
|
|
53
|
+
numberOfNodesPerKBucket: this.options.numberOfNodesPerKBucket,
|
|
54
|
+
numberOfNodesToPing: this.options.numberOfNodesPerKBucket
|
|
55
55
|
});
|
|
56
|
-
this.ringContacts = new RingContactList_1.RingContactList((0, ringIdentifiers_1.getRingIdRawFromPeerDescriptor)(this.
|
|
56
|
+
this.ringContacts = new RingContactList_1.RingContactList((0, ringIdentifiers_1.getRingIdRawFromPeerDescriptor)(this.options.localPeerDescriptor));
|
|
57
57
|
this.ringContacts.on('contactAdded', (contact) => {
|
|
58
58
|
this.emit('ringContactAdded', contact.getPeerDescriptor());
|
|
59
59
|
});
|
|
@@ -67,8 +67,8 @@ class PeerManager extends eventemitter3_1.default {
|
|
|
67
67
|
// TODO: Update contact info to the connection manager and reconnect
|
|
68
68
|
});
|
|
69
69
|
this.nearbyContacts = new SortedContactList_1.SortedContactList({
|
|
70
|
-
referenceId: this.
|
|
71
|
-
maxSize: this.
|
|
70
|
+
referenceId: this.options.localNodeId,
|
|
71
|
+
maxSize: this.options.maxContactCount,
|
|
72
72
|
allowToContainReferenceId: false
|
|
73
73
|
});
|
|
74
74
|
this.nearbyContacts.on('contactRemoved', (contact) => {
|
|
@@ -76,11 +76,11 @@ class PeerManager extends eventemitter3_1.default {
|
|
|
76
76
|
return;
|
|
77
77
|
}
|
|
78
78
|
this.emit('nearbyContactRemoved', contact.getPeerDescriptor());
|
|
79
|
-
this.randomContacts.addContact(this.
|
|
79
|
+
this.randomContacts.addContact(this.options.createDhtNodeRpcRemote(contact.getPeerDescriptor()));
|
|
80
80
|
});
|
|
81
81
|
this.nearbyContacts.on('contactAdded', (contact) => this.emit('nearbyContactAdded', contact.getPeerDescriptor()));
|
|
82
82
|
this.activeContacts = new Set();
|
|
83
|
-
this.randomContacts = new RandomContactList_1.RandomContactList(this.
|
|
83
|
+
this.randomContacts = new RandomContactList_1.RandomContactList(this.options.localNodeId, this.options.maxContactCount);
|
|
84
84
|
this.randomContacts.on('contactRemoved', (removedContact) => this.emit('randomContactRemoved', removedContact.getPeerDescriptor()));
|
|
85
85
|
this.randomContacts.on('contactAdded', (contactAdded) => this.emit('randomContactAdded', contactAdded.getPeerDescriptor()));
|
|
86
86
|
}
|
|
@@ -89,12 +89,12 @@ class PeerManager extends eventemitter3_1.default {
|
|
|
89
89
|
return;
|
|
90
90
|
}
|
|
91
91
|
const sortingList = new SortedContactList_1.SortedContactList({
|
|
92
|
-
referenceId: this.
|
|
92
|
+
referenceId: this.options.localNodeId,
|
|
93
93
|
allowToContainReferenceId: false
|
|
94
94
|
});
|
|
95
95
|
sortingList.addContacts(oldContacts);
|
|
96
96
|
const removableNodeId = sortingList.getFurthestContacts(1)[0].getNodeId();
|
|
97
|
-
this.
|
|
97
|
+
this.options.connectionLocker?.weakUnlockConnection(removableNodeId, this.options.lockId);
|
|
98
98
|
this.neighbors.remove((0, identifiers_1.getRawFromDhtAddress)(removableNodeId));
|
|
99
99
|
this.neighbors.add(newContact);
|
|
100
100
|
}
|
|
@@ -102,7 +102,7 @@ class PeerManager extends eventemitter3_1.default {
|
|
|
102
102
|
if (this.stopped) {
|
|
103
103
|
return;
|
|
104
104
|
}
|
|
105
|
-
this.
|
|
105
|
+
this.options.connectionLocker?.weakUnlockConnection(nodeId, this.options.lockId);
|
|
106
106
|
logger.trace(`Removed contact ${nodeId}`);
|
|
107
107
|
if (this.neighbors.count() === 0) {
|
|
108
108
|
this.emit('kBucketEmpty');
|
|
@@ -112,12 +112,12 @@ class PeerManager extends eventemitter3_1.default {
|
|
|
112
112
|
if (this.stopped) {
|
|
113
113
|
return;
|
|
114
114
|
}
|
|
115
|
-
if (contact.getNodeId() !== this.
|
|
115
|
+
if (contact.getNodeId() !== this.options.localNodeId) {
|
|
116
116
|
const peerDescriptor = contact.getPeerDescriptor();
|
|
117
117
|
const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
|
|
118
118
|
// Important to lock here, before the ping result is known
|
|
119
|
-
this.
|
|
120
|
-
if (this.
|
|
119
|
+
this.options.connectionLocker?.weakLockConnection(nodeId, this.options.lockId);
|
|
120
|
+
if (this.options.hasConnection(contact.getNodeId())) {
|
|
121
121
|
logger.trace(`Added new contact ${nodeId}`);
|
|
122
122
|
}
|
|
123
123
|
else { // open connection by pinging
|
|
@@ -128,12 +128,12 @@ class PeerManager extends eventemitter3_1.default {
|
|
|
128
128
|
}
|
|
129
129
|
else {
|
|
130
130
|
logger.trace('ping failed ' + nodeId);
|
|
131
|
-
this.
|
|
131
|
+
this.options.connectionLocker?.weakUnlockConnection(nodeId, this.options.lockId);
|
|
132
132
|
this.removeContact(nodeId);
|
|
133
133
|
this.addNearbyContactToNeighbors();
|
|
134
134
|
}
|
|
135
135
|
}).catch((_e) => {
|
|
136
|
-
this.
|
|
136
|
+
this.options.connectionLocker?.weakUnlockConnection(nodeId, this.options.lockId);
|
|
137
137
|
this.removeContact(nodeId);
|
|
138
138
|
this.addNearbyContactToNeighbors();
|
|
139
139
|
});
|
|
@@ -199,7 +199,7 @@ class PeerManager extends eventemitter3_1.default {
|
|
|
199
199
|
getClosestRingContactsTo(ringIdRaw, limit, excludedIds) {
|
|
200
200
|
const closest = new RingContactList_1.RingContactList(ringIdRaw, excludedIds);
|
|
201
201
|
this.ringContacts.getAllContacts().map((contact) => closest.addContact(contact));
|
|
202
|
-
// TODO use
|
|
202
|
+
// TODO use options option or named constant?
|
|
203
203
|
return closest.getClosestContacts(limit ?? 8);
|
|
204
204
|
}
|
|
205
205
|
getRandomContacts() {
|
|
@@ -225,9 +225,9 @@ class PeerManager extends eventemitter3_1.default {
|
|
|
225
225
|
return;
|
|
226
226
|
}
|
|
227
227
|
const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
|
|
228
|
-
if (nodeId !== this.
|
|
228
|
+
if (nodeId !== this.options.localNodeId) {
|
|
229
229
|
logger.trace(`Adding new contact ${nodeId}`);
|
|
230
|
-
const remote = this.
|
|
230
|
+
const remote = this.options.createDhtNodeRpcRemote(peerDescriptor);
|
|
231
231
|
const isInNeighbors = (this.neighbors.get(peerDescriptor.nodeId) !== null);
|
|
232
232
|
const isInNearbyContacts = (this.nearbyContacts.getContact(nodeId) !== undefined);
|
|
233
233
|
const isInRingContacts = this.ringContacts.getContact(peerDescriptor) !== undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeerManager.js","sourceRoot":"","sources":["../../../src/dht/PeerManager.ts"],"names":[],"mappings":";;;;;;AAAA,0CAEuB;AACvB,kEAAwC;AACxC,wDAA8B;AAG9B,gDAA6G;AAK7G,mEAA+D;AAC/D,+DAA2D;AAC3D,mEAA0F;AAC1F,+DAAqF;AAErF,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAajC,wEAAwE;AACxE,MAAM,SAAS,GAAG,KAAK,EAAE,KAAyB,EAAE,cAA+B,EAA6B,EAAE;IAC9G,MAAM,gBAAgB,GAAqB,EAAE,CAAA;IAC7C,MAAM,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACjD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,IAAI,EAAE,CAAA;QACrC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACZ,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;YAC1C,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAA;QACtD,CAAC;aAAM,CAAC;YACJ,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAA;QAC3C,CAAC;IACL,CAAC,CAAC,CAAC,CAAA;IACH,OAAO,gBAAgB,CAAA;AAC3B,CAAC,CAAA;AAYM,MAAM,WAAW,GAAG,CAAC,mBAAkC,EAAE,mBAAkC,EAAU,EAAE;IAC1G,OAAO,kBAAO,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAA;AACrE,CAAC,CAAA;AAFY,QAAA,WAAW,eAEvB;AAED,MAAa,WAAY,SAAQ,uBAA+B;IAE5D,aAAa;IACb,mEAAmE;IACnE,wCAAwC;IACxC,0EAA0E;IAC1E,iEAAiE;IAEzD,SAAS,CAA2B;IACpC,cAAc,CAAqC;IACnD,cAAc,CAAiB;IAC/B,YAAY,CAAmC;IAC/C,cAAc,CAAqC;IACnD,OAAO,GAAY,KAAK,CAAA;IACf,
|
|
1
|
+
{"version":3,"file":"PeerManager.js","sourceRoot":"","sources":["../../../src/dht/PeerManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { DhtAddress } from '../../identifiers';
|
|
|
4
4
|
export type ReadonlySortedContactList<C extends {
|
|
5
5
|
getNodeId: () => DhtAddress;
|
|
6
6
|
}> = Pick<SortedContactList<C>, 'getClosestContacts' | 'getAllContactsInUndefinedOrder'>;
|
|
7
|
-
export interface
|
|
7
|
+
export interface SortedContactListOptions {
|
|
8
8
|
referenceId: DhtAddress;
|
|
9
9
|
allowToContainReferenceId: boolean;
|
|
10
10
|
maxSize?: number;
|
|
@@ -14,10 +14,10 @@ export interface SortedContactListConfig {
|
|
|
14
14
|
export declare class SortedContactList<C extends {
|
|
15
15
|
getNodeId: () => DhtAddress;
|
|
16
16
|
}> extends EventEmitter<Events<C>> {
|
|
17
|
-
private
|
|
17
|
+
private options;
|
|
18
18
|
private contactsById;
|
|
19
19
|
private contactIds;
|
|
20
|
-
constructor(
|
|
20
|
+
constructor(options: SortedContactListOptions);
|
|
21
21
|
getClosestContactId(): DhtAddress;
|
|
22
22
|
getContactIds(): DhtAddress[];
|
|
23
23
|
addContact(contact: C): void;
|
|
@@ -9,12 +9,12 @@ const eventemitter3_1 = __importDefault(require("eventemitter3"));
|
|
|
9
9
|
const PeerManager_1 = require("../PeerManager");
|
|
10
10
|
const identifiers_1 = require("../../identifiers");
|
|
11
11
|
class SortedContactList extends eventemitter3_1.default {
|
|
12
|
-
|
|
12
|
+
options;
|
|
13
13
|
contactsById = new Map();
|
|
14
14
|
contactIds = [];
|
|
15
|
-
constructor(
|
|
15
|
+
constructor(options) {
|
|
16
16
|
super();
|
|
17
|
-
this.
|
|
17
|
+
this.options = options;
|
|
18
18
|
this.compareIds = this.compareIds.bind(this);
|
|
19
19
|
}
|
|
20
20
|
getClosestContactId() {
|
|
@@ -25,15 +25,15 @@ class SortedContactList extends eventemitter3_1.default {
|
|
|
25
25
|
}
|
|
26
26
|
addContact(contact) {
|
|
27
27
|
const contactId = contact.getNodeId();
|
|
28
|
-
if (this.
|
|
28
|
+
if (this.options.excludedNodeIds !== undefined && this.options.excludedNodeIds.has(contactId)) {
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
|
-
if ((!this.
|
|
32
|
-
(this.
|
|
31
|
+
if ((!this.options.allowToContainReferenceId && (this.options.referenceId === contactId)) ||
|
|
32
|
+
(this.options.nodeIdDistanceLimit !== undefined && this.compareIds(this.options.nodeIdDistanceLimit, contactId) < 0)) {
|
|
33
33
|
return;
|
|
34
34
|
}
|
|
35
35
|
if (!this.contactsById.has(contactId)) {
|
|
36
|
-
if ((this.
|
|
36
|
+
if ((this.options.maxSize === undefined) || (this.contactIds.length < this.options.maxSize)) {
|
|
37
37
|
this.contactsById.set(contactId, contact);
|
|
38
38
|
const index = (0, lodash_1.sortedIndexBy)(this.contactIds, contactId, (id) => { return this.distanceToReferenceId(id); });
|
|
39
39
|
this.contactIds.splice(index, 0, contactId);
|
|
@@ -41,7 +41,7 @@ class SortedContactList extends eventemitter3_1.default {
|
|
|
41
41
|
this.emit('contactAdded', contact);
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
|
-
else if (this.compareIds(this.contactIds[this.
|
|
44
|
+
else if (this.compareIds(this.contactIds[this.options.maxSize - 1], contactId) > 0) {
|
|
45
45
|
const removedId = this.contactIds.pop();
|
|
46
46
|
const removedContact = this.contactsById.get(removedId);
|
|
47
47
|
this.contactsById.delete(removedId);
|
|
@@ -88,7 +88,7 @@ class SortedContactList extends eventemitter3_1.default {
|
|
|
88
88
|
// TODO inline this method?
|
|
89
89
|
distanceToReferenceId(id) {
|
|
90
90
|
// TODO maybe this class should store the referenceId also as DhtAddressRaw so that we don't need to convert it here?
|
|
91
|
-
return (0, PeerManager_1.getDistance)((0, identifiers_1.getRawFromDhtAddress)(this.
|
|
91
|
+
return (0, PeerManager_1.getDistance)((0, identifiers_1.getRawFromDhtAddress)(this.options.referenceId), (0, identifiers_1.getRawFromDhtAddress)(id));
|
|
92
92
|
}
|
|
93
93
|
removeContact(id) {
|
|
94
94
|
if (this.contactsById.has(id)) {
|
|
@@ -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;AAgBpE,MAAa,iBAA6D,SAAQ,uBAAuB;IAE7F,
|
|
1
|
+
{"version":3,"file":"SortedContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/SortedContactList.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { DhtAddress } from '../../identifiers';
|
|
|
3
3
|
import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
4
4
|
import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
|
|
5
5
|
import { PeerManager } from '../PeerManager';
|
|
6
|
-
interface
|
|
6
|
+
interface DiscoverySessionOptions {
|
|
7
7
|
targetId: DhtAddress;
|
|
8
8
|
parallelism: number;
|
|
9
9
|
noProgressLimit: number;
|
|
@@ -17,8 +17,8 @@ export declare class DiscoverySession {
|
|
|
17
17
|
private noProgressCounter;
|
|
18
18
|
private ongoingRequests;
|
|
19
19
|
private doneGate;
|
|
20
|
-
private readonly
|
|
21
|
-
constructor(
|
|
20
|
+
private readonly options;
|
|
21
|
+
constructor(options: DiscoverySessionOptions);
|
|
22
22
|
private addContacts;
|
|
23
23
|
private fetchClosestNeighborsFromRemote;
|
|
24
24
|
private onRequestSucceeded;
|
|
@@ -12,28 +12,28 @@ class DiscoverySession {
|
|
|
12
12
|
noProgressCounter = 0;
|
|
13
13
|
ongoingRequests = new Set();
|
|
14
14
|
doneGate = new utils_1.Gate(false);
|
|
15
|
-
|
|
16
|
-
constructor(
|
|
17
|
-
this.
|
|
15
|
+
options;
|
|
16
|
+
constructor(options) {
|
|
17
|
+
this.options = options;
|
|
18
18
|
}
|
|
19
19
|
addContacts(contacts) {
|
|
20
|
-
if (this.
|
|
20
|
+
if (this.options.abortSignal.aborted || this.doneGate.isOpen()) {
|
|
21
21
|
return;
|
|
22
22
|
}
|
|
23
23
|
for (const contact of contacts) {
|
|
24
|
-
this.
|
|
24
|
+
this.options.peerManager.addContact(contact);
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
async fetchClosestNeighborsFromRemote(peerDescriptor) {
|
|
28
|
-
if (this.
|
|
28
|
+
if (this.options.abortSignal.aborted || this.doneGate.isOpen()) {
|
|
29
29
|
return [];
|
|
30
30
|
}
|
|
31
31
|
const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
|
|
32
32
|
logger.trace(`Getting closest neighbors from remote: ${nodeId}`);
|
|
33
|
-
this.
|
|
34
|
-
const remote = this.
|
|
35
|
-
const returnedContacts = await remote.getClosestPeers(this.
|
|
36
|
-
this.
|
|
33
|
+
this.options.contactedPeers.add(nodeId);
|
|
34
|
+
const remote = this.options.createDhtNodeRpcRemote(peerDescriptor);
|
|
35
|
+
const returnedContacts = await remote.getClosestPeers(this.options.targetId);
|
|
36
|
+
this.options.peerManager.setContactActive(nodeId);
|
|
37
37
|
return returnedContacts;
|
|
38
38
|
}
|
|
39
39
|
onRequestSucceeded(nodeId, contacts) {
|
|
@@ -41,7 +41,7 @@ class DiscoverySession {
|
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
this.ongoingRequests.delete(nodeId);
|
|
44
|
-
const targetId = (0, identifiers_1.getRawFromDhtAddress)(this.
|
|
44
|
+
const targetId = (0, identifiers_1.getRawFromDhtAddress)(this.options.targetId);
|
|
45
45
|
const oldClosestNeighbor = this.getClosestNeighbor();
|
|
46
46
|
const oldClosestDistance = (0, PeerManager_1.getDistance)(targetId, oldClosestNeighbor.nodeId);
|
|
47
47
|
this.addContacts(contacts);
|
|
@@ -52,29 +52,29 @@ class DiscoverySession {
|
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
getClosestNeighbor() {
|
|
55
|
-
return (0, getClosestNodes_1.getClosestNodes)(this.
|
|
55
|
+
return (0, getClosestNodes_1.getClosestNodes)(this.options.targetId, this.options.peerManager.getNeighbors().map((n) => n.getPeerDescriptor()), { maxCount: 1 })[0];
|
|
56
56
|
}
|
|
57
57
|
onRequestFailed(nodeId) {
|
|
58
58
|
if (!this.ongoingRequests.has(nodeId)) {
|
|
59
59
|
return;
|
|
60
60
|
}
|
|
61
61
|
this.ongoingRequests.delete(nodeId);
|
|
62
|
-
this.
|
|
62
|
+
this.options.peerManager.removeContact(nodeId);
|
|
63
63
|
}
|
|
64
64
|
findMoreContacts() {
|
|
65
|
-
if (this.
|
|
65
|
+
if (this.options.abortSignal.aborted || this.doneGate.isOpen()) {
|
|
66
66
|
return;
|
|
67
67
|
}
|
|
68
|
-
const uncontacted = (0, getClosestNodes_1.getClosestNodes)(this.
|
|
69
|
-
maxCount: this.
|
|
70
|
-
excludedNodeIds: this.
|
|
68
|
+
const uncontacted = (0, getClosestNodes_1.getClosestNodes)(this.options.targetId, Array.from(this.options.peerManager.getNearbyContacts().getAllContactsInUndefinedOrder(), (c) => c.getPeerDescriptor()), {
|
|
69
|
+
maxCount: this.options.parallelism,
|
|
70
|
+
excludedNodeIds: this.options.contactedPeers
|
|
71
71
|
});
|
|
72
|
-
if ((uncontacted.length === 0 && this.ongoingRequests.size === 0) || (this.noProgressCounter >= this.
|
|
72
|
+
if ((uncontacted.length === 0 && this.ongoingRequests.size === 0) || (this.noProgressCounter >= this.options.noProgressLimit)) {
|
|
73
73
|
this.doneGate.open();
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
76
|
for (const node of uncontacted) {
|
|
77
|
-
if (this.ongoingRequests.size >= this.
|
|
77
|
+
if (this.ongoingRequests.size >= this.options.parallelism) {
|
|
78
78
|
break;
|
|
79
79
|
}
|
|
80
80
|
const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(node);
|
|
@@ -89,13 +89,13 @@ class DiscoverySession {
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
async findClosestNodes(timeout) {
|
|
92
|
-
if (this.
|
|
92
|
+
if (this.options.peerManager.getNearbyContactCount(this.options.contactedPeers) === 0) {
|
|
93
93
|
return;
|
|
94
94
|
}
|
|
95
95
|
setImmediate(() => {
|
|
96
96
|
this.findMoreContacts();
|
|
97
97
|
});
|
|
98
|
-
await (0, utils_1.withTimeout)(this.doneGate.waitUntilOpen(), timeout, 'discovery session timed out', this.
|
|
98
|
+
await (0, utils_1.withTimeout)(this.doneGate.waitUntilOpen(), timeout, 'discovery session timed out', this.options.abortSignal);
|
|
99
99
|
}
|
|
100
100
|
}
|
|
101
101
|
exports.DiscoverySession = DiscoverySession;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/DiscoverySession.ts"],"names":[],"mappings":";;;AAAA,0CAA0D;AAC1D,+BAAyB;AACzB,mDAAiG;AAGjG,gDAAyD;AACzD,gEAA4D;AAE5D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAajC,MAAa,gBAAgB;IAET,EAAE,GAAG,IAAA,SAAE,GAAE,CAAA;IACjB,iBAAiB,GAAG,CAAC,CAAA;IACrB,eAAe,GAAoB,IAAI,GAAG,EAAE,CAAA;IAC5C,QAAQ,GAAG,IAAI,YAAI,CAAC,KAAK,CAAC,CAAA;IACjB,
|
|
1
|
+
{"version":3,"file":"DiscoverySession.js","sourceRoot":"","sources":["../../../../src/dht/discovery/DiscoverySession.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
|
5
5
|
import { ServiceID } from '../../types/ServiceID';
|
|
6
6
|
import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
|
|
7
7
|
import { PeerManager } from '../PeerManager';
|
|
8
|
-
interface
|
|
8
|
+
interface PeerDiscoveryOptions {
|
|
9
9
|
localPeerDescriptor: PeerDescriptor;
|
|
10
10
|
joinNoProgressLimit: number;
|
|
11
11
|
serviceId: ServiceID;
|
|
@@ -23,8 +23,8 @@ export declare class PeerDiscovery {
|
|
|
23
23
|
private rejoinOngoing;
|
|
24
24
|
private joinCalled;
|
|
25
25
|
private recoveryIntervalStarted;
|
|
26
|
-
private readonly
|
|
27
|
-
constructor(
|
|
26
|
+
private readonly options;
|
|
27
|
+
constructor(options: PeerDiscoveryOptions);
|
|
28
28
|
joinDht(entryPoints: PeerDescriptor[], doAdditionalDistantPeerDiscovery?: boolean, retry?: boolean): Promise<void>;
|
|
29
29
|
private joinThroughEntryPoint;
|
|
30
30
|
joinRing(): Promise<void>;
|