@streamr/node 101.0.0-beta.2 → 101.0.0-beta.3
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/plugins/consoleMetrics/ConsoleMetricsPlugin.js +1 -1
- package/dist/src/plugins/consoleMetrics/ConsoleMetricsPlugin.js.map +1 -1
- package/dist/src/plugins/mqtt/Bridge.js +2 -3
- package/dist/src/plugins/mqtt/Bridge.js.map +1 -1
- package/dist/src/plugins/mqtt/MqttServer.js.map +1 -1
- package/dist/src/plugins/operator/ConsistentHashRing.d.ts +1 -1
- package/dist/src/plugins/operator/ConsistentHashRing.js +2 -2
- package/dist/src/plugins/operator/ConsistentHashRing.js.map +1 -1
- package/dist/src/plugins/operator/MaintainTopologyHelper.d.ts +1 -1
- package/dist/src/plugins/operator/MaintainTopologyHelper.js.map +1 -1
- package/dist/src/plugins/operator/MaintainTopologyService.js +1 -2
- package/dist/src/plugins/operator/MaintainTopologyService.js.map +1 -1
- package/dist/src/plugins/operator/OperatorFleetState.d.ts +2 -2
- package/dist/src/plugins/operator/OperatorFleetState.js.map +1 -1
- package/dist/src/plugins/operator/StreamPartAssignments.d.ts +1 -1
- package/dist/src/plugins/operator/StreamPartAssignments.js.map +1 -1
- package/dist/src/plugins/operator/formCoordinationStreamId.d.ts +1 -2
- package/dist/src/plugins/operator/formCoordinationStreamId.js +2 -2
- package/dist/src/plugins/operator/formCoordinationStreamId.js.map +1 -1
- package/dist/src/plugins/operator/inspectRandomNode.js +1 -2
- package/dist/src/plugins/operator/inspectRandomNode.js.map +1 -1
- package/dist/src/plugins/operator/inspectionUtils.d.ts +1 -2
- package/dist/src/plugins/operator/inspectionUtils.js +4 -4
- package/dist/src/plugins/operator/inspectionUtils.js.map +1 -1
- package/dist/src/plugins/operator/reviewSuspectNode.js +1 -2
- package/dist/src/plugins/operator/reviewSuspectNode.js.map +1 -1
- package/dist/src/plugins/storage/BatchManager.js +1 -2
- package/dist/src/plugins/storage/BatchManager.js.map +1 -1
- package/dist/src/plugins/storage/BucketManager.js +2 -3
- package/dist/src/plugins/storage/BucketManager.js.map +1 -1
- package/dist/src/plugins/storage/DataQueryFormat.d.ts +1 -1
- package/dist/src/plugins/storage/DataQueryFormat.js +2 -2
- package/dist/src/plugins/storage/DataQueryFormat.js.map +1 -1
- package/dist/src/plugins/storage/Storage.d.ts +4 -4
- package/dist/src/plugins/storage/Storage.js +8 -10
- package/dist/src/plugins/storage/Storage.js.map +1 -1
- package/dist/src/plugins/storage/StorageConfig.d.ts +1 -2
- package/dist/src/plugins/storage/StorageConfig.js +1 -1
- package/dist/src/plugins/storage/StorageConfig.js.map +1 -1
- package/dist/src/plugins/storage/StoragePlugin.d.ts +1 -1
- package/dist/src/plugins/storage/StoragePlugin.js +6 -7
- package/dist/src/plugins/storage/StoragePlugin.js.map +1 -1
- package/dist/src/plugins/storage/storageConfigEndpoint.d.ts +1 -1
- package/dist/src/plugins/storage/storageConfigEndpoint.js +2 -2
- package/dist/src/plugins/storage/storageConfigEndpoint.js.map +1 -1
- package/package.json +6 -6
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/node",
|
|
3
|
-
"version": "101.0.0-beta.
|
|
3
|
+
"version": "101.0.0-beta.3",
|
|
4
4
|
"description": "A full-featured node implementation for the Streamr Network",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"@ensdomains/ens-contracts": "1.1.4",
|
|
32
32
|
"@inquirer/prompts": "^4.2.1",
|
|
33
33
|
"@streamr/config": "^5.3.12",
|
|
34
|
+
"@streamr/dht": "101.0.0-beta.3",
|
|
34
35
|
"@streamr/network-contracts-ethers6": "^7.1.2",
|
|
35
|
-
"@streamr/
|
|
36
|
-
"@streamr/
|
|
37
|
-
"@streamr/utils": "101.0.0-beta.2",
|
|
36
|
+
"@streamr/sdk": "101.0.0-beta.3",
|
|
37
|
+
"@streamr/utils": "101.0.0-beta.3",
|
|
38
38
|
"aedes": "^0.51.0",
|
|
39
39
|
"ajv": "^8.8.2",
|
|
40
40
|
"ajv-formats": "^2.1.1",
|
|
@@ -44,6 +44,7 @@
|
|
|
44
44
|
"consistent-hash": "^1.1.1",
|
|
45
45
|
"cors": "^2.8.5",
|
|
46
46
|
"ethers": "^6.13.0",
|
|
47
|
+
"eventemitter3": "^5.0.0",
|
|
47
48
|
"express": "^4.19.2",
|
|
48
49
|
"heap": "^0.2.6",
|
|
49
50
|
"lodash": "^4.17.21",
|
|
@@ -58,8 +59,7 @@
|
|
|
58
59
|
},
|
|
59
60
|
"devDependencies": {
|
|
60
61
|
"@inquirer/testing": "^2.1.12",
|
|
61
|
-
"@streamr/
|
|
62
|
-
"@streamr/test-utils": "101.0.0-beta.2",
|
|
62
|
+
"@streamr/test-utils": "101.0.0-beta.3",
|
|
63
63
|
"@types/cors": "^2.8.17",
|
|
64
64
|
"@types/express": "^4.17.21",
|
|
65
65
|
"@types/heap": "^0.2.34",
|
|
@@ -15,7 +15,7 @@ function formatNumber(n) {
|
|
|
15
15
|
class ConsoleMetricsPlugin extends Plugin_1.Plugin {
|
|
16
16
|
abortController = new AbortController();
|
|
17
17
|
async start(streamrClient) {
|
|
18
|
-
const metricsContext =
|
|
18
|
+
const metricsContext = await streamrClient.getNode().getMetricsContext();
|
|
19
19
|
metricsContext.createReportProducer((report) => {
|
|
20
20
|
// omit timestamp info as that is printed by the logger
|
|
21
21
|
const data = (0, omit_1.default)(report, 'period');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsoleMetricsPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/consoleMetrics/ConsoleMetricsPlugin.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAsD;AAEtD,uDAA8B;AAE9B,yCAAqC;AACrC,8EAAuD;AAEvD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,SAAS,YAAY,CAAC,CAAS;IAC3B,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACxD,CAAC;AAMD,MAAa,oBAAqB,SAAQ,eAAkC;IAEvD,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAExD,KAAK,CAAC,KAAK,CAAC,aAA4B;QACpC,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"ConsoleMetricsPlugin.js","sourceRoot":"","sources":["../../../../src/plugins/consoleMetrics/ConsoleMetricsPlugin.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAsD;AAEtD,uDAA8B;AAE9B,yCAAqC;AACrC,8EAAuD;AAEvD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,SAAS,YAAY,CAAC,CAAS;IAC3B,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACxD,CAAC;AAMD,MAAa,oBAAqB,SAAQ,eAAkC;IAEvD,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAExD,KAAK,CAAC,KAAK,CAAC,aAA4B;QACpC,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,CAAC,iBAAiB,EAAE,CAAA;QACxE,cAAc,CAAC,oBAAoB,CAAC,CAAC,MAAqB,EAAE,EAAE;YAC1D,uDAAuD;YACvD,MAAM,IAAI,GAAG,IAAA,cAAI,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;YACnC,4CAA4C;YAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;YACnE,MAAM,CAAC,IAAI,CAAC,WAAW,MAAM,EAAE,CAAC,CAAA;QACpC,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,GAAG,IAAI,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACpF,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;CACJ;AAvBD,oDAuBC"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Bridge = void 0;
|
|
7
|
-
const protocol_1 = require("@streamr/protocol");
|
|
8
7
|
const utils_1 = require("@streamr/utils");
|
|
9
8
|
const without_1 = __importDefault(require("lodash/without"));
|
|
10
9
|
const parser_1 = require("../../helpers/parser");
|
|
@@ -114,7 +113,7 @@ class Bridge {
|
|
|
114
113
|
getSubscribeStreamPart(topic) {
|
|
115
114
|
const { base, query } = (0, parser_1.parseQueryAndBase)(topic);
|
|
116
115
|
const partition = (0, parser_1.parseQueryParameter)('partition', query, parser_1.parsePositiveInteger);
|
|
117
|
-
return (0,
|
|
116
|
+
return (0, utils_1.toStreamPartID)(this.getStreamId(base), partition ?? DEFAULT_PARTITION);
|
|
118
117
|
}
|
|
119
118
|
getPublishStreamPart(topic) {
|
|
120
119
|
const { base, query } = (0, parser_1.parseQueryAndBase)(topic);
|
|
@@ -124,7 +123,7 @@ class Bridge {
|
|
|
124
123
|
};
|
|
125
124
|
}
|
|
126
125
|
getStreamId(topicBase) {
|
|
127
|
-
return (0,
|
|
126
|
+
return (0, utils_1.toStreamID)((this.streamIdDomain !== undefined) ? `${this.streamIdDomain}/${topicBase}` : topicBase);
|
|
128
127
|
}
|
|
129
128
|
getSubscription(streamPartId) {
|
|
130
129
|
return this.subscriptions.find((s) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Bridge.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/Bridge.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"Bridge.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/Bridge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MqttServer.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/MqttServer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,yCAA0B;AAC1B,gDAAuB;
|
|
1
|
+
{"version":3,"file":"MqttServer.js","sourceRoot":"","sources":["../../../../src/plugins/mqtt/MqttServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.ConsistentHashRing = void 0;
|
|
7
|
-
const
|
|
7
|
+
const utils_1 = require("@streamr/utils");
|
|
8
8
|
const consistent_hash_1 = __importDefault(require("consistent-hash"));
|
|
9
9
|
/**
|
|
10
10
|
* Slight variations at the very end of a string will not result in the keys
|
|
@@ -14,7 +14,7 @@ const consistent_hash_1 = __importDefault(require("consistent-hash"));
|
|
|
14
14
|
* TODO: use md5 instead?
|
|
15
15
|
*/
|
|
16
16
|
function formKey(streamPartId) {
|
|
17
|
-
const [streamId, partition] =
|
|
17
|
+
const [streamId, partition] = utils_1.StreamPartIDUtils.getStreamIDAndPartition(streamPartId);
|
|
18
18
|
return `${partition}#${streamId}`;
|
|
19
19
|
}
|
|
20
20
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ConsistentHashRing.js","sourceRoot":"","sources":["../../../../src/plugins/operator/ConsistentHashRing.ts"],"names":[],"mappings":";;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"ConsistentHashRing.js","sourceRoot":"","sources":["../../../../src/plugins/operator/ConsistentHashRing.ts"],"names":[],"mappings":";;;;;;AACA,0CAAgE;AAChE,sEAA4C;AAE5C;;;;;;GAMG;AACH,SAAS,OAAO,CAAC,YAA0B;IACvC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,yBAAiB,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;IACrF,OAAO,GAAG,SAAS,IAAI,QAAQ,EAAE,CAAA;AACrC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAa,kBAAkB;IACV,KAAK,GAAG,IAAI,KAAK,EAAc,CAAA;IACxC,cAAc,CAAiB;IACtB,gBAAgB,CAAQ;IAEzC,YAAY,gBAAwB;QAChC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;IAC5C,CAAC;IAED,GAAG,CAAC,MAAkB;QAClB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACvB,IAAI,CAAC,cAAc,GAAG,SAAS,CAAA;QACnC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,MAAkB;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACtC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAA;YACzB,IAAI,CAAC,cAAc,GAAG,SAAS,CAAA;QACnC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,YAA0B;QAC1B,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACpC,IAAI,CAAC,cAAc,GAAG,IAAI,yBAAc,CAAC;gBACrC,YAAY,EAAE,SAAS;aAC1B,CAAC,CAAA;YACF,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;YACjB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC9B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACnC,CAAC;QACL,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;QACpF,OAAO,MAAsB,IAAI,EAAE,CAAA;IACvC,CAAC;CACJ;AArCD,gDAqCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaintainTopologyHelper.js","sourceRoot":"","sources":["../../../../src/plugins/operator/MaintainTopologyHelper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"MaintainTopologyHelper.js","sourceRoot":"","sources":["../../../../src/plugins/operator/MaintainTopologyHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.MaintainTopologyService = void 0;
|
|
7
7
|
const utils_1 = require("@streamr/utils");
|
|
8
|
-
const protocol_1 = require("@streamr/protocol");
|
|
9
8
|
const p_limit_1 = __importDefault(require("p-limit"));
|
|
10
9
|
const logger = new utils_1.Logger(module);
|
|
11
10
|
class MaintainTopologyService {
|
|
@@ -18,7 +17,7 @@ class MaintainTopologyService {
|
|
|
18
17
|
assignments.on('unassigned', this.onRemoveStakedStreamPart);
|
|
19
18
|
}
|
|
20
19
|
onAddStakedStreamPart = this.concurrencyLimiter(async (streamPartId) => {
|
|
21
|
-
const [id, partition] =
|
|
20
|
+
const [id, partition] = utils_1.StreamPartIDUtils.getStreamIDAndPartition(streamPartId);
|
|
22
21
|
let subscription;
|
|
23
22
|
try {
|
|
24
23
|
logger.info('Join stream partition', { streamPartId });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MaintainTopologyService.js","sourceRoot":"","sources":["../../../../src/plugins/operator/MaintainTopologyService.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"MaintainTopologyService.js","sourceRoot":"","sources":["../../../../src/plugins/operator/MaintainTopologyService.ts"],"names":[],"mappings":";;;;;;AACA,0CAAwE;AACxE,sDAA4B;AAG5B,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,uBAAuB;IACf,aAAa,CAAe;IAC5B,aAAa,GAAG,IAAI,GAAG,EAA8B,CAAA;IACrD,gBAAgB,GAAG,IAAA,iBAAM,EAAC,CAAC,CAAC,CAAA;IAE7C,YAAY,aAA4B,EAAE,WAAkC;QACxE,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,WAAW,CAAC,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAA;QACtD,WAAW,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,wBAAwB,CAAC,CAAA;IAC/D,CAAC;IAEO,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,YAA0B,EAAiB,EAAE;QACxG,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,GAAG,yBAAiB,CAAC,uBAAuB,CAAC,YAAY,CAAC,CAAA;QAC/E,IAAI,YAA0B,CAAA;QAC9B,IAAI,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;YACtD,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC;gBAC9C,EAAE;gBACF,SAAS;gBACT,GAAG,EAAE,IAAI;aACZ,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAChB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,iCAAiC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAA;YACrF,OAAM;QACV,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;IAEM,wBAAwB,GAAG,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,YAA0B,EAAiB,EAAE;QAC3G,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACzD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QACvC,IAAI,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE,YAAY,EAAE,CAAC,CAAA;YACvD,MAAM,YAAY,EAAE,WAAW,EAAE,CAAA;QACrC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,kCAAkC,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAA;QAC1F,CAAC;IACL,CAAC,CAAC,CAAA;IAEM,kBAAkB,CACtB,EAAiD;QAEjD,OAAO,CAAC,YAAY,EAAE,EAAE;YACpB,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;gBACxD,MAAM,CAAC,IAAI,CAAC,0CAA0C,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACpE,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;IACL,CAAC;CACJ;AAhDD,0DAgDC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DhtAddress } from '@streamr/dht';
|
|
2
|
-
import { StreamID } from '@streamr/protocol';
|
|
3
|
-
import { EventEmitter } from 'eventemitter3';
|
|
4
2
|
import { NetworkPeerDescriptor, StreamrClient } from '@streamr/sdk';
|
|
3
|
+
import { StreamID } from '@streamr/utils';
|
|
4
|
+
import { EventEmitter } from 'eventemitter3';
|
|
5
5
|
export interface OperatorFleetStateEvents {
|
|
6
6
|
added: (nodeId: DhtAddress) => void;
|
|
7
7
|
removed: (nodeId: DhtAddress) => void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OperatorFleetState.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorFleetState.ts"],"names":[],"mappings":";;;;;;AAEA,
|
|
1
|
+
{"version":3,"file":"OperatorFleetState.js","sourceRoot":"","sources":["../../../../src/plugins/operator/OperatorFleetState.ts"],"names":[],"mappings":";;;;;;AAEA,0CAAkG;AAClG,iDAA4C;AAC5C,qDAA4B;AAC5B,uDAA8B;AAC9B,qDAA2E;AAE3E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAcjC,gCAAgC;AAChC,MAAa,kBAAmB,SAAQ,4BAAsC;IACzD,aAAa,CAAe;IAC5B,oBAAoB,CAAU;IAC9B,YAAY,CAAc;IAC1B,YAAY,CAAQ;IACpB,iBAAiB,CAAQ;IACzB,qBAAqB,CAAQ;IAC7B,gBAAgB,CAAQ;IACxB,gBAAgB,CAAQ;IACxB,gBAAgB,GAAG,IAAI,GAAG,EAAyB,CAAA;IACnD,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IACvC,KAAK,GAAG,IAAI,YAAI,CAAC,KAAK,CAAC,CAAA;IAChC,YAAY,CAAe;IAEnC,MAAM,CAAC,+BAA+B,CAClC,aAA4B,EAC5B,qBAA6B,EAC7B,YAAoB,EACpB,iBAAyB,EACzB,gBAAwB,EACxB,gBAAwB,EACxB,YAAY,GAAG,IAAI,CAAC,GAAG;QAEvB,OAAO,CAAC,oBAAoB,EAAE,EAAE,CAAC,IAAI,kBAAkB,CACnD,aAAa,EACb,oBAAoB,EACpB,qBAAqB,EACrB,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,YAAY,CACf,CAAA;IACL,CAAC;IAED,YACI,aAA4B,EAC5B,oBAA8B,EAC9B,qBAA6B,EAC7B,YAAoB,EACpB,iBAAyB,EACzB,gBAAwB,EACxB,gBAAwB,EACxB,YAAY,GAAG,IAAI,CAAC,GAAG;QAEvB,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,oBAAoB,GAAG,oBAAoB,CAAA;QAChD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;QAC1C,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAA;QAClD,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAA;QACtC,CAAC;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;QACrC,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,UAAU,EAAE,EAAE;YAC7F,+GAA+G;YAC/G,cAAc;YACd,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,SAAS,CAAC,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC,CAAC,mBAAmB;gBAChF,OAAM;YACV,CAAC;YAED,IAAI,OAAyB,CAAA;YAC7B,IAAI,CAAC;gBACD,OAAO,GAAG,uCAAsB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;YACtD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE;oBAC3D,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;oBAC/C,MAAM,EAAE,GAAG,EAAE,MAAM;iBACtB,CAAC,CAAA;gBACF,OAAM;YACV,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;gBAClC,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,MAAoB,CAAA;gBAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;gBAChD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,EAAE;oBAC9B,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;oBAC9B,cAAc,EAAE,OAAO,CAAC,cAAc;iBACzC,CAAC,CAAA;gBACF,IAAI,CAAC,MAAM,EAAE,CAAC;oBACV,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;gBAC9B,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;oBACvB,IAAI,CAAC,wBAAwB,EAAE,CAAA;gBACnC,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;QACF,IAAA,4BAAoB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IAC7G,CAAC;IAED,KAAK,CAAC,cAAc;QAChB,OAAO,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE,CAAA;IACrC,CAAC;IAED,KAAK,CAAC,OAAO;QACT,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAC5B,MAAM,IAAI,CAAC,YAAY,EAAE,WAAW,EAAE,CAAA;IAC1C,CAAC;IAED,eAAe;QACX,OAAO,IAAA,aAAG,EAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAA,CAAC,2CAA2C;IAC7E,CAAC;IAED,UAAU;QACN,OAAO,CAAC,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAA;IAC5C,CAAC;IAED,iBAAiB,CAAC,MAAkB;QAChC,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,cAAc,CAAA;IAC5D,CAAC;IAEO,wBAAwB,GAAG,IAAA,cAAI,EAAC,GAAG,EAAE;QACzC,IAAA,2BAAmB,EAAC,GAAG,EAAE;YACrB,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QACrB,CAAC,EAAE,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACvF,CAAC,CAAC,CAAA;IAEM,iBAAiB;QACrB,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAA;QAC/B,KAAK,MAAM,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1D,IAAI,GAAG,GAAG,SAAS,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACvC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBACpC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;YAChC,CAAC;QACL,CAAC;IACL,CAAC;CACJ;AApID,gDAoIC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DhtAddress } from '@streamr/dht';
|
|
2
|
-
import { StreamID, StreamPartID } from '@streamr/
|
|
2
|
+
import { StreamID, StreamPartID } from '@streamr/utils';
|
|
3
3
|
import EventEmitter3 from 'eventemitter3';
|
|
4
4
|
import { MaintainTopologyHelperEvents } from './MaintainTopologyHelper';
|
|
5
5
|
import { OperatorFleetStateEvents } from './OperatorFleetState';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamPartAssignments.js","sourceRoot":"","sources":["../../../../src/plugins/operator/StreamPartAssignments.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"StreamPartAssignments.js","sourceRoot":"","sources":["../../../../src/plugins/operator/StreamPartAssignments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.formCoordinationStreamId = void 0;
|
|
4
|
-
const
|
|
4
|
+
const utils_1 = require("@streamr/utils");
|
|
5
5
|
function formCoordinationStreamId(operatorContractAddress) {
|
|
6
|
-
return (0,
|
|
6
|
+
return (0, utils_1.toStreamID)('/operator/coordination', operatorContractAddress);
|
|
7
7
|
}
|
|
8
8
|
exports.formCoordinationStreamId = formCoordinationStreamId;
|
|
9
9
|
//# sourceMappingURL=formCoordinationStreamId.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formCoordinationStreamId.js","sourceRoot":"","sources":["../../../../src/plugins/operator/formCoordinationStreamId.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"formCoordinationStreamId.js","sourceRoot":"","sources":["../../../../src/plugins/operator/formCoordinationStreamId.ts"],"names":[],"mappings":";;;AAAA,0CAAsE;AAEtE,SAAgB,wBAAwB,CAAC,uBAAwC;IAC7E,OAAO,IAAA,kBAAU,EAAC,wBAAwB,EAAE,uBAAuB,CAAC,CAAA;AACxE,CAAC;AAFD,4DAEC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.inspectRandomNode = void 0;
|
|
4
|
-
const protocol_1 = require("@streamr/protocol");
|
|
5
4
|
const utils_1 = require("@streamr/utils");
|
|
6
5
|
const inspectOverTime_1 = require("./inspectOverTime");
|
|
7
6
|
const inspectionUtils_1 = require("./inspectionUtils");
|
|
@@ -38,7 +37,7 @@ async function inspectRandomNode(operatorContractAddress, myOperator, assignment
|
|
|
38
37
|
return;
|
|
39
38
|
}
|
|
40
39
|
logger.info('Raise flag', { target });
|
|
41
|
-
await myOperator.flag(target.sponsorshipAddress, target.operatorAddress,
|
|
40
|
+
await myOperator.flag(target.sponsorshipAddress, target.operatorAddress, utils_1.StreamPartIDUtils.getStreamPartition(target.streamPart));
|
|
42
41
|
}
|
|
43
42
|
exports.inspectRandomNode = inspectRandomNode;
|
|
44
43
|
//# sourceMappingURL=inspectRandomNode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectRandomNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/inspectRandomNode.ts"],"names":[],"mappings":";;;
|
|
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,kCAAkC,EAAE,CAAC;QACrC,oBAAoB;QACpB,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;QACrC,cAAc,EAAE,EAAE;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;AArDD,8CAqDC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
-
import { StreamPartID } from '@streamr/protocol';
|
|
3
2
|
import { NetworkPeerDescriptor, Operator, StreamrClient } from '@streamr/sdk';
|
|
4
|
-
import { EthereumAddress, Logger } from '@streamr/utils';
|
|
3
|
+
import { EthereumAddress, Logger, StreamPartID } from '@streamr/utils';
|
|
5
4
|
import { OperatorFleetState } from './OperatorFleetState';
|
|
6
5
|
import { StreamPartAssignments } from './StreamPartAssignments';
|
|
7
6
|
export type FindNodesForTargetGivenFleetStateFn = typeof findNodesForTargetGivenFleetState;
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.inspectTarget = exports.findNodesForTargetGivenFleetState = exports.findTarget = void 0;
|
|
7
|
-
const
|
|
7
|
+
const utils_1 = require("@streamr/utils");
|
|
8
8
|
const lodash_1 = require("lodash");
|
|
9
9
|
const sample_1 = __importDefault(require("lodash/sample"));
|
|
10
10
|
const without_1 = __importDefault(require("lodash/without"));
|
|
@@ -12,7 +12,7 @@ const weightedSample_1 = require("../../helpers/weightedSample");
|
|
|
12
12
|
const ConsistentHashRing_1 = require("./ConsistentHashRing");
|
|
13
13
|
function createStreamIDMatcher(streamId) {
|
|
14
14
|
return (streamPart) => {
|
|
15
|
-
return
|
|
15
|
+
return utils_1.StreamPartIDUtils.getStreamID(streamPart) === streamId;
|
|
16
16
|
};
|
|
17
17
|
}
|
|
18
18
|
function isAnyPartitionOfStreamAssignedToMe(assignments, streamId) {
|
|
@@ -85,8 +85,8 @@ async function inspectTarget({ target, targetPeerDescriptors, streamrClient, abo
|
|
|
85
85
|
});
|
|
86
86
|
// need to subscribe before inspecting, otherwise inspect will instantly return false
|
|
87
87
|
const sub = await streamrClient.subscribe({
|
|
88
|
-
id:
|
|
89
|
-
partition:
|
|
88
|
+
id: utils_1.StreamPartIDUtils.getStreamID(target.streamPart),
|
|
89
|
+
partition: utils_1.StreamPartIDUtils.getStreamPartition(target.streamPart),
|
|
90
90
|
raw: true
|
|
91
91
|
});
|
|
92
92
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../../../src/plugins/operator/inspectionUtils.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"inspectionUtils.js","sourceRoot":"","sources":["../../../../src/plugins/operator/inspectionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.reviewSuspectNode = void 0;
|
|
7
|
-
const protocol_1 = require("@streamr/protocol");
|
|
8
7
|
const utils_1 = require("@streamr/utils");
|
|
9
8
|
const random_1 = __importDefault(require("lodash/random"));
|
|
10
9
|
const inspectOverTime_1 = require("./inspectOverTime");
|
|
@@ -20,7 +19,7 @@ const reviewSuspectNode = async ({ sponsorshipAddress, targetOperator, partition
|
|
|
20
19
|
target: {
|
|
21
20
|
sponsorshipAddress: sponsorshipAddress,
|
|
22
21
|
operatorAddress: targetOperator,
|
|
23
|
-
streamPart: (0,
|
|
22
|
+
streamPart: (0, utils_1.toStreamPartID)(streamId, partition),
|
|
24
23
|
},
|
|
25
24
|
streamrClient,
|
|
26
25
|
createOperatorFleetState,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reviewSuspectNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/reviewSuspectNode.ts"],"names":[],"mappings":";;;;;;
|
|
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,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,cAAc,EACd,WAAW,EACK,EAAiB,EAAE;IACnC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;IACjE,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IACjE,iGAAiG;IACjG,MAAM,kCAAkC,GAAG,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAA;IAC/D,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,kCAAkC;QAClC,oBAAoB;QACpB,sBAAsB;QACtB,cAAc;QACd,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"}
|
|
@@ -4,7 +4,6 @@ exports.BatchManager = void 0;
|
|
|
4
4
|
const events_1 = require("events");
|
|
5
5
|
const utils_1 = require("@streamr/utils");
|
|
6
6
|
const Batch_1 = require("./Batch");
|
|
7
|
-
const utils_2 = require("@streamr/utils");
|
|
8
7
|
const INSERT_STATEMENT = 'INSERT INTO stream_data '
|
|
9
8
|
+ '(stream_id, partition, bucket_id, ts, sequence_no, publisher_id, msg_chain_id, payload) '
|
|
10
9
|
+ 'VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
|
|
@@ -31,7 +30,7 @@ class BatchManager extends events_1.EventEmitter {
|
|
|
31
30
|
batchCloseTimeout: 1000,
|
|
32
31
|
batchMaxRetries: 1000 // in total max ~16 minutes timeout
|
|
33
32
|
};
|
|
34
|
-
this.opts = (0,
|
|
33
|
+
this.opts = (0, utils_1.merge)(defaultOptions, opts);
|
|
35
34
|
// bucketId => batch
|
|
36
35
|
this.batches = Object.create(null);
|
|
37
36
|
// batchId => batch
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BatchManager.js","sourceRoot":"","sources":["../../../../src/plugins/storage/BatchManager.ts"],"names":[],"mappings":";;;AACA,mCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"BatchManager.js","sourceRoot":"","sources":["../../../../src/plugins/storage/BatchManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,11 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.BucketManager = void 0;
|
|
7
|
-
const heap_1 = __importDefault(require("heap"));
|
|
8
7
|
const cassandra_driver_1 = require("cassandra-driver");
|
|
8
|
+
const heap_1 = __importDefault(require("heap"));
|
|
9
9
|
const utils_1 = require("@streamr/utils");
|
|
10
10
|
const Bucket_1 = require("./Bucket");
|
|
11
|
-
const utils_2 = require("@streamr/utils");
|
|
12
11
|
const { TimeUuid } = cassandra_driver_1.types;
|
|
13
12
|
const logger = new utils_1.Logger(module);
|
|
14
13
|
const toKey = (streamId, partition) => `${streamId}-${partition}`;
|
|
@@ -31,7 +30,7 @@ class BucketManager {
|
|
|
31
30
|
maxBucketRecords: 500 * 1000,
|
|
32
31
|
bucketKeepAliveSeconds: 60
|
|
33
32
|
};
|
|
34
|
-
this.opts = (0,
|
|
33
|
+
this.opts = (0, utils_1.merge)(defaultOptions, opts);
|
|
35
34
|
this.streamParts = Object.create(null);
|
|
36
35
|
this.buckets = Object.create(null);
|
|
37
36
|
this.cassandraClient = cassandraClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BucketManager.js","sourceRoot":"","sources":["../../../../src/plugins/storage/BucketManager.ts"],"names":[],"mappings":"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"}
|
|
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,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getFormat = exports.toObject = void 0;
|
|
4
|
-
const
|
|
4
|
+
const sdk_1 = require("@streamr/sdk");
|
|
5
5
|
const utils_1 = require("@streamr/utils");
|
|
6
6
|
const createJsonFormat = (formatMessage) => {
|
|
7
7
|
return {
|
|
@@ -40,7 +40,7 @@ const toObject = (msg) => {
|
|
|
40
40
|
};
|
|
41
41
|
exports.toObject = toObject;
|
|
42
42
|
const FORMATS = {
|
|
43
|
-
'object': createJsonFormat((bytes) => JSON.stringify((0, exports.toObject)((0,
|
|
43
|
+
'object': createJsonFormat((bytes) => JSON.stringify((0, exports.toObject)((0, sdk_1.convertBytesToStreamMessage)(bytes)))),
|
|
44
44
|
'raw': createBinaryFormat(utils_1.toLengthPrefixedFrame)
|
|
45
45
|
};
|
|
46
46
|
const getFormat = (id) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DataQueryFormat.js","sourceRoot":"","sources":["../../../../src/plugins/storage/DataQueryFormat.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"DataQueryFormat.js","sourceRoot":"","sources":["../../../../src/plugins/storage/DataQueryFormat.ts"],"names":[],"mappings":";;;AAAA,sCAAyE;AACzE,0CAAmE;AAUnE,MAAM,gBAAgB,GAAG,CAAC,aAA4C,EAAU,EAAE;IAC9E,OAAO;QACH,aAAa;QACb,WAAW,EAAE,kBAAkB;QAC/B,SAAS,EAAE,GAAG;QACd,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,GAAG;KACd,CAAA;AACL,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,aAAgD,EAAU,EAAE;IACpF,OAAO;QACH,aAAa;QACb,WAAW,EAAE,0BAA0B;KAC1C,CAAA;AACL,CAAC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAkB,EAAO,EAAE;IAChD,MAAM,aAAa,GAAG,GAAG,CAAC,gBAAgB,EAAE,CAAA;IAC5C,MAAM,MAAM,GAAQ;QAChB,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE;QAC3B,eAAe,EAAE,GAAG,CAAC,kBAAkB,EAAE;QACzC,SAAS,EAAE,GAAG,CAAC,YAAY,EAAE;QAC7B,cAAc,EAAE,GAAG,CAAC,iBAAiB,EAAE;QACvC,WAAW,EAAE,GAAG,CAAC,cAAc,EAAE;QACjC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE;QAC/B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,OAAO,EAAE,aAAa,YAAY,UAAU,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa;QACzF,SAAS,EAAE,IAAA,mBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;KACxC,CAAA;IACD,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;IACtC,CAAC;IACD,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AAnBY,QAAA,QAAQ,YAmBpB;AAED,MAAM,OAAO,GAA2B;IACpC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,KAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAA,gBAAQ,EAAC,IAAA,iCAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/G,KAAK,EAAE,kBAAkB,CAAC,6BAAqB,CAAC;CACnD,CAAA;AAEM,MAAM,SAAS,GAAG,CAAC,EAAsB,EAAsB,EAAE;IACpE,MAAM,GAAG,GAAG,EAAE,IAAI,QAAQ,CAAA;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAA;AACvB,CAAC,CAAA;AAHY,QAAA,SAAS,aAGrB"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
3
|
/// <reference types="node" />
|
|
4
|
-
import {
|
|
4
|
+
import { StreamMessage } from '@streamr/sdk';
|
|
5
5
|
import { MetricsContext } from '@streamr/utils';
|
|
6
|
-
import {
|
|
7
|
-
import { Readable } from 'stream';
|
|
6
|
+
import { Client } from 'cassandra-driver';
|
|
8
7
|
import { EventEmitter } from 'events';
|
|
9
|
-
import {
|
|
8
|
+
import { Readable } from 'stream';
|
|
9
|
+
import { BatchManager } from './BatchManager';
|
|
10
10
|
import { BucketManager, BucketManagerOptions } from './BucketManager';
|
|
11
11
|
export interface StartCassandraOptions {
|
|
12
12
|
contactPoints: string[];
|
|
@@ -4,19 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.startCassandraStorage = exports.Storage = void 0;
|
|
7
|
-
const
|
|
7
|
+
const sdk_1 = require("@streamr/sdk");
|
|
8
8
|
const utils_1 = require("@streamr/utils");
|
|
9
|
-
const
|
|
10
|
-
const stream_1 = require("stream");
|
|
9
|
+
const cassandra_driver_1 = require("cassandra-driver");
|
|
11
10
|
const events_1 = require("events");
|
|
12
|
-
const stream_2 = require("stream");
|
|
13
|
-
const uuid_1 = require("uuid");
|
|
14
11
|
const merge2_1 = __importDefault(require("merge2"));
|
|
12
|
+
const stream_1 = require("stream");
|
|
13
|
+
const uuid_1 = require("uuid");
|
|
14
|
+
const BatchManager_1 = require("./BatchManager");
|
|
15
15
|
const BucketManager_1 = require("./BucketManager");
|
|
16
|
-
const utils_2 = require("@streamr/utils");
|
|
17
16
|
const dataQueryEndpoint_1 = require("./dataQueryEndpoint");
|
|
18
|
-
const
|
|
19
|
-
const logger = new utils_2.Logger(module);
|
|
17
|
+
const logger = new utils_1.Logger(module);
|
|
20
18
|
const MAX_TIMESTAMP_VALUE = 8640000000000000; // https://262.ecma-international.org/5.1/#sec-15.9.1.1
|
|
21
19
|
const MAX_RESEND_LAST = 10000;
|
|
22
20
|
const bucketsToIds = (buckets) => buckets.map((bucket) => bucket.getId());
|
|
@@ -56,7 +54,7 @@ class Storage extends events_1.EventEmitter {
|
|
|
56
54
|
sequenceNo: streamMessage.getSequenceNumber(),
|
|
57
55
|
publisherId: streamMessage.getPublisherId(),
|
|
58
56
|
msgChainId: streamMessage.getMsgChainId(),
|
|
59
|
-
payload: Buffer.from((0,
|
|
57
|
+
payload: Buffer.from((0, sdk_1.convertStreamMessageToBytes)(streamMessage))
|
|
60
58
|
};
|
|
61
59
|
this.bucketManager.incrementBucket(bucketId, record.payload.length);
|
|
62
60
|
setImmediate(() => this.batchManager.store(bucketId, record, (err) => {
|
|
@@ -259,7 +257,7 @@ class Storage extends events_1.EventEmitter {
|
|
|
259
257
|
const select = `SELECT payload FROM stream_data ${q.where} ALLOW FILTERING`;
|
|
260
258
|
return this.queryWithStreamingResults(select, q.params);
|
|
261
259
|
});
|
|
262
|
-
return (0,
|
|
260
|
+
return (0, stream_1.pipeline)(
|
|
263
261
|
// @ts-expect-error options not in type
|
|
264
262
|
(0, merge2_1.default)(...streams, {
|
|
265
263
|
pipeError: true,
|
|
@@ -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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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { EthereumAddress } from '@streamr/utils';
|
|
2
|
-
import { StreamPartID } from '@streamr/protocol';
|
|
3
1
|
import { StreamrClient } from '@streamr/sdk';
|
|
2
|
+
import { EthereumAddress, StreamPartID } from '@streamr/utils';
|
|
4
3
|
export interface StorageConfigListener {
|
|
5
4
|
onStreamPartAdded: (streamPart: StreamPartID) => void;
|
|
6
5
|
onStreamPartRemoved: (streamPart: StreamPartID) => void;
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.StorageConfig = void 0;
|
|
4
4
|
const utils_1 = require("@streamr/utils");
|
|
5
5
|
const SetMembershipSynchronizer_1 = require("./SetMembershipSynchronizer");
|
|
6
|
-
const StoragePoller_1 = require("./StoragePoller");
|
|
7
6
|
const StorageEventListener_1 = require("./StorageEventListener");
|
|
7
|
+
const StoragePoller_1 = require("./StoragePoller");
|
|
8
8
|
const logger = new utils_1.Logger(module);
|
|
9
9
|
/**
|
|
10
10
|
* Manages the two data sources for storage node assignments (poll-based and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StorageConfig.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StorageConfig.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"StorageConfig.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StorageConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import { StreamrClient } from '@streamr/sdk';
|
|
1
2
|
import { EthereumAddress } from '@streamr/utils';
|
|
2
3
|
import { Schema } from 'ajv';
|
|
3
|
-
import { StreamrClient } from '@streamr/sdk';
|
|
4
4
|
import { ApiPluginConfig, Plugin } from '../../Plugin';
|
|
5
5
|
export interface StoragePluginConfig extends ApiPluginConfig {
|
|
6
6
|
cassandra: {
|
|
@@ -4,9 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.StoragePlugin = void 0;
|
|
7
|
-
const protocol_1 = require("@streamr/protocol");
|
|
8
|
-
const utils_1 = require("@streamr/utils");
|
|
9
7
|
const sdk_1 = require("@streamr/sdk");
|
|
8
|
+
const utils_1 = require("@streamr/utils");
|
|
10
9
|
const Plugin_1 = require("../../Plugin");
|
|
11
10
|
const Storage_1 = require("./Storage");
|
|
12
11
|
const StorageConfig_1 = require("./StorageConfig");
|
|
@@ -16,7 +15,7 @@ const dataQueryEndpoint_1 = require("./dataQueryEndpoint");
|
|
|
16
15
|
const storageConfigEndpoint_1 = require("./storageConfigEndpoint");
|
|
17
16
|
const logger = new utils_1.Logger(module);
|
|
18
17
|
const isStorableMessage = (msg) => {
|
|
19
|
-
return msg.messageType ===
|
|
18
|
+
return msg.messageType === sdk_1.StreamMessageType.MESSAGE;
|
|
20
19
|
};
|
|
21
20
|
class StoragePlugin extends Plugin_1.Plugin {
|
|
22
21
|
streamrClient;
|
|
@@ -27,7 +26,7 @@ class StoragePlugin extends Plugin_1.Plugin {
|
|
|
27
26
|
this.streamrClient = streamrClient;
|
|
28
27
|
const clusterId = this.pluginConfig.cluster.clusterAddress ?? await this.streamrClient.getAddress();
|
|
29
28
|
const assignmentStream = await this.streamrClient.getStream((0, sdk_1.formStorageNodeAssignmentStreamId)(clusterId));
|
|
30
|
-
const metricsContext =
|
|
29
|
+
const metricsContext = await this.streamrClient.getNode().getMetricsContext();
|
|
31
30
|
this.cassandra = await this.startCassandraStorage(metricsContext);
|
|
32
31
|
this.storageConfig = await this.startStorageConfig(clusterId, assignmentStream);
|
|
33
32
|
this.messageListener = (msg) => {
|
|
@@ -35,14 +34,14 @@ class StoragePlugin extends Plugin_1.Plugin {
|
|
|
35
34
|
this.cassandra.store(msg);
|
|
36
35
|
}
|
|
37
36
|
};
|
|
38
|
-
const node =
|
|
37
|
+
const node = this.streamrClient.getNode();
|
|
39
38
|
node.addMessageListener(this.messageListener);
|
|
40
39
|
this.addHttpServerEndpoint((0, dataQueryEndpoint_1.createDataQueryEndpoint)(this.cassandra, metricsContext));
|
|
41
40
|
this.addHttpServerEndpoint((0, dataMetadataEndpoint_1.createDataMetadataEndpoint)(this.cassandra));
|
|
42
41
|
this.addHttpServerEndpoint((0, storageConfigEndpoint_1.createStorageConfigEndpoint)(this.storageConfig));
|
|
43
42
|
}
|
|
44
43
|
async stop() {
|
|
45
|
-
const node =
|
|
44
|
+
const node = this.streamrClient.getNode();
|
|
46
45
|
node.removeMessageListener(this.messageListener);
|
|
47
46
|
await Promise.all(Array.from(this.storageConfig.getStreamParts()).map((streamPart) => node.leave(streamPart)));
|
|
48
47
|
await this.cassandra.close();
|
|
@@ -67,7 +66,7 @@ class StoragePlugin extends Plugin_1.Plugin {
|
|
|
67
66
|
return cassandraStorage;
|
|
68
67
|
}
|
|
69
68
|
async startStorageConfig(clusterId, assignmentStream) {
|
|
70
|
-
const node =
|
|
69
|
+
const node = this.streamrClient.getNode();
|
|
71
70
|
const storageConfig = new StorageConfig_1.StorageConfig(clusterId, this.pluginConfig.cluster.clusterSize, this.pluginConfig.cluster.myIndexInCluster, this.pluginConfig.storageConfig.refreshInterval, this.streamrClient, {
|
|
72
71
|
onStreamPartAdded: async (streamPart) => {
|
|
73
72
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StoragePlugin.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StoragePlugin.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"StoragePlugin.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StoragePlugin.ts"],"names":[],"mappings":";;;;;;AAAA,sCAAyH;AACzH,0CAA4F;AAE5F,yCAAsD;AACtD,uCAA0D;AAC1D,mDAA+C;AAC/C,8EAAuD;AACvD,iEAAmE;AACnE,2DAA6D;AAC7D,mEAAqE;AAErE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAqBjC,MAAM,iBAAiB,GAAG,CAAC,GAAkB,EAAW,EAAE;IACtD,OAAO,GAAG,CAAC,WAAW,KAAK,uBAAiB,CAAC,OAAO,CAAA;AACxD,CAAC,CAAA;AAED,MAAa,aAAc,SAAQ,eAA2B;IAElD,aAAa,CAAgB;IAC7B,SAAS,CAAU;IACnB,aAAa,CAAgB;IAC7B,eAAe,CAA+B;IAEtD,KAAK,CAAC,KAAK,CAAC,aAA4B;QACpC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,cAAc,IAAI,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,EAAE,CAAA;QACnG,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAA,uCAAiC,EAAC,SAAS,CAAC,CAAC,CAAA;QACzG,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,iBAAiB,EAAE,CAAA;QAC7E,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAA;QACjE,IAAI,CAAC,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;QAC/E,IAAI,CAAC,eAAe,GAAG,CAAC,GAAG,EAAE,EAAE;YAC3B,IAAI,iBAAiB,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,aAAc,CAAC,aAAa,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,EAAE,CAAC;gBACrF,IAAI,CAAC,SAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC9B,CAAC;QACL,CAAC,CAAA;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAA;QACzC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;QAC7C,IAAI,CAAC,qBAAqB,CAAC,IAAA,2CAAuB,EAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAA;QACnF,IAAI,CAAC,qBAAqB,CAAC,IAAA,iDAA0B,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAA;QACtE,IAAI,CAAC,qBAAqB,CAAC,IAAA,mDAA2B,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAA;IAC/E,CAAC;IAED,KAAK,CAAC,IAAI;QACN,MAAM,IAAI,GAAG,IAAI,CAAC,aAAc,CAAC,OAAO,EAAE,CAAA;QAC1C,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,eAAgB,CAAC,CAAA;QACjD,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAc,CAAC,cAAc,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;QAC/G,MAAM,IAAI,CAAC,SAAU,CAAC,KAAK,EAAE,CAAA;QAC7B,IAAI,CAAC,aAAc,CAAC,OAAO,EAAE,CAAA;IACjC,CAAC;IAED,kDAAkD;IACzC,eAAe;QACpB,OAAO,4BAAoB,CAAA;IAC/B,CAAC;IAEO,KAAK,CAAC,qBAAqB,CAAC,cAA8B;QAC9D,MAAM,gBAAgB,GAAG,MAAM,IAAA,+BAAqB,EAAC;YACjD,aAAa,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,KAAK,CAAC;YACrD,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,UAAU;YACvD,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ;YAC9C,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ;YAC9C,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ;YAC9C,IAAI,EAAE;gBACF,MAAM,EAAE,KAAK;aAChB;SACJ,CAAC,CAAA;QACF,gBAAgB,CAAC,aAAa,CAAC,cAAc,CAAC,CAAA;QAC9C,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAC,SAA0B,EAAE,gBAAwB;QACjF,MAAM,IAAI,GAAG,IAAI,CAAC,aAAc,CAAC,OAAO,EAAE,CAAA;QAC1C,MAAM,aAAa,GAAG,IAAI,6BAAa,CACnC,SAAS,EACT,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EACrC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,gBAAgB,EAC1C,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,eAAe,EAC/C,IAAI,CAAC,aAAc,EACnB;YACI,iBAAiB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACpC,IAAI,CAAC;oBACD,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA,CAAC,4BAA4B;gBAC5F,CAAC;gBAAC,OAAO,EAAE,EAAE,CAAC;oBACV,QAAQ;gBACZ,CAAC;gBACD,IAAI,CAAC;oBACD,MAAM,gBAAgB,CAAC,OAAO,CAAC;wBAC3B,UAAU;qBACb,CAAC,CAAA;oBACF,MAAM,CAAC,KAAK,CAAC,wCAAwC,EAAE;wBACnD,kBAAkB,EAAE,gBAAgB,CAAC,EAAE;qBAC1C,CAAC,CAAA;gBACN,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACX,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;wBAClD,kBAAkB,EAAE,gBAAgB,CAAC,EAAE;wBACvC,GAAG;qBACN,CAAC,CAAA;gBACN,CAAC;YACL,CAAC;YACD,mBAAmB,EAAE,CAAC,UAAU,EAAE,EAAE;gBAChC,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAA;YACpD,CAAC;SACJ,CACJ,CAAA;QACD,MAAM,aAAa,CAAC,KAAK,EAAE,CAAA;QAC3B,OAAO,aAAa,CAAA;IACxB,CAAC;CACJ;AA3FD,sCA2FC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createStorageConfigEndpoint = void 0;
|
|
4
|
-
const
|
|
4
|
+
const utils_1 = require("@streamr/utils");
|
|
5
5
|
const createHandler = (storageConfig) => {
|
|
6
6
|
return (req, res) => {
|
|
7
7
|
const { id, partition } = req.params;
|
|
8
8
|
const isValidPartition = !Number.isNaN(parseInt(partition));
|
|
9
9
|
if (isValidPartition) {
|
|
10
|
-
const found = storageConfig.hasStreamPart((0,
|
|
10
|
+
const found = storageConfig.hasStreamPart((0, utils_1.toStreamPartID)((0, utils_1.toStreamID)(id), Number(partition)));
|
|
11
11
|
if (found) {
|
|
12
12
|
res.status(200).send({});
|
|
13
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storageConfigEndpoint.js","sourceRoot":"","sources":["../../../../src/plugins/storage/storageConfigEndpoint.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"storageConfigEndpoint.js","sourceRoot":"","sources":["../../../../src/plugins/storage/storageConfigEndpoint.ts"],"names":[],"mappings":";;;AAAA,0CAA2D;AAK3D,MAAM,aAAa,GAAG,CAAC,aAA4B,EAAkB,EAAE;IACnE,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,EAAE;QACnC,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,MAAM,CAAA;QACpC,MAAM,gBAAgB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAA;QAC3D,IAAI,gBAAgB,EAAE,CAAC;YACnB,MAAM,KAAK,GAAG,aAAa,CAAC,aAAa,CAAC,IAAA,sBAAc,EAAC,IAAA,kBAAU,EAAC,EAAE,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;YAC5F,IAAI,KAAK,EAAE,CAAC;gBACR,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC5B,CAAC;iBAAM,CAAC;gBACJ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAA;YACzB,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,6BAA6B,GAAG,SAAS,CAAC,CAAA;QACnE,CAAC;IACL,CAAC,CAAA;AACL,CAAC,CAAA;AAEM,MAAM,2BAA2B,GAAG,CAAC,aAA4B,EAAsB,EAAE;IAC5F,OAAO;QACH,IAAI,EAAE,4CAA4C;QAClD,MAAM,EAAE,KAAK;QACb,eAAe,EAAE,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;KAClD,CAAA;AACL,CAAC,CAAA;AANY,QAAA,2BAA2B,+BAMvC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@streamr/node",
|
|
3
|
-
"version": "101.0.0-beta.
|
|
3
|
+
"version": "101.0.0-beta.3",
|
|
4
4
|
"description": "A full-featured node implementation for the Streamr Network",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -31,10 +31,10 @@
|
|
|
31
31
|
"@ensdomains/ens-contracts": "1.1.4",
|
|
32
32
|
"@inquirer/prompts": "^4.2.1",
|
|
33
33
|
"@streamr/config": "^5.3.12",
|
|
34
|
+
"@streamr/dht": "101.0.0-beta.3",
|
|
34
35
|
"@streamr/network-contracts-ethers6": "^7.1.2",
|
|
35
|
-
"@streamr/
|
|
36
|
-
"@streamr/
|
|
37
|
-
"@streamr/utils": "101.0.0-beta.2",
|
|
36
|
+
"@streamr/sdk": "101.0.0-beta.3",
|
|
37
|
+
"@streamr/utils": "101.0.0-beta.3",
|
|
38
38
|
"aedes": "^0.51.0",
|
|
39
39
|
"ajv": "^8.8.2",
|
|
40
40
|
"ajv-formats": "^2.1.1",
|
|
@@ -44,6 +44,7 @@
|
|
|
44
44
|
"consistent-hash": "^1.1.1",
|
|
45
45
|
"cors": "^2.8.5",
|
|
46
46
|
"ethers": "^6.13.0",
|
|
47
|
+
"eventemitter3": "^5.0.0",
|
|
47
48
|
"express": "^4.19.2",
|
|
48
49
|
"heap": "^0.2.6",
|
|
49
50
|
"lodash": "^4.17.21",
|
|
@@ -58,8 +59,7 @@
|
|
|
58
59
|
},
|
|
59
60
|
"devDependencies": {
|
|
60
61
|
"@inquirer/testing": "^2.1.12",
|
|
61
|
-
"@streamr/
|
|
62
|
-
"@streamr/test-utils": "101.0.0-beta.2",
|
|
62
|
+
"@streamr/test-utils": "101.0.0-beta.3",
|
|
63
63
|
"@types/cors": "^2.8.17",
|
|
64
64
|
"@types/express": "^4.17.21",
|
|
65
65
|
"@types/heap": "^0.2.34",
|