.cspell.json

@@ -4,7 +4,6 @@
   "language": "en",
   "words": [
     "abortable",
-    "acks",
     "Addrs",
     "ahadns",
     "Alives",
@@ -24,11 +23,9 @@
     "cipherparams",
     "ciphertext",
     "circleci",
-    "circom",
     "codecov",
     "codegen",
     "commitlint",
-    "cooldown",
     "dependabot",
     "dialable",
     "dingpu",
@@ -43,7 +40,9 @@
     "Encrypters",
     "enr",
     "enrs",
+    "unsubscription",
     "enrtree",
+    "unhandle",
     "ephem",
     "esnext",
     "ethersproject",
@@ -55,7 +54,6 @@
     "fontsource",
     "globby",
     "gossipsub",
-    "hackathons",
     "huilong",
     "iasked",
     "ihave",
@@ -63,7 +61,6 @@
     "ineed",
     "IPAM",
     "ipfs",
-    "isready",
     "iwant",
     "jdev",
     "jswaku",
@@ -104,7 +101,6 @@
     "reactjs",
     "recid",
     "rlnrelay",
-    "rlnv",
     "roadmap",
     "sandboxed",
     "scanf",
@@ -124,18 +120,14 @@
     "typedoc",
     "undialable",
     "unencrypted",
-    "unhandle",
     "unmarshal",
     "unmount",
     "unmounts",
-    "unsubscription",
     "untracked",
     "upgrader",
     "vacp",
     "varint",
-    "viem",
     "vkey",
-    "wagmi",
     "waku",
     "wakuconnect",
     "wakunode",
@@ -145,7 +137,6 @@
     "weboko",
     "websockets",
     "wifi",
-    "WTNS",
     "xsalsa20",
     "zerokit",
     "Привет",
@@ -170,7 +161,6 @@
     "gen",
     "proto",
     "*.spec.ts",
-    "*.log",
     "CHANGELOG.md"
   ],
   "patterns": [

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ on:
         type: string
 
 env:
-  NODE_JS: "24"
+  NODE_JS: "22"
 
 jobs:
   check:
@@ -57,7 +57,7 @@ jobs:
   browser:
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.56.1-jammy
+      image: mcr.microsoft.com/playwright:v1.53.1-jammy
     env:
       HOME: "/root"
     steps:
@@ -71,18 +71,65 @@ jobs:
       - run: npm run build:esm
       - run: npm run test:browser
 
+  build_rln_tree:
+    if: false # This condition disables the job
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: waku-org/js-waku
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_JS }}
+      - name: Check for existing RLN tree artifact
+        id: check-artifact
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const artifact = await github.rest.actions.listWorkflowRunArtifacts({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              run_id: context.runId
+            });
+            console.log(artifact);
+            const foundArtifact = artifact.data.artifacts.find(art => art.name === 'rln_tree.tar.gz');
+            if (foundArtifact) {
+              core.setOutput('artifact_id', foundArtifact.id);
+              core.setOutput('artifact_found', 'true');
+            } else {
+              core.setOutput('artifact_found', 'false');
+            }
+      - name: Download RLN tree artifact
+        if: steps.check-artifact.outputs.artifact_found == 'true'
+        uses: actions/download-artifact@v4
+        with:
+          name: rln_tree.tar.gz
+          path: /tmp
+      - uses: ./.github/actions/npm
+      - name: Sync rln tree and save artifact
+        run: |
+          mkdir -p /tmp/rln_tree.db
+          npm run build:esm
+          npm run sync-rln-tree
+          tar -czf rln_tree.tar.gz -C /tmp/rln_tree.db .
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: rln_tree.tar.gz
+          path: rln_tree.tar.gz
+
   node:
     uses: ./.github/workflows/test-node.yml
     secrets: inherit
     with:
-      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.36.0' }}
+      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.35.1' }}
       test_type: node
       allure_reports: true
 
   node_optional:
     uses: ./.github/workflows/test-node.yml
     with:
-      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.36.0' }}
+      nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'wakuorg/nwaku:v0.35.1' }}
       test_type: node-optional
 
   node_with_nwaku_master:
@@ -113,44 +160,12 @@ jobs:
           node-version: ${{ env.NODE_JS }}
           registry-url: "https://registry.npmjs.org"
 
-      - uses: pnpm/action-setup@v4
-        if: ${{ steps.release.outputs.releases_created }}
-        with:
-          version: 9
-
       - run: npm install
         if: ${{ steps.release.outputs.releases_created }}
 
       - run: npm run build
         if: ${{ steps.release.outputs.releases_created }}
 
-      - name: Setup Foundry
-        if: ${{ steps.release.outputs.releases_created }}
-        uses: foundry-rs/foundry-toolchain@v1
-        with:
-          version: nightly
-
-      - name: Generate RLN contract ABIs
-        id: rln-abi
-        if: ${{ steps.release.outputs.releases_created }}
-        run: |
-          npm run setup:contract-abi -w @waku/rln || {
-            echo "::warning::Failed to generate contract ABIs, marking @waku/rln as private to skip publishing"
-            cd packages/rln
-            node -e "const fs = require('fs'); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.private = true; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2));"
-            echo "failed=true" >> $GITHUB_OUTPUT
-          }
-
-      - name: Rebuild with new ABIs
-        if: ${{ steps.release.outputs.releases_created && steps.rln-abi.outputs.failed != 'true' }}
-        run: |
-          npm install -w packages/rln
-          npm run build -w @waku/rln || {
-            echo "::warning::Failed to build @waku/rln, marking as private to skip publishing"
-            cd packages/rln
-            node -e "const fs = require('fs'); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.private = true; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2));"
-          }
-
       - run: npm run publish
         if: ${{ steps.release.outputs.releases_created }}
         env:

.github/workflows/playwright.yml

@@ -8,6 +8,9 @@ on:
 
 env:
   NODE_JS: "22"
+  EXAMPLE_TEMPLATE: "web-chat"
+  EXAMPLE_NAME: "example"
+  EXAMPLE_PORT: "8080"
   # Firefox in container fails due to $HOME not being owned by user running commands
   # more details https://github.com/microsoft/playwright/issues/6500
   HOME: "/root"
@@ -17,7 +20,7 @@ jobs:
     timeout-minutes: 60
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/playwright:v1.56.1-jammy
+      image: mcr.microsoft.com/playwright:v1.53.1-jammy
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
@@ -26,8 +29,11 @@ jobs:
 
     - uses: ./.github/actions/npm
 
-    - name: Build entire monorepo
-      run: npm run build
+    - name: Build browser container
+      run: npm run build --workspace=@waku/headless-tests
+
+    - name: Build browser test environment
+      run: npm run build --workspace=@waku/browser-tests
 
     - name: Run Playwright tests
       run: npm run test --workspace=@waku/browser-tests

.github/workflows/pre-release.yml

@@ -2,11 +2,7 @@ on:
     workflow_dispatch:
 
 env:
-  NODE_JS: "24"
-
-permissions:
-  id-token: write
-  contents: read
+  NODE_JS: "22"
 
 jobs:
     pre-release:
@@ -14,49 +10,19 @@ jobs:
         runs-on: ubuntu-latest
         if: github.event_name == 'workflow_dispatch'
         steps:
-          - uses: actions/checkout@v4
-            with:
+          - uses: actions/checkout@v3
+            with: 
               repository: waku-org/js-waku
-              ref: ${{ github.ref }}
-
-          - uses: actions/setup-node@v4
+    
+          - uses: actions/setup-node@v3
             with:
               node-version: ${{ env.NODE_JS }}
               registry-url: "https://registry.npmjs.org"
-
-          - uses: pnpm/action-setup@v4
-            with:
-              version: 9
-
+    
           - run: npm install
-
+    
           - run: npm run build
-
-          - name: Setup Foundry
-            uses: foundry-rs/foundry-toolchain@v1
-            with:
-              version: nightly
-
-          - name: Generate RLN contract ABIs
-            id: rln-abi
-            run: |
-              npm run setup:contract-abi -w @waku/rln || {
-                echo "::warning::Failed to generate contract ABIs, marking @waku/rln as private to skip publishing"
-                cd packages/rln
-                node -e "const fs = require('fs'); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.private = true; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2));"
-                echo "failed=true" >> $GITHUB_OUTPUT
-              }
-
-          - name: Rebuild with new ABIs
-            if: steps.rln-abi.outputs.failed != 'true'
-            run: |
-              npm install -w packages/rln
-              npm run build -w @waku/rln || {
-                echo "::warning::Failed to build @waku/rln, marking as private to skip publishing"
-                cd packages/rln
-                node -e "const fs = require('fs'); const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8')); pkg.private = true; fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2));"
-              }
-
+    
           - run: npm run publish -- --tag next
             env:
               NODE_AUTH_TOKEN: ${{ secrets.NPM_JS_WAKU_PUBLISH }}

.github/workflows/test-node.yml

@@ -24,7 +24,7 @@ on:
         default: false
 
 env:
-  NODE_JS: "24"
+  NODE_JS: "22"
   # Ensure test type conditions remain consistent.
   WAKU_SERVICE_NODE_PARAMS: ${{ (inputs.test_type == 'go-waku-master') && '--min-relay-peers-to-publish=0' || '' }}
   DEBUG: ${{ inputs.debug }}
@@ -42,7 +42,7 @@ jobs:
       checks: write
     steps:
       - uses: actions/checkout@v3
-        with:
+        with: 
           repository: waku-org/js-waku
 
       - name: Remove unwanted software
@@ -62,7 +62,7 @@ jobs:
 
       - name: Merge allure reports
         if: always() && env.ALLURE_REPORTS == 'true'
-        run: node ci/mergeAllureResults.cjs
+        run: node ci/mergeAllureResults.cjs 
 
       - name: Get allure history
         if: always() && env.ALLURE_REPORTS == 'true'
@@ -125,4 +125,4 @@ jobs:
           echo "## Run Information" >> $GITHUB_STEP_SUMMARY
           echo "- **NWAKU**: ${{ env.WAKUNODE_IMAGE }}" >> $GITHUB_STEP_SUMMARY
           echo "## Test Results" >> $GITHUB_STEP_SUMMARY
-          echo "Allure report will be available at: https://waku-org.github.io/allure-jswaku/${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY
+          echo "Allure report will be available at: https://waku-org.github.io/allure-jswaku/${{ github.run_number }}" >> $GITHUB_STEP_SUMMARY

.github/workflows/test-reliability.yml

@@ -2,39 +2,23 @@ name: Run Reliability Test
 
 on:
   workflow_dispatch:
-    inputs:
-      test_type:
-        description: 'Type of reliability test to run'
-        required: true
-        default: 'longevity'
-        type: choice
-        options:
-          - longevity
-          - high-throughput
-          - throughput-sizes
-          - network-latency
-          - low-bandwidth
-          - packet-loss
-          - all
+  push:
+    branches:
+      - "chore/longevity-tests"
 
 env:
-  NODE_JS: "24"
+  NODE_JS: "22"
 
 jobs:
-  test:
+  node:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       actions: read
       checks: write
-    strategy:
-      matrix:
-        test_type: [longevity, high-throughput, throughput-sizes, network-latency, low-bandwidth, packet-loss]
-      fail-fast: false
-    if: ${{ github.event.inputs.test_type == 'all' }}
     steps:
       - uses: actions/checkout@v3
-        with:
+        with: 
           repository: waku-org/js-waku
 
       - name: Remove unwanted software
@@ -50,57 +34,4 @@ jobs:
 
       - name: Run tests
         timeout-minutes: 150
-        run: |
-          if [ "${{ matrix.test_type }}" = "high-throughput" ]; then
-            npm run test:high-throughput
-          elif [ "${{ matrix.test_type }}" = "throughput-sizes" ]; then
-            npm run test:throughput-sizes
-          elif [ "${{ matrix.test_type }}" = "network-latency" ]; then
-            npm run test:network-latency
-          elif [ "${{ matrix.test_type }}" = "low-bandwidth" ]; then
-            npm run test:low-bandwidth
-          elif [ "${{ matrix.test_type }}" = "packet-loss" ]; then
-            npm run test:packet-loss
-          else
-            npm run test:longevity
-          fi
-
-  single-test:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      actions: read
-      checks: write
-    if: ${{ github.event.inputs.test_type != 'all' }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          repository: waku-org/js-waku
-
-      - name: Remove unwanted software
-        uses: ./.github/actions/prune-vm
-
-      - uses: actions/setup-node@v3
-        with:
-          node-version: ${{ env.NODE_JS }}
-
-      - uses: ./.github/actions/npm
-
-      - run: npm run build:esm
-
-      - name: Run tests
-        timeout-minutes: 150
-        run: |
-          if [ "${{ github.event.inputs.test_type }}" = "high-throughput" ]; then
-            npm run test:high-throughput
-          elif [ "${{ github.event.inputs.test_type }}" = "throughput-sizes" ]; then
-            npm run test:throughput-sizes
-          elif [ "${{ github.event.inputs.test_type }}" = "network-latency" ]; then
-            npm run test:network-latency
-          elif [ "${{ github.event.inputs.test_type }}" = "low-bandwidth" ]; then
-            npm run test:low-bandwidth
-          elif [ "${{ github.event.inputs.test_type }}" = "packet-loss" ]; then
-            npm run test:packet-loss
-          else
-            npm run test:longevity
-          fi
+        run: npm run test:longevity

.gitignore

@@ -17,7 +17,4 @@ packages/discovery/mock_local_storage
 .giga
 .cursor
 .DS_Store
-CLAUDE.md
-.env
-postgres-data/
-packages/rln/waku-rlnv2-contract/
+CLAUDE.md

.release-please-manifest.json

@@ -1,15 +1,13 @@
 {
-  "packages/utils": "0.0.27",
-  "packages/proto": "0.0.15",
-  "packages/interfaces": "0.0.34",
-  "packages/enr": "0.0.33",
-  "packages/core": "0.0.40",
-  "packages/message-encryption": "0.0.38",
-  "packages/relay": "0.0.23",
-  "packages/sdk": "0.0.36",
-  "packages/discovery": "0.0.13",
-  "packages/sds": "0.0.8",
-  "packages/rln": "0.1.10",
-  "packages/react": "0.0.8",
-  "packages/run": "0.0.2"
+  "packages/utils": "0.0.24",
+  "packages/proto": "0.0.11",
+  "packages/interfaces": "0.0.31",
+  "packages/enr": "0.0.30",
+  "packages/core": "0.0.36",
+  "packages/message-encryption": "0.0.34",
+  "packages/relay": "0.0.19",
+  "packages/sdk": "0.0.32",
+  "packages/discovery": "0.0.9",
+  "packages/sds": "0.0.4",
+  "packages/rln": "0.1.6"
 }

.size-limit.cjs

@@ -33,9 +33,9 @@ module.exports = [
     import: "{ wakuPeerExchangeDiscovery }",
   },
   {
-    name: "Peer Cache Discovery",
+    name: "Local Peer Cache Discovery",
     path: "packages/discovery/bundle/index.js",
-    import: "{ wakuPeerCacheDiscovery }",
+    import: "{ wakuLocalPeerCacheDiscovery }",
   },
   {
     name: "Privacy preserving protocols",

Dockerfile

@@ -0,0 +1,45 @@
+FROM node:20-slim
+
+# Install Chrome dependencies
+RUN apt-get update && apt-get install -y \
+    procps \
+    libglib2.0-0 \
+    libnss3 \
+    libnspr4 \
+    libatk1.0-0 \
+    libatk-bridge2.0-0 \
+    libcups2 \
+    libdrm2 \
+    libxkbcommon0 \
+    libxcomposite1 \
+    libxdamage1 \
+    libxfixes3 \
+    libxrandr2 \
+    libgbm1 \
+    libasound2 \
+    libpango-1.0-0 \
+    libcairo2 \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+# Copy package files
+COPY package*.json ./
+COPY packages/browser-tests/package.json ./packages/browser-tests/
+COPY packages/headless-tests/package.json ./packages/headless-tests/
+
+# Install dependencies and serve
+RUN npm install && npm install -g serve
+
+# Copy source files
+COPY tsconfig.json ./
+COPY packages/ ./packages/
+
+# Build packages
+RUN npm run build -w packages/headless-tests && \
+    npm run build:server -w packages/browser-tests && \
+    npx playwright install chromium
+
+EXPOSE 3000
+
+CMD ["npm", "run", "start:server", "-w", "packages/browser-tests"]

README.md

@@ -23,15 +23,6 @@ npm install
 npm run doc
 ```
 
-# Using Nix shell
-```shell
-git clone https://github.com/waku-org/js-waku.git
-cd js-waku
-nix develop
-npm install
-npm run doc
-```
-
 ## Bugs, Questions & Features
 
 If you encounter any bug or would like to propose new features, feel free to [open an issue](https://github.com/waku-org/js-waku/issues/new/).

ci/Jenkinsfile

@@ -1,20 +1,8 @@
-#!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.9.27'
-
 pipeline {
-  agent {
-    docker {
-      label 'linuxcontainer'
-      image 'harbor.status.im/infra/ci-build-containers:linux-base-1.0.0'
-      args '--volume=/nix:/nix ' +
-           '--volume=/etc/nix:/etc/nix ' +
-           '--user jenkins'
-    }
-  }
+  agent { label 'linux' }
 
   options {
     disableConcurrentBuilds()
-    disableRestartFromStage()
     /* manage how many builds we keep */
     buildDiscarder(logRotator(
       numToKeepStr: '20',
@@ -32,25 +20,19 @@ pipeline {
   stages {
     stage('Deps') {
       steps {
-        script {
-          nix.develop('npm install', pure: true)
-        }
+        sh 'npm install'
       }
     }
 
     stage('Packages') {
       steps {
-        script {
-          nix.develop('npm run build', pure: true)
-        }
+        sh 'npm run build'
       }
     }
 
     stage('Build') {
       steps {
-        script {
-          nix.develop('npm run doc', pure: true)
-        }
+        sh 'npm run doc'
       }
     }
 
@@ -58,9 +40,7 @@ pipeline {
       when { expression { GIT_BRANCH.endsWith('master') } }
       steps {
         sshagent(credentials: ['status-im-auto-ssh']) {
-          script {
-            nix.develop('npm run deploy', pure: false)
-          }
+          sh 'npm run deploy'
         }
       }
     }

flake.lock

@@ -1,26 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1761016216,
-        "narHash": "sha256-G/iC4t/9j/52i/nm+0/4ybBmAF4hzR8CNHC75qEhjHo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "481cf557888e05d3128a76f14c76397b7d7cc869",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-25.05",
-        "type": "indirect"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,33 +0,0 @@
-{
-  description = "Nix flake development shell.";
-
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-25.05";
-  };
-
-  outputs =
-    { self, nixpkgs }:
-    let
-      supportedSystems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
-      forEachSystem = nixpkgs.lib.genAttrs supportedSystems;
-      pkgsFor = forEachSystem (system: import nixpkgs { inherit system; });
-    in
-    rec {
-      formatter = forEachSystem (system: pkgsFor.${system}.nixpkgs-fmt);
-
-      devShells = forEachSystem (system: {
-        default = pkgsFor.${system}.mkShellNoCC {
-          packages = with pkgsFor.${system}.buildPackages; [
-            git        # 2.44.1
-            openssh    # 9.7p1
-            nodejs_20  # v20.15.1
-          ];
-        };
-      });
-    };
-}

karma.conf.cjs

@@ -6,10 +6,7 @@ if (!process.env.CHROME_BIN) {
   process.env.CHROME_BIN = playwright.chromium.executablePath();
 }
 console.log("Using CHROME_BIN:", process.env.CHROME_BIN);
-if (!process.env.FIREFOX_BIN) {
-  process.env.FIREFOX_BIN = playwright.firefox.executablePath();
-}
-console.log("Using FIREFOX_BIN:", process.env.FIREFOX_BIN);
+process.env.FIREFOX_BIN = playwright.firefox.executablePath();
 
 module.exports = function (config) {
   const configuration = {

package.json

@@ -10,16 +10,15 @@
     "packages/core",
     "packages/discovery",
     "packages/message-encryption",
-    "packages/sds",
-    "packages/rln",
     "packages/sdk",
     "packages/relay",
-    "packages/run",
+    "packages/sds",
+    "packages/rln",
     "packages/tests",
     "packages/reliability-tests",
+    "packages/headless-tests",
     "packages/browser-tests",
-    "packages/build-utils",
-    "packages/react"
+    "packages/build-utils"
   ],
   "scripts": {
     "prepare": "husky",
@@ -35,17 +34,13 @@
     "test:browser": "NODE_ENV=test npm run test:browser --workspaces --if-present",
     "test:node": "NODE_ENV=test npm run test:node --workspaces --if-present",
     "test:longevity": "npm --prefix packages/reliability-tests run test:longevity",
-    "test:high-throughput": "npm --prefix packages/reliability-tests run test:high-throughput",
-    "test:throughput-sizes": "npm --prefix packages/reliability-tests run test:throughput-sizes",
-    "test:network-latency": "npm --prefix packages/reliability-tests run test:network-latency",
-    "test:low-bandwidth": "npm --prefix packages/reliability-tests run test:low-bandwidth",
-    "test:packet-loss": "npm --prefix packages/reliability-tests run test:packet-loss",
     "proto": "npm run proto --workspaces --if-present",
     "deploy": "node ci/deploy.js",
     "doc": "run-s doc:*",
     "doc:html": "typedoc --options typedoc.cjs",
     "doc:cname": "echo 'js.waku.org' > docs/CNAME",
-    "publish": "node ./ci/publish.js"
+    "publish": "node ./ci/publish.js",
+    "sync-rln-tree": "node ./packages/tests/src/sync-rln-tree.js"
   },
   "devDependencies": {
     "@size-limit/preset-big-lib": "^11.0.2",
@@ -78,6 +73,5 @@
     "*.{ts,js}": [
       "eslint --fix"
     ]
-  },
-  "version": ""
+  }
 }

packages/browser-tests/.dockerignore

@@ -1,4 +1,5 @@
 node_modules
+dist
 build
 .DS_Store
 *.log

packages/browser-tests/.eslintrc.cjs

@@ -12,7 +12,7 @@ module.exports = {
     plugins: ["import"],
     extends: ["eslint:recommended"],
     rules: {
-        "no-unused-vars": ["error", { "argsIgnorePattern": "^_", "ignoreRestSiblings": true }]
+        "no-console": "off"
     },
     globals: {
         process: true

packages/browser-tests/Dockerfile

@@ -1,72 +0,0 @@
-# syntax=docker/dockerfile:1
-
-# Build stage - install all dependencies and build
-FROM node:22-bullseye AS builder
-
-WORKDIR /app
-
-# Copy package.json and temporarily remove workspace dependencies that can't be resolved
-COPY package.json package.json.orig
-RUN sed '/"@waku\/tests": "\*",/d' package.json.orig > package.json
-RUN npm install --no-audit --no-fund
-
-COPY src ./src
-COPY types ./types
-COPY tsconfig.json ./
-COPY web ./web
-
-RUN npm run build
-
-# Production stage - only runtime dependencies
-FROM node:22-bullseye
-
-# Install required system deps for Playwright Chromium
-RUN apt-get update && apt-get install -y \
-    wget \
-    gnupg \
-    ca-certificates \
-    fonts-liberation \
-    libatk-bridge2.0-0 \
-    libatk1.0-0 \
-    libatspi2.0-0 \
-    libcups2 \
-    libdbus-1-3 \
-    libdrm2 \
-    libgtk-3-0 \
-    libnspr4 \
-    libnss3 \
-    libx11-xcb1 \
-    libxcomposite1 \
-    libxdamage1 \
-    libxfixes3 \
-    libxkbcommon0 \
-    libxrandr2 \
-    xdg-utils \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /app
-
-# Copy package files and install only production dependencies
-COPY package.json package.json.orig
-RUN sed '/"@waku\/tests": "\*",/d' package.json.orig > package.json  
-RUN npm install --only=production --no-audit --no-fund
-
-# Copy built application from builder stage
-COPY --from=builder /app/dist ./dist
-
-# Install Playwright browsers (Chromium only) at runtime layer
-RUN npx playwright install --with-deps chromium
-
-ENV PORT=8080 \
-    NODE_ENV=production
-
-EXPOSE 8080
-
-# Use a script to handle CLI arguments and environment variables
-COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-RUN chmod +x /usr/local/bin/docker-entrypoint.sh
-
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-CMD ["npm", "run", "start:server"]
-
-

packages/browser-tests/README.md

@@ -1,174 +1,182 @@
 # Waku Browser Tests
 
-This package provides a containerized Waku light node simulation server for testing and development. The server runs a headless browser using Playwright and exposes a REST API similar to the nwaku REST API. A Dockerfile is provided to allow programmatic simulation and "deployment" of js-waku nodes in any Waku orchestration environment that uses Docker (e.g. [10ksim](https://github.com/vacp2p/10ksim) ).
+This project provides a system for testing the Waku SDK in a browser environment.
 
-## Quick Start
+## Architecture
 
-### Build and Run
+The system consists of:
+
+1. **Headless Web App**: A simple web application (in the `@waku/headless-tests` package) that loads the Waku SDK and exposes shared API functions.
+2. **Express Server**: A server that communicates with the headless app using Playwright.
+3. **Shared API**: TypeScript functions shared between the server and web app.
+
+## Setup
+
+1. Install dependencies:
+
+```bash
+# Install main dependencies
+npm install
+
+# Install headless app dependencies
+cd ../headless-tests
+npm install
+cd ../browser-tests
+```
+
+2. Build the application:
 
 ```bash
-# Build the application
 npm run build
-
-# Start the server (port 8080)
-npm run start:server
-
-# Build and run Docker container
-npm run docker:build
-docker run -p 8080:8080 waku-browser-tests:local
 ```
 
-## Configuration
+This will:
+- Build the headless web app using webpack
+- Compile the TypeScript server code
 
-Configure the Waku node using environment variables:
+## Running
 
-### Network Configuration
-- `WAKU_CLUSTER_ID`: Cluster ID (default: 1)
-- `WAKU_SHARD`: Specific shard number - enables static sharding mode (optional)
-
-**Sharding Behavior:**
-- **Auto-sharding** (default): Uses `numShardsInCluster: 8` across cluster 1
-- **Static sharding**: When `WAKU_SHARD` is set, uses only that specific shard
-
-### Bootstrap Configuration
-- `WAKU_ENR_BOOTSTRAP`: Enable ENR bootstrap mode with custom bootstrap peers (comma-separated)
-- `WAKU_LIGHTPUSH_NODE`: Preferred lightpush node multiaddr (Docker only)
-
-### ENR Bootstrap Mode
-
-When `WAKU_ENR_BOOTSTRAP` is set:
-- Disables default bootstrap (`defaultBootstrap: false`)
-- Enables DNS discovery using production ENR trees
-- Enables peer exchange and peer cache
-- Uses the specified ENR for additional bootstrap peers
+Start the server with:
 
 ```bash
-# Example: ENR bootstrap mode
-WAKU_ENR_BOOTSTRAP="enr:-QEnuEBEAyErHEfhiQxAVQoWowGTCuEF9fKZtXSd7H_PymHFhGJA3rGAYDVSHKCyJDGRLBGsloNbS8AZF33IVuefjOO6BIJpZIJ2NIJpcIQS39tkim11bHRpYWRkcnO4lgAvNihub2RlLTAxLmRvLWFtczMud2FrdXYyLnRlc3Quc3RhdHVzaW0ubmV0BgG73gMAODcxbm9kZS0wMS5hYy1jbi1ob25na29uZy1jLndha3V2Mi50ZXN0LnN0YXR1c2ltLm5ldAYBu94DACm9A62t7AQL4Ef5ZYZosRpQTzFVAB8jGjf1TER2wH-0zBOe1-MDBNLeA4lzZWNwMjU2azGhAzfsxbxyCkgCqq8WwYsVWH7YkpMLnU2Bw5xJSimxKav-g3VkcIIjKA" npm run start:server
+npm run start:server
 ```
 
+This will:
+1. Serve the headless app on port 8080
+2. Start a headless browser to load the app
+3. Expose API endpoints to interact with Waku
+
 ## API Endpoints
 
-The server exposes the following HTTP endpoints:
+- `GET /info`: Get information about the Waku node
+- `GET /debug/v1/info`: Get debug information from the Waku node
+- `POST /push`: Push a message to the Waku network (legacy)
+- `POST /lightpush/v1/message`: Push a message to the Waku network (Waku REST API compatible)
+- `POST /admin/v1/create-node`: Create a new Waku node (requires networkConfig)
+- `POST /admin/v1/start-node`: Start the Waku node
+- `POST /admin/v1/stop-node`: Stop the Waku node
+- `POST /admin/v1/peers`: Dial to specified peers (Waku REST API compatible)
+- `GET /filter/v2/messages/:contentTopic`: Subscribe to messages on a specific content topic using Server-Sent Events (Waku REST API compatible)
+- `GET /filter/v1/messages/:contentTopic`: Retrieve stored messages from a content topic (Waku REST API compatible)
 
-### Node Management
-- `GET /`: Health check - returns server status
-- `GET /waku/v1/peer-info`: Get node peer information
-- `POST /waku/v1/wait-for-peers`: Wait for peers with specific protocols
+### Example: Pushing a message with the legacy endpoint
 
-### Messaging
-- `POST /lightpush/v3/message`: Send message via lightpush
-
-### Static Files
-- `GET /app/index.html`: Web application entry point
-- `GET /app/*`: Static web application files
-
-### Examples
-
-#### Send a Message (Auto-sharding)
 ```bash
-curl -X POST http://localhost:8080/lightpush/v3/message \
+curl -X POST http://localhost:3000/push \
+  -H "Content-Type: application/json" \
+  -d '{"contentTopic": "/toy-chat/2/huilong/proto", "payload": [1, 2, 3]}'
+```
+
+### Example: Pushing a message with the Waku REST API compatible endpoint
+
+```bash
+curl -X POST http://localhost:3000/lightpush/v1/message \
   -H "Content-Type: application/json" \
   -d '{
-    "pubsubTopic": "",
+    "pubsubTopic": "/waku/2/rs/0/0",
     "message": {
-      "contentTopic": "/test/1/example/proto",
-      "payload": "SGVsbG8gV2FrdQ==",
-      "version": 1
+      "payload": "SGVsbG8sIFdha3Uh",
+      "contentTopic": "/toy-chat/2/huilong/proto",
+      "timestamp": 1712135330213797632
     }
   }'
 ```
 
-#### Send a Message (Explicit pubsub topic)
+### Example: Executing a function
+
 ```bash
-curl -X POST http://localhost:8080/lightpush/v3/message \
+curl -X POST http://localhost:3000/execute \
+  -H "Content-Type: application/json" \
+  -d '{"functionName": "getPeerInfo", "params": []}'
+```
+
+### Example: Creating a Waku node
+
+```bash
+curl -X POST http://localhost:3000/admin/v1/create-node \
   -H "Content-Type: application/json" \
   -d '{
-    "pubsubTopic": "/waku/2/rs/1/4",
-    "message": {
-      "contentTopic": "/test/1/example/proto",
-      "payload": "SGVsbG8gV2FrdQ==",
-      "version": 1
+    "defaultBootstrap": true,
+    "networkConfig": {
+      "clusterId": 1,
+      "shards": [0, 1]
     }
   }'
 ```
 
-#### Wait for Peers
+### Example: Starting and stopping a Waku node
+
 ```bash
-curl -X POST http://localhost:8080/waku/v1/wait-for-peers \
+# Start the node
+curl -X POST http://localhost:3000/admin/v1/start-node
+
+# Stop the node
+curl -X POST http://localhost:3000/admin/v1/stop-node
+```
+
+### Example: Dialing to specific peers with the Waku REST API compatible endpoint
+
+```bash
+curl -X POST http://localhost:3000/admin/v1/peers \
   -H "Content-Type: application/json" \
   -d '{
-    "timeoutMs": 30000,
-    "protocols": ["lightpush", "filter"]
+    "peerMultiaddrs": [
+      "/ip4/127.0.0.1/tcp/8000/p2p/16Uiu2HAm4v8KuHUH6Cwz3upPeQbkyxQJsFGPdt7kHtkN8F79QiE6"]
+    ]
   }'
 ```
 
-#### Get Peer Info
-```bash
-curl -X GET http://localhost:8080/waku/v1/peer-info
-```
-
-## CLI Usage
-
-Run with CLI arguments:
+### Example: Dialing to specific peers with the execute endpoint
 
 ```bash
-# Custom cluster and shard
-node dist/src/server.js --cluster-id=2 --shard=0
+curl -X POST http://localhost:3000/execute \
+  -H "Content-Type: application/json" \
+  -d '{
+    "functionName": "dialPeers", 
+    "params": [
+      ["/ip4/127.0.0.1/tcp/8000/p2p/16Uiu2HAm4v8KuHUH6Cwz3upPeQbkyxQJsFGPdt7kHtkN8F79QiE6"]
+    ]
+  }'
 ```
 
-## Testing
-
-The package includes several test suites:
+### Example: Subscribing to a content topic with the filter endpoint
 
 ```bash
-# Basic server functionality tests (default)
-npm test
+# Open a persistent connection to receive messages as Server-Sent Events
+curl -N http://localhost:3000/filter/v2/messages/%2Ftoy-chat%2F2%2Fhuilong%2Fproto
 
-# Docker testing workflow
-npm run docker:build
-npm run test:integration
-
-# All tests
-npm run test:all
-
-# Individual test suites:
-npm run test:server      # Server-only tests
-npm run test:e2e        # End-to-end tests 
+# You can also specify clustering options
+curl -N "http://localhost:3000/filter/v2/messages/%2Ftoy-chat%2F2%2Fhuilong%2Fproto?clusterId=0&shard=0"
 ```
 
-**Test Types:**
-- `server.spec.ts` - Tests basic server functionality and static file serving
-- `integration.spec.ts` - Tests Docker container integration with external services  
-- `e2e.spec.ts` - Full end-to-end tests using nwaku nodes
-
-## Docker Usage
-
-The package includes Docker support for containerized testing:
+### Example: Retrieving stored messages from a content topic
 
 ```bash
-# Build image
-docker build -t waku-browser-tests:local .
+# Get the most recent 20 messages
+curl http://localhost:3000/filter/v1/messages/%2Ftoy-chat%2F2%2Fhuilong%2Fproto
 
-# Run with ENR bootstrap
-docker run -p 8080:8080 \
-  -e WAKU_ENR_BOOTSTRAP="enr:-QEnuE..." \
-  -e WAKU_CLUSTER_ID="1" \
-  waku-browser-tests:local
-
-# Run with specific configuration
-docker run -p 8080:8080 \
-  -e WAKU_CLUSTER_ID="2" \
-  -e WAKU_SHARD="0" \
-  waku-browser-tests:local
+# Get messages with pagination and time filtering
+curl "http://localhost:3000/filter/v1/messages/%2Ftoy-chat%2F2%2Fhuilong%2Fproto?pageSize=10&startTime=1712000000000&endTime=1713000000000&ascending=true"
 ```
 
-## Development
+## Extending
 
-The server automatically:
-- Creates a Waku light node on startup
-- Configures network settings from environment variables
-- Enables appropriate protocols (lightpush, filter)
-- Handles peer discovery and connection management
+To add new functionality:
 
-All endpoints are CORS-enabled for cross-origin requests.
+1. Add your function to `src/api/shared.ts`
+2. Add your function to the `API` object in `src/api/shared.ts`
+3. Use it via the server endpoints 
+
+### Example: Dialing to specific peers
+
+```bash
+curl -X POST http://localhost:3000/execute \
+  -H "Content-Type: application/json" \
+  -d '{
+    "functionName": "dialPeers", 
+    "params": [
+      ["/ip4/127.0.0.1/tcp/8000/p2p/16Uiu2HAm4v8KuHUH6Cwz3upPeQbkyxQJsFGPdt7kHtkN8F79QiE6"]
+    ]
+  }'
+```

packages/browser-tests/package.json

@@ -5,38 +5,27 @@
   "type": "module",
   "scripts": {
     "start": "npm run start:server",
-    "start:server": "PORT=8080 node ./dist/src/server.js",
-    "test": "npx playwright test tests/server.spec.ts --reporter=line",
-    "test:all": "npx playwright test --reporter=line",
-    "test:server": "npx playwright test tests/server.spec.ts --reporter=line",
-    "test:integration": "npx playwright test tests/integration.spec.ts --reporter=line",
-    "test:e2e": "npx playwright test tests/e2e.spec.ts --reporter=line",
+    "start:server": "node ./dist/server.js",
+    "test": "npx playwright test",
     "build:server": "tsc -p tsconfig.json",
-    "build:web": "esbuild web/index.ts --bundle --format=esm --platform=browser --outdir=dist/web && cp web/index.html dist/web/index.html",
-    "build": "npm-run-all -s build:server build:web",
-    "docker:build": "docker build -t waku-browser-tests:local . && docker tag waku-browser-tests:local waku-browser-tests:latest"
-  },
-  "dependencies": {
-    "@playwright/test": "^1.51.1",
-    "@waku/discovery": "^0.0.11",
-    "@waku/interfaces": "^0.0.33",
-    "@waku/sdk": "^0.0.34",
-    "@waku/utils": "0.0.27",
-    "cors": "^2.8.5",
-    "dotenv-flow": "^0.4.0",
-    "express": "^4.21.2",
-    "filter-obj": "^2.0.2",
-    "it-first": "^3.0.9"
+    "build": "npm run build:server"
   },
   "devDependencies": {
     "@types/cors": "^2.8.15",
     "@types/express": "^4.17.21",
     "@types/node": "^20.10.0",
-    "@waku/tests": "*",
     "axios": "^1.8.4",
-    "esbuild": "^0.21.5",
+    "dotenv-flow": "^0.4.0",
     "npm-run-all": "^4.1.5",
-    "testcontainers": "^10.9.0",
-    "typescript": "5.8.3"
+    "serve": "^14.2.3",
+    "typescript": "5.8.3",
+    "webpack-cli": "^6.0.1"
+  },
+  "dependencies": {
+    "@playwright/test": "^1.51.1",
+    "@waku/sdk": "^0.0.30",
+    "cors": "^2.8.5",
+    "express": "^4.21.2",
+    "node-polyfill-webpack-plugin": "^4.1.0"
   }
 }

packages/browser-tests/playwright.config.ts

@@ -1,39 +1,57 @@
+// For dynamic import of dotenv-flow
 import { defineConfig, devices } from "@playwright/test";
-import { Logger } from "@waku/utils";
-
-const log = new Logger("playwright-config");
 
+// Only load dotenv-flow in non-CI environments
 if (!process.env.CI) {
-  try {
-    await import("dotenv-flow/config.js");
-  } catch (e) {
-    log.warn("dotenv-flow not found; skipping env loading");
-  }
+  // Need to use .js extension for ES modules
+  // eslint-disable-next-line import/extensions
+  await import("dotenv-flow/config.js");
 }
 
 const EXAMPLE_PORT = process.env.EXAMPLE_PORT || "8080";
-const BASE_URL = `http://127.0.0.1:${EXAMPLE_PORT}`;
-const TEST_IGNORE = process.env.CI ? ["tests/e2e.spec.ts"] : [];
+// web-chat specific thingy
+const EXAMPLE_TEMPLATE = process.env.EXAMPLE_TEMPLATE || "";
+const BASE_URL = `http://127.0.0.1:${EXAMPLE_PORT}/${EXAMPLE_TEMPLATE}`;
 
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
 export default defineConfig({
   testDir: "./tests",
-  testIgnore: TEST_IGNORE,
+  /* Run tests in files in parallel */
   fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
   retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
   workers: process.env.CI ? 2 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: "html",
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
     baseURL: BASE_URL,
 
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: "on-first-retry"
   },
 
+  /* Configure projects for major browsers */
   projects: [
     {
       name: "chromium",
       use: { ...devices["Desktop Chrome"] }
     }
-  ]
+  ],
 
+  /* Run your local dev server before starting the tests */
+  webServer: {
+    url: BASE_URL,
+    stdout: "pipe",
+    stderr: "pipe",
+    command: "npm run start:server",
+    reuseExistingServer: !process.env.CI,
+    timeout: 5 * 60 * 1000 // five minutes for bootstrapping an example
+  }
 });

packages/browser-tests/scripts/docker-entrypoint.sh

@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# Docker entrypoint script for waku-browser-tests
-# Handles CLI arguments and converts them to environment variables
-# Supports reading discovered addresses from /etc/addrs/addrs.env (10k sim pattern)
-echo "docker-entrypoint.sh"
-echo "Using address: $addrs1"
-# Only set WAKU_LIGHTPUSH_NODE if it's not already set and addrs1 is available
-if [ -z "$WAKU_LIGHTPUSH_NODE" ] && [ -n "$addrs1" ]; then
-  export WAKU_LIGHTPUSH_NODE="$addrs1"
-fi
-echo "Num Args: $#"
-echo "Args: $@"
-
-echo "WAKU_LIGHTPUSH_NODE=$WAKU_LIGHTPUSH_NODE"
-
-# Parse command line arguments
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    --cluster-id=*)
-      export WAKU_CLUSTER_ID="${1#*=}"
-      echo "Setting WAKU_CLUSTER_ID=${WAKU_CLUSTER_ID}"
-      shift
-      ;;
-    --shard=*)
-      export WAKU_SHARD="${1#*=}"
-      echo "Setting WAKU_SHARD=${WAKU_SHARD}"
-      shift
-      ;;
-    --lightpushnode=*)
-      export WAKU_LIGHTPUSH_NODE="${1#*=}"
-      echo "Setting WAKU_LIGHTPUSH_NODE=${WAKU_LIGHTPUSH_NODE}"
-      shift
-      ;;
-    --enr-bootstrap=*)
-      export WAKU_ENR_BOOTSTRAP="${1#*=}"
-      echo "Setting WAKU_ENR_BOOTSTRAP=${WAKU_ENR_BOOTSTRAP}"
-      shift
-      ;;
-    *)
-      # Unknown argument, notify user and keep it for the main command
-      echo "Warning: Unknown argument '$1' will be passed to the main command"
-      break
-      ;;
-  esac
-done
-
-# If no specific command is provided, use the default CMD
-if [ $# -eq 0 ]; then
-  set -- "npm" "run" "start:server"
-fi
-
-# Execute the main command
-exec "$@"

packages/browser-tests/src/api/common.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Shared utilities for working with Waku nodes
+ * This file contains functions used by both browser tests and server
+ */
+
+/**
+ * Type definition for a minimal Waku node interface
+ * This allows us to use the same code in different contexts
+ */
+export interface IWakuNode {
+  libp2p: {
+    peerId: { toString(): string };
+    getMultiaddrs(): Array<{ toString(): string }>;
+    getProtocols(): any;
+    peerStore: {
+      all(): Promise<Array<{ id: { toString(): string } }>>;
+    };
+  };
+  lightPush: {
+    send: (encoder: any, message: { payload: Uint8Array }) => Promise<{ successes: any[] }>;
+  };
+}

packages/browser-tests/src/api/debug.ts

@@ -0,0 +1,36 @@
+import { IWakuNode } from "./common.js";
+
+/**
+ * Gets peer information from a Waku node
+ * Used in both server API endpoints and headless tests
+ */
+export async function getPeerInfo(waku: IWakuNode): Promise<{
+  peerId: string;
+  multiaddrs: string[];
+  peers: string[];
+}> {
+  const multiaddrs = waku.libp2p.getMultiaddrs();
+  const peers = await waku.libp2p.peerStore.all();
+
+  return {
+    peerId: waku.libp2p.peerId.toString(),
+    multiaddrs: multiaddrs.map((addr) => addr.toString()),
+    peers: peers.map((peer) => peer.id.toString())
+  };
+}
+
+/**
+ * Gets debug information from a Waku node
+ * Used in both server API endpoints and tests
+ */
+export async function getDebugInfo(waku: IWakuNode): Promise<{
+  listenAddresses: string[];
+  peerId: string;
+  protocols: string[];
+}> {
+  return {
+    listenAddresses: waku.libp2p.getMultiaddrs().map((addr) => addr.toString()),
+    peerId: waku.libp2p.peerId.toString(),
+    protocols: Array.from(waku.libp2p.getProtocols())
+  };
+}

packages/browser-tests/src/api/push.ts

@@ -0,0 +1,16 @@
+import { createEncoder, LightNode, SDKProtocolResult } from "@waku/sdk";
+
+export async function pushMessage(
+  waku: LightNode,
+  contentTopic: string,
+  payload?: Uint8Array
+): Promise<SDKProtocolResult> {
+  const enc = createEncoder({
+    contentTopic
+  });
+
+  const result = await waku.lightPush.send(enc, {
+    payload: payload ?? new Uint8Array()
+  });
+  return result;
+}

packages/browser-tests/src/api/shared.ts

@@ -0,0 +1,274 @@
+import {
+  createDecoder,
+  createEncoder,
+  createLightNode,
+  CreateNodeOptions,
+  DecodedMessage,
+  LightNode,
+  SDKProtocolResult,
+  SubscribeResult
+} from "@waku/sdk";
+
+import { IWakuNode } from "./common.js";
+
+/**
+ * Gets peer information from a Waku node
+ */
+export async function getPeerInfo(waku: IWakuNode): Promise<{
+  peerId: string;
+  multiaddrs: string[];
+  peers: string[];
+}> {
+  const multiaddrs = waku.libp2p.getMultiaddrs();
+  const peers = await waku.libp2p.peerStore.all();
+
+  return {
+    peerId: waku.libp2p.peerId.toString(),
+    multiaddrs: multiaddrs.map((addr) => addr.toString()),
+    peers: peers.map((peer) => peer.id.toString())
+  };
+}
+
+/**
+ * Gets debug information from a Waku node
+ */
+export async function getDebugInfo(waku: IWakuNode): Promise<{
+  listenAddresses: string[];
+  peerId: string;
+  protocols: string[];
+}> {
+  return {
+    listenAddresses: waku.libp2p.getMultiaddrs().map((addr) => addr.toString()),
+    peerId: waku.libp2p.peerId.toString(),
+    protocols: Array.from(waku.libp2p.getProtocols())
+  };
+}
+
+/**
+ * Pushes a message to the network
+ */
+export async function pushMessage(
+  waku: LightNode,
+  contentTopic: string,
+  payload?: Uint8Array,
+  options?: {
+    clusterId?: number;
+    shard?: number;
+  }
+): Promise<SDKProtocolResult> {
+  if (!waku) {
+    throw new Error("Waku node not found");
+  }
+
+  const encoder = createEncoder({
+    contentTopic,
+    pubsubTopicShardInfo: {
+      clusterId: options?.clusterId ?? 1,
+      shard: options?.shard ?? 1
+    }
+  });
+
+  const result = await waku.lightPush.send(encoder, {
+    payload: payload ?? new Uint8Array()
+  });
+  return result;
+}
+
+/**
+ * Creates and initializes a Waku node
+ * Checks if a node is already running in window and stops it if it exists
+ */
+export async function createWakuNode(
+  options: CreateNodeOptions
+): Promise<{ success: boolean; error?: string }> {
+  // Check if we're in a browser environment and a node already exists
+  if (typeof window === "undefined") {
+    return { success: false, error: "No window found" };
+  }
+
+  try {
+    if ((window as any).waku) {
+      await (window as any).waku.stop();
+    }
+    (window as any).waku = await createLightNode(options);
+    return { success: true };
+  } catch (error: any) {
+    return { success: false, error: error.message };
+  }
+}
+
+export async function startNode(): Promise<{
+  success: boolean;
+  error?: string;
+}> {
+  if (typeof window !== "undefined" && (window as any).waku) {
+    try {
+      await (window as any).waku.start();
+      return { success: true };
+    } catch (error: any) {
+      // Silently continue if there's an error starting the node
+      return { success: false, error: error.message };
+    }
+  }
+  return { success: false, error: "Waku node not found in window" };
+}
+
+export async function stopNode(): Promise<{
+  success: boolean;
+  error?: string;
+}> {
+  if (typeof window !== "undefined" && (window as any).waku) {
+    await (window as any).waku.stop();
+    return { success: true };
+  }
+  return { success: false, error: "Waku node not found in window" };
+}
+
+export async function dialPeers(
+  waku: LightNode,
+  peers: string[]
+): Promise<{
+  total: number;
+  errors: string[];
+}> {
+  const total = peers.length;
+  const errors: string[] = [];
+
+  await Promise.allSettled(
+    peers.map((peer) =>
+      waku.dial(peer).catch((error: any) => {
+        errors.push(error.message);
+      })
+    )
+  );
+
+  return { total, errors };
+}
+
+export async function subscribe(
+  waku: LightNode,
+  contentTopic: string,
+  options?: {
+    clusterId?: number;
+    shard?: number;
+  },
+  // eslint-disable-next-line no-unused-vars
+  callback?: (message: DecodedMessage) => void
+): Promise<SubscribeResult> {
+  const clusterId = options?.clusterId ?? 42;
+  const shard = options?.shard ?? 0;
+
+  console.log(
+    `Creating decoder for content topic ${contentTopic} with clusterId=${clusterId}, shard=${shard}`
+  );
+
+  const pubsubTopic = `/waku/2/rs/${clusterId}/${shard}`;
+
+  let configuredTopics: string[] = [];
+
+  try {
+    const protocols = waku.libp2p.getProtocols();
+    console.log(`Available protocols: ${Array.from(protocols).join(", ")}`);
+
+    const metadataMethod = (waku.libp2p as any)._services?.metadata?.getInfo;
+    if (metadataMethod) {
+      const metadata = metadataMethod();
+      console.log(`Node metadata: ${JSON.stringify(metadata)}`);
+
+      if (metadata?.pubsubTopics && Array.isArray(metadata.pubsubTopics)) {
+        configuredTopics = metadata.pubsubTopics;
+        console.log(
+          `Found configured pubsub topics: ${configuredTopics.join(", ")}`
+        );
+      }
+    }
+
+    if (
+      configuredTopics.length > 0 &&
+      !configuredTopics.includes(pubsubTopic)
+    ) {
+      console.warn(
+        `Pubsub topic ${pubsubTopic} is not configured. Configured topics: ${configuredTopics.join(", ")}`
+      );
+
+      for (const topic of configuredTopics) {
+        const parts = topic.split("/");
+        if (parts.length === 6 && parts[1] === "waku" && parts[3] === "rs") {
+          console.log(`Found potential matching pubsub topic: ${topic}`);
+
+          // Use the first topic as a fallback if no exact match is found
+          // This isn't ideal but allows tests to continue
+          const topicClusterId = parseInt(parts[4]);
+          const topicShard = parseInt(parts[5]);
+
+          if (!isNaN(topicClusterId) && !isNaN(topicShard)) {
+            console.log(
+              `Using pubsub topic with clusterId=${topicClusterId}, shard=${topicShard} instead`
+            );
+
+            const decoder = createDecoder(contentTopic, {
+              clusterId: topicClusterId,
+              shard: topicShard
+            });
+
+            try {
+              const subscription = await waku.filter.subscribe(
+                decoder,
+                callback ??
+                  ((_message) => {
+                    console.log(_message);
+                  })
+              );
+              return subscription;
+            } catch (innerErr: any) {
+              console.error(
+                `Error with alternative pubsub topic: ${innerErr.message}`
+              );
+            }
+          }
+        }
+      }
+    }
+  } catch (err) {
+    console.error(`Error checking node protocols: ${String(err)}`);
+  }
+
+  const decoder = createDecoder(contentTopic, {
+    clusterId,
+    shard
+  });
+
+  try {
+    const subscription = await waku.filter.subscribe(
+      decoder,
+      callback ??
+        ((_message) => {
+          console.log(_message);
+        })
+    );
+    return subscription;
+  } catch (err: any) {
+    if (err.message && err.message.includes("Pubsub topic")) {
+      console.error(`Pubsub topic error: ${err.message}`);
+      console.log("Subscription failed, but continuing with empty result");
+
+      return {
+        unsubscribe: async () => {
+          console.log("No-op unsubscribe from failed subscription");
+        }
+      } as unknown as SubscribeResult;
+    }
+    throw err;
+  }
+}
+
+export const API = {
+  getPeerInfo,
+  getDebugInfo,
+  pushMessage,
+  createWakuNode,
+  startNode,
+  stopNode,
+  dialPeers,
+  subscribe
+};

packages/browser-tests/src/browser/index.ts

@@ -1,63 +1,43 @@
 import { Browser, chromium, Page } from "@playwright/test";
-import { Logger } from "@waku/utils";
-
-const log = new Logger("browser-test");
 
+// Global variable to store the browser and page
 let browser: Browser | undefined;
 let page: Page | undefined;
 
-export async function initBrowser(appPort: number): Promise<void> {
-  try {
-    const launchArgs = ["--no-sandbox", "--disable-setuid-sandbox"];
+/**
+ * Initialize browser and load headless page
+ */
+export async function initBrowser(): Promise<void> {
+  browser = await chromium.launch({
+    headless: true
+  });
 
-    browser = await chromium.launch({
-      headless: true,
-      args: launchArgs
-    });
-
-    if (!browser) {
-      throw new Error("Failed to initialize browser");
-    }
-
-    page = await browser.newPage();
-
-    // Forward browser console to server logs
-    page.on('console', msg => {
-      const type = msg.type();
-      const text = msg.text();
-      log.info(`[Browser Console ${type.toUpperCase()}] ${text}`);
-    });
-
-    page.on('pageerror', error => {
-      log.error('[Browser Page Error]', error.message);
-    });
-
-    await page.goto(`http://localhost:${appPort}/app/index.html`, {
-      waitUntil: "networkidle",
-    });
-
-    await page.waitForFunction(
-      () => {
-        return window.wakuApi && typeof window.wakuApi.createWakuNode === "function";
-      },
-      { timeout: 30000 }
-    );
-
-    log.info("Browser initialized successfully with wakuApi");
-  } catch (error) {
-    log.error("Error initializing browser:", error);
-    throw error;
+  if (!browser) {
+    throw new Error("Failed to initialize browser");
   }
+
+  page = await browser.newPage();
+
+  await page.goto("http://localhost:8080");
 }
 
+/**
+ * Get the current page instance
+ */
 export function getPage(): Page | undefined {
   return page;
 }
 
+/**
+ * Set the page instance (for use by server.ts)
+ */
 export function setPage(pageInstance: Page | undefined): void {
   page = pageInstance;
 }
 
+/**
+ * Closes the browser instance
+ */
 export async function closeBrowser(): Promise<void> {
   if (browser) {
     await browser.close();

packages/browser-tests/src/queue/index.ts

@@ -0,0 +1,89 @@
+// Message queue to store received messages by content topic
+export interface QueuedMessage {
+  payload: number[] | undefined;
+  contentTopic: string;
+  timestamp: number;
+  receivedAt: number;
+}
+
+export interface MessageQueue {
+  [contentTopic: string]: QueuedMessage[];
+}
+
+// Global message queue storage
+const messageQueue: MessageQueue = {};
+
+/**
+ * Store a message in the queue
+ */
+export function storeMessage(message: QueuedMessage): void {
+  const { contentTopic } = message;
+
+  if (!messageQueue[contentTopic]) {
+    messageQueue[contentTopic] = [];
+  }
+
+  messageQueue[contentTopic].push(message);
+}
+
+/**
+ * Get messages for a specific content topic
+ */
+export function getMessages(
+  contentTopic: string,
+  options?: {
+    startTime?: number;
+    endTime?: number;
+    pageSize?: number;
+    ascending?: boolean;
+  }
+): QueuedMessage[] {
+  if (!messageQueue[contentTopic]) {
+    return [];
+  }
+
+  let messages = [...messageQueue[contentTopic]];
+
+  // Filter by time if specified
+  if (options?.startTime || options?.endTime) {
+    messages = messages.filter((msg) => {
+      const afterStart = options.startTime
+        ? msg.timestamp >= options.startTime
+        : true;
+      const beforeEnd = options.endTime
+        ? msg.timestamp <= options.endTime
+        : true;
+      return afterStart && beforeEnd;
+    });
+  }
+
+  // Sort by timestamp
+  messages.sort((a, b) => {
+    return options?.ascending
+      ? a.timestamp - b.timestamp
+      : b.timestamp - a.timestamp;
+  });
+
+  // Limit result size
+  if (options?.pageSize && options.pageSize > 0) {
+    messages = messages.slice(0, options.pageSize);
+  }
+
+  return messages;
+}
+
+/**
+ * Clear all messages from the queue
+ */
+export function clearQueue(): void {
+  Object.keys(messageQueue).forEach((topic) => {
+    delete messageQueue[topic];
+  });
+}
+
+/**
+ * Get all content topics in the queue
+ */
+export function getContentTopics(): string[] {
+  return Object.keys(messageQueue);
+}

packages/browser-tests/src/routes/admin.ts

@@ -0,0 +1,223 @@
+import express, { Request, Response, Router } from "express";
+
+import { getPage } from "../browser/index.js";
+
+const router = Router();
+
+router.head("/admin/v1/create-node", (_req: Request, res: Response) => {
+  res.status(200).end();
+});
+
+router.head("/admin/v1/start-node", (_req: Request, res: Response) => {
+  res.status(200).end();
+});
+
+router.head("/admin/v1/stop-node", (_req: Request, res: Response) => {
+  res.status(200).end();
+});
+
+router.post("/admin/v1/create-node", (async (req: Request, res: Response) => {
+  try {
+    const {
+      defaultBootstrap = true,
+      networkConfig
+    } = req.body;
+
+    // Validate that networkConfig is provided
+    if (!networkConfig) {
+      return res.status(400).json({
+        code: 400,
+        message: "networkConfig is required"
+      });
+    }
+
+    // Validate that networkConfig has required properties
+    if (networkConfig.clusterId === undefined) {
+      return res.status(400).json({
+        code: 400,
+        message: "networkConfig.clusterId is required"
+      });
+    }
+
+    const page = getPage();
+
+    if (!page) {
+      return res.status(503).json({
+        code: 503,
+        message: "Browser not initialized"
+      });
+    }
+
+    const result = await page.evaluate(
+      ({ defaultBootstrap, networkConfig }) => {
+        const nodeOptions: any = {
+          defaultBootstrap,
+          relay: {
+            advertise: true,
+            gossipsubOptions: {
+              allowPublishToZeroPeers: true
+            }
+          },
+          filter: true,
+          peers: [],
+          networkConfig: {
+            clusterId: networkConfig.clusterId,
+            shards: networkConfig.shards || [0]
+          }
+        };
+
+        return window.wakuAPI.createWakuNode(nodeOptions);
+      },
+      { defaultBootstrap, networkConfig }
+    );
+
+    if (result && result.success) {
+      res.status(200).json({
+        success: true,
+        message: "Waku node created successfully"
+      });
+    } else {
+      res.status(500).json({
+        code: 500,
+        message: "Failed to create Waku node",
+        details: result?.error || "Unknown error"
+      });
+    }
+  } catch (error: any) {
+    res.status(500).json({
+      code: 500,
+      message: `Could not create Waku node: ${error.message}`
+    });
+  }
+}) as express.RequestHandler);
+
+// Start Waku node endpoint
+router.post("/admin/v1/start-node", (async (_req: Request, res: Response) => {
+  try {
+    const page = getPage();
+
+    if (!page) {
+      return res.status(503).json({
+        code: 503,
+        message: "Browser not initialized"
+      });
+    }
+
+    const result = await page.evaluate(() => {
+      return window.wakuAPI.startNode
+        ? window.wakuAPI.startNode()
+        : { error: "startNode function not available" };
+    });
+
+    if (result && !result.error) {
+      res.status(200).json({
+        success: true,
+        message: "Waku node started successfully"
+      });
+    } else {
+      res.status(500).json({
+        code: 500,
+        message: "Failed to start Waku node",
+        details: result?.error || "Unknown error"
+      });
+    }
+  } catch (error: any) {
+    res.status(500).json({
+      code: 500,
+      message: `Could not start Waku node: ${error.message}`
+    });
+  }
+}) as express.RequestHandler);
+
+// Stop Waku node endpoint
+router.post("/admin/v1/stop-node", (async (_req: Request, res: Response) => {
+  try {
+    const page = getPage();
+
+    if (!page) {
+      return res.status(503).json({
+        code: 503,
+        message: "Browser not initialized"
+      });
+    }
+
+    const result = await page.evaluate(() => {
+      return window.wakuAPI.stopNode
+        ? window.wakuAPI.stopNode()
+        : { error: "stopNode function not available" };
+    });
+
+    if (result && !result.error) {
+      res.status(200).json({
+        success: true,
+        message: "Waku node stopped successfully"
+      });
+    } else {
+      res.status(500).json({
+        code: 500,
+        message: "Failed to stop Waku node",
+        details: result?.error || "Unknown error"
+      });
+    }
+  } catch (error: any) {
+    res.status(500).json({
+      code: 500,
+      message: `Could not stop Waku node: ${error.message}`
+    });
+  }
+}) as express.RequestHandler);
+
+// Dial to peers endpoint
+router.post("/admin/v1/peers", (async (req: Request, res: Response) => {
+  try {
+    const { peerMultiaddrs } = req.body;
+
+    if (!peerMultiaddrs || !Array.isArray(peerMultiaddrs)) {
+      return res.status(400).json({
+        code: 400,
+        message: "Invalid request. peerMultiaddrs array is required."
+      });
+    }
+
+    const page = getPage();
+
+    if (!page) {
+      return res.status(503).json({
+        code: 503,
+        message: "Browser not initialized"
+      });
+    }
+
+    const result = await page.evaluate(
+      ({ peerAddrs }) => {
+        return window.wakuAPI.dialPeers(window.waku, peerAddrs);
+      },
+      { peerAddrs: peerMultiaddrs }
+    );
+
+    if (result) {
+      res.status(200).json({
+        peersAdded: peerMultiaddrs.length - (result.errors?.length || 0),
+        peerErrors:
+          result.errors?.map((error: string, index: number) => {
+            return {
+              peerMultiaddr: peerMultiaddrs[index],
+              error
+            };
+          }) || []
+      });
+    } else {
+      res.status(500).json({
+        code: 500,
+        message: "Failed to dial peers"
+      });
+    }
+  } catch (error: any) {
+    res.status(500).json({
+      code: 500,
+      message: `Could not dial peers: ${error.message}`
+    });
+  }
+}) as express.RequestHandler);
+
+export default router;

packages/browser-tests/src/routes/info.ts

@@ -0,0 +1,51 @@
+import express, { Request, Response, Router } from "express";
+
+import { getPage } from "../browser/index.js";
+
+const router = Router();
+
+// Get node info endpoint
+router.get("/info", (async (_req: Request, res: Response) => {
+  try {
+    const page = getPage();
+    if (!page) {
+      return res.status(503).json({
+        code: 503,
+        message: "Browser not initialized"
+      });
+    }
+
+    const result = await page.evaluate(() => {
+      return window.wakuAPI.getPeerInfo(window.waku);
+    });
+
+    res.json(result);
+  } catch (error: any) {
+    console.error("Error getting info:", error);
+    res.status(500).json({ error: error.message });
+  }
+}) as express.RequestHandler);
+
+// Get node debug info endpoint
+router.get("/debug/v1/info", (async (_req: Request, res: Response) => {
+  try {
+    const page = getPage();
+    if (!page) {
+      return res.status(503).json({
+        code: 503,
+        message: "Browser not initialized"
+      });
+    }
+
+    const result = await page.evaluate(() => {
+      return window.wakuAPI.getDebugInfo(window.waku);
+    });
+
+    res.json(result);
+  } catch (error: any) {
+    console.error("Error getting debug info:", error);
+    res.status(500).json({ error: error.message });
+  }
+}) as express.RequestHandler);
+
+export default router;

packages/browser-tests/src/routes/push.ts

@@ -0,0 +1,131 @@
+import express, { Request, Response, Router } from "express";
+
+import { getPage } from "../browser/index.js";
+
+const router = Router();
+
+// Legacy push message endpoint
+router.post("/push", (async (req: Request, res: Response) => {
+  try {
+    const { contentTopic, payload } = req.body;
+
+    if (!contentTopic) {
+      return res.status(400).json({
+        code: 400,
+        message: "Invalid request. contentTopic is required."
+      });
+    }
+
+    const page = getPage();
+    if (!page) {
+      return res.status(503).json({
+        code: 503,
+        message: "Browser not initialized"
+      });
+    }
+
+    const result = await page.evaluate(
+      ({ topic, data }) => {
+        return window.wakuAPI.pushMessage(window.waku, topic, data);
+      },
+      {
+        topic: contentTopic,
+        data: payload
+      }
+    );
+
+    if (result) {
+      res.status(200).json({
+        messageId:
+          "0x" +
+          Buffer.from(contentTopic + Date.now().toString()).toString("hex")
+      });
+    } else {
+      res.status(503).json({
+        code: 503,
+        message: "Could not publish message: no suitable peers"
+      });
+    }
+  } catch (error: any) {
+    if (
+      error.message.includes("size exceeds") ||
+      error.message.includes("stream reset")
+    ) {
+      res.status(503).json({
+        code: 503,
+        message:
+          "Could not publish message: message size exceeds gossipsub max message size"
+      });
+    } else {
+      res.status(500).json({
+        code: 500,
+        message: `Could not publish message: ${error.message}`
+      });
+    }
+  }
+}) as express.RequestHandler);
+
+// Waku REST API compatible push endpoint
+router.post("/lightpush/v1/message", (async (req: Request, res: Response) => {
+  try {
+    const { message } = req.body;
+
+    if (!message || !message.contentTopic) {
+      return res.status(400).json({
+        code: 400,
+        message: "Invalid request. contentTopic is required."
+      });
+    }
+
+    const page = getPage();
+    if (!page) {
+      return res.status(503).json({
+        code: 503,
+        message: "Browser not initialized"
+      });
+    }
+
+    const result = await page.evaluate(
+      ({ contentTopic, payload }) => {
+        return window.wakuAPI.pushMessage(window.waku, contentTopic, payload);
+      },
+      {
+        contentTopic: message.contentTopic,
+        payload: message.payload
+      }
+    );
+
+    if (result) {
+      res.status(200).json({
+        messageId:
+          "0x" +
+          Buffer.from(message.contentTopic + Date.now().toString()).toString(
+            "hex"
+          )
+      });
+    } else {
+      res.status(503).json({
+        code: 503,
+        message: "Could not publish message: no suitable peers"
+      });
+    }
+  } catch (error: any) {
+    if (
+      error.message.includes("size exceeds") ||
+      error.message.includes("stream reset")
+    ) {
+      res.status(503).json({
+        code: 503,
+        message:
+          "Could not publish message: message size exceeds gossipsub max message size"
+      });
+    } else {
+      res.status(500).json({
+        code: 500,
+        message: `Could not publish message: ${error.message}`
+      });
+    }
+  }
+}) as express.RequestHandler);
+
+export default router;

packages/browser-tests/src/routes/waku.ts

@@ -1,87 +0,0 @@
-import { Router } from "express";
-import { Logger } from "@waku/utils";
-import {
-  createEndpointHandler,
-  validators,
-  errorHandlers,
-} from "../utils/endpoint-handler.js";
-
-interface LightPushResult {
-  successes: string[];
-  failures: Array<{ error: string; peerId?: string }>;
-}
-
-const log = new Logger("routes:waku");
-const router = Router();
-
-const corsEndpoints = [
-  "/waku/v1/wait-for-peers",
-  "/waku/v1/peer-info",
-  "/lightpush/v3/message",
-];
-
-corsEndpoints.forEach((endpoint) => {
-  router.head(endpoint, (_req, res) => {
-    res.status(200).end();
-  });
-});
-
-router.post(
-  "/waku/v1/wait-for-peers",
-  createEndpointHandler({
-    methodName: "waitForPeers",
-    validateInput: (body: unknown) => {
-      const bodyObj = body as { timeoutMs?: number; protocols?: string[] };
-      return [
-        bodyObj.timeoutMs || 10000,
-        bodyObj.protocols || ["lightpush", "filter"],
-      ];
-    },
-    transformResult: () => ({
-      success: true,
-      message: "Successfully connected to peers",
-    }),
-  }),
-);
-
-router.get(
-  "/waku/v1/peer-info",
-  createEndpointHandler({
-    methodName: "getPeerInfo",
-    validateInput: validators.noInput,
-  }),
-);
-
-router.post(
-  "/lightpush/v3/message",
-  createEndpointHandler({
-    methodName: "pushMessageV3",
-    validateInput: (body: unknown): [string, string, string] => {
-      const validatedRequest = validators.requireLightpushV3(body);
-
-      return [
-        validatedRequest.message.contentTopic,
-        validatedRequest.message.payload,
-        validatedRequest.pubsubTopic,
-      ];
-    },
-    handleError: errorHandlers.lightpushError,
-    transformResult: (result: unknown) => {
-      const lightPushResult = result as LightPushResult;
-      if (lightPushResult && lightPushResult.successes && lightPushResult.successes.length > 0) {
-        log.info("[Server] Message successfully sent via v3 lightpush!");
-        return {
-          success: true,
-          result: lightPushResult,
-        };
-      } else {
-        return {
-          success: false,
-          error: "Could not publish message: no suitable peers",
-        };
-      }
-    },
-  }),
-);
-
-export default router;

packages/browser-tests/src/server.ts

@@ -1,244 +1,507 @@
+import { ChildProcess, exec } from "child_process";
+import * as net from "net";
+import { dirname, join } from "path";
 import { fileURLToPath } from "url";
-import * as path from "path";
 
+import { chromium } from "@playwright/test";
 import cors from "cors";
 import express, { Request, Response } from "express";
-import { Logger } from "@waku/utils";
 
-import wakuRouter from "./routes/waku.js";
-import { initBrowser, getPage, closeBrowser } from "./browser/index.js";
-import {
-  DEFAULT_CLUSTER_ID,
-  DEFAULT_NUM_SHARDS,
-  Protocols,
-  AutoSharding,
-  StaticSharding,
-} from "@waku/interfaces";
-import { CreateNodeOptions } from "@waku/sdk";
-import type { WindowNetworkConfig } from "../types/global.js";
+import adminRouter from "./routes/admin.js";
+import { setPage, getPage, closeBrowser } from "./browser/index.js";
 
-interface NodeError extends Error {
-  code?: string;
-}
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
 
-const log = new Logger("server");
 const app = express();
 
 app.use(cors());
 app.use(express.json());
+app.use(adminRouter);
 
-import * as fs from "fs";
+let headlessServerProcess: ChildProcess | undefined;
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const distRoot = path.resolve(__dirname, "..");
-const webDir = path.resolve(distRoot, "web");
+interface MessageQueue {
+  [contentTopic: string]: Array<{
+    payload: number[] | undefined;
+    contentTopic: string;
+    timestamp: number;
+    receivedAt: number;
+  }>;
+}
 
-app.get("/app/index.html", (_req: Request, res: Response) => {
+const messageQueue: MessageQueue = {};
+
+async function startHeadlessServer(): Promise<void> {
+  return new Promise((resolve, reject) => {
+    try {
+      headlessServerProcess = exec(
+        `serve ${join(__dirname, "../../headless-tests")} -p 8080 -s`,
+        (error) => {
+          if (error) {
+            console.error(`Error starting serve: ${error}`);
+            return;
+          }
+        }
+      );
+
+      setTimeout(resolve, 2000);
+    } catch (error) {
+      console.error("Failed to start headless server:", error);
+      reject(error);
+    }
+  });
+}
+
+async function initBrowser(): Promise<void> {
   try {
-    const htmlPath = path.join(webDir, "index.html");
-    let htmlContent = fs.readFileSync(htmlPath, "utf8");
+    const browser = await chromium.launch({
+      headless: true
+    });
 
-    const networkConfig: WindowNetworkConfig = {};
-    if (process.env.WAKU_CLUSTER_ID) {
-      networkConfig.clusterId = parseInt(process.env.WAKU_CLUSTER_ID, 10);
-    }
-    if (process.env.WAKU_SHARD) {
-      networkConfig.shards = [parseInt(process.env.WAKU_SHARD, 10)];
-      log.info("Using static shard:", networkConfig.shards);
+    if (!browser) {
+      throw new Error("Failed to initialize browser");
     }
 
-    const lightpushNode = process.env.WAKU_LIGHTPUSH_NODE || null;
-    const enrBootstrap = process.env.WAKU_ENR_BOOTSTRAP || null;
+    const page = await browser.newPage();
 
-    log.info("Network config on server start, pre headless:", networkConfig);
+    try {
+      await checkServerAvailability("http://localhost:8080", 3);
+      await page.goto("http://localhost:8080");
+    } catch (error) {
+      console.error(
+        "Error loading headless app, continuing without it:",
+        error
+      );
+      await page.setContent(`
+        <html>
+          <head><title>Waku Test Environment</title></head>
+          <body>
+            <h1>Waku Test Environment (No headless app available)</h1>
+            <script>
+              window.waku = {};
+              window.wakuAPI = {
+                getPeerInfo: () => ({ peerId: "mock-peer-id", multiaddrs: [], peers: [] }),
+                getDebugInfo: () => ({ listenAddresses: [], peerId: "mock-peer-id", protocols: [] }),
+                pushMessage: () => ({ successes: [], failures: [{ error: "No headless app available" }] }),
+                dialPeers: () => ({ total: 0, errors: ["No headless app available"] }),
+                createWakuNode: () => ({ success: true, message: "Mock node created" }),
+                startNode: () => ({ success: true }),
+                stopNode: () => ({ success: true }),
+                subscribe: () => ({ unsubscribe: async () => {} })
+              };
+            </script>
+          </body>
+        </html>
+      `);
+    }
 
-    const configScript = `    <script>
-      window.__WAKU_NETWORK_CONFIG = ${JSON.stringify(networkConfig)};
-      window.__WAKU_LIGHTPUSH_NODE = ${JSON.stringify(lightpushNode)};
-      window.__WAKU_ENR_BOOTSTRAP = ${JSON.stringify(enrBootstrap)};
-    </script>`;
-    const originalPattern =
-      '    <script type="module" src="./index.js"></script>';
-    const replacement = `${configScript}\n    <script type="module" src="./index.js"></script>`;
-
-    htmlContent = htmlContent.replace(originalPattern, replacement);
-
-    res.setHeader("Content-Type", "text/html");
-    res.send(htmlContent);
+    setPage(page);
   } catch (error) {
-    log.error("Error serving dynamic index.html:", error);
-    res.status(500).send("Error loading page");
+    console.error("Error initializing browser:", error);
+    throw error;
   }
-});
+}
 
-app.use("/app", express.static(webDir, { index: false }));
+async function checkServerAvailability(
+  url: string,
+  retries = 3
+): Promise<boolean> {
+  for (let i = 0; i < retries; i++) {
+    try {
+      const response = await fetch(url, { method: "HEAD" });
+      if (response.ok) return true;
+    } catch (e) {
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+    }
+  }
+  throw new Error(`Server at ${url} not available after ${retries} retries`);
+}
 
-app.use(wakuRouter);
+async function findAvailablePort(
+  startPort: number,
+  maxAttempts = 10
+): Promise<number> {
+  for (let attempt = 0; attempt < maxAttempts; attempt++) {
+    const port = startPort + attempt;
+    try {
+      // Try to create a server on the port
+      await new Promise<void>((resolve, reject) => {
+        const server = net
+          .createServer()
+          .once("error", (err: any) => {
+            reject(err);
+          })
+          .once("listening", () => {
+            // If we can listen, the port is available
+            server.close();
+            resolve();
+          })
+          .listen(port);
+      });
 
-async function startAPI(requestedPort: number): Promise<number> {
+      // If we get here, the port is available
+      return port;
+    } catch (err) {
+      // Port is not available, continue to next port
+    }
+  }
+
+  // If we tried all ports and none are available, throw an error
+  throw new Error(
+    `Unable to find an available port after ${maxAttempts} attempts`
+  );
+}
+
+async function startServer(port: number = 3000): Promise<void> {
+  try {
+    await startHeadlessServer();
+
+    await initBrowser();
+
+    await startAPI(port);
+  } catch (error: any) {
+    console.error("Error starting server:", error);
+  }
+}
+
+async function startAPI(requestedPort: number): Promise<void> {
   try {
     app.get("/", (_req: Request, res: Response) => {
       res.json({ status: "Waku simulation server is running" });
     });
 
+    app.get("/info", (async (_req: Request, res: Response) => {
+      try {
+        const result = await getPage()?.evaluate(() => {
+          return window.wakuAPI.getPeerInfo(window.waku);
+        });
+
+        res.json(result);
+      } catch (error: any) {
+        console.error("Error getting info:", error);
+        res.status(500).json({ error: error.message });
+      }
+    }) as express.RequestHandler);
+
+    app.get("/debug/v1/info", (async (_req: Request, res: Response) => {
+      try {
+        const result = await getPage()?.evaluate(() => {
+          return window.wakuAPI.getDebugInfo(window.waku);
+        });
+
+        res.json(result);
+      } catch (error: any) {
+        console.error("Error getting debug info:", error);
+        res.status(500).json({ error: error.message });
+      }
+    }) as express.RequestHandler);
+
+    app.post("/lightpush/v1/message", (async (req: Request, res: Response) => {
+      try {
+        const { message } = req.body;
+
+        if (!message || !message.contentTopic) {
+          return res.status(400).json({
+            code: 400,
+            message: "Invalid request. contentTopic is required."
+          });
+        }
+
+        const result = await getPage()?.evaluate(
+          ({ contentTopic, payload }) => {
+            return window.wakuAPI.pushMessage(
+              window.waku,
+              contentTopic,
+              payload
+            );
+          },
+          {
+            contentTopic: message.contentTopic,
+            payload: message.payload
+          }
+        );
+
+        if (result) {
+          res.status(200).json({
+            messageId:
+              "0x" +
+              Buffer.from(
+                message.contentTopic + Date.now().toString()
+              ).toString("hex")
+          });
+        } else {
+          res.status(503).json({
+            code: 503,
+            message: "Could not publish message: no suitable peers"
+          });
+        }
+      } catch (error: any) {
+
+        if (
+          error.message.includes("size exceeds") ||
+          error.message.includes("stream reset")
+        ) {
+          res.status(503).json({
+            code: 503,
+
+            message:
+              "Could not publish message: message size exceeds gossipsub max message size"
+          });
+        } else {
+          res.status(500).json({
+            code: 500,
+            message: `Could not publish message: ${error.message}`
+          });
+        }
+      }
+    }) as express.RequestHandler);
+
+    app.get("/filter/v2/messages/:contentTopic", (async (
+      req: Request,
+      res: Response
+    ) => {
+      try {
+        const { contentTopic } = req.params;
+        const { clusterId, shard } = req.query;
+
+        const options = {
+          clusterId: clusterId ? parseInt(clusterId as string, 10) : 42, // Default to match node creation
+          shard: shard ? parseInt(shard as string, 10) : 0 // Default to match node creation
+        };
+
+
+        // Set up SSE (Server-Sent Events)
+        res.setHeader("Content-Type", "text/event-stream");
+        res.setHeader("Cache-Control", "no-cache");
+        res.setHeader("Connection", "keep-alive");
+
+        // Function to send SSE
+        const sendSSE = (data: any): void => {
+          res.write(`data: ${JSON.stringify(data)}\n\n`);
+        };
+
+        // Subscribe to messages
+        await getPage()?.evaluate(
+          ({ contentTopic, options }) => {
+            // Message handler that will send messages back to the client
+            const callback = (message: any): void => {
+              // Post message to the browser context
+              window.postMessage(
+                {
+                  type: "WAKU_MESSAGE",
+                  payload: {
+                    payload: message.payload
+                      ? Array.from(message.payload)
+                      : undefined,
+                    contentTopic: message.contentTopic,
+                    timestamp: message.timestamp
+                  }
+                },
+                "*"
+              );
+            };
+
+            return window.wakuAPI.subscribe(
+              window.waku,
+              contentTopic,
+              options,
+              callback
+            );
+          },
+          { contentTopic, options }
+        );
+
+        // Set up event listener for messages from the page
+        await getPage()?.exposeFunction("sendMessageToServer", (message: any) => {
+          // Send the message as SSE
+          sendSSE(message);
+
+          const topic = message.contentTopic;
+          if (!messageQueue[topic]) {
+            messageQueue[topic] = [];
+          }
+
+          messageQueue[topic].push({
+            ...message,
+            receivedAt: Date.now()
+          });
+
+          if (messageQueue[topic].length > 1000) {
+            messageQueue[topic].shift();
+          }
+        });
+
+        // Add event listener in the browser context to forward messages to the server
+        await getPage()?.evaluate(() => {
+          window.addEventListener("message", (event) => {
+            if (event.data.type === "WAKU_MESSAGE") {
+              (window as any).sendMessageToServer(event.data.payload);
+            }
+          });
+        });
+
+        req.on("close", () => {
+        });
+      } catch (error: any) {
+        console.error("Error in filter subscription:", error);
+        res.write(`data: ${JSON.stringify({ error: error.message })}\n\n`);
+        res.end();
+      }
+    }) as express.RequestHandler);
+
+    app.get("/filter/v1/messages/:contentTopic", (async (
+      req: Request,
+      res: Response
+    ) => {
+      try {
+        const { contentTopic } = req.params;
+        const {
+          pageSize = "20",
+          startTime,
+          endTime,
+          ascending = "false"
+        } = req.query;
+
+        if (!messageQueue[contentTopic]) {
+          return res.status(200).json({ messages: [] });
+        }
+
+        const limit = parseInt(pageSize as string, 10);
+        const isAscending = (ascending as string).toLowerCase() === "true";
+        const timeStart = startTime ? parseInt(startTime as string, 10) : 0;
+        const timeEnd = endTime ? parseInt(endTime as string, 10) : Date.now();
+
+        const filteredMessages = messageQueue[contentTopic]
+          .filter((msg) => {
+            const msgTime = msg.timestamp || msg.receivedAt;
+            return msgTime >= timeStart && msgTime <= timeEnd;
+          })
+          .sort((a, b) => {
+            const timeA = a.timestamp || a.receivedAt;
+            const timeB = b.timestamp || b.receivedAt;
+            return isAscending ? timeA - timeB : timeB - timeA;
+          })
+          .slice(0, limit);
+
+
+        // Format response to match Waku REST API format
+        const response = {
+          messages: filteredMessages.map((msg) => ({
+            payload: msg.payload
+              ? Buffer.from(msg.payload).toString("base64")
+              : "",
+            contentTopic: msg.contentTopic,
+            timestamp: msg.timestamp,
+            version: 0 // Default version
+          }))
+        };
+
+        res.status(200).json(response);
+      } catch (error: any) {
+        console.error("Error retrieving messages:", error);
+        res.status(500).json({
+          code: 500,
+          message: `Failed to retrieve messages: ${error.message}`
+        });
+      }
+    }) as express.RequestHandler);
+
+    // Helper endpoint for executing functions (useful for testing)
+    app.post("/execute", (async (req: Request, res: Response) => {
+      try {
+        const { functionName, params = [] } = req.body;
+
+        if (functionName === "simulateMessages") {
+          const [contentTopic, messages] = params;
+
+          if (!messageQueue[contentTopic]) {
+            messageQueue[contentTopic] = [];
+          }
+
+          // Add messages to the queue
+          for (const msg of messages) {
+            messageQueue[contentTopic].push({
+              ...msg,
+              contentTopic,
+              receivedAt: Date.now()
+            });
+          }
+
+          return res.status(200).json({
+            success: true,
+            messagesAdded: messages.length
+          });
+        }
+
+        const result = await getPage()?.evaluate(
+          ({ fnName, fnParams }) => {
+            if (!window.wakuAPI[fnName]) {
+              return { error: `Function ${fnName} not found` };
+            }
+            return window.wakuAPI[fnName](...fnParams);
+          },
+          { fnName: functionName, fnParams: params }
+        );
+
+        res.status(200).json(result);
+      } catch (error: any) {
+        console.error(
+          `Error executing function ${req.body.functionName}:`,
+          error
+        );
+        res.status(500).json({
+          error: error.message
+        });
+      }
+    }) as express.RequestHandler);
+
+
+    let actualPort: number;
+    try {
+      actualPort = await findAvailablePort(requestedPort);
+    } catch (error) {
+      console.error("Failed to find an available port:", error);
+      throw error;
+    }
+
     app
-      .listen(requestedPort, () => {
-        log.info(`API server running on http://localhost:${requestedPort}`);
+      .listen(actualPort, () => {
       })
-      .on("error", (error: NodeError) => {
+      .on("error", (error: any) => {
         if (error.code === "EADDRINUSE") {
-          log.error(
-            `Port ${requestedPort} is already in use. Please close the application using this port and try again.`,
+          console.error(
+            `Port ${actualPort} is already in use. Please close the application using this port and try again.`
           );
         } else {
-          log.error("Error starting server:", error);
+          console.error("Error starting server:", error);
         }
-        throw error;
       });
 
-    return requestedPort;
-  } catch (error) {
-    log.error("Error starting server:", error);
-    throw error;
+    return Promise.resolve();
+  } catch (error: any) {
+    console.error("Error starting server:", error);
+    return Promise.reject(error);
   }
 }
 
-async function startServer(port: number = 3000): Promise<void> {
-  try {
-    const actualPort = await startAPI(port);
-    await initBrowser(actualPort);
+process.on("SIGINT", (async () => {
+  await closeBrowser();
 
+  if (headlessServerProcess && headlessServerProcess.pid) {
     try {
-      log.info("Auto-starting node with CLI configuration...");
-
-      const hasEnrBootstrap = Boolean(process.env.WAKU_ENR_BOOTSTRAP);
-
-      const networkConfig: AutoSharding | StaticSharding = process.env.WAKU_SHARD
-        ? ({
-            clusterId: process.env.WAKU_CLUSTER_ID
-              ? parseInt(process.env.WAKU_CLUSTER_ID, 10)
-              : DEFAULT_CLUSTER_ID,
-            shards: [parseInt(process.env.WAKU_SHARD, 10)],
-          } as StaticSharding)
-        : ({
-            clusterId: process.env.WAKU_CLUSTER_ID
-              ? parseInt(process.env.WAKU_CLUSTER_ID, 10)
-              : DEFAULT_CLUSTER_ID,
-            numShardsInCluster: DEFAULT_NUM_SHARDS,
-          } as AutoSharding);
-
-      const createOptions: CreateNodeOptions = {
-        defaultBootstrap: false,
-        ...(hasEnrBootstrap && {
-          discovery: {
-            dns: true,
-            peerExchange: true,
-            peerCache: true,
-          },
-        }),
-        networkConfig,
-      };
-
-      log.info(
-        `Bootstrap mode: ${hasEnrBootstrap ? "ENR-only (defaultBootstrap=false)" : "default bootstrap (defaultBootstrap=true)"}`,
-      );
-      if (hasEnrBootstrap) {
-        log.info(`ENR bootstrap peers: ${process.env.WAKU_ENR_BOOTSTRAP}`);
-      }
-
-      log.info(
-        `Network config: ${JSON.stringify(networkConfig)}`,
-      );
-
-      await getPage()?.evaluate((config) => {
-        return window.wakuApi.createWakuNode(config);
-      }, createOptions);
-      await getPage()?.evaluate(() => window.wakuApi.startNode());
-
-      try {
-        await getPage()?.evaluate(() =>
-          window.wakuApi.waitForPeers?.(5000, [Protocols.LightPush]),
-        );
-        log.info("Auto-start completed with bootstrap peers");
-      } catch (peerError) {
-        log.info(
-          "Auto-start completed (no bootstrap peers found - may be expected with test ENRs)",
-        );
-      }
+      process.kill(headlessServerProcess.pid);
     } catch (e) {
-      log.warn("Auto-start failed:", e);
+      // Process already stopped
     }
-  } catch (error) {
-    log.error("Error starting server:", error);
   }
-}
 
-process.on("uncaughtException", (error) => {
-  log.error("Uncaught Exception:", error);
-  if (process.env.NODE_ENV !== "production") {
-    process.exit(1);
-  }
-});
-
-process.on("unhandledRejection", (reason, promise) => {
-  log.error("Unhandled Rejection at:", promise, "reason:", reason);
-  if (process.env.NODE_ENV !== "production") {
-    process.exit(1);
-  }
-});
-
-const gracefulShutdown = async (signal: string) => {
-  log.info(`Received ${signal}, gracefully shutting down...`);
-  try {
-    await closeBrowser();
-  } catch (e) {
-    log.warn("Error closing browser:", e);
-  }
   process.exit(0);
-};
-
-process.on("SIGINT", () => gracefulShutdown("SIGINT"));
-process.on("SIGTERM", () => gracefulShutdown("SIGTERM"));
-
-function parseCliArgs() {
-  const args = process.argv.slice(2);
-  let clusterId: number | undefined;
-  let shard: number | undefined;
-
-  for (const arg of args) {
-    if (arg.startsWith("--cluster-id=")) {
-      clusterId = parseInt(arg.split("=")[1], 10);
-      if (isNaN(clusterId)) {
-        log.error("Invalid cluster-id value. Must be a number.");
-        process.exit(1);
-      }
-    } else if (arg.startsWith("--shard=")) {
-      shard = parseInt(arg.split("=")[1], 10);
-      if (isNaN(shard)) {
-        log.error("Invalid shard value. Must be a number.");
-        process.exit(1);
-      }
-    }
-  }
-
-  return { clusterId, shard };
-}
+}) as any);
 
 const isMainModule = process.argv[1] === fileURLToPath(import.meta.url);
 
 if (isMainModule) {
   const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
-  const cliArgs = parseCliArgs();
-
-  if (cliArgs.clusterId !== undefined) {
-    process.env.WAKU_CLUSTER_ID = cliArgs.clusterId.toString();
-    log.info(`Using CLI cluster ID: ${cliArgs.clusterId}`);
-  }
-  if (cliArgs.shard !== undefined) {
-    process.env.WAKU_SHARD = cliArgs.shard.toString();
-    log.info(`Using CLI shard: ${cliArgs.shard}`);
-  }
-
   void startServer(port);
 }

packages/browser-tests/src/utils.js

@@ -0,0 +1,8 @@
+import { readFileSync } from "fs";
+import { dirname } from "path";
+import { fileURLToPath } from "url";
+
+const __filename = fileURLToPath(import.meta.url);
+export const __dirname = dirname(__filename);
+
+export const readJSON = (path) => JSON.parse(readFileSync(path, "utf-8"));

packages/browser-tests/src/utils/endpoint-handler.ts

@@ -1,197 +0,0 @@
-import { Request, Response } from "express";
-import { Logger } from "@waku/utils";
-import { getPage } from "../browser/index.js";
-import type { ITestBrowser } from "../../types/global.js";
-
-const log = new Logger("endpoint-handler");
-
-export interface LightpushV3Request {
-  pubsubTopic: string;
-  message: {
-    payload: string;
-    contentTopic: string;
-    version: number;
-  };
-}
-
-export interface LightpushV3Response {
-  success?: boolean;
-  error?: string;
-  result?: {
-    successes: string[];
-    failures: Array<{
-      error: string;
-      peerId?: string;
-    }>;
-  };
-}
-
-export interface EndpointConfig<TInput = unknown, TOutput = unknown> {
-  methodName: string;
-  validateInput?: (_requestBody: unknown) => TInput;
-  transformResult?: (_sdkResult: unknown) => TOutput;
-  handleError?: (_caughtError: Error) => { code: number; message: string };
-  preCheck?: () => Promise<void> | void;
-  logResult?: boolean;
-}
-
-export function createEndpointHandler<TInput = unknown, TOutput = unknown>(
-  config: EndpointConfig<TInput, TOutput>,
-) {
-  return async (req: Request, res: Response) => {
-    try {
-      let input: TInput;
-      try {
-        input = config.validateInput
-          ? config.validateInput(req.body)
-          : req.body;
-      } catch (validationError) {
-        return res.status(400).json({
-          code: 400,
-          message: `Invalid input: ${validationError instanceof Error ? validationError.message : String(validationError)}`,
-        });
-      }
-
-      if (config.preCheck) {
-        try {
-          await config.preCheck();
-        } catch (checkError) {
-          return res.status(503).json({
-            code: 503,
-            message: checkError instanceof Error ? checkError.message : String(checkError),
-          });
-        }
-      }
-
-      const page = getPage();
-      if (!page) {
-        return res.status(503).json({
-          code: 503,
-          message: "Browser not initialized",
-        });
-      }
-
-      const result = await page.evaluate(
-        ({ methodName, params }) => {
-          const testWindow = window as ITestBrowser;
-          if (!testWindow.wakuApi) {
-            throw new Error("window.wakuApi is not available");
-          }
-
-          const wakuApi = testWindow.wakuApi as unknown as Record<string, unknown>;
-          const method = wakuApi[methodName];
-          if (typeof method !== "function") {
-            throw new Error(`window.wakuApi.${methodName} is not a function`);
-          }
-
-          if (params === null || params === undefined) {
-            return method.call(testWindow.wakuApi);
-          } else if (Array.isArray(params)) {
-            return method.apply(testWindow.wakuApi, params);
-          } else {
-            return method.call(testWindow.wakuApi, params);
-          }
-        },
-        { methodName: config.methodName, params: input },
-      );
-
-      if (config.logResult !== false) {
-        log.info(
-          `[${config.methodName}] Result:`,
-          JSON.stringify(result, null, 2),
-        );
-      }
-
-      const finalResult = config.transformResult
-        ? config.transformResult(result)
-        : result;
-
-      res.status(200).json(finalResult);
-    } catch (error) {
-      if (config.handleError) {
-        const errorResponse = config.handleError(error as Error);
-        return res.status(errorResponse.code).json({
-          code: errorResponse.code,
-          message: errorResponse.message,
-        });
-      }
-
-      log.error(`[${config.methodName}] Error:`, error);
-      res.status(500).json({
-        code: 500,
-        message: `Could not execute ${config.methodName}: ${error instanceof Error ? error.message : String(error)}`,
-      });
-    }
-  };
-}
-
-export const validators = {
-  requireLightpushV3: (body: unknown): LightpushV3Request => {
-    // Type guard to check if body is an object
-    if (!body || typeof body !== "object") {
-      throw new Error("Request body must be an object");
-    }
-
-    const bodyObj = body as Record<string, unknown>;
-
-    if (
-      bodyObj.pubsubTopic !== undefined &&
-      typeof bodyObj.pubsubTopic !== "string"
-    ) {
-      throw new Error("pubsubTopic must be a string if provided");
-    }
-    if (!bodyObj.message || typeof bodyObj.message !== "object") {
-      throw new Error("message is required and must be an object");
-    }
-
-    const message = bodyObj.message as Record<string, unknown>;
-
-    if (
-      !message.contentTopic ||
-      typeof message.contentTopic !== "string"
-    ) {
-      throw new Error("message.contentTopic is required and must be a string");
-    }
-    if (!message.payload || typeof message.payload !== "string") {
-      throw new Error(
-        "message.payload is required and must be a string (base64 encoded)",
-      );
-    }
-    if (
-      message.version !== undefined &&
-      typeof message.version !== "number"
-    ) {
-      throw new Error("message.version must be a number if provided");
-    }
-
-    return {
-      pubsubTopic: (bodyObj.pubsubTopic as string) || "",
-      message: {
-        payload: message.payload as string,
-        contentTopic: message.contentTopic as string,
-        version: (message.version as number) || 1,
-      },
-    };
-  },
-
-  noInput: () => null,
-};
-
-export const errorHandlers = {
-  lightpushError: (error: Error) => {
-    if (
-      error.message.includes("size exceeds") ||
-      error.message.includes("stream reset")
-    ) {
-      return {
-        code: 503,
-        message:
-          "Could not publish message: message size exceeds gossipsub max message size",
-      };
-    }
-    return {
-      code: 500,
-      message: `Could not publish message: ${error.message}`,
-    };
-  },
-};

packages/browser-tests/tests/e2e.spec.ts

@@ -1,117 +0,0 @@
-import { test, expect } from "@playwright/test";
-import axios from "axios";
-import { StartedTestContainer } from "testcontainers";
-import { DefaultTestRoutingInfo } from "@waku/tests";
-import {
-  startBrowserTestsContainer,
-  stopContainer
-} from "./utils/container-helpers.js";
-import {
-  createTwoNodeNetwork,
-  getDockerAccessibleMultiaddr,
-  stopNwakuNodes,
-  TwoNodeNetwork
-} from "./utils/nwaku-helpers.js";
-import {
-  ENV_BUILDERS,
-  TEST_CONFIG,
-  ASSERTIONS
-} from "./utils/test-config.js";
-
-test.describe.configure({ mode: "serial" });
-
-let container: StartedTestContainer;
-let nwakuNodes: TwoNodeNetwork;
-let baseUrl: string;
-
-test.beforeAll(async () => {
-  nwakuNodes = await createTwoNodeNetwork();
-
-  const lightPushPeerAddr = await getDockerAccessibleMultiaddr(nwakuNodes.nodes[0]);
-
-  const result = await startBrowserTestsContainer({
-    environment: {
-      ...ENV_BUILDERS.withLocalLightPush(lightPushPeerAddr),
-      DEBUG: "waku:*",
-      WAKU_LIGHTPUSH_NODE: lightPushPeerAddr,
-    },
-    networkMode: "waku",
-  });
-
-  container = result.container;
-  baseUrl = result.baseUrl;
-});
-
-test.afterAll(async () => {
-  await Promise.all([
-    stopContainer(container),
-    stopNwakuNodes(nwakuNodes?.nodes || []),
-  ]);
-});
-
-test("WakuHeadless can discover nwaku peer and use it for light push", async () => {
-  test.setTimeout(TEST_CONFIG.DEFAULT_TEST_TIMEOUT);
-
-  const contentTopic = TEST_CONFIG.DEFAULT_CONTENT_TOPIC;
-  const testMessage = TEST_CONFIG.DEFAULT_TEST_MESSAGE;
-
-  await new Promise((r) => setTimeout(r, TEST_CONFIG.WAKU_INIT_DELAY));
-
-  const healthResponse = await axios.get(`${baseUrl}/`, { timeout: 5000 });
-  ASSERTIONS.serverHealth(healthResponse);
-
-  try {
-    await axios.post(`${baseUrl}/waku/v1/wait-for-peers`, {
-      timeoutMs: 10000,
-      protocols: ["lightpush"],
-    }, { timeout: 15000 });
-  } catch {
-    // Ignore errors
-  }
-
-  const peerInfoResponse = await axios.get(`${baseUrl}/waku/v1/peer-info`);
-  ASSERTIONS.peerInfo(peerInfoResponse);
-
-  const routingInfo = DefaultTestRoutingInfo;
-
-  const subscriptionResults = await Promise.all([
-    nwakuNodes.nodes[0].ensureSubscriptions([routingInfo.pubsubTopic]),
-    nwakuNodes.nodes[1].ensureSubscriptions([routingInfo.pubsubTopic])
-  ]);
-
-  expect(subscriptionResults[0]).toBe(true);
-  expect(subscriptionResults[1]).toBe(true);
-
-  await new Promise((r) => setTimeout(r, TEST_CONFIG.SUBSCRIPTION_DELAY));
-
-  const base64Payload = btoa(testMessage);
-
-  const pushResponse = await axios.post(`${baseUrl}/lightpush/v3/message`, {
-    pubsubTopic: routingInfo.pubsubTopic,
-    message: {
-      contentTopic,
-      payload: base64Payload,
-      version: 1,
-    },
-  });
-
-  ASSERTIONS.lightPushV3Success(pushResponse);
-
-  await new Promise((r) => setTimeout(r, TEST_CONFIG.MESSAGE_PROPAGATION_DELAY));
-
-  const [node1Messages, node2Messages] = await Promise.all([
-    nwakuNodes.nodes[0].messages(contentTopic),
-    nwakuNodes.nodes[1].messages(contentTopic)
-  ]);
-
-
-  const totalMessages = node1Messages.length + node2Messages.length;
-  expect(totalMessages).toBeGreaterThanOrEqual(1);
-
-  const receivedMessages = [...node1Messages, ...node2Messages];
-  expect(receivedMessages.length).toBeGreaterThan(0);
-
-  const receivedMessage = receivedMessages[0];
-  ASSERTIONS.messageContent(receivedMessage, testMessage, contentTopic);
-
-});

packages/browser-tests/tests/headless.spec.ts

@@ -0,0 +1,136 @@
+import { expect, test } from "@playwright/test";
+import { LightNode } from "@waku/sdk";
+
+import { API } from "../src/api/shared.js";
+import { NETWORK_CONFIG, ACTIVE_PEERS } from "./test-config.js";
+
+// Define the window interface for TypeScript
+declare global {
+  // eslint-disable-next-line no-unused-vars
+  interface Window {
+    waku: LightNode;
+    wakuAPI: typeof API;
+  }
+}
+
+test.describe("waku", () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto("");
+    await page.waitForTimeout(5000);
+
+    // Create and initialize a fresh Waku node for each test
+    const setupResult = await page.evaluate(async (config) => {
+      try {
+        await window.wakuAPI.createWakuNode({
+          ...config.defaultNodeConfig,
+          networkConfig: config.cluster42.networkConfig
+        });
+        await window.wakuAPI.startNode();
+        return { success: true };
+      } catch (error) {
+        console.error("Failed to initialize Waku node:", error);
+        return { success: false, error: String(error) };
+      }
+    }, NETWORK_CONFIG);
+
+    expect(setupResult.success).toBe(true);
+  });
+
+  test("can get peer id", async ({ page }) => {
+    const peerId = await page.evaluate(() => {
+      return window.waku.libp2p.peerId.toString();
+    });
+
+    expect(peerId).toBeDefined();
+    console.log("Peer ID:", peerId);
+  });
+
+  test("can get info", async ({ page }) => {
+    const info = await page.evaluate(() => {
+      return window.wakuAPI.getPeerInfo(window.waku);
+    });
+
+    expect(info).toBeDefined();
+    expect(info.peerId).toBeDefined();
+    expect(info.multiaddrs).toBeDefined();
+    expect(info.peers).toBeDefined();
+    console.log("Info:", info);
+  });
+
+  test("can get debug info", async ({ page }) => {
+    const debug = await page.evaluate(() => {
+      return window.wakuAPI.getDebugInfo(window.waku);
+    });
+
+    expect(debug).toBeDefined();
+    expect(debug.listenAddresses).toBeDefined();
+    expect(debug.peerId).toBeDefined();
+    expect(debug.protocols).toBeDefined();
+    console.log("Debug:", debug);
+  });
+
+  test("can dial peers", async ({ page }) => {
+    const result = await page.evaluate((peerAddrs) => {
+      return window.wakuAPI.dialPeers(window.waku, peerAddrs);
+    }, ACTIVE_PEERS);
+
+    expect(result).toBeDefined();
+    expect(result.total).toBe(ACTIVE_PEERS.length);
+    expect(result.errors.length >= result.total).toBe(false);
+    console.log("Dial result:", result);
+  });
+
+  test("can push a message", async ({ page }) => {
+    // First dial to peers
+    await page.evaluate((peersToDial) => {
+      return window.wakuAPI.dialPeers(window.waku, peersToDial);
+    }, ACTIVE_PEERS);
+
+    // Create a test message
+    const contentTopic = NETWORK_CONFIG.testMessage.contentTopic;
+    const payload = new TextEncoder().encode(NETWORK_CONFIG.testMessage.payload);
+    const arrayPayload = Array.from(payload);
+
+    // Push the message
+    const result = await page.evaluate(
+      ({ topic, data }) => {
+        return window.wakuAPI.pushMessage(
+          window.waku,
+          topic,
+          new Uint8Array(data)
+        );
+      },
+      { topic: contentTopic, data: arrayPayload }
+    );
+
+    expect(result).toBeDefined();
+    console.log("Push result:", result);
+  });
+
+  test("can recreate Waku node", async ({ page }) => {
+    // Get the current node's peer ID
+    const initialPeerId = await page.evaluate(() => {
+      return window.waku.libp2p.peerId.toString();
+    });
+
+    // Create a new node with different parameters
+    const result = await page.evaluate(() => {
+      return window.wakuAPI.createWakuNode({
+        defaultBootstrap: true // Different from beforeEach
+      });
+    });
+
+    expect(result.success).toBe(true);
+
+    // Start the new node
+    await page.evaluate(() => window.wakuAPI.startNode());
+
+    // Get the new peer ID
+    const newPeerId = await page.evaluate(() => {
+      return window.waku.libp2p.peerId.toString();
+    });
+
+    expect(newPeerId).not.toBe(initialPeerId);
+    console.log("Initial:", initialPeerId, "New:", newPeerId);
+  });
+});

packages/browser-tests/tests/integration.spec.ts

@@ -1,134 +0,0 @@
-import { test, expect } from "@playwright/test";
-import axios from "axios";
-import { StartedTestContainer } from "testcontainers";
-import {
-  createLightNode,
-  LightNode,
-  Protocols,
-  IDecodedMessage,
-} from "@waku/sdk";
-import { DEFAULT_CLUSTER_ID, DEFAULT_NUM_SHARDS } from "@waku/interfaces";
-import { startBrowserTestsContainer, stopContainer } from "./utils/container-helpers.js";
-import { ENV_BUILDERS, TEST_CONFIG } from "./utils/test-config.js";
-
-test.describe.configure({ mode: "serial" });
-
-let container: StartedTestContainer;
-let baseUrl: string;
-let wakuNode: LightNode;
-
-test.beforeAll(async () => {
-  const result = await startBrowserTestsContainer({
-    environment: {
-      ...ENV_BUILDERS.withProductionEnr(),
-      DEBUG: "waku:*",
-    },
-  });
-
-  container = result.container;
-  baseUrl = result.baseUrl;
-});
-
-test.afterAll(async () => {
-  if (wakuNode) {
-    try {
-      await wakuNode.stop();
-    } catch {
-      // Ignore errors
-    }
-  }
-
-  await stopContainer(container);
-});
-
-test("cross-network message delivery: SDK light node receives server lightpush", async () => {
-  test.setTimeout(TEST_CONFIG.DEFAULT_TEST_TIMEOUT);
-
-  const contentTopic = TEST_CONFIG.DEFAULT_CONTENT_TOPIC;
-  const testMessage = TEST_CONFIG.DEFAULT_TEST_MESSAGE;
-
-  wakuNode = await createLightNode({
-    defaultBootstrap: true,
-    discovery: {
-      dns: true,
-      peerExchange: true,
-      peerCache: true,
-    },
-    networkConfig: {
-      clusterId: DEFAULT_CLUSTER_ID,
-      numShardsInCluster: DEFAULT_NUM_SHARDS,
-    },
-    libp2p: {
-      filterMultiaddrs: false,
-    },
-  });
-
-  await wakuNode.start();
-
-  await wakuNode.waitForPeers(
-    [Protocols.Filter, Protocols.LightPush],
-    30000,
-  );
-
-  const messages: IDecodedMessage[] = [];
-  const decoder = wakuNode.createDecoder({ contentTopic });
-
-  if (
-    !(await wakuNode.filter.subscribe([decoder], (message) => {
-      messages.push(message);
-    }))
-  ) {
-    throw new Error("Failed to subscribe to Filter");
-  }
-
-  await new Promise((r) => setTimeout(r, 2000));
-
-  const messagePromise = new Promise<void>((resolve) => {
-    const originalLength = messages.length;
-    const checkForMessage = () => {
-      if (messages.length > originalLength) {
-        resolve();
-      } else {
-        setTimeout(checkForMessage, 100);
-      }
-    };
-    checkForMessage();
-  });
-
-  await axios.post(`${baseUrl}/waku/v1/wait-for-peers`, {
-    timeoutMs: 30000, // Increased timeout
-    protocols: ["lightpush", "filter"],
-  });
-
-  await new Promise((r) => setTimeout(r, 10000));
-
-  const base64Payload = btoa(testMessage);
-
-  const pushResponse = await axios.post(`${baseUrl}/lightpush/v3/message`, {
-    pubsubTopic: decoder.pubsubTopic,
-    message: {
-      contentTopic,
-      payload: base64Payload,
-      version: 1,
-    },
-  });
-
-  expect(pushResponse.status).toBe(200);
-  expect(pushResponse.data.success).toBe(true);
-
-  await Promise.race([
-    messagePromise,
-    new Promise((_, reject) =>
-      setTimeout(() => {
-        reject(new Error("Timeout waiting for message"));
-      }, 45000),
-    ),
-  ]);
-
-  expect(messages).toHaveLength(1);
-  const receivedMessage = messages[0];
-  expect(receivedMessage.contentTopic).toBe(contentTopic);
-
-  const receivedPayload = new TextDecoder().decode(receivedMessage.payload);
-  expect(receivedPayload).toBe(testMessage);
-});

packages/browser-tests/tests/server.spec.ts

@@ -1,82 +1,722 @@
-import { test, expect } from "@playwright/test";
+import { ChildProcess, exec, spawn } from "child_process";
+import * as http from "http";
+import * as net from "net";
+import { join } from "path";
+
+import { expect, test } from "@playwright/test";
 import axios from "axios";
-import { spawn, ChildProcess } from "child_process";
-import { fileURLToPath } from "url";
-import { dirname, join } from "path";
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+// The default URL, but we'll update this if we detect a different port
+let API_URL = "http://localhost:3000";
+// Need this for basic node initialization that doesn't rely on /execute
+const PEERS = [
+  "/dns4/waku-test.bloxy.one/tcp/8095/wss/p2p/16Uiu2HAmSZbDB7CusdRhgkD81VssRjQV5ZH13FbzCGcdnbbh6VwZ",
+  "/dns4/waku.fryorcraken.xyz/tcp/8000/wss/p2p/16Uiu2HAmMRvhDHrtiHft1FTUYnn6cVA8AWVrTyLUayJJ3MWpUZDB"
+];
 
+let serverProcess: ChildProcess;
+
+// Force tests to run sequentially to avoid port conflicts
 test.describe.configure({ mode: "serial" });
 
-test.describe("Server Tests", () => {
-  let serverProcess: ChildProcess;
-  let baseUrl = "http://localhost:3000";
+// Helper function to check if a port is in use
+async function isPortInUse(port: number): Promise<boolean> {
+  return new Promise((resolve) => {
+    const server = net
+      .createServer()
+      .once("error", () => {
+        // Port is in use
+        resolve(true);
+      })
+      .once("listening", () => {
+        // Port is free, close server
+        server.close();
+        resolve(false);
+      })
+      .listen(port);
+  });
+}
 
-  test.beforeAll(async () => {
-    const serverPath = join(__dirname, "..", "dist", "src", "server.js");
+// Helper function to kill processes on port 3000
+async function killProcessOnPort(): Promise<void> {
+  return new Promise<void>((resolve) => {
+    // Different commands for different platforms
+    const cmd =
+      process.platform === "win32"
+        ? `netstat -ano | findstr :3000 | findstr LISTENING`
+        : `lsof -i:3000 -t`;
 
-    serverProcess = spawn("node", [serverPath], {
-      stdio: "pipe",
-      env: { ...process.env, PORT: "3000" }
+    exec(cmd, (err, stdout) => {
+      if (err || !stdout.trim()) {
+        console.log("No process running on port 3000");
+        resolve();
+        return;
+      }
+
+      console.log(`Found processes on port 3000: ${stdout.trim()}`);
+
+      // Kill the process
+      const killCmd =
+        process.platform === "win32"
+          ? `FOR /F "tokens=5" %P IN ('netstat -ano ^| findstr :3000 ^| findstr LISTENING') DO taskkill /F /PID %P`
+          : `kill -9 ${stdout.trim()}`;
+
+      exec(killCmd, (killErr) => {
+        if (killErr) {
+          console.error(`Error killing process: ${killErr.message}`);
+        } else {
+          console.log("Killed process on port 3000");
+        }
+
+        // Wait a moment for OS to release the port
+        setTimeout(resolve, 500);
+      });
     });
+  });
+}
 
-    serverProcess.stdout?.on("data", (_data: Buffer) => {
-    });
+// Helper function to wait for the API server to be available
+async function waitForApiServer(
+  maxRetries = 10,
+  interval = 1000
+): Promise<boolean> {
+  for (let i = 0; i < maxRetries; i++) {
+    try {
+      const response = await axios.get(API_URL, { timeout: 2000 });
+      if (response.status === 200) {
+        console.log(`API server is available at ${API_URL}`);
+        return true;
+      }
+    } catch (e) {
+      console.log(
+        `API server not available at ${API_URL}, retrying (${i + 1}/${maxRetries})...`
+      );
+      await new Promise((resolve) => setTimeout(resolve, interval));
+    }
+  }
+  console.warn(
+    `API server at ${API_URL} not available after ${maxRetries} attempts`
+  );
+  return false;
+}
 
-    serverProcess.stderr?.on("data", (_data: Buffer) => {
-    });
+// Setup and teardown for the whole test suite
+test.beforeAll(async () => {
+  // First check if port 3000 is already in use - if so, try to kill it
+  const portInUse = await isPortInUse(3000);
+  if (portInUse) {
+    console.log(
+      "Port 3000 is already in use. Attempting to kill the process..."
+    );
+    await killProcessOnPort();
 
-    await new Promise((resolve) => setTimeout(resolve, 3000));
+    // Check again
+    const stillInUse = await isPortInUse(3000);
+    if (stillInUse) {
+      console.log("Failed to free port 3000. Waiting for it to be released...");
+      await new Promise((resolve) => setTimeout(resolve, 5000));
+    }
+  }
 
-    let serverReady = false;
-    for (let i = 0; i < 30; i++) {
+  // Start the server
+  console.log("Starting server for tests...");
+  serverProcess = spawn("node", [join(process.cwd(), "dist/server.js")], {
+    stdio: "pipe",
+    detached: true
+  });
+
+  // Log server output for debugging and capture the actual port
+  serverProcess.stdout?.on("data", (data) => {
+    const output = data.toString();
+    console.log(`Server: ${output}`);
+
+    // Check if the output contains the port information
+    const portMatch = output.match(
+      /API server running on http:\/\/localhost:(\d+)/
+    );
+    if (portMatch && portMatch[1]) {
+      const detectedPort = parseInt(portMatch[1], 10);
+      if (detectedPort !== 3000) {
+        console.log(
+          `Server is running on port ${detectedPort} instead of 3000`
+        );
+        API_URL = `http://localhost:${detectedPort}`;
+      }
+    }
+  });
+
+  serverProcess.stderr?.on("data", (data) => {
+    console.error(`Server Error: ${data}`);
+  });
+
+  // Wait for server to start and API to be available
+  console.log("Waiting for server to start...");
+  await new Promise((resolve) => setTimeout(resolve, 5000));
+
+  const apiAvailable = await waitForApiServer();
+  if (!apiAvailable) {
+    console.warn("API server is not available, tests may fail");
+  }
+
+  if (apiAvailable) {
+    // Create a node for the tests
+    try {
+      console.log("Creating node for tests...");
+      const createNodeResponse = await axios.post(
+        `${API_URL}/admin/v1/create-node`,
+        {
+          defaultBootstrap: false,
+          networkConfig: {
+            clusterId: 42,
+            shards: [0]
+          },
+          pubsubTopics: ["/waku/2/rs/42/0"] // Explicitly configure the pubsub topic
+        },
+        { timeout: 10000 }
+      );
+
+      if (createNodeResponse.status === 200) {
+        console.log("Node creation response:", createNodeResponse.data);
+
+        // Start the node
+        const startNodeResponse = await axios.post(
+          `${API_URL}/admin/v1/start-node`,
+          {},
+          { timeout: 5000 }
+        );
+
+        if (startNodeResponse.status === 200) {
+          console.log("Node started successfully");
+        }
+      }
+    } catch (error) {
+      console.warn(
+        "Failed to create/start node through API, some tests may fail:",
+        error
+      );
+    }
+  } else {
+    console.warn(
+      "Skipping node creation as server doesn't appear to be running"
+    );
+  }
+});
+
+test.afterAll(async () => {
+  // Stop the server
+  console.log("Stopping server...");
+  if (serverProcess && serverProcess.pid) {
+    if (process.platform === "win32") {
+      spawn("taskkill", ["/pid", serverProcess.pid.toString(), "/f", "/t"]);
+    } else {
+      // Ensure the process and all its children are terminated
       try {
-        const res = await axios.get(`${baseUrl}/`, { timeout: 2000 });
-        if (res.status === 200) {
-          serverReady = true;
+        process.kill(-serverProcess.pid, "SIGINT");
+      } catch (e) {
+        console.log("Server process already terminated");
+      }
+    }
+  }
+
+  // Verify no processes running on port 3000
+  await killProcessOnPort();
+
+  // Give time for all processes to terminate
+  await new Promise((resolve) => setTimeout(resolve, 1000));
+});
+
+test.describe("Waku Server API", () => {
+  // Direct test of filter endpoint - this runs first
+  test("can directly access filter/v1/messages endpoint", async () => {
+    // Try with different content topic formats
+    const testTopics = [
+      "test-topic",
+      "/test/topic",
+      "%2Ftest%2Ftopic", // Pre-encoded
+      "%2Ftest%2Ftopic" // Pre-encoded
+    ];
+
+    for (const topic of testTopics) {
+      console.log(`Testing direct access with topic: ${topic}`);
+      try {
+        const response = await axios.get(
+          `${API_URL}/filter/v1/messages/${topic}`,
+          {
+            timeout: 5000,
+            validateStatus: () => true
+          }
+        );
+
+        console.log(`  Status: ${response.status}`);
+        console.log(`  Content-Type: ${response.headers["content-type"]}`);
+        console.log(`  Data: ${JSON.stringify(response.data)}`);
+
+        // If this succeeds, we'll use this topic format for our tests
+        if (response.status === 200) {
+          console.log(`  Found working topic format: ${topic}`);
           break;
         }
-      } catch {
-        // Ignore errors
+      } catch (error: any) {
+        console.error(`  Error with topic ${topic}:`, error.message);
+        if (error.response) {
+          console.error(`  Response status: ${error.response.status}`);
+        }
       }
-      await new Promise((r) => setTimeout(r, 1000));
-    }
-
-    expect(serverReady).toBe(true);
-  });
-
-  test.afterAll(async () => {
-    if (serverProcess) {
-      serverProcess.kill("SIGTERM");
-      await new Promise((resolve) => setTimeout(resolve, 1000));
     }
   });
 
-  test("server health endpoint", async () => {
-    const res = await axios.get(`${baseUrl}/`);
-    expect(res.status).toBe(200);
-    expect(res.data.status).toBe("Waku simulation server is running");
-  });
+  // This test checks if the server is running and can serve the basic endpoints
+  test("can get server status and verify endpoints", async () => {
+    // Get initial server status with retry mechanism
+    let initialResponse;
+    for (let attempt = 0; attempt < 5; attempt++) {
+      try {
+        initialResponse = await axios.get(`${API_URL}/`, {
+          timeout: 5000,
+          validateStatus: () => true // Accept any status code
+        });
+        if (initialResponse.status === 200) {
+          break;
+        }
+      } catch (e) {
+        console.log(
+          `Server not responding on attempt ${attempt + 1}/5, retrying...`
+        );
+        await new Promise((resolve) => setTimeout(resolve, 1000));
+      }
+    }
 
-  test("static files are served", async () => {
-    const htmlRes = await axios.get(`${baseUrl}/app/index.html`);
-    expect(htmlRes.status).toBe(200);
-    expect(htmlRes.data).toContain("Waku Test Environment");
+    // If we still couldn't connect, skip this test
+    if (!initialResponse || initialResponse.status !== 200) {
+      console.warn("Server is not responding, skipping endpoint checks");
+      test.skip();
+      return;
+    }
 
-    const jsRes = await axios.get(`${baseUrl}/app/index.js`);
-    expect(jsRes.status).toBe(200);
-    expect(jsRes.data).toContain("WakuHeadless");
-  });
+    expect(initialResponse.status).toBe(200);
+    expect(initialResponse.data.status).toBe(
+      "Waku simulation server is running"
+    );
+
+    // Check if key endpoints are available
+    console.log("Checking if server endpoints are properly registered...");
 
-  test("Waku node auto-started", async () => {
     try {
-      const infoRes = await axios.get(`${baseUrl}/waku/v1/peer-info`);
-      expect(infoRes.status).toBe(200);
-      expect(infoRes.data.peerId).toBeDefined();
-      expect(infoRes.data.multiaddrs).toBeDefined();
+      // Try to access the various endpoints with simple HEAD requests
+      const endpoints = [
+        "/info",
+        "/debug/v1/info",
+        "/admin/v1/create-node",
+        "/admin/v1/start-node",
+        "/admin/v1/stop-node",
+        "/filter/v1/messages/test-topic",
+        "/filter/v2/messages/test-topic"
+      ];
+
+      for (const endpoint of endpoints) {
+        try {
+          const response = await axios.head(`${API_URL}${endpoint}`, {
+            validateStatus: () => true, // Accept any status code
+            timeout: 3000 // Short timeout to avoid hanging
+          });
+
+          // Some endpoints may return 404 or 405 if they only support specific methods,
+          // but at least we should get a response if the route is registered
+          console.log(`Endpoint ${endpoint}: Status ${response.status}`);
+
+          // If we get a 404, the route is not registered
+          expect(response.status).not.toBe(404);
+        } catch (error) {
+          console.warn(`Error checking endpoint ${endpoint}:`, error.message);
+          // Continue checking other endpoints even if one fails
+        }
+      }
+    } catch (error: any) {
+      console.error("Error checking endpoints:", error.message);
+      throw error;
+    }
+  });
+
+  // Test node lifecycle operations using the dedicated endpoints
+  test("can create, start, and stop a node", async () => {
+    // 1. Create a new node
+    const createResponse = await axios.post(`${API_URL}/admin/v1/create-node`, {
+      defaultBootstrap: true,
+      networkConfig: {
+        clusterId: 42,
+        shards: [0]
+      },
+      pubsubTopics: ["/waku/2/rs/42/0"] // Explicitly configure the pubsub topic
+    });
+    expect(createResponse.status).toBe(200);
+    expect(createResponse.data.success).toBe(true);
+
+    // 2. Start the node
+    const startResponse = await axios.post(`${API_URL}/admin/v1/start-node`);
+    expect(startResponse.status).toBe(200);
+    expect(startResponse.data.success).toBe(true);
+
+    // 3. Get info to verify it's running
+    const infoResponse = await axios.get(`${API_URL}/info`);
+    expect(infoResponse.status).toBe(200);
+    expect(infoResponse.data.peerId).toBeDefined();
+    console.log("Node peer ID:", infoResponse.data.peerId);
+
+    // 4. Stop the node
+    const stopResponse = await axios.post(`${API_URL}/admin/v1/stop-node`);
+    expect(stopResponse.status).toBe(200);
+    expect(stopResponse.data.success).toBe(true);
+
+    // 5. Start it again
+    const restartResponse = await axios.post(`${API_URL}/admin/v1/start-node`);
+    expect(restartResponse.status).toBe(200);
+    expect(restartResponse.data.success).toBe(true);
+
+    // 6. Verify it's running again
+    const finalInfoResponse = await axios.get(`${API_URL}/info`);
+    expect(finalInfoResponse.status).toBe(200);
+    expect(finalInfoResponse.data.peerId).toBeDefined();
+  });
+
+  // This test requires a running node, which we now can properly initialize with our new endpoints
+  test("can connect to peers and get node info", async () => {
+    // Create and start a fresh node
+    await axios.post(`${API_URL}/admin/v1/create-node`, {
+      defaultBootstrap: false,
+      networkConfig: {
+        clusterId: 42,
+        shards: [0]
+      },
+      pubsubTopics: ["/waku/2/rs/42/0"] // Explicitly configure the pubsub topic
+    });
+    await axios.post(`${API_URL}/admin/v1/start-node`);
+
+    // Connect to peers
+    const dialResponse = await axios.post(`${API_URL}/admin/v1/peers`, {
+      peerMultiaddrs: PEERS
+    });
+
+    expect(dialResponse.status).toBe(200);
+    console.log("Peer connection response:", dialResponse.data);
+
+    // Get debug info now that we have a properly initialized node
+    const debugResponse = await axios.get(`${API_URL}/debug/v1/info`);
+    expect(debugResponse.status).toBe(200);
+    expect(debugResponse.data).toBeDefined();
+
+    // Log protocols available
+    if (debugResponse.data.protocols) {
+      const wakuProtocols = debugResponse.data.protocols.filter((p: string) =>
+        p.includes("/waku/")
+      );
+      console.log("Waku protocols:", wakuProtocols);
+    }
+  });
+
+  test("can push messages", async () => {
+    // Create and start a fresh node
+    await axios.post(`${API_URL}/admin/v1/create-node`, {
+      defaultBootstrap: true,
+      networkConfig: {
+        clusterId: 42,
+        shards: [0]
+      },
+      pubsubTopics: ["/waku/2/rs/42/0"] // Explicitly configure the pubsub topic
+    });
+    await axios.post(`${API_URL}/admin/v1/start-node`);
+
+    // Connect to peers
+    await axios.post(`${API_URL}/admin/v1/peers`, {
+      peerMultiaddrs: PEERS
+    });
+
+    // Test the REST API format push endpoint
+    try {
+      const restPushResponse = await axios.post(
+        `${API_URL}/lightpush/v1/message`,
+        {
+          pubsubTopic: "/waku/2/default-waku/proto",
+          message: {
+            contentTopic: "/test/1/message/proto",
+            payload: Array.from(
+              new TextEncoder().encode("Test message via REST endpoint")
+            )
+          }
+        }
+      );
+
+      expect(restPushResponse.status).toBe(200);
+      expect(restPushResponse.data.messageId).toBeDefined();
+      console.log("Message ID:", restPushResponse.data.messageId);
     } catch (error) {
-      expect(error.response?.status).toBe(400);
+      console.log("REST push might fail if no peers connected:", error);
+    }
+  });
+
+  test("can retrieve messages from the queue", async () => {
+    // Create and start a fresh node
+    await axios.post(`${API_URL}/admin/v1/create-node`, {
+      defaultBootstrap: true,
+      networkConfig: {
+        clusterId: 42,
+        shards: [0]
+      },
+      pubsubTopics: ["/waku/2/rs/42/0"] // Explicitly configure the pubsub topic
+    });
+    await axios.post(`${API_URL}/admin/v1/start-node`);
+
+    // Connect to peers
+    await axios.post(`${API_URL}/admin/v1/peers`, {
+      peerMultiaddrs: PEERS
+    });
+
+    // Use a simple content topic to avoid encoding issues
+    const contentTopic = "test-queue";
+
+    try {
+      // Check endpoint existence by checking available routes
+      console.log("Checking server routes and status...");
+      const rootResponse = await axios.get(`${API_URL}/`);
+      console.log(
+        "Server root response:",
+        rootResponse.status,
+        rootResponse.data
+      );
+
+      // First ensure the queue is empty
+      console.log(`Attempting to get messages from ${contentTopic}...`);
+      const emptyQueueResponse = await axios.get(
+        `${API_URL}/filter/v1/messages/${contentTopic}`
+      );
+      expect(emptyQueueResponse.status).toBe(200);
+      expect(emptyQueueResponse.data.messages).toEqual([]);
+    } catch (error: any) {
+      console.error("Error accessing filter endpoint:", error.message);
+      if (error.response) {
+        console.error("Response status:", error.response.status);
+        console.error("Response data:", error.response.data);
+      }
+      throw error;
+    }
+
+    // Simulate adding messages to the queue
+    const messages = [
+      {
+        payload: Array.from(new TextEncoder().encode("Message 1")),
+        timestamp: Date.now() - 2000,
+        contentTopic
+      },
+      {
+        payload: Array.from(new TextEncoder().encode("Message 2")),
+        timestamp: Date.now() - 1000,
+        contentTopic
+      },
+      {
+        payload: Array.from(new TextEncoder().encode("Message 3")),
+        timestamp: Date.now(),
+        contentTopic
+      }
+    ];
+
+    const testMessages = await axios.post(`${API_URL}/execute`, {
+      functionName: "simulateMessages",
+      params: [contentTopic, messages]
+    });
+    expect(testMessages.status).toBe(200);
+
+    // Now check if we can retrieve messages
+    const messagesResponse = await axios.get(
+      `${API_URL}/filter/v1/messages/${contentTopic}`
+    );
+    expect(messagesResponse.status).toBe(200);
+    expect(messagesResponse.data.messages.length).toBe(3);
+
+    // Verify message format
+    const message = messagesResponse.data.messages[0];
+    expect(message).toHaveProperty("payload");
+    expect(message).toHaveProperty("contentTopic");
+    expect(message).toHaveProperty("timestamp");
+    expect(message).toHaveProperty("version");
+
+    // Test pagination
+    const paginatedResponse = await axios.get(
+      `${API_URL}/filter/v1/messages/${contentTopic}?pageSize=2`
+    );
+    expect(paginatedResponse.status).toBe(200);
+    expect(paginatedResponse.data.messages.length).toBe(2);
+
+    // Test sorting order
+    const ascendingResponse = await axios.get(
+      `${API_URL}/filter/v1/messages/${contentTopic}?ascending=true`
+    );
+    expect(ascendingResponse.status).toBe(200);
+    expect(ascendingResponse.data.messages.length).toBe(3);
+    const timestamps = ascendingResponse.data.messages.map(
+      (msg: any) => msg.timestamp
+    );
+    expect(timestamps[0]).toBeLessThan(timestamps[1]);
+    expect(timestamps[1]).toBeLessThan(timestamps[2]);
+  });
+
+  test("can access filter endpoint for SSE", async () => {
+    // Create and start a fresh node - only if API is accessible
+    try {
+      // Quick check if server is running
+      await axios.get(API_URL, { timeout: 2000 });
+
+      // Create node
+      await axios.post(`${API_URL}/admin/v1/create-node`, {
+        defaultBootstrap: true,
+        networkConfig: {
+          clusterId: 42,
+          shards: [0]
+        },
+        pubsubTopics: ["/waku/2/rs/42/0"] // Explicitly configure the pubsub topic
+      });
+
+      // Start node
+      await axios.post(`${API_URL}/admin/v1/start-node`);
+
+      // Connect to peers
+      await axios.post(`${API_URL}/admin/v1/peers`, {
+        peerMultiaddrs: PEERS
+      });
+    } catch (error) {
+      console.warn("Server appears to be unreachable, skipping test");
+      test.skip();
+      return;
+    }
+
+    const contentTopic = "test-sse";
+
+    // Verify filter endpoint is accessible
+    // Instead of implementing a full SSE client, we'll make sure the endpoint
+    // returns the correct headers and status code which indicates SSE readiness
+    try {
+      const sseResponse = await axios
+        .get(
+          `${API_URL}/filter/v2/messages/${contentTopic}?clusterId=42&shard=0`,
+          {
+            // Set a timeout to avoid hanging the test
+            timeout: 2000,
+            // Expecting the request to timeout as SSE keeps connection open
+            validateStatus: () => true,
+            // We can't use responseType: 'stream' directly with axios,
+            // but we can check the response headers
+            headers: {
+              Accept: "text/event-stream"
+            }
+          }
+        )
+        .catch((e) => {
+          // We expect a timeout error since SSE keeps connection open
+          if (e.code === "ECONNABORTED") {
+            return e.response;
+          }
+          throw e;
+        });
+
+      // If response exists and has expected SSE headers, the test passes
+      if (sseResponse) {
+        expect(sseResponse.headers["content-type"]).toBe("text/event-stream");
+        expect(sseResponse.headers["cache-control"]).toBe("no-cache");
+        expect(sseResponse.headers["connection"]).toBe("keep-alive");
+      } else {
+        // If no response, we manually make an HTTP request to check the headers
+        const headers = await new Promise<Record<string, string>>((resolve) => {
+          const requestUrl = new URL(
+            `${API_URL}/filter/v2/messages/${contentTopic}?clusterId=42&shard=0`
+          );
+          const req = http.get(requestUrl, (res) => {
+            // Only interested in headers
+            req.destroy();
+            if (res.headers) {
+              resolve(res.headers as Record<string, string>);
+            } else {
+              resolve({});
+            }
+          });
+          req.on("error", () => resolve({}));
+        });
+
+        if (Object.keys(headers).length === 0) {
+          console.warn(
+            "No headers received, SSE endpoint may not be accessible"
+          );
+          test.skip();
+          return;
+        }
+
+        expect(headers["content-type"]).toBe("text/event-stream");
+      }
+    } catch (error) {
+      console.error("Error during SSE endpoint test:", error);
+      test.fail();
+      return;
+    }
+
+    console.log("SSE endpoint is accessible with correct headers");
+  });
+
+  // Add a specific test just for the filter/v1/messages endpoint
+  test("can access filter/v1/messages endpoint directly", async () => {
+    // Check if server is available first
+    try {
+      await axios.get(API_URL, { timeout: 2000 });
+    } catch (error) {
+      console.warn("Server appears to be unreachable, skipping test");
+      test.skip();
+      return;
+    }
+
+    // Create a random content topic just for this test
+    const contentTopic = `direct-filter-${Date.now()}`;
+
+    try {
+      // Try different approaches to access the endpoint
+      console.log(
+        `Testing direct access to filter/v1/messages/${contentTopic}`
+      );
+
+      // Method 1: GET request with encoded content topic
+      const getResponse = await axios({
+        method: "get",
+        url: `${API_URL}/filter/v1/messages/${contentTopic}`,
+        validateStatus: function () {
+          // Allow any status code to check what's coming back
+          return true;
+        },
+        timeout: 5000
+      });
+
+      console.log("Response status:", getResponse.status);
+      console.log("Response headers:", getResponse.headers);
+
+      if (getResponse.status === 404) {
+        throw new Error(
+          `Endpoint not found (404): /filter/v1/messages/${contentTopic}`
+        );
+      }
+
+      // If we got here, the endpoint exists even if it returns empty results
+      expect(getResponse.status).toBe(200);
+      expect(getResponse.data).toHaveProperty("messages");
+      expect(Array.isArray(getResponse.data.messages)).toBe(true);
+    } catch (error: any) {
+      console.error("Error during filter/v1 endpoint test:", error.message);
+
+      if (error.response) {
+        console.error("Response status:", error.response.status);
+        console.error("Response headers:", error.response.headers);
+        console.error("Response data:", error.response.data);
+      } else if (error.request) {
+        console.error("No response received:", error.request);
+        // If no response, we'll skip the test rather than fail it
+        test.skip();
+        return;
+      }
+
+      throw error;
     }
   });
 });

packages/browser-tests/tests/test-config.ts

@@ -0,0 +1,40 @@
+export const NETWORK_CONFIG = {
+  cluster42: {
+    networkConfig: {
+      clusterId: 42,
+      shards: [0]
+    },
+    peers: [
+      "/dns4/waku-test.bloxy.one/tcp/8095/wss/p2p/16Uiu2HAmSZbDB7CusdRhgkD81VssRjQV5ZH13FbzCGcdnbbh6VwZ",
+      "/dns4/waku.fryorcraken.xyz/tcp/8000/wss/p2p/16Uiu2HAmMRvhDHrtiHft1FTUYnn6cVA8AWVrTyLUayJJ3MWpUZDB",
+      "/dns4/ivansete.xyz/tcp/8000/wss/p2p/16Uiu2HAmDAHuJ8w9zgxVnhtFe8otWNJdCewPAerJJPbXJcn8tu4r"
+    ]
+  },
+
+  sandbox: {
+    networkConfig: {
+      clusterId: 1,
+      shards: [0]
+    },
+    peers: [
+      "/dns4/node-01.do-ams3.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmNaeL4p3WEYzC9mgXBmBWSgWjPHRvatZTXnp8Jgv3iKsb",
+      "/dns4/node-01.gc-us-central1-a.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmRv1iQ3NoMMcjbtRmKxPuYBbF9nLYz2SDv9MTN8WhGuUU",
+      "/dns4/node-01.ac-cn-hongkong-c.waku.sandbox.status.im/tcp/30303/p2p/16Uiu2HAmQYiojgZ8APsh9wqbWNyCstVhnp9gbeNrxSEQnLJchC92"
+    ]
+  },
+
+  // Default node configuration
+  defaultNodeConfig: {
+    defaultBootstrap: false
+  },
+
+  // Test message configuration
+  testMessage: {
+    contentTopic: "/test/1/message/proto",
+    payload: "Hello, Waku!"
+  }
+};
+
+// Active environment - change this to switch between cluster42 and sandbox
+export const ACTIVE_ENV = 'cluster42';
+export const ACTIVE_PEERS = NETWORK_CONFIG[ACTIVE_ENV].peers;

packages/browser-tests/tests/utils/container-helpers.ts

@@ -1,128 +0,0 @@
-import axios from "axios";
-import { GenericContainer, StartedTestContainer } from "testcontainers";
-import { Logger } from "@waku/utils";
-
-const log = new Logger("container-helpers");
-
-export interface ContainerSetupOptions {
-  environment?: Record<string, string>;
-  networkMode?: string;
-  timeout?: number;
-  maxAttempts?: number;
-}
-
-export interface ContainerSetupResult {
-  container: StartedTestContainer;
-  baseUrl: string;
-}
-
-/**
- * Starts a waku-browser-tests Docker container with proper health checking.
- * Follows patterns from @waku/tests package for retry logic and cleanup.
- */
-export async function startBrowserTestsContainer(
-  options: ContainerSetupOptions = {}
-): Promise<ContainerSetupResult> {
-  const {
-    environment = {},
-    networkMode = "bridge",
-    timeout = 2000,
-    maxAttempts = 60
-  } = options;
-
-  log.info("Starting waku-browser-tests container...");
-
-  let generic = new GenericContainer("waku-browser-tests:local")
-    .withExposedPorts(8080)
-    .withNetworkMode(networkMode);
-
-  // Apply environment variables
-  for (const [key, value] of Object.entries(environment)) {
-    generic = generic.withEnvironment({ [key]: value });
-  }
-
-  const container = await generic.start();
-
-  // Set up container logging - stream all output from the start
-  const logs = await container.logs();
-  logs.on("data", (b) => process.stdout.write("[container] " + b.toString()));
-  logs.on("error", (err) => log.error("[container log error]", err));
-
-  // Give container time to initialize
-  await new Promise((r) => setTimeout(r, 5000));
-
-  const mappedPort = container.getMappedPort(8080);
-  const baseUrl = `http://127.0.0.1:${mappedPort}`;
-
-  // Wait for server readiness with retry logic (following waku/tests patterns)
-  const serverReady = await waitForServerReady(baseUrl, maxAttempts, timeout);
-
-  if (!serverReady) {
-    await logFinalContainerState(container);
-    throw new Error("Container failed to become ready");
-  }
-
-  log.info("✅ Browser tests container ready");
-  await new Promise((r) => setTimeout(r, 500)); // Final settling time
-
-  return { container, baseUrl };
-}
-
-/**
- * Waits for server to become ready with exponential backoff and detailed logging.
- * Follows retry patterns from @waku/tests ServiceNode.
- */
-async function waitForServerReady(
-  baseUrl: string,
-  maxAttempts: number,
-  timeout: number
-): Promise<boolean> {
-  for (let i = 0; i < maxAttempts; i++) {
-    try {
-      const res = await axios.get(`${baseUrl}/`, { timeout });
-      if (res.status === 200) {
-        log.info(`Server is ready after ${i + 1} attempts`);
-        return true;
-      }
-    } catch (error) {
-      if (i % 10 === 0) {
-        log.info(`Attempt ${i + 1}/${maxAttempts} failed:`, error.code || error.message);
-      }
-    }
-    await new Promise((r) => setTimeout(r, 1000));
-  }
-  return false;
-}
-
-/**
- * Logs final container state for debugging, following waku/tests error handling patterns.
- */
-async function logFinalContainerState(container: StartedTestContainer): Promise<void> {
-  try {
-    const finalLogs = await container.logs({ tail: 50 });
-    log.info("=== Final Container Logs ===");
-    finalLogs.on("data", (b) => log.info(b.toString()));
-    await new Promise((r) => setTimeout(r, 1000));
-  } catch (logError) {
-    log.error("Failed to get container logs:", logError);
-  }
-}
-
-/**
- * Gracefully stops containers with retry logic, following teardown patterns from waku/tests.
- */
-export async function stopContainer(container: StartedTestContainer): Promise<void> {
-  if (!container) return;
-
-  log.info("Stopping container gracefully...");
-  try {
-    await container.stop({ timeout: 10000 });
-    log.info("Container stopped successfully");
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    log.warn(
-      "Container stop had issues (expected):",
-      message
-    );
-  }
-}

packages/browser-tests/tests/utils/index.ts

@@ -1,8 +0,0 @@
-/**
- * Shared test utilities for browser-tests package.
- * Follows patterns established in @waku/tests package.
- */
-
-export * from "./container-helpers.js";
-export * from "./nwaku-helpers.js"; 
-export * from "./test-config.js";

packages/browser-tests/tests/utils/nwaku-helpers.ts

@@ -1,141 +0,0 @@
-import { ServiceNode } from "@waku/tests";
-import { DefaultTestRoutingInfo } from "@waku/tests";
-import { Logger } from "@waku/utils";
-
-const log = new Logger("nwaku-helpers");
-
-export interface TwoNodeNetwork {
-  nodes: ServiceNode[];
-}
-
-/**
- * Creates a two-node nwaku network following waku/tests patterns.
- * Node 1: Relay + Light Push (service provider)
- * Node 2: Relay only (network peer)
- */
-export async function createTwoNodeNetwork(): Promise<TwoNodeNetwork> {
-  log.info("Creating nwaku node 1 (Relay + Light Push)...");
-  const lightPushNode = new ServiceNode(
-    "lightpush-node-" + Math.random().toString(36).substring(7),
-  );
-
-  const lightPushArgs = {
-    relay: true,
-    lightpush: true,
-    filter: false,
-    store: false,
-    clusterId: DefaultTestRoutingInfo.clusterId,
-    numShardsInNetwork: DefaultTestRoutingInfo.networkConfig.numShardsInCluster,
-    contentTopic: [DefaultTestRoutingInfo.contentTopic],
-  };
-
-  await lightPushNode.start(lightPushArgs, { retries: 3 });
-
-  log.info("Creating nwaku node 2 (Relay only)...");
-  const relayNode = new ServiceNode(
-    "relay-node-" + Math.random().toString(36).substring(7),
-  );
-
-  // Connect second node to first node (following ServiceNodesFleet pattern)
-  const firstNodeAddr = await lightPushNode.getExternalMultiaddr();
-  const relayArgs = {
-    relay: true,
-    lightpush: false,
-    filter: false,
-    store: false,
-    staticnode: firstNodeAddr,
-    clusterId: DefaultTestRoutingInfo.clusterId,
-    numShardsInNetwork: DefaultTestRoutingInfo.networkConfig.numShardsInCluster,
-    contentTopic: [DefaultTestRoutingInfo.contentTopic],
-  };
-
-  await relayNode.start(relayArgs, { retries: 3 });
-
-  // Wait for network formation (following waku/tests timing patterns)
-  log.info("Waiting for nwaku network formation...");
-  await new Promise((r) => setTimeout(r, 5000));
-
-  // Verify connectivity (optional, for debugging)
-  await verifyNetworkFormation([lightPushNode, relayNode]);
-
-  return {
-    nodes: [lightPushNode, relayNode],
-  };
-}
-
-/**
- * Verifies that nwaku nodes have formed connections.
- * Follows error handling patterns from waku/tests.
- */
-async function verifyNetworkFormation(nodes: ServiceNode[]): Promise<void> {
-  try {
-    const peerCounts = await Promise.all(
-      nodes.map(async (node, index) => {
-        const peers = await node.peers();
-        log.info(`Node ${index + 1} has ${peers.length} peer(s)`);
-        return peers.length;
-      }),
-    );
-
-    if (peerCounts.every((count) => count === 0)) {
-      log.warn("⚠️  Nodes may not be properly connected yet");
-    }
-  } catch (error) {
-    log.warn("Could not verify peer connections:", error);
-  }
-}
-
-/**
- * Extracts Docker-accessible multiaddr from nwaku node.
- * Returns multiaddr using container's internal IP for Docker network communication.
- */
-export async function getDockerAccessibleMultiaddr(
-  node: ServiceNode,
-): Promise<string> {
-  // Get multiaddr with localhost and extract components
-  const localhostMultiaddr = await node.getMultiaddrWithId();
-  const peerId = await node.getPeerId();
-
-  // Extract port from multiaddr string
-  const multiaddrStr = localhostMultiaddr.toString();
-  const portMatch = multiaddrStr.match(/\/tcp\/(\d+)/);
-  const port = portMatch ? portMatch[1] : null;
-
-  if (!port) {
-    throw new Error("Could not extract port from multiaddr: " + multiaddrStr);
-  }
-
-  // Get Docker container IP (accessing internal field)
-  // Note: This accesses an internal implementation detail of ServiceNode
-  const nodeWithDocker = node as ServiceNode & {
-    docker?: { containerIp?: string };
-  };
-  const containerIp = nodeWithDocker.docker?.containerIp;
-  if (!containerIp) {
-    throw new Error("Could not get container IP from node");
-  }
-
-  // Build Docker network accessible multiaddr
-  const dockerMultiaddr = `/ip4/${containerIp}/tcp/${port}/ws/p2p/${peerId}`;
-
-  log.info("Original multiaddr:", multiaddrStr);
-  log.info("Docker accessible multiaddr:", dockerMultiaddr);
-
-  return dockerMultiaddr;
-}
-
-/**
- * Stops nwaku nodes with retry logic, following teardown patterns from waku/tests.
- */
-export async function stopNwakuNodes(nodes: ServiceNode[]): Promise<void> {
-  if (!nodes || nodes.length === 0) return;
-
-  log.info("Stopping nwaku nodes...");
-  try {
-    await Promise.all(nodes.map((node) => node.stop()));
-    log.info("Nwaku nodes stopped successfully");
-  } catch (error) {
-    const message = error instanceof Error ? error.message : String(error);
-    log.warn("Nwaku nodes stop had issues:", message);
-  }
-}

packages/browser-tests/tests/utils/test-config.ts

@@ -1,127 +0,0 @@
-import { expect } from "@playwright/test";
-import { DefaultTestRoutingInfo } from "@waku/tests";
-import { AxiosResponse } from "axios";
-
-/**
- * Response type definitions for API endpoints
- */
-interface ServerHealthResponse {
-  status: string;
-}
-
-interface PeerInfoResponse {
-  peerId: string;
-  multiaddrs: string[];
-  peers: string[];
-}
-
-interface LightPushV3Result {
-  successes: string[];
-  failures: Array<{ error: string; peerId?: string }>;
-}
-
-interface LightPushV3Response {
-  success: boolean;
-  result: LightPushV3Result;
-  error?: string;
-}
-
-interface MessageResponse {
-  contentTopic: string;
-  payload: string;
-  version: number;
-  timestamp?: bigint | number;
-}
-
-/**
- * Common test configuration constants following waku/tests patterns.
- */
-export const TEST_CONFIG = {
-  // Test timeouts (following waku/tests timeout patterns)
-  DEFAULT_TEST_TIMEOUT: 120000, // 2 minutes
-  CONTAINER_READY_TIMEOUT: 60000, // 1 minute
-  NETWORK_FORMATION_DELAY: 5000, // 5 seconds
-  SUBSCRIPTION_DELAY: 3000, // 3 seconds
-  MESSAGE_PROPAGATION_DELAY: 5000, // 5 seconds
-  WAKU_INIT_DELAY: 8000, // 8 seconds
-
-  // Network configuration
-  DEFAULT_CLUSTER_ID: DefaultTestRoutingInfo.clusterId.toString(),
-  DEFAULT_CONTENT_TOPIC: "/test/1/browser-tests/proto",
-  
-  // Test messages
-  DEFAULT_TEST_MESSAGE: "Hello from browser tests",
-} as const;
-
-/**
- * Environment variable builders for different test scenarios.
- */
-export const ENV_BUILDERS = {
-  /**
-   * Environment for production ENR bootstrap (integration test pattern).
-   */
-  withProductionEnr: () => ({
-    WAKU_ENR_BOOTSTRAP: "enr:-QEnuEBEAyErHEfhiQxAVQoWowGTCuEF9fKZtXSd7H_PymHFhGJA3rGAYDVSHKCyJDGRLBGsloNbS8AZF33IVuefjOO6BIJpZIJ2NIJpcIQS39tkim11bHRpYWRkcnO4lgAvNihub2RlLTAxLmRvLWFtczMud2FrdXYyLnRlc3Quc3RhdHVzaW0ubmV0BgG73gMAODcxbm9kZS0wMS5hYy1jbi1ob25na29uZy1jLndha3V2Mi50ZXN0LnN0YXR1c2ltLm5ldAYBu94DACm9A62t7AQL4Ef5ZYZosRpQTzFVAB8jGjf1TER2wH-0zBOe1-MDBNLeA4lzZWNwMjU2azGhAzfsxbxyCkgCqq8WwYsVWH7YkpMLnU2Bw5xJSimxKav-g3VkcIIjKA",
-    WAKU_CLUSTER_ID: "1",
-  }),
-
-  /**
-   * Environment for local nwaku node connection (e2e test pattern).
-   */
-  withLocalLightPush: (lightpushMultiaddr: string) => ({
-    WAKU_LIGHTPUSH_NODE: lightpushMultiaddr,
-    WAKU_CLUSTER_ID: TEST_CONFIG.DEFAULT_CLUSTER_ID,
-  }),
-};
-
-/**
- * Test assertion helpers following waku/tests verification patterns.
- */
-export const ASSERTIONS = {
-  /**
-   * Verifies server health response structure.
-   */
-  serverHealth: (response: AxiosResponse<ServerHealthResponse>) => {
-    expect(response.status).toBe(200);
-    expect(response.data.status).toBe("Waku simulation server is running");
-  },
-
-  /**
-   * Verifies peer info response structure.
-   */
-  peerInfo: (response: AxiosResponse<PeerInfoResponse>) => {
-    expect(response.status).toBe(200);
-    expect(response.data.peerId).toBeDefined();
-    expect(typeof response.data.peerId).toBe("string");
-  },
-
-  /**
-   * Verifies lightpush response structure (v3 format).
-   */
-  lightPushV3Success: (response: AxiosResponse<LightPushV3Response>) => {
-    expect(response.status).toBe(200);
-    expect(response.data).toHaveProperty('success', true);
-    expect(response.data).toHaveProperty('result');
-    expect(response.data.result).toHaveProperty('successes');
-    expect(Array.isArray(response.data.result.successes)).toBe(true);
-    expect(response.data.result.successes.length).toBeGreaterThan(0);
-  },
-
-  /**
-   * Verifies message content and structure.
-   */
-  messageContent: (message: MessageResponse, expectedContent: string, expectedTopic: string) => {
-    expect(message).toHaveProperty('contentTopic', expectedTopic);
-    expect(message).toHaveProperty('payload');
-    expect(typeof message.payload).toBe('string');
-
-    const receivedPayload = Buffer.from(message.payload, 'base64').toString();
-    expect(receivedPayload).toBe(expectedContent);
-
-    // Optional fields
-    expect(message).toHaveProperty('version');
-    if (message.timestamp) {
-      expect(['bigint', 'number']).toContain(typeof message.timestamp);
-    }
-  },
-};

packages/browser-tests/tsconfig.json

@@ -15,5 +15,5 @@
     "typeRoots": ["./node_modules/@types", "./types"]
   },
   "include": ["src/server.ts", "types/**/*.d.ts"],
-  "exclude": ["node_modules", "dist", "web"]
+  "exclude": ["node_modules", "dist"]
 }

packages/browser-tests/types/global.d.ts

@@ -1,19 +1,27 @@
-import type { WakuHeadless } from "../web/index.js";
-
-export interface WindowNetworkConfig {
-  clusterId?: number;
-  shards?: number[];
-}
-
-export interface ITestBrowser extends Window {
-  wakuApi: WakuHeadless;
-  __WAKU_NETWORK_CONFIG?: WindowNetworkConfig;
-  __WAKU_LIGHTPUSH_NODE?: string | null;
-  __WAKU_ENR_BOOTSTRAP?: string | null;
-}
+import { LightNode } from "@waku/sdk";
+import { IWakuNode } from "../src/api/common.js";
+import {
+  createWakuNode,
+  dialPeers,
+  getDebugInfo,
+  getPeerInfo,
+  pushMessage,
+  subscribe
+} from "../src/api/shared.js";
 
+// Define types for the Waku node and window
 declare global {
+  // eslint-disable-next-line no-unused-vars
   interface Window {
-    wakuApi: WakuHeadless;
+    waku: IWakuNode & LightNode;
+    wakuAPI: {
+      getPeerInfo: typeof getPeerInfo;
+      getDebugInfo: typeof getDebugInfo;
+      pushMessage: typeof pushMessage;
+      dialPeers: typeof dialPeers;
+      createWakuNode: typeof createWakuNode;
+      subscribe: typeof subscribe;
+      [key: string]: any;
+    };
   }
 }

packages/browser-tests/types/serve.d.ts

@@ -1,9 +1,7 @@
 declare module "serve" {
-  import type { Server } from "http";
-
   function serve(
     folder: string,
-    options: { port: number; single: boolean; listen: boolean },
-  ): Promise<Server>;
+    options: { port: number; single: boolean; listen: boolean }
+  ): any;
   export default serve;
 }

packages/browser-tests/web/index.html

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <title>Waku Test Environment</title>
-  </head>
-  <body>
-    <h1>Waku Test Environment</h1>
-    <script type="module" src="./index.js"></script>
-  </body>
-  </html>
-
-

packages/browser-tests/web/index.ts

@@ -1,431 +0,0 @@
-import {
-  createLightNode,
-  LightNode,
-  Protocols,
-  NetworkConfig,
-  CreateNodeOptions,
-} from "@waku/sdk";
-import {
-  AutoSharding,
-  DEFAULT_CLUSTER_ID,
-  DEFAULT_NUM_SHARDS,
-  ShardId,
-  StaticSharding,
-  ShardInfo,
-  CreateLibp2pOptions,
-  IEncoder,
-  ILightPush,
-  SDKProtocolResult,
-  Failure,
-} from "@waku/interfaces";
-import { bootstrap } from "@libp2p/bootstrap";
-import { EnrDecoder, TransportProtocol } from "@waku/enr";
-import type { Multiaddr } from "@multiformats/multiaddr";
-import type { ITestBrowser } from "../types/global.js";
-import { Logger, StaticShardingRoutingInfo } from "@waku/utils";
-import type { PeerId } from "@libp2p/interface";
-
-const log = new Logger("waku-headless");
-
-export interface SerializableSDKProtocolResult {
-  successes: string[];
-  failures: Array<{
-    error: string;
-    peerId?: string;
-  }>;
-  myPeerId?: string;
-}
-
-function makeSerializable(result: SDKProtocolResult): SerializableSDKProtocolResult {
-  return {
-    ...result,
-    successes: result.successes.map((peerId: PeerId) => peerId.toString()),
-    failures: result.failures.map((failure: Failure) => ({
-      error: failure.error || failure.toString(),
-      peerId: failure.peerId ? failure.peerId.toString() : undefined,
-    })),
-  };
-}
-
-async function convertEnrToMultiaddrs(enrString: string): Promise<string[]> {
-  try {
-    const enr = await EnrDecoder.fromString(enrString);
-    const allMultiaddrs = enr.getAllLocationMultiaddrs();
-    const multiaddrs: string[] = [];
-
-    for (const multiaddr of allMultiaddrs) {
-      const maStr = multiaddr.toString();
-      multiaddrs.push(maStr);
-    }
-    if (multiaddrs.length === 0) {
-      const tcpMultiaddr = enr.getFullMultiaddr(TransportProtocol.TCP);
-      if (tcpMultiaddr) {
-        const tcpStr = tcpMultiaddr.toString();
-        multiaddrs.push(tcpStr);
-      }
-      const udpMultiaddr = enr.getFullMultiaddr(TransportProtocol.UDP);
-      if (udpMultiaddr) {
-        const udpStr = udpMultiaddr.toString();
-        multiaddrs.push(udpStr);
-      }
-    }
-
-    return multiaddrs;
-  } catch (error) {
-    return [];
-  }
-}
-
-export class WakuHeadless {
-  waku: LightNode | null;
-  networkConfig: NetworkConfig;
-  lightpushNode: string | null;
-  enrBootstrap: string | null;
-  constructor(
-    networkConfig?: Partial<NetworkConfig>,
-    lightpushNode?: string | null,
-    enrBootstrap?: string | null,
-  ) {
-    this.waku = null;
-    this.networkConfig = this.buildNetworkConfig(networkConfig);
-    log.info("Network config on construction:", this.networkConfig);
-    this.lightpushNode = lightpushNode || null;
-    this.enrBootstrap = enrBootstrap || null;
-
-    if (this.lightpushNode) {
-      log.info(`Configured preferred lightpush node: ${this.lightpushNode}`);
-    }
-    if (this.enrBootstrap) {
-      log.info(`Configured ENR bootstrap: ${this.enrBootstrap}`);
-    }
-  }
-
-  private shouldUseCustomBootstrap(options: CreateNodeOptions): boolean {
-    const hasEnr = Boolean(this.enrBootstrap);
-    const isDefaultBootstrap = Boolean(options.defaultBootstrap);
-
-    return hasEnr && !isDefaultBootstrap;
-  }
-
-  private async getBootstrapMultiaddrs(): Promise<string[]> {
-    if (!this.enrBootstrap) {
-      return [];
-    }
-
-    const enrList = this.enrBootstrap.split(",").map((enr) => enr.trim());
-    const allMultiaddrs: string[] = [];
-
-    for (const enr of enrList) {
-      const multiaddrs = await convertEnrToMultiaddrs(enr);
-      if (multiaddrs.length > 0) {
-        allMultiaddrs.push(...multiaddrs);
-      }
-    }
-
-    return allMultiaddrs;
-  }
-
-  private buildNetworkConfig(
-    providedConfig?: Partial<NetworkConfig> | Partial<ShardInfo>,
-  ): NetworkConfig {
-    const clusterId = providedConfig?.clusterId ?? DEFAULT_CLUSTER_ID;
-
-    const staticShards = (providedConfig as Partial<ShardInfo>)?.shards;
-    if (
-      staticShards &&
-      Array.isArray(staticShards) &&
-      staticShards.length > 0
-    ) {
-      log.info("Using static sharding with shards:", staticShards);
-      return {
-        clusterId,
-      } as StaticSharding;
-    }
-
-    const numShardsInCluster =
-      (providedConfig as Partial<AutoSharding>)?.numShardsInCluster ?? DEFAULT_NUM_SHARDS;
-    log.info(
-      "Using auto sharding with num shards in cluster:",
-      numShardsInCluster,
-    );
-    return {
-      clusterId,
-      numShardsInCluster,
-    } as AutoSharding;
-  }
-
-  private async send(
-    lightPush: ILightPush,
-    encoder: IEncoder,
-    payload: Uint8Array,
-  ): Promise<SDKProtocolResult> {
-    return lightPush.send(encoder, {
-      payload,
-      timestamp: new Date(),
-    });
-  }
-
-  async pushMessageV3(
-    contentTopic: string,
-    payload: string,
-    pubsubTopic: string,
-  ): Promise<SerializableSDKProtocolResult> {
-    if (!this.waku) {
-      throw new Error("Waku node not started");
-    }
-    log.info(
-      "Pushing message via v3 lightpush:",
-      contentTopic,
-      payload,
-      pubsubTopic,
-    );
-    log.info("Waku node:", this.waku);
-    log.info("Network config:", this.networkConfig);
-
-    let processedPayload: Uint8Array;
-    try {
-      const binaryString = atob(payload);
-      const bytes = new Uint8Array(binaryString.length);
-      for (let i = 0; i < binaryString.length; i++) {
-        bytes[i] = binaryString.charCodeAt(i);
-      }
-      processedPayload = bytes;
-    } catch (e) {
-      processedPayload = new TextEncoder().encode(payload);
-    }
-
-    try {
-      const lightPush = this.waku.lightPush;
-      if (!lightPush) {
-        throw new Error("Lightpush service not available");
-      }
-
-      let shardId: ShardId | undefined;
-      if (pubsubTopic) {
-        const staticShardingRoutingInfo =
-          StaticShardingRoutingInfo.fromPubsubTopic(
-            pubsubTopic,
-            this.networkConfig as StaticSharding,
-          );
-        shardId = staticShardingRoutingInfo?.shardId;
-      }
-
-      const encoder = this.waku.createEncoder({
-        contentTopic,
-        shardId,
-      });
-      log.info("Encoder:", encoder);
-      log.info("Pubsub topic:", pubsubTopic);
-      log.info("Encoder pubsub topic:", encoder.pubsubTopic);
-
-      if (pubsubTopic && pubsubTopic !== encoder.pubsubTopic) {
-        log.warn(
-          `Explicit pubsubTopic ${pubsubTopic} provided, but auto-sharding determined ${encoder.pubsubTopic}. Using auto-sharding.`,
-        );
-      }
-
-      let result;
-      if (this.lightpushNode) {
-        try {
-          const preferredPeerId = this.getPeerIdFromMultiaddr(
-            this.lightpushNode,
-          );
-          if (preferredPeerId) {
-            result = await this.send(lightPush, encoder, processedPayload);
-            log.info("✅ Message sent via preferred lightpush node");
-          } else {
-            throw new Error(
-              "Could not extract peer ID from preferred node address",
-            );
-          }
-        } catch (error) {
-          log.error(
-            "Couldn't send message via preferred lightpush node:",
-            error,
-          );
-          result = await this.send(lightPush, encoder, processedPayload);
-        }
-      } else {
-        result = await this.send(lightPush, encoder, processedPayload);
-      }
-
-      const serializableResult = makeSerializable(result);
-
-      return serializableResult;
-    } catch (error) {
-      log.error("Error sending message via v3 lightpush:", error);
-      throw new Error(
-        `Failed to send v3 message: ${error instanceof Error ? error.message : String(error)}`,
-      );
-    }
-  }
-
-  async waitForPeers(
-    timeoutMs: number = 10000,
-    protocols: Protocols[] = [Protocols.LightPush, Protocols.Filter],
-  ) {
-    if (!this.waku) {
-      throw new Error("Waku node not started");
-    }
-
-    const startTime = Date.now();
-
-    try {
-      await this.waku.waitForPeers(protocols, timeoutMs);
-      const elapsed = Date.now() - startTime;
-
-      const peers = this.waku.libp2p.getPeers();
-
-      return {
-        success: true,
-        peersFound: peers.length,
-        protocolsRequested: protocols,
-        timeElapsed: elapsed,
-      };
-    } catch (error) {
-      const elapsed = Date.now() - startTime;
-      log.error(`Failed to find peers after ${elapsed}ms:`, error);
-      throw error;
-    }
-  }
-
-  async createWakuNode(options: CreateNodeOptions) {
-    try {
-      if (this.waku) {
-        await this.waku.stop();
-      }
-    } catch (e) {
-      log.warn("ignore previous waku stop error");
-    }
-
-    let libp2pConfig: CreateLibp2pOptions = {
-      ...options.libp2p,
-      filterMultiaddrs: false,
-    };
-
-    if (this.enrBootstrap) {
-      const multiaddrs = await this.getBootstrapMultiaddrs();
-
-      if (multiaddrs.length > 0) {
-        libp2pConfig.peerDiscovery = [
-          bootstrap({ list: multiaddrs }),
-          ...(options.libp2p?.peerDiscovery || []),
-        ];
-      }
-    }
-
-    const createOptions = {
-      ...options,
-      networkConfig: this.networkConfig,
-      libp2p: libp2pConfig,
-    };
-
-    this.waku = await createLightNode(createOptions);
-    return { success: true };
-  }
-
-  async startNode() {
-    if (!this.waku) {
-      throw new Error("Waku node not created");
-    }
-    await this.waku.start();
-
-    if (this.lightpushNode) {
-      await this.dialPreferredLightpushNode();
-    }
-
-    return { success: true };
-  }
-
-  private async dialPreferredLightpushNode() {
-    if (!this.waku || !this.lightpushNode) {
-      log.info("Skipping dial: waku or lightpushNode not set");
-      return;
-    }
-
-    try {
-      log.info("Attempting to dial preferred lightpush node:", this.lightpushNode);
-      await this.waku.dial(this.lightpushNode);
-      log.info("Successfully dialed preferred lightpush node:", this.lightpushNode);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      log.error(
-        "Failed to dial preferred lightpush node:",
-        this.lightpushNode,
-        message
-      );
-    }
-  }
-
-  private getPeerIdFromMultiaddr(multiaddr: string): string | null {
-    const parts = multiaddr.split("/");
-    const p2pIndex = parts.indexOf("p2p");
-    return p2pIndex !== -1 && p2pIndex + 1 < parts.length
-      ? parts[p2pIndex + 1]
-      : null;
-  }
-
-  async stopNode() {
-    if (!this.waku) {
-      throw new Error("Waku node not created");
-    }
-    await this.waku.stop();
-    return { success: true };
-  }
-
-  getPeerInfo() {
-    if (!this.waku) {
-      throw new Error("Waku node not started");
-    }
-
-    const addrs = this.waku.libp2p.getMultiaddrs();
-    return {
-      peerId: this.waku.libp2p.peerId.toString(),
-      multiaddrs: addrs.map((a: Multiaddr) => a.toString()),
-      peers: [],
-    };
-  }
-}
-
-(() => {
-  try {
-    log.info("Initializing WakuHeadless...");
-
-    const testWindow = window as ITestBrowser;
-    const globalNetworkConfig = testWindow.__WAKU_NETWORK_CONFIG;
-    const globalLightpushNode = testWindow.__WAKU_LIGHTPUSH_NODE;
-    const globalEnrBootstrap = testWindow.__WAKU_ENR_BOOTSTRAP;
-
-    log.info("Global config from window:", {
-      networkConfig: globalNetworkConfig,
-      lightpushNode: globalLightpushNode,
-      enrBootstrap: globalEnrBootstrap
-    });
-
-    const instance = new WakuHeadless(
-      globalNetworkConfig,
-      globalLightpushNode,
-      globalEnrBootstrap,
-    );
-
-    testWindow.wakuApi = instance;
-    log.info("WakuHeadless initialized successfully:", !!testWindow.wakuApi);
-  } catch (error) {
-    log.error("Error initializing WakuHeadless:", error);
-    const testWindow = window as ITestBrowser;
-    // Create a stub wakuApi that will reject all method calls
-    testWindow.wakuApi = {
-      waku: null,
-      networkConfig: { clusterId: 0, numShardsInCluster: 0 },
-      lightpushNode: null,
-      enrBootstrap: null,
-      error,
-      createWakuNode: () => Promise.reject(new Error("WakuHeadless failed to initialize")),
-      startNode: () => Promise.reject(new Error("WakuHeadless failed to initialize")),
-      stopNode: () => Promise.reject(new Error("WakuHeadless failed to initialize")),
-      pushMessageV3: () => Promise.reject(new Error("WakuHeadless failed to initialize")),
-      waitForPeers: () => Promise.reject(new Error("WakuHeadless failed to initialize")),
-      getPeerInfo: () => { throw new Error("WakuHeadless failed to initialize"); },
-    } as unknown as WakuHeadless;
-  }
-})();

packages/core/CHANGELOG.md

@@ -5,98 +5,6 @@ All notable changes to this project will be documented in this file.
 The file is maintained by [Release Please](https://github.com/googleapis/release-please) based on [Conventional Commits](https://www.conventionalcommits.org) specification,
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.0.40](https://github.com/waku-org/js-waku/compare/core-v0.0.39...core-v0.0.40) (2025-10-31)
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * @waku/proto bumped from 0.0.14 to 0.0.15
-
-## [0.0.39](https://github.com/waku-org/js-waku/compare/core-v0.0.38...core-v0.0.39) (2025-09-20)
-
-
-### Features
-
-* Add start/stop to filter ([#2592](https://github.com/waku-org/js-waku/issues/2592)) ([2fba052](https://github.com/waku-org/js-waku/commit/2fba052b8b98cb64f6383de95d01b33beb771448))
-* Expose message hash from IDecodedMessage ([#2578](https://github.com/waku-org/js-waku/issues/2578)) ([836d6b8](https://github.com/waku-org/js-waku/commit/836d6b8793a5124747684f6ea76b6dd47c73048b))
-* Implement lp-v3 error codes with backwards compatibility ([#2501](https://github.com/waku-org/js-waku/issues/2501)) ([1625302](https://github.com/waku-org/js-waku/commit/16253026c6e30052d87d9975b58480951de469d8))
-* Implement peer-store re-bootstrapping ([#2641](https://github.com/waku-org/js-waku/issues/2641)) ([11d84ad](https://github.com/waku-org/js-waku/commit/11d84ad342fe45158ef0734f9ca070f14704503f))
-* StoreConnect events ([#2601](https://github.com/waku-org/js-waku/issues/2601)) ([0dfbcf6](https://github.com/waku-org/js-waku/commit/0dfbcf6b6bd9225dcb0dec540aeb1eb2703c8397))
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * @waku/enr bumped from ^0.0.32 to ^0.0.33
-    * @waku/interfaces bumped from 0.0.33 to 0.0.34
-    * @waku/proto bumped from 0.0.13 to 0.0.14
-    * @waku/utils bumped from 0.0.26 to 0.0.27
-
-## [0.0.38](https://github.com/waku-org/js-waku/compare/core-v0.0.37...core-v0.0.38) (2025-08-14)
-
-
-### ⚠ BREAKING CHANGES
-
-* local peer discovery improvements ([#2557](https://github.com/waku-org/js-waku/issues/2557))
-* Introduce routing info concept
-
-### Features
-
-* Introduce routing info concept ([3842d84](https://github.com/waku-org/js-waku/commit/3842d84b55eb96728f6b05b9307ff823fac58a54))
-* Local peer discovery improvements ([#2557](https://github.com/waku-org/js-waku/issues/2557)) ([eab8ce8](https://github.com/waku-org/js-waku/commit/eab8ce81b431b11d79dcbec31aea759319853336))
-* Peer exchange discovery improvements ([#2537](https://github.com/waku-org/js-waku/issues/2537)) ([95da57a](https://github.com/waku-org/js-waku/commit/95da57a8705fa195529ef52a6c908642da5e120c))
-
-
-### Bug Fixes
-
-* Improve error handling for stream manager ([#2546](https://github.com/waku-org/js-waku/issues/2546)) ([ada2657](https://github.com/waku-org/js-waku/commit/ada265731acfeddc2bfe2e8e963bc2be37f13900))
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * @waku/enr bumped from ^0.0.31 to ^0.0.32
-    * @waku/interfaces bumped from 0.0.32 to 0.0.33
-    * @waku/proto bumped from 0.0.12 to 0.0.13
-    * @waku/utils bumped from 0.0.25 to 0.0.26
-
-## [0.0.37](https://github.com/waku-org/js-waku/compare/core-v0.0.36...core-v0.0.37) (2025-07-18)
-
-
-### ⚠ BREAKING CHANGES
-
-* remove node level pubsub topic concept
-* unify events under one source ([#2473](https://github.com/waku-org/js-waku/issues/2473))
-* re-architect connection manager ([#2445](https://github.com/waku-org/js-waku/issues/2445))
-
-### Features
-
-* Add recovery and connection maintenance ([#2496](https://github.com/waku-org/js-waku/issues/2496)) ([ed389cc](https://github.com/waku-org/js-waku/commit/ed389ccbc970c8e41761c5c427d151bcf9f72725))
-* Don't dial peers that failed before, make dialer use dial queue ([#2478](https://github.com/waku-org/js-waku/issues/2478)) ([35acdf8](https://github.com/waku-org/js-waku/commit/35acdf8fa5a8f8d79b75cc0361302628178b5193))
-* Implement store query chunking ([#2511](https://github.com/waku-org/js-waku/issues/2511)) ([36f6884](https://github.com/waku-org/js-waku/commit/36f6884d220eab42d4ce25cc4b2cc12cf36e5468))
-* Make peer manager aware of codec and shard, fix retry manager and shut down subscriptions ([#2425](https://github.com/waku-org/js-waku/issues/2425)) ([058f2ff](https://github.com/waku-org/js-waku/commit/058f2ff620a4a9a6f465a1498c05fb85df369941))
-* Re-architect connection manager ([#2445](https://github.com/waku-org/js-waku/issues/2445)) ([c7682ea](https://github.com/waku-org/js-waku/commit/c7682ea67c54d2c26a68ce96208003fb1ffc915c))
-* Unify events under one source ([#2473](https://github.com/waku-org/js-waku/issues/2473)) ([27292ed](https://github.com/waku-org/js-waku/commit/27292edabce801a5d2296437ca3e6198da018a24))
-
-
-### Bug Fixes
-
-* Remove node level pubsub topic concept ([6d55af9](https://github.com/waku-org/js-waku/commit/6d55af947e8e57bf0d33fc6a5a67f61594e83ff1))
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * @waku/enr bumped from ^0.0.30 to ^0.0.31
-    * @waku/interfaces bumped from 0.0.31 to 0.0.32
-    * @waku/proto bumped from 0.0.11 to 0.0.12
-    * @waku/utils bumped from 0.0.24 to 0.0.25
-
 ## [0.0.36](https://github.com/waku-org/js-waku/compare/core-v0.0.35...core-v0.0.36) (2025-06-23)
 
 

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waku/core",
-  "version": "0.0.40",
+  "version": "0.0.36",
   "description": "TypeScript implementation of the Waku v2 protocol",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
@@ -28,7 +28,7 @@
   "homepage": "https://github.com/waku-org/js-waku/tree/master/packages/core#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/waku-org/js-waku.git"
+    "url": "https://github.com/waku-org/js-waku.git"
   },
   "bugs": {
     "url": "https://github.com/waku-org/js-waku/issues"
@@ -64,11 +64,11 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@waku/enr": "^0.0.33",
-    "@waku/interfaces": "0.0.34",
+    "@waku/enr": "^0.0.30",
+    "@waku/interfaces": "0.0.31",
     "@libp2p/ping": "2.0.35",
-    "@waku/proto": "0.0.15",
-    "@waku/utils": "0.0.27",
+    "@waku/proto": "0.0.11",
+    "@waku/utils": "0.0.24",
     "debug": "^4.3.4",
     "@noble/hashes": "^1.3.2",
     "it-all": "^3.0.4",

packages/core/src/index.ts

@@ -10,11 +10,7 @@ export * as waku_filter from "./lib/filter/index.js";
 export { FilterCore, FilterCodecs } from "./lib/filter/index.js";
 
 export * as waku_light_push from "./lib/light_push/index.js";
-export {
-  LightPushCore,
-  LightPushCodec,
-  LightPushCodecV2
-} from "./lib/light_push/index.js";
+export { LightPushCodec, LightPushCore } from "./lib/light_push/index.js";
 
 export * as waku_store from "./lib/store/index.js";
 export { StoreCore, StoreCodec } from "./lib/store/index.js";

packages/core/src/lib/connection_manager/connection_limiter.spec.ts

@@ -1,539 +0,0 @@
-import { type Connection, type Peer, type PeerId } from "@libp2p/interface";
-import { multiaddr } from "@multiformats/multiaddr";
-import {
-  CONNECTION_LOCKED_TAG,
-  IWakuEventEmitter,
-  Tags,
-  WakuEvent
-} from "@waku/interfaces";
-import { expect } from "chai";
-import sinon from "sinon";
-
-import { ConnectionLimiter } from "./connection_limiter.js";
-import { Dialer } from "./dialer.js";
-import { NetworkMonitor } from "./network_monitor.js";
-
-describe("ConnectionLimiter", () => {
-  let libp2p: any;
-  let events: IWakuEventEmitter;
-  let dialer: sinon.SinonStubbedInstance<Dialer>;
-  let networkMonitor: sinon.SinonStubbedInstance<NetworkMonitor>;
-  let connectionLimiter: ConnectionLimiter;
-  let mockPeerId: PeerId;
-
-  let mockConnection: Connection;
-
-  let mockPeer: Peer;
-  let mockPeer2: Peer;
-
-  const createMockPeerId = (id: string): PeerId =>
-    ({
-      toString: () => id,
-      equals: function (other: PeerId) {
-        return (
-          other &&
-          typeof other.toString === "function" &&
-          other.toString() === id
-        );
-      }
-    }) as PeerId;
-
-  const createMockPeer = (id: string, tags: string[] = []): Peer =>
-    ({
-      id: createMockPeerId(id),
-      tags: new Map(tags.map((tag) => [tag, { value: 0 }])),
-      addresses: [],
-      protocols: [],
-      metadata: new Map(),
-      toString: () => id
-    }) as unknown as Peer;
-
-  const createMockConnection = (
-    peerId: PeerId,
-    tags: string[] = []
-  ): Connection =>
-    ({
-      remotePeer: peerId,
-      tags: tags || []
-    }) as Connection;
-
-  const defaultOptions = {
-    maxConnections: 5,
-    maxBootstrapPeers: 2,
-    pingKeepAlive: 300,
-    relayKeepAlive: 300,
-    enableAutoRecovery: true,
-    maxDialingPeers: 3,
-    failedDialCooldown: 60,
-    dialCooldown: 10
-  };
-
-  function createLimiter(
-    opts: Partial<typeof defaultOptions> = {}
-  ): ConnectionLimiter {
-    return new ConnectionLimiter({
-      libp2p,
-      events,
-      dialer,
-      networkMonitor,
-      options: { ...defaultOptions, ...opts }
-    });
-  }
-
-  beforeEach(() => {
-    mockPeerId = createMockPeerId("12D3KooWTest1");
-
-    mockPeer = createMockPeer("12D3KooWTest1", [Tags.BOOTSTRAP]);
-    mockPeer2 = createMockPeer("12D3KooWTest2", [Tags.BOOTSTRAP]); // Ensure mockPeer2 is prioritized and dialed
-    mockConnection = createMockConnection(mockPeerId, [Tags.BOOTSTRAP]);
-
-    dialer = {
-      start: sinon.stub(),
-      stop: sinon.stub(),
-      dial: sinon.stub().resolves()
-    } as unknown as sinon.SinonStubbedInstance<Dialer>;
-
-    libp2p = {
-      addEventListener: sinon.stub(),
-      removeEventListener: sinon.stub(),
-      dial: sinon.stub().resolves(),
-      hangUp: sinon.stub().resolves(),
-      getConnections: sinon.stub().returns([]),
-      peerStore: {
-        all: sinon.stub().resolves([]),
-        get: sinon.stub().resolves(mockPeer),
-        merge: sinon.stub().resolves()
-      },
-      components: {
-        components: {}
-      }
-    };
-
-    events = {
-      addEventListener: sinon.stub(),
-      removeEventListener: sinon.stub(),
-      dispatchEvent: sinon.stub()
-    } as any;
-
-    networkMonitor = {
-      start: sinon.stub(),
-      stop: sinon.stub(),
-      isBrowserConnected: sinon.stub().returns(true),
-      isConnected: sinon.stub().returns(true),
-      isP2PConnected: sinon.stub().returns(true)
-    } as unknown as sinon.SinonStubbedInstance<NetworkMonitor>;
-
-    // Mock the libp2p components needed by isAddressesSupported
-    libp2p.components = {
-      components: {},
-      transportManager: {
-        getTransports: sinon.stub().returns([
-          {
-            dialFilter: sinon
-              .stub()
-              .returns([multiaddr("/dns4/test/tcp/443/wss")])
-          }
-        ])
-      }
-    };
-  });
-
-  afterEach(() => {
-    if (connectionLimiter) {
-      connectionLimiter.stop();
-    }
-    sinon.restore();
-  });
-
-  describe("start", () => {
-    beforeEach(() => {
-      connectionLimiter = createLimiter();
-    });
-
-    it("should dial peers from store on start", async () => {
-      const dialPeersStub = sinon.stub(
-        connectionLimiter as any,
-        "dialPeersFromStore"
-      );
-
-      connectionLimiter.start();
-
-      expect(dialPeersStub.calledOnce).to.be.true;
-    });
-
-    it("should add event listeners for waku:connection and peer:disconnect", () => {
-      connectionLimiter.start();
-
-      expect((events.addEventListener as sinon.SinonStub).calledOnce).to.be
-        .true;
-      expect(
-        (events.addEventListener as sinon.SinonStub).calledWith(
-          WakuEvent.Connection,
-          sinon.match.func
-        )
-      ).to.be.true;
-
-      expect(libp2p.addEventListener.calledOnce).to.be.true;
-      expect(
-        libp2p.addEventListener.calledWith("peer:disconnect", sinon.match.func)
-      ).to.be.true;
-    });
-
-    it("should be safe to call multiple times", () => {
-      connectionLimiter.start();
-      connectionLimiter.start();
-
-      expect((events.addEventListener as sinon.SinonStub).callCount).to.equal(
-        2
-      );
-      expect(libp2p.addEventListener.callCount).to.equal(2);
-    });
-  });
-
-  describe("stop", () => {
-    beforeEach(() => {
-      connectionLimiter = createLimiter();
-      connectionLimiter.start();
-    });
-
-    it("should remove event listeners", () => {
-      connectionLimiter.stop();
-
-      expect((events.removeEventListener as sinon.SinonStub).calledOnce).to.be
-        .true;
-      expect(
-        (events.removeEventListener as sinon.SinonStub).calledWith(
-          WakuEvent.Connection,
-          sinon.match.func
-        )
-      ).to.be.true;
-
-      expect(libp2p.removeEventListener.calledOnce).to.be.true;
-      expect(
-        libp2p.removeEventListener.calledWith(
-          "peer:disconnect",
-          sinon.match.func
-        )
-      ).to.be.true;
-    });
-
-    it("should be safe to call multiple times", () => {
-      connectionLimiter.stop();
-      connectionLimiter.stop();
-
-      expect(
-        (events.removeEventListener as sinon.SinonStub).callCount
-      ).to.equal(2);
-      expect(libp2p.removeEventListener.callCount).to.equal(2);
-    });
-  });
-
-  describe("onWakuConnectionEvent", () => {
-    let eventHandler: () => void;
-
-    beforeEach(() => {
-      connectionLimiter = createLimiter();
-      connectionLimiter.start();
-
-      const addEventListenerStub = events.addEventListener as sinon.SinonStub;
-      eventHandler = addEventListenerStub.getCall(0).args[1];
-    });
-
-    it("should dial peers from store when browser is connected", () => {
-      const dialPeersStub = sinon.stub(
-        connectionLimiter as any,
-        "dialPeersFromStore"
-      );
-      networkMonitor.isBrowserConnected.returns(true);
-
-      eventHandler();
-
-      expect(dialPeersStub.calledOnce).to.be.true;
-    });
-
-    it("should not dial peers from store when browser is not connected", () => {
-      const dialPeersStub = sinon.stub(
-        connectionLimiter as any,
-        "dialPeersFromStore"
-      );
-      networkMonitor.isBrowserConnected.returns(false);
-
-      eventHandler();
-
-      expect(dialPeersStub.called).to.be.false;
-    });
-  });
-
-  describe("onDisconnectedEvent", () => {
-    let eventHandler: () => Promise<void>;
-
-    beforeEach(() => {
-      connectionLimiter = createLimiter();
-      connectionLimiter.start();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      eventHandler = addEventListenerStub.getCall(0).args[1];
-    });
-
-    it("should dial peers from store when no connections remain", async () => {
-      libp2p.getConnections.returns([]);
-      const dialPeersStub = sinon.stub(
-        connectionLimiter as any,
-        "dialPeersFromStore"
-      );
-      await eventHandler();
-      expect(dialPeersStub.calledOnce).to.be.true;
-    });
-
-    it("should do nothing when connections still exist", async () => {
-      libp2p.getConnections.returns([mockConnection]);
-      const dialPeersStub = sinon.stub(
-        connectionLimiter as any,
-        "dialPeersFromStore"
-      );
-      await eventHandler();
-      expect(dialPeersStub.called).to.be.false;
-    });
-  });
-
-  describe("dialPeersFromStore", () => {
-    beforeEach(() => {
-      libp2p.hangUp = sinon.stub().resolves();
-      connectionLimiter = createLimiter();
-      mockPeer.addresses = [
-        {
-          multiaddr: multiaddr("/dns4/mockpeer/tcp/443/wss"),
-          isCertified: false
-        }
-      ];
-      mockPeer2.addresses = [
-        {
-          multiaddr: multiaddr("/dns4/mockpeer2/tcp/443/wss"),
-          isCertified: false
-        }
-      ];
-    });
-
-    it("should get all peers from store", async () => {
-      libp2p.peerStore.all.resolves([mockPeer, mockPeer2]);
-      libp2p.getConnections.returns([]);
-      await (connectionLimiter as any).dialPeersFromStore();
-      expect(libp2p.peerStore.all.calledOnce).to.be.true;
-    });
-
-    it("should filter out already connected peers", async () => {
-      dialer.dial.resetHistory();
-      libp2p.hangUp.resetHistory();
-      libp2p.peerStore.all.resolves([mockPeer, mockPeer2]);
-      libp2p.getConnections.returns([createMockConnection(mockPeer.id, [])]);
-      await (connectionLimiter as any).dialPeersFromStore();
-      expect(dialer.dial.calledOnce).to.be.true;
-      expect(dialer.dial.calledWith(mockPeer2.id)).to.be.true;
-      expect(dialer.dial.calledWith(mockPeer.id)).to.be.false;
-    });
-
-    it("should dial all remaining peers", async () => {
-      dialer.dial.resetHistory();
-      libp2p.hangUp.resetHistory();
-      libp2p.peerStore.all.resolves([mockPeer, mockPeer2]);
-      libp2p.getConnections.returns([]);
-      await (connectionLimiter as any).dialPeersFromStore();
-      expect(dialer.dial.callCount).to.equal(2);
-      expect(dialer.dial.calledWith(mockPeer.id)).to.be.true;
-      expect(dialer.dial.calledWith(mockPeer2.id)).to.be.true;
-    });
-
-    it("should handle dial errors gracefully", async () => {
-      libp2p.peerStore.all.resolves([mockPeer]);
-      libp2p.getConnections.returns([]);
-      dialer.dial.rejects(new Error("Dial failed"));
-      await (connectionLimiter as any).dialPeersFromStore();
-      expect(dialer.dial.calledOnce).to.be.true;
-    });
-
-    it("should handle case with no peers in store", async () => {
-      libp2p.peerStore.all.resolves([]);
-      libp2p.getConnections.returns([]);
-      await (connectionLimiter as any).dialPeersFromStore();
-      expect(dialer.dial.called).to.be.false;
-    });
-
-    it("should handle case with all peers already connected", async () => {
-      libp2p.peerStore.all.resolves([mockPeer]);
-      libp2p.getConnections.returns([createMockConnection(mockPeer.id)]);
-      await (connectionLimiter as any).dialPeersFromStore();
-      expect(dialer.dial.called).to.be.false;
-    });
-  });
-
-  describe("getPeer", () => {
-    beforeEach(() => {
-      connectionLimiter = createLimiter();
-    });
-
-    it("should return peer for existing peer", async () => {
-      const peer = await (connectionLimiter as any).getPeer(mockPeerId);
-
-      expect(libp2p.peerStore.get.calledWith(mockPeerId)).to.be.true;
-      expect(peer).to.equal(mockPeer);
-    });
-
-    it("should return null for non-existent peer", async () => {
-      libp2p.peerStore.get.rejects(new Error("Peer not found"));
-
-      const peer = await (connectionLimiter as any).getPeer(mockPeerId);
-
-      expect(peer).to.be.null;
-    });
-
-    it("should handle peer store errors gracefully", async () => {
-      libp2p.peerStore.get.rejects(new Error("Database error"));
-
-      const peer = await (connectionLimiter as any).getPeer(mockPeerId);
-
-      expect(peer).to.be.null;
-    });
-  });
-
-  describe("autoRecovery flag", () => {
-    it("should not dial on waku:connection if enableAutoRecovery is false, but should dial on start", () => {
-      connectionLimiter = createLimiter({ enableAutoRecovery: false });
-      const dialPeersStub = sinon.stub(
-        connectionLimiter as any,
-        "dialPeersFromStore"
-      );
-      connectionLimiter.start();
-      expect(connectionLimiter["connectionMonitorInterval"]).to.be.null;
-      connectionLimiter["onWakuConnectionEvent"]();
-      expect(dialPeersStub.calledOnce).to.be.true;
-    });
-
-    it("should start connection monitor interval and dial on waku:connection if enableAutoRecovery is true", () => {
-      connectionLimiter = createLimiter({ enableAutoRecovery: true });
-      const dialPeersStub = sinon.stub(
-        connectionLimiter as any,
-        "dialPeersFromStore"
-      );
-      connectionLimiter.start();
-      expect(connectionLimiter["connectionMonitorInterval"]).to.not.be.null;
-      connectionLimiter["onWakuConnectionEvent"]();
-      expect(dialPeersStub.calledTwice).to.be.true;
-    });
-  });
-
-  describe("maintainConnectionsCount", () => {
-    beforeEach(() => {
-      libp2p.hangUp = sinon.stub().resolves();
-      connectionLimiter = createLimiter({ maxConnections: 2 });
-      mockPeer.addresses = [
-        {
-          multiaddr: multiaddr("/dns4/mockpeer/tcp/443/wss"),
-          isCertified: false
-        }
-      ];
-      mockPeer2.addresses = [
-        {
-          multiaddr: multiaddr("/dns4/mockpeer2/tcp/443/wss"),
-          isCertified: false
-        }
-      ];
-    });
-
-    it("should dial more peers if under maxConnections", async () => {
-      libp2p.getConnections.returns([]);
-      sinon
-        .stub(connectionLimiter as any, "getPrioritizedPeers")
-        .resolves([mockPeer, mockPeer2]);
-      await (connectionLimiter as any).maintainConnectionsCount();
-      expect(dialer.dial.calledTwice).to.be.true;
-    });
-
-    it("should drop only non-locked connections when over maxConnections", async () => {
-      dialer.dial.resetHistory();
-      libp2p.hangUp.resetHistory();
-      const lockedConn = createMockConnection(mockPeerId, [
-        CONNECTION_LOCKED_TAG
-      ]);
-      const normalConn1 = createMockConnection(createMockPeerId("p2"), []);
-      const normalConn2 = createMockConnection(createMockPeerId("p3"), []);
-      const normalConn3 = createMockConnection(createMockPeerId("p4"), []);
-      const connections = [lockedConn, normalConn1, normalConn2, normalConn3];
-      libp2p.getConnections.returns(connections);
-      sinon.stub(connectionLimiter as any, "getPrioritizedPeers").resolves([]);
-      await (connectionLimiter as any).maintainConnectionsCount();
-
-      expect(libp2p.hangUp.callCount).to.equal(1);
-      expect(libp2p.hangUp.calledWith(normalConn3.remotePeer)).to.be.true;
-      expect(libp2p.hangUp.calledWith(normalConn1.remotePeer)).to.be.false;
-      expect(libp2p.hangUp.calledWith(normalConn2.remotePeer)).to.be.false;
-      expect(libp2p.hangUp.calledWith(lockedConn.remotePeer)).to.be.false;
-    });
-
-    it("should do nothing if no non-locked connections to drop", async () => {
-      const lockedConn1 = createMockConnection(createMockPeerId("p1"), [
-        CONNECTION_LOCKED_TAG
-      ]);
-      const lockedConn2 = createMockConnection(createMockPeerId("p2"), [
-        CONNECTION_LOCKED_TAG
-      ]);
-      libp2p.getConnections.returns([lockedConn1, lockedConn2]);
-      sinon.stub(connectionLimiter as any, "getPrioritizedPeers").resolves([]);
-      await (connectionLimiter as any).maintainConnectionsCount();
-      expect(libp2p.hangUp.called).to.be.false;
-    });
-  });
-
-  describe("maintainBootstrapConnections", () => {
-    beforeEach(() => {
-      connectionLimiter = createLimiter({ maxBootstrapPeers: 2 });
-    });
-
-    it("should do nothing if at or below maxBootstrapPeers", async () => {
-      sinon
-        .stub(connectionLimiter as any, "getBootstrapPeers")
-        .resolves([mockPeer, mockPeer2]);
-      await (connectionLimiter as any).maintainBootstrapConnections();
-      expect(libp2p.hangUp.called).to.be.false;
-    });
-
-    it("should drop excess bootstrap peers if over maxBootstrapPeers", async () => {
-      const p1 = createMockPeer("p1", [Tags.BOOTSTRAP]);
-      const p2 = createMockPeer("p2", [Tags.BOOTSTRAP]);
-      const p3 = createMockPeer("p3", [Tags.BOOTSTRAP]);
-      sinon
-        .stub(connectionLimiter as any, "getBootstrapPeers")
-        .resolves([p1, p2, p3]);
-      await (connectionLimiter as any).maintainBootstrapConnections();
-      expect(libp2p.hangUp.calledOnce).to.be.true;
-      expect(libp2p.hangUp.calledWith(p3.id)).to.be.true;
-    });
-  });
-
-  describe("dialPeersFromStore prioritization", () => {
-    beforeEach(() => {
-      connectionLimiter = createLimiter();
-    });
-
-    it("should prioritize bootstrap, then peer exchange, then local peers", async () => {
-      const bootstrapPeer = createMockPeer("b", [Tags.BOOTSTRAP]);
-      bootstrapPeer.addresses = [
-        { multiaddr: multiaddr("/dns4/b/tcp/443/wss"), isCertified: false }
-      ];
-      const pxPeer = createMockPeer("px", [Tags.PEER_EXCHANGE]);
-      pxPeer.addresses = [
-        { multiaddr: multiaddr("/dns4/px/tcp/443/wss"), isCertified: false }
-      ];
-      const localPeer = createMockPeer("l", [Tags.PEER_CACHE]);
-      localPeer.addresses = [
-        { multiaddr: multiaddr("/dns4/l/tcp/443/wss"), isCertified: false }
-      ];
-      libp2p.peerStore.all.resolves([bootstrapPeer, pxPeer, localPeer]);
-      libp2p.getConnections.returns([]);
-      connectionLimiter = createLimiter();
-      const peers = await (connectionLimiter as any).getPrioritizedPeers();
-      expect(peers[0].id.toString()).to.equal("b");
-      expect(peers[1].id.toString()).to.equal("px");
-      expect(peers[2].id.toString()).to.equal("l");
-    });
-  });
-});

packages/core/src/lib/connection_manager/connection_limiter.ts

@@ -1,349 +0,0 @@
-import { Peer, PeerId } from "@libp2p/interface";
-import {
-  CONNECTION_LOCKED_TAG,
-  ConnectionManagerOptions,
-  IWakuEventEmitter,
-  Libp2p,
-  Libp2pEventHandler,
-  Tags,
-  WakuEvent
-} from "@waku/interfaces";
-import { Logger } from "@waku/utils";
-
-import { Dialer } from "./dialer.js";
-import { NetworkMonitor } from "./network_monitor.js";
-import { isAddressesSupported } from "./utils.js";
-
-const log = new Logger("connection-limiter");
-
-const DEFAULT_CONNECTION_MONITOR_INTERVAL = 5 * 1_000;
-
-type ConnectionLimiterConstructorOptions = {
-  libp2p: Libp2p;
-  events: IWakuEventEmitter;
-  dialer: Dialer;
-  networkMonitor: NetworkMonitor;
-  options: ConnectionManagerOptions;
-};
-
-interface IConnectionLimiter {
-  start(): void;
-  stop(): void;
-}
-
-/**
- * This class is responsible for limiting the number of connections to peers.
- * It also dials all known peers because libp2p might have emitted `peer:discovery` before initialization
- * and listen to `peer:connect` and `peer:disconnect` events to manage connections.
- */
-export class ConnectionLimiter implements IConnectionLimiter {
-  private readonly libp2p: Libp2p;
-  private readonly events: IWakuEventEmitter;
-  private readonly networkMonitor: NetworkMonitor;
-  private readonly dialer: Dialer;
-
-  private connectionMonitorInterval: NodeJS.Timeout | null = null;
-  private readonly options: ConnectionManagerOptions;
-
-  public constructor(options: ConnectionLimiterConstructorOptions) {
-    this.libp2p = options.libp2p;
-    this.events = options.events;
-    this.networkMonitor = options.networkMonitor;
-    this.dialer = options.dialer;
-
-    this.options = options.options;
-
-    this.onWakuConnectionEvent = this.onWakuConnectionEvent.bind(this);
-    this.onDisconnectedEvent = this.onDisconnectedEvent.bind(this);
-  }
-
-  public start(): void {
-    // dial all known peers because libp2p might have emitted `peer:discovery` before initialization
-    void this.dialPeersFromStore();
-
-    if (
-      this.options.enableAutoRecovery &&
-      this.connectionMonitorInterval === null
-    ) {
-      this.connectionMonitorInterval = setInterval(
-        () => void this.maintainConnections(),
-        DEFAULT_CONNECTION_MONITOR_INTERVAL
-      );
-    }
-
-    this.events.addEventListener(
-      WakuEvent.Connection,
-      this.onWakuConnectionEvent
-    );
-
-    /**
-     * NOTE: Event is not being emitted on closing nor losing a connection.
-     * @see https://github.com/libp2p/js-libp2p/issues/939
-     * @see https://github.com/status-im/js-waku/issues/252
-     *
-     * >This event will be triggered anytime we are disconnected from another peer,
-     * >regardless of the circumstances of that disconnection.
-     * >If we happen to have multiple connections to a peer,
-     * >this event will **only** be triggered when the last connection is closed.
-     * @see https://github.com/libp2p/js-libp2p/blob/bad9e8c0ff58d60a78314077720c82ae331cc55b/doc/API.md?plain=1#L2100
-     */
-    this.libp2p.addEventListener(
-      "peer:disconnect",
-      this.onDisconnectedEvent as Libp2pEventHandler<PeerId>
-    );
-  }
-
-  public stop(): void {
-    this.events.removeEventListener(
-      WakuEvent.Connection,
-      this.onWakuConnectionEvent
-    );
-
-    this.libp2p.removeEventListener(
-      "peer:disconnect",
-      this.onDisconnectedEvent as Libp2pEventHandler<PeerId>
-    );
-
-    if (this.connectionMonitorInterval) {
-      clearInterval(this.connectionMonitorInterval);
-      this.connectionMonitorInterval = null;
-    }
-  }
-
-  private onWakuConnectionEvent(): void {
-    if (!this.options.enableAutoRecovery) {
-      log.info(`Auto recovery is disabled, skipping`);
-      return;
-    }
-
-    if (this.networkMonitor.isBrowserConnected()) {
-      void this.dialPeersFromStore();
-    }
-  }
-
-  private async maintainConnections(): Promise<void> {
-    await this.maintainConnectionsCount();
-    await this.maintainBootstrapConnections();
-  }
-
-  private async onDisconnectedEvent(): Promise<void> {
-    if (this.libp2p.getConnections().length === 0) {
-      log.info(`No connections, dialing peers from store`);
-      await this.dialPeersFromStore();
-    }
-  }
-
-  private async maintainConnectionsCount(): Promise<void> {
-    log.info(`Maintaining connections count`);
-
-    const connections = this.libp2p.getConnections();
-
-    if (connections.length <= this.options.maxConnections) {
-      log.info(
-        `Node has less than max connections ${this.options.maxConnections}, trying to dial more peers`
-      );
-
-      const peers = await this.getPrioritizedPeers();
-
-      if (peers.length === 0) {
-        log.info(`No peers to dial, skipping`);
-        await this.triggerBootstrap();
-        return;
-      }
-
-      const promises = peers
-        .slice(0, this.options.maxConnections - connections.length)
-        .map((p) => this.dialer.dial(p.id));
-
-      await Promise.all(promises);
-
-      return;
-    }
-
-    log.info(
-      `Node has more than max connections ${this.options.maxConnections}, dropping connections`
-    );
-
-    try {
-      const connectionsToDrop = connections
-        .filter((c) => !c.tags.includes(CONNECTION_LOCKED_TAG))
-        .slice(this.options.maxConnections);
-
-      if (connectionsToDrop.length === 0) {
-        log.info(`No connections to drop, skipping`);
-        return;
-      }
-
-      const promises = connectionsToDrop.map((c) =>
-        this.libp2p.hangUp(c.remotePeer)
-      );
-      await Promise.all(promises);
-
-      log.info(`Dropped ${connectionsToDrop.length} connections`);
-    } catch (error) {
-      log.error(`Unexpected error while maintaining connections`, error);
-    }
-  }
-
-  private async maintainBootstrapConnections(): Promise<void> {
-    log.info(`Maintaining bootstrap connections`);
-
-    const bootstrapPeers = await this.getBootstrapPeers();
-
-    if (bootstrapPeers.length <= this.options.maxBootstrapPeers) {
-      return;
-    }
-
-    try {
-      const peersToDrop = bootstrapPeers.slice(this.options.maxBootstrapPeers);
-
-      log.info(
-        `Dropping ${peersToDrop.length} bootstrap connections because node has more than max bootstrap connections ${this.options.maxBootstrapPeers}`
-      );
-
-      const promises = peersToDrop.map((p) => this.libp2p.hangUp(p.id));
-      await Promise.all(promises);
-
-      log.info(`Dropped ${peersToDrop.length} bootstrap connections`);
-    } catch (error) {
-      log.error(
-        `Unexpected error while maintaining bootstrap connections`,
-        error
-      );
-    }
-  }
-
-  private async dialPeersFromStore(): Promise<void> {
-    log.info(`Dialing peers from store`);
-
-    try {
-      const peers = await this.getPrioritizedPeers();
-
-      if (peers.length === 0) {
-        log.info(`No peers to dial, skipping`);
-        await this.triggerBootstrap();
-        return;
-      }
-
-      const promises = peers.map((p) => this.dialer.dial(p.id));
-
-      log.info(`Dialing ${peers.length} peers from store`);
-      await Promise.all(promises);
-      log.info(`Dialed ${promises.length} peers from store`);
-    } catch (error) {
-      log.error(`Unexpected error while dialing peer store peers`, error);
-    }
-  }
-
-  /**
-   * Returns a list of peers ordered by priority:
-   * - bootstrap peers
-   * - peers from peer exchange
-   * - peers from peer cache (last because we are not sure that locally stored information is up to date)
-   */
-  private async getPrioritizedPeers(): Promise<Peer[]> {
-    const allPeers = await this.libp2p.peerStore.all();
-    const allConnections = this.libp2p.getConnections();
-    const allConnectionsSet = new Set(
-      allConnections.map((c) => c.remotePeer.toString())
-    );
-
-    log.info(
-      `Found ${allPeers.length} peers in store, and found ${allConnections.length} connections`
-    );
-
-    const notConnectedPeers = allPeers.filter(
-      (p) =>
-        !allConnectionsSet.has(p.id.toString()) &&
-        isAddressesSupported(
-          this.libp2p,
-          p.addresses.map((a) => a.multiaddr)
-        )
-    );
-
-    const bootstrapPeers = notConnectedPeers.filter((p) =>
-      p.tags.has(Tags.BOOTSTRAP)
-    );
-
-    const peerExchangePeers = notConnectedPeers.filter((p) =>
-      p.tags.has(Tags.PEER_EXCHANGE)
-    );
-
-    const localStorePeers = notConnectedPeers.filter((p) =>
-      p.tags.has(Tags.PEER_CACHE)
-    );
-
-    const restPeers = notConnectedPeers.filter(
-      (p) =>
-        !p.tags.has(Tags.BOOTSTRAP) &&
-        !p.tags.has(Tags.PEER_EXCHANGE) &&
-        !p.tags.has(Tags.PEER_CACHE)
-    );
-
-    return [
-      ...bootstrapPeers,
-      ...peerExchangePeers,
-      ...localStorePeers,
-      ...restPeers
-    ];
-  }
-
-  private async getBootstrapPeers(): Promise<Peer[]> {
-    const peers = await Promise.all(
-      this.libp2p
-        .getConnections()
-        .map((conn) => conn.remotePeer)
-        .map((id) => this.getPeer(id))
-    );
-
-    return peers.filter(
-      (peer) => peer && peer.tags.has(Tags.BOOTSTRAP)
-    ) as Peer[];
-  }
-
-  private async getPeer(peerId: PeerId): Promise<Peer | null> {
-    try {
-      return await this.libp2p.peerStore.get(peerId);
-    } catch (error) {
-      log.error(`Failed to get peer ${peerId}, error: ${error}`);
-      return null;
-    }
-  }
-
-  /**
-   * Triggers the bootstrap or peer cache discovery if they are mounted.
-   * @returns void
-   */
-  private async triggerBootstrap(): Promise<void> {
-    log.info("Triggering bootstrap discovery");
-
-    const bootstrapComponents = Object.values(this.libp2p.components.components)
-      .filter((c) => !!c)
-      .filter((c: unknown) =>
-        [`@waku/${Tags.BOOTSTRAP}`, `@waku/${Tags.PEER_CACHE}`].includes(
-          (c as { [Symbol.toStringTag]: string })?.[Symbol.toStringTag]
-        )
-      );
-
-    if (bootstrapComponents.length === 0) {
-      log.warn("No bootstrap components found to trigger");
-      return;
-    }
-
-    log.info(
-      `Found ${bootstrapComponents.length} bootstrap components, starting them`
-    );
-
-    const promises = bootstrapComponents.map(async (component) => {
-      try {
-        await (component as { stop: () => Promise<void> })?.stop?.();
-        await (component as { start: () => Promise<void> })?.start?.();
-        log.info("Successfully started bootstrap component");
-      } catch (error) {
-        log.error("Failed to start bootstrap component", error);
-      }
-    });
-
-    await Promise.all(promises);
-  }
-}

packages/core/src/lib/connection_manager/connection_manager.spec.ts

@@ -1,587 +0,0 @@
-import { type Peer, type PeerId, type Stream } from "@libp2p/interface";
-import { peerIdFromString } from "@libp2p/peer-id";
-import { multiaddr, MultiaddrInput } from "@multiformats/multiaddr";
-import {
-  IWakuEventEmitter,
-  Libp2p,
-  NetworkConfig,
-  PubsubTopic
-} from "@waku/interfaces";
-import { expect } from "chai";
-import sinon from "sinon";
-
-import { ConnectionLimiter } from "./connection_limiter.js";
-import { ConnectionManager } from "./connection_manager.js";
-import { DiscoveryDialer } from "./discovery_dialer.js";
-import { KeepAliveManager } from "./keep_alive_manager.js";
-import { NetworkMonitor } from "./network_monitor.js";
-import { IShardReader, ShardReader } from "./shard_reader.js";
-
-describe("ConnectionManager", () => {
-  let libp2p: Libp2p;
-  let events: IWakuEventEmitter;
-  let networkConfig: NetworkConfig;
-  let pubsubTopics: PubsubTopic[];
-  let relay: any;
-  let connectionManager: ConnectionManager;
-  let mockPeerId: PeerId;
-  let mockMultiaddr: MultiaddrInput;
-  let mockStream: Stream;
-  // Mock internal components
-  let mockKeepAliveManager: sinon.SinonStubbedInstance<KeepAliveManager>;
-  let mockDiscoveryDialer: sinon.SinonStubbedInstance<DiscoveryDialer>;
-  let mockShardReader: sinon.SinonStubbedInstance<IShardReader>;
-  let mockNetworkMonitor: sinon.SinonStubbedInstance<NetworkMonitor>;
-  let mockConnectionLimiter: sinon.SinonStubbedInstance<ConnectionLimiter>;
-
-  const createMockPeer = (
-    id: string,
-    protocols: string[] = [],
-    ping = 100
-  ): Peer =>
-    ({
-      id: peerIdFromString(id),
-      protocols,
-      metadata: new Map([["ping", new TextEncoder().encode(ping.toString())]]),
-      toString: () => id
-    }) as Peer;
-
-  beforeEach(() => {
-    // Create mock dependencies
-    libp2p = {
-      dialProtocol: sinon.stub().resolves({} as Stream),
-      hangUp: sinon.stub().resolves(),
-      getPeers: sinon.stub().returns([]),
-      getConnections: sinon.stub().returns([]),
-      addEventListener: sinon.stub(),
-      removeEventListener: sinon.stub(),
-      components: {
-        components: {}
-      },
-      peerStore: {
-        get: sinon.stub().resolves(null),
-        merge: sinon.stub().resolves()
-      }
-    } as unknown as Libp2p;
-
-    events = {
-      dispatchEvent: sinon.stub()
-    } as unknown as IWakuEventEmitter;
-
-    networkConfig = {
-      clusterId: 2,
-      shards: [0, 1]
-    } as NetworkConfig;
-
-    pubsubTopics = ["/waku/2/rs/1/0", "/waku/2/rs/1/1"];
-
-    relay = {
-      pubsubTopics,
-      getMeshPeers: sinon.stub().returns([])
-    };
-
-    // Create mock internal components
-    mockKeepAliveManager = {
-      start: sinon.stub(),
-      stop: sinon.stub()
-    } as unknown as sinon.SinonStubbedInstance<KeepAliveManager>;
-
-    mockDiscoveryDialer = {
-      start: sinon.stub(),
-      stop: sinon.stub()
-    } as unknown as sinon.SinonStubbedInstance<DiscoveryDialer>;
-
-    mockShardReader = {
-      isPeerOnTopic: sinon.stub().resolves(true)
-    } as unknown as sinon.SinonStubbedInstance<IShardReader>;
-
-    mockNetworkMonitor = {
-      start: sinon.stub(),
-      stop: sinon.stub(),
-      isConnected: sinon.stub().returns(true)
-    } as unknown as sinon.SinonStubbedInstance<NetworkMonitor>;
-
-    mockConnectionLimiter = {
-      start: sinon.stub(),
-      stop: sinon.stub()
-    } as unknown as sinon.SinonStubbedInstance<ConnectionLimiter>;
-
-    // Create test data
-    mockPeerId = peerIdFromString(
-      "12D3KooWPjceQuRaNMhcrLF6BaW69PdCXB95h6TBpFf9nAmcL8hE"
-    );
-    mockMultiaddr = multiaddr(
-      "/ip4/127.0.0.1/tcp/60000/p2p/12D3KooWPjceQuRaNMhcrLF6BaW69PdCXB95h6TBpFf9nAmcL8hE"
-    );
-    mockStream = {} as Stream;
-
-    // Mock the internal component prototype methods
-    sinon
-      .stub(KeepAliveManager.prototype, "start")
-      .callsFake(() => mockKeepAliveManager.start());
-    sinon
-      .stub(KeepAliveManager.prototype, "stop")
-      .callsFake(() => mockKeepAliveManager.stop());
-
-    sinon
-      .stub(DiscoveryDialer.prototype, "start")
-      .callsFake(() => mockDiscoveryDialer.start());
-    sinon
-      .stub(DiscoveryDialer.prototype, "stop")
-      .callsFake(() => mockDiscoveryDialer.stop());
-
-    sinon
-      .stub(ShardReader.prototype, "isPeerOnTopic")
-      .callsFake((peerId: PeerId, topic: string) =>
-        mockShardReader.isPeerOnTopic(peerId, topic)
-      );
-
-    sinon
-      .stub(NetworkMonitor.prototype, "start")
-      .callsFake(() => mockNetworkMonitor.start());
-    sinon
-      .stub(NetworkMonitor.prototype, "stop")
-      .callsFake(() => mockNetworkMonitor.stop());
-    sinon
-      .stub(NetworkMonitor.prototype, "isConnected")
-      .callsFake(() => mockNetworkMonitor.isConnected());
-
-    sinon
-      .stub(ConnectionLimiter.prototype, "start")
-      .callsFake(() => mockConnectionLimiter.start());
-    sinon
-      .stub(ConnectionLimiter.prototype, "stop")
-      .callsFake(() => mockConnectionLimiter.stop());
-  });
-
-  afterEach(() => {
-    sinon.restore();
-  });
-
-  describe("constructor", () => {
-    it("should create ConnectionManager with required options", () => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig
-      });
-
-      expect(connectionManager).to.be.instanceOf(ConnectionManager);
-    });
-
-    it("should create ConnectionManager with relay", () => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig,
-        relay
-      });
-
-      expect(connectionManager).to.be.instanceOf(ConnectionManager);
-    });
-
-    it("should set default options when no config provided", () => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig
-      });
-
-      expect(connectionManager).to.be.instanceOf(ConnectionManager);
-      // Default options are set internally and tested through behavior
-    });
-
-    it("should merge provided config with defaults", () => {
-      const customConfig = {
-        maxBootstrapPeers: 5,
-        pingKeepAlive: 120
-      };
-
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig,
-        config: customConfig
-      });
-
-      expect(connectionManager).to.be.instanceOf(ConnectionManager);
-    });
-
-    it("should create all internal components", () => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig,
-        relay
-      });
-
-      expect(connectionManager).to.be.instanceOf(ConnectionManager);
-      // Internal components are created and tested through their behavior
-    });
-  });
-
-  describe("start", () => {
-    beforeEach(() => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig,
-        relay
-      });
-    });
-
-    it("should start all internal components", () => {
-      connectionManager.start();
-
-      expect(mockNetworkMonitor.start.calledOnce).to.be.true;
-      expect(mockDiscoveryDialer.start.calledOnce).to.be.true;
-      expect(mockKeepAliveManager.start.calledOnce).to.be.true;
-      expect(mockConnectionLimiter.start.calledOnce).to.be.true;
-    });
-
-    it("should be safe to call multiple times", () => {
-      connectionManager.start();
-      connectionManager.start();
-
-      expect(mockNetworkMonitor.start.calledTwice).to.be.true;
-      expect(mockDiscoveryDialer.start.calledTwice).to.be.true;
-      expect(mockKeepAliveManager.start.calledTwice).to.be.true;
-      expect(mockConnectionLimiter.start.calledTwice).to.be.true;
-    });
-  });
-
-  describe("stop", () => {
-    beforeEach(() => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig,
-        relay
-      });
-      connectionManager.start();
-    });
-
-    it("should stop all internal components", () => {
-      connectionManager.stop();
-
-      expect(mockNetworkMonitor.stop.calledOnce).to.be.true;
-      expect(mockDiscoveryDialer.stop.calledOnce).to.be.true;
-      expect(mockKeepAliveManager.stop.calledOnce).to.be.true;
-      expect(mockConnectionLimiter.stop.calledOnce).to.be.true;
-    });
-
-    it("should be safe to call multiple times", () => {
-      connectionManager.stop();
-      connectionManager.stop();
-
-      expect(mockNetworkMonitor.stop.calledTwice).to.be.true;
-      expect(mockDiscoveryDialer.stop.calledTwice).to.be.true;
-      expect(mockKeepAliveManager.stop.calledTwice).to.be.true;
-      expect(mockConnectionLimiter.stop.calledTwice).to.be.true;
-    });
-  });
-
-  describe("isConnected", () => {
-    beforeEach(() => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig
-      });
-    });
-
-    it("should delegate to networkMonitor.isConnected()", () => {
-      mockNetworkMonitor.isConnected.returns(true);
-
-      const result = connectionManager.isConnected();
-
-      expect(mockNetworkMonitor.isConnected.calledOnce).to.be.true;
-      expect(result).to.be.true;
-    });
-
-    it("should return false when network is not connected", () => {
-      mockNetworkMonitor.isConnected.returns(false);
-
-      const result = connectionManager.isConnected();
-
-      expect(mockNetworkMonitor.isConnected.calledOnce).to.be.true;
-      expect(result).to.be.false;
-    });
-  });
-
-  describe("dial", () => {
-    beforeEach(() => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig
-      });
-    });
-
-    it("should dial with PeerId and return stream", async () => {
-      const protocolCodecs = ["/waku/2/store/1.0.0"];
-      const libp2pStub = libp2p.dialProtocol as sinon.SinonStub;
-      libp2pStub.resolves(mockStream);
-
-      const result = await connectionManager.dial(mockPeerId, protocolCodecs);
-
-      expect(libp2pStub.calledOnce).to.be.true;
-      expect(libp2pStub.calledWith(mockPeerId, protocolCodecs)).to.be.true;
-      expect(result).to.equal(mockStream);
-    });
-
-    it("should dial with multiaddr and return stream", async () => {
-      const protocolCodecs = ["/waku/2/store/1.0.0"];
-      const libp2pStub = libp2p.dialProtocol as sinon.SinonStub;
-      libp2pStub.resolves(mockStream);
-
-      const result = await connectionManager.dial(
-        mockMultiaddr,
-        protocolCodecs
-      );
-
-      expect(libp2pStub.calledOnce).to.be.true;
-      expect(result).to.equal(mockStream);
-    });
-
-    it("should handle dial errors", async () => {
-      const protocolCodecs = ["/waku/2/store/1.0.0"];
-      const libp2pStub = libp2p.dialProtocol as sinon.SinonStub;
-      const error = new Error("Dial failed");
-      libp2pStub.rejects(error);
-
-      try {
-        await connectionManager.dial(mockPeerId, protocolCodecs);
-        expect.fail("Should have thrown error");
-      } catch (e) {
-        expect(e).to.equal(error);
-      }
-    });
-  });
-
-  describe("hangUp", () => {
-    beforeEach(() => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig
-      });
-    });
-
-    it("should hang up with PeerId and return true on success", async () => {
-      const libp2pStub = libp2p.hangUp as sinon.SinonStub;
-      libp2pStub.resolves();
-
-      const result = await connectionManager.hangUp(mockPeerId);
-
-      expect(libp2pStub.calledOnce).to.be.true;
-      expect(libp2pStub.calledWith(mockPeerId)).to.be.true;
-      expect(result).to.be.true;
-    });
-
-    it("should hang up with multiaddr and return true on success", async () => {
-      const libp2pStub = libp2p.hangUp as sinon.SinonStub;
-      libp2pStub.resolves();
-
-      const result = await connectionManager.hangUp(mockMultiaddr);
-
-      expect(libp2pStub.calledOnce).to.be.true;
-      expect(result).to.be.true;
-    });
-
-    it("should return false and handle errors gracefully", async () => {
-      const libp2pStub = libp2p.hangUp as sinon.SinonStub;
-      libp2pStub.rejects(new Error("Hang up failed"));
-
-      const result = await connectionManager.hangUp(mockPeerId);
-
-      expect(libp2pStub.calledOnce).to.be.true;
-      expect(result).to.be.false;
-    });
-  });
-
-  describe("getConnectedPeers", () => {
-    beforeEach(() => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig
-      });
-    });
-
-    it("should return empty array when no peers connected", async () => {
-      const libp2pStub = libp2p.getPeers as sinon.SinonStub;
-      libp2pStub.returns([]);
-
-      const result = await connectionManager.getConnectedPeers();
-
-      expect(libp2pStub.calledOnce).to.be.true;
-      expect(result).to.deep.equal([]);
-    });
-
-    it("should return all connected peers without codec filter", async () => {
-      const peer1Id = "12D3KooWPjceQuRaNMhcrLF6BaW69PdCXB95h6TBpFf9nAmcL8hE";
-      const peer2Id = "12D3KooWNFmTNRsVfUJqGrRMzQiULd4fL2iRKGj4PpNm4F5BhvCw";
-      const mockPeerIds = [
-        peerIdFromString(peer1Id),
-        peerIdFromString(peer2Id)
-      ];
-      const mockPeers = [
-        createMockPeer(peer1Id, ["/waku/2/relay/1.0.0"], 50),
-        createMockPeer(peer2Id, ["/waku/2/store/1.0.0"], 100)
-      ];
-
-      const libp2pStub = libp2p.getPeers as sinon.SinonStub;
-      libp2pStub.returns(mockPeerIds);
-
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.onCall(0).resolves(mockPeers[0]);
-      peerStoreStub.onCall(1).resolves(mockPeers[1]);
-
-      const result = await connectionManager.getConnectedPeers();
-
-      expect(libp2pStub.calledOnce).to.be.true;
-      expect(peerStoreStub.calledTwice).to.be.true;
-      expect(result).to.have.length(2);
-      // Should be sorted by ping (peer1 has lower ping)
-      expect(result[0].id.toString()).to.equal(peer1Id);
-      expect(result[1].id.toString()).to.equal(peer2Id);
-    });
-
-    it("should filter peers by codec", async () => {
-      const peer1Id = "12D3KooWPjceQuRaNMhcrLF6BaW69PdCXB95h6TBpFf9nAmcL8hE";
-      const peer2Id = "12D3KooWNFmTNRsVfUJqGrRMzQiULd4fL2iRKGj4PpNm4F5BhvCw";
-      const mockPeerIds = [
-        peerIdFromString(peer1Id),
-        peerIdFromString(peer2Id)
-      ];
-      const mockPeers = [
-        createMockPeer(peer1Id, ["/waku/2/relay/1.0.0"], 50),
-        createMockPeer(peer2Id, ["/waku/2/store/1.0.0"], 100)
-      ];
-
-      const libp2pStub = libp2p.getPeers as sinon.SinonStub;
-      libp2pStub.returns(mockPeerIds);
-
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.onCall(0).resolves(mockPeers[0]);
-      peerStoreStub.onCall(1).resolves(mockPeers[1]);
-
-      const result = await connectionManager.getConnectedPeers(
-        "/waku/2/relay/1.0.0"
-      );
-
-      expect(result).to.have.length(1);
-      expect(result[0].id.toString()).to.equal(peer1Id);
-    });
-
-    it("should handle peerStore errors gracefully", async () => {
-      const peer1Id = "12D3KooWPjceQuRaNMhcrLF6BaW69PdCXB95h6TBpFf9nAmcL8hE";
-      const peer2Id = "12D3KooWNFmTNRsVfUJqGrRMzQiULd4fL2iRKGj4PpNm4F5BhvCw";
-      const mockPeerIds = [
-        peerIdFromString(peer1Id),
-        peerIdFromString(peer2Id)
-      ];
-      const mockPeer = createMockPeer(peer2Id, ["/waku/2/store/1.0.0"], 100);
-
-      const libp2pStub = libp2p.getPeers as sinon.SinonStub;
-      libp2pStub.returns(mockPeerIds);
-
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.onCall(0).rejects(new Error("Peer not found"));
-      peerStoreStub.onCall(1).resolves(mockPeer);
-
-      const result = await connectionManager.getConnectedPeers();
-
-      expect(result).to.have.length(1);
-      expect(result[0].id.toString()).to.equal(peer2Id);
-    });
-
-    it("should sort peers by ping value", async () => {
-      const peer1Id = "12D3KooWPjceQuRaNMhcrLF6BaW69PdCXB95h6TBpFf9nAmcL8hE";
-      const peer2Id = "12D3KooWNFmTNRsVfUJqGrRMzQiULd4fL2iRKGj4PpNm4F5BhvCw";
-      const peer3Id = "12D3KooWMvU9HGhiEHDWYgJDnLj2Z4JHBQMdxFPgWTNKXjHDYKUW";
-      const mockPeerIds = [
-        peerIdFromString(peer1Id),
-        peerIdFromString(peer2Id),
-        peerIdFromString(peer3Id)
-      ];
-      const mockPeers = [
-        createMockPeer(peer1Id, ["/waku/2/relay/1.0.0"], 200),
-        createMockPeer(peer2Id, ["/waku/2/store/1.0.0"], 50),
-        createMockPeer(peer3Id, ["/waku/2/filter/1.0.0"], 150)
-      ];
-
-      const libp2pStub = libp2p.getPeers as sinon.SinonStub;
-      libp2pStub.returns(mockPeerIds);
-
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.onCall(0).resolves(mockPeers[0]);
-      peerStoreStub.onCall(1).resolves(mockPeers[1]);
-      peerStoreStub.onCall(2).resolves(mockPeers[2]);
-
-      const result = await connectionManager.getConnectedPeers();
-
-      expect(result).to.have.length(3);
-      // Should be sorted by ping: peer2 (50), peer3 (150), peer1 (200)
-      expect(result[0].id.toString()).to.equal(peer2Id);
-      expect(result[1].id.toString()).to.equal(peer3Id);
-      expect(result[2].id.toString()).to.equal(peer1Id);
-    });
-  });
-
-  describe("isTopicConfigured", () => {
-    beforeEach(() => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig
-      });
-    });
-  });
-
-  describe("isPeerOnTopic", () => {
-    beforeEach(() => {
-      connectionManager = new ConnectionManager({
-        libp2p,
-        events,
-        networkConfig
-      });
-    });
-
-    it("should delegate to shardReader.isPeerOnTopic()", async () => {
-      const topic = "/waku/2/rs/1/0";
-      mockShardReader.isPeerOnTopic.resolves(true);
-
-      const result = await connectionManager.isPeerOnTopic(mockPeerId, topic);
-
-      expect(mockShardReader.isPeerOnTopic.calledOnce).to.be.true;
-      expect(mockShardReader.isPeerOnTopic.calledWith(mockPeerId, topic)).to.be
-        .true;
-      expect(result).to.be.true;
-    });
-
-    it("should return false when peer is not on topic", async () => {
-      const topic = "/waku/2/rs/1/0";
-      mockShardReader.isPeerOnTopic.resolves(false);
-
-      const result = await connectionManager.isPeerOnTopic(mockPeerId, topic);
-
-      expect(mockShardReader.isPeerOnTopic.calledOnce).to.be.true;
-      expect(result).to.be.false;
-    });
-
-    it("should handle shardReader errors", async () => {
-      const topic = "/waku/2/rs/1/0";
-      const error = new Error("Shard reader error");
-      mockShardReader.isPeerOnTopic.rejects(error);
-
-      try {
-        await connectionManager.isPeerOnTopic(mockPeerId, topic);
-        expect.fail("Should have thrown error");
-      } catch (e) {
-        expect(e).to.equal(error);
-      }
-    });
-  });
-});

packages/core/src/lib/connection_manager/connection_manager.ts

@@ -1,168 +1,198 @@
-import { type Peer, type PeerId, type Stream } from "@libp2p/interface";
-import { MultiaddrInput } from "@multiformats/multiaddr";
+import {
+  type Connection,
+  isPeerId,
+  type Peer,
+  type PeerId,
+  type PeerInfo,
+  type Stream,
+  TypedEventEmitter
+} from "@libp2p/interface";
+import { Multiaddr, multiaddr, MultiaddrInput } from "@multiformats/multiaddr";
 import {
   ConnectionManagerOptions,
+  DiscoveryTrigger,
+  DNS_DISCOVERY_TAG,
+  EConnectionStateEvents,
+  EPeersByDiscoveryEvents,
   IConnectionManager,
+  IConnectionStateEvents,
+  IPeersByDiscoveryEvents,
   IRelay,
-  IWakuEventEmitter,
-  NetworkConfig,
-  ShardId
+  PeersByDiscoveryResult,
+  PubsubTopic,
+  ShardInfo
 } from "@waku/interfaces";
-import { Libp2p } from "@waku/interfaces";
+import { Libp2p, Tags } from "@waku/interfaces";
+import { decodeRelayShard, shardInfoToPubsubTopics } from "@waku/utils";
 import { Logger } from "@waku/utils";
 
-import { ConnectionLimiter } from "./connection_limiter.js";
-import { Dialer } from "./dialer.js";
-import { DiscoveryDialer } from "./discovery_dialer.js";
 import { KeepAliveManager } from "./keep_alive_manager.js";
-import { NetworkMonitor } from "./network_monitor.js";
-import { ShardReader } from "./shard_reader.js";
-import { getPeerPing, mapToPeerId, mapToPeerIdOrMultiaddr } from "./utils.js";
+import { getPeerPing } from "./utils.js";
 
 const log = new Logger("connection-manager");
 
-const DEFAULT_MAX_BOOTSTRAP_PEERS_ALLOWED = 3;
+const DEFAULT_MAX_BOOTSTRAP_PEERS_ALLOWED = 1;
+const DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER = 3;
+const DEFAULT_MAX_PARALLEL_DIALS = 3;
+
 const DEFAULT_PING_KEEP_ALIVE_SEC = 5 * 60;
 const DEFAULT_RELAY_KEEP_ALIVE_SEC = 5 * 60;
-const DEFAULT_ENABLE_AUTO_RECOVERY = true;
-const DEFAULT_MAX_CONNECTIONS = 10;
-const DEFAULT_MAX_DIALING_PEERS = 3;
-const DEFAULT_FAILED_DIAL_COOLDOWN_SEC = 60;
-const DEFAULT_DIAL_COOLDOWN_SEC = 10;
 
 type ConnectionManagerConstructorOptions = {
   libp2p: Libp2p;
-  events: IWakuEventEmitter;
-  networkConfig: NetworkConfig;
+  pubsubTopics: PubsubTopic[];
   relay?: IRelay;
   config?: Partial<ConnectionManagerOptions>;
 };
 
-export class ConnectionManager implements IConnectionManager {
-  private readonly keepAliveManager: KeepAliveManager;
-  private readonly discoveryDialer: DiscoveryDialer;
-  private readonly dialer: Dialer;
-  private readonly shardReader: ShardReader;
-  private readonly networkMonitor: NetworkMonitor;
-  private readonly connectionLimiter: ConnectionLimiter;
+export class ConnectionManager
+  extends TypedEventEmitter<IPeersByDiscoveryEvents & IConnectionStateEvents>
+  implements IConnectionManager
+{
+  // TODO(weboko): make it private
+  public readonly pubsubTopics: PubsubTopic[];
 
-  private readonly options: ConnectionManagerOptions;
+  private keepAliveManager: KeepAliveManager;
+  private options: ConnectionManagerOptions;
   private libp2p: Libp2p;
+  private dialAttemptsForPeer: Map<string, number> = new Map();
+  private dialErrorsForPeer: Map<string, any> = new Map();
+
+  private currentActiveParallelDialCount = 0;
+  private pendingPeerDialQueue: Array<PeerId> = [];
+
+  private isP2PNetworkConnected: boolean = false;
+
+  public isConnected(): boolean {
+    if (globalThis?.navigator && !globalThis?.navigator?.onLine) {
+      return false;
+    }
+
+    return this.isP2PNetworkConnected;
+  }
+
+  public stop(): void {
+    this.keepAliveManager.stopAll();
+    this.libp2p.removeEventListener(
+      "peer:connect",
+      this.onEventHandlers["peer:connect"]
+    );
+    this.libp2p.removeEventListener(
+      "peer:disconnect",
+      this.onEventHandlers["peer:disconnect"]
+    );
+    this.libp2p.removeEventListener(
+      "peer:discovery",
+      this.onEventHandlers["peer:discovery"]
+    );
+    this.stopNetworkStatusListener();
+  }
+
+  public async dropConnection(peerId: PeerId): Promise<void> {
+    try {
+      this.keepAliveManager.stop(peerId);
+      await this.libp2p.hangUp(peerId);
+      log.info(`Dropped connection with peer ${peerId.toString()}`);
+    } catch (error) {
+      log.error(
+        `Error dropping connection with peer ${peerId.toString()} - ${error}`
+      );
+    }
+  }
+
+  public async getPeersByDiscovery(): Promise<PeersByDiscoveryResult> {
+    const peersDiscovered = await this.libp2p.peerStore.all();
+    const peersConnected = this.libp2p
+      .getConnections()
+      .map((conn) => conn.remotePeer);
+
+    const peersDiscoveredByBootstrap: Peer[] = [];
+    const peersDiscoveredByPeerExchange: Peer[] = [];
+    const peersDiscoveredByLocal: Peer[] = [];
+
+    const peersConnectedByBootstrap: Peer[] = [];
+    const peersConnectedByPeerExchange: Peer[] = [];
+    const peersConnectedByLocal: Peer[] = [];
+
+    for (const peer of peersDiscovered) {
+      const tags = await this.getTagNamesForPeer(peer.id);
+
+      if (tags.includes(Tags.BOOTSTRAP)) {
+        peersDiscoveredByBootstrap.push(peer);
+      } else if (tags.includes(Tags.PEER_EXCHANGE)) {
+        peersDiscoveredByPeerExchange.push(peer);
+      } else if (tags.includes(Tags.LOCAL)) {
+        peersDiscoveredByLocal.push(peer);
+      }
+    }
+
+    for (const peerId of peersConnected) {
+      const peer = await this.libp2p.peerStore.get(peerId);
+      const tags = await this.getTagNamesForPeer(peerId);
+
+      if (tags.includes(Tags.BOOTSTRAP)) {
+        peersConnectedByBootstrap.push(peer);
+      } else if (tags.includes(Tags.PEER_EXCHANGE)) {
+        peersConnectedByPeerExchange.push(peer);
+      } else if (tags.includes(Tags.LOCAL)) {
+        peersConnectedByLocal.push(peer);
+      }
+    }
+
+    return {
+      DISCOVERED: {
+        [Tags.BOOTSTRAP]: peersDiscoveredByBootstrap,
+        [Tags.PEER_EXCHANGE]: peersDiscoveredByPeerExchange,
+        [Tags.LOCAL]: peersDiscoveredByLocal
+      },
+      CONNECTED: {
+        [Tags.BOOTSTRAP]: peersConnectedByBootstrap,
+        [Tags.PEER_EXCHANGE]: peersConnectedByPeerExchange,
+        [Tags.LOCAL]: peersConnectedByLocal
+      }
+    };
+  }
 
   public constructor(options: ConnectionManagerConstructorOptions) {
+    super();
     this.libp2p = options.libp2p;
-
+    this.pubsubTopics = options.pubsubTopics;
     this.options = {
-      maxBootstrapPeers: DEFAULT_MAX_BOOTSTRAP_PEERS_ALLOWED,
-      maxConnections: DEFAULT_MAX_CONNECTIONS,
+      maxDialAttemptsForPeer: DEFAULT_MAX_DIAL_ATTEMPTS_FOR_PEER,
+      maxBootstrapPeersAllowed: DEFAULT_MAX_BOOTSTRAP_PEERS_ALLOWED,
+      maxParallelDials: DEFAULT_MAX_PARALLEL_DIALS,
       pingKeepAlive: DEFAULT_PING_KEEP_ALIVE_SEC,
       relayKeepAlive: DEFAULT_RELAY_KEEP_ALIVE_SEC,
-      enableAutoRecovery: DEFAULT_ENABLE_AUTO_RECOVERY,
-      maxDialingPeers: DEFAULT_MAX_DIALING_PEERS,
-      failedDialCooldown: DEFAULT_FAILED_DIAL_COOLDOWN_SEC,
-      dialCooldown: DEFAULT_DIAL_COOLDOWN_SEC,
       ...options.config
     };
 
     this.keepAliveManager = new KeepAliveManager({
       relay: options.relay,
       libp2p: options.libp2p,
-      networkConfig: options.networkConfig,
       options: {
         pingKeepAlive: this.options.pingKeepAlive,
         relayKeepAlive: this.options.relayKeepAlive
       }
     });
 
-    this.shardReader = new ShardReader({
-      libp2p: options.libp2p,
-      networkConfig: options.networkConfig
-    });
-
-    this.dialer = new Dialer({
-      libp2p: options.libp2p,
-      shardReader: this.shardReader,
-      options: this.options
-    });
-
-    this.discoveryDialer = new DiscoveryDialer({
-      libp2p: options.libp2p,
-      dialer: this.dialer
-    });
-
-    this.networkMonitor = new NetworkMonitor({
-      libp2p: options.libp2p,
-      events: options.events
-    });
-
-    this.connectionLimiter = new ConnectionLimiter({
-      libp2p: options.libp2p,
-      events: options.events,
-      networkMonitor: this.networkMonitor,
-      dialer: this.dialer,
-      options: this.options
-    });
-  }
-
-  public start(): void {
-    this.dialer.start();
-    this.networkMonitor.start();
-    this.discoveryDialer.start();
-    this.keepAliveManager.start();
-    this.connectionLimiter.start();
-  }
-
-  public stop(): void {
-    this.dialer.stop();
-    this.networkMonitor.stop();
-    this.discoveryDialer.stop();
-    this.keepAliveManager.stop();
-    this.connectionLimiter.stop();
-  }
-
-  public isConnected(): boolean {
-    return this.networkMonitor.isConnected();
-  }
-
-  public async dial(
-    peer: PeerId | MultiaddrInput,
-    protocolCodecs: string[]
-  ): Promise<Stream> {
-    const ma = mapToPeerIdOrMultiaddr(peer);
-    log.info(`Dialing peer ${ma.toString()} with protocols ${protocolCodecs}`);
-
-    // must use libp2p directly instead of dialer because we need to dial the peer right away
-    const stream = await this.libp2p.dialProtocol(ma, protocolCodecs);
-    log.info(`Dialed peer ${ma.toString()} with protocols ${protocolCodecs}`);
-
-    return stream;
-  }
-
-  public async hangUp(peer: PeerId | MultiaddrInput): Promise<boolean> {
-    const peerId = mapToPeerId(peer);
-
-    try {
-      log.info(`Dropping connection with peer ${peerId.toString()}`);
-      await this.libp2p.hangUp(peerId);
-      log.info(`Dropped connection with peer ${peerId.toString()}`);
-
-      return true;
-    } catch (error) {
-      log.error(
-        `Error dropping connection with peer ${peerId.toString()} - ${error}`
+    this.startEventListeners()
+      .then(() => log.info(`Connection Manager is now running`))
+      .catch((error) =>
+        log.error(`Unexpected error while running service`, error)
       );
 
-      return false;
-    }
+    // 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().catch((error) =>
+      log.error(`Unexpected error while dialing peer store peers`, error)
+    );
   }
 
   public async getConnectedPeers(codec?: string): Promise<Peer[]> {
     const peerIDs = this.libp2p.getPeers();
 
-    log.info(`Getting connected peers for codec ${codec}`);
-
     if (peerIDs.length === 0) {
-      log.info(`No connected peers`);
       return [];
     }
 
@@ -176,31 +206,553 @@ export class ConnectionManager implements IConnectionManager {
       })
     );
 
-    const result = peers
+    return peers
       .filter((p) => !!p)
       .filter((p) => (codec ? (p as Peer).protocols.includes(codec) : true))
       .sort((left, right) => getPeerPing(left) - getPeerPing(right)) as Peer[];
-
-    log.info(`Found ${result.length} connected peers for codec ${codec}`);
-
-    return result;
   }
 
-  public async hasShardInfo(peerId: PeerId): Promise<boolean> {
-    return this.shardReader.hasShardInfo(peerId);
+  private async dialPeerStorePeers(): Promise<void> {
+    const peerInfos = await this.libp2p.peerStore.all();
+    const dialPromises = [];
+    for (const peerInfo of peerInfos) {
+      if (
+        this.libp2p.getConnections().find((c) => c.remotePeer === peerInfo.id)
+      )
+        continue;
+
+      dialPromises.push(this.attemptDial(peerInfo.id));
+    }
+    try {
+      await Promise.all(dialPromises);
+    } catch (error) {
+      log.error(`Unexpected error while dialing peer store peers`, error);
+    }
   }
 
-  public async isPeerOnTopic(
+  private async startEventListeners(): Promise<void> {
+    this.startPeerDiscoveryListener();
+    this.startPeerConnectionListener();
+    this.startPeerDisconnectionListener();
+
+    this.startNetworkStatusListener();
+  }
+
+  /**
+   * Attempts to establish a connection with a peer and set up specified protocols.
+   * The method handles both PeerId and Multiaddr inputs, manages connection attempts,
+   * and maintains the connection state.
+   *
+   * The dialing process includes:
+   * 1. Converting input to dialable peer info
+   * 2. Managing parallel dial attempts
+   * 3. Attempting to establish protocol-specific connections
+   * 4. Handling connection failures and retries
+   * 5. Updating the peer store and connection state
+   *
+   * @param {PeerId | MultiaddrInput} peer - The peer to connect to, either as a PeerId or multiaddr
+   * @param {string[]} [protocolCodecs] - Optional array of protocol-specific codec strings to establish
+   *                                      (e.g., for LightPush, Filter, Store protocols)
+   *
+   * @throws {Error} If the multiaddr is missing a peer ID
+   * @throws {Error} If the maximum dial attempts are reached and the peer cannot be dialed
+   * @throws {Error} If there's an error deleting an undialable peer from the peer store
+   *
+   * @example
+   * ```typescript
+   * // Dial using PeerId
+   * await connectionManager.dialPeer(peerId);
+   *
+   * // Dial using multiaddr with specific protocols
+   * await connectionManager.dialPeer(multiaddr, [
+   *   "/vac/waku/relay/2.0.0",
+   *   "/vac/waku/lightpush/2.0.0-beta1"
+   * ]);
+   * ```
+   *
+   * @remarks
+   * - The method implements exponential backoff through multiple dial attempts
+   * - Maintains a queue for parallel dial attempts (limited by maxParallelDials)
+   * - Integrates with the KeepAliveManager for connection maintenance
+   * - Updates the peer store and connection state after successful/failed attempts
+   * - If all dial attempts fail, triggers DNS discovery as a fallback
+   */
+  public async dialPeer(peer: PeerId | MultiaddrInput): Promise<Connection> {
+    let connection: Connection | undefined;
+    let peerId: PeerId | undefined;
+    const peerDialInfo = this.getDialablePeerInfo(peer);
+    const peerIdStr = isPeerId(peerDialInfo)
+      ? peerDialInfo.toString()
+      : peerDialInfo.getPeerId()!;
+
+    this.currentActiveParallelDialCount += 1;
+    let dialAttempt = 0;
+    while (dialAttempt < this.options.maxDialAttemptsForPeer) {
+      try {
+        log.info(`Dialing peer ${peerDialInfo} on attempt ${dialAttempt + 1}`);
+        connection = await this.libp2p.dial(peerDialInfo);
+        peerId = connection.remotePeer;
+
+        const tags = await this.getTagNamesForPeer(peerId);
+        // add tag to connection describing discovery mechanism
+        // don't add duplicate tags
+        this.libp2p.getConnections(peerId).forEach((conn) => {
+          conn.tags = Array.from(new Set([...conn.tags, ...tags]));
+        });
+
+        // instead of deleting the peer from the peer store, we set the dial attempt to -1
+        // this helps us keep track of peers that have been dialed before
+        this.dialAttemptsForPeer.set(peerId.toString(), -1);
+
+        // Dialing succeeded, break the loop
+        this.keepAliveManager.start(peerId);
+        break;
+      } catch (error) {
+        if (error instanceof AggregateError) {
+          // Handle AggregateError
+          log.error(`Error dialing peer ${peerIdStr} - ${error.errors}`);
+        } else {
+          // Handle generic error
+          log.error(
+            `Error dialing peer ${peerIdStr} - ${(error as any).message}`
+          );
+        }
+        this.dialErrorsForPeer.set(peerIdStr, error);
+
+        dialAttempt++;
+        this.dialAttemptsForPeer.set(peerIdStr, dialAttempt);
+      }
+    }
+
+    // Always decrease the active dial count and process the dial queue
+    this.currentActiveParallelDialCount--;
+    this.processDialQueue();
+
+    // If max dial attempts reached and dialing failed, delete the peer
+    if (dialAttempt === this.options.maxDialAttemptsForPeer) {
+      try {
+        const error = this.dialErrorsForPeer.get(peerIdStr);
+
+        if (error) {
+          let errorMessage;
+          if (error instanceof AggregateError) {
+            if (!error.errors) {
+              log.warn(`No errors array found for AggregateError`);
+            } else if (error.errors.length === 0) {
+              log.warn(`Errors array is empty for AggregateError`);
+            } else {
+              errorMessage = JSON.stringify(error.errors[0]);
+            }
+          } else {
+            errorMessage = error.message;
+          }
+
+          log.info(
+            `Deleting undialable peer ${peerIdStr} from peer store. Reason: ${errorMessage}`
+          );
+        }
+
+        this.dialErrorsForPeer.delete(peerIdStr);
+        if (peerId) {
+          await this.libp2p.peerStore.delete(peerId);
+        }
+
+        // if it was last available peer - attempt DNS discovery
+        await this.attemptDnsDiscovery();
+      } catch (error) {
+        throw new Error(
+          `Error deleting undialable peer ${peerIdStr} from peer store - ${error}`
+        );
+      }
+    }
+
+    if (!connection) {
+      throw new Error(`Failed to dial peer ${peerDialInfo}`);
+    }
+
+    return connection;
+  }
+
+  /**
+   * Dial a peer with specific protocols.
+   * This method is a raw proxy to the libp2p dialProtocol method.
+   * @param peer - The peer to connect to, either as a PeerId or multiaddr
+   * @param protocolCodecs - Optional array of protocol-specific codec strings to establish
+   * @returns A stream to the peer
+   */
+  public async rawDialPeerWithProtocols(
+    peer: PeerId | MultiaddrInput,
+    protocolCodecs: string[]
+  ): Promise<Stream> {
+    const peerDialInfo = this.getDialablePeerInfo(peer);
+    return await this.libp2p.dialProtocol(peerDialInfo, protocolCodecs);
+  }
+
+  /**
+   * Internal utility to extract a PeerId or Multiaddr from a peer input.
+   * This is used internally by the connection manager to handle different peer input formats.
+   * @internal
+   */
+  private getDialablePeerInfo(
+    peer: PeerId | MultiaddrInput
+  ): PeerId | Multiaddr {
+    if (isPeerId(peer)) {
+      return peer;
+    } else {
+      // peer is of MultiaddrInput type
+      const ma = multiaddr(peer);
+      const peerIdStr = ma.getPeerId();
+      if (!peerIdStr) {
+        throw new Error("Failed to dial multiaddr: missing peer ID");
+      }
+      return ma;
+    }
+  }
+
+  private async attemptDnsDiscovery(): Promise<void> {
+    if (this.libp2p.getConnections().length > 0) return;
+    if ((await this.libp2p.peerStore.all()).length > 0) return;
+
+    log.info("Attempting to trigger DNS discovery.");
+
+    const dnsDiscovery = Object.values(this.libp2p.components.components).find(
+      (v: unknown) => {
+        if (v && v.toString) {
+          return v.toString().includes(DNS_DISCOVERY_TAG);
+        }
+
+        return false;
+      }
+    ) as DiscoveryTrigger;
+
+    if (!dnsDiscovery) return;
+
+    await dnsDiscovery.findPeers();
+  }
+
+  private processDialQueue(): void {
+    if (
+      this.pendingPeerDialQueue.length > 0 &&
+      this.currentActiveParallelDialCount < this.options.maxParallelDials
+    ) {
+      const peerId = this.pendingPeerDialQueue.shift();
+      if (!peerId) return;
+      this.attemptDial(peerId).catch((error) => {
+        log.error(error);
+      });
+    }
+  }
+
+  private startPeerDiscoveryListener(): void {
+    this.libp2p.addEventListener(
+      "peer:discovery",
+      this.onEventHandlers["peer:discovery"]
+    );
+  }
+
+  private startPeerConnectionListener(): void {
+    this.libp2p.addEventListener(
+      "peer:connect",
+      this.onEventHandlers["peer:connect"]
+    );
+  }
+
+  private startPeerDisconnectionListener(): void {
+    // TODO: ensure that these following issues are updated and confirmed
+    /**
+     * NOTE: Event is not being emitted on closing nor losing a connection.
+     * @see https://github.com/libp2p/js-libp2p/issues/939
+     * @see https://github.com/status-im/js-waku/issues/252
+     *
+     * >This event will be triggered anytime we are disconnected from another peer,
+     * >regardless of the circumstances of that disconnection.
+     * >If we happen to have multiple connections to a peer,
+     * >this event will **only** be triggered when the last connection is closed.
+     * @see https://github.com/libp2p/js-libp2p/blob/bad9e8c0ff58d60a78314077720c82ae331cc55b/doc/API.md?plain=1#L2100
+     */
+    this.libp2p.addEventListener(
+      "peer:disconnect",
+      this.onEventHandlers["peer:disconnect"]
+    );
+  }
+
+  public async attemptDial(peerId: PeerId): Promise<void> {
+    if (!(await this.shouldDialPeer(peerId))) return;
+
+    if (this.currentActiveParallelDialCount >= this.options.maxParallelDials) {
+      this.pendingPeerDialQueue.push(peerId);
+      return;
+    }
+
+    await this.dialPeer(peerId);
+  }
+
+  private onEventHandlers = {
+    "peer:discovery": (evt: CustomEvent<PeerInfo>): void => {
+      void (async () => {
+        const { id: peerId } = evt.detail;
+
+        await this.dispatchDiscoveryEvent(peerId);
+
+        try {
+          await this.attemptDial(peerId);
+        } catch (error) {
+          log.error(`Error dialing peer ${peerId.toString()} : ${error}`);
+        }
+      })();
+    },
+    "peer:connect": (evt: CustomEvent<PeerId>): void => {
+      void (async () => {
+        log.info(`Connected to peer ${evt.detail.toString()}`);
+
+        const peerId = evt.detail;
+
+        this.keepAliveManager.start(peerId);
+
+        const isBootstrap = (await this.getTagNamesForPeer(peerId)).includes(
+          Tags.BOOTSTRAP
+        );
+
+        if (isBootstrap) {
+          const bootstrapConnections = this.libp2p
+            .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);
+          } else {
+            this.dispatchEvent(
+              new CustomEvent<PeerId>(
+                EPeersByDiscoveryEvents.PEER_CONNECT_BOOTSTRAP,
+                {
+                  detail: peerId
+                }
+              )
+            );
+          }
+        } else {
+          this.dispatchEvent(
+            new CustomEvent<PeerId>(
+              EPeersByDiscoveryEvents.PEER_CONNECT_PEER_EXCHANGE,
+              {
+                detail: peerId
+              }
+            )
+          );
+        }
+
+        this.setP2PNetworkConnected();
+      })();
+    },
+    "peer:disconnect": (evt: CustomEvent<PeerId>): void => {
+      void (async () => {
+        this.keepAliveManager.stop(evt.detail);
+        this.setP2PNetworkDisconnected();
+      })();
+    },
+    "browser:network": (): void => {
+      this.dispatchWakuConnectionEvent();
+    }
+  };
+
+  /**
+   * Checks if the peer should be dialed based on the following conditions:
+   * 1. If the peer is already connected, don't dial
+   * 2. If the peer is not part of any of the configured pubsub topics, don't dial
+   * 3. If the peer is not dialable based on bootstrap status, don't dial
+   * 4. If the peer is already has an active dial attempt, or has been dialed before, don't dial it
+   * @returns true if the peer should be dialed, false otherwise
+   */
+  private async shouldDialPeer(peerId: PeerId): Promise<boolean> {
+    const isConnected = this.libp2p.getConnections(peerId).length > 0;
+    if (isConnected) {
+      log.warn(`Already connected to peer ${peerId.toString()}. Not dialing.`);
+      return false;
+    }
+
+    const isSameShard = await this.isPeerOnSameShard(peerId);
+    if (!isSameShard) {
+      const shardInfo = await this.getPeerShardInfo(peerId);
+
+      log.warn(
+        `Discovered peer ${peerId.toString()} with ShardInfo ${shardInfo} is not part of any of the configured pubsub topics (${
+          this.pubsubTopics
+        }).
+            Not dialing.`
+      );
+
+      return false;
+    }
+
+    const isPreferredBasedOnBootstrap =
+      await this.isPeerDialableBasedOnBootstrapStatus(peerId);
+    if (!isPreferredBasedOnBootstrap) {
+      log.warn(
+        `Peer ${peerId.toString()} is not dialable based on bootstrap status. Not dialing.`
+      );
+      return false;
+    }
+
+    const hasBeenDialed = this.dialAttemptsForPeer.has(peerId.toString());
+    if (hasBeenDialed) {
+      log.warn(
+        `Peer ${peerId.toString()} has already been attempted dial before, or already has a dial attempt in progress, skipping dial`
+      );
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Checks if the peer is dialable based on the following conditions:
+   * 1. If the peer is a bootstrap peer, it is only dialable if the number of current bootstrap connections is less than the max allowed.
+   * 2. If the peer is not a bootstrap peer
+   */
+  private async isPeerDialableBasedOnBootstrapStatus(
+    peerId: PeerId
+  ): Promise<boolean> {
+    const tagNames = await this.getTagNamesForPeer(peerId);
+
+    const isBootstrap = tagNames.some((tagName) => tagName === Tags.BOOTSTRAP);
+
+    if (!isBootstrap) {
+      return true;
+    }
+
+    const currentBootstrapConnections = this.libp2p
+      .getConnections()
+      .filter((conn) => {
+        return conn.tags.find((name) => name === Tags.BOOTSTRAP);
+      }).length;
+
+    return currentBootstrapConnections < this.options.maxBootstrapPeersAllowed;
+  }
+
+  private async dispatchDiscoveryEvent(peerId: PeerId): Promise<void> {
+    const isBootstrap = (await this.getTagNamesForPeer(peerId)).includes(
+      Tags.BOOTSTRAP
+    );
+
+    this.dispatchEvent(
+      new CustomEvent<PeerId>(
+        isBootstrap
+          ? EPeersByDiscoveryEvents.PEER_DISCOVERY_BOOTSTRAP
+          : EPeersByDiscoveryEvents.PEER_DISCOVERY_PEER_EXCHANGE,
+        {
+          detail: peerId
+        }
+      )
+    );
+  }
+
+  /**
+   * Fetches the tag names for a given peer
+   */
+  private async getTagNamesForPeer(peerId: PeerId): Promise<string[]> {
+    try {
+      const peer = await this.libp2p.peerStore.get(peerId);
+      return Array.from(peer.tags.keys());
+    } catch (error) {
+      log.error(`Failed to get peer ${peerId}, error: ${error}`);
+      return [];
+    }
+  }
+
+  public async isPeerOnSameShard(peerId: PeerId): Promise<boolean> {
+    const shardInfo = await this.getPeerShardInfo(peerId);
+
+    if (!shardInfo) {
+      return true;
+    }
+
+    const pubsubTopics = shardInfoToPubsubTopics(shardInfo);
+
+    const isTopicConfigured = pubsubTopics.some((topic) =>
+      this.pubsubTopics.includes(topic)
+    );
+
+    return isTopicConfigured;
+  }
+
+  public async isPeerOnPubsubTopic(
     peerId: PeerId,
     pubsubTopic: string
   ): Promise<boolean> {
-    return this.shardReader.isPeerOnTopic(peerId, pubsubTopic);
+    const shardInfo = await this.getPeerShardInfo(peerId);
+
+    if (!shardInfo) {
+      return true;
+    }
+
+    const pubsubTopics = shardInfoToPubsubTopics(shardInfo);
+    return pubsubTopics.some((t) => t === pubsubTopic);
   }
 
-  public async isPeerOnShard(
-    peerId: PeerId,
-    shardId: ShardId
-  ): Promise<boolean> {
-    return this.shardReader.isPeerOnShard(peerId, shardId);
+  private async getPeerShardInfo(
+    peerId: PeerId
+  ): Promise<ShardInfo | undefined> {
+    const peer = await this.libp2p.peerStore.get(peerId);
+    const shardInfoBytes = peer.metadata.get("shardInfo");
+    if (!shardInfoBytes) return undefined;
+    return decodeRelayShard(shardInfoBytes);
+  }
+
+  private startNetworkStatusListener(): void {
+    try {
+      globalThis.addEventListener(
+        "online",
+        this.onEventHandlers["browser:network"]
+      );
+      globalThis.addEventListener(
+        "offline",
+        this.onEventHandlers["browser:network"]
+      );
+    } catch (err) {
+      log.error(`Failed to start network listener: ${err}`);
+    }
+  }
+
+  private stopNetworkStatusListener(): void {
+    try {
+      globalThis.removeEventListener(
+        "online",
+        this.onEventHandlers["browser:network"]
+      );
+      globalThis.removeEventListener(
+        "offline",
+        this.onEventHandlers["browser:network"]
+      );
+    } catch (err) {
+      log.error(`Failed to stop network listener: ${err}`);
+    }
+  }
+
+  private setP2PNetworkConnected(): void {
+    if (!this.isP2PNetworkConnected) {
+      this.isP2PNetworkConnected = true;
+      this.dispatchWakuConnectionEvent();
+    }
+  }
+
+  private setP2PNetworkDisconnected(): void {
+    if (
+      this.isP2PNetworkConnected &&
+      this.libp2p.getConnections().length === 0
+    ) {
+      this.isP2PNetworkConnected = false;
+      this.dispatchWakuConnectionEvent();
+    }
+  }
+
+  private dispatchWakuConnectionEvent(): void {
+    this.dispatchEvent(
+      new CustomEvent<boolean>(EConnectionStateEvents.CONNECTION_STATUS, {
+        detail: this.isConnected()
+      })
+    );
   }
 }

packages/core/src/lib/connection_manager/dialer.spec.ts

@@ -1,529 +0,0 @@
-import { PeerId } from "@libp2p/interface";
-import { ConnectionManagerOptions, Libp2p } from "@waku/interfaces";
-import { expect } from "chai";
-import sinon from "sinon";
-
-import { Dialer } from "./dialer.js";
-import { ShardReader } from "./shard_reader.js";
-
-describe("Dialer", () => {
-  let libp2p: Libp2p;
-  let dialer: Dialer;
-  let mockShardReader: sinon.SinonStubbedInstance<ShardReader>;
-  let mockPeerId: PeerId;
-  let mockPeerId2: PeerId;
-  let clock: sinon.SinonFakeTimers;
-  let mockOptions: ConnectionManagerOptions;
-
-  const createMockPeerId = (id: string): PeerId =>
-    ({
-      toString: () => id,
-      equals: (other: PeerId) => other.toString() === id
-    }) as PeerId;
-
-  beforeEach(() => {
-    libp2p = {
-      dial: sinon.stub().resolves(),
-      getPeers: sinon.stub().returns([])
-    } as unknown as Libp2p;
-
-    mockShardReader = {
-      hasShardInfo: sinon.stub().resolves(false),
-      isPeerOnCluster: sinon.stub().resolves(true)
-    } as unknown as sinon.SinonStubbedInstance<ShardReader>;
-
-    mockOptions = {
-      maxBootstrapPeers: 1,
-      pingKeepAlive: 300,
-      relayKeepAlive: 300,
-      maxDialingPeers: 3,
-      failedDialCooldown: 60,
-      dialCooldown: 10,
-      maxConnections: 10,
-      enableAutoRecovery: true
-    };
-
-    mockPeerId = createMockPeerId("12D3KooWTest1");
-    mockPeerId2 = createMockPeerId("12D3KooWTest2");
-
-    clock = sinon.useFakeTimers({
-      now: 1000000000000
-    });
-  });
-
-  afterEach(() => {
-    if (dialer) {
-      dialer.stop();
-    }
-    clock.restore();
-    sinon.restore();
-  });
-
-  describe("constructor", () => {
-    it("should create dialer with libp2p and shardReader", () => {
-      dialer = new Dialer({
-        libp2p,
-        shardReader: mockShardReader,
-        options: mockOptions
-      });
-
-      expect(dialer).to.be.instanceOf(Dialer);
-    });
-  });
-
-  describe("start", () => {
-    beforeEach(() => {
-      dialer = new Dialer({
-        libp2p,
-        shardReader: mockShardReader,
-        options: mockOptions
-      });
-    });
-
-    it("should start the dialing interval", () => {
-      dialer.start();
-
-      expect(clock.countTimers()).to.be.greaterThan(0);
-    });
-
-    it("should clear dial history on start", () => {
-      dialer.start();
-
-      void dialer.dial(mockPeerId);
-
-      dialer.stop();
-      dialer.start();
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resetHistory();
-
-      void dialer.dial(mockPeerId);
-
-      expect(dialStub.called).to.be.false;
-    });
-
-    it("should not create multiple intervals when called multiple times", () => {
-      dialer.start();
-      dialer.start();
-
-      expect(clock.countTimers()).to.equal(1);
-    });
-  });
-
-  describe("stop", () => {
-    beforeEach(() => {
-      dialer = new Dialer({
-        libp2p,
-        shardReader: mockShardReader,
-        options: mockOptions
-      });
-      dialer.start();
-    });
-
-    it("should clear the dialing interval", () => {
-      expect(clock.countTimers()).to.be.greaterThan(0);
-
-      dialer.stop();
-
-      expect(clock.countTimers()).to.equal(0);
-    });
-
-    it("should clear dial history on stop", () => {
-      dialer.stop();
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resetHistory();
-
-      dialer.start();
-      void dialer.dial(mockPeerId);
-
-      expect(dialStub.called).to.be.false;
-    });
-
-    it("should be safe to call multiple times", () => {
-      dialer.stop();
-      dialer.stop();
-
-      expect(clock.countTimers()).to.equal(0);
-    });
-  });
-
-  describe("dial", () => {
-    beforeEach(() => {
-      dialer = new Dialer({
-        libp2p,
-        shardReader: mockShardReader,
-        options: mockOptions
-      });
-      dialer.start();
-    });
-
-    it("should dial peer immediately when queue is empty", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resolves();
-
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.calledOnce).to.be.true;
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-    });
-
-    it("should add peer to queue when queue is not empty", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-
-      let resolveFirstDial: () => void;
-      const firstDialPromise = new Promise<void>((resolve) => {
-        resolveFirstDial = resolve;
-      });
-      dialStub.onFirstCall().returns(firstDialPromise);
-      dialStub.onSecondCall().resolves();
-
-      const firstDialCall = dialer.dial(mockPeerId);
-
-      await dialer.dial(mockPeerId2);
-
-      expect(dialStub.calledOnce).to.be.true;
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-
-      resolveFirstDial!();
-      await firstDialCall;
-
-      clock.tick(500);
-      await Promise.resolve();
-
-      expect(dialStub.calledTwice).to.be.true;
-      expect(dialStub.calledWith(mockPeerId2)).to.be.true;
-    });
-
-    it("should skip peer when already connected", async () => {
-      const getPeersStub = libp2p.getPeers as sinon.SinonStub;
-      getPeersStub.returns([mockPeerId]);
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.called).to.be.false;
-    });
-
-    it("should skip peer when dialed recently", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resolves();
-
-      await dialer.dial(mockPeerId);
-      expect(dialStub.calledOnce).to.be.true;
-
-      dialStub.resetHistory();
-
-      clock.tick(5000);
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.called).to.be.false;
-    });
-
-    it("should skip peer when failed to dial recently", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.rejects(new Error("Dial failed"));
-
-      await dialer.dial(mockPeerId);
-      expect(dialStub.calledOnce).to.be.true;
-
-      dialStub.resetHistory();
-      dialStub.resolves();
-
-      clock.tick(30000);
-
-      await dialer.dial(mockPeerId);
-      expect(dialStub.called).to.be.false;
-    });
-
-    it("should populate queue if has active dial", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      const mockPeerId3 = createMockPeerId("12D3KooWTest3");
-
-      let resolveFirstDial: () => void;
-      const firstDialPromise = new Promise<void>((resolve) => {
-        resolveFirstDial = resolve;
-      });
-      dialStub.onFirstCall().returns(firstDialPromise);
-      dialStub.onSecondCall().resolves();
-      dialStub.onThirdCall().resolves();
-
-      const firstDialCall = dialer.dial(mockPeerId);
-
-      await dialer.dial(mockPeerId2);
-      await dialer.dial(mockPeerId3);
-
-      expect(dialStub.calledOnce).to.be.true;
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-
-      resolveFirstDial!();
-      await firstDialCall;
-
-      clock.tick(500);
-      await Promise.resolve();
-
-      expect(dialStub.callCount).to.equal(3);
-      expect(dialStub.calledWith(mockPeerId2)).to.be.true;
-      expect(dialStub.calledWith(mockPeerId3)).to.be.true;
-    });
-
-    it("should allow redial after cooldown period", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resolves();
-
-      await dialer.dial(mockPeerId);
-      expect(dialStub.calledOnce).to.be.true;
-
-      clock.tick(10001);
-      await dialer.dial(mockPeerId);
-      expect(dialStub.calledTwice).to.be.true;
-    });
-
-    it("should skip peer when not on same cluster", async () => {
-      mockShardReader.hasShardInfo.resolves(true);
-      mockShardReader.isPeerOnCluster.resolves(false);
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.called).to.be.false;
-      expect(mockShardReader.hasShardInfo.calledWith(mockPeerId)).to.be.true;
-      expect(mockShardReader.isPeerOnCluster.calledWith(mockPeerId)).to.be.true;
-    });
-
-    it("should dial peer when on same shard", async () => {
-      mockShardReader.hasShardInfo.resolves(true);
-      mockShardReader.isPeerOnCluster.resolves(true);
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resolves();
-
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.calledOnce).to.be.true;
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-      expect(mockShardReader.hasShardInfo.calledWith(mockPeerId)).to.be.true;
-      expect(mockShardReader.isPeerOnCluster.calledWith(mockPeerId)).to.be.true;
-    });
-
-    it("should dial peer when no shard info available", async () => {
-      mockShardReader.hasShardInfo.resolves(false);
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resolves();
-
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.calledOnce).to.be.true;
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-      expect(mockShardReader.hasShardInfo.calledWith(mockPeerId)).to.be.true;
-      expect(mockShardReader.isPeerOnCluster.called).to.be.false;
-    });
-
-    it("should handle dial errors gracefully", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.rejects(new Error("Dial failed"));
-
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.calledOnce).to.be.true;
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-    });
-
-    it("should allow redial after failed dial cooldown expires", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.onFirstCall().rejects(new Error("Dial failed"));
-      dialStub.onSecondCall().resolves();
-      await dialer.dial(mockPeerId);
-      expect(dialStub.calledOnce).to.be.true;
-      clock.tick(60001);
-      await dialer.dial(mockPeerId);
-      expect(dialStub.calledTwice).to.be.true;
-    });
-
-    it("should handle queue overflow by adding peers to queue", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      const peers = [];
-      for (let i = 0; i < 100; i++) {
-        peers.push(createMockPeerId(`12D3KooWTest${i}`));
-      }
-      let resolveFirstDial: () => void;
-      const firstDialPromise = new Promise<void>((resolve) => {
-        resolveFirstDial = resolve;
-      });
-      dialStub.onFirstCall().returns(firstDialPromise);
-      dialStub.resolves();
-      const firstDialCall = dialer.dial(peers[0]);
-      for (let i = 1; i < 100; i++) {
-        await dialer.dial(peers[i]);
-      }
-      expect(dialStub.calledOnce).to.be.true;
-      resolveFirstDial!();
-      await firstDialCall;
-      clock.tick(500);
-      await Promise.resolve();
-      expect(dialStub.callCount).to.be.greaterThan(1);
-    });
-  });
-
-  describe("queue processing", () => {
-    beforeEach(() => {
-      dialer = new Dialer({
-        libp2p,
-        shardReader: mockShardReader,
-        options: mockOptions
-      });
-      dialer.start();
-    });
-
-    it("should process queue every 500ms", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resolves();
-
-      await dialer.dial(mockPeerId);
-      expect(dialStub.calledOnce).to.be.true;
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-
-      dialStub.resetHistory();
-      await dialer.dial(mockPeerId2);
-      expect(dialStub.calledOnce).to.be.true;
-      expect(dialStub.calledWith(mockPeerId2)).to.be.true;
-    });
-
-    it("should process up to 3 peers at once", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      const mockPeerId3 = createMockPeerId("12D3KooWTest3");
-      const mockPeerId4 = createMockPeerId("12D3KooWTest4");
-      const mockPeerId5 = createMockPeerId("12D3KooWTest5");
-
-      dialStub.resolves();
-
-      await dialer.dial(mockPeerId);
-      await dialer.dial(mockPeerId2);
-      await dialer.dial(mockPeerId3);
-      await dialer.dial(mockPeerId4);
-      await dialer.dial(mockPeerId5);
-
-      expect(dialStub.callCount).to.equal(5);
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-      expect(dialStub.calledWith(mockPeerId2)).to.be.true;
-      expect(dialStub.calledWith(mockPeerId3)).to.be.true;
-      expect(dialStub.calledWith(mockPeerId4)).to.be.true;
-      expect(dialStub.calledWith(mockPeerId5)).to.be.true;
-    });
-
-    it("should not process empty queue", () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-
-      clock.tick(500);
-
-      expect(dialStub.called).to.be.false;
-    });
-
-    it("should handle queue processing errors gracefully", async () => {
-      const dialStub = libp2p.dial as sinon.SinonStub;
-
-      let resolveFirstDial: () => void;
-      const firstDialPromise = new Promise<void>((resolve) => {
-        resolveFirstDial = resolve;
-      });
-      dialStub.onFirstCall().returns(firstDialPromise);
-      dialStub.onSecondCall().rejects(new Error("Queue dial failed"));
-
-      const firstDialPromise2 = dialer.dial(mockPeerId);
-      await dialer.dial(mockPeerId2);
-
-      resolveFirstDial!();
-      await firstDialPromise2;
-
-      clock.tick(500);
-      await Promise.resolve();
-
-      expect(dialStub.calledTwice).to.be.true;
-    });
-  });
-
-  describe("shard reader integration", () => {
-    beforeEach(() => {
-      dialer = new Dialer({
-        libp2p,
-        shardReader: mockShardReader,
-        options: mockOptions
-      });
-      dialer.start();
-    });
-
-    it("should handle shard reader errors gracefully", async () => {
-      mockShardReader.hasShardInfo.rejects(new Error("Shard reader error"));
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.called).to.be.false;
-      expect(mockShardReader.hasShardInfo.calledWith(mockPeerId)).to.be.true;
-    });
-
-    it("should handle network check errors gracefully", async () => {
-      mockShardReader.hasShardInfo.resolves(true);
-      mockShardReader.isPeerOnCluster.rejects(new Error("Network check error"));
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.called).to.be.false;
-      expect(mockShardReader.hasShardInfo.calledWith(mockPeerId)).to.be.true;
-      expect(mockShardReader.isPeerOnCluster.calledWith(mockPeerId)).to.be.true;
-    });
-  });
-
-  describe("integration", () => {
-    it("should handle complete dial lifecycle", async () => {
-      dialer = new Dialer({
-        libp2p,
-        shardReader: mockShardReader,
-        options: mockOptions
-      });
-      dialer.start();
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resolves();
-
-      await dialer.dial(mockPeerId);
-
-      expect(dialStub.calledOnce).to.be.true;
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-
-      dialer.stop();
-    });
-
-    it("should handle multiple peers with different shard configurations", async () => {
-      dialer = new Dialer({
-        libp2p,
-        shardReader: mockShardReader,
-        options: mockOptions
-      });
-      dialer.start();
-
-      const dialStub = libp2p.dial as sinon.SinonStub;
-      dialStub.resolves();
-
-      mockShardReader.hasShardInfo.withArgs(mockPeerId).resolves(true);
-      mockShardReader.isPeerOnCluster.withArgs(mockPeerId).resolves(true);
-
-      mockShardReader.hasShardInfo.withArgs(mockPeerId2).resolves(false);
-
-      await dialer.dial(mockPeerId);
-      await dialer.dial(mockPeerId2);
-
-      expect(dialStub.calledTwice).to.be.true;
-      expect(dialStub.calledWith(mockPeerId)).to.be.true;
-      expect(dialStub.calledWith(mockPeerId2)).to.be.true;
-
-      dialer.stop();
-    });
-  });
-});

packages/core/src/lib/connection_manager/dialer.ts

@@ -1,192 +0,0 @@
-import type { PeerId } from "@libp2p/interface";
-import { ConnectionManagerOptions, Libp2p } from "@waku/interfaces";
-import { Logger } from "@waku/utils";
-
-import { ShardReader } from "./shard_reader.js";
-
-const log = new Logger("dialer");
-
-type DialerConstructorOptions = {
-  libp2p: Libp2p;
-  shardReader: ShardReader;
-  options: ConnectionManagerOptions;
-};
-
-interface IDialer {
-  start(): void;
-  stop(): void;
-  dial(peerId: PeerId): Promise<void>;
-}
-
-export class Dialer implements IDialer {
-  private readonly libp2p: Libp2p;
-  private readonly shardReader: ShardReader;
-  private readonly options: ConnectionManagerOptions;
-
-  private dialingQueue: PeerId[] = [];
-  private dialHistory: Map<string, number> = new Map();
-  private failedDials: Map<string, number> = new Map();
-  private dialingInterval: NodeJS.Timeout | null = null;
-
-  private isProcessing = false;
-  private isImmediateDialing = false;
-
-  public constructor(options: DialerConstructorOptions) {
-    this.libp2p = options.libp2p;
-    this.shardReader = options.shardReader;
-    this.options = options.options;
-  }
-
-  public start(): void {
-    log.info("Starting dialer");
-
-    if (!this.dialingInterval) {
-      this.dialingInterval = setInterval(() => {
-        void this.processQueue();
-      }, 500);
-    }
-
-    this.dialHistory.clear();
-    this.failedDials.clear();
-  }
-
-  public stop(): void {
-    log.info("Stopping dialer");
-
-    if (this.dialingInterval) {
-      clearInterval(this.dialingInterval);
-      this.dialingInterval = null;
-    }
-
-    this.dialHistory.clear();
-    this.failedDials.clear();
-  }
-
-  public async dial(peerId: PeerId): Promise<void> {
-    const shouldSkip = await this.shouldSkipPeer(peerId);
-
-    if (shouldSkip) {
-      log.info(`Skipping peer: ${peerId}`);
-      return;
-    }
-
-    const isEmptyQueue = this.dialingQueue.length === 0;
-    const isNotDialing = !this.isProcessing && !this.isImmediateDialing;
-
-    // If queue is empty and we're not currently processing, dial immediately
-    if (isEmptyQueue && isNotDialing) {
-      this.isImmediateDialing = true;
-      log.info("Dialed peer immediately");
-      await this.dialPeer(peerId);
-      this.isImmediateDialing = false;
-      log.info("Released immediate dial lock");
-    } else {
-      this.dialingQueue.push(peerId);
-      log.info(
-        `Added peer to dialing queue, queue size: ${this.dialingQueue.length}`
-      );
-    }
-  }
-
-  private async processQueue(): Promise<void> {
-    if (this.dialingQueue.length === 0 || this.isProcessing) {
-      return;
-    }
-
-    this.isProcessing = true;
-
-    try {
-      const peersToDial = this.dialingQueue.slice(
-        0,
-        this.options.maxDialingPeers
-      );
-      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;
-    }
-  }
-
-  private async dialPeer(peerId: PeerId): Promise<void> {
-    try {
-      log.info(`Dialing peer from queue: ${peerId}`);
-
-      await this.libp2p.dial(peerId);
-      this.dialHistory.set(peerId.toString(), Date.now());
-      this.failedDials.delete(peerId.toString());
-
-      log.info(`Successfully dialed peer from queue: ${peerId}`);
-    } catch (error) {
-      log.error(`Error dialing peer ${peerId}`, error);
-      this.failedDials.set(peerId.toString(), Date.now());
-    }
-  }
-
-  private async shouldSkipPeer(peerId: PeerId): Promise<boolean> {
-    const hasConnection = this.libp2p.getPeers().some((p) => p.equals(peerId));
-    if (hasConnection) {
-      log.info(`Skipping peer ${peerId} - already connected`);
-      return true;
-    }
-
-    if (this.isRecentlyDialed(peerId)) {
-      log.info(
-        `Skipping peer ${peerId} - already dialed in the last 10 seconds`
-      );
-      return true;
-    }
-
-    if (this.isRecentlyFailed(peerId)) {
-      log.info(`Skipping peer ${peerId} - recently failed to dial`);
-      return true;
-    }
-
-    try {
-      const hasShardInfo = await this.shardReader.hasShardInfo(peerId);
-      if (!hasShardInfo) {
-        log.info(`Skipping peer ${peerId} - no shard info`);
-        return false;
-      }
-
-      const isOnSameCluster = await this.shardReader.isPeerOnCluster(peerId);
-      if (!isOnSameCluster) {
-        log.info(`Skipping peer ${peerId} - not on same cluster`);
-        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
-    }
-  }
-
-  private isRecentlyDialed(peerId: PeerId): boolean {
-    const lastDialed = this.dialHistory.get(peerId.toString());
-    if (
-      lastDialed &&
-      Date.now() - lastDialed < this.options.dialCooldown * 1000
-    ) {
-      return true;
-    }
-
-    return false;
-  }
-
-  private isRecentlyFailed(peerId: PeerId): boolean {
-    const lastFailed = this.failedDials.get(peerId.toString());
-    if (
-      lastFailed &&
-      Date.now() - lastFailed < this.options.failedDialCooldown * 1000
-    ) {
-      return true;
-    }
-
-    return false;
-  }
-}

packages/core/src/lib/connection_manager/discovery_dialer.spec.ts

@@ -1,304 +0,0 @@
-import { PeerId, PeerInfo } from "@libp2p/interface";
-import { expect } from "chai";
-import { Libp2p } from "libp2p";
-import sinon from "sinon";
-
-import { Dialer } from "./dialer.js";
-import { DiscoveryDialer } from "./discovery_dialer.js";
-
-describe("DiscoveryDialer", () => {
-  let libp2p: Libp2p;
-  let discoveryDialer: DiscoveryDialer;
-  let dialer: sinon.SinonStubbedInstance<Dialer>;
-  let mockPeerId: PeerId;
-  let mockPeerInfo: PeerInfo;
-
-  beforeEach(() => {
-    libp2p = {
-      addEventListener: sinon.stub(),
-      removeEventListener: sinon.stub(),
-      peerStore: {
-        get: sinon.stub().resolves(undefined),
-        save: sinon.stub().resolves(),
-        merge: sinon.stub().resolves()
-      }
-    } as unknown as Libp2p;
-
-    dialer = {
-      start: sinon.stub(),
-      stop: sinon.stub(),
-      dial: sinon.stub().resolves()
-    } as unknown as sinon.SinonStubbedInstance<Dialer>;
-
-    mockPeerId = {
-      toString: () => "mock-peer-id",
-      equals: (other: PeerId) => other.toString() === "mock-peer-id"
-    } as PeerId;
-
-    mockPeerInfo = {
-      id: mockPeerId,
-      multiaddrs: []
-    } as PeerInfo;
-  });
-
-  afterEach(() => {
-    if (discoveryDialer) {
-      discoveryDialer.stop();
-    }
-    sinon.restore();
-  });
-
-  describe("constructor", () => {
-    it("should create an instance with libp2p and dialer", () => {
-      discoveryDialer = new DiscoveryDialer({
-        libp2p,
-        dialer
-      });
-      expect(discoveryDialer).to.be.instanceOf(DiscoveryDialer);
-    });
-  });
-
-  describe("start", () => {
-    beforeEach(() => {
-      discoveryDialer = new DiscoveryDialer({
-        libp2p,
-        dialer
-      });
-    });
-
-    it("should add event listener for peer:discovery", () => {
-      discoveryDialer.start();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      expect(addEventListenerStub.calledOnce).to.be.true;
-      expect(
-        addEventListenerStub.calledWith("peer:discovery", sinon.match.func)
-      ).to.be.true;
-    });
-
-    it("should be safe to call multiple times", () => {
-      discoveryDialer.start();
-      discoveryDialer.start();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      expect(addEventListenerStub.calledTwice).to.be.true;
-    });
-  });
-
-  describe("stop", () => {
-    beforeEach(() => {
-      discoveryDialer = new DiscoveryDialer({
-        libp2p,
-        dialer
-      });
-      discoveryDialer.start();
-    });
-
-    it("should remove event listener for peer:discovery", () => {
-      discoveryDialer.stop();
-
-      const removeEventListenerStub =
-        libp2p.removeEventListener as sinon.SinonStub;
-      expect(removeEventListenerStub.calledOnce).to.be.true;
-      expect(
-        removeEventListenerStub.calledWith("peer:discovery", sinon.match.func)
-      ).to.be.true;
-    });
-
-    it("should be safe to call multiple times", () => {
-      discoveryDialer.stop();
-      discoveryDialer.stop();
-
-      const removeEventListenerStub =
-        libp2p.removeEventListener as sinon.SinonStub;
-      expect(removeEventListenerStub.calledTwice).to.be.true;
-    });
-  });
-
-  describe("peer discovery handling", () => {
-    let eventHandler: (event: CustomEvent<PeerInfo>) => Promise<void>;
-
-    beforeEach(() => {
-      discoveryDialer = new DiscoveryDialer({
-        libp2p,
-        dialer
-      });
-      discoveryDialer.start();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      eventHandler = addEventListenerStub.getCall(0).args[1];
-    });
-
-    it("should dial peer when peer is discovered", async () => {
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.resolves(undefined);
-
-      const mockEvent = new CustomEvent("peer:discovery", {
-        detail: mockPeerInfo
-      });
-
-      await eventHandler(mockEvent);
-
-      expect(dialer.dial.calledOnce).to.be.true;
-      expect(dialer.dial.calledWith(mockPeerId)).to.be.true;
-    });
-
-    it("should handle dial errors gracefully", async () => {
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.resolves(undefined);
-
-      dialer.dial.rejects(new Error("Dial failed"));
-
-      const mockEvent = new CustomEvent("peer:discovery", {
-        detail: mockPeerInfo
-      });
-
-      await eventHandler(mockEvent);
-
-      expect(dialer.dial.calledOnce).to.be.true;
-      expect(dialer.dial.calledWith(mockPeerId)).to.be.true;
-    });
-
-    it("should update peer store before dialing", async () => {
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.resolves(undefined);
-
-      const mockEvent = new CustomEvent("peer:discovery", {
-        detail: mockPeerInfo
-      });
-
-      await eventHandler(mockEvent);
-
-      expect(peerStoreStub.calledWith(mockPeerId)).to.be.true;
-      expect(dialer.dial.calledOnce).to.be.true;
-    });
-
-    it("should handle peer store errors gracefully", async () => {
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.rejects(new Error("Peer store error"));
-
-      const mockEvent = new CustomEvent("peer:discovery", {
-        detail: mockPeerInfo
-      });
-
-      await eventHandler(mockEvent);
-
-      expect(dialer.dial.calledOnce).to.be.true;
-    });
-  });
-
-  describe("updatePeerStore", () => {
-    let eventHandler: (event: CustomEvent<PeerInfo>) => Promise<void>;
-
-    beforeEach(() => {
-      discoveryDialer = new DiscoveryDialer({
-        libp2p,
-        dialer
-      });
-      discoveryDialer.start();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      eventHandler = addEventListenerStub.getCall(0).args[1];
-    });
-
-    it("should save new peer to store", async () => {
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.resolves(undefined);
-
-      const mockEvent = new CustomEvent("peer:discovery", {
-        detail: mockPeerInfo
-      });
-
-      await eventHandler(mockEvent);
-
-      expect((libp2p.peerStore.save as sinon.SinonStub).calledOnce).to.be.true;
-      expect(
-        (libp2p.peerStore.save as sinon.SinonStub).calledWith(mockPeerId, {
-          multiaddrs: mockPeerInfo.multiaddrs
-        })
-      ).to.be.true;
-    });
-
-    it("should skip updating peer store if peer has same addresses", async () => {
-      // Set up mockPeerInfo with actual multiaddrs for this test
-      const mockMultiaddr = { equals: sinon.stub().returns(true) };
-      const mockPeerInfoWithAddr = {
-        id: mockPeerId,
-        multiaddrs: [mockMultiaddr]
-      } as unknown as PeerInfo;
-
-      const mockPeer = {
-        addresses: [{ multiaddr: mockMultiaddr }]
-      };
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.resolves(mockPeer);
-
-      const mockEvent = new CustomEvent("peer:discovery", {
-        detail: mockPeerInfoWithAddr
-      });
-
-      await eventHandler(mockEvent);
-
-      expect((libp2p.peerStore.save as sinon.SinonStub).called).to.be.false;
-      expect((libp2p.peerStore.merge as sinon.SinonStub).called).to.be.false;
-    });
-
-    it("should merge peer addresses if peer exists with different addresses", async () => {
-      // Set up mockPeerInfo with actual multiaddrs for this test
-      const mockMultiaddr = { equals: sinon.stub().returns(false) };
-      const mockPeerInfoWithAddr = {
-        id: mockPeerId,
-        multiaddrs: [mockMultiaddr]
-      } as unknown as PeerInfo;
-
-      const mockPeer = {
-        addresses: []
-      };
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.resolves(mockPeer);
-
-      const mockEvent = new CustomEvent("peer:discovery", {
-        detail: mockPeerInfoWithAddr
-      });
-
-      await eventHandler(mockEvent);
-
-      expect((libp2p.peerStore.merge as sinon.SinonStub).calledOnce).to.be.true;
-      expect(
-        (libp2p.peerStore.merge as sinon.SinonStub).calledWith(mockPeerId, {
-          multiaddrs: mockPeerInfoWithAddr.multiaddrs
-        })
-      ).to.be.true;
-    });
-  });
-
-  describe("integration", () => {
-    it("should handle complete discovery-to-dial flow", async () => {
-      const peerStoreStub = libp2p.peerStore.get as sinon.SinonStub;
-      peerStoreStub.resolves(undefined);
-
-      discoveryDialer = new DiscoveryDialer({
-        libp2p,
-        dialer
-      });
-      discoveryDialer.start();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      const eventHandler = addEventListenerStub.getCall(0).args[1];
-
-      const mockEvent = new CustomEvent("peer:discovery", {
-        detail: mockPeerInfo
-      });
-
-      await eventHandler(mockEvent);
-
-      expect(dialer.dial.calledOnce).to.be.true;
-      expect(dialer.dial.calledWith(mockPeerId)).to.be.true;
-
-      discoveryDialer.stop();
-      const removeEventListenerStub =
-        libp2p.removeEventListener as sinon.SinonStub;
-      expect(removeEventListenerStub.called).to.be.true;
-    });
-  });
-});

packages/core/src/lib/connection_manager/discovery_dialer.ts

@@ -1,104 +0,0 @@
-import { Libp2p, Peer, PeerId, PeerInfo } from "@libp2p/interface";
-import { Multiaddr } from "@multiformats/multiaddr";
-import { Libp2pEventHandler } from "@waku/interfaces";
-import { Logger } from "@waku/utils";
-
-import { Dialer } from "./dialer.js";
-
-type DiscoveryDialerConstructorOptions = {
-  libp2p: Libp2p;
-  dialer: Dialer;
-};
-
-interface IDiscoveryDialer {
-  start(): void;
-  stop(): void;
-}
-
-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 implements IDiscoveryDialer {
-  private readonly libp2p: Libp2p;
-  private readonly dialer: Dialer;
-
-  public constructor(options: DiscoveryDialerConstructorOptions) {
-    this.libp2p = options.libp2p;
-    this.dialer = options.dialer;
-
-    this.onPeerDiscovery = this.onPeerDiscovery.bind(this);
-  }
-
-  public start(): void {
-    this.libp2p.addEventListener(
-      "peer:discovery",
-      this.onPeerDiscovery as Libp2pEventHandler<PeerInfo>
-    );
-  }
-
-  public stop(): void {
-    this.libp2p.removeEventListener(
-      "peer:discovery",
-      this.onPeerDiscovery as Libp2pEventHandler<PeerInfo>
-    );
-  }
-
-  private async onPeerDiscovery(event: CustomEvent<PeerInfo>): Promise<void> {
-    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);
-    }
-  }
-
-  private async updatePeerStore(
-    peerId: PeerId,
-    multiaddrs: Multiaddr[]
-  ): Promise<void> {
-    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);
-    }
-  }
-
-  private async getPeer(peerId: PeerId): Promise<Peer | undefined> {
-    try {
-      return await this.libp2p.peerStore.get(peerId);
-    } catch (error) {
-      log.error(`Error getting peer info for ${peerId}`, error);
-      return undefined;
-    }
-  }
-}

packages/core/src/lib/connection_manager/keep_alive_manager.spec.ts

@@ -1,605 +0,0 @@
-import type { PeerId } from "@libp2p/interface";
-import { AutoSharding } from "@waku/interfaces";
-import { expect } from "chai";
-import sinon from "sinon";
-
-import { KeepAliveManager } from "./keep_alive_manager.js";
-
-describe("KeepAliveManager", () => {
-  let libp2p: any;
-  let relay: any;
-  let keepAliveManager: KeepAliveManager;
-  let mockPeerId: PeerId;
-  let mockPeerId2: PeerId;
-  let clock: sinon.SinonFakeTimers;
-
-  const createMockPeerId = (id: string): PeerId =>
-    ({
-      toString: () => id,
-      equals: (other: PeerId) => other.toString() === id
-    }) as PeerId;
-
-  const defaultOptions = {
-    pingKeepAlive: 30,
-    relayKeepAlive: 60
-  };
-
-  const defaultNetworkConfig: AutoSharding = {
-    clusterId: 0,
-    numShardsInCluster: 1
-  };
-
-  beforeEach(() => {
-    clock = sinon.useFakeTimers();
-
-    mockPeerId = createMockPeerId("12D3KooWTest1");
-    mockPeerId2 = createMockPeerId("12D3KooWTest2");
-
-    libp2p = {
-      addEventListener: sinon.stub(),
-      removeEventListener: sinon.stub(),
-      services: {
-        ping: {
-          ping: sinon.stub().resolves(100)
-        }
-      },
-      peerStore: {
-        merge: sinon.stub().resolves()
-      }
-    };
-
-    relay = {
-      pubsubTopics: ["/waku/2/rs/1/0", "/waku/2/rs/1/1"],
-      getMeshPeers: sinon.stub().returns(["12D3KooWTest1"]),
-      send: sinon.stub().resolves()
-    };
-  });
-
-  afterEach(() => {
-    if (keepAliveManager) {
-      keepAliveManager.stop();
-    }
-    clock.restore();
-    sinon.restore();
-  });
-
-  describe("constructor", () => {
-    it("should create KeepAliveManager with required options", () => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p
-      });
-
-      expect(keepAliveManager).to.be.instanceOf(KeepAliveManager);
-    });
-
-    it("should create KeepAliveManager with relay", () => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-
-      expect(keepAliveManager).to.be.instanceOf(KeepAliveManager);
-    });
-  });
-
-  describe("start", () => {
-    beforeEach(() => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p
-      });
-    });
-
-    it("should add event listeners for peer connect and disconnect", () => {
-      keepAliveManager.start();
-
-      expect(libp2p.addEventListener.calledTwice).to.be.true;
-      expect(
-        libp2p.addEventListener.calledWith("peer:connect", sinon.match.func)
-      ).to.be.true;
-      expect(
-        libp2p.addEventListener.calledWith("peer:disconnect", sinon.match.func)
-      ).to.be.true;
-    });
-
-    it("should be safe to call multiple times", () => {
-      keepAliveManager.start();
-      keepAliveManager.start();
-
-      expect(libp2p.addEventListener.callCount).to.equal(4);
-    });
-  });
-
-  describe("stop", () => {
-    beforeEach(() => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-      keepAliveManager.start();
-    });
-
-    it("should remove event listeners", () => {
-      keepAliveManager.stop();
-
-      expect(libp2p.removeEventListener.calledTwice).to.be.true;
-      expect(
-        libp2p.removeEventListener.calledWith("peer:connect", sinon.match.func)
-      ).to.be.true;
-      expect(
-        libp2p.removeEventListener.calledWith(
-          "peer:disconnect",
-          sinon.match.func
-        )
-      ).to.be.true;
-    });
-
-    it("should clear all timers", () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      const timersBeforeStop = clock.countTimers();
-      expect(timersBeforeStop).to.be.greaterThan(0);
-
-      keepAliveManager.stop();
-
-      expect(clock.countTimers()).to.equal(0);
-    });
-
-    it("should be safe to call multiple times", () => {
-      keepAliveManager.stop();
-      keepAliveManager.stop();
-
-      expect(libp2p.removeEventListener.callCount).to.equal(4);
-    });
-  });
-
-  describe("peer connect event handling", () => {
-    beforeEach(() => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-      keepAliveManager.start();
-    });
-
-    it("should start ping timers on peer connect", () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.be.greaterThan(0);
-    });
-
-    it("should handle multiple peer connections", () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent1 = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      const connectEvent2 = new CustomEvent("peer:connect", {
-        detail: mockPeerId2
-      });
-
-      peerConnectHandler(connectEvent1);
-      peerConnectHandler(connectEvent2);
-
-      expect(clock.countTimers()).to.be.greaterThan(1);
-    });
-  });
-
-  describe("peer disconnect event handling", () => {
-    beforeEach(() => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-      keepAliveManager.start();
-    });
-
-    it("should stop ping timers on peer disconnect", () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const peerDisconnectHandler = libp2p.addEventListener.getCall(1).args[1];
-
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      const timerCountAfterConnect = clock.countTimers();
-      expect(timerCountAfterConnect).to.be.greaterThan(0);
-
-      const disconnectEvent = new CustomEvent("peer:disconnect", {
-        detail: mockPeerId
-      });
-      peerDisconnectHandler(disconnectEvent);
-
-      expect(clock.countTimers()).to.be.lessThan(timerCountAfterConnect);
-    });
-  });
-
-  describe("ping timer management", () => {
-    beforeEach(() => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p
-      });
-      keepAliveManager.start();
-    });
-
-    it("should create ping timers when pingKeepAlive > 0", () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.be.greaterThan(0);
-    });
-
-    it("should not create ping timers when pingKeepAlive = 0", () => {
-      keepAliveManager.stop();
-      keepAliveManager = new KeepAliveManager({
-        options: { pingKeepAlive: 0, relayKeepAlive: 0 },
-        networkConfig: defaultNetworkConfig,
-        libp2p
-      });
-      keepAliveManager.start();
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(2).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.equal(0);
-    });
-
-    it("should perform ping and update peer store on timer", async () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      clock.tick(defaultOptions.pingKeepAlive * 1000);
-
-      await clock.tickAsync(0);
-
-      sinon.assert.calledWith(libp2p.services.ping.ping, mockPeerId);
-      sinon.assert.calledWith(
-        libp2p.peerStore.merge,
-        mockPeerId,
-        sinon.match.object
-      );
-    });
-
-    it("should handle ping failures gracefully", async () => {
-      libp2p.services.ping.ping.rejects(new Error("Ping failed"));
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      clock.tick(defaultOptions.pingKeepAlive * 1000);
-      await clock.tickAsync(0);
-
-      sinon.assert.calledWith(libp2p.services.ping.ping, mockPeerId);
-      sinon.assert.notCalled(libp2p.peerStore.merge);
-    });
-
-    it("should handle peer store update failures gracefully", async () => {
-      libp2p.peerStore.merge.rejects(new Error("Peer store update failed"));
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      clock.tick(defaultOptions.pingKeepAlive * 1000);
-      await clock.tickAsync(0);
-
-      sinon.assert.calledWith(libp2p.services.ping.ping, mockPeerId);
-      sinon.assert.calledWith(
-        libp2p.peerStore.merge,
-        mockPeerId,
-        sinon.match.object
-      );
-    });
-  });
-
-  describe("relay timer management", () => {
-    beforeEach(() => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-      keepAliveManager.start();
-    });
-
-    it("should create relay timers when relay exists and relayKeepAlive > 0", () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.be.greaterThan(1);
-    });
-
-    it("should not create relay timers when relayKeepAlive = 0", () => {
-      keepAliveManager.stop();
-      keepAliveManager = new KeepAliveManager({
-        options: { pingKeepAlive: 30, relayKeepAlive: 0 },
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-      keepAliveManager.start();
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(2).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.equal(1);
-    });
-
-    it("should not create relay timers when relay is not provided", () => {
-      keepAliveManager.stop();
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p
-      });
-      keepAliveManager.start();
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(2).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.equal(1);
-    });
-
-    it("should create timers for each pubsub topic where peer is in mesh", () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.be.greaterThan(relay.pubsubTopics.length);
-    });
-
-    it("should not create timers for topics where peer is not in mesh", () => {
-      relay.getMeshPeers.returns([]);
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.equal(1);
-    });
-
-    it("should send relay ping messages on timer", async () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      clock.tick(defaultOptions.relayKeepAlive * 1000);
-      await clock.tickAsync(0);
-
-      sinon.assert.called(relay.send);
-    });
-
-    it("should handle relay send failures gracefully", async () => {
-      relay.send.rejects(new Error("Relay send failed"));
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      clock.tick(defaultOptions.relayKeepAlive * 1000);
-      await clock.tickAsync(0);
-
-      sinon.assert.called(relay.send);
-    });
-  });
-
-  describe("timer cleanup", () => {
-    beforeEach(() => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-      keepAliveManager.start();
-    });
-
-    it("should clear timers for specific peer on disconnect", () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const peerDisconnectHandler = libp2p.addEventListener.getCall(1).args[1];
-
-      const connectEvent1 = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      const connectEvent2 = new CustomEvent("peer:connect", {
-        detail: mockPeerId2
-      });
-      peerConnectHandler(connectEvent1);
-      peerConnectHandler(connectEvent2);
-
-      const timerCountAfterConnect = clock.countTimers();
-      expect(timerCountAfterConnect).to.be.greaterThan(0);
-
-      const disconnectEvent = new CustomEvent("peer:disconnect", {
-        detail: mockPeerId
-      });
-      peerDisconnectHandler(disconnectEvent);
-
-      expect(clock.countTimers()).to.be.lessThan(timerCountAfterConnect);
-      expect(clock.countTimers()).to.be.greaterThan(0);
-    });
-
-    it("should handle disconnect when peer has no timers", () => {
-      const peerDisconnectHandler = libp2p.addEventListener.getCall(1).args[1];
-      const disconnectEvent = new CustomEvent("peer:disconnect", {
-        detail: mockPeerId
-      });
-
-      expect(() => peerDisconnectHandler(disconnectEvent)).to.not.throw();
-    });
-
-    it("should clear existing timers before creating new ones", () => {
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-
-      peerConnectHandler(connectEvent);
-      const timerCountAfterFirst = clock.countTimers();
-
-      peerConnectHandler(connectEvent);
-      const timerCountAfterSecond = clock.countTimers();
-
-      expect(timerCountAfterSecond).to.equal(timerCountAfterFirst);
-    });
-  });
-
-  describe("edge cases", () => {
-    it("should handle empty pubsub topics", () => {
-      const emptyRelay = {
-        pubsubTopics: [],
-        getMeshPeers: sinon.stub().returns([]),
-        send: sinon.stub().resolves()
-      } as any;
-
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay: emptyRelay
-      });
-      keepAliveManager.start();
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.equal(1);
-    });
-
-    it("should handle all zero keep alive options", () => {
-      keepAliveManager = new KeepAliveManager({
-        options: { pingKeepAlive: 0, relayKeepAlive: 0 },
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-      keepAliveManager.start();
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.equal(0);
-    });
-
-    it("should handle peer not in mesh for all topics", () => {
-      relay.getMeshPeers.returns(["different-peer-id"]);
-
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-      keepAliveManager.start();
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.equal(1);
-    });
-  });
-
-  describe("integration", () => {
-    it("should handle complete peer lifecycle", async () => {
-      keepAliveManager = new KeepAliveManager({
-        options: defaultOptions,
-        networkConfig: defaultNetworkConfig,
-        libp2p,
-        relay
-      });
-      keepAliveManager.start();
-
-      const peerConnectHandler = libp2p.addEventListener.getCall(0).args[1];
-      const peerDisconnectHandler = libp2p.addEventListener.getCall(1).args[1];
-
-      const connectEvent = new CustomEvent("peer:connect", {
-        detail: mockPeerId
-      });
-      peerConnectHandler(connectEvent);
-
-      expect(clock.countTimers()).to.be.greaterThan(0);
-
-      clock.tick(
-        Math.max(defaultOptions.pingKeepAlive, defaultOptions.relayKeepAlive) *
-          1000
-      );
-      await clock.tickAsync(0);
-
-      sinon.assert.called(libp2p.services.ping.ping);
-      sinon.assert.called(relay.send);
-
-      const disconnectEvent = new CustomEvent("peer:disconnect", {
-        detail: mockPeerId
-      });
-      peerDisconnectHandler(disconnectEvent);
-
-      expect(clock.countTimers()).to.equal(0);
-
-      keepAliveManager.stop();
-
-      sinon.assert.called(libp2p.removeEventListener);
-    });
-  });
-});

packages/core/src/lib/connection_manager/keep_alive_manager.ts

@@ -1,6 +1,6 @@
 import type { PeerId } from "@libp2p/interface";
-import type { IEncoder, IRelay, Libp2p, NetworkConfig } from "@waku/interfaces";
-import { createRoutingInfo, Logger } from "@waku/utils";
+import type { IRelay, Libp2p, PeerIdStr } from "@waku/interfaces";
+import { Logger, pubsubTopicToSingleShardInfo } from "@waku/utils";
 import { utf8ToBytes } from "@waku/utils/bytes";
 
 import { createEncoder } from "../message/version_0.js";
@@ -15,221 +15,145 @@ type KeepAliveOptions = {
 
 type CreateKeepAliveManagerOptions = {
   options: KeepAliveOptions;
-  networkConfig: NetworkConfig;
   libp2p: Libp2p;
   relay?: IRelay;
 };
 
-interface IKeepAliveManager {
-  start(): void;
-  stop(): void;
-}
-
-export class KeepAliveManager implements IKeepAliveManager {
+export class KeepAliveManager {
   private readonly relay?: IRelay;
-  private readonly networkConfig: NetworkConfig;
   private readonly libp2p: Libp2p;
 
   private readonly options: KeepAliveOptions;
 
   private pingKeepAliveTimers: Map<string, ReturnType<typeof setInterval>> =
     new Map();
-  private relayKeepAliveTimers: Map<string, ReturnType<typeof setInterval>[]> =
+  private relayKeepAliveTimers: Map<PeerId, ReturnType<typeof setInterval>[]> =
     new Map();
 
   public constructor({
     options,
     relay,
-    networkConfig,
     libp2p
   }: CreateKeepAliveManagerOptions) {
     this.options = options;
     this.relay = relay;
-    this.networkConfig = networkConfig;
     this.libp2p = libp2p;
-
-    this.onPeerConnect = this.onPeerConnect.bind(this);
-    this.onPeerDisconnect = this.onPeerDisconnect.bind(this);
   }
 
-  public start(): void {
-    this.libp2p.addEventListener("peer:connect", this.onPeerConnect);
-    this.libp2p.addEventListener("peer:disconnect", this.onPeerDisconnect);
-  }
+  public start(peerId: PeerId): void {
+    // Just in case a timer already exists for this peer
+    this.stop(peerId);
 
-  public stop(): void {
-    this.libp2p.removeEventListener("peer:connect", this.onPeerConnect);
-    this.libp2p.removeEventListener("peer:disconnect", this.onPeerDisconnect);
+    const { pingKeepAlive: pingPeriodSecs, relayKeepAlive: relayPeriodSecs } =
+      this.options;
 
-    for (const timer of this.pingKeepAliveTimers.values()) {
-      clearInterval(timer);
+    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: number;
+          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);
     }
 
-    for (const timerArray of this.relayKeepAliveTimers.values()) {
-      for (const timer of timerArray) {
-        clearInterval(timer);
-      }
+    const relay = this.relay;
+    if (relay && relayPeriodSecs !== 0) {
+      const intervals = this.scheduleRelayPings(
+        relay,
+        relayPeriodSecs,
+        peerId.toString()
+      );
+      this.relayKeepAliveTimers.set(peerId, intervals);
+    }
+  }
+
+  public stop(peerId: PeerId): void {
+    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);
+    }
+  }
+
+  public stopAll(): void {
+    for (const timer of [
+      ...Object.values(this.pingKeepAliveTimers),
+      ...Object.values(this.relayKeepAliveTimers)
+    ]) {
+      clearInterval(timer);
     }
 
     this.pingKeepAliveTimers.clear();
     this.relayKeepAliveTimers.clear();
   }
 
-  private onPeerConnect(evt: CustomEvent<PeerId>): void {
-    const peerId = evt.detail;
-    this.startPingForPeer(peerId);
+  public connectionsExist(): boolean {
+    return (
+      this.pingKeepAliveTimers.size > 0 || this.relayKeepAliveTimers.size > 0
+    );
   }
 
-  private onPeerDisconnect(evt: CustomEvent<PeerId>): void {
-    const peerId = evt.detail;
-    this.stopPingForPeer(peerId);
-  }
-
-  private startPingForPeer(peerId: PeerId): void {
-    // Just in case a timer already exists for this peer
-    this.stopPingForPeer(peerId);
-
-    this.startLibp2pPing(peerId);
-    this.startRelayPing(peerId);
-  }
-
-  private stopPingForPeer(peerId: PeerId): void {
-    this.stopLibp2pPing(peerId);
-    this.stopRelayPing(peerId);
-  }
-
-  private startLibp2pPing(peerId: PeerId): void {
-    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)) {
-      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);
-  }
-
-  private stopLibp2pPing(peerId: PeerId): void {
-    const peerIdStr = peerId.toString();
-
-    if (!this.pingKeepAliveTimers.has(peerIdStr)) {
-      log.warn(
-        `Ping not started for peer: ${peerIdStr}, skipping stop for ping`
-      );
-      return;
-    }
-
-    clearInterval(this.pingKeepAliveTimers.get(peerIdStr));
-    this.pingKeepAliveTimers.delete(peerIdStr);
-  }
-
-  private startRelayPing(peerId: PeerId): void {
-    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;
-    }
-
+  private scheduleRelayPings(
+    relay: IRelay,
+    relayPeriodSecs: number,
+    peerIdStr: PeerIdStr
+  ): NodeJS.Timeout[] {
+    // send a ping message to each PubsubTopic the peer is part of
     const intervals: NodeJS.Timeout[] = [];
-
-    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 routingInfo = createRoutingInfo(this.networkConfig, {
-        contentTopic: RelayPingContentTopic,
-        pubsubTopic: topic
-      });
+    for (const topic of relay.pubsubTopics) {
+      const meshPeers = relay.getMeshPeers(topic);
+      if (!meshPeers.includes(peerIdStr)) continue;
 
       const encoder = createEncoder({
-        routingInfo: routingInfo,
+        pubsubTopicShardInfo: pubsubTopicToSingleShardInfo(topic),
         contentTopic: RelayPingContentTopic,
         ephemeral: true
       });
-
       const interval = setInterval(() => {
-        void this.pingRelay(encoder);
-      }, this.options.relayKeepAlive * 1000);
-
+        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);
       intervals.push(interval);
     }
 
-    this.relayKeepAliveTimers.set(peerId.toString(), intervals);
-  }
-
-  private stopRelayPing(peerId: PeerId): void {
-    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);
-  }
-
-  private async pingRelay(encoder: IEncoder): Promise<void> {
-    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);
-    }
-  }
-
-  private async pingLibp2p(peerId: PeerId): Promise<void> {
-    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);
-    }
+    return intervals;
   }
 }

packages/core/src/lib/connection_manager/network_monitor.spec.ts

@@ -1,431 +0,0 @@
-import { IWakuEventEmitter, Libp2p, WakuEvent } from "@waku/interfaces";
-import { expect } from "chai";
-import sinon from "sinon";
-
-import { NetworkMonitor } from "./network_monitor.js";
-
-describe("NetworkMonitor", () => {
-  let libp2p: Libp2p;
-  let events: IWakuEventEmitter;
-  let networkMonitor: NetworkMonitor;
-  let originalGlobalThis: typeof globalThis;
-  let mockGlobalThis: {
-    addEventListener: sinon.SinonStub;
-    removeEventListener: sinon.SinonStub;
-    navigator: { onLine: boolean } | undefined;
-  };
-
-  beforeEach(() => {
-    libp2p = {
-      addEventListener: sinon.stub(),
-      removeEventListener: sinon.stub(),
-      getConnections: sinon.stub().returns([])
-    } as unknown as Libp2p;
-
-    events = {
-      dispatchEvent: sinon.stub()
-    } as unknown as IWakuEventEmitter;
-
-    originalGlobalThis = globalThis;
-    mockGlobalThis = {
-      addEventListener: sinon.stub(),
-      removeEventListener: sinon.stub(),
-      navigator: {
-        onLine: true
-      }
-    };
-
-    (global as unknown as { globalThis: typeof mockGlobalThis }).globalThis =
-      mockGlobalThis;
-  });
-
-  afterEach(() => {
-    if (networkMonitor) {
-      networkMonitor.stop();
-    }
-
-    (
-      global as unknown as { globalThis: typeof originalGlobalThis }
-    ).globalThis = originalGlobalThis;
-    sinon.restore();
-  });
-
-  describe("constructor", () => {
-    it("should create NetworkMonitor with libp2p and events", () => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-
-      expect(networkMonitor).to.be.instanceOf(NetworkMonitor);
-    });
-
-    it("should initialize with isNetworkConnected as false", () => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-
-      expect(networkMonitor.isConnected()).to.be.false;
-    });
-  });
-
-  describe("start", () => {
-    beforeEach(() => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-    });
-
-    it("should add event listeners to libp2p", () => {
-      networkMonitor.start();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      expect(addEventListenerStub.calledTwice).to.be.true;
-      expect(addEventListenerStub.calledWith("peer:connect", sinon.match.func))
-        .to.be.true;
-      expect(
-        addEventListenerStub.calledWith("peer:disconnect", sinon.match.func)
-      ).to.be.true;
-    });
-
-    it("should add event listeners to globalThis", () => {
-      networkMonitor.start();
-
-      expect(mockGlobalThis.addEventListener.calledTwice).to.be.true;
-      expect(
-        mockGlobalThis.addEventListener.calledWith("online", sinon.match.func)
-      ).to.be.true;
-      expect(
-        mockGlobalThis.addEventListener.calledWith("offline", sinon.match.func)
-      ).to.be.true;
-    });
-
-    it("should handle errors when globalThis is not available", () => {
-      mockGlobalThis.addEventListener.throws(new Error("No globalThis"));
-
-      expect(() => networkMonitor.start()).to.not.throw();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      expect(addEventListenerStub.calledTwice).to.be.true;
-    });
-  });
-
-  describe("stop", () => {
-    beforeEach(() => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-      networkMonitor.start();
-    });
-
-    it("should remove event listeners from libp2p", () => {
-      networkMonitor.stop();
-
-      const removeEventListenerStub =
-        libp2p.removeEventListener as sinon.SinonStub;
-      expect(removeEventListenerStub.calledTwice).to.be.true;
-      expect(
-        removeEventListenerStub.calledWith("peer:connect", sinon.match.func)
-      ).to.be.true;
-      expect(
-        removeEventListenerStub.calledWith("peer:disconnect", sinon.match.func)
-      ).to.be.true;
-    });
-
-    it("should remove event listeners from globalThis", () => {
-      networkMonitor.stop();
-
-      expect(mockGlobalThis.removeEventListener.calledTwice).to.be.true;
-      expect(
-        mockGlobalThis.removeEventListener.calledWith(
-          "online",
-          sinon.match.func
-        )
-      ).to.be.true;
-      expect(
-        mockGlobalThis.removeEventListener.calledWith(
-          "offline",
-          sinon.match.func
-        )
-      ).to.be.true;
-    });
-
-    it("should handle errors when removing globalThis listeners", () => {
-      mockGlobalThis.removeEventListener.throws(new Error("Remove failed"));
-
-      expect(() => networkMonitor.stop()).to.not.throw();
-
-      const removeEventListenerStub =
-        libp2p.removeEventListener as sinon.SinonStub;
-      expect(removeEventListenerStub.calledTwice).to.be.true;
-    });
-  });
-
-  describe("isConnected", () => {
-    beforeEach(() => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-    });
-
-    it("should return false when navigator.onLine is false", () => {
-      if (mockGlobalThis.navigator) {
-        mockGlobalThis.navigator.onLine = false;
-      }
-
-      expect(networkMonitor.isConnected()).to.be.false;
-    });
-
-    it("should return false when navigator.onLine is true but network is not connected", () => {
-      if (mockGlobalThis.navigator) {
-        mockGlobalThis.navigator.onLine = true;
-      }
-
-      expect(networkMonitor.isConnected()).to.be.false;
-    });
-
-    it("should handle case when navigator is not available", () => {
-      mockGlobalThis.navigator = undefined;
-
-      expect(networkMonitor.isConnected()).to.be.false;
-    });
-
-    it("should handle case when globalThis is not available", () => {
-      (global as unknown as { globalThis: undefined }).globalThis = undefined;
-
-      expect(networkMonitor.isConnected()).to.be.false;
-    });
-  });
-
-  describe("peer connection events", () => {
-    let connectHandler: () => void;
-    let disconnectHandler: () => void;
-
-    beforeEach(() => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-      networkMonitor.start();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-
-      connectHandler = addEventListenerStub.getCall(0).args[1];
-      disconnectHandler = addEventListenerStub.getCall(1).args[1];
-    });
-
-    it("should handle peer connect event", () => {
-      expect(networkMonitor.isConnected()).to.be.false;
-
-      connectHandler();
-
-      expect(networkMonitor.isConnected()).to.be.true;
-      const dispatchEventStub = events.dispatchEvent as sinon.SinonStub;
-      expect(dispatchEventStub.calledOnce).to.be.true;
-    });
-
-    it("should handle peer disconnect event when no connections remain", () => {
-      connectHandler();
-
-      const dispatchEventStub = events.dispatchEvent as sinon.SinonStub;
-      dispatchEventStub.resetHistory();
-
-      const getConnectionsStub = libp2p.getConnections as sinon.SinonStub;
-      getConnectionsStub.returns([]);
-
-      disconnectHandler();
-
-      expect(networkMonitor.isConnected()).to.be.false;
-      expect(dispatchEventStub.calledOnce).to.be.true;
-    });
-
-    it("should not change state when connections remain after disconnect", () => {
-      connectHandler();
-
-      const dispatchEventStub = events.dispatchEvent as sinon.SinonStub;
-      dispatchEventStub.resetHistory();
-
-      const getConnectionsStub = libp2p.getConnections as sinon.SinonStub;
-      getConnectionsStub.returns([{ id: "connection1" }]);
-
-      disconnectHandler();
-
-      expect(networkMonitor.isConnected()).to.be.true;
-      expect(dispatchEventStub.called).to.be.false;
-    });
-
-    it("should not dispatch event when already connected", () => {
-      connectHandler();
-      const dispatchEventStub = events.dispatchEvent as sinon.SinonStub;
-      dispatchEventStub.resetHistory();
-
-      connectHandler();
-
-      expect(dispatchEventStub.called).to.be.false;
-    });
-
-    it("should not dispatch event when already disconnected", () => {
-      connectHandler();
-
-      const getConnectionsStub = libp2p.getConnections as sinon.SinonStub;
-      getConnectionsStub.returns([]);
-      disconnectHandler();
-
-      const dispatchEventStub = events.dispatchEvent as sinon.SinonStub;
-      dispatchEventStub.resetHistory();
-
-      disconnectHandler();
-
-      expect(dispatchEventStub.called).to.be.false;
-    });
-  });
-
-  describe("browser online/offline events", () => {
-    let onlineHandler: () => void;
-    let offlineHandler: () => void;
-
-    beforeEach(() => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-      networkMonitor.start();
-
-      onlineHandler = mockGlobalThis.addEventListener.getCall(0).args[1];
-      offlineHandler = mockGlobalThis.addEventListener.getCall(1).args[1];
-    });
-
-    it("should dispatch network event when browser goes online", () => {
-      if (mockGlobalThis.navigator) {
-        mockGlobalThis.navigator.onLine = true;
-      }
-
-      onlineHandler();
-
-      const dispatchEventStub = events.dispatchEvent as sinon.SinonStub;
-      expect(dispatchEventStub.calledOnce).to.be.true;
-    });
-
-    it("should dispatch network event when browser goes offline", () => {
-      if (mockGlobalThis.navigator) {
-        mockGlobalThis.navigator.onLine = false;
-      }
-
-      offlineHandler();
-
-      const dispatchEventStub = events.dispatchEvent as sinon.SinonStub;
-      expect(dispatchEventStub.calledOnce).to.be.true;
-    });
-  });
-
-  describe("dispatchNetworkEvent", () => {
-    beforeEach(() => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-    });
-
-    it("should dispatch CustomEvent with correct type and detail", () => {
-      networkMonitor.start();
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      const connectHandler = addEventListenerStub.getCall(0).args[1];
-      connectHandler();
-
-      const dispatchEventStub = events.dispatchEvent as sinon.SinonStub;
-      expect(dispatchEventStub.calledOnce).to.be.true;
-      const dispatchedEvent = dispatchEventStub.getCall(0)
-        .args[0] as CustomEvent<boolean>;
-      expect(dispatchedEvent).to.be.instanceOf(CustomEvent);
-      expect(dispatchedEvent.type).to.equal(WakuEvent.Connection);
-      expect(dispatchedEvent.detail).to.be.true;
-    });
-  });
-
-  describe("error handling", () => {
-    beforeEach(() => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-    });
-
-    it("should handle errors when getting connections", () => {
-      const getConnectionsStub = libp2p.getConnections as sinon.SinonStub;
-      getConnectionsStub.throws(new Error("Get connections failed"));
-
-      networkMonitor.start();
-
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      const connectHandler = addEventListenerStub.getCall(0).args[1];
-      const disconnectHandler = addEventListenerStub.getCall(1).args[1];
-
-      connectHandler();
-      expect(networkMonitor.isConnected()).to.be.true;
-
-      expect(() => disconnectHandler()).to.throw("Get connections failed");
-    });
-
-    it("should handle errors when accessing navigator", () => {
-      Object.defineProperty(mockGlobalThis, "navigator", {
-        get: () => {
-          throw new Error("Navigator access failed");
-        }
-      });
-
-      expect(networkMonitor.isConnected()).to.be.false;
-    });
-  });
-
-  describe("integration", () => {
-    beforeEach(() => {
-      networkMonitor = new NetworkMonitor({
-        libp2p,
-        events
-      });
-      networkMonitor.start();
-    });
-
-    it("should handle complete connection lifecycle", () => {
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      const connectHandler = addEventListenerStub.getCall(0).args[1];
-      const disconnectHandler = addEventListenerStub.getCall(1).args[1];
-      const getConnectionsStub = libp2p.getConnections as sinon.SinonStub;
-
-      expect(networkMonitor.isConnected()).to.be.false;
-
-      connectHandler();
-      expect(networkMonitor.isConnected()).to.be.true;
-
-      getConnectionsStub.returns([{ id: "other" }]);
-      disconnectHandler();
-      expect(networkMonitor.isConnected()).to.be.true;
-
-      getConnectionsStub.returns([]);
-      disconnectHandler();
-      expect(networkMonitor.isConnected()).to.be.false;
-    });
-
-    it("should handle browser offline state overriding peer connections", () => {
-      const addEventListenerStub = libp2p.addEventListener as sinon.SinonStub;
-      const connectHandler = addEventListenerStub.getCall(0).args[1];
-
-      connectHandler();
-      expect(networkMonitor.isConnected()).to.be.true;
-
-      if (mockGlobalThis.navigator) {
-        mockGlobalThis.navigator.onLine = false;
-      }
-      expect(networkMonitor.isConnected()).to.be.false;
-
-      if (mockGlobalThis.navigator) {
-        mockGlobalThis.navigator.onLine = true;
-      }
-      expect(networkMonitor.isConnected()).to.be.true;
-    });
-  });
-});

packages/core/src/lib/connection_manager/network_monitor.ts

@@ -1,112 +0,0 @@
-import { IWakuEventEmitter, Libp2p, WakuEvent } from "@waku/interfaces";
-
-type NetworkMonitorConstructorOptions = {
-  libp2p: Libp2p;
-  events: IWakuEventEmitter;
-};
-
-interface INetworkMonitor {
-  start(): void;
-  stop(): void;
-  isConnected(): boolean;
-  isP2PConnected(): boolean;
-  isBrowserConnected(): boolean;
-}
-
-export class NetworkMonitor implements INetworkMonitor {
-  private readonly libp2p: Libp2p;
-  private readonly events: IWakuEventEmitter;
-
-  private isNetworkConnected: boolean = false;
-
-  public constructor(options: NetworkMonitorConstructorOptions) {
-    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);
-  }
-
-  public start(): void {
-    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
-    }
-  }
-
-  public stop(): void {
-    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.
-   */
-  public isConnected(): boolean {
-    if (!this.isBrowserConnected()) {
-      return false;
-    }
-
-    return this.isP2PConnected();
-  }
-
-  /**
-   * Returns true if the node is connected to the network via libp2p.
-   */
-  public isP2PConnected(): boolean {
-    return this.isNetworkConnected;
-  }
-
-  /**
-   * Returns true if the node is connected to the network via browser.
-   */
-  public isBrowserConnected(): boolean {
-    try {
-      if (globalThis?.navigator && !globalThis?.navigator?.onLine) {
-        return false;
-      }
-    } catch (err) {
-      // ignore
-    }
-
-    return true;
-  }
-
-  private onConnectedEvent(): void {
-    if (!this.isNetworkConnected) {
-      this.isNetworkConnected = true;
-      this.dispatchNetworkEvent();
-    }
-  }
-
-  private onDisconnectedEvent(): void {
-    if (this.isNetworkConnected && this.libp2p.getConnections().length === 0) {
-      this.isNetworkConnected = false;
-      this.dispatchNetworkEvent();
-    }
-  }
-
-  private dispatchNetworkEvent(): void {
-    this.events.dispatchEvent(
-      new CustomEvent<boolean>(WakuEvent.Connection, {
-        detail: this.isConnected()
-      })
-    );
-  }
-}

packages/core/src/lib/connection_manager/shard_reader.spec.ts

@@ -1,316 +0,0 @@
-import { PeerId } from "@libp2p/interface";
-import {
-  AutoSharding,
-  DEFAULT_NUM_SHARDS,
-  NetworkConfig,
-  PubsubTopic,
-  ShardInfo
-} from "@waku/interfaces";
-import { contentTopicToShardIndex, encodeRelayShard } from "@waku/utils";
-import { expect } from "chai";
-import { Libp2p } from "libp2p";
-import sinon from "sinon";
-
-import { ShardReader } from "./shard_reader.js";
-
-const createMockPeerId = (): PeerId => {
-  const mockPeerId = {
-    toString: () => "12D3KooWTest123",
-    equals: (other: PeerId) => other.toString() === "12D3KooWTest123"
-  };
-  return mockPeerId as unknown as PeerId;
-};
-
-describe("ShardReader", function () {
-  let mockLibp2p: sinon.SinonStubbedInstance<Libp2p>;
-  let mockPeerStore: any;
-  let shardReader: ShardReader;
-  let testPeerId: PeerId;
-
-  const testContentTopic = "/test/1/waku-light-push/utf8";
-  const testClusterId = 3;
-  const testShardIndex = contentTopicToShardIndex(
-    testContentTopic,
-    DEFAULT_NUM_SHARDS
-  );
-
-  const testNetworkConfig: AutoSharding = {
-    clusterId: testClusterId,
-    numShardsInCluster: DEFAULT_NUM_SHARDS
-  };
-
-  const testShardInfo: ShardInfo = {
-    clusterId: testClusterId,
-    shards: [testShardIndex]
-  };
-
-  beforeEach(async function () {
-    testPeerId = createMockPeerId();
-
-    mockPeerStore = {
-      get: sinon.stub(),
-      save: sinon.stub(),
-      merge: sinon.stub()
-    };
-
-    mockLibp2p = {
-      peerStore: mockPeerStore
-    } as any;
-
-    shardReader = new ShardReader({
-      libp2p: mockLibp2p as any,
-      networkConfig: testNetworkConfig
-    });
-  });
-
-  afterEach(function () {
-    sinon.restore();
-  });
-
-  describe("constructor", function () {
-    it("should create ShardReader with auto sharding network config", function () {
-      const config: AutoSharding = {
-        clusterId: 3,
-        numShardsInCluster: 10
-      };
-
-      const reader = new ShardReader({
-        libp2p: mockLibp2p as any,
-        networkConfig: config
-      });
-
-      expect(reader).to.be.instanceOf(ShardReader);
-    });
-
-    it("should create ShardReader with static shards network config", function () {
-      const config: NetworkConfig = {
-        clusterId: 3
-      };
-
-      const reader = new ShardReader({
-        libp2p: mockLibp2p as any,
-        networkConfig: config
-      });
-
-      expect(reader).to.be.instanceOf(ShardReader);
-    });
-  });
-
-  describe("isPeerOnNetwork", function () {
-    it("should return true when peer is on the same cluster", async function () {
-      const shardInfoBytes = encodeRelayShard(testShardInfo);
-      const mockPeer = {
-        metadata: new Map([["shardInfo", shardInfoBytes]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const result = await shardReader.isPeerOnCluster(testPeerId);
-
-      expect(result).to.be.true;
-      sinon.assert.calledWith(mockPeerStore.get, testPeerId);
-    });
-
-    it("should return false when peer is on different cluster", async function () {
-      const differentClusterShardInfo: ShardInfo = {
-        clusterId: 5,
-        shards: [1, 2]
-      };
-      const shardInfoBytes = encodeRelayShard(differentClusterShardInfo);
-      const mockPeer = {
-        metadata: new Map([["shardInfo", shardInfoBytes]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const result = await shardReader.isPeerOnCluster(testPeerId);
-
-      expect(result).to.be.false;
-    });
-
-    it("should return true even if peer has no overlapping shards", async function () {
-      const noOverlapShardInfo: ShardInfo = {
-        clusterId: testClusterId,
-        shards: [testShardIndex + 100, testShardIndex + 200] // Use different shards
-      };
-      const shardInfoBytes = encodeRelayShard(noOverlapShardInfo);
-      const mockPeer = {
-        metadata: new Map([["shardInfo", shardInfoBytes]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const result = await shardReader.isPeerOnCluster(testPeerId);
-
-      expect(result).to.be.true;
-    });
-
-    it("should return false when peer has no shard info", async function () {
-      const mockPeer = {
-        metadata: new Map()
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const result = await shardReader.isPeerOnCluster(testPeerId);
-
-      expect(result).to.be.false;
-    });
-
-    it("should return false when peer is not found", async function () {
-      mockPeerStore.get.rejects(new Error("Peer not found"));
-
-      const result = await shardReader.isPeerOnCluster(testPeerId);
-
-      expect(result).to.be.false;
-    });
-  });
-
-  describe("isPeerOnShard", function () {
-    it("should return true when peer is on the specified shard", async function () {
-      const shardInfoBytes = encodeRelayShard(testShardInfo);
-      const mockPeer = {
-        metadata: new Map([["shardInfo", shardInfoBytes]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const result = await shardReader.isPeerOnShard(
-        testPeerId,
-        testShardIndex
-      );
-
-      expect(result).to.be.true;
-    });
-
-    it("should return false when peer is on different cluster", async function () {
-      const shardInfoBytes = encodeRelayShard(testShardInfo);
-      const mockPeer = {
-        metadata: new Map([["shardInfo", shardInfoBytes]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const shardReaderCluster5 = new ShardReader({
-        libp2p: mockLibp2p as any,
-        networkConfig: { clusterId: 5 }
-      });
-
-      const result = await shardReaderCluster5.isPeerOnShard(
-        testPeerId,
-        testShardIndex
-      );
-
-      expect(result).to.be.false;
-    });
-
-    it("should return false when peer is not on the specified shard", async function () {
-      const shardInfoBytes = encodeRelayShard(testShardInfo);
-      const mockPeer = {
-        metadata: new Map([["shardInfo", shardInfoBytes]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const result = await shardReader.isPeerOnShard(
-        testPeerId,
-        testShardIndex + 100
-      );
-
-      expect(result).to.be.false;
-    });
-
-    it("should return false when peer shard info is not found", async function () {
-      mockPeerStore.get.rejects(new Error("Peer not found"));
-
-      const result = await shardReader.isPeerOnShard(
-        testPeerId,
-        testShardIndex
-      );
-
-      expect(result).to.be.false;
-    });
-  });
-
-  describe("isPeerOnTopic", function () {
-    it("should return true when peer is on the pubsub topic shard", async function () {
-      const shardInfoBytes = encodeRelayShard(testShardInfo);
-      const mockPeer = {
-        metadata: new Map([["shardInfo", shardInfoBytes]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const pubsubTopic: PubsubTopic = `/waku/2/rs/${testClusterId}/${testShardIndex}`;
-
-      const result = await shardReader.isPeerOnTopic(testPeerId, pubsubTopic);
-
-      expect(result).to.be.true;
-    });
-
-    it("should return false when peer is not on the pubsub topic shard", async function () {
-      const shardInfoBytes = encodeRelayShard(testShardInfo);
-      const mockPeer = {
-        metadata: new Map([["shardInfo", shardInfoBytes]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const pubsubTopic: PubsubTopic = `/waku/2/rs/${testClusterId}/${testShardIndex + 100}`;
-
-      const result = await shardReader.isPeerOnTopic(testPeerId, pubsubTopic);
-
-      expect(result).to.be.false;
-    });
-
-    it("should return false when pubsub topic parsing fails", async function () {
-      const shardInfoBytes = encodeRelayShard(testShardInfo);
-      const mockPeer = {
-        metadata: new Map([["shardInfo", shardInfoBytes]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const invalidPubsubTopic: PubsubTopic = "/invalid/topic";
-
-      const result = await shardReader.isPeerOnTopic(
-        testPeerId,
-        invalidPubsubTopic
-      );
-
-      expect(result).to.be.false;
-    });
-
-    it("should return false when peer is not found", async function () {
-      mockPeerStore.get.rejects(new Error("Peer not found"));
-
-      const pubsubTopic: PubsubTopic = `/waku/2/rs/${testClusterId}/${testShardIndex}`;
-
-      const result = await shardReader.isPeerOnTopic(testPeerId, pubsubTopic);
-
-      expect(result).to.be.false;
-    });
-  });
-
-  describe("error handling", function () {
-    it("should handle errors gracefully when getting peer info", async function () {
-      mockPeerStore.get.rejects(new Error("Network error"));
-
-      const result = await shardReader.isPeerOnCluster(testPeerId);
-
-      expect(result).to.be.false;
-    });
-
-    it("should handle corrupted shard info gracefully", async function () {
-      const mockPeer = {
-        metadata: new Map([["shardInfo", new Uint8Array([1, 2, 3])]])
-      };
-
-      mockPeerStore.get.resolves(mockPeer);
-
-      const result = await shardReader.isPeerOnCluster(testPeerId);
-
-      expect(result).to.be.false;
-    });
-  });
-});

packages/core/src/lib/connection_manager/shard_reader.ts

@@ -1,112 +0,0 @@
-import type { PeerId } from "@libp2p/interface";
-import type {
-  ClusterId,
-  NetworkConfig,
-  PubsubTopic,
-  ShardId,
-  ShardInfo
-} from "@waku/interfaces";
-import {
-  decodeRelayShard,
-  Logger,
-  pubsubTopicToSingleShardInfo
-} from "@waku/utils";
-import { Libp2p } from "libp2p";
-
-const log = new Logger("shard-reader");
-
-type ShardReaderConstructorOptions = {
-  libp2p: Libp2p;
-  networkConfig: NetworkConfig;
-};
-
-export interface IShardReader {
-  hasShardInfo(id: PeerId): Promise<boolean>;
-  isPeerOnCluster(id: PeerId): Promise<boolean>;
-  isPeerOnShard(
-    id: PeerId,
-    clusterId: ClusterId,
-    shard: ShardId
-  ): Promise<boolean>;
-  isPeerOnTopic(id: PeerId, pubsubTopic: PubsubTopic): Promise<boolean>;
-}
-
-/**
- * This class is responsible for reading the shard info from the libp2p peer store or from the current node's network config.
- */
-export class ShardReader implements IShardReader {
-  private readonly libp2p: Libp2p;
-
-  private readonly clusterId: ClusterId;
-
-  public constructor(options: ShardReaderConstructorOptions) {
-    this.libp2p = options.libp2p;
-
-    this.clusterId = options.networkConfig.clusterId;
-  }
-
-  public async isPeerOnCluster(id: PeerId): Promise<boolean> {
-    const peerRelayShards = await this.getRelayShards(id);
-
-    if (!peerRelayShards) {
-      return false;
-    }
-
-    return peerRelayShards.clusterId === this.clusterId;
-  }
-
-  public async hasShardInfo(id: PeerId): Promise<boolean> {
-    const shardInfo = await this.getRelayShards(id);
-    return !!shardInfo;
-  }
-
-  public async isPeerOnTopic(
-    id: PeerId,
-    pubsubTopic: PubsubTopic
-  ): Promise<boolean> {
-    try {
-      const { clusterId, shard } = pubsubTopicToSingleShardInfo(pubsubTopic);
-      if (clusterId !== this.clusterId) return false;
-      return await this.isPeerOnShard(id, shard);
-    } catch (error) {
-      log.error(
-        `Error comparing pubsub topic ${pubsubTopic} with shard info for ${id}`,
-        error
-      );
-      return false;
-    }
-  }
-
-  public async isPeerOnShard(id: PeerId, shard: ShardId): Promise<boolean> {
-    const peerShardInfo = await this.getRelayShards(id);
-    log.info(
-      `Checking if peer on same shard: this { clusterId: ${this.clusterId}, shardId: ${shard} },` +
-        `${id} { clusterId: ${peerShardInfo?.clusterId}, shards: ${peerShardInfo?.shards} }`
-    );
-    if (!peerShardInfo) {
-      return false;
-    }
-
-    return (
-      peerShardInfo.clusterId === this.clusterId &&
-      peerShardInfo.shards.includes(shard)
-    );
-  }
-
-  private async getRelayShards(id: PeerId): Promise<ShardInfo | undefined> {
-    try {
-      const peer = await this.libp2p.peerStore.get(id);
-
-      const shardInfoBytes = peer.metadata.get("shardInfo");
-
-      if (!shardInfoBytes) {
-        return undefined;
-      }
-
-      return decodeRelayShard(shardInfoBytes);
-    } catch (error) {
-      log.error(`Error getting shard info for ${id}`, error);
-      return undefined;
-    }
-  }
-}

packages/core/src/lib/connection_manager/utils.spec.ts

@@ -1,46 +0,0 @@
-import { peerIdFromString } from "@libp2p/peer-id";
-import { expect } from "chai";
-
-import { mapToPeerId, mapToPeerIdOrMultiaddr } from "./utils.js";
-
-describe("mapToPeerIdOrMultiaddr", () => {
-  it("should return PeerId when PeerId is provided", async () => {
-    const peerId = peerIdFromString(
-      "12D3KooWHFJGwBXD7ukXqKaQZYmV1U3xxN1XCNrgriSEyvkxf6nE"
-    );
-
-    const result = mapToPeerIdOrMultiaddr(peerId);
-
-    expect(result).to.equal(peerId);
-  });
-
-  it("should return Multiaddr when Multiaddr input is provided", () => {
-    const multiAddr =
-      "/ip4/127.0.0.1/tcp/8000/p2p/12D3KooWHFJGwBXD7ukXqKaQZYmV1U3xxN1XCNrgriSEyvkxf6nE";
-
-    const result = mapToPeerIdOrMultiaddr(multiAddr);
-
-    expect(result.toString()).to.equal(multiAddr);
-  });
-});
-
-describe("mapToPeerId", () => {
-  it("should return PeerId when PeerId is provided", async () => {
-    const peerId = peerIdFromString(
-      "12D3KooWHFJGwBXD7ukXqKaQZYmV1U3xxN1XCNrgriSEyvkxf6nE"
-    );
-    const result = mapToPeerId(peerId);
-    expect(result).to.equal(peerId);
-    expect(result.toString()).to.equal(peerId.toString());
-  });
-
-  it("should return PeerId when Multiaddr input is provided", () => {
-    const multiAddr =
-      "/ip4/127.0.0.1/tcp/8000/p2p/12D3KooWHFJGwBXD7ukXqKaQZYmV1U3xxN1XCNrgriSEyvkxf6nE";
-
-    const result = mapToPeerId(multiAddr);
-    expect(result.toString()).to.equal(
-      "12D3KooWHFJGwBXD7ukXqKaQZYmV1U3xxN1XCNrgriSEyvkxf6nE"
-    );
-  });
-});

packages/core/src/lib/connection_manager/utils.ts

@@ -1,7 +1,4 @@
-import { isPeerId, type Peer, type PeerId } from "@libp2p/interface";
-import { peerIdFromString } from "@libp2p/peer-id";
-import { Multiaddr, multiaddr, MultiaddrInput } from "@multiformats/multiaddr";
-import { Libp2p } from "@waku/interfaces";
+import type { Peer } from "@libp2p/interface";
 import { bytesToUtf8 } from "@waku/utils/bytes";
 
 /**
@@ -26,49 +23,3 @@ export const getPeerPing = (peer: Peer | null): number => {
     return -1;
   }
 };
-
-/**
- * Maps a PeerId or MultiaddrInput to a PeerId or Multiaddr.
- * @param input - The PeerId or MultiaddrInput to map.
- * @returns The PeerId or Multiaddr.
- * @throws {Error} If the input is not a valid PeerId or MultiaddrInput.
- */
-export const mapToPeerIdOrMultiaddr = (
-  input: PeerId | MultiaddrInput
-): PeerId | Multiaddr => {
-  return isPeerId(input) ? input : multiaddr(input);
-};
-
-/**
- * Maps a PeerId or MultiaddrInput to a PeerId.
- * @param input - The PeerId or MultiaddrInput to map.
- * @returns The PeerId.
- * @throws {Error} If the input is not a valid PeerId or MultiaddrInput.
- */
-export const mapToPeerId = (input: PeerId | MultiaddrInput): PeerId => {
-  return isPeerId(input)
-    ? input
-    : peerIdFromString(multiaddr(input).getPeerId()!);
-};
-
-/**
- * Checks if the address is supported by the libp2p instance.
- * @param libp2p - The libp2p instance.
- * @param addresses - The addresses to check.
- * @returns True if the addresses are supported, false otherwise.
- */
-export const isAddressesSupported = (
-  libp2p: Libp2p,
-  addresses: Multiaddr[]
-): boolean => {
-  const transports =
-    libp2p?.components?.transportManager?.getTransports() || [];
-
-  if (transports.length === 0) {
-    return false;
-  }
-
-  return transports
-    .map((transport) => transport.dialFilter(addresses))
-    .some((supportedAddresses) => supportedAddresses.length > 0);
-};

packages/core/src/lib/filter/filter.ts

@@ -1,10 +1,10 @@
-import type { PeerId } from "@libp2p/interface";
+import type { PeerId, Stream } from "@libp2p/interface";
 import type { IncomingStreamData } from "@libp2p/interface-internal";
 import {
   type ContentTopic,
-  type FilterCoreResult,
-  FilterError,
+  type CoreProtocolResult,
   type Libp2p,
+  ProtocolError,
   type PubsubTopic
 } from "@waku/interfaces";
 import { WakuMessage } from "@waku/proto";
@@ -22,7 +22,7 @@ import {
   FilterSubscribeRpc
 } from "./filter_rpc.js";
 
-const log = new Logger("filter-core");
+const log = new Logger("filter:v2");
 
 export const FilterCodecs = {
   SUBSCRIBE: "/vac/waku/filter-subscribe/2.0.0-beta1",
@@ -37,55 +37,59 @@ type IncomingMessageHandler = (
 
 export class FilterCore {
   private streamManager: StreamManager;
+  private static handleIncomingMessage?: IncomingMessageHandler;
 
   public readonly multicodec = FilterCodecs.SUBSCRIBE;
 
   public constructor(
-    private handleIncomingMessage: IncomingMessageHandler,
-    private libp2p: Libp2p
+    handleIncomingMessage: IncomingMessageHandler,
+    public readonly pubsubTopics: PubsubTopic[],
+    libp2p: Libp2p
   ) {
     this.streamManager = new StreamManager(
       FilterCodecs.SUBSCRIBE,
       libp2p.components
     );
-  }
 
-  public async start(): Promise<void> {
-    try {
-      await this.libp2p.handle(FilterCodecs.PUSH, this.onRequest.bind(this), {
+    // TODO(weboko): remove when @waku/sdk 0.0.33 is released
+    const prevHandler = FilterCore.handleIncomingMessage;
+    FilterCore.handleIncomingMessage = !prevHandler
+      ? handleIncomingMessage
+      : async (pubsubTopic, message, peerIdStr): Promise<void> => {
+          try {
+            await prevHandler(pubsubTopic, message, peerIdStr);
+          } catch (e) {
+            log.error(
+              "Previous FilterCore incoming message handler failed ",
+              e
+            );
+          }
+
+          try {
+            await handleIncomingMessage(pubsubTopic, message, peerIdStr);
+          } catch (e) {
+            log.error("Present FilterCore incoming message handler failed ", e);
+          }
+
+          return;
+        };
+
+    libp2p
+      .handle(FilterCodecs.PUSH, this.onRequest.bind(this), {
         maxInboundStreams: 100
+      })
+      .catch((e) => {
+        log.error("Failed to register ", FilterCodecs.PUSH, e);
       });
-    } catch (e) {
-      log.error("Failed to register ", FilterCodecs.PUSH, e);
-    }
-  }
-
-  public async stop(): Promise<void> {
-    this.streamManager.stop();
-    try {
-      await this.libp2p.unhandle(FilterCodecs.PUSH);
-    } catch (e) {
-      log.error("Failed to unregister ", FilterCodecs.PUSH, e);
-    }
   }
 
   public async subscribe(
     pubsubTopic: PubsubTopic,
     peerId: PeerId,
     contentTopics: ContentTopic[]
-  ): Promise<FilterCoreResult> {
+  ): Promise<CoreProtocolResult> {
     const stream = await this.streamManager.getStream(peerId);
 
-    if (!stream) {
-      return {
-        success: null,
-        failure: {
-          error: FilterError.NO_STREAM_AVAILABLE,
-          peerId: peerId
-        }
-      };
-    }
-
     const request = FilterSubscribeRpc.createSubscribeRequest(
       pubsubTopic,
       contentTopics
@@ -100,16 +104,12 @@ export class FilterCore {
         lp.decode,
         async (source) => await all(source)
       );
-
-      if (!res?.length) {
-        throw Error("Received no response from subscription request.");
-      }
     } catch (error) {
       log.error("Failed to send subscribe request", error);
       return {
         success: null,
         failure: {
-          error: FilterError.GENERIC_FAIL,
+          error: ProtocolError.GENERIC_FAIL,
           peerId: peerId
         }
       };
@@ -124,7 +124,7 @@ export class FilterCore {
       );
       return {
         failure: {
-          error: FilterError.REMOTE_PEER_REJECTED,
+          error: ProtocolError.REMOTE_PEER_REJECTED,
           peerId: peerId
         },
         success: null
@@ -141,15 +141,19 @@ export class FilterCore {
     pubsubTopic: PubsubTopic,
     peerId: PeerId,
     contentTopics: ContentTopic[]
-  ): Promise<FilterCoreResult> {
-    const stream = await this.streamManager.getStream(peerId);
-
-    if (!stream) {
-      log.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
+  ): Promise<CoreProtocolResult> {
+    let stream: Stream | undefined;
+    try {
+      stream = await this.streamManager.getStream(peerId);
+    } catch (error) {
+      log.error(
+        `Failed to get a stream for remote peer${peerId.toString()}`,
+        error
+      );
       return {
         success: null,
         failure: {
-          error: FilterError.NO_STREAM_AVAILABLE,
+          error: ProtocolError.NO_STREAM_AVAILABLE,
           peerId: peerId
         }
       };
@@ -167,7 +171,7 @@ export class FilterCore {
       return {
         success: null,
         failure: {
-          error: FilterError.GENERIC_FAIL,
+          error: ProtocolError.GENERIC_FAIL,
           peerId: peerId
         }
       };
@@ -182,20 +186,9 @@ export class FilterCore {
   public async unsubscribeAll(
     pubsubTopic: PubsubTopic,
     peerId: PeerId
-  ): Promise<FilterCoreResult> {
+  ): Promise<CoreProtocolResult> {
     const stream = await this.streamManager.getStream(peerId);
 
-    if (!stream) {
-      log.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
-      return {
-        success: null,
-        failure: {
-          error: FilterError.NO_STREAM_AVAILABLE,
-          peerId: peerId
-        }
-      };
-    }
-
     const request = FilterSubscribeRpc.createUnsubscribeAllRequest(pubsubTopic);
 
     const res = await pipe(
@@ -209,7 +202,7 @@ export class FilterCore {
     if (!res || !res.length) {
       return {
         failure: {
-          error: FilterError.NO_RESPONSE,
+          error: ProtocolError.NO_RESPONSE,
           peerId: peerId
         },
         success: null
@@ -225,7 +218,7 @@ export class FilterCore {
       );
       return {
         failure: {
-          error: FilterError.REMOTE_PEER_REJECTED,
+          error: ProtocolError.REMOTE_PEER_REJECTED,
           peerId: peerId
         },
         success: null
@@ -238,15 +231,19 @@ export class FilterCore {
     };
   }
 
-  public async ping(peerId: PeerId): Promise<FilterCoreResult> {
-    const stream = await this.streamManager.getStream(peerId);
-
-    if (!stream) {
-      log.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
+  public async ping(peerId: PeerId): Promise<CoreProtocolResult> {
+    let stream: Stream | undefined;
+    try {
+      stream = await this.streamManager.getStream(peerId);
+    } catch (error) {
+      log.error(
+        `Failed to get a stream for remote peer${peerId.toString()}`,
+        error
+      );
       return {
         success: null,
         failure: {
-          error: FilterError.NO_STREAM_AVAILABLE,
+          error: ProtocolError.NO_STREAM_AVAILABLE,
           peerId: peerId
         }
       };
@@ -268,7 +265,7 @@ export class FilterCore {
       return {
         success: null,
         failure: {
-          error: FilterError.GENERIC_FAIL,
+          error: ProtocolError.GENERIC_FAIL,
           peerId: peerId
         }
       };
@@ -278,7 +275,7 @@ export class FilterCore {
       return {
         success: null,
         failure: {
-          error: FilterError.NO_RESPONSE,
+          error: ProtocolError.NO_RESPONSE,
           peerId: peerId
         }
       };
@@ -294,7 +291,7 @@ export class FilterCore {
       return {
         success: null,
         failure: {
-          error: FilterError.REMOTE_PEER_REJECTED,
+          error: ProtocolError.REMOTE_PEER_REJECTED,
           peerId: peerId
         }
       };
@@ -326,7 +323,7 @@ export class FilterCore {
             return;
           }
 
-          await this.handleIncomingMessage(
+          await FilterCore.handleIncomingMessage?.(
             pubsubTopic,
             wakuMessage,
             connection.remotePeer.toString()

packages/core/src/lib/light_push/constants.ts

@@ -1,7 +0,0 @@
-export const CODECS = {
-  v2: "/vac/waku/lightpush/2.0.0-beta1",
-  v3: "/vac/waku/lightpush/3.0.0"
-} as const;
-
-export const LightPushCodecV2 = CODECS.v2;
-export const LightPushCodec = CODECS.v3;

packages/core/src/lib/light_push/index.ts

@@ -1,2 +1 @@
-export { LightPushCore } from "./light_push.js";
-export { LightPushCodec, LightPushCodecV2 } from "./constants.js";
+export { LightPushCore, LightPushCodec, PushResponse } from "./light_push.js";

packages/core/src/lib/light_push/light_push.ts

@@ -1,11 +1,15 @@
 import type { PeerId, Stream } from "@libp2p/interface";
 import {
+  type CoreProtocolResult,
   type IEncoder,
   type IMessage,
   type Libp2p,
-  type LightPushCoreResult,
-  LightPushError
+  ProtocolError,
+  PubsubTopic,
+  type ThisOrThat
 } from "@waku/interfaces";
+import { PushResponse } from "@waku/proto";
+import { isMessageSizeUnderCap } from "@waku/utils";
 import { Logger } from "@waku/utils";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
@@ -14,76 +18,96 @@ import { Uint8ArrayList } from "uint8arraylist";
 
 import { StreamManager } from "../stream_manager/index.js";
 
-import { CODECS } from "./constants.js";
-import { ProtocolHandler } from "./protocol_handler.js";
+import { PushRpc } from "./push_rpc.js";
+import { isRLNResponseError } from "./utils.js";
 
 const log = new Logger("light-push");
 
+export const LightPushCodec = "/vac/waku/lightpush/2.0.0-beta1";
+export { PushResponse };
+
+type PreparePushMessageResult = ThisOrThat<"query", PushRpc>;
+
 /**
  * Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
  */
 export class LightPushCore {
   private readonly streamManager: StreamManager;
-  private readonly streamManagerV2: StreamManager;
 
-  public readonly multicodec = [CODECS.v3, CODECS.v2];
+  public readonly multicodec = LightPushCodec;
 
-  public constructor(private libp2p: Libp2p) {
-    this.streamManagerV2 = new StreamManager(CODECS.v2, libp2p.components);
-    this.streamManager = new StreamManager(CODECS.v3, libp2p.components);
+  public constructor(
+    public readonly pubsubTopics: PubsubTopic[],
+    libp2p: Libp2p
+  ) {
+    this.streamManager = new StreamManager(LightPushCodec, libp2p.components);
   }
 
-  public stop(): void {
-    this.streamManager.stop();
-    this.streamManagerV2.stop();
+  private async preparePushMessage(
+    encoder: IEncoder,
+    message: IMessage
+  ): Promise<PreparePushMessageResult> {
+    try {
+      if (!message.payload || message.payload.length === 0) {
+        log.error("Failed to send waku light push: payload is empty");
+        return { query: null, error: ProtocolError.EMPTY_PAYLOAD };
+      }
+
+      if (!(await isMessageSizeUnderCap(encoder, message))) {
+        log.error("Failed to send waku light push: message is bigger than 1MB");
+        return { query: null, error: ProtocolError.SIZE_TOO_BIG };
+      }
+
+      const protoMessage = await encoder.toProtoObj(message);
+      if (!protoMessage) {
+        log.error("Failed to encode to protoMessage, aborting push");
+        return {
+          query: null,
+          error: ProtocolError.ENCODE_FAILED
+        };
+      }
+
+      const query = PushRpc.createRequest(protoMessage, encoder.pubsubTopic);
+      return { query, error: null };
+    } catch (error) {
+      log.error("Failed to prepare push message", error);
+
+      return {
+        query: null,
+        error: ProtocolError.GENERIC_FAIL
+      };
+    }
   }
 
   public async send(
     encoder: IEncoder,
     message: IMessage,
-    peerId: PeerId,
-    useLegacy: boolean = false
-  ): Promise<LightPushCoreResult> {
-    const protocol = await this.getProtocol(peerId, useLegacy);
-
-    log.info(
-      `Sending light push request to peer:${peerId.toString()}, protocol:${protocol}`
-    );
-
-    if (!protocol) {
-      return {
-        success: null,
-        failure: {
-          error: LightPushError.GENERIC_FAIL,
-          peerId
-        }
-      };
-    }
-
-    const { rpc, error: prepError } = await ProtocolHandler.preparePushMessage(
+    peerId: PeerId
+  ): Promise<CoreProtocolResult> {
+    const { query, error: preparationError } = await this.preparePushMessage(
       encoder,
-      message,
-      protocol
+      message
     );
 
-    if (prepError) {
+    if (preparationError || !query) {
       return {
         success: null,
         failure: {
-          error: prepError,
+          error: preparationError,
           peerId
         }
       };
     }
 
-    const stream = await this.getStream(peerId, protocol);
-
-    if (!stream) {
-      log.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
+    let stream: Stream;
+    try {
+      stream = await this.streamManager.getStream(peerId);
+    } catch (error) {
+      log.error("Failed to get stream", error);
       return {
         success: null,
         failure: {
-          error: LightPushError.NO_STREAM_AVAILABLE,
+          error: ProtocolError.NO_STREAM_AVAILABLE,
           peerId: peerId
         }
       };
@@ -92,74 +116,76 @@ export class LightPushCore {
     let res: Uint8ArrayList[] | undefined;
     try {
       res = await pipe(
-        [rpc.encode()],
+        [query.encode()],
         lp.encode,
         stream,
         lp.decode,
         async (source) => await all(source)
       );
     } catch (err) {
+      // can fail only because of `stream` abortion
       log.error("Failed to send waku light push request", err);
       return {
         success: null,
         failure: {
-          error: LightPushError.STREAM_ABORTED,
+          error: ProtocolError.STREAM_ABORTED,
           peerId: peerId
         }
       };
     }
 
     const bytes = new Uint8ArrayList();
-    res.forEach((chunk) => bytes.append(chunk));
+    res.forEach((chunk) => {
+      bytes.append(chunk);
+    });
 
-    if (bytes.length === 0) {
+    let response: PushResponse | undefined;
+    try {
+      response = PushRpc.decode(bytes).response;
+    } catch (err) {
+      log.error("Failed to decode push reply", err);
       return {
         success: null,
         failure: {
-          error: LightPushError.NO_RESPONSE,
+          error: ProtocolError.DECODE_FAILED,
           peerId: peerId
         }
       };
     }
 
-    return ProtocolHandler.handleResponse(bytes, protocol, peerId);
-  }
-
-  private async getProtocol(
-    peerId: PeerId,
-    useLegacy: boolean
-  ): Promise<string | undefined> {
-    try {
-      const peer = await this.libp2p.peerStore.get(peerId);
-
-      if (
-        useLegacy ||
-        (!peer.protocols.includes(CODECS.v3) &&
-          peer.protocols.includes(CODECS.v2))
-      ) {
-        return CODECS.v2;
-      } else if (peer.protocols.includes(CODECS.v3)) {
-        return CODECS.v3;
-      } else {
-        throw new Error("No supported protocol found");
-      }
-    } catch (error) {
-      log.error("Failed to get protocol", error);
-      return undefined;
+    if (!response) {
+      log.error("Remote peer fault: No response in PushRPC");
+      return {
+        success: null,
+        failure: {
+          error: ProtocolError.NO_RESPONSE,
+          peerId: peerId
+        }
+      };
     }
-  }
 
-  private async getStream(
-    peerId: PeerId,
-    protocol: string
-  ): Promise<Stream | undefined> {
-    switch (protocol) {
-      case CODECS.v2:
-        return this.streamManagerV2.getStream(peerId);
-      case CODECS.v3:
-        return this.streamManager.getStream(peerId);
-      default:
-        return undefined;
+    if (isRLNResponseError(response.info)) {
+      log.error("Remote peer fault: RLN generation");
+      return {
+        success: null,
+        failure: {
+          error: ProtocolError.RLN_PROOF_GENERATION,
+          peerId: peerId
+        }
+      };
     }
+
+    if (!response.isSuccess) {
+      log.error("Remote peer rejected the message: ", response.info);
+      return {
+        success: null,
+        failure: {
+          error: ProtocolError.REMOTE_PEER_REJECTED,
+          peerId: peerId
+        }
+      };
+    }
+
+    return { success: peerId, failure: null };
   }
 }

packages/core/src/lib/light_push/protocol_handler.ts

@@ -1,191 +0,0 @@
-import type { PeerId } from "@libp2p/interface";
-import type { IEncoder, IMessage, LightPushCoreResult } from "@waku/interfaces";
-import { LightPushError, LightPushStatusCode } from "@waku/interfaces";
-import { PushResponse, WakuMessage } from "@waku/proto";
-import { isMessageSizeUnderCap, Logger } from "@waku/utils";
-import { Uint8ArrayList } from "uint8arraylist";
-
-import { CODECS } from "./constants.js";
-import { PushRpcV2 } from "./push_rpc.js";
-import { PushRpc } from "./push_rpc_v3.js";
-import { isRLNResponseError } from "./utils.js";
-
-type VersionedPushRpc =
-  | ({ version: "v2" } & PushRpcV2)
-  | ({ version: "v3" } & PushRpc);
-
-type PreparePushMessageResult =
-  | { rpc: VersionedPushRpc; error: null }
-  | { rpc: null; error: LightPushError };
-
-const log = new Logger("light-push:protocol-handler");
-
-export class ProtocolHandler {
-  public static async preparePushMessage(
-    encoder: IEncoder,
-    message: IMessage,
-    protocol: string
-  ): Promise<PreparePushMessageResult> {
-    try {
-      if (!message.payload || message.payload.length === 0) {
-        log.error("Failed to send waku light push: payload is empty");
-        return { rpc: null, error: LightPushError.EMPTY_PAYLOAD };
-      }
-
-      if (!(await isMessageSizeUnderCap(encoder, message))) {
-        log.error("Failed to send waku light push: message is bigger than 1MB");
-        return { rpc: null, error: LightPushError.SIZE_TOO_BIG };
-      }
-
-      const protoMessage = await encoder.toProtoObj(message);
-      if (!protoMessage) {
-        log.error("Failed to encode to protoMessage, aborting push");
-        return { rpc: null, error: LightPushError.ENCODE_FAILED };
-      }
-
-      if (protocol === CODECS.v3) {
-        log.info("Creating v3 RPC message");
-        return {
-          rpc: ProtocolHandler.createV3Rpc(protoMessage, encoder.pubsubTopic),
-          error: null
-        };
-      }
-
-      log.info("Creating v2 RPC message");
-      return {
-        rpc: ProtocolHandler.createV2Rpc(protoMessage, encoder.pubsubTopic),
-        error: null
-      };
-    } catch (err) {
-      log.error("Failed to prepare push message", err);
-      return { rpc: null, error: LightPushError.GENERIC_FAIL };
-    }
-  }
-
-  /**
-   * Decode and evaluate a LightPush response according to the protocol version
-   */
-  public static handleResponse(
-    bytes: Uint8ArrayList,
-    protocol: string,
-    peerId: PeerId
-  ): LightPushCoreResult {
-    if (protocol === CODECS.v3) {
-      return ProtocolHandler.handleV3Response(bytes, peerId);
-    }
-
-    return ProtocolHandler.handleV2Response(bytes, peerId);
-  }
-
-  private static handleV3Response(
-    bytes: Uint8ArrayList,
-    peerId: PeerId
-  ): LightPushCoreResult {
-    try {
-      const decodedRpcV3 = PushRpc.decodeResponse(bytes);
-      const statusCode = decodedRpcV3.statusCode;
-      const statusDesc = decodedRpcV3.statusDesc;
-
-      if (statusCode !== LightPushStatusCode.SUCCESS) {
-        const error = LightPushError.REMOTE_PEER_REJECTED;
-        log.error(
-          `Remote peer rejected with v3 status code ${statusCode}: ${statusDesc}`
-        );
-        return {
-          success: null,
-          failure: {
-            error,
-            peerId: peerId
-          }
-        };
-      }
-
-      if (decodedRpcV3.relayPeerCount !== undefined) {
-        log.info(`Message relayed to ${decodedRpcV3.relayPeerCount} peers`);
-      }
-
-      return { success: peerId, failure: null };
-    } catch (err) {
-      return {
-        success: null,
-        failure: {
-          error: LightPushError.DECODE_FAILED,
-          peerId: peerId
-        }
-      };
-    }
-  }
-
-  private static handleV2Response(
-    bytes: Uint8ArrayList,
-    peerId: PeerId
-  ): LightPushCoreResult {
-    let response: PushResponse | undefined;
-    try {
-      const decodedRpc = PushRpcV2.decode(bytes);
-      response = decodedRpc.response;
-    } catch (err) {
-      return {
-        success: null,
-        failure: {
-          error: LightPushError.DECODE_FAILED,
-          peerId: peerId
-        }
-      };
-    }
-
-    if (!response) {
-      return {
-        success: null,
-        failure: {
-          error: LightPushError.NO_RESPONSE,
-          peerId: peerId
-        }
-      };
-    }
-
-    if (isRLNResponseError(response.info)) {
-      log.error("Remote peer fault: RLN generation");
-      return {
-        success: null,
-        failure: {
-          error: LightPushError.RLN_PROOF_GENERATION,
-          peerId: peerId
-        }
-      };
-    }
-
-    if (!response.isSuccess) {
-      log.error("Remote peer rejected the message: ", response.info);
-      return {
-        success: null,
-        failure: {
-          error: LightPushError.REMOTE_PEER_REJECTED,
-          peerId: peerId
-        }
-      };
-    }
-
-    return { success: peerId, failure: null };
-  }
-
-  private static createV2Rpc(
-    message: WakuMessage,
-    pubsubTopic: string
-  ): VersionedPushRpc {
-    const v2Rpc = PushRpcV2.createRequest(message, pubsubTopic);
-    return Object.assign(v2Rpc, { version: "v2" as const });
-  }
-
-  private static createV3Rpc(
-    message: WakuMessage,
-    pubsubTopic: string
-  ): VersionedPushRpc {
-    if (!message.timestamp) {
-      message.timestamp = BigInt(Date.now()) * BigInt(1_000_000);
-    }
-
-    const v3Rpc = PushRpc.createRequest(message, pubsubTopic);
-    return Object.assign(v3Rpc, { version: "v3" as const });
-  }
-}

packages/core/src/lib/light_push/push_rpc.ts

@@ -2,14 +2,14 @@ import { proto_lightpush as proto } from "@waku/proto";
 import type { Uint8ArrayList } from "uint8arraylist";
 import { v4 as uuid } from "uuid";
 
-export class PushRpcV2 {
+export class PushRpc {
   public constructor(public proto: proto.PushRpc) {}
 
   public static createRequest(
     message: proto.WakuMessage,
     pubsubTopic: string
-  ): PushRpcV2 {
-    return new PushRpcV2({
+  ): PushRpc {
+    return new PushRpc({
       requestId: uuid(),
       request: {
         message: message,
@@ -19,9 +19,9 @@ export class PushRpcV2 {
     });
   }
 
-  public static decode(bytes: Uint8ArrayList): PushRpcV2 {
+  public static decode(bytes: Uint8ArrayList): PushRpc {
     const res = proto.PushRpc.decode(bytes);
-    return new PushRpcV2(res);
+    return new PushRpc(res);
   }
 
   public encode(): Uint8Array {

packages/core/src/lib/light_push/push_rpc_v3.ts

@@ -1,162 +0,0 @@
-import { proto_lightpush as proto } from "@waku/proto";
-import type { Uint8ArrayList } from "uint8arraylist";
-import { v4 as uuid } from "uuid";
-
-/**
- * LightPush v3 protocol RPC handler.
- * Implements the v3 message format with correct field numbers:
- * - requestId: 1
- * - pubsubTopic: 20
- * - message: 21
- */
-export class PushRpc {
-  public constructor(
-    public proto: proto.LightPushRequestV3 | proto.LightPushResponseV3
-  ) {}
-
-  /**
-   * Create a v3 request message with proper field numbering
-   */
-  public static createRequest(
-    message: proto.WakuMessage,
-    pubsubTopic: string
-  ): PushRpc {
-    return new PushRpc({
-      requestId: uuid(),
-      pubsubTopic: pubsubTopic,
-      message: message
-    });
-  }
-
-  /**
-   * Create a v3 response message with status code handling
-   */
-  public static createResponse(
-    requestId: string,
-    statusCode: number,
-    statusDesc?: string,
-    relayPeerCount?: number
-  ): PushRpc {
-    return new PushRpc({
-      requestId,
-      statusCode,
-      statusDesc,
-      relayPeerCount
-    });
-  }
-
-  /**
-   * Decode v3 request message
-   */
-  public static decodeRequest(bytes: Uint8ArrayList): PushRpc {
-    const res = proto.LightPushRequestV3.decode(bytes);
-    return new PushRpc(res);
-  }
-
-  /**
-   * Decode v3 response message
-   */
-  public static decodeResponse(bytes: Uint8ArrayList): PushRpc {
-    const res = proto.LightPushResponseV3.decode(bytes);
-    return new PushRpc(res);
-  }
-
-  /**
-   * Encode message to bytes
-   */
-  public encode(): Uint8Array {
-    if (this.isRequest()) {
-      return proto.LightPushRequestV3.encode(
-        this.proto as proto.LightPushRequestV3
-      );
-    } else {
-      return proto.LightPushResponseV3.encode(
-        this.proto as proto.LightPushResponseV3
-      );
-    }
-  }
-
-  /**
-   * Get request data (if this is a request message)
-   */
-  public get request(): proto.LightPushRequestV3 | undefined {
-    return this.isRequest()
-      ? (this.proto as proto.LightPushRequestV3)
-      : undefined;
-  }
-
-  /**
-   * Get response data (if this is a response message)
-   */
-  public get response(): proto.LightPushResponseV3 | undefined {
-    return this.isResponse()
-      ? (this.proto as proto.LightPushResponseV3)
-      : undefined;
-  }
-
-  /**
-   * Get the request ID
-   */
-  public get requestId(): string {
-    return this.proto.requestId;
-  }
-
-  /**
-   * Get the pubsub topic (only available in requests)
-   */
-  public get pubsubTopic(): string | undefined {
-    return this.isRequest()
-      ? (this.proto as proto.LightPushRequestV3).pubsubTopic
-      : undefined;
-  }
-
-  /**
-   * Get the message (only available in requests)
-   */
-  public get message(): proto.WakuMessage | undefined {
-    return this.isRequest()
-      ? (this.proto as proto.LightPushRequestV3).message
-      : undefined;
-  }
-
-  /**
-   * Get the status code (only available in responses)
-   */
-  public get statusCode(): number | undefined {
-    return this.isResponse()
-      ? (this.proto as proto.LightPushResponseV3).statusCode
-      : undefined;
-  }
-
-  /**
-   * Get the status description (only available in responses)
-   */
-  public get statusDesc(): string | undefined {
-    return this.isResponse()
-      ? (this.proto as proto.LightPushResponseV3).statusDesc
-      : undefined;
-  }
-
-  /**
-   * Get the relay peer count (only available in responses)
-   */
-  public get relayPeerCount(): number | undefined {
-    return this.isResponse()
-      ? (this.proto as proto.LightPushResponseV3).relayPeerCount
-      : undefined;
-  }
-
-  /**
-   * Check if this is a request message
-   */
-  private isRequest(): boolean {
-    return "pubsubTopic" in this.proto && "message" in this.proto;
-  }
-
-  /**
-   * Check if this is a response message
-   */
-  private isResponse(): boolean {
-    return "statusCode" in this.proto;
-  }
-}

packages/core/src/lib/message/version_0.spec.ts

@@ -1,46 +1,30 @@
-import type { AutoSharding, IProtoMessage } from "@waku/interfaces";
-import { createRoutingInfo } from "@waku/utils";
-import { bytesToHex } from "@waku/utils/bytes";
+import type { IProtoMessage } from "@waku/interfaces";
+import { contentTopicToPubsubTopic } from "@waku/utils";
 import { expect } from "chai";
 import fc from "fast-check";
 
-import { messageHash } from "../message_hash/index.js";
+import { createDecoder, createEncoder, DecodedMessage } from "./version_0.js";
 
-import {
-  createDecoder,
-  createEncoder,
-  DecodedMessage,
-  proto
-} from "./version_0.js";
-
-const testContentTopic = "/js-waku/1/tests/bytes";
-
-const testNetworkConfig: AutoSharding = {
-  clusterId: 0,
-  numShardsInCluster: 8
-};
-const testRoutingInfo = createRoutingInfo(testNetworkConfig, {
-  contentTopic: testContentTopic
-});
+const contentTopic = "/js-waku/1/tests/bytes";
+const pubsubTopic = contentTopicToPubsubTopic(contentTopic);
 
 describe("Waku Message version 0", function () {
   it("Round trip binary serialization", async function () {
     await fc.assert(
       fc.asyncProperty(fc.uint8Array({ minLength: 1 }), async (payload) => {
         const encoder = createEncoder({
-          contentTopic: testContentTopic,
-          routingInfo: testRoutingInfo
+          contentTopic
         });
         const bytes = await encoder.toWire({ payload });
-        const decoder = createDecoder(testContentTopic, testRoutingInfo);
+        const decoder = createDecoder(contentTopic);
         const protoResult = await decoder.fromWireToProtoObj(bytes);
         const result = (await decoder.fromProtoObj(
-          testRoutingInfo.pubsubTopic,
+          pubsubTopic,
           protoResult!
         )) as DecodedMessage;
 
-        expect(result.contentTopic).to.eq(testContentTopic);
-        expect(result.pubsubTopic).to.eq(testRoutingInfo.pubsubTopic);
+        expect(result.contentTopic).to.eq(contentTopic);
+        expect(result.pubsubTopic).to.eq(pubsubTopic);
         expect(result.version).to.eq(0);
         expect(result.ephemeral).to.be.false;
         expect(result.payload).to.deep.eq(payload);
@@ -53,15 +37,14 @@ describe("Waku Message version 0", function () {
     await fc.assert(
       fc.asyncProperty(fc.uint8Array({ minLength: 1 }), async (payload) => {
         const encoder = createEncoder({
-          contentTopic: testContentTopic,
-          routingInfo: testRoutingInfo,
+          contentTopic,
           ephemeral: true
         });
         const bytes = await encoder.toWire({ payload });
-        const decoder = createDecoder(testContentTopic, testRoutingInfo);
+        const decoder = createDecoder(contentTopic);
         const protoResult = await decoder.fromWireToProtoObj(bytes);
         const result = (await decoder.fromProtoObj(
-          testRoutingInfo.pubsubTopic,
+          pubsubTopic,
           protoResult!
         )) as DecodedMessage;
 
@@ -85,16 +68,15 @@ describe("Waku Message version 0", function () {
         };
 
         const encoder = createEncoder({
-          contentTopic: testContentTopic,
-          routingInfo: testRoutingInfo,
+          contentTopic,
           ephemeral: true,
           metaSetter
         });
         const bytes = await encoder.toWire({ payload });
-        const decoder = createDecoder(testContentTopic, testRoutingInfo);
+        const decoder = createDecoder(contentTopic);
         const protoResult = await decoder.fromWireToProtoObj(bytes);
         const result = (await decoder.fromProtoObj(
-          testRoutingInfo.pubsubTopic,
+          pubsubTopic,
           protoResult!
         )) as DecodedMessage;
 
@@ -117,34 +99,28 @@ describe("Waku Message version 0", function () {
 describe("Ensures content topic is defined", () => {
   it("Encoder throws on undefined content topic", () => {
     const wrapper = function (): void {
-      createEncoder({
-        contentTopic: undefined as unknown as string,
-        routingInfo: testRoutingInfo
-      });
+      createEncoder({ contentTopic: undefined as unknown as string });
     };
 
     expect(wrapper).to.throw("Content topic must be specified");
   });
   it("Encoder throws on empty string content topic", () => {
     const wrapper = function (): void {
-      createEncoder({
-        contentTopic: "",
-        routingInfo: testRoutingInfo
-      });
+      createEncoder({ contentTopic: "" });
     };
 
     expect(wrapper).to.throw("Content topic must be specified");
   });
   it("Decoder throws on undefined content topic", () => {
     const wrapper = function (): void {
-      createDecoder(undefined as unknown as string, testRoutingInfo);
+      createDecoder(undefined as unknown as string);
     };
 
     expect(wrapper).to.throw("Content topic must be specified");
   });
   it("Decoder throws on empty string content topic", () => {
     const wrapper = function (): void {
-      createDecoder("", testRoutingInfo);
+      createDecoder("");
     };
 
     expect(wrapper).to.throw("Content topic must be specified");
@@ -154,73 +130,23 @@ describe("Ensures content topic is defined", () => {
 describe("Sets sharding configuration correctly", () => {
   it("uses static shard pubsub topic instead of autosharding when set", async () => {
     // Create an encoder setup to use autosharding
-    const contentTopic = "/myapp/1/test/proto";
+    const ContentTopic = "/waku/2/content/test.js";
     const autoshardingEncoder = createEncoder({
-      contentTopic: contentTopic,
-      routingInfo: createRoutingInfo(testNetworkConfig, { contentTopic })
+      pubsubTopicShardInfo: { clusterId: 0 },
+      contentTopic: ContentTopic
     });
 
     // When autosharding is enabled, we expect the shard index to be 1
-    expect(autoshardingEncoder.pubsubTopic).to.be.eq("/waku/2/rs/0/0");
+    expect(autoshardingEncoder.pubsubTopic).to.be.eq("/waku/2/rs/0/1");
 
     // Create an encoder setup to use static sharding with the same content topic
+    const singleShardInfo = { clusterId: 0, shard: 0 };
     const staticshardingEncoder = createEncoder({
-      contentTopic: contentTopic,
-      routingInfo: createRoutingInfo({ clusterId: 0 }, { shardId: 3 })
+      contentTopic: ContentTopic,
+      pubsubTopicShardInfo: singleShardInfo
     });
 
     // When static sharding is enabled, we expect the shard index to be 0
-    expect(staticshardingEncoder.pubsubTopic).to.be.eq("/waku/2/rs/0/3");
-  });
-});
-
-describe("DecodedMessage lazy hash initialization", () => {
-  it("should compute hash only when first accessed", () => {
-    const pubsubTopic = "/waku/2/default-waku/proto";
-    const protoMessage: proto.WakuMessage = {
-      payload: new Uint8Array([1, 2, 3]),
-      contentTopic: "/test/1/test-proto/proto",
-      timestamp: BigInt(1234567890000000),
-      ephemeral: false
-    };
-
-    const message = new DecodedMessage(pubsubTopic, protoMessage);
-
-    expect((message as any)._hash).to.be.undefined;
-    expect((message as any)._hashStr).to.be.undefined;
-
-    const hash = message.hash;
-    expect((message as any)._hash).to.not.be.undefined;
-    expect((message as any)._hashStr).to.be.undefined;
-
-    const hashStr = message.hashStr;
-    expect((message as any)._hashStr).to.not.be.undefined;
-
-    const expectedHash = messageHash(
-      pubsubTopic,
-      protoMessage as IProtoMessage
-    );
-    expect(hash).to.deep.equal(expectedHash);
-    expect(hashStr).to.equal(bytesToHex(expectedHash));
-  });
-
-  it("should return cached hash on subsequent access", () => {
-    const pubsubTopic = "/waku/2/default-waku/proto";
-    const protoMessage: proto.WakuMessage = {
-      payload: new Uint8Array([1, 2, 3]),
-      contentTopic: "/test/1/test-proto/proto",
-      timestamp: BigInt(1234567890000000),
-      ephemeral: false
-    };
-
-    const message = new DecodedMessage(pubsubTopic, protoMessage);
-
-    const hash1 = message.hash;
-    const hash2 = message.hash;
-    expect(hash1).to.equal(hash2);
-
-    const hashStr1 = message.hashStr;
-    const hashStr2 = message.hashStr;
-    expect(hashStr1).to.equal(hashStr2);
+    expect(staticshardingEncoder.pubsubTopic).to.be.eq("/waku/2/rs/0/0");
   });
 });

packages/core/src/lib/message/version_0.ts

@@ -7,14 +7,11 @@ import type {
   IMetaSetter,
   IProtoMessage,
   IRateLimitProof,
-  IRoutingInfo,
-  PubsubTopic
+  PubsubTopic,
+  SingleShardInfo
 } from "@waku/interfaces";
 import { proto_message as proto } from "@waku/proto";
-import { Logger } from "@waku/utils";
-import { bytesToHex } from "@waku/utils/bytes";
-
-import { messageHash } from "../message_hash/index.js";
+import { determinePubsubTopic, Logger } from "@waku/utils";
 
 const log = new Logger("message:version-0");
 const OneMillion = BigInt(1_000_000);
@@ -23,9 +20,6 @@ export const Version = 0;
 export { proto };
 
 export class DecodedMessage implements IDecodedMessage {
-  private _hash: Uint8Array | undefined;
-  private _hashStr: string | undefined;
-
   public constructor(
     public pubsubTopic: string,
     private proto: proto.WakuMessage
@@ -43,20 +37,6 @@ export class DecodedMessage implements IDecodedMessage {
     return this.proto.contentTopic;
   }
 
-  public get hash(): Uint8Array {
-    if (this._hash === undefined) {
-      this._hash = messageHash(this.pubsubTopic, this.proto as IProtoMessage);
-    }
-    return this._hash;
-  }
-
-  public get hashStr(): string {
-    if (this._hashStr === undefined) {
-      this._hashStr = bytesToHex(this.hash);
-    }
-    return this._hashStr;
-  }
-
   public get timestamp(): Date | undefined {
     // In the case we receive a value that is bigger than JS's max number,
     // we catch the error and return undefined.
@@ -91,7 +71,7 @@ export class Encoder implements IEncoder {
   public constructor(
     public contentTopic: string,
     public ephemeral: boolean = false,
-    public routingInfo: IRoutingInfo,
+    public pubsubTopic: PubsubTopic,
     public metaSetter?: IMetaSetter
   ) {
     if (!contentTopic || contentTopic === "") {
@@ -99,10 +79,6 @@ export class Encoder implements IEncoder {
     }
   }
 
-  public get pubsubTopic(): PubsubTopic {
-    return this.routingInfo.pubsubTopic;
-  }
-
   public async toWire(message: IMessage): Promise<Uint8Array> {
     return proto.WakuMessage.encode(await this.toProtoObj(message));
   }
@@ -136,32 +112,32 @@ export class Encoder implements IEncoder {
  * format to be sent over the Waku network. The resulting encoder can then be
  * pass to { @link @waku/interfaces!ISender.send } to automatically encode outgoing
  * messages.
- *
- * Note that a routing info may be tied to a given content topic, this is not checked by the encoder.
  */
 export function createEncoder({
+  pubsubTopic,
+  pubsubTopicShardInfo,
   contentTopic,
-  routingInfo,
   ephemeral,
   metaSetter
 }: EncoderOptions): Encoder {
-  return new Encoder(contentTopic, ephemeral, routingInfo, metaSetter);
+  return new Encoder(
+    contentTopic,
+    ephemeral,
+    determinePubsubTopic(contentTopic, pubsubTopic ?? pubsubTopicShardInfo),
+    metaSetter
+  );
 }
 
 export class Decoder implements IDecoder<IDecodedMessage> {
   public constructor(
-    public contentTopic: string,
-    public routingInfo: IRoutingInfo
+    public pubsubTopic: PubsubTopic,
+    public contentTopic: string
   ) {
     if (!contentTopic || contentTopic === "") {
       throw new Error("Content topic must be specified");
     }
   }
 
-  public get pubsubTopic(): PubsubTopic {
-    return this.routingInfo.pubsubTopic;
-  }
-
   public fromWireToProtoObj(
     bytes: Uint8Array
   ): Promise<IProtoMessage | undefined> {
@@ -206,13 +182,13 @@ export class Decoder implements IDecoder<IDecodedMessage> {
  * messages.
  *
  * @param contentTopic The resulting decoder will only decode messages with this content topic.
- * @param routingInfo Routing information such as cluster id and shard id on which the message is expected to be received.
- *
- * Note that a routing info may be tied to a given content topic, this is not checked by the encoder.
  */
 export function createDecoder(
   contentTopic: string,
-  routingInfo: IRoutingInfo
+  pubsubTopicShardInfo?: SingleShardInfo | PubsubTopic
 ): Decoder {
-  return new Decoder(contentTopic, routingInfo);
+  return new Decoder(
+    determinePubsubTopic(contentTopic, pubsubTopicShardInfo),
+    contentTopic
+  );
 }

packages/core/src/lib/metadata/metadata.ts

@@ -1,16 +1,16 @@
 import type { PeerId } from "@libp2p/interface";
 import { IncomingStreamData } from "@libp2p/interface";
 import {
-  type ClusterId,
   type IMetadata,
   type Libp2pComponents,
   type MetadataQueryResult,
   type PeerIdStr,
   ProtocolError,
+  PubsubTopic,
   type ShardInfo
 } from "@waku/interfaces";
 import { proto_metadata } from "@waku/proto";
-import { encodeRelayShard, Logger } from "@waku/utils";
+import { encodeRelayShard, Logger, pubsubTopicsToShardInfo } from "@waku/utils";
 import all from "it-all";
 import * as lp from "it-length-prefixed";
 import { pipe } from "it-pipe";
@@ -30,7 +30,7 @@ class Metadata implements IMetadata {
   public readonly multicodec = MetadataCodec;
 
   public constructor(
-    public clusterId: ClusterId,
+    public pubsubTopics: PubsubTopic[],
     libp2p: Libp2pComponents
   ) {
     this.streamManager = new StreamManager(MetadataCodec, libp2p);
@@ -44,10 +44,9 @@ class Metadata implements IMetadata {
    * Make a metadata query to a peer
    */
   public async query(peerId: PeerId): Promise<MetadataQueryResult> {
-    const request = proto_metadata.WakuMetadataRequest.encode({
-      clusterId: this.clusterId,
-      shards: [] // Only services node need to provide shards
-    });
+    const request = proto_metadata.WakuMetadataRequest.encode(
+      pubsubTopicsToShardInfo(this.pubsubTopics)
+    );
 
     const peer = await this.libp2pComponents.peerStore.get(peerId);
     if (!peer) {
@@ -57,10 +56,11 @@ class Metadata implements IMetadata {
       };
     }
 
-    const stream = await this.streamManager.getStream(peerId);
-
-    if (!stream) {
-      log.error(`Failed to get a stream for remote peer:${peerId.toString()}`);
+    let stream;
+    try {
+      stream = await this.streamManager.getStream(peerId);
+    } catch (error) {
+      log.error("Failed to get stream", error);
       return {
         shardInfo: null,
         error: ProtocolError.NO_STREAM_AVAILABLE
@@ -112,10 +112,9 @@ class Metadata implements IMetadata {
   private async onRequest(streamData: IncomingStreamData): Promise<void> {
     try {
       const { stream, connection } = streamData;
-      const encodedShardInfo = proto_metadata.WakuMetadataResponse.encode({
-        clusterId: this.clusterId,
-        shards: [] // Only service nodes need to provide shards
-      });
+      const encodedShardInfo = proto_metadata.WakuMetadataResponse.encode(
+        pubsubTopicsToShardInfo(this.pubsubTopics)
+      );
 
       const encodedResponse = await pipe(
         [encodedShardInfo],
@@ -179,7 +178,8 @@ class Metadata implements IMetadata {
 }
 
 export function wakuMetadata(
-  clusterId: ClusterId
+  pubsubTopics: PubsubTopic[]
 ): (components: Libp2pComponents) => IMetadata {
-  return (components: Libp2pComponents) => new Metadata(clusterId, components);
+  return (components: Libp2pComponents) =>
+    new Metadata(pubsubTopics, components);
 }

packages/core/src/lib/store/rpc.ts

@@ -6,7 +6,6 @@ import { v4 as uuid } from "uuid";
 // https://github.com/waku-org/nwaku/blob/7205f95cff9f49ca0bb762e8fd0bf56a6a7f3b3b/waku/waku_store/common.nim#L12
 export const DEFAULT_PAGE_SIZE = 20;
 export const MAX_PAGE_SIZE = 100;
-export const MAX_TIME_RANGE = 24 * 60 * 60 * 1000;
 const ONE_MILLION = 1_000000;
 
 export class StoreQueryRequest {

packages/core/src/lib/store/store.spec.ts

@@ -1,230 +0,0 @@
-import type { PeerId } from "@libp2p/interface";
-import {
-  IDecodedMessage,
-  IDecoder,
-  Libp2p,
-  QueryRequestParams
-} from "@waku/interfaces";
-import { expect } from "chai";
-import sinon from "sinon";
-
-import { StreamManager } from "../stream_manager/index.js";
-
-import {
-  MAX_PAGE_SIZE,
-  MAX_TIME_RANGE,
-  StoreQueryRequest,
-  StoreQueryResponse
-} from "./rpc.js";
-import { StoreCore } from "./store.js";
-
-describe("StoreCore", () => {
-  let libp2p: Libp2p;
-  let storeCore: StoreCore;
-  let mockStreamManager: sinon.SinonStubbedInstance<StreamManager>;
-  let mockPeerId: PeerId;
-  let mockStream: any;
-  let mockDecoder: sinon.SinonStubbedInstance<IDecoder<IDecodedMessage>>;
-  let decoders: Map<string, IDecoder<IDecodedMessage>>;
-
-  const createMockPeerId = (id: string): PeerId =>
-    ({
-      toString: () => id,
-      equals: (other: PeerId) => other.toString() === id
-    }) as PeerId;
-
-  beforeEach(() => {
-    libp2p = {
-      components: {
-        events: {
-          addEventListener: sinon.stub(),
-          removeEventListener: sinon.stub()
-        },
-        connectionManager: {
-          getConnections: sinon.stub().returns([])
-        }
-      }
-    } as unknown as Libp2p;
-
-    mockStreamManager = {
-      getStream: sinon.stub()
-    } as unknown as sinon.SinonStubbedInstance<StreamManager>;
-
-    mockPeerId = createMockPeerId("12D3KooWTest1");
-
-    mockStream = {
-      sink: sinon.stub(),
-      source: []
-    };
-
-    mockDecoder = {
-      fromProtoObj: sinon.stub()
-    } as unknown as sinon.SinonStubbedInstance<IDecoder<IDecodedMessage>>;
-
-    decoders = new Map([["test-topic", mockDecoder]]);
-
-    sinon
-      .stub(StreamManager.prototype, "getStream")
-      .callsFake(mockStreamManager.getStream);
-    storeCore = new StoreCore(libp2p);
-  });
-
-  afterEach(() => {
-    sinon.restore();
-  });
-
-  describe("queryPerPage", () => {
-    let queryOpts: QueryRequestParams;
-    let mockStoreQueryRequest: any;
-    let mockStoreQueryResponse: any;
-
-    beforeEach(() => {
-      queryOpts = {
-        pubsubTopic: "test-topic",
-        contentTopics: ["test-topic"],
-        paginationLimit: 10,
-        includeData: true,
-        paginationForward: true
-      };
-
-      mockStoreQueryRequest = {
-        encode: sinon.stub().returns(new Uint8Array([1, 2, 3]))
-      };
-
-      mockStoreQueryResponse = {
-        statusCode: 200,
-        statusDesc: "OK",
-        messages: [
-          {
-            messageHash: new Uint8Array([1]),
-            message: {
-              contentTopic: "test-topic"
-            },
-            pubsubTopic: "test-topic"
-          }
-        ]
-      };
-
-      sinon.stub(StoreQueryRequest, "create").returns(mockStoreQueryRequest);
-      sinon.stub(StoreQueryResponse, "decode").returns(mockStoreQueryResponse);
-    });
-
-    it("throws if time range exceeds MAX_TIME_RANGE", async () => {
-      queryOpts.timeStart = new Date();
-      queryOpts.timeEnd = new Date(
-        queryOpts.timeStart.getTime() + MAX_TIME_RANGE + 1000
-      );
-      const generator = storeCore.queryPerPage(queryOpts, decoders, mockPeerId);
-      try {
-        await generator.next();
-        expect.fail("Should have thrown an error");
-      } catch (error) {
-        expect((error as Error).message).to.equal("Time range bigger than 24h");
-      }
-    });
-
-    it("throws if decoders don't match content topics", async () => {
-      const differentDecoders = new Map([["different-topic", mockDecoder]]);
-      const generator = storeCore.queryPerPage(
-        queryOpts,
-        differentDecoders,
-        mockPeerId
-      );
-      try {
-        await generator.next();
-        expect.fail("Should have thrown an error");
-      } catch (error) {
-        expect((error as Error).message).to.equal(
-          "Internal error, the decoders should match the query's content topics"
-        );
-      }
-    });
-
-    it("does not validate decoders for hash queries", async () => {
-      queryOpts.messageHashes = [new Uint8Array([1, 2, 3])];
-      queryOpts.contentTopics = [];
-      const differentDecoders = new Map([["different-topic", mockDecoder]]);
-      mockStreamManager.getStream.resolves(mockStream);
-      const generator = storeCore.queryPerPage(
-        queryOpts,
-        differentDecoders,
-        mockPeerId
-      );
-      const result = await generator.next();
-      expect(result.done).to.be.false;
-    });
-
-    it("ends if stream creation fails", async () => {
-      mockStreamManager.getStream.resolves(undefined as any);
-      const generator = storeCore.queryPerPage(queryOpts, decoders, mockPeerId);
-      const result = await generator.next();
-      expect(result.done).to.be.true;
-    });
-
-    it("throws if store query response has error status", async () => {
-      mockStoreQueryResponse.statusCode = 400;
-      mockStoreQueryResponse.statusDesc = "Bad Request";
-      mockStreamManager.getStream.resolves(mockStream);
-      const generator = storeCore.queryPerPage(queryOpts, decoders, mockPeerId);
-      try {
-        await generator.next();
-        expect.fail("Should have thrown an error");
-      } catch (error) {
-        expect((error as Error).message).to.equal(
-          "Store query failed with status code: 400, description: Bad Request"
-        );
-      }
-    });
-
-    it("ends if response has no messages", async () => {
-      mockStoreQueryResponse.messages = [];
-      mockStreamManager.getStream.resolves(mockStream);
-      const generator = storeCore.queryPerPage(queryOpts, decoders, mockPeerId);
-      const result = await generator.next();
-      expect(result.done).to.be.true;
-    });
-
-    it("yields decoded messages", async () => {
-      const mockDecodedMessage = {
-        contentTopic: "test-topic"
-      } as IDecodedMessage;
-      mockDecoder.fromProtoObj.resolves(mockDecodedMessage);
-      mockStreamManager.getStream.resolves(mockStream);
-      const generator = storeCore.queryPerPage(queryOpts, decoders, mockPeerId);
-      const result = await generator.next();
-      const decodedMessage = await result.value[0];
-      expect(decodedMessage).to.equal(mockDecodedMessage);
-    });
-
-    it("yields undefined for messages without content topic", async () => {
-      mockStoreQueryResponse.messages[0].message.contentTopic = undefined;
-      mockStreamManager.getStream.resolves(mockStream);
-      const generator = storeCore.queryPerPage(queryOpts, decoders, mockPeerId);
-      const result = await generator.next();
-      const decodedMessage = await result.value[0];
-      expect(decodedMessage).to.be.undefined;
-    });
-
-    it("yields undefined for messages without decoder", async () => {
-      mockStoreQueryResponse.messages[0].message.contentTopic = "unknown-topic";
-      mockStreamManager.getStream.resolves(mockStream);
-      const generator = storeCore.queryPerPage(queryOpts, decoders, mockPeerId);
-      const result = await generator.next();
-      const decodedMessage = await result.value[0];
-      expect(decodedMessage).to.be.undefined;
-    });
-
-    it("ends after yielding if response size indicates end", async () => {
-      queryOpts.paginationLimit = MAX_PAGE_SIZE + 10;
-      mockStoreQueryResponse.messages = new Array(MAX_PAGE_SIZE + 1).fill({
-        messageHash: new Uint8Array([1]),
-        message: { contentTopic: "test-topic" }
-      });
-      mockStreamManager.getStream.resolves(mockStream);
-      const generator = storeCore.queryPerPage(queryOpts, decoders, mockPeerId);
-      await generator.next();
-      const second = await generator.next();
-      expect(second.done).to.be.true;
-    });
-  });
-});

packages/core/src/lib/store/store.ts

@@ -3,6 +3,7 @@ import {
   IDecodedMessage,
   IDecoder,
   Libp2p,
+  PubsubTopic,
   QueryRequestParams
 } from "@waku/interfaces";
 import { Logger } from "@waku/utils";
@@ -17,7 +18,6 @@ import { toProtoMessage } from "../to_proto_message.js";
 import {
   DEFAULT_PAGE_SIZE,
   MAX_PAGE_SIZE,
-  MAX_TIME_RANGE,
   StoreQueryRequest,
   StoreQueryResponse
 } from "./rpc.js";
@@ -31,31 +31,18 @@ export class StoreCore {
 
   public readonly multicodec = StoreCodec;
 
-  public constructor(libp2p: Libp2p) {
+  public constructor(
+    public readonly pubsubTopics: PubsubTopic[],
+    libp2p: Libp2p
+  ) {
     this.streamManager = new StreamManager(StoreCodec, libp2p.components);
   }
 
-  public stop(): void {
-    this.streamManager.stop();
-  }
-
-  public get maxTimeLimit(): number {
-    return MAX_TIME_RANGE;
-  }
-
   public async *queryPerPage<T extends IDecodedMessage>(
     queryOpts: QueryRequestParams,
     decoders: Map<string, IDecoder<T>>,
     peerId: PeerId
   ): AsyncGenerator<Promise<T | undefined>[]> {
-    if (queryOpts.timeStart && queryOpts.timeEnd) {
-      const timeDiff =
-        queryOpts.timeEnd.getTime() - queryOpts.timeStart.getTime();
-      if (timeDiff > MAX_TIME_RANGE) {
-        throw new Error("Time range bigger than 24h");
-      }
-    }
-
     // Only validate decoder content topics for content-filtered queries
     const isHashQuery =
       queryOpts.messageHashes && queryOpts.messageHashes.length > 0;
@@ -72,11 +59,6 @@ export class StoreCore {
 
     let currentCursor = queryOpts.paginationCursor;
     while (true) {
-      if (queryOpts.abortSignal?.aborted) {
-        log.info("Store query aborted by signal");
-        break;
-      }
-
       const storeQueryRequest = StoreQueryRequest.create({
         ...queryOpts,
         paginationCursor: currentCursor
@@ -89,31 +71,21 @@ export class StoreCore {
         contentTopics: queryOpts.contentTopics
       });
 
-      const stream = await this.streamManager.getStream(peerId);
-
-      if (!stream) {
-        log.error(
-          `Failed to get a stream for remote peer:${peerId.toString()}`
-        );
+      let stream;
+      try {
+        stream = await this.streamManager.getStream(peerId);
+      } catch (e) {
+        log.error("Failed to get stream", e);
         break;
       }
 
-      let res;
-      try {
-        res = await pipe(
-          [storeQueryRequest.encode()],
-          lp.encode,
-          stream,
-          lp.decode,
-          async (source) => await all(source)
-        );
-      } catch (error) {
-        if (error instanceof Error && error.name === "AbortError") {
-          log.info(`Store query aborted for peer ${peerId.toString()}`);
-          break;
-        }
-        throw error;
-      }
+      const res = await pipe(
+        [storeQueryRequest.encode()],
+        lp.encode,
+        stream,
+        lp.decode,
+        async (source) => await all(source)
+      );
 
       const bytes = new Uint8ArrayList();
       res.forEach((chunk) => {
@@ -140,11 +112,6 @@ export class StoreCore {
         `${storeQueryResponse.messages.length} messages retrieved from store`
       );
 
-      if (queryOpts.abortSignal?.aborted) {
-        log.info("Store query aborted by signal before processing messages");
-        break;
-      }
-
       const decodedMessages = storeQueryResponse.messages.map((protoMsg) => {
         if (!protoMsg.message) {
           return Promise.resolve(undefined);

packages/core/src/lib/stream_manager/stream_manager.spec.ts

@@ -27,10 +27,6 @@ describe("StreamManager", () => {
     } as any as Libp2pComponents);
   });
 
-  afterEach(() => {
-    sinon.restore();
-  });
-
   it("should return usable stream attached to connection", async () => {
     for (const writeStatus of ["ready", "writing"]) {
       const con1 = createMockConnection();
@@ -49,13 +45,21 @@ describe("StreamManager", () => {
     }
   });
 
-  it("should return undefined if no connection provided", async () => {
+  it("should throw if no connection provided", async () => {
     streamManager["libp2p"]["connectionManager"]["getConnections"] = (
       _peerId: PeerId | undefined
     ) => [];
 
-    const stream = await streamManager.getStream(mockPeer.id);
-    expect(stream).to.be.undefined;
+    let error: Error | undefined;
+    try {
+      await streamManager.getStream(mockPeer.id);
+    } catch (e) {
+      error = e as Error;
+    }
+
+    expect(error).not.to.be.undefined;
+    expect(error?.message).to.include(mockPeer.id.toString());
+    expect(error?.message).to.include(MULTICODEC);
   });
 
   it("should create a new stream if no existing for protocol found", async () => {
@@ -110,11 +114,8 @@ describe("StreamManager", () => {
       streamManager.getStream(mockPeer.id)
     ]);
 
-    expect(stream1).to.not.be.undefined;
-    expect(stream2).to.not.be.undefined;
-
     const expected = ["1", "2"].toString();
-    const actual = [stream1?.id, stream2?.id].sort().toString();
+    const actual = [stream1.id, stream2.id].sort().toString();
 
     expect(actual).to.be.eq(expected);
   });
@@ -123,9 +124,7 @@ describe("StreamManager", () => {
     const scheduleNewStreamSpy = sinon.spy();
     streamManager["scheduleNewStream"] = scheduleNewStreamSpy;
     eventTarget.dispatchEvent(
-      new CustomEvent("peer:update", {
-        detail: { peer: { id: mockPeer.id, protocols: [] } }
-      })
+      new CustomEvent("peer:update", { detail: { peer: { protocols: [] } } })
     );
 
     expect(scheduleNewStreamSpy.calledOnce).to.be.false;
@@ -136,7 +135,7 @@ describe("StreamManager", () => {
     streamManager["scheduleNewStream"] = scheduleNewStreamSpy;
     eventTarget.dispatchEvent(
       new CustomEvent("peer:update", {
-        detail: { peer: { id: mockPeer.id, protocols: [MULTICODEC] } }
+        detail: { peer: { protocols: [MULTICODEC] } }
       })
     );
 
@@ -161,7 +160,7 @@ describe("StreamManager", () => {
 
     eventTarget.dispatchEvent(
       new CustomEvent("peer:update", {
-        detail: { peer: { id: mockPeer.id, protocols: [MULTICODEC] } }
+        detail: { peer: { protocols: [MULTICODEC] } }
       })
     );
 

packages/core/src/lib/stream_manager/stream_manager.ts

@@ -13,7 +13,7 @@ export class StreamManager {
   private streamPool: Map<string, Promise<void>> = new Map();
 
   public constructor(
-    private readonly multicodec: string,
+    private multicodec: string,
     private readonly libp2p: Libp2pComponents
   ) {
     this.log = new Logger(`stream-manager:${multicodec}`);
@@ -23,56 +23,39 @@ export class StreamManager {
     );
   }
 
-  public stop(): void {
-    this.libp2p.events.removeEventListener(
-      "peer:update",
-      this.handlePeerUpdateStreamPool
-    );
-    this.streamPool.clear();
-    this.ongoingCreation.clear();
-  }
+  public async getStream(peerId: PeerId): Promise<Stream> {
+    const peerIdStr = peerId.toString();
+    const scheduledStream = this.streamPool.get(peerIdStr);
 
-  public async getStream(peerId: PeerId): Promise<Stream | undefined> {
-    try {
-      const peerIdStr = peerId.toString();
-      const scheduledStream = this.streamPool.get(peerIdStr);
+    if (scheduledStream) {
+      this.streamPool.delete(peerIdStr);
+      await scheduledStream;
+    }
 
-      if (scheduledStream) {
-        this.streamPool.delete(peerIdStr);
-        await scheduledStream;
-      }
-
-      const stream =
-        this.getOpenStreamForCodec(peerId) || (await this.createStream(peerId));
-
-      if (!stream) {
-        return;
-      }
+    let stream = this.getOpenStreamForCodec(peerId);
 
+    if (stream) {
       this.log.info(
-        `Using stream for peerId=${peerIdStr} multicodec=${this.multicodec}`
+        `Found existing stream peerId=${peerIdStr} multicodec=${this.multicodec}`
       );
-
       this.lockStream(peerIdStr, stream);
       return stream;
-    } catch (error) {
-      this.log.error(`Failed to getStream:`, error);
-      return;
     }
+
+    stream = await this.createStream(peerId);
+    this.lockStream(peerIdStr, stream);
+
+    return stream;
   }
 
-  private async createStream(
-    peerId: PeerId,
-    retries = 0
-  ): Promise<Stream | undefined> {
+  private async createStream(peerId: PeerId, retries = 0): Promise<Stream> {
     const connections = this.libp2p.connectionManager.getConnections(peerId);
     const connection = selectOpenConnection(connections);
 
     if (!connection) {
-      this.log.error(
+      throw new Error(
         `Failed to get a connection to the peer peerId=${peerId.toString()} multicodec=${this.multicodec}`
       );
-      return;
     }
 
     let lastError: unknown;
@@ -94,10 +77,9 @@ export class StreamManager {
     }
 
     if (!stream) {
-      this.log.error(
+      throw new Error(
         `Failed to create a new stream for ${peerId.toString()} -- ` + lastError
       );
-      return;
     }
 
     return stream;
@@ -159,9 +141,6 @@ export class StreamManager {
     const connection = selectOpenConnection(connections);
 
     if (!connection) {
-      this.log.info(
-        `No open connection found for peerId=${peerId.toString()} multicodec=${this.multicodec}`
-      );
       return;
     }
 
@@ -170,27 +149,16 @@ export class StreamManager {
     );
 
     if (!stream) {
-      this.log.info(
-        `No open stream found for peerId=${peerId.toString()} multicodec=${this.multicodec}`
-      );
       return;
     }
 
     const isStreamUnusable = ["done", "closed", "closing"].includes(
       stream.writeStatus || ""
     );
-
     if (isStreamUnusable || this.isStreamLocked(stream)) {
-      this.log.info(
-        `Stream for peerId=${peerId.toString()} multicodec=${this.multicodec} is unusable`
-      );
       return;
     }
 
-    this.log.info(
-      `Found open stream for peerId=${peerId.toString()} multicodec=${this.multicodec}`
-    );
-
     return stream;
   }
 

packages/discovery/CHANGELOG.md

@@ -1,83 +1,5 @@
 # Changelog
 
-## [0.0.13](https://github.com/waku-org/js-waku/compare/discovery-v0.0.12...discovery-v0.0.13) (2025-10-31)
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * @waku/core bumped from 0.0.39 to 0.0.40
-    * @waku/proto bumped from ^0.0.14 to ^0.0.15
-
-## [0.0.12](https://github.com/waku-org/js-waku/compare/discovery-v0.0.11...discovery-v0.0.12) (2025-09-20)
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * @waku/core bumped from 0.0.38 to 0.0.39
-    * @waku/enr bumped from 0.0.32 to 0.0.33
-    * @waku/interfaces bumped from 0.0.33 to 0.0.34
-    * @waku/proto bumped from ^0.0.13 to ^0.0.14
-    * @waku/utils bumped from 0.0.26 to 0.0.27
-
-## [0.0.11](https://github.com/waku-org/js-waku/compare/discovery-v0.0.10...discovery-v0.0.11) (2025-08-14)
-
-
-### ⚠ BREAKING CHANGES
-
-* local peer discovery improvements ([#2557](https://github.com/waku-org/js-waku/issues/2557))
-* Introduce routing info concept
-
-### Features
-
-* Introduce routing info concept ([3842d84](https://github.com/waku-org/js-waku/commit/3842d84b55eb96728f6b05b9307ff823fac58a54))
-* Local peer discovery improvements ([#2557](https://github.com/waku-org/js-waku/issues/2557)) ([eab8ce8](https://github.com/waku-org/js-waku/commit/eab8ce81b431b11d79dcbec31aea759319853336))
-* Peer exchange discovery improvements ([#2537](https://github.com/waku-org/js-waku/issues/2537)) ([95da57a](https://github.com/waku-org/js-waku/commit/95da57a8705fa195529ef52a6c908642da5e120c))
-* Retrieve peers from all passed enrtree URLs ([25f884e](https://github.com/waku-org/js-waku/commit/25f884e05b430cebe3b6650c16026d771d1b7626))
-
-
-### Bug Fixes
-
-* Do not limit DNS Peer Discovery on capability ([0dfe352](https://github.com/waku-org/js-waku/commit/0dfe35281c677e91c064557a83a50e6a1ca6d0ac))
-* Improve error handling for stream manager ([#2546](https://github.com/waku-org/js-waku/issues/2546)) ([ada2657](https://github.com/waku-org/js-waku/commit/ada265731acfeddc2bfe2e8e963bc2be37f13900))
-* Prevent setting shard info from PX if it exists ([#2561](https://github.com/waku-org/js-waku/issues/2561)) ([dfb2baf](https://github.com/waku-org/js-waku/commit/dfb2baf004a58c29f7afd0144c82a8d2e6710d5a))
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * @waku/core bumped from 0.0.37 to 0.0.38
-    * @waku/enr bumped from 0.0.31 to 0.0.32
-    * @waku/interfaces bumped from 0.0.32 to 0.0.33
-    * @waku/proto bumped from ^0.0.12 to ^0.0.13
-    * @waku/utils bumped from 0.0.25 to 0.0.26
-
-## [0.0.10](https://github.com/waku-org/js-waku/compare/discovery-v0.0.9...discovery-v0.0.10) (2025-07-18)
-
-
-### ⚠ BREAKING CHANGES
-
-* re-architect connection manager ([#2445](https://github.com/waku-org/js-waku/issues/2445))
-
-### Features
-
-* Re-architect connection manager ([#2445](https://github.com/waku-org/js-waku/issues/2445)) ([c7682ea](https://github.com/waku-org/js-waku/commit/c7682ea67c54d2c26a68ce96208003fb1ffc915c))
-
-
-### Dependencies
-
-* The following workspace dependencies were updated
-  * dependencies
-    * @waku/core bumped from 0.0.36 to 0.0.37
-    * @waku/enr bumped from 0.0.30 to 0.0.31
-    * @waku/interfaces bumped from 0.0.31 to 0.0.32
-    * @waku/proto bumped from ^0.0.11 to ^0.0.12
-    * @waku/utils bumped from 0.0.24 to 0.0.25
-
 ## [0.0.9](https://github.com/waku-org/js-waku/compare/discovery-v0.0.8...discovery-v0.0.9) (2025-06-23)
 
 

packages/discovery/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@waku/discovery",
-  "version": "0.0.13",
+  "version": "0.0.9",
   "description": "Contains various discovery mechanisms: DNS Discovery (EIP-1459, Peer Exchange, Local Peer Cache Discovery.",
   "types": "./dist/index.d.ts",
   "module": "./dist/index.js",
@@ -15,7 +15,7 @@
   "homepage": "https://github.com/waku-org/js-waku/tree/master/packages/discovery#readme",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/waku-org/js-waku.git"
+    "url": "https://github.com/waku-org/js-waku.git"
   },
   "bugs": {
     "url": "https://github.com/waku-org/js-waku/issues"
@@ -51,11 +51,11 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@waku/core": "0.0.40",
-    "@waku/enr": "0.0.33",
-    "@waku/interfaces": "0.0.34",
-    "@waku/proto": "^0.0.15",
-    "@waku/utils": "0.0.27",
+    "@waku/core": "0.0.36",
+    "@waku/enr": "0.0.30",
+    "@waku/interfaces": "0.0.31",
+    "@waku/proto": "^0.0.11",
+    "@waku/utils": "0.0.24",
     "debug": "^4.3.4",
     "dns-over-http-resolver": "^3.0.8",
     "hi-base32": "^0.5.1",

packages/discovery/src/dns/constants.ts

@@ -1,4 +1,4 @@
-import { Tags } from "@waku/interfaces";
+import type { NodeCapabilityCount } from "@waku/interfaces";
 
 /**
  * The ENR tree for the different fleets.
@@ -10,6 +10,12 @@ export const enrTree = {
   TEST: "enrtree://AOGYWMBYOUIMOENHXCHILPKY3ZRFEULMFI4DOM442QSZ73TT2A7VI@test.waku.nodes.status.im"
 };
 
-export const DEFAULT_BOOTSTRAP_TAG_NAME = Tags.BOOTSTRAP;
+export const DEFAULT_BOOTSTRAP_TAG_NAME = "bootstrap";
 export const DEFAULT_BOOTSTRAP_TAG_VALUE = 50;
 export const DEFAULT_BOOTSTRAP_TAG_TTL = 100_000_000;
+
+export const DEFAULT_NODE_REQUIREMENTS: Partial<NodeCapabilityCount> = {
+  store: 1,
+  filter: 2,
+  lightPush: 2
+};

packages/discovery/src/dns/dns.spec.ts

@@ -1,6 +1,5 @@
 import type { DnsClient } from "@waku/interfaces";
 import { expect } from "chai";
-import sinon from "sinon";
 
 import { DnsNodeDiscovery } from "./dns.js";
 import testData from "./testdata.json" with { type: "json" };
@@ -18,6 +17,7 @@ const branchDomainD = "D5SNLTAGWNQ34NTQTPHNZDECFU";
 const partialBranchA = "AAAA";
 const partialBranchB = "BBBB";
 const singleBranch = `enrtree-branch:${branchDomainA}`;
+const doubleBranch = `enrtree-branch:${branchDomainA},${branchDomainB}`;
 const multiComponentBranch = [
   `enrtree-branch:${branchDomainA},${partialBranchA}`,
   `${partialBranchB},${branchDomainB}`
@@ -34,12 +34,10 @@ const errorBranchB = `enrtree-branch:${branchDomainD}`;
 class MockDNS implements DnsClient {
   private fqdnRes: Map<string, string[]>;
   private fqdnThrows: string[];
-  public hasThrown: boolean;
 
   public constructor() {
     this.fqdnRes = new Map();
     this.fqdnThrows = [];
-    this.hasThrown = false;
   }
 
   public addRes(fqdn: string, res: string[]): void {
@@ -51,17 +49,11 @@ class MockDNS implements DnsClient {
   }
 
   public resolveTXT(fqdn: string): Promise<string[]> {
-    if (this.fqdnThrows.includes(fqdn)) {
-      this.hasThrown = true;
-      throw "Mock DNS throws.";
-    }
+    if (this.fqdnThrows.includes(fqdn)) throw "Mock DNS throws.";
 
     const res = this.fqdnRes.get(fqdn);
 
-    if (!res) {
-      this.hasThrown = true;
-      throw `Mock DNS could not resolve ${fqdn}`;
-    }
+    if (!res) throw `Mock DNS could not resolve ${fqdn}`;
 
     return Promise.resolve(res);
   }
@@ -80,10 +72,9 @@ describe("DNS Node Discovery", () => {
     mockDns.addRes(`${branchDomainA}.${host}`, [mockData.enrWithWaku2Relay]);
 
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
-    const peers = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peers.push(peer);
-    }
+    const peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      relay: 1
+    });
 
     expect(peers.length).to.eq(1);
     expect(peers[0].ip).to.eq("192.168.178.251");
@@ -97,10 +88,9 @@ describe("DNS Node Discovery", () => {
     mockDns.addRes(`${branchDomainA}.${host}`, [singleBranch]);
 
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
-    const peers = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peers.push(peer);
-    }
+    const peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      relay: 1
+    });
 
     expect(peers.length).to.eq(0);
   });
@@ -112,21 +102,17 @@ describe("DNS Node Discovery", () => {
     mockDns.addRes(`${branchDomainA}.${host}`, []);
 
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
-    const peersA = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peersA.push(peer);
-    }
+    let peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      relay: 1
+    });
 
-    expect(peersA.length).to.eq(0);
+    expect(peers.length).to.eq(0);
 
     // No TXT records case
     mockDns.addRes(`${branchDomainA}.${host}`, []);
 
-    const peersB = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peersB.push(peer);
-    }
-    expect(peersB.length).to.eq(0);
+    peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], { relay: 1 });
+    expect(peers.length).to.eq(0);
   });
 
   it("ignores domain fetching errors", async function () {
@@ -134,20 +120,18 @@ describe("DNS Node Discovery", () => {
     mockDns.addThrow(`${branchDomainC}.${host}`);
 
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
-    const peers = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peers.push(peer);
-    }
+    const peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      relay: 1
+    });
     expect(peers.length).to.eq(0);
   });
 
   it("ignores unrecognized TXT record formats", async function () {
     mockDns.addRes(`${rootDomain}.${host}`, [mockData.enrBranchBadPrefix]);
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
-    const peers = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peers.push(peer);
-    }
+    const peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      relay: 1
+    });
     expect(peers.length).to.eq(0);
   });
 
@@ -156,23 +140,20 @@ describe("DNS Node Discovery", () => {
     mockDns.addRes(`${branchDomainD}.${host}`, [mockData.enrWithWaku2Relay]);
 
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
-    const peersA = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peersA.push(peer);
-    }
+    const peersA = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      relay: 1
+    });
     expect(peersA.length).to.eq(1);
 
     // Specify that a subsequent network call retrieving the same peer should throw.
     // This test passes only if the peer is fetched from cache
     mockDns.addThrow(`${branchDomainD}.${host}`);
 
-    const peersB = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peersB.push(peer);
-    }
+    const peersB = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      relay: 1
+    });
     expect(peersB.length).to.eq(1);
     expect(peersA[0].ip).to.eq(peersB[0].ip);
-    expect(mockDns.hasThrown).to.be.false;
   });
 });
 
@@ -188,10 +169,9 @@ describe("DNS Node Discovery w/ capabilities", () => {
     mockDns.addRes(`${rootDomain}.${host}`, [mockData.enrWithWaku2Relay]);
 
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
-    const peers = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peers.push(peer);
-    }
+    const peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      relay: 1
+    });
 
     expect(peers.length).to.eq(1);
     expect(peers[0].peerId?.toString()).to.eq(
@@ -203,10 +183,10 @@ describe("DNS Node Discovery w/ capabilities", () => {
     mockDns.addRes(`${rootDomain}.${host}`, [mockData.enrWithWaku2RelayStore]);
 
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
-    const peers = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peers.push(peer);
-    }
+    const peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      store: 1,
+      relay: 1
+    });
 
     expect(peers.length).to.eq(1);
     expect(peers[0].peerId?.toString()).to.eq(
@@ -214,29 +194,42 @@ describe("DNS Node Discovery w/ capabilities", () => {
     );
   });
 
-  it("return first retrieved peers without further DNS queries", async function () {
-    mockDns.addRes(`${rootDomain}.${host}`, multiComponentBranch);
+  it("should only return 1 node with store capability", async () => {
+    mockDns.addRes(`${rootDomain}.${host}`, [mockData.enrWithWaku2Store]);
+
+    const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
+    const peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      store: 1
+    });
+
+    expect(peers.length).to.eq(1);
+    expect(peers[0].peerId?.toString()).to.eq(
+      "16Uiu2HAkv3La3ECgQpdYeEJfrX36EWdhkUDv4C9wvXM8TFZ9dNgd"
+    );
+  });
+
+  it("retrieves all peers (2) when cannot fulfill all requirements", async () => {
+    mockDns.addRes(`${rootDomain}.${host}`, [doubleBranch]);
     mockDns.addRes(`${branchDomainA}.${host}`, [
       mockData.enrWithWaku2RelayStore
     ]);
-    // The ENR Tree is such as there are more branches to be explored.
-    // But they should not be explored if it isn't asked
-    mockDns.addThrow(`${branchDomainB}.${host}`);
+    mockDns.addRes(`${branchDomainB}.${host}`, [mockData.enrWithWaku2Relay]);
 
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
+    const peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      store: 1,
+      relay: 2,
+      filter: 1
+    });
 
-    const randomStub = sinon.stub(Math, "random").returns(0);
-    try {
-      const iterator = dnsNodeDiscovery.getNextPeer([mockData.enrTree]);
-      const { value: peer } = await iterator.next();
-
-      expect(peer.peerId?.toString()).to.eq(
-        "16Uiu2HAm2HyS6brcCspSbszG9i36re2bWBVjMe3tMdnFp1Hua34F"
-      );
-      expect(mockDns.hasThrown).to.be.false;
-    } finally {
-      randomStub.restore();
-    }
+    expect(peers.length).to.eq(2);
+    const peerIds = peers.map((p) => p.peerId?.toString());
+    expect(peerIds).to.contain(
+      "16Uiu2HAm2HyS6brcCspSbszG9i36re2bWBVjMe3tMdnFp1Hua34F"
+    );
+    expect(peerIds).to.contain(
+      "16Uiu2HAmPsYLvfKafxgRsb6tioYyGnSvGXS2iuMigptHrqHPNPzx"
+    );
   });
 
   it("retrieves all peers (3) when branch entries are composed of multiple strings", async function () {
@@ -250,10 +243,10 @@ describe("DNS Node Discovery w/ capabilities", () => {
     ]);
 
     const dnsNodeDiscovery = new DnsNodeDiscovery(mockDns);
-    const peers = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([mockData.enrTree])) {
-      peers.push(peer);
-    }
+    const peers = await dnsNodeDiscovery.getPeers([mockData.enrTree], {
+      store: 2,
+      relay: 2
+    });
 
     expect(peers.length).to.eq(3);
     const peerIds = peers.map((p) => p.peerId?.toString());
@@ -282,10 +275,12 @@ describe("DNS Node Discovery [live data]", function () {
     this.timeout(10000);
     // Google's dns server address. Needs to be set explicitly to run in CI
     const dnsNodeDiscovery = await DnsNodeDiscovery.dnsOverHttp();
-    const peers = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([enrTree.TEST])) {
-      peers.push(peer);
-    }
+    const peers = await dnsNodeDiscovery.getPeers([enrTree.TEST], {
+      relay: maxQuantity,
+      store: maxQuantity,
+      filter: maxQuantity,
+      lightPush: maxQuantity
+    });
 
     expect(peers.length).to.eq(maxQuantity);
 
@@ -303,10 +298,12 @@ describe("DNS Node Discovery [live data]", function () {
     this.timeout(10000);
     // Google's dns server address. Needs to be set explicitly to run in CI
     const dnsNodeDiscovery = await DnsNodeDiscovery.dnsOverHttp();
-    const peers = [];
-    for await (const peer of dnsNodeDiscovery.getNextPeer([enrTree.SANDBOX])) {
-      peers.push(peer);
-    }
+    const peers = await dnsNodeDiscovery.getPeers([enrTree.SANDBOX], {
+      relay: maxQuantity,
+      store: maxQuantity,
+      filter: maxQuantity,
+      lightPush: maxQuantity
+    });
 
     expect(peers.length).to.eq(maxQuantity);
 

packages/discovery/src/dns/dns.ts

@@ -1,16 +1,25 @@
 import { ENR, EnrDecoder } from "@waku/enr";
-import type { DnsClient, IEnr, SearchContext } from "@waku/interfaces";
-import { Logger, shuffle } from "@waku/utils";
+import type {
+  DnsClient,
+  IEnr,
+  NodeCapabilityCount,
+  SearchContext
+} from "@waku/interfaces";
+import { Logger } from "@waku/utils";
 
 import { DnsOverHttps } from "./dns_over_https.js";
 import { ENRTree } from "./enrtree.js";
-import { fetchNodes } from "./fetch_nodes.js";
+import {
+  fetchNodesUntilCapabilitiesFulfilled,
+  yieldNodesUntilCapabilitiesFulfilled
+} from "./fetch_nodes.js";
 
 const log = new Logger("discovery:dns");
 
 export class DnsNodeDiscovery {
   private readonly dns: DnsClient;
   private readonly _DNSTreeCache: { [key: string]: string };
+  private readonly _errorTolerance: number = 10;
 
   public static async dnsOverHttp(
     dnsClient?: DnsClient
@@ -21,29 +30,68 @@ export class DnsNodeDiscovery {
     return new DnsNodeDiscovery(dnsClient);
   }
 
+  /**
+   * Returns a list of verified peers listed in an EIP-1459 DNS tree. Method may
+   * return fewer peers than requested if @link wantedNodeCapabilityCount requires
+   * larger quantity of peers than available or the number of errors/duplicate
+   * peers encountered by randomized search exceeds the sum of the fields of
+   * @link wantedNodeCapabilityCount plus the @link _errorTolerance factor.
+   */
+  public async getPeers(
+    enrTreeUrls: string[],
+    wantedNodeCapabilityCount: Partial<NodeCapabilityCount>
+  ): Promise<IEnr[]> {
+    const networkIndex = Math.floor(Math.random() * enrTreeUrls.length);
+    const { publicKey, domain } = ENRTree.parseTree(enrTreeUrls[networkIndex]);
+    const context: SearchContext = {
+      domain,
+      publicKey,
+      visits: {}
+    };
+
+    const peers = await fetchNodesUntilCapabilitiesFulfilled(
+      wantedNodeCapabilityCount,
+      this._errorTolerance,
+      () => this._search(domain, context)
+    );
+    log.info(
+      "retrieved peers: ",
+      peers.map((peer) => {
+        return {
+          id: peer.peerId?.toString(),
+          multiaddrs: peer.multiaddrs?.map((ma) => ma.toString())
+        };
+      })
+    );
+    return peers;
+  }
+
   public constructor(dns: DnsClient) {
     this._DNSTreeCache = {};
     this.dns = dns;
   }
 
   /**
-   * Retrieve the next peers from the passed [[enrTreeUrls]],
+   * {@inheritDoc getPeers}
    */
-  public async *getNextPeer(enrTreeUrls: string[]): AsyncGenerator<IEnr> {
-    // Shuffle the ENR Trees so that not all clients connect to same nodes first.
-    for (const enrTreeUrl of shuffle(enrTreeUrls)) {
-      const { publicKey, domain } = ENRTree.parseTree(enrTreeUrl);
-      const context: SearchContext = {
-        domain,
-        publicKey,
-        visits: {}
-      };
+  public async *getNextPeer(
+    enrTreeUrls: string[],
+    wantedNodeCapabilityCount: Partial<NodeCapabilityCount>
+  ): AsyncGenerator<IEnr> {
+    const networkIndex = Math.floor(Math.random() * enrTreeUrls.length);
+    const { publicKey, domain } = ENRTree.parseTree(enrTreeUrls[networkIndex]);
+    const context: SearchContext = {
+      domain,
+      publicKey,
+      visits: {}
+    };
 
-      for await (const peer of fetchNodes(() =>
-        this._search(domain, context)
-      )) {
-        yield peer;
-      }
+    for await (const peer of yieldNodesUntilCapabilitiesFulfilled(
+      wantedNodeCapabilityCount,
+      this._errorTolerance,
+      () => this._search(domain, context)
+    )) {
+      yield peer;
     }
   }
 
@@ -117,7 +165,7 @@ export class DnsNodeDiscovery {
       throw new Error("Received empty result array while fetching TXT record");
     if (!response[0].length) throw new Error("Received empty TXT record");
 
-    // Branch entries can be an array of strings of comma-delimited subdomains, with
+    // Branch entries can be an array of strings of comma delimited subdomains, with
     // some subdomain strings split across the array elements
     const result = response.join("");
 

packages/discovery/src/dns/dns_discovery.ts

@@ -9,7 +9,8 @@ import type {
   DiscoveryTrigger,
   DnsDiscOptions,
   DnsDiscoveryComponents,
-  IEnr
+  IEnr,
+  NodeCapabilityCount
 } from "@waku/interfaces";
 import { DNS_DISCOVERY_TAG } from "@waku/interfaces";
 import { encodeRelayShard, Logger } from "@waku/utils";
@@ -17,7 +18,8 @@ import { encodeRelayShard, Logger } from "@waku/utils";
 import {
   DEFAULT_BOOTSTRAP_TAG_NAME,
   DEFAULT_BOOTSTRAP_TAG_TTL,
-  DEFAULT_BOOTSTRAP_TAG_VALUE
+  DEFAULT_BOOTSTRAP_TAG_VALUE,
+  DEFAULT_NODE_REQUIREMENTS
 } from "./constants.js";
 import { DnsNodeDiscovery } from "./dns.js";
 
@@ -33,7 +35,7 @@ export class PeerDiscoveryDns
   private nextPeer: (() => AsyncGenerator<IEnr>) | undefined;
   private _started: boolean;
   private _components: DnsDiscoveryComponents;
-  private readonly _options: DnsDiscOptions;
+  private _options: DnsDiscOptions;
 
   public constructor(
     components: DnsDiscoveryComponents,
@@ -63,9 +65,14 @@ export class PeerDiscoveryDns
       let { enrUrls } = this._options;
       if (!Array.isArray(enrUrls)) enrUrls = [enrUrls];
 
+      const { wantedNodeCapabilityCount } = this._options;
       const dns = await DnsNodeDiscovery.dnsOverHttp();
 
-      this.nextPeer = dns.getNextPeer.bind(dns, enrUrls);
+      this.nextPeer = dns.getNextPeer.bind(
+        dns,
+        enrUrls,
+        wantedNodeCapabilityCount
+      );
     }
 
     for await (const peerEnr of this.nextPeer()) {
@@ -87,11 +94,9 @@ export class PeerDiscoveryDns
       };
 
       let isPeerChanged = false;
-      const isPeerAlreadyInPeerStore = await this._components.peerStore.has(
-        peerInfo.id
-      );
+      const isPeerExists = await this._components.peerStore.has(peerInfo.id);
 
-      if (isPeerAlreadyInPeerStore) {
+      if (isPeerExists) {
         const peer = await this._components.peerStore.get(peerInfo.id);
         const hasBootstrapTag = peer.tags.has(DEFAULT_BOOTSTRAP_TAG_NAME);
 
@@ -138,8 +143,9 @@ export class PeerDiscoveryDns
 }
 
 export function wakuDnsDiscovery(
-  enrUrls: string[]
+  enrUrls: string[],
+  wantedNodeCapabilityCount: Partial<NodeCapabilityCount> = DEFAULT_NODE_REQUIREMENTS
 ): (components: DnsDiscoveryComponents) => PeerDiscoveryDns {
   return (components: DnsDiscoveryComponents) =>
-    new PeerDiscoveryDns(components, { enrUrls });
+    new PeerDiscoveryDns(components, { enrUrls, wantedNodeCapabilityCount });
 }

packages/discovery/src/dns/fetch_nodes.spec.ts

@@ -3,11 +3,12 @@ import { peerIdFromPrivateKey } from "@libp2p/peer-id";
 import { multiaddr } from "@multiformats/multiaddr";
 import { ENR } from "@waku/enr";
 import { EnrCreator } from "@waku/enr";
+import type { Waku2 } from "@waku/interfaces";
 import { expect } from "chai";
 
-import { fetchNodes } from "./fetch_nodes.js";
+import { fetchNodesUntilCapabilitiesFulfilled } from "./fetch_nodes.js";
 
-async function createEnr(): Promise<ENR> {
+async function createEnr(waku2: Waku2): Promise<ENR> {
   const peerId = await generateKeyPair("secp256k1").then(peerIdFromPrivateKey);
   const enr = await EnrCreator.fromPeerId(peerId);
   enr.setLocationMultiaddr(multiaddr("/ip4/18.223.219.100/udp/9000"));
@@ -19,67 +20,99 @@ async function createEnr(): Promise<ENR> {
     )
   ];
 
-  enr.waku2 = { lightPush: true, filter: true, relay: false, store: false };
+  enr.waku2 = waku2;
   return enr;
 }
 
-describe("Fetch nodes", function () {
-  it("Get Nodes", async function () {
-    const retrievedNodes = [await createEnr(), await createEnr()];
+const Waku2None = {
+  relay: false,
+  store: false,
+  filter: false,
+  lightPush: false
+};
 
-    let fetchCount = 0;
-    const getNode = (): Promise<ENR> => {
-      const node = retrievedNodes[fetchCount];
-      fetchCount++;
-      return Promise.resolve(node);
-    };
+describe("Fetch nodes until capabilities are fulfilled", function () {
+  it("1 Relay, 1 fetch", async function () {
+    const relayNode = await createEnr({ ...Waku2None, relay: true });
 
-    const res = [];
-    for await (const node of fetchNodes(getNode, 5)) {
-      res.push(node);
-    }
+    const getNode = (): Promise<ENR> => Promise.resolve(relayNode);
 
-    expect(res.length).to.eq(2);
-    expect(res[0].peerId!.toString()).to.not.eq(res[1].peerId!.toString());
-  });
-
-  it("Stops search when maxGet is reached", async function () {
-    const retrievedNodes = [
-      await createEnr(),
-      await createEnr(),
-      await createEnr()
-    ];
-
-    let fetchCount = 0;
-    const getNode = (): Promise<ENR> => {
-      const node = retrievedNodes[fetchCount];
-      fetchCount++;
-      return Promise.resolve(node);
-    };
-
-    const res = [];
-    for await (const node of fetchNodes(getNode, 2)) {
-      res.push(node);
-    }
-
-    expect(res.length).to.eq(2);
-  });
-
-  it("Stops search when 2 null results are returned", async function () {
-    const retrievedNodes = [await createEnr(), null, null, await createEnr()];
-
-    let fetchCount = 0;
-    const getNode = (): Promise<ENR | null> => {
-      const node = retrievedNodes[fetchCount];
-      fetchCount++;
-      return Promise.resolve(node);
-    };
-
-    const res = [];
-    for await (const node of fetchNodes(getNode, 10, 2)) {
-      res.push(node);
-    }
+    const res = await fetchNodesUntilCapabilitiesFulfilled(
+      { relay: 1 },
+      0,
+      getNode
+    );
 
     expect(res.length).to.eq(1);
+    expect(res[0].peerId!.toString()).to.eq(relayNode.peerId?.toString());
+  });
+
+  it("1 Store, 2 fetches", async function () {
+    const relayNode = await createEnr({ ...Waku2None, relay: true });
+    const storeNode = await createEnr({ ...Waku2None, store: true });
+
+    const retrievedNodes = [relayNode, storeNode];
+
+    let fetchCount = 0;
+    const getNode = (): Promise<ENR> => {
+      const node = retrievedNodes[fetchCount];
+      fetchCount++;
+      return Promise.resolve(node);
+    };
+
+    const res = await fetchNodesUntilCapabilitiesFulfilled(
+      { store: 1 },
+      1,
+      getNode
+    );
+
+    expect(res.length).to.eq(1);
+    expect(res[0].peerId!.toString()).to.eq(storeNode.peerId?.toString());
+  });
+
+  it("1 Store, 2 relays, 2 fetches", async function () {
+    const relayNode1 = await createEnr({ ...Waku2None, relay: true });
+    const relayNode2 = await createEnr({ ...Waku2None, relay: true });
+    const relayNode3 = await createEnr({ ...Waku2None, relay: true });
+    const relayStoreNode = await createEnr({
+      ...Waku2None,
+      relay: true,
+      store: true
+    });
+
+    const retrievedNodes = [relayNode1, relayNode2, relayNode3, relayStoreNode];
+
+    let fetchCount = 0;
+    const getNode = (): Promise<ENR> => {
+      const node = retrievedNodes[fetchCount];
+      fetchCount++;
+      return Promise.resolve(node);
+    };
+
+    const res = await fetchNodesUntilCapabilitiesFulfilled(
+      { store: 1, relay: 2 },
+      1,
+      getNode
+    );
+
+    expect(res.length).to.eq(3);
+    expect(res[0].peerId!.toString()).to.eq(relayNode1.peerId?.toString());
+    expect(res[1].peerId!.toString()).to.eq(relayNode2.peerId?.toString());
+    expect(res[2].peerId!.toString()).to.eq(relayStoreNode.peerId?.toString());
+  });
+
+  it("1 Relay, 1 Filter, gives up", async function () {
+    const relayNode = await createEnr({ ...Waku2None, relay: true });
+
+    const getNode = (): Promise<ENR> => Promise.resolve(relayNode);
+
+    const res = await fetchNodesUntilCapabilitiesFulfilled(
+      { filter: 1, relay: 1 },
+      5,
+      getNode
+    );
+
+    expect(res.length).to.eq(1);
+    expect(res[0].peerId!.toString()).to.eq(relayNode.peerId?.toString());
   });
 });

packages/discovery/src/dns/fetch_nodes.ts

@@ -1,44 +1,181 @@
-import type { IEnr } from "@waku/interfaces";
+import type { IEnr, NodeCapabilityCount, Waku2 } from "@waku/interfaces";
 import { Logger } from "@waku/utils";
 
 const log = new Logger("discovery:fetch_nodes");
 
 /**
- * Fetch nodes using passed [[getNode]] until it has been called [[maxGet]]
- * times, or it has returned empty or duplicate results more than [[maxErrors]]
- * times.
+ * Fetch nodes using passed [[getNode]] until all wanted capabilities are
+ * fulfilled or the number of [[getNode]] call exceeds the sum of
+ * [[wantedNodeCapabilityCount]] plus [[errorTolerance]].
  */
-export async function* fetchNodes(
-  getNode: () => Promise<IEnr | null>,
-  maxGet: number = 10,
-  maxErrors: number = 3
-): AsyncGenerator<IEnr> {
-  const peerNodeIds = new Set();
+export async function fetchNodesUntilCapabilitiesFulfilled(
+  wantedNodeCapabilityCount: Partial<NodeCapabilityCount>,
+  errorTolerance: number,
+  getNode: () => Promise<IEnr | null>
+): Promise<IEnr[]> {
+  const wanted = {
+    relay: wantedNodeCapabilityCount.relay ?? 0,
+    store: wantedNodeCapabilityCount.store ?? 0,
+    filter: wantedNodeCapabilityCount.filter ?? 0,
+    lightPush: wantedNodeCapabilityCount.lightPush ?? 0
+  };
+
+  const maxSearches =
+    wanted.relay + wanted.store + wanted.filter + wanted.lightPush;
+
+  const actual = {
+    relay: 0,
+    store: 0,
+    filter: 0,
+    lightPush: 0
+  };
 
   let totalSearches = 0;
-  let erroneousSearches = 0;
+  const peers: IEnr[] = [];
 
   while (
-    totalSearches < maxGet &&
-    erroneousSearches < maxErrors // Allows a couple of empty results before calling it quit
+    !isSatisfied(wanted, actual) &&
+    totalSearches < maxSearches + errorTolerance
   ) {
-    totalSearches++;
-
     const peer = await getNode();
-    if (!peer || !peer.nodeId) {
-      erroneousSearches++;
-      continue;
-    }
-
-    if (!peerNodeIds.has(peer.nodeId)) {
-      peerNodeIds.add(peer.nodeId);
+    if (peer && isNewPeer(peer, peers)) {
       // ENRs without a waku2 key are ignored.
       if (peer.waku2) {
-        yield peer;
+        if (helpsSatisfyCapabilities(peer.waku2, wanted, actual)) {
+          addCapabilities(peer.waku2, actual);
+          peers.push(peer);
+        }
       }
       log.info(
         `got new peer candidate from DNS address=${peer.nodeId}@${peer.ip}`
       );
     }
+
+    totalSearches++;
+  }
+  return peers;
+}
+
+/**
+ * Fetch nodes using passed [[getNode]] until all wanted capabilities are
+ * fulfilled or the number of [[getNode]] call exceeds the sum of
+ * [[wantedNodeCapabilityCount]] plus [[errorTolerance]].
+ */
+export async function* yieldNodesUntilCapabilitiesFulfilled(
+  wantedNodeCapabilityCount: Partial<NodeCapabilityCount>,
+  errorTolerance: number,
+  getNode: () => Promise<IEnr | null>
+): AsyncGenerator<IEnr> {
+  const wanted = {
+    relay: wantedNodeCapabilityCount.relay ?? 0,
+    store: wantedNodeCapabilityCount.store ?? 0,
+    filter: wantedNodeCapabilityCount.filter ?? 0,
+    lightPush: wantedNodeCapabilityCount.lightPush ?? 0
+  };
+
+  const maxSearches =
+    wanted.relay + wanted.store + wanted.filter + wanted.lightPush;
+
+  const actual = {
+    relay: 0,
+    store: 0,
+    filter: 0,
+    lightPush: 0
+  };
+
+  let totalSearches = 0;
+  const peerNodeIds = new Set();
+
+  while (
+    !isSatisfied(wanted, actual) &&
+    totalSearches < maxSearches + errorTolerance
+  ) {
+    const peer = await getNode();
+    if (peer && peer.nodeId && !peerNodeIds.has(peer.nodeId)) {
+      peerNodeIds.add(peer.nodeId);
+      // ENRs without a waku2 key are ignored.
+      if (peer.waku2) {
+        if (helpsSatisfyCapabilities(peer.waku2, wanted, actual)) {
+          addCapabilities(peer.waku2, actual);
+          yield peer;
+        }
+      }
+      log.info(
+        `got new peer candidate from DNS address=${peer.nodeId}@${peer.ip}`
+      );
+    }
+    totalSearches++;
   }
 }
+
+function isSatisfied(
+  wanted: NodeCapabilityCount,
+  actual: NodeCapabilityCount
+): boolean {
+  return (
+    actual.relay >= wanted.relay &&
+    actual.store >= wanted.store &&
+    actual.filter >= wanted.filter &&
+    actual.lightPush >= wanted.lightPush
+  );
+}
+
+function isNewPeer(peer: IEnr, peers: IEnr[]): boolean {
+  if (!peer.nodeId) return false;
+
+  for (const existingPeer of peers) {
+    if (peer.nodeId === existingPeer.nodeId) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+function addCapabilities(node: Waku2, total: NodeCapabilityCount): void {
+  if (node.relay) total.relay += 1;
+  if (node.store) total.store += 1;
+  if (node.filter) total.filter += 1;
+  if (node.lightPush) total.lightPush += 1;
+}
+
+/**
+ * Checks if the proposed ENR [[node]] helps satisfy the [[wanted]] capabilities,
+ * considering the [[actual]] capabilities of nodes retrieved so far..
+ *
+ * @throws If the function is called when the wanted capabilities are already fulfilled.
+ */
+function helpsSatisfyCapabilities(
+  node: Waku2,
+  wanted: NodeCapabilityCount,
+  actual: NodeCapabilityCount
+): boolean {
+  if (isSatisfied(wanted, actual)) {
+    throw "Internal Error: Waku2 wanted capabilities are already fulfilled";
+  }
+
+  const missing = missingCapabilities(wanted, actual);
+
+  return (
+    (missing.relay && node.relay) ||
+    (missing.store && node.store) ||
+    (missing.filter && node.filter) ||
+    (missing.lightPush && node.lightPush)
+  );
+}
+
+/**
+ * Return a [[Waku2]] Object for which capabilities are set to true if they are
+ * [[wanted]] yet missing from [[actual]].
+ */
+function missingCapabilities(
+  wanted: NodeCapabilityCount,
+  actual: NodeCapabilityCount
+): Waku2 {
+  return {
+    relay: actual.relay < wanted.relay,
+    store: actual.store < wanted.store,
+    filter: actual.filter < wanted.filter,
+    lightPush: actual.lightPush < wanted.lightPush
+  };
+}

packages/discovery/src/index.ts

@@ -1,14 +1,21 @@
+// DNS Discovery
 export { PeerDiscoveryDns, wakuDnsDiscovery } from "./dns/dns_discovery.js";
 export { enrTree } from "./dns/constants.js";
 export { DnsNodeDiscovery } from "./dns/dns.js";
 
+// Peer Exchange Discovery
+export {
+  wakuPeerExchange,
+  PeerExchangeCodec,
+  WakuPeerExchange
+} from "./peer-exchange/waku_peer_exchange.js";
 export {
   wakuPeerExchangeDiscovery,
-  PeerExchangeDiscovery,
-  PeerExchangeCodec
-} from "./peer-exchange/index.js";
+  PeerExchangeDiscovery
+} from "./peer-exchange/waku_peer_exchange_discovery.js";
 
+// Local Peer Cache Discovery
 export {
-  PeerCacheDiscovery,
-  wakuPeerCacheDiscovery
-} from "./peer-cache/index.js";
+  LocalPeerCacheDiscovery,
+  wakuLocalPeerCacheDiscovery
+} from "./local-peer-cache/index.js";

packages/discovery/src/local-peer-cache/index.spec.ts

@@ -6,68 +6,70 @@ import { prefixLogger } from "@libp2p/logger";
 import { peerIdFromPrivateKey, peerIdFromString } from "@libp2p/peer-id";
 import { persistentPeerStore } from "@libp2p/peer-store";
 import { multiaddr } from "@multiformats/multiaddr";
-import { Libp2pComponents, PartialPeerInfo, PeerCache } from "@waku/interfaces";
+import { Libp2pComponents } from "@waku/interfaces";
+import { LocalStoragePeerInfo } from "@waku/interfaces";
 import chai, { expect } from "chai";
 import chaiAsPromised from "chai-as-promised";
 import { MemoryDatastore } from "datastore-core/memory";
 import sinon from "sinon";
 
-import { PeerCacheDiscovery } from "./index.js";
+import { LocalPeerCacheDiscovery } from "./index.js";
 
 chai.use(chaiAsPromised);
 
-const mockPeers: PartialPeerInfo[] = [
+if (typeof window === "undefined") {
+  try {
+    global.localStorage = {
+      store: {} as Record<string, string>,
+      getItem(key: string) {
+        return this.store[key] || null;
+      },
+      setItem(key: string, value: string) {
+        this.store[key] = value;
+      },
+      removeItem(key: string) {
+        delete this.store[key];
+      },
+      clear() {
+        this.store = {};
+      }
+    } as any;
+  } catch (error) {
+    console.error("Failed to load localStorage polyfill:", error);
+  }
+}
+
+const mockPeers = [
   {
     id: "16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD",
-    multiaddrs: [
-      "/ip4/127.0.0.1/tcp/8000/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD"
-    ]
+    address:
+      "/ip4/127.0.0.1/tcp/8000/ws/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrD"
   },
   {
     id: "16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrE",
-    multiaddrs: [
-      "/ip4/127.0.0.1/tcp/8001/wss/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrE"
-    ]
+    address:
+      "/ip4/127.0.0.1/tcp/8001/ws/p2p/16Uiu2HAm4v86W3bmT1BiH6oSPzcsSr24iDQpSN5Qa992BCjjwgrE"
   }
 ];
 
-class MockPeerCache implements PeerCache {
-  public data: PartialPeerInfo[] = [];
-  public throwOnGet = false;
-  public get(): PartialPeerInfo[] {
-    if (this.throwOnGet) {
-      throw new Error("cache get error");
-    }
-    return this.data;
-  }
-  public set(value: PartialPeerInfo[]): void {
-    this.data = value;
-  }
-  public remove(): void {
-    this.data = [];
-  }
-}
-
-async function setPeersInCache(
-  cache: MockPeerCache,
-  peers: PartialPeerInfo[]
+async function setPeersInLocalStorage(
+  peers: LocalStoragePeerInfo[]
 ): Promise<void> {
-  cache.set(peers);
+  localStorage.setItem("waku:peers", JSON.stringify(peers));
 }
 
-describe("Peer Cache Discovery", function () {
+describe("Local Storage Discovery", function () {
   this.timeout(25_000);
   let components: Libp2pComponents;
-  let mockCache: MockPeerCache;
 
   beforeEach(async function () {
-    mockCache = new MockPeerCache();
+    localStorage.clear();
     components = {
       peerStore: persistentPeerStore({
         events: new TypedEventEmitter(),
         peerId: await generateKeyPair("secp256k1").then(peerIdFromPrivateKey),
         datastore: new MemoryDatastore(),
-        logger: prefixLogger("peer_cache_discovery.spec.ts")
+        logger: prefixLogger("local_discovery.spec.ts")
       }),
       events: new TypedEventEmitter()
     } as unknown as Libp2pComponents;
@@ -75,24 +77,23 @@ describe("Peer Cache Discovery", function () {
 
   describe("Compliance Tests", function () {
     beforeEach(async function () {
-      mockCache = new MockPeerCache();
-      await setPeersInCache(mockCache, [mockPeers[0]]);
+      await setPeersInLocalStorage([mockPeers[0]]);
     });
 
     tests({
       async setup() {
-        return new PeerCacheDiscovery(components, { cache: mockCache });
+        return new LocalPeerCacheDiscovery(components);
       },
       async teardown() {}
     });
   });
 
   describe("Unit Tests", function () {
-    let discovery: PeerCacheDiscovery;
+    let discovery: LocalPeerCacheDiscovery;
 
     beforeEach(async function () {
-      discovery = new PeerCacheDiscovery(components, { cache: mockCache });
-      await setPeersInCache(mockCache, mockPeers);
+      discovery = new LocalPeerCacheDiscovery(components);
+      await setPeersInLocalStorage(mockPeers);
     });
 
     it("should load peers from local storage and dispatch events", async () => {
@@ -102,46 +103,43 @@ describe("Peer Cache Discovery", function () {
 
       expect(dispatchEventSpy.calledWith(sinon.match.has("type", "peer"))).to.be
         .true;
-
-      const dispatchedIds = dispatchEventSpy
-        .getCalls()
-        .map((c) => (c.args[0] as CustomEvent<any>).detail?.id?.toString?.())
-        .filter(Boolean);
-
       mockPeers.forEach((mockPeer) => {
-        expect(dispatchedIds).to.include(mockPeer.id);
+        expect(
+          dispatchEventSpy.calledWith(
+            sinon.match.hasNested("detail.id", mockPeer.id)
+          )
+        ).to.be.true;
       });
     });
 
-    it("should update peers in cache on 'peer:identify' event", async () => {
-      await discovery.start();
-
-      const newPeerIdentifyEvent = new CustomEvent<IdentifyResult>(
-        "peer:identify",
-        {
-          detail: {
-            peerId: peerIdFromString(mockPeers[1].id.toString()),
-            listenAddrs: [multiaddr(mockPeers[1].multiaddrs[0])]
-          } as IdentifyResult
+    it("should update peers in local storage on 'peer:identify' event", async () => {
+      const newPeerIdentifyEvent = {
+        detail: {
+          peerId: peerIdFromString(mockPeers[1].id.toString()),
+          listenAddrs: [multiaddr(mockPeers[1].address)]
         }
+      } as CustomEvent<IdentifyResult>;
+
+      // Directly invoke handleNewPeers to simulate receiving an 'identify' event
+      discovery.handleNewPeers(newPeerIdentifyEvent);
+
+      const updatedPeers = JSON.parse(
+        localStorage.getItem("waku:peers") || "[]"
       );
-
-      components.events.dispatchEvent(newPeerIdentifyEvent);
-
-      expect(mockCache.get()).to.deep.include({
-        id: mockPeers[1].id,
-        multiaddrs: [mockPeers[1].multiaddrs[0]]
+      expect(updatedPeers).to.deep.include({
+        id: newPeerIdentifyEvent.detail.peerId.toString(),
+        address: newPeerIdentifyEvent.detail.listenAddrs[0].toString()
       });
     });
 
-    it("should handle cache.get errors gracefully", async () => {
-      mockCache.throwOnGet = true;
+    it("should handle corrupted local storage data gracefully", async () => {
+      localStorage.setItem("waku:peers", "not-a-valid-json");
 
       try {
         await discovery.start();
       } catch (error) {
         expect.fail(
-          "start() should not have thrown an error when cache.get throws"
+          "start() should not have thrown an error for corrupted local storage data"
         );
       }
     });

packages/discovery/src/local-peer-cache/index.ts

@@ -0,0 +1,163 @@
+import { TypedEventEmitter } from "@libp2p/interface";
+import {
+  IdentifyResult,
+  PeerDiscovery,
+  PeerDiscoveryEvents,
+  PeerInfo,
+  Startable
+} from "@libp2p/interface";
+import { peerIdFromString } from "@libp2p/peer-id";
+import { multiaddr } from "@multiformats/multiaddr";
+import {
+  type Libp2pComponents,
+  type LocalStoragePeerInfo,
+  Tags
+} from "@waku/interfaces";
+import { getWsMultiaddrFromMultiaddrs, Logger } from "@waku/utils";
+
+const log = new Logger("peer-exchange-discovery");
+
+type LocalPeerCacheDiscoveryOptions = {
+  tagName?: string;
+  tagValue?: number;
+  tagTTL?: number;
+};
+
+export const DEFAULT_LOCAL_TAG_NAME = Tags.LOCAL;
+const DEFAULT_LOCAL_TAG_VALUE = 50;
+const DEFAULT_LOCAL_TAG_TTL = 100_000_000;
+
+export class LocalPeerCacheDiscovery
+  extends TypedEventEmitter<PeerDiscoveryEvents>
+  implements PeerDiscovery, Startable
+{
+  private isStarted: boolean;
+  private peers: LocalStoragePeerInfo[] = [];
+
+  public constructor(
+    private readonly components: Libp2pComponents,
+    private readonly options?: LocalPeerCacheDiscoveryOptions
+  ) {
+    super();
+    this.isStarted = false;
+    this.peers = this.getPeersFromLocalStorage();
+  }
+
+  public get [Symbol.toStringTag](): string {
+    return "@waku/local-peer-cache-discovery";
+  }
+
+  public async start(): Promise<void> {
+    if (this.isStarted) return;
+
+    log.info("Starting Local Storage Discovery");
+    this.components.events.addEventListener(
+      "peer:identify",
+      this.handleNewPeers
+    );
+
+    for (const { id: idStr, address } of this.peers) {
+      const peerId = peerIdFromString(idStr);
+      if (await this.components.peerStore.has(peerId)) continue;
+
+      await this.components.peerStore.save(peerId, {
+        multiaddrs: [multiaddr(address)],
+        tags: {
+          [this.options?.tagName ?? DEFAULT_LOCAL_TAG_NAME]: {
+            value: this.options?.tagValue ?? DEFAULT_LOCAL_TAG_VALUE,
+            ttl: this.options?.tagTTL ?? DEFAULT_LOCAL_TAG_TTL
+          }
+        }
+      });
+
+      this.dispatchEvent(
+        new CustomEvent<PeerInfo>("peer", {
+          detail: {
+            id: peerId,
+            multiaddrs: [multiaddr(address)]
+          }
+        })
+      );
+    }
+
+    log.info(`Discovered ${this.peers.length} peers`);
+
+    this.isStarted = true;
+  }
+
+  public stop(): void | Promise<void> {
+    if (!this.isStarted) return;
+    log.info("Stopping Local Storage Discovery");
+    this.components.events.removeEventListener(
+      "peer:identify",
+      this.handleNewPeers
+    );
+    this.isStarted = false;
+
+    this.savePeersToLocalStorage();
+  }
+
+  public handleNewPeers = (event: CustomEvent<IdentifyResult>): void => {
+    const { peerId, listenAddrs } = event.detail;
+
+    const websocketMultiaddr = getWsMultiaddrFromMultiaddrs(listenAddrs);
+
+    const localStoragePeers = this.getPeersFromLocalStorage();
+
+    const existingPeerIndex = localStoragePeers.findIndex(
+      (_peer) => _peer.id === peerId.toString()
+    );
+
+    if (existingPeerIndex >= 0) {
+      localStoragePeers[existingPeerIndex].address =
+        websocketMultiaddr.toString();
+    } else {
+      localStoragePeers.push({
+        id: peerId.toString(),
+        address: websocketMultiaddr.toString()
+      });
+    }
+
+    this.peers = localStoragePeers;
+    this.savePeersToLocalStorage();
+  };
+
+  private getPeersFromLocalStorage(): LocalStoragePeerInfo[] {
+    try {
+      const storedPeersData = localStorage.getItem("waku:peers");
+      if (!storedPeersData) return [];
+      const peers = JSON.parse(storedPeersData);
+      return peers.filter(isValidStoredPeer);
+    } catch (error) {
+      log.error("Error parsing peers from local storage:", error);
+      return [];
+    }
+  }
+
+  private savePeersToLocalStorage(): void {
+    try {
+      localStorage.setItem("waku:peers", JSON.stringify(this.peers));
+    } catch (error) {
+      log.error("Error saving peers to local storage:", error);
+    }
+  }
+}
+
+function isValidStoredPeer(peer: any): peer is LocalStoragePeerInfo {
+  return (
+    peer &&
+    typeof peer === "object" &&
+    typeof peer.id === "string" &&
+    typeof peer.address === "string"
+  );
+}
+
+export function wakuLocalPeerCacheDiscovery(): (
+  components: Libp2pComponents,
+  options?: LocalPeerCacheDiscoveryOptions
+) => LocalPeerCacheDiscovery {
+  return (
+    components: Libp2pComponents,
+    options?: LocalPeerCacheDiscoveryOptions
+  ) => new LocalPeerCacheDiscovery(components, options);
+}

packages/discovery/src/peer-cache/constants.ts

@@ -1,4 +0,0 @@
-import { Tags } from "@waku/interfaces";
-
-export const DEFAULT_PEER_CACHE_TAG_NAME = Tags.PEER_CACHE;
-export const DEFAULT_PEER_CACHE_TAG_VALUE = 50;

packages/discovery/src/peer-cache/index.ts

@@ -1 +0,0 @@
-export { wakuPeerCacheDiscovery, PeerCacheDiscovery } from "./peer_cache.js";

packages/discovery/src/peer-cache/peer_cache.ts

@@ -1,152 +0,0 @@
-import { TypedEventEmitter } from "@libp2p/interface";
-import {
-  IdentifyResult,
-  PeerDiscovery,
-  PeerDiscoveryEvents,
-  PeerInfo,
-  Startable
-} from "@libp2p/interface";
-import { peerIdFromString } from "@libp2p/peer-id";
-import { multiaddr } from "@multiformats/multiaddr";
-import type {
-  Libp2pComponents,
-  PartialPeerInfo,
-  PeerCache,
-  PeerCacheDiscoveryOptions
-} from "@waku/interfaces";
-import { Logger } from "@waku/utils";
-
-import {
-  DEFAULT_PEER_CACHE_TAG_NAME,
-  DEFAULT_PEER_CACHE_TAG_VALUE
-} from "./constants.js";
-import { defaultCache } from "./utils.js";
-
-const log = new Logger("peer-cache");
-
-export class PeerCacheDiscovery
-  extends TypedEventEmitter<PeerDiscoveryEvents>
-  implements PeerDiscovery, Startable
-{
-  private isStarted: boolean = false;
-  private readonly cache: PeerCache;
-
-  public constructor(
-    private readonly components: Libp2pComponents,
-    options?: Partial<PeerCacheDiscoveryOptions>
-  ) {
-    super();
-    this.cache = options?.cache ?? defaultCache();
-  }
-
-  public get [Symbol.toStringTag](): string {
-    return `@waku/${DEFAULT_PEER_CACHE_TAG_NAME}`;
-  }
-
-  public async start(): Promise<void> {
-    if (this.isStarted) {
-      return;
-    }
-
-    log.info("Starting Peer Cache Discovery");
-
-    this.components.events.addEventListener(
-      "peer:identify",
-      this.handleDiscoveredPeer
-    );
-
-    await this.discoverPeers();
-
-    this.isStarted = true;
-  }
-
-  public stop(): void | Promise<void> {
-    if (!this.isStarted) {
-      return;
-    }
-
-    log.info("Stopping Peer Cache Discovery");
-
-    this.components.events.removeEventListener(
-      "peer:identify",
-      this.handleDiscoveredPeer
-    );
-
-    this.isStarted = false;
-  }
-
-  private handleDiscoveredPeer = (event: CustomEvent<IdentifyResult>): void => {
-    const { peerId, listenAddrs } = event.detail;
-    const multiaddrs = listenAddrs.map((addr) => addr.toString());
-
-    const peerIdStr = peerId.toString();
-    const knownPeers = this.readPeerInfoFromCache();
-    const peerIndex = knownPeers.findIndex((p) => p.id === peerIdStr);
-
-    if (peerIndex !== -1) {
-      knownPeers[peerIndex].multiaddrs = multiaddrs;
-    } else {
-      knownPeers.push({
-        id: peerIdStr,
-        multiaddrs
-      });
-    }
-
-    this.writePeerInfoToCache(knownPeers);
-  };
-
-  private async discoverPeers(): Promise<void> {
-    const knownPeers = this.readPeerInfoFromCache();
-
-    for (const peer of knownPeers) {
-      const peerId = peerIdFromString(peer.id);
-      const multiaddrs = peer.multiaddrs.map((addr) => multiaddr(addr));
-
-      if (await this.components.peerStore.has(peerId)) {
-        continue;
-      }
-
-      await this.components.peerStore.save(peerId, {
-        multiaddrs,
-        tags: {
-          [DEFAULT_PEER_CACHE_TAG_NAME]: {
-            value: DEFAULT_PEER_CACHE_TAG_VALUE
-          }
-        }
-      });
-
-      this.dispatchEvent(
-        new CustomEvent<PeerInfo>("peer", {
-          detail: {
-            id: peerId,
-            multiaddrs
-          }
-        })
-      );
-    }
-  }
-
-  private readPeerInfoFromCache(): PartialPeerInfo[] {
-    try {
-      return this.cache.get();
-    } catch (error) {
-      log.error("Error parsing peers from cache:", error);
-      return [];
-    }
-  }
-
-  private writePeerInfoToCache(peers: PartialPeerInfo[]): void {
-    try {
-      this.cache.set(peers);
-    } catch (error) {
-      log.error("Error saving peers to cache:", error);
-    }
-  }
-}
-
-export function wakuPeerCacheDiscovery(
-  options: Partial<PeerCacheDiscoveryOptions> = {}
-): (components: Libp2pComponents) => PeerCacheDiscovery {
-  return (components: Libp2pComponents) =>
-    new PeerCacheDiscovery(components, options);
-}

packages/discovery/src/peer-cache/utils.ts

@@ -1,73 +0,0 @@
-import type { PartialPeerInfo, PeerCache } from "@waku/interfaces";
-
-const isValidStoredPeer = (peer: unknown): boolean => {
-  return (
-    !!peer &&
-    typeof peer === "object" &&
-    "id" in peer &&
-    typeof peer.id === "string" &&
-    "multiaddrs" in peer &&
-    Array.isArray(peer.multiaddrs)
-  );
-};
-
-/**
- * A noop cache that will be used in environments where localStorage is not available.
- */
-class NoopCache implements PeerCache {
-  public get(): PartialPeerInfo[] {
-    return [];
-  }
-
-  public set(_value: PartialPeerInfo[]): void {
-    return;
-  }
-
-  public remove(): void {
-    return;
-  }
-}
-
-/**
- * A cache that uses localStorage to store peer information.
- */
-class LocalStorageCache implements PeerCache {
-  public get(): PartialPeerInfo[] {
-    try {
-      const cachedPeers = localStorage.getItem("waku:peers");
-      const peers = cachedPeers ? JSON.parse(cachedPeers) : [];
-
-      return peers.filter(isValidStoredPeer);
-    } catch (e) {
-      return [];
-    }
-  }
-
-  public set(_value: PartialPeerInfo[]): void {
-    try {
-      localStorage.setItem("waku:peers", JSON.stringify(_value));
-    } catch (e) {
-      // ignore
-    }
-  }
-
-  public remove(): void {
-    try {
-      localStorage.removeItem("waku:peers");
-    } catch (e) {
-      // ignore
-    }
-  }
-}
-
-export const defaultCache = (): PeerCache => {
-  try {
-    if (typeof localStorage !== "undefined") {
-      return new LocalStorageCache();
-    }
-  } catch (_e) {
-    // ignore
-  }
-
-  return new NoopCache();
-};