@waku/core 0.0.37-7a9850d.0 → 0.0.37-987c6cd.0

package/dist/lib/connection_manager/dialer.d.ts

@@ -0,0 +1,28 @@
+import type { PeerId } from "@libp2p/interface";
+import { Libp2p } from "@waku/interfaces";
+import { ShardReader } from "./shard_reader.js";
+type DialerConstructorOptions = {
+    libp2p: Libp2p;
+    shardReader: ShardReader;
+};
+interface IDialer {
+    start(): void;
+    stop(): void;
+    dial(peerId: PeerId): Promise<void>;
+}
+export declare class Dialer implements IDialer {
+    private readonly libp2p;
+    private readonly shardReader;
+    private dialingQueue;
+    private dialHistory;
+    private dialingInterval;
+    private isProcessing;
+    constructor(options: DialerConstructorOptions);
+    start(): void;
+    stop(): void;
+    dial(peerId: PeerId): Promise<void>;
+    private processQueue;
+    private dialPeer;
+    private shouldSkipPeer;
+}
+export {};

package/dist/lib/connection_manager/dialer.js

@@ -0,0 +1,100 @@
+import { Logger } from "@waku/utils";
+const log = new Logger("dialer");
+export class Dialer {
+    libp2p;
+    shardReader;
+    dialingQueue = [];
+    dialHistory = new Map();
+    dialingInterval = null;
+    isProcessing = false;
+    constructor(options) {
+        this.libp2p = options.libp2p;
+        this.shardReader = options.shardReader;
+    }
+    start() {
+        if (!this.dialingInterval) {
+            this.dialingInterval = setInterval(() => {
+                void this.processQueue();
+            }, 500);
+        }
+        this.dialHistory.clear();
+    }
+    stop() {
+        if (this.dialingInterval) {
+            clearInterval(this.dialingInterval);
+            this.dialingInterval = null;
+        }
+        this.dialHistory.clear();
+    }
+    async dial(peerId) {
+        const shouldSkip = await this.shouldSkipPeer(peerId);
+        if (shouldSkip) {
+            log.info(`Skipping peer: ${peerId}`);
+            return;
+        }
+        // If queue is empty and we're not currently processing, dial immediately
+        if (this.dialingQueue.length === 0 && !this.isProcessing) {
+            await this.dialPeer(peerId);
+        }
+        else {
+            // Add to queue
+            this.dialingQueue.push(peerId);
+            log.info(`Added peer to dialing queue, queue size: ${this.dialingQueue.length}`);
+        }
+    }
+    async processQueue() {
+        if (this.dialingQueue.length === 0 || this.isProcessing)
+            return;
+        this.isProcessing = true;
+        try {
+            const peersToDial = this.dialingQueue.slice(0, 3);
+            this.dialingQueue = this.dialingQueue.slice(peersToDial.length);
+            log.info(`Processing dial queue: dialing ${peersToDial.length} peers, ${this.dialingQueue.length} remaining in queue`);
+            await Promise.all(peersToDial.map((peerId) => this.dialPeer(peerId)));
+        }
+        finally {
+            this.isProcessing = false;
+        }
+    }
+    async dialPeer(peerId) {
+        try {
+            log.info(`Dialing peer from queue: ${peerId}`);
+            await this.libp2p.dial(peerId);
+            this.dialHistory.set(peerId.toString(), Date.now());
+            log.info(`Successfully dialed peer from queue: ${peerId}`);
+        }
+        catch (error) {
+            log.error(`Error dialing peer ${peerId}`, error);
+        }
+    }
+    async shouldSkipPeer(peerId) {
+        const hasConnection = this.libp2p.getPeers().some((p) => p.equals(peerId));
+        if (hasConnection) {
+            log.info(`Skipping peer ${peerId} - already connected`);
+            return true;
+        }
+        const lastDialed = this.dialHistory.get(peerId.toString());
+        if (lastDialed && Date.now() - lastDialed < 10_000) {
+            log.info(`Skipping peer ${peerId} - already dialed in the last 10 seconds`);
+            return true;
+        }
+        try {
+            const hasShardInfo = await this.shardReader.hasShardInfo(peerId);
+            if (!hasShardInfo) {
+                log.info(`Skipping peer ${peerId} - no shard info`);
+                return false;
+            }
+            const isOnSameShard = await this.shardReader.isPeerOnNetwork(peerId);
+            if (!isOnSameShard) {
+                log.info(`Skipping peer ${peerId} - not on same shard`);
+                return true;
+            }
+            return false;
+        }
+        catch (error) {
+            log.error(`Error checking shard info for peer ${peerId}`, error);
+            return true; // Skip peer when there's an error
+        }
+    }
+}
+//# sourceMappingURL=dialer.js.map

package/dist/lib/connection_manager/dialer.js.map

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

package/dist/lib/connection_manager/discovery_dialer.d.ts

@@ -0,0 +1,26 @@
+import { Libp2p } from "libp2p";
+import { Dialer } from "./dialer.js";
+type DiscoveryDialerConstructorOptions = {
+    libp2p: Libp2p;
+    dialer: Dialer;
+};
+interface IDiscoveryDialer {
+    start(): void;
+    stop(): void;
+}
+/**
+ * This class is responsible for dialing peers that are discovered by the libp2p node.
+ * Managing limits for the peers is out of scope for this class.
+ * Dialing after discovery is needed to identify the peer and get all other information: metadata, protocols, etc.
+ */
+export declare class DiscoveryDialer implements IDiscoveryDialer {
+    private readonly libp2p;
+    private readonly dialer;
+    constructor(options: DiscoveryDialerConstructorOptions);
+    start(): void;
+    stop(): void;
+    private onPeerDiscovery;
+    private updatePeerStore;
+    private getPeer;
+}
+export {};

package/dist/lib/connection_manager/discovery_dialer.js

@@ -0,0 +1,68 @@
+import { Logger } from "@waku/utils";
+const log = new Logger("discovery-dialer");
+/**
+ * This class is responsible for dialing peers that are discovered by the libp2p node.
+ * Managing limits for the peers is out of scope for this class.
+ * Dialing after discovery is needed to identify the peer and get all other information: metadata, protocols, etc.
+ */
+export class DiscoveryDialer {
+    libp2p;
+    dialer;
+    constructor(options) {
+        this.libp2p = options.libp2p;
+        this.dialer = options.dialer;
+        this.onPeerDiscovery = this.onPeerDiscovery.bind(this);
+    }
+    start() {
+        this.libp2p.addEventListener("peer:discovery", this.onPeerDiscovery);
+    }
+    stop() {
+        this.libp2p.removeEventListener("peer:discovery", this.onPeerDiscovery);
+    }
+    async onPeerDiscovery(event) {
+        const peerId = event.detail.id;
+        log.info(`Discovered new peer: ${peerId}`);
+        try {
+            await this.updatePeerStore(peerId, event.detail.multiaddrs);
+            await this.dialer.dial(peerId);
+        }
+        catch (error) {
+            log.error(`Error dialing peer ${peerId}`, error);
+        }
+    }
+    async updatePeerStore(peerId, multiaddrs) {
+        try {
+            log.info(`Updating peer store for ${peerId}`);
+            const peer = await this.getPeer(peerId);
+            if (!peer) {
+                log.info(`Peer ${peerId} not found in store, saving`);
+                await this.libp2p.peerStore.save(peerId, {
+                    multiaddrs: multiaddrs
+                });
+                return;
+            }
+            const hasSameAddr = multiaddrs.every((addr) => peer.addresses.some((a) => a.multiaddr.equals(addr)));
+            if (hasSameAddr) {
+                log.info(`Peer ${peerId} has same addresses in peer store, skipping`);
+                return;
+            }
+            log.info(`Merging peer ${peerId} addresses in peer store`);
+            await this.libp2p.peerStore.merge(peerId, {
+                multiaddrs: multiaddrs
+            });
+        }
+        catch (error) {
+            log.error(`Error updating peer store for ${peerId}`, error);
+        }
+    }
+    async getPeer(peerId) {
+        try {
+            return await this.libp2p.peerStore.get(peerId);
+        }
+        catch (error) {
+            log.error(`Error getting peer info for ${peerId}`, error);
+            return undefined;
+        }
+    }
+}
+//# sourceMappingURL=discovery_dialer.js.map

package/dist/lib/connection_manager/discovery_dialer.js.map

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

package/dist/lib/connection_manager/keep_alive_manager.d.ts

@@ -1,4 +1,3 @@
-import type { PeerId } from "@libp2p/interface";
 import type { IRelay, Libp2p } from "@waku/interfaces";
 type KeepAliveOptions = {
     pingKeepAlive: number;
@@ -9,17 +8,28 @@ type CreateKeepAliveManagerOptions = {
     libp2p: Libp2p;
     relay?: IRelay;
 };
-export declare class KeepAliveManager {
+interface IKeepAliveManager {
+    start(): void;
+    stop(): void;
+}
+export declare class KeepAliveManager implements IKeepAliveManager {
     private readonly relay?;
     private readonly libp2p;
     private readonly options;
     private pingKeepAliveTimers;
     private relayKeepAliveTimers;
     constructor({ options, relay, libp2p }: CreateKeepAliveManagerOptions);
-    start(peerId: PeerId): void;
-    stop(peerId: PeerId): void;
-    stopAll(): void;
-    connectionsExist(): boolean;
-    private scheduleRelayPings;
+    start(): void;
+    stop(): void;
+    private onPeerConnect;
+    private onPeerDisconnect;
+    private startPingForPeer;
+    private stopPingForPeer;
+    private startLibp2pPing;
+    private stopLibp2pPing;
+    private startRelayPing;
+    private stopRelayPing;
+    private pingRelay;
+    private pingLibp2p;
 }
 export {};

package/dist/lib/connection_manager/keep_alive_manager.js

@@ -13,100 +13,136 @@ export class KeepAliveManager {
         this.options = options;
         this.relay = relay;
         this.libp2p = libp2p;
+        this.onPeerConnect = this.onPeerConnect.bind(this);
+        this.onPeerDisconnect = this.onPeerDisconnect.bind(this);
     }
-    start(peerId) {
-        // Just in case a timer already exists for this peer
-        this.stop(peerId);
-        const { pingKeepAlive: pingPeriodSecs, relayKeepAlive: relayPeriodSecs } = this.options;
-        const peerIdStr = peerId.toString();
-        // Ping the peer every pingPeriodSecs seconds
-        // if pingPeriodSecs is 0, don't ping the peer
-        if (pingPeriodSecs !== 0) {
-            const interval = setInterval(() => {
-                void (async () => {
-                    let ping;
-                    try {
-                        // ping the peer for keep alive
-                        // also update the peer store with the latency
-                        try {
-                            ping = await this.libp2p.services.ping.ping(peerId);
-                            log.info(`Ping succeeded (${peerIdStr})`, ping);
-                        }
-                        catch (error) {
-                            log.error(`Ping failed for peer (${peerIdStr}).
-                Next ping will be attempted in ${pingPeriodSecs} seconds.
-              `);
-                            return;
-                        }
-                        try {
-                            await this.libp2p.peerStore.merge(peerId, {
-                                metadata: {
-                                    ping: utf8ToBytes(ping.toString())
-                                }
-                            });
-                        }
-                        catch (e) {
-                            log.error("Failed to update ping", e);
-                        }
-                    }
-                    catch (e) {
-                        log.error(`Ping failed (${peerIdStr})`, e);
-                    }
-                })();
-            }, pingPeriodSecs * 1000);
-            this.pingKeepAliveTimers.set(peerIdStr, interval);
+    start() {
+        this.libp2p.addEventListener("peer:connect", this.onPeerConnect);
+        this.libp2p.addEventListener("peer:disconnect", this.onPeerDisconnect);
+    }
+    stop() {
+        this.libp2p.removeEventListener("peer:connect", this.onPeerConnect);
+        this.libp2p.removeEventListener("peer:disconnect", this.onPeerDisconnect);
+        for (const timer of this.pingKeepAliveTimers.values()) {
+            clearInterval(timer);
         }
-        const relay = this.relay;
-        if (relay && relayPeriodSecs !== 0) {
-            const intervals = this.scheduleRelayPings(relay, relayPeriodSecs, peerId.toString());
-            this.relayKeepAliveTimers.set(peerId, intervals);
+        for (const timerArray of this.relayKeepAliveTimers.values()) {
+            for (const timer of timerArray) {
+                clearInterval(timer);
+            }
         }
+        this.pingKeepAliveTimers.clear();
+        this.relayKeepAliveTimers.clear();
+    }
+    onPeerConnect(evt) {
+        const peerId = evt.detail;
+        this.startPingForPeer(peerId);
+    }
+    onPeerDisconnect(evt) {
+        const peerId = evt.detail;
+        this.stopPingForPeer(peerId);
     }
-    stop(peerId) {
+    startPingForPeer(peerId) {
+        // Just in case a timer already exists for this peer
+        this.stopPingForPeer(peerId);
+        this.startLibp2pPing(peerId);
+        this.startRelayPing(peerId);
+    }
+    stopPingForPeer(peerId) {
+        this.stopLibp2pPing(peerId);
+        this.stopRelayPing(peerId);
+    }
+    startLibp2pPing(peerId) {
+        if (this.options.pingKeepAlive === 0) {
+            log.warn(`Ping keep alive is disabled pingKeepAlive:${this.options.pingKeepAlive}, skipping start for libp2p ping`);
+            return;
+        }
         const peerIdStr = peerId.toString();
         if (this.pingKeepAliveTimers.has(peerIdStr)) {
-            clearInterval(this.pingKeepAliveTimers.get(peerIdStr));
-            this.pingKeepAliveTimers.delete(peerIdStr);
-        }
-        if (this.relayKeepAliveTimers.has(peerId)) {
-            this.relayKeepAliveTimers.get(peerId)?.map(clearInterval);
-            this.relayKeepAliveTimers.delete(peerId);
+            log.warn(`Ping already started for peer: ${peerIdStr}, skipping start for libp2p ping`);
+            return;
         }
+        const interval = setInterval(() => {
+            void this.pingLibp2p(peerId);
+        }, this.options.pingKeepAlive * 1000);
+        this.pingKeepAliveTimers.set(peerIdStr, interval);
     }
-    stopAll() {
-        for (const timer of [
-            ...Object.values(this.pingKeepAliveTimers),
-            ...Object.values(this.relayKeepAliveTimers)
-        ]) {
-            clearInterval(timer);
+    stopLibp2pPing(peerId) {
+        const peerIdStr = peerId.toString();
+        if (!this.pingKeepAliveTimers.has(peerIdStr)) {
+            log.warn(`Ping not started for peer: ${peerIdStr}, skipping stop for ping`);
+            return;
         }
-        this.pingKeepAliveTimers.clear();
-        this.relayKeepAliveTimers.clear();
-    }
-    connectionsExist() {
-        return (this.pingKeepAliveTimers.size > 0 || this.relayKeepAliveTimers.size > 0);
+        clearInterval(this.pingKeepAliveTimers.get(peerIdStr));
+        this.pingKeepAliveTimers.delete(peerIdStr);
     }
-    scheduleRelayPings(relay, relayPeriodSecs, peerIdStr) {
-        // send a ping message to each PubsubTopic the peer is part of
+    startRelayPing(peerId) {
+        if (!this.relay) {
+            return;
+        }
+        if (this.options.relayKeepAlive === 0) {
+            log.warn(`Relay keep alive is disabled relayKeepAlive:${this.options.relayKeepAlive}, skipping start for relay ping`);
+            return;
+        }
+        if (this.relayKeepAliveTimers.has(peerId.toString())) {
+            log.warn(`Relay ping already started for peer: ${peerId.toString()}, skipping start for relay ping`);
+            return;
+        }
         const intervals = [];
-        for (const topic of relay.pubsubTopics) {
-            const meshPeers = relay.getMeshPeers(topic);
-            if (!meshPeers.includes(peerIdStr))
+        for (const topic of this.relay.pubsubTopics) {
+            const meshPeers = this.relay.getMeshPeers(topic);
+            if (!meshPeers.includes(peerId.toString())) {
+                log.warn(`Peer: ${peerId.toString()} is not in the mesh for topic: ${topic}, skipping start for relay ping`);
                 continue;
+            }
             const encoder = createEncoder({
                 pubsubTopicShardInfo: pubsubTopicToSingleShardInfo(topic),
                 contentTopic: RelayPingContentTopic,
                 ephemeral: true
             });
             const interval = setInterval(() => {
-                log.info("Sending Waku Relay ping message");
-                relay
-                    .send(encoder, { payload: new Uint8Array([1]) })
-                    .catch((e) => log.error("Failed to send relay ping", e));
-            }, relayPeriodSecs * 1000);
+                void this.pingRelay(encoder);
+            }, this.options.relayKeepAlive * 1000);
             intervals.push(interval);
         }
-        return intervals;
+        this.relayKeepAliveTimers.set(peerId.toString(), intervals);
+    }
+    stopRelayPing(peerId) {
+        if (!this.relay) {
+            return;
+        }
+        const peerIdStr = peerId.toString();
+        if (!this.relayKeepAliveTimers.has(peerIdStr)) {
+            log.warn(`Relay ping not started for peer: ${peerIdStr}, skipping stop for relay ping`);
+            return;
+        }
+        this.relayKeepAliveTimers.get(peerIdStr)?.map(clearInterval);
+        this.relayKeepAliveTimers.delete(peerIdStr);
+    }
+    async pingRelay(encoder) {
+        try {
+            log.info("Sending Waku Relay ping message");
+            await this.relay.send(encoder, { payload: new Uint8Array([1]) });
+        }
+        catch (e) {
+            log.error("Failed to send relay ping", e);
+        }
+    }
+    async pingLibp2p(peerId) {
+        try {
+            log.info(`Pinging libp2p peer (${peerId.toString()})`);
+            const ping = await this.libp2p.services.ping.ping(peerId);
+            log.info(`Ping succeeded (${peerId.toString()})`, ping);
+            await this.libp2p.peerStore.merge(peerId, {
+                metadata: {
+                    ping: utf8ToBytes(ping.toString())
+                }
+            });
+            log.info(`Ping updated for peer (${peerId.toString()})`);
+        }
+        catch (e) {
+            log.error(`Ping failed for peer (${peerId.toString()})`, e);
+        }
     }
 }
 //# sourceMappingURL=keep_alive_manager.js.map

package/dist/lib/connection_manager/keep_alive_manager.js.map

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

package/dist/lib/connection_manager/network_monitor.d.ts

@@ -0,0 +1,36 @@
+import { IWakuEventEmitter, Libp2p } from "@waku/interfaces";
+type NetworkMonitorConstructorOptions = {
+    libp2p: Libp2p;
+    events: IWakuEventEmitter;
+};
+interface INetworkMonitor {
+    start(): void;
+    stop(): void;
+    isConnected(): boolean;
+    isP2PConnected(): boolean;
+    isBrowserConnected(): boolean;
+}
+export declare class NetworkMonitor implements INetworkMonitor {
+    private readonly libp2p;
+    private readonly events;
+    private isNetworkConnected;
+    constructor(options: NetworkMonitorConstructorOptions);
+    start(): void;
+    stop(): void;
+    /**
+     * Returns true if the node is connected to the network via libp2p and browser.
+     */
+    isConnected(): boolean;
+    /**
+     * Returns true if the node is connected to the network via libp2p.
+     */
+    isP2PConnected(): boolean;
+    /**
+     * Returns true if the node is connected to the network via browser.
+     */
+    isBrowserConnected(): boolean;
+    private onConnectedEvent;
+    private onDisconnectedEvent;
+    private dispatchNetworkEvent;
+}
+export {};

package/dist/lib/connection_manager/network_monitor.js

@@ -0,0 +1,81 @@
+export class NetworkMonitor {
+    libp2p;
+    events;
+    isNetworkConnected = false;
+    constructor(options) {
+        this.libp2p = options.libp2p;
+        this.events = options.events;
+        this.onConnectedEvent = this.onConnectedEvent.bind(this);
+        this.onDisconnectedEvent = this.onDisconnectedEvent.bind(this);
+        this.dispatchNetworkEvent = this.dispatchNetworkEvent.bind(this);
+    }
+    start() {
+        this.libp2p.addEventListener("peer:connect", this.onConnectedEvent);
+        this.libp2p.addEventListener("peer:disconnect", this.onDisconnectedEvent);
+        try {
+            globalThis.addEventListener("online", this.dispatchNetworkEvent);
+            globalThis.addEventListener("offline", this.dispatchNetworkEvent);
+        }
+        catch (err) {
+            // ignore
+        }
+    }
+    stop() {
+        this.libp2p.removeEventListener("peer:connect", this.onConnectedEvent);
+        this.libp2p.removeEventListener("peer:disconnect", this.onDisconnectedEvent);
+        try {
+            globalThis.removeEventListener("online", this.dispatchNetworkEvent);
+            globalThis.removeEventListener("offline", this.dispatchNetworkEvent);
+        }
+        catch (err) {
+            // ignore
+        }
+    }
+    /**
+     * Returns true if the node is connected to the network via libp2p and browser.
+     */
+    isConnected() {
+        if (!this.isBrowserConnected()) {
+            return false;
+        }
+        return this.isP2PConnected();
+    }
+    /**
+     * Returns true if the node is connected to the network via libp2p.
+     */
+    isP2PConnected() {
+        return this.isNetworkConnected;
+    }
+    /**
+     * Returns true if the node is connected to the network via browser.
+     */
+    isBrowserConnected() {
+        try {
+            if (globalThis?.navigator && !globalThis?.navigator?.onLine) {
+                return false;
+            }
+        }
+        catch (err) {
+            // ignore
+        }
+        return true;
+    }
+    onConnectedEvent() {
+        if (!this.isNetworkConnected) {
+            this.isNetworkConnected = true;
+            this.dispatchNetworkEvent();
+        }
+    }
+    onDisconnectedEvent() {
+        if (this.isNetworkConnected && this.libp2p.getConnections().length === 0) {
+            this.isNetworkConnected = false;
+            this.dispatchNetworkEvent();
+        }
+    }
+    dispatchNetworkEvent() {
+        this.events.dispatchEvent(new CustomEvent("waku:connection", {
+            detail: this.isConnected()
+        }));
+    }
+}
+//# sourceMappingURL=network_monitor.js.map

package/dist/lib/connection_manager/network_monitor.js.map

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