@streamr/node 101.1.2 → 102.0.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/entry-point.ts +2 -2
- package/bin/streamr-node.ts +0 -1
- 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/bin/streamr-node.js +0 -1
- package/dist/bin/streamr-node.js.map +1 -1
- package/dist/package.json +18 -23
- package/dist/src/broker.js +1 -1
- package/dist/src/broker.js.map +1 -1
- package/dist/src/config/ConfigWizard.js +22 -15
- package/dist/src/config/ConfigWizard.js.map +1 -1
- package/dist/src/config/config.js +19 -9
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/migration.js +0 -1
- 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/helpers/applyPluginClientConfigs.d.ts +1 -1
- package/dist/src/helpers/partitions.js +2 -2
- package/dist/src/helpers/partitions.js.map +1 -1
- package/dist/src/helpers/weightedSample.d.ts +3 -3
- package/dist/src/helpers/weightedSample.js +1 -2
- package/dist/src/helpers/weightedSample.js.map +1 -1
- package/dist/src/httpServer.d.ts +1 -3
- package/dist/src/plugins/http/publishEndpoint.js +3 -3
- 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/mqtt/MqttServer.js +17 -7
- package/dist/src/plugins/mqtt/MqttServer.js.map +1 -1
- package/dist/src/plugins/operator/MaintainTopologyHelper.js +1 -1
- package/dist/src/plugins/operator/OperatorPlugin.d.ts +5 -0
- package/dist/src/plugins/operator/OperatorPlugin.js +11 -16
- package/dist/src/plugins/operator/OperatorPlugin.js.map +1 -1
- package/dist/src/plugins/operator/checkOperatorValueBreach.d.ts +2 -2
- package/dist/src/plugins/operator/checkOperatorValueBreach.js +9 -4
- package/dist/src/plugins/operator/checkOperatorValueBreach.js.map +1 -1
- package/dist/src/plugins/operator/config.schema.json +27 -1
- package/dist/src/plugins/operator/createIsLeaderFn.js +1 -2
- package/dist/src/plugins/operator/createIsLeaderFn.js.map +1 -1
- package/dist/src/plugins/operator/formCoordinationStreamId.js +1 -2
- package/dist/src/plugins/operator/formCoordinationStreamId.js.map +1 -1
- package/dist/src/plugins/operator/heartbeatUtils.d.ts +4 -1
- package/dist/src/plugins/operator/heartbeatUtils.js +8 -5
- package/dist/src/plugins/operator/heartbeatUtils.js.map +1 -1
- package/dist/src/plugins/operator/inspectOverTime.d.ts +2 -3
- package/dist/src/plugins/operator/inspectOverTime.js +13 -13
- package/dist/src/plugins/operator/inspectOverTime.js.map +1 -1
- package/dist/src/plugins/operator/inspectRandomNode.d.ts +1 -2
- package/dist/src/plugins/operator/inspectRandomNode.js +4 -5
- package/dist/src/plugins/operator/inspectRandomNode.js.map +1 -1
- package/dist/src/plugins/operator/inspectionUtils.d.ts +0 -1
- package/dist/src/plugins/operator/inspectionUtils.js +3 -4
- package/dist/src/plugins/operator/inspectionUtils.js.map +1 -1
- package/dist/src/plugins/operator/maintainOperatorValue.d.ts +2 -1
- package/dist/src/plugins/operator/maintainOperatorValue.js +4 -5
- package/dist/src/plugins/operator/maintainOperatorValue.js.map +1 -1
- package/dist/src/plugins/operator/reviewSuspectNode.d.ts +3 -4
- 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 +2 -4
- package/dist/src/plugins/storage/Batch.js +1 -1
- package/dist/src/plugins/storage/Batch.js.map +1 -1
- package/dist/src/plugins/storage/BatchManager.d.ts +0 -1
- package/dist/src/plugins/storage/BatchManager.js +1 -1
- package/dist/src/plugins/storage/BatchManager.js.map +1 -1
- package/dist/src/plugins/storage/Bucket.js +2 -2
- package/dist/src/plugins/storage/Bucket.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/DeleteExpiredCmd.js +2 -2
- package/dist/src/plugins/storage/DeleteExpiredCmd.js.map +1 -1
- package/dist/src/plugins/storage/SetMembershipSynchronizer.js +1 -1
- package/dist/src/plugins/storage/Storage.d.ts +3 -6
- package/dist/src/plugins/storage/Storage.js +2 -5
- package/dist/src/plugins/storage/Storage.js.map +1 -1
- package/dist/src/plugins/storage/StorageConfig.js +8 -8
- package/dist/src/plugins/storage/StorageConfig.js.map +1 -1
- package/dist/src/plugins/storage/StorageEventListener.d.ts +1 -1
- package/dist/src/plugins/storage/StorageEventListener.js +3 -3
- package/dist/src/plugins/storage/StorageEventListener.js.map +1 -1
- package/dist/src/plugins/storage/StoragePlugin.js +1 -1
- package/dist/src/plugins/storage/StoragePlugin.js.map +1 -1
- package/dist/src/plugins/storage/StoragePoller.d.ts +1 -2
- package/dist/src/plugins/storage/StoragePoller.js +1 -1
- package/dist/src/plugins/storage/StoragePoller.js.map +1 -1
- package/dist/src/plugins/storage/dataQueryEndpoint.js +12 -5
- package/dist/src/plugins/storage/dataQueryEndpoint.js.map +1 -1
- package/jest.config.ts +9 -0
- package/package.json +18 -23
- package/bin/broker.ts +0 -11
- package/bin/config-wizard.js +0 -4
- package/bin/config-wizard.ts +0 -9
- package/dist/bin/broker.d.ts +0 -2
- package/dist/bin/broker.js +0 -12
- package/dist/bin/broker.js.map +0 -1
- package/dist/bin/config-wizard.d.ts +0 -2
- package/dist/bin/config-wizard.js +0 -10
- package/dist/bin/config-wizard.js.map +0 -1
- package/dist/src/helpers/fetchOrThrow.d.ts +0 -2
- package/dist/src/helpers/fetchOrThrow.js +0 -20
- package/dist/src/helpers/fetchOrThrow.js.map +0 -1
- package/dist/src/helpers/multiply.d.ts +0 -1
- package/dist/src/helpers/multiply.js +0 -10
- package/dist/src/helpers/multiply.js.map +0 -1
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.inspectRandomNode =
|
|
3
|
+
exports.inspectRandomNode = inspectRandomNode;
|
|
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
|
|
@@ -39,5 +39,4 @@ async function inspectRandomNode(operatorContractAddress, myOperator, assignment
|
|
|
39
39
|
logger.info('Raise flag', { target });
|
|
40
40
|
await myOperator.flag(target.sponsorshipAddress, target.operatorAddress, utils_1.StreamPartIDUtils.getStreamPartition(target.streamPart));
|
|
41
41
|
}
|
|
42
|
-
exports.inspectRandomNode = inspectRandomNode;
|
|
43
42
|
//# 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":";;AAOA,8CAsDC;AA5DD,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"}
|
|
@@ -3,7 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.findTarget = findTarget;
|
|
7
|
+
exports.findNodesForTargetGivenFleetState = findNodesForTargetGivenFleetState;
|
|
8
|
+
exports.inspectTarget = inspectTarget;
|
|
7
9
|
const utils_1 = require("@streamr/utils");
|
|
8
10
|
const lodash_1 = require("lodash");
|
|
9
11
|
const sample_1 = __importDefault(require("lodash/sample"));
|
|
@@ -61,7 +63,6 @@ async function findTarget(myOperatorContractAddress, myOperator, assignments, st
|
|
|
61
63
|
streamPart: targetStreamPart
|
|
62
64
|
};
|
|
63
65
|
}
|
|
64
|
-
exports.findTarget = findTarget;
|
|
65
66
|
async function findNodesForTargetGivenFleetState(target, targetOperatorFleetState, getRedundancyFactor, logger) {
|
|
66
67
|
const replicationFactor = await getRedundancyFactor(target.operatorAddress);
|
|
67
68
|
if (replicationFactor === undefined) {
|
|
@@ -75,7 +76,6 @@ async function findNodesForTargetGivenFleetState(target, targetOperatorFleetStat
|
|
|
75
76
|
const targetNodes = consistentHashRing.get(target.streamPart);
|
|
76
77
|
return targetNodes.map((nodeId) => targetOperatorFleetState.getPeerDescriptor(nodeId));
|
|
77
78
|
}
|
|
78
|
-
exports.findNodesForTargetGivenFleetState = findNodesForTargetGivenFleetState;
|
|
79
79
|
async function inspectTarget({ target, targetPeerDescriptors, streamrClient, abortSignal, logger }) {
|
|
80
80
|
logger.info('Inspecting nodes of operator', {
|
|
81
81
|
targetOperator: target.operatorAddress,
|
|
@@ -117,5 +117,4 @@ async function inspectTarget({ target, targetPeerDescriptors, streamrClient, abo
|
|
|
117
117
|
await sub.unsubscribe();
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
|
-
exports.inspectTarget = inspectTarget;
|
|
121
120
|
//# sourceMappingURL=inspectionUtils.js.map
|
|
@@ -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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"}
|
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
import { Operator } from '@streamr/sdk';
|
|
2
|
-
|
|
2
|
+
import { WeiAmount } from '@streamr/utils';
|
|
3
|
+
export declare const maintainOperatorValue: (withdrawLimitSafetyFraction: number, minSponsorshipEarningsInWithdraw: WeiAmount, maxSponsorshipsInWithdraw: number, myOperator: Operator) => Promise<void>;
|
|
@@ -2,14 +2,13 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.maintainOperatorValue = void 0;
|
|
4
4
|
const utils_1 = require("@streamr/utils");
|
|
5
|
-
const multiply_1 = require("../../helpers/multiply");
|
|
6
5
|
const logger = new utils_1.Logger(module);
|
|
7
6
|
const maintainOperatorValue = async (withdrawLimitSafetyFraction, minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw, myOperator) => {
|
|
8
7
|
logger.info('Check whether it is time to withdraw my earnings');
|
|
9
|
-
const {
|
|
10
|
-
const
|
|
11
|
-
logger.trace(` -> is ${
|
|
12
|
-
if (
|
|
8
|
+
const { sum, maxAllowedEarnings, sponsorshipAddresses } = await myOperator.getEarnings(minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw);
|
|
9
|
+
const triggerWithdrawLimit = (0, utils_1.multiplyWeiAmount)(maxAllowedEarnings, 1 - withdrawLimitSafetyFraction);
|
|
10
|
+
logger.trace(` -> is ${sum} > ${triggerWithdrawLimit} ?`);
|
|
11
|
+
if (sum > triggerWithdrawLimit) {
|
|
13
12
|
logger.info('Withdraw earnings from sponsorships', { sponsorshipAddresses });
|
|
14
13
|
await myOperator.withdrawEarningsFromSponsorships(sponsorshipAddresses);
|
|
15
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"maintainOperatorValue.js","sourceRoot":"","sources":["../../../../src/plugins/operator/maintainOperatorValue.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"maintainOperatorValue.js","sourceRoot":"","sources":["../../../../src/plugins/operator/maintainOperatorValue.ts"],"names":[],"mappings":";;;AACA,0CAAqE;AAErE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,qBAAqB,GAAG,KAAK,EACtC,2BAAmC,EACnC,gCAA2C,EAC3C,yBAAiC,EACjC,UAAoB,EACP,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAA;IAC/D,MAAM,EAAE,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,GAAG,MAAM,UAAU,CAAC,WAAW,CAClF,gCAAgC,EAChC,yBAAyB,CAC5B,CAAA;IACD,MAAM,oBAAoB,GAAG,IAAA,yBAAiB,EAAC,kBAAkB,EAAE,CAAC,GAAG,2BAA2B,CAAC,CAAA;IACnG,MAAM,CAAC,KAAK,CAAC,UAAU,GAAG,MAAM,oBAAoB,IAAI,CAAC,CAAA;IACzD,IAAI,GAAG,GAAG,oBAAoB,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAA;QAC5E,MAAM,UAAU,CAAC,gCAAgC,CAAC,oBAAoB,CAAC,CAAA;IAC3E,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;IAC5C,CAAC;AACL,CAAC,CAAA;AAnBY,QAAA,qBAAqB,yBAmBjC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
1
|
import { Operator, StreamrClient } from '@streamr/sdk';
|
|
3
2
|
import { EthereumAddress } from '@streamr/utils';
|
|
4
3
|
import { CreateOperatorFleetStateFn } from './OperatorFleetState';
|
|
@@ -10,14 +9,14 @@ export interface ReviewProcessOpts {
|
|
|
10
9
|
streamrClient: StreamrClient;
|
|
11
10
|
createOperatorFleetState: CreateOperatorFleetStateFn;
|
|
12
11
|
getRedundancyFactor: (operatorContractAddress: EthereumAddress) => Promise<number | undefined>;
|
|
13
|
-
|
|
12
|
+
maxDelayBeforeFirstInspectionInMs: number;
|
|
14
13
|
heartbeatTimeoutInMs: number;
|
|
15
14
|
votingPeriod: {
|
|
16
15
|
startTime: number;
|
|
17
16
|
endTime: number;
|
|
18
17
|
};
|
|
19
18
|
inspectionIntervalInMs: number;
|
|
20
|
-
|
|
19
|
+
maxInspectionCount: number;
|
|
21
20
|
abortSignal: AbortSignal;
|
|
22
21
|
}
|
|
23
|
-
export declare const reviewSuspectNode: ({ sponsorshipAddress, targetOperator, partition, myOperator, streamrClient, createOperatorFleetState, getRedundancyFactor,
|
|
22
|
+
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,5 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
1
|
import { EventEmitter } from 'events';
|
|
4
|
-
import { Logger } from '@streamr/utils';
|
|
2
|
+
import { Logger, UserID } from '@streamr/utils';
|
|
5
3
|
import { BucketId } from './Bucket';
|
|
6
4
|
export type BatchId = string;
|
|
7
5
|
export type State = string;
|
|
@@ -11,7 +9,7 @@ export interface InsertRecord {
|
|
|
11
9
|
partition: number;
|
|
12
10
|
timestamp: number;
|
|
13
11
|
sequenceNo: number;
|
|
14
|
-
publisherId:
|
|
12
|
+
publisherId: UserID;
|
|
15
13
|
msgChainId: string;
|
|
16
14
|
payload: Buffer;
|
|
17
15
|
}
|
|
@@ -28,7 +28,7 @@ class Batch extends events_1.EventEmitter {
|
|
|
28
28
|
state;
|
|
29
29
|
doneCbs;
|
|
30
30
|
constructor(bucketId, maxSize, maxRecordCount, closeTimeout, maxRetries) {
|
|
31
|
-
if (!bucketId
|
|
31
|
+
if (!bucketId?.length) {
|
|
32
32
|
throw new TypeError('bucketId must be not empty string');
|
|
33
33
|
}
|
|
34
34
|
if (maxSize <= 0) {
|
|
@@ -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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"}
|
|
@@ -40,7 +40,7 @@ class BatchManager extends events_1.EventEmitter {
|
|
|
40
40
|
}
|
|
41
41
|
store(bucketId, record, doneCb) {
|
|
42
42
|
const batch = this.batches[bucketId];
|
|
43
|
-
if (batch
|
|
43
|
+
if (batch?.isFull()) {
|
|
44
44
|
batch.lock();
|
|
45
45
|
}
|
|
46
46
|
if (this.batches[bucketId] === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BatchManager.js","sourceRoot":"","sources":["../../../../src/plugins/storage/BatchManager.ts"],"names":[],"mappings":";;;AACA,mCAAqC;AACrC,0CAA8C;AAC9C,mCAAoE;AAGpE,MAAM,gBAAgB,GAAG,0BAA0B;MAC7C,0FAA0F;MAC1F,iCAAiC,CAAA;AAEvC,MAAM,yBAAyB,GAAG,0BAA0B;MACtD,0FAA0F;MAC1F,kDAAkD,CAAA,CAAC,SAAS;AAWlE,IAAI,EAAE,GAAG,CAAC,CAAA;AAEV,MAAa,YAAa,SAAQ,qBAAY;IAE1C,IAAI,CAAqB;IACzB,OAAO,CAAyB;IAChC,cAAc,CAAwB;IACtC,eAAe,CAAQ;IACvB,eAAe,CAAQ;IACvB,MAAM,CAAQ;IAEd,YAAY,eAAuB,EAAE,OAAqC,EAAE;QACxE,KAAK,EAAE,CAAA;QACP,EAAE,IAAI,CAAC,CAAA;QACP,IAAI,CAAC,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QAEjD,MAAM,cAAc,GAAG;YACnB,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,IAAI,GAAG,GAAG;YACxB,mBAAmB,EAAE,IAAI;YACzB,iBAAiB,EAAE,IAAI;YACvB,eAAe,EAAE,IAAI,CAAC,mCAAmC;SAC5D,CAAA;QAED,IAAI,CAAC,IAAI,GAAG,IAAA,aAAK,EAAC,cAAc,EAAE,IAAI,CAAC,CAAA;QAEvC,oBAAoB;QACpB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAClC,mBAAmB;QACnB,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAEzC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,gBAAgB,CAAA;IAC1F,CAAC;IAED,KAAK,CAAC,QAAkB,EAAE,MAAoB,EAAE,MAAqB;QACjE,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;QAEpC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"BatchManager.js","sourceRoot":"","sources":["../../../../src/plugins/storage/BatchManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,10 @@ class Bucket {
|
|
|
14
14
|
ttl;
|
|
15
15
|
stored;
|
|
16
16
|
constructor(id, streamId, partition, size, records, dateCreate, maxSize, maxRecordCount, keepAliveSeconds) {
|
|
17
|
-
if (!id
|
|
17
|
+
if (!id?.length) {
|
|
18
18
|
throw new TypeError('id must be not empty string');
|
|
19
19
|
}
|
|
20
|
-
if (!streamId
|
|
20
|
+
if (!streamId?.length) {
|
|
21
21
|
throw new TypeError('streamId must be not empty string');
|
|
22
22
|
}
|
|
23
23
|
if (partition < 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Bucket.js","sourceRoot":"","sources":["../../../../src/plugins/storage/Bucket.ts"],"names":[],"mappings":";;;AAEA,MAAa,MAAM;IAEf,EAAE,CAAU;IACZ,QAAQ,CAAQ;IAChB,SAAS,CAAQ;IACjB,IAAI,CAAQ;IACZ,OAAO,CAAQ;IACf,UAAU,CAAM;IACR,OAAO,CAAQ;IACf,cAAc,CAAQ;IACtB,gBAAgB,CAAQ;IAChC,GAAG,CAAM;IACD,MAAM,CAAS;IAEvB,YACI,EAAY,EACZ,QAAgB,EAChB,SAAiB,EACjB,IAAY,EACZ,OAAe,EACf,UAAgB,EAChB,OAAe,EACf,cAAsB,EACtB,gBAAwB;QAExB,IAAI,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"Bucket.js","sourceRoot":"","sources":["../../../../src/plugins/storage/Bucket.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":"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"}
|
|
1
|
+
{"version":3,"file":"BucketManager.js","sourceRoot":"","sources":["../../../../src/plugins/storage/BucketManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ class DeleteExpiredCmd {
|
|
|
19
19
|
constructor({ streamrBaseUrl, cassandraUsername, cassandraPassword, cassandraHosts, cassandraDatacenter, cassandraKeyspace, bucketLimit, dryRun = true }) {
|
|
20
20
|
this.streamrBaseUrl = streamrBaseUrl;
|
|
21
21
|
this.dryRun = dryRun;
|
|
22
|
-
this.bucketLimit = bucketLimit
|
|
22
|
+
this.bucketLimit = bucketLimit ?? 10000000;
|
|
23
23
|
const authProvider = new cassandra_driver_1.default.auth.PlainTextAuthProvider(cassandraUsername, cassandraPassword);
|
|
24
24
|
this.cassandraClient = new cassandra_driver_1.default.Client({
|
|
25
25
|
contactPoints: [...cassandraHosts],
|
|
@@ -66,7 +66,7 @@ class DeleteExpiredCmd {
|
|
|
66
66
|
return {
|
|
67
67
|
streamId: stream.streamId,
|
|
68
68
|
partition: stream.partition,
|
|
69
|
-
storageDays: streamFromChain.
|
|
69
|
+
storageDays: (await streamFromChain.getStorageDayCount()) ?? 365
|
|
70
70
|
};
|
|
71
71
|
}
|
|
72
72
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeleteExpiredCmd.js","sourceRoot":"","sources":["../../../../src/plugins/storage/DeleteExpiredCmd.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DeleteExpiredCmd.js","sourceRoot":"","sources":["../../../../src/plugins/storage/DeleteExpiredCmd.ts"],"names":[],"mappings":";;;;;;AAAA,wEAAoD;AACpD,sDAAuC;AAEvC,0CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,kBAAkB,GAAG,CAAC,OAAqB,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;AAEtH,MAAM,gBAAgB,GAAG,CAAC,OAAqB,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,EAAE,CAAC,CAAC,CAAA;AAgC1G,MAAa,gBAAgB;IAEzB,cAAc,CAAQ;IACtB,MAAM,CAAS;IACf,WAAW,CAAQ;IACnB,eAAe,CAAQ;IACvB,KAAK,CAAO;IAEZ,YAAY,EACR,cAAc,EACd,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EACnB,iBAAiB,EACjB,WAAW,EACX,MAAM,GAAG,IAAI,EACP;QACN,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACpC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,WAAW,GAAG,WAAW,IAAI,QAAQ,CAAA;QAE1C,MAAM,YAAY,GAAG,IAAI,0BAAS,CAAC,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAA;QACnG,IAAI,CAAC,eAAe,GAAG,IAAI,0BAAS,CAAC,MAAM,CAAC;YACxC,aAAa,EAAE,CAAC,GAAG,cAAc,CAAC;YAClC,eAAe,EAAE,mBAAmB;YACpC,QAAQ,EAAE,iBAAiB;YAC3B,YAAY;SACf,CAAC,CAAA;QAEF,+BAA+B;QAC/B,IAAI,CAAC,KAAK,GAAG,IAAA,iBAAM,EAAC,CAAC,CAAC,CAAA;IAC1B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAqB;QAC3B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAA;QACvC,MAAM,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,MAAM,iBAAiB,CAAC,CAAA;QAErD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAChE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,WAAW,CAAC,CAAA;QAC7E,MAAM,CAAC,IAAI,CAAC,SAAS,gBAAgB,CAAC,MAAM,8BAA8B,CAAC,CAAA;QAE3E,MAAM,mBAAmB,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;QACvE,MAAM,CAAC,IAAI,CAAC,aAAa,mBAAmB,CAAC,MAAM,4CAA4C,CAAC,CAAA;QAEhG,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAA;QAC3E,MAAM,CAAC,IAAI,CAAC,SAAS,cAAc,CAAC,MAAM,kBAAkB,EAAE;YAC1D,YAAY,EAAE,gBAAgB,CAAC,cAAc,CAAC;YAC9C,sBAAsB,EAAE,kBAAkB,CAAC,cAAc,CAAC;SAC7D,CAAC,CAAA;QAEF,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAA;QAC5C,CAAC;QAED,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAA;IACzC,CAAC;IAEO,KAAK,CAAC,UAAU;QACpB,MAAM,KAAK,GAAG,kDAAkD,CAAA;QAChE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE;YAC5D,SAAS,EAAE,MAAM;SACpB,CAAC,CAAA;QACF,OAAO,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAChC,QAAQ,EAAE,GAAG,CAAC,SAAS;YACvB,SAAS,EAAE,GAAG,CAAC,SAAS;SAC3B,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,OAAqB,EAAE,MAAqB;QACvE,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAkB,EAAE,EAAE;YAC7D,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;gBACzB,IAAI,CAAC;oBACD,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;oBAC/D,OAAO;wBACH,QAAQ,EAAE,MAAM,CAAC,QAAQ;wBACzB,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,CAAC,MAAM,eAAe,CAAC,kBAAkB,EAAE,CAAC,IAAI,GAAG;qBACnE,CAAA;gBACL,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;gBAAC,CAAC;YAC1E,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC;IAEO,KAAK,CAAC,4BAA4B,CAAC,WAA2C;QAClF,MAAM,MAAM,GAAiB,EAAE,CAAA;QAE/B,MAAM,KAAK,GAAG,iFAAiF,CAAA;QAE/F,kCAAkC;QAClC,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAsB,EAAE,EAAE;YACrE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;YACnD,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAAW,CAAA;YACtE,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,eAAe,CAAC,CAAA;YAErD,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;gBACzB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE;oBAChE,OAAO,EAAE,IAAI;iBAChB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;gBAE1E,IAAI,SAAS,EAAE,CAAC;oBACZ,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAwB,EAAE,EAAE;wBAChD,MAAM,CAAC,IAAI,CAAC;4BACR,QAAQ,EAAE,GAAG,CAAC,EAAE;4BAChB,UAAU,EAAE,GAAG,CAAC,WAAW;4BAC3B,QAAQ,EAAE,GAAG,CAAC,SAAS;4BACvB,SAAS,EAAE,GAAG,CAAC,SAAS;4BACxB,OAAO,EAAE,GAAG,CAAC,OAAO;4BACpB,IAAI,EAAE,GAAG,CAAC,IAAI;4BACd,WAAW;yBACd,CAAC,CAAA;oBACN,CAAC,CAAC,CAAA;gBACN,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QAEF,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACxB,OAAO,MAAM,CAAA;IACjB,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAAC,gBAA8B;QAC7D,MAAM,MAAM,GAAiB,EAAE,CAAA;QAE/B,MAAM,KAAK,GAAG,8FAA8F,CAAA;QAE5G,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAkB,EAAE,EAAE;YACtE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;YAC7D,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,WAAW,CAAA;YACtE,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAA;YAE9C,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;gBACzB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE;oBAChE,OAAO,EAAE,IAAI;iBAChB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC,CAAA;gBAE1E,IAAI,SAAS,IAAI,CACb,SAAS,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC;uBACxB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;uBAC5B,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC;oBACtD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;gBACvB,CAAC;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QAEF,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACxB,OAAO,MAAM,CAAA;IACjB,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,cAA4B;QACpD,MAAM,KAAK,GAAG,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACxD,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;YAC5D,MAAM,OAAO,GAAG;gBACZ;oBACI,KAAK,EAAE,8EAA8E;oBACrF,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC;iBAC5C;gBACD;oBACI,KAAK,EAAE,iFAAiF;oBACxF,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC;iBAC1C;aACJ,CAAA;YAED,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;YAEvE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE;gBACzB,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,EAAE;oBACtC,OAAO,EAAE,IAAI;iBAChB,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;gBACrF,OAAO,SAAS,CAAA;YACpB,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QAEF,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC;CACJ;AAhLD,4CAgLC"}
|
|
@@ -72,7 +72,7 @@ class SetMembershipSynchronizer {
|
|
|
72
72
|
if (sequenceNo <= this.lastSnapshotSequenceNo) {
|
|
73
73
|
return exports.EMPTY_DIFF;
|
|
74
74
|
}
|
|
75
|
-
const nonStaleElements = [...elements].filter((element) => (sequenceNo > (this.lastSequenceNoByElement.get(element)
|
|
75
|
+
const nonStaleElements = [...elements].filter((element) => (sequenceNo > (this.lastSequenceNoByElement.get(element) ?? 0)));
|
|
76
76
|
nonStaleElements.forEach((element) => {
|
|
77
77
|
this.lastSequenceNoByElement.set(element, sequenceNo);
|
|
78
78
|
});
|
|
@@ -1,8 +1,5 @@
|
|
|
1
|
-
/// <reference types="node" />
|
|
2
|
-
/// <reference types="node" />
|
|
3
|
-
/// <reference types="node" />
|
|
4
1
|
import { StreamMessage } from '@streamr/sdk';
|
|
5
|
-
import { MetricsContext } from '@streamr/utils';
|
|
2
|
+
import { MetricsContext, UserID } from '@streamr/utils';
|
|
6
3
|
import { Client } from 'cassandra-driver';
|
|
7
4
|
import { EventEmitter } from 'events';
|
|
8
5
|
import { Readable } from 'stream';
|
|
@@ -31,8 +28,8 @@ export declare class Storage extends EventEmitter {
|
|
|
31
28
|
constructor(cassandraClient: Client, opts: StorageOptions);
|
|
32
29
|
store(streamMessage: StreamMessage): Promise<boolean>;
|
|
33
30
|
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:
|
|
31
|
+
requestFrom(streamId: string, partition: number, fromTimestamp: number, fromSequenceNo: number, publisherId?: UserID): Readable;
|
|
32
|
+
requestRange(streamId: string, partition: number, fromTimestamp: number, fromSequenceNo: number, toTimestamp: number, toSequenceNo: number, publisherId: UserID | undefined, msgChainId: string | undefined): Readable;
|
|
36
33
|
enableMetrics(metricsContext: MetricsContext): void;
|
|
37
34
|
close(): Promise<void>;
|
|
38
35
|
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 '
|
|
@@ -415,7 +414,7 @@ function sleep(ms) {
|
|
|
415
414
|
return new Promise((resolve) => setTimeout(() => resolve(undefined), ms));
|
|
416
415
|
}
|
|
417
416
|
const startCassandraStorage = async ({ contactPoints, localDataCenter, keyspace, username, password, opts }) => {
|
|
418
|
-
const authProvider = new cassandra_driver_1.auth.PlainTextAuthProvider(username
|
|
417
|
+
const authProvider = new cassandra_driver_1.auth.PlainTextAuthProvider(username ?? '', password ?? '');
|
|
419
418
|
const requestLogger = new cassandra_driver_1.tracker.RequestLogger({
|
|
420
419
|
slowThreshold: 10 * 1000, // 10 secs
|
|
421
420
|
});
|
|
@@ -437,10 +436,9 @@ 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
|
-
return new Storage(cassandraClient, opts
|
|
441
|
+
return new Storage(cassandraClient, opts ?? {});
|
|
444
442
|
}
|
|
445
443
|
catch (err) {
|
|
446
444
|
// eslint-disable-next-line no-console
|
|
@@ -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
|
};
|