@waku/core 0.0.23 → 0.0.25-a42b7be.0

package/src/lib/stream_manager.ts

@@ -2,19 +2,19 @@ import type { PeerUpdate } from "@libp2p/interface";
 import type { Stream } from "@libp2p/interface/connection";
 import { Peer } from "@libp2p/interface/peer-store";
 import { Libp2p } from "@waku/interfaces";
+import { Logger } from "@waku/utils";
 import { selectConnection } from "@waku/utils/libp2p";
-import debug from "debug";
 
 export class StreamManager {
-  private streamPool: Map<string, Promise<Stream>>;
-  private log: debug.Debugger;
+  private streamPool: Map<string, Promise<Stream | void>>;
+  private readonly log: Logger;
 
   constructor(
     public multicodec: string,
     public getConnections: Libp2p["getConnections"],
     public addEventListener: Libp2p["addEventListener"]
   ) {
-    this.log = debug(`waku:stream-manager:${multicodec}`);
+    this.log = new Logger(`stream-manager:${multicodec}`);
     this.addEventListener(
       "peer:update",
       this.handlePeerUpdateStreamPool.bind(this)
@@ -38,7 +38,7 @@ export class StreamManager {
 
     const stream = await streamPromise;
 
-    if (stream.status === "closed") {
+    if (!stream || stream.status === "closed") {
       return this.newStream(peer); // fallback by creating a new stream on the spot
     }
 
@@ -55,14 +55,19 @@ export class StreamManager {
   }
 
   private prepareNewStream(peer: Peer): void {
-    const streamPromise = this.newStream(peer);
+    const streamPromise = this.newStream(peer).catch(() => {
+      // No error thrown as this call is not triggered by the user
+      this.log.error(
+        `Failed to prepare a new stream for ${peer.id.toString()}`
+      );
+    });
     this.streamPool.set(peer.id.toString(), streamPromise);
   }
 
   private handlePeerUpdateStreamPool = (evt: CustomEvent<PeerUpdate>): void => {
     const peer = evt.detail.peer;
     if (peer.protocols.includes(this.multicodec)) {
-      this.log(`Preemptively opening a stream to ${peer.id.toString()}`);
+      this.log.info(`Preemptively opening a stream to ${peer.id.toString()}`);
       this.prepareNewStream(peer);
     }
   };

package/src/lib/wait_for_remote_peer.ts

@@ -1,16 +1,16 @@
 import type { IdentifyResult } from "@libp2p/interface";
 import type { IBaseProtocol, IRelay, Waku } from "@waku/interfaces";
 import { Protocols } from "@waku/interfaces";
-import debug from "debug";
+import { Logger } from "@waku/utils";
 import { pEvent } from "p-event";
 
-const log = debug("waku:wait-for-remote-peer");
+const log = new Logger("wait-for-remote-peer");
 
 /**
  * Wait for a remote peer to be ready given the passed protocols.
  * Must be used after attempting to connect to nodes, using
- * {@link @waku/core.WakuNode.dial} or a bootstrap method with
- * {@link @waku/sdk.createLightNode}.
+ * {@link @waku/core!WakuNode.dial} or a bootstrap method with
+ * {@link @waku/sdk!createLightNode}.
  *
  * If the passed protocols is a GossipSub protocol, then it resolves only once
  * a peer is in a mesh, to help ensure that other peers will send and receive
@@ -79,14 +79,13 @@ async function waitForConnectedPeer(protocol: IBaseProtocol): Promise<void> {
   const peers = await protocol.peers();
 
   if (peers.length) {
-    log(`${codec} peer found: `, peers[0].id.toString());
+    log.info(`${codec} peer found: `, peers[0].id.toString());
     return;
   }
 
   await new Promise<void>((resolve) => {
     const cb = (evt: CustomEvent<IdentifyResult>): void => {
       if (evt.detail?.protocols?.includes(codec)) {
-        log("Resolving for", codec, evt.detail.protocols);
         protocol.removeLibp2pEventListener("peer:identify", cb);
         resolve();
       }
@@ -96,15 +95,18 @@ async function waitForConnectedPeer(protocol: IBaseProtocol): Promise<void> {
 }
 
 /**
- * Wait for a peer with the given protocol to be connected and in the gossipsub
- * mesh.
+ * Wait for at least one peer with the given protocol to be connected and in the gossipsub
+ * mesh for all pubsubTopics.
  */
 async function waitForGossipSubPeerInMesh(waku: IRelay): Promise<void> {
   let peers = waku.getMeshPeers();
+  const pubsubTopics = waku.pubsubTopics;
 
-  while (peers.length == 0) {
-    await pEvent(waku.gossipSub, "gossipsub:heartbeat");
-    peers = waku.getMeshPeers();
+  for (const topic of pubsubTopics) {
+    while (peers.length == 0) {
+      await pEvent(waku.gossipSub, "gossipsub:heartbeat");
+      peers = waku.getMeshPeers(topic);
+    }
   }
 }
 

package/src/lib/waku.ts

@@ -7,18 +7,19 @@ import type {
   IRelay,
   IStore,
   Libp2p,
+  PubSubTopic,
   Waku
 } from "@waku/interfaces";
 import { Protocols } from "@waku/interfaces";
-import debug from "debug";
+import { Logger } from "@waku/utils";
 
 import { ConnectionManager } from "./connection_manager.js";
 
-export const DefaultPingKeepAliveValueSecs = 0;
+export const DefaultPingKeepAliveValueSecs = 5 * 60;
 export const DefaultRelayKeepAliveValueSecs = 5 * 60;
 export const DefaultUserAgent = "js-waku";
 
-const log = debug("waku:waku");
+const log = new Logger("waku");
 
 export interface WakuOptions {
   /**
@@ -52,6 +53,7 @@ export class WakuNode implements Waku {
 
   constructor(
     options: WakuOptions,
+    public readonly pubsubTopics: PubSubTopic[],
     libp2p: Libp2p,
     store?: (libp2p: Libp2p) => IStore,
     lightPush?: (libp2p: Libp2p) => ILightPush,
@@ -86,10 +88,11 @@ export class WakuNode implements Waku {
       peerId,
       libp2p,
       { pingKeepAlive, relayKeepAlive },
+      pubsubTopics,
       this.relay
     );
 
-    log(
+    log.info(
       "Waku node created",
       peerId,
       `relay: ${!!this.relay}, store: ${!!this.store}, light push: ${!!this
@@ -124,7 +127,7 @@ export class WakuNode implements Waku {
           codecs.push(codec)
         );
       } else {
-        log(
+        log.error(
           "Relay codec not included in dial codec: protocol not mounted locally"
         );
       }
@@ -133,7 +136,7 @@ export class WakuNode implements Waku {
       if (this.store) {
         codecs.push(this.store.multicodec);
       } else {
-        log(
+        log.error(
           "Store codec not included in dial codec: protocol not mounted locally"
         );
       }
@@ -142,7 +145,7 @@ export class WakuNode implements Waku {
       if (this.lightPush) {
         codecs.push(this.lightPush.multicodec);
       } else {
-        log(
+        log.error(
           "Light Push codec not included in dial codec: protocol not mounted locally"
         );
       }
@@ -151,13 +154,13 @@ export class WakuNode implements Waku {
       if (this.filter) {
         codecs.push(this.filter.multicodec);
       } else {
-        log(
+        log.error(
           "Filter codec not included in dial codec: protocol not mounted locally"
         );
       }
     }
 
-    log(`Dialing to ${peerId.toString()} with protocols ${_protocols}`);
+    log.info(`Dialing to ${peerId.toString()} with protocols ${_protocols}`);
 
     return this.libp2p.dialProtocol(peerId, codecs);
   }

package/dist/lib/push_or_init_map.d.ts

@@ -1 +0,0 @@
-export declare function pushOrInitMapSet<K, V>(map: Map<K, Set<V>>, key: K, newValue: V): void;

package/dist/lib/push_or_init_map.js

@@ -1,9 +0,0 @@
-export function pushOrInitMapSet(map, key, newValue) {
-    let arr = map.get(key);
-    if (typeof arr === "undefined") {
-        map.set(key, new Set());
-        arr = map.get(key);
-    }
-    arr.add(newValue);
-}
-//# sourceMappingURL=push_or_init_map.js.map

package/dist/lib/push_or_init_map.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"push_or_init_map.js","sourceRoot":"","sources":["../../src/lib/push_or_init_map.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,gBAAgB,CAC9B,GAAmB,EACnB,GAAM,EACN,QAAW;IAEX,IAAI,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvB,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;QAC9B,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;QACxB,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAW,CAAC;KAC9B;IAED,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACpB,CAAC"}

package/src/lib/push_or_init_map.ts

@@ -1,13 +0,0 @@
-export function pushOrInitMapSet<K, V>(
-  map: Map<K, Set<V>>,
-  key: K,
-  newValue: V
-): void {
-  let arr = map.get(key);
-  if (typeof arr === "undefined") {
-    map.set(key, new Set());
-    arr = map.get(key) as Set<V>;
-  }
-
-  arr.add(newValue);
-}