@streamr/trackerless-network 0.0.1-tatum.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintignore +7 -0
- package/.eslintrc +3 -0
- package/README.md +6 -0
- package/bin/bootstrap-node.ts +73 -0
- package/bin/full-node-webrtc.ts +102 -0
- package/bin/full-node-websocket.ts +102 -0
- package/bin/network.ts +43 -0
- package/dist/package.json +53 -0
- package/dist/src/NameDirectory.d.ts +5 -0
- package/dist/src/NameDirectory.js +44 -0
- package/dist/src/NameDirectory.js.map +1 -0
- package/dist/src/NetworkNode.d.ts +35 -0
- package/dist/src/NetworkNode.js +130 -0
- package/dist/src/NetworkNode.js.map +1 -0
- package/dist/src/NetworkStack.d.ts +32 -0
- package/dist/src/NetworkStack.js +108 -0
- package/dist/src/NetworkStack.js.map +1 -0
- package/dist/src/exports.d.ts +6 -0
- package/dist/src/exports.js +12 -0
- package/dist/src/exports.js.map +1 -0
- package/dist/src/identifiers.d.ts +1 -0
- package/dist/src/identifiers.js +3 -0
- package/dist/src/identifiers.js.map +1 -0
- package/dist/src/logic/DuplicateMessageDetector.d.ts +55 -0
- package/dist/src/logic/DuplicateMessageDetector.js +155 -0
- package/dist/src/logic/DuplicateMessageDetector.js.map +1 -0
- package/dist/src/logic/ILayer0.d.ts +13 -0
- package/dist/src/logic/ILayer0.js +3 -0
- package/dist/src/logic/ILayer0.js.map +1 -0
- package/dist/src/logic/IStreamNode.d.ts +12 -0
- package/dist/src/logic/IStreamNode.js +3 -0
- package/dist/src/logic/IStreamNode.js.map +1 -0
- package/dist/src/logic/PeerList.d.ts +27 -0
- package/dist/src/logic/PeerList.js +84 -0
- package/dist/src/logic/PeerList.js.map +1 -0
- package/dist/src/logic/RandomGraphNode.d.ts +68 -0
- package/dist/src/logic/RandomGraphNode.js +201 -0
- package/dist/src/logic/RandomGraphNode.js.map +1 -0
- package/dist/src/logic/Remote.d.ts +9 -0
- package/dist/src/logic/Remote.js +15 -0
- package/dist/src/logic/Remote.js.map +1 -0
- package/dist/src/logic/RemoteRandomGraphNode.d.ts +8 -0
- package/dist/src/logic/RemoteRandomGraphNode.js +35 -0
- package/dist/src/logic/RemoteRandomGraphNode.js.map +1 -0
- package/dist/src/logic/StreamEntryPointDiscovery.d.ts +36 -0
- package/dist/src/logic/StreamEntryPointDiscovery.js +179 -0
- package/dist/src/logic/StreamEntryPointDiscovery.js.map +1 -0
- package/dist/src/logic/StreamNodeServer.d.ts +20 -0
- package/dist/src/logic/StreamNodeServer.js +26 -0
- package/dist/src/logic/StreamNodeServer.js.map +1 -0
- package/dist/src/logic/StreamrNode.d.ts +76 -0
- package/dist/src/logic/StreamrNode.js +303 -0
- package/dist/src/logic/StreamrNode.js.map +1 -0
- package/dist/src/logic/createRandomGraphNode.d.ts +5 -0
- package/dist/src/logic/createRandomGraphNode.js +110 -0
- package/dist/src/logic/createRandomGraphNode.js.map +1 -0
- package/dist/src/logic/inspect/InspectSession.d.ts +18 -0
- package/dist/src/logic/inspect/InspectSession.js +38 -0
- package/dist/src/logic/inspect/InspectSession.js.map +1 -0
- package/dist/src/logic/inspect/Inspector.d.ts +33 -0
- package/dist/src/logic/inspect/Inspector.js +63 -0
- package/dist/src/logic/inspect/Inspector.js.map +1 -0
- package/dist/src/logic/neighbor-discovery/Handshaker.d.ts +35 -0
- package/dist/src/logic/neighbor-discovery/Handshaker.js +121 -0
- package/dist/src/logic/neighbor-discovery/Handshaker.js.map +1 -0
- package/dist/src/logic/neighbor-discovery/HandshakerServer.d.ts +30 -0
- package/dist/src/logic/neighbor-discovery/HandshakerServer.js +78 -0
- package/dist/src/logic/neighbor-discovery/HandshakerServer.js.map +1 -0
- package/dist/src/logic/neighbor-discovery/NeighborFinder.d.ts +23 -0
- package/dist/src/logic/neighbor-discovery/NeighborFinder.js +44 -0
- package/dist/src/logic/neighbor-discovery/NeighborFinder.js.map +1 -0
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.d.ts +30 -0
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js +42 -0
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js.map +1 -0
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManagerServer.d.ts +20 -0
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManagerServer.js +42 -0
- package/dist/src/logic/neighbor-discovery/NeighborUpdateManagerServer.js.map +1 -0
- package/dist/src/logic/neighbor-discovery/RemoteHandshaker.d.ts +12 -0
- package/dist/src/logic/neighbor-discovery/RemoteHandshaker.js +54 -0
- package/dist/src/logic/neighbor-discovery/RemoteHandshaker.js.map +1 -0
- package/dist/src/logic/neighbor-discovery/RemoteNeighborUpdateManager.d.ts +11 -0
- package/dist/src/logic/neighbor-discovery/RemoteNeighborUpdateManager.js +37 -0
- package/dist/src/logic/neighbor-discovery/RemoteNeighborUpdateManager.js.map +1 -0
- package/dist/src/logic/propagation/FifoMapWithTTL.d.ts +36 -0
- package/dist/src/logic/propagation/FifoMapWithTTL.js +81 -0
- package/dist/src/logic/propagation/FifoMapWithTTL.js.map +1 -0
- package/dist/src/logic/propagation/Propagation.d.ts +31 -0
- package/dist/src/logic/propagation/Propagation.js +64 -0
- package/dist/src/logic/propagation/Propagation.js.map +1 -0
- package/dist/src/logic/propagation/PropagationTaskStore.d.ts +21 -0
- package/dist/src/logic/propagation/PropagationTaskStore.js +32 -0
- package/dist/src/logic/propagation/PropagationTaskStore.js.map +1 -0
- package/dist/src/logic/protocol-integration/stream-message/ContentMessageTranslator.d.ts +5 -0
- package/dist/src/logic/protocol-integration/stream-message/ContentMessageTranslator.js +17 -0
- package/dist/src/logic/protocol-integration/stream-message/ContentMessageTranslator.js.map +1 -0
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.d.ts +6 -0
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.js +27 -0
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.js.map +1 -0
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.d.ts +6 -0
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.js +33 -0
- package/dist/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.js.map +1 -0
- package/dist/src/logic/protocol-integration/stream-message/StreamMessageTranslator.d.ts +6 -0
- package/dist/src/logic/protocol-integration/stream-message/StreamMessageTranslator.js +109 -0
- package/dist/src/logic/protocol-integration/stream-message/StreamMessageTranslator.js.map +1 -0
- package/dist/src/logic/proxy/ProxyStreamConnectionClient.d.ts +44 -0
- package/dist/src/logic/proxy/ProxyStreamConnectionClient.js +189 -0
- package/dist/src/logic/proxy/ProxyStreamConnectionClient.js.map +1 -0
- package/dist/src/logic/proxy/ProxyStreamConnectionServer.d.ts +34 -0
- package/dist/src/logic/proxy/ProxyStreamConnectionServer.js +64 -0
- package/dist/src/logic/proxy/ProxyStreamConnectionServer.js.map +1 -0
- package/dist/src/logic/proxy/RemoteProxyServer.d.ts +7 -0
- package/dist/src/logic/proxy/RemoteProxyServer.js +36 -0
- package/dist/src/logic/proxy/RemoteProxyServer.js.map +1 -0
- package/dist/src/logic/temporary-connection/RemoteTemporaryConnectionRpcServer.d.ts +6 -0
- package/dist/src/logic/temporary-connection/RemoteTemporaryConnectionRpcServer.js +28 -0
- package/dist/src/logic/temporary-connection/RemoteTemporaryConnectionRpcServer.js.map +1 -0
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcServer.d.ts +20 -0
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcServer.js +29 -0
- package/dist/src/logic/temporary-connection/TemporaryConnectionRpcServer.js.map +1 -0
- package/dist/src/logic/utils.d.ts +3 -0
- package/dist/src/logic/utils.js +16 -0
- package/dist/src/logic/utils.js.map +1 -0
- package/dist/src/proto/google/protobuf/any.d.ts +173 -0
- package/dist/src/proto/google/protobuf/any.js +155 -0
- package/dist/src/proto/google/protobuf/any.js.map +1 -0
- package/dist/src/proto/google/protobuf/empty.d.ts +32 -0
- package/dist/src/proto/google/protobuf/empty.js +34 -0
- package/dist/src/proto/google/protobuf/empty.js.map +1 -0
- package/dist/src/proto/google/protobuf/timestamp.d.ts +149 -0
- package/dist/src/proto/google/protobuf/timestamp.js +136 -0
- package/dist/src/proto/google/protobuf/timestamp.js.map +1 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +320 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +245 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +1089 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +710 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +145 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.js +3 -0
- package/dist/src/proto/packages/dht/protos/DhtRpc.server.js.map +1 -0
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.d.ts +87 -0
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.js +66 -0
- package/dist/src/proto/packages/proto-rpc/protos/ProtoRpc.js.map +1 -0
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.client.d.ts +156 -0
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.client.js +122 -0
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.client.js.map +1 -0
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.d.ts +524 -0
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.js +350 -0
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.js.map +1 -0
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.server.d.ts +65 -0
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.server.js +3 -0
- package/dist/src/proto/packages/trackerless-network/protos/NetworkRpc.server.js.map +1 -0
- package/dist/test/benchmark/first-message.d.ts +1 -0
- package/dist/test/benchmark/first-message.js +137 -0
- package/dist/test/benchmark/first-message.js.map +1 -0
- package/dist/test/utils/utils.d.ts +12 -0
- package/dist/test/utils/utils.js +86 -0
- package/dist/test/utils/utils.js.map +1 -0
- package/jest.config.js +36 -0
- package/karma.config.js +20 -0
- package/log.txt +501 -0
- package/package.json +53 -0
- package/proto.sh +2 -0
- package/protos/NetworkRpc.proto +161 -0
- package/src/NameDirectory.ts +44 -0
- package/src/NetworkNode.ts +169 -0
- package/src/NetworkStack.ts +144 -0
- package/src/exports.ts +6 -0
- package/src/identifiers.ts +1 -0
- package/src/logic/DuplicateMessageDetector.ts +167 -0
- package/src/logic/ILayer0.ts +14 -0
- package/src/logic/IStreamNode.ts +17 -0
- package/src/logic/PeerList.ts +106 -0
- package/src/logic/RandomGraphNode.ts +310 -0
- package/src/logic/Remote.ts +19 -0
- package/src/logic/RemoteRandomGraphNode.ts +39 -0
- package/src/logic/StreamEntryPointDiscovery.ts +221 -0
- package/src/logic/StreamNodeServer.ts +44 -0
- package/src/logic/StreamrNode.ts +416 -0
- package/src/logic/createRandomGraphNode.ts +114 -0
- package/src/logic/inspect/InspectSession.ts +49 -0
- package/src/logic/inspect/Inspector.ts +89 -0
- package/src/logic/neighbor-discovery/Handshaker.ts +180 -0
- package/src/logic/neighbor-discovery/HandshakerServer.ts +99 -0
- package/src/logic/neighbor-discovery/NeighborFinder.ts +61 -0
- package/src/logic/neighbor-discovery/NeighborUpdateManager.ts +67 -0
- package/src/logic/neighbor-discovery/NeighborUpdateManagerServer.ts +61 -0
- package/src/logic/neighbor-discovery/RemoteHandshaker.ts +64 -0
- package/src/logic/neighbor-discovery/RemoteNeighborUpdateManager.ts +41 -0
- package/src/logic/propagation/FifoMapWithTTL.ts +108 -0
- package/src/logic/propagation/Propagation.ts +83 -0
- package/src/logic/propagation/PropagationTaskStore.ts +40 -0
- package/src/logic/protocol-integration/stream-message/ContentMessageTranslator.ts +16 -0
- package/src/logic/protocol-integration/stream-message/GroupKeyRequestTranslator.ts +28 -0
- package/src/logic/protocol-integration/stream-message/GroupKeyResponseTranslator.ts +38 -0
- package/src/logic/protocol-integration/stream-message/StreamMessageTranslator.ts +142 -0
- package/src/logic/proxy/ProxyStreamConnectionClient.ts +255 -0
- package/src/logic/proxy/ProxyStreamConnectionServer.ts +97 -0
- package/src/logic/proxy/RemoteProxyServer.ts +36 -0
- package/src/logic/temporary-connection/RemoteTemporaryConnectionRpcServer.ts +27 -0
- package/src/logic/temporary-connection/TemporaryConnectionRpcServer.ts +50 -0
- package/src/logic/utils.ts +17 -0
- package/src/proto/google/protobuf/any.ts +319 -0
- package/src/proto/google/protobuf/empty.ts +84 -0
- package/src/proto/google/protobuf/timestamp.ts +281 -0
- package/src/proto/packages/dht/protos/DhtRpc.client.ts +373 -0
- package/src/proto/packages/dht/protos/DhtRpc.server.ts +148 -0
- package/src/proto/packages/dht/protos/DhtRpc.ts +1399 -0
- package/src/proto/packages/proto-rpc/protos/ProtoRpc.ts +108 -0
- package/src/proto/packages/trackerless-network/protos/NetworkRpc.client.ts +176 -0
- package/src/proto/packages/trackerless-network/protos/NetworkRpc.server.ts +68 -0
- package/src/proto/packages/trackerless-network/protos/NetworkRpc.ts +667 -0
- package/test/benchmark/first-message.ts +155 -0
- package/test/end-to-end/inspect.test.ts +119 -0
- package/test/end-to-end/proxy-and-full-node.test.ts +140 -0
- package/test/end-to-end/proxy-connections.test.ts +228 -0
- package/test/end-to-end/proxy-key-exchange.test.ts +142 -0
- package/test/end-to-end/random-graph-with-real-connections.test.ts +154 -0
- package/test/end-to-end/webrtc-full-node-network.test.ts +97 -0
- package/test/end-to-end/websocket-full-node-network.test.ts +93 -0
- package/test/integration/Handshakes.test.ts +167 -0
- package/test/integration/Inspect.test.ts +102 -0
- package/test/integration/NetworkNode.test.ts +99 -0
- package/test/integration/NetworkRpc.test.ts +61 -0
- package/test/integration/NetworkStack.test.ts +74 -0
- package/test/integration/NetworkStackStoppedDuringStart.test.ts +45 -0
- package/test/integration/Propagation.test.ts +79 -0
- package/test/integration/RandomGraphNode-Layer1Node-Latencies.test.ts +141 -0
- package/test/integration/RandomGraphNode-Layer1Node.test.ts +226 -0
- package/test/integration/RemoteHandshaker.test.ts +78 -0
- package/test/integration/RemoteNeighborUpdateManager.test.ts +82 -0
- package/test/integration/RemoteRandomGraphNode.test.ts +102 -0
- package/test/integration/StreamrNode.test.ts +145 -0
- package/test/integration/stream-without-default-entrypoints.test.ts +132 -0
- package/test/unit/ContentMessageTranslator.test.ts +20 -0
- package/test/unit/DuplicateMessageDetector.test.ts +192 -0
- package/test/unit/FifoMapWithTtl.test.ts +229 -0
- package/test/unit/GroupKeyRequestTranslator.test.ts +36 -0
- package/test/unit/GroupKeyResponseTranslator.test.ts +39 -0
- package/test/unit/Handshaker.test.ts +63 -0
- package/test/unit/HandshakerServer.test.ts +123 -0
- package/test/unit/InspectSession.test.ts +78 -0
- package/test/unit/Inspector.test.ts +57 -0
- package/test/unit/NeighborFinder.test.ts +48 -0
- package/test/unit/NumberPair.test.ts +22 -0
- package/test/unit/PeerList.test.ts +150 -0
- package/test/unit/Propagation.test.ts +134 -0
- package/test/unit/RandomGraphNode.test.ts +73 -0
- package/test/unit/StreamEntrypointDiscovery.test.ts +152 -0
- package/test/unit/StreamMessageTranslator.test.ts +67 -0
- package/test/unit/StreamNodeServer.test.ts +63 -0
- package/test/unit/StreamrNode.test.ts +74 -0
- package/test/utils/mock/MockHandshaker.ts +15 -0
- package/test/utils/mock/MockLayer0.ts +71 -0
- package/test/utils/mock/MockLayer1.ts +6 -0
- package/test/utils/mock/MockNeighborFinder.ts +19 -0
- package/test/utils/mock/MockNeighborUpdateManager.ts +21 -0
- package/test/utils/mock/Transport.ts +25 -0
- package/test/utils/utils.ts +104 -0
- package/tsconfig.browser.json +12 -0
- package/tsconfig.jest.json +15 -0
- package/tsconfig.node.json +18 -0
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RandomGraphNode = void 0;
|
|
4
|
+
const eventemitter3_1 = require("eventemitter3");
|
|
5
|
+
const dht_1 = require("@streamr/dht");
|
|
6
|
+
const NetworkRpc_1 = require("../proto/packages/trackerless-network/protos/NetworkRpc");
|
|
7
|
+
const NetworkRpc_client_1 = require("../proto/packages/trackerless-network/protos/NetworkRpc.client");
|
|
8
|
+
const RemoteRandomGraphNode_1 = require("./RemoteRandomGraphNode");
|
|
9
|
+
const utils_1 = require("@streamr/utils");
|
|
10
|
+
const proto_rpc_1 = require("@streamr/proto-rpc");
|
|
11
|
+
const StreamNodeServer_1 = require("./StreamNodeServer");
|
|
12
|
+
const utils_2 = require("./utils");
|
|
13
|
+
const logger = new utils_1.Logger(module);
|
|
14
|
+
class RandomGraphNode extends eventemitter3_1.EventEmitter {
|
|
15
|
+
constructor(config) {
|
|
16
|
+
super();
|
|
17
|
+
this.stopped = false;
|
|
18
|
+
this.started = false;
|
|
19
|
+
this.config = config;
|
|
20
|
+
this.duplicateDetectors = new Map();
|
|
21
|
+
this.server = new StreamNodeServer_1.StreamNodeServer({
|
|
22
|
+
ownPeerDescriptor: this.config.ownPeerDescriptor,
|
|
23
|
+
randomGraphId: this.config.randomGraphId,
|
|
24
|
+
rpcCommunicator: this.config.rpcCommunicator,
|
|
25
|
+
markAndCheckDuplicate: (msg, prev) => (0, utils_2.markAndCheckDuplicate)(this.duplicateDetectors, msg, prev),
|
|
26
|
+
broadcast: (message, previousPeer) => this.broadcast(message, previousPeer),
|
|
27
|
+
onLeaveNotice: (notice) => {
|
|
28
|
+
const senderId = notice.senderId;
|
|
29
|
+
const contact = this.config.nearbyContactPool.getNeighborById(senderId)
|
|
30
|
+
|| this.config.randomContactPool.getNeighborById(senderId)
|
|
31
|
+
|| this.config.targetNeighbors.getNeighborById(senderId)
|
|
32
|
+
|| this.config.proxyConnectionServer?.getConnection(senderId)?.remote;
|
|
33
|
+
// TODO: check integrity of notifier?
|
|
34
|
+
if (contact) {
|
|
35
|
+
this.config.layer1.removeContact(contact.getPeerDescriptor(), true);
|
|
36
|
+
this.config.targetNeighbors.remove(contact.getPeerDescriptor());
|
|
37
|
+
this.config.nearbyContactPool.remove(contact.getPeerDescriptor());
|
|
38
|
+
this.config.connectionLocker.unlockConnection(contact.getPeerDescriptor(), this.config.randomGraphId);
|
|
39
|
+
this.config.neighborFinder.start([senderId]);
|
|
40
|
+
this.config.proxyConnectionServer?.removeConnection(senderId);
|
|
41
|
+
}
|
|
42
|
+
},
|
|
43
|
+
markForInspection: (senderId, messageRef) => this.config.inspector.markMessage(senderId, messageRef)
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
async start() {
|
|
47
|
+
this.started = true;
|
|
48
|
+
this.registerDefaultServerMethods();
|
|
49
|
+
this.config.layer1.on('newContact', (peerDescriptor, closestPeers) => this.newContact(peerDescriptor, closestPeers));
|
|
50
|
+
this.config.layer1.on('contactRemoved', (peerDescriptor, closestPeers) => this.removedContact(peerDescriptor, closestPeers));
|
|
51
|
+
this.config.layer1.on('newRandomContact', (peerDescriptor, randomPeers) => this.newRandomContact(peerDescriptor, randomPeers));
|
|
52
|
+
this.config.layer1.on('randomContactRemoved', (peerDescriptor, randomPeers) => this.removedRandomContact(peerDescriptor, randomPeers));
|
|
53
|
+
this.config.P2PTransport.on('disconnected', (peerDescriptor) => this.onPeerDisconnected(peerDescriptor));
|
|
54
|
+
this.config.targetNeighbors.on('peerAdded', (id, _remote) => {
|
|
55
|
+
this.config.propagation.onNeighborJoined(id);
|
|
56
|
+
this.emit('targetNeighborConnected', id);
|
|
57
|
+
});
|
|
58
|
+
this.config.proxyConnectionServer?.on('newConnection', (id) => {
|
|
59
|
+
this.config.propagation.onNeighborJoined(id);
|
|
60
|
+
});
|
|
61
|
+
const candidates = this.getNewNeighborCandidates();
|
|
62
|
+
if (candidates.length > 0) {
|
|
63
|
+
this.newContact(candidates[0], candidates);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
logger.debug('layer1 had no closest contacts in the beginning');
|
|
67
|
+
}
|
|
68
|
+
this.config.neighborFinder.start();
|
|
69
|
+
await this.config.neighborUpdateManager.start();
|
|
70
|
+
}
|
|
71
|
+
registerDefaultServerMethods() {
|
|
72
|
+
this.config.rpcCommunicator.registerRpcNotification(NetworkRpc_1.StreamMessage, 'sendData', (msg, context) => this.server.sendData(msg, context));
|
|
73
|
+
this.config.rpcCommunicator.registerRpcNotification(NetworkRpc_1.LeaveStreamNotice, 'leaveStreamNotice', (req, context) => this.server.leaveStreamNotice(req, context));
|
|
74
|
+
this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.TemporaryConnectionRequest, NetworkRpc_1.TemporaryConnectionResponse, 'openConnection', (req, context) => this.config.temporaryConnectionServer.openConnection(req, context));
|
|
75
|
+
}
|
|
76
|
+
newContact(_newContact, closestTen) {
|
|
77
|
+
logger.trace(`New nearby contact found`);
|
|
78
|
+
if (this.stopped) {
|
|
79
|
+
return;
|
|
80
|
+
}
|
|
81
|
+
const oldLength = this.config.nearbyContactPool.getStringIds().length;
|
|
82
|
+
this.config.nearbyContactPool.replaceAll(closestTen.map((descriptor) => new RemoteRandomGraphNode_1.RemoteRandomGraphNode(descriptor, this.config.randomGraphId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))));
|
|
83
|
+
if (oldLength < this.config.nearbyContactPool.getStringIds().length) {
|
|
84
|
+
this.emit('nearbyContactPoolIdAdded');
|
|
85
|
+
}
|
|
86
|
+
if (this.config.targetNeighbors.size() < this.config.numOfTargetNeighbors) {
|
|
87
|
+
this.config.neighborFinder.start();
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
removedContact(_removedContact, closestTen) {
|
|
91
|
+
logger.trace(`Nearby contact removed`);
|
|
92
|
+
if (this.stopped) {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
this.config.nearbyContactPool.replaceAll(closestTen.map((descriptor) => new RemoteRandomGraphNode_1.RemoteRandomGraphNode(descriptor, this.config.randomGraphId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))));
|
|
96
|
+
}
|
|
97
|
+
newRandomContact(_newDescriptor, randomPeers) {
|
|
98
|
+
if (this.stopped) {
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
this.config.randomContactPool.replaceAll(randomPeers.map((descriptor) => new RemoteRandomGraphNode_1.RemoteRandomGraphNode(descriptor, this.config.randomGraphId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))));
|
|
102
|
+
if (this.config.targetNeighbors.size() < this.config.numOfTargetNeighbors) {
|
|
103
|
+
this.config.neighborFinder.start();
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
removedRandomContact(_removedDescriptor, randomPeers) {
|
|
107
|
+
logger.trace(`New nearby contact found`);
|
|
108
|
+
if (this.stopped) {
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
this.config.randomContactPool.replaceAll(randomPeers.map((descriptor) => new RemoteRandomGraphNode_1.RemoteRandomGraphNode(descriptor, this.config.randomGraphId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))));
|
|
112
|
+
}
|
|
113
|
+
onPeerDisconnected(peerDescriptor) {
|
|
114
|
+
if (this.config.targetNeighbors.hasPeer(peerDescriptor)) {
|
|
115
|
+
this.config.targetNeighbors.remove(peerDescriptor);
|
|
116
|
+
this.config.connectionLocker.unlockConnection(peerDescriptor, this.config.randomGraphId);
|
|
117
|
+
this.config.neighborFinder.start([(0, dht_1.keyFromPeerDescriptor)(peerDescriptor)]);
|
|
118
|
+
this.config.temporaryConnectionServer.removePeer(peerDescriptor);
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
getNewNeighborCandidates() {
|
|
122
|
+
return this.config.layer1.getNeighborList().getClosestContacts(this.config.peerViewSize).map((contact) => {
|
|
123
|
+
return contact.getPeerDescriptor();
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
hasProxyConnection(peerKey) {
|
|
127
|
+
if (this.config.proxyConnectionServer) {
|
|
128
|
+
return this.config.proxyConnectionServer.hasConnection(peerKey);
|
|
129
|
+
}
|
|
130
|
+
return false;
|
|
131
|
+
}
|
|
132
|
+
stop() {
|
|
133
|
+
if (!this.started) {
|
|
134
|
+
return;
|
|
135
|
+
}
|
|
136
|
+
this.stopped = true;
|
|
137
|
+
this.config.proxyConnectionServer?.stop();
|
|
138
|
+
this.config.targetNeighbors.getPeers().map((remote) => remote.leaveStreamNotice(this.config.ownPeerDescriptor));
|
|
139
|
+
this.config.rpcCommunicator.stop();
|
|
140
|
+
this.removeAllListeners();
|
|
141
|
+
this.config.layer1.off('newContact', (peerDescriptor, closestTen) => this.newContact(peerDescriptor, closestTen));
|
|
142
|
+
this.config.layer1.off('contactRemoved', (peerDescriptor, closestTen) => this.removedContact(peerDescriptor, closestTen));
|
|
143
|
+
this.config.layer1.off('newRandomContact', (peerDescriptor, randomPeers) => this.newRandomContact(peerDescriptor, randomPeers));
|
|
144
|
+
this.config.layer1.off('randomContactRemoved', (peerDescriptor, randomPeers) => this.removedRandomContact(peerDescriptor, randomPeers));
|
|
145
|
+
this.config.P2PTransport.off('disconnected', (peerDescriptor) => this.onPeerDisconnected(peerDescriptor));
|
|
146
|
+
this.config.nearbyContactPool.stop();
|
|
147
|
+
this.config.targetNeighbors.stop();
|
|
148
|
+
this.config.randomContactPool.stop();
|
|
149
|
+
this.config.neighborFinder.stop();
|
|
150
|
+
this.config.neighborUpdateManager.stop();
|
|
151
|
+
this.config.inspector.stop();
|
|
152
|
+
}
|
|
153
|
+
broadcast(msg, previousPeer) {
|
|
154
|
+
if (!previousPeer) {
|
|
155
|
+
(0, utils_2.markAndCheckDuplicate)(this.duplicateDetectors, msg.messageRef, msg.previousMessageRef);
|
|
156
|
+
}
|
|
157
|
+
this.emit('message', msg);
|
|
158
|
+
this.config.propagation.feedUnseenMessage(msg, this.getPropagationTargets(msg), previousPeer ?? null);
|
|
159
|
+
}
|
|
160
|
+
inspect(peerDescriptor) {
|
|
161
|
+
return this.config.inspector.inspect(peerDescriptor);
|
|
162
|
+
}
|
|
163
|
+
getPropagationTargets(msg) {
|
|
164
|
+
let propagationTargets = this.config.targetNeighbors.getStringIds();
|
|
165
|
+
if (this.config.proxyConnectionServer) {
|
|
166
|
+
const proxyTargets = (msg.messageType === NetworkRpc_1.StreamMessageType.GROUP_KEY_REQUEST)
|
|
167
|
+
? this.config.proxyConnectionServer.getPeerKeysForUserId(NetworkRpc_1.GroupKeyRequest.fromBinary(msg.content).recipient)
|
|
168
|
+
: this.config.proxyConnectionServer.getSubscribers();
|
|
169
|
+
propagationTargets = propagationTargets.concat(proxyTargets);
|
|
170
|
+
}
|
|
171
|
+
propagationTargets = propagationTargets.filter((target) => !this.config.inspector.isInspected(target));
|
|
172
|
+
propagationTargets = propagationTargets.concat(this.config.temporaryConnectionServer.getPeers().getStringIds());
|
|
173
|
+
return propagationTargets;
|
|
174
|
+
}
|
|
175
|
+
getOwnStringId() {
|
|
176
|
+
return (0, dht_1.keyFromPeerDescriptor)(this.config.ownPeerDescriptor);
|
|
177
|
+
}
|
|
178
|
+
getNumberOfOutgoingHandshakes() {
|
|
179
|
+
return this.config.handshaker.getOngoingHandshakes().size;
|
|
180
|
+
}
|
|
181
|
+
getTargetNeighborStringIds() {
|
|
182
|
+
if (!this.started && this.stopped) {
|
|
183
|
+
return [];
|
|
184
|
+
}
|
|
185
|
+
return this.config.targetNeighbors.getStringIds();
|
|
186
|
+
}
|
|
187
|
+
getNearbyContactPoolIds() {
|
|
188
|
+
if (!this.started && this.stopped) {
|
|
189
|
+
return [];
|
|
190
|
+
}
|
|
191
|
+
return this.config.nearbyContactPool.getStringIds();
|
|
192
|
+
}
|
|
193
|
+
getRandomContactPoolIds() {
|
|
194
|
+
if (!this.started && this.stopped) {
|
|
195
|
+
return [];
|
|
196
|
+
}
|
|
197
|
+
return this.config.randomContactPool.getStringIds();
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
exports.RandomGraphNode = RandomGraphNode;
|
|
201
|
+
//# sourceMappingURL=RandomGraphNode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RandomGraphNode.js","sourceRoot":"","sources":["../../../src/logic/RandomGraphNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { PeerDescriptor } from '@streamr/dht';
|
|
2
|
+
import { ProtoRpcClient } from '@streamr/proto-rpc';
|
|
3
|
+
export declare abstract class Remote<T> {
|
|
4
|
+
protected remotePeerDescriptor: PeerDescriptor;
|
|
5
|
+
protected client: ProtoRpcClient<T>;
|
|
6
|
+
protected graphId: string;
|
|
7
|
+
constructor(peerDescriptor: PeerDescriptor, graphId: string, client: ProtoRpcClient<T>);
|
|
8
|
+
getPeerDescriptor(): PeerDescriptor;
|
|
9
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Remote = void 0;
|
|
4
|
+
class Remote {
|
|
5
|
+
constructor(peerDescriptor, graphId, client) {
|
|
6
|
+
this.remotePeerDescriptor = peerDescriptor;
|
|
7
|
+
this.client = client;
|
|
8
|
+
this.graphId = graphId;
|
|
9
|
+
}
|
|
10
|
+
getPeerDescriptor() {
|
|
11
|
+
return this.remotePeerDescriptor;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
exports.Remote = Remote;
|
|
15
|
+
//# sourceMappingURL=Remote.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Remote.js","sourceRoot":"","sources":["../../../src/logic/Remote.ts"],"names":[],"mappings":";;;AAGA,MAAsB,MAAM;IAKxB,YAAY,cAA8B,EAAE,OAAe,EAAE,MAAyB;QAClF,IAAI,CAAC,oBAAoB,GAAG,cAAc,CAAA;QAC1C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAED,iBAAiB;QACb,OAAO,IAAI,CAAC,oBAAoB,CAAA;IACpC,CAAC;CAEJ;AAfD,wBAeC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { INetworkRpcClient } from '../proto/packages/trackerless-network/protos/NetworkRpc.client';
|
|
2
|
+
import { PeerDescriptor } from '@streamr/dht';
|
|
3
|
+
import { StreamMessage } from '../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
4
|
+
import { Remote } from './Remote';
|
|
5
|
+
export declare class RemoteRandomGraphNode extends Remote<INetworkRpcClient> {
|
|
6
|
+
sendData(ownPeerDescriptor: PeerDescriptor, msg: StreamMessage): Promise<void>;
|
|
7
|
+
leaveStreamNotice(ownPeerDescriptor: PeerDescriptor): void;
|
|
8
|
+
}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RemoteRandomGraphNode = void 0;
|
|
4
|
+
const dht_1 = require("@streamr/dht");
|
|
5
|
+
const utils_1 = require("@streamr/utils");
|
|
6
|
+
const Remote_1 = require("./Remote");
|
|
7
|
+
const logger = new utils_1.Logger(module);
|
|
8
|
+
class RemoteRandomGraphNode extends Remote_1.Remote {
|
|
9
|
+
async sendData(ownPeerDescriptor, msg) {
|
|
10
|
+
const options = {
|
|
11
|
+
sourceDescriptor: ownPeerDescriptor,
|
|
12
|
+
targetDescriptor: this.remotePeerDescriptor,
|
|
13
|
+
notification: true
|
|
14
|
+
};
|
|
15
|
+
this.client.sendData(msg, options).catch(() => {
|
|
16
|
+
logger.trace('Failed to sendData');
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
leaveStreamNotice(ownPeerDescriptor) {
|
|
20
|
+
const options = {
|
|
21
|
+
sourceDescriptor: ownPeerDescriptor,
|
|
22
|
+
targetDescriptor: this.remotePeerDescriptor,
|
|
23
|
+
notification: true
|
|
24
|
+
};
|
|
25
|
+
const notification = {
|
|
26
|
+
senderId: (0, dht_1.keyFromPeerDescriptor)(ownPeerDescriptor),
|
|
27
|
+
randomGraphId: this.graphId
|
|
28
|
+
};
|
|
29
|
+
this.client.leaveStreamNotice(notification, options).catch(() => {
|
|
30
|
+
logger.debug('Failed to send leaveStreamNotice');
|
|
31
|
+
});
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
exports.RemoteRandomGraphNode = RemoteRandomGraphNode;
|
|
35
|
+
//# sourceMappingURL=RemoteRandomGraphNode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RemoteRandomGraphNode.js","sourceRoot":"","sources":["../../../src/logic/RemoteRandomGraphNode.ts"],"names":[],"mappings":";;;AACA,sCAAmF;AAKnF,0CAAuC;AACvC,qCAAiC;AAEjC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,qBAAsB,SAAQ,eAAyB;IAEhE,KAAK,CAAC,QAAQ,CAAC,iBAAiC,EAAE,GAAkB;QAChE,MAAM,OAAO,GAAkB;YAC3B,gBAAgB,EAAE,iBAAmC;YACrD,gBAAgB,EAAE,IAAI,CAAC,oBAAsC;YAC7D,YAAY,EAAE,IAAI;SACrB,CAAA;QACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC1C,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA;QACtC,CAAC,CAAC,CAAA;IACN,CAAC;IAED,iBAAiB,CAAC,iBAAiC;QAC/C,MAAM,OAAO,GAAkB;YAC3B,gBAAgB,EAAE,iBAAmC;YACrD,gBAAgB,EAAE,IAAI,CAAC,oBAAsC;YAC7D,YAAY,EAAE,IAAI;SACrB,CAAA;QACD,MAAM,YAAY,GAAsB;YACpC,QAAQ,EAAE,IAAA,2BAAqB,EAAC,iBAAiB,CAAC;YAClD,aAAa,EAAE,IAAI,CAAC,OAAO;SAC9B,CAAA;QACD,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YAC5D,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAA;QACpD,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AA3BD,sDA2BC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { PeerDescriptor, RecursiveFindResult, DataEntry } from '@streamr/dht';
|
|
2
|
+
import { Any } from '../proto/google/protobuf/any';
|
|
3
|
+
import { StreamObject } from './StreamrNode';
|
|
4
|
+
export declare const streamPartIdToDataKey: (streamPartId: string) => Uint8Array;
|
|
5
|
+
interface FindEntryPointsResult {
|
|
6
|
+
joiningEmptyStream: boolean;
|
|
7
|
+
entryPointsFromDht: boolean;
|
|
8
|
+
discoveredEntryPoints: PeerDescriptor[];
|
|
9
|
+
}
|
|
10
|
+
interface StreamEntryPointDiscoveryConfig {
|
|
11
|
+
streams: Map<string, StreamObject>;
|
|
12
|
+
ownPeerDescriptor: PeerDescriptor;
|
|
13
|
+
getEntryPointData: (key: Uint8Array) => Promise<RecursiveFindResult>;
|
|
14
|
+
getEntryPointDataViaPeer: (key: Uint8Array, peer: PeerDescriptor) => Promise<DataEntry[]>;
|
|
15
|
+
storeEntryPointData: (key: Uint8Array, data: Any) => Promise<PeerDescriptor[]>;
|
|
16
|
+
deleteEntryPointData: (key: Uint8Array) => Promise<void>;
|
|
17
|
+
cacheInterval?: number;
|
|
18
|
+
}
|
|
19
|
+
export declare class StreamEntryPointDiscovery {
|
|
20
|
+
private readonly abortController;
|
|
21
|
+
private readonly config;
|
|
22
|
+
private readonly servicedStreams;
|
|
23
|
+
private readonly cacheInterval;
|
|
24
|
+
constructor(config: StreamEntryPointDiscoveryConfig);
|
|
25
|
+
discoverEntryPointsFromDht(streamPartID: string, knownEntryPointCount: number, forwardingPeer?: PeerDescriptor): Promise<FindEntryPointsResult>;
|
|
26
|
+
private discoverEntryPoints;
|
|
27
|
+
private queryEntrypoints;
|
|
28
|
+
private queryEntryPointsViaPeer;
|
|
29
|
+
storeSelfAsEntryPointIfNecessary(streamPartID: string, joiningEmptyStream: boolean, entryPointsFromDht: boolean, currentEntrypointCount: number): Promise<void>;
|
|
30
|
+
private storeSelfAsEntryPoint;
|
|
31
|
+
private keepSelfAsEntryPoint;
|
|
32
|
+
private avoidNetworkSplit;
|
|
33
|
+
removeSelfAsEntryPoint(streamPartId: string): void;
|
|
34
|
+
destroy(): Promise<void>;
|
|
35
|
+
}
|
|
36
|
+
export {};
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StreamEntryPointDiscovery = exports.streamPartIdToDataKey = void 0;
|
|
4
|
+
const crypto_1 = require("crypto");
|
|
5
|
+
const dht_1 = require("@streamr/dht");
|
|
6
|
+
const any_1 = require("../proto/google/protobuf/any");
|
|
7
|
+
const utils_1 = require("@streamr/utils");
|
|
8
|
+
const streamPartIdToDataKey = (streamPartId) => {
|
|
9
|
+
return new Uint8Array((0, crypto_1.createHash)('md5').update(streamPartId).digest());
|
|
10
|
+
};
|
|
11
|
+
exports.streamPartIdToDataKey = streamPartIdToDataKey;
|
|
12
|
+
const parseEntryPointData = (dataEntries) => {
|
|
13
|
+
return dataEntries.filter((entry) => !entry.deleted).map((entry) => any_1.Any.unpack(entry.data, dht_1.PeerDescriptor));
|
|
14
|
+
};
|
|
15
|
+
const exponentialRunOff = async (task, description, abortSignal, baseDelay = 500, maxAttempts = 6) => {
|
|
16
|
+
for (let i = 1; i <= maxAttempts; i++) {
|
|
17
|
+
if (abortSignal.aborted) {
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
20
|
+
const factor = 2 ** i;
|
|
21
|
+
const delay = baseDelay * factor;
|
|
22
|
+
try {
|
|
23
|
+
await task();
|
|
24
|
+
}
|
|
25
|
+
catch (e) {
|
|
26
|
+
logger.trace(`${description} failed, retrying in ${delay} ms`);
|
|
27
|
+
}
|
|
28
|
+
try { // Abort controller throws unexpected errors in destroy?
|
|
29
|
+
await (0, utils_1.wait)(delay, abortSignal);
|
|
30
|
+
}
|
|
31
|
+
catch (err) {
|
|
32
|
+
logger.trace(`${err}`);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
const logger = new utils_1.Logger(module);
|
|
37
|
+
const ENTRYPOINT_STORE_LIMIT = 8;
|
|
38
|
+
class StreamEntryPointDiscovery {
|
|
39
|
+
constructor(config) {
|
|
40
|
+
this.config = config;
|
|
41
|
+
this.abortController = new AbortController();
|
|
42
|
+
this.cacheInterval = this.config.cacheInterval ?? 60000;
|
|
43
|
+
this.servicedStreams = new Map();
|
|
44
|
+
}
|
|
45
|
+
async discoverEntryPointsFromDht(streamPartID, knownEntryPointCount, forwardingPeer) {
|
|
46
|
+
if (knownEntryPointCount > 0) {
|
|
47
|
+
return {
|
|
48
|
+
joiningEmptyStream: false,
|
|
49
|
+
entryPointsFromDht: false,
|
|
50
|
+
discoveredEntryPoints: []
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
let joiningEmptyStream = false;
|
|
54
|
+
const discoveredEntryPoints = await this.discoverEntryPoints(streamPartID, forwardingPeer);
|
|
55
|
+
if (discoveredEntryPoints.length === 0) {
|
|
56
|
+
joiningEmptyStream = true;
|
|
57
|
+
discoveredEntryPoints.push(this.config.ownPeerDescriptor);
|
|
58
|
+
}
|
|
59
|
+
return {
|
|
60
|
+
joiningEmptyStream,
|
|
61
|
+
discoveredEntryPoints,
|
|
62
|
+
entryPointsFromDht: true
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
async discoverEntryPoints(streamPartId, forwardingPeer) {
|
|
66
|
+
const dataKey = (0, exports.streamPartIdToDataKey)(streamPartId);
|
|
67
|
+
return forwardingPeer ?
|
|
68
|
+
this.queryEntryPointsViaPeer(dataKey, forwardingPeer) : await this.queryEntrypoints(dataKey);
|
|
69
|
+
}
|
|
70
|
+
async queryEntrypoints(key) {
|
|
71
|
+
logger.trace(`Finding data from dht peer ${this.config.ownPeerDescriptor.nodeName}`);
|
|
72
|
+
try {
|
|
73
|
+
const results = await this.config.getEntryPointData(key);
|
|
74
|
+
if (results.dataEntries) {
|
|
75
|
+
return parseEntryPointData(results.dataEntries);
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
return [];
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
catch (err) {
|
|
82
|
+
return [];
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
async queryEntryPointsViaPeer(key, peer) {
|
|
86
|
+
logger.trace(`Finding data via peer ${this.config.ownPeerDescriptor.nodeName}`);
|
|
87
|
+
try {
|
|
88
|
+
const results = await this.config.getEntryPointDataViaPeer(key, peer);
|
|
89
|
+
if (results) {
|
|
90
|
+
return parseEntryPointData(results);
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
return [];
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
catch (err) {
|
|
97
|
+
return [];
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
async storeSelfAsEntryPointIfNecessary(streamPartID, joiningEmptyStream, entryPointsFromDht, currentEntrypointCount) {
|
|
101
|
+
if (joiningEmptyStream) {
|
|
102
|
+
await this.storeSelfAsEntryPoint(streamPartID);
|
|
103
|
+
setImmediate(() => this.avoidNetworkSplit(streamPartID));
|
|
104
|
+
}
|
|
105
|
+
else if (entryPointsFromDht && currentEntrypointCount < ENTRYPOINT_STORE_LIMIT) {
|
|
106
|
+
try {
|
|
107
|
+
await this.storeSelfAsEntryPoint(streamPartID);
|
|
108
|
+
}
|
|
109
|
+
catch (err) {
|
|
110
|
+
logger.trace(`Failed to store self as entrypoint on stream `);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
async storeSelfAsEntryPoint(streamPartId) {
|
|
115
|
+
const ownPeerDescriptor = this.config.ownPeerDescriptor;
|
|
116
|
+
const dataToStore = any_1.Any.pack(ownPeerDescriptor, dht_1.PeerDescriptor);
|
|
117
|
+
try {
|
|
118
|
+
await this.config.storeEntryPointData((0, exports.streamPartIdToDataKey)(streamPartId), dataToStore);
|
|
119
|
+
this.keepSelfAsEntryPoint(streamPartId);
|
|
120
|
+
}
|
|
121
|
+
catch (err) {
|
|
122
|
+
logger.warn(`Failed to store self as entrypoint for ${streamPartId}`);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
keepSelfAsEntryPoint(streamPartId) {
|
|
126
|
+
if (!this.config.streams.has(streamPartId) || this.servicedStreams.has(streamPartId)) {
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
this.servicedStreams.set(streamPartId, setTimeout(async () => {
|
|
130
|
+
if (!this.config.streams.has(streamPartId)) {
|
|
131
|
+
this.servicedStreams.delete(streamPartId);
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
logger.trace(`Attempting to keep self as entrypoint for ${streamPartId}`);
|
|
135
|
+
try {
|
|
136
|
+
const discovered = await this.discoverEntryPoints(streamPartId);
|
|
137
|
+
if (discovered.length < ENTRYPOINT_STORE_LIMIT
|
|
138
|
+
|| discovered.some((peer) => (0, dht_1.isSamePeerDescriptor)(peer, this.config.ownPeerDescriptor))) {
|
|
139
|
+
await this.storeSelfAsEntryPoint(streamPartId);
|
|
140
|
+
this.servicedStreams.delete(streamPartId);
|
|
141
|
+
this.keepSelfAsEntryPoint(streamPartId);
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
this.servicedStreams.delete(streamPartId);
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
catch (err) {
|
|
148
|
+
logger.debug(`Failed to keep self as entrypoint for ${streamPartId}`);
|
|
149
|
+
}
|
|
150
|
+
}, this.cacheInterval));
|
|
151
|
+
}
|
|
152
|
+
async avoidNetworkSplit(streamPartID) {
|
|
153
|
+
await exponentialRunOff(async () => {
|
|
154
|
+
if (this.config.streams.has(streamPartID)) {
|
|
155
|
+
const stream = this.config.streams.get(streamPartID);
|
|
156
|
+
const rediscoveredEntrypoints = await this.discoverEntryPoints(streamPartID);
|
|
157
|
+
await stream.layer1.joinDht(rediscoveredEntrypoints, false);
|
|
158
|
+
if (stream.layer1.getBucketSize() < 4) {
|
|
159
|
+
throw new Error(`Network split is still possible`);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
}, 'avoid network split', this.abortController.signal);
|
|
163
|
+
logger.trace(`Network split avoided`);
|
|
164
|
+
}
|
|
165
|
+
removeSelfAsEntryPoint(streamPartId) {
|
|
166
|
+
if (this.servicedStreams.has(streamPartId)) {
|
|
167
|
+
(0, utils_1.setAbortableTimeout)(() => this.config.deleteEntryPointData((0, exports.streamPartIdToDataKey)(streamPartId)), 0, this.abortController.signal);
|
|
168
|
+
clearTimeout(this.servicedStreams.get(streamPartId));
|
|
169
|
+
this.servicedStreams.delete(streamPartId);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
async destroy() {
|
|
173
|
+
this.servicedStreams.forEach((_, streamPartId) => this.removeSelfAsEntryPoint(streamPartId));
|
|
174
|
+
this.servicedStreams.clear();
|
|
175
|
+
this.abortController.abort();
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
exports.StreamEntryPointDiscovery = StreamEntryPointDiscovery;
|
|
179
|
+
//# sourceMappingURL=StreamEntryPointDiscovery.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StreamEntryPointDiscovery.js","sourceRoot":"","sources":["../../../src/logic/StreamEntryPointDiscovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { ListeningRpcCommunicator, PeerDescriptor, PeerIDKey } from '@streamr/dht';
|
|
2
|
+
import { Empty } from '../proto/google/protobuf/empty';
|
|
3
|
+
import { LeaveStreamNotice, MessageRef, StreamMessage } from '../proto/packages/trackerless-network/protos/NetworkRpc';
|
|
4
|
+
import { INetworkRpc } from '../proto/packages/trackerless-network/protos/NetworkRpc.server';
|
|
5
|
+
import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
|
|
6
|
+
export interface StreamNodeServerConfig {
|
|
7
|
+
ownPeerDescriptor: PeerDescriptor;
|
|
8
|
+
randomGraphId: string;
|
|
9
|
+
markAndCheckDuplicate: (messageRef: MessageRef, previousMessageRef?: MessageRef) => boolean;
|
|
10
|
+
broadcast: (message: StreamMessage, previousPeer?: string) => void;
|
|
11
|
+
onLeaveNotice(notice: LeaveStreamNotice): void;
|
|
12
|
+
markForInspection(senderId: PeerIDKey, messageRef: MessageRef): void;
|
|
13
|
+
rpcCommunicator: ListeningRpcCommunicator;
|
|
14
|
+
}
|
|
15
|
+
export declare class StreamNodeServer implements INetworkRpc {
|
|
16
|
+
private readonly config;
|
|
17
|
+
constructor(config: StreamNodeServerConfig);
|
|
18
|
+
sendData(message: StreamMessage, context: ServerCallContext): Promise<Empty>;
|
|
19
|
+
leaveStreamNotice(message: LeaveStreamNotice, _context: ServerCallContext): Promise<Empty>;
|
|
20
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StreamNodeServer = void 0;
|
|
4
|
+
const dht_1 = require("@streamr/dht");
|
|
5
|
+
const empty_1 = require("../proto/google/protobuf/empty");
|
|
6
|
+
class StreamNodeServer {
|
|
7
|
+
constructor(config) {
|
|
8
|
+
this.config = config;
|
|
9
|
+
}
|
|
10
|
+
async sendData(message, context) {
|
|
11
|
+
const previousPeer = (0, dht_1.keyFromPeerDescriptor)(context.incomingSourceDescriptor);
|
|
12
|
+
this.config.markForInspection(previousPeer, message.messageRef);
|
|
13
|
+
if (this.config.markAndCheckDuplicate(message.messageRef, message.previousMessageRef)) {
|
|
14
|
+
this.config.broadcast(message, previousPeer);
|
|
15
|
+
}
|
|
16
|
+
return empty_1.Empty;
|
|
17
|
+
}
|
|
18
|
+
async leaveStreamNotice(message, _context) {
|
|
19
|
+
if (message.randomGraphId === this.config.randomGraphId) {
|
|
20
|
+
this.config.onLeaveNotice(message);
|
|
21
|
+
}
|
|
22
|
+
return empty_1.Empty;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
exports.StreamNodeServer = StreamNodeServer;
|
|
26
|
+
//# sourceMappingURL=StreamNodeServer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StreamNodeServer.js","sourceRoot":"","sources":["../../../src/logic/StreamNodeServer.ts"],"names":[],"mappings":";;;AAAA,sCAAyH;AACzH,0DAAsD;AAmBtD,MAAa,gBAAgB;IAIzB,YAAY,MAA8B;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAsB,EAAE,OAA0B;QAC7D,MAAM,YAAY,GAAG,IAAA,2BAAqB,EAAE,OAA0B,CAAC,wBAAyB,CAAC,CAAA;QACjG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC,UAAW,CAAC,CAAA;QAChE,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAqB,CAAC,OAAO,CAAC,UAAW,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE;YACpF,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;SAC/C;QACD,OAAO,aAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA0B,EAAE,QAA2B;QAC3E,IAAI,OAAO,CAAC,aAAa,KAAK,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACrD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;SACrC;QACD,OAAO,aAAK,CAAA;IAChB,CAAC;CACJ;AAvBD,4CAuBC"}
|