@streamr/trackerless-network 100.0.0-pretestnet.6 → 100.0.0-rc.1

package/dist/src/logic/EntryPointDiscovery.d.ts

@@ -1,20 +1,21 @@
-import { DataEntry, PeerDescriptor } from '@streamr/dht';
+import { DataEntry, DhtAddress, PeerDescriptor } from '@streamr/dht';
 import { StreamPartID } from '@streamr/protocol';
 import { Any } from '../proto/google/protobuf/any';
 import { Layer1Node } from './Layer1Node';
-export declare const streamPartIdToDataKey: (streamPartId: StreamPartID) => Uint8Array;
+export declare const streamPartIdToDataKey: (streamPartId: StreamPartID) => DhtAddress;
 interface FindEntryPointsResult {
     entryPointsFromDht: boolean;
     discoveredEntryPoints: PeerDescriptor[];
 }
+export declare const ENTRYPOINT_STORE_LIMIT = 8;
 export declare const NETWORK_SPLIT_AVOIDANCE_LIMIT = 4;
 interface EntryPointDiscoveryConfig {
     streamPartId: StreamPartID;
     localPeerDescriptor: PeerDescriptor;
     layer1Node: Layer1Node;
-    getEntryPointData: (key: Uint8Array) => Promise<DataEntry[]>;
-    storeEntryPointData: (key: Uint8Array, data: Any) => Promise<PeerDescriptor[]>;
-    deleteEntryPointData: (key: Uint8Array) => Promise<void>;
+    fetchEntryPointData: (key: DhtAddress) => Promise<DataEntry[]>;
+    storeEntryPointData: (key: DhtAddress, data: Any) => Promise<PeerDescriptor[]>;
+    deleteEntryPointData: (key: DhtAddress) => Promise<void>;
     storeInterval?: number;
 }
 export declare class EntryPointDiscovery {
@@ -22,6 +23,7 @@ export declare class EntryPointDiscovery {
     private readonly config;
     private readonly storeInterval;
     private readonly networkSplitAvoidedNodes;
+    private isLocalNodeStoredAsEntryPoint;
     constructor(config: EntryPointDiscoveryConfig);
     discoverEntryPointsFromDht(knownEntryPointCount: number): Promise<FindEntryPointsResult>;
     private discoverEntryPoints;
@@ -30,6 +32,7 @@ export declare class EntryPointDiscovery {
     private storeSelfAsEntryPoint;
     private keepSelfAsEntryPoint;
     private avoidNetworkSplit;
+    isLocalNodeEntryPoint(): boolean;
     destroy(): Promise<void>;
 }
 export {};

package/dist/src/logic/EntryPointDiscovery.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntryPointDiscovery = exports.NETWORK_SPLIT_AVOIDANCE_LIMIT = exports.streamPartIdToDataKey = void 0;
+exports.EntryPointDiscovery = exports.NETWORK_SPLIT_AVOIDANCE_LIMIT = exports.ENTRYPOINT_STORE_LIMIT = exports.streamPartIdToDataKey = void 0;
 const dht_1 = require("@streamr/dht");
 const utils_1 = require("@streamr/utils");
 const crypto_1 = require("crypto");
-const identifiers_1 = require("../identifiers");
 const any_1 = require("../proto/google/protobuf/any");
 const streamPartIdToDataKey = (streamPartId) => {
-    return new Uint8Array((0, crypto_1.createHash)('md5').update(streamPartId).digest());
+    return (0, dht_1.getDhtAddressFromRaw)(new Uint8Array(((0, crypto_1.createHash)('sha1').update(streamPartId).digest())));
 };
 exports.streamPartIdToDataKey = streamPartIdToDataKey;
 const parseEntryPointData = (dataEntries) => {
@@ -35,11 +34,15 @@ const exponentialRunOff = async (task, description, abortSignal, baseDelay = 500
     }
 };
 const logger = new utils_1.Logger(module);
-const ENTRYPOINT_STORE_LIMIT = 20;
+exports.ENTRYPOINT_STORE_LIMIT = 8;
 exports.NETWORK_SPLIT_AVOIDANCE_LIMIT = 4;
 class EntryPointDiscovery {
+    abortController;
+    config;
+    storeInterval;
+    networkSplitAvoidedNodes = new Set();
+    isLocalNodeStoredAsEntryPoint = false;
     constructor(config) {
-        this.networkSplitAvoidedNodes = new Set();
         this.config = config;
         this.abortController = new AbortController();
         this.storeInterval = this.config.storeInterval ?? 60000;
@@ -63,7 +66,7 @@ class EntryPointDiscovery {
     async discoverEntryPoints() {
         const dataKey = (0, exports.streamPartIdToDataKey)(this.config.streamPartId);
         const discoveredEntryPoints = await this.queryEntrypoints(dataKey);
-        const filtered = discoveredEntryPoints.filter((node) => !this.networkSplitAvoidedNodes.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(node)));
+        const filtered = discoveredEntryPoints.filter((node) => !this.networkSplitAvoidedNodes.has((0, dht_1.getNodeIdFromPeerDescriptor)(node)));
         // If all discovered entry points have previously been detected as offline, try again
         if (filtered.length > 0) {
             return filtered;
@@ -73,9 +76,9 @@ class EntryPointDiscovery {
         }
     }
     async queryEntrypoints(key) {
-        logger.trace(`Finding data from dht node ${(0, identifiers_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor)}`);
+        logger.trace(`Finding data from dht node ${(0, dht_1.getNodeIdFromPeerDescriptor)(this.config.localPeerDescriptor)}`);
         try {
-            const result = await this.config.getEntryPointData(key);
+            const result = await this.config.fetchEntryPointData(key);
             return parseEntryPointData(result);
         }
         catch (err) {
@@ -86,12 +89,14 @@ class EntryPointDiscovery {
         if (this.abortController.signal.aborted) {
             return;
         }
-        const possibleNetworkSplitDetected = this.config.layer1Node.getBucketSize() < exports.NETWORK_SPLIT_AVOIDANCE_LIMIT;
-        if ((currentEntrypointCount < ENTRYPOINT_STORE_LIMIT) || possibleNetworkSplitDetected) {
+        const possibleNetworkSplitDetected = this.config.layer1Node.getNeighborCount() < exports.NETWORK_SPLIT_AVOIDANCE_LIMIT;
+        if ((currentEntrypointCount < exports.ENTRYPOINT_STORE_LIMIT) || possibleNetworkSplitDetected) {
+            this.isLocalNodeStoredAsEntryPoint = true;
             await this.storeSelfAsEntryPoint();
             await this.keepSelfAsEntryPoint();
         }
         if (possibleNetworkSplitDetected) {
+            // TODO should we catch possible promise rejection?
             setImmediate(() => this.avoidNetworkSplit());
         }
     }
@@ -110,7 +115,7 @@ class EntryPointDiscovery {
             logger.trace(`Attempting to keep self as entrypoint for ${this.config.streamPartId}`);
             try {
                 const discovered = await this.discoverEntryPoints();
-                if (discovered.length < ENTRYPOINT_STORE_LIMIT
+                if (discovered.length < exports.ENTRYPOINT_STORE_LIMIT
                     || discovered.some((peerDescriptor) => (0, dht_1.areEqualPeerDescriptors)(peerDescriptor, this.config.localPeerDescriptor))) {
                     await this.storeSelfAsEntryPoint();
                 }
@@ -124,11 +129,12 @@ class EntryPointDiscovery {
         await exponentialRunOff(async () => {
             const rediscoveredEntrypoints = await this.discoverEntryPoints();
             await this.config.layer1Node.joinDht(rediscoveredEntrypoints, false, false);
-            if (this.config.layer1Node.getBucketSize() < exports.NETWORK_SPLIT_AVOIDANCE_LIMIT) {
-                // Filter out nodes that are not in the k-bucket, assumed to be offline
+            if (this.config.layer1Node.getNeighborCount() < exports.NETWORK_SPLIT_AVOIDANCE_LIMIT) {
+                // Filter out nodes that are not neighbors as those nodes are assumed to be offline
                 const nodesToAvoid = rediscoveredEntrypoints
-                    .filter((peer) => !this.config.layer1Node.getKBucketPeers().includes(peer))
-                    .map((peer) => (0, identifiers_1.getNodeIdFromPeerDescriptor)(peer));
+                    .filter((peer) => !this.config.layer1Node.getNeighbors()
+                    .some((neighbor) => (0, dht_1.areEqualPeerDescriptors)(neighbor, peer)))
+                    .map((peer) => (0, dht_1.getNodeIdFromPeerDescriptor)(peer));
                 nodesToAvoid.forEach((node) => this.networkSplitAvoidedNodes.add(node));
                 throw new Error(`Network split is still possible`);
             }
@@ -136,6 +142,9 @@ class EntryPointDiscovery {
         this.networkSplitAvoidedNodes.clear();
         logger.trace(`Network split avoided`);
     }
+    isLocalNodeEntryPoint() {
+        return this.isLocalNodeStoredAsEntryPoint;
+    }
     async destroy() {
         this.abortController.abort();
         await this.config.deleteEntryPointData((0, exports.streamPartIdToDataKey)(this.config.streamPartId));

package/dist/src/logic/EntryPointDiscovery.js.map

@@ -1 +1 @@
-{"version":3,"file":"EntryPointDiscovery.js","sourceRoot":"","sources":["../../../src/logic/EntryPointDiscovery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"EntryPointDiscovery.js","sourceRoot":"","sources":["../../../src/logic/EntryPointDiscovery.ts"],"names":[],"mappings":"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"}

package/dist/src/logic/Layer0Node.d.ts

@@ -1,14 +1,16 @@
-import { DataEntry, ITransport, PeerDescriptor } from '@streamr/dht';
+import { DataEntry, DhtAddress, ITransport, PeerDescriptor } from '@streamr/dht';
 import { Any } from '../proto/google/protobuf/any';
 export interface Layer0Node extends ITransport {
     joinDht(entryPointDescriptors: PeerDescriptor[]): Promise<void>;
     hasJoined(): boolean;
     getLocalPeerDescriptor(): PeerDescriptor;
-    getDataFromDht(key: Uint8Array): Promise<DataEntry[]>;
-    storeDataToDht(key: Uint8Array, data: Any): Promise<PeerDescriptor[]>;
-    deleteDataFromDht(key: Uint8Array): Promise<void>;
+    fetchDataFromDht(key: DhtAddress): Promise<DataEntry[]>;
+    storeDataToDht(key: DhtAddress, data: Any): Promise<PeerDescriptor[]>;
+    deleteDataFromDht(key: DhtAddress, waitForCompletion: boolean): Promise<void>;
     waitForNetworkConnectivity(): Promise<void>;
     getTransport(): ITransport;
+    getNeighbors(): PeerDescriptor[];
+    getConnections(): PeerDescriptor[];
     start(): Promise<void>;
     stop(): Promise<void>;
 }

package/dist/src/logic/Layer1Node.d.ts

@@ -1,19 +1,25 @@
-import { PeerDescriptor } from '@streamr/dht';
+import { DhtAddress, PeerDescriptor, RingContacts } from '@streamr/dht';
 export interface Layer1NodeEvents {
-    newContact: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
+    contactAdded: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
     contactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: PeerDescriptor[]) => void;
-    newRandomContact: (peerDescriptor: PeerDescriptor, randomPeers: PeerDescriptor[]) => void;
+    randomContactAdded: (peerDescriptor: PeerDescriptor, randomPeers: PeerDescriptor[]) => void;
     randomContactRemoved: (peerDescriptor: PeerDescriptor, randomPeers: PeerDescriptor[]) => void;
+    ringContactAdded: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
+    ringContactRemoved: (peerDescriptor: PeerDescriptor, closestPeers: RingContacts) => void;
 }
 export interface Layer1Node {
     on<T extends keyof Layer1NodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: PeerDescriptor[]) => void): void;
     once<T extends keyof Layer1NodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: PeerDescriptor[]) => void): void;
     off<T extends keyof Layer1NodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: PeerDescriptor[]) => void): void;
-    removeContact: (peerDescriptor: PeerDescriptor) => void;
+    on<T extends keyof Layer1NodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: RingContacts) => void): void;
+    once<T extends keyof Layer1NodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: RingContacts) => void): void;
+    off<T extends keyof Layer1NodeEvents>(eventName: T, listener: (peerDescriptor: PeerDescriptor, peers: RingContacts) => void): void;
+    removeContact: (nodeId: DhtAddress) => void;
     getClosestContacts: (maxCount?: number) => PeerDescriptor[];
-    getKBucketPeers: () => PeerDescriptor[];
-    getBucketSize: () => number;
+    getNeighbors: () => PeerDescriptor[];
+    getNeighborCount(): number;
     joinDht: (entryPoints: PeerDescriptor[], doRandomJoin?: boolean, retry?: boolean) => Promise<void>;
+    joinRing: () => Promise<void>;
     start: () => Promise<void>;
     stop: () => Promise<void>;
 }

package/dist/src/logic/NodeList.d.ts

@@ -1,28 +1,26 @@
-import { PeerDescriptor } from '@streamr/dht';
+import { DhtAddress } from '@streamr/dht';
 import { DeliveryRpcRemote } from './DeliveryRpcRemote';
 import { EventEmitter } from 'eventemitter3';
-import { NodeID } from '../identifiers';
 export interface Events {
-    nodeAdded: (id: NodeID, remote: DeliveryRpcRemote) => any;
+    nodeAdded: (id: DhtAddress, remote: DeliveryRpcRemote) => void;
+    nodeRemoved: (id: DhtAddress, remote: DeliveryRpcRemote) => void;
 }
 export declare class NodeList extends EventEmitter<Events> {
     private readonly nodes;
     private readonly limit;
     private ownId;
-    constructor(ownId: NodeID, limit: number);
+    constructor(ownId: DhtAddress, limit: number);
     add(remote: DeliveryRpcRemote): void;
-    remove(peerDescriptor: PeerDescriptor): void;
-    removeById(nodeId: NodeID): void;
-    hasNode(peerDescriptor: PeerDescriptor): boolean;
-    hasNodeById(nodeId: NodeID): boolean;
+    remove(nodeId: DhtAddress): void;
+    has(nodeId: DhtAddress): boolean;
     replaceAll(neighbors: DeliveryRpcRemote[]): void;
-    getIds(): NodeID[];
-    get(id: NodeID): DeliveryRpcRemote | undefined;
-    size(exclude?: NodeID[]): number;
-    getRandom(exclude: NodeID[]): DeliveryRpcRemote | undefined;
-    getClosest(exclude: NodeID[]): DeliveryRpcRemote | undefined;
-    getClosestAndFurthest(exclude: NodeID[]): DeliveryRpcRemote[];
-    getFurthest(exclude: NodeID[]): DeliveryRpcRemote | undefined;
+    getIds(): DhtAddress[];
+    get(id: DhtAddress): DeliveryRpcRemote | undefined;
+    size(exclude?: DhtAddress[]): number;
+    getRandom(exclude: DhtAddress[]): DeliveryRpcRemote | undefined;
+    getFirst(exclude: DhtAddress[]): DeliveryRpcRemote | undefined;
+    getFirstAndLast(exclude: DhtAddress[]): DeliveryRpcRemote[];
+    getLast(exclude: DhtAddress[]): DeliveryRpcRemote | undefined;
     getAll(): DeliveryRpcRemote[];
     stop(): void;
 }

package/dist/src/logic/NodeList.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeList = void 0;
+const dht_1 = require("@streamr/dht");
 const lodash_1 = require("lodash");
 const eventemitter3_1 = require("eventemitter3");
-const identifiers_1 = require("../identifiers");
 const getValuesOfIncludedKeys = (nodes, exclude) => {
     return Array.from(nodes.entries())
         .filter(([id, _node]) => !exclude.includes(id))
         .map(([_id, node]) => node);
 };
+// The items in the list are in the insertion order
 class NodeList extends eventemitter3_1.EventEmitter {
+    nodes;
+    limit;
+    ownId;
     constructor(ownId, limit) {
         super();
         this.nodes = new Map();
@@ -17,7 +21,7 @@ class NodeList extends eventemitter3_1.EventEmitter {
         this.ownId = ownId;
     }
     add(remote) {
-        const nodeId = (0, identifiers_1.getNodeIdFromPeerDescriptor)(remote.getPeerDescriptor());
+        const nodeId = (0, dht_1.getNodeIdFromPeerDescriptor)(remote.getPeerDescriptor());
         if ((this.ownId !== nodeId) && (this.nodes.size < this.limit)) {
             const isExistingNode = this.nodes.has(nodeId);
             this.nodes.set(nodeId, remote);
@@ -26,18 +30,17 @@ class NodeList extends eventemitter3_1.EventEmitter {
             }
         }
     }
-    remove(peerDescriptor) {
-        this.nodes.delete((0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor));
-    }
-    removeById(nodeId) {
-        this.nodes.delete(nodeId);
-    }
-    hasNode(peerDescriptor) {
-        return this.nodes.has((0, identifiers_1.getNodeIdFromPeerDescriptor)(peerDescriptor));
+    remove(nodeId) {
+        if (this.nodes.has(nodeId)) {
+            const remote = this.nodes.get(nodeId);
+            this.nodes.delete(nodeId);
+            this.emit('nodeRemoved', nodeId, remote);
+        }
     }
-    hasNodeById(nodeId) {
+    has(nodeId) {
         return this.nodes.has(nodeId);
     }
+    // Replace nodes does not emit nodeRemoved events, use with caution
     replaceAll(neighbors) {
         this.nodes.clear();
         const limited = neighbors.splice(0, this.limit);
@@ -57,18 +60,18 @@ class NodeList extends eventemitter3_1.EventEmitter {
     getRandom(exclude) {
         return (0, lodash_1.sample)(getValuesOfIncludedKeys(this.nodes, exclude));
     }
-    getClosest(exclude) {
+    getFirst(exclude) {
         const included = getValuesOfIncludedKeys(this.nodes, exclude);
         return included[0];
     }
-    getClosestAndFurthest(exclude) {
+    getFirstAndLast(exclude) {
         const included = getValuesOfIncludedKeys(this.nodes, exclude);
         if (included.length === 0) {
             return [];
         }
-        return included.length > 1 ? [this.getClosest(exclude), this.getFurthest(exclude)] : [this.getClosest(exclude)];
+        return included.length > 1 ? [this.getFirst(exclude), this.getLast(exclude)] : [this.getFirst(exclude)];
     }
-    getFurthest(exclude) {
+    getLast(exclude) {
         const included = getValuesOfIncludedKeys(this.nodes, exclude);
         return included[included.length - 1];
     }
@@ -76,7 +79,7 @@ class NodeList extends eventemitter3_1.EventEmitter {
         return Array.from(this.nodes.values());
     }
     stop() {
-        this.nodes.clear();
+        this.nodes.forEach((node) => this.remove((0, dht_1.getNodeIdFromPeerDescriptor)(node.getPeerDescriptor())));
         this.removeAllListeners();
     }
 }

package/dist/src/logic/NodeList.js.map

@@ -1 +1 @@
-{"version":3,"file":"NodeList.js","sourceRoot":"","sources":["../../../src/logic/NodeList.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"NodeList.js","sourceRoot":"","sources":["../../../src/logic/NodeList.ts"],"names":[],"mappings":"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"}

package/dist/src/logic/RandomGraphNode.d.ts

@@ -1,20 +1,20 @@
 import { EventEmitter } from 'eventemitter3';
-import { PeerDescriptor, ListeningRpcCommunicator, ITransport, ConnectionLocker } from '@streamr/dht';
+import { PeerDescriptor, ListeningRpcCommunicator, ITransport, ConnectionLocker, DhtAddress } from '@streamr/dht';
 import { StreamMessage } from '../proto/packages/trackerless-network/protos/NetworkRpc';
 import { NodeList } from './NodeList';
-import { IHandshaker } from './neighbor-discovery/Handshaker';
+import { Handshaker } from './neighbor-discovery/Handshaker';
 import { Propagation } from './propagation/Propagation';
-import { INeighborFinder } from './neighbor-discovery/NeighborFinder';
-import { INeighborUpdateManager } from './neighbor-discovery/NeighborUpdateManager';
+import { NeighborFinder } from './neighbor-discovery/NeighborFinder';
+import { NeighborUpdateManager } from './neighbor-discovery/NeighborUpdateManager';
 import { ProxyConnectionRpcLocal } from './proxy/ProxyConnectionRpcLocal';
-import { IInspector } from './inspect/Inspector';
+import { Inspector } from './inspect/Inspector';
 import { TemporaryConnectionRpcLocal } from './temporary-connection/TemporaryConnectionRpcLocal';
-import { NodeID } from '../identifiers';
 import { Layer1Node } from './Layer1Node';
 import { StreamPartID } from '@streamr/protocol';
 export interface Events {
     message: (message: StreamMessage) => void;
-    targetNeighborConnected: (nodeId: NodeID) => void;
+    neighborConnected: (nodeId: DhtAddress) => void;
+    entryPointLeaveDetected: () => void;
 }
 export interface StrictRandomGraphNodeConfig {
     streamPartId: StreamPartID;
@@ -25,15 +25,18 @@ export interface StrictRandomGraphNodeConfig {
     nodeViewSize: number;
     nearbyNodeView: NodeList;
     randomNodeView: NodeList;
-    targetNeighbors: NodeList;
-    handshaker: IHandshaker;
-    neighborFinder: INeighborFinder;
-    neighborUpdateManager: INeighborUpdateManager;
+    leftNodeView: NodeList;
+    rightNodeView: NodeList;
+    neighbors: NodeList;
+    handshaker: Handshaker;
+    neighborFinder: NeighborFinder;
+    neighborUpdateManager: NeighborUpdateManager;
     propagation: Propagation;
     rpcCommunicator: ListeningRpcCommunicator;
-    numOfTargetNeighbors: number;
-    inspector: IInspector;
+    neighborTargetCount: number;
+    inspector: Inspector;
     temporaryConnectionRpcLocal: TemporaryConnectionRpcLocal;
+    isLocalNodeEntryPoint: () => boolean;
     proxyConnectionRpcLocal?: ProxyConnectionRpcLocal;
     rpcRequestTimeout?: number;
 }
@@ -46,21 +49,22 @@ export declare class RandomGraphNode extends EventEmitter<Events> {
     constructor(config: StrictRandomGraphNodeConfig);
     start(): Promise<void>;
     private registerDefaultServerMethods;
-    private newContact;
-    private removedContact;
+    private onRingContactEvent;
+    private onContactAdded;
+    private onContactRemoved;
     private updateNearbyNodeView;
-    private newRandomContact;
-    private removedRandomContact;
+    private onRandomContactAdded;
+    private onRandomContactRemoved;
     private onNodeDisconnected;
     private getNeighborCandidatesFromLayer1;
-    hasProxyConnection(nodeId: NodeID): boolean;
+    hasProxyConnection(nodeId: DhtAddress): boolean;
     stop(): void;
-    broadcast(msg: StreamMessage, previousNode?: NodeID): void;
+    broadcast(msg: StreamMessage, previousNode?: DhtAddress): void;
     inspect(peerDescriptor: PeerDescriptor): Promise<boolean>;
     private getPropagationTargets;
-    getOwnNodeId(): NodeID;
-    getNumberOfOutgoingHandshakes(): number;
-    getTargetNeighborIds(): NodeID[];
+    getOwnNodeId(): DhtAddress;
+    getOutgoingHandshakeCount(): number;
+    getNeighbors(): PeerDescriptor[];
     getNearbyNodeView(): NodeList;
     private isStopped;
 }