@waku/core 0.0.34-c43cec2.0 → 0.0.34-caeafce.0

package/src/lib/stream_manager/stream_manager.ts

@@ -21,39 +21,38 @@ export class StreamManager {
     this.addEventListener("peer:update", this.handlePeerUpdateStreamPool);
   }
 
-  public async getStream(peer: Peer): Promise<Stream> {
-    const peerId = peer.id.toString();
-
-    const scheduledStream = this.streamPool.get(peerId);
+  public async getStream(peerId: PeerId): Promise<Stream> {
+    const peerIdStr = peerId.toString();
+    const scheduledStream = this.streamPool.get(peerIdStr);
 
     if (scheduledStream) {
-      this.streamPool.delete(peerId);
+      this.streamPool.delete(peerIdStr);
       await scheduledStream;
     }
 
-    let stream = this.getOpenStreamForCodec(peer.id);
+    let stream = this.getOpenStreamForCodec(peerId);
 
     if (stream) {
       this.log.info(
-        `Found existing stream peerId=${peer.id.toString()} multicodec=${this.multicodec}`
+        `Found existing stream peerId=${peerIdStr} multicodec=${this.multicodec}`
       );
-      this.lockStream(peer.id.toString(), stream);
+      this.lockStream(peerIdStr, stream);
       return stream;
     }
 
-    stream = await this.createStream(peer);
-    this.lockStream(peer.id.toString(), stream);
+    stream = await this.createStream(peerId);
+    this.lockStream(peerIdStr, stream);
 
     return stream;
   }
 
-  private async createStream(peer: Peer, retries = 0): Promise<Stream> {
-    const connections = this.getConnections(peer.id);
+  private async createStream(peerId: PeerId, retries = 0): Promise<Stream> {
+    const connections = this.getConnections(peerId);
     const connection = selectOpenConnection(connections);
 
     if (!connection) {
       throw new Error(
-        `Failed to get a connection to the peer peerId=${peer.id.toString()} multicodec=${this.multicodec}`
+        `Failed to get a connection to the peer peerId=${peerId.toString()} multicodec=${this.multicodec}`
       );
     }
 
@@ -63,11 +62,11 @@ export class StreamManager {
     for (let i = 0; i < retries + 1; i++) {
       try {
         this.log.info(
-          `Attempting to create a stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`
+          `Attempting to create a stream for peerId=${peerId.toString()} multicodec=${this.multicodec}`
         );
         stream = await connection.newStream(this.multicodec);
         this.log.info(
-          `Created stream for peerId=${peer.id.toString()} multicodec=${this.multicodec}`
+          `Created stream for peerId=${peerId.toString()} multicodec=${this.multicodec}`
         );
         break;
       } catch (error) {
@@ -77,8 +76,7 @@ export class StreamManager {
 
     if (!stream) {
       throw new Error(
-        `Failed to create a new stream for ${peer.id.toString()} -- ` +
-          lastError
+        `Failed to create a new stream for ${peerId.toString()} -- ` + lastError
       );
     }
 
@@ -97,7 +95,7 @@ export class StreamManager {
 
     try {
       this.ongoingCreation.add(peerId);
-      await this.createStream(peer);
+      await this.createStream(peer.id);
     } catch (error) {
       this.log.error(`Failed to createStreamWithLock:`, error);
     } finally {

package/dist/lib/health_manager.d.ts

@@ -1,14 +0,0 @@
-import { HealthStatus, type IHealthManager, type ProtocolHealth, Protocols } from "@waku/interfaces";
-declare class HealthManager implements IHealthManager {
-    static instance: HealthManager;
-    private readonly health;
-    private constructor();
-    static getInstance(): HealthManager;
-    getHealthStatus(): HealthStatus;
-    getProtocolStatus(protocol: Protocols): ProtocolHealth | undefined;
-    updateProtocolHealth(multicodec: string, connectedPeers: number): void;
-    private getNameFromMulticodec;
-    private updateOverallHealth;
-}
-export declare const getHealthManager: () => HealthManager;
-export {};

package/dist/lib/health_manager.js

@@ -1,70 +0,0 @@
-import { HealthStatus, Protocols } from "@waku/interfaces";
-class HealthManager {
-    static instance;
-    health;
-    constructor() {
-        this.health = {
-            overallStatus: HealthStatus.Unhealthy,
-            protocolStatuses: new Map()
-        };
-    }
-    static getInstance() {
-        if (!HealthManager.instance) {
-            HealthManager.instance = new HealthManager();
-        }
-        return HealthManager.instance;
-    }
-    getHealthStatus() {
-        return this.health.overallStatus;
-    }
-    getProtocolStatus(protocol) {
-        return this.health.protocolStatuses.get(protocol);
-    }
-    updateProtocolHealth(multicodec, connectedPeers) {
-        const protocol = this.getNameFromMulticodec(multicodec);
-        let status = HealthStatus.Unhealthy;
-        if (connectedPeers == 1) {
-            status = HealthStatus.MinimallyHealthy;
-        }
-        else if (connectedPeers >= 2) {
-            status = HealthStatus.SufficientlyHealthy;
-        }
-        this.health.protocolStatuses.set(protocol, {
-            name: protocol,
-            status: status,
-            lastUpdate: new Date()
-        });
-        this.updateOverallHealth();
-    }
-    getNameFromMulticodec(multicodec) {
-        let name;
-        if (multicodec.includes("filter")) {
-            name = Protocols.Filter;
-        }
-        else if (multicodec.includes("lightpush")) {
-            name = Protocols.LightPush;
-        }
-        else if (multicodec.includes("store")) {
-            name = Protocols.Store;
-        }
-        else {
-            throw new Error(`Unknown protocol: ${multicodec}`);
-        }
-        return name;
-    }
-    updateOverallHealth() {
-        const relevantProtocols = [Protocols.LightPush, Protocols.Filter];
-        const statuses = relevantProtocols.map((p) => this.getProtocolStatus(p)?.status);
-        if (statuses.some((status) => status === HealthStatus.Unhealthy)) {
-            this.health.overallStatus = HealthStatus.Unhealthy;
-        }
-        else if (statuses.some((status) => status === HealthStatus.MinimallyHealthy)) {
-            this.health.overallStatus = HealthStatus.MinimallyHealthy;
-        }
-        else {
-            this.health.overallStatus = HealthStatus.SufficientlyHealthy;
-        }
-    }
-}
-export const getHealthManager = () => HealthManager.getInstance();
-//# sourceMappingURL=health_manager.js.map

package/dist/lib/health_manager.js.map

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

package/src/lib/health_manager.ts

@@ -1,90 +0,0 @@
-import {
-  HealthStatus,
-  type IHealthManager,
-  NodeHealth,
-  type ProtocolHealth,
-  Protocols
-} from "@waku/interfaces";
-
-class HealthManager implements IHealthManager {
-  public static instance: HealthManager;
-  private readonly health: NodeHealth;
-
-  private constructor() {
-    this.health = {
-      overallStatus: HealthStatus.Unhealthy,
-      protocolStatuses: new Map()
-    };
-  }
-
-  public static getInstance(): HealthManager {
-    if (!HealthManager.instance) {
-      HealthManager.instance = new HealthManager();
-    }
-    return HealthManager.instance;
-  }
-
-  public getHealthStatus(): HealthStatus {
-    return this.health.overallStatus;
-  }
-
-  public getProtocolStatus(protocol: Protocols): ProtocolHealth | undefined {
-    return this.health.protocolStatuses.get(protocol);
-  }
-
-  public updateProtocolHealth(
-    multicodec: string,
-    connectedPeers: number
-  ): void {
-    const protocol = this.getNameFromMulticodec(multicodec);
-
-    let status: HealthStatus = HealthStatus.Unhealthy;
-    if (connectedPeers == 1) {
-      status = HealthStatus.MinimallyHealthy;
-    } else if (connectedPeers >= 2) {
-      status = HealthStatus.SufficientlyHealthy;
-    }
-
-    this.health.protocolStatuses.set(protocol, {
-      name: protocol,
-      status: status,
-      lastUpdate: new Date()
-    });
-
-    this.updateOverallHealth();
-  }
-
-  private getNameFromMulticodec(multicodec: string): Protocols {
-    let name: Protocols;
-    if (multicodec.includes("filter")) {
-      name = Protocols.Filter;
-    } else if (multicodec.includes("lightpush")) {
-      name = Protocols.LightPush;
-    } else if (multicodec.includes("store")) {
-      name = Protocols.Store;
-    } else {
-      throw new Error(`Unknown protocol: ${multicodec}`);
-    }
-    return name;
-  }
-
-  private updateOverallHealth(): void {
-    const relevantProtocols = [Protocols.LightPush, Protocols.Filter];
-    const statuses = relevantProtocols.map(
-      (p) => this.getProtocolStatus(p)?.status
-    );
-
-    if (statuses.some((status) => status === HealthStatus.Unhealthy)) {
-      this.health.overallStatus = HealthStatus.Unhealthy;
-    } else if (
-      statuses.some((status) => status === HealthStatus.MinimallyHealthy)
-    ) {
-      this.health.overallStatus = HealthStatus.MinimallyHealthy;
-    } else {
-      this.health.overallStatus = HealthStatus.SufficientlyHealthy;
-    }
-  }
-}
-
-export const getHealthManager = (): HealthManager =>
-  HealthManager.getInstance();