@streamr/trackerless-network 0.0.1-tatum.0

package/dist/src/logic/inspect/Inspector.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Inspector = void 0;
+const dht_1 = require("@streamr/dht");
+const InspectSession_1 = require("./InspectSession");
+const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
+const proto_rpc_1 = require("@streamr/proto-rpc");
+const utils_1 = require("@streamr/utils");
+const RemoteTemporaryConnectionRpcServer_1 = require("../temporary-connection/RemoteTemporaryConnectionRpcServer");
+const logger = new utils_1.Logger(module);
+const DEFAULT_TIMEOUT = 60 * 1000;
+class Inspector {
+    constructor(config) {
+        this.sessions = new Map();
+        this.graphId = config.graphId;
+        this.ownPeerDescriptor = config.ownPeerDescriptor;
+        this.client = (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.TemporaryConnectionRpcClient(config.rpcCommunicator.getRpcClientTransport()));
+        this.connectionLocker = config.connectionLocker;
+        this.inspectionTimeout = config.inspectionTimeout ?? DEFAULT_TIMEOUT;
+        this.openInspectConnection = config.openInspectConnection ?? this.defaultOpenInspectConnection;
+    }
+    async defaultOpenInspectConnection(peerDescriptor, lockId) {
+        const remoteRandomGraphNode = new RemoteTemporaryConnectionRpcServer_1.RemoteTemporaryConnectionRpcServer(peerDescriptor, this.graphId, this.client);
+        await remoteRandomGraphNode.openConnection(this.ownPeerDescriptor);
+        this.connectionLocker.lockConnection(peerDescriptor, lockId);
+    }
+    async inspect(peerDescriptor) {
+        const nodeId = (0, dht_1.keyFromPeerDescriptor)(peerDescriptor);
+        const session = new InspectSession_1.InspectSession({
+            inspectedPeer: nodeId
+        });
+        const lockId = `inspector-${this.graphId}`;
+        this.sessions.set(nodeId, session);
+        await this.openInspectConnection(peerDescriptor, lockId);
+        let success = false;
+        try {
+            await (0, utils_1.waitForEvent3)(session, 'done', this.inspectionTimeout);
+            success = true;
+        }
+        catch (err) {
+            logger.trace('Inspect session timed out, removing');
+        }
+        finally {
+            this.sessions.delete(nodeId);
+            this.connectionLocker.unlockConnection(peerDescriptor, lockId);
+        }
+        return success || session.getInspectedMessageCount() < 1;
+    }
+    markMessage(sender, messageId) {
+        this.sessions.forEach((session) => session.markMessage(sender, messageId));
+    }
+    isInspected(nodeId) {
+        return this.sessions.has(nodeId);
+    }
+    stop() {
+        this.sessions.forEach((session) => {
+            session.stop();
+        });
+        this.sessions.clear();
+    }
+}
+exports.Inspector = Inspector;
+//# sourceMappingURL=Inspector.js.map

package/dist/src/logic/inspect/Inspector.js.map

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

package/dist/src/logic/neighbor-discovery/Handshaker.d.ts

@@ -0,0 +1,35 @@
+import { ConnectionLocker, PeerDescriptor } from '@streamr/dht';
+import { PeerList } from '../PeerList';
+import { RpcCommunicator } from '@streamr/proto-rpc';
+interface HandshakerConfig {
+    ownPeerDescriptor: PeerDescriptor;
+    randomGraphId: string;
+    connectionLocker: ConnectionLocker;
+    targetNeighbors: PeerList;
+    nearbyContactPool: PeerList;
+    randomContactPool: PeerList;
+    rpcCommunicator: RpcCommunicator;
+    N: number;
+}
+export interface IHandshaker {
+    attemptHandshakesOnContacts(excludedIds: string[]): Promise<string[]>;
+    getOngoingHandshakes(): Set<string>;
+}
+export declare class Handshaker implements IHandshaker {
+    private readonly ongoingHandshakes;
+    private config;
+    private readonly client;
+    private readonly server;
+    constructor(config: HandshakerConfig);
+    attemptHandshakesOnContacts(excludedIds: string[]): Promise<string[]>;
+    private selectParallelTargetsAndHandshake;
+    private selectParallelTargets;
+    private doParallelHandshakes;
+    private selectNewTargetAndHandshake;
+    private handshakeWithTarget;
+    private handshakeWithInterleaving;
+    private createRemoteHandshaker;
+    private createRemoteNode;
+    getOngoingHandshakes(): Set<string>;
+}
+export {};

package/dist/src/logic/neighbor-discovery/Handshaker.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Handshaker = void 0;
+const dht_1 = require("@streamr/dht");
+const RemoteRandomGraphNode_1 = require("../RemoteRandomGraphNode");
+const proto_rpc_1 = require("@streamr/proto-rpc");
+const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
+const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
+const utils_1 = require("@streamr/utils");
+const RemoteHandshaker_1 = require("./RemoteHandshaker");
+const HandshakerServer_1 = require("./HandshakerServer");
+const logger = new utils_1.Logger(module);
+const PARALLEL_HANDSHAKE_COUNT = 2;
+class Handshaker {
+    constructor(config) {
+        this.ongoingHandshakes = new Set();
+        this.config = config;
+        this.client = (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.HandshakeRpcClient(this.config.rpcCommunicator.getRpcClientTransport()));
+        this.server = new HandshakerServer_1.HandshakerServer({
+            randomGraphId: this.config.randomGraphId,
+            ownPeerDescriptor: this.config.ownPeerDescriptor,
+            targetNeighbors: this.config.targetNeighbors,
+            connectionLocker: this.config.connectionLocker,
+            ongoingHandshakes: this.ongoingHandshakes,
+            N: this.config.N,
+            handshakeWithInterleaving: (target, senderId) => this.handshakeWithInterleaving(target, senderId),
+            createRemoteHandshaker: (target) => this.createRemoteHandshaker(target),
+            createRemoteNode: (target) => this.createRemoteNode(target)
+        });
+        this.config.rpcCommunicator.registerRpcNotification(NetworkRpc_1.InterleaveNotice, 'interleaveNotice', (req, context) => this.server.interleaveNotice(req, context));
+        this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.StreamHandshakeRequest, NetworkRpc_1.StreamHandshakeResponse, 'handshake', (req, context) => this.server.handshake(req, context));
+    }
+    async attemptHandshakesOnContacts(excludedIds) {
+        if (this.config.targetNeighbors.size() + this.ongoingHandshakes.size < this.config.N - 2) {
+            logger.trace(`Attempting parallel handshakes with ${PARALLEL_HANDSHAKE_COUNT} targets`);
+            return this.selectParallelTargetsAndHandshake(excludedIds);
+        }
+        else if (this.config.targetNeighbors.size() + this.ongoingHandshakes.size < this.config.N) {
+            logger.trace(`Attempting handshake with new target`);
+            return this.selectNewTargetAndHandshake(excludedIds);
+        }
+        return excludedIds;
+    }
+    async selectParallelTargetsAndHandshake(excludedIds) {
+        const exclude = excludedIds.concat(this.config.targetNeighbors.getStringIds());
+        const targetNeighbors = this.selectParallelTargets(exclude);
+        targetNeighbors.forEach((contact) => this.ongoingHandshakes.add((0, dht_1.keyFromPeerDescriptor)(contact.getPeerDescriptor())));
+        return this.doParallelHandshakes(targetNeighbors, exclude);
+    }
+    selectParallelTargets(excludedIds) {
+        const targetNeighbors = this.config.nearbyContactPool.getClosestAndFurthest(excludedIds);
+        while (targetNeighbors.length < PARALLEL_HANDSHAKE_COUNT && this.config.randomContactPool.size(excludedIds) > 0) {
+            const random = this.config.randomContactPool.getRandom(excludedIds);
+            if (random) {
+                targetNeighbors.push(random);
+            }
+        }
+        return targetNeighbors.map((neighbor) => this.createRemoteHandshaker(neighbor.getPeerDescriptor()));
+    }
+    async doParallelHandshakes(targets, excludedIds) {
+        const results = await Promise.allSettled(Array.from(targets.values()).map(async (target, i) => {
+            const otherPeer = i === 0 ? targets[1] : targets[0];
+            const otherPeerStringId = otherPeer ? (0, dht_1.keyFromPeerDescriptor)(otherPeer.getPeerDescriptor()) : undefined;
+            return this.handshakeWithTarget(target, otherPeerStringId);
+        }));
+        results.map((res, i) => {
+            if (res.status !== 'fulfilled' || !res.value) {
+                excludedIds.push((0, dht_1.keyFromPeerDescriptor)(targets[i].getPeerDescriptor()));
+            }
+        });
+        return excludedIds;
+    }
+    async selectNewTargetAndHandshake(excludedIds) {
+        const exclude = excludedIds.concat(this.config.targetNeighbors.getStringIds());
+        const targetNeighbor = this.config.nearbyContactPool.getClosest(exclude) ?? this.config.randomContactPool.getRandom(exclude);
+        if (targetNeighbor) {
+            const accepted = await this.handshakeWithTarget(this.createRemoteHandshaker(targetNeighbor.getPeerDescriptor()));
+            if (!accepted) {
+                excludedIds.push((0, dht_1.keyFromPeerDescriptor)(targetNeighbor.getPeerDescriptor()));
+            }
+        }
+        return excludedIds;
+    }
+    async handshakeWithTarget(targetNeighbor, concurrentStringId) {
+        const targetStringId = (0, dht_1.keyFromPeerDescriptor)(targetNeighbor.getPeerDescriptor());
+        this.ongoingHandshakes.add(targetStringId);
+        const result = await targetNeighbor.handshake(this.config.ownPeerDescriptor, this.config.targetNeighbors.getStringIds(), concurrentStringId);
+        if (result.accepted) {
+            this.config.targetNeighbors.add(this.createRemoteNode(targetNeighbor.getPeerDescriptor()));
+            this.config.connectionLocker.lockConnection(targetNeighbor.getPeerDescriptor(), this.config.randomGraphId);
+        }
+        if (result.interleaveTarget) {
+            await this.handshakeWithInterleaving(result.interleaveTarget, targetStringId);
+        }
+        this.ongoingHandshakes.delete(targetStringId);
+        return result.accepted;
+    }
+    async handshakeWithInterleaving(target, interleavingFrom) {
+        const targetNeighbor = new RemoteHandshaker_1.RemoteHandshaker(target, this.config.randomGraphId, this.client);
+        const targetStringId = (0, dht_1.keyFromPeerDescriptor)(targetNeighbor.getPeerDescriptor());
+        this.ongoingHandshakes.add(targetStringId);
+        const result = await targetNeighbor.handshake(this.config.ownPeerDescriptor, this.config.targetNeighbors.getStringIds(), undefined, interleavingFrom);
+        if (result.accepted) {
+            this.config.targetNeighbors.add(this.createRemoteNode(targetNeighbor.getPeerDescriptor()));
+            this.config.connectionLocker.lockConnection(targetNeighbor.getPeerDescriptor(), this.config.randomGraphId);
+        }
+        this.ongoingHandshakes.delete(targetStringId);
+        return result.accepted;
+    }
+    createRemoteHandshaker(targetPeerDescriptor) {
+        return new RemoteHandshaker_1.RemoteHandshaker(targetPeerDescriptor, this.config.randomGraphId, this.client);
+    }
+    createRemoteNode(targetPeerDescriptor) {
+        return new RemoteRandomGraphNode_1.RemoteRandomGraphNode(targetPeerDescriptor, this.config.randomGraphId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())));
+    }
+    getOngoingHandshakes() {
+        return this.ongoingHandshakes;
+    }
+}
+exports.Handshaker = Handshaker;
+//# sourceMappingURL=Handshaker.js.map

package/dist/src/logic/neighbor-discovery/Handshaker.js.map

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

package/dist/src/logic/neighbor-discovery/HandshakerServer.d.ts

@@ -0,0 +1,30 @@
+import { Empty } from '../../proto/google/protobuf/empty';
+import { InterleaveNotice, StreamHandshakeRequest, StreamHandshakeResponse } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
+import { PeerList } from '../PeerList';
+import { ConnectionLocker, PeerDescriptor } from '@streamr/dht';
+import { IHandshakeRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
+import { RemoteHandshaker } from './RemoteHandshaker';
+import { RemoteRandomGraphNode } from '../RemoteRandomGraphNode';
+interface HandshakerServerConfig {
+    randomGraphId: string;
+    ownPeerDescriptor: PeerDescriptor;
+    targetNeighbors: PeerList;
+    connectionLocker: ConnectionLocker;
+    ongoingHandshakes: Set<string>;
+    N: number;
+    createRemoteHandshaker: (target: PeerDescriptor) => RemoteHandshaker;
+    createRemoteNode: (peerDescriptor: PeerDescriptor) => RemoteRandomGraphNode;
+    handshakeWithInterleaving: (target: PeerDescriptor, senderId: string) => Promise<boolean>;
+}
+export declare class HandshakerServer implements IHandshakeRpc {
+    private readonly config;
+    constructor(config: HandshakerServerConfig);
+    handshake(request: StreamHandshakeRequest, _context: ServerCallContext): Promise<StreamHandshakeResponse>;
+    private handleRequest;
+    private acceptHandshake;
+    private rejectHandshake;
+    private acceptHandshakeWithInterleaving;
+    interleaveNotice(message: InterleaveNotice, _context: ServerCallContext): Promise<Empty>;
+}
+export {};

package/dist/src/logic/neighbor-discovery/HandshakerServer.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HandshakerServer = void 0;
+const empty_1 = require("../../proto/google/protobuf/empty");
+const dht_1 = require("@streamr/dht");
+class HandshakerServer {
+    constructor(config) {
+        this.config = config;
+    }
+    async handshake(request, _context) {
+        return this.handleRequest(request);
+    }
+    handleRequest(request) {
+        if (this.config.targetNeighbors.hasPeer(request.senderDescriptor)
+            || this.config.ongoingHandshakes.has((0, dht_1.keyFromPeerDescriptor)(request.senderDescriptor))) {
+            return this.acceptHandshake(request, request.senderDescriptor);
+        }
+        else if (this.config.targetNeighbors.size() + this.config.ongoingHandshakes.size < this.config.N) {
+            return this.acceptHandshake(request, request.senderDescriptor);
+        }
+        else if (this.config.targetNeighbors.size([request.interleavingFrom]) >= 2) {
+            return this.acceptHandshakeWithInterleaving(request, request.senderDescriptor);
+        }
+        else {
+            return this.rejectHandshake(request);
+        }
+    }
+    acceptHandshake(request, requester) {
+        const res = {
+            requestId: request.requestId,
+            accepted: true
+        };
+        this.config.targetNeighbors.add(this.config.createRemoteNode(requester));
+        this.config.connectionLocker.lockConnection(request.senderDescriptor, this.config.randomGraphId);
+        return res;
+    }
+    // eslint-disable-next-line class-methods-use-this
+    rejectHandshake(request) {
+        const res = {
+            requestId: request.requestId,
+            accepted: false
+        };
+        return res;
+    }
+    acceptHandshakeWithInterleaving(request, requester) {
+        const exclude = request.neighbors;
+        exclude.push(request.senderId);
+        exclude.push(request.interleavingFrom);
+        const furthest = this.config.targetNeighbors.getFurthest(exclude);
+        const furthestPeerDescriptor = furthest ? furthest.getPeerDescriptor() : undefined;
+        if (furthest) {
+            const remote = this.config.createRemoteHandshaker(furthest.getPeerDescriptor());
+            remote.interleaveNotice(this.config.ownPeerDescriptor, request.senderDescriptor);
+            this.config.targetNeighbors.remove(furthest.getPeerDescriptor());
+            this.config.connectionLocker.unlockConnection(furthestPeerDescriptor, this.config.randomGraphId);
+        }
+        this.config.targetNeighbors.add(this.config.createRemoteNode(requester));
+        this.config.connectionLocker.lockConnection(request.senderDescriptor, this.config.randomGraphId);
+        return {
+            requestId: request.requestId,
+            accepted: true,
+            interleaveTarget: furthestPeerDescriptor
+        };
+    }
+    async interleaveNotice(message, _context) {
+        if (message.randomGraphId === this.config.randomGraphId) {
+            if (this.config.targetNeighbors.hasPeerWithStringId(message.senderId)) {
+                const senderDescriptor = this.config.targetNeighbors.getNeighborById(message.senderId).getPeerDescriptor();
+                this.config.connectionLocker.unlockConnection(senderDescriptor, this.config.randomGraphId);
+                this.config.targetNeighbors.remove(senderDescriptor);
+            }
+            this.config.handshakeWithInterleaving(message.interleaveTarget, message.senderId).catch((_e) => { });
+        }
+        return empty_1.Empty;
+    }
+}
+exports.HandshakerServer = HandshakerServer;
+//# sourceMappingURL=HandshakerServer.js.map

package/dist/src/logic/neighbor-discovery/HandshakerServer.js.map

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

package/dist/src/logic/neighbor-discovery/NeighborFinder.d.ts

@@ -0,0 +1,23 @@
+import { PeerList } from '../PeerList';
+interface FindNeighborsSessionConfig {
+    targetNeighbors: PeerList;
+    nearbyContactPool: PeerList;
+    doFindNeighbors: (excludedNodes: string[]) => Promise<string[]>;
+    N: number;
+}
+export interface INeighborFinder {
+    start(excluded?: string[]): void;
+    stop(): void;
+    isRunning(): boolean;
+}
+export declare class NeighborFinder implements INeighborFinder {
+    private readonly abortController;
+    private readonly config;
+    private running;
+    constructor(config: FindNeighborsSessionConfig);
+    private findNeighbors;
+    isRunning(): boolean;
+    start(excluded?: string[]): void;
+    stop(): void;
+}
+export {};

package/dist/src/logic/neighbor-discovery/NeighborFinder.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NeighborFinder = void 0;
+const utils_1 = require("@streamr/utils");
+const INITIAL_TIMEOUT = 100;
+const INTERVAL_TIMEOUT = 250;
+class NeighborFinder {
+    constructor(config) {
+        this.running = false;
+        this.config = config;
+        this.abortController = new AbortController();
+    }
+    async findNeighbors(excluded) {
+        if (!this.running) {
+            return;
+        }
+        const newExcludes = await this.config.doFindNeighbors(excluded);
+        if (this.config.targetNeighbors.size() < this.config.N && newExcludes.length < this.config.nearbyContactPool.size()) {
+            (0, utils_1.setAbortableTimeout)(() => this.findNeighbors(newExcludes), INTERVAL_TIMEOUT, this.abortController.signal);
+        }
+        else {
+            this.running = false;
+        }
+    }
+    isRunning() {
+        return this.running;
+    }
+    start(excluded = []) {
+        if (this.running) {
+            return;
+        }
+        this.running = true;
+        (0, utils_1.setAbortableTimeout)(() => this.findNeighbors(excluded), INITIAL_TIMEOUT, this.abortController.signal);
+    }
+    stop() {
+        if (!this.running) {
+            return;
+        }
+        this.running = false;
+        this.abortController.abort();
+    }
+}
+exports.NeighborFinder = NeighborFinder;
+//# sourceMappingURL=NeighborFinder.js.map

package/dist/src/logic/neighbor-discovery/NeighborFinder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAAoD;AAUpD,MAAM,eAAe,GAAG,GAAG,CAAA;AAC3B,MAAM,gBAAgB,GAAG,GAAG,CAAA;AAQ5B,MAAa,cAAc;IAKvB,YAAY,MAAkC;QAFtC,YAAO,GAAG,KAAK,CAAA;QAGnB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAkB;QAC1C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,eAAgB,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAkB,CAAC,IAAI,EAAE,EAAE;YACnH,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;SAC5G;aAAM;YACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;SACvB;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,WAAqB,EAAE;QACzB,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACzG,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAM;SACT;QACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AAzCD,wCAyCC"}

package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.d.ts

@@ -0,0 +1,30 @@
+import { ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
+import { PeerIDKey } from '@streamr/dht/dist/src/helpers/PeerID';
+import { INeighborFinder } from './NeighborFinder';
+import { PeerList } from '../PeerList';
+interface NeighborUpdateManagerConfig {
+    ownStringId: PeerIDKey;
+    ownPeerDescriptor: PeerDescriptor;
+    targetNeighbors: PeerList;
+    nearbyContactPool: PeerList;
+    neighborFinder: INeighborFinder;
+    randomGraphId: string;
+    rpcCommunicator: ListeningRpcCommunicator;
+    neighborUpdateInterval: number;
+}
+export interface INeighborUpdateManager {
+    start(): Promise<void>;
+    stop(): void;
+}
+export declare class NeighborUpdateManager implements INeighborUpdateManager {
+    private readonly abortController;
+    private readonly config;
+    private readonly client;
+    private readonly server;
+    constructor(config: NeighborUpdateManagerConfig);
+    start(): Promise<void>;
+    stop(): void;
+    private updateNeighborInfo;
+    private createRemote;
+}
+export {};

package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NeighborUpdateManager = void 0;
+const NetworkRpc_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc");
+const dht_1 = require("@streamr/dht");
+const proto_rpc_1 = require("@streamr/proto-rpc");
+const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
+const utils_1 = require("@streamr/utils");
+const RemoteNeighborUpdateManager_1 = require("./RemoteNeighborUpdateManager");
+const NeighborUpdateManagerServer_1 = require("./NeighborUpdateManagerServer");
+const logger = new utils_1.Logger(module);
+class NeighborUpdateManager {
+    constructor(config) {
+        this.abortController = new AbortController();
+        this.client = (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NeighborUpdateRpcClient(config.rpcCommunicator.getRpcClientTransport()));
+        this.server = new NeighborUpdateManagerServer_1.NeighborUpdateManagerServer(config);
+        this.config = config;
+        this.config.rpcCommunicator.registerRpcMethod(NetworkRpc_1.NeighborUpdate, NetworkRpc_1.NeighborUpdate, 'neighborUpdate', (req, context) => this.server.neighborUpdate(req, context));
+    }
+    async start() {
+        await (0, utils_1.scheduleAtInterval)(() => this.updateNeighborInfo(), this.config.neighborUpdateInterval, false, this.abortController.signal);
+    }
+    stop() {
+        this.abortController.abort();
+    }
+    async updateNeighborInfo() {
+        logger.trace(`Updating neighbor info to peers`);
+        const neighborDescriptors = this.config.targetNeighbors.getPeers().map((neighbor) => neighbor.getPeerDescriptor());
+        await Promise.allSettled(this.config.targetNeighbors.getPeers().map(async (neighbor) => {
+            const res = await this.createRemote(neighbor.getPeerDescriptor()).updateNeighbors(this.config.ownPeerDescriptor, neighborDescriptors);
+            if (res.removeMe) {
+                this.config.targetNeighbors.remove(neighbor.getPeerDescriptor());
+                this.config.neighborFinder.start([(0, dht_1.keyFromPeerDescriptor)(neighbor.getPeerDescriptor())]);
+            }
+        }));
+    }
+    createRemote(targetPeerDescriptor) {
+        return new RemoteNeighborUpdateManager_1.RemoteNeighborUpdateManager(targetPeerDescriptor, this.config.randomGraphId, this.client);
+    }
+}
+exports.NeighborUpdateManager = NeighborUpdateManager;
+//# sourceMappingURL=NeighborUpdateManager.js.map

package/dist/src/logic/neighbor-discovery/NeighborUpdateManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NeighborUpdateManager.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManager.ts"],"names":[],"mappings":";;;AAAA,2FAA2F;AAC3F,sCAA8F;AAC9F,kDAAqE;AACrE,yGAA2G;AAC3G,0CAA2D;AAI3D,+EAA2E;AAC3E,+EAA2E;AAa3E,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,qBAAqB;IAK9B,YAAY,MAAmC;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,MAAM,GAAG,IAAA,4BAAgB,EAAC,IAAI,2CAAuB,CAAC,MAAM,CAAC,eAAe,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAA;QAC3G,IAAI,CAAC,MAAM,GAAG,IAAI,yDAA2B,CAAC,MAAM,CAAC,CAAA;QACrD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,iBAAiB,CAAC,2BAAc,EAAE,2BAAc,EAAE,gBAAgB,EAC1F,CAAC,GAAmB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACnF,CAAC;IAEM,KAAK,CAAC,KAAK;QACd,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACrI,CAAC;IAEM,IAAI;QACP,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC5B,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAC/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,eAAgB,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;QACnH,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,eAAgB,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YACpF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE,mBAAmB,CAAC,CAAA;YACrI,IAAI,GAAG,CAAC,QAAQ,EAAE;gBACd,IAAI,CAAC,MAAM,CAAC,eAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;gBACjE,IAAI,CAAC,MAAM,CAAC,cAAe,CAAC,KAAK,CAAC,CAAC,IAAA,2BAAqB,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAA;aAC3F;QACL,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,YAAY,CAAC,oBAAoC;QACrD,OAAO,IAAI,yDAA2B,CAAC,oBAAoB,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACxG,CAAC;CACJ;AArCD,sDAqCC"}

package/dist/src/logic/neighbor-discovery/NeighborUpdateManagerServer.d.ts

@@ -0,0 +1,20 @@
+import { ListeningRpcCommunicator } from '@streamr/dht';
+import { NeighborUpdate } from '../../proto/packages/trackerless-network/protos/NetworkRpc';
+import { INeighborUpdateRpc } from '../../proto/packages/trackerless-network/protos/NetworkRpc.server';
+import { PeerList } from '../PeerList';
+import { INeighborFinder } from './NeighborFinder';
+import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
+interface NeighborUpdateManagerConfig {
+    ownStringId: string;
+    randomGraphId: string;
+    targetNeighbors: PeerList;
+    nearbyContactPool: PeerList;
+    neighborFinder: INeighborFinder;
+    rpcCommunicator: ListeningRpcCommunicator;
+}
+export declare class NeighborUpdateManagerServer implements INeighborUpdateRpc {
+    private readonly config;
+    constructor(config: NeighborUpdateManagerConfig);
+    neighborUpdate(message: NeighborUpdate, _context: ServerCallContext): Promise<NeighborUpdate>;
+}
+export {};

package/dist/src/logic/neighbor-discovery/NeighborUpdateManagerServer.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NeighborUpdateManagerServer = void 0;
+const dht_1 = require("@streamr/dht");
+const proto_rpc_1 = require("@streamr/proto-rpc");
+const NetworkRpc_client_1 = require("../../proto/packages/trackerless-network/protos/NetworkRpc.client");
+const RemoteRandomGraphNode_1 = require("../RemoteRandomGraphNode");
+class NeighborUpdateManagerServer {
+    constructor(config) {
+        this.config = config;
+    }
+    // INetworkRpc server method
+    async neighborUpdate(message, _context) {
+        if (this.config.targetNeighbors.hasPeerWithStringId(message.senderId)) {
+            const newPeers = message.neighborDescriptors
+                .filter((peerDescriptor) => {
+                const stringId = (0, dht_1.keyFromPeerDescriptor)(peerDescriptor);
+                return stringId !== this.config.ownStringId && !this.config.targetNeighbors.getStringIds().includes(stringId);
+            });
+            newPeers.forEach((peer) => this.config.nearbyContactPool.add(new RemoteRandomGraphNode_1.RemoteRandomGraphNode(peer, this.config.randomGraphId, (0, proto_rpc_1.toProtoRpcClient)(new NetworkRpc_client_1.NetworkRpcClient(this.config.rpcCommunicator.getRpcClientTransport())))));
+            this.config.neighborFinder.start();
+            const response = {
+                senderId: this.config.ownStringId,
+                randomGraphId: this.config.randomGraphId,
+                neighborDescriptors: this.config.targetNeighbors.getPeers().map((neighbor) => neighbor.getPeerDescriptor()),
+                removeMe: false
+            };
+            return response;
+        }
+        else {
+            const response = {
+                senderId: this.config.ownStringId,
+                randomGraphId: this.config.randomGraphId,
+                neighborDescriptors: this.config.targetNeighbors.getPeers().map((neighbor) => neighbor.getPeerDescriptor()),
+                removeMe: true
+            };
+            return response;
+        }
+    }
+}
+exports.NeighborUpdateManagerServer = NeighborUpdateManagerServer;
+//# sourceMappingURL=NeighborUpdateManagerServer.js.map

package/dist/src/logic/neighbor-discovery/NeighborUpdateManagerServer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NeighborUpdateManagerServer.js","sourceRoot":"","sources":["../../../../src/logic/neighbor-discovery/NeighborUpdateManagerServer.ts"],"names":[],"mappings":";;;AAAA,sCAA8E;AAM9E,kDAAqD;AACrD,yGAAoG;AACpG,oEAAgE;AAWhE,MAAa,2BAA2B;IAIpC,YAAY,MAAmC;QAC3C,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAED,4BAA4B;IAC5B,KAAK,CAAC,cAAc,CAAC,OAAuB,EAAE,QAA2B;QACrE,IAAI,IAAI,CAAC,MAAM,CAAC,eAAgB,CAAC,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACpE,MAAM,QAAQ,GAAG,OAAO,CAAC,mBAAmB;iBACvC,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE;gBACvB,MAAM,QAAQ,GAAG,IAAA,2BAAqB,EAAC,cAAc,CAAC,CAAA;gBACtD,OAAO,QAAQ,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA;YACjH,CAAC,CAAC,CAAA;YACN,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CACxD,IAAI,6CAAqB,CACrB,IAAI,EACJ,IAAI,CAAC,MAAM,CAAC,aAAa,EACzB,IAAA,4BAAgB,EAAC,IAAI,oCAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,eAAgB,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAC/F,CAAC,CACL,CAAA;YACD,IAAI,CAAC,MAAM,CAAC,cAAe,CAAC,KAAK,EAAE,CAAA;YACnC,MAAM,QAAQ,GAAmB;gBAC7B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;gBACjC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;gBACxC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBAC3G,QAAQ,EAAE,KAAK;aAClB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;aAAM;YACH,MAAM,QAAQ,GAAmB;gBAC7B,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;gBACjC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,aAAa;gBACxC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;gBAC3G,QAAQ,EAAE,IAAI;aACjB,CAAA;YACD,OAAO,QAAQ,CAAA;SAClB;IACL,CAAC;CACJ;AAzCD,kEAyCC"}

package/dist/src/logic/neighbor-discovery/RemoteHandshaker.d.ts

@@ -0,0 +1,12 @@
+import { Remote } from '../Remote';
+import { PeerDescriptor } from '@streamr/dht';
+import { IHandshakeRpcClient } from '../../proto/packages/trackerless-network/protos/NetworkRpc.client';
+interface HandshakeResponse {
+    accepted: boolean;
+    interleaveTarget?: PeerDescriptor;
+}
+export declare class RemoteHandshaker extends Remote<IHandshakeRpcClient> {
+    handshake(ownPeerDescriptor: PeerDescriptor, neighbors: string[], concurrentHandshakeTargetId?: string, interleavingFrom?: string): Promise<HandshakeResponse>;
+    interleaveNotice(ownPeerDescriptor: PeerDescriptor, originatorDescriptor: PeerDescriptor): void;
+}
+export {};