@streamr/trackerless-network 103.1.2 → 103.2.0-experiment.0

package/dist/src/content-delivery-layer/neighbor-discovery/HandshakeRpcRemote.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HandshakeRpcRemote = exports.INTERLEAVE_REQUEST_TIMEOUT = void 0;
-const dht_1 = require("@streamr/dht");
-const utils_1 = require("@streamr/utils");
-const uuid_1 = require("uuid");
-const logger = new utils_1.Logger(module);
-exports.INTERLEAVE_REQUEST_TIMEOUT = 10000;
-class HandshakeRpcRemote extends dht_1.RpcRemote {
-    async handshake(streamPartId, neighborNodeIds, concurrentHandshakeNodeId, interleaveNodeId) {
-        const request = {
-            streamPartId,
-            requestId: (0, uuid_1.v4)(),
-            neighborNodeIds: neighborNodeIds.map((id) => (0, dht_1.toDhtAddressRaw)(id)),
-            concurrentHandshakeNodeId: (concurrentHandshakeNodeId !== undefined) ? (0, dht_1.toDhtAddressRaw)(concurrentHandshakeNodeId) : undefined,
-            interleaveNodeId: (interleaveNodeId !== undefined) ? (0, dht_1.toDhtAddressRaw)(interleaveNodeId) : undefined
-        };
-        try {
-            const response = await this.getClient().handshake(request, this.formDhtRpcOptions());
-            return {
-                accepted: response.accepted,
-                interleaveTargetDescriptor: response.interleaveTargetDescriptor
-            };
-        }
-        catch (err) {
-            logger.debug(`handshake to ${(0, dht_1.toNodeId)(this.getPeerDescriptor())} failed`, { err });
-            return {
-                accepted: false
-            };
-        }
-    }
-    async interleaveRequest(originatorDescriptor) {
-        const request = {
-            interleaveTargetDescriptor: originatorDescriptor
-        };
-        const options = this.formDhtRpcOptions({
-            connect: false,
-            timeout: exports.INTERLEAVE_REQUEST_TIMEOUT
-        });
-        try {
-            const res = await this.getClient().interleaveRequest(request, options);
-            return {
-                accepted: res.accepted
-            };
-        }
-        catch (err) {
-            logger.debug(`interleaveRequest to ${(0, dht_1.toNodeId)(this.getPeerDescriptor())} failed`, { err });
-            return {
-                accepted: false
-            };
-        }
-    }
-}
-exports.HandshakeRpcRemote = HandshakeRpcRemote;
-//# sourceMappingURL=HandshakeRpcRemote.js.map

package/dist/src/content-delivery-layer/neighbor-discovery/HandshakeRpcRemote.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HandshakeRpcRemote.js","sourceRoot":"","sources":["../../../../src/content-delivery-layer/neighbor-discovery/HandshakeRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAA+F;AAC/F,0CAAqD;AACrD,+BAAyB;AAIzB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOpB,QAAA,0BAA0B,GAAG,KAAK,CAAA;AAE/C,MAAa,kBAAmB,SAAQ,eAA6B;IAEjE,KAAK,CAAC,SAAS,CACX,YAA0B,EAC1B,eAA6B,EAC7B,yBAAsC,EACtC,gBAA6B;QAE7B,MAAM,OAAO,GAA+B;YACxC,YAAY;YACZ,SAAS,EAAE,IAAA,SAAE,GAAE;YACf,eAAe,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAA,qBAAe,EAAC,EAAE,CAAC,CAAC;YACjE,yBAAyB,EAAE,CAAC,yBAAyB,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,qBAAe,EAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,SAAS;YAC7H,gBAAgB,EAAE,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,IAAA,qBAAe,EAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,SAAS;SACrG,CAAA;QACD,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACpF,OAAO;gBACH,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,0BAA0B,EAAE,QAAQ,CAAC,0BAA0B;aAClE,CAAA;QACL,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,gBAAgB,IAAA,cAAQ,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAClF,OAAO;gBACH,QAAQ,EAAE,KAAK;aAClB,CAAA;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,oBAAoC;QACxD,MAAM,OAAO,GAAsB;YAC/B,0BAA0B,EAAE,oBAAoB;SACnD,CAAA;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC;YACnC,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,kCAA0B;SACtC,CAAC,CAAA;QACF,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,iBAAiB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;YACtE,OAAO;gBACH,QAAQ,EAAE,GAAG,CAAC,QAAQ;aACzB,CAAA;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,wBAAwB,IAAA,cAAQ,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YAC1F,OAAO;gBACH,QAAQ,EAAE,KAAK;aAClB,CAAA;QACL,CAAC;IAEL,CAAC;CACJ;AAlDD,gDAkDC"}

package/dist/src/content-delivery-layer/neighbor-discovery/Handshaker.d.ts

@@ -1,32 +0,0 @@
-import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
-import { StreamPartID } from '@streamr/utils';
-import { NodeList } from '../NodeList';
-interface HandshakerOptions {
-    localPeerDescriptor: PeerDescriptor;
-    streamPartId: StreamPartID;
-    neighbors: NodeList;
-    leftNodeView: NodeList;
-    rightNodeView: NodeList;
-    nearbyNodeView: NodeList;
-    randomNodeView: NodeList;
-    rpcCommunicator: ListeningRpcCommunicator;
-    maxNeighborCount: number;
-    ongoingHandshakes: Set<DhtAddress>;
-    rpcRequestTimeout?: number;
-}
-export declare class Handshaker {
-    private options;
-    private readonly rpcLocal;
-    constructor(options: HandshakerOptions);
-    attemptHandshakesOnContacts(excludedIds: DhtAddress[]): Promise<DhtAddress[]>;
-    private selectParallelTargetsAndHandshake;
-    private selectParallelTargets;
-    private doParallelHandshakes;
-    private selectNewTargetAndHandshake;
-    private handshakeWithTarget;
-    private handshakeWithInterleaving;
-    private createRpcRemote;
-    private createContentDeliveryRpcRemote;
-    getOngoingHandshakes(): Set<DhtAddress>;
-}
-export {};

package/dist/src/content-delivery-layer/neighbor-discovery/Handshaker.js

@@ -1,149 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Handshaker = void 0;
-const dht_1 = require("@streamr/dht");
-const utils_1 = require("@streamr/utils");
-const NetworkRpc_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc");
-const NetworkRpc_client_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc.client");
-const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
-const HandshakeRpcLocal_1 = require("./HandshakeRpcLocal");
-const HandshakeRpcRemote_1 = require("./HandshakeRpcRemote");
-const logger = new utils_1.Logger(module);
-const PARALLEL_HANDSHAKE_COUNT = 2;
-class Handshaker {
-    options;
-    rpcLocal;
-    constructor(options) {
-        this.options = options;
-        this.rpcLocal = new HandshakeRpcLocal_1.HandshakeRpcLocal({
-            streamPartId: this.options.streamPartId,
-            neighbors: this.options.neighbors,
-            ongoingHandshakes: this.options.ongoingHandshakes,
-            ongoingInterleaves: new Set(),
-            maxNeighborCount: this.options.maxNeighborCount,
-            handshakeWithInterleaving: (target, remoteNodeId) => this.handshakeWithInterleaving(target, remoteNodeId),
-            createRpcRemote: (target) => this.createRpcRemote(target),
-            createContentDeliveryRpcRemote: (target) => this.createContentDeliveryRpcRemote(target)
-        });
-        this.options.rpcCommunicator.registerRpcMethod(NetworkRpc_1.InterleaveRequest, NetworkRpc_1.InterleaveResponse, 'interleaveRequest', (req, context) => this.rpcLocal.interleaveRequest(req, context), { timeout: HandshakeRpcRemote_1.INTERLEAVE_REQUEST_TIMEOUT });
-        this.options.rpcCommunicator.registerRpcMethod(NetworkRpc_1.StreamPartHandshakeRequest, NetworkRpc_1.StreamPartHandshakeResponse, 'handshake', (req, context) => this.rpcLocal.handshake(req, context));
-    }
-    async attemptHandshakesOnContacts(excludedIds) {
-        // TODO use options option or named constant? or why the value 2?
-        if (this.options.neighbors.size() + this.options.ongoingHandshakes.size < this.options.maxNeighborCount - 2) {
-            logger.trace(`Attempting parallel handshakes with ${PARALLEL_HANDSHAKE_COUNT} targets`);
-            return this.selectParallelTargetsAndHandshake(excludedIds);
-        }
-        else if (this.options.neighbors.size() + this.options.ongoingHandshakes.size < this.options.maxNeighborCount) {
-            logger.trace(`Attempting handshake with new target`);
-            return this.selectNewTargetAndHandshake(excludedIds);
-        }
-        return excludedIds;
-    }
-    async selectParallelTargetsAndHandshake(excludedIds) {
-        const exclude = excludedIds.concat(this.options.neighbors.getIds());
-        const targets = this.selectParallelTargets(exclude);
-        targets.forEach((contact) => this.options.ongoingHandshakes.add((0, dht_1.toNodeId)(contact.getPeerDescriptor())));
-        return this.doParallelHandshakes(targets, exclude);
-    }
-    selectParallelTargets(excludedIds) {
-        const targets = new Map();
-        const getExcludedIds = () => [...excludedIds, ...Array.from(targets.keys())];
-        // Step 1: If no neighbors, try to find a WebSocket node first
-        if (this.options.neighbors.size() === 0) {
-            const wsNode = this.options.nearbyNodeView.getFirst(getExcludedIds(), true);
-            if (wsNode) {
-                const wsNodeId = (0, dht_1.toNodeId)(wsNode.getPeerDescriptor());
-                targets.set(wsNodeId, wsNode);
-            }
-        }
-        // Step 2: Add left and right contacts from the ring
-        const left = this.options.leftNodeView.getFirst(getExcludedIds());
-        const right = this.options.rightNodeView.getFirst(getExcludedIds());
-        if (left) {
-            targets.set((0, dht_1.toNodeId)(left.getPeerDescriptor()), left);
-        }
-        if (right) {
-            targets.set((0, dht_1.toNodeId)(right.getPeerDescriptor()), right);
-        }
-        // Step 3: Add closest contact based on Kademlia metric if needed
-        if (targets.size < PARALLEL_HANDSHAKE_COUNT) {
-            const closest = this.options.nearbyNodeView.getFirst(getExcludedIds());
-            if (closest) {
-                targets.set((0, dht_1.toNodeId)(closest.getPeerDescriptor()), closest);
-            }
-        }
-        // Step 4: Fill remaining slots with random contacts
-        while (targets.size < PARALLEL_HANDSHAKE_COUNT) {
-            const random = this.options.randomNodeView.getRandom(getExcludedIds());
-            if (!random) {
-                break;
-            }
-            targets.set((0, dht_1.toNodeId)(random.getPeerDescriptor()), random);
-        }
-        return Array.from(targets.values()).map((neighbor) => this.createRpcRemote(neighbor.getPeerDescriptor()));
-    }
-    async doParallelHandshakes(targets, excludedIds) {
-        const results = await Promise.allSettled(Array.from(targets.values()).map(async (target, i) => {
-            const otherNode = i === 0 ? targets[1] : targets[0];
-            // TODO better check (currently this condition is always true)
-            const otherNodeId = otherNode ? (0, dht_1.toNodeId)(otherNode.getPeerDescriptor()) : undefined;
-            return this.handshakeWithTarget(target, otherNodeId);
-        }));
-        results.forEach((res, i) => {
-            if (res.status !== 'fulfilled' || !res.value) {
-                excludedIds.push((0, dht_1.toNodeId)(targets[i].getPeerDescriptor()));
-            }
-        });
-        return excludedIds;
-    }
-    async selectNewTargetAndHandshake(excludedIds) {
-        const exclude = excludedIds.concat(this.options.neighbors.getIds());
-        const target = this.options.leftNodeView.getFirst(exclude)
-            ?? this.options.rightNodeView.getFirst(exclude)
-            ?? this.options.nearbyNodeView.getFirst(exclude)
-            ?? this.options.randomNodeView.getRandom(exclude);
-        if (target) {
-            const accepted = await this.handshakeWithTarget(this.createRpcRemote(target.getPeerDescriptor()));
-            if (!accepted) {
-                excludedIds.push((0, dht_1.toNodeId)(target.getPeerDescriptor()));
-            }
-        }
-        return excludedIds;
-    }
-    async handshakeWithTarget(target, concurrentNodeId) {
-        const targetNodeId = (0, dht_1.toNodeId)(target.getPeerDescriptor());
-        this.options.ongoingHandshakes.add(targetNodeId);
-        const result = await target.handshake(this.options.streamPartId, this.options.neighbors.getIds(), concurrentNodeId);
-        if (result.accepted) {
-            this.options.neighbors.add(this.createContentDeliveryRpcRemote(target.getPeerDescriptor()));
-        }
-        if (result.interleaveTargetDescriptor) {
-            await this.handshakeWithInterleaving(result.interleaveTargetDescriptor, targetNodeId);
-        }
-        this.options.ongoingHandshakes.delete(targetNodeId);
-        return result.accepted;
-    }
-    async handshakeWithInterleaving(target, remoteNodeId) {
-        const remote = this.createRpcRemote(target);
-        const targetNodeId = (0, dht_1.toNodeId)(remote.getPeerDescriptor());
-        this.options.ongoingHandshakes.add(targetNodeId);
-        const result = await remote.handshake(this.options.streamPartId, this.options.neighbors.getIds(), undefined, remoteNodeId);
-        if (result.accepted) {
-            this.options.neighbors.add(this.createContentDeliveryRpcRemote(remote.getPeerDescriptor()));
-        }
-        this.options.ongoingHandshakes.delete(targetNodeId);
-        return result.accepted;
-    }
-    createRpcRemote(targetPeerDescriptor) {
-        return new HandshakeRpcRemote_1.HandshakeRpcRemote(this.options.localPeerDescriptor, targetPeerDescriptor, this.options.rpcCommunicator, NetworkRpc_client_1.HandshakeRpcClient, this.options.rpcRequestTimeout);
-    }
-    createContentDeliveryRpcRemote(targetPeerDescriptor) {
-        return new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.options.localPeerDescriptor, targetPeerDescriptor, this.options.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient, this.options.rpcRequestTimeout);
-    }
-    getOngoingHandshakes() {
-        return this.options.ongoingHandshakes;
-    }
-}
-exports.Handshaker = Handshaker;
-//# sourceMappingURL=Handshaker.js.map

package/dist/src/content-delivery-layer/neighbor-discovery/Handshaker.js.map

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

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborFinder.d.ts

@@ -1,22 +0,0 @@
-import { NodeList } from '../NodeList';
-import { DhtAddress } from '@streamr/dht';
-interface FindNeighborsSessionOptions {
-    neighbors: NodeList;
-    nearbyNodeView: NodeList;
-    leftNodeView: NodeList;
-    rightNodeView: NodeList;
-    randomNodeView: NodeList;
-    doFindNeighbors: (excludedNodes: DhtAddress[]) => Promise<DhtAddress[]>;
-    minCount: number;
-}
-export declare class NeighborFinder {
-    private readonly abortController;
-    private readonly options;
-    private running;
-    constructor(options: FindNeighborsSessionOptions);
-    private findNeighbors;
-    isRunning(): boolean;
-    start(excluded?: DhtAddress[]): void;
-    stop(): void;
-}
-export {};

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborFinder.js

@@ -1,64 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NeighborFinder = void 0;
-const utils_1 = require("@streamr/utils");
-const INITIAL_WAIT = 100;
-const INTERVAL = 250;
-const logger = new utils_1.Logger(module);
-class NeighborFinder {
-    abortController;
-    options;
-    running = false;
-    constructor(options) {
-        this.options = options;
-        this.abortController = new AbortController();
-    }
-    async findNeighbors(excluded) {
-        if (!this.running) {
-            return;
-        }
-        const newExcludes = await this.options.doFindNeighbors(excluded);
-        const uniqueContactCount = new Set([
-            ...this.options.nearbyNodeView.getIds(),
-            ...this.options.leftNodeView.getIds(),
-            ...this.options.rightNodeView.getIds(),
-            ...this.options.randomNodeView.getIds()
-        ]).size;
-        if (this.options.neighbors.size() < this.options.minCount && newExcludes.length < uniqueContactCount) {
-            // TODO should we catch possible promise rejection?
-            (0, utils_1.setAbortableTimeout)(() => this.findNeighbors(newExcludes), INTERVAL, this.abortController.signal);
-        }
-        else if (this.options.neighbors.size() === 0 && uniqueContactCount > 0) {
-            logger.debug('No neighbors found yet contacts are available, restarting handshaking process');
-            (0, utils_1.setAbortableTimeout)(() => this.findNeighbors([]), INTERVAL, this.abortController.signal);
-        }
-        else {
-            this.running = false;
-        }
-    }
-    isRunning() {
-        return this.running;
-    }
-    start(excluded = []) {
-        if (this.running) {
-            return;
-        }
-        this.running = true;
-        // TODO should we catch possible promise rejection?
-        (0, utils_1.setAbortableTimeout)(async () => {
-            await Promise.all([
-                this.findNeighbors(excluded),
-                this.findNeighbors(excluded)
-            ]);
-        }, INITIAL_WAIT, this.abortController.signal);
-    }
-    stop() {
-        if (!this.running) {
-            return;
-        }
-        this.running = false;
-        this.abortController.abort();
-    }
-}
-exports.NeighborFinder = NeighborFinder;
-//# sourceMappingURL=NeighborFinder.js.map

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborFinder.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NeighborFinder.js","sourceRoot":"","sources":["../../../../src/content-delivery-layer/neighbor-discovery/NeighborFinder.ts"],"names":[],"mappings":";;;AAAA,0CAA4D;AAc5D,MAAM,YAAY,GAAG,GAAG,CAAA;AACxB,MAAM,QAAQ,GAAG,GAAG,CAAA;AAEpB,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEjC,MAAa,cAAc;IACN,eAAe,CAAiB;IAChC,OAAO,CAA6B;IAC7C,OAAO,GAAG,KAAK,CAAA;IAEvB,YAAY,OAAoC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;IAChD,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,QAAsB;QAC9C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,OAAM;QACV,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;QAChE,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC;YAC/B,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE;YACvC,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE;YACrC,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE;YACtC,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,EAAE;SAC1C,CAAC,CAAC,IAAI,CAAA;QACP,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,WAAW,CAAC,MAAM,GAAG,kBAAkB,EAAE,CAAC;YACnG,mDAAmD;YACnD,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QACrG,CAAC;aAAM,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,kBAAkB,GAAG,CAAC,EAAE,CAAC;YACvE,MAAM,CAAC,KAAK,CAAC,+EAA+E,CAAC,CAAA;YAC7F,IAAA,2BAAmB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;QAC5F,CAAC;aAAM,CAAC;YACJ,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACxB,CAAC;IACL,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,OAAO,CAAA;IACvB,CAAC;IAED,KAAK,CAAC,WAAyB,EAAE;QAC7B,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAM;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAA;QACnB,mDAAmD;QACnD,IAAA,2BAAmB,EAAC,KAAK,IAAI,EAAE;YAC3B,MAAM,OAAO,CAAC,GAAG,CAAC;gBACd,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;gBAC5B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC;aAC/B,CAAC,CAAA;QACN,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAChB,OAAM;QACV,CAAC;QACD,IAAI,CAAC,OAAO,GAAG,KAAK,CAAA;QACpB,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAA;IAChC,CAAC;CACJ;AAzDD,wCAyDC"}

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborUpdateManager.d.ts

@@ -1,27 +0,0 @@
-import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
-import { StreamPartID } from '@streamr/utils';
-import { NodeList } from '../NodeList';
-import { NeighborFinder } from './NeighborFinder';
-interface NeighborUpdateManagerOptions {
-    localPeerDescriptor: PeerDescriptor;
-    neighbors: NodeList;
-    nearbyNodeView: NodeList;
-    neighborFinder: NeighborFinder;
-    streamPartId: StreamPartID;
-    rpcCommunicator: ListeningRpcCommunicator;
-    neighborUpdateInterval: number;
-    neighborTargetCount: number;
-    ongoingHandshakes: Set<DhtAddress>;
-}
-export declare const DEFAULT_NEIGHBOR_UPDATE_INTERVAL: number;
-export declare class NeighborUpdateManager {
-    private readonly abortController;
-    private readonly options;
-    private readonly rpcLocal;
-    constructor(options: NeighborUpdateManagerOptions);
-    start(): Promise<void>;
-    stop(): void;
-    private updateNeighborInfo;
-    private createRemote;
-}
-export {};

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborUpdateManager.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NeighborUpdateManager = exports.DEFAULT_NEIGHBOR_UPDATE_INTERVAL = void 0;
-const dht_1 = require("@streamr/dht");
-const utils_1 = require("@streamr/utils");
-const NetworkRpc_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc");
-const NetworkRpc_client_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc.client");
-const NeighborUpdateRpcLocal_1 = require("./NeighborUpdateRpcLocal");
-const NeighborUpdateRpcRemote_1 = require("./NeighborUpdateRpcRemote");
-const logger = new utils_1.Logger(module);
-exports.DEFAULT_NEIGHBOR_UPDATE_INTERVAL = 10 * 1000;
-class NeighborUpdateManager {
-    abortController;
-    options;
-    rpcLocal;
-    constructor(options) {
-        this.abortController = new AbortController();
-        this.rpcLocal = new NeighborUpdateRpcLocal_1.NeighborUpdateRpcLocal(options);
-        this.options = options;
-        this.options.rpcCommunicator.registerRpcMethod(NetworkRpc_1.NeighborUpdate, NetworkRpc_1.NeighborUpdate, 'neighborUpdate', (req, context) => this.rpcLocal.neighborUpdate(req, context));
-    }
-    async start() {
-        await (0, utils_1.scheduleAtInterval)(() => this.updateNeighborInfo(), this.options.neighborUpdateInterval, false, this.abortController.signal);
-    }
-    stop() {
-        this.abortController.abort();
-    }
-    async updateNeighborInfo() {
-        logger.trace(`Updating neighbor info to nodes`);
-        const neighborDescriptors = this.options.neighbors.getAll().map((neighbor) => neighbor.getPeerDescriptor());
-        const startTime = Date.now();
-        await Promise.allSettled(this.options.neighbors.getAll().map(async (neighbor) => {
-            const res = await this.createRemote(neighbor.getPeerDescriptor()).updateNeighbors(this.options.streamPartId, neighborDescriptors);
-            const nodeId = (0, dht_1.toNodeId)(neighbor.getPeerDescriptor());
-            this.options.neighbors.get(nodeId).setRtt(Date.now() - startTime);
-            if (res.removeMe) {
-                this.options.neighbors.remove(nodeId);
-                this.options.neighborFinder.start([nodeId]);
-            }
-        }));
-    }
-    createRemote(targetPeerDescriptor) {
-        return new NeighborUpdateRpcRemote_1.NeighborUpdateRpcRemote(this.options.localPeerDescriptor, targetPeerDescriptor, this.options.rpcCommunicator, NetworkRpc_client_1.NeighborUpdateRpcClient);
-    }
-}
-exports.NeighborUpdateManager = NeighborUpdateManager;
-//# sourceMappingURL=NeighborUpdateManager.js.map

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborUpdateManager.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NeighborUpdateManager.js","sourceRoot":"","sources":["../../../../src/content-delivery-layer/neighbor-discovery/NeighborUpdateManager.ts"],"names":[],"mappings":";;;AAAA,sCAA6F;AAC7F,0CAAyE;AACzE,kGAAkG;AAClG,gHAAkH;AAGlH,qEAAiE;AACjE,uEAAmE;AAcnE,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAEpB,QAAA,gCAAgC,GAAG,EAAE,GAAG,IAAI,CAAA;AAEzD,MAAa,qBAAqB;IAEb,eAAe,CAAiB;IAChC,OAAO,CAA8B;IACrC,QAAQ,CAAwB;IAEjD,YAAY,OAAqC;QAC7C,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC5C,IAAI,CAAC,QAAQ,GAAG,IAAI,+CAAsB,CAAC,OAAO,CAAC,CAAA;QACnD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,2BAAc,EAAE,2BAAc,EAAE,gBAAgB,EAC3F,CAAC,GAAmB,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAA;IACrF,CAAC;IAED,KAAK,CAAC,KAAK;QACP,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAA;IACtI,CAAC;IAED,IAAI;QACA,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,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;QAC3G,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;QAC5B,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC5E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,mBAAmB,CAAC,CAAA;YACjI,MAAM,MAAM,GAAG,IAAA,cAAQ,EAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACrD,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,CAAC,CAAA;YAClE,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;gBACf,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBACrC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;YAC/C,CAAC;QACL,CAAC,CAAC,CAAC,CAAA;IACP,CAAC;IAEO,YAAY,CAAC,oBAAoC;QACrD,OAAO,IAAI,iDAAuB,CAC9B,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAChC,oBAAoB,EACpB,IAAI,CAAC,OAAO,CAAC,eAAe,EAC5B,2CAAuB,CAC1B,CAAA;IACL,CAAC;CACJ;AA7CD,sDA6CC"}

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcLocal.d.ts

@@ -1,25 +0,0 @@
-import { ServerCallContext } from '@protobuf-ts/runtime-rpc';
-import { DhtAddress, ListeningRpcCommunicator, PeerDescriptor } from '@streamr/dht';
-import { StreamPartID } from '@streamr/utils';
-import { NeighborUpdate } from '../../../generated/packages/trackerless-network/protos/NetworkRpc';
-import { INeighborUpdateRpc } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.server';
-import { NodeList } from '../NodeList';
-import { NeighborFinder } from './NeighborFinder';
-interface NeighborUpdateRpcLocalOptions {
-    localPeerDescriptor: PeerDescriptor;
-    streamPartId: StreamPartID;
-    neighbors: NodeList;
-    nearbyNodeView: NodeList;
-    neighborFinder: NeighborFinder;
-    rpcCommunicator: ListeningRpcCommunicator;
-    neighborTargetCount: number;
-    ongoingHandshakes: Set<DhtAddress>;
-}
-export declare class NeighborUpdateRpcLocal implements INeighborUpdateRpc {
-    private readonly options;
-    constructor(options: NeighborUpdateRpcLocalOptions);
-    private updateContacts;
-    private createResponse;
-    neighborUpdate(message: NeighborUpdate, context: ServerCallContext): Promise<NeighborUpdate>;
-}
-export {};

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcLocal.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NeighborUpdateRpcLocal = void 0;
-const dht_1 = require("@streamr/dht");
-const NetworkRpc_client_1 = require("../../../generated/packages/trackerless-network/protos/NetworkRpc.client");
-const ContentDeliveryRpcRemote_1 = require("../ContentDeliveryRpcRemote");
-class NeighborUpdateRpcLocal {
-    options;
-    constructor(options) {
-        this.options = options;
-    }
-    updateContacts(neighborDescriptors) {
-        const ownNodeId = (0, dht_1.toNodeId)(this.options.localPeerDescriptor);
-        const newPeerDescriptors = neighborDescriptors.filter((peerDescriptor) => {
-            const nodeId = (0, dht_1.toNodeId)(peerDescriptor);
-            return nodeId !== ownNodeId && !this.options.neighbors.getIds().includes(nodeId);
-        });
-        newPeerDescriptors.forEach((peerDescriptor) => this.options.nearbyNodeView.add(new ContentDeliveryRpcRemote_1.ContentDeliveryRpcRemote(this.options.localPeerDescriptor, peerDescriptor, this.options.rpcCommunicator, NetworkRpc_client_1.ContentDeliveryRpcClient)));
-    }
-    createResponse(removeMe) {
-        return {
-            streamPartId: this.options.streamPartId,
-            neighborDescriptors: this.options.neighbors.getAll().map((neighbor) => neighbor.getPeerDescriptor()),
-            removeMe
-        };
-    }
-    // INeighborUpdateRpc server method
-    async neighborUpdate(message, context) {
-        const senderPeerDescriptor = context.incomingSourceDescriptor;
-        const remoteNodeId = (0, dht_1.toNodeId)(senderPeerDescriptor);
-        this.updateContacts(message.neighborDescriptors);
-        if (!this.options.neighbors.has(remoteNodeId) && !this.options.ongoingHandshakes.has(remoteNodeId)) {
-            return this.createResponse(true);
-        }
-        else {
-            const isOverNeighborCount = this.options.neighbors.size() > this.options.neighborTargetCount
-                // Motivation: We don't know the remote's neighborTargetCount setting here. We only ask to cut connections
-                // if the remote has a "sufficient" number of neighbors, where "sufficient" means our neighborTargetCount
-                // setting.
-                && message.neighborDescriptors.length > this.options.neighborTargetCount;
-            if (!isOverNeighborCount) {
-                this.options.neighborFinder.start();
-            }
-            else {
-                this.options.neighbors.remove(remoteNodeId);
-            }
-            return this.createResponse(isOverNeighborCount);
-        }
-    }
-}
-exports.NeighborUpdateRpcLocal = NeighborUpdateRpcLocal;
-//# sourceMappingURL=NeighborUpdateRpcLocal.js.map

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcLocal.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NeighborUpdateRpcLocal.js","sourceRoot":"","sources":["../../../../src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcLocal.ts"],"names":[],"mappings":";;;AACA,sCAA6G;AAG7G,gHAAmH;AAEnH,0EAAsE;AAetE,MAAa,sBAAsB;IAEd,OAAO,CAA+B;IAEvD,YAAY,OAAsC;QAC9C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;IAEO,cAAc,CAAC,mBAAqC;QACxD,MAAM,SAAS,GAAG,IAAA,cAAQ,EAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QAC5D,MAAM,kBAAkB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,cAAc,EAAE,EAAE;YACrE,MAAM,MAAM,GAAG,IAAA,cAAQ,EAAC,cAAc,CAAC,CAAA;YACvC,OAAO,MAAM,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QACpF,CAAC,CAAC,CAAA;QACF,kBAAkB,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAC1E,IAAI,mDAAwB,CACxB,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAChC,cAAc,EACd,IAAI,CAAC,OAAO,CAAC,eAAe,EAC5B,4CAAwB,CAC3B,CAAC,CACL,CAAA;IACL,CAAC;IAEO,cAAc,CAAC,QAAiB;QACpC,OAAO;YACH,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;YACvC,mBAAmB,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,CAAC;YACpG,QAAQ;SACX,CAAA;IACL,CAAC;IAED,mCAAmC;IACnC,KAAK,CAAC,cAAc,CAAC,OAAuB,EAAE,OAA0B;QACpE,MAAM,oBAAoB,GAAI,OAA0B,CAAC,wBAAyB,CAAA;QAClF,MAAM,YAAY,GAAG,IAAA,cAAQ,EAAC,oBAAoB,CAAC,CAAA;QACnD,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;QAChD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;YACjG,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QACpC,CAAC;aAAM,CAAC;YACJ,MAAM,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB;gBACxF,0GAA0G;gBAC1G,yGAAyG;gBACzG,WAAW;mBACR,OAAO,CAAC,mBAAmB,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAA;YAC5E,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBACvB,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,CAAA;YACvC,CAAC;iBAAM,CAAC;gBACJ,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YAC/C,CAAC;YACD,OAAO,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAA;QACnD,CAAC;IACL,CAAC;CACJ;AArDD,wDAqDC"}

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcRemote.d.ts

@@ -1,11 +0,0 @@
-import { PeerDescriptor, RpcRemote } from '@streamr/dht';
-import { StreamPartID } from '@streamr/utils';
-import { NeighborUpdateRpcClient } from '../../../generated/packages/trackerless-network/protos/NetworkRpc.client';
-interface UpdateNeighborsResponse {
-    peerDescriptors: PeerDescriptor[];
-    removeMe: boolean;
-}
-export declare class NeighborUpdateRpcRemote extends RpcRemote<NeighborUpdateRpcClient> {
-    updateNeighbors(streamPartId: StreamPartID, neighbors: PeerDescriptor[]): Promise<UpdateNeighborsResponse>;
-}
-export {};

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcRemote.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NeighborUpdateRpcRemote = void 0;
-const dht_1 = require("@streamr/dht");
-const utils_1 = require("@streamr/utils");
-const logger = new utils_1.Logger(module);
-class NeighborUpdateRpcRemote extends dht_1.RpcRemote {
-    async updateNeighbors(streamPartId, neighbors) {
-        const request = {
-            streamPartId,
-            neighborDescriptors: neighbors,
-            removeMe: false
-        };
-        try {
-            const response = await this.getClient().neighborUpdate(request, this.formDhtRpcOptions());
-            return {
-                peerDescriptors: response.neighborDescriptors,
-                removeMe: response.removeMe
-            };
-        }
-        catch (err) {
-            logger.debug(`updateNeighbors to ${(0, dht_1.toNodeId)(this.getPeerDescriptor())} failed`, { err });
-            return {
-                peerDescriptors: [],
-                removeMe: true
-            };
-        }
-    }
-}
-exports.NeighborUpdateRpcRemote = NeighborUpdateRpcRemote;
-//# sourceMappingURL=NeighborUpdateRpcRemote.js.map

package/dist/src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcRemote.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"NeighborUpdateRpcRemote.js","sourceRoot":"","sources":["../../../../src/content-delivery-layer/neighbor-discovery/NeighborUpdateRpcRemote.ts"],"names":[],"mappings":";;;AAAA,sCAAkE;AAClE,0CAAqD;AAIrD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAOjC,MAAa,uBAAwB,SAAQ,eAAkC;IAE3E,KAAK,CAAC,eAAe,CAAC,YAA0B,EAAE,SAA2B;QACzE,MAAM,OAAO,GAAmB;YAC5B,YAAY;YACZ,mBAAmB,EAAE,SAAS;YAC9B,QAAQ,EAAE,KAAK;SAClB,CAAA;QACD,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAA;YACzF,OAAO;gBACH,eAAe,EAAE,QAAQ,CAAC,mBAAmB;gBAC7C,QAAQ,EAAE,QAAQ,CAAC,QAAQ;aAC9B,CAAA;QACL,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAChB,MAAM,CAAC,KAAK,CAAC,sBAAsB,IAAA,cAAQ,EAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;YACxF,OAAO;gBACH,eAAe,EAAE,EAAE;gBACnB,QAAQ,EAAE,IAAI;aACjB,CAAA;QACL,CAAC;IACL,CAAC;CACJ;AAtBD,0DAsBC"}

package/dist/src/content-delivery-layer/plumtree/PausedNeighbors.d.ts

@@ -1,12 +0,0 @@
-import { DhtAddress } from '@streamr/dht';
-export declare class PausedNeighbors {
-    private readonly pausedNeighbors;
-    private readonly limit;
-    constructor(limit: number);
-    add(node: DhtAddress, msgChainId: string): void;
-    delete(node: DhtAddress, msgChainId: string): void;
-    deleteAll(node: DhtAddress): void;
-    isPaused(node: DhtAddress, msgChainId: string): boolean;
-    forEach(fn: (neighbors: Set<DhtAddress>, msgChainId: string) => void): void;
-    size(msgChainId: string): number;
-}

package/dist/src/content-delivery-layer/plumtree/PausedNeighbors.js

@@ -1,50 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PausedNeighbors = void 0;
-class PausedNeighbors {
-    pausedNeighbors;
-    limit;
-    constructor(limit) {
-        this.pausedNeighbors = new Map();
-        this.limit = limit;
-    }
-    add(node, msgChainId) {
-        if (!this.pausedNeighbors.has(msgChainId)) {
-            this.pausedNeighbors.set(msgChainId, new Set());
-        }
-        if (this.pausedNeighbors.get(msgChainId).size >= this.limit) {
-            return;
-        }
-        this.pausedNeighbors.get(msgChainId).add(node);
-    }
-    delete(node, msgChainId) {
-        this.pausedNeighbors.get(msgChainId)?.delete(node);
-        if (this.pausedNeighbors.get(msgChainId)?.size === 0) {
-            this.pausedNeighbors.delete(msgChainId);
-        }
-    }
-    deleteAll(node) {
-        this.pausedNeighbors.forEach((neighbors, msgChainId) => {
-            neighbors.delete(node);
-            if (neighbors.size === 0) {
-                this.pausedNeighbors.delete(msgChainId);
-            }
-        });
-    }
-    isPaused(node, msgChainId) {
-        if (!this.pausedNeighbors.has(msgChainId)) {
-            return false;
-        }
-        return this.pausedNeighbors.get(msgChainId).has(node);
-    }
-    forEach(fn) {
-        this.pausedNeighbors.forEach((neighbors, msgChainId) => {
-            fn(neighbors, msgChainId);
-        });
-    }
-    size(msgChainId) {
-        return this.pausedNeighbors.get(msgChainId)?.size ?? 0;
-    }
-}
-exports.PausedNeighbors = PausedNeighbors;
-//# sourceMappingURL=PausedNeighbors.js.map

package/dist/src/content-delivery-layer/plumtree/PausedNeighbors.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"PausedNeighbors.js","sourceRoot":"","sources":["../../../../src/content-delivery-layer/plumtree/PausedNeighbors.ts"],"names":[],"mappings":";;;AACA,MAAa,eAAe;IACP,eAAe,CAA8B;IAC7C,KAAK,CAAQ;IAE9B,YAAY,KAAa;QACrB,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,EAAE,CAAA;QAChC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;IACtB,CAAC;IAED,GAAG,CAAC,IAAgB,EAAE,UAAkB;QACpC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;QACnD,CAAC;QACD,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3D,OAAM;QACV,CAAC;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACnD,CAAC;IAED,MAAM,CAAC,IAAgB,EAAE,UAAkB;QACvC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAClD,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,IAAI,KAAK,CAAC,EAAE,CAAC;YACnD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAC3C,CAAC;IACL,CAAC;IAED,SAAS,CAAC,IAAgB;QACtB,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;YACnD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;YACtB,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;gBACvB,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;YAC3C,CAAC;QACL,CAAC,CAAC,CAAA;IACN,CAAC;IAED,QAAQ,CAAC,IAAgB,EAAE,UAAkB;QACzC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACxC,OAAO,KAAK,CAAA;QAChB,CAAC;QACD,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IAC1D,CAAC;IAED,OAAO,CAAC,EAA4D;QAChE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE;YACnD,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;QAC7B,CAAC,CAAC,CAAA;IACN,CAAC;IAED,IAAI,CAAC,UAAkB;QACnB,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,IAAI,IAAI,CAAC,CAAA;IAC1D,CAAC;CAEJ;AApDD,0CAoDC"}