@streamr/dht 101.1.2 → 102.0.0-beta.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 +17 -18
- package/dist/src/connection/Connection.d.ts +1 -1
- package/dist/src/connection/ConnectionLockRpcLocal.d.ts +5 -3
- package/dist/src/connection/ConnectionLockRpcLocal.js +9 -3
- package/dist/src/connection/ConnectionLockRpcLocal.js.map +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.d.ts +3 -2
- package/dist/src/connection/ConnectionLockRpcRemote.js +14 -3
- package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -1
- package/dist/src/connection/ConnectionLockStates.d.ts +5 -0
- package/dist/src/connection/ConnectionLockStates.js +14 -0
- package/dist/src/connection/ConnectionLockStates.js.map +1 -1
- package/dist/src/connection/ConnectionManager.d.ts +8 -1
- package/dist/src/connection/ConnectionManager.js +96 -32
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectionsView.d.ts +1 -1
- package/dist/src/connection/ConnectorFacade.d.ts +1 -1
- package/dist/src/connection/Handshaker.d.ts +2 -2
- package/dist/src/connection/Handshaker.js +11 -7
- package/dist/src/connection/Handshaker.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +7 -1
- package/dist/src/connection/ManagedConnection.js +41 -8
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/PendingConnection.d.ts +1 -1
- package/dist/src/connection/connectivityChecker.d.ts +1 -1
- package/dist/src/connection/connectivityChecker.js +22 -11
- package/dist/src/connection/connectivityChecker.js.map +1 -1
- package/dist/src/connection/connectivityRequestHandler.js +4 -4
- package/dist/src/connection/connectivityRequestHandler.js.map +1 -1
- package/dist/src/connection/simulator/Simulator.d.ts +1 -1
- package/dist/src/connection/simulator/Simulator.js +5 -4
- package/dist/src/connection/simulator/Simulator.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorConnection.d.ts +1 -1
- package/dist/src/connection/simulator/SimulatorConnection.js +9 -9
- package/dist/src/connection/simulator/SimulatorConnection.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorConnector.d.ts +1 -1
- package/dist/src/connection/simulator/SimulatorConnector.js +4 -4
- package/dist/src/connection/simulator/SimulatorConnector.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorTransport.d.ts +1 -1
- package/dist/src/connection/simulator/SimulatorTransport.js +2 -1
- package/dist/src/connection/simulator/SimulatorTransport.js.map +1 -1
- package/dist/src/connection/simulator/pings.d.ts +1 -1
- package/dist/src/connection/simulator/pings.js +3 -3
- package/dist/src/connection/simulator/pings.js.map +1 -1
- package/dist/src/connection/webrtc/NodeWebrtcConnection.d.ts +2 -1
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js +13 -8
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnector.d.ts +2 -1
- package/dist/src/connection/webrtc/WebrtcConnector.js +28 -17
- package/dist/src/connection/webrtc/WebrtcConnector.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts +3 -3
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js +4 -4
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnectorRpcRemote.d.ts +1 -1
- package/dist/src/connection/webrtc/iceServerAsString.js +1 -2
- package/dist/src/connection/webrtc/iceServerAsString.js.map +1 -1
- package/dist/src/connection/websocket/AbstractWebsocketClientConnection.d.ts +0 -1
- package/dist/src/connection/websocket/WebsocketClientConnector.d.ts +1 -1
- package/dist/src/connection/websocket/WebsocketClientConnector.js +3 -3
- package/dist/src/connection/websocket/WebsocketClientConnector.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcLocal.d.ts +3 -4
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcLocal.js +1 -1
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcLocal.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcRemote.d.ts +1 -1
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcRemote.js +1 -1
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcRemote.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketServerConnection.d.ts +0 -1
- package/dist/src/connection/websocket/WebsocketServerConnector.d.ts +1 -1
- package/dist/src/connection/websocket/WebsocketServerConnector.js +34 -24
- package/dist/src/connection/websocket/WebsocketServerConnector.js.map +1 -1
- package/dist/src/dht/DhtNode.d.ts +5 -2
- package/dist/src/dht/DhtNode.js +20 -8
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcLocal.d.ts +4 -4
- package/dist/src/dht/DhtNodeRpcLocal.js +3 -3
- package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcRemote.d.ts +2 -2
- package/dist/src/dht/DhtNodeRpcRemote.js +3 -3
- package/dist/src/dht/DhtNodeRpcRemote.js.map +1 -1
- package/dist/src/dht/ExternalApiRpcLocal.d.ts +3 -3
- package/dist/src/dht/ExternalApiRpcLocal.js +3 -3
- package/dist/src/dht/ExternalApiRpcLocal.js.map +1 -1
- package/dist/src/dht/ExternalApiRpcRemote.d.ts +3 -3
- package/dist/src/dht/ExternalApiRpcRemote.js +2 -2
- package/dist/src/dht/ExternalApiRpcRemote.js.map +1 -1
- package/dist/src/dht/PeerManager.d.ts +3 -2
- package/dist/src/dht/PeerManager.js +12 -11
- package/dist/src/dht/PeerManager.js.map +1 -1
- package/dist/src/dht/contact/Contact.d.ts +1 -1
- package/dist/src/dht/contact/Contact.js +1 -1
- package/dist/src/dht/contact/Contact.js.map +1 -1
- package/dist/src/dht/contact/RingContactList.d.ts +1 -1
- package/dist/src/dht/contact/RingContactList.js +1 -1
- package/dist/src/dht/contact/RingContactList.js.map +1 -1
- package/dist/src/dht/contact/RpcRemote.d.ts +1 -1
- package/dist/src/dht/contact/SortedContactList.js +2 -2
- package/dist/src/dht/contact/SortedContactList.js.map +1 -1
- package/dist/src/dht/contact/ringIdentifiers.d.ts +1 -1
- package/dist/src/dht/discovery/DiscoverySession.d.ts +1 -2
- package/dist/src/dht/discovery/DiscoverySession.js +3 -3
- package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.d.ts +1 -2
- package/dist/src/dht/discovery/PeerDiscovery.js +7 -7
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/dht/discovery/RingDiscoverySession.d.ts +0 -1
- package/dist/src/dht/discovery/RingDiscoverySession.js +1 -1
- package/dist/src/dht/discovery/RingDiscoverySession.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.d.ts +3 -3
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js +8 -8
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.d.ts +2 -2
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.js +2 -2
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcRemote.d.ts +2 -2
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcRemote.js +3 -3
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcRemote.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.d.ts +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js +7 -7
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.d.ts +3 -3
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.d.ts +2 -2
- package/dist/src/dht/routing/DuplicateDetector.js.map +1 -1
- package/dist/src/dht/routing/Router.d.ts +4 -1
- package/dist/src/dht/routing/Router.js +17 -9
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcLocal.d.ts +2 -2
- package/dist/src/dht/routing/RouterRpcLocal.js +5 -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 +1 -1
- package/dist/src/dht/routing/RoutingSession.js +7 -8
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/dist/src/dht/routing/RoutingTablesCache.d.ts +1 -1
- package/dist/src/dht/routing/getPreviousPeer.d.ts +1 -1
- package/dist/src/dht/store/LocalDataStore.d.ts +1 -1
- package/dist/src/dht/store/LocalDataStore.js +3 -3
- package/dist/src/dht/store/LocalDataStore.js.map +1 -1
- package/dist/src/dht/store/StoreManager.d.ts +3 -3
- package/dist/src/dht/store/StoreManager.js +8 -8
- package/dist/src/dht/store/StoreManager.js.map +1 -1
- package/dist/src/dht/store/StoreRpcLocal.d.ts +4 -4
- package/dist/src/dht/store/StoreRpcLocal.js +4 -4
- package/dist/src/dht/store/StoreRpcLocal.js.map +1 -1
- package/dist/src/dht/store/StoreRpcRemote.d.ts +3 -3
- package/dist/src/dht/store/StoreRpcRemote.js +7 -4
- package/dist/src/dht/store/StoreRpcRemote.js.map +1 -1
- package/dist/src/exports.d.ts +2 -2
- package/dist/src/exports.js +6 -6
- package/dist/src/exports.js.map +1 -1
- package/dist/src/helpers/AddressTools.js +2 -3
- package/dist/src/helpers/AddressTools.js.map +1 -1
- package/dist/src/helpers/Connectivity.d.ts +1 -1
- package/dist/src/helpers/Connectivity.js +1 -1
- package/dist/src/helpers/Connectivity.js.map +1 -1
- package/dist/src/helpers/createPeerDescriptor.d.ts +1 -1
- package/dist/src/helpers/createPeerDescriptor.js +2 -2
- package/dist/src/helpers/createPeerDescriptor.js.map +1 -1
- package/dist/src/helpers/createPeerDescriptorSignaturePayload.d.ts +1 -1
- package/dist/src/helpers/createPeerDescriptorSignaturePayload.js +1 -1
- package/dist/src/helpers/createPeerDescriptorSignaturePayload.js.map +1 -1
- package/dist/src/helpers/debugHelpers.js +2 -2
- package/dist/src/helpers/debugHelpers.js.map +1 -1
- package/dist/src/helpers/protoClasses.d.ts +1 -1
- package/dist/src/helpers/protoClasses.js +1 -1
- package/dist/src/helpers/protoClasses.js.map +1 -1
- package/dist/src/helpers/protoToString.js +1 -2
- package/dist/src/helpers/protoToString.js.map +1 -1
- package/dist/src/helpers/version.d.ts +1 -1
- package/dist/src/helpers/version.js +4 -4
- package/dist/src/helpers/version.js.map +1 -1
- package/dist/src/identifiers.d.ts +5 -5
- package/dist/src/identifiers.js +11 -11
- package/dist/src/identifiers.js.map +1 -1
- package/dist/src/rpc-protocol/DhtCallContext.d.ts +1 -1
- package/dist/src/rpc-protocol/DhtRpcOptions.d.ts +1 -1
- package/dist/src/transport/ITransport.d.ts +2 -1
- package/dist/src/transport/ListeningRpcCommunicator.d.ts +2 -1
- package/dist/src/transport/ListeningRpcCommunicator.js +13 -4
- package/dist/src/transport/ListeningRpcCommunicator.js.map +1 -1
- package/dist/src/transport/RoutingRpcCommunicator.d.ts +1 -1
- package/eslint.config.mjs +12 -0
- package/jest.config.ts +12 -0
- package/package.json +17 -18
- package/proto.sh +2 -3
- package/protos/DhtRpc.proto +11 -4
- package/src/connection/Connection.ts +1 -1
- package/src/connection/ConnectionLockRpcLocal.ts +16 -7
- package/src/connection/ConnectionLockRpcRemote.ts +18 -6
- package/src/connection/ConnectionLockStates.ts +18 -0
- package/src/connection/ConnectionManager.ts +93 -27
- package/src/connection/ConnectionsView.ts +1 -1
- package/src/connection/ConnectorFacade.ts +1 -1
- package/src/connection/Handshaker.ts +18 -14
- package/src/connection/ManagedConnection.ts +28 -3
- package/src/connection/PendingConnection.ts +1 -1
- package/src/connection/connectivityChecker.ts +6 -5
- package/src/connection/connectivityRequestHandler.ts +4 -4
- package/src/connection/simulator/Simulator.ts +8 -7
- package/src/connection/simulator/SimulatorConnection.ts +10 -10
- package/src/connection/simulator/SimulatorConnector.ts +5 -5
- package/src/connection/simulator/SimulatorTransport.ts +3 -2
- package/src/connection/simulator/pings.ts +1 -1
- package/src/connection/webrtc/BrowserWebrtcConnection.ts +10 -1
- package/src/connection/webrtc/NodeWebrtcConnection.ts +15 -11
- package/src/connection/webrtc/WebrtcConnector.ts +13 -11
- package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +8 -8
- package/src/connection/webrtc/WebrtcConnectorRpcRemote.ts +2 -2
- package/src/connection/websocket/WebsocketClientConnector.ts +5 -5
- package/src/connection/websocket/WebsocketClientConnectorRpcLocal.ts +5 -5
- package/src/connection/websocket/WebsocketClientConnectorRpcRemote.ts +4 -4
- package/src/connection/websocket/WebsocketServerConnector.ts +24 -20
- package/src/dht/DhtNode.ts +29 -11
- package/src/dht/DhtNodeRpcLocal.ts +8 -8
- package/src/dht/DhtNodeRpcRemote.ts +5 -5
- package/src/dht/ExternalApiRpcLocal.ts +8 -8
- package/src/dht/ExternalApiRpcRemote.ts +6 -6
- package/src/dht/PeerManager.ts +16 -14
- package/src/dht/contact/Contact.ts +3 -3
- package/src/dht/contact/RingContactList.ts +3 -3
- package/src/dht/contact/RpcRemote.ts +1 -1
- package/src/dht/contact/SortedContactList.ts +3 -3
- package/src/dht/contact/ringIdentifiers.ts +1 -1
- package/src/dht/discovery/DiscoverySession.ts +5 -5
- package/src/dht/discovery/PeerDiscovery.ts +12 -12
- package/src/dht/discovery/RingDiscoverySession.ts +3 -3
- package/src/dht/recursive-operation/RecursiveOperationManager.ts +10 -10
- package/src/dht/recursive-operation/RecursiveOperationRpcLocal.ts +4 -4
- package/src/dht/recursive-operation/RecursiveOperationRpcRemote.ts +6 -6
- package/src/dht/recursive-operation/RecursiveOperationSession.ts +8 -8
- package/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts +5 -5
- package/src/dht/recursive-operation/RecursiveOperationSessionRpcRemote.ts +2 -2
- package/src/dht/routing/DuplicateDetector.ts +1 -1
- package/src/dht/routing/Router.ts +19 -10
- package/src/dht/routing/RouterRpcLocal.ts +7 -7
- package/src/dht/routing/RouterRpcRemote.ts +9 -9
- package/src/dht/routing/RoutingSession.ts +9 -10
- package/src/dht/routing/RoutingTablesCache.ts +1 -1
- package/src/dht/routing/getPreviousPeer.ts +1 -1
- package/src/dht/store/LocalDataStore.ts +5 -5
- package/src/dht/store/StoreManager.ts +13 -13
- package/src/dht/store/StoreRpcLocal.ts +9 -9
- package/src/dht/store/StoreRpcRemote.ts +10 -7
- package/src/exports.ts +5 -5
- package/src/helpers/Connectivity.ts +1 -1
- package/src/helpers/createPeerDescriptor.ts +3 -3
- package/src/helpers/createPeerDescriptorSignaturePayload.ts +1 -1
- package/src/helpers/protoClasses.ts +2 -2
- package/src/helpers/version.ts +2 -2
- package/src/identifiers.ts +7 -7
- package/src/rpc-protocol/DhtCallContext.ts +1 -1
- package/src/rpc-protocol/DhtRpcOptions.ts +1 -1
- package/src/transport/ITransport.ts +2 -1
- package/src/transport/ListeningRpcCommunicator.ts +14 -6
- package/src/transport/RoutingRpcCommunicator.ts +2 -2
- package/test/benchmark/Find.test.ts +9 -9
- package/test/benchmark/KademliaCorrectness.test.ts +7 -7
- package/test/benchmark/RingCorrectness.test.ts +8 -8
- package/test/benchmark/SortedContactListBenchmark.test.ts +10 -10
- package/test/benchmark/hybrid-network-simulation/RingContactList.test.ts +3 -3
- package/test/end-to-end/Layer0Webrtc-Layer1.test.ts +6 -6
- package/test/end-to-end/Layer0Webrtc.test.ts +6 -6
- package/test/end-to-end/RecoveryFromFailedAutoCertification.test.ts +1 -1
- package/test/end-to-end/WebsocketConnectionRequest.test.ts +3 -3
- package/test/end-to-end/memory-leak.test.ts +6 -6
- package/test/integration/ConnectionLocking.test.ts +48 -37
- package/test/integration/ConnectionManager.test.ts +62 -6
- package/test/integration/ConnectivityChecking.test.ts +3 -2
- package/test/integration/DhtJoinPeerDiscovery.test.ts +2 -2
- package/test/integration/DhtNode.test.ts +6 -6
- package/test/integration/DhtNodeExternalAPI.test.ts +7 -7
- package/test/integration/DhtNodeRpcRemote.test.ts +9 -9
- package/test/integration/DhtRpc.test.ts +12 -13
- package/test/integration/Find.test.ts +5 -5
- package/test/integration/GeoIpConnectivityChecking.test.ts +8 -7
- package/test/integration/Layer1-scale.test.ts +3 -3
- package/test/integration/Mock-Layer1-Layer0.test.ts +6 -6
- package/test/integration/MultipleEntryPointJoining.test.ts +1 -1
- package/test/integration/ReplicateData.test.ts +10 -11
- package/test/integration/RouteMessage.test.ts +13 -13
- package/test/integration/RouterRpcRemote.test.ts +7 -7
- package/test/integration/SimultaneousConnections.test.ts +14 -13
- package/test/integration/Store.test.ts +9 -9
- package/test/integration/StoreAndDelete.test.ts +10 -10
- package/test/integration/StoreOnDhtWithThreeNodes.test.ts +10 -10
- package/test/integration/StoreOnDhtWithTwoNodes.test.ts +10 -10
- package/test/integration/StoreRpcRemote.test.ts +11 -11
- package/test/integration/WebrtcConnectionManagement.test.ts +4 -31
- package/test/integration/WebrtcConnectorRpc.test.ts +14 -14
- package/test/integration/Websocket.test.ts +0 -2
- package/test/integration/WebsocketClientConnectorRpc.test.ts +8 -8
- package/test/integration/WebsocketConnectionManagement.test.ts +11 -12
- package/test/integration/{rpc-connections-over-webrpc.test.ts → rpc-connections-over-webrtc.test.ts} +12 -46
- package/test/unit/AutoCertifierClientFacade.test.ts +6 -6
- package/test/unit/ConnectionManager.test.ts +4 -3
- package/test/unit/ConnectivityHelpers.test.ts +1 -1
- package/test/unit/DiscoverySession.test.ts +6 -6
- package/test/unit/Handshaker.test.ts +2 -2
- package/test/unit/ListeningRpcCommunicator.test.ts +52 -0
- package/test/unit/LocalDataStore.test.ts +21 -21
- package/test/unit/PeerManager.test.ts +15 -15
- package/test/unit/PendingConnection.test.ts +1 -1
- package/test/unit/ProtobufMessage.test.ts +1 -1
- package/test/unit/RandomContactList.test.ts +2 -2
- package/test/unit/RecursiveOperationManager.test.ts +3 -3
- package/test/unit/RecursiveOperationSession.test.ts +6 -6
- package/test/unit/Router.test.ts +6 -6
- package/test/unit/RoutingSession.test.ts +13 -6
- package/test/unit/SortedContactList.test.ts +8 -8
- package/test/unit/StoreManager.test.ts +12 -12
- package/test/unit/StoreRpcLocal.test.ts +9 -9
- package/test/unit/WebrtcConnection.test.ts +29 -0
- package/test/unit/WebsocketClientConnector.test.ts +1 -1
- package/test/unit/WebsocketServerConnector.test.ts +1 -1
- package/test/unit/connectivityRequestHandler.test.ts +6 -6
- package/test/unit/createPeerDescriptor.test.ts +4 -4
- package/test/unit/customMatchers.test.ts +18 -0
- package/test/unit/getClosestNodes.test.ts +5 -5
- package/test/unit/version.test.ts +9 -9
- package/test/utils/FakeConnectorFacade.ts +1 -1
- package/test/utils/FakeTransport.ts +12 -9
- package/test/utils/customMatchers.ts +9 -9
- package/test/utils/mock/MockConnectionsView.ts +1 -1
- package/test/utils/mock/MockRouter.ts +5 -1
- package/test/utils/mock/MockTransport.ts +6 -1
- package/test/utils/mock/mockDataEntry.ts +6 -6
- package/test/utils/topology.ts +3 -4
- package/test/utils/utils.ts +11 -11
- package/tsconfig.jest.json +2 -1
- package/tsconfig.node.json +1 -0
- package/.eslintignore +0 -5
- package/.eslintrc +0 -3
- package/dist/src/proto/google/protobuf/any.d.ts +0 -173
- package/dist/src/proto/google/protobuf/any.js +0 -155
- package/dist/src/proto/google/protobuf/any.js.map +0 -1
- package/dist/src/proto/google/protobuf/empty.d.ts +0 -32
- package/dist/src/proto/google/protobuf/empty.js +0 -32
- package/dist/src/proto/google/protobuf/empty.js.map +0 -1
- package/dist/src/proto/google/protobuf/timestamp.d.ts +0 -149
- package/dist/src/proto/google/protobuf/timestamp.js +0 -136
- package/dist/src/proto/google/protobuf/timestamp.js.map +0 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +0 -352
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +0 -278
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +0 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +0 -975
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +0 -661
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +0 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +0 -157
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.js +0 -3
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.js.map +0 -1
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.d.ts +0 -87
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.js +0 -66
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.js.map +0 -1
- package/dist/src/proto/tests.d.ts +0 -39
- package/dist/src/proto/tests.js +0 -34
- package/dist/src/proto/tests.js.map +0 -1
- package/jest.config.js +0 -5
- package/src/proto/google/protobuf/any.ts +0 -319
- package/src/proto/google/protobuf/empty.ts +0 -82
- package/src/proto/google/protobuf/timestamp.ts +0 -281
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +0 -407
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +0 -160
- package/src/proto/packages/dht/protos/DhtRpc.ts +0 -1244
- package/src/proto/packages/proto-rpc/protos/ProtoRpc.ts +0 -108
- package/src/proto/tests.ts +0 -52
- package/test/benchmark/any.test.ts +0 -28
- /package/{src/types/glogal.d.ts → test/types/global.d.ts} +0 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationManager.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationManager.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationManager.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '
|
|
2
|
-
import { IRecursiveOperationRpc } from '
|
|
1
|
+
import { PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
2
|
+
import { IRecursiveOperationRpc } from '../../../generated/packages/dht/protos/DhtRpc.server';
|
|
3
3
|
interface RecursiveOperationRpcLocalOptions {
|
|
4
4
|
doRouteRequest: (routedMessage: RouteMessageWrapper) => RouteMessageAck;
|
|
5
5
|
addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RecursiveOperationRpcLocal = void 0;
|
|
4
4
|
const utils_1 = require("@streamr/utils");
|
|
5
|
-
const DhtRpc_1 = require("
|
|
5
|
+
const DhtRpc_1 = require("../../../generated/packages/dht/protos/DhtRpc");
|
|
6
6
|
const RouterRpcLocal_1 = require("../routing/RouterRpcLocal");
|
|
7
7
|
const getPreviousPeer_1 = require("../routing/getPreviousPeer");
|
|
8
8
|
const identifiers_1 = require("../../identifiers");
|
|
@@ -16,7 +16,7 @@ class RecursiveOperationRpcLocal {
|
|
|
16
16
|
if (this.options.isMostLikelyDuplicate(routedMessage.requestId)) {
|
|
17
17
|
return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.DUPLICATE);
|
|
18
18
|
}
|
|
19
|
-
const remoteNodeId = (0, identifiers_1.
|
|
19
|
+
const remoteNodeId = (0, identifiers_1.toNodeId)((0, getPreviousPeer_1.getPreviousPeer)(routedMessage) ?? routedMessage.sourcePeer);
|
|
20
20
|
logger.trace(`Received routeRequest call from ${remoteNodeId}`);
|
|
21
21
|
this.options.addToDuplicateDetector(routedMessage.requestId);
|
|
22
22
|
return this.options.doRouteRequest(routedMessage);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,0EAAuI;AAEvI,8DAAiE;AACjE,gEAA4D;AAC5D,mDAA4C;AAE5C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AASjC,MAAa,0BAA0B;IAElB,OAAO,CAAmC;IAE3D,YAAY,OAA0C;QAClD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,aAAkC;QACjD,IAAI,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YAC9D,OAAO,IAAA,sCAAqB,EAAC,aAAa,EAAE,0BAAiB,CAAC,SAAS,CAAC,CAAA;QAC5E,CAAC;QACD,MAAM,YAAY,GAAG,IAAA,sBAAQ,EAAC,IAAA,iCAAe,EAAC,aAAa,CAAC,IAAI,aAAa,CAAC,UAAW,CAAC,CAAA;QAC1F,MAAM,CAAC,KAAK,CAAC,mCAAmC,YAAY,EAAE,CAAC,CAAA;QAC/D,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAC5D,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,CAAA;IACrD,CAAC;CACJ;AAjBD,gEAiBC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { RouteMessageWrapper } from '
|
|
2
|
-
import { RecursiveOperationRpcClient } from '
|
|
1
|
+
import { RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
2
|
+
import { RecursiveOperationRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client';
|
|
3
3
|
import { RpcRemote } from '../contact/RpcRemote';
|
|
4
4
|
export declare class RecursiveOperationRpcRemote extends RpcRemote<RecursiveOperationRpcClient> {
|
|
5
5
|
routeRequest(params: RouteMessageWrapper): Promise<boolean>;
|
|
@@ -31,9 +31,9 @@ class RecursiveOperationRpcRemote extends RpcRemote_1.RpcRemote {
|
|
|
31
31
|
catch (err) {
|
|
32
32
|
const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(params);
|
|
33
33
|
const fromNode = previousPeer
|
|
34
|
-
? (0, identifiers_1.
|
|
35
|
-
: (0, identifiers_1.
|
|
36
|
-
const toNode = (0, identifiers_1.
|
|
34
|
+
? (0, identifiers_1.toNodeId)(previousPeer)
|
|
35
|
+
: (0, identifiers_1.toNodeId)(params.sourcePeer);
|
|
36
|
+
const toNode = (0, identifiers_1.toNodeId)(this.getPeerDescriptor());
|
|
37
37
|
logger.debug(`Failed to send routeRequest message from ${fromNode} to ${toNode}`, { err });
|
|
38
38
|
return false;
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,+BAAyB;AAGzB,oDAAgD;AAChD,gEAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,+BAAyB;AAGzB,oDAAgD;AAChD,gEAA4D;AAC5D,mDAA4C;AAE5C,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,2BAA4B,SAAQ,qBAAsC;IAEnF,KAAK,CAAC,YAAY,CAAC,MAA2B;QAC1C,MAAM,OAAO,GAAwB;YACjC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,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;YAC/B,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;SAClD,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACjE,IAAI,GAAG,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC1B,MAAM,CAAC,KAAK,CAAC,gCAAgC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAA;gBAC1D,OAAO,KAAK,CAAA;YAChB,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,YAAY,GAAG,IAAA,iCAAe,EAAC,MAAM,CAAC,CAAA;YAC5C,MAAM,QAAQ,GAAG,YAAY;gBACzB,CAAC,CAAC,IAAA,sBAAQ,EAAC,YAAY,CAAC;gBACxB,CAAC,CAAC,IAAA,sBAAQ,EAAC,MAAM,CAAC,UAAW,CAAC,CAAA;YAClC,MAAM,MAAM,GAAG,IAAA,sBAAQ,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACjD,MAAM,CAAC,KAAK,CAAC,4CAA4C,QAAQ,OAAO,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAC1F,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,OAAO,IAAI,CAAA;IACf,CAAC;CACJ;AAhCD,kEAgCC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import EventEmitter from 'eventemitter3';
|
|
2
|
-
import { DataEntry, PeerDescriptor, RecursiveOperation, RouteMessageWrapper, RouteMessageAck } from '
|
|
2
|
+
import { DataEntry, PeerDescriptor, RecursiveOperation, RouteMessageWrapper, RouteMessageAck } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
3
3
|
import { ITransport } from '../../transport/ITransport';
|
|
4
4
|
import { RecursiveOperationResult } from './RecursiveOperationManager';
|
|
5
5
|
import { ServiceID } from '../../types/ServiceID';
|
|
@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.RecursiveOperationSession = exports.RECURSIVE_OPERATION_TIMEOUT = void 0;
|
|
7
7
|
const eventemitter3_1 = __importDefault(require("eventemitter3"));
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
|
-
const DhtRpc_1 = require("
|
|
9
|
+
const DhtRpc_1 = require("../../../generated/packages/dht/protos/DhtRpc");
|
|
10
10
|
const ListeningRpcCommunicator_1 = require("../../transport/ListeningRpcCommunicator");
|
|
11
11
|
const Contact_1 = require("../contact/Contact");
|
|
12
12
|
const SortedContactList_1 = require("../contact/SortedContactList");
|
|
@@ -66,7 +66,7 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
66
66
|
const routeMessage = {
|
|
67
67
|
message: msg,
|
|
68
68
|
requestId: (0, uuid_1.v4)(),
|
|
69
|
-
target: (0, identifiers_1.
|
|
69
|
+
target: (0, identifiers_1.toDhtAddressRaw)(this.options.targetId),
|
|
70
70
|
sourcePeer: this.options.localPeerDescriptor,
|
|
71
71
|
reachableThrough: [],
|
|
72
72
|
routingPath: [],
|
|
@@ -108,17 +108,17 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
108
108
|
}
|
|
109
109
|
}
|
|
110
110
|
addKnownHops(routingPath) {
|
|
111
|
-
const localNodeId = (0, identifiers_1.
|
|
111
|
+
const localNodeId = (0, identifiers_1.toNodeId)(this.options.localPeerDescriptor);
|
|
112
112
|
routingPath.forEach((desc) => {
|
|
113
|
-
const newNodeId = (0, identifiers_1.
|
|
113
|
+
const newNodeId = (0, identifiers_1.toNodeId)(desc);
|
|
114
114
|
if (localNodeId !== newNodeId) {
|
|
115
115
|
this.allKnownHops.add(newNodeId);
|
|
116
116
|
}
|
|
117
117
|
});
|
|
118
118
|
}
|
|
119
119
|
setHopAsReported(desc) {
|
|
120
|
-
const localNodeId = (0, identifiers_1.
|
|
121
|
-
const newNodeId = (0, identifiers_1.
|
|
120
|
+
const localNodeId = (0, identifiers_1.toNodeId)(this.options.localPeerDescriptor);
|
|
121
|
+
const newNodeId = (0, identifiers_1.toNodeId)(desc);
|
|
122
122
|
if (localNodeId !== newNodeId) {
|
|
123
123
|
this.reportedHops.add(newNodeId);
|
|
124
124
|
}
|
|
@@ -135,7 +135,7 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
135
135
|
}
|
|
136
136
|
processFoundData(dataEntries) {
|
|
137
137
|
dataEntries.forEach((entry) => {
|
|
138
|
-
const creatorNodeId = (0, identifiers_1.
|
|
138
|
+
const creatorNodeId = (0, identifiers_1.toDhtAddress)(entry.creator);
|
|
139
139
|
const existingEntry = this.foundData.get(creatorNodeId);
|
|
140
140
|
if (!existingEntry || existingEntry.createdAt < entry.createdAt
|
|
141
141
|
|| (existingEntry.createdAt <= entry.createdAt && entry.deleted)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationSession.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSession.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AACxC,+BAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationSession.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { IRecursiveOperationSessionRpc } from '
|
|
2
|
-
import { Empty } from '
|
|
3
|
-
import { DataEntry, RecursiveOperationResponse, PeerDescriptor } from '
|
|
1
|
+
import { IRecursiveOperationSessionRpc } from '../../../generated/packages/dht/protos/DhtRpc.server';
|
|
2
|
+
import { Empty } from '../../../generated/google/protobuf/empty';
|
|
3
|
+
import { DataEntry, RecursiveOperationResponse, PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
4
4
|
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
5
5
|
import { DhtAddress } from '../../identifiers';
|
|
6
6
|
interface RecursiveOperationSessionRpcLocalOptions {
|
|
@@ -10,7 +10,7 @@ class RecursiveOperationSessionRpcLocal {
|
|
|
10
10
|
this.options = options;
|
|
11
11
|
}
|
|
12
12
|
async sendResponse(report, context) {
|
|
13
|
-
const remoteNodeId = (0, identifiers_1.
|
|
13
|
+
const remoteNodeId = (0, identifiers_1.toNodeId)(context.incomingSourceDescriptor);
|
|
14
14
|
logger.trace('RecursiveOperationResponse arrived: ' + JSON.stringify(report));
|
|
15
15
|
this.options.onResponseReceived(remoteNodeId, report.routingPath, report.closestConnectedNodes, report.dataEntries, report.noCloserNodesFound);
|
|
16
16
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationSessionRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts"],"names":[],"mappings":";;;AAGA,0CAAuC;AAGvC,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationSessionRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts"],"names":[],"mappings":";;;AAGA,0CAAuC;AAGvC,mDAAwD;AAExD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAYjC,MAAa,iCAAiC;IAEzB,OAAO,CAA0C;IAElE,YAAY,OAAiD;QACzD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAkC,EAAE,OAA0B;QAC7E,MAAM,YAAY,GAAG,IAAA,sBAAQ,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QACpF,MAAM,CAAC,KAAK,CAAC,sCAAsC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;QAC7E,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,YAAY,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,qBAAqB,EAAE,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAA;QAC9I,OAAO,EAAE,CAAA;IACb,CAAC;CACJ;AAdD,8EAcC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { DataEntry, PeerDescriptor } from '
|
|
2
|
-
import { RecursiveOperationSessionRpcClient } from '
|
|
1
|
+
import { DataEntry, PeerDescriptor } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
2
|
+
import { RecursiveOperationSessionRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client';
|
|
3
3
|
import { RpcRemote } from '../contact/RpcRemote';
|
|
4
4
|
export declare class RecursiveOperationSessionRpcRemote extends RpcRemote<RecursiveOperationSessionRpcClient> {
|
|
5
5
|
sendResponse(routingPath: PeerDescriptor[], closestConnectedNodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DuplicateDetector.js","sourceRoot":"","sources":["../../../../src/dht/routing/DuplicateDetector.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAiB;IAElB,MAAM,GAAgB,IAAI,GAAG,EAAE,CAAA;IAC/B,KAAK,
|
|
1
|
+
{"version":3,"file":"DuplicateDetector.js","sourceRoot":"","sources":["../../../../src/dht/routing/DuplicateDetector.ts"],"names":[],"mappings":";;;AAAA,MAAa,iBAAiB;IAElB,MAAM,GAAgB,IAAI,GAAG,EAAE,CAAA;IAC/B,KAAK,GAAa,EAAE,CAAA;IACpB,YAAY,CAAQ;IAE5B,YACI,YAAoB;QAEpB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;IACpC,CAAC;IAEM,GAAG,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACtB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACxC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAG,CAAA;YACnC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QAC/B,CAAC;IACL,CAAC;IAEM,qBAAqB,CAAC,KAAa;QACtC,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAEM,IAAI;QACP,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IAC3B,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;QACnB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;IACnB,CAAC;CACJ;AAjCD,8CAiCC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Message, PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '
|
|
1
|
+
import { Message, PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
2
2
|
import { RoutingMode, RoutingSession } from './RoutingSession';
|
|
3
3
|
import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
|
|
4
4
|
import { DhtAddress } from '../../identifiers';
|
|
@@ -15,6 +15,8 @@ export declare class Router {
|
|
|
15
15
|
private readonly duplicateRequestDetector;
|
|
16
16
|
private stopped;
|
|
17
17
|
private readonly options;
|
|
18
|
+
private messagesRouted;
|
|
19
|
+
private messagesSent;
|
|
18
20
|
constructor(options: RouterOptions);
|
|
19
21
|
private registerLocalRpcMethods;
|
|
20
22
|
send(msg: Message, reachableThrough: PeerDescriptor[]): void;
|
|
@@ -28,5 +30,6 @@ export declare class Router {
|
|
|
28
30
|
onNodeDisconnected(peerDescriptor: PeerDescriptor): void;
|
|
29
31
|
resetCache(): void;
|
|
30
32
|
stop(): void;
|
|
33
|
+
getDiagnosticInfo(): Record<string, unknown>;
|
|
31
34
|
private setForwardingEntries;
|
|
32
35
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Router = void 0;
|
|
4
|
-
const DhtRpc_1 = require("
|
|
4
|
+
const DhtRpc_1 = require("../../../generated/packages/dht/protos/DhtRpc");
|
|
5
5
|
const RoutingSession_1 = require("./RoutingSession");
|
|
6
6
|
const utils_1 = require("@streamr/utils");
|
|
7
7
|
const DuplicateDetector_1 = require("./DuplicateDetector");
|
|
@@ -18,6 +18,8 @@ class Router {
|
|
|
18
18
|
duplicateRequestDetector = new DuplicateDetector_1.DuplicateDetector(10000);
|
|
19
19
|
stopped = false;
|
|
20
20
|
options;
|
|
21
|
+
messagesRouted = 0;
|
|
22
|
+
messagesSent = 0;
|
|
21
23
|
constructor(options) {
|
|
22
24
|
this.options = options;
|
|
23
25
|
this.registerLocalRpcMethods();
|
|
@@ -46,7 +48,7 @@ class Router {
|
|
|
46
48
|
send(msg, reachableThrough) {
|
|
47
49
|
msg.sourceDescriptor = this.options.localPeerDescriptor;
|
|
48
50
|
const targetPeerDescriptor = msg.targetDescriptor;
|
|
49
|
-
const forwardingEntry = this.forwardingTable.get((0, identifiers_1.
|
|
51
|
+
const forwardingEntry = this.forwardingTable.get((0, identifiers_1.toNodeId)(targetPeerDescriptor));
|
|
50
52
|
if (forwardingEntry && forwardingEntry.peerDescriptors.length > 0) {
|
|
51
53
|
const forwardedMessage = {
|
|
52
54
|
message: msg,
|
|
@@ -81,21 +83,20 @@ class Router {
|
|
|
81
83
|
throw new Error(error);
|
|
82
84
|
}
|
|
83
85
|
}
|
|
86
|
+
this.messagesSent += 1;
|
|
84
87
|
}
|
|
85
88
|
doRouteMessage(routedMessage, mode = RoutingSession_1.RoutingMode.ROUTE, excludedPeer) {
|
|
86
89
|
if (this.stopped) {
|
|
87
90
|
return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.STOPPED);
|
|
88
91
|
}
|
|
89
|
-
logger.trace(`Routing message ${routedMessage.requestId} from ${(0, identifiers_1.
|
|
90
|
-
+ `to ${(0, identifiers_1.
|
|
92
|
+
logger.trace(`Routing message ${routedMessage.requestId} from ${(0, identifiers_1.toNodeId)(routedMessage.sourcePeer)} `
|
|
93
|
+
+ `to ${(0, identifiers_1.toDhtAddress)(routedMessage.target)}`);
|
|
91
94
|
const session = this.createRoutingSession(routedMessage, mode, excludedPeer);
|
|
92
95
|
const contacts = session.updateAndGetRoutablePeers();
|
|
93
96
|
if (contacts.length > 0) {
|
|
94
97
|
this.addRoutingSession(session);
|
|
95
|
-
// eslint-disable-next-line promise/catch-or-return
|
|
96
98
|
logger.trace('starting to raceEvents from routingSession: ' + session.sessionId);
|
|
97
99
|
let eventReceived;
|
|
98
|
-
// eslint-disable-next-line @typescript-eslint/no-floating-promises
|
|
99
100
|
(0, utils_1.executeSafePromise)(async () => {
|
|
100
101
|
eventReceived = (0, utils_1.raceEvents3)(session, ['routingSucceeded', 'partialSuccess', 'routingFailed', 'stopped'], null);
|
|
101
102
|
});
|
|
@@ -112,6 +113,7 @@ class Router {
|
|
|
112
113
|
this.removeRoutingSession(session.sessionId);
|
|
113
114
|
});
|
|
114
115
|
session.sendMoreRequests(contacts);
|
|
116
|
+
this.messagesRouted += 1;
|
|
115
117
|
return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage);
|
|
116
118
|
}
|
|
117
119
|
else {
|
|
@@ -120,7 +122,7 @@ class Router {
|
|
|
120
122
|
}
|
|
121
123
|
}
|
|
122
124
|
createRoutingSession(routedMessage, mode, excludedNode) {
|
|
123
|
-
const excludedNodeIds = new Set(routedMessage.routingPath.map((descriptor) => (0, identifiers_1.
|
|
125
|
+
const excludedNodeIds = new Set(routedMessage.routingPath.map((descriptor) => (0, identifiers_1.toNodeId)(descriptor)));
|
|
124
126
|
if (excludedNode) {
|
|
125
127
|
excludedNodeIds.add(excludedNode);
|
|
126
128
|
}
|
|
@@ -156,7 +158,7 @@ class Router {
|
|
|
156
158
|
this.routingTablesCache.onNodeConnected(remote);
|
|
157
159
|
}
|
|
158
160
|
onNodeDisconnected(peerDescriptor) {
|
|
159
|
-
this.routingTablesCache.onNodeDisconnected((0, identifiers_1.
|
|
161
|
+
this.routingTablesCache.onNodeDisconnected((0, identifiers_1.toNodeId)(peerDescriptor));
|
|
160
162
|
}
|
|
161
163
|
resetCache() {
|
|
162
164
|
this.routingTablesCache.reset();
|
|
@@ -174,12 +176,18 @@ class Router {
|
|
|
174
176
|
this.duplicateRequestDetector.clear();
|
|
175
177
|
this.routingTablesCache.reset();
|
|
176
178
|
}
|
|
179
|
+
getDiagnosticInfo() {
|
|
180
|
+
return {
|
|
181
|
+
messagesRouted: this.messagesRouted,
|
|
182
|
+
messagesSent: this.messagesSent
|
|
183
|
+
};
|
|
184
|
+
}
|
|
177
185
|
setForwardingEntries(routedMessage) {
|
|
178
186
|
const reachableThroughWithoutSelf = routedMessage.reachableThrough.filter((peer) => {
|
|
179
187
|
return !(0, identifiers_1.areEqualPeerDescriptors)(peer, this.options.localPeerDescriptor);
|
|
180
188
|
});
|
|
181
189
|
if (reachableThroughWithoutSelf.length > 0) {
|
|
182
|
-
const sourceNodeId = (0, identifiers_1.
|
|
190
|
+
const sourceNodeId = (0, identifiers_1.toNodeId)(routedMessage.sourcePeer);
|
|
183
191
|
if (this.forwardingTable.has(sourceNodeId)) {
|
|
184
192
|
const oldEntry = this.forwardingTable.get(sourceNodeId);
|
|
185
193
|
clearTimeout(oldEntry.timeout);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../../src/dht/routing/Router.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../../src/dht/routing/Router.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Message, PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessageWrapper } from '
|
|
2
|
-
import { IRouterRpc } from '
|
|
1
|
+
import { Message, PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
2
|
+
import { IRouterRpc } from '../../../generated/packages/dht/protos/DhtRpc.server';
|
|
3
3
|
import { DuplicateDetector } from './DuplicateDetector';
|
|
4
4
|
import { RoutingMode } from './RoutingSession';
|
|
5
5
|
interface RouterRpcLocalOptions {
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RouterRpcLocal = exports.createRouteMessageAck = void 0;
|
|
4
4
|
const utils_1 = require("@streamr/utils");
|
|
5
|
-
const DhtRpc_1 = require("
|
|
5
|
+
const DhtRpc_1 = require("../../../generated/packages/dht/protos/DhtRpc");
|
|
6
6
|
const RoutingSession_1 = require("./RoutingSession");
|
|
7
7
|
const identifiers_1 = require("../../identifiers");
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
@@ -22,8 +22,8 @@ class RouterRpcLocal {
|
|
|
22
22
|
}
|
|
23
23
|
async routeMessage(routedMessage) {
|
|
24
24
|
if (this.options.duplicateRequestDetector.isMostLikelyDuplicate(routedMessage.requestId)) {
|
|
25
|
-
logger.trace(`Routing message ${routedMessage.requestId} from ${(0, identifiers_1.
|
|
26
|
-
+ `to ${(0, identifiers_1.
|
|
25
|
+
logger.trace(`Routing message ${routedMessage.requestId} from ${(0, identifiers_1.toNodeId)(routedMessage.sourcePeer)} `
|
|
26
|
+
+ `to ${(0, identifiers_1.toDhtAddress)(routedMessage.target)} is likely a duplicate`);
|
|
27
27
|
return (0, exports.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.DUPLICATE);
|
|
28
28
|
}
|
|
29
29
|
logger.trace(`Processing received routeMessage ${routedMessage.requestId}`);
|
|
@@ -40,8 +40,8 @@ class RouterRpcLocal {
|
|
|
40
40
|
}
|
|
41
41
|
async forwardMessage(forwardMessage) {
|
|
42
42
|
if (this.options.duplicateRequestDetector.isMostLikelyDuplicate(forwardMessage.requestId)) {
|
|
43
|
-
logger.trace(`Forwarding message ${forwardMessage.requestId} from ${(0, identifiers_1.
|
|
44
|
-
+ `to ${(0, identifiers_1.
|
|
43
|
+
logger.trace(`Forwarding message ${forwardMessage.requestId} from ${(0, identifiers_1.toNodeId)(forwardMessage.sourcePeer)} `
|
|
44
|
+
+ `to ${(0, identifiers_1.toDhtAddress)(forwardMessage.target)} is likely a duplicate`);
|
|
45
45
|
return (0, exports.createRouteMessageAck)(forwardMessage, DhtRpc_1.RouteMessageError.DUPLICATE);
|
|
46
46
|
}
|
|
47
47
|
logger.trace(`Processing received forward routeMessage ${forwardMessage.requestId}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"RouterRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAyD;AACzD,0EAAgJ;AAGhJ,qDAA8C;AAC9C,mDAAmF;AACnF,+BAAyB;AAUzB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,qBAAqB,GAAG,CAAC,aAAkC,EAAE,KAAyB,EAAmB,EAAE;IACpH,MAAM,GAAG,GAAoB;QACzB,SAAS,EAAE,aAAa,CAAC,SAAS;QAClC,KAAK;KACR,CAAA;IACD,OAAO,GAAG,CAAA;AACd,CAAC,CAAA;AANY,QAAA,qBAAqB,yBAMjC;AAED,MAAa,cAAc;IAEN,OAAO,CAAuB;IAE/C,YAAY,OAA8B;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,aAAkC;QACjD,IAAI,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,qBAAqB,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YACvF,MAAM,CAAC,KAAK,CAAC,mBAAmB,aAAa,CAAC,SAAS,SAAS,IAAA,sBAAQ,EAAC,aAAa,CAAC,UAAW,CAAC,GAAG;kBAChG,MAAM,IAAA,0BAAY,EAAC,aAAa,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAA;YACvE,OAAO,IAAA,6BAAqB,EAAC,aAAa,EAAE,0BAAiB,CAAC,SAAS,CAAC,CAAA;QAC5E,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,oCAAoC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAA;QAC3E,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAA;QAClE,IAAI,IAAA,wBAAgB,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;YAClF,MAAM,CAAC,KAAK,CAAC,oCAAoC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAA;YAC3E,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAA;YAChD,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,OAAQ,CAAC,CAAA;YAClD,OAAO,IAAA,6BAAqB,EAAC,aAAa,CAAC,CAAA;QAC/C,CAAC;aAAM,CAAC;YACJ,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,aAAa,CAAC,CAAA;QACrD,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,cAAmC;QACpD,IAAI,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,qBAAqB,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;YACxF,MAAM,CAAC,KAAK,CAAC,sBAAsB,cAAc,CAAC,SAAS,SAAS,IAAA,sBAAQ,EAAC,cAAc,CAAC,UAAW,CAAC,GAAG;kBACrG,MAAM,IAAA,0BAAY,EAAC,cAAc,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAA;YACxE,OAAO,IAAA,6BAAqB,EAAC,cAAc,EAAE,0BAAiB,CAAC,SAAS,CAAC,CAAA;QAC7E,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,4CAA4C,cAAc,CAAC,SAAS,EAAE,CAAC,CAAA;QACpF,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;QACnE,IAAI,IAAA,wBAAgB,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,MAAM,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;YACnF,OAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAA;QACpD,CAAC;aAAM,CAAC;YACJ,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,4BAAW,CAAC,OAAO,CAAC,CAAA;QAC3E,CAAC;IACL,CAAC;IAEO,oBAAoB,CAAC,aAAkC;QAC3D,MAAM,CAAC,KAAK,CAAC,6CAA6C,aAAa,CAAC,SAAS,EAAE,CAAC,CAAA;QACpF,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAQ,CAAA;QAC/C,IAAI,IAAA,qCAAuB,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,gBAAiB,CAAC,EAAE,CAAC;YAChG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAA;YAC5C,OAAO,IAAA,6BAAqB,EAAC,aAAa,CAAC,CAAA;QAC/C,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,GAAG,aAAa,EAAE,SAAS,EAAE,IAAA,SAAE,GAAE,EAAE,MAAM,EAAE,gBAAgB,CAAC,gBAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;IAChI,CAAC;CAEJ;AAnDD,wCAmDC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { RouteMessageWrapper } from '
|
|
2
|
-
import { RouterRpcClient } from '
|
|
1
|
+
import { RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
2
|
+
import { RouterRpcClient } from '../../../generated/packages/dht/protos/DhtRpc.client';
|
|
3
3
|
import { RpcRemote } from '../contact/RpcRemote';
|
|
4
4
|
export declare const ROUTING_TIMEOUT = 2000;
|
|
5
5
|
export declare class RouterRpcRemote extends RpcRemote<RouterRpcClient> {
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.RouterRpcRemote = exports.ROUTING_TIMEOUT = void 0;
|
|
4
4
|
const utils_1 = require("@streamr/utils");
|
|
5
5
|
const uuid_1 = require("uuid");
|
|
6
|
-
const DhtRpc_1 = require("
|
|
6
|
+
const DhtRpc_1 = require("../../../generated/packages/dht/protos/DhtRpc");
|
|
7
7
|
const RpcRemote_1 = require("../contact/RpcRemote");
|
|
8
8
|
const getPreviousPeer_1 = require("./getPreviousPeer");
|
|
9
9
|
const identifiers_1 = require("../../identifiers");
|
|
@@ -38,9 +38,9 @@ class RouterRpcRemote extends RpcRemote_1.RpcRemote {
|
|
|
38
38
|
catch (err) {
|
|
39
39
|
const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(params);
|
|
40
40
|
const fromNode = previousPeer
|
|
41
|
-
? (0, identifiers_1.
|
|
42
|
-
: (0, identifiers_1.
|
|
43
|
-
const toNode = (0, identifiers_1.
|
|
41
|
+
? (0, identifiers_1.toNodeId)(previousPeer)
|
|
42
|
+
: (0, identifiers_1.toNodeId)(params.sourcePeer);
|
|
43
|
+
const toNode = (0, identifiers_1.toNodeId)(this.getPeerDescriptor());
|
|
44
44
|
logger.trace(`Failed to send routeMessage from ${fromNode} to ${toNode}`, { err });
|
|
45
45
|
return false;
|
|
46
46
|
}
|
|
@@ -68,9 +68,9 @@ class RouterRpcRemote extends RpcRemote_1.RpcRemote {
|
|
|
68
68
|
catch (err) {
|
|
69
69
|
const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(params);
|
|
70
70
|
const fromNode = previousPeer
|
|
71
|
-
? (0, identifiers_1.
|
|
72
|
-
: (0, identifiers_1.
|
|
73
|
-
const toNode = (0, identifiers_1.
|
|
71
|
+
? (0, identifiers_1.toNodeId)(previousPeer)
|
|
72
|
+
: (0, identifiers_1.toNodeId)(params.sourcePeer);
|
|
73
|
+
const toNode = (0, identifiers_1.toNodeId)(this.getPeerDescriptor());
|
|
74
74
|
logger.trace(`Failed to send forwardMessage from ${fromNode} to ${toNode}`, { err });
|
|
75
75
|
return false;
|
|
76
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcRemote.ts"],"names":[],"mappings":";;;AAAA,0CAAyD;AACzD,+BAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"RouterRpcRemote.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcRemote.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import EventEmitter from 'eventemitter3';
|
|
2
|
-
import { PeerDescriptor, RouteMessageWrapper } from '
|
|
2
|
+
import { PeerDescriptor, RouteMessageWrapper } from '../../../generated/packages/dht/protos/DhtRpc';
|
|
3
3
|
import { RouterRpcRemote } from './RouterRpcRemote';
|
|
4
4
|
import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
|
|
5
5
|
import { Contact } from '../contact/Contact';
|
|
@@ -9,7 +9,7 @@ const utils_1 = require("@streamr/utils");
|
|
|
9
9
|
const eventemitter3_1 = __importDefault(require("eventemitter3"));
|
|
10
10
|
const uuid_1 = require("uuid");
|
|
11
11
|
const RouterRpcRemote_1 = require("./RouterRpcRemote");
|
|
12
|
-
const DhtRpc_client_1 = require("
|
|
12
|
+
const DhtRpc_client_1 = require("../../../generated/packages/dht/protos/DhtRpc.client");
|
|
13
13
|
const Contact_1 = require("../contact/Contact");
|
|
14
14
|
const RecursiveOperationRpcRemote_1 = require("../recursive-operation/RecursiveOperationRpcRemote");
|
|
15
15
|
const getPreviousPeer_1 = require("./getPreviousPeer");
|
|
@@ -17,7 +17,7 @@ const identifiers_1 = require("../../identifiers");
|
|
|
17
17
|
const lodash_1 = require("lodash");
|
|
18
18
|
const logger = new utils_1.Logger(module);
|
|
19
19
|
const MAX_FAILED_HOPS = 2;
|
|
20
|
-
const ROUTING_TABLE_MAX_SIZE =
|
|
20
|
+
const ROUTING_TABLE_MAX_SIZE = 5;
|
|
21
21
|
class RoutingRemoteContact extends Contact_1.Contact {
|
|
22
22
|
routerRpcRemote;
|
|
23
23
|
recursiveOperationRpcRemote;
|
|
@@ -124,15 +124,15 @@ class RoutingSession extends eventemitter3_1.default {
|
|
|
124
124
|
updateAndGetRoutablePeers() {
|
|
125
125
|
logger.trace('getRoutablePeers() sessionId: ' + this.sessionId);
|
|
126
126
|
const previousPeer = (0, getPreviousPeer_1.getPreviousPeer)(this.options.routedMessage);
|
|
127
|
-
const previousId = previousPeer ? (0, identifiers_1.
|
|
128
|
-
const targetId = (0, identifiers_1.
|
|
127
|
+
const previousId = previousPeer ? (0, identifiers_1.toNodeId)(previousPeer) : undefined;
|
|
128
|
+
const targetId = (0, identifiers_1.toDhtAddress)(this.options.routedMessage.target);
|
|
129
129
|
let routingTable;
|
|
130
|
-
if (this.options.routingTablesCache.has(targetId, previousId)) {
|
|
130
|
+
if (this.options.routingTablesCache.has(targetId, previousId) && this.options.routingTablesCache.get(targetId, previousId).getSize() > 0) {
|
|
131
131
|
routingTable = this.options.routingTablesCache.get(targetId, previousId);
|
|
132
132
|
}
|
|
133
133
|
else {
|
|
134
134
|
routingTable = new SortedContactList_1.SortedContactList({
|
|
135
|
-
referenceId: (0, identifiers_1.
|
|
135
|
+
referenceId: (0, identifiers_1.toDhtAddress)(this.options.routedMessage.target),
|
|
136
136
|
maxSize: ROUTING_TABLE_MAX_SIZE,
|
|
137
137
|
allowToContainReferenceId: true,
|
|
138
138
|
nodeIdDistanceLimit: previousId
|
|
@@ -156,8 +156,7 @@ class RoutingSession extends eventemitter3_1.default {
|
|
|
156
156
|
}
|
|
157
157
|
while ((this.ongoingRequests.size < this.options.parallelism) && (uncontacted.length > 0) && !this.stopped) {
|
|
158
158
|
const nextPeer = uncontacted.shift();
|
|
159
|
-
|
|
160
|
-
logger.trace(`Sending routeMessage request to contact: ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(nextPeer.getPeerDescriptor())} (sessionId=${this.sessionId})`);
|
|
159
|
+
logger.trace(`Sending routeMessage request to contact: ${(0, identifiers_1.toNodeId)(nextPeer.getPeerDescriptor())} (sessionId=${this.sessionId})`);
|
|
161
160
|
this.contactedPeers.add(nextPeer.getNodeId());
|
|
162
161
|
this.ongoingRequests.add(nextPeer.getNodeId());
|
|
163
162
|
this.addParallelRootIfSource(nextPeer.getNodeId());
|