@streamr/trackerless-network 100.2.4 → 100.2.5-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 +6 -6
- package/dist/src/logic/ContentDeliveryManager.d.ts +2 -0
- package/dist/src/logic/ContentDeliveryManager.js +31 -13
- package/dist/src/logic/ContentDeliveryManager.js.map +1 -1
- package/dist/src/logic/EntryPointDiscovery.d.ts +3 -16
- package/dist/src/logic/EntryPointDiscovery.js +9 -88
- package/dist/src/logic/EntryPointDiscovery.js.map +1 -1
- package/dist/src/logic/StreamPartNetworkSplitAvoidance.d.ts +18 -0
- package/dist/src/logic/StreamPartNetworkSplitAvoidance.js +73 -0
- package/dist/src/logic/StreamPartNetworkSplitAvoidance.js.map +1 -0
- package/dist/src/logic/StreamPartReconnect.js +3 -3
- package/dist/src/logic/StreamPartReconnect.js.map +1 -1
- package/dist/src/proto/google/protobuf/any.d.ts +4 -11
- 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 +3 -9
- package/dist/src/proto/google/protobuf/timestamp.js.map +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +2 -2
- package/dist/src/proto/packages/dht/protos/DhtRpc.js +1 -1
- package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
- package/package.json +6 -6
- package/src/logic/ContentDeliveryManager.ts +32 -16
- package/src/logic/EntryPointDiscovery.ts +14 -108
- package/src/logic/StreamPartNetworkSplitAvoidance.ts +89 -0
- package/src/logic/StreamPartReconnect.ts +3 -3
- package/src/proto/google/protobuf/any.ts +4 -11
- package/src/proto/google/protobuf/empty.ts +1 -0
- package/src/proto/google/protobuf/timestamp.ts +3 -9
- package/src/proto/packages/dht/protos/DhtRpc.ts +3 -3
- package/test/unit/EntrypointDiscovery.test.ts +9 -40
- package/test/unit/StreamPartNetworkSplitAvoidance.test.ts +32 -0
- package/test/utils/fake/FakeEntryPointDiscovery.ts +4 -7
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/trackerless-network",
|
|
3
|
-
"version": "100.2.
|
|
3
|
+
"version": "100.2.5-beta.1",
|
|
4
4
|
"description": "Minimal and extendable implementation of the Streamr Network node.",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"@protobuf-ts/runtime": "^2.8.2",
|
|
32
32
|
"@protobuf-ts/runtime-rpc": "^2.8.2",
|
|
33
|
-
"@streamr/dht": "100.2.
|
|
34
|
-
"@streamr/proto-rpc": "100.2.
|
|
35
|
-
"@streamr/protocol": "100.2.
|
|
36
|
-
"@streamr/test-utils": "100.2.
|
|
37
|
-
"@streamr/utils": "100.2.
|
|
33
|
+
"@streamr/dht": "100.2.5-beta.1",
|
|
34
|
+
"@streamr/proto-rpc": "100.2.5-beta.1",
|
|
35
|
+
"@streamr/protocol": "100.2.5-beta.1",
|
|
36
|
+
"@streamr/test-utils": "100.2.5-beta.1",
|
|
37
|
+
"@streamr/utils": "100.2.5-beta.1",
|
|
38
38
|
"eventemitter3": "^5.0.0",
|
|
39
39
|
"lodash": "^4.17.21",
|
|
40
40
|
"uuid": "^9.0.1",
|
|
@@ -8,6 +8,7 @@ import { Layer0Node } from './Layer0Node';
|
|
|
8
8
|
import { Layer1Node } from './Layer1Node';
|
|
9
9
|
import { ContentDeliveryLayerNode } from './ContentDeliveryLayerNode';
|
|
10
10
|
import { ProxyClient } from './proxy/ProxyClient';
|
|
11
|
+
import { StreamPartNetworkSplitAvoidance } from './StreamPartNetworkSplitAvoidance';
|
|
11
12
|
export type StreamPartDelivery = {
|
|
12
13
|
broadcast: (msg: StreamMessage) => void;
|
|
13
14
|
stop: () => Promise<void>;
|
|
@@ -16,6 +17,7 @@ export type StreamPartDelivery = {
|
|
|
16
17
|
layer1Node: Layer1Node;
|
|
17
18
|
node: ContentDeliveryLayerNode;
|
|
18
19
|
entryPointDiscovery: EntryPointDiscovery;
|
|
20
|
+
networkSplitAvoidance: StreamPartNetworkSplitAvoidance;
|
|
19
21
|
} | {
|
|
20
22
|
proxied: true;
|
|
21
23
|
client: ProxyClient;
|
|
@@ -10,6 +10,7 @@ const EntryPointDiscovery_1 = require("./EntryPointDiscovery");
|
|
|
10
10
|
const createContentDeliveryLayerNode_1 = require("./createContentDeliveryLayerNode");
|
|
11
11
|
const ProxyClient_1 = require("./proxy/ProxyClient");
|
|
12
12
|
const StreamPartReconnect_1 = require("./StreamPartReconnect");
|
|
13
|
+
const StreamPartNetworkSplitAvoidance_1 = require("./StreamPartNetworkSplitAvoidance");
|
|
13
14
|
const logger = new utils_1.Logger(module);
|
|
14
15
|
class ContentDeliveryManager extends eventemitter3_1.EventEmitter {
|
|
15
16
|
transport;
|
|
@@ -82,11 +83,14 @@ class ContentDeliveryManager extends eventemitter3_1.EventEmitter {
|
|
|
82
83
|
const entryPointDiscovery = new EntryPointDiscovery_1.EntryPointDiscovery({
|
|
83
84
|
streamPartId,
|
|
84
85
|
localPeerDescriptor: this.getPeerDescriptor(),
|
|
85
|
-
layer1Node,
|
|
86
86
|
fetchEntryPointData: (key) => this.layer0Node.fetchDataFromDht(key),
|
|
87
87
|
storeEntryPointData: (key, data) => this.layer0Node.storeDataToDht(key, data),
|
|
88
88
|
deleteEntryPointData: async (key) => this.layer0Node.deleteDataFromDht(key, false)
|
|
89
89
|
});
|
|
90
|
+
const networkSplitAvoidance = new StreamPartNetworkSplitAvoidance_1.StreamPartNetworkSplitAvoidance({
|
|
91
|
+
layer1Node,
|
|
92
|
+
discoverEntryPoints: async () => entryPointDiscovery.discoverEntryPoints()
|
|
93
|
+
});
|
|
90
94
|
const node = this.createContentDeliveryLayerNode(streamPartId, layer1Node, () => entryPointDiscovery.isLocalNodeEntryPoint());
|
|
91
95
|
const streamPartReconnect = new StreamPartReconnect_1.StreamPartReconnect(layer1Node, entryPointDiscovery);
|
|
92
96
|
streamPart = {
|
|
@@ -94,9 +98,11 @@ class ContentDeliveryManager extends eventemitter3_1.EventEmitter {
|
|
|
94
98
|
layer1Node,
|
|
95
99
|
node,
|
|
96
100
|
entryPointDiscovery,
|
|
101
|
+
networkSplitAvoidance,
|
|
97
102
|
broadcast: (msg) => node.broadcast(msg),
|
|
98
103
|
stop: async () => {
|
|
99
104
|
streamPartReconnect.destroy();
|
|
105
|
+
networkSplitAvoidance.destroy();
|
|
100
106
|
await entryPointDiscovery.destroy();
|
|
101
107
|
node.stop();
|
|
102
108
|
await layer1Node.stop();
|
|
@@ -110,11 +116,13 @@ class ContentDeliveryManager extends eventemitter3_1.EventEmitter {
|
|
|
110
116
|
if (this.destroyed || entryPointDiscovery.isLocalNodeEntryPoint() || this.knownStreamPartEntryPoints.has(streamPartId)) {
|
|
111
117
|
return;
|
|
112
118
|
}
|
|
113
|
-
const entryPoints = await entryPointDiscovery.
|
|
114
|
-
|
|
119
|
+
const entryPoints = await entryPointDiscovery.discoverEntryPoints();
|
|
120
|
+
if (entryPoints.length < EntryPointDiscovery_1.ENTRYPOINT_STORE_LIMIT) {
|
|
121
|
+
await entryPointDiscovery.storeAndKeepLocalNodeAsEntryPoint();
|
|
122
|
+
}
|
|
115
123
|
};
|
|
116
124
|
layer1Node.on('manualRejoinRequired', async () => {
|
|
117
|
-
if (!streamPartReconnect.isRunning() && !
|
|
125
|
+
if (!streamPartReconnect.isRunning() && !networkSplitAvoidance.isRunning()) {
|
|
118
126
|
logger.debug('Manual rejoin required for stream part', { streamPartId });
|
|
119
127
|
await streamPartReconnect.reconnect();
|
|
120
128
|
}
|
|
@@ -138,15 +146,25 @@ class ContentDeliveryManager extends eventemitter3_1.EventEmitter {
|
|
|
138
146
|
}
|
|
139
147
|
await streamPart.layer1Node.start();
|
|
140
148
|
await streamPart.node.start();
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
await entryPointDiscovery.
|
|
149
|
+
const knownEntryPoints = this.knownStreamPartEntryPoints.get(streamPartId);
|
|
150
|
+
if (knownEntryPoints !== undefined) {
|
|
151
|
+
await Promise.all([
|
|
152
|
+
streamPart.layer1Node.joinDht(knownEntryPoints),
|
|
153
|
+
streamPart.layer1Node.joinRing()
|
|
154
|
+
]);
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
const entryPoints = await entryPointDiscovery.discoverEntryPoints();
|
|
158
|
+
await Promise.all([
|
|
159
|
+
streamPart.layer1Node.joinDht((0, lodash_1.sampleSize)(entryPoints, StreamPartNetworkSplitAvoidance_1.MIN_NEIGHBOR_COUNT)),
|
|
160
|
+
streamPart.layer1Node.joinRing()
|
|
161
|
+
]);
|
|
162
|
+
if (entryPoints.length < EntryPointDiscovery_1.ENTRYPOINT_STORE_LIMIT) {
|
|
163
|
+
await entryPointDiscovery.storeAndKeepLocalNodeAsEntryPoint();
|
|
164
|
+
if (streamPart.layer1Node.getNeighborCount() < StreamPartNetworkSplitAvoidance_1.MIN_NEIGHBOR_COUNT) {
|
|
165
|
+
setImmediate(() => streamPart.networkSplitAvoidance.avoidNetworkSplit());
|
|
166
|
+
}
|
|
167
|
+
}
|
|
150
168
|
}
|
|
151
169
|
}
|
|
152
170
|
createLayer1Node(streamPartId, entryPoints) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContentDeliveryManager.js","sourceRoot":"","sources":["../../../src/logic/ContentDeliveryManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ContentDeliveryManager.js","sourceRoot":"","sources":["../../../src/logic/ContentDeliveryManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,11 @@
|
|
|
1
1
|
import { DataEntry, DhtAddress, PeerDescriptor } from '@streamr/dht';
|
|
2
2
|
import { StreamPartID } from '@streamr/protocol';
|
|
3
3
|
import { Any } from '../proto/google/protobuf/any';
|
|
4
|
-
import { Layer1Node } from './Layer1Node';
|
|
5
4
|
export declare const streamPartIdToDataKey: (streamPartId: StreamPartID) => DhtAddress;
|
|
6
|
-
export interface FindEntryPointsResult {
|
|
7
|
-
entryPointsFromDht: boolean;
|
|
8
|
-
discoveredEntryPoints: PeerDescriptor[];
|
|
9
|
-
}
|
|
10
5
|
export declare const ENTRYPOINT_STORE_LIMIT = 8;
|
|
11
|
-
export declare const NETWORK_SPLIT_AVOIDANCE_LIMIT = 4;
|
|
12
6
|
interface EntryPointDiscoveryConfig {
|
|
13
7
|
streamPartId: StreamPartID;
|
|
14
8
|
localPeerDescriptor: PeerDescriptor;
|
|
15
|
-
layer1Node: Layer1Node;
|
|
16
9
|
fetchEntryPointData: (key: DhtAddress) => Promise<DataEntry[]>;
|
|
17
10
|
storeEntryPointData: (key: DhtAddress, data: Any) => Promise<PeerDescriptor[]>;
|
|
18
11
|
deleteEntryPointData: (key: DhtAddress) => Promise<void>;
|
|
@@ -22,19 +15,13 @@ export declare class EntryPointDiscovery {
|
|
|
22
15
|
private readonly abortController;
|
|
23
16
|
private readonly config;
|
|
24
17
|
private readonly storeInterval;
|
|
25
|
-
private readonly networkSplitAvoidedNodes;
|
|
26
18
|
private isLocalNodeStoredAsEntryPoint;
|
|
27
|
-
private networkSplitAvoidanceIsRunning;
|
|
28
19
|
constructor(config: EntryPointDiscoveryConfig);
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
private
|
|
32
|
-
storeSelfAsEntryPointIfNecessary(currentEntrypointCount: number): Promise<void>;
|
|
33
|
-
private storeSelfAsEntryPoint;
|
|
20
|
+
discoverEntryPoints(): Promise<PeerDescriptor[]>;
|
|
21
|
+
storeAndKeepLocalNodeAsEntryPoint(): Promise<void>;
|
|
22
|
+
private storeLocalNodeAsEntryPoint;
|
|
34
23
|
private keepSelfAsEntryPoint;
|
|
35
|
-
private avoidNetworkSplit;
|
|
36
24
|
isLocalNodeEntryPoint(): boolean;
|
|
37
|
-
isNetworkSplitAvoidanceRunning(): boolean;
|
|
38
25
|
destroy(): Promise<void>;
|
|
39
26
|
}
|
|
40
27
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.EntryPointDiscovery = exports.
|
|
3
|
+
exports.EntryPointDiscovery = exports.ENTRYPOINT_STORE_LIMIT = exports.streamPartIdToDataKey = void 0;
|
|
4
4
|
const dht_1 = require("@streamr/dht");
|
|
5
5
|
const utils_1 = require("@streamr/utils");
|
|
6
6
|
const crypto_1 = require("crypto");
|
|
@@ -12,96 +12,38 @@ exports.streamPartIdToDataKey = streamPartIdToDataKey;
|
|
|
12
12
|
const parseEntryPointData = (dataEntries) => {
|
|
13
13
|
return dataEntries.filter((entry) => !entry.deleted).map((entry) => any_1.Any.unpack(entry.data, dht_1.PeerDescriptor));
|
|
14
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}`); // TODO Do we need logging?
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
};
|
|
36
15
|
const logger = new utils_1.Logger(module);
|
|
37
16
|
exports.ENTRYPOINT_STORE_LIMIT = 8;
|
|
38
|
-
exports.NETWORK_SPLIT_AVOIDANCE_LIMIT = 4;
|
|
39
17
|
class EntryPointDiscovery {
|
|
40
18
|
abortController;
|
|
41
19
|
config;
|
|
42
20
|
storeInterval;
|
|
43
|
-
networkSplitAvoidedNodes = new Set();
|
|
44
21
|
isLocalNodeStoredAsEntryPoint = false;
|
|
45
|
-
networkSplitAvoidanceIsRunning = false;
|
|
46
22
|
constructor(config) {
|
|
47
23
|
this.config = config;
|
|
48
24
|
this.abortController = new AbortController();
|
|
49
25
|
this.storeInterval = this.config.storeInterval ?? 60000;
|
|
50
26
|
}
|
|
51
|
-
async discoverEntryPointsFromDht(knownEntryPointCount) {
|
|
52
|
-
if (knownEntryPointCount > 0) {
|
|
53
|
-
return {
|
|
54
|
-
entryPointsFromDht: false,
|
|
55
|
-
discoveredEntryPoints: []
|
|
56
|
-
};
|
|
57
|
-
}
|
|
58
|
-
const discoveredEntryPoints = await this.discoverEntryPoints();
|
|
59
|
-
if (discoveredEntryPoints.length === 0) {
|
|
60
|
-
discoveredEntryPoints.push(this.config.localPeerDescriptor);
|
|
61
|
-
}
|
|
62
|
-
return {
|
|
63
|
-
discoveredEntryPoints,
|
|
64
|
-
entryPointsFromDht: true
|
|
65
|
-
};
|
|
66
|
-
}
|
|
67
27
|
async discoverEntryPoints() {
|
|
68
28
|
const dataKey = (0, exports.streamPartIdToDataKey)(this.config.streamPartId);
|
|
69
|
-
|
|
70
|
-
const filtered = discoveredEntryPoints.filter((node) => !this.networkSplitAvoidedNodes.has((0, dht_1.getNodeIdFromPeerDescriptor)(node)));
|
|
71
|
-
// If all discovered entry points have previously been detected as offline, try again
|
|
72
|
-
if (filtered.length > 0) {
|
|
73
|
-
return filtered;
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
return discoveredEntryPoints;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
async queryEntrypoints(key) {
|
|
80
|
-
logger.trace(`Finding data from dht node ${(0, dht_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor)}`);
|
|
29
|
+
logger.trace(`Discovering entry points for key ${dataKey}`);
|
|
81
30
|
try {
|
|
82
|
-
const result = await this.config.fetchEntryPointData(
|
|
31
|
+
const result = await this.config.fetchEntryPointData(dataKey);
|
|
83
32
|
return parseEntryPointData(result);
|
|
84
33
|
}
|
|
85
34
|
catch (err) {
|
|
86
35
|
return [];
|
|
87
36
|
}
|
|
88
37
|
}
|
|
89
|
-
async
|
|
38
|
+
async storeAndKeepLocalNodeAsEntryPoint() {
|
|
90
39
|
if (this.abortController.signal.aborted) {
|
|
91
40
|
return;
|
|
92
41
|
}
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
await this.storeSelfAsEntryPoint();
|
|
97
|
-
await this.keepSelfAsEntryPoint();
|
|
98
|
-
}
|
|
99
|
-
if (possibleNetworkSplitDetected) {
|
|
100
|
-
// TODO should we catch possible promise rejection?
|
|
101
|
-
setImmediate(() => this.avoidNetworkSplit());
|
|
102
|
-
}
|
|
42
|
+
this.isLocalNodeStoredAsEntryPoint = true;
|
|
43
|
+
await this.storeLocalNodeAsEntryPoint();
|
|
44
|
+
await this.keepSelfAsEntryPoint();
|
|
103
45
|
}
|
|
104
|
-
async
|
|
46
|
+
async storeLocalNodeAsEntryPoint() {
|
|
105
47
|
const localPeerDescriptor = this.config.localPeerDescriptor;
|
|
106
48
|
const dataToStore = any_1.Any.pack(localPeerDescriptor, dht_1.PeerDescriptor);
|
|
107
49
|
try {
|
|
@@ -118,7 +60,7 @@ class EntryPointDiscovery {
|
|
|
118
60
|
const discovered = await this.discoverEntryPoints();
|
|
119
61
|
if (discovered.length < exports.ENTRYPOINT_STORE_LIMIT
|
|
120
62
|
|| discovered.some((peerDescriptor) => (0, dht_1.areEqualPeerDescriptors)(peerDescriptor, this.config.localPeerDescriptor))) {
|
|
121
|
-
await this.
|
|
63
|
+
await this.storeLocalNodeAsEntryPoint();
|
|
122
64
|
}
|
|
123
65
|
}
|
|
124
66
|
catch (err) {
|
|
@@ -126,30 +68,9 @@ class EntryPointDiscovery {
|
|
|
126
68
|
}
|
|
127
69
|
}, this.storeInterval, false, this.abortController.signal);
|
|
128
70
|
}
|
|
129
|
-
async avoidNetworkSplit() {
|
|
130
|
-
this.networkSplitAvoidanceIsRunning = true;
|
|
131
|
-
await exponentialRunOff(async () => {
|
|
132
|
-
const rediscoveredEntrypoints = await this.discoverEntryPoints();
|
|
133
|
-
await this.config.layer1Node.joinDht(rediscoveredEntrypoints, false, false);
|
|
134
|
-
if (this.config.layer1Node.getNeighborCount() < exports.NETWORK_SPLIT_AVOIDANCE_LIMIT) {
|
|
135
|
-
// Filter out nodes that are not neighbors as those nodes are assumed to be offline
|
|
136
|
-
const nodesToAvoid = rediscoveredEntrypoints
|
|
137
|
-
.filter((peer) => !this.config.layer1Node.getNeighbors()
|
|
138
|
-
.some((neighbor) => (0, dht_1.areEqualPeerDescriptors)(neighbor, peer)))
|
|
139
|
-
.map((peer) => (0, dht_1.getNodeIdFromPeerDescriptor)(peer));
|
|
140
|
-
nodesToAvoid.forEach((node) => this.networkSplitAvoidedNodes.add(node));
|
|
141
|
-
throw new Error(`Network split is still possible`);
|
|
142
|
-
}
|
|
143
|
-
}, 'avoid network split', this.abortController.signal);
|
|
144
|
-
this.networkSplitAvoidedNodes.clear();
|
|
145
|
-
logger.trace(`Network split avoided`);
|
|
146
|
-
}
|
|
147
71
|
isLocalNodeEntryPoint() {
|
|
148
72
|
return this.isLocalNodeStoredAsEntryPoint;
|
|
149
73
|
}
|
|
150
|
-
isNetworkSplitAvoidanceRunning() {
|
|
151
|
-
return this.networkSplitAvoidanceIsRunning;
|
|
152
|
-
}
|
|
153
74
|
async destroy() {
|
|
154
75
|
this.abortController.abort();
|
|
155
76
|
await this.config.deleteEntryPointData((0, exports.streamPartIdToDataKey)(this.config.streamPartId));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EntryPointDiscovery.js","sourceRoot":"","sources":["../../../src/logic/EntryPointDiscovery.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"EntryPointDiscovery.js","sourceRoot":"","sources":["../../../src/logic/EntryPointDiscovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { DhtAddress, PeerDescriptor } from '@streamr/dht';
|
|
2
|
+
import { Layer1Node } from './Layer1Node';
|
|
3
|
+
export declare const MIN_NEIGHBOR_COUNT = 4;
|
|
4
|
+
export interface StreamPartNetworkSplitAvoidanceConfig {
|
|
5
|
+
layer1Node: Layer1Node;
|
|
6
|
+
discoverEntryPoints: (excludedNodes?: Set<DhtAddress>) => Promise<PeerDescriptor[]>;
|
|
7
|
+
exponentialRunOfBaseDelay?: number;
|
|
8
|
+
}
|
|
9
|
+
export declare class StreamPartNetworkSplitAvoidance {
|
|
10
|
+
private readonly abortController;
|
|
11
|
+
private readonly config;
|
|
12
|
+
private readonly excludedNodes;
|
|
13
|
+
private running;
|
|
14
|
+
constructor(config: StreamPartNetworkSplitAvoidanceConfig);
|
|
15
|
+
avoidNetworkSplit(): Promise<void>;
|
|
16
|
+
isRunning(): boolean;
|
|
17
|
+
destroy(): void;
|
|
18
|
+
}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.StreamPartNetworkSplitAvoidance = exports.MIN_NEIGHBOR_COUNT = void 0;
|
|
4
|
+
const dht_1 = require("@streamr/dht");
|
|
5
|
+
const utils_1 = require("@streamr/utils");
|
|
6
|
+
/*
|
|
7
|
+
* Tries to find new neighbors if we currently have less than MIN_NEIGHBOR_COUNT neigbors. It does so by
|
|
8
|
+
* rejoining the stream's control layer network.
|
|
9
|
+
*
|
|
10
|
+
* This way we can avoid some network split scenarios. The functionality is most relevant for small stream
|
|
11
|
+
* networks.
|
|
12
|
+
*/
|
|
13
|
+
const logger = new utils_1.Logger(module);
|
|
14
|
+
const exponentialRunOff = async (task, description, abortSignal, baseDelay = 500, maxAttempts = 6) => {
|
|
15
|
+
for (let i = 1; i <= maxAttempts; i++) {
|
|
16
|
+
if (abortSignal.aborted) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
const factor = 2 ** i;
|
|
20
|
+
const delay = baseDelay * factor;
|
|
21
|
+
try {
|
|
22
|
+
await task();
|
|
23
|
+
}
|
|
24
|
+
catch (e) {
|
|
25
|
+
logger.debug(`${description} failed, retrying in ${delay} ms`);
|
|
26
|
+
}
|
|
27
|
+
try { // Abort controller throws unexpected errors in destroy?
|
|
28
|
+
await (0, utils_1.wait)(delay, abortSignal);
|
|
29
|
+
}
|
|
30
|
+
catch (err) {
|
|
31
|
+
logger.trace(`${err}`); // TODO Do we need logging?
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
exports.MIN_NEIGHBOR_COUNT = 4;
|
|
36
|
+
class StreamPartNetworkSplitAvoidance {
|
|
37
|
+
abortController;
|
|
38
|
+
config;
|
|
39
|
+
excludedNodes = new Set();
|
|
40
|
+
running = false;
|
|
41
|
+
constructor(config) {
|
|
42
|
+
this.config = config;
|
|
43
|
+
this.abortController = new AbortController();
|
|
44
|
+
}
|
|
45
|
+
async avoidNetworkSplit() {
|
|
46
|
+
this.running = true;
|
|
47
|
+
await exponentialRunOff(async () => {
|
|
48
|
+
const discoveredEntrypoints = await this.config.discoverEntryPoints();
|
|
49
|
+
const filteredEntryPoints = discoveredEntrypoints.filter((peer) => !this.excludedNodes.has((0, dht_1.getNodeIdFromPeerDescriptor)(peer)));
|
|
50
|
+
await this.config.layer1Node.joinDht(filteredEntryPoints, false, false);
|
|
51
|
+
if (this.config.layer1Node.getNeighborCount() < exports.MIN_NEIGHBOR_COUNT) {
|
|
52
|
+
// Filter out nodes that are not neighbors as those nodes are assumed to be offline
|
|
53
|
+
const newExcludes = filteredEntryPoints
|
|
54
|
+
.filter((peer) => !this.config.layer1Node.getNeighbors()
|
|
55
|
+
.some((neighbor) => (0, dht_1.areEqualPeerDescriptors)(neighbor, peer)))
|
|
56
|
+
.map((peer) => (0, dht_1.getNodeIdFromPeerDescriptor)(peer));
|
|
57
|
+
newExcludes.forEach((node) => this.excludedNodes.add(node));
|
|
58
|
+
throw new Error(`Network split is still possible`);
|
|
59
|
+
}
|
|
60
|
+
}, 'avoid network split', this.abortController.signal, this.config.exponentialRunOfBaseDelay);
|
|
61
|
+
this.running = false;
|
|
62
|
+
this.excludedNodes.clear();
|
|
63
|
+
logger.trace(`Network split avoided`);
|
|
64
|
+
}
|
|
65
|
+
isRunning() {
|
|
66
|
+
return this.running;
|
|
67
|
+
}
|
|
68
|
+
destroy() {
|
|
69
|
+
this.abortController.abort();
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
exports.StreamPartNetworkSplitAvoidance = StreamPartNetworkSplitAvoidance;
|
|
73
|
+
//# sourceMappingURL=StreamPartNetworkSplitAvoidance.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"StreamPartNetworkSplitAvoidance.js","sourceRoot":"","sources":["../../../src/logic/StreamPartNetworkSplitAvoidance.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,10 @@ class StreamPartReconnect {
|
|
|
14
14
|
async reconnect(timeout = DEFAULT_RECONNECT_INTERVAL) {
|
|
15
15
|
this.abortController = new AbortController();
|
|
16
16
|
await (0, utils_1.scheduleAtInterval)(async () => {
|
|
17
|
-
const entryPoints = await this.entryPointDiscovery.
|
|
18
|
-
await this.layer1Node.joinDht(entryPoints
|
|
17
|
+
const entryPoints = await this.entryPointDiscovery.discoverEntryPoints();
|
|
18
|
+
await this.layer1Node.joinDht(entryPoints);
|
|
19
19
|
if (this.entryPointDiscovery.isLocalNodeEntryPoint()) {
|
|
20
|
-
await this.entryPointDiscovery.
|
|
20
|
+
await this.entryPointDiscovery.storeAndKeepLocalNodeAsEntryPoint();
|
|
21
21
|
}
|
|
22
22
|
if (this.layer1Node.getNeighborCount() > 0) {
|
|
23
23
|
this.abortController.abort();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamPartReconnect.js","sourceRoot":"","sources":["../../../src/logic/StreamPartReconnect.ts"],"names":[],"mappings":";;;AAAA,0CAAmD;AAInD,MAAM,0BAA0B,GAAG,EAAE,GAAG,IAAI,CAAA;AAC5C,MAAa,mBAAmB;IACpB,eAAe,CAAkB;IACxB,UAAU,CAAY;IACtB,mBAAmB,CAAqB;IAEzD,YAAY,UAAsB,EAAE,mBAAwC;QACxE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAO,GAAG,0BAA0B;QAChD,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,MAAM,IAAA,0BAAkB,EAAC,KAAK,IAAI,EAAE;YAChC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"StreamPartReconnect.js","sourceRoot":"","sources":["../../../src/logic/StreamPartReconnect.ts"],"names":[],"mappings":";;;AAAA,0CAAmD;AAInD,MAAM,0BAA0B,GAAG,EAAE,GAAG,IAAI,CAAA;AAC5C,MAAa,mBAAmB;IACpB,eAAe,CAAkB;IACxB,UAAU,CAAY;IACtB,mBAAmB,CAAqB;IAEzD,YAAY,UAAsB,EAAE,mBAAwC;QACxE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAA;QAC5B,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAA;IAClD,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,OAAO,GAAG,0BAA0B;QAChD,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,MAAM,IAAA,0BAAkB,EAAC,KAAK,IAAI,EAAE;YAChC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,EAAE,CAAA;YACxE,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;YAC1C,IAAI,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,EAAE,EAAE,CAAC;gBACnD,MAAM,IAAI,CAAC,mBAAmB,CAAC,iCAAiC,EAAE,CAAA;YACtE,CAAC;YACD,IAAI,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,GAAG,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC,eAAgB,CAAC,KAAK,EAAE,CAAA;YACjC,CAAC;QACL,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IAClD,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAA;IAC9E,CAAC;IAED,OAAO;QACH,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAA;IACjC,CAAC;CACJ;AA/BD,kDA+BC"}
|
|
@@ -33,10 +33,6 @@ import { MessageType } from "@protobuf-ts/runtime";
|
|
|
33
33
|
* if (any.is(Foo.class)) {
|
|
34
34
|
* foo = any.unpack(Foo.class);
|
|
35
35
|
* }
|
|
36
|
-
* // or ...
|
|
37
|
-
* if (any.isSameTypeAs(Foo.getDefaultInstance())) {
|
|
38
|
-
* foo = any.unpack(Foo.getDefaultInstance());
|
|
39
|
-
* }
|
|
40
36
|
*
|
|
41
37
|
* Example 3: Pack and unpack a message in Python.
|
|
42
38
|
*
|
|
@@ -51,13 +47,10 @@ import { MessageType } from "@protobuf-ts/runtime";
|
|
|
51
47
|
* Example 4: Pack and unpack a message in Go
|
|
52
48
|
*
|
|
53
49
|
* foo := &pb.Foo{...}
|
|
54
|
-
* any, err :=
|
|
55
|
-
* if err != nil {
|
|
56
|
-
* ...
|
|
57
|
-
* }
|
|
50
|
+
* any, err := ptypes.MarshalAny(foo)
|
|
58
51
|
* ...
|
|
59
52
|
* foo := &pb.Foo{}
|
|
60
|
-
* if err :=
|
|
53
|
+
* if err := ptypes.UnmarshalAny(any, foo); err != nil {
|
|
61
54
|
* ...
|
|
62
55
|
* }
|
|
63
56
|
*
|
|
@@ -67,6 +60,7 @@ import { MessageType } from "@protobuf-ts/runtime";
|
|
|
67
60
|
* in the type URL, for example "foo.bar.com/x/y.z" will yield type
|
|
68
61
|
* name "y.z".
|
|
69
62
|
*
|
|
63
|
+
*
|
|
70
64
|
* JSON
|
|
71
65
|
* ====
|
|
72
66
|
* The JSON representation of an `Any` value uses the regular
|
|
@@ -123,8 +117,7 @@ export interface Any {
|
|
|
123
117
|
*
|
|
124
118
|
* Note: this functionality is not currently available in the official
|
|
125
119
|
* protobuf release, and it is not used for type URLs beginning with
|
|
126
|
-
* type.googleapis.com.
|
|
127
|
-
* implementations and no plans to implement one.
|
|
120
|
+
* type.googleapis.com.
|
|
128
121
|
*
|
|
129
122
|
* Schemes other than `http`, `https` (or the empty scheme) might be
|
|
130
123
|
* used with implementation specific semantics.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"any.js","sourceRoot":"","sources":["../../../../../src/proto/google/protobuf/any.ts"],"names":[],"mappings":";;;AAoCA,kDAAgD;AAEhD,kDAA2D;AAE3D,kDAA8D;AAC9D,kDAAoD;AACpD,kDAAuD;AAEvD,kDAAwD;AAKxD,kDAAmD;
|
|
1
|
+
{"version":3,"file":"any.js","sourceRoot":"","sources":["../../../../../src/proto/google/protobuf/any.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ import { MessageType } from "@protobuf-ts/runtime";
|
|
|
13
13
|
* rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
|
|
14
14
|
* }
|
|
15
15
|
*
|
|
16
|
+
* The JSON representation for `Empty` is empty JSON object `{}`.
|
|
16
17
|
*
|
|
17
18
|
* @generated from protobuf message google.protobuf.Empty
|
|
18
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"empty.js","sourceRoot":"","sources":["../../../../../src/proto/google/protobuf/empty.ts"],"names":[],"mappings":";;;AAoCA,kDAA2D;AAI3D,kDAA8D;AAC9D,kDAAmD;
|
|
1
|
+
{"version":3,"file":"empty.js","sourceRoot":"","sources":["../../../../../src/proto/google/protobuf/empty.ts"],"names":[],"mappings":";;;AAoCA,kDAA2D;AAI3D,kDAA8D;AAC9D,kDAAmD;AAgBnD,2FAA2F;AAC3F,MAAM,UAAW,SAAQ,qBAAkB;IACvC;QACI,KAAK,CAAC,uBAAuB,EAAE,EAAE,CAAC,CAAC;IACvC,CAAC;IACD,MAAM,CAAC,KAA6B;QAChC,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,gBAAiB,CAAC,CAAC,CAAC;QACnE,IAAI,KAAK,KAAK,SAAS;YACnB,IAAA,gCAAsB,EAAQ,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;QACxD,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,kBAAkB,CAAC,MAAqB,EAAE,MAAc,EAAE,OAA0B,EAAE,MAAc;QAChG,OAAO,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;IACnC,CAAC;IACD,mBAAmB,CAAC,OAAc,EAAE,MAAqB,EAAE,OAA2B;QAClF,IAAI,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACnC,IAAI,CAAC,KAAK,KAAK;YACX,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,6BAAmB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAClF,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AACD;;GAEG;AACU,QAAA,KAAK,GAAG,IAAI,UAAU,EAAE,CAAC"}
|