fix: replace deprecated wss filter

Author: adklempner

packages/sdk/src/create/libp2p.ts

@@ -1,10 +1,10 @@
 import { noise } from "@chainsafe/libp2p-noise";
 import { bootstrap } from "@libp2p/bootstrap";
 import { identify } from "@libp2p/identify";
+import type { ConnectionGater } from "@libp2p/interface";
 import { mplex } from "@libp2p/mplex";
 import { ping } from "@libp2p/ping";
 import { webSockets } from "@libp2p/websockets";
-import { all as filterAll, wss } from "@libp2p/websockets/filters";
 import { wakuMetadata } from "@waku/core";
 import {
   type CreateLibp2pOptions,
@@ -53,16 +53,22 @@ export async function defaultLibp2p(
     ? { metadata: wakuMetadata(pubsubTopics) }
     : {};
 
-  const filter =
-    options?.filterMultiaddrs === false || isTestEnvironment()
-      ? filterAll
-      : wss;
+  const connectionGater: ConnectionGater = {
+    denyDialMultiaddr: async (multiaddr) => {
+      if (options?.filterMultiaddrs === false || isTestEnvironment()) {
+        return false;
+      }
+      const protocols = multiaddr.protos().map((proto) => proto.name);
+      return protocols.includes("ws") && !protocols.includes("wss");
+    }
+  };
 
   return createLibp2p({
-    transports: [webSockets({ filter: filter })],
+    transports: [webSockets()],
     streamMuxers: [mplex()],
     connectionEncrypters: [noise()],
     ...options,
+    connectionGater,
     services: {
       identify: identify({
         agentVersion: userAgent ?? DefaultUserAgent

packages/sdk/src/filter/filter.ts

@@ -39,6 +39,7 @@ export class Filter implements IFilter {
 
     this.protocol = new FilterCore(
       this.onIncomingMessage.bind(this),
+      this.connectionManager.pubsubTopics,
       params.libp2p
     );
   }
@@ -173,7 +174,7 @@ export class Filter implements IFilter {
 
   private throwIfTopicNotSupported(pubsubTopic: string): void {
     const supportedPubsubTopic =
-      this.connectionManager.isTopicConfigured(pubsubTopic);
+      this.connectionManager.pubsubTopics.includes(pubsubTopic);
 
     if (!supportedPubsubTopic) {
       throw Error(

packages/sdk/src/light_push/light_push.ts

@@ -51,7 +51,10 @@ export class LightPush implements ILightPush {
 
     this.peerManager = params.peerManager;
     this.connectionManager = params.connectionManager;
-    this.protocol = new LightPushCore(params.libp2p);
+    this.protocol = new LightPushCore(
+      this.connectionManager.pubsubTopics,
+      params.libp2p
+    );
     this.retryManager = new RetryManager({
       peerManager: params.peerManager,
       retryIntervalMs: this.config.retryIntervalMs
@@ -84,7 +87,7 @@ export class LightPush implements ILightPush {
 
     log.info("send: attempting to send a message to pubsubTopic:", pubsubTopic);
 
-    if (!this.connectionManager.isTopicConfigured(pubsubTopic)) {
+    if (!this.connectionManager.pubsubTopics.includes(pubsubTopic)) {
       return {
         successes: [],
         failures: [

packages/sdk/src/peer_manager/peer_manager.ts

@@ -114,7 +114,7 @@ export class PeerManager {
 
     for (const peer of connectedPeers) {
       const hasProtocol = this.hasPeerProtocol(peer, params.protocol);
-      const hasSamePubsub = await this.connectionManager.isPeerOnTopic(
+      const hasSamePubsub = await this.connectionManager.isPeerOnPubsubTopic(
         peer.id,
         params.pubsubTopic
       );
@@ -187,14 +187,14 @@ export class PeerManager {
     id: PeerId,
     pubsubTopic: string
   ): Promise<boolean> {
-    const hasShardInfo = await this.connectionManager.hasShardInfo(id);
+    const hasShardInfo = await this.connectionManager.isPeerOnSameShard(id);
 
     // allow to use peers that we don't know information about yet
     if (!hasShardInfo) {
       return true;
     }
 
-    return this.connectionManager.isPeerOnTopic(id, pubsubTopic);
+    return this.connectionManager.isPeerOnPubsubTopic(id, pubsubTopic);
   }
 
   private async onConnected(event: CustomEvent<IdentifyResult>): Promise<void> {

packages/sdk/src/store/store.ts

@@ -42,7 +42,10 @@ export class Store implements IStore {
     this.connectionManager = params.connectionManager;
     this.libp2p = params.libp2p;
 
-    this.protocol = new StoreCore(params.libp2p);
+    this.protocol = new StoreCore(
+      this.connectionManager.pubsubTopics,
+      params.libp2p
+    );
   }
 
   public get multicodec(): string {
@@ -230,7 +233,7 @@ export class Store implements IStore {
 
     const pubsubTopicForQuery = uniquePubsubTopicsInQuery[0];
     const isTopicSupported =
-      this.connectionManager.isTopicConfigured(pubsubTopicForQuery);
+      this.connectionManager.pubsubTopics.includes(pubsubTopicForQuery);
 
     if (!isTopicSupported) {
       throw new Error(

packages/sdk/src/waku/waku.ts

@@ -4,6 +4,7 @@ import {
   type Stream,
   TypedEventEmitter
 } from "@libp2p/interface";
+import { peerIdFromString } from "@libp2p/peer-id";
 import type { MultiaddrInput } from "@multiformats/multiaddr";
 import { ConnectionManager, createDecoder, createEncoder } from "@waku/core";
 import type {
@@ -85,9 +86,7 @@ export class WakuNode implements IWaku {
     this.connectionManager = new ConnectionManager({
       libp2p,
       relay: this.relay,
-      events: this.events,
       pubsubTopics: pubsubTopics,
-      networkConfig: this.networkConfig,
       config: options?.connectionManager
     });
 
@@ -199,13 +198,29 @@ export class WakuNode implements IWaku {
 
     log.info(`Dialing to ${peer?.toString()} with protocols ${_protocols}`);
 
-    return await this.connectionManager.dial(peer, codecs);
+    return await this.connectionManager.rawDialPeerWithProtocols(peer, codecs);
   }
 
   public async hangUp(peer: PeerId | MultiaddrInput): Promise<boolean> {
     log.info(`Hanging up peer:${peer?.toString()}.`);
 
-    return this.connectionManager.hangUp(peer);
+    let peerId: PeerId;
+    if (typeof peer === "string") {
+      peerId = peerIdFromString(peer);
+    } else if (peer && "getPeerId" in peer) {
+      // MultiaddrInput case
+      const peerIdStr = peer.getPeerId?.();
+      if (!peerIdStr) {
+        throw new Error("No peer ID in multiaddr");
+      }
+      peerId = peerIdFromString(peerIdStr);
+    } else {
+      // PeerId case
+      peerId = peer as PeerId;
+    }
+
+    await this.connectionManager.dropConnection(peerId);
+    return true;
   }
 
   public async start(): Promise<void> {
@@ -214,7 +229,7 @@ export class WakuNode implements IWaku {
     this._nodeStateLock = true;
 
     await this.libp2p.start();
-    this.connectionManager.start();
+    // Connection manager starts automatically
     this.peerManager.start();
     this.health.start();
     this.lightPush?.start();