@streamr/node 101.0.0-beta.1 → 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.
Files changed (73) hide show
  1. package/dist/package.json +6 -6
  2. package/dist/src/plugins/consoleMetrics/ConsoleMetricsPlugin.js +1 -1
  3. package/dist/src/plugins/consoleMetrics/ConsoleMetricsPlugin.js.map +1 -1
  4. package/dist/src/plugins/mqtt/Bridge.js +2 -3
  5. package/dist/src/plugins/mqtt/Bridge.js.map +1 -1
  6. package/dist/src/plugins/mqtt/MqttServer.js.map +1 -1
  7. package/dist/src/plugins/operator/ConsistentHashRing.d.ts +1 -1
  8. package/dist/src/plugins/operator/ConsistentHashRing.js +2 -2
  9. package/dist/src/plugins/operator/ConsistentHashRing.js.map +1 -1
  10. package/dist/src/plugins/operator/MaintainTopologyHelper.d.ts +4 -4
  11. package/dist/src/plugins/operator/MaintainTopologyHelper.js +18 -19
  12. package/dist/src/plugins/operator/MaintainTopologyHelper.js.map +1 -1
  13. package/dist/src/plugins/operator/MaintainTopologyService.js +1 -2
  14. package/dist/src/plugins/operator/MaintainTopologyService.js.map +1 -1
  15. package/dist/src/plugins/operator/OperatorFleetState.d.ts +2 -2
  16. package/dist/src/plugins/operator/OperatorFleetState.js.map +1 -1
  17. package/dist/src/plugins/operator/OperatorPlugin.d.ts +1 -1
  18. package/dist/src/plugins/operator/OperatorPlugin.js +45 -54
  19. package/dist/src/plugins/operator/OperatorPlugin.js.map +1 -1
  20. package/dist/src/plugins/operator/StreamPartAssignments.d.ts +1 -1
  21. package/dist/src/plugins/operator/StreamPartAssignments.js.map +1 -1
  22. package/dist/src/plugins/operator/announceNodeToContract.d.ts +2 -3
  23. package/dist/src/plugins/operator/announceNodeToContract.js +8 -8
  24. package/dist/src/plugins/operator/announceNodeToContract.js.map +1 -1
  25. package/dist/src/plugins/operator/checkOperatorValueBreach.d.ts +2 -2
  26. package/dist/src/plugins/operator/checkOperatorValueBreach.js +4 -4
  27. package/dist/src/plugins/operator/checkOperatorValueBreach.js.map +1 -1
  28. package/dist/src/plugins/operator/closeExpiredFlags.d.ts +2 -3
  29. package/dist/src/plugins/operator/closeExpiredFlags.js +6 -6
  30. package/dist/src/plugins/operator/closeExpiredFlags.js.map +1 -1
  31. package/dist/src/plugins/operator/formCoordinationStreamId.d.ts +1 -2
  32. package/dist/src/plugins/operator/formCoordinationStreamId.js +2 -2
  33. package/dist/src/plugins/operator/formCoordinationStreamId.js.map +1 -1
  34. package/dist/src/plugins/operator/inspectRandomNode.d.ts +3 -4
  35. package/dist/src/plugins/operator/inspectRandomNode.js +5 -6
  36. package/dist/src/plugins/operator/inspectRandomNode.js.map +1 -1
  37. package/dist/src/plugins/operator/inspectionUtils.d.ts +3 -5
  38. package/dist/src/plugins/operator/inspectionUtils.js +11 -10
  39. package/dist/src/plugins/operator/inspectionUtils.js.map +1 -1
  40. package/dist/src/plugins/operator/maintainOperatorValue.d.ts +2 -2
  41. package/dist/src/plugins/operator/maintainOperatorValue.js +3 -3
  42. package/dist/src/plugins/operator/maintainOperatorValue.js.map +1 -1
  43. package/dist/src/plugins/operator/reviewSuspectNode.d.ts +3 -4
  44. package/dist/src/plugins/operator/reviewSuspectNode.js +4 -5
  45. package/dist/src/plugins/operator/reviewSuspectNode.js.map +1 -1
  46. package/dist/src/plugins/storage/BatchManager.js +1 -2
  47. package/dist/src/plugins/storage/BatchManager.js.map +1 -1
  48. package/dist/src/plugins/storage/BucketManager.js +2 -3
  49. package/dist/src/plugins/storage/BucketManager.js.map +1 -1
  50. package/dist/src/plugins/storage/DataQueryFormat.d.ts +1 -1
  51. package/dist/src/plugins/storage/DataQueryFormat.js +2 -2
  52. package/dist/src/plugins/storage/DataQueryFormat.js.map +1 -1
  53. package/dist/src/plugins/storage/Storage.d.ts +4 -4
  54. package/dist/src/plugins/storage/Storage.js +8 -10
  55. package/dist/src/plugins/storage/Storage.js.map +1 -1
  56. package/dist/src/plugins/storage/StorageConfig.d.ts +1 -2
  57. package/dist/src/plugins/storage/StorageConfig.js +1 -1
  58. package/dist/src/plugins/storage/StorageConfig.js.map +1 -1
  59. package/dist/src/plugins/storage/StorageEventListener.js +4 -4
  60. package/dist/src/plugins/storage/StorageEventListener.js.map +1 -1
  61. package/dist/src/plugins/storage/StoragePlugin.d.ts +1 -1
  62. package/dist/src/plugins/storage/StoragePlugin.js +6 -7
  63. package/dist/src/plugins/storage/StoragePlugin.js.map +1 -1
  64. package/dist/src/plugins/storage/storageConfigEndpoint.d.ts +1 -1
  65. package/dist/src/plugins/storage/storageConfigEndpoint.js +2 -2
  66. package/dist/src/plugins/storage/storageConfigEndpoint.js.map +1 -1
  67. package/package.json +6 -6
  68. package/dist/src/plugins/operator/ContractFacade.d.ts +0 -80
  69. package/dist/src/plugins/operator/ContractFacade.js +0 -376
  70. package/dist/src/plugins/operator/ContractFacade.js.map +0 -1
  71. package/dist/src/plugins/operator/fetchRedundancyFactor.d.ts +0 -2
  72. package/dist/src/plugins/operator/fetchRedundancyFactor.js +0 -43
  73. package/dist/src/plugins/operator/fetchRedundancyFactor.js.map +0 -1
package/dist/src/plugins/storage/Storage.d.ts CHANGED
@@ -1,12 +1,12 @@
1
1
  /// <reference types="node" />
2
2
  /// <reference types="node" />
3
3
  /// <reference types="node" />
4
- import { Client } from 'cassandra-driver';
4
+ import { StreamMessage } from '@streamr/sdk';
5
5
  import { MetricsContext } from '@streamr/utils';
6
- import { BatchManager } from './BatchManager';
7
- import { Readable } from 'stream';
6
+ import { Client } from 'cassandra-driver';
8
7
  import { EventEmitter } from 'events';
9
- import { StreamMessage } from '@streamr/protocol';
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[];
package/dist/src/plugins/storage/Storage.js CHANGED
@@ -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 cassandra_driver_1 = require("cassandra-driver");
7
+ const sdk_1 = require("@streamr/sdk");
8
8
  const utils_1 = require("@streamr/utils");
9
- const BatchManager_1 = require("./BatchManager");
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 trackerless_network_1 = require("@streamr/trackerless-network");
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, trackerless_network_1.convertStreamMessageToBytes)(streamMessage))
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, stream_2.pipeline)(
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,
package/dist/src/plugins/storage/Storage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Storage.js","sourceRoot":"","sources":["../../../../src/plugins/storage/Storage.ts"],"names":[],"mappings":";;;;;;AAAA,uDAA+D;AAC/D,0CAA2D;AAC3D,iDAA6C;AAC7C,mCAA4C;AAC5C,mCAAqC;AACrC,mCAAiC;AACjC,+BAAmC;AACnC,oDAA2B;AAE3B,mDAAqE;AACrE,0CAAuC;AAEvC,2DAA0F;AAC1F,sEAA0E;AAE1E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAM,mBAAmB,GAAG,gBAAgB,CAAA,CAAC,uDAAuD;AACpG,MAAM,eAAe,GAAG,KAAK,CAAA;AAW7B,MAAM,YAAY,GAAG,CAAC,OAAiB,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;AAoB3F,MAAa,OAAQ,SAAQ,qBAAY;IAErC,IAAI,CAAgB;IACpB,eAAe,CAAQ;IACvB,aAAa,CAAe;IAC5B,YAAY,CAAc;IAC1B,aAAa,CAA6B;IAE1C,YAAY,eAAuB,EAAE,IAAoB;QACrD,KAAK,EAAE,CAAA;QAEP,MAAM,cAAc,GAAG;YACnB,MAAM,EAAE,KAAK;YACb,2BAA2B,EAAE,GAAG;SACnC,CAAA;QAED,IAAI,CAAC,IAAI,GAAG;YACR,GAAG,cAAc;YACjB,GAAG,IAAI;SACV,CAAA;QAED,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,aAAa,GAAG,IAAI,6BAAa,CAAC,eAAe,EAAE,IAAI,CAAC,CAAA;QAC7D,IAAI,CAAC,YAAY,GAAG,IAAI,2BAAY,CAAC,eAAe,EAAE;YAClD,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM;SAC3B,CAAC,CAAA;QACF,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAA;IAClC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,aAA4B;QACpC,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,aAAa,CAAC,SAAS,EAAE,CAAC,CAAA;QAEjE,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,aAAa,CAAC,WAAW,EAAE,EAAE,aAAa,CAAC,kBAAkB,EAAE,EAAE,aAAa,CAAC,YAAY,EAAE,CAAC,CAAA;QAE9I,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,IAAI,QAAQ,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;gBAE1C,MAAM,MAAM,GAAG;oBACX,QAAQ,EAAE,aAAa,CAAC,WAAW,EAAE;oBACrC,SAAS,EAAE,aAAa,CAAC,kBAAkB,EAAE;oBAC7C,SAAS,EAAE,aAAa,CAAC,YAAY,EAAE;oBACvC,UAAU,EAAE,aAAa,CAAC,iBAAiB,EAAE;oBAC7C,WAAW,EAAE,aAAa,CAAC,cAAc,EAAE;oBAC3C,UAAU,EAAE,aAAa,CAAC,aAAa,EAAE;oBACzC,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,IAAA,iDAA2B,EAAC,aAAa,CAAC,CAAC;iBACnE,CAAA;gBAED,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;gBACnE,YAAY,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE;oBACzE,IAAI,GAAG,EAAE,CAAC;wBACN,MAAM,CAAC,GAAG,CAAC,CAAA;oBACf,CAAC;yBAAM,CAAC;wBACJ,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAA;wBAClC,OAAO,CAAC,IAAI,CAAC,CAAA;oBACjB,CAAC;gBACL,CAAC,CAAC,CAAC,CAAA;YACP,CAAC;iBAAM,CAAC;gBACJ,MAAM,CAAC,KAAK,CAAC,qDAAqD,EAAE;oBAChE,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,SAAS,CAAC;iBACrD,CAAC,CAAA;gBAEF,MAAM,IAAI,GAAG,IAAA,SAAM,GAAE,CAAA;gBACrB,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;oBAC5B,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;oBAC/B,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;gBACnD,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;gBACzC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YACzC,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,WAAW,CAAC,QAAgB,EAAE,SAAiB,EAAE,KAAa;QAC1D,IAAI,KAAK,GAAG,eAAe,EAAE,CAAC;YAC1B,6CAA6C;YAC7C,KAAK,GAAG,eAAe,CAAA;QAC3B,CAAC;QAED,MAAM,mBAAmB,GAAG,wCAAwC;cAC9D,qDAAqD;cACrD,qCAAqC;cACrC,SAAS,CAAA;QACf,MAAM,cAAc,GAAG,mGAAmG,CAAA;QAC1H,MAAM,WAAW,GAAG,6DAA6D,CAAA;QAEjF,IAAI,KAAK,GAAG,CAAC,CAAA;QACb,MAAM,OAAO,GAAG;YACZ,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;SAC9B,CAAA;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAA;QAE5E,MAAM,aAAa,GAAG,KAAK,EAAE,SAAqB,EAAE,EAAE;YAClD,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,CAAA;gBACtD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,mBAAmB,EAAE,MAAM,EAAE;oBAC9E,OAAO,EAAE,IAAI;oBACb,SAAS,EAAE,CAAC,CAAC,iBAAiB;iBACjC,CAAC,CAAA;gBACF,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAY,EAAE,EAAE;oBAC9C,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;gBACzB,CAAC,CAAC,CAAA;gBACF,YAAY,CAAC,GAAG,EAAE,CAAA;YACtB,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACX,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAC7B,CAAC;QACL,CAAC,CAAA;QAED,IAAI,QAAkB,CAAA;QACtB,MAAM,SAAS,GAAe,EAAE,CAAA;QAChC;;;;;WAKG;QACH,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,GAAc,EAAE,EAAE;YAC7F,QAAQ,GAAG,GAAG,CAAC,EAAE,CAAA;YACjB,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC5B,CAAC,EAAE,KAAK,EAAE,GAAsB,EAAE,MAAuB,EAAE,EAAE;YACzD,mCAAmC;YACnC,IAAI,YAAY,CAAC,aAAa,IAAI,YAAY,CAAC,aAAa,EAAE,CAAC;gBAAC,OAAM;YAAC,CAAC;YACxE,IAAI,GAAG,EAAE,CAAC;gBACN,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;YAC7B,CAAC;iBAAM,CAAC;gBACJ,0BAA0B;gBAC1B,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACZ,YAAY,CAAC,GAAG,EAAE,CAAA;oBAClB,OAAM;gBACV,CAAC;gBACD,IAAI,CAAC;oBACD,qCAAqC;oBACrC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE;wBAClG,OAAO,EAAE,IAAI;wBACb,SAAS,EAAE,CAAC,CAAC,iBAAiB;qBACjC,CAAC,CAAA;oBACF,MAAM,GAAG,GAAG,SAAS,CAAC,KAAK,EAAE,CAAA;oBAC7B,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAA;oBAEtB,iEAAiE;oBACjE,IAAI,MAAM,CAAC,QAAQ,IAAI,KAAK,GAAG,KAAK,IAAI,KAAK,GAAG,eAAe,EAAE,CAAC;wBAC9D,MAAM,CAAC,QAAQ,EAAE,CAAA;oBACrB,CAAC;yBAAM,CAAC;wBACJ,aAAa,CAAC,SAAS,CAAC,CAAA;oBAC5B,CAAC;gBACL,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACX,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;gBAC7B,CAAC;YACL,CAAC;QACL,CAAC,CAAC,CAAA;QAEF,OAAO,YAAY,CAAA;IACvB,CAAC;IAED,WAAW,CAAC,QAAgB,EAAE,SAAiB,EAAE,aAAqB,EAAE,cAAsB,EAAE,WAAoB;QAChH,OAAO,IAAI,CAAC,UAAU,CAClB,QAAQ,EACR,SAAS,EACT,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,6CAAyB,EACzB,WAAW,CACd,CAAA;IACL,CAAC;IAED,YAAY,CACR,QAAgB,EAChB,SAAiB,EACjB,aAAqB,EACrB,cAAsB,EACtB,WAAmB,EACnB,YAAoB,EACpB,WAA+B,EAC/B,UAA8B;QAE9B,+GAA+G;QAC/G,gEAAgE;QAChE,MAAM,cAAc,GAAG,CAAC,WAAW,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,CAAC,CAAA;QACzI,IAAI,CAAC,cAAc,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAA;QACnE,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,EACrD,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,CAAC,CAAA;IAC3E,CAAC;IAED,aAAa,CAAC,cAA8B;QACxC,MAAM,OAAO,GAAG;YACZ,qBAAqB,EAAE,IAAI,kBAAU,EAAE;YACvC,kBAAkB,EAAE,IAAI,kBAAU,EAAE;YACpC,sBAAsB,EAAE,IAAI,kBAAU,EAAE;YACxC,mBAAmB,EAAE,IAAI,kBAAU,EAAE;SACxC,CAAA;QACD,cAAc,CAAC,UAAU,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAA;QAC3D,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,aAAyB,EAAE,EAAE;YAC1C,OAAO,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;YACvC,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAC3D,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,aAAyB,EAAE,EAAE;YAC3C,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;YACxC,OAAO,CAAC,mBAAmB,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;QAC5D,CAAC,CAAC,CAAA;IACN,CAAC;IAED,KAAK;QACD,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3C,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjB,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAC3C,YAAY,CAAC,OAAO,CAAC,CAAA;YACrB,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;QAClC,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAA;QACzB,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAA;QACxB,OAAO,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAA;IAC1C,CAAC;IAEO,UAAU,CACd,QAAgB,EAChB,SAAiB,EACjB,aAAqB,EACrB,cAAsB,EACtB,WAAmB,EACnB,YAAoB,EACpB,WAAoB,EACpB,UAAmB;QAEnB,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAAC;YACzC,QAAQ;YACR,SAAS;YACT,aAAa;YACb,cAAc;YACd,WAAW;YACX,YAAY;YACZ,WAAW;YACX,UAAU;SACb,CAAC,CAAA;QAEF,IAAI,CAAC,aAAa,CAAC,qBAAqB,CAAC,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,OAAiB,EAAE,EAAE;YACjH,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,YAAY,CAAC,GAAG,EAAE,CAAA;gBAClB,OAAM;YACV,CAAC;YAED,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YAEvC,IAAI,OAAO,CAAA;YACX,iFAAiF;YACjF,IAAI,CAAC,cAAc,KAAK,6CAAyB,CAAC,IAAI,CAAC,YAAY,KAAK,6CAAyB,CAAC,EAAE,CAAC;gBACjG,OAAO,GAAG;oBACN;wBACI,KAAK,EAAE,kFAAkF;wBACzF,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,CAAC;qBACvE;iBACJ,CAAA;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG;oBACN;wBACI,KAAK,EAAE,0FAA0F;wBACjG,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,cAAc,CAAC;qBAC1E;oBACD;wBACI,KAAK,EAAE,gFAAgF;wBACvF,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,CAAC;qBACvE;oBACD;wBACI,KAAK,EAAE,0FAA0F;wBACjG,MAAM,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,CAAC;qBACtE;iBACJ,CAAA;YACL,CAAC;YAED,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBAClB,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;oBAC5B,CAAC,CAAC,KAAK,IAAI,uBAAuB,CAAA;oBAClC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;gBAC9B,CAAC;gBACD,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;oBAC3B,CAAC,CAAC,KAAK,IAAI,uBAAuB,CAAA;oBAClC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;gBAC7B,CAAC;YACL,CAAC,CAAC,CAAA;YAEF,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC9B,MAAM,MAAM,GAAG,mCAAmC,CAAC,CAAC,KAAK,kBAAkB,CAAA;gBAC3E,OAAO,IAAI,CAAC,yBAAyB,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAA;YAC3D,CAAC,CAAC,CAAA;YAEF,OAAO,IAAA,iBAAQ;YACX,uCAAuC;YACvC,IAAA,gBAAM,EAAC,GAAG,OAAO,EAAE;gBACf,SAAS,EAAE,IAAI;aAClB,CAAC,EACF,YAAY,EACZ,CAAC,GAAiB,EAAE,EAAE;gBAClB,IAAI,GAAG,EAAE,CAAC;oBACN,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;oBACzB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAA;gBAChD,CAAC;YACL,CAAC,CACJ,CAAA;QACL,CAAC,CAAC;aACG,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAC3B,CAAC,CAAC,CAAA;QAEN,OAAO,YAAY,CAAA;IACvB,CAAC;IAEO,yBAAyB,CAAC,KAAa,EAAE,WAAkB;QAC/D,OAAO,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,EAAE;YACnD,OAAO,EAAE,IAAI;YACb,gHAAgH;YAChH,SAAS,EAAE,GAAG;YACd,WAAW,EAAE,CAAC;SACjB,CAAa,CAAA;IAClB,CAAC;IAEO,QAAQ,CAAC,GAAc,EAAE,SAA0B;QACvD,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YACvB,MAAM,CAAC,KAAK,CAAC,yDAAyD,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;YACtF,OAAO,IAAI,CAAA;QACf,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,CAAA;QAC9B,OAAO,GAAG,CAAC,OAAO,CAAA;IACtB,CAAC;IAEO,kBAAkB,CAAC,SAA0B;QACjD,MAAM,IAAI,GAAG,IAAI,CAAA,CAAC,uDAAuD;QACzE,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QACrB,OAAO,IAAI,kBAAS,CAAC;YACjB,aAAa,EAAE,IAAI,EAAE,6BAA6B;YAClD,UAAU,EAAE,IAAI;YAChB,SAAS,CAAC,GAAc,EAAE,CAAC,EAAE,IAAI;gBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;gBACtB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;gBAC7C,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;oBACnB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBACtB,CAAC;gBACD,gEAAgE;gBAChE,uEAAuE;gBACvE,gCAAgC;gBAChC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;oBACrB,YAAY,CAAC,GAAG,EAAE;wBACd,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;wBACjB,IAAI,EAAE,CAAA;oBACV,CAAC,CAAC,CAAA;gBACN,CAAC;qBAAM,CAAC;oBACJ,IAAI,EAAE,CAAA;gBACV,CAAC;YACL,CAAC;SACJ,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,gCAAgC,CAAC,QAAgB,EAAE,SAAiB;QACtE,MAAM,WAAW,GAAG,2FAA2F,CAAA;QAE/G,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAEzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE;YACzE,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,CAAA;QACZ,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAEnC,MAAM,KAAK,GAAG,sGAAsG,CAAA;QAEpH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE;YACtD,QAAQ;YACR,SAAS;YACT,QAAQ;SACX,EAAE;YACC,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,CAAA;QACZ,CAAC;QAED,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE9B,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,QAAgB,EAAE,SAAiB;QACrE,MAAM,WAAW,GAAG,4FAA4F,CAAA;QAEhH,MAAM,WAAW,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAEzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,EAAE;YACzE,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,CAAA;QACZ,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;QAEnC,MAAM,KAAK,GAAG,uGAAuG,CAAA;QAErH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE;YACtD,QAAQ;YACR,SAAS;YACT,QAAQ;SACX,EAAE;YACC,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,CAAA;QACZ,CAAC;QAED,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE9B,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,QAAgB,EAAE,SAAiB;QACjE,MAAM,KAAK,GAAG,4EAA4E,CAAA;QAC1F,MAAM,WAAW,GAAG;YAChB,QAAQ;YACR,SAAS;SACZ,CAAA;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE;YAC/D,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,CAAA;QACZ,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE7B,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,QAAgB,EAAE,SAAiB;QAC3D,MAAM,KAAK,GAAG,yEAAyE,CAAA;QACvF,MAAM,WAAW,GAAG;YAChB,QAAQ;YACR,SAAS;SACZ,CAAA;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE;YAC/D,OAAO,EAAE,IAAI;SAChB,CAAC,CAAA;QAEF,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO,CAAC,CAAA;QACZ,CAAC;QAED,IAAI,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE3B,mEAAmE;QACnE,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;YACZ,KAAK,GAAG,CAAC,CAAA;YAET,MAAM,KAAK,GAAG,2DAA2D,CAAA;YACzE,MAAM,WAAW,GAAG;gBAChB,QAAQ;gBACR,SAAS;aACZ,CAAA;YAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE;gBAC/D,OAAO,EAAE,IAAI;aAChB,CAAC,CAAA;YAEF,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;gBACzB,KAAK,IAAI,GAAG,CAAC,IAAI,CAAA;YACrB,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAA;IAChB,CAAC;CAEJ;AAjeD,0BAieC;AAED,SAAS,KAAK,CAAC,EAAU;IACrB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,CAAA;AAC7E,CAAC;AAEM,MAAM,qBAAqB,GAAG,KAAK,EAAE,EACxC,aAAa,EACb,eAAe,EACf,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,IAAI,EACgB,EAAoB,EAAE;IAC1C,MAAM,YAAY,GAAG,IAAI,uBAAI,CAAC,qBAAqB,CAAC,QAAQ,IAAI,EAAE,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAA;IACnF,MAAM,aAAa,GAAG,IAAI,0BAAO,CAAC,aAAa,CAAC;QAC5C,aAAa,EAAE,EAAE,GAAG,IAAI,EAAE,UAAU;KACvC,CAAC,CAAA;IACF,sEAAsE;IACtE,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,OAAa,EAAE,EAAE;QAC/C,MAAM,CAAC,IAAI,CAAC,+CAA+C,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAC7E,CAAC,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,IAAI,yBAAM,CAAC;QAC/B,aAAa;QACb,eAAe;QACf,QAAQ;QACR,YAAY;QACZ,cAAc,EAAE,aAAa;QAC7B,OAAO,EAAE;YACL,wBAAwB,EAAE,KAAK;SAClC;KACJ,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,EAAE,CAAA;IACnB,IAAI,UAAU,GAAG,QAAQ,CAAA;IACzB,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,OAAO,UAAU,GAAG,CAAC,EAAE,CAAC;QACpB,qCAAqC;QACrC,IAAI,CAAC;YACD,MAAM,eAAe,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,GAAG,MAAM,GAAG,CAAA,CAAC,CAAC,CAAC,CAAA;YAC7D,OAAO,IAAI,OAAO,CAAC,eAAe,EAAE,IAAI,IAAI,EAAE,CAAC,CAAA;QACnD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,sCAAsC;YACtC,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAA;YAC9C,UAAU,IAAI,CAAC,CAAA;YACf,MAAM,KAAK,CAAC,IAAI,CAAC,CAAA;YACjB,SAAS,GAAG,GAAG,CAAA;QACnB,CAAC;QACD,oCAAoC;IACxC,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,QAAQ,YAAY,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;AACvG,CAAC,CAAA;AA5CY,QAAA,qBAAqB,yBA4CjC"}
1
+ {"version":3,"file":"Storage.js","sourceRoot":"","sources":["../../../../src/plugins/storage/Storage.ts"],"names":[],"mappings":"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"}
package/dist/src/plugins/storage/StorageConfig.d.ts CHANGED
@@ -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;
package/dist/src/plugins/storage/StorageConfig.js CHANGED
@@ -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
package/dist/src/plugins/storage/StorageConfig.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"StorageConfig.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StorageConfig.ts"],"names":[],"mappings":";;;AAAA,0CAAyE;AAGzE,2EAA6E;AAC7E,mDAA+C;AAC/C,iEAA6D;AAE7D,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAa,aAAa;IACL,QAAQ,CAAuB;IAC/B,YAAY,GAAG,IAAI,qDAAyB,EAAgB,CAAA;IAC5D,WAAW,CAAQ;IACnB,gBAAgB,CAAQ;IACxB,aAAa,CAAe;IAC5B,oBAAoB,CAAsB;IAC1C,eAAe,CAAiB;IAEjD,YACI,SAA0B,EAC1B,WAAmB,EACnB,gBAAwB,EACxB,YAAoB,EACpB,aAA4B,EAC5B,QAA+B;QAE/B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAA;QAC9B,IAAI,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;QACxC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;QACxB,IAAI,CAAC,aAAa,GAAG,IAAI,6BAAa,CAAC,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;YAC9F,MAAM,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAc,EAAE,EAAE,CAAC,CAAC;gBACrD,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC;aACtC,CAAC,CAAC,CAAA;YACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,IAAI,GAAG,CAAe,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC,CAAA;QAChG,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,oBAAoB,GAAG,IAAI,2CAAoB,CAAC,SAAS,EAAE,aAAa,EAAE,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE;YACnG,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAA;YACpD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,WAAW,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAA;QAC5E,CAAC,CAAC,CAAA;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAA;QACjC,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IAC/D,CAAC;IAED,OAAO;QACH,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;QAC5B,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAA;IACvC,CAAC;IAED,aAAa,CAAC,UAAwB;QAClC,OAAO,IAAI,CAAC,cAAc,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;IAChD,CAAC;IAED,cAAc;QACV,OAAO,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAA;IACvC,CAAC;IAEO,mBAAmB,CAAC,MAAc;QACtC,OAAO,IAAI,GAAG,CAAe,MAAM,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE;YACvE,MAAM,WAAW,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;YACjE,OAAO,WAAW,KAAK,IAAI,CAAC,gBAAgB,CAAA;QAChD,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,UAAU,CAAC,EAAE,KAAK,EAAE,OAAO,EAAsB;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAA;QAC1E,OAAO,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAA;QAC9E,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE;YACzB,KAAK;YACL,OAAO;SACV,CAAC,CAAA;IACN,CAAC;CACJ;AAlED,sCAkEC"}
1
+ {"version":3,"file":"StorageConfig.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StorageConfig.ts"],"names":[],"mappings":"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"}
package/dist/src/plugins/storage/StorageEventListener.js CHANGED
@@ -34,12 +34,12 @@ class StorageEventListener {
34
34
  }
35
35
  }
36
36
  start() {
37
- this.streamrClient.on('addToStorageNode', this.onAddToStorageNode);
38
- this.streamrClient.on('removeFromStorageNode', this.onRemoveFromStorageNode);
37
+ this.streamrClient.on('streamAddedToStorageNode', this.onAddToStorageNode);
38
+ this.streamrClient.on('streamRemovedFromFromStorageNode', this.onRemoveFromStorageNode);
39
39
  }
40
40
  destroy() {
41
- this.streamrClient.off('addToStorageNode', this.onAddToStorageNode);
42
- this.streamrClient.off('removeFromStorageNode', this.onRemoveFromStorageNode);
41
+ this.streamrClient.off('streamAddedToStorageNode', this.onAddToStorageNode);
42
+ this.streamrClient.off('streamRemovedFromFromStorageNode', this.onRemoveFromStorageNode);
43
43
  }
44
44
  }
45
45
  exports.StorageEventListener = StorageEventListener;
package/dist/src/plugins/storage/StorageEventListener.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"StorageEventListener.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StorageEventListener.ts"],"names":[],"mappings":";;;AACA,0CAAwD;AAExD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC;;;GAGG;AACH,MAAa,oBAAoB;IACZ,SAAS,CAAiB;IAC1B,aAAa,CAAe;IAC5B,OAAO,CAAoE;IAC3E,kBAAkB,CAA6C;IAC/D,uBAAuB,CAA6C;IAErF,YACI,SAA0B,EAC1B,aAA4B,EAC5B,OAA2E;QAE3E,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,kBAAkB,GAAG,CAAC,KAAiC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACjG,IAAI,CAAC,uBAAuB,GAAG,CAAC,KAAiC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAC5G,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,KAAiC,EAAE,IAAyB;QAClF,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YACvC,OAAM;QACV,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QACnE,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YACjE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;QACjD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,uDAAuD,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9F,CAAC;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAA;QAClE,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,uBAAuB,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAA;IAChF,CAAC;IAED,OAAO;QACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAA;QACnE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,uBAAuB,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAA;IACjF,CAAC;CACJ;AAzCD,oDAyCC"}
1
+ {"version":3,"file":"StorageEventListener.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StorageEventListener.ts"],"names":[],"mappings":";;;AACA,0CAAwD;AAExD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC;;;GAGG;AACH,MAAa,oBAAoB;IACZ,SAAS,CAAiB;IAC1B,aAAa,CAAe;IAC5B,OAAO,CAAoE;IAC3E,kBAAkB,CAA6C;IAC/D,uBAAuB,CAA6C;IAErF,YACI,SAA0B,EAC1B,aAA4B,EAC5B,OAA2E;QAE3E,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,kBAAkB,GAAG,CAAC,KAAiC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACjG,IAAI,CAAC,uBAAuB,GAAG,CAAC,KAAiC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAA;IAC5G,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,KAAiC,EAAE,IAAyB;QAClF,IAAI,KAAK,CAAC,WAAW,KAAK,IAAI,CAAC,SAAS,EAAE,CAAC;YACvC,OAAM;QACV,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAA;QACnE,IAAI,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;YACjE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,CAAA;QACjD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,uDAAuD,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;QAC9F,CAAC;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,0BAA0B,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAA;QAC1E,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,kCAAkC,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAA;IAC3F,CAAC;IAED,OAAO;QACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,0BAA0B,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAA;QAC3E,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,kCAAkC,EAAE,IAAI,CAAC,uBAAuB,CAAC,CAAA;IAC5F,CAAC;CACJ;AAzCD,oDAyCC"}
package/dist/src/plugins/storage/StoragePlugin.d.ts CHANGED
@@ -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: {
package/dist/src/plugins/storage/StoragePlugin.js CHANGED
@@ -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 === protocol_1.StreamMessageType.MESSAGE;
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 = (await (this.streamrClient.getNode())).getMetricsContext();
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 = await this.streamrClient.getNode();
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 = await this.streamrClient.getNode();
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 = await this.streamrClient.getNode();
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 {
package/dist/src/plugins/storage/StoragePlugin.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"StoragePlugin.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StoragePlugin.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAoE;AACpE,0CAA4F;AAE5F,sCAAuF;AACvF,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,4BAAiB,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,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAA;QACjF,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,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAA;QAC/C,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,MAAM,IAAI,CAAC,aAAc,CAAC,OAAO,EAAE,CAAA;QAChD,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,MAAM,IAAI,CAAC,aAAc,CAAC,OAAO,EAAE,CAAA;QAChD,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
+ {"version":3,"file":"StoragePlugin.js","sourceRoot":"","sources":["../../../../src/plugins/storage/StoragePlugin.ts"],"names":[],"mappings":"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"}
package/dist/src/plugins/storage/storageConfigEndpoint.d.ts CHANGED
@@ -1,3 +1,3 @@
1
- import { StorageConfig } from './StorageConfig';
2
1
  import { HttpServerEndpoint } from '../../Plugin';
2
+ import { StorageConfig } from './StorageConfig';
3
3
  export declare const createStorageConfigEndpoint: (storageConfig: StorageConfig) => HttpServerEndpoint;
package/dist/src/plugins/storage/storageConfigEndpoint.js CHANGED
@@ -1,13 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createStorageConfigEndpoint = void 0;
4
- const protocol_1 = require("@streamr/protocol");
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, protocol_1.toStreamPartID)((0, protocol_1.toStreamID)(id), Number(partition)));
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
  }
package/dist/src/plugins/storage/storageConfigEndpoint.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"storageConfigEndpoint.js","sourceRoot":"","sources":["../../../../src/plugins/storage/storageConfigEndpoint.ts"],"names":[],"mappings":";;;AAEA,gDAA8D;AAG9D,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,yBAAc,EAAC,IAAA,qBAAU,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"}
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.1",
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/protocol": "101.0.0-beta.1",
36
- "@streamr/sdk": "101.0.0-beta.1",
37
- "@streamr/utils": "101.0.0-beta.1",
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/dht": "101.0.0-beta.1",
62
- "@streamr/test-utils": "101.0.0-beta.1",
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",
package/dist/src/plugins/operator/ContractFacade.d.ts DELETED
@@ -1,80 +0,0 @@
1
- /// <reference types="node" />
2
- import { Provider } from 'ethers';
3
- import { Operator } from '@streamr/network-contracts-ethers6';
4
- import { StreamID } from '@streamr/protocol';
5
- import { EthereumAddress, TheGraphClient } from '@streamr/utils';
6
- import { Overrides } from 'ethers';
7
- import { NetworkPeerDescriptor } from '@streamr/sdk';
8
- import { OperatorServiceConfig } from './OperatorPlugin';
9
- interface EarningsData {
10
- sponsorshipAddresses: EthereumAddress[];
11
- sumDataWei: bigint;
12
- maxAllowedEarningsDataWei: bigint;
13
- }
14
- export declare const VOTE_KICK = "0x0000000000000000000000000000000000000000000000000000000000000001";
15
- export declare const VOTE_NO_KICK = "0x0000000000000000000000000000000000000000000000000000000000000000";
16
- export declare class ParseError extends Error {
17
- readonly reasonText: string;
18
- constructor(reasonText: string);
19
- }
20
- export declare function parsePartitionFromReviewRequestMetadata(metadataAsString: string | undefined): number | never;
21
- export type ReviewRequestListener = (sponsorship: EthereumAddress, operatorContractAddress: EthereumAddress, partition: number, votingPeriodStartTime: number, votingPeriodEndTime: number) => void;
22
- export interface SponsorshipResult {
23
- sponsorshipAddress: EthereumAddress;
24
- streamId: StreamID;
25
- operatorCount: number;
26
- }
27
- export interface Flag {
28
- id: string;
29
- flaggingTimestamp: number;
30
- target: {
31
- id: string;
32
- };
33
- sponsorship: {
34
- id: string;
35
- };
36
- }
37
- export declare class ContractFacade {
38
- private readonly operatorContract;
39
- private readonly theGraphClient;
40
- private readonly config;
41
- constructor(operatorContract: Operator, theGraphClient: TheGraphClient, config: OperatorServiceConfig);
42
- static createInstance(config: OperatorServiceConfig): ContractFacade;
43
- writeHeartbeat(nodeDescriptor: NetworkPeerDescriptor): Promise<void>;
44
- getTimestampOfLastHeartbeat(): Promise<number | undefined>;
45
- getOperatorContractAddress(): Promise<EthereumAddress>;
46
- getSponsorshipsOfOperator(operatorAddress: EthereumAddress): Promise<SponsorshipResult[]>;
47
- getExpiredFlags(sponsorships: EthereumAddress[], maxAgeInMs: number): Promise<Flag[]>;
48
- getOperatorsInSponsorship(sponsorshipAddress: EthereumAddress): Promise<EthereumAddress[]>;
49
- flag(sponsorship: EthereumAddress, operator: EthereumAddress, partition: number): Promise<void>;
50
- getRandomOperator(): Promise<EthereumAddress | undefined>;
51
- /**
52
- * Find the sum of earnings in Sponsorships (that the Operator must withdraw before the sum reaches a limit),
53
- * SUBJECT TO the constraints, set in the OperatorServiceConfig:
54
- * - only take at most maxSponsorshipsInWithdraw addresses (those with most earnings), or all if undefined
55
- * - only take sponsorships that have more than minSponsorshipEarningsInWithdraw, or all if undefined
56
- */
57
- getEarningsOf(operatorContractAddress: EthereumAddress, minSponsorshipEarningsInWithdraw: number, maxSponsorshipsInWithdraw: number): Promise<EarningsData>;
58
- getMyEarnings(minSponsorshipEarningsInWithdraw: number, maxSponsorshipsInWithdraw: number): Promise<EarningsData>;
59
- withdrawMyEarningsFromSponsorships(sponsorshipAddresses: EthereumAddress[]): Promise<void>;
60
- triggerWithdraw(targetOperatorAddress: EthereumAddress, sponsorshipAddresses: EthereumAddress[]): Promise<void>;
61
- private getOperatorAddresses;
62
- pullStakedStreams(requiredBlockNumber: number): AsyncGenerator<{
63
- sponsorship: {
64
- id: string;
65
- stream: {
66
- id: string;
67
- };
68
- };
69
- }, undefined, undefined>;
70
- hasOpenFlag(operatorAddress: EthereumAddress, sponsorshipAddress: EthereumAddress): Promise<boolean>;
71
- addReviewRequestListener(listener: ReviewRequestListener, abortSignal: AbortSignal): void;
72
- getStreamId(sponsorshipAddress: string): Promise<StreamID>;
73
- voteOnFlag(sponsorship: string, targetOperator: string, kick: boolean): Promise<void>;
74
- closeFlag(sponsorship: string, targetOperator: string): Promise<void>;
75
- addOperatorContractStakeEventListener(eventName: 'Staked' | 'Unstaked', listener: (sponsorship: string) => unknown): void;
76
- removeOperatorContractStakeEventListener(eventName: 'Staked' | 'Unstaked', listener: (sponsorship: string) => unknown): void;
77
- getProvider(): Provider;
78
- getEthersOverrides(): Promise<Overrides>;
79
- }
80
- export {};