@streamr/dht 100.0.0-testnet-one.4 → 100.0.0-testnet-two.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/src/connection/ConnectionLockHandler.d.ts +11 -11
- package/dist/src/connection/ConnectionLockHandler.js.map +1 -1
- package/dist/src/connection/ConnectionLockRpcLocal.d.ts +3 -3
- package/dist/src/connection/ConnectionLockRpcLocal.js +4 -4
- package/dist/src/connection/ConnectionLockRpcLocal.js.map +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.d.ts +3 -5
- package/dist/src/connection/ConnectionLockRpcRemote.js +4 -7
- package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -1
- package/dist/src/connection/ConnectionManager.d.ts +4 -6
- package/dist/src/connection/ConnectionManager.js +48 -46
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectorFacade.d.ts +2 -2
- package/dist/src/connection/ConnectorFacade.js +2 -1
- package/dist/src/connection/ConnectorFacade.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +3 -6
- package/dist/src/connection/ManagedConnection.js +6 -10
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/connectivityChecker.js +1 -0
- package/dist/src/connection/connectivityChecker.js.map +1 -1
- package/dist/src/connection/simulator/Simulator.d.ts +0 -3
- package/dist/src/connection/simulator/Simulator.js +3 -51
- package/dist/src/connection/simulator/Simulator.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorConnector.js +5 -5
- package/dist/src/connection/simulator/SimulatorConnector.js.map +1 -1
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js +2 -2
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnector.d.ts +0 -1
- package/dist/src/connection/webrtc/WebrtcConnector.js +7 -9
- package/dist/src/connection/webrtc/WebrtcConnector.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts +2 -2
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js +11 -12
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnectorRpcRemote.d.ts +2 -5
- package/dist/src/connection/webrtc/WebrtcConnectorRpcRemote.js +1 -4
- package/dist/src/connection/webrtc/WebrtcConnectorRpcRemote.js.map +1 -1
- package/dist/src/connection/websocket/AutoCertifierClientFacade.d.ts +1 -2
- package/dist/src/connection/websocket/AutoCertifierClientFacade.js +3 -4
- package/dist/src/connection/websocket/AutoCertifierClientFacade.js.map +1 -1
- package/dist/src/connection/websocket/ClientWebsocket.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketConnector.d.ts +2 -7
- package/dist/src/connection/websocket/WebsocketConnector.js +32 -38
- package/dist/src/connection/websocket/WebsocketConnector.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.d.ts +3 -2
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js +8 -10
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.d.ts +3 -6
- package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js +0 -3
- package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketServer.d.ts +1 -4
- package/dist/src/connection/websocket/WebsocketServer.js +11 -12
- package/dist/src/connection/websocket/WebsocketServer.js.map +1 -1
- package/dist/src/dht/DhtNode.d.ts +10 -13
- package/dist/src/dht/DhtNode.js +39 -52
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcLocal.d.ts +0 -1
- package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcRemote.d.ts +7 -7
- package/dist/src/dht/DhtNodeRpcRemote.js +8 -7
- package/dist/src/dht/DhtNodeRpcRemote.js.map +1 -1
- package/dist/src/dht/ExternalApiRpcLocal.d.ts +5 -4
- package/dist/src/dht/ExternalApiRpcLocal.js +3 -2
- package/dist/src/dht/ExternalApiRpcLocal.js.map +1 -1
- package/dist/src/dht/ExternalApiRpcRemote.d.ts +2 -2
- package/dist/src/dht/ExternalApiRpcRemote.js +2 -0
- package/dist/src/dht/ExternalApiRpcRemote.js.map +1 -1
- package/dist/src/dht/PeerManager.d.ts +13 -14
- package/dist/src/dht/PeerManager.js +45 -60
- package/dist/src/dht/PeerManager.js.map +1 -1
- package/dist/src/dht/contact/Contact.d.ts +2 -2
- package/dist/src/dht/contact/Contact.js +2 -2
- package/dist/src/dht/contact/Contact.js.map +1 -1
- package/dist/src/dht/contact/ContactList.d.ts +7 -7
- package/dist/src/dht/contact/ContactList.js +3 -3
- package/dist/src/dht/contact/ContactList.js.map +1 -1
- package/dist/src/dht/contact/RandomContactList.d.ts +4 -4
- package/dist/src/dht/contact/RandomContactList.js +12 -11
- package/dist/src/dht/contact/RandomContactList.js.map +1 -1
- package/dist/src/dht/contact/RpcRemote.d.ts +7 -4
- package/dist/src/dht/contact/RpcRemote.js +5 -2
- package/dist/src/dht/contact/RpcRemote.js.map +1 -1
- package/dist/src/dht/contact/SortedContactList.d.ts +13 -13
- package/dist/src/dht/contact/SortedContactList.js +33 -29
- package/dist/src/dht/contact/SortedContactList.js.map +1 -1
- package/dist/src/dht/discovery/DiscoverySession.d.ts +2 -4
- package/dist/src/dht/discovery/DiscoverySession.js +19 -20
- package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.d.ts +2 -5
- package/dist/src/dht/discovery/PeerDiscovery.js +12 -20
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.d.ts +36 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js +165 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map +1 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.d.ts +14 -0
- package/dist/src/dht/{find/FindRpcLocal.js → recursive-operation/RecursiveOperationRpcLocal.js} +7 -7
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.js.map +1 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcRemote.d.ts +6 -0
- package/dist/src/dht/{routing/FindRpcRemote.js → recursive-operation/RecursiveOperationRpcRemote.js} +11 -11
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcRemote.js.map +1 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.d.ts +42 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js +182 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js.map +1 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.d.ts +12 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js +17 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js.map +1 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.d.ts +6 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.js +21 -0
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.js.map +1 -0
- package/dist/src/dht/routing/Router.d.ts +4 -19
- package/dist/src/dht/routing/Router.js +41 -33
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcLocal.js +6 -5
- package/dist/src/dht/routing/RouterRpcLocal.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcRemote.d.ts +2 -2
- package/dist/src/dht/routing/RouterRpcRemote.js +7 -7
- package/dist/src/dht/routing/RouterRpcRemote.js.map +1 -1
- package/dist/src/dht/routing/RoutingSession.d.ts +20 -16
- package/dist/src/dht/routing/RoutingSession.js +37 -45
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/dist/src/dht/store/LocalDataStore.d.ts +11 -13
- package/dist/src/dht/store/LocalDataStore.js +36 -56
- package/dist/src/dht/store/LocalDataStore.js.map +1 -1
- package/dist/src/dht/store/StoreManager.d.ts +33 -0
- package/dist/src/dht/store/StoreManager.js +186 -0
- package/dist/src/dht/store/StoreManager.js.map +1 -0
- package/dist/src/dht/store/StoreRpcLocal.d.ts +8 -40
- package/dist/src/dht/store/StoreRpcLocal.js +13 -229
- package/dist/src/dht/store/StoreRpcLocal.js.map +1 -1
- package/dist/src/dht/store/StoreRpcRemote.d.ts +5 -5
- package/dist/src/dht/store/StoreRpcRemote.js +4 -5
- package/dist/src/dht/store/StoreRpcRemote.js.map +1 -1
- package/dist/src/exports.d.ts +2 -0
- package/dist/src/exports.js.map +1 -1
- package/dist/src/helpers/MapWithTtl.d.ts +14 -0
- package/dist/src/helpers/MapWithTtl.js +59 -0
- package/dist/src/helpers/MapWithTtl.js.map +1 -0
- package/dist/src/helpers/PeerID.d.ts +2 -0
- package/dist/src/helpers/PeerID.js +4 -0
- package/dist/src/helpers/PeerID.js.map +1 -1
- package/dist/src/helpers/nodeId.d.ts +5 -0
- package/dist/src/helpers/nodeId.js +18 -1
- package/dist/src/helpers/nodeId.js.map +1 -1
- package/dist/src/helpers/peerIdFromPeerDescriptor.d.ts +2 -1
- package/dist/src/helpers/peerIdFromPeerDescriptor.js +2 -1
- package/dist/src/helpers/peerIdFromPeerDescriptor.js.map +1 -1
- package/dist/src/helpers/protoClasses.js +2 -3
- package/dist/src/helpers/protoClasses.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +21 -22
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +18 -18
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +36 -60
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +34 -53
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +11 -12
- package/dist/src/rpc-protocol/DhtCallContext.d.ts +2 -1
- package/dist/src/rpc-protocol/DhtCallContext.js.map +1 -1
- package/dist/src/rpc-protocol/DhtRpcOptions.d.ts +2 -1
- package/dist/src/transport/ITransport.d.ts +9 -1
- package/dist/src/transport/ITransport.js +5 -0
- package/dist/src/transport/ITransport.js.map +1 -1
- package/dist/src/transport/ListeningRpcCommunicator.js +1 -1
- package/dist/src/transport/ListeningRpcCommunicator.js.map +1 -1
- package/dist/src/transport/RoutingRpcCommunicator.d.ts +2 -1
- package/dist/src/transport/RoutingRpcCommunicator.js +16 -11
- package/dist/src/transport/RoutingRpcCommunicator.js.map +1 -1
- package/jest.config.js +4 -1
- package/karma-setup.js +2 -0
- package/karma.config.js +11 -7
- package/package.json +6 -7
- package/protos/DhtRpc.proto +17 -23
- package/src/connection/ConnectionLockHandler.ts +15 -15
- package/src/connection/ConnectionLockRpcLocal.ts +8 -9
- package/src/connection/ConnectionLockRpcRemote.ts +7 -16
- package/src/connection/ConnectionManager.ts +58 -55
- package/src/connection/ConnectorFacade.ts +3 -0
- package/src/connection/ManagedConnection.ts +12 -30
- package/src/connection/connectivityChecker.ts +1 -0
- package/src/connection/simulator/Simulator.ts +5 -36
- package/src/connection/simulator/SimulatorConnector.ts +8 -8
- package/src/connection/webrtc/BrowserWebrtcConnection.ts +0 -3
- package/src/connection/webrtc/NodeWebrtcConnection.ts +3 -4
- package/src/connection/webrtc/WebrtcConnector.ts +11 -13
- package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +16 -16
- package/src/connection/webrtc/WebrtcConnectorRpcRemote.ts +3 -13
- package/src/connection/websocket/AutoCertifierClientFacade.ts +4 -6
- package/src/connection/websocket/ClientWebsocket.ts +1 -0
- package/src/connection/websocket/WebsocketConnector.ts +43 -56
- package/src/connection/websocket/WebsocketConnectorRpcLocal.ts +11 -13
- package/src/connection/websocket/WebsocketConnectorRpcRemote.ts +4 -15
- package/src/connection/websocket/WebsocketServer.ts +14 -17
- package/src/dht/DhtNode.ts +67 -69
- package/src/dht/DhtNodeRpcLocal.ts +0 -1
- package/src/dht/DhtNodeRpcRemote.ts +13 -13
- package/src/dht/ExternalApiRpcLocal.ts +16 -6
- package/src/dht/ExternalApiRpcRemote.ts +5 -3
- package/src/dht/PeerManager.ts +73 -90
- package/src/dht/contact/Contact.ts +5 -4
- package/src/dht/contact/ContactList.ts +9 -9
- package/src/dht/contact/RandomContactList.ts +14 -14
- package/src/dht/contact/RpcRemote.ts +10 -7
- package/src/dht/contact/SortedContactList.ts +48 -45
- package/src/dht/discovery/DiscoverySession.ts +25 -25
- package/src/dht/discovery/PeerDiscovery.ts +16 -37
- package/src/dht/recursive-operation/RecursiveOperationManager.ts +240 -0
- package/src/dht/{find/FindRpcLocal.ts → recursive-operation/RecursiveOperationRpcLocal.ts} +9 -9
- package/src/dht/{routing/FindRpcRemote.ts → recursive-operation/RecursiveOperationRpcRemote.ts} +10 -10
- package/src/dht/recursive-operation/RecursiveOperationSession.ts +224 -0
- package/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts +25 -0
- package/src/dht/{find/FindSessionRpcRemote.ts → recursive-operation/RecursiveOperationSessionRpcRemote.ts} +8 -8
- package/src/dht/routing/Router.ts +45 -64
- package/src/dht/routing/RouterRpcLocal.ts +7 -6
- package/src/dht/routing/RouterRpcRemote.ts +9 -10
- package/src/dht/routing/RoutingSession.ts +59 -68
- package/src/dht/store/LocalDataStore.ts +47 -66
- package/src/dht/store/StoreManager.ts +217 -0
- package/src/dht/store/StoreRpcLocal.ts +26 -302
- package/src/dht/store/StoreRpcRemote.ts +9 -11
- package/src/exports.ts +2 -0
- package/src/helpers/MapWithTtl.ts +71 -0
- package/src/helpers/PeerID.ts +5 -0
- package/src/helpers/nodeId.ts +20 -0
- package/src/helpers/peerIdFromPeerDescriptor.ts +5 -3
- package/src/helpers/protoClasses.ts +4 -6
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +31 -32
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +11 -12
- package/src/proto/packages/dht/protos/DhtRpc.ts +49 -80
- package/src/rpc-protocol/DhtCallContext.ts +2 -1
- package/src/rpc-protocol/DhtRpcOptions.ts +2 -1
- package/src/transport/ITransport.ts +10 -1
- package/src/transport/ListeningRpcCommunicator.ts +1 -1
- package/src/transport/RoutingRpcCommunicator.ts +18 -12
- package/test/benchmark/Find.test.ts +8 -21
- package/test/benchmark/KademliaCorrectness.test.ts +11 -20
- package/test/benchmark/SortedContactListBenchmark.test.ts +9 -9
- package/test/benchmark/kademlia-simulation/Contact.ts +9 -8
- package/test/benchmark/kademlia-simulation/KademliaSimulation.ts +2 -2
- package/test/benchmark/kademlia-simulation/SimulationNode.ts +17 -17
- package/test/end-to-end/Layer0-Layer1.test.ts +10 -14
- package/test/end-to-end/Layer0.test.ts +15 -18
- package/test/end-to-end/Layer0MixedConnectionTypes.test.ts +7 -9
- package/test/end-to-end/Layer0Webrtc-Layer1.test.ts +4 -10
- package/test/end-to-end/Layer0Webrtc.test.ts +5 -6
- package/test/end-to-end/Layer1-Scale-WebSocket.test.ts +8 -16
- package/test/end-to-end/Layer1-Scale-Webrtc.test.ts +6 -13
- package/test/end-to-end/WebsocketConnectionRequest.test.ts +5 -6
- package/test/end-to-end/memory-leak.test.ts +6 -8
- package/test/integration/ConnectionLocking.test.ts +6 -13
- package/test/integration/ConnectionManager.test.ts +26 -43
- package/test/integration/DhtJoinPeerDiscovery.test.ts +5 -10
- package/test/integration/DhtNodeExternalAPI.test.ts +16 -22
- package/test/integration/DhtNodeRpcRemote.test.ts +13 -22
- package/test/integration/DhtRpc.test.ts +13 -18
- package/test/integration/Find.test.ts +10 -10
- package/test/integration/Layer1-scale.test.ts +17 -28
- package/test/integration/Mock-Layer1-Layer0.test.ts +25 -43
- package/test/integration/MultipleEntryPointJoining.test.ts +7 -7
- package/test/integration/ReplicateData.test.ts +28 -30
- package/test/integration/RouteMessage.test.ts +30 -27
- package/test/integration/RouterRpcRemote.test.ts +12 -18
- package/test/integration/RpcErrors.test.ts +8 -21
- package/test/integration/ScaleDownDht.test.ts +11 -10
- package/test/integration/SimultaneousConnections.test.ts +43 -67
- package/test/integration/Store.test.ts +23 -36
- package/test/integration/StoreAndDelete.test.ts +30 -50
- package/test/integration/StoreOnDhtWithTwoNodes.test.ts +16 -37
- package/test/integration/StoreRpcRemote.test.ts +20 -30
- package/test/integration/WebrtcConnectionManagement.test.ts +3 -13
- package/test/integration/WebrtcConnectorRpc.test.ts +3 -9
- package/test/integration/WebsocketConnectionManagement.test.ts +7 -10
- package/test/integration/WebsocketConnectorRpc.test.ts +8 -17
- package/test/unit/ConnectivityHelpers.test.ts +9 -17
- package/test/unit/DuplicateDetector.test.ts +7 -4
- package/test/unit/LocalDataStore.test.ts +66 -77
- package/test/unit/PeerManager.test.ts +31 -0
- package/test/unit/RandomContactList.test.ts +13 -8
- package/test/unit/{Finder.test.ts → RecursiveOperationManager.test.ts} +38 -43
- package/test/unit/RecursiveOperationSession.test.ts +68 -0
- package/test/unit/Router.test.ts +15 -22
- package/test/unit/RoutingSession.test.ts +23 -25
- package/test/unit/SortedContactList.test.ts +41 -26
- package/test/unit/StoreManager.test.ts +132 -0
- package/test/unit/WebsocketConnector.test.ts +27 -35
- package/test/unit/customMatchers.test.ts +16 -0
- package/test/utils/FakeTransport.ts +44 -0
- package/test/utils/customMatchers.ts +70 -0
- package/test/utils/mock/MockRpcCommunicator.ts +7 -0
- package/test/utils/mock/Router.ts +3 -2
- package/test/utils/mock/mockDataEntry.ts +36 -0
- package/test/utils/utils.ts +49 -87
- package/dist/src/dht/find/FindRpcLocal.d.ts +0 -14
- package/dist/src/dht/find/FindRpcLocal.js.map +0 -1
- package/dist/src/dht/find/FindSession.d.ts +0 -44
- package/dist/src/dht/find/FindSession.js +0 -150
- package/dist/src/dht/find/FindSession.js.map +0 -1
- package/dist/src/dht/find/FindSessionRpcLocal.d.ts +0 -12
- package/dist/src/dht/find/FindSessionRpcLocal.js +0 -17
- package/dist/src/dht/find/FindSessionRpcLocal.js.map +0 -1
- package/dist/src/dht/find/FindSessionRpcRemote.d.ts +0 -6
- package/dist/src/dht/find/FindSessionRpcRemote.js +0 -21
- package/dist/src/dht/find/FindSessionRpcRemote.js.map +0 -1
- package/dist/src/dht/find/Finder.d.ts +0 -49
- package/dist/src/dht/find/Finder.js +0 -197
- package/dist/src/dht/find/Finder.js.map +0 -1
- package/dist/src/dht/routing/FindRpcRemote.d.ts +0 -6
- package/dist/src/dht/routing/FindRpcRemote.js.map +0 -1
- package/src/dht/find/FindSession.ts +0 -183
- package/src/dht/find/FindSessionRpcLocal.ts +0 -25
- package/src/dht/find/Finder.ts +0 -295
|
@@ -5,72 +5,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.RoutingSession = exports.RoutingMode = void 0;
|
|
7
7
|
const SortedContactList_1 = require("../contact/SortedContactList");
|
|
8
|
-
const PeerID_1 = require("../../helpers/PeerID");
|
|
9
8
|
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
10
9
|
const utils_1 = require("@streamr/utils");
|
|
11
10
|
const eventemitter3_1 = __importDefault(require("eventemitter3"));
|
|
12
11
|
const uuid_1 = require("uuid");
|
|
13
12
|
const RouterRpcRemote_1 = require("./RouterRpcRemote");
|
|
14
13
|
const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
|
|
15
|
-
const proto_rpc_1 = require("@streamr/proto-rpc");
|
|
16
14
|
const Contact_1 = require("../contact/Contact");
|
|
17
|
-
const
|
|
15
|
+
const RecursiveOperationRpcRemote_1 = require("../recursive-operation/RecursiveOperationRpcRemote");
|
|
18
16
|
const RpcRemote_1 = require("../contact/RpcRemote");
|
|
19
17
|
const getPreviousPeer_1 = require("./getPreviousPeer");
|
|
18
|
+
const nodeId_1 = require("../../helpers/nodeId");
|
|
20
19
|
const logger = new utils_1.Logger(module);
|
|
21
20
|
const MAX_FAILED_HOPS = 2;
|
|
22
21
|
class RemoteContact extends Contact_1.Contact {
|
|
23
22
|
constructor(peer, localPeerDescriptor, rpcCommunicator) {
|
|
24
23
|
super(peer.getPeerDescriptor());
|
|
25
|
-
this.routerRpcRemote = new RouterRpcRemote_1.RouterRpcRemote(localPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(),
|
|
26
|
-
this.
|
|
24
|
+
this.routerRpcRemote = new RouterRpcRemote_1.RouterRpcRemote(localPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), rpcCommunicator, DhtRpc_client_1.RouterRpcClient, RpcRemote_1.EXISTING_CONNECTION_TIMEOUT);
|
|
25
|
+
this.recursiveOperationRpcRemote = new RecursiveOperationRpcRemote_1.RecursiveOperationRpcRemote(localPeerDescriptor, peer.getPeerDescriptor(), peer.getServiceId(), rpcCommunicator, DhtRpc_client_1.RecursiveOperationRpcClient, RpcRemote_1.EXISTING_CONNECTION_TIMEOUT);
|
|
27
26
|
}
|
|
28
27
|
getRouterRpcRemote() {
|
|
29
28
|
return this.routerRpcRemote;
|
|
30
29
|
}
|
|
31
|
-
|
|
32
|
-
return this.
|
|
30
|
+
getRecursiveOperationRpcRemote() {
|
|
31
|
+
return this.recursiveOperationRpcRemote;
|
|
33
32
|
}
|
|
34
33
|
}
|
|
35
34
|
var RoutingMode;
|
|
36
35
|
(function (RoutingMode) {
|
|
37
36
|
RoutingMode[RoutingMode["ROUTE"] = 0] = "ROUTE";
|
|
38
37
|
RoutingMode[RoutingMode["FORWARD"] = 1] = "FORWARD";
|
|
39
|
-
RoutingMode[RoutingMode["
|
|
38
|
+
RoutingMode[RoutingMode["RECURSIVE"] = 2] = "RECURSIVE";
|
|
40
39
|
})(RoutingMode || (exports.RoutingMode = RoutingMode = {}));
|
|
41
40
|
class RoutingSession extends eventemitter3_1.default {
|
|
42
|
-
constructor(
|
|
41
|
+
constructor(config) {
|
|
43
42
|
super();
|
|
44
43
|
this.sessionId = (0, uuid_1.v4)();
|
|
45
44
|
this.ongoingRequests = new Set();
|
|
46
45
|
this.failedHopCounter = 0;
|
|
47
46
|
this.successfulHopCounter = 0;
|
|
48
|
-
this.mode = RoutingMode.ROUTE;
|
|
49
47
|
this.stopped = false;
|
|
50
|
-
this.
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
this.connections = connections;
|
|
54
|
-
this.parallelism = parallelism;
|
|
55
|
-
this.mode = mode;
|
|
56
|
-
const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(messageToRoute);
|
|
57
|
-
const previousId = previousPeer ? PeerID_1.PeerID.fromValue(previousPeer.nodeId) : undefined;
|
|
48
|
+
this.config = config;
|
|
49
|
+
const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(config.routedMessage);
|
|
50
|
+
const previousId = previousPeer ? (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(previousPeer) : undefined;
|
|
58
51
|
this.contactList = new SortedContactList_1.SortedContactList({
|
|
59
|
-
referenceId:
|
|
52
|
+
referenceId: (0, nodeId_1.getNodeIdFromBinary)(config.routedMessage.target),
|
|
60
53
|
maxSize: 10000,
|
|
61
54
|
allowToContainReferenceId: true,
|
|
62
|
-
|
|
63
|
-
|
|
55
|
+
nodeIdDistanceLimit: previousId,
|
|
56
|
+
excludedNodeIds: config.excludedNodeIds,
|
|
64
57
|
emitEvents: false
|
|
65
58
|
});
|
|
66
59
|
}
|
|
67
|
-
onRequestFailed(
|
|
60
|
+
onRequestFailed(nodeId) {
|
|
68
61
|
logger.trace('onRequestFailed() sessionId: ' + this.sessionId);
|
|
69
62
|
if (this.stopped) {
|
|
70
63
|
return;
|
|
71
64
|
}
|
|
72
|
-
if (this.ongoingRequests.has(
|
|
73
|
-
this.ongoingRequests.delete(
|
|
65
|
+
if (this.ongoingRequests.has(nodeId)) {
|
|
66
|
+
this.ongoingRequests.delete(nodeId);
|
|
74
67
|
}
|
|
75
68
|
const contacts = this.updateAndGetRoutablePeers();
|
|
76
69
|
if (contacts.length === 0 && this.ongoingRequests.size === 0) {
|
|
@@ -87,10 +80,10 @@ class RoutingSession extends eventemitter3_1.default {
|
|
|
87
80
|
}
|
|
88
81
|
emitFailure() {
|
|
89
82
|
if (this.successfulHopCounter >= 1) {
|
|
90
|
-
this.emit('partialSuccess'
|
|
83
|
+
this.emit('partialSuccess');
|
|
91
84
|
}
|
|
92
85
|
else {
|
|
93
|
-
this.emit('routingFailed'
|
|
86
|
+
this.emit('routingFailed');
|
|
94
87
|
}
|
|
95
88
|
}
|
|
96
89
|
onRequestSucceeded() {
|
|
@@ -100,10 +93,10 @@ class RoutingSession extends eventemitter3_1.default {
|
|
|
100
93
|
}
|
|
101
94
|
this.successfulHopCounter += 1;
|
|
102
95
|
const contacts = this.updateAndGetRoutablePeers();
|
|
103
|
-
if (this.successfulHopCounter >= this.parallelism || contacts.length === 0) {
|
|
96
|
+
if (this.successfulHopCounter >= this.config.parallelism || contacts.length === 0) {
|
|
104
97
|
// TODO should call this.stop() so that we do cleanup? (after the routingSucceeded call)
|
|
105
98
|
this.stopped = true;
|
|
106
|
-
this.emit('routingSucceeded'
|
|
99
|
+
this.emit('routingSucceeded');
|
|
107
100
|
}
|
|
108
101
|
else if (contacts.length > 0 && this.ongoingRequests.size === 0) {
|
|
109
102
|
this.sendMoreRequests(contacts);
|
|
@@ -114,14 +107,14 @@ class RoutingSession extends eventemitter3_1.default {
|
|
|
114
107
|
return false;
|
|
115
108
|
}
|
|
116
109
|
const msg = {
|
|
117
|
-
...this.
|
|
118
|
-
routingPath: this.
|
|
110
|
+
...this.config.routedMessage,
|
|
111
|
+
routingPath: this.config.routedMessage.routingPath.concat([this.config.localPeerDescriptor])
|
|
119
112
|
};
|
|
120
|
-
if (this.mode === RoutingMode.FORWARD) {
|
|
113
|
+
if (this.config.mode === RoutingMode.FORWARD) {
|
|
121
114
|
return contact.getRouterRpcRemote().forwardMessage(msg);
|
|
122
115
|
}
|
|
123
|
-
else if (this.mode === RoutingMode.
|
|
124
|
-
return contact.
|
|
116
|
+
else if (this.config.mode === RoutingMode.RECURSIVE) {
|
|
117
|
+
return contact.getRecursiveOperationRpcRemote().routeRequest(msg);
|
|
125
118
|
}
|
|
126
119
|
else {
|
|
127
120
|
return contact.getRouterRpcRemote().routeMessage(msg);
|
|
@@ -130,16 +123,15 @@ class RoutingSession extends eventemitter3_1.default {
|
|
|
130
123
|
updateAndGetRoutablePeers() {
|
|
131
124
|
logger.trace('getRoutablePeers() sessionId: ' + this.sessionId);
|
|
132
125
|
// Remove stale contacts that may have been removed from connections
|
|
133
|
-
this.contactList.
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
this.contactList.removeContact(peerId);
|
|
126
|
+
this.contactList.getContactIds().forEach((nodeId) => {
|
|
127
|
+
if (!this.config.connections.has(nodeId)) {
|
|
128
|
+
this.contactList.removeContact(nodeId);
|
|
137
129
|
}
|
|
138
130
|
});
|
|
139
|
-
const contacts = Array.from(this.connections.values())
|
|
140
|
-
.map((peer) => new RemoteContact(peer, this.localPeerDescriptor, this.rpcCommunicator));
|
|
131
|
+
const contacts = Array.from(this.config.connections.values())
|
|
132
|
+
.map((peer) => new RemoteContact(peer, this.config.localPeerDescriptor, this.config.rpcCommunicator));
|
|
141
133
|
this.contactList.addContacts(contacts);
|
|
142
|
-
return this.contactList.getUncontactedContacts(this.parallelism);
|
|
134
|
+
return this.contactList.getUncontactedContacts(this.config.parallelism);
|
|
143
135
|
}
|
|
144
136
|
sendMoreRequests(uncontacted) {
|
|
145
137
|
logger.trace('sendMoreRequests() sessionId: ' + this.sessionId);
|
|
@@ -155,12 +147,12 @@ class RoutingSession extends eventemitter3_1.default {
|
|
|
155
147
|
this.emitFailure();
|
|
156
148
|
return;
|
|
157
149
|
}
|
|
158
|
-
while ((this.ongoingRequests.size < this.parallelism) && (uncontacted.length > 0) && !this.stopped) {
|
|
150
|
+
while ((this.ongoingRequests.size < this.config.parallelism) && (uncontacted.length > 0) && !this.stopped) {
|
|
159
151
|
const nextPeer = uncontacted.shift();
|
|
160
152
|
// eslint-disable-next-line max-len
|
|
161
153
|
logger.trace(`Sending routeMessage request to contact: ${(0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(nextPeer.getPeerDescriptor())} (sessionId=${this.sessionId})`);
|
|
162
|
-
this.contactList.setContacted(nextPeer.
|
|
163
|
-
this.ongoingRequests.add(nextPeer.
|
|
154
|
+
this.contactList.setContacted(nextPeer.getNodeId());
|
|
155
|
+
this.ongoingRequests.add(nextPeer.getNodeId());
|
|
164
156
|
setImmediate(async () => {
|
|
165
157
|
try {
|
|
166
158
|
const succeeded = await this.sendRouteMessageRequest(nextPeer);
|
|
@@ -168,7 +160,7 @@ class RoutingSession extends eventemitter3_1.default {
|
|
|
168
160
|
this.onRequestSucceeded();
|
|
169
161
|
}
|
|
170
162
|
else {
|
|
171
|
-
this.onRequestFailed(nextPeer.
|
|
163
|
+
this.onRequestFailed(nextPeer.getNodeId());
|
|
172
164
|
}
|
|
173
165
|
}
|
|
174
166
|
catch (e) {
|
|
@@ -183,7 +175,7 @@ class RoutingSession extends eventemitter3_1.default {
|
|
|
183
175
|
stop() {
|
|
184
176
|
this.stopped = true;
|
|
185
177
|
this.contactList.stop();
|
|
186
|
-
this.emit('stopped'
|
|
178
|
+
this.emit('stopped');
|
|
187
179
|
this.removeAllListeners();
|
|
188
180
|
}
|
|
189
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RoutingSession.js","sourceRoot":"","sources":["../../../../src/dht/routing/RoutingSession.ts"],"names":[],"mappings":";;;;;;AACA,oEAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"RoutingSession.js","sourceRoot":"","sources":["../../../../src/dht/routing/RoutingSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,17 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
interface LocalDataEntry {
|
|
5
|
-
dataEntry: DataEntry;
|
|
6
|
-
ttlTimeout: NodeJS.Timeout;
|
|
7
|
-
}
|
|
1
|
+
import { DataEntry } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
|
+
import { NodeID } from '../../helpers/nodeId';
|
|
3
|
+
type Key = Uint8Array;
|
|
8
4
|
export declare class LocalDataStore {
|
|
5
|
+
private readonly maxTtl;
|
|
6
|
+
constructor(maxTtl: number);
|
|
9
7
|
private store;
|
|
10
8
|
storeEntry(dataEntry: DataEntry): boolean;
|
|
11
|
-
markAsDeleted(
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
setStale(key:
|
|
15
|
-
setAllEntriesAsStale(key:
|
|
16
|
-
deleteEntry(key:
|
|
9
|
+
markAsDeleted(key: Key, creator: NodeID): boolean;
|
|
10
|
+
values(): IterableIterator<DataEntry>;
|
|
11
|
+
getEntries(key: Key): Map<NodeID, DataEntry>;
|
|
12
|
+
setStale(key: Key, creator: NodeID, stale: boolean): void;
|
|
13
|
+
setAllEntriesAsStale(key: Key): void;
|
|
14
|
+
deleteEntry(key: Key, creator: NodeID): void;
|
|
17
15
|
clear(): void;
|
|
18
16
|
}
|
|
19
17
|
export {};
|
|
@@ -2,102 +2,82 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LocalDataStore = void 0;
|
|
4
4
|
const PeerID_1 = require("../../helpers/PeerID");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
const MAX_TTL = 300 * 1000;
|
|
8
|
-
const createTtlValue = (ttl) => {
|
|
9
|
-
if (ttl < MIN_TTL) {
|
|
10
|
-
return MIN_TTL;
|
|
11
|
-
}
|
|
12
|
-
else if (ttl > MAX_TTL) {
|
|
13
|
-
return MAX_TTL;
|
|
14
|
-
}
|
|
15
|
-
else {
|
|
16
|
-
return ttl;
|
|
17
|
-
}
|
|
18
|
-
};
|
|
5
|
+
const MapWithTtl_1 = require("../../helpers/MapWithTtl");
|
|
6
|
+
const nodeId_1 = require("../../helpers/nodeId");
|
|
19
7
|
class LocalDataStore {
|
|
20
|
-
constructor() {
|
|
8
|
+
constructor(maxTtl) {
|
|
21
9
|
// A map into which each node can store one value per data key
|
|
22
10
|
// The first key is the key of the data, the second key is the
|
|
23
|
-
//
|
|
11
|
+
// NodeID of the creator of the data
|
|
24
12
|
this.store = new Map();
|
|
13
|
+
this.maxTtl = maxTtl;
|
|
25
14
|
}
|
|
26
15
|
storeEntry(dataEntry) {
|
|
27
|
-
const publisherKey = PeerID_1.PeerID.fromValue(dataEntry.creator.nodeId).toKey();
|
|
28
16
|
const dataKey = PeerID_1.PeerID.fromValue(dataEntry.key).toKey();
|
|
17
|
+
const creatorNodeId = (0, nodeId_1.getNodeIdFromBinary)(dataEntry.creator);
|
|
29
18
|
if (!this.store.has(dataKey)) {
|
|
30
|
-
this.store.set(dataKey, new
|
|
19
|
+
this.store.set(dataKey, new MapWithTtl_1.MapWithTtl((e) => Math.min(e.ttl, this.maxTtl)));
|
|
31
20
|
}
|
|
32
|
-
if (this.store.get(dataKey).has(
|
|
21
|
+
if (this.store.get(dataKey).has(creatorNodeId)) {
|
|
33
22
|
const storedMillis = (dataEntry.createdAt.seconds * 1000) + (dataEntry.createdAt.nanos / 1000000);
|
|
34
|
-
const oldLocalEntry = this.store.get(dataKey).get(
|
|
35
|
-
const oldStoredMillis = (oldLocalEntry.
|
|
23
|
+
const oldLocalEntry = this.store.get(dataKey).get(creatorNodeId);
|
|
24
|
+
const oldStoredMillis = (oldLocalEntry.createdAt.seconds * 1000) + (oldLocalEntry.createdAt.nanos / 1000000);
|
|
36
25
|
// do nothing if old entry is newer than the one being replicated
|
|
37
26
|
if (oldStoredMillis >= storedMillis) {
|
|
38
27
|
return false;
|
|
39
28
|
}
|
|
40
|
-
else {
|
|
41
|
-
clearTimeout(oldLocalEntry.ttlTimeout);
|
|
42
|
-
}
|
|
43
29
|
}
|
|
44
|
-
this.store.get(dataKey).set(
|
|
45
|
-
dataEntry,
|
|
46
|
-
ttlTimeout: setTimeout(() => {
|
|
47
|
-
this.deleteEntry(PeerID_1.PeerID.fromValue(dataEntry.key), dataEntry.creator);
|
|
48
|
-
}, createTtlValue(dataEntry.ttl))
|
|
49
|
-
});
|
|
30
|
+
this.store.get(dataKey).set(creatorNodeId, dataEntry);
|
|
50
31
|
return true;
|
|
51
32
|
}
|
|
52
|
-
markAsDeleted(
|
|
53
|
-
const dataKey = PeerID_1.PeerID.fromValue(
|
|
33
|
+
markAsDeleted(key, creator) {
|
|
34
|
+
const dataKey = PeerID_1.PeerID.fromValue(key).toKey();
|
|
54
35
|
const item = this.store.get(dataKey);
|
|
55
|
-
if ((item === undefined) || !item.has(creator
|
|
36
|
+
if ((item === undefined) || !item.has(creator)) {
|
|
56
37
|
return false;
|
|
57
38
|
}
|
|
58
|
-
const storedEntry = item.get(creator
|
|
59
|
-
storedEntry.
|
|
39
|
+
const storedEntry = item.get(creator);
|
|
40
|
+
storedEntry.deleted = true;
|
|
60
41
|
return true;
|
|
61
42
|
}
|
|
62
|
-
|
|
63
|
-
|
|
43
|
+
*values() {
|
|
44
|
+
for (const v of this.store.values()) {
|
|
45
|
+
yield* v.values();
|
|
46
|
+
}
|
|
64
47
|
}
|
|
65
|
-
|
|
48
|
+
getEntries(key) {
|
|
66
49
|
const dataEntries = new Map;
|
|
67
|
-
|
|
68
|
-
|
|
50
|
+
const mapKey = PeerID_1.PeerID.fromValue(key).toKey();
|
|
51
|
+
this.store.get(mapKey)?.forEach((value, key) => {
|
|
52
|
+
dataEntries.set(key, value);
|
|
69
53
|
});
|
|
70
54
|
return dataEntries;
|
|
71
55
|
}
|
|
72
56
|
setStale(key, creator, stale) {
|
|
73
|
-
const
|
|
74
|
-
const storedEntry = this.store.get(
|
|
57
|
+
const mapKey = PeerID_1.PeerID.fromValue(key).toKey();
|
|
58
|
+
const storedEntry = this.store.get(mapKey)?.get(creator);
|
|
75
59
|
if (storedEntry) {
|
|
76
|
-
storedEntry.
|
|
60
|
+
storedEntry.stale = stale;
|
|
77
61
|
}
|
|
78
62
|
}
|
|
79
63
|
setAllEntriesAsStale(key) {
|
|
80
|
-
|
|
81
|
-
|
|
64
|
+
const mapKey = PeerID_1.PeerID.fromValue(key).toKey();
|
|
65
|
+
this.store.get(mapKey)?.forEach((value) => {
|
|
66
|
+
value.stale = true;
|
|
82
67
|
});
|
|
83
68
|
}
|
|
84
69
|
deleteEntry(key, creator) {
|
|
85
|
-
const
|
|
86
|
-
const storedEntry = this.store.get(
|
|
70
|
+
const mapKey = PeerID_1.PeerID.fromValue(key).toKey();
|
|
71
|
+
const storedEntry = this.store.get(mapKey)?.get(creator);
|
|
87
72
|
if (storedEntry) {
|
|
88
|
-
|
|
89
|
-
this.store.get(
|
|
90
|
-
|
|
91
|
-
this.store.delete(key.toKey());
|
|
73
|
+
this.store.get(mapKey)?.delete(creator);
|
|
74
|
+
if (this.store.get(mapKey)?.size() === 0) {
|
|
75
|
+
this.store.delete(mapKey);
|
|
92
76
|
}
|
|
93
77
|
}
|
|
94
78
|
}
|
|
95
79
|
clear() {
|
|
96
|
-
this.store.forEach((value) =>
|
|
97
|
-
value.forEach((value) => {
|
|
98
|
-
clearTimeout(value.ttlTimeout);
|
|
99
|
-
});
|
|
100
|
-
});
|
|
80
|
+
this.store.forEach((value) => value.clear());
|
|
101
81
|
this.store.clear();
|
|
102
82
|
}
|
|
103
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalDataStore.js","sourceRoot":"","sources":["../../../../src/dht/store/LocalDataStore.ts"],"names":[],"mappings":";;;AAAA,iDAAwD;AAExD,
|
|
1
|
+
{"version":3,"file":"LocalDataStore.js","sourceRoot":"","sources":["../../../../src/dht/store/LocalDataStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
|
+
import { Any } from '../../proto/google/protobuf/any';
|
|
3
|
+
import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
|
|
4
|
+
import { RecursiveOperationManager } from '../recursive-operation/RecursiveOperationManager';
|
|
5
|
+
import { LocalDataStore } from './LocalDataStore';
|
|
6
|
+
import { StoreRpcRemote } from './StoreRpcRemote';
|
|
7
|
+
import { ServiceID } from '../../types/ServiceID';
|
|
8
|
+
import { NodeID } from '../../helpers/nodeId';
|
|
9
|
+
interface StoreManagerConfig {
|
|
10
|
+
rpcCommunicator: RoutingRpcCommunicator;
|
|
11
|
+
recursiveOperationManager: RecursiveOperationManager;
|
|
12
|
+
localPeerDescriptor: PeerDescriptor;
|
|
13
|
+
localDataStore: LocalDataStore;
|
|
14
|
+
serviceId: ServiceID;
|
|
15
|
+
highestTtl: number;
|
|
16
|
+
redundancyFactor: number;
|
|
17
|
+
getClosestNeighborsTo: (id: Uint8Array, n?: number) => PeerDescriptor[];
|
|
18
|
+
createRpcRemote: (contact: PeerDescriptor) => StoreRpcRemote;
|
|
19
|
+
}
|
|
20
|
+
export declare class StoreManager {
|
|
21
|
+
private readonly config;
|
|
22
|
+
constructor(config: StoreManagerConfig);
|
|
23
|
+
private registerLocalRpcMethods;
|
|
24
|
+
onNewContact(peerDescriptor: PeerDescriptor): void;
|
|
25
|
+
private replicateAndUpdateStaleState;
|
|
26
|
+
private replicateDataToContact;
|
|
27
|
+
storeDataToDht(key: Uint8Array, data: Any, creator: NodeID): Promise<PeerDescriptor[]>;
|
|
28
|
+
private selfIsWithinRedundancyFactor;
|
|
29
|
+
private replicateDataToClosestNodes;
|
|
30
|
+
private replicateDataToNeighbors;
|
|
31
|
+
destroy(): Promise<void>;
|
|
32
|
+
}
|
|
33
|
+
export {};
|
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StoreManager = void 0;
|
|
4
|
+
const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
|
|
5
|
+
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
6
|
+
const utils_1 = require("@streamr/utils");
|
|
7
|
+
const timestamp_1 = require("../../proto/google/protobuf/timestamp");
|
|
8
|
+
const SortedContactList_1 = require("../contact/SortedContactList");
|
|
9
|
+
const Contact_1 = require("../contact/Contact");
|
|
10
|
+
const lodash_1 = require("lodash");
|
|
11
|
+
const nodeId_1 = require("../../helpers/nodeId");
|
|
12
|
+
const StoreRpcLocal_1 = require("./StoreRpcLocal");
|
|
13
|
+
const PeerManager_1 = require("../PeerManager");
|
|
14
|
+
const logger = new utils_1.Logger(module);
|
|
15
|
+
class StoreManager {
|
|
16
|
+
constructor(config) {
|
|
17
|
+
this.config = config;
|
|
18
|
+
this.registerLocalRpcMethods();
|
|
19
|
+
}
|
|
20
|
+
registerLocalRpcMethods() {
|
|
21
|
+
const rpcLocal = new StoreRpcLocal_1.StoreRpcLocal({
|
|
22
|
+
localDataStore: this.config.localDataStore,
|
|
23
|
+
replicateDataToNeighbors: (incomingPeer, dataEntry) => this.replicateDataToNeighbors(incomingPeer, dataEntry),
|
|
24
|
+
selfIsWithinRedundancyFactor: (key) => this.selfIsWithinRedundancyFactor(key)
|
|
25
|
+
});
|
|
26
|
+
this.config.rpcCommunicator.registerRpcMethod(DhtRpc_1.StoreDataRequest, DhtRpc_1.StoreDataResponse, 'storeData', (request) => rpcLocal.storeData(request));
|
|
27
|
+
this.config.rpcCommunicator.registerRpcNotification(DhtRpc_1.ReplicateDataRequest, 'replicateData', (request, context) => rpcLocal.replicateData(request, context));
|
|
28
|
+
}
|
|
29
|
+
onNewContact(peerDescriptor) {
|
|
30
|
+
for (const dataEntry of this.config.localDataStore.values()) {
|
|
31
|
+
this.replicateAndUpdateStaleState(dataEntry, peerDescriptor);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
replicateAndUpdateStaleState(dataEntry, newNode) {
|
|
35
|
+
const newNodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(newNode);
|
|
36
|
+
// TODO use config option or named constant?
|
|
37
|
+
const closestToData = this.config.getClosestNeighborsTo(dataEntry.key, 10);
|
|
38
|
+
const sortedList = new SortedContactList_1.SortedContactList({
|
|
39
|
+
referenceId: (0, nodeId_1.getNodeIdFromDataKey)(dataEntry.key),
|
|
40
|
+
maxSize: 20,
|
|
41
|
+
allowToContainReferenceId: true,
|
|
42
|
+
emitEvents: false
|
|
43
|
+
});
|
|
44
|
+
sortedList.addContact(new Contact_1.Contact(this.config.localPeerDescriptor));
|
|
45
|
+
closestToData.forEach((neighbor) => {
|
|
46
|
+
if (!(0, nodeId_1.areEqualNodeIds)(newNodeId, (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(neighbor))) {
|
|
47
|
+
sortedList.addContact(new Contact_1.Contact(neighbor));
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
const selfIsPrimaryStorer = (0, nodeId_1.areEqualNodeIds)(sortedList.getClosestContactId(), (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor));
|
|
51
|
+
if (selfIsPrimaryStorer) {
|
|
52
|
+
sortedList.addContact(new Contact_1.Contact(newNode));
|
|
53
|
+
const sorted = sortedList.getContactIds();
|
|
54
|
+
// findIndex should never return -1 here because we just added the new node to the list
|
|
55
|
+
const index = (0, lodash_1.findIndex)(sorted, (nodeId) => (0, nodeId_1.areEqualNodeIds)(nodeId, newNodeId));
|
|
56
|
+
// if new node is within the storageRedundancyFactor closest nodes to the data
|
|
57
|
+
// do replicate data to it
|
|
58
|
+
if (index < this.config.redundancyFactor) {
|
|
59
|
+
setImmediate(async () => {
|
|
60
|
+
await this.replicateDataToContact(dataEntry, newNode);
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
else if (!this.selfIsWithinRedundancyFactor(dataEntry.key)) {
|
|
65
|
+
this.config.localDataStore.setStale(dataEntry.key, (0, nodeId_1.getNodeIdFromBinary)(dataEntry.creator), true);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
async replicateDataToContact(dataEntry, contact) {
|
|
69
|
+
const rpcRemote = this.config.createRpcRemote(contact);
|
|
70
|
+
try {
|
|
71
|
+
await rpcRemote.replicateData({ entry: dataEntry });
|
|
72
|
+
}
|
|
73
|
+
catch (e) {
|
|
74
|
+
logger.trace('replicateData() threw an exception ' + e);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
async storeDataToDht(key, data, creator) {
|
|
78
|
+
logger.debug(`Storing data to DHT ${this.config.serviceId}`);
|
|
79
|
+
const result = await this.config.recursiveOperationManager.execute(key, DhtRpc_1.RecursiveOperation.FIND_NODE);
|
|
80
|
+
const closestNodes = result.closestNodes;
|
|
81
|
+
const successfulNodes = [];
|
|
82
|
+
const ttl = this.config.highestTtl; // ToDo: make TTL decrease according to some nice curve
|
|
83
|
+
const createdAt = timestamp_1.Timestamp.now();
|
|
84
|
+
for (let i = 0; i < closestNodes.length && successfulNodes.length < this.config.redundancyFactor; i++) {
|
|
85
|
+
if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.config.localPeerDescriptor, closestNodes[i])) {
|
|
86
|
+
this.config.localDataStore.storeEntry({
|
|
87
|
+
key,
|
|
88
|
+
data,
|
|
89
|
+
creator: (0, utils_1.hexToBinary)(creator),
|
|
90
|
+
createdAt,
|
|
91
|
+
storedAt: timestamp_1.Timestamp.now(),
|
|
92
|
+
ttl,
|
|
93
|
+
stale: false,
|
|
94
|
+
deleted: false,
|
|
95
|
+
});
|
|
96
|
+
successfulNodes.push(closestNodes[i]);
|
|
97
|
+
continue;
|
|
98
|
+
}
|
|
99
|
+
const rpcRemote = this.config.createRpcRemote(closestNodes[i]);
|
|
100
|
+
try {
|
|
101
|
+
await rpcRemote.storeData({
|
|
102
|
+
key,
|
|
103
|
+
data,
|
|
104
|
+
creator: (0, utils_1.hexToBinary)(creator),
|
|
105
|
+
createdAt,
|
|
106
|
+
ttl
|
|
107
|
+
});
|
|
108
|
+
successfulNodes.push(closestNodes[i]);
|
|
109
|
+
logger.trace('remote.storeData() success');
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
logger.trace('remote.storeData() threw an exception ' + e);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return successfulNodes;
|
|
116
|
+
}
|
|
117
|
+
selfIsWithinRedundancyFactor(dataKey) {
|
|
118
|
+
const closestNeighbors = this.config.getClosestNeighborsTo(dataKey, this.config.redundancyFactor);
|
|
119
|
+
if (closestNeighbors.length < this.config.redundancyFactor) {
|
|
120
|
+
return true;
|
|
121
|
+
}
|
|
122
|
+
else {
|
|
123
|
+
const localNodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
|
|
124
|
+
const furthestCloseNeighbor = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(closestNeighbors[closestNeighbors.length - 1]);
|
|
125
|
+
const dataId = (0, nodeId_1.getNodeIdFromDataKey)(dataKey);
|
|
126
|
+
return (0, PeerManager_1.getDistance)(dataId, localNodeId) < (0, PeerManager_1.getDistance)(dataId, furthestCloseNeighbor);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
async replicateDataToClosestNodes() {
|
|
130
|
+
const dataEntries = Array.from(this.config.localDataStore.values());
|
|
131
|
+
await Promise.all(dataEntries.map(async (dataEntry) => {
|
|
132
|
+
const neighbors = this.config.getClosestNeighborsTo(dataEntry.key, this.config.redundancyFactor);
|
|
133
|
+
await Promise.all(neighbors.map(async (neighbor) => {
|
|
134
|
+
const rpcRemote = this.config.createRpcRemote(neighbor);
|
|
135
|
+
try {
|
|
136
|
+
await rpcRemote.replicateData({ entry: dataEntry });
|
|
137
|
+
}
|
|
138
|
+
catch (err) {
|
|
139
|
+
logger.trace('Failed to replicate data in replicateDataToClosestNodes', { error: err });
|
|
140
|
+
}
|
|
141
|
+
}));
|
|
142
|
+
}));
|
|
143
|
+
}
|
|
144
|
+
replicateDataToNeighbors(incomingPeer, dataEntry) {
|
|
145
|
+
// sort own contact list according to data id
|
|
146
|
+
const localNodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor);
|
|
147
|
+
const incomingNodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(incomingPeer);
|
|
148
|
+
// TODO use config option or named constant?
|
|
149
|
+
const closestToData = this.config.getClosestNeighborsTo(dataEntry.key, 10);
|
|
150
|
+
const sortedList = new SortedContactList_1.SortedContactList({
|
|
151
|
+
referenceId: (0, nodeId_1.getNodeIdFromDataKey)(dataEntry.key),
|
|
152
|
+
maxSize: this.config.redundancyFactor,
|
|
153
|
+
allowToContainReferenceId: true,
|
|
154
|
+
emitEvents: false
|
|
155
|
+
});
|
|
156
|
+
sortedList.addContact(new Contact_1.Contact(this.config.localPeerDescriptor));
|
|
157
|
+
closestToData.forEach((neighbor) => {
|
|
158
|
+
sortedList.addContact(new Contact_1.Contact(neighbor));
|
|
159
|
+
});
|
|
160
|
+
const selfIsPrimaryStorer = (0, nodeId_1.areEqualNodeIds)(sortedList.getClosestContactId(), localNodeId);
|
|
161
|
+
const targets = selfIsPrimaryStorer
|
|
162
|
+
// if we are the closest to the data, replicate to all storageRedundancyFactor nearest
|
|
163
|
+
? sortedList.getAllContacts()
|
|
164
|
+
// if we are not the closest node to the data, replicate only to the closest one to the data
|
|
165
|
+
: [sortedList.getAllContacts()[0]];
|
|
166
|
+
targets.forEach((contact) => {
|
|
167
|
+
const contactNodeId = (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor());
|
|
168
|
+
if (!(0, nodeId_1.areEqualNodeIds)(incomingNodeId, contactNodeId) && !(0, nodeId_1.areEqualNodeIds)(localNodeId, contactNodeId)) {
|
|
169
|
+
setImmediate(() => {
|
|
170
|
+
(0, utils_1.executeSafePromise)(async () => {
|
|
171
|
+
await this.replicateDataToContact(dataEntry, contact.getPeerDescriptor());
|
|
172
|
+
logger.trace('replicateDataToContact() returned', {
|
|
173
|
+
node: (0, peerIdFromPeerDescriptor_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor()),
|
|
174
|
+
replicateOnlyToClosest: !selfIsPrimaryStorer
|
|
175
|
+
});
|
|
176
|
+
});
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
});
|
|
180
|
+
}
|
|
181
|
+
async destroy() {
|
|
182
|
+
await this.replicateDataToClosestNodes();
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
exports.StoreManager = StoreManager;
|
|
186
|
+
//# sourceMappingURL=StoreManager.js.map
|