@streamr/dht 100.0.0-testnet-three.5 → 100.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (174) hide show
  1. package/README.md +1 -1
  2. package/dist/package.json +14 -9
  3. package/dist/src/connection/ConnectionLockHandler.d.ts +2 -2
  4. package/dist/src/connection/ConnectionLockHandler.js +13 -5
  5. package/dist/src/connection/ConnectionLockHandler.js.map +1 -1
  6. package/dist/src/connection/ConnectionManager.d.ts +6 -5
  7. package/dist/src/connection/ConnectionManager.js +16 -8
  8. package/dist/src/connection/ConnectionManager.js.map +1 -1
  9. package/dist/src/connection/ConnectorFacade.js.map +1 -1
  10. package/dist/src/connection/Handshaker.d.ts +2 -0
  11. package/dist/src/connection/Handshaker.js +12 -14
  12. package/dist/src/connection/Handshaker.js.map +1 -1
  13. package/dist/src/connection/ManagedConnection.js +1 -0
  14. package/dist/src/connection/ManagedConnection.js.map +1 -1
  15. package/dist/src/connection/connectivityChecker.d.ts +1 -1
  16. package/dist/src/connection/connectivityChecker.js +5 -5
  17. package/dist/src/connection/connectivityChecker.js.map +1 -1
  18. package/dist/src/connection/connectivityRequestHandler.d.ts +2 -2
  19. package/dist/src/connection/connectivityRequestHandler.js +6 -7
  20. package/dist/src/connection/connectivityRequestHandler.js.map +1 -1
  21. package/dist/src/connection/webrtc/WebrtcConnector.d.ts +1 -0
  22. package/dist/src/connection/webrtc/WebrtcConnector.js +13 -8
  23. package/dist/src/connection/webrtc/WebrtcConnector.js.map +1 -1
  24. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.d.ts +2 -0
  25. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js +4 -6
  26. package/dist/src/connection/webrtc/WebrtcConnectorRpcLocal.js.map +1 -1
  27. package/dist/src/connection/websocket/WebsocketConnector.js +24 -21
  28. package/dist/src/connection/websocket/WebsocketConnector.js.map +1 -1
  29. package/dist/src/connection/websocket/WebsocketServer.js +25 -35
  30. package/dist/src/connection/websocket/WebsocketServer.js.map +1 -1
  31. package/dist/src/connection/websocket/{ServerWebsocket.d.ts → WebsocketServerConnection.d.ts} +4 -5
  32. package/dist/src/connection/websocket/{ServerWebsocket.js → WebsocketServerConnection.js} +15 -48
  33. package/dist/src/connection/websocket/WebsocketServerConnection.js.map +1 -0
  34. package/dist/src/dht/DhtNode.d.ts +15 -7
  35. package/dist/src/dht/DhtNode.js +63 -21
  36. package/dist/src/dht/DhtNode.js.map +1 -1
  37. package/dist/src/dht/DhtNodeRpcLocal.d.ts +5 -1
  38. package/dist/src/dht/DhtNodeRpcLocal.js +10 -0
  39. package/dist/src/dht/DhtNodeRpcLocal.js.map +1 -1
  40. package/dist/src/dht/DhtNodeRpcRemote.d.ts +3 -0
  41. package/dist/src/dht/DhtNodeRpcRemote.js +15 -0
  42. package/dist/src/dht/DhtNodeRpcRemote.js.map +1 -1
  43. package/dist/src/dht/ExternalApiRpcLocal.d.ts +2 -2
  44. package/dist/src/dht/ExternalApiRpcLocal.js +3 -3
  45. package/dist/src/dht/ExternalApiRpcLocal.js.map +1 -1
  46. package/dist/src/dht/ExternalApiRpcRemote.d.ts +1 -1
  47. package/dist/src/dht/ExternalApiRpcRemote.js +2 -2
  48. package/dist/src/dht/ExternalApiRpcRemote.js.map +1 -1
  49. package/dist/src/dht/PeerManager.d.ts +12 -0
  50. package/dist/src/dht/PeerManager.js +30 -5
  51. package/dist/src/dht/PeerManager.js.map +1 -1
  52. package/dist/src/dht/contact/RingContactList.d.ts +31 -0
  53. package/dist/src/dht/contact/RingContactList.js +133 -0
  54. package/dist/src/dht/contact/RingContactList.js.map +1 -0
  55. package/dist/src/dht/contact/ringIdentifiers.d.ts +16 -0
  56. package/dist/src/dht/contact/ringIdentifiers.js +54 -0
  57. package/dist/src/dht/contact/ringIdentifiers.js.map +1 -0
  58. package/dist/src/dht/discovery/PeerDiscovery.d.ts +4 -0
  59. package/dist/src/dht/discovery/PeerDiscovery.js +35 -0
  60. package/dist/src/dht/discovery/PeerDiscovery.js.map +1 -1
  61. package/dist/src/dht/discovery/RingDiscoverySession.d.ts +29 -0
  62. package/dist/src/dht/discovery/RingDiscoverySession.js +123 -0
  63. package/dist/src/dht/discovery/RingDiscoverySession.js.map +1 -0
  64. package/dist/src/dht/recursive-operation/RecursiveOperationSession.js +0 -1
  65. package/dist/src/dht/recursive-operation/RecursiveOperationSession.js.map +1 -1
  66. package/dist/src/dht/routing/Router.d.ts +5 -2
  67. package/dist/src/dht/routing/Router.js +17 -3
  68. package/dist/src/dht/routing/Router.js.map +1 -1
  69. package/dist/src/dht/routing/RouterRpcLocal.d.ts +2 -3
  70. package/dist/src/dht/routing/RouterRpcLocal.js +2 -2
  71. package/dist/src/dht/routing/RouterRpcLocal.js.map +1 -1
  72. package/dist/src/dht/routing/RoutingSession.d.ts +8 -6
  73. package/dist/src/dht/routing/RoutingSession.js +42 -40
  74. package/dist/src/dht/routing/RoutingSession.js.map +1 -1
  75. package/dist/src/dht/routing/RoutingTablesCache.d.ts +24 -0
  76. package/dist/src/dht/routing/RoutingTablesCache.js +46 -0
  77. package/dist/src/dht/routing/RoutingTablesCache.js.map +1 -0
  78. package/dist/src/dht/store/StoreManager.js +1 -1
  79. package/dist/src/dht/store/StoreManager.js.map +1 -1
  80. package/dist/src/exports.d.ts +1 -0
  81. package/dist/src/exports.js.map +1 -1
  82. package/dist/src/helpers/createPeerDescriptor.d.ts +1 -1
  83. package/dist/src/helpers/createPeerDescriptor.js +2 -1
  84. package/dist/src/helpers/createPeerDescriptor.js.map +1 -1
  85. package/dist/src/helpers/version.d.ts +6 -0
  86. package/dist/src/helpers/version.js +38 -0
  87. package/dist/src/helpers/version.js.map +1 -0
  88. package/dist/src/proto/packages/dht/protos/DhtRpc.client.d.ts +16 -6
  89. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js +11 -4
  90. package/dist/src/proto/packages/dht/protos/DhtRpc.client.js.map +1 -1
  91. package/dist/src/proto/packages/dht/protos/DhtRpc.d.ts +98 -87
  92. package/dist/src/proto/packages/dht/protos/DhtRpc.js +45 -49
  93. package/dist/src/proto/packages/dht/protos/DhtRpc.js.map +1 -1
  94. package/dist/src/proto/packages/dht/protos/DhtRpc.server.d.ts +10 -4
  95. package/dist/src/transport/RoutingRpcCommunicator.js +0 -2
  96. package/dist/src/transport/RoutingRpcCommunicator.js.map +1 -1
  97. package/package.json +14 -9
  98. package/protos/DhtRpc.proto +21 -21
  99. package/src/connection/ConnectionLockHandler.ts +13 -5
  100. package/src/connection/ConnectionManager.ts +20 -12
  101. package/src/connection/ConnectorFacade.ts +0 -1
  102. package/src/connection/Handshaker.ts +14 -17
  103. package/src/connection/ManagedConnection.ts +1 -0
  104. package/src/connection/connectivityChecker.ts +6 -7
  105. package/src/connection/connectivityRequestHandler.ts +12 -12
  106. package/src/connection/webrtc/NodeWebrtcConnection.ts +1 -1
  107. package/src/connection/webrtc/WebrtcConnector.ts +14 -8
  108. package/src/connection/webrtc/WebrtcConnectorRpcLocal.ts +5 -5
  109. package/src/connection/websocket/WebsocketConnector.ts +25 -26
  110. package/src/connection/websocket/WebsocketServer.ts +27 -42
  111. package/src/connection/websocket/{ServerWebsocket.ts → WebsocketServerConnection.ts} +14 -55
  112. package/src/dht/DhtNode.ts +85 -40
  113. package/src/dht/DhtNodeRpcLocal.ts +16 -0
  114. package/src/dht/DhtNodeRpcRemote.ts +18 -0
  115. package/src/dht/ExternalApiRpcLocal.ts +5 -5
  116. package/src/dht/ExternalApiRpcRemote.ts +4 -4
  117. package/src/dht/PeerManager.ts +48 -12
  118. package/src/dht/contact/RingContactList.ts +151 -0
  119. package/src/dht/contact/ringIdentifiers.ts +62 -0
  120. package/src/dht/discovery/PeerDiscovery.ts +37 -0
  121. package/src/dht/discovery/RingDiscoverySession.ts +160 -0
  122. package/src/dht/recursive-operation/RecursiveOperationSession.ts +1 -3
  123. package/src/dht/routing/Router.ts +22 -6
  124. package/src/dht/routing/RouterRpcLocal.ts +4 -5
  125. package/src/dht/routing/RoutingSession.ts +50 -44
  126. package/src/dht/routing/RoutingTablesCache.ts +58 -0
  127. package/src/dht/store/StoreManager.ts +1 -1
  128. package/src/exports.ts +1 -0
  129. package/src/helpers/createPeerDescriptor.ts +2 -1
  130. package/src/helpers/version.ts +32 -0
  131. package/src/proto/packages/dht/protos/DhtRpc.client.ts +22 -9
  132. package/src/proto/packages/dht/protos/DhtRpc.server.ts +10 -4
  133. package/src/proto/packages/dht/protos/DhtRpc.ts +122 -100
  134. package/src/transport/RoutingRpcCommunicator.ts +1 -2
  135. package/test/benchmark/Find.test.ts +3 -4
  136. package/test/benchmark/KademliaCorrectness.test.ts +14 -8
  137. package/test/benchmark/RingCorrectness.test.ts +157 -0
  138. package/test/benchmark/hybrid-network-simulation/RingContactList.test.ts +72 -0
  139. package/test/data/generateGroundTruthData.ts +2 -2
  140. package/test/end-to-end/memory-leak.test.ts +1 -2
  141. package/test/integration/ConnectionManager.test.ts +28 -10
  142. package/test/integration/ConnectivityChecking.test.ts +3 -15
  143. package/test/integration/DhtNodeExternalAPI.test.ts +6 -6
  144. package/test/integration/Find.test.ts +4 -4
  145. package/test/integration/Layer1-scale.test.ts +0 -1
  146. package/test/integration/ReplicateData.test.ts +1 -1
  147. package/test/integration/RouteMessage.test.ts +1 -6
  148. package/test/integration/RouterRpcRemote.test.ts +1 -3
  149. package/test/integration/SimultaneousConnections.test.ts +9 -10
  150. package/test/integration/Store.test.ts +2 -2
  151. package/test/integration/StoreAndDelete.test.ts +3 -3
  152. package/test/integration/StoreOnDhtWithThreeNodes.test.ts +5 -5
  153. package/test/integration/StoreOnDhtWithTwoNodes.test.ts +3 -3
  154. package/test/integration/WebrtcConnectionManagement.test.ts +3 -9
  155. package/test/integration/WebsocketConnectionManagement.test.ts +1 -6
  156. package/test/integration/rpc-connections-over-webrpc.test.ts +1 -2
  157. package/test/unit/PeerManager.test.ts +5 -2
  158. package/test/unit/RecursiveOperationManager.test.ts +14 -8
  159. package/test/unit/RecursiveOperationSession.test.ts +1 -1
  160. package/test/unit/Router.test.ts +2 -3
  161. package/test/unit/RoutingSession.test.ts +8 -3
  162. package/test/unit/connectivityRequestHandler.test.ts +5 -9
  163. package/test/unit/createPeerDescriptor.test.ts +12 -6
  164. package/test/unit/version.test.ts +18 -0
  165. package/test/utils/mock/Router.ts +9 -0
  166. package/test/utils/utils.ts +43 -10
  167. package/tsconfig.jest.json +2 -1
  168. package/tsconfig.node.json +2 -1
  169. package/dist/src/connection/websocket/ServerWebsocket.js.map +0 -1
  170. package/dist/src/helpers/versionCompatibility.d.ts +0 -2
  171. package/dist/src/helpers/versionCompatibility.js +0 -18
  172. package/dist/src/helpers/versionCompatibility.js.map +0 -1
  173. package/src/helpers/versionCompatibility.ts +0 -13
  174. package/test/unit/versionCompatibility.test.ts +0 -16
@@ -4,6 +4,6 @@ import { DataEntry, PeerDescriptor } from '../proto/packages/dht/protos/DhtRpc';
4
4
  import { ExternalApiRpcClient } from '../proto/packages/dht/protos/DhtRpc.client';
5
5
  import { RpcRemote } from './contact/RpcRemote';
6
6
  export declare class ExternalApiRpcRemote extends RpcRemote<ExternalApiRpcClient> {
7
- externalFindData(key: DhtAddress): Promise<DataEntry[]>;
7
+ externalFetchData(key: DhtAddress): Promise<DataEntry[]>;
8
8
  storeData(key: DhtAddress, data: Any): Promise<PeerDescriptor[]>;
9
9
  }
@@ -4,7 +4,7 @@ exports.ExternalApiRpcRemote = void 0;
4
4
  const identifiers_1 = require("../identifiers");
5
5
  const RpcRemote_1 = require("./contact/RpcRemote");
6
6
  class ExternalApiRpcRemote extends RpcRemote_1.RpcRemote {
7
- async externalFindData(key) {
7
+ async externalFetchData(key) {
8
8
  const request = {
9
9
  key: (0, identifiers_1.getRawFromDhtAddress)(key)
10
10
  };
@@ -13,7 +13,7 @@ class ExternalApiRpcRemote extends RpcRemote_1.RpcRemote {
13
13
  timeout: 10000
14
14
  });
15
15
  try {
16
- const data = await this.getClient().externalFindData(request, options);
16
+ const data = await this.getClient().externalFetchData(request, options);
17
17
  return data.entries;
18
18
  }
19
19
  catch (err) {
@@ -1 +1 @@
1
- {"version":3,"file":"ExternalApiRpcRemote.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcRemote.ts"],"names":[],"mappings":";;;AAAA,gDAAiE;AAIjE,mDAA+C;AAE/C,MAAa,oBAAqB,SAAQ,qBAA+B;IAErE,KAAK,CAAC,gBAAgB,CAAC,GAAe;QAClC,MAAM,OAAO,GAA4B;YACrC,GAAG,EAAE,IAAA,kCAAoB,EAAC,GAAG,CAAC;SACjC,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,4CAA4C;YAC5C,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO,IAAI,CAAC,OAAO,CAAA;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,EAAE,CAAA;QACb,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAe,EAAE,IAAS;QACtC,MAAM,OAAO,GAA6B;YACtC,GAAG,EAAE,IAAA,kCAAoB,EAAC,GAAG,CAAC;YAC9B,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,4CAA4C;YAC5C,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3E,OAAO,QAAQ,CAAC,OAAO,CAAA;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,EAAE,CAAA;QACb,CAAC;IACL,CAAC;CACJ;AAlCD,oDAkCC"}
1
+ {"version":3,"file":"ExternalApiRpcRemote.js","sourceRoot":"","sources":["../../../src/dht/ExternalApiRpcRemote.ts"],"names":[],"mappings":";;;AAAA,gDAAiE;AAIjE,mDAA+C;AAE/C,MAAa,oBAAqB,SAAQ,qBAA+B;IAErE,KAAK,CAAC,iBAAiB,CAAC,GAAe;QACnC,MAAM,OAAO,GAA6B;YACtC,GAAG,EAAE,IAAA,kCAAoB,EAAC,GAAG,CAAC;SACjC,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,4CAA4C;YAC5C,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACvE,OAAO,IAAI,CAAC,OAAO,CAAA;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,EAAE,CAAA;QACb,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAe,EAAE,IAAS;QACtC,MAAM,OAAO,GAA6B;YACtC,GAAG,EAAE,IAAA,kCAAoB,EAAC,GAAG,CAAC;YAC9B,IAAI;SACP,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,4CAA4C;YAC5C,OAAO,EAAE,KAAK;SACjB,CAAC,CAAA;QACF,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YAC3E,OAAO,QAAQ,CAAC,OAAO,CAAA;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,EAAE,CAAA;QACb,CAAC;IACL,CAAC;CACJ;AAlCD,oDAkCC"}
@@ -3,13 +3,18 @@ import { DhtNodeRpcRemote } from './DhtNodeRpcRemote';
3
3
  import { ConnectionManager } from '../connection/ConnectionManager';
4
4
  import EventEmitter from 'eventemitter3';
5
5
  import { DhtAddress, DhtAddressRaw } from '../identifiers';
6
+ import { RingContacts } from './contact/RingContactList';
7
+ import { RingIdRaw } from './contact/ringIdentifiers';
8
+ import { LockID } from '../connection/ConnectionLockHandler';
6
9
  interface PeerManagerConfig {
7
10
  numberOfNodesPerKBucket: number;
8
11
  maxContactListSize: number;
9
12
  peerDiscoveryQueryBatchSize: number;
10
13
  localNodeId: DhtAddress;
14
+ localPeerDescriptor: PeerDescriptor;
11
15
  connectionManager: ConnectionManager;
12
16
  isLayer0: boolean;
17
+ lockId: LockID;
13
18
  createDhtNodeRpcRemote: (peerDescriptor: PeerDescriptor) => DhtNodeRpcRemote;
14
19
  }
15
20
  export interface PeerManagerEvents {
@@ -17,6 +22,8 @@ export interface PeerManagerEvents {
17
22
  contactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
18
23
  randomContactAdded: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
19
24
  randomContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
25
+ ringContactAdded: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
26
+ ringContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
20
27
  kBucketEmpty: () => void;
21
28
  }
22
29
  export declare const getDistance: (nodeIdOrDataKeyRaw1: DhtAddressRaw, nodeIdOrDataKeyRaw2: DhtAddressRaw) => number;
@@ -25,6 +32,7 @@ export declare class PeerManager extends EventEmitter<PeerManagerEvents> {
25
32
  readonly connections: Map<DhtAddress, DhtNodeRpcRemote>;
26
33
  private contacts;
27
34
  private randomPeers;
35
+ private ringContacts;
28
36
  private stopped;
29
37
  private readonly config;
30
38
  constructor(config: PeerManagerConfig);
@@ -39,6 +47,10 @@ export declare class PeerManager extends EventEmitter<PeerManagerEvents> {
39
47
  stop(): void;
40
48
  getClosestNeighborsTo(referenceId: DhtAddress, limit?: number, excludedNodeIds?: Set<DhtAddress>): DhtNodeRpcRemote[];
41
49
  getClosestContactsTo(referenceId: DhtAddress, limit?: number, excludedNodeIds?: Set<DhtAddress>): DhtNodeRpcRemote[];
50
+ getClosestRingContactsTo(ringIdRaw: RingIdRaw, limit?: number, excludedIds?: Set<DhtAddress>): {
51
+ left: DhtNodeRpcRemote[];
52
+ right: DhtNodeRpcRemote[];
53
+ };
42
54
  getContactCount(excludedNodeIds?: Set<DhtAddress>): number;
43
55
  getConnectionCount(): number;
44
56
  getNeighborCount(): number;
@@ -10,6 +10,8 @@ const RandomContactList_1 = require("./contact/RandomContactList");
10
10
  const SortedContactList_1 = require("./contact/SortedContactList");
11
11
  const eventemitter3_1 = __importDefault(require("eventemitter3"));
12
12
  const identifiers_1 = require("../identifiers");
13
+ const RingContactList_1 = require("./contact/RingContactList");
14
+ const ringIdentifiers_1 = require("./contact/ringIdentifiers");
13
15
  const logger = new utils_1.Logger(module);
14
16
  const getDistance = (nodeIdOrDataKeyRaw1, nodeIdOrDataKeyRaw2) => {
15
17
  return k_bucket_1.default.distance(nodeIdOrDataKeyRaw1, nodeIdOrDataKeyRaw2);
@@ -28,6 +30,7 @@ class PeerManager extends eventemitter3_1.default {
28
30
  // All nodes that we know about
29
31
  contacts;
30
32
  randomPeers;
33
+ ringContacts;
31
34
  stopped = false;
32
35
  config;
33
36
  constructor(config) {
@@ -38,6 +41,13 @@ class PeerManager extends eventemitter3_1.default {
38
41
  numberOfNodesPerKBucket: this.config.numberOfNodesPerKBucket,
39
42
  numberOfNodesToPing: this.config.numberOfNodesPerKBucket
40
43
  });
44
+ this.ringContacts = new RingContactList_1.RingContactList((0, ringIdentifiers_1.getRingIdRawFromPeerDescriptor)(this.config.localPeerDescriptor), true);
45
+ this.ringContacts.on('ringContactAdded', (peerDescriptor, closestPeers) => {
46
+ this.emit('ringContactAdded', peerDescriptor, closestPeers);
47
+ });
48
+ this.ringContacts.on('ringContactRemoved', (peerDescriptor, closestPeers) => {
49
+ this.emit('ringContactRemoved', peerDescriptor, closestPeers);
50
+ });
41
51
  this.bucket.on('ping', (oldContacts, newContact) => this.onKBucketPing(oldContacts, newContact));
42
52
  this.bucket.on('removed', (contact) => this.onKBucketRemoved((0, identifiers_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor())));
43
53
  this.bucket.on('added', (contact) => this.onKBucketAdded(contact));
@@ -75,7 +85,7 @@ class PeerManager extends eventemitter3_1.default {
75
85
  sortingList.addContacts(oldContacts);
76
86
  const sortedContacts = sortingList.getAllContacts();
77
87
  const removableNodeId = sortedContacts[sortedContacts.length - 1].getNodeId();
78
- this.config.connectionManager?.weakUnlockConnection(removableNodeId);
88
+ this.config.connectionManager?.weakUnlockConnection(removableNodeId, this.config.lockId);
79
89
  this.bucket.remove((0, identifiers_1.getRawFromDhtAddress)(removableNodeId));
80
90
  this.bucket.add(newContact);
81
91
  }
@@ -83,7 +93,7 @@ class PeerManager extends eventemitter3_1.default {
83
93
  if (this.stopped) {
84
94
  return;
85
95
  }
86
- this.config.connectionManager?.weakUnlockConnection(nodeId);
96
+ this.config.connectionManager?.weakUnlockConnection(nodeId, this.config.lockId);
87
97
  logger.trace(`Removed contact ${nodeId}`);
88
98
  if (this.bucket.count() === 0) {
89
99
  this.emit('kBucketEmpty');
@@ -97,7 +107,7 @@ class PeerManager extends eventemitter3_1.default {
97
107
  const peerDescriptor = contact.getPeerDescriptor();
98
108
  const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor);
99
109
  // Important to lock here, before the ping result is known
100
- this.config.connectionManager?.weakLockConnection(nodeId);
110
+ this.config.connectionManager?.weakLockConnection(nodeId, this.config.lockId);
101
111
  if (this.connections.has(contact.getNodeId())) {
102
112
  logger.trace(`Added new contact ${nodeId}`);
103
113
  }
@@ -109,13 +119,13 @@ class PeerManager extends eventemitter3_1.default {
109
119
  }
110
120
  else {
111
121
  logger.trace('ping failed ' + nodeId);
112
- this.config.connectionManager?.weakUnlockConnection(nodeId);
122
+ this.config.connectionManager?.weakUnlockConnection(nodeId, this.config.lockId);
113
123
  this.removeContact(nodeId);
114
124
  this.addClosestContactToBucket();
115
125
  }
116
126
  return;
117
127
  }).catch((_e) => {
118
- this.config.connectionManager?.weakUnlockConnection(nodeId);
128
+ this.config.connectionManager?.weakUnlockConnection(nodeId, this.config.lockId);
119
129
  this.removeContact(nodeId);
120
130
  this.addClosestContactToBucket();
121
131
  });
@@ -173,6 +183,7 @@ class PeerManager extends eventemitter3_1.default {
173
183
  return;
174
184
  }
175
185
  logger.trace(`Removing contact ${nodeId}`);
186
+ this.ringContacts.removeContact(this.contacts.getContact(nodeId)?.contact);
176
187
  this.bucket.remove((0, identifiers_1.getRawFromDhtAddress)(nodeId));
177
188
  this.contacts.removeContact(nodeId);
178
189
  this.randomPeers.removeContact(nodeId);
@@ -184,6 +195,10 @@ class PeerManager extends eventemitter3_1.default {
184
195
  this.bucket.remove(rpcRemote.id);
185
196
  });
186
197
  this.bucket.removeAllListeners();
198
+ this.ringContacts.getAllContacts().forEach((rpcRemote) => {
199
+ rpcRemote.leaveNotice();
200
+ this.ringContacts.removeContact(rpcRemote);
201
+ });
187
202
  this.contacts.stop();
188
203
  this.randomPeers.stop();
189
204
  this.connections.clear();
@@ -210,6 +225,12 @@ class PeerManager extends eventemitter3_1.default {
210
225
  // TODO should set the excludeSet and limit to SortedContactList constructor and remove these line
211
226
  return closest.getClosestContacts(limit);
212
227
  }
228
+ getClosestRingContactsTo(ringIdRaw, limit, excludedIds) {
229
+ const closest = new RingContactList_1.RingContactList(ringIdRaw, false, excludedIds);
230
+ this.contacts.getAllContacts().map((contact) => closest.addContact(contact));
231
+ this.ringContacts.getAllContacts().map((contact) => closest.addContact(contact));
232
+ return closest.getClosestContacts(limit ?? 8);
233
+ }
213
234
  getContactCount(excludedNodeIds) {
214
235
  return this.contacts.getAllContacts().filter((contact) => {
215
236
  if (!excludedNodeIds) {
@@ -243,6 +264,7 @@ class PeerManager extends eventemitter3_1.default {
243
264
  const remote = this.config.createDhtNodeRpcRemote(contact);
244
265
  const isInBucket = (this.bucket.get(contact.nodeId) !== null);
245
266
  const isInContacts = (this.contacts.getContact(nodeId) !== undefined);
267
+ const isInRingContacts = this.ringContacts.getContact(contact) !== undefined;
246
268
  if (isInBucket || isInContacts) {
247
269
  this.randomPeers.addContact(remote);
248
270
  }
@@ -255,6 +277,9 @@ class PeerManager extends eventemitter3_1.default {
255
277
  if (setActive) {
256
278
  this.contacts.setActive(nodeId);
257
279
  }
280
+ if (!isInRingContacts) {
281
+ this.ringContacts.addContact(remote);
282
+ }
258
283
  }
259
284
  });
260
285
  }
@@ -1 +1 @@
1
- {"version":3,"file":"PeerManager.js","sourceRoot":"","sources":["../../../src/dht/PeerManager.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PeerManager.js","sourceRoot":"","sources":["../../../src/dht/PeerManager.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,31 @@
1
+ import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
2
+ import { RingIdRaw } from './ringIdentifiers';
3
+ import { DhtAddress } from '../../identifiers';
4
+ import EventEmitter from 'eventemitter3';
5
+ export interface RingContacts {
6
+ left: PeerDescriptor[];
7
+ right: PeerDescriptor[];
8
+ }
9
+ export interface RingContactListEvents {
10
+ ringContactAdded: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
11
+ ringContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
12
+ }
13
+ export declare class RingContactList<C extends {
14
+ getPeerDescriptor(): PeerDescriptor;
15
+ }> extends EventEmitter<RingContactListEvents> {
16
+ private readonly numNeighborsPerSide;
17
+ private readonly referenceId;
18
+ private readonly excludedIds;
19
+ private readonly leftNeighbors;
20
+ private readonly rightNeighbors;
21
+ private readonly emitEvents;
22
+ constructor(rawReferenceId: RingIdRaw, emitEvents: boolean, excludedIds?: Set<DhtAddress>);
23
+ addContact(contact: C): void;
24
+ removeContact(contact?: C): void;
25
+ getContact(peerDescriptor: PeerDescriptor): C | undefined;
26
+ getClosestContacts(limitPerSide?: number): {
27
+ left: C[];
28
+ right: C[];
29
+ };
30
+ getAllContacts(): C[];
31
+ }
@@ -0,0 +1,133 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.RingContactList = void 0;
7
+ const ordered_map_1 = require("@js-sdsl/ordered-map");
8
+ const ringIdentifiers_1 = require("./ringIdentifiers");
9
+ const identifiers_1 = require("../../identifiers");
10
+ const eventemitter3_1 = __importDefault(require("eventemitter3"));
11
+ class RingContactList extends eventemitter3_1.default {
12
+ numNeighborsPerSide = 5;
13
+ referenceId;
14
+ excludedIds;
15
+ leftNeighbors;
16
+ rightNeighbors;
17
+ emitEvents;
18
+ constructor(rawReferenceId, emitEvents, excludedIds) {
19
+ super();
20
+ this.referenceId = (0, ringIdentifiers_1.getRingIdFromRaw)(rawReferenceId);
21
+ this.emitEvents = emitEvents;
22
+ this.excludedIds = excludedIds ?? new Set();
23
+ this.leftNeighbors = new ordered_map_1.OrderedMap();
24
+ this.rightNeighbors = new ordered_map_1.OrderedMap();
25
+ }
26
+ addContact(contact) {
27
+ const id = (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(contact.getPeerDescriptor());
28
+ if (id === this.referenceId || this.excludedIds.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(contact.getPeerDescriptor()))) {
29
+ return;
30
+ }
31
+ let elementAdded = false;
32
+ let elementRemoved = false;
33
+ const leftDistance = (0, ringIdentifiers_1.getLeftDistance)(this.referenceId, id);
34
+ const lastLeftNeighbor = this.leftNeighbors.back();
35
+ if (lastLeftNeighbor === undefined || leftDistance < lastLeftNeighbor[0]) {
36
+ this.leftNeighbors.setElement(leftDistance, contact);
37
+ elementAdded = true;
38
+ if (this.leftNeighbors.size() > this.numNeighborsPerSide) {
39
+ this.leftNeighbors.eraseElementByIterator(this.leftNeighbors.rBegin());
40
+ elementRemoved = true;
41
+ }
42
+ }
43
+ const rightDistance = (0, ringIdentifiers_1.getRightDistance)(this.referenceId, id);
44
+ const lastRightNeighbor = this.rightNeighbors.back();
45
+ if (lastRightNeighbor === undefined || rightDistance < lastRightNeighbor[0]) {
46
+ this.rightNeighbors.setElement(rightDistance, contact);
47
+ elementAdded = true;
48
+ if (this.rightNeighbors.size() > this.numNeighborsPerSide) {
49
+ this.rightNeighbors.eraseElementByIterator(this.rightNeighbors.rBegin());
50
+ elementRemoved = true;
51
+ }
52
+ }
53
+ if (this.emitEvents && (elementAdded || elementRemoved)) {
54
+ const closestContacts = this.getClosestContacts();
55
+ const closestDescriptors = {
56
+ left: closestContacts.left.map((c) => c.getPeerDescriptor()),
57
+ right: closestContacts.right.map((c) => c.getPeerDescriptor())
58
+ };
59
+ if (elementAdded) {
60
+ this.emit('ringContactAdded', contact.getPeerDescriptor(), closestDescriptors);
61
+ }
62
+ if (elementRemoved) {
63
+ this.emit('ringContactRemoved', contact.getPeerDescriptor(), closestDescriptors);
64
+ }
65
+ }
66
+ }
67
+ removeContact(contact) {
68
+ if (contact === undefined) {
69
+ return;
70
+ }
71
+ const id = (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(contact.getPeerDescriptor());
72
+ const leftDistance = (0, ringIdentifiers_1.getLeftDistance)(this.referenceId, id);
73
+ const rightDistance = (0, ringIdentifiers_1.getRightDistance)(this.referenceId, id);
74
+ let elementRemoved = false;
75
+ if (this.leftNeighbors.eraseElementByKey(leftDistance)) {
76
+ elementRemoved = true;
77
+ }
78
+ if (this.rightNeighbors.eraseElementByKey(rightDistance)) {
79
+ elementRemoved = true;
80
+ }
81
+ if (this.emitEvents && elementRemoved) {
82
+ const closestContacts = this.getClosestContacts();
83
+ const closestDescriptors = { left: closestContacts.left.map((c) => c.getPeerDescriptor()),
84
+ right: closestContacts.right.map((c) => c.getPeerDescriptor()) };
85
+ this.emit('ringContactRemoved', contact.getPeerDescriptor(), closestDescriptors);
86
+ }
87
+ }
88
+ getContact(peerDescriptor) {
89
+ const id = (0, ringIdentifiers_1.getRingIdFromPeerDescriptor)(peerDescriptor);
90
+ const leftDistance = (0, ringIdentifiers_1.getLeftDistance)(this.referenceId, id);
91
+ const rightDistance = (0, ringIdentifiers_1.getRightDistance)(this.referenceId, id);
92
+ if (this.leftNeighbors.getElementByKey(leftDistance)) {
93
+ return this.leftNeighbors.getElementByKey(leftDistance);
94
+ }
95
+ if (this.rightNeighbors.getElementByKey(rightDistance)) {
96
+ return this.rightNeighbors.getElementByKey(rightDistance);
97
+ }
98
+ return undefined;
99
+ }
100
+ getClosestContacts(limitPerSide) {
101
+ const leftContacts = [];
102
+ const rightContacts = [];
103
+ let leftCount = 0;
104
+ for (const item of this.leftNeighbors) {
105
+ if (limitPerSide != undefined && leftCount >= limitPerSide) {
106
+ break;
107
+ }
108
+ leftContacts.push(item[1]);
109
+ leftCount++;
110
+ }
111
+ let rightCount = 0;
112
+ for (const item of this.rightNeighbors) {
113
+ if (limitPerSide != undefined && rightCount >= limitPerSide) {
114
+ break;
115
+ }
116
+ rightContacts.push(item[1]);
117
+ rightCount++;
118
+ }
119
+ return { left: leftContacts, right: rightContacts };
120
+ }
121
+ getAllContacts() {
122
+ const ret = [];
123
+ for (const item of this.leftNeighbors) {
124
+ ret.push(item[1]);
125
+ }
126
+ for (const item of this.rightNeighbors) {
127
+ ret.push(item[1]);
128
+ }
129
+ return ret;
130
+ }
131
+ }
132
+ exports.RingContactList = RingContactList;
133
+ //# sourceMappingURL=RingContactList.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"RingContactList.js","sourceRoot":"","sources":["../../../../src/dht/contact/RingContactList.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,16 @@
1
+ import { PeerDescriptor } from '../../proto/packages/dht/protos/DhtRpc';
2
+ export type RingIdRaw = Uint8Array & {
3
+ __ringIdRaw: never;
4
+ };
5
+ export type RingId = number & {
6
+ __ringId: never;
7
+ };
8
+ export type RingDistance = number & {
9
+ __ringDistance: never;
10
+ };
11
+ export declare const RING_SIZE: number;
12
+ export declare const getRingIdFromRaw: (raw: RingIdRaw) => RingId;
13
+ export declare const getRingIdRawFromPeerDescriptor: (peerDescriptor: PeerDescriptor) => RingIdRaw;
14
+ export declare const getRingIdFromPeerDescriptor: (peerDescriptor: PeerDescriptor) => RingId;
15
+ export declare const getLeftDistance: (referenceId: RingId, id: RingId) => RingDistance;
16
+ export declare const getRightDistance: (referenceId: RingId, id: RingId) => RingDistance;
@@ -0,0 +1,54 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getRightDistance = exports.getLeftDistance = exports.getRingIdFromPeerDescriptor = exports.getRingIdRawFromPeerDescriptor = exports.getRingIdFromRaw = exports.RING_SIZE = void 0;
4
+ exports.RING_SIZE = 2 ** 120 - 1; // 2^120 - 1
5
+ const binaryToBigInt = (binary) => {
6
+ return binary.reduce((acc, val) => (acc << BigInt(8)) | BigInt(val), BigInt(0));
7
+ };
8
+ const getRingIdFromRaw = (raw) => Number(binaryToBigInt(raw));
9
+ exports.getRingIdFromRaw = getRingIdFromRaw;
10
+ const getRingIdRawFromPeerDescriptor = (peerDescriptor) => {
11
+ const regionAsBuffer = Buffer.alloc(4);
12
+ regionAsBuffer.writeUInt32BE(peerDescriptor.region ?? 0, 0);
13
+ const ipAsbuffer = Buffer.alloc(4);
14
+ ipAsbuffer.writeUInt32BE(peerDescriptor.ipAddress ?? 0, 0);
15
+ const uniquePartAsBuffer = Buffer.from(peerDescriptor.nodeId.subarray(peerDescriptor.nodeId.length - 7, peerDescriptor.nodeId.length));
16
+ const arr = [
17
+ regionAsBuffer,
18
+ ipAsbuffer,
19
+ uniquePartAsBuffer
20
+ ];
21
+ const buffer = Buffer.concat(arr);
22
+ return new Uint8Array(buffer);
23
+ };
24
+ exports.getRingIdRawFromPeerDescriptor = getRingIdRawFromPeerDescriptor;
25
+ const getRingIdFromPeerDescriptor = (peerDescriptor) => {
26
+ const raw = (0, exports.getRingIdRawFromPeerDescriptor)(peerDescriptor);
27
+ return Number(binaryToBigInt(raw));
28
+ };
29
+ exports.getRingIdFromPeerDescriptor = getRingIdFromPeerDescriptor;
30
+ const getLeftDistance = (referenceId, id) => {
31
+ const diff = Math.abs(referenceId - id);
32
+ if (referenceId > id) {
33
+ // if id is smaller than referenceId, then the distance is the difference
34
+ return diff;
35
+ }
36
+ else {
37
+ // if id is bigger than referenceId, then the distance is the ringSize - difference
38
+ return exports.RING_SIZE - diff;
39
+ }
40
+ };
41
+ exports.getLeftDistance = getLeftDistance;
42
+ const getRightDistance = (referenceId, id) => {
43
+ const diff = Math.abs(referenceId - id);
44
+ if (referenceId > id) {
45
+ // if id is smaller than referenceId, then the distance is the ringSize - difference
46
+ return exports.RING_SIZE - diff;
47
+ }
48
+ else {
49
+ // if id is bigger than referenceId, then the distance is the difference
50
+ return diff;
51
+ }
52
+ };
53
+ exports.getRightDistance = getRightDistance;
54
+ //# sourceMappingURL=ringIdentifiers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ringIdentifiers.js","sourceRoot":"","sources":["../../../../src/dht/contact/ringIdentifiers.ts"],"names":[],"mappings":";;;AAUa,QAAA,SAAS,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,CAAA,CAAG,YAAY;AAEpD,MAAM,cAAc,GAAG,CAAC,MAAkB,EAAU,EAAE;IAClD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;AACnF,CAAC,CAAA;AAEM,MAAM,gBAAgB,GAAG,CAAC,GAAc,EAAU,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAW,CAAA;AAApF,QAAA,gBAAgB,oBAAoE;AAE1F,MAAM,8BAA8B,GAAG,CAAC,cAA8B,EAAa,EAAE;IACxF,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACtC,cAAc,CAAC,aAAa,CAAC,cAAc,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;IAC3D,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IAClC,UAAU,CAAC,aAAa,CAAC,cAAc,CAAC,SAAS,IAAI,CAAC,EAAE,CAAC,CAAC,CAAA;IAE1D,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAEtI,MAAM,GAAG,GAAG;QACR,cAAc;QACd,UAAU;QACV,kBAAkB;KACrB,CAAA;IAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACjC,OAAO,IAAI,UAAU,CAAC,MAAM,CAAc,CAAA;AAC9C,CAAC,CAAA;AAhBY,QAAA,8BAA8B,kCAgB1C;AAEM,MAAM,2BAA2B,GAAG,CAAC,cAA8B,EAAU,EAAE;IAClF,MAAM,GAAG,GAAG,IAAA,sCAA8B,EAAC,cAAc,CAAC,CAAA;IAC1D,OAAO,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,CAAW,CAAA;AAChD,CAAC,CAAA;AAHY,QAAA,2BAA2B,+BAGvC;AAEM,MAAM,eAAe,GAAG,CAAC,WAAmB,EAAE,EAAU,EAAgB,EAAE;IAC7E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC,CAAA;IACvC,IAAI,WAAW,GAAG,EAAE,EAAE,CAAC;QACnB,yEAAyE;QACzE,OAAO,IAAoB,CAAA;IAC/B,CAAC;SAAM,CAAC;QACJ,mFAAmF;QACnF,OAAO,iBAAS,GAAG,IAAoB,CAAA;IAC3C,CAAC;AACL,CAAC,CAAA;AATY,QAAA,eAAe,mBAS3B;AAEM,MAAM,gBAAgB,GAAG,CAAC,WAAmB,EAAE,EAAU,EAAgB,EAAE;IAC9E,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,GAAG,EAAE,CAAC,CAAA;IACvC,IAAI,WAAW,GAAG,EAAE,EAAE,CAAC;QACnB,oFAAoF;QACpF,OAAO,iBAAS,GAAG,IAAoB,CAAA;IAC3C,CAAC;SAAM,CAAC;QACJ,wEAAwE;QACxE,OAAO,IAAoB,CAAA;IAC/B,CAAC;AACL,CAAC,CAAA;AATY,QAAA,gBAAgB,oBAS5B"}
@@ -16,6 +16,7 @@ interface PeerDiscoveryConfig {
16
16
  export declare const createDistantDhtAddress: (address: DhtAddress) => DhtAddress;
17
17
  export declare class PeerDiscovery {
18
18
  private ongoingDiscoverySessions;
19
+ private ongoingRingDiscoverySessions;
19
20
  private rejoinOngoing;
20
21
  private joinCalled;
21
22
  private readonly abortController;
@@ -29,8 +30,11 @@ export declare class PeerDiscovery {
29
30
  } | {
30
31
  enabled: false;
31
32
  }, retry?: boolean): Promise<void>;
33
+ joinRing(): Promise<void>;
32
34
  private createSession;
35
+ private createRingSession;
33
36
  private runSessions;
37
+ private runRingSessions;
34
38
  rejoinDht(entryPoint: PeerDescriptor): Promise<void>;
35
39
  private ensureRecoveryIntervalIsRunning;
36
40
  private fetchClosestPeersFromBucket;
@@ -4,6 +4,8 @@ exports.PeerDiscovery = exports.createDistantDhtAddress = void 0;
4
4
  const DiscoverySession_1 = require("./DiscoverySession");
5
5
  const utils_1 = require("@streamr/utils");
6
6
  const identifiers_1 = require("../../identifiers");
7
+ const RingDiscoverySession_1 = require("./RingDiscoverySession");
8
+ const ringIdentifiers_1 = require("../contact/ringIdentifiers");
7
9
  const createDistantDhtAddress = (address) => {
8
10
  const raw = (0, identifiers_1.getRawFromDhtAddress)(address);
9
11
  const flipped = raw.map((val) => ~val);
@@ -13,6 +15,7 @@ exports.createDistantDhtAddress = createDistantDhtAddress;
13
15
  const logger = new utils_1.Logger(module);
14
16
  class PeerDiscovery {
15
17
  ongoingDiscoverySessions = new Map();
18
+ ongoingRingDiscoverySessions = new Map();
16
19
  rejoinOngoing = false;
17
20
  joinCalled = false;
18
21
  abortController;
@@ -50,6 +53,11 @@ class PeerDiscovery {
50
53
  await this.runSessions(sessions, entryPointDescriptor, retry);
51
54
  this.config.connectionManager?.unlockConnection(entryPointDescriptor, `${this.config.serviceId}::joinDht`);
52
55
  }
56
+ async joinRing() {
57
+ const contactedPeers = new Set();
58
+ const sessions = [this.createRingSession((0, ringIdentifiers_1.getRingIdRawFromPeerDescriptor)(this.config.localPeerDescriptor), contactedPeers)];
59
+ await this.runRingSessions(sessions);
60
+ }
53
61
  createSession(targetId, contactedPeers) {
54
62
  const sessionOptions = {
55
63
  targetId,
@@ -60,6 +68,16 @@ class PeerDiscovery {
60
68
  };
61
69
  return new DiscoverySession_1.DiscoverySession(sessionOptions);
62
70
  }
71
+ createRingSession(targetId, contactedPeers) {
72
+ const sessionOptions = {
73
+ targetId,
74
+ parallelism: this.config.parallelism,
75
+ noProgressLimit: this.config.joinNoProgressLimit,
76
+ peerManager: this.config.peerManager,
77
+ contactedPeers
78
+ };
79
+ return new RingDiscoverySession_1.RingDiscoverySession(sessionOptions);
80
+ }
63
81
  async runSessions(sessions, entryPointDescriptor, retry) {
64
82
  try {
65
83
  for (const session of sessions) {
@@ -86,6 +104,20 @@ class PeerDiscovery {
86
104
  sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.id));
87
105
  }
88
106
  }
107
+ async runRingSessions(sessions) {
108
+ try {
109
+ for (const session of sessions) {
110
+ this.ongoingRingDiscoverySessions.set(session.id, session);
111
+ await session.findClosestNodes(this.config.joinTimeout);
112
+ }
113
+ }
114
+ catch (_e) {
115
+ logger.debug(`Ring join on ${this.config.serviceId} timed out`);
116
+ }
117
+ finally {
118
+ sessions.forEach((session) => this.ongoingDiscoverySessions.delete(session.id));
119
+ }
120
+ }
89
121
  async rejoinDht(entryPoint) {
90
122
  if (this.isStopped() || this.rejoinOngoing) {
91
123
  return;
@@ -140,6 +172,9 @@ class PeerDiscovery {
140
172
  this.ongoingDiscoverySessions.forEach((session) => {
141
173
  session.stop();
142
174
  });
175
+ this.ongoingRingDiscoverySessions.forEach((session) => {
176
+ session.stop();
177
+ });
143
178
  }
144
179
  }
145
180
  exports.PeerDiscovery = PeerDiscovery;
@@ -1 +1 @@
1
- {"version":3,"file":"PeerDiscovery.js","sourceRoot":"","sources":["../../../../src/dht/discovery/PeerDiscovery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PeerDiscovery.js","sourceRoot":"","sources":["../../../../src/dht/discovery/PeerDiscovery.ts"],"names":[],"mappings":"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"}