@streamr/dht 100.2.5-beta.1 → 101.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 +8 -8
- package/dist/src/connection/ConnectionLockRpcLocal.d.ts +3 -3
- package/dist/src/connection/ConnectionLockRpcLocal.js +8 -8
- package/dist/src/connection/ConnectionLockRpcLocal.js.map +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.js +1 -1
- package/dist/src/connection/ConnectionLockRpcRemote.js.map +1 -1
- package/dist/src/connection/ConnectionManager.d.ts +4 -6
- package/dist/src/connection/ConnectionManager.js +128 -103
- package/dist/src/connection/ConnectionManager.js.map +1 -1
- package/dist/src/connection/ConnectorFacade.d.ts +15 -14
- package/dist/src/connection/ConnectorFacade.js +70 -52
- package/dist/src/connection/ConnectorFacade.js.map +1 -1
- package/dist/src/connection/Handshaker.d.ts +9 -2
- package/dist/src/connection/Handshaker.js +117 -27
- package/dist/src/connection/Handshaker.js.map +1 -1
- package/dist/src/connection/ManagedConnection.d.ts +13 -38
- package/dist/src/connection/ManagedConnection.js +31 -252
- package/dist/src/connection/ManagedConnection.js.map +1 -1
- package/dist/src/connection/OutputBuffer.d.ts +9 -0
- package/dist/src/connection/OutputBuffer.js +26 -0
- package/dist/src/connection/OutputBuffer.js.map +1 -0
- package/dist/src/connection/PendingConnection.d.ts +19 -0
- package/dist/src/connection/PendingConnection.js +59 -0
- package/dist/src/connection/PendingConnection.js.map +1 -0
- package/dist/src/connection/connectivityChecker.js +3 -3
- package/dist/src/connection/connectivityChecker.js.map +1 -1
- package/dist/src/connection/connectivityRequestHandler.js +2 -2
- package/dist/src/connection/connectivityRequestHandler.js.map +1 -1
- package/dist/src/connection/simulator/Simulator.d.ts +1 -3
- package/dist/src/connection/simulator/Simulator.js +1 -4
- package/dist/src/connection/simulator/Simulator.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorConnection.js +1 -2
- package/dist/src/connection/simulator/SimulatorConnection.js.map +1 -1
- package/dist/src/connection/simulator/SimulatorConnector.d.ts +3 -3
- package/dist/src/connection/simulator/SimulatorConnector.js +28 -21
- package/dist/src/connection/simulator/SimulatorConnector.js.map +1 -1
- package/dist/src/connection/webrtc/NodeWebrtcConnection.d.ts +1 -6
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js +3 -20
- package/dist/src/connection/webrtc/NodeWebrtcConnection.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnector.d.ts +11 -6
- package/dist/src/connection/webrtc/WebrtcConnector.js +57 -42
- package/dist/src/connection/webrtc/WebrtcConnector.js.map +1 -1
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts +8 -10
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js +21 -44
- package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js.map +1 -1
- package/dist/src/connection/websocket/AbstractWebsocketClientConnection.js +8 -2
- package/dist/src/connection/websocket/AbstractWebsocketClientConnection.js.map +1 -1
- package/dist/src/connection/websocket/AutoCertifierClientFacade.d.ts +3 -3
- package/dist/src/connection/websocket/AutoCertifierClientFacade.js +8 -8
- package/dist/src/connection/websocket/AutoCertifierClientFacade.js.map +1 -1
- package/dist/src/connection/websocket/NodeWebsocketClientConnection.js +1 -1
- package/dist/src/connection/websocket/NodeWebsocketClientConnection.js.map +1 -1
- package/dist/src/connection/websocket/WebsocketClientConnector.d.ts +26 -0
- package/dist/src/connection/websocket/WebsocketClientConnector.js +86 -0
- package/dist/src/connection/websocket/WebsocketClientConnector.js.map +1 -0
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcLocal.d.ts +19 -0
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcLocal.js +23 -0
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcLocal.js.map +1 -0
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcRemote.d.ts +5 -0
- package/dist/src/connection/websocket/{WebsocketConnectorRpcRemote.js → WebsocketClientConnectorRpcRemote.js} +4 -4
- package/dist/src/connection/websocket/WebsocketClientConnectorRpcRemote.js.map +1 -0
- package/dist/src/connection/websocket/WebsocketServer.d.ts +8 -5
- package/dist/src/connection/websocket/WebsocketServer.js +11 -11
- package/dist/src/connection/websocket/WebsocketServer.js.map +1 -1
- package/dist/src/connection/websocket/{WebsocketConnector.d.ts → WebsocketServerConnector.d.ts} +16 -21
- package/dist/src/connection/websocket/{WebsocketConnector.js → WebsocketServerConnector.js} +112 -160
- package/dist/src/connection/websocket/WebsocketServerConnector.js.map +1 -0
- package/dist/src/dht/DhtNode.d.ts +4 -4
- package/dist/src/dht/DhtNode.js +85 -84
- package/dist/src/dht/DhtNode.js.map +1 -1
- package/dist/src/dht/DhtNodeRpcLocal.d.ts +3 -3
- package/dist/src/dht/DhtNodeRpcLocal.js +9 -9
- package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -1
- package/dist/src/dht/ExternalApiRpcLocal.d.ts +3 -3
- package/dist/src/dht/ExternalApiRpcLocal.js +5 -5
- package/dist/src/dht/ExternalApiRpcLocal.js.map +1 -1
- package/dist/src/dht/ExternalApiRpcRemote.js +2 -2
- package/dist/src/dht/ExternalApiRpcRemote.js.map +1 -1
- package/dist/src/dht/PeerManager.d.ts +4 -4
- package/dist/src/dht/PeerManager.js +22 -22
- package/dist/src/dht/PeerManager.js.map +1 -1
- package/dist/src/dht/contact/SortedContactList.d.ts +3 -3
- package/dist/src/dht/contact/SortedContactList.js +9 -9
- package/dist/src/dht/contact/SortedContactList.js.map +1 -1
- package/dist/src/dht/discovery/DiscoverySession.d.ts +3 -3
- package/dist/src/dht/discovery/DiscoverySession.js +21 -21
- package/dist/src/dht/discovery/DiscoverySession.js.map +1 -1
- package/dist/src/dht/discovery/PeerDiscovery.d.ts +3 -3
- package/dist/src/dht/discovery/PeerDiscovery.js +46 -44
- package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
- package/dist/src/dht/discovery/RingDiscoverySession.d.ts +3 -3
- package/dist/src/dht/discovery/RingDiscoverySession.js +19 -19
- package/dist/src/dht/discovery/RingDiscoverySession.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.d.ts +3 -3
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js +33 -33
- package/dist/src/dht/recursive-operation/RecursiveOperationManager.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.d.ts +3 -3
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.js +8 -8
- package/dist/src/dht/recursive-operation/RecursiveOperationRpcLocal.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.d.ts +4 -4
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js +24 -24
- package/dist/src/dht/recursive-operation/RecursiveOperationSession.js.map +1 -1
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.d.ts +4 -4
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js +5 -5
- package/dist/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.js.map +1 -1
- package/dist/src/dht/routing/Router.d.ts +3 -3
- package/dist/src/dht/routing/Router.js +20 -20
- package/dist/src/dht/routing/Router.js.map +1 -1
- package/dist/src/dht/routing/RouterRpcLocal.d.ts +3 -3
- package/dist/src/dht/routing/RouterRpcLocal.js +16 -16
- package/dist/src/dht/routing/RouterRpcLocal.js.map +1 -1
- package/dist/src/dht/routing/RoutingSession.d.ts +3 -3
- package/dist/src/dht/routing/RoutingSession.js +24 -24
- package/dist/src/dht/routing/RoutingSession.js.map +1 -1
- package/dist/src/dht/store/StoreManager.d.ts +3 -3
- package/dist/src/dht/store/StoreManager.js +25 -25
- package/dist/src/dht/store/StoreManager.js.map +1 -1
- package/dist/src/dht/store/StoreRpcLocal.d.ts +3 -3
- package/dist/src/dht/store/StoreRpcLocal.js +12 -12
- package/dist/src/dht/store/StoreRpcLocal.js.map +1 -1
- package/dist/src/exports.d.ts +3 -0
- package/dist/src/exports.js +5 -1
- package/dist/src/exports.js.map +1 -1
- package/dist/src/proto/google/protobuf/any.d.ts +5 -8
- package/dist/src/proto/google/protobuf/any.js.map +1 -1
- package/dist/src/proto/google/protobuf/empty.d.ts +1 -0
- package/dist/src/proto/google/protobuf/empty.js.map +1 -1
- package/dist/src/proto/google/protobuf/timestamp.d.ts +1 -10
- package/dist/src/proto/google/protobuf/timestamp.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +4 -4
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +8 -8
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +3 -3
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +4 -4
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +2 -2
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.js +1 -1
- package/dist/src/transport/ListeningRpcCommunicator.d.ts +2 -2
- package/dist/src/transport/ListeningRpcCommunicator.js +2 -2
- package/dist/src/transport/ListeningRpcCommunicator.js.map +1 -1
- package/dist/src/transport/RoutingRpcCommunicator.d.ts +2 -2
- package/dist/src/transport/RoutingRpcCommunicator.js +2 -2
- package/dist/src/transport/RoutingRpcCommunicator.js.map +1 -1
- package/package.json +8 -8
- package/protos/DhtRpc.proto +1 -1
- package/src/connection/ConnectionLockRpcLocal.ts +9 -9
- package/src/connection/ConnectionLockRpcRemote.ts +1 -1
- package/src/connection/ConnectionManager.ts +153 -111
- package/src/connection/ConnectorFacade.ts +84 -61
- package/src/connection/Handshaker.ts +131 -27
- package/src/connection/ManagedConnection.ts +41 -304
- package/src/connection/OutputBuffer.ts +28 -0
- package/src/connection/PendingConnection.ts +68 -0
- package/src/connection/connectivityChecker.ts +2 -2
- package/src/connection/connectivityRequestHandler.ts +1 -1
- package/src/connection/simulator/Simulator.ts +1 -5
- package/src/connection/simulator/SimulatorConnection.ts +1 -2
- package/src/connection/simulator/SimulatorConnector.ts +34 -33
- package/src/connection/webrtc/BrowserWebrtcConnection.ts +0 -6
- package/src/connection/webrtc/NodeWebrtcConnection.ts +3 -24
- package/src/connection/webrtc/WebrtcConnector.ts +73 -62
- package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +26 -56
- package/src/connection/websocket/AbstractWebsocketClientConnection.ts +8 -2
- package/src/connection/websocket/AutoCertifierClientFacade.ts +11 -11
- package/src/connection/websocket/NodeWebsocketClientConnection.ts +1 -1
- package/src/connection/websocket/WebsocketClientConnector.ts +119 -0
- package/src/connection/websocket/WebsocketClientConnectorRpcLocal.ts +39 -0
- package/src/connection/websocket/{WebsocketConnectorRpcRemote.ts → WebsocketClientConnectorRpcRemote.ts} +2 -2
- package/src/connection/websocket/WebsocketServer.ts +18 -14
- package/src/connection/websocket/{WebsocketConnector.ts → WebsocketServerConnector.ts} +128 -205
- package/src/dht/DhtNode.ts +90 -89
- package/src/dht/DhtNodeRpcLocal.ts +11 -11
- package/src/dht/ExternalApiRpcLocal.ts +6 -6
- package/src/dht/ExternalApiRpcRemote.ts +2 -2
- package/src/dht/PeerManager.ts +24 -24
- package/src/dht/contact/SortedContactList.ts +10 -10
- package/src/dht/discovery/DiscoverySession.ts +24 -24
- package/src/dht/discovery/PeerDiscovery.ts +47 -45
- package/src/dht/discovery/RingDiscoverySession.ts +23 -23
- package/src/dht/recursive-operation/RecursiveOperationManager.ts +36 -36
- package/src/dht/recursive-operation/RecursiveOperationRpcLocal.ts +9 -9
- package/src/dht/recursive-operation/RecursiveOperationSession.ts +25 -25
- package/src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts +7 -7
- package/src/dht/routing/Router.ts +21 -21
- package/src/dht/routing/RouterRpcLocal.ts +17 -17
- package/src/dht/routing/RoutingSession.ts +26 -26
- package/src/dht/store/StoreManager.ts +27 -27
- package/src/dht/store/StoreRpcLocal.ts +13 -13
- package/src/exports.ts +3 -0
- package/src/proto/google/protobuf/any.ts +6 -9
- package/src/proto/google/protobuf/empty.ts +2 -1
- package/src/proto/google/protobuf/timestamp.ts +2 -11
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +9 -9
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +3 -3
- package/src/proto/packages/dht/protos/DhtRpc.ts +4 -4
- package/src/proto/packages/proto-rpc/protos/ProtoRpc.ts +1 -1
- package/src/transport/ListeningRpcCommunicator.ts +3 -3
- package/src/transport/RoutingRpcCommunicator.ts +3 -3
- package/test/end-to-end/Layer0Webrtc.test.ts +0 -10
- package/test/integration/ConnectionManager.test.ts +3 -2
- package/test/integration/GeoIpConnectivityChecking.test.ts +1 -1
- package/test/integration/SimultaneousConnections.test.ts +2 -2
- package/test/integration/WebrtcConnectionManagement.test.ts +2 -10
- package/test/integration/{WebsocketConnectorRpc.test.ts → WebsocketClientConnectorRpc.test.ts} +9 -9
- package/test/integration/WebsocketConnectionManagement.test.ts +11 -29
- package/test/unit/ConnectionManager.test.ts +64 -0
- package/test/unit/DiscoverySession.test.ts +1 -1
- package/test/unit/Handshaker.test.ts +169 -0
- package/test/unit/ManagedConnection.test.ts +58 -0
- package/test/unit/PendingConnection.test.ts +57 -0
- package/test/unit/WebrtcConnector.test.ts +56 -0
- package/test/unit/{WebsocketConnector.test.ts → WebsocketClientConnector.test.ts} +56 -11
- package/test/unit/WebsocketServerConnector.test.ts +102 -0
- package/test/utils/FakeConnectorFacade.ts +41 -0
- package/test/utils/mock/MockConnection.ts +26 -0
- package/test/utils/utils.ts +2 -2
- package/dist/src/connection/IConnectionSource.d.ts +0 -4
- package/dist/src/connection/IConnectionSource.js +0 -3
- package/dist/src/connection/IConnectionSource.js.map +0 -1
- package/dist/src/connection/webrtc/ManagedWebrtcConnection.d.ts +0 -7
- package/dist/src/connection/webrtc/ManagedWebrtcConnection.js +0 -20
- package/dist/src/connection/webrtc/ManagedWebrtcConnection.js.map +0 -1
- package/dist/src/connection/websocket/WebsocketConnector.js.map +0 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.d.ts +0 -19
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js +0 -23
- package/dist/src/connection/websocket/WebsocketConnectorRpcLocal.js.map +0 -1
- package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.d.ts +0 -5
- package/dist/src/connection/websocket/WebsocketConnectorRpcRemote.js.map +0 -1
- package/src/connection/IConnectionSource.ts +0 -6
- package/src/connection/webrtc/ManagedWebrtcConnection.ts +0 -27
- package/src/connection/websocket/WebsocketConnectorRpcLocal.ts +0 -39
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '../../proto/packages/dht/protos/DhtRpc';
|
|
2
2
|
import { IRecursiveOperationRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
|
|
3
|
-
interface
|
|
3
|
+
interface RecursiveOperationRpcLocalOptions {
|
|
4
4
|
doRouteRequest: (routedMessage: RouteMessageWrapper) => RouteMessageAck;
|
|
5
5
|
addContact: (contact: PeerDescriptor, setActive?: boolean) => void;
|
|
6
6
|
isMostLikelyDuplicate: (requestId: string) => boolean;
|
|
7
7
|
addToDuplicateDetector: (requestId: string) => void;
|
|
8
8
|
}
|
|
9
9
|
export declare class RecursiveOperationRpcLocal implements IRecursiveOperationRpc {
|
|
10
|
-
private readonly
|
|
11
|
-
constructor(
|
|
10
|
+
private readonly options;
|
|
11
|
+
constructor(options: RecursiveOperationRpcLocalOptions);
|
|
12
12
|
routeRequest(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
|
|
13
13
|
}
|
|
14
14
|
export {};
|
|
@@ -8,18 +8,18 @@ const getPreviousPeer_1 = require("../routing/getPreviousPeer");
|
|
|
8
8
|
const identifiers_1 = require("../../identifiers");
|
|
9
9
|
const logger = new utils_1.Logger(module);
|
|
10
10
|
class RecursiveOperationRpcLocal {
|
|
11
|
-
|
|
12
|
-
constructor(
|
|
13
|
-
this.
|
|
11
|
+
options;
|
|
12
|
+
constructor(options) {
|
|
13
|
+
this.options = options;
|
|
14
14
|
}
|
|
15
15
|
async routeRequest(routedMessage) {
|
|
16
|
-
if (this.
|
|
16
|
+
if (this.options.isMostLikelyDuplicate(routedMessage.requestId)) {
|
|
17
17
|
return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.DUPLICATE);
|
|
18
18
|
}
|
|
19
|
-
const
|
|
20
|
-
logger.trace(`Received routeRequest call from ${
|
|
21
|
-
this.
|
|
22
|
-
return this.
|
|
19
|
+
const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)((0, getPreviousPeer_1.getPreviousPeer)(routedMessage) ?? routedMessage.sourcePeer);
|
|
20
|
+
logger.trace(`Received routeRequest call from ${remoteNodeId}`);
|
|
21
|
+
this.options.addToDuplicateDetector(routedMessage.requestId);
|
|
22
|
+
return this.options.doRouteRequest(routedMessage);
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
25
|
exports.RecursiveOperationRpcLocal = RecursiveOperationRpcLocal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,mEAAgI;AAEhI,8DAAiE;AACjE,gEAA4D;AAC5D,mDAA+D;AAE/D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AASjC,MAAa,0BAA0B;IAElB,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,mEAAgI;AAEhI,8DAAiE;AACjE,gEAA4D;AAC5D,mDAA+D;AAE/D,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,yCAA2B,EAAC,IAAA,iCAAe,EAAC,aAAa,CAAC,IAAI,aAAa,CAAC,UAAW,CAAC,CAAA;QAC7G,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"}
|
|
@@ -7,7 +7,7 @@ import { DhtAddress } from '../../identifiers';
|
|
|
7
7
|
export interface RecursiveOperationSessionEvents {
|
|
8
8
|
completed: () => void;
|
|
9
9
|
}
|
|
10
|
-
export interface
|
|
10
|
+
export interface RecursiveOperationSessionOptions {
|
|
11
11
|
transport: ITransport;
|
|
12
12
|
targetId: DhtAddress;
|
|
13
13
|
localPeerDescriptor: PeerDescriptor;
|
|
@@ -26,14 +26,14 @@ export declare class RecursiveOperationSession extends EventEmitter<RecursiveOpe
|
|
|
26
26
|
private completionEventEmitted;
|
|
27
27
|
private noCloserNodesReceivedCounter;
|
|
28
28
|
private readonly noCloserNodesReceivedFrom;
|
|
29
|
-
private readonly
|
|
30
|
-
constructor(
|
|
29
|
+
private readonly options;
|
|
30
|
+
constructor(options: RecursiveOperationSessionOptions);
|
|
31
31
|
private registerLocalRpcMethods;
|
|
32
32
|
start(serviceId: ServiceID): void;
|
|
33
33
|
private wrapRequest;
|
|
34
34
|
private isCompleted;
|
|
35
35
|
private hasNonStaleData;
|
|
36
|
-
onResponseReceived(
|
|
36
|
+
onResponseReceived(remoteNodeId: DhtAddress, routingPath: PeerDescriptor[], closestConnectedNodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean): void;
|
|
37
37
|
private addKnownHops;
|
|
38
38
|
private setHopAsReported;
|
|
39
39
|
private processFoundData;
|
|
@@ -23,36 +23,36 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
23
23
|
completionEventEmitted = false;
|
|
24
24
|
noCloserNodesReceivedCounter = 0;
|
|
25
25
|
noCloserNodesReceivedFrom = new Set();
|
|
26
|
-
|
|
27
|
-
constructor(
|
|
26
|
+
options;
|
|
27
|
+
constructor(options) {
|
|
28
28
|
super();
|
|
29
|
-
this.
|
|
29
|
+
this.options = options;
|
|
30
30
|
this.results = new SortedContactList_1.SortedContactList({
|
|
31
|
-
referenceId:
|
|
32
|
-
maxSize: 10, // TODO use
|
|
31
|
+
referenceId: options.targetId,
|
|
32
|
+
maxSize: 10, // TODO use options option or named constant?
|
|
33
33
|
allowToContainReferenceId: true
|
|
34
34
|
});
|
|
35
|
-
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(this.id,
|
|
36
|
-
rpcRequestTimeout: 15000 // TODO use
|
|
35
|
+
this.rpcCommunicator = new ListeningRpcCommunicator_1.ListeningRpcCommunicator(this.id, options.transport, {
|
|
36
|
+
rpcRequestTimeout: 15000 // TODO use options option or named constant?
|
|
37
37
|
});
|
|
38
38
|
this.registerLocalRpcMethods();
|
|
39
39
|
}
|
|
40
40
|
registerLocalRpcMethods() {
|
|
41
41
|
const rpcLocal = new RecursiveOperationSessionRpcLocal_1.RecursiveOperationSessionRpcLocal({
|
|
42
|
-
onResponseReceived: (
|
|
43
|
-
this.onResponseReceived(
|
|
42
|
+
onResponseReceived: (remoteNodeId, routingPath, closestConnectedNodes, dataEntries, noCloserNodesFound) => {
|
|
43
|
+
this.onResponseReceived(remoteNodeId, routingPath, closestConnectedNodes, dataEntries, noCloserNodesFound);
|
|
44
44
|
}
|
|
45
45
|
});
|
|
46
46
|
this.rpcCommunicator.registerRpcNotification(DhtRpc_1.RecursiveOperationResponse, 'sendResponse', (req, context) => rpcLocal.sendResponse(req, context));
|
|
47
47
|
}
|
|
48
48
|
start(serviceId) {
|
|
49
49
|
const routeMessage = this.wrapRequest(serviceId);
|
|
50
|
-
this.
|
|
50
|
+
this.options.doRouteRequest(routeMessage);
|
|
51
51
|
}
|
|
52
52
|
wrapRequest(serviceId) {
|
|
53
53
|
const request = {
|
|
54
54
|
sessionId: this.getId(),
|
|
55
|
-
operation: this.
|
|
55
|
+
operation: this.options.operation
|
|
56
56
|
};
|
|
57
57
|
const msg = {
|
|
58
58
|
messageId: (0, uuid_1.v4)(),
|
|
@@ -65,8 +65,8 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
65
65
|
const routeMessage = {
|
|
66
66
|
message: msg,
|
|
67
67
|
requestId: (0, uuid_1.v4)(),
|
|
68
|
-
target: (0, identifiers_1.getRawFromDhtAddress)(this.
|
|
69
|
-
sourcePeer: this.
|
|
68
|
+
target: (0, identifiers_1.getRawFromDhtAddress)(this.options.targetId),
|
|
69
|
+
sourcePeer: this.options.localPeerDescriptor,
|
|
70
70
|
reachableThrough: [],
|
|
71
71
|
routingPath: [],
|
|
72
72
|
parallelRootNodeIds: []
|
|
@@ -79,11 +79,11 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
79
79
|
unreportedHops.delete(id);
|
|
80
80
|
});
|
|
81
81
|
if (this.noCloserNodesReceivedCounter >= 1 && unreportedHops.size === 0) {
|
|
82
|
-
if (this.
|
|
83
|
-
&& (this.hasNonStaleData() || this.noCloserNodesReceivedCounter >= this.
|
|
82
|
+
if (this.options.operation === DhtRpc_1.RecursiveOperation.FETCH_DATA
|
|
83
|
+
&& (this.hasNonStaleData() || this.noCloserNodesReceivedCounter >= this.options.waitedRoutingPathCompletions)) {
|
|
84
84
|
return true;
|
|
85
85
|
}
|
|
86
|
-
else if (this.
|
|
86
|
+
else if (this.options.operation === DhtRpc_1.RecursiveOperation.FETCH_DATA) {
|
|
87
87
|
return false;
|
|
88
88
|
}
|
|
89
89
|
return true;
|
|
@@ -93,7 +93,7 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
93
93
|
hasNonStaleData() {
|
|
94
94
|
return Array.from(this.foundData.values()).some((entry) => entry.stale === false);
|
|
95
95
|
}
|
|
96
|
-
onResponseReceived(
|
|
96
|
+
onResponseReceived(remoteNodeId, routingPath, closestConnectedNodes, dataEntries, noCloserNodesFound) {
|
|
97
97
|
this.addKnownHops(routingPath);
|
|
98
98
|
if (routingPath.length >= 1) {
|
|
99
99
|
this.setHopAsReported(routingPath[routingPath.length - 1]);
|
|
@@ -102,12 +102,12 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
102
102
|
this.results.addContact(new Contact_1.Contact(descriptor));
|
|
103
103
|
});
|
|
104
104
|
this.processFoundData(dataEntries);
|
|
105
|
-
if (noCloserNodesFound || this.noCloserNodesReceivedFrom.has(
|
|
106
|
-
this.onNoCloserPeersFound(
|
|
105
|
+
if (noCloserNodesFound || this.noCloserNodesReceivedFrom.has(remoteNodeId)) {
|
|
106
|
+
this.onNoCloserPeersFound(remoteNodeId);
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
addKnownHops(routingPath) {
|
|
110
|
-
const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.
|
|
110
|
+
const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.options.localPeerDescriptor);
|
|
111
111
|
routingPath.forEach((desc) => {
|
|
112
112
|
const newNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(desc);
|
|
113
113
|
if (localNodeId !== newNodeId) {
|
|
@@ -116,7 +116,7 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
116
116
|
});
|
|
117
117
|
}
|
|
118
118
|
setHopAsReported(desc) {
|
|
119
|
-
const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.
|
|
119
|
+
const localNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(this.options.localPeerDescriptor);
|
|
120
120
|
const newNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(desc);
|
|
121
121
|
if (localNodeId !== newNodeId) {
|
|
122
122
|
this.reportedHops.add(newNodeId);
|
|
@@ -142,9 +142,9 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
142
142
|
}
|
|
143
143
|
});
|
|
144
144
|
}
|
|
145
|
-
onNoCloserPeersFound(
|
|
145
|
+
onNoCloserPeersFound(remoteNodeId) {
|
|
146
146
|
this.noCloserNodesReceivedCounter += 1;
|
|
147
|
-
this.noCloserNodesReceivedFrom.add(
|
|
147
|
+
this.noCloserNodesReceivedFrom.add(remoteNodeId);
|
|
148
148
|
if (this.isCompleted()) {
|
|
149
149
|
this.emit('completed');
|
|
150
150
|
this.completionEventEmitted = true;
|
|
@@ -159,7 +159,7 @@ class RecursiveOperationSession extends eventemitter3_1.default {
|
|
|
159
159
|
this.emit('completed');
|
|
160
160
|
this.completionEventEmitted = true;
|
|
161
161
|
}
|
|
162
|
-
}, 4000); // TODO use
|
|
162
|
+
}, 4000); // TODO use options option or named constant?
|
|
163
163
|
}
|
|
164
164
|
}
|
|
165
165
|
getResults() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationSession.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSession.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AACxC,+BAAyB;AACzB,mEAS+C;AAE/C,uFAAmF;AACnF,gDAA4C;AAC5C,oEAAgE;AAGhE,2FAAuF;AACvF,mDAAuH;AAgBvH,MAAa,yBAA0B,SAAQ,uBAA6C;IAEvE,EAAE,GAAG,IAAA,SAAE,GAAE,CAAA;IACT,eAAe,CAA0B;IAClD,OAAO,CAA4B;IACnC,SAAS,GAA+B,IAAI,GAAG,EAAE,CAAA;IACjD,YAAY,GAAoB,IAAI,GAAG,EAAE,CAAA;IACzC,YAAY,GAAoB,IAAI,GAAG,EAAE,CAAA;IACzC,WAAW,CAAiB;IAC5B,sBAAsB,GAAG,KAAK,CAAA;IAC9B,4BAA4B,GAAG,CAAC,CAAA;IACvB,yBAAyB,GAAoB,IAAI,GAAG,EAAE,CAAA;IACtD,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationSession.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSession.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAwC;AACxC,+BAAyB;AACzB,mEAS+C;AAE/C,uFAAmF;AACnF,gDAA4C;AAC5C,oEAAgE;AAGhE,2FAAuF;AACvF,mDAAuH;AAgBvH,MAAa,yBAA0B,SAAQ,uBAA6C;IAEvE,EAAE,GAAG,IAAA,SAAE,GAAE,CAAA;IACT,eAAe,CAA0B;IAClD,OAAO,CAA4B;IACnC,SAAS,GAA+B,IAAI,GAAG,EAAE,CAAA;IACjD,YAAY,GAAoB,IAAI,GAAG,EAAE,CAAA;IACzC,YAAY,GAAoB,IAAI,GAAG,EAAE,CAAA;IACzC,WAAW,CAAiB;IAC5B,sBAAsB,GAAG,KAAK,CAAA;IAC9B,4BAA4B,GAAG,CAAC,CAAA;IACvB,yBAAyB,GAAoB,IAAI,GAAG,EAAE,CAAA;IACtD,OAAO,CAAkC;IAE1D,YAAY,OAAyC;QACjD,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,qCAAiB,CAAC;YACjC,WAAW,EAAE,OAAO,CAAC,QAAQ;YAC7B,OAAO,EAAE,EAAE,EAAG,6CAA6C;YAC3D,yBAAyB,EAAE,IAAI;SAClC,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,mDAAwB,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,SAAS,EAAE;YAC5E,iBAAiB,EAAE,KAAK,CAAE,6CAA6C;SAC1E,CAAC,CAAA;QACF,IAAI,CAAC,uBAAuB,EAAE,CAAA;IAClC,CAAC;IAEO,uBAAuB;QAC3B,MAAM,QAAQ,GAAG,IAAI,qEAAiC,CAAC;YACnD,kBAAkB,EAAE,CAChB,YAAwB,EACxB,WAA6B,EAC7B,qBAAuC,EACvC,WAAwB,EACxB,kBAA2B,EAC7B,EAAE;gBACA,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,WAAW,EAAE,qBAAqB,EAAE,WAAW,EAAE,kBAAkB,CAAC,CAAA;YAC9G,CAAC;SACJ,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,mCAA0B,EAAE,cAAc,EACnF,CAAC,GAA+B,EAAE,OAA0B,EAAE,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IAC7G,CAAC;IAEM,KAAK,CAAC,SAAoB;QAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAA;QAChD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,CAAA;IAC7C,CAAC;IAEO,WAAW,CAAC,SAAoB;QACpC,MAAM,OAAO,GAA8B;YACvC,SAAS,EAAE,IAAI,CAAC,KAAK,EAAE;YACvB,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS;SACpC,CAAA;QACD,MAAM,GAAG,GAAY;YACjB,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,SAAS;YACT,IAAI,EAAE;gBACF,SAAS,EAAE,2BAA2B;gBACtC,yBAAyB,EAAE,OAAO;aACrC;SACJ,CAAA;QACD,MAAM,YAAY,GAAwB;YACtC,OAAO,EAAE,GAAG;YACZ,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,MAAM,EAAE,IAAA,kCAAoB,EAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;YACnD,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,mBAAmB;YAC5C,gBAAgB,EAAE,EAAE;YACpB,WAAW,EAAE,EAAE;YACf,mBAAmB,EAAE,EAAE;SAC1B,CAAA;QACD,OAAO,YAAY,CAAA;IACvB,CAAC;IAEO,WAAW;QACf,MAAM,cAAc,GAAoB,IAAI,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;QAClE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7B,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;QACF,IAAI,IAAI,CAAC,4BAA4B,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACtE,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,2BAAkB,CAAC,UAAU;mBACrD,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,IAAI,CAAC,4BAA4B,IAAI,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,EAAE,CAAC;gBAChH,OAAO,IAAI,CAAA;YACf,CAAC;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,KAAK,2BAAkB,CAAC,UAAU,EAAE,CAAC;gBAClE,OAAO,KAAK,CAAA;YAChB,CAAC;YACD,OAAO,IAAI,CAAA;QACf,CAAC;QACD,OAAO,KAAK,CAAA;IAChB,CAAC;IAEO,eAAe;QACnB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,CAAC,CAAA;IACrF,CAAC;IAEM,kBAAkB,CACrB,YAAwB,EACxB,WAA6B,EAC7B,qBAAuC,EACvC,WAAwB,EACxB,kBAA2B;QAE3B,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;QAC9B,IAAI,WAAW,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAA;QAC9D,CAAC;QACD,qBAAqB,CAAC,OAAO,CAAC,CAAC,UAA0B,EAAE,EAAE;YACzD,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,iBAAO,CAAC,UAAU,CAAC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;QAClC,IAAI,kBAAkB,IAAI,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACzE,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAA;QAC3C,CAAC;IACL,CAAC;IAEO,YAAY,CAAC,WAA6B;QAC9C,MAAM,WAAW,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACjF,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,CAAA;YACnD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC5B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;YACpC,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,gBAAgB,CAAC,IAAoB;QACzC,MAAM,WAAW,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QACjF,MAAM,SAAS,GAAG,IAAA,yCAA2B,EAAC,IAAI,CAAC,CAAA;QACnD,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACpC,CAAC;QACD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,sBAAsB,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;gBACrD,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;oBACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBAC9B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;gBAChC,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBACtB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;YACtC,CAAC;QACL,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,WAAwB;QAC7C,WAAW,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1B,MAAM,aAAa,GAAG,IAAA,kCAAoB,EAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACzD,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;YACvD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,SAAU,GAAG,KAAK,CAAC,SAAU;mBAC1D,CAAC,aAAa,CAAC,SAAU,IAAI,KAAK,CAAC,SAAU,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrE,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;YAC5C,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAEO,oBAAoB,CAAC,YAAwB;QACjD,IAAI,CAAC,4BAA4B,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QAChD,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACtB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;YAClC,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;gBACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC9B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;YAChC,CAAC;QACL,CAAC;aAAM,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC3D,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE;gBAC/B,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;oBAC/B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBACtB,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAA;gBACtC,CAAC;YACL,CAAC,EAAE,IAAI,CAAC,CAAA,CAAE,6CAA6C;QAC3D,CAAC;IACL,CAAC;IAEM,UAAU;QACb,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC7F,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;SACnD,CAAA;IACL,CAAC;IAEM,KAAK;QACR,OAAO,IAAI,CAAC,EAAE,CAAA;IAClB,CAAC;IAEM,IAAI;QACP,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC9B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAA;QAChC,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAA;QAC9B,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAC1B,CAAC;CACJ;AAjMD,8DAiMC"}
|
|
@@ -3,12 +3,12 @@ import { Empty } from '../../proto/google/protobuf/empty';
|
|
|
3
3
|
import { DataEntry, RecursiveOperationResponse, PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
|
|
4
4
|
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
5
5
|
import { DhtAddress } from '../../identifiers';
|
|
6
|
-
interface
|
|
7
|
-
onResponseReceived: (
|
|
6
|
+
interface RecursiveOperationSessionRpcLocalOptions {
|
|
7
|
+
onResponseReceived: (remoteNodeId: DhtAddress, routingPath: PeerDescriptor[], nodes: PeerDescriptor[], dataEntries: DataEntry[], noCloserNodesFound: boolean) => void;
|
|
8
8
|
}
|
|
9
9
|
export declare class RecursiveOperationSessionRpcLocal implements IRecursiveOperationSessionRpc {
|
|
10
|
-
private readonly
|
|
11
|
-
constructor(
|
|
10
|
+
private readonly options;
|
|
11
|
+
constructor(options: RecursiveOperationSessionRpcLocalOptions);
|
|
12
12
|
sendResponse(report: RecursiveOperationResponse, context: ServerCallContext): Promise<Empty>;
|
|
13
13
|
}
|
|
14
14
|
export {};
|
|
@@ -5,14 +5,14 @@ const utils_1 = require("@streamr/utils");
|
|
|
5
5
|
const identifiers_1 = require("../../identifiers");
|
|
6
6
|
const logger = new utils_1.Logger(module);
|
|
7
7
|
class RecursiveOperationSessionRpcLocal {
|
|
8
|
-
|
|
9
|
-
constructor(
|
|
10
|
-
this.
|
|
8
|
+
options;
|
|
9
|
+
constructor(options) {
|
|
10
|
+
this.options = options;
|
|
11
11
|
}
|
|
12
12
|
async sendResponse(report, context) {
|
|
13
|
-
const
|
|
13
|
+
const remoteNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(context.incomingSourceDescriptor);
|
|
14
14
|
logger.trace('RecursiveOperationResponse arrived: ' + JSON.stringify(report));
|
|
15
|
-
this.
|
|
15
|
+
this.options.onResponseReceived(remoteNodeId, report.routingPath, report.closestConnectedNodes, report.dataEntries, report.noCloserNodesFound);
|
|
16
16
|
return {};
|
|
17
17
|
}
|
|
18
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RecursiveOperationSessionRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts"],"names":[],"mappings":";;;AAGA,0CAAuC;AAGvC,mDAA2E;AAE3E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAYjC,MAAa,iCAAiC;IAEzB,
|
|
1
|
+
{"version":3,"file":"RecursiveOperationSessionRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/recursive-operation/RecursiveOperationSessionRpcLocal.ts"],"names":[],"mappings":";;;AAGA,0CAAuC;AAGvC,mDAA2E;AAE3E,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,yCAA2B,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QACvG,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"}
|
|
@@ -2,7 +2,7 @@ import { Message, PeerDescriptor, RouteMessageAck, RouteMessageWrapper } from '.
|
|
|
2
2
|
import { RoutingMode, RoutingSession } from './RoutingSession';
|
|
3
3
|
import { RoutingRpcCommunicator } from '../../transport/RoutingRpcCommunicator';
|
|
4
4
|
import { DhtAddress } from '../../identifiers';
|
|
5
|
-
export interface
|
|
5
|
+
export interface RouterOptions {
|
|
6
6
|
rpcCommunicator: RoutingRpcCommunicator;
|
|
7
7
|
localPeerDescriptor: PeerDescriptor;
|
|
8
8
|
handleMessage: (message: Message) => void;
|
|
@@ -14,8 +14,8 @@ export declare class Router {
|
|
|
14
14
|
private ongoingRoutingSessions;
|
|
15
15
|
private readonly duplicateRequestDetector;
|
|
16
16
|
private stopped;
|
|
17
|
-
private readonly
|
|
18
|
-
constructor(
|
|
17
|
+
private readonly options;
|
|
18
|
+
constructor(options: RouterOptions);
|
|
19
19
|
private registerLocalRpcMethods;
|
|
20
20
|
send(msg: Message, reachableThrough: PeerDescriptor[]): void;
|
|
21
21
|
doRouteMessage(routedMessage: RouteMessageWrapper, mode?: RoutingMode, excludedPeer?: DhtAddress): RouteMessageAck;
|
|
@@ -14,12 +14,12 @@ class Router {
|
|
|
14
14
|
forwardingTable = new Map();
|
|
15
15
|
routingTablesCache = new RoutingTablesCache_1.RoutingTablesCache();
|
|
16
16
|
ongoingRoutingSessions = new Map();
|
|
17
|
-
// TODO use
|
|
17
|
+
// TODO use options option or named constant?
|
|
18
18
|
duplicateRequestDetector = new DuplicateDetector_1.DuplicateDetector(10000);
|
|
19
19
|
stopped = false;
|
|
20
|
-
|
|
21
|
-
constructor(
|
|
22
|
-
this.
|
|
20
|
+
options;
|
|
21
|
+
constructor(options) {
|
|
22
|
+
this.options = options;
|
|
23
23
|
this.registerLocalRpcMethods();
|
|
24
24
|
}
|
|
25
25
|
registerLocalRpcMethods() {
|
|
@@ -27,16 +27,16 @@ class Router {
|
|
|
27
27
|
doRouteMessage: (routedMessage, mode) => this.doRouteMessage(routedMessage, mode),
|
|
28
28
|
setForwardingEntries: (routedMessage) => this.setForwardingEntries(routedMessage),
|
|
29
29
|
duplicateRequestDetector: this.duplicateRequestDetector,
|
|
30
|
-
localPeerDescriptor: this.
|
|
31
|
-
handleMessage: this.
|
|
30
|
+
localPeerDescriptor: this.options.localPeerDescriptor,
|
|
31
|
+
handleMessage: this.options.handleMessage
|
|
32
32
|
});
|
|
33
|
-
this.
|
|
33
|
+
this.options.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'routeMessage', async (routedMessage) => {
|
|
34
34
|
if (this.stopped) {
|
|
35
35
|
return (0, RouterRpcLocal_1.createRouteMessageAck)(routedMessage, DhtRpc_1.RouteMessageError.STOPPED);
|
|
36
36
|
}
|
|
37
37
|
return rpcLocal.routeMessage(routedMessage);
|
|
38
38
|
});
|
|
39
|
-
this.
|
|
39
|
+
this.options.rpcCommunicator.registerRpcMethod(DhtRpc_1.RouteMessageWrapper, DhtRpc_1.RouteMessageAck, 'forwardMessage', async (forwardMessage) => {
|
|
40
40
|
if (this.stopped) {
|
|
41
41
|
return (0, RouterRpcLocal_1.createRouteMessageAck)(forwardMessage, DhtRpc_1.RouteMessageError.STOPPED);
|
|
42
42
|
}
|
|
@@ -44,7 +44,7 @@ class Router {
|
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
send(msg, reachableThrough) {
|
|
47
|
-
msg.sourceDescriptor = this.
|
|
47
|
+
msg.sourceDescriptor = this.options.localPeerDescriptor;
|
|
48
48
|
const targetPeerDescriptor = msg.targetDescriptor;
|
|
49
49
|
const forwardingEntry = this.forwardingTable.get((0, identifiers_1.getNodeIdFromPeerDescriptor)(targetPeerDescriptor));
|
|
50
50
|
if (forwardingEntry && forwardingEntry.peerDescriptors.length > 0) {
|
|
@@ -52,7 +52,7 @@ class Router {
|
|
|
52
52
|
message: msg,
|
|
53
53
|
requestId: (0, uuid_1.v4)(),
|
|
54
54
|
target: forwardingEntry.peerDescriptors[0].nodeId,
|
|
55
|
-
sourcePeer: this.
|
|
55
|
+
sourcePeer: this.options.localPeerDescriptor,
|
|
56
56
|
reachableThrough,
|
|
57
57
|
routingPath: [],
|
|
58
58
|
parallelRootNodeIds: []
|
|
@@ -69,7 +69,7 @@ class Router {
|
|
|
69
69
|
message: msg,
|
|
70
70
|
requestId: (0, uuid_1.v4)(),
|
|
71
71
|
target: targetPeerDescriptor.nodeId,
|
|
72
|
-
sourcePeer: this.
|
|
72
|
+
sourcePeer: this.options.localPeerDescriptor,
|
|
73
73
|
reachableThrough,
|
|
74
74
|
routingPath: [],
|
|
75
75
|
parallelRootNodeIds: []
|
|
@@ -101,7 +101,7 @@ class Router {
|
|
|
101
101
|
});
|
|
102
102
|
setImmediate(async () => {
|
|
103
103
|
try {
|
|
104
|
-
// TODO use
|
|
104
|
+
// TODO use options option or named constant?
|
|
105
105
|
await (0, utils_1.withTimeout)(eventReceived, 10000);
|
|
106
106
|
logger.trace('raceEvents ended from routingSession: ' + session.sessionId);
|
|
107
107
|
}
|
|
@@ -128,15 +128,15 @@ class Router {
|
|
|
128
128
|
excludedNodeIds.add(nodeId);
|
|
129
129
|
});
|
|
130
130
|
return new RoutingSession_1.RoutingSession({
|
|
131
|
-
rpcCommunicator: this.
|
|
132
|
-
localPeerDescriptor: this.
|
|
131
|
+
rpcCommunicator: this.options.rpcCommunicator,
|
|
132
|
+
localPeerDescriptor: this.options.localPeerDescriptor,
|
|
133
133
|
routedMessage,
|
|
134
|
-
// TODO use
|
|
135
|
-
parallelism: (0, identifiers_1.areEqualPeerDescriptors)(this.
|
|
134
|
+
// TODO use options option or named constant?
|
|
135
|
+
parallelism: (0, identifiers_1.areEqualPeerDescriptors)(this.options.localPeerDescriptor, routedMessage.sourcePeer) ? 2 : 1,
|
|
136
136
|
mode,
|
|
137
137
|
excludedNodeIds,
|
|
138
138
|
routingTablesCache: this.routingTablesCache,
|
|
139
|
-
getConnections: this.
|
|
139
|
+
getConnections: this.options.getConnections
|
|
140
140
|
});
|
|
141
141
|
}
|
|
142
142
|
isMostLikelyDuplicate(requestId) {
|
|
@@ -152,7 +152,7 @@ class Router {
|
|
|
152
152
|
this.ongoingRoutingSessions.delete(sessionId);
|
|
153
153
|
}
|
|
154
154
|
onNodeConnected(peerDescriptor) {
|
|
155
|
-
const remote = new RoutingSession_1.RoutingRemoteContact(peerDescriptor, this.
|
|
155
|
+
const remote = new RoutingSession_1.RoutingRemoteContact(peerDescriptor, this.options.localPeerDescriptor, this.options.rpcCommunicator);
|
|
156
156
|
this.routingTablesCache.onNodeConnected(remote);
|
|
157
157
|
}
|
|
158
158
|
onNodeDisconnected(peerDescriptor) {
|
|
@@ -176,7 +176,7 @@ class Router {
|
|
|
176
176
|
}
|
|
177
177
|
setForwardingEntries(routedMessage) {
|
|
178
178
|
const reachableThroughWithoutSelf = routedMessage.reachableThrough.filter((peer) => {
|
|
179
|
-
return !(0, identifiers_1.areEqualPeerDescriptors)(peer, this.
|
|
179
|
+
return !(0, identifiers_1.areEqualPeerDescriptors)(peer, this.options.localPeerDescriptor);
|
|
180
180
|
});
|
|
181
181
|
if (reachableThroughWithoutSelf.length > 0) {
|
|
182
182
|
const sourceNodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer);
|
|
@@ -189,7 +189,7 @@ class Router {
|
|
|
189
189
|
peerDescriptors: reachableThroughWithoutSelf,
|
|
190
190
|
timeout: setTimeout(() => {
|
|
191
191
|
this.forwardingTable.delete(sourceNodeId);
|
|
192
|
-
}, 10000) // TODO use
|
|
192
|
+
}, 10000) // TODO use options option or named constant?
|
|
193
193
|
};
|
|
194
194
|
this.forwardingTable.set(sourceNodeId, forwardingEntry);
|
|
195
195
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../../src/dht/routing/Router.ts"],"names":[],"mappings":";;;AAAA,mEAAyI;AACzI,qDAA0G;AAC1G,0CAAqF;AAErF,2DAAuD;AACvD,+BAAyB;AACzB,qDAAwE;AACxE,mDAA0H;AAC1H,6DAAyD;AAczD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,MAAM;IAEE,eAAe,GAA0C,IAAI,GAAG,EAAE,CAAA;IAClE,kBAAkB,GAAG,IAAI,uCAAkB,EAAE,CAAA;IACtD,sBAAsB,GAAgC,IAAI,GAAG,EAAE,CAAA;IACvE,
|
|
1
|
+
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../../src/dht/routing/Router.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Message, PeerDescriptor, RouteMessageAck, RouteMessageError, RouteMessa
|
|
|
2
2
|
import { IRouterRpc } from '../../proto/packages/dht/protos/DhtRpc.server';
|
|
3
3
|
import { DuplicateDetector } from './DuplicateDetector';
|
|
4
4
|
import { RoutingMode } from './RoutingSession';
|
|
5
|
-
interface
|
|
5
|
+
interface RouterRpcLocalOptions {
|
|
6
6
|
doRouteMessage: (routedMessage: RouteMessageWrapper, mode?: RoutingMode) => RouteMessageAck;
|
|
7
7
|
setForwardingEntries: (routedMessage: RouteMessageWrapper) => void;
|
|
8
8
|
handleMessage: (message: Message) => void;
|
|
@@ -11,8 +11,8 @@ interface RouterRpcLocalConfig {
|
|
|
11
11
|
}
|
|
12
12
|
export declare const createRouteMessageAck: (routedMessage: RouteMessageWrapper, error?: RouteMessageError) => RouteMessageAck;
|
|
13
13
|
export declare class RouterRpcLocal implements IRouterRpc {
|
|
14
|
-
private readonly
|
|
15
|
-
constructor(
|
|
14
|
+
private readonly options;
|
|
15
|
+
constructor(options: RouterRpcLocalOptions);
|
|
16
16
|
routeMessage(routedMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
|
|
17
17
|
forwardMessage(forwardMessage: RouteMessageWrapper): Promise<RouteMessageAck>;
|
|
18
18
|
private forwardToDestination;
|
|
@@ -16,51 +16,51 @@ const createRouteMessageAck = (routedMessage, error) => {
|
|
|
16
16
|
};
|
|
17
17
|
exports.createRouteMessageAck = createRouteMessageAck;
|
|
18
18
|
class RouterRpcLocal {
|
|
19
|
-
|
|
20
|
-
constructor(
|
|
21
|
-
this.
|
|
19
|
+
options;
|
|
20
|
+
constructor(options) {
|
|
21
|
+
this.options = options;
|
|
22
22
|
}
|
|
23
23
|
async routeMessage(routedMessage) {
|
|
24
|
-
if (this.
|
|
24
|
+
if (this.options.duplicateRequestDetector.isMostLikelyDuplicate(routedMessage.requestId)) {
|
|
25
25
|
logger.trace(`Routing message ${routedMessage.requestId} from ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(routedMessage.sourcePeer)} `
|
|
26
26
|
+ `to ${(0, identifiers_1.getDhtAddressFromRaw)(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}`);
|
|
30
|
-
this.
|
|
31
|
-
if ((0, utils_1.areEqualBinaries)(this.
|
|
30
|
+
this.options.duplicateRequestDetector.add(routedMessage.requestId);
|
|
31
|
+
if ((0, utils_1.areEqualBinaries)(this.options.localPeerDescriptor.nodeId, routedMessage.target)) {
|
|
32
32
|
logger.trace(`routing message targeted to self ${routedMessage.requestId}`);
|
|
33
|
-
this.
|
|
34
|
-
this.
|
|
33
|
+
this.options.setForwardingEntries(routedMessage);
|
|
34
|
+
this.options.handleMessage(routedMessage.message);
|
|
35
35
|
return (0, exports.createRouteMessageAck)(routedMessage);
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
38
|
-
return this.
|
|
38
|
+
return this.options.doRouteMessage(routedMessage);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
async forwardMessage(forwardMessage) {
|
|
42
|
-
if (this.
|
|
42
|
+
if (this.options.duplicateRequestDetector.isMostLikelyDuplicate(forwardMessage.requestId)) {
|
|
43
43
|
logger.trace(`Forwarding message ${forwardMessage.requestId} from ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(forwardMessage.sourcePeer)} `
|
|
44
44
|
+ `to ${(0, identifiers_1.getDhtAddressFromRaw)(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}`);
|
|
48
|
-
this.
|
|
49
|
-
if ((0, utils_1.areEqualBinaries)(this.
|
|
48
|
+
this.options.duplicateRequestDetector.add(forwardMessage.requestId);
|
|
49
|
+
if ((0, utils_1.areEqualBinaries)(this.options.localPeerDescriptor.nodeId, forwardMessage.target)) {
|
|
50
50
|
return this.forwardToDestination(forwardMessage);
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
|
-
return this.
|
|
53
|
+
return this.options.doRouteMessage(forwardMessage, RoutingSession_1.RoutingMode.FORWARD);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
forwardToDestination(routedMessage) {
|
|
57
57
|
logger.trace(`Forwarding found message targeted to self ${routedMessage.requestId}`);
|
|
58
58
|
const forwardedMessage = routedMessage.message;
|
|
59
|
-
if ((0, identifiers_1.areEqualPeerDescriptors)(this.
|
|
60
|
-
this.
|
|
59
|
+
if ((0, identifiers_1.areEqualPeerDescriptors)(this.options.localPeerDescriptor, forwardedMessage.targetDescriptor)) {
|
|
60
|
+
this.options.handleMessage(forwardedMessage);
|
|
61
61
|
return (0, exports.createRouteMessageAck)(routedMessage);
|
|
62
62
|
}
|
|
63
|
-
return this.
|
|
63
|
+
return this.options.doRouteMessage({ ...routedMessage, requestId: (0, uuid_1.v4)(), target: forwardedMessage.targetDescriptor.nodeId });
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
exports.RouterRpcLocal = RouterRpcLocal;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RouterRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcLocal.ts"],"names":[],"mappings":";;;AAAA,0CAAyD;AACzD,mEAAyI;AAGzI,qDAA8C;AAC9C,mDAA8G;AAC9G,+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,
|
|
1
|
+
{"version":3,"file":"RouterRpcLocal.js","sourceRoot":"","sources":["../../../../src/dht/routing/RouterRpcLocal.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,7 +24,7 @@ export declare enum RoutingMode {
|
|
|
24
24
|
FORWARD = 1,
|
|
25
25
|
RECURSIVE = 2
|
|
26
26
|
}
|
|
27
|
-
interface
|
|
27
|
+
interface RoutingSessionOptions {
|
|
28
28
|
rpcCommunicator: RoutingRpcCommunicator;
|
|
29
29
|
localPeerDescriptor: PeerDescriptor;
|
|
30
30
|
routedMessage: RouteMessageWrapper;
|
|
@@ -41,8 +41,8 @@ export declare class RoutingSession extends EventEmitter<RoutingSessionEvents> {
|
|
|
41
41
|
private failedHopCounter;
|
|
42
42
|
private successfulHopCounter;
|
|
43
43
|
private stopped;
|
|
44
|
-
private readonly
|
|
45
|
-
constructor(
|
|
44
|
+
private readonly options;
|
|
45
|
+
constructor(options: RoutingSessionOptions);
|
|
46
46
|
private onRequestFailed;
|
|
47
47
|
private emitFailure;
|
|
48
48
|
private onRequestSucceeded;
|