@waku/core 0.0.18 → 0.0.20

package/dist/lib/waku.d.ts

@@ -1,8 +1,8 @@
 import type { Stream } from "@libp2p/interface-connection";
 import type { Libp2p } from "@libp2p/interface-libp2p";
-import type { PeerId } from "@libp2p/interface-peer-id";
-import type { MultiaddrInput } from "@multiformats/multiaddr";
-import type { IFilter, ILightPush, IRelay, IStore, Waku } from "@waku/interfaces";
+import { PeerId } from "@libp2p/interface-peer-id";
+import { MultiaddrInput } from "@multiformats/multiaddr";
+import type { IFilter, IFilterV2, ILightPush, IRelay, IStore, Waku } from "@waku/interfaces";
 import { Protocols } from "@waku/interfaces";
 import { ConnectionManager } from "./connection_manager.js";
 export declare const DefaultPingKeepAliveValueSecs = 0;
@@ -33,10 +33,10 @@ export declare class WakuNode implements Waku {
     libp2p: Libp2p;
     relay?: IRelay;
     store?: IStore;
-    filter?: IFilter;
+    filter?: IFilter | IFilterV2;
     lightPush?: ILightPush;
     connectionManager: ConnectionManager;
-    constructor(options: WakuOptions, libp2p: Libp2p, store?: (libp2p: Libp2p) => IStore, lightPush?: (libp2p: Libp2p) => ILightPush, filter?: (libp2p: Libp2p) => IFilter, relay?: (libp2p: Libp2p) => IRelay);
+    constructor(options: WakuOptions, libp2p: Libp2p, store?: (libp2p: Libp2p) => IStore, lightPush?: (libp2p: Libp2p) => ILightPush, filter?: (libp2p: Libp2p) => IFilter | IFilterV2, relay?: (libp2p: Libp2p) => IRelay);
     /**
      * Dials to the provided peer.
      *

package/dist/lib/waku.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waku/core",
-  "version": "0.0.18",
+  "version": "0.0.20",
   "description": "TypeScript implementation of the Waku v2 protocol",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
@@ -56,7 +56,6 @@
     "build:bundle": "rollup --config rollup.config.js",
     "fix": "run-s fix:*",
     "fix:lint": "eslint src *.js --fix",
-    "pretest": "run-s pretest:*",
     "check": "run-s check:*",
     "check:tsc": "tsc -p tsconfig.dev.json",
     "check:lint": "eslint src *.js",
@@ -74,13 +73,13 @@
   },
   "dependencies": {
     "@noble/hashes": "^1.3.0",
-    "@waku/interfaces": "0.0.13",
-    "@waku/proto": "*",
-    "@waku/utils": "0.0.6",
+    "@waku/interfaces": "0.0.15",
+    "@waku/proto": "0.0.5",
+    "@waku/utils": "0.0.8",
     "debug": "^4.3.4",
-    "it-all": "^3.0.1",
+    "it-all": "^3.0.2",
     "it-length-prefixed": "^9.0.1",
-    "it-pipe": "^2.0.5",
+    "it-pipe": "^3.0.1",
     "p-event": "^5.0.1",
     "uint8arraylist": "^2.4.3",
     "uuid": "^9.0.0"
@@ -100,11 +99,11 @@
     "@types/mocha": "^10.0.1",
     "@types/uuid": "^9.0.1",
     "@typescript-eslint/eslint-plugin": "^5.57.0",
-    "@typescript-eslint/parser": "^5.51.0",
+    "@typescript-eslint/parser": "^5.59.8",
     "@waku/build-utils": "*",
     "chai": "^4.3.7",
     "cspell": "^6.31.1",
-    "eslint": "^8.35.0",
+    "eslint": "^8.41.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-functional": "^5.0.4",
@@ -121,7 +120,7 @@
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.8",
     "process": "^0.11.10",
-    "puppeteer": "^19.8.2",
+    "puppeteer": "^20.4.0",
     "rollup": "^3.21.3",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",

package/src/index.ts

@@ -11,8 +11,11 @@ export * as message from "./lib/message/index.js";
 export * as waku from "./lib/waku.js";
 export { WakuNode, WakuOptions } from "./lib/waku.js";
 
-export * as waku_filter from "./lib/filter/index.js";
-export { wakuFilter } from "./lib/filter/index.js";
+export * as waku_filter_v1 from "./lib/filter/v1/index.js";
+export { wakuFilter as wakuFilterV1 } from "./lib/filter/v1/index.js";
+
+export * as waku_filter_v2 from "./lib/filter/v2/index.js";
+export { wakuFilterV2 } from "./lib/filter/v2/index.js";
 
 export * as waku_light_push from "./lib/light_push/index.js";
 export { wakuLightPush, LightPushCodec } from "./lib/light_push/index.js";

package/src/lib/connection_manager.ts

@@ -12,6 +12,7 @@ const log = debug("waku:connection-manager");
 
 export const DEFAULT_MAX_BOOTSTRAP_PEERS_ALLOWED = 1;
 export const DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER = 3;
+export const DEFAULT_MAX_PARALLEL_DIALS = 3;
 
 export class ConnectionManager {
   private static instances = new Map<string, ConnectionManager>();
@@ -21,6 +22,9 @@ export class ConnectionManager {
   private dialAttemptsForPeer: Map<string, number> = new Map();
   private dialErrorsForPeer: Map<string, any> = new Map();
 
+  private currentActiveDialCount = 0;
+  private pendingPeerDialQueue: Array<PeerId> = [];
+
   public static create(
     peerId: string,
     libp2p: Libp2p,
@@ -52,6 +56,7 @@ export class ConnectionManager {
     this.options = {
       maxDialAttemptsForPeer: DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER,
       maxBootstrapPeersAllowed: DEFAULT_MAX_BOOTSTRAP_PEERS_ALLOWED,
+      maxParallelDials: DEFAULT_MAX_PARALLEL_DIALS,
       ...options,
     };
 
@@ -60,6 +65,31 @@ export class ConnectionManager {
     this.run()
       .then(() => log(`Connection Manager is now running`))
       .catch((error) => log(`Unexpected error while running service`, error));
+
+    // libp2p emits `peer:discovery` events during its initialization
+    // which means that before the ConnectionManager is initialized, some peers may have been discovered
+    // we will dial the peers in peerStore ONCE before we start to listen to the `peer:discovery` events within the ConnectionManager
+    this.dialPeerStorePeers();
+  }
+
+  private async dialPeerStorePeers(): Promise<void> {
+    const peerInfos = await this.libp2pComponents.peerStore.all();
+    const dialPromises = [];
+    for (const peerInfo of peerInfos) {
+      if (
+        this.libp2pComponents
+          .getConnections()
+          .find((c) => c.remotePeer === peerInfo.id)
+      )
+        continue;
+
+      dialPromises.push(this.attemptDial(peerInfo.id));
+    }
+    try {
+      await Promise.all(dialPromises);
+    } catch (error) {
+      log(`Unexpected error while dialing peer store peers`, error);
+    }
   }
 
   private async run(): Promise<void> {
@@ -86,6 +116,7 @@ export class ConnectionManager {
   }
 
   private async dialPeer(peerId: PeerId): Promise<void> {
+    this.currentActiveDialCount += 1;
     let dialAttempt = 0;
     while (dialAttempt <= this.options.maxDialAttemptsForPeer) {
       try {
@@ -105,6 +136,7 @@ export class ConnectionManager {
         return;
       } catch (e) {
         const error = e as AggregateError;
+
         this.dialErrorsForPeer.set(peerId.toString(), error);
         log(`Error dialing peer ${peerId.toString()} - ${error.errors}`);
 
@@ -128,6 +160,33 @@ export class ConnectionManager {
       return await this.libp2pComponents.peerStore.delete(peerId);
     } catch (error) {
       throw `Error deleting undialable peer ${peerId.toString()} from peer store - ${error}`;
+    } finally {
+      this.currentActiveDialCount -= 1;
+      this.processDialQueue();
+    }
+  }
+
+  async dropConnection(peerId: PeerId): Promise<void> {
+    try {
+      await this.libp2pComponents.hangUp(peerId);
+      log(`Dropped connection with peer ${peerId.toString()}`);
+    } catch (error) {
+      log(
+        `Error dropping connection with peer ${peerId.toString()} - ${error}`
+      );
+    }
+  }
+
+  private async processDialQueue(): Promise<void> {
+    if (
+      this.pendingPeerDialQueue.length > 0 &&
+      this.currentActiveDialCount < this.options.maxParallelDials
+    ) {
+      const peerId = this.pendingPeerDialQueue.shift();
+      if (!peerId) return;
+      this.attemptDial(peerId).catch((error) => {
+        log(error);
+      });
     }
   }
 
@@ -164,21 +223,50 @@ export class ConnectionManager {
     );
   }
 
+  private async attemptDial(peerId: PeerId): Promise<void> {
+    if (this.currentActiveDialCount >= this.options.maxParallelDials) {
+      this.pendingPeerDialQueue.push(peerId);
+      return;
+    }
+
+    if (!(await this.shouldDialPeer(peerId))) return;
+
+    this.dialPeer(peerId).catch((err) => {
+      throw `Error dialing peer ${peerId.toString()} : ${err}`;
+    });
+  }
+
   private onEventHandlers = {
     "peer:discovery": async (evt: CustomEvent<PeerInfo>): Promise<void> => {
       const { id: peerId } = evt.detail;
-      if (!(await this.shouldDialPeer(peerId))) return;
 
-      this.dialPeer(peerId).catch((err) =>
+      this.attemptDial(peerId).catch((err) =>
         log(`Error dialing peer ${peerId.toString()} : ${err}`)
       );
     },
-    "peer:connect": (evt: CustomEvent<Connection>): void => {
-      {
-        this.keepAliveManager.start(
-          evt.detail.remotePeer,
-          this.libp2pComponents.ping.bind(this)
-        );
+    "peer:connect": async (evt: CustomEvent<Connection>): Promise<void> => {
+      const { remotePeer: peerId } = evt.detail;
+
+      this.keepAliveManager.start(
+        peerId,
+        this.libp2pComponents.ping.bind(this)
+      );
+
+      const isBootstrap = (await this.getTagNamesForPeer(peerId)).includes(
+        Tags.BOOTSTRAP
+      );
+
+      if (isBootstrap) {
+        const bootstrapConnections = this.libp2pComponents
+          .getConnections()
+          .filter((conn) => conn.tags.includes(Tags.BOOTSTRAP));
+
+        // If we have too many bootstrap connections, drop one
+        if (
+          bootstrapConnections.length > this.options.maxBootstrapPeersAllowed
+        ) {
+          await this.dropConnection(peerId);
+        }
       }
     },
     "peer:disconnect": () => {

package/src/lib/filter/{filter_rpc.ts → v1/filter_rpc.ts}

@@ -1,10 +1,7 @@
+import { ContentFilter } from "@waku/interfaces";
 import { proto_filter as proto } from "@waku/proto";
 import { v4 as uuid } from "uuid";
 
-export type ContentFilter = {
-  contentTopic: string;
-};
-
 /**
  * FilterRPC represents a message conforming to the Waku Filter protocol
  */

package/src/lib/filter/{index.ts → v1/index.ts}

@@ -4,6 +4,7 @@ import type { IncomingStreamData } from "@libp2p/interface-registrar";
 import type {
   ActiveSubscriptions,
   Callback,
+  ContentFilter,
   IAsyncIterator,
   IDecodedMessage,
   IDecoder,
@@ -19,13 +20,11 @@ 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 { toProtoMessage } from "../to_proto_message.js";
+import { BaseProtocol } from "../../base_protocol.js";
+import { DefaultPubSubTopic } from "../../constants.js";
+import { toProtoMessage } from "../../to_proto_message.js";
 
-import { ContentFilter, FilterRpc } from "./filter_rpc.js";
-
-export { ContentFilter };
+import { FilterRpc } from "./filter_rpc.js";
 
 export const FilterCodec = "/vac/waku/filter/2.0.0-beta1";
 

package/src/lib/filter/v2/filter_rpc.ts

@@ -0,0 +1,131 @@
+import { proto_filter_v2 as proto, WakuMessage } from "@waku/proto";
+import { v4 as uuid } from "uuid";
+
+/**
+ * FilterPushRPC represents a message conforming to the Waku FilterPush protocol.
+ * Protocol documentation: https://rfc.vac.dev/spec/12/
+ */
+export class FilterPushRpc {
+  public constructor(public proto: proto.MessagePush) {}
+
+  static decode(bytes: Uint8Array): FilterPushRpc {
+    const res = proto.MessagePush.decode(bytes);
+    return new FilterPushRpc(res);
+  }
+
+  encode(): Uint8Array {
+    return proto.MessagePush.encode(this.proto);
+  }
+
+  get wakuMessage(): WakuMessage | undefined {
+    return this.proto.wakuMessage;
+  }
+
+  /**
+   * Get the pubsub topic from the FilterPushRpc object.
+   * @returns string
+   */
+  get pubsubTopic(): string | undefined {
+    return this.proto.pubsubTopic;
+  }
+}
+
+export class FilterSubscribeRpc {
+  public constructor(public proto: proto.FilterSubscribeRequest) {}
+
+  static createSubscribeRequest(
+    pubsubTopic: string,
+    contentTopics: string[]
+  ): FilterSubscribeRpc {
+    return new FilterSubscribeRpc({
+      requestId: uuid(),
+      filterSubscribeType:
+        proto.FilterSubscribeRequest.FilterSubscribeType.SUBSCRIBE,
+      pubsubTopic,
+      contentTopics,
+    });
+  }
+
+  static createUnsubscribeRequest(
+    pubsubTopic: string,
+    contentTopics: string[]
+  ): FilterSubscribeRpc {
+    return new FilterSubscribeRpc({
+      requestId: uuid(),
+      filterSubscribeType:
+        proto.FilterSubscribeRequest.FilterSubscribeType.UNSUBSCRIBE,
+      pubsubTopic,
+      contentTopics,
+    });
+  }
+
+  static createUnsubscribeAllRequest(pubsubTopic: string): FilterSubscribeRpc {
+    return new FilterSubscribeRpc({
+      requestId: uuid(),
+      filterSubscribeType:
+        proto.FilterSubscribeRequest.FilterSubscribeType.UNSUBSCRIBE_ALL,
+      pubsubTopic,
+      contentTopics: [],
+    });
+  }
+
+  static createSubscriberPingRequest(): FilterSubscribeRpc {
+    return new FilterSubscribeRpc({
+      requestId: uuid(),
+      filterSubscribeType:
+        proto.FilterSubscribeRequest.FilterSubscribeType.SUBSCRIBER_PING,
+      pubsubTopic: "",
+      contentTopics: [],
+    });
+  }
+
+  static decode(bytes: Uint8Array): FilterSubscribeRpc {
+    const res = proto.FilterSubscribeRequest.decode(bytes);
+    return new FilterSubscribeRpc(res);
+  }
+
+  encode(): Uint8Array {
+    return proto.FilterSubscribeRequest.encode(this.proto);
+  }
+
+  get filterSubscribeType(): proto.FilterSubscribeRequest.FilterSubscribeType {
+    return this.proto.filterSubscribeType;
+  }
+
+  get requestId(): string {
+    return this.proto.requestId;
+  }
+
+  get pubsubTopic(): string | undefined {
+    return this.proto.pubsubTopic;
+  }
+
+  get contentTopics(): string[] {
+    return this.proto.contentTopics;
+  }
+}
+
+export class FilterSubscribeResponse {
+  public constructor(public proto: proto.FilterSubscribeResponse) {}
+
+  static decode(bytes: Uint8Array): FilterSubscribeResponse {
+    const res = proto.FilterSubscribeResponse.decode(bytes);
+    return new FilterSubscribeResponse(res);
+  }
+
+  encode(): Uint8Array {
+    return proto.FilterSubscribeResponse.encode(this.proto);
+  }
+
+  get statusCode(): number {
+    return this.proto.statusCode;
+  }
+
+  get statusDesc(): string | undefined {
+    return this.proto.statusDesc;
+  }
+
+  get requestId(): string {
+    return this.proto.requestId;
+  }
+}