@streamr/dht 100.0.0-testnet-one.4 → 100.0.0-testnet-two.1
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 +66 -0
- 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/Handshaker.d.ts +1 -1
- package/dist/src/connection/Handshaker.js +14 -5
- package/dist/src/connection/Handshaker.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +4 -7
- package/dist/src/connection/ManagedConnection.js +9 -13
- 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 +21 -14
- 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 +48 -44
- 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 +41 -54
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcLocal.d.ts +2 -3
- package/dist/src/dht/DhtNodeRpcLocal.js +1 -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 +9 -11
- 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 -23
- 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/helpers/versionCompatibility.d.ts +2 -0
- package/dist/src/helpers/versionCompatibility.js +18 -0
- package/dist/src/helpers/versionCompatibility.js.map +1 -0
- 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 +49 -65
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +43 -58
- 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 +20 -24
- 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/Handshaker.ts +21 -6
- package/src/connection/ManagedConnection.ts +20 -34
- 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 +25 -18
- 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 +57 -61
- 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 +69 -71
- package/src/dht/DhtNodeRpcLocal.ts +1 -3
- package/src/dht/DhtNodeRpcRemote.ts +14 -18
- 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 -27
- 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/helpers/versionCompatibility.ts +13 -0
- 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 +67 -90
- 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/unit/versionCompatibility.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/tsconfig.browser.json +2 -1
- package/tsconfig.jest.json +2 -1
- package/tsconfig.node.json +2 -1
- 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
package/tsconfig.jest.json
CHANGED
package/tsconfig.node.json
CHANGED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
|
-
import { IFindRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
|
|
3
|
-
interface FindRpcLocalConfig {
|
|
4
|
-
doRouteFindRequest: (routedMessage: RouteMessageWrapper) => RouteMessageAck;
|
|
5
|
-
addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
|
|
6
|
-
isMostLikelyDuplicate: (requestId: string) => boolean;
|
|
7
|
-
addToDuplicateDetector: (requestId: string) => void;
|
|
8
|
-
}
|
|
9
|
-
export declare class FindRpcLocal implements IFindRpc {
|
|
10
|
-
private readonly config;
|
|
11
|
-
constructor(config: FindRpcLocalConfig);
|
|
12
|
-
routeFindRequest(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
|
|
13
|
-
}
|
|
14
|
-
export {};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"FindRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/find/FindRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,mEAAgI;AAEhI,qFAAoF;AACpF,8DAAiE;AACjE,gEAA4D;AAE5D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AASjC,MAAa,YAAY;IAIrB,YAAY,MAA0B;QAClC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,aAAkC;QACrD,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE;YAC5D,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,0BAAiB,CAAC,SAAS,CAAC,CAAA;SAC3E;QACD,MAAM,QAAQ,GAAG,IAAA,sDAA2B,EAAC,IAAA,iCAAe,EAAC,aAAa,CAAC,IAAI,aAAa,CAAC,UAAW,CAAC,CAAA;QACzG,MAAM,CAAC,KAAK,CAAC,uCAAuC,QAAQ,EAAE,CAAC,CAAA;QAC/D,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,UAAW,EAAE,IAAI,CAAC,CAAA;QACvD,IAAI,CAAC,MAAM,CAAC,sBAAsB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAC3D,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,aAAa,CAAC,CAAA;IACxD,CAAC;CACJ;AAlBD,oCAkBC"}
|
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
import EventEmitter from 'eventemitter3';
|
|
2
|
-
import { PeerID } from '../../helpers/PeerID';
|
|
3
|
-
import { DataEntry, PeerDescriptor, FindAction } from '../../proto/packages/dht/protos/DhtRpc';
|
|
4
|
-
import { ITransport } from '../../transport/ITransport';
|
|
5
|
-
import { FindResult } from './Finder';
|
|
6
|
-
import { ServiceID } from '../../types/ServiceID';
|
|
7
|
-
export interface FindSessionEvents {
|
|
8
|
-
findCompleted: (results: PeerDescriptor[]) => void;
|
|
9
|
-
}
|
|
10
|
-
export interface FindSessionConfig {
|
|
11
|
-
serviceId: ServiceID;
|
|
12
|
-
transport: ITransport;
|
|
13
|
-
nodeIdToFind: Uint8Array;
|
|
14
|
-
localPeerId: PeerID;
|
|
15
|
-
waitedRoutingPathCompletions: number;
|
|
16
|
-
action: FindAction;
|
|
17
|
-
}
|
|
18
|
-
export declare class FindSession extends EventEmitter<FindSessionEvents> {
|
|
19
|
-
private readonly serviceId;
|
|
20
|
-
private readonly transport;
|
|
21
|
-
private readonly nodeIdToFind;
|
|
22
|
-
private readonly localPeerId;
|
|
23
|
-
private readonly waitedRoutingPathCompletions;
|
|
24
|
-
private readonly rpcCommunicator;
|
|
25
|
-
private readonly action;
|
|
26
|
-
private results;
|
|
27
|
-
private foundData;
|
|
28
|
-
private allKnownHops;
|
|
29
|
-
private reportedHops;
|
|
30
|
-
private reportFindCompletedTimeout?;
|
|
31
|
-
private findCompletedEmitted;
|
|
32
|
-
private noCloserNodesReceivedCounter;
|
|
33
|
-
constructor(config: FindSessionConfig);
|
|
34
|
-
private registerLocalRpcMethods;
|
|
35
|
-
private isFindCompleted;
|
|
36
|
-
private hasNonStaleData;
|
|
37
|
-
doSendFindResponse(routingPath: PeerDescriptor[], nodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean): void;
|
|
38
|
-
private addKnownHops;
|
|
39
|
-
private setHopAsReported;
|
|
40
|
-
private processFoundData;
|
|
41
|
-
private onNoCloserPeersFound;
|
|
42
|
-
getResults: () => FindResult;
|
|
43
|
-
stop(): void;
|
|
44
|
-
}
|
|
@@ -1,150 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.FindSession = void 0;
|
|
7
|
-
const eventemitter3_1 = __importDefault(require("eventemitter3"));
|
|
8
|
-
const PeerID_1 = require("../../helpers/PeerID");
|
|
9
|
-
const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
|
|
10
|
-
const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
|
|
11
|
-
const Contact_1 = require("../contact/Contact");
|
|
12
|
-
const SortedContactList_1 = require("../contact/SortedContactList");
|
|
13
|
-
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
14
|
-
const FindSessionRpcLocal_1 = require("./FindSessionRpcLocal");
|
|
15
|
-
class FindSession extends eventemitter3_1.default {
|
|
16
|
-
constructor(config) {
|
|
17
|
-
super();
|
|
18
|
-
this.foundData = new Map();
|
|
19
|
-
this.allKnownHops = new Set();
|
|
20
|
-
this.reportedHops = new Set();
|
|
21
|
-
this.findCompletedEmitted = false;
|
|
22
|
-
this.noCloserNodesReceivedCounter = 0;
|
|
23
|
-
this.getResults = () => ({
|
|
24
|
-
closestNodes: this.results.getAllContacts().map((contact) => contact.getPeerDescriptor()),
|
|
25
|
-
dataEntries: Array.from(this.foundData.values())
|
|
26
|
-
});
|
|
27
|
-
this.serviceId = config.serviceId;
|
|
28
|
-
this.transport = config.transport;
|
|
29
|
-
this.nodeIdToFind = config.nodeIdToFind;
|
|
30
|
-
this.localPeerId = config.localPeerId;
|
|
31
|
-
this.waitedRoutingPathCompletions = config.waitedRoutingPathCompletions;
|
|
32
|
-
this.results = new SortedContactList_1.SortedContactList({
|
|
33
|
-
referenceId: PeerID_1.PeerID.fromValue(this.nodeIdToFind),
|
|
34
|
-
maxSize: 10,
|
|
35
|
-
allowToContainReferenceId: true,
|
|
36
|
-
emitEvents: false
|
|
37
|
-
});
|
|
38
|
-
this.action = config.action;
|
|
39
|
-
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(this.serviceId, this.transport, {
|
|
40
|
-
rpcRequestTimeout: 15000
|
|
41
|
-
});
|
|
42
|
-
this.registerLocalRpcMethods();
|
|
43
|
-
}
|
|
44
|
-
registerLocalRpcMethods() {
|
|
45
|
-
const rpcLocal = new FindSessionRpcLocal_1.FindSessionRpcLocal({
|
|
46
|
-
doSendFindResponse: (routingPath, nodes, dataEntries, noCloserNodesFound) => {
|
|
47
|
-
this.doSendFindResponse(routingPath, nodes, dataEntries, noCloserNodesFound);
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.FindResponse, 'sendFindResponse', (req) => rpcLocal.sendFindResponse(req));
|
|
51
|
-
}
|
|
52
|
-
isFindCompleted() {
|
|
53
|
-
const unreportedHops = new Set(this.allKnownHops);
|
|
54
|
-
this.reportedHops.forEach((id) => {
|
|
55
|
-
unreportedHops.delete(id);
|
|
56
|
-
});
|
|
57
|
-
if (this.noCloserNodesReceivedCounter >= 1 && unreportedHops.size === 0) {
|
|
58
|
-
if (this.action === DhtRpc_1.FindAction.FETCH_DATA
|
|
59
|
-
&& (this.hasNonStaleData() || this.noCloserNodesReceivedCounter >= this.waitedRoutingPathCompletions)) {
|
|
60
|
-
return true;
|
|
61
|
-
}
|
|
62
|
-
else if (this.action === DhtRpc_1.FindAction.FETCH_DATA) {
|
|
63
|
-
return false;
|
|
64
|
-
}
|
|
65
|
-
return true;
|
|
66
|
-
}
|
|
67
|
-
return false;
|
|
68
|
-
}
|
|
69
|
-
hasNonStaleData() {
|
|
70
|
-
return Array.from(this.foundData.values()).some((entry) => entry.stale === false);
|
|
71
|
-
}
|
|
72
|
-
doSendFindResponse(routingPath, nodes, dataEntries, noCloserNodesFound) {
|
|
73
|
-
this.addKnownHops(routingPath);
|
|
74
|
-
if (routingPath.length >= 1) {
|
|
75
|
-
this.setHopAsReported(routingPath[routingPath.length - 1]);
|
|
76
|
-
}
|
|
77
|
-
nodes.forEach((descriptor) => {
|
|
78
|
-
this.results.addContact(new Contact_1.Contact(descriptor));
|
|
79
|
-
});
|
|
80
|
-
this.processFoundData(dataEntries);
|
|
81
|
-
if (noCloserNodesFound) {
|
|
82
|
-
this.onNoCloserPeersFound();
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
addKnownHops(routingPath) {
|
|
86
|
-
routingPath.forEach((desc) => {
|
|
87
|
-
const newPeerId = PeerID_1.PeerID.fromValue(desc.nodeId);
|
|
88
|
-
if (!this.localPeerId.equals(newPeerId)) {
|
|
89
|
-
this.allKnownHops.add(newPeerId.toKey());
|
|
90
|
-
}
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
setHopAsReported(desc) {
|
|
94
|
-
const newPeerId = PeerID_1.PeerID.fromValue(desc.nodeId);
|
|
95
|
-
if (!this.localPeerId.equals(newPeerId)) {
|
|
96
|
-
this.reportedHops.add(newPeerId.toKey());
|
|
97
|
-
}
|
|
98
|
-
if (this.isFindCompleted()) {
|
|
99
|
-
if (!this.findCompletedEmitted && this.isFindCompleted()) {
|
|
100
|
-
if (this.reportFindCompletedTimeout) {
|
|
101
|
-
clearTimeout(this.reportFindCompletedTimeout);
|
|
102
|
-
this.reportFindCompletedTimeout = undefined;
|
|
103
|
-
}
|
|
104
|
-
this.emit('findCompleted', this.results.getAllContacts().map((contact) => contact.getPeerDescriptor()));
|
|
105
|
-
this.findCompletedEmitted = true;
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
processFoundData(dataEntries) {
|
|
110
|
-
dataEntries.forEach((entry) => {
|
|
111
|
-
const creatorKey = (0, peerIdFromPeerDescriptor_1.keyFromPeerDescriptor)(entry.creator);
|
|
112
|
-
const existingEntry = this.foundData.get(creatorKey);
|
|
113
|
-
if (!existingEntry || existingEntry.createdAt < entry.createdAt
|
|
114
|
-
|| (existingEntry.createdAt <= entry.createdAt && entry.deleted)) {
|
|
115
|
-
this.foundData.set(creatorKey, entry);
|
|
116
|
-
}
|
|
117
|
-
});
|
|
118
|
-
}
|
|
119
|
-
onNoCloserPeersFound() {
|
|
120
|
-
this.noCloserNodesReceivedCounter += 1;
|
|
121
|
-
if (this.isFindCompleted()) {
|
|
122
|
-
this.emit('findCompleted', this.results.getAllContacts().map((contact) => contact.getPeerDescriptor()));
|
|
123
|
-
this.findCompletedEmitted = true;
|
|
124
|
-
if (this.reportFindCompletedTimeout) {
|
|
125
|
-
clearTimeout(this.reportFindCompletedTimeout);
|
|
126
|
-
this.reportFindCompletedTimeout = undefined;
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
else {
|
|
130
|
-
if (!this.reportFindCompletedTimeout && !this.findCompletedEmitted) {
|
|
131
|
-
this.reportFindCompletedTimeout = setTimeout(() => {
|
|
132
|
-
if (!this.findCompletedEmitted) {
|
|
133
|
-
this.emit('findCompleted', this.results.getAllContacts().map((contact) => contact.getPeerDescriptor()));
|
|
134
|
-
this.findCompletedEmitted = true;
|
|
135
|
-
}
|
|
136
|
-
}, 4000);
|
|
137
|
-
}
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
stop() {
|
|
141
|
-
if (this.reportFindCompletedTimeout) {
|
|
142
|
-
clearTimeout(this.reportFindCompletedTimeout);
|
|
143
|
-
this.reportFindCompletedTimeout = undefined;
|
|
144
|
-
}
|
|
145
|
-
this.rpcCommunicator.destroy();
|
|
146
|
-
this.emit('findCompleted', []);
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
exports.FindSession = FindSession;
|
|
150
|
-
//# sourceMappingURL=FindSession.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"FindSession.js","sourceRoot":"","sources":["../../../../src/dht/find/FindSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import { IFindSessionRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
|
|
2
|
-
import { Empty } from '../../proto/google/protobuf/empty';
|
|
3
|
-
import { DataEntry, FindResponse, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
4
|
-
interface FindSessionRpcLocalConfig {
|
|
5
|
-
doSendFindResponse: (routingPath: PeerDescriptor[], nodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean) => void;
|
|
6
|
-
}
|
|
7
|
-
export declare class FindSessionRpcLocal implements IFindSessionRpc {
|
|
8
|
-
private readonly config;
|
|
9
|
-
constructor(config: FindSessionRpcLocalConfig);
|
|
10
|
-
sendFindResponse(report: FindResponse): Promise<Empty>;
|
|
11
|
-
}
|
|
12
|
-
export {};
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FindSessionRpcLocal = void 0;
|
|
4
|
-
const utils_1 = require("@streamr/utils");
|
|
5
|
-
const logger = new utils_1.Logger(module);
|
|
6
|
-
class FindSessionRpcLocal {
|
|
7
|
-
constructor(config) {
|
|
8
|
-
this.config = config;
|
|
9
|
-
}
|
|
10
|
-
async sendFindResponse(report) {
|
|
11
|
-
logger.trace('FindResponse arrived: ' + JSON.stringify(report));
|
|
12
|
-
this.config.doSendFindResponse(report.routingPath, report.closestConnectedPeers, report.dataEntries, report.noCloserNodesFound);
|
|
13
|
-
return {};
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
exports.FindSessionRpcLocal = FindSessionRpcLocal;
|
|
17
|
-
//# sourceMappingURL=FindSessionRpcLocal.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"FindSessionRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/find/FindSessionRpcLocal.ts"],"names":[],"mappings":";;;AAGA,0CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAMjC,MAAa,mBAAmB;IAI5B,YAAY,MAAiC;QACzC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,MAAoB;QACvC,MAAM,CAAC,KAAK,CAAC,wBAAwB,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;QAC/D,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAA;QAC/H,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAbD,kDAaC"}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import { DataEntry, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
|
-
import { IFindSessionRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
|
|
3
|
-
import { RpcRemote } from '../contact/RpcRemote';
|
|
4
|
-
export declare class FindSessionRpcRemote extends RpcRemote<IFindSessionRpcClient> {
|
|
5
|
-
sendFindResponse(routingPath: PeerDescriptor[], closestNodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean): void;
|
|
6
|
-
}
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FindSessionRpcRemote = void 0;
|
|
4
|
-
const utils_1 = require("@streamr/utils");
|
|
5
|
-
const RpcRemote_1 = require("../contact/RpcRemote");
|
|
6
|
-
const logger = new utils_1.Logger(module);
|
|
7
|
-
class FindSessionRpcRemote extends RpcRemote_1.RpcRemote {
|
|
8
|
-
sendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound) {
|
|
9
|
-
const report = {
|
|
10
|
-
routingPath,
|
|
11
|
-
closestConnectedPeers: closestNodes,
|
|
12
|
-
dataEntries,
|
|
13
|
-
noCloserNodesFound
|
|
14
|
-
};
|
|
15
|
-
this.getClient().sendFindResponse(report, this.formDhtRpcOptions()).catch((_e) => {
|
|
16
|
-
logger.trace('Failed to send FindResponse');
|
|
17
|
-
});
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
exports.FindSessionRpcRemote = FindSessionRpcRemote;
|
|
21
|
-
//# sourceMappingURL=FindSessionRpcRemote.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"FindSessionRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/find/FindSessionRpcRemote.ts"],"names":[],"mappings":";;;AAMA,0CAAuC;AACvC,oDAAgD;AAEhD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,oBAAqB,SAAQ,qBAAgC;IAEtE,gBAAgB,CACZ,WAA6B,EAC7B,YAA8B,EAC9B,WAAwB,EACxB,kBAA2B;QAE3B,MAAM,MAAM,GAAiB;YACzB,WAAW;YACX,qBAAqB,EAAE,YAAY;YACnC,WAAW;YACX,kBAAkB;SACrB,CAAA;QACD,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7E,MAAM,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC/C,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AAlBD,oDAkBC"}
|
|
@@ -1,49 +0,0 @@
|
|
|
1
|
-
import { DataEntry, PeerDescriptor, FindAction } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
|
-
import { PeerID, PeerIDKey } from '../../helpers/PeerID';
|
|
3
|
-
import { IRouter } from '../routing/Router';
|
|
4
|
-
import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
|
|
5
|
-
import { DhtNodeRpcRemote } from '../DhtNodeRpcRemote';
|
|
6
|
-
import { ITransport } from '../../transport/ITransport';
|
|
7
|
-
import { LocalDataStore } from '../store/LocalDataStore';
|
|
8
|
-
import { ServiceID } from '../../types/ServiceID';
|
|
9
|
-
interface FinderConfig {
|
|
10
|
-
rpcCommunicator: RoutingRpcCommunicator;
|
|
11
|
-
sessionTransport: ITransport;
|
|
12
|
-
connections: Map<PeerIDKey, DhtNodeRpcRemote>;
|
|
13
|
-
router: IRouter;
|
|
14
|
-
localPeerDescriptor: PeerDescriptor;
|
|
15
|
-
serviceId: ServiceID;
|
|
16
|
-
localDataStore: LocalDataStore;
|
|
17
|
-
addContact: (contact: PeerDescriptor) => void;
|
|
18
|
-
isPeerCloserToIdThanSelf: (peer1: PeerDescriptor, compareToId: PeerID) => boolean;
|
|
19
|
-
}
|
|
20
|
-
export interface IFinder {
|
|
21
|
-
startFind(idToFind: Uint8Array, action?: FindAction): Promise<FindResult>;
|
|
22
|
-
}
|
|
23
|
-
export interface FindResult {
|
|
24
|
-
closestNodes: Array<PeerDescriptor>;
|
|
25
|
-
dataEntries?: Array<DataEntry>;
|
|
26
|
-
}
|
|
27
|
-
export declare class Finder implements IFinder {
|
|
28
|
-
private readonly rpcCommunicator;
|
|
29
|
-
private readonly sessionTransport;
|
|
30
|
-
private readonly connections;
|
|
31
|
-
private readonly router;
|
|
32
|
-
private readonly localPeerDescriptor;
|
|
33
|
-
private readonly serviceId;
|
|
34
|
-
private readonly localDataStore;
|
|
35
|
-
private readonly isPeerCloserToIdThanSelf;
|
|
36
|
-
private ongoingSessions;
|
|
37
|
-
private stopped;
|
|
38
|
-
constructor(config: FinderConfig);
|
|
39
|
-
private registerLocalRpcMethods;
|
|
40
|
-
startFind(idToFind: Uint8Array, action?: FindAction, excludedPeer?: PeerDescriptor, waitForCompletion?: boolean): Promise<FindResult>;
|
|
41
|
-
private wrapFindRequest;
|
|
42
|
-
private findAndReportLocalData;
|
|
43
|
-
private findLocalData;
|
|
44
|
-
private sendFindResponse;
|
|
45
|
-
private doRouteFindRequest;
|
|
46
|
-
private getClosestConnections;
|
|
47
|
-
stop(): void;
|
|
48
|
-
}
|
|
49
|
-
export {};
|
|
@@ -1,197 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Finder = void 0;
|
|
4
|
-
const DhtRpc_1 = require("../../proto/packages/dht/protos/DhtRpc");
|
|
5
|
-
const PeerID_1 = require("../../helpers/PeerID");
|
|
6
|
-
const RoutingSession_1 = require("../routing/RoutingSession");
|
|
7
|
-
const peerIdFromPeerDescriptor_1 = require("../../helpers/peerIdFromPeerDescriptor");
|
|
8
|
-
const utils_1 = require("@streamr/utils");
|
|
9
|
-
const FindSessionRpcRemote_1 = require("./FindSessionRpcRemote");
|
|
10
|
-
const uuid_1 = require("uuid");
|
|
11
|
-
const FindSession_1 = require("./FindSession");
|
|
12
|
-
const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
|
|
13
|
-
const DhtRpc_client_1 = require("../../proto/packages/dht/protos/DhtRpc.client");
|
|
14
|
-
const proto_rpc_1 = require("@streamr/proto-rpc");
|
|
15
|
-
const SortedContactList_1 = require("../contact/SortedContactList");
|
|
16
|
-
const getPreviousPeer_1 = require("../routing/getPreviousPeer");
|
|
17
|
-
const RouterRpcLocal_1 = require("../routing/RouterRpcLocal");
|
|
18
|
-
const FindRpcLocal_1 = require("./FindRpcLocal");
|
|
19
|
-
const logger = new utils_1.Logger(module);
|
|
20
|
-
class Finder {
|
|
21
|
-
constructor(config) {
|
|
22
|
-
this.ongoingSessions = new Map();
|
|
23
|
-
this.stopped = false;
|
|
24
|
-
this.rpcCommunicator = config.rpcCommunicator;
|
|
25
|
-
this.sessionTransport = config.sessionTransport;
|
|
26
|
-
this.connections = config.connections;
|
|
27
|
-
this.router = config.router;
|
|
28
|
-
this.localPeerDescriptor = config.localPeerDescriptor;
|
|
29
|
-
this.serviceId = config.serviceId;
|
|
30
|
-
this.localDataStore = config.localDataStore;
|
|
31
|
-
this.isPeerCloserToIdThanSelf = config.isPeerCloserToIdThanSelf;
|
|
32
|
-
this.registerLocalRpcMethods(config);
|
|
33
|
-
}
|
|
34
|
-
registerLocalRpcMethods(config) {
|
|
35
|
-
const rpcLocal = new FindRpcLocal_1.FindRpcLocal({
|
|
36
|
-
doRouteFindRequest: (routedMessage) => this.doRouteFindRequest(routedMessage),
|
|
37
|
-
addContact: (contact) => config.addContact(contact),
|
|
38
|
-
isMostLikelyDuplicate: (requestId) => this.router.isMostLikelyDuplicate(requestId),
|
|
39
|
-
addToDuplicateDetector: (requestId) => this.router.addToDuplicateDetector(requestId)
|
|
40
|
-
});
|
|
41
|
-
this.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeFindRequest', async (routedMessage) => {
|
|
42
|
-
if (this.stopped) {
|
|
43
|
-
return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.STOPPED);
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
return rpcLocal.routeFindRequest(routedMessage);
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
async startFind(idToFind, action = DhtRpc_1.FindAction.NODE, excludedPeer, waitForCompletion = true) {
|
|
51
|
-
if (this.stopped) {
|
|
52
|
-
return { closestNodes: [] };
|
|
53
|
-
}
|
|
54
|
-
const sessionId = (0, uuid_1.v4)();
|
|
55
|
-
const session = new FindSession_1.FindSession({
|
|
56
|
-
serviceId: sessionId,
|
|
57
|
-
transport: this.sessionTransport,
|
|
58
|
-
nodeIdToFind: idToFind,
|
|
59
|
-
localPeerId: (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor),
|
|
60
|
-
waitedRoutingPathCompletions: this.connections.size > 1 ? 2 : 1,
|
|
61
|
-
action
|
|
62
|
-
});
|
|
63
|
-
if (this.connections.size === 0) {
|
|
64
|
-
const data = this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
|
|
65
|
-
session.doSendFindResponse([this.localPeerDescriptor], [this.localPeerDescriptor], Array.from(data.values()), true);
|
|
66
|
-
return session.getResults();
|
|
67
|
-
}
|
|
68
|
-
const routeMessage = this.wrapFindRequest(idToFind, sessionId, action);
|
|
69
|
-
this.ongoingSessions.set(sessionId, session);
|
|
70
|
-
if (waitForCompletion === true) {
|
|
71
|
-
try {
|
|
72
|
-
await (0, utils_1.runAndWaitForEvents3)([() => this.doRouteFindRequest(routeMessage, excludedPeer)], [[session, 'findCompleted']], 15000);
|
|
73
|
-
}
|
|
74
|
-
catch (err) {
|
|
75
|
-
logger.debug(`doRouteFindRequest failed with error ${err}`);
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
else {
|
|
79
|
-
this.doRouteFindRequest(routeMessage, excludedPeer);
|
|
80
|
-
// Wait for delete operation to be sent out by the router
|
|
81
|
-
// TODO: Add a feature to wait for the router to pass the message?
|
|
82
|
-
await (0, utils_1.wait)(50);
|
|
83
|
-
}
|
|
84
|
-
if (action === DhtRpc_1.FindAction.FETCH_DATA) {
|
|
85
|
-
this.findAndReportLocalData(idToFind, [], this.localPeerDescriptor, sessionId);
|
|
86
|
-
}
|
|
87
|
-
else if (action === DhtRpc_1.FindAction.DELETE_DATA) {
|
|
88
|
-
this.localDataStore.markAsDeleted(idToFind, (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(this.localPeerDescriptor));
|
|
89
|
-
}
|
|
90
|
-
this.ongoingSessions.delete(sessionId);
|
|
91
|
-
session.stop();
|
|
92
|
-
return session.getResults();
|
|
93
|
-
}
|
|
94
|
-
wrapFindRequest(idToFind, sessionId, action) {
|
|
95
|
-
const targetDescriptor = {
|
|
96
|
-
nodeId: idToFind,
|
|
97
|
-
type: DhtRpc_1.NodeType.VIRTUAL
|
|
98
|
-
};
|
|
99
|
-
const request = {
|
|
100
|
-
sessionId,
|
|
101
|
-
action
|
|
102
|
-
};
|
|
103
|
-
const msg = {
|
|
104
|
-
messageType: DhtRpc_1.MessageType.FIND_REQUEST,
|
|
105
|
-
messageId: (0, uuid_1.v4)(),
|
|
106
|
-
serviceId: this.serviceId,
|
|
107
|
-
body: {
|
|
108
|
-
oneofKind: 'findRequest',
|
|
109
|
-
findRequest: request
|
|
110
|
-
}
|
|
111
|
-
};
|
|
112
|
-
const routeMessage = {
|
|
113
|
-
message: msg,
|
|
114
|
-
requestId: (0, uuid_1.v4)(),
|
|
115
|
-
destinationPeer: targetDescriptor,
|
|
116
|
-
sourcePeer: this.localPeerDescriptor,
|
|
117
|
-
reachableThrough: [],
|
|
118
|
-
routingPath: []
|
|
119
|
-
};
|
|
120
|
-
return routeMessage;
|
|
121
|
-
}
|
|
122
|
-
findAndReportLocalData(idToFind, routingPath, sourcePeer, sessionId) {
|
|
123
|
-
const data = this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
|
|
124
|
-
if (data.size > 0) {
|
|
125
|
-
this.sendFindResponse(routingPath, sourcePeer, sessionId, [], data, true);
|
|
126
|
-
}
|
|
127
|
-
}
|
|
128
|
-
findLocalData(idToFind, fetchData) {
|
|
129
|
-
if (fetchData) {
|
|
130
|
-
return this.localDataStore.getEntry(PeerID_1.PeerID.fromValue(idToFind));
|
|
131
|
-
}
|
|
132
|
-
return undefined;
|
|
133
|
-
}
|
|
134
|
-
sendFindResponse(routingPath, targetPeerDescriptor, serviceId, closestNodes, data, noCloserNodesFound = false) {
|
|
135
|
-
const dataEntries = data ? Array.from(data.values(), DhtRpc_1.DataEntry.create.bind(DhtRpc_1.DataEntry)) : [];
|
|
136
|
-
const isOwnNode = (0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, targetPeerDescriptor);
|
|
137
|
-
if (isOwnNode && this.ongoingSessions.has(serviceId)) {
|
|
138
|
-
this.ongoingSessions.get(serviceId)
|
|
139
|
-
.doSendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound);
|
|
140
|
-
}
|
|
141
|
-
else {
|
|
142
|
-
const remoteCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(serviceId, this.sessionTransport, { rpcRequestTimeout: 15000 });
|
|
143
|
-
const rpcRemote = new FindSessionRpcRemote_1.FindSessionRpcRemote(this.localPeerDescriptor, targetPeerDescriptor, serviceId, (0, proto_rpc_1.toProtoRpcClient)(new DhtRpc_client_1.FindSessionRpcClient(remoteCommunicator.getRpcClientTransport())), 10000);
|
|
144
|
-
rpcRemote.sendFindResponse(routingPath, closestNodes, dataEntries, noCloserNodesFound);
|
|
145
|
-
remoteCommunicator.destroy();
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
doRouteFindRequest(routedMessage, excludedPeer) {
|
|
149
|
-
if (this.stopped) {
|
|
150
|
-
return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.STOPPED);
|
|
151
|
-
}
|
|
152
|
-
const idToFind = (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(routedMessage.destinationPeer);
|
|
153
|
-
const msg = routedMessage.message;
|
|
154
|
-
const findRequest = msg?.body.oneofKind === 'findRequest' ? msg.body.findRequest : undefined;
|
|
155
|
-
const closestPeersToDestination = this.getClosestConnections(routedMessage.destinationPeer.nodeId, 5);
|
|
156
|
-
const data = this.findLocalData(idToFind.value, findRequest.action === DhtRpc_1.FindAction.FETCH_DATA);
|
|
157
|
-
if (findRequest.action === DhtRpc_1.FindAction.DELETE_DATA) {
|
|
158
|
-
this.localDataStore.markAsDeleted(idToFind.value, (0, peerIdFromPeerDescriptor_1.peerIdFromPeerDescriptor)(routedMessage.sourcePeer));
|
|
159
|
-
}
|
|
160
|
-
if ((0, peerIdFromPeerDescriptor_1.areEqualPeerDescriptors)(this.localPeerDescriptor, routedMessage.destinationPeer)) {
|
|
161
|
-
// TODO this is also very similar case to what we do at line 255, could simplify the code paths?
|
|
162
|
-
this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, true);
|
|
163
|
-
return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage);
|
|
164
|
-
}
|
|
165
|
-
else {
|
|
166
|
-
const ack = this.router.doRouteMessage(routedMessage, RoutingSession_1.RoutingMode.FIND, excludedPeer);
|
|
167
|
-
if ((ack.error === undefined) || (ack.error === DhtRpc_1.RouteMessageError.NO_TARGETS)) {
|
|
168
|
-
const noCloserContactsFound = (ack.error === DhtRpc_1.RouteMessageError.NO_TARGETS) ||
|
|
169
|
-
(closestPeersToDestination.length > 0
|
|
170
|
-
&& (0, getPreviousPeer_1.getPreviousPeer)(routedMessage)
|
|
171
|
-
&& !this.isPeerCloserToIdThanSelf(closestPeersToDestination[0], idToFind));
|
|
172
|
-
this.sendFindResponse(routedMessage.routingPath, routedMessage.sourcePeer, findRequest.sessionId, closestPeersToDestination, data, noCloserContactsFound);
|
|
173
|
-
}
|
|
174
|
-
return ack;
|
|
175
|
-
}
|
|
176
|
-
}
|
|
177
|
-
getClosestConnections(nodeId, limit) {
|
|
178
|
-
const connectedPeers = Array.from(this.connections.values());
|
|
179
|
-
const closestPeers = new SortedContactList_1.SortedContactList({
|
|
180
|
-
referenceId: PeerID_1.PeerID.fromValue(nodeId),
|
|
181
|
-
maxSize: limit,
|
|
182
|
-
allowToContainReferenceId: true,
|
|
183
|
-
emitEvents: false
|
|
184
|
-
});
|
|
185
|
-
closestPeers.addContacts(connectedPeers);
|
|
186
|
-
return closestPeers.getClosestContacts(limit).map((peer) => peer.getPeerDescriptor());
|
|
187
|
-
}
|
|
188
|
-
stop() {
|
|
189
|
-
this.stopped = true;
|
|
190
|
-
this.ongoingSessions.forEach((session, _id) => {
|
|
191
|
-
session.stop();
|
|
192
|
-
});
|
|
193
|
-
this.ongoingSessions.clear();
|
|
194
|
-
}
|
|
195
|
-
}
|
|
196
|
-
exports.Finder = Finder;
|
|
197
|
-
//# sourceMappingURL=Finder.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"Finder.js","sourceRoot":"","sources":["../../../../src/dht/find/Finder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import { RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
|
-
import { RpcRemote } from '../contact/RpcRemote';
|
|
3
|
-
import { IFindRpcClient } from '../../proto/packages/dht/protos/DhtRpc.client';
|
|
4
|
-
export declare class FindRpcRemote extends RpcRemote<IFindRpcClient> {
|
|
5
|
-
routeFindRequest(params: RouteMessageWrapper): Promise<boolean>;
|
|
6
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"FindRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/routing/FindRpcRemote.ts"],"names":[],"mappings":";;;AACA,+BAAyB;AACzB,qFAAoF;AACpF,oDAAgD;AAChD,0CAAuC;AAEvC,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,aAAc,SAAQ,qBAAyB;IAExD,KAAK,CAAC,gBAAgB,CAAC,MAA2B;QAC9C,MAAM,OAAO,GAAwB;YACjC,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,IAAA,SAAE,GAAE;YACnC,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,EAAE;YAC/C,WAAW,EAAE,MAAM,CAAC,WAAW;SAClC,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,YAAY,EAAE,IAAI;SACrB,CAAC,CAAA;QACF,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACrE,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE;gBACzB,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;gBAC1D,OAAO,KAAK,CAAA;aACf;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,MAAM,CAAC,CAAA;YAC5C,MAAM,QAAQ,GAAG,YAAY;gBACzB,CAAC,CAAC,IAAA,sDAA2B,EAAC,YAAY,CAAC;gBAC3C,CAAC,CAAC,IAAA,sDAA2B,EAAC,MAAM,CAAC,UAAW,CAAC,CAAA;YACrD,mCAAmC;YACnC,MAAM,CAAC,KAAK,CAAC,gDAAgD,QAAQ,OAAO,IAAA,sDAA2B,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,UAAU,GAAG,EAAE,CAAC,CAAA;YACjJ,OAAO,KAAK,CAAA;SACf;QACD,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AA/BD,sCA+BC"}
|