@waku/core 0.0.9 → 0.0.11

package/dist/lib/connection_manager.js

@@ -0,0 +1,146 @@
+import { Tags } from "@waku/interfaces";
+import debug from "debug";
+import { KeepAliveManager } from "./keep_alive_manager.js";
+const log = debug("waku:connection-manager");
+export const DEFAULT_MAX_BOOTSTRAP_PEERS_ALLOWED = 1;
+export const DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER = 3;
+export class ConnectionManager {
+    static create(peerId, libp2p, keepAliveOptions, relay, options) {
+        let instance = ConnectionManager.instances.get(peerId);
+        if (!instance) {
+            instance = new ConnectionManager(libp2p, keepAliveOptions, relay, options);
+            ConnectionManager.instances.set(peerId, instance);
+        }
+        return instance;
+    }
+    constructor(libp2pComponents, keepAliveOptions, relay, options) {
+        this.dialAttemptsForPeer = new Map();
+        this.onEventHandlers = {
+            "peer:discovery": async (evt) => {
+                const { id: peerId } = evt.detail;
+                if (!(await this.shouldDialPeer(peerId)))
+                    return;
+                this.dialPeer(peerId).catch((err) => log(`Error dialing peer ${peerId.toString()} : ${err}`));
+            },
+            "peer:connect": (evt) => {
+                {
+                    this.keepAliveManager.start(evt.detail.remotePeer, this.libp2pComponents.ping.bind(this));
+                }
+            },
+            "peer:disconnect": () => {
+                return (evt) => {
+                    this.keepAliveManager.stop(evt.detail.remotePeer);
+                };
+            },
+        };
+        this.libp2pComponents = libp2pComponents;
+        this.options = {
+            maxDialAttemptsForPeer: DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER,
+            maxBootstrapPeersAllowed: DEFAULT_MAX_BOOTSTRAP_PEERS_ALLOWED,
+            ...options,
+        };
+        this.keepAliveManager = new KeepAliveManager(keepAliveOptions, relay);
+        this.run()
+            .then(() => log(`Connection Manager is now running`))
+            .catch((error) => log(`Unexpected error while running service`, error));
+    }
+    async run() {
+        // start event listeners
+        this.startPeerDiscoveryListener();
+        this.startPeerConnectionListener();
+        this.startPeerDisconnectionListener();
+    }
+    stop() {
+        this.keepAliveManager.stopAll();
+        this.libp2pComponents.removeEventListener("peer:connect", this.onEventHandlers["peer:connect"]);
+        this.libp2pComponents.removeEventListener("peer:disconnect", this.onEventHandlers["peer:disconnect"]);
+        this.libp2pComponents.removeEventListener("peer:discovery", this.onEventHandlers["peer:discovery"]);
+    }
+    async dialPeer(peerId) {
+        let dialAttempt = 0;
+        while (dialAttempt <= this.options.maxDialAttemptsForPeer) {
+            try {
+                log(`Dialing peer ${peerId.toString()}`);
+                await this.libp2pComponents.dial(peerId);
+                const tags = await this.getTagNamesForPeer(peerId);
+                // add tag to connection describing discovery mechanism
+                // don't add duplicate tags
+                this.libp2pComponents
+                    .getConnections(peerId)
+                    .forEach((conn) => (conn.tags = Array.from(new Set([...conn.tags, ...tags]))));
+                this.dialAttemptsForPeer.delete(peerId.toString());
+                return;
+            }
+            catch (error) {
+                log(`
+          Error dialing peer ${peerId.toString()}`);
+                dialAttempt = this.dialAttemptsForPeer.get(peerId.toString()) ?? 1;
+                this.dialAttemptsForPeer.set(peerId.toString(), dialAttempt + 1);
+                if (dialAttempt <= this.options.maxDialAttemptsForPeer) {
+                    log(`Reattempting dial (${dialAttempt})`);
+                }
+            }
+        }
+        try {
+            log(`Deleting undialable peer ${peerId.toString()} from peer store`);
+            return await this.libp2pComponents.peerStore.delete(peerId);
+        }
+        catch (error) {
+            throw `Error deleting undialable peer ${peerId.toString()} from peer store - ${error}`;
+        }
+    }
+    startPeerDiscoveryListener() {
+        this.libp2pComponents.peerStore.addEventListener("peer", this.onEventHandlers["peer:discovery"]);
+    }
+    startPeerConnectionListener() {
+        this.libp2pComponents.addEventListener("peer:connect", this.onEventHandlers["peer:connect"]);
+    }
+    startPeerDisconnectionListener() {
+        // TODO: ensure that these following issues are updated and confirmed
+        /**
+         * NOTE: Event is not being emitted on closing nor losing a connection.
+         * @see https://github.com/libp2p/js-libp2p/issues/939
+         * @see https://github.com/status-im/js-waku/issues/252
+         *
+         * >This event will be triggered anytime we are disconnected from another peer,
+         * >regardless of the circumstances of that disconnection.
+         * >If we happen to have multiple connections to a peer,
+         * >this event will **only** be triggered when the last connection is closed.
+         * @see https://github.com/libp2p/js-libp2p/blob/bad9e8c0ff58d60a78314077720c82ae331cc55b/doc/API.md?plain=1#L2100
+         */
+        this.libp2pComponents.addEventListener("peer:disconnect", this.onEventHandlers["peer:disconnect"]);
+    }
+    /**
+     * Checks if the peer is dialable based on the following conditions:
+     * 1. If the peer is a bootstrap peer, it is only dialable if the number of current bootstrap connections is less than the max allowed.
+     * 2. If the peer is not a bootstrap peer
+     */
+    async shouldDialPeer(peerId) {
+        const isConnected = this.libp2pComponents.getConnections(peerId).length > 0;
+        if (isConnected)
+            return false;
+        const isBootstrap = (await this.getTagNamesForPeer(peerId)).some((tagName) => tagName === Tags.BOOTSTRAP);
+        if (isBootstrap) {
+            const currentBootstrapConnections = this.libp2pComponents
+                .getConnections()
+                .filter((conn) => {
+                conn.tags.find((name) => name === Tags.BOOTSTRAP);
+            }).length;
+            if (currentBootstrapConnections < this.options.maxBootstrapPeersAllowed)
+                return true;
+        }
+        else {
+            return true;
+        }
+        return false;
+    }
+    /**
+     * Fetches the tag names for a given peer
+     */
+    async getTagNamesForPeer(peerId) {
+        const tags = (await this.libp2pComponents.peerStore.getTags(peerId)).map((tag) => tag.name);
+        return tags;
+    }
+}
+ConnectionManager.instances = new Map();
+//# sourceMappingURL=connection_manager.js.map

package/dist/lib/connection_manager.js.map

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

package/dist/lib/filter/filter_rpc.d.ts

@@ -1,25 +1,25 @@
 import { proto_filter as proto } from "@waku/proto";
-export declare type ContentFilter = {
+export type ContentFilter = {
     contentTopic: string;
 };
 /**
  * FilterRPC represents a message conforming to the Waku Filter protocol
  */
-export declare class FilterRPC {
-    proto: proto.FilterRPC;
-    constructor(proto: proto.FilterRPC);
-    static createRequest(topic: string, contentFilters: ContentFilter[], requestId?: string, subscribe?: boolean): FilterRPC;
+export declare class FilterRpc {
+    proto: proto.FilterRpc;
+    constructor(proto: proto.FilterRpc);
+    static createRequest(topic: string, contentFilters: ContentFilter[], requestId?: string, subscribe?: boolean): FilterRpc;
     /**
      *
      * @param bytes Uint8Array of bytes from a FilterRPC message
-     * @returns FilterRPC
+     * @returns FilterRpc
      */
-    static decode(bytes: Uint8Array): FilterRPC;
+    static decode(bytes: Uint8Array): FilterRpc;
     /**
      * Encode the current FilterRPC request to bytes
      * @returns Uint8Array
      */
     encode(): Uint8Array;
     get push(): proto.MessagePush | undefined;
-    get requestId(): string | undefined;
+    get requestId(): string;
 }

package/dist/lib/filter/filter_rpc.js

@@ -3,12 +3,12 @@ import { v4 as uuid } from "uuid";
 /**
  * FilterRPC represents a message conforming to the Waku Filter protocol
  */
-export class FilterRPC {
+export class FilterRpc {
     constructor(proto) {
         this.proto = proto;
     }
     static createRequest(topic, contentFilters, requestId, subscribe = true) {
-        return new FilterRPC({
+        return new FilterRpc({
             requestId: requestId || uuid(),
             request: {
                 subscribe,
@@ -21,18 +21,18 @@ export class FilterRPC {
     /**
      *
      * @param bytes Uint8Array of bytes from a FilterRPC message
-     * @returns FilterRPC
+     * @returns FilterRpc
      */
     static decode(bytes) {
-        const res = proto.FilterRPC.decode(bytes);
-        return new FilterRPC(res);
+        const res = proto.FilterRpc.decode(bytes);
+        return new FilterRpc(res);
     }
     /**
      * Encode the current FilterRPC request to bytes
      * @returns Uint8Array
      */
     encode() {
-        return proto.FilterRPC.encode(this.proto);
+        return proto.FilterRpc.encode(this.proto);
     }
     get push() {
         return this.proto.push;

package/dist/lib/filter/index.d.ts

@@ -1,25 +1,8 @@
-import type { ConnectionManager } from "@libp2p/interface-connection-manager";
-import type { PeerStore } from "@libp2p/interface-peer-store";
-import type { Registrar } from "@libp2p/interface-registrar";
-import type { IFilter } from "@waku/interfaces";
+import type { Libp2p } from "@libp2p/interface-libp2p";
+import type { IFilter, ProtocolCreateOptions } from "@waku/interfaces";
 import { ContentFilter } from "./filter_rpc.js";
 export { ContentFilter };
 export declare const FilterCodec = "/vac/waku/filter/2.0.0-beta1";
-export interface FilterComponents {
-    peerStore: PeerStore;
-    registrar: Registrar;
-    connectionManager: ConnectionManager;
-}
-export interface CreateOptions {
-    /**
-     * The PubSub Topic to use. Defaults to {@link DefaultPubSubTopic}.
-     *
-     * The usage of the default pubsub topic is recommended.
-     * See [Waku v2 Topic Usage Recommendations](https://rfc.vac.dev/spec/23/) for details.
-     *
-     * @default {@link DefaultPubSubTopic}
-     */
-    pubSubTopic?: string;
-}
-export declare type UnsubscribeFunction = () => Promise<void>;
-export declare function wakuFilter(init?: Partial<CreateOptions>): (components: FilterComponents) => IFilter;
+export type UnsubscribeFunction = () => Promise<void>;
+export type RequestID = string;
+export declare function wakuFilter(init?: Partial<ProtocolCreateOptions>): (libp2p: Libp2p) => IFilter;

package/dist/lib/filter/index.js

@@ -1,12 +1,12 @@
-import { getPeersForProtocol, selectConnection, selectPeerForProtocol, selectRandomPeer, } from "@waku/libp2p-utils";
 import debug from "debug";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
+import { BaseProtocol } from "../base_protocol.js";
 import { DefaultPubSubTopic } from "../constants.js";
 import { groupByContentTopic } from "../group_by.js";
 import { toProtoMessage } from "../to_proto_message.js";
-import { FilterRPC } from "./filter_rpc.js";
+import { FilterRpc } from "./filter_rpc.js";
 export const FilterCodec = "/vac/waku/filter/2.0.0-beta1";
 const log = debug("waku:filter");
 /**
@@ -16,14 +16,14 @@ const log = debug("waku:filter");
  * - https://github.com/status-im/go-waku/issues/245
  * - https://github.com/status-im/nwaku/issues/948
  */
-class Filter {
-    constructor(components, options) {
-        this.components = components;
+class Filter extends BaseProtocol {
+    constructor(libp2p, options) {
+        super(FilterCodec, libp2p.peerStore, libp2p.getConnections.bind(libp2p));
+        this.libp2p = libp2p;
+        this.options = options ?? {};
         this.subscriptions = new Map();
-        this.decoders = new Map();
-        this.pubSubTopic = options?.pubSubTopic ?? DefaultPubSubTopic;
-        this.components.registrar
-            .handle(FilterCodec, this.onRequest.bind(this))
+        this.libp2p
+            .handle(this.multicodec, this.onRequest.bind(this))
             .catch((e) => log("Failed to register filter protocol", e));
     }
     /**
@@ -33,16 +33,13 @@ class Filter {
      * @returns Unsubscribe function that can be used to end the subscription.
      */
     async subscribe(decoders, callback, opts) {
-        const topic = opts?.pubSubTopic ?? this.pubSubTopic;
-        const groupedDecoders = groupByContentTopic(decoders);
-        const contentTopics = Array.from(groupedDecoders.keys());
+        const { pubSubTopic = DefaultPubSubTopic } = this.options;
+        const contentTopics = Array.from(groupByContentTopic(decoders).keys());
         const contentFilters = contentTopics.map((contentTopic) => ({
             contentTopic,
         }));
-        const request = FilterRPC.createRequest(topic, contentFilters, undefined, true);
+        const request = FilterRpc.createRequest(pubSubTopic, contentFilters, undefined, true);
         const requestId = request.requestId;
-        if (!requestId)
-            throw new Error("Internal error: createRequest expected to set `requestId`");
         const peer = await this.getPeer(opts?.peerId);
         const stream = await this.newStream(peer);
         try {
@@ -53,23 +50,19 @@ class Filter {
             log("Error subscribing to peer ", peer.id.toString(), "for content topics", contentTopics, ": ", e);
             throw e;
         }
-        this.addDecoders(groupedDecoders);
-        this.addCallback(requestId, callback);
+        const subscription = { callback, decoders, pubSubTopic };
+        this.subscriptions.set(requestId, subscription);
         return async () => {
-            await this.unsubscribe(topic, contentFilters, requestId, peer);
-            this.deleteDecoders(groupedDecoders);
-            this.deleteCallback(requestId);
+            await this.unsubscribe(pubSubTopic, contentFilters, requestId, peer);
+            this.subscriptions.delete(requestId);
         };
     }
-    get peerStore() {
-        return this.components.peerStore;
-    }
     onRequest(streamData) {
         log("Receiving message push");
         try {
             pipe(streamData.stream, lp.decode(), async (source) => {
                 for await (const bytes of source) {
-                    const res = FilterRPC.decode(bytes.slice());
+                    const res = FilterRpc.decode(bytes.slice());
                     if (res.requestId && res.push?.messages?.length) {
                         await this.pushMessages(res.requestId, res.push.messages);
                     }
@@ -85,9 +78,14 @@ class Filter {
         }
     }
     async pushMessages(requestId, messages) {
-        const callback = this.subscriptions.get(requestId);
-        if (!callback) {
-            log(`No callback registered for request ID ${requestId}`);
+        const subscription = this.subscriptions.get(requestId);
+        if (!subscription) {
+            log(`No subscription locally registered for request ID ${requestId}`);
+            return;
+        }
+        const { decoders, callback, pubSubTopic } = subscription;
+        if (!decoders || !decoders.length) {
+            log(`No decoder registered for request ID ${requestId}`);
             return;
         }
         for (const protoMessage of messages) {
@@ -96,59 +94,27 @@ class Filter {
                 log("Message has no content topic, skipping");
                 return;
             }
-            const decoders = this.decoders.get(contentTopic);
-            if (!decoders) {
-                log("No decoder for", contentTopic);
-                return;
-            }
-            let msg;
+            let didDecodeMsg = false;
             // We don't want to wait for decoding failure, just attempt to decode
             // all messages and do the call back on the one that works
             // noinspection ES6MissingAwait
             decoders.forEach(async (dec) => {
-                if (msg)
+                if (didDecodeMsg)
                     return;
-                const decoded = await dec.fromProtoObj(toProtoMessage(protoMessage));
+                const decoded = await dec.fromProtoObj(pubSubTopic, toProtoMessage(protoMessage));
                 if (!decoded) {
                     log("Not able to decode message");
                     return;
                 }
                 // This is just to prevent more decoding attempt
                 // TODO: Could be better if we were to abort promises
-                msg = decoded;
+                didDecodeMsg = Boolean(decoded);
                 await callback(decoded);
             });
         }
     }
-    addCallback(requestId, callback) {
-        this.subscriptions.set(requestId, callback);
-    }
-    deleteCallback(requestId) {
-        this.subscriptions.delete(requestId);
-    }
-    addDecoders(decoders) {
-        decoders.forEach((decoders, contentTopic) => {
-            const currDecs = this.decoders.get(contentTopic);
-            if (!currDecs) {
-                this.decoders.set(contentTopic, new Set(decoders));
-            }
-            else {
-                this.decoders.set(contentTopic, new Set([...currDecs, ...decoders]));
-            }
-        });
-    }
-    deleteDecoders(decoders) {
-        decoders.forEach((decoders, contentTopic) => {
-            const currDecs = this.decoders.get(contentTopic);
-            if (currDecs) {
-                decoders.forEach((dec) => {
-                    currDecs.delete(dec);
-                });
-            }
-        });
-    }
     async unsubscribe(topic, contentFilters, requestId, peer) {
-        const unsubscribeRequest = FilterRPC.createRequest(topic, contentFilters, requestId, false);
+        const unsubscribeRequest = FilterRpc.createRequest(topic, contentFilters, requestId, false);
         const stream = await this.newStream(peer);
         try {
             await pipe([unsubscribeRequest.encode()], lp.encode(), stream.sink);
@@ -158,29 +124,8 @@ class Filter {
             throw e;
         }
     }
-    async newStream(peer) {
-        const connections = this.components.connectionManager.getConnections(peer.id);
-        const connection = selectConnection(connections);
-        if (!connection) {
-            throw new Error("Failed to get a connection to the peer");
-        }
-        return connection.newStream(FilterCodec);
-    }
-    async getPeer(peerId) {
-        const res = await selectPeerForProtocol(this.components.peerStore, [FilterCodec], peerId);
-        if (!res) {
-            throw new Error(`Failed to select peer for ${FilterCodec}`);
-        }
-        return res.peer;
-    }
-    async peers() {
-        return getPeersForProtocol(this.components.peerStore, [FilterCodec]);
-    }
-    async randomPeer() {
-        return selectRandomPeer(await this.peers());
-    }
 }
 export function wakuFilter(init = {}) {
-    return (components) => new Filter(components, init);
+    return (libp2p) => new Filter(libp2p, init);
 }
 //# sourceMappingURL=index.js.map

package/dist/lib/filter/index.js.map

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

package/dist/lib/group_by.d.ts

@@ -1,3 +1,3 @@
 export declare function groupByContentTopic<T extends {
     contentTopic: string;
-}>(values: T[]): Map<string, Array<T>>;
+}>(values: readonly T[]): Map<string, Array<T>>;

package/dist/lib/group_by.js.map

@@ -1 +1 @@
-{"version":3,"file":"group_by.js","sourceRoot":"","sources":["../../src/lib/group_by.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,mBAAmB,CACjC,MAAW;IAEX,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;IAClC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,EAAE;YACT,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAC5C,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAChD;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,OAAO,eAAe,CAAC;AACzB,CAAC"}
+{"version":3,"file":"group_by.js","sourceRoot":"","sources":["../../src/lib/group_by.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,mBAAmB,CACjC,MAAoB;IAEpB,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;IAClC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACnD,IAAI,CAAC,IAAI,EAAE;YACT,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;YAC5C,IAAI,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAChD;QACD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC,CAAC,CAAC;IACH,OAAO,eAAe,CAAC;AACzB,CAAC"}

package/dist/lib/keep_alive_manager.d.ts

@@ -0,0 +1,17 @@
+import type { PeerId } from "@libp2p/interface-peer-id";
+import type { IRelay } from "@waku/interfaces";
+import type { Libp2p } from "libp2p";
+export interface KeepAliveOptions {
+    pingKeepAlive: number;
+    relayKeepAlive: number;
+}
+export declare class KeepAliveManager {
+    private pingKeepAliveTimers;
+    private relayKeepAliveTimers;
+    private options;
+    private relay?;
+    constructor(options: KeepAliveOptions, relay?: IRelay);
+    start(peerId: PeerId, libp2pPing: Libp2p["ping"]): void;
+    stop(peerId: PeerId): void;
+    stopAll(): void;
+}

package/dist/lib/keep_alive_manager.js

@@ -0,0 +1,62 @@
+import debug from "debug";
+import { createEncoder } from "../index.js";
+import { RelayPingContentTopic } from "./relay/constants.js";
+const log = debug("waku:keep-alive");
+export class KeepAliveManager {
+    constructor(options, relay) {
+        this.pingKeepAliveTimers = new Map();
+        this.relayKeepAliveTimers = new Map();
+        this.options = options;
+        this.relay = relay;
+    }
+    start(peerId, libp2pPing) {
+        // Just in case a timer already exist for this peer
+        this.stop(peerId);
+        const { pingKeepAlive: pingPeriodSecs, relayKeepAlive: relayPeriodSecs } = this.options;
+        const peerIdStr = peerId.toString();
+        if (pingPeriodSecs !== 0) {
+            const interval = setInterval(() => {
+                libp2pPing(peerId).catch((e) => {
+                    log(`Ping failed (${peerIdStr})`, e);
+                });
+            }, pingPeriodSecs * 1000);
+            this.pingKeepAliveTimers.set(peerIdStr, interval);
+        }
+        const relay = this.relay;
+        if (relay && relayPeriodSecs !== 0) {
+            const encoder = createEncoder({
+                contentTopic: RelayPingContentTopic,
+                ephemeral: true,
+            });
+            const interval = setInterval(() => {
+                log("Sending Waku Relay ping message");
+                relay
+                    .send(encoder, { payload: new Uint8Array([1]) })
+                    .catch((e) => log("Failed to send relay ping", e));
+            }, relayPeriodSecs * 1000);
+            this.relayKeepAliveTimers.set(peerId, interval);
+        }
+    }
+    stop(peerId) {
+        const peerIdStr = peerId.toString();
+        if (this.pingKeepAliveTimers.has(peerIdStr)) {
+            clearInterval(this.pingKeepAliveTimers.get(peerIdStr));
+            this.pingKeepAliveTimers.delete(peerIdStr);
+        }
+        if (this.relayKeepAliveTimers.has(peerId)) {
+            clearInterval(this.relayKeepAliveTimers.get(peerId));
+            this.relayKeepAliveTimers.delete(peerId);
+        }
+    }
+    stopAll() {
+        for (const timer of [
+            ...Object.values(this.pingKeepAliveTimers),
+            ...Object.values(this.relayKeepAliveTimers),
+        ]) {
+            clearInterval(timer);
+        }
+        this.pingKeepAliveTimers.clear();
+        this.relayKeepAliveTimers.clear();
+    }
+}
+//# sourceMappingURL=keep_alive_manager.js.map

package/dist/lib/keep_alive_manager.js.map

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

package/dist/lib/light_push/index.d.ts

@@ -1,22 +1,6 @@
-import { ConnectionManager } from "@libp2p/interface-connection-manager";
-import type { PeerStore } from "@libp2p/interface-peer-store";
-import type { ILightPush } from "@waku/interfaces";
+import type { Libp2p } from "@libp2p/interface-libp2p";
+import type { ILightPush, ProtocolCreateOptions } from "@waku/interfaces";
 import { PushResponse } from "@waku/proto";
 export declare const LightPushCodec = "/vac/waku/lightpush/2.0.0-beta1";
 export { PushResponse };
-export interface LightPushComponents {
-    peerStore: PeerStore;
-    connectionManager: ConnectionManager;
-}
-export interface CreateOptions {
-    /**
-     * The PubSub Topic to use. Defaults to {@link DefaultPubSubTopic}.
-     *
-     * The usage of the default pubsub topic is recommended.
-     * See [Waku v2 Topic Usage Recommendations](https://rfc.vac.dev/spec/23/) for details.
-     *
-     * @default {@link DefaultPubSubTopic}
-     */
-    pubSubTopic?: string;
-}
-export declare function wakuLightPush(init?: Partial<CreateOptions>): (components: LightPushComponents) => ILightPush;
+export declare function wakuLightPush(init?: Partial<ProtocolCreateOptions>): (libp2p: Libp2p) => ILightPush;