@streamr/trackerless-network 103.0.0-rc.13 → 103.0.0-rc.14

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@streamr/trackerless-network",
3
- "version": "103.0.0-rc.13",
3
+ "version": "103.0.0-rc.14",
4
4
  "description": "Minimal and extendable implementation of the Streamr Network node.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -36,9 +36,9 @@
36
36
  "dependencies": {
37
37
  "@protobuf-ts/runtime": "^2.8.2",
38
38
  "@protobuf-ts/runtime-rpc": "^2.8.2",
39
- "@streamr/dht": "103.0.0-rc.13",
40
- "@streamr/proto-rpc": "103.0.0-rc.13",
41
- "@streamr/utils": "103.0.0-rc.13",
39
+ "@streamr/dht": "103.0.0-rc.14",
40
+ "@streamr/proto-rpc": "103.0.0-rc.14",
41
+ "@streamr/utils": "103.0.0-rc.14",
42
42
  "eventemitter3": "^5.0.0",
43
43
  "lodash": "^4.17.21",
44
44
  "ts-essentials": "^10.0.4",
@@ -47,7 +47,7 @@
47
47
  },
48
48
  "devDependencies": {
49
49
  "@streamr/browser-test-runner": "^0.0.1",
50
- "@streamr/test-utils": "103.0.0-rc.13",
50
+ "@streamr/test-utils": "103.0.0-rc.14",
51
51
  "@types/lodash": "^4.17.16",
52
52
  "@types/yallist": "^4.0.1",
53
53
  "expect": "^29.6.2",
@@ -1,9 +1,11 @@
1
1
  import { DhtAddress } from '@streamr/dht';
2
2
  export declare class PausedNeighbors {
3
3
  private readonly pausedNeighbors;
4
- constructor();
4
+ private readonly limit;
5
+ constructor(limit: number);
5
6
  add(node: DhtAddress, msgChainId: string): void;
6
7
  delete(node: DhtAddress, msgChainId: string): void;
7
8
  deleteAll(node: DhtAddress): void;
8
9
  isPaused(node: DhtAddress, msgChainId: string): boolean;
10
+ forEach(fn: (neighbors: Set<DhtAddress>, msgChainId: string) => void): void;
9
11
  }
@@ -3,13 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.PausedNeighbors = void 0;
4
4
  class PausedNeighbors {
5
5
  pausedNeighbors;
6
- constructor() {
6
+ limit;
7
+ constructor(limit) {
7
8
  this.pausedNeighbors = new Map();
9
+ this.limit = limit;
8
10
  }
9
11
  add(node, msgChainId) {
10
12
  if (!this.pausedNeighbors.has(msgChainId)) {
11
13
  this.pausedNeighbors.set(msgChainId, new Set());
12
14
  }
15
+ if (this.pausedNeighbors.get(msgChainId).size >= this.limit) {
16
+ return;
17
+ }
13
18
  this.pausedNeighbors.get(msgChainId).add(node);
14
19
  }
15
20
  delete(node, msgChainId) {
@@ -32,6 +37,11 @@ class PausedNeighbors {
32
37
  }
33
38
  return this.pausedNeighbors.get(msgChainId).has(node);
34
39
  }
40
+ forEach(fn) {
41
+ this.pausedNeighbors.forEach((neighbors, msgChainId) => {
42
+ fn(neighbors, msgChainId);
43
+ });
44
+ }
35
45
  }
36
46
  exports.PausedNeighbors = PausedNeighbors;
37
47
  //# sourceMappingURL=PausedNeighbors.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"PausedNeighbors.js","sourceRoot":"","sources":["../../../../src/logic/plumtree/PausedNeighbors.ts"],"names":[],"mappings":";;;AAEA,MAAa,eAAe;IACP,eAAe,CAA8B;IAE9D;QACI,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAA;IACpC,CAAC;IAED,GAAG,CAAC,IAAgB,EAAE,UAAkB;QACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;QACnD,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,CAAC,IAAgB,EAAE,UAAkB;QACvC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAClD,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAC3C,CAAC;IACL,CAAC;IAED,SAAS,CAAC,IAAgB;QACtB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;YACnD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YACtB,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YAC3C,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,QAAQ,CAAC,IAAgB,EAAE,UAAkB;QACzC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;CAEJ;AArCD,0CAqCC"}
1
+ {"version":3,"file":"PausedNeighbors.js","sourceRoot":"","sources":["../../../../src/logic/plumtree/PausedNeighbors.ts"],"names":[],"mappings":";;;AACA,MAAa,eAAe;IACP,eAAe,CAA8B;IAC7C,KAAK,CAAQ;IAE9B,YAAY,KAAa;QACrB,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAA;QAChC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,GAAG,CAAC,IAAgB,EAAE,UAAkB;QACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;QACnD,CAAC;QACD,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3D,OAAM;QACV,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,CAAC,IAAgB,EAAE,UAAkB;QACvC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAClD,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAC3C,CAAC;IACL,CAAC;IAED,SAAS,CAAC,IAAgB;QACtB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;YACnD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YACtB,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YAC3C,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,QAAQ,CAAC,IAAgB,EAAE,UAAkB;QACzC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IAED,OAAO,CAAC,EAA4D;QAChE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;YACnD,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;IACN,CAAC;CAEJ;AAhDD,0CAgDC"}
@@ -7,6 +7,7 @@ interface Options {
7
7
  localPeerDescriptor: PeerDescriptor;
8
8
  rpcCommunicator: ListeningRpcCommunicator;
9
9
  }
10
+ export declare const MAX_PAUSED_NEIGHBORS_DEFAULT = 3;
10
11
  interface Events {
11
12
  message: (msg: StreamMessage) => void;
12
13
  }
@@ -3,7 +3,7 @@ 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.PlumTreeManager = void 0;
6
+ exports.PlumTreeManager = exports.MAX_PAUSED_NEIGHBORS_DEFAULT = void 0;
7
7
  const dht_1 = require("@streamr/dht");
8
8
  const NetworkRpc_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc");
9
9
  const PlumTreeRpcLocal_1 = require("./PlumTreeRpcLocal");
@@ -13,14 +13,15 @@ const eventemitter3_1 = __importDefault(require("eventemitter3"));
13
13
  const utils_1 = require("@streamr/utils");
14
14
  const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
15
15
  const PausedNeighbors_1 = require("./PausedNeighbors");
16
+ exports.MAX_PAUSED_NEIGHBORS_DEFAULT = 3;
16
17
  const logger = new utils_1.Logger(module);
17
18
  class PlumTreeManager extends eventemitter3_1.default {
18
19
  neighbors;
19
20
  localPeerDescriptor;
20
21
  // We have paused sending real data to these neighbrs and only send metadata
21
- localPausedNeighbors = new PausedNeighbors_1.PausedNeighbors();
22
+ localPausedNeighbors = new PausedNeighbors_1.PausedNeighbors(exports.MAX_PAUSED_NEIGHBORS_DEFAULT);
22
23
  // We have asked these nodes to pause sending real data to us, used to limit sending of pausing and resuming requests
23
- remotePausedNeighbors = new PausedNeighbors_1.PausedNeighbors();
24
+ remotePausedNeighbors = new PausedNeighbors_1.PausedNeighbors(exports.MAX_PAUSED_NEIGHBORS_DEFAULT);
24
25
  rpcLocal;
25
26
  latestMessages = new Map();
26
27
  rpcCommunicator;
@@ -37,7 +38,7 @@ class PlumTreeManager extends eventemitter3_1.default {
37
38
  this.rpcCommunicator.registerRpcNotification(NetworkRpc_1.ResumeNeighborRequest, 'resumeNeighbor', (msg, context) => this.rpcLocal.resumeNeighbor(msg, context));
38
39
  }
39
40
  async pauseNeighbor(node, msgChainId) {
40
- if (this.neighbors.has((0, dht_1.toNodeId)(node))) {
41
+ if (this.neighbors.has((0, dht_1.toNodeId)(node)) && !this.remotePausedNeighbors.isPaused((0, dht_1.toNodeId)(node), msgChainId)) {
41
42
  logger.debug(`Pausing neighbor ${(0, dht_1.toNodeId)(node)}`);
42
43
  this.remotePausedNeighbors.add((0, dht_1.toNodeId)(node), msgChainId);
43
44
  const remote = this.createRemote(node);
@@ -55,6 +56,15 @@ class PlumTreeManager extends eventemitter3_1.default {
55
56
  onNeighborRemoved(nodeId) {
56
57
  this.localPausedNeighbors.deleteAll(nodeId);
57
58
  this.remotePausedNeighbors.deleteAll(nodeId);
59
+ if (this.neighbors.size() > 0) {
60
+ this.remotePausedNeighbors.forEach((pausedNeighbors, msgChainId) => {
61
+ if (pausedNeighbors.size >= this.neighbors.size()) {
62
+ logger.debug('All neighbors are paused, resuming first neighbor');
63
+ const neighborToResume = this.neighbors.getFirst([]).getPeerDescriptor();
64
+ setImmediate(() => this.resumeNeighbor(neighborToResume, msgChainId, this.getLatestMessageTimestamp(msgChainId)));
65
+ }
66
+ });
67
+ }
58
68
  }
59
69
  getLatestMessageTimestamp(msgChainId) {
60
70
  if (!this.latestMessages.has(msgChainId) || this.latestMessages.get(msgChainId).length === 0) {
@@ -1 +1 @@
1
- {"version":3,"file":"PlumTreeManager.js","sourceRoot":"","sources":["../../../../src/logic/plumtree/PlumTreeManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PlumTreeManager.js","sourceRoot":"","sources":["../../../../src/logic/plumtree/PlumTreeManager.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@streamr/trackerless-network",
3
- "version": "103.0.0-rc.13",
3
+ "version": "103.0.0-rc.14",
4
4
  "description": "Minimal and extendable implementation of the Streamr Network node.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -36,9 +36,9 @@
36
36
  "dependencies": {
37
37
  "@protobuf-ts/runtime": "^2.8.2",
38
38
  "@protobuf-ts/runtime-rpc": "^2.8.2",
39
- "@streamr/dht": "103.0.0-rc.13",
40
- "@streamr/proto-rpc": "103.0.0-rc.13",
41
- "@streamr/utils": "103.0.0-rc.13",
39
+ "@streamr/dht": "103.0.0-rc.14",
40
+ "@streamr/proto-rpc": "103.0.0-rc.14",
41
+ "@streamr/utils": "103.0.0-rc.14",
42
42
  "eventemitter3": "^5.0.0",
43
43
  "lodash": "^4.17.21",
44
44
  "ts-essentials": "^10.0.4",
@@ -47,7 +47,7 @@
47
47
  },
48
48
  "devDependencies": {
49
49
  "@streamr/browser-test-runner": "^0.0.1",
50
- "@streamr/test-utils": "103.0.0-rc.13",
50
+ "@streamr/test-utils": "103.0.0-rc.14",
51
51
  "@types/lodash": "^4.17.16",
52
52
  "@types/yallist": "^4.0.1",
53
53
  "expect": "^29.6.2",