@streamr/node 101.0.1 → 101.1.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/dist/package.json +11 -11
- package/dist/src/config/ConfigWizard.js +2 -2
- package/dist/src/config/ConfigWizard.js.map +1 -1
- package/dist/src/plugins/operator/OperatorPlugin.js +8 -0
- package/dist/src/plugins/operator/OperatorPlugin.js.map +1 -1
- package/dist/src/plugins/operator/StreamPartAssignments.d.ts +5 -3
- package/dist/src/plugins/operator/StreamPartAssignments.js +19 -6
- package/dist/src/plugins/operator/StreamPartAssignments.js.map +1 -1
- package/package.json +11 -11
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/node",
|
|
3
|
-
"version": "101.0
|
|
3
|
+
"version": "101.1.0",
|
|
4
4
|
"description": "A full-featured node implementation for the Streamr Network",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"license": "STREAMR NETWORK OPEN SOURCE LICENSE",
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@ensdomains/ens-contracts": "1.1.4",
|
|
34
|
-
"@inquirer/prompts": "^5.
|
|
34
|
+
"@inquirer/prompts": "^5.3.8",
|
|
35
35
|
"@streamr/config": "^5.3.13",
|
|
36
|
-
"@streamr/dht": "101.0
|
|
37
|
-
"@streamr/sdk": "101.0
|
|
38
|
-
"@streamr/utils": "101.0
|
|
36
|
+
"@streamr/dht": "101.1.0",
|
|
37
|
+
"@streamr/sdk": "101.1.0",
|
|
38
|
+
"@streamr/utils": "101.1.0",
|
|
39
39
|
"aedes": "^0.51.2",
|
|
40
|
-
"ajv": "^8.
|
|
40
|
+
"ajv": "^8.17.1",
|
|
41
41
|
"ajv-formats": "^3.0.1",
|
|
42
42
|
"cassandra-driver": "^4.7.2",
|
|
43
43
|
"chalk": "^4.0.0",
|
|
@@ -52,26 +52,26 @@
|
|
|
52
52
|
"merge2": "^1.4.1",
|
|
53
53
|
"node-fetch": "^2.7.0",
|
|
54
54
|
"p-limit": "^3.1.0",
|
|
55
|
-
"qs": "^6.
|
|
55
|
+
"qs": "^6.13.0",
|
|
56
56
|
"uuid": "^10.0.0",
|
|
57
57
|
"ws": "^8.18.0",
|
|
58
58
|
"zod": "^3.22.4"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@inquirer/testing": "^2.1.
|
|
61
|
+
"@inquirer/testing": "^2.1.31",
|
|
62
62
|
"@streamr/network-contracts-ethers6": "^7.1.3",
|
|
63
|
-
"@streamr/test-utils": "101.0
|
|
63
|
+
"@streamr/test-utils": "101.1.0",
|
|
64
64
|
"@types/cors": "^2.8.17",
|
|
65
65
|
"@types/express": "^4.17.21",
|
|
66
66
|
"@types/heap": "^0.2.34",
|
|
67
|
-
"@types/lodash": "^4.17.
|
|
67
|
+
"@types/lodash": "^4.17.7",
|
|
68
68
|
"@types/merge2": "^1.4.4",
|
|
69
69
|
"@types/node-fetch": "^2.6.4",
|
|
70
70
|
"@types/qs": "^6.9.12",
|
|
71
71
|
"@types/stream-to-array": "^2.3.3",
|
|
72
72
|
"@types/supertest": "^6.0.2",
|
|
73
73
|
"@types/uuid": "^10.0.0",
|
|
74
|
-
"@types/ws": "^8.5.
|
|
74
|
+
"@types/ws": "^8.5.12",
|
|
75
75
|
"async-mqtt": "^2.6.1",
|
|
76
76
|
"stream-to-array": "^2.3.0",
|
|
77
77
|
"supertest": "^7.0.0"
|
|
@@ -120,7 +120,7 @@ async function start() {
|
|
|
120
120
|
log(`> ${content}`);
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
|
-
catch
|
|
123
|
+
catch {
|
|
124
124
|
resume();
|
|
125
125
|
log('> x Failed to fetch node\'s balance');
|
|
126
126
|
}
|
|
@@ -148,7 +148,7 @@ async function start() {
|
|
|
148
148
|
}
|
|
149
149
|
log(`> *https://streamr.network/hub/network/operators/${operator}*`);
|
|
150
150
|
}
|
|
151
|
-
catch
|
|
151
|
+
catch {
|
|
152
152
|
resume();
|
|
153
153
|
log('> x Failed to fetch operator nodes');
|
|
154
154
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConfigWizard.js","sourceRoot":"","sources":["../../../src/config/ConfigWizard.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ConfigWizard.js","sourceRoot":"","sources":["../../../src/config/ConfigWizard.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.OperatorPlugin = void 0;
|
|
7
|
+
const sdk_1 = require("@streamr/sdk");
|
|
7
8
|
const utils_1 = require("@streamr/utils");
|
|
8
9
|
const Plugin_1 = require("../../Plugin");
|
|
9
10
|
const MaintainTopologyHelper_1 = require("./MaintainTopologyHelper");
|
|
@@ -44,6 +45,13 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
44
45
|
const maintainTopologyService = new MaintainTopologyService_1.MaintainTopologyService(streamrClient, streamPartAssignments);
|
|
45
46
|
await fleetState.start();
|
|
46
47
|
await maintainTopologyHelper.start();
|
|
48
|
+
const networkNode = await streamrClient.getNode();
|
|
49
|
+
const rpcServerFunction = async (request) => {
|
|
50
|
+
const streamPartId = utils_1.StreamPartIDUtils.parse(request.streamPartId);
|
|
51
|
+
const operators = streamPartAssignments.getAssignedNodesForStreamPart(streamPartId);
|
|
52
|
+
return sdk_1.OperatorDiscoveryResponse.create({ operators: operators.map((operator) => (0, sdk_1.peerDescriptorTranslator)(operator)) });
|
|
53
|
+
};
|
|
54
|
+
await networkNode.registerExternalRpcMethod(sdk_1.OperatorDiscoveryRequest, sdk_1.OperatorDiscoveryResponse, 'discoverOperators', rpcServerFunction);
|
|
47
55
|
this.abortController.signal.addEventListener('abort', async () => {
|
|
48
56
|
await fleetState.destroy();
|
|
49
57
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorPlugin.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"OperatorPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorPlugin.ts"],"names":[],"mappings":";;;;;;AAAA,sCAOqB;AACrB,0CAQuB;AAGvB,yCAAqC;AACrC,qEAAiE;AACjE,uEAAmE;AACnE,6DAAyD;AACzD,mEAA+D;AAC/D,qEAAiE;AACjE,iEAA6D;AAC7D,yEAAqE;AACrE,2DAAuD;AACvD,8EAAuD;AACvD,yDAAqD;AACrD,yEAAqE;AACrE,2DAAuD;AACvD,mEAA+D;AAC/D,2DAAuD;AAuCvD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,cAAe,SAAQ,eAA4B;IAC3C,eAAe,GAAoB,IAAI,eAAe,EAAE,CAAA;IAEzE,KAAK,CAAC,KAAK,CAAC,aAA4B;QACpC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,SAAS,EAAE,CAAA;QAC9C,MAAM,uBAAuB,GAAG,IAAA,yBAAiB,EAAC,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAA;QAE5F,MAAM,QAAQ,GAAG,aAAa,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAA;QACnE,MAAM,gBAAgB,GAAG,MAAM,QAAQ,CAAC,qBAAqB,EAAE,CAAA;QAC/D,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAA;QAC3D,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,8BAA8B,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAEjE,MAAM,sBAAsB,GAAG,IAAI,+CAAsB,CAAC,QAAQ,CAAC,CAAA;QACnE,MAAM,wBAAwB,GAAG,uCAAkB,CAAC,+BAA+B,CAC/E,aAAa,EACb,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAC7C,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,YAAY,EACzC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,iBAAiB,EAC9C,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,gBAAgB,EAC7C,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAChD,CAAA;QAED,MAAM,UAAU,GAAG,wBAAwB,CAAC,IAAA,mDAAwB,EAAC,uBAAuB,CAAC,CAAC,CAAA;QAC9F,MAAM,qBAAqB,GAAG,IAAI,6CAAqB,CACnD,MAAM,EACN,gBAAgB,EAChB,KAAK,EAAE,QAAQ,EAAE,EAAE;YACf,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;YACtD,OAAO,MAAM,CAAC,cAAc,EAAE,CAAA;QAClC,CAAC,EACD,UAAU,EACV,sBAAsB,CACzB,CAAA;QAED,6EAA6E;QAC7E,6DAA6D;QAC7D,MAAM,uBAAuB,GAAG,IAAI,iDAAuB,CAAC,aAAa,EAAE,qBAAqB,CAAC,CAAA;QACjG,MAAM,UAAU,CAAC,KAAK,EAAE,CAAA;QACxB,MAAM,sBAAsB,CAAC,KAAK,EAAE,CAAA;QAEpC,MAAM,WAAW,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAA;QAEjD,MAAM,iBAAiB,GAAG,KAAK,EAAE,OAAiC,EAAE,EAAE;YAClE,MAAM,YAAY,GAAG,yBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;YAClE,MAAM,SAAS,GAAG,qBAAqB,CAAC,6BAA6B,CAAC,YAAY,CAAC,CAAA;YACnF,OAAO,+BAAyB,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,8BAAwB,EAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAA;QAC3H,CAAC,CAAA;QAED,MAAM,WAAW,CAAC,yBAAyB,CAAC,8BAAwB,EAAE,+BAAyB,EAAE,mBAAmB,EAAE,iBAAiB,CAAC,CAAA;QAExI,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;YAC7D,MAAM,UAAU,CAAC,OAAO,EAAE,CAAA;QAC9B,CAAC,CAAC,CAAA;QAEF,wHAAwH;QACxH,oCAAoC;QACpC,YAAY,CAAC,KAAK,IAAI,EAAE;YACpB,IAAA,4BAAoB,EAAC,GAAG,EAAE;gBACtB,CAAC,KAAK,IAAI,EAAE;oBACR,MAAM,IAAA,2CAAoB,EACtB,IAAA,yBAAiB,EAAC,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,EAC5D,aAAa,CAChB,CAAA;gBACL,CAAC,CAAC,EAAE,CAAA;YACR,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;YAC9E,MAAM,IAAA,0BAAkB,EACpB,KAAK,IAAI,EAAE,CAAC,IAAA,mDAAwB,EAChC,QAAQ,EACR,aAAa,EACb,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,gCAAgC,EACxE,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,yBAAyB,CACpE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACZ,MAAM,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAC7C,CAAC,CAAC,EACF,IAAI,CAAC,YAAY,CAAC,oCAAoC,EACtD,IAAI,EACJ,IAAI,CAAC,eAAe,CAAC,MAAM,CAC9B,CAAA;YACD,MAAM,UAAU,CAAC,cAAc,EAAE,CAAA;YACjC,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAAgB,EAAC,aAAa,EAAE,UAAU,EAAE,MAAM,CAAC,CAAA;YAC1E,IAAI,CAAC;gBACD,MAAM,IAAA,0BAAkB,EAAC,KAAK,IAAI,EAAE;oBAChC,IAAI,QAAQ,EAAE,EAAE,CAAC;wBACb,MAAM,IAAA,+CAAsB,EACxB,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,iBAAiB,EAC1D,QAAQ,EACR,aAAa,CAChB,CAAA;oBACL,CAAC;gBACL,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;YACpG,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;gBAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;YACnB,CAAC;YACD,MAAM,IAAA,0BAAkB,EACpB,KAAK,IAAI,EAAE;gBACP,IAAI,QAAQ,EAAE,EAAE,CAAC;oBACb,IAAI,CAAC;wBACD,MAAM,IAAA,6CAAqB,EACvB,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,2BAA2B,EACnE,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,gCAAgC,EACxE,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,yBAAyB,EACjE,QAAQ,CACX,CAAA;oBACL,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACX,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;oBACtE,CAAC;gBACL,CAAC;YACL,CAAC,EACD,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,YAAY,EACpD,IAAI,EACJ,IAAI,CAAC,eAAe,CAAC,MAAM,CAC9B,CAAA;YAED,MAAM,IAAA,0BAAkB,EAAC,KAAK,IAAI,EAAE;gBAChC,IAAI,CAAC;oBACD,MAAM,IAAA,qCAAiB,EACnB,uBAAuB,EACvB,QAAQ,EACR,qBAAqB,EACrB,aAAa,EACb,IAAI,CAAC,YAAY,CAAC,oBAAoB,EACtC,KAAK,EAAE,6BAA6B,EAAE,EAAE;wBACpC,OAAO,aAAa,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC,qBAAqB,EAAE,CAAA;oBAC3F,CAAC,EACD,wBAAwB,EACxB,IAAI,CAAC,eAAe,CAAC,MAAM,CAC9B,CAAA;gBACL,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACX,MAAM,CAAC,KAAK,CAAC,gDAAgD,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;gBAC3E,CAAC;YACL,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;YAExF,MAAM,IAAA,0BAAkB,EAAC,KAAK,IAAI,EAAE;gBAChC,IAAI,CAAC;oBACD,MAAM,IAAA,qCAAiB,EACnB,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,EAC9C,QAAQ,CACX,CAAA;gBACL,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACX,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;gBAC1E,CAAC;YACL,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;YAExF,IAAA,+BAAuB,EACnB,QAAQ,EACR,iBAAiB,EACjB,CAAC,KAAyB,EAAQ,EAAE;gBAChC,YAAY,CAAC,KAAK,IAAI,EAAE;oBACpB,IAAI,CAAC;wBACD,IAAI,QAAQ,EAAE,EAAE,CAAC;4BACb,MAAM,IAAA,qCAAiB,EAAC;gCACpB,kBAAkB,EAAE,KAAK,CAAC,WAAW;gCACrC,cAAc,EAAE,KAAK,CAAC,cAAc;gCACpC,SAAS,EAAE,KAAK,CAAC,SAAS;gCAC1B,UAAU,EAAE,QAAQ;gCACpB,aAAa;gCACb,wBAAwB;gCACxB,mBAAmB,EAAE,KAAK,EAAE,6BAA6B,EAAE,EAAE;oCACzD,OAAO,aAAa,CAAC,WAAW,CAAC,6BAA6B,CAAC,CAAC,qBAAqB,EAAE,CAAA;gCAC3F,CAAC;gCACD,YAAY,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;gCAC3B,oBAAoB,EAAE,IAAI,CAAC,YAAY,CAAC,oBAAoB;gCAC5D,YAAY,EAAE;oCACV,SAAS,EAAE,KAAK,CAAC,0BAA0B;oCAC3C,OAAO,EAAE,KAAK,CAAC,wBAAwB;iCAC1C;gCACD,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;gCACrC,cAAc,EAAE,EAAE;gCAClB,WAAW,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM;6BAC3C,CAAC,CAAA;wBACN,CAAC;oBACL,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC;wBACX,MAAM,CAAC,KAAK,CAAC,mDAAmD,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;oBAC9E,CAAC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC,EACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAC9B,CAAA;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;IAED,kDAAkD;IACzC,eAAe;QACpB,OAAO,4BAAoB,CAAA;IAC/B,CAAC;IAED,kDAAkD;IACzC,eAAe;QACpB,OAAO,CAAC;gBACJ,IAAI,EAAE,qCAAqC,EAAE,KAAK,EAAE,IAAI;aAC3D,CAAC,CAAA;IACN,CAAC;CACJ;AAvMD,wCAuMC"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { DhtAddress } from '@streamr/dht';
|
|
2
2
|
import { StreamID, StreamPartID } from '@streamr/utils';
|
|
3
|
+
import { NetworkPeerDescriptor } from '@streamr/sdk';
|
|
3
4
|
import EventEmitter3 from 'eventemitter3';
|
|
4
5
|
import { MaintainTopologyHelperEvents } from './MaintainTopologyHelper';
|
|
5
|
-
import {
|
|
6
|
+
import { OperatorFleetState } from './OperatorFleetState';
|
|
6
7
|
export interface StreamPartAssignmentEvents {
|
|
7
8
|
assigned(streamPartId: StreamPartID): void;
|
|
8
9
|
unassigned(streamPartId: StreamPartID): void;
|
|
9
10
|
}
|
|
10
11
|
export declare class StreamPartAssignments extends EventEmitter3<StreamPartAssignmentEvents> {
|
|
11
|
-
private readonly
|
|
12
|
+
private readonly assignments;
|
|
12
13
|
private readonly myStreamParts;
|
|
13
14
|
private readonly concurrencyLimit;
|
|
14
15
|
private readonly consistentHashRing;
|
|
@@ -16,8 +17,9 @@ export declare class StreamPartAssignments extends EventEmitter3<StreamPartAssig
|
|
|
16
17
|
private readonly getStreamParts;
|
|
17
18
|
private readonly operatorFleetState;
|
|
18
19
|
private readonly maintainTopologyHelper;
|
|
19
|
-
constructor(myNodeId: DhtAddress, redundancyFactor: number, getStreamParts: (streamId: StreamID) => Promise<StreamPartID[]>, operatorFleetState:
|
|
20
|
+
constructor(myNodeId: DhtAddress, redundancyFactor: number, getStreamParts: (streamId: StreamID) => Promise<StreamPartID[]>, operatorFleetState: OperatorFleetState, maintainTopologyHelper: EventEmitter3<MaintainTopologyHelperEvents>);
|
|
20
21
|
getMyStreamParts(): StreamPartID[];
|
|
22
|
+
getAssignedNodesForStreamPart(streamPartId: StreamPartID): NetworkPeerDescriptor[];
|
|
21
23
|
private nodeAdded;
|
|
22
24
|
private nodeRemoved;
|
|
23
25
|
private streamsStaked;
|
|
@@ -10,7 +10,7 @@ const p_limit_1 = __importDefault(require("p-limit"));
|
|
|
10
10
|
const ConsistentHashRing_1 = require("./ConsistentHashRing");
|
|
11
11
|
const logger = new utils_1.Logger(module);
|
|
12
12
|
class StreamPartAssignments extends eventemitter3_1.default {
|
|
13
|
-
|
|
13
|
+
assignments = new Map();
|
|
14
14
|
myStreamParts = new Set();
|
|
15
15
|
concurrencyLimit = (0, p_limit_1.default)(1);
|
|
16
16
|
consistentHashRing;
|
|
@@ -34,6 +34,17 @@ class StreamPartAssignments extends eventemitter3_1.default {
|
|
|
34
34
|
getMyStreamParts() {
|
|
35
35
|
return Array.from(this.myStreamParts);
|
|
36
36
|
}
|
|
37
|
+
getAssignedNodesForStreamPart(streamPartId) {
|
|
38
|
+
const nodeList = this.assignments.get(streamPartId) ?? [];
|
|
39
|
+
const descriptorList = [];
|
|
40
|
+
for (const nodeId of nodeList) {
|
|
41
|
+
const descriptor = this.operatorFleetState.getPeerDescriptor(nodeId);
|
|
42
|
+
if (descriptor !== undefined) {
|
|
43
|
+
descriptorList.push(descriptor);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
return descriptorList;
|
|
47
|
+
}
|
|
37
48
|
nodeAdded = this.concurrencyLimiter(async (nodeId) => {
|
|
38
49
|
if (nodeId === this.myNodeId) {
|
|
39
50
|
return;
|
|
@@ -51,7 +62,7 @@ class StreamPartAssignments extends eventemitter3_1.default {
|
|
|
51
62
|
streamsStaked = this.concurrencyLimiter(async (streamIds) => {
|
|
52
63
|
const streamPartIds = (await Promise.all(streamIds.map(this.getStreamPartIds))).flat();
|
|
53
64
|
for (const streamPartId of streamPartIds) {
|
|
54
|
-
this.
|
|
65
|
+
this.assignments.set(streamPartId, []);
|
|
55
66
|
}
|
|
56
67
|
// TODO: optimize; calculate efficiently by only considering added stream parts
|
|
57
68
|
this.recalculateAssignments(`streamsStaked:${streamIds.join()}`);
|
|
@@ -59,7 +70,7 @@ class StreamPartAssignments extends eventemitter3_1.default {
|
|
|
59
70
|
streamUnstaked = this.concurrencyLimiter(async (streamId) => {
|
|
60
71
|
const streamPartIds = await this.getStreamPartIds(streamId);
|
|
61
72
|
for (const streamPartId of streamPartIds) {
|
|
62
|
-
this.
|
|
73
|
+
this.assignments.delete(streamPartId);
|
|
63
74
|
}
|
|
64
75
|
// TODO: optimize; calculate efficiently by only considering removed stream parts
|
|
65
76
|
this.recalculateAssignments(`streamUnstaked:${streamId}`);
|
|
@@ -67,15 +78,17 @@ class StreamPartAssignments extends eventemitter3_1.default {
|
|
|
67
78
|
recalculateAssignments(context) {
|
|
68
79
|
const assigned = [];
|
|
69
80
|
const unassigned = [];
|
|
70
|
-
for (const streamPartId of this.
|
|
71
|
-
|
|
81
|
+
for (const streamPartId of this.assignments.keys()) {
|
|
82
|
+
const nodeList = this.consistentHashRing.get(streamPartId);
|
|
83
|
+
this.assignments.set(streamPartId, nodeList);
|
|
84
|
+
if (nodeList.includes(this.myNodeId) && !this.myStreamParts.has(streamPartId)) {
|
|
72
85
|
assigned.push(streamPartId);
|
|
73
86
|
this.myStreamParts.add(streamPartId);
|
|
74
87
|
this.emit('assigned', streamPartId);
|
|
75
88
|
}
|
|
76
89
|
}
|
|
77
90
|
for (const streamPartId of this.myStreamParts) {
|
|
78
|
-
if (!this.
|
|
91
|
+
if (!this.assignments.has(streamPartId) || !this.consistentHashRing.get(streamPartId).includes(this.myNodeId)) {
|
|
79
92
|
unassigned.push(streamPartId);
|
|
80
93
|
this.myStreamParts.delete(streamPartId);
|
|
81
94
|
this.emit('unassigned', streamPartId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamPartAssignments.js","sourceRoot":"","sources":["../../../../src/plugins/operator/StreamPartAssignments.ts"],"names":[],"mappings":";;;;;;AACA,0CAA+D;
|
|
1
|
+
{"version":3,"file":"StreamPartAssignments.js","sourceRoot":"","sources":["../../../../src/plugins/operator/StreamPartAssignments.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/node",
|
|
3
|
-
"version": "101.0
|
|
3
|
+
"version": "101.1.0",
|
|
4
4
|
"description": "A full-featured node implementation for the Streamr Network",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"license": "STREAMR NETWORK OPEN SOURCE LICENSE",
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@ensdomains/ens-contracts": "1.1.4",
|
|
34
|
-
"@inquirer/prompts": "^5.
|
|
34
|
+
"@inquirer/prompts": "^5.3.8",
|
|
35
35
|
"@streamr/config": "^5.3.13",
|
|
36
|
-
"@streamr/dht": "101.0
|
|
37
|
-
"@streamr/sdk": "101.0
|
|
38
|
-
"@streamr/utils": "101.0
|
|
36
|
+
"@streamr/dht": "101.1.0",
|
|
37
|
+
"@streamr/sdk": "101.1.0",
|
|
38
|
+
"@streamr/utils": "101.1.0",
|
|
39
39
|
"aedes": "^0.51.2",
|
|
40
|
-
"ajv": "^8.
|
|
40
|
+
"ajv": "^8.17.1",
|
|
41
41
|
"ajv-formats": "^3.0.1",
|
|
42
42
|
"cassandra-driver": "^4.7.2",
|
|
43
43
|
"chalk": "^4.0.0",
|
|
@@ -52,26 +52,26 @@
|
|
|
52
52
|
"merge2": "^1.4.1",
|
|
53
53
|
"node-fetch": "^2.7.0",
|
|
54
54
|
"p-limit": "^3.1.0",
|
|
55
|
-
"qs": "^6.
|
|
55
|
+
"qs": "^6.13.0",
|
|
56
56
|
"uuid": "^10.0.0",
|
|
57
57
|
"ws": "^8.18.0",
|
|
58
58
|
"zod": "^3.22.4"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
|
-
"@inquirer/testing": "^2.1.
|
|
61
|
+
"@inquirer/testing": "^2.1.31",
|
|
62
62
|
"@streamr/network-contracts-ethers6": "^7.1.3",
|
|
63
|
-
"@streamr/test-utils": "101.0
|
|
63
|
+
"@streamr/test-utils": "101.1.0",
|
|
64
64
|
"@types/cors": "^2.8.17",
|
|
65
65
|
"@types/express": "^4.17.21",
|
|
66
66
|
"@types/heap": "^0.2.34",
|
|
67
|
-
"@types/lodash": "^4.17.
|
|
67
|
+
"@types/lodash": "^4.17.7",
|
|
68
68
|
"@types/merge2": "^1.4.4",
|
|
69
69
|
"@types/node-fetch": "^2.6.4",
|
|
70
70
|
"@types/qs": "^6.9.12",
|
|
71
71
|
"@types/stream-to-array": "^2.3.3",
|
|
72
72
|
"@types/supertest": "^6.0.2",
|
|
73
73
|
"@types/uuid": "^10.0.0",
|
|
74
|
-
"@types/ws": "^8.5.
|
|
74
|
+
"@types/ws": "^8.5.12",
|
|
75
75
|
"async-mqtt": "^2.6.1",
|
|
76
76
|
"stream-to-array": "^2.3.0",
|
|
77
77
|
"supertest": "^7.0.0"
|