@waku/discovery 0.0.7-219b8cb.0 → 0.0.7-2a94244.0

package/dist/dns/dns_over_https.d.ts

@@ -1,18 +1,12 @@
 import type { DnsClient } from "@waku/interfaces";
-import { Endpoint } from "dns-query";
 export declare class DnsOverHttps implements DnsClient {
-    private endpoints;
-    private retries;
+    private resolver;
     /**
      * Create new Dns-Over-Http DNS client.
      *
-     * @param endpoints The endpoints for Dns-Over-Https queries;
-     * Defaults to using dns-query's API..
-     * @param retries Retries if a given endpoint fails.
-     *
      * @throws {code: string} If DNS query fails.
      */
-    static create(endpoints?: Endpoint[], retries?: number): Promise<DnsOverHttps>;
+    static create(): Promise<DnsOverHttps>;
     private constructor();
     /**
      * Resolves a TXT record

package/dist/dns/dns_over_https.js

@@ -1,26 +1,19 @@
 import { Logger } from "@waku/utils";
 import { bytesToUtf8 } from "@waku/utils/bytes";
-import { query, wellknown } from "dns-query";
+import DnsOverHttpResolver from "dns-over-http-resolver";
 const log = new Logger("dns-over-https");
 export class DnsOverHttps {
-    endpoints;
-    retries;
+    resolver;
     /**
      * Create new Dns-Over-Http DNS client.
      *
-     * @param endpoints The endpoints for Dns-Over-Https queries;
-     * Defaults to using dns-query's API..
-     * @param retries Retries if a given endpoint fails.
-     *
      * @throws {code: string} If DNS query fails.
      */
-    static async create(endpoints, retries) {
-        const _endpoints = endpoints ?? (await wellknown.endpoints("doh"));
-        return new DnsOverHttps(_endpoints, retries);
+    static async create() {
+        return new DnsOverHttps();
     }
-    constructor(endpoints, retries = 3) {
-        this.endpoints = endpoints;
-        this.retries = retries;
+    constructor(resolver = new DnsOverHttpResolver()) {
+        this.resolver = resolver;
     }
     /**
      * Resolves a TXT record
@@ -32,13 +25,7 @@ export class DnsOverHttps {
     async resolveTXT(domain) {
         let answers;
         try {
-            const res = await query({
-                question: { type: "TXT", name: domain }
-            }, {
-                endpoints: this.endpoints,
-                retries: this.retries
-            });
-            answers = res.answers;
+            answers = await this.resolver.resolveTxt(domain);
         }
         catch (error) {
             log.error("query failed: ", error);
@@ -46,9 +33,8 @@ export class DnsOverHttps {
         }
         if (!answers)
             throw new Error(`Could not resolve ${domain}`);
-        const data = answers.map((a) => a.data);
         const result = [];
-        data.forEach((d) => {
+        answers.forEach((d) => {
             if (typeof d === "string") {
                 result.push(d);
             }

package/dist/dns/dns_over_https.js.map

@@ -1 +1 @@
-{"version":3,"file":"dns_over_https.js","sourceRoot":"","sources":["../../src/dns/dns_over_https.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAY,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEvD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAEzC,MAAM,OAAO,YAAY;IAoBb;IACA;IApBV;;;;;;;;OAQG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM,CACxB,SAAsB,EACtB,OAAgB;QAEhB,MAAM,UAAU,GAAG,SAAS,IAAI,CAAC,MAAM,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;QAEnE,OAAO,IAAI,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,YACU,SAAqB,EACrB,UAAkB,CAAC;QADnB,cAAS,GAAT,SAAS,CAAY;QACrB,YAAO,GAAP,OAAO,CAAY;IAC1B,CAAC;IAEJ;;;;;;OAMG;IACI,KAAK,CAAC,UAAU,CAAC,MAAc;QACpC,IAAI,OAAO,CAAC;QACZ,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,KAAK,CACrB;gBACE,QAAQ,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE;aACxC,EACD;gBACE,SAAS,EAAE,IAAI,CAAC,SAAS;gBACzB,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CACF,CAAC;YACF,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QACxB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,MAAM,EAAE,CAAC,CAAC;QAE7D,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAED,CAAC;QAEtC,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5B,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;oBACf,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;wBAC3B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAClB,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC/B,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}
+{"version":3,"file":"dns_over_https.js","sourceRoot":"","sources":["../../src/dns/dns_over_https.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,mBAAmB,MAAM,wBAAwB,CAAC;AAEzD,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC;AAEzC,MAAM,OAAO,YAAY;IAUK;IAT5B;;;;OAIG;IACI,MAAM,CAAC,KAAK,CAAC,MAAM;QACxB,OAAO,IAAI,YAAY,EAAE,CAAC;IAC5B,CAAC;IAED,YAA4B,WAAW,IAAI,mBAAmB,EAAE;QAApC,aAAQ,GAAR,QAAQ,CAA4B;IAAG,CAAC;IAEpE;;;;;;OAMG;IACI,KAAK,CAAC,UAAU,CAAC,MAAc;QACpC,IAAI,OAAO,CAAC;QACZ,IAAI,CAAC;YACH,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,CAAC,OAAO;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,MAAM,EAAE,CAAC,CAAC;QAE7D,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACjB,CAAC;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5B,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;oBACf,IAAI,OAAO,EAAE,KAAK,QAAQ,EAAE,CAAC;wBAC3B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAClB,CAAC;yBAAM,CAAC;wBACN,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC/B,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF"}

package/dist/dns/fetch_nodes.d.ts

@@ -1,13 +1,11 @@
-import type { IEnr, NodeCapabilityCount } from "@waku/interfaces";
+import type { IEnr } from "@waku/interfaces";
 /**
- * Fetch nodes using passed [[getNode]] until all wanted capabilities are
- * fulfilled or the number of [[getNode]] call exceeds the sum of
- * [[wantedNodeCapabilityCount]] plus [[errorTolerance]].
+ * Fetch nodes using passed [[getNode]]; results are validated before being
+ * returned. Stops when [[getNodes]] does not return any more nodes or the
+ * number call exceeds [[maxSearches]].
  */
-export declare function fetchNodesUntilCapabilitiesFulfilled(wantedNodeCapabilityCount: Partial<NodeCapabilityCount>, errorTolerance: number, getNode: () => Promise<IEnr | null>): Promise<IEnr[]>;
+export declare function fetchAndValidateNodes(maxSearches: number | undefined, getNode: () => Promise<IEnr | null>): Promise<IEnr[]>;
 /**
- * Fetch nodes using passed [[getNode]] until all wanted capabilities are
- * fulfilled or the number of [[getNode]] call exceeds the sum of
- * [[wantedNodeCapabilityCount]] plus [[errorTolerance]].
+ * Fetch nodes using passed [[getNode]]
  */
-export declare function yieldNodesUntilCapabilitiesFulfilled(wantedNodeCapabilityCount: Partial<NodeCapabilityCount>, errorTolerance: number, getNode: () => Promise<IEnr | null>): AsyncGenerator<IEnr>;
+export declare function yieldNodes(getNode: () => Promise<IEnr | null>): AsyncGenerator<IEnr>;

package/dist/dns/fetch_nodes.js

@@ -1,87 +1,47 @@
 import { Logger } from "@waku/utils";
 const log = new Logger("discovery:fetch_nodes");
 /**
- * Fetch nodes using passed [[getNode]] until all wanted capabilities are
- * fulfilled or the number of [[getNode]] call exceeds the sum of
- * [[wantedNodeCapabilityCount]] plus [[errorTolerance]].
+ * Fetch nodes using passed [[getNode]]; results are validated before being
+ * returned. Stops when [[getNodes]] does not return any more nodes or the
+ * number call exceeds [[maxSearches]].
  */
-export async function fetchNodesUntilCapabilitiesFulfilled(wantedNodeCapabilityCount, errorTolerance, getNode) {
-    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
-    };
+export async function fetchAndValidateNodes(maxSearches = 10, getNode) {
     let totalSearches = 0;
+    let emptyResults = 0;
     const peers = [];
-    while (!isSatisfied(wanted, actual) &&
-        totalSearches < maxSearches + errorTolerance) {
+    while (totalSearches < maxSearches &&
+        emptyResults < 2 // Allows a couple of empty results before calling it quit
+    ) {
         const peer = await getNode();
         if (peer && isNewPeer(peer, peers)) {
             // ENRs without a waku2 key are ignored.
             if (peer.waku2) {
-                if (helpsSatisfyCapabilities(peer.waku2, wanted, actual)) {
-                    addCapabilities(peer.waku2, actual);
-                    peers.push(peer);
-                }
+                peers.push(peer);
             }
             log.info(`got new peer candidate from DNS address=${peer.nodeId}@${peer.ip}`);
         }
+        else {
+            emptyResults++;
+        }
         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]].
+ * Fetch nodes using passed [[getNode]]
  */
-export async function* yieldNodesUntilCapabilitiesFulfilled(wantedNodeCapabilityCount, errorTolerance, getNode) {
-    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;
+export async function* yieldNodes(getNode) {
     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}`);
+    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) {
+            yield peer;
         }
-        totalSearches++;
+        log.info(`got new peer candidate from DNS address=${peer.nodeId}@${peer.ip}`);
     }
 }
-function isSatisfied(wanted, actual) {
-    return (actual.relay >= wanted.relay &&
-        actual.store >= wanted.store &&
-        actual.filter >= wanted.filter &&
-        actual.lightPush >= wanted.lightPush);
-}
 function isNewPeer(peer, peers) {
     if (!peer.nodeId)
         return false;
@@ -92,42 +52,4 @@ function isNewPeer(peer, peers) {
     }
     return true;
 }
-function addCapabilities(node, total) {
-    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, wanted, actual) {
-    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, actual) {
-    return {
-        relay: actual.relay < wanted.relay,
-        store: actual.store < wanted.store,
-        filter: actual.filter < wanted.filter,
-        lightPush: actual.lightPush < wanted.lightPush
-    };
-}
 //# sourceMappingURL=fetch_nodes.js.map

package/dist/dns/fetch_nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetch_nodes.js","sourceRoot":"","sources":["../../src/dns/fetch_nodes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetch_nodes.js","sourceRoot":"","sources":["../../src/dns/fetch_nodes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,GAAG,GAAG,IAAI,MAAM,CAAC,uBAAuB,CAAC,CAAC;AAEhD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,cAAsB,EAAE,EACxB,OAAmC;IAEnC,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,MAAM,KAAK,GAAW,EAAE,CAAC;IAEzB,OACE,aAAa,GAAG,WAAW;QAC3B,YAAY,GAAG,CAAC,CAAC,0DAA0D;MAC3E,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAC;QAC7B,IAAI,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;YACnC,wCAAwC;YACxC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACf,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnB,CAAC;YACD,GAAG,CAAC,IAAI,CACN,2CAA2C,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,EAAE,EAAE,CACpE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,YAAY,EAAE,CAAC;QACjB,CAAC;QAED,aAAa,EAAE,CAAC;IAClB,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,UAAU,CAC/B,OAAmC;IAEnC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;IAE9B,MAAM,IAAI,GAAG,MAAM,OAAO,EAAE,CAAC;IAC7B,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACzD,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7B,wCAAwC;QACxC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,CAAC;QACb,CAAC;QACD,GAAG,CAAC,IAAI,CACN,2CAA2C,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,EAAE,EAAE,CACpE,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAC,IAAU,EAAE,KAAa;IAC1C,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE/B,KAAK,MAAM,YAAY,IAAI,KAAK,EAAE,CAAC;QACjC,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,CAAC,MAAM,EAAE,CAAC;YACxC,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}

package/package.json

@@ -1 +1 @@
-{"name":"@waku/discovery","version":"0.0.7-219b8cb.0","description":"Contains various discovery mechanisms: DNS Discovery (EIP-1459, Peer Exchange, Local Peer Cache Discovery.","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"}},"type":"module","author":"Waku Team","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/discovery#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","decentralized","secure","communication","web3","ethereum","dapps","privacy"],"scripts":{"build":"run-s build:**","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:lint":"eslint src --ext .ts","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","check:tsc":"tsc -p tsconfig.dev.json","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build","test":"NODE_ENV=test run-s test:*","test:node":"NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha 'src/**/*.spec.ts'","test:browser":"NODE_ENV=test karma start karma.conf.cjs"},"engines":{"node":">=20"},"dependencies":{"@waku/interfaces":"0.0.29-219b8cb.0","@waku/proto":"0.0.9-219b8cb.0","@waku/enr":"0.0.28-219b8cb.0","@waku/core":"0.0.34-219b8cb.0","@waku/utils":"0.0.22-219b8cb.0","debug":"^4.3.4","dns-query":"^0.11.2","hi-base32":"^0.5.1","uint8arrays":"^5.0.1"},"devDependencies":{"@libp2p/interface":"^2.1.3","@libp2p/peer-id":"5.0.1","@multiformats/multiaddr":"^12.3.0","@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^4.3.11","@types/node-localstorage":"^1.3.3","@waku/build-utils":"*","chai":"^4.3.10","chai-as-promised":"^7.1.1","cspell":"^8.6.1","mocha":"^10.3.0","node-localstorage":"^3.0.5","npm-run-all":"^4.1.5","rollup":"^4.12.0","sinon":"^18.0.0"},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}
+{"name":"@waku/discovery","version":"0.0.7-2a94244.0","description":"Contains various discovery mechanisms: DNS Discovery (EIP-1459, Peer Exchange, Local Peer Cache Discovery.","types":"./dist/index.d.ts","module":"./dist/index.js","exports":{".":{"types":"./dist/index.d.ts","import":"./dist/index.js"}},"type":"module","author":"Waku Team","homepage":"https://github.com/waku-org/js-waku/tree/master/packages/discovery#readme","repository":{"type":"git","url":"https://github.com/waku-org/js-waku.git"},"bugs":{"url":"https://github.com/waku-org/js-waku/issues"},"license":"MIT OR Apache-2.0","keywords":["waku","decentralized","secure","communication","web3","ethereum","dapps","privacy"],"scripts":{"build":"run-s build:**","build:esm":"tsc","build:bundle":"rollup --config rollup.config.js","fix":"run-s fix:*","fix:lint":"eslint src *.js --fix","check":"run-s check:*","check:lint":"eslint src --ext .ts","check:spelling":"cspell \"{README.md,src/**/*.ts}\"","check:tsc":"tsc -p tsconfig.dev.json","prepublish":"npm run build","reset-hard":"git clean -dfx -e .idea && git reset --hard && npm i && npm run build","test":"NODE_ENV=test run-s test:*","test:node":"NODE_ENV=test TS_NODE_PROJECT=./tsconfig.dev.json mocha 'src/**/*.spec.ts'","test:browser":"NODE_ENV=test karma start karma.conf.cjs"},"engines":{"node":">=20"},"dependencies":{"@waku/core":"0.0.34-2a94244.0","@waku/enr":"0.0.28-2a94244.0","@waku/interfaces":"0.0.29-2a94244.0","@waku/proto":"0.0.9-2a94244.0","@waku/utils":"0.0.22-2a94244.0","debug":"^4.3.4","dns-over-http-resolver":"^3.0.8","hi-base32":"^0.5.1","uint8arrays":"^5.0.1"},"devDependencies":{"@libp2p/interface":"^2.1.3","@libp2p/peer-id":"5.0.1","@multiformats/multiaddr":"^12.3.0","@rollup/plugin-commonjs":"^25.0.7","@rollup/plugin-json":"^6.0.0","@rollup/plugin-node-resolve":"^15.2.3","@types/chai":"^4.3.11","@types/node-localstorage":"^1.3.3","@waku/build-utils":"*","chai":"^4.3.10","chai-as-promised":"^7.1.1","cspell":"^8.6.1","mocha":"^10.3.0","node-localstorage":"^3.0.5","npm-run-all":"^4.1.5","rollup":"^4.12.0","sinon":"^18.0.0"},"files":["dist","bundle","src/**/*.ts","!**/*.spec.*","!**/*.json","CHANGELOG.md","LICENSE","README.md"]}

package/src/dns/constants.ts

@@ -1,5 +1,3 @@
-import type { NodeCapabilityCount } from "@waku/interfaces";
-
 /**
  * The ENR tree for the different fleets.
  * SANDBOX and TEST fleets are for The Waku Network.
@@ -13,9 +11,3 @@ export const enrTree = {
 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
-};

package/src/dns/dns.ts

@@ -1,25 +1,17 @@
 import { ENR, EnrDecoder } from "@waku/enr";
-import type {
-  DnsClient,
-  IEnr,
-  NodeCapabilityCount,
-  SearchContext
-} from "@waku/interfaces";
+import type { DnsClient, IEnr, SearchContext } from "@waku/interfaces";
 import { Logger } from "@waku/utils";
 
 import { DnsOverHttps } from "./dns_over_https.js";
 import { ENRTree } from "./enrtree.js";
-import {
-  fetchNodesUntilCapabilitiesFulfilled,
-  yieldNodesUntilCapabilitiesFulfilled
-} from "./fetch_nodes.js";
+import { fetchAndValidateNodes, yieldNodes } 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;
+  private readonly _maxSearch: number = 10;
 
   public static async dnsOverHttp(
     dnsClient?: DnsClient
@@ -31,16 +23,11 @@ export class DnsNodeDiscovery {
   }
 
   /**
-   * 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.
+   * Returns a list of verified peers listed in an EIP-1459 DNS tree. The
+   * underlying retrieval mechanism is capped by [[_maxSearch]] to avoid an
+   * infinite loop of DNS queries.
    */
-  public async getPeers(
-    enrTreeUrls: string[],
-    wantedNodeCapabilityCount: Partial<NodeCapabilityCount>
-  ): Promise<IEnr[]> {
+  public async getPeers(enrTreeUrls: string[]): Promise<IEnr[]> {
     const networkIndex = Math.floor(Math.random() * enrTreeUrls.length);
     const { publicKey, domain } = ENRTree.parseTree(enrTreeUrls[networkIndex]);
     const context: SearchContext = {
@@ -49,10 +36,8 @@ export class DnsNodeDiscovery {
       visits: {}
     };
 
-    const peers = await fetchNodesUntilCapabilitiesFulfilled(
-      wantedNodeCapabilityCount,
-      this._errorTolerance,
-      () => this._search(domain, context)
+    const peers = await fetchAndValidateNodes(this._maxSearch, () =>
+      this._search(domain, context)
     );
     log.info(
       "retrieved peers: ",
@@ -74,10 +59,7 @@ export class DnsNodeDiscovery {
   /**
    * {@inheritDoc getPeers}
    */
-  public async *getNextPeer(
-    enrTreeUrls: string[],
-    wantedNodeCapabilityCount: Partial<NodeCapabilityCount>
-  ): AsyncGenerator<IEnr> {
+  public async *getNextPeer(enrTreeUrls: string[]): AsyncGenerator<IEnr> {
     const networkIndex = Math.floor(Math.random() * enrTreeUrls.length);
     const { publicKey, domain } = ENRTree.parseTree(enrTreeUrls[networkIndex]);
     const context: SearchContext = {
@@ -86,11 +68,7 @@ export class DnsNodeDiscovery {
       visits: {}
     };
 
-    for await (const peer of yieldNodesUntilCapabilitiesFulfilled(
-      wantedNodeCapabilityCount,
-      this._errorTolerance,
-      () => this._search(domain, context)
-    )) {
+    for await (const peer of yieldNodes(() => this._search(domain, context))) {
       yield peer;
     }
   }

package/src/dns/dns_discovery.ts

@@ -9,8 +9,7 @@ import type {
   DiscoveryTrigger,
   DnsDiscOptions,
   DnsDiscoveryComponents,
-  IEnr,
-  NodeCapabilityCount
+  IEnr
 } from "@waku/interfaces";
 import { DNS_DISCOVERY_TAG } from "@waku/interfaces";
 import { encodeRelayShard, Logger } from "@waku/utils";
@@ -18,8 +17,7 @@ import { encodeRelayShard, Logger } from "@waku/utils";
 import {
   DEFAULT_BOOTSTRAP_TAG_NAME,
   DEFAULT_BOOTSTRAP_TAG_TTL,
-  DEFAULT_BOOTSTRAP_TAG_VALUE,
-  DEFAULT_NODE_REQUIREMENTS
+  DEFAULT_BOOTSTRAP_TAG_VALUE
 } from "./constants.js";
 import { DnsNodeDiscovery } from "./dns.js";
 
@@ -35,7 +33,7 @@ export class PeerDiscoveryDns
   private nextPeer: (() => AsyncGenerator<IEnr>) | undefined;
   private _started: boolean;
   private _components: DnsDiscoveryComponents;
-  private _options: DnsDiscOptions;
+  private readonly _options: DnsDiscOptions;
 
   public constructor(
     components: DnsDiscoveryComponents,
@@ -65,14 +63,9 @@ 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,
-        wantedNodeCapabilityCount
-      );
+      this.nextPeer = dns.getNextPeer.bind(dns, enrUrls);
     }
 
     for await (const peerEnr of this.nextPeer()) {
@@ -143,9 +136,8 @@ export class PeerDiscoveryDns
 }
 
 export function wakuDnsDiscovery(
-  enrUrls: string[],
-  wantedNodeCapabilityCount: Partial<NodeCapabilityCount> = DEFAULT_NODE_REQUIREMENTS
+  enrUrls: string[]
 ): (components: DnsDiscoveryComponents) => PeerDiscoveryDns {
   return (components: DnsDiscoveryComponents) =>
-    new PeerDiscoveryDns(components, { enrUrls, wantedNodeCapabilityCount });
+    new PeerDiscoveryDns(components, { enrUrls });
 }

package/src/dns/dns_over_https.ts

@@ -1,7 +1,7 @@
 import type { DnsClient } from "@waku/interfaces";
 import { Logger } from "@waku/utils";
 import { bytesToUtf8 } from "@waku/utils/bytes";
-import { Endpoint, query, wellknown } from "dns-query";
+import DnsOverHttpResolver from "dns-over-http-resolver";
 
 const log = new Logger("dns-over-https");
 
@@ -9,25 +9,13 @@ export class DnsOverHttps implements DnsClient {
   /**
    * Create new Dns-Over-Http DNS client.
    *
-   * @param endpoints The endpoints for Dns-Over-Https queries;
-   * Defaults to using dns-query's API..
-   * @param retries Retries if a given endpoint fails.
-   *
    * @throws {code: string} If DNS query fails.
    */
-  public static async create(
-    endpoints?: Endpoint[],
-    retries?: number
-  ): Promise<DnsOverHttps> {
-    const _endpoints = endpoints ?? (await wellknown.endpoints("doh"));
-
-    return new DnsOverHttps(_endpoints, retries);
+  public static async create(): Promise<DnsOverHttps> {
+    return new DnsOverHttps();
   }
 
-  private constructor(
-    private endpoints: Endpoint[],
-    private retries: number = 3
-  ) {}
+  private constructor(private resolver = new DnsOverHttpResolver()) {}
 
   /**
    * Resolves a TXT record
@@ -39,16 +27,7 @@ export class DnsOverHttps implements DnsClient {
   public async resolveTXT(domain: string): Promise<string[]> {
     let answers;
     try {
-      const res = await query(
-        {
-          question: { type: "TXT", name: domain }
-        },
-        {
-          endpoints: this.endpoints,
-          retries: this.retries
-        }
-      );
-      answers = res.answers;
+      answers = await this.resolver.resolveTxt(domain);
     } catch (error) {
       log.error("query failed: ", error);
       throw new Error("DNS query failed");
@@ -56,13 +35,9 @@ export class DnsOverHttps implements DnsClient {
 
     if (!answers) throw new Error(`Could not resolve ${domain}`);
 
-    const data = answers.map((a) => a.data) as
-      | Array<string | Uint8Array>
-      | Array<Array<string | Uint8Array>>;
-
     const result: string[] = [];
 
-    data.forEach((d) => {
+    answers.forEach((d) => {
       if (typeof d === "string") {
         result.push(d);
       } else if (Array.isArray(d)) {