@streamr/node 101.1.1 → 102.0.0-beta.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/bin/entry-point.ts +2 -2
- package/configs/development-1.env.json +0 -3
- package/configs/development-2.env.json +0 -3
- package/configs/development-3.env.json +0 -3
- package/configs/development-prod-resend.env.json +0 -3
- package/configs/docker-1.env.json +0 -3
- package/configs/docker-2.env.json +0 -3
- package/configs/docker-3.env.json +0 -3
- package/dist/bin/entry-point.js +1 -1
- package/dist/bin/entry-point.js.map +1 -1
- package/dist/package.json +14 -14
- package/dist/src/config/migration.js.map +1 -1
- package/dist/src/config/validateConfig.js +1 -0
- package/dist/src/config/validateConfig.js.map +1 -1
- package/dist/src/helpers/PayloadFormat.js +1 -0
- package/dist/src/helpers/PayloadFormat.js.map +1 -1
- package/dist/src/plugins/http/publishEndpoint.js +2 -2
- package/dist/src/plugins/http/publishEndpoint.js.map +1 -1
- package/dist/src/plugins/mqtt/MqttPlugin.js +0 -1
- package/dist/src/plugins/mqtt/MqttPlugin.js.map +1 -1
- package/dist/src/plugins/operator/OperatorPlugin.d.ts +5 -0
- package/dist/src/plugins/operator/OperatorPlugin.js +8 -8
- package/dist/src/plugins/operator/OperatorPlugin.js.map +1 -1
- package/dist/src/plugins/operator/config.schema.json +27 -1
- package/dist/src/plugins/operator/inspectOverTime.d.ts +2 -2
- package/dist/src/plugins/operator/inspectOverTime.js +11 -11
- package/dist/src/plugins/operator/inspectOverTime.js.map +1 -1
- package/dist/src/plugins/operator/inspectRandomNode.d.ts +1 -1
- package/dist/src/plugins/operator/inspectRandomNode.js +3 -3
- package/dist/src/plugins/operator/inspectRandomNode.js.map +1 -1
- package/dist/src/plugins/operator/reviewSuspectNode.d.ts +3 -3
- package/dist/src/plugins/operator/reviewSuspectNode.js +7 -7
- package/dist/src/plugins/operator/reviewSuspectNode.js.map +1 -1
- package/dist/src/plugins/storage/Batch.d.ts +3 -2
- package/dist/src/plugins/storage/Batch.js.map +1 -1
- package/dist/src/plugins/storage/BucketManager.js +2 -5
- package/dist/src/plugins/storage/BucketManager.js.map +1 -1
- package/dist/src/plugins/storage/Storage.d.ts +3 -3
- package/dist/src/plugins/storage/Storage.js +0 -3
- package/dist/src/plugins/storage/Storage.js.map +1 -1
- package/dist/src/plugins/storage/dataQueryEndpoint.js +12 -5
- package/dist/src/plugins/storage/dataQueryEndpoint.js.map +1 -1
- package/package.json +14 -14
package/bin/entry-point.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { config as CHAIN_CONFIG } from '@streamr/config'
|
|
3
|
-
import { DhtAddress, DhtNode, NodeType,
|
|
3
|
+
import { DhtAddress, DhtNode, NodeType, toDhtAddressRaw } from '@streamr/dht'
|
|
4
4
|
|
|
5
5
|
const main = async () => {
|
|
6
6
|
const entryPoint = CHAIN_CONFIG.dev2.entryPoints[0]
|
|
7
7
|
const peerDescriptor = {
|
|
8
8
|
...entryPoint,
|
|
9
|
-
nodeId:
|
|
9
|
+
nodeId: toDhtAddressRaw(entryPoint.nodeId as DhtAddress),
|
|
10
10
|
type: NodeType.NODEJS // TODO remove this when NET-1070 done
|
|
11
11
|
}
|
|
12
12
|
const dhtNode = new DhtNode({
|
package/dist/bin/entry-point.js
CHANGED
|
@@ -7,7 +7,7 @@ const main = async () => {
|
|
|
7
7
|
const entryPoint = config_1.config.dev2.entryPoints[0];
|
|
8
8
|
const peerDescriptor = {
|
|
9
9
|
...entryPoint,
|
|
10
|
-
nodeId: (0, dht_1.
|
|
10
|
+
nodeId: (0, dht_1.toDhtAddressRaw)(entryPoint.nodeId),
|
|
11
11
|
type: dht_1.NodeType.NODEJS // TODO remove this when NET-1070 done
|
|
12
12
|
};
|
|
13
13
|
const dhtNode = new dht_1.DhtNode({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../bin/entry-point.ts"],"names":[],"mappings":";;;AACA,4CAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"entry-point.js","sourceRoot":"","sources":["../../bin/entry-point.ts"],"names":[],"mappings":";;;AACA,4CAAwD;AACxD,sCAA6E;AAE7E,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;IACpB,MAAM,UAAU,GAAG,eAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;IACnD,MAAM,cAAc,GAAG;QACnB,GAAG,UAAU;QACb,MAAM,EAAE,IAAA,qBAAe,EAAC,UAAU,CAAC,MAAoB,CAAC;QACxD,IAAI,EAAE,cAAQ,CAAC,MAAM,CAAE,sCAAsC;KAChE,CAAA;IACD,MAAM,OAAO,GAAG,IAAI,aAAO,CAAC;QACxB,MAAM,EAAE,UAAU,CAAC,MAAoB;QACvC,aAAa,EAAE,UAAU,CAAC,SAAS,CAAC,IAAI;QACxC,kBAAkB,EAAE;YAChB,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,IAAI;YAC9B,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,IAAI;SACjC;QACD,wBAAwB,EAAE,KAAK;QAC/B,WAAW,EAAE,CAAC,cAAc,CAAC;KAChC,CAAC,CAAA;IACF,MAAM,OAAO,CAAC,KAAK,EAAE,CAAA;IACrB,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,CAAC,CAAA;IACvC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;AACvC,CAAC,CAAA;AAED,IAAI,EAAE,CAAA"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/node",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "102.0.0-beta.0",
|
|
4
4
|
"description": "A full-featured node implementation for the Streamr Network",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"types": "./dist/src/exports.d.ts",
|
|
20
20
|
"scripts": {
|
|
21
21
|
"build": "tsc -b tsconfig.node.json",
|
|
22
|
-
"check": "tsc -p ./tsconfig.jest.json
|
|
22
|
+
"check": "tsc -p ./tsconfig.jest.json",
|
|
23
23
|
"clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
|
|
24
24
|
"eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
|
|
25
25
|
"test": "npm run test-unit && npm run test-integration && npm run test-sequential",
|
|
@@ -30,12 +30,12 @@
|
|
|
30
30
|
"author": "Streamr Network AG <contact@streamr.network>",
|
|
31
31
|
"license": "STREAMR NETWORK OPEN SOURCE LICENSE",
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@inquirer/prompts": "^
|
|
34
|
-
"@streamr/config": "^5.
|
|
35
|
-
"@streamr/dht": "
|
|
36
|
-
"@streamr/sdk": "
|
|
37
|
-
"@streamr/utils": "
|
|
38
|
-
"aedes": "^0.51.
|
|
33
|
+
"@inquirer/prompts": "^7.0.0",
|
|
34
|
+
"@streamr/config": "^5.4.0",
|
|
35
|
+
"@streamr/dht": "102.0.0-beta.0",
|
|
36
|
+
"@streamr/sdk": "102.0.0-beta.0",
|
|
37
|
+
"@streamr/utils": "102.0.0-beta.0",
|
|
38
|
+
"aedes": "^0.51.3",
|
|
39
39
|
"ajv": "^8.17.1",
|
|
40
40
|
"ajv-formats": "^3.0.1",
|
|
41
41
|
"cassandra-driver": "^4.7.2",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"cors": "^2.8.5",
|
|
46
46
|
"ethers": "^6.13.0",
|
|
47
47
|
"eventemitter3": "^5.0.0",
|
|
48
|
-
"express": "^4.
|
|
48
|
+
"express": "^4.21.1",
|
|
49
49
|
"heap": "^0.2.6",
|
|
50
50
|
"lodash": "^4.17.21",
|
|
51
51
|
"merge2": "^1.4.1",
|
|
@@ -57,16 +57,16 @@
|
|
|
57
57
|
"zod": "^3.22.4"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
|
-
"@inquirer/testing": "^2.1.
|
|
61
|
-
"@streamr/network-contracts
|
|
62
|
-
"@streamr/test-utils": "
|
|
60
|
+
"@inquirer/testing": "^2.1.35",
|
|
61
|
+
"@streamr/network-contracts": "^8.2.0",
|
|
62
|
+
"@streamr/test-utils": "102.0.0-beta.0",
|
|
63
63
|
"@types/cors": "^2.8.17",
|
|
64
64
|
"@types/express": "^4.17.21",
|
|
65
65
|
"@types/heap": "^0.2.34",
|
|
66
|
-
"@types/lodash": "^4.17.
|
|
66
|
+
"@types/lodash": "^4.17.10",
|
|
67
67
|
"@types/merge2": "^1.4.4",
|
|
68
68
|
"@types/node-fetch": "^2.6.4",
|
|
69
|
-
"@types/qs": "^6.9.
|
|
69
|
+
"@types/qs": "^6.9.16",
|
|
70
70
|
"@types/stream-to-array": "^2.3.3",
|
|
71
71
|
"@types/supertest": "^6.0.2",
|
|
72
72
|
"@types/uuid": "^10.0.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../src/config/migration.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,iEAAwC;AACxC,qCAA2E;AAE9D,QAAA,6BAA6B,GAAG,CAAC,CAAA;AAEvC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAU,EAAE;IACrD,OAAO,0CAA0C,OAAO,cAAc,CAAA;AAC1E,CAAC,CAAA;AAFY,QAAA,aAAa,iBAEzB;AAED,MAAM,UAAU,GAAG,CAAC,MAAW,EAAsB,EAAE;IACnD,MAAM,OAAO,GAAG,+BAA+B,CAAA;IAC/C,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAA;IAChC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1B,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACrC,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACjB,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;QAC3B,CAAC;IACL,CAAC;IACD,OAAO,SAAS,CAAA;AACpB,CAAC,CAAA;AAED,6EAA6E;AACtE,MAAM,cAAc,GAAG,CAAC,MAAW,EAAW,EAAE;IACnD,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,qCAA6B,CAAC,CAAA;AACvG,CAAC,CAAA;AAFY,QAAA,cAAc,kBAE1B;AAED,MAAM,aAAa,GAAG,CAAC,MAAW,EAAc,EAAE;IAC9C,MAAM,cAAc,GAAG,CAAC,CAAA;IACxB,MAAM,MAAM,GAAG,IAAA,mBAAS,EAAC,MAAM,CAAC,CAAA;IAChC,MAAM,CAAC,OAAO,GAAG,IAAA,qBAAa,EAAC,cAAc,CAAC,CAAA;IAC9C,MAAM,8BAA8B,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,8BAA8B,CAAA;IAC7F,IAAI,CAAC,8BAA8B,KAAK,SAAS,CAAC,IAAI,CAAC,8BAA8B,KAAK,CAAC,CAAC,EAAE,CAAC;QAC3F,MAAM,CAAC,OAAO,CAAC,cAAc,GAAG;YAC5B,QAAQ,EAAE,8BAA8B;SAC3C,CAAA;QACD,OAAO,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,8BAA8B,CAAA;IAChE,CAAC;IACD,MAAM,sBAAsB,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,KAAK,IAAI,CAAC,CAAA;IACtH,IAAI,sBAAsB,EAAE,CAAC;QACzB,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"migration.js","sourceRoot":"","sources":["../../../src/config/migration.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ const validateConfig = (data, schema, contextName, useDefaults = true) => {
|
|
|
19
19
|
throw new Error(prefix + ajv.errors.map((e) => {
|
|
20
20
|
let text = ajv.errorsText([e], { dataVar: '' }).trim();
|
|
21
21
|
if (e.params.additionalProperty) {
|
|
22
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
22
23
|
text += ` (${e.params.additionalProperty})`;
|
|
23
24
|
}
|
|
24
25
|
return text;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateConfig.js","sourceRoot":"","sources":["../../../src/config/validateConfig.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA8C;AAC9C,8DAAoC;AAEpC,wFAA0D;AAEnD,MAAM,cAAc,GAAG,CAAC,IAAa,EAAE,MAAc,EAAE,WAAoB,EAAE,WAAW,GAAG,IAAI,EAAgB,EAAE;IACpH,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC;QAChB,WAAW;KACd,CAAC,CAAA;IACF,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAA;IACf,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAA;IACxD,GAAG,CAAC,SAAS,CAAC,iCAAkB,CAAC,CAAA;IACjC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACtE,MAAM,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,MAAO,CAAC,GAAG,CAAC,CAAC,CAAc,EAAE,EAAE;YACxD,IAAI,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAE,CAAC,IAAI,EAAE,CAAA;YACvD,IAAI,CAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC9B,IAAI,IAAI,KAAK,CAAC,CAAC,MAAM,CAAC,kBAAkB,GAAG,CAAA;YAC/C,CAAC;YACD,OAAO,IAAI,CAAA;QACf,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,IAAoB,CAAA;AAC/B,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"validateConfig.js","sourceRoot":"","sources":["../../../src/config/validateConfig.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA8C;AAC9C,8DAAoC;AAEpC,wFAA0D;AAEnD,MAAM,cAAc,GAAG,CAAC,IAAa,EAAE,MAAc,EAAE,WAAoB,EAAE,WAAW,GAAG,IAAI,EAAgB,EAAE;IACpH,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC;QAChB,WAAW;KACd,CAAC,CAAA;IACF,IAAA,qBAAU,EAAC,GAAG,CAAC,CAAA;IACf,GAAG,CAAC,SAAS,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAAA;IACxD,GAAG,CAAC,SAAS,CAAC,iCAAkB,CAAC,CAAA;IACjC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QACtE,MAAM,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,MAAO,CAAC,GAAG,CAAC,CAAC,CAAc,EAAE,EAAE;YACxD,IAAI,IAAI,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAE,CAAC,IAAI,EAAE,CAAA;YACvD,IAAI,CAAC,CAAC,MAAM,CAAC,kBAAkB,EAAE,CAAC;gBAC9B,4EAA4E;gBAC5E,IAAI,IAAI,KAAK,CAAC,CAAC,MAAM,CAAC,kBAAkB,GAAG,CAAA;YAC/C,CAAC;YACD,OAAO,IAAI,CAAA;QACf,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAClB,CAAC;IACD,OAAO,IAAoB,CAAA;AAC/B,CAAC,CAAA;AAnBY,QAAA,cAAc,kBAmB1B;AAEM,MAAM,aAAa,GAAG,CAAC,IAAa,EAAE,MAAc,EAAW,EAAE;IACpE,IAAI,CAAC;QACD,IAAA,sBAAc,EAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QAC9C,OAAO,IAAI,CAAA;IACf,CAAC;IAAC,OAAO,EAAE,EAAE,CAAC;QACV,OAAO,KAAK,CAAA;IAChB,CAAC;AACL,CAAC,CAAA;AAPY,QAAA,aAAa,iBAOzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PayloadFormat.js","sourceRoot":"","sources":["../../../src/helpers/PayloadFormat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PayloadFormat.js","sourceRoot":"","sources":["../../../src/helpers/PayloadFormat.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,11 +46,11 @@ const createHandler = (msgChainId, streamrClient) => {
|
|
|
46
46
|
partitionKey,
|
|
47
47
|
msgChainId
|
|
48
48
|
});
|
|
49
|
-
|
|
49
|
+
res.sendStatus(200);
|
|
50
50
|
}
|
|
51
51
|
catch (err) {
|
|
52
52
|
logger.error('Unable to publish to message', { streamId, err });
|
|
53
|
-
|
|
53
|
+
res.sendStatus(500);
|
|
54
54
|
}
|
|
55
55
|
};
|
|
56
56
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publishEndpoint.js","sourceRoot":"","sources":["../../../../src/plugins/http/publishEndpoint.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAoE;AAEpE,0CAAuC;AACvC,+BAAiC;AACjC,iDAAgG;AAChG,+DAAgE;AAGhE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AACjC,MAAM,cAAc,GAAG,IAAI,kCAAkB,EAAE,CAAA;AAE/C,MAAM,aAAa,GAAG,CAAC,UAAkB,EAAE,aAA4B,EAAkB,EAAE;IACvF,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QACzC,IAAI,OAAgC,CAAA;QACpC,IAAI,SAA6B,CAAA;QACjC,IAAI,SAA6B,CAAA;QACjC,IAAI,YAAgC,CAAA;QACpC,IAAI,CAAC;YACD,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAA;YACnE,SAAS,GAAG,IAAA,4BAAmB,EAAS,WAAW,EAAE,GAAG,CAAC,KAAK,EAAE,uBAAc,CAAC,CAAA;YAC/E,SAAS,GAAG,IAAA,4BAAmB,EAAS,WAAW,EAAE,GAAG,CAAC,KAAK,EAAE,6BAAoB,CAAC,CAAA;YACrF,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,cAAc,CAAW,CAAA;QACtD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,KAAK,EAAE,CAAC,CAAC,OAAO;aACnB,CAAC,CAAA;YACF,OAAM;QACV,CAAC;QACD,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,CAAC,YAAY,KAAK,SAAS,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,KAAK,EAAE,uDAAuD;aACjE,CAAC,CAAA;YACF,OAAM;QACV,CAAC;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAA;QACpC,MAAM,oBAAoB,GAAG;YACzB,QAAQ;YACR,eAAe,EAAE,SAAS;SAC7B,CAAA;QACD,IAAI,CAAC;YACD,MAAM,aAAa,CAAC,OAAO,CAAC,oBAAoB,EAAE,OAAO,EAAE;gBACvD,SAAS;gBACT,YAAY;gBACZ,UAAU;aACb,CAAC,CAAA;YACF,
|
|
1
|
+
{"version":3,"file":"publishEndpoint.js","sourceRoot":"","sources":["../../../../src/plugins/http/publishEndpoint.ts"],"names":[],"mappings":";;;;;;AAAA,sDAAoE;AAEpE,0CAAuC;AACvC,+BAAiC;AACjC,iDAAgG;AAChG,+DAAgE;AAGhE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AACjC,MAAM,cAAc,GAAG,IAAI,kCAAkB,EAAE,CAAA;AAE/C,MAAM,aAAa,GAAG,CAAC,UAAkB,EAAE,aAA4B,EAAkB,EAAE;IACvF,OAAO,KAAK,EAAE,GAAY,EAAE,GAAa,EAAE,EAAE;QACzC,IAAI,OAAgC,CAAA;QACpC,IAAI,SAA6B,CAAA;QACjC,IAAI,SAA6B,CAAA;QACjC,IAAI,YAAgC,CAAA;QACpC,IAAI,CAAC;YACD,OAAO,GAAG,cAAc,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,OAAO,CAAA;YACnE,SAAS,GAAG,IAAA,4BAAmB,EAAS,WAAW,EAAE,GAAG,CAAC,KAAK,EAAE,uBAAc,CAAC,CAAA;YAC/E,SAAS,GAAG,IAAA,4BAAmB,EAAS,WAAW,EAAE,GAAG,CAAC,KAAK,EAAE,6BAAoB,CAAC,CAAA;YACrF,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,cAAc,CAAW,CAAA;QACtD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,KAAK,EAAE,CAAC,CAAC,OAAO;aACnB,CAAC,CAAA;YACF,OAAM;QACV,CAAC;QACD,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,CAAC,YAAY,KAAK,SAAS,CAAC,EAAE,CAAC;YAC5D,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACjB,KAAK,EAAE,uDAAuD;aACjE,CAAC,CAAA;YACF,OAAM;QACV,CAAC;QACD,MAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAA;QACpC,MAAM,oBAAoB,GAAG;YACzB,QAAQ;YACR,eAAe,EAAE,SAAS;SAC7B,CAAA;QACD,IAAI,CAAC;YACD,MAAM,aAAa,CAAC,OAAO,CAAC,oBAAoB,EAAE,OAAO,EAAE;gBACvD,SAAS;gBACT,YAAY;gBACZ,UAAU;aACb,CAAC,CAAA;YACF,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,8BAA8B,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAA;YAC/D,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;QACvB,CAAC;IACL,CAAC,CAAA;AACL,CAAC,CAAA;AAEM,MAAM,cAAc,GAAG,CAAC,aAA4B,EAAsB,EAAE;IAC/E,MAAM,UAAU,GAAG,IAAA,SAAI,GAAE,CAAA;IACzB,OAAO;QACH,IAAI,EAAE,qBAAqB;QAC3B,MAAM,EAAE,MAAM;QACd,eAAe,EAAE;YACb,iBAAO,CAAC,GAAG,CAAC;gBACR,KAAK,EAAE,QAAQ;gBACf,IAAI,KAAK,OAAO,IAAI,CAAA,CAAC,CAAC;aACzB,CAAC;YACF,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC;SAC3C;KACJ,CAAA;AACL,CAAC,CAAA;AAbY,QAAA,cAAc,kBAa1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MqttPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/MqttPlugin.ts"],"names":[],"mappings":";;;;;;AAEA,yCAAsD;AACtD,+DAA8D;AAC9D,qCAAiC;AACjC,6CAAyC;AACzC,8EAAuD;AAQvD,MAAa,UAAW,SAAQ,eAAwB;IAE5C,MAAM,CAAa;IAE3B,KAAK,CAAC,KAAK,CAAC,aAA4B;QACpC,IAAI,CAAC,MAAM,GAAG,IAAI,uBAAU,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAA;QACjF,MAAM,MAAM,GAAG,IAAI,eAAM,CACrB,aAAa,EACb,IAAI,CAAC,MAAM,EACX,IAAA,gCAAgB,EAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EACnD,IAAI,CAAC,YAAY,CAAC,cAAc,CACnC,CAAA;QACD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IAC9B,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"MqttPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/MqttPlugin.ts"],"names":[],"mappings":";;;;;;AAEA,yCAAsD;AACtD,+DAA8D;AAC9D,qCAAiC;AACjC,6CAAyC;AACzC,8EAAuD;AAQvD,MAAa,UAAW,SAAQ,eAAwB;IAE5C,MAAM,CAAa;IAE3B,KAAK,CAAC,KAAK,CAAC,aAA4B;QACpC,IAAI,CAAC,MAAM,GAAG,IAAI,uBAAU,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAA;QACjF,MAAM,MAAM,GAAG,IAAI,eAAM,CACrB,aAAa,EACb,IAAI,CAAC,MAAM,EACX,IAAA,gCAAgB,EAAC,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EACnD,IAAI,CAAC,YAAY,CAAC,cAAc,CACnC,CAAA;QACD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAA;IAC9B,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,CAAC,MAAO,CAAC,IAAI,EAAE,CAAA;IAC7B,CAAC;IAED,kDAAkD;IACzC,eAAe;QACpB,OAAO,4BAAoB,CAAA;IAC/B,CAAC;CACJ;AAxBD,gCAwBC"}
|
|
@@ -26,6 +26,11 @@ export interface OperatorPluginConfig {
|
|
|
26
26
|
};
|
|
27
27
|
inspectRandomNode: {
|
|
28
28
|
intervalInMs: number;
|
|
29
|
+
maxInspectionCount: number;
|
|
30
|
+
};
|
|
31
|
+
reviewSuspectNode: {
|
|
32
|
+
maxInspectionCount: number;
|
|
33
|
+
maxDelayBeforeFirstInspectionInMs: number;
|
|
29
34
|
};
|
|
30
35
|
closeExpiredFlags: {
|
|
31
36
|
intervalInMs: number;
|
|
@@ -46,7 +46,7 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
46
46
|
const maintainTopologyService = new MaintainTopologyService_1.MaintainTopologyService(streamrClient, streamPartAssignments);
|
|
47
47
|
await fleetState.start();
|
|
48
48
|
await maintainTopologyHelper.start();
|
|
49
|
-
const networkNode =
|
|
49
|
+
const networkNode = streamrClient.getNode();
|
|
50
50
|
const rpcServerFunction = async (request) => {
|
|
51
51
|
const streamPartId = utils_1.StreamPartIDUtils.parse(request.streamPartId);
|
|
52
52
|
const operators = streamPartAssignments.getAssignedNodesForStreamPart(streamPartId);
|
|
@@ -64,10 +64,6 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
64
64
|
await (0, announceNodeToStream_1.announceNodeToStream)((0, utils_1.toEthereumAddress)(this.pluginConfig.operatorContractAddress), streamrClient);
|
|
65
65
|
})();
|
|
66
66
|
}, this.pluginConfig.heartbeatUpdateIntervalInMs, this.abortController.signal);
|
|
67
|
-
const stakedOperatorsCache = new utils_1.Cache(() => operator.getStakedOperators(), STAKED_OPERATORS_CACHE_MAX_AGE);
|
|
68
|
-
await (0, utils_1.scheduleAtInterval)(async () => (0, checkOperatorValueBreach_1.checkOperatorValueBreach)(operator, streamrClient, () => stakedOperatorsCache.get(), this.pluginConfig.maintainOperatorValue.minSponsorshipEarningsInWithdraw, this.pluginConfig.maintainOperatorValue.maxSponsorshipsInWithdraw).catch((err) => {
|
|
69
|
-
logger.warn('Encountered error', { err });
|
|
70
|
-
}), this.pluginConfig.checkOperatorValueBreachIntervalInMs, true, this.abortController.signal);
|
|
71
67
|
await fleetState.waitUntilReady();
|
|
72
68
|
const isLeader = await (0, createIsLeaderFn_1.createIsLeaderFn)(streamrClient, fleetState, logger);
|
|
73
69
|
try {
|
|
@@ -93,7 +89,7 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
93
89
|
}, this.pluginConfig.maintainOperatorValue.intervalInMs, true, this.abortController.signal);
|
|
94
90
|
await (0, utils_1.scheduleAtInterval)(async () => {
|
|
95
91
|
try {
|
|
96
|
-
await (0, inspectRandomNode_1.inspectRandomNode)(operatorContractAddress, operator, streamPartAssignments, streamrClient, this.pluginConfig.heartbeatTimeoutInMs, async (targetOperatorContractAddress) => {
|
|
92
|
+
await (0, inspectRandomNode_1.inspectRandomNode)(operatorContractAddress, operator, streamPartAssignments, streamrClient, this.pluginConfig.heartbeatTimeoutInMs, this.pluginConfig.inspectRandomNode.maxInspectionCount, async (targetOperatorContractAddress) => {
|
|
97
93
|
return streamrClient.getOperator(targetOperatorContractAddress).fetchRedundancyFactor();
|
|
98
94
|
}, createOperatorFleetState, this.abortController.signal);
|
|
99
95
|
}
|
|
@@ -109,6 +105,10 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
109
105
|
logger.error('Encountered error while closing expired flags', { err });
|
|
110
106
|
}
|
|
111
107
|
}, this.pluginConfig.closeExpiredFlags.intervalInMs, false, this.abortController.signal);
|
|
108
|
+
const stakedOperatorsCache = new utils_1.Cache(() => operator.getStakedOperators(), STAKED_OPERATORS_CACHE_MAX_AGE);
|
|
109
|
+
await (0, utils_1.scheduleAtInterval)(async () => (0, checkOperatorValueBreach_1.checkOperatorValueBreach)(operator, streamrClient, () => stakedOperatorsCache.get(), this.pluginConfig.maintainOperatorValue.minSponsorshipEarningsInWithdraw, this.pluginConfig.maintainOperatorValue.maxSponsorshipsInWithdraw).catch((err) => {
|
|
110
|
+
logger.warn('Encountered error', { err });
|
|
111
|
+
}), this.pluginConfig.checkOperatorValueBreachIntervalInMs, false, this.abortController.signal);
|
|
112
112
|
(0, utils_1.addManagedEventListener)(operator, 'reviewRequested', (event) => {
|
|
113
113
|
setImmediate(async () => {
|
|
114
114
|
try {
|
|
@@ -123,14 +123,14 @@ class OperatorPlugin extends Plugin_1.Plugin {
|
|
|
123
123
|
getRedundancyFactor: async (targetOperatorContractAddress) => {
|
|
124
124
|
return streamrClient.getOperator(targetOperatorContractAddress).fetchRedundancyFactor();
|
|
125
125
|
},
|
|
126
|
-
|
|
126
|
+
maxDelayBeforeFirstInspectionInMs: this.pluginConfig.reviewSuspectNode.maxDelayBeforeFirstInspectionInMs,
|
|
127
127
|
heartbeatTimeoutInMs: this.pluginConfig.heartbeatTimeoutInMs,
|
|
128
128
|
votingPeriod: {
|
|
129
129
|
startTime: event.votingPeriodStartTimestamp,
|
|
130
130
|
endTime: event.votingPeriodEndTimestamp
|
|
131
131
|
},
|
|
132
132
|
inspectionIntervalInMs: 8 * 60 * 1000,
|
|
133
|
-
|
|
133
|
+
maxInspectionCount: this.pluginConfig.reviewSuspectNode.maxInspectionCount,
|
|
134
134
|
abortSignal: this.abortController.signal
|
|
135
135
|
});
|
|
136
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorPlugin.ts"],"names":[],"mappings":";;;;;;AAAA,sCAOqB;AACrB,0CASuB;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;
|
|
1
|
+
{"version":3,"file":"OperatorPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -125,6 +125,32 @@
|
|
|
125
125
|
"description": "How often to run (in milliseconds)",
|
|
126
126
|
"minimum": 0,
|
|
127
127
|
"default": 900000
|
|
128
|
+
},
|
|
129
|
+
"maxInspectionCount": {
|
|
130
|
+
"type": "integer",
|
|
131
|
+
"description": "How many rounds of analysis are performed at most",
|
|
132
|
+
"minimum": 1,
|
|
133
|
+
"default": 10
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
},
|
|
137
|
+
"reviewSuspectNode": {
|
|
138
|
+
"type": "object",
|
|
139
|
+
"description": "Review suspect node settings",
|
|
140
|
+
"additionalProperties": false,
|
|
141
|
+
"default": {},
|
|
142
|
+
"properties": {
|
|
143
|
+
"maxInspectionCount": {
|
|
144
|
+
"type": "integer",
|
|
145
|
+
"description": "How many rounds of analysis are performed at most",
|
|
146
|
+
"minimum": 1,
|
|
147
|
+
"default": 10
|
|
148
|
+
},
|
|
149
|
+
"maxDelayBeforeFirstInspectionInMs": {
|
|
150
|
+
"type": "integer",
|
|
151
|
+
"description": "The maximum time (in milliseconds) to wait before the 1st inspection round",
|
|
152
|
+
"minimum": 0,
|
|
153
|
+
"default": 300000
|
|
128
154
|
}
|
|
129
155
|
}
|
|
130
156
|
},
|
|
@@ -142,7 +168,7 @@
|
|
|
142
168
|
},
|
|
143
169
|
"maxAgeInMs": {
|
|
144
170
|
"type": "integer",
|
|
145
|
-
"description": "
|
|
171
|
+
"description": "After the voting ends, how soon (in milliseconds) does the flag expire",
|
|
146
172
|
"minimum": 0,
|
|
147
173
|
"default": 86400000
|
|
148
174
|
}
|
|
@@ -8,10 +8,10 @@ interface InspectOverTimeOpts {
|
|
|
8
8
|
streamrClient: StreamrClient;
|
|
9
9
|
createOperatorFleetState: CreateOperatorFleetStateFn;
|
|
10
10
|
getRedundancyFactor: (operatorContractAddress: EthereumAddress) => Promise<number | undefined>;
|
|
11
|
-
|
|
11
|
+
delayBeforeFirstInspectionInMs: number;
|
|
12
12
|
heartbeatTimeoutInMs: number;
|
|
13
13
|
inspectionIntervalInMs: number;
|
|
14
|
-
|
|
14
|
+
maxInspectionCount: number;
|
|
15
15
|
waitUntilPassOrDone: boolean;
|
|
16
16
|
abortSignal: AbortSignal;
|
|
17
17
|
traceId: string;
|
|
@@ -25,10 +25,10 @@ class InspectionOverTimeTask {
|
|
|
25
25
|
streamrClient;
|
|
26
26
|
createOperatorFleetState;
|
|
27
27
|
getRedundancyFactor;
|
|
28
|
-
|
|
28
|
+
delayBeforeFirstInspectionInMs;
|
|
29
29
|
heartbeatTimeoutInMs;
|
|
30
30
|
inspectionIntervalInMs;
|
|
31
|
-
|
|
31
|
+
maxInspectionCount;
|
|
32
32
|
abortSignal;
|
|
33
33
|
findNodesForTargetGivenFleetStateFn;
|
|
34
34
|
inspectTargetFn;
|
|
@@ -38,15 +38,15 @@ class InspectionOverTimeTask {
|
|
|
38
38
|
abortController = new AbortController();
|
|
39
39
|
passedSingleInspectionGate = new utils_1.Gate(false);
|
|
40
40
|
doneGate = new utils_1.Gate(false);
|
|
41
|
-
constructor({ target, streamrClient, createOperatorFleetState, getRedundancyFactor,
|
|
41
|
+
constructor({ target, streamrClient, createOperatorFleetState, getRedundancyFactor, delayBeforeFirstInspectionInMs, heartbeatTimeoutInMs, inspectionIntervalInMs, maxInspectionCount, abortSignal: userAbortSignal, traceId, findNodesForTargetGivenFleetStateFn = inspectionUtils_1.findNodesForTargetGivenFleetState, inspectTargetFn = inspectionUtils_1.inspectTarget, }) {
|
|
42
42
|
this.target = target;
|
|
43
43
|
this.streamrClient = streamrClient;
|
|
44
44
|
this.createOperatorFleetState = createOperatorFleetState;
|
|
45
45
|
this.getRedundancyFactor = getRedundancyFactor;
|
|
46
|
-
this.
|
|
46
|
+
this.delayBeforeFirstInspectionInMs = delayBeforeFirstInspectionInMs;
|
|
47
47
|
this.heartbeatTimeoutInMs = heartbeatTimeoutInMs;
|
|
48
48
|
this.inspectionIntervalInMs = inspectionIntervalInMs;
|
|
49
|
-
this.
|
|
49
|
+
this.maxInspectionCount = maxInspectionCount;
|
|
50
50
|
this.abortSignal = (0, utils_1.composeAbortSignals)(userAbortSignal, this.abortController.signal);
|
|
51
51
|
this.findNodesForTargetGivenFleetStateFn = findNodesForTargetGivenFleetStateFn;
|
|
52
52
|
this.inspectTargetFn = inspectTargetFn;
|
|
@@ -85,12 +85,12 @@ class InspectionOverTimeTask {
|
|
|
85
85
|
target: this.target,
|
|
86
86
|
heartbeatTimeoutInMs: this.heartbeatTimeoutInMs,
|
|
87
87
|
inspectionIntervalInMs: this.inspectionIntervalInMs,
|
|
88
|
-
|
|
88
|
+
maxInspectionCount: this.maxInspectionCount
|
|
89
89
|
});
|
|
90
90
|
await this.initializeNewOperatorFleetState();
|
|
91
|
-
this.logger.
|
|
92
|
-
await (0, utils_1.wait)(this.
|
|
93
|
-
for (const attemptNo of (0, range_1.default)(1, this.
|
|
91
|
+
this.logger.debug('Sleep', { timeInMs: this.delayBeforeFirstInspectionInMs });
|
|
92
|
+
await (0, utils_1.wait)(this.delayBeforeFirstInspectionInMs, this.abortSignal);
|
|
93
|
+
for (const attemptNo of (0, range_1.default)(1, this.maxInspectionCount + 1)) {
|
|
94
94
|
const startTime = Date.now();
|
|
95
95
|
this.logger.info('Inspecting target', { attemptNo, target: this.target });
|
|
96
96
|
const onlineNodeDescriptors = await this.findNodesForTargetGivenFleetStateFn(this.target, this.fleetState, this.getRedundancyFactor, this.logger);
|
|
@@ -113,7 +113,7 @@ class InspectionOverTimeTask {
|
|
|
113
113
|
timeElapsedInMs,
|
|
114
114
|
target: this.target
|
|
115
115
|
});
|
|
116
|
-
if (attemptNo !== this.
|
|
116
|
+
if (attemptNo !== this.maxInspectionCount) {
|
|
117
117
|
// TODO: remove when NET-1169 landed;
|
|
118
118
|
// workaround subscribe bug in @streamr/sdk (sometimes messages don't come thru to heartbeat stream)
|
|
119
119
|
if (this.fleetState?.getNodeIds().length === 0) {
|
|
@@ -126,7 +126,7 @@ class InspectionOverTimeTask {
|
|
|
126
126
|
this.abortSignal.throwIfAborted();
|
|
127
127
|
}
|
|
128
128
|
const sleepTime = Math.max(this.inspectionIntervalInMs - timeElapsedInMs, 0);
|
|
129
|
-
this.logger.
|
|
129
|
+
this.logger.debug('Sleep', { timeInMs: sleepTime });
|
|
130
130
|
await (0, utils_1.wait)(sleepTime, this.abortSignal);
|
|
131
131
|
}
|
|
132
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectOverTime.js","sourceRoot":"","sources":["../../../../src/plugins/operator/inspectOverTime.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAqG;AAGrG,uDAM0B;AAC1B,yEAAqE;AACrE,yDAAgC;AAkBhC,SAAgB,eAAe,CAAC,IAAyB;IACrD,MAAM,IAAI,GAAG,IAAI,sBAAsB,CAAC,IAAI,CAAC,CAAA;IAC7C,IAAI,CAAC,KAAK,EAAE,CAAA;IACZ,OAAO,KAAK,IAAI,EAAE;QACd,IAAI,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAA;QACpC,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAA;QACd,OAAO,IAAI,CAAC,eAAe,EAAE,CAAA;IACjC,CAAC,CAAA;AACL,CAAC;AAVD,0CAUC;AAED,MAAM,sBAAsB;IACP,MAAM,CAAQ;IACd,aAAa,CAAe;IAC5B,wBAAwB,CAA4B;IACpD,mBAAmB,CAA2E;IAC9F,
|
|
1
|
+
{"version":3,"file":"inspectOverTime.js","sourceRoot":"","sources":["../../../../src/plugins/operator/inspectOverTime.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,4 +4,4 @@ import { EthereumAddress } from '@streamr/utils';
|
|
|
4
4
|
import { CreateOperatorFleetStateFn } from './OperatorFleetState';
|
|
5
5
|
import { StreamPartAssignments } from './StreamPartAssignments';
|
|
6
6
|
import { findTarget } from './inspectionUtils';
|
|
7
|
-
export declare function inspectRandomNode(operatorContractAddress: EthereumAddress, myOperator: Operator, assignments: StreamPartAssignments, streamrClient: StreamrClient, heartbeatTimeoutInMs: number, getRedundancyFactor: (operatorContractAddress: EthereumAddress) => Promise<number | undefined>, createOperatorFleetState: CreateOperatorFleetStateFn, abortSignal: AbortSignal, findTargetFn?: typeof findTarget): Promise<void>;
|
|
7
|
+
export declare function inspectRandomNode(operatorContractAddress: EthereumAddress, myOperator: Operator, assignments: StreamPartAssignments, streamrClient: StreamrClient, heartbeatTimeoutInMs: number, maxInspectionCount: number, getRedundancyFactor: (operatorContractAddress: EthereumAddress) => Promise<number | undefined>, createOperatorFleetState: CreateOperatorFleetStateFn, abortSignal: AbortSignal, findTargetFn?: typeof findTarget): Promise<void>;
|
|
@@ -4,7 +4,7 @@ exports.inspectRandomNode = void 0;
|
|
|
4
4
|
const utils_1 = require("@streamr/utils");
|
|
5
5
|
const inspectOverTime_1 = require("./inspectOverTime");
|
|
6
6
|
const inspectionUtils_1 = require("./inspectionUtils");
|
|
7
|
-
async function inspectRandomNode(operatorContractAddress, myOperator, assignments, streamrClient, heartbeatTimeoutInMs, getRedundancyFactor, createOperatorFleetState, abortSignal, findTargetFn = inspectionUtils_1.findTarget) {
|
|
7
|
+
async function inspectRandomNode(operatorContractAddress, myOperator, assignments, streamrClient, heartbeatTimeoutInMs, maxInspectionCount, getRedundancyFactor, createOperatorFleetState, abortSignal, findTargetFn = inspectionUtils_1.findTarget) {
|
|
8
8
|
const traceId = (0, utils_1.randomString)(6);
|
|
9
9
|
const logger = new utils_1.Logger(module, { traceId });
|
|
10
10
|
logger.info('Select a random operator to inspect');
|
|
@@ -18,10 +18,10 @@ async function inspectRandomNode(operatorContractAddress, myOperator, assignment
|
|
|
18
18
|
streamrClient,
|
|
19
19
|
createOperatorFleetState,
|
|
20
20
|
getRedundancyFactor,
|
|
21
|
-
|
|
21
|
+
delayBeforeFirstInspectionInMs: 0,
|
|
22
22
|
heartbeatTimeoutInMs,
|
|
23
23
|
inspectionIntervalInMs: 8 * 60 * 1000,
|
|
24
|
-
|
|
24
|
+
maxInspectionCount,
|
|
25
25
|
waitUntilPassOrDone: true,
|
|
26
26
|
abortSignal,
|
|
27
27
|
traceId
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectRandomNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/inspectRandomNode.ts"],"names":[],"mappings":";;;AACA,0CAAyF;AAGzF,uDAAmD;AACnD,uDAA8C;AAEvC,KAAK,UAAU,iBAAiB,CACnC,uBAAwC,EACxC,UAAoB,EACpB,WAAkC,EAClC,aAA4B,EAC5B,oBAA4B,EAC5B,mBAA8F,EAC9F,wBAAoD,EACpD,WAAwB,EACxB,YAAY,GAAG,4BAAU;IAEzB,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,CAAC,CAAC,CAAA;IAC/B,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;IAElD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,uBAAuB,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,CAAC,CAAA;IAC1G,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAM;IACV,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAE9C,MAAM,cAAc,GAAG,IAAA,iCAAe,EAAC;QACnC,MAAM;QACN,aAAa;QACb,wBAAwB;QACxB,mBAAmB;QACnB,
|
|
1
|
+
{"version":3,"file":"inspectRandomNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/inspectRandomNode.ts"],"names":[],"mappings":";;;AACA,0CAAyF;AAGzF,uDAAmD;AACnD,uDAA8C;AAEvC,KAAK,UAAU,iBAAiB,CACnC,uBAAwC,EACxC,UAAoB,EACpB,WAAkC,EAClC,aAA4B,EAC5B,oBAA4B,EAC5B,kBAA0B,EAC1B,mBAA8F,EAC9F,wBAAoD,EACpD,WAAwB,EACxB,YAAY,GAAG,4BAAU;IAEzB,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,CAAC,CAAC,CAAA;IAC/B,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;IAElD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,uBAAuB,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,CAAC,CAAA;IAC1G,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAM;IACV,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAE9C,MAAM,cAAc,GAAG,IAAA,iCAAe,EAAC;QACnC,MAAM;QACN,aAAa;QACb,wBAAwB;QACxB,mBAAmB;QACnB,8BAA8B,EAAE,CAAC;QACjC,oBAAoB;QACpB,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;QACrC,kBAAkB;QAClB,mBAAmB,EAAE,IAAI;QACzB,WAAW;QACX,OAAO;KACV,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAA;IACtC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC3C,OAAM;IACV,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;IACxH,IAAI,iBAAiB,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC1E,OAAM;IACV,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IACrC,MAAM,UAAU,CAAC,IAAI,CACjB,MAAM,CAAC,kBAAkB,EACzB,MAAM,CAAC,eAAe,EACtB,yBAAiB,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,CAC1D,CAAA;AACL,CAAC;AAtDD,8CAsDC"}
|
|
@@ -10,14 +10,14 @@ export interface ReviewProcessOpts {
|
|
|
10
10
|
streamrClient: StreamrClient;
|
|
11
11
|
createOperatorFleetState: CreateOperatorFleetStateFn;
|
|
12
12
|
getRedundancyFactor: (operatorContractAddress: EthereumAddress) => Promise<number | undefined>;
|
|
13
|
-
|
|
13
|
+
maxDelayBeforeFirstInspectionInMs: number;
|
|
14
14
|
heartbeatTimeoutInMs: number;
|
|
15
15
|
votingPeriod: {
|
|
16
16
|
startTime: number;
|
|
17
17
|
endTime: number;
|
|
18
18
|
};
|
|
19
19
|
inspectionIntervalInMs: number;
|
|
20
|
-
|
|
20
|
+
maxInspectionCount: number;
|
|
21
21
|
abortSignal: AbortSignal;
|
|
22
22
|
}
|
|
23
|
-
export declare const reviewSuspectNode: ({ sponsorshipAddress, targetOperator, partition, myOperator, streamrClient, createOperatorFleetState, getRedundancyFactor,
|
|
23
|
+
export declare const reviewSuspectNode: ({ sponsorshipAddress, targetOperator, partition, myOperator, streamrClient, createOperatorFleetState, getRedundancyFactor, maxDelayBeforeFirstInspectionInMs, heartbeatTimeoutInMs, votingPeriod, inspectionIntervalInMs, maxInspectionCount, abortSignal }: ReviewProcessOpts) => Promise<void>;
|
|
@@ -8,13 +8,13 @@ const utils_1 = require("@streamr/utils");
|
|
|
8
8
|
const random_1 = __importDefault(require("lodash/random"));
|
|
9
9
|
const inspectOverTime_1 = require("./inspectOverTime");
|
|
10
10
|
const logger = new utils_1.Logger(module);
|
|
11
|
-
const reviewSuspectNode = async ({ sponsorshipAddress, targetOperator, partition, myOperator, streamrClient, createOperatorFleetState, getRedundancyFactor,
|
|
12
|
-
if (Date.now() +
|
|
13
|
-
throw new Error('Max
|
|
11
|
+
const reviewSuspectNode = async ({ sponsorshipAddress, targetOperator, partition, myOperator, streamrClient, createOperatorFleetState, getRedundancyFactor, maxDelayBeforeFirstInspectionInMs, heartbeatTimeoutInMs, votingPeriod, inspectionIntervalInMs, maxInspectionCount, abortSignal }) => {
|
|
12
|
+
if (Date.now() + maxDelayBeforeFirstInspectionInMs > votingPeriod.startTime) {
|
|
13
|
+
throw new Error('Max delay time overlaps with voting period');
|
|
14
14
|
}
|
|
15
15
|
const streamId = await myOperator.getStreamId(sponsorshipAddress);
|
|
16
|
-
// random
|
|
17
|
-
const
|
|
16
|
+
// random wait time to make sure multiple instances of voters don't all inspect at the same time
|
|
17
|
+
const delayBeforeFirstInspectionInMs = (0, random_1.default)(maxDelayBeforeFirstInspectionInMs);
|
|
18
18
|
const consumeResults = (0, inspectOverTime_1.inspectOverTime)({
|
|
19
19
|
target: {
|
|
20
20
|
sponsorshipAddress: sponsorshipAddress,
|
|
@@ -24,10 +24,10 @@ const reviewSuspectNode = async ({ sponsorshipAddress, targetOperator, partition
|
|
|
24
24
|
streamrClient,
|
|
25
25
|
createOperatorFleetState,
|
|
26
26
|
getRedundancyFactor,
|
|
27
|
-
|
|
27
|
+
delayBeforeFirstInspectionInMs,
|
|
28
28
|
heartbeatTimeoutInMs,
|
|
29
29
|
inspectionIntervalInMs,
|
|
30
|
-
|
|
30
|
+
maxInspectionCount,
|
|
31
31
|
waitUntilPassOrDone: false,
|
|
32
32
|
abortSignal,
|
|
33
33
|
traceId: (0, utils_1.randomString)(6)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reviewSuspectNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/reviewSuspectNode.ts"],"names":[],"mappings":";;;;;;AACA,0CAA2G;AAC3G,2DAAkC;AAElC,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAqB1B,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACpC,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,UAAU,EACV,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"reviewSuspectNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/reviewSuspectNode.ts"],"names":[],"mappings":";;;;;;AACA,0CAA2G;AAC3G,2DAAkC;AAElC,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAqB1B,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACpC,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,UAAU,EACV,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,iCAAiC,EACjC,oBAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,kBAAkB,EAClB,WAAW,EACK,EAAiB,EAAE;IACnC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,iCAAiC,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;QAC1E,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;IACjE,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IACjE,gGAAgG;IAChG,MAAM,8BAA8B,GAAG,IAAA,gBAAM,EAAC,iCAAiC,CAAC,CAAA;IAChF,MAAM,cAAc,GAAG,IAAA,iCAAe,EAAC;QACnC,MAAM,EAAE;YACJ,kBAAkB,EAAE,kBAAkB;YACtC,eAAe,EAAE,cAAc;YAC/B,UAAU,EAAE,IAAA,sBAAc,EAAC,QAAQ,EAAE,SAAS,CAAC;SAClD;QACD,aAAa;QACb,wBAAwB;QACxB,mBAAmB;QACnB,8BAA8B;QAC9B,oBAAoB;QACpB,sBAAsB;QACtB,kBAAkB;QAClB,mBAAmB,EAAE,KAAK;QAC1B,WAAW;QACX,OAAO,EAAE,IAAA,oBAAY,EAAC,CAAC,CAAC;KAC3B,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAC5F,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,iBAAiB,EAAE,CAAC,CAAA;IAC9D,IAAA,2BAAmB,EAAC,KAAK,IAAI,EAAE;QAC3B,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAA;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;QAClE,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QACzE,IAAI,CAAC;YACD,MAAM,UAAU,CAAC,UAAU,CAAC,kBAAkB,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;QACzE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;gBAClD,kBAAkB;gBAClB,cAAc;gBACd,IAAI;gBACJ,MAAM,EAAE,GAAG,EAAE,OAAO;aACvB,CAAC,CAAA;QACN,CAAC;IACL,CAAC,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAA;AACtC,CAAC,CAAA;AAxDY,QAAA,iBAAiB,qBAwD7B"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
+
/// <reference types="node" />
|
|
3
4
|
import { EventEmitter } from 'events';
|
|
4
|
-
import { Logger } from '@streamr/utils';
|
|
5
|
+
import { Logger, UserID } from '@streamr/utils';
|
|
5
6
|
import { BucketId } from './Bucket';
|
|
6
7
|
export type BatchId = string;
|
|
7
8
|
export type State = string;
|
|
@@ -11,7 +12,7 @@ export interface InsertRecord {
|
|
|
11
12
|
partition: number;
|
|
12
13
|
timestamp: number;
|
|
13
14
|
sequenceNo: number;
|
|
14
|
-
publisherId:
|
|
15
|
+
publisherId: UserID;
|
|
15
16
|
msgChainId: string;
|
|
16
17
|
payload: Buffer;
|
|
17
18
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Batch.js","sourceRoot":"","sources":["../../../../src/plugins/storage/Batch.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"Batch.js","sourceRoot":"","sources":["../../../../src/plugins/storage/Batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -115,7 +115,6 @@ class BucketManager {
|
|
|
115
115
|
const { minTimestamp } = stream;
|
|
116
116
|
// minTimestamp is undefined if all buckets are found
|
|
117
117
|
if (minTimestamp === undefined) {
|
|
118
|
-
// eslint-disable-next-line no-continue
|
|
119
118
|
continue;
|
|
120
119
|
}
|
|
121
120
|
let insertNewBucket = false;
|
|
@@ -140,13 +139,11 @@ class BucketManager {
|
|
|
140
139
|
}
|
|
141
140
|
// if latest is not found or it's full => try to find latest in database
|
|
142
141
|
if (!latestBucket || latestBucket.isAlmostFull()) {
|
|
143
|
-
// eslint-disable-next-line no-await-in-loop
|
|
144
142
|
const foundBuckets = await this.getLastBuckets(streamId, partition, 1);
|
|
145
143
|
checkFoundBuckets(foundBuckets);
|
|
146
144
|
}
|
|
147
145
|
// check in database that we have bucket for minTimestamp
|
|
148
146
|
if (!insertNewBucket && !this.findBucketId(key, minTimestamp)) {
|
|
149
|
-
// eslint-disable-next-line no-await-in-loop
|
|
150
147
|
const foundBuckets = await this.getLastBuckets(streamId, partition, 1, minTimestamp);
|
|
151
148
|
checkFoundBuckets(foundBuckets);
|
|
152
149
|
}
|
|
@@ -156,7 +153,6 @@ class BucketManager {
|
|
|
156
153
|
const newBucket = new Bucket_1.Bucket(TimeUuid.fromDate(new Date(minTimestamp)).toString(), streamId, partition, 0, 0, new Date(minTimestamp), this.opts.maxBucketSize, this.opts.maxBucketRecords, this.opts.bucketKeepAliveSeconds);
|
|
157
154
|
stream.buckets.push(newBucket);
|
|
158
155
|
this.buckets[newBucket.getId()] = newBucket;
|
|
159
|
-
// eslint-disable-next-line require-atomic-updates
|
|
160
156
|
stream.minTimestamp = undefined;
|
|
161
157
|
}
|
|
162
158
|
}
|
|
@@ -207,7 +203,7 @@ class BucketManager {
|
|
|
207
203
|
return Promise.all([getExplicitFirst(), getRest()])
|
|
208
204
|
.then(([first, rest]) => rest.concat(first));
|
|
209
205
|
}
|
|
210
|
-
else {
|
|
206
|
+
else {
|
|
211
207
|
return getRest();
|
|
212
208
|
}
|
|
213
209
|
}
|
|
@@ -289,6 +285,7 @@ class BucketManager {
|
|
|
289
285
|
const currentBuckets = stream.buckets.toArray();
|
|
290
286
|
for (let i = 0; i < currentBuckets.length; i++) {
|
|
291
287
|
if (currentBuckets[i].getId() === bucketId) {
|
|
288
|
+
// eslint-disable-next-line @typescript-eslint/no-array-delete
|
|
292
289
|
delete currentBuckets[i];
|
|
293
290
|
break;
|
|
294
291
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BucketManager.js","sourceRoot":"","sources":["../../../../src/plugins/storage/BucketManager.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAkE;AAClE,gDAAuB;AACvB,0CAA8C;AAC9C,qCAA2C;AAE3C,MAAM,EAAE,QAAQ,EAAE,GAAG,wBAAc,CAAA;AAEnC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAmBjC,MAAM,KAAK,GAAG,CAAC,QAAgB,EAAE,SAAiB,EAAiB,EAAE,CAAC,GAAG,QAAQ,IAAI,SAAS,EAAE,CAAA;AAEhG,MAAM,kBAAkB,GAAG,GAAG,EAAE,CAAC,IAAI,cAAI,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IAC/D,iEAAiE;IACjE,OAAO,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAA;AACtC,CAAC,CAAC,CAAA;AAEF,MAAa,aAAa;IAEtB,IAAI,CAAsB;IAC1B,WAAW,CAAwC;IACnD,OAAO,CAA0B;IACjC,eAAe,CAAQ;IACf,uBAAuB,CAAiB;IACxC,mBAAmB,CAAiB;IAE5C,YAAY,eAAuB,EAAE,OAAsC,EAAE;QACzE,MAAM,cAAc,GAAG;YACnB,uBAAuB,EAAE,IAAI;YAC7B,mBAAmB,EAAE,GAAG;YACxB,aAAa,EAAE,IAAI,GAAG,IAAI,GAAG,GAAG;YAChC,gBAAgB,EAAE,GAAG,GAAG,IAAI;YAC5B,sBAAsB,EAAE,EAAE;SAC7B,CAAA;QAED,IAAI,CAAC,IAAI,GAAG,IAAA,aAAK,EAAC,cAAc,EAAE,IAAI,CAAC,CAAA;QAEvC,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAElC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QAEtC,IAAI,CAAC,uBAAuB,GAAG,SAAS,CAAA;QACxC,IAAI,CAAC,mBAAmB,GAAG,SAAS,CAAA;QAEpC,IAAI,CAAC,gBAAgB,EAAE,CAAA;QACvB,IAAI,CAAC,YAAY,EAAE,CAAA;IACvB,CAAC;IAED,WAAW,CAAC,QAAgB,EAAE,SAAiB,EAAE,SAAiB;QAC9D,IAAI,QAAQ,CAAA;QAEZ,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAEtC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACrC,QAAQ,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;YAE5C,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;gBACpC,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAClH,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAEtD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG;gBACpB,QAAQ;gBACR,SAAS;gBACT,OAAO,EAAE,kBAAkB,EAAE;gBAC7B,YAAY,EAAE,SAAS;aAC1B,CAAA;QACL,CAAC;QAED,OAAO,QAAQ,CAAA;IACnB,CAAC;IAED,eAAe,CAAC,QAAkB,EAAE,IAAY;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QACrC,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC;aAAM,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC,+CAA+C,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC9E,CAAC;IACL,CAAC;IAEO,uBAAuB,CAAC,GAAkB;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACpC,IAAI,MAAM,EAAE,CAAC;YACT,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAA;QAChC,CAAC;QACD,OAAO,SAAS,CAAA;IACpB,CAAC;IAEO,YAAY,CAAC,GAAkB,EAAE,SAAiB;QACtD,IAAI,QAAQ,CAAA;QACZ,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE;YAClC,GAAG;YACH,SAAS;SACZ,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACpC,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAA;YAEtD,IAAI,YAAY,EAAE,CAAC;gBACf,0CAA0C;gBAC1C,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,IAAI,YAAY,CAAC,UAAU,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;oBACjF,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,CAAA;oBAC/B,2BAA2B;gBAC/B,CAAC;qBAAM,IAAI,YAAY,CAAC,UAAU,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;oBACvD,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;oBAC/C,gBAAgB;oBAChB,cAAc,CAAC,KAAK,EAAE,CAAA;oBAEtB,KAAK,MAAM,aAAa,IAAI,cAAc,EAAE,CAAC;wBACzC,IAAI,aAAa,CAAC,UAAU,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;4BAClD,QAAQ,GAAG,aAAa,CAAC,KAAK,EAAE,CAAA;4BAChC,MAAK;wBACT,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QACD,OAAO,QAAQ,CAAA;IACnB,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC1B,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAE/C,KAAK,MAAM,WAAW,IAAI,SAAS,EAAE,CAAC;YAClC,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAA;YAC5C,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;YACtC,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAA;YAE/B,qDAAqD;YACrD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;gBAC7B,uCAAuC;gBACvC,SAAQ;YACZ,CAAC;YAED,IAAI,eAAe,GAAG,KAAK,CAAA;YAE3B,kBAAkB;YAClB,MAAM,iBAAiB,GAAG,CAAC,YAAsB,EAAE,EAAE;gBACjD,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;gBAErE,IAAI,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;oBACxD,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;oBAChC,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAA;oBAC/C,MAAM,CAAC,YAAY,GAAG,SAAS,CAAA;gBACnC,CAAC;qBAAM,CAAC;oBACJ,eAAe,GAAG,IAAI,CAAA;gBAC1B,CAAC;YACL,CAAC,CAAA;YAED,kBAAkB;YAClB,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;YACtC,MAAM,YAAY,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAA;YACtD,IAAI,YAAY,EAAE,CAAC;gBACf,uDAAuD;gBACvD,eAAe,GAAG,YAAY,CAAC,YAAY,EAAE,CAAA;YACjD,CAAC;YAED,wEAAwE;YACxE,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,YAAY,EAAE,EAAE,CAAC;gBAC/C,4CAA4C;gBAC5C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,CAAA;gBACtE,iBAAiB,CAAC,YAAY,CAAC,CAAA;YACnC,CAAC;YAED,yDAAyD;YACzD,IAAI,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,EAAE,CAAC;gBAC5D,4CAA4C;gBAC5C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE,YAAY,CAAC,CAAA;gBACpF,iBAAiB,CAAC,YAAY,CAAC,CAAA;YACnC,CAAC;YAED,IAAI,eAAe,EAAE,CAAC;gBAClB,MAAM,CAAC,KAAK,CAAC,6DAA6D,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;gBAE7F,yGAAyG;gBACzG,MAAM,SAAS,GAAG,IAAI,eAAM,CACxB,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,IAAI,CAAC,YAAY,CAAC,EACvG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,sBAAsB,CACxF,CAAA;gBAED,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;gBAC9B,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,CAAA;gBAC3C,kDAAkD;gBAClD,MAAM,CAAC,YAAY,GAAG,SAAS,CAAA;YACnC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,uBAAuB,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;IAC/G,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,qBAAqB,CACvB,QAAgB,EAChB,SAAiB,EACjB,gBAAoC,SAAS,EAC7C,cAAkC,SAAS;QAE3C,MAAM,gBAAgB,GAAG,GAAG,EAAE;YAC1B,iFAAiF;YACjF,0GAA0G;YAC1G,MAAM,KAAK,GAAG,mHAAmH,CAAA;YACjI,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;YACnD,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC1E,CAAC,CAAA;QAED,MAAM,OAAO,GAAG,GAAG,EAAE;YACjB,4BAA4B;YAC5B,MAAM,gCAAgC,GAAG,+HAA+H,CAAA;YACxK,MAAM,+BAA+B,GAAG,0GAA0G,CAAA;YAClJ,MAAM,6BAA6B,GAAG,2GAA2G,CAAA;YACjJ,IAAI,KAAK,CAAA;YACT,IAAI,MAAM,CAAA;YACV,IAAI,aAAa,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC3D,KAAK,GAAG,gCAAgC,CAAA;gBACxC,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,CAAC,CAAA;YAC9D,CAAC;iBAAM,IAAI,aAAa,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAClE,KAAK,GAAG,+BAA+B,CAAA;gBACvC,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,CAAC,CAAA;YACjD,CAAC;iBAAM,IAAI,aAAa,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;gBAClE,KAAK,GAAG,6BAA6B,CAAA;gBACrC,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;YAC/C,CAAC;iBAAM,CAAC;gBACJ,MAAM,IAAI,SAAS,CAAC,6CAA6C,aAAa,sBAAsB,WAAW,GAAG,CAAC,CAAA;YACvH,CAAC;YACD,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC1E,CAAC,CAAA;QAED,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;iBAC9C,IAAI,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QACpD,CAAC;aAAM,CAAC,CAAC,qCAAqC;YAC1C,OAAO,OAAO,EAAE,CAAA;QACpB,CAAC;IACL,CAAC;IAED;;;;;;;;OAQG;IACH,KAAK,CAAC,cAAc,CAAC,QAAgB,EAAE,SAAiB,EAAE,KAAK,GAAG,CAAC,EAAE,YAAgC,SAAS;QAC1G,MAAM,gBAAgB,GAAG,+FAA+F,CAAA;QACxH,MAAM,0BAA0B,GAAG,mHAAmH,CAAA;QAEtJ,IAAI,KAAK,CAAA;QACT,IAAI,MAAM,CAAA;QAEV,IAAI,SAAS,EAAE,CAAC;YACZ,KAAK,GAAG,0BAA0B,CAAA;YAClC,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACpD,CAAC;aAAM,CAAC;YACJ,KAAK,GAAG,gBAAgB,CAAA;YACxB,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;QACzC,CAAC;QAED,OAAO,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;IAC1E,CAAC;IAEO,KAAK,CAAC,sBAAsB,CAAC,KAAa,EAAE,MAAW,EAAE,QAAgB,EAAE,SAAiB;QAChG,MAAM,OAAO,GAAa,EAAE,CAAA;QAE5B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE;YAChE,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3B,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,GAAG,CAAA;YAE1D,MAAM,MAAM,GAAG,IAAI,eAAM,CACrB,EAAE,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,EACvE,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,sBAAsB,CACxF,CAAA;YAED,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACxB,CAAC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAA;IAClB,CAAC;IAED,IAAI;QACA,aAAa,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAA;QAC3C,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;IAC3C,CAAC;IAEO,KAAK,CAAC,YAAY;QACtB,kDAAkD;QAClD,MAAM,aAAa,GAAG,2GAA2G,CAAA;QAEjI,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;QAEnG,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC3E,MAAM,EACF,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EACrD,GAAG,MAAM,CAAA;YACV,MAAM,MAAM,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAA;YAEnE,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,EAAE;gBACtD,OAAO,EAAE,IAAI;aAChB,CAAC,CAAA;YACF,OAAO;gBACH,MAAM;gBACN,OAAO;aACV,CAAA;QACL,CAAC,CAAC,CAAC,CAAA;QAEH,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACvB,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBAChC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,KAAK,CAAA;gBAEtD,IAAI,YAAY,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;oBACnC,YAAY,CAAC,SAAS,EAAE,CAAA;gBAC5B,CAAC;gBAED,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,YAAY,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACrD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,YAAY,CAAC,QAAQ,EAAE,YAAY,CAAC,SAAS,CAAC,CAAA;gBAC1F,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;QAEF,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,CAAA;QACtH,eAAe,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;QAEjH,IAAI,CAAC,mBAAmB,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;IACnG,CAAC;IAEO,YAAY,CAAC,QAAkB,EAAE,QAAgB,EAAE,SAAiB;QACxE,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAE7B,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QACtC,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;QACpC,IAAI,MAAM,EAAE,CAAC;YACT,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;YAC/C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC7C,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,KAAK,QAAQ,EAAE,CAAC;oBACzC,OAAO,cAAc,CAAC,CAAC,CAAC,CAAA;oBACxB,MAAK;gBACT,CAAC;YACL,CAAC;YAED,yCAAyC;YACzC,MAAM,CAAC,OAAO,GAAG,kBAAkB,EAAE,CAAA;YACrC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE;gBACtC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YAC/B,CAAC,CAAC,CAAA;QACN,CAAC;IACL,CAAC;CACJ;AA3VD,sCA2VC"}
|
|
1
|
+
{"version":3,"file":"BucketManager.js","sourceRoot":"","sources":["../../../../src/plugins/storage/BucketManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
/// <reference types="node" />
|
|
4
4
|
import { StreamMessage } from '@streamr/sdk';
|
|
5
|
-
import { MetricsContext } from '@streamr/utils';
|
|
5
|
+
import { MetricsContext, UserID } from '@streamr/utils';
|
|
6
6
|
import { Client } from 'cassandra-driver';
|
|
7
7
|
import { EventEmitter } from 'events';
|
|
8
8
|
import { Readable } from 'stream';
|
|
@@ -31,8 +31,8 @@ export declare class Storage extends EventEmitter {
|
|
|
31
31
|
constructor(cassandraClient: Client, opts: StorageOptions);
|
|
32
32
|
store(streamMessage: StreamMessage): Promise<boolean>;
|
|
33
33
|
requestLast(streamId: string, partition: number, limit: number): Readable;
|
|
34
|
-
requestFrom(streamId: string, partition: number, fromTimestamp: number, fromSequenceNo: number, publisherId?:
|
|
35
|
-
requestRange(streamId: string, partition: number, fromTimestamp: number, fromSequenceNo: number, toTimestamp: number, toSequenceNo: number, publisherId:
|
|
34
|
+
requestFrom(streamId: string, partition: number, fromTimestamp: number, fromSequenceNo: number, publisherId?: UserID): Readable;
|
|
35
|
+
requestRange(streamId: string, partition: number, fromTimestamp: number, fromSequenceNo: number, toTimestamp: number, toSequenceNo: number, publisherId: UserID | undefined, msgChainId: string | undefined): Readable;
|
|
36
36
|
enableMetrics(metricsContext: MetricsContext): void;
|
|
37
37
|
close(): Promise<void>;
|
|
38
38
|
private fetchRange;
|
|
@@ -82,7 +82,6 @@ class Storage extends events_1.EventEmitter {
|
|
|
82
82
|
}
|
|
83
83
|
requestLast(streamId, partition, limit) {
|
|
84
84
|
if (limit > MAX_RESEND_LAST) {
|
|
85
|
-
// eslint-disable-next-line no-param-reassign
|
|
86
85
|
limit = MAX_RESEND_LAST;
|
|
87
86
|
}
|
|
88
87
|
const GET_LAST_N_MESSAGES = 'SELECT payload FROM stream_data WHERE '
|
|
@@ -437,7 +436,6 @@ const startCassandraStorage = async ({ contactPoints, localDataCenter, keyspace,
|
|
|
437
436
|
let retryCount = nbTrials;
|
|
438
437
|
let lastError = '';
|
|
439
438
|
while (retryCount > 0) {
|
|
440
|
-
/* eslint-disable no-await-in-loop */
|
|
441
439
|
try {
|
|
442
440
|
await cassandraClient.connect().catch((err) => { throw err; });
|
|
443
441
|
return new Storage(cassandraClient, opts || {});
|
|
@@ -449,7 +447,6 @@ const startCassandraStorage = async ({ contactPoints, localDataCenter, keyspace,
|
|
|
449
447
|
await sleep(5000);
|
|
450
448
|
lastError = err;
|
|
451
449
|
}
|
|
452
|
-
/* eslint-enable no-await-in-loop */
|
|
453
450
|
}
|
|
454
451
|
throw new Error(`Failed to connect to Cassandra after ${nbTrials} trials: ${lastError.toString()}`);
|
|
455
452
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Storage.js","sourceRoot":"","sources":["../../../../src/plugins/storage/Storage.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Storage.js","sourceRoot":"","sources":["../../../../src/plugins/storage/Storage.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,7 +86,6 @@ const handleFrom = (req, streamId, partition, format, res, storage, metrics) =>
|
|
|
86
86
|
metrics.resendFromQueriesPerSecond.record(1);
|
|
87
87
|
const fromTimestamp = parseIntIfExists(req.query.fromTimestamp);
|
|
88
88
|
const fromSequenceNumber = parseIntIfExists(req.query.fromSequenceNumber) ?? exports.MIN_SEQUENCE_NUMBER_VALUE;
|
|
89
|
-
const { publisherId } = req.query;
|
|
90
89
|
if (fromTimestamp === undefined) {
|
|
91
90
|
sendError('Query parameter "fromTimestamp" required.', res);
|
|
92
91
|
return;
|
|
@@ -95,7 +94,11 @@ const handleFrom = (req, streamId, partition, format, res, storage, metrics) =>
|
|
|
95
94
|
sendError(`Query parameter "fromTimestamp" not a number: ${req.query.fromTimestamp}`, res);
|
|
96
95
|
return;
|
|
97
96
|
}
|
|
98
|
-
|
|
97
|
+
if ((req.query.publisherId !== undefined) && (!(0, utils_1.isValidUserId)(req.query.publisherId))) {
|
|
98
|
+
sendError(`Query parameter "publisherId" not valid: ${req.query.publisherId}`, res);
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
const data = storage.requestFrom(streamId, partition, fromTimestamp, fromSequenceNumber, (req.query.publisherId !== undefined) ? (0, utils_1.toUserId)(req.query.publisherId) : undefined);
|
|
99
102
|
sendSuccess(data, format, streamId, res);
|
|
100
103
|
};
|
|
101
104
|
const handleRange = (req, streamId, partition, format, res, storage, metrics) => {
|
|
@@ -104,7 +107,6 @@ const handleRange = (req, streamId, partition, format, res, storage, metrics) =>
|
|
|
104
107
|
const toTimestamp = parseIntIfExists(req.query.toTimestamp);
|
|
105
108
|
const fromSequenceNumber = parseIntIfExists(req.query.fromSequenceNumber) ?? exports.MIN_SEQUENCE_NUMBER_VALUE;
|
|
106
109
|
const toSequenceNumber = parseIntIfExists(req.query.toSequenceNumber) ?? exports.MAX_SEQUENCE_NUMBER_VALUE;
|
|
107
|
-
const { publisherId, msgChainId } = req.query;
|
|
108
110
|
if (req.query.fromOffset !== undefined || req.query.toOffset !== undefined) {
|
|
109
111
|
sendError('Query parameters "fromOffset" and "toOffset" are no longer supported. Please use "fromTimestamp" and "toTimestamp".', res);
|
|
110
112
|
return;
|
|
@@ -126,11 +128,15 @@ const handleRange = (req, streamId, partition, format, res, storage, metrics) =>
|
|
|
126
128
|
sendError(`Query parameter "toTimestamp" not a number: ${req.query.toTimestamp}`, res);
|
|
127
129
|
return;
|
|
128
130
|
}
|
|
129
|
-
if ((publisherId && !msgChainId) || (!publisherId && msgChainId)) {
|
|
131
|
+
if ((req.query.publisherId && !req.query.msgChainId) || (!req.query.publisherId && req.query.msgChainId)) {
|
|
130
132
|
sendError('Invalid combination of "publisherId" and "msgChainId"', res);
|
|
131
133
|
return;
|
|
132
134
|
}
|
|
133
|
-
|
|
135
|
+
if ((req.query.publisherId !== undefined) && (!(0, utils_1.isValidUserId)(req.query.publisherId))) {
|
|
136
|
+
sendError(`Query parameter "publisherId" not valid: ${req.query.publisherId}`, res);
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
const data = storage.requestRange(streamId, partition, fromTimestamp, fromSequenceNumber, toTimestamp, toSequenceNumber, (req.query.publisherId !== undefined) ? (0, utils_1.toUserId)(req.query.publisherId) : undefined, req.query.msgChainId);
|
|
134
140
|
sendSuccess(data, format, streamId, res);
|
|
135
141
|
};
|
|
136
142
|
const createHandler = (storage, metrics) => {
|
|
@@ -141,6 +147,7 @@ const createHandler = (storage, metrics) => {
|
|
|
141
147
|
}
|
|
142
148
|
const format = (0, DataQueryFormat_1.getFormat)(req.query.format);
|
|
143
149
|
if (format === undefined) {
|
|
150
|
+
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
|
|
144
151
|
sendError(`Query parameter "format" is invalid: ${req.query.format}`, res);
|
|
145
152
|
return;
|
|
146
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataQueryEndpoint.js","sourceRoot":"","sources":["../../../../src/plugins/storage/dataQueryEndpoint.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"dataQueryEndpoint.js","sourceRoot":"","sources":["../../../../src/plugins/storage/dataQueryEndpoint.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/node",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "102.0.0-beta.0",
|
|
4
4
|
"description": "A full-featured node implementation for the Streamr Network",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"types": "./dist/src/exports.d.ts",
|
|
20
20
|
"scripts": {
|
|
21
21
|
"build": "tsc -b tsconfig.node.json",
|
|
22
|
-
"check": "tsc -p ./tsconfig.jest.json
|
|
22
|
+
"check": "tsc -p ./tsconfig.jest.json",
|
|
23
23
|
"clean": "jest --clearCache || true; rm -rf dist *.tsbuildinfo node_modules/.cache || true",
|
|
24
24
|
"eslint": "eslint --cache --cache-location=node_modules/.cache/.eslintcache/ '*/**/*.{js,ts}'",
|
|
25
25
|
"test": "npm run test-unit && npm run test-integration && npm run test-sequential",
|
|
@@ -30,12 +30,12 @@
|
|
|
30
30
|
"author": "Streamr Network AG <contact@streamr.network>",
|
|
31
31
|
"license": "STREAMR NETWORK OPEN SOURCE LICENSE",
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@inquirer/prompts": "^
|
|
34
|
-
"@streamr/config": "^5.
|
|
35
|
-
"@streamr/dht": "
|
|
36
|
-
"@streamr/sdk": "
|
|
37
|
-
"@streamr/utils": "
|
|
38
|
-
"aedes": "^0.51.
|
|
33
|
+
"@inquirer/prompts": "^7.0.0",
|
|
34
|
+
"@streamr/config": "^5.4.0",
|
|
35
|
+
"@streamr/dht": "102.0.0-beta.0",
|
|
36
|
+
"@streamr/sdk": "102.0.0-beta.0",
|
|
37
|
+
"@streamr/utils": "102.0.0-beta.0",
|
|
38
|
+
"aedes": "^0.51.3",
|
|
39
39
|
"ajv": "^8.17.1",
|
|
40
40
|
"ajv-formats": "^3.0.1",
|
|
41
41
|
"cassandra-driver": "^4.7.2",
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
"cors": "^2.8.5",
|
|
46
46
|
"ethers": "^6.13.0",
|
|
47
47
|
"eventemitter3": "^5.0.0",
|
|
48
|
-
"express": "^4.
|
|
48
|
+
"express": "^4.21.1",
|
|
49
49
|
"heap": "^0.2.6",
|
|
50
50
|
"lodash": "^4.17.21",
|
|
51
51
|
"merge2": "^1.4.1",
|
|
@@ -57,16 +57,16 @@
|
|
|
57
57
|
"zod": "^3.22.4"
|
|
58
58
|
},
|
|
59
59
|
"devDependencies": {
|
|
60
|
-
"@inquirer/testing": "^2.1.
|
|
61
|
-
"@streamr/network-contracts
|
|
62
|
-
"@streamr/test-utils": "
|
|
60
|
+
"@inquirer/testing": "^2.1.35",
|
|
61
|
+
"@streamr/network-contracts": "^8.2.0",
|
|
62
|
+
"@streamr/test-utils": "102.0.0-beta.0",
|
|
63
63
|
"@types/cors": "^2.8.17",
|
|
64
64
|
"@types/express": "^4.17.21",
|
|
65
65
|
"@types/heap": "^0.2.34",
|
|
66
|
-
"@types/lodash": "^4.17.
|
|
66
|
+
"@types/lodash": "^4.17.10",
|
|
67
67
|
"@types/merge2": "^1.4.4",
|
|
68
68
|
"@types/node-fetch": "^2.6.4",
|
|
69
|
-
"@types/qs": "^6.9.
|
|
69
|
+
"@types/qs": "^6.9.16",
|
|
70
70
|
"@types/stream-to-array": "^2.3.3",
|
|
71
71
|
"@types/supertest": "^6.0.2",
|
|
72
72
|
"@types/uuid": "^10.0.0",
|