@helia/ipns 6.0.0 → 6.0.1-2c71b6e

package/dist/src/utils/dns.js

@@ -1,79 +0,0 @@
-import { CodeError } from '@libp2p/interface';
-import * as isIPFS from 'is-ipfs';
-export const ipfsPathForAnswer = (answer) => {
-    let data = answer.data;
-    if (data.startsWith('"')) {
-        data = data.substring(1);
-    }
-    if (data.endsWith('"')) {
-        data = data.substring(0, data.length - 1);
-    }
-    return data.replace('dnslink=', '');
-};
-export const ipfsPathAndAnswer = (domain, response) => {
-    const answer = findDNSLinkAnswer(domain, response);
-    return {
-        ipfsPath: ipfsPathForAnswer(answer),
-        answer
-    };
-};
-export const findDNSLinkAnswer = (domain, response) => {
-    const answer = response.Answer?.filter(a => a.data.includes('dnslink=/ipfs') || a.data.includes('dnslink=/ipns')).pop();
-    if (answer == null) {
-        throw new CodeError(`No dnslink records found for domain: ${domain}`, 'ERR_DNSLINK_NOT_FOUND');
-    }
-    return answer;
-};
-export const MAX_RECURSIVE_DEPTH = 32;
-export const recursiveResolveDnslink = async (domain, depth, resolve, options = {}) => {
-    if (depth === 0) {
-        throw new Error('recursion limit exceeded');
-    }
-    let dnslinkRecord;
-    try {
-        dnslinkRecord = await resolve(domain, options);
-    }
-    catch (err) {
-        // If the code is not ENOTFOUND or ERR_DNSLINK_NOT_FOUND or ENODATA then throw the error
-        if (err.code !== 'ENOTFOUND' && err.code !== 'ERR_DNSLINK_NOT_FOUND' && err.code !== 'ENODATA') {
-            throw err;
-        }
-        if (domain.startsWith('_dnslink.')) {
-            // The supplied domain contains a _dnslink component
-            // Check the non-_dnslink domain
-            domain = domain.replace('_dnslink.', '');
-        }
-        else {
-            // Check the _dnslink subdomain
-            domain = `_dnslink.${domain}`;
-        }
-        // If this throws then we propagate the error
-        dnslinkRecord = await resolve(domain, options);
-    }
-    const result = dnslinkRecord.replace('dnslink=', '');
-    // result is now a `/ipfs/<cid>` or `/ipns/<cid>` string
-    const domainOrCID = result.split('/')[2]; // e.g. ["", "ipfs", "<cid>"]
-    const isIPFSCID = isIPFS.cid(domainOrCID);
-    // if the result is a CID, or depth is 1, we've reached the end of the recursion
-    // if depth is 1, another recursive call will be made, but it would throw.
-    // we could return if depth is 1 and allow users to handle, but that may be a breaking change
-    if (isIPFSCID) {
-        return result;
-    }
-    return recursiveResolveDnslink(domainOrCID, depth - 1, resolve, options);
-};
-const DNSLINK_REGEX = /^dnslink=.+$/;
-export const resolveFn = async (resolver, domain) => {
-    const records = await resolver.resolveTxt(domain);
-    const dnslinkRecords = records.flat()
-        .filter(record => DNSLINK_REGEX.test(record));
-    // we now have dns text entries as an array of strings
-    // only records passing the DNSLINK_REGEX text are included
-    // TODO: support multiple dnslink records
-    const dnslinkRecord = dnslinkRecords[0];
-    if (dnslinkRecord == null) {
-        throw new CodeError(`No dnslink records found for domain: ${domain}`, 'ERR_DNSLINK_NOT_FOUND');
-    }
-    return dnslinkRecord;
-};
-//# sourceMappingURL=dns.js.map

package/dist/src/utils/dns.js.map

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

package/dist/src/utils/tlru.d.ts

@@ -1,15 +0,0 @@
-/**
- * Time Aware Least Recent Used Cache
- *
- * @see https://arxiv.org/pdf/1801.00390
- */
-export declare class TLRU<T> {
-    private readonly lru;
-    constructor(maxSize: number);
-    get(key: string): T | undefined;
-    set(key: string, value: T, ttl: number): void;
-    has(key: string): boolean;
-    remove(key: string): void;
-    clear(): void;
-}
-//# sourceMappingURL=tlru.d.ts.map

package/dist/src/utils/tlru.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"tlru.d.ts","sourceRoot":"","sources":["../../../src/utils/tlru.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,qBAAa,IAAI,CAAC,CAAC;IACjB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAA4B;gBAEnC,OAAO,EAAE,MAAM;IAI5B,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,CAAC,GAAG,SAAS;IAgBhC,GAAG,CAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9C,GAAG,CAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IAU1B,MAAM,CAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAI1B,KAAK,IAAK,IAAI;CAGf"}

package/dist/src/utils/tlru.js

@@ -1,40 +0,0 @@
-import hashlru from 'hashlru';
-/**
- * Time Aware Least Recent Used Cache
- *
- * @see https://arxiv.org/pdf/1801.00390
- */
-export class TLRU {
-    lru;
-    constructor(maxSize) {
-        this.lru = hashlru(maxSize);
-    }
-    get(key) {
-        const value = this.lru.get(key);
-        if (value != null) {
-            if (value.expire != null && value.expire < Date.now()) {
-                this.lru.remove(key);
-                return undefined;
-            }
-            return value.value;
-        }
-        return undefined;
-    }
-    set(key, value, ttl) {
-        this.lru.set(key, { value, expire: Date.now() + ttl });
-    }
-    has(key) {
-        const value = this.get(key);
-        if (value != null) {
-            return true;
-        }
-        return false;
-    }
-    remove(key) {
-        this.lru.remove(key);
-    }
-    clear() {
-        this.lru.clear();
-    }
-}
-//# sourceMappingURL=tlru.js.map

package/dist/src/utils/tlru.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"tlru.js","sourceRoot":"","sources":["../../../src/utils/tlru.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAE7B;;;;GAIG;AACH,MAAM,OAAO,IAAI;IACE,GAAG,CAA4B;IAEhD,YAAa,OAAe;QAC1B,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;IAC7B,CAAC;IAED,GAAG,CAAE,GAAW;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE/B,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,IAAI,KAAK,CAAC,MAAM,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;gBACtD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;gBAEpB,OAAO,SAAS,CAAA;YAClB,CAAC;YAED,OAAO,KAAK,CAAC,KAAK,CAAA;QACpB,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;IAED,GAAG,CAAE,GAAW,EAAE,KAAQ,EAAE,GAAW;QACrC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,EAAE,CAAC,CAAA;IACxD,CAAC;IAED,GAAG,CAAE,GAAW;QACd,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE3B,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAED,MAAM,CAAE,GAAW;QACjB,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IACtB,CAAC;IAED,KAAK;QACH,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAA;IAClB,CAAC;CACF"}

package/dist/typedoc-urls.json

@@ -1,44 +0,0 @@
-{
-  "dnsJsonOverHttps": "https://ipfs.github.io/helia/functions/_helia_ipns.dns_resolvers.dnsJsonOverHttps.html",
-  "dnsOverHttps": "https://ipfs.github.io/helia/functions/_helia_ipns.dns_resolvers.dnsOverHttps.html",
-  "DNSResolver": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.DNSResolver.html",
-  ".:DNSResolver": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.DNSResolver.html",
-  "IPNS": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.IPNS.html",
-  ".:IPNS": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.IPNS.html",
-  "IPNSComponents": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.IPNSComponents.html",
-  ".:IPNSComponents": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.IPNSComponents.html",
-  "IPNSOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.IPNSOptions.html",
-  ".:IPNSOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.IPNSOptions.html",
-  "PublishOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.PublishOptions.html",
-  ".:PublishOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.PublishOptions.html",
-  "RepublishOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.RepublishOptions.html",
-  ".:RepublishOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.RepublishOptions.html",
-  "ResolveDNSOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.ResolveDNSOptions.html",
-  ".:ResolveDNSOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.ResolveDNSOptions.html",
-  "ResolveDnsLinkOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.ResolveDnsLinkOptions.html",
-  ".:ResolveDnsLinkOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.ResolveDnsLinkOptions.html",
-  "ResolveOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.ResolveOptions.html",
-  ".:ResolveOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.ResolveOptions.html",
-  "ResolveResult": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.ResolveResult.html",
-  ".:ResolveResult": "https://ipfs.github.io/helia/interfaces/_helia_ipns.index.ResolveResult.html",
-  "PublishProgressEvents": "https://ipfs.github.io/helia/types/_helia_ipns.index.PublishProgressEvents.html",
-  ".:PublishProgressEvents": "https://ipfs.github.io/helia/types/_helia_ipns.index.PublishProgressEvents.html",
-  "RepublishProgressEvents": "https://ipfs.github.io/helia/types/_helia_ipns.index.RepublishProgressEvents.html",
-  ".:RepublishProgressEvents": "https://ipfs.github.io/helia/types/_helia_ipns.index.RepublishProgressEvents.html",
-  "ResolveDnsLinkProgressEvents": "https://ipfs.github.io/helia/types/_helia_ipns.index.ResolveDnsLinkProgressEvents.html",
-  ".:ResolveDnsLinkProgressEvents": "https://ipfs.github.io/helia/types/_helia_ipns.index.ResolveDnsLinkProgressEvents.html",
-  "ResolveProgressEvents": "https://ipfs.github.io/helia/types/_helia_ipns.index.ResolveProgressEvents.html",
-  ".:ResolveProgressEvents": "https://ipfs.github.io/helia/types/_helia_ipns.index.ResolveProgressEvents.html",
-  "ipns": "https://ipfs.github.io/helia/functions/_helia_ipns.index.ipns-1.html",
-  ".:ipns": "https://ipfs.github.io/helia/functions/_helia_ipns.index.ipns-1.html",
-  "GetOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.routing.GetOptions.html",
-  "./routing:GetOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.routing.GetOptions.html",
-  "IPNSRouting": "https://ipfs.github.io/helia/interfaces/_helia_ipns.routing.IPNSRouting.html",
-  "./routing:IPNSRouting": "https://ipfs.github.io/helia/interfaces/_helia_ipns.routing.IPNSRouting.html",
-  "PutOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.routing.PutOptions.html",
-  "./routing:PutOptions": "https://ipfs.github.io/helia/interfaces/_helia_ipns.routing.PutOptions.html",
-  "IPNSRoutingEvents": "https://ipfs.github.io/helia/types/_helia_ipns.routing.IPNSRoutingEvents.html",
-  "./routing:IPNSRoutingEvents": "https://ipfs.github.io/helia/types/_helia_ipns.routing.IPNSRoutingEvents.html",
-  "helia": "https://ipfs.github.io/helia/functions/_helia_ipns.routing.helia.html",
-  "pubsub": "https://ipfs.github.io/helia/functions/_helia_ipns.routing.pubsub.html"
-}

package/src/dns-resolvers/default.ts

@@ -1,9 +0,0 @@
-import { MAX_RECURSIVE_DEPTH, recursiveResolveDnslink } from '../utils/dns.js'
-import resolve from './resolver.js'
-import type { DNSResolver, ResolveDnsLinkOptions } from '../index.js'
-
-export function defaultResolver (): DNSResolver {
-  return async (domain: string, options: ResolveDnsLinkOptions = {}): Promise<string> => {
-    return recursiveResolveDnslink(domain, MAX_RECURSIVE_DEPTH, resolve, options)
-  }
-}

package/src/dns-resolvers/dns-json-over-https.ts

@@ -1,90 +0,0 @@
-/* eslint-env browser */
-
-import PQueue from 'p-queue'
-import { CustomProgressEvent } from 'progress-events'
-import { type DNSResponse, MAX_RECURSIVE_DEPTH, recursiveResolveDnslink, ipfsPathAndAnswer } from '../utils/dns.js'
-import { TLRU } from '../utils/tlru.js'
-import type { ResolveDnsLinkOptions, DNSResolver } from '../index.js'
-
-// Avoid sending multiple queries for the same hostname by caching results
-const cache = new TLRU<string>(1000)
-// This TTL will be used if the remote service does not return one
-const ttl = 60 * 1000
-
-/**
- * Uses the RFC 8427 'application/dns-json' content-type to resolve DNS queries.
- *
- * Supports and server that uses the same schema as Google's DNS over HTTPS
- * resolver.
- *
- * This resolver needs fewer dependencies than the regular DNS-over-HTTPS
- * resolver so can result in a smaller bundle size and consequently is preferred
- * for browser use.
- *
- * @see https://developers.cloudflare.com/1.1.1.1/encryption/dns-over-https/make-api-requests/dns-json/
- * @see https://github.com/curl/curl/wiki/DNS-over-HTTPS#publicly-available-servers
- * @see https://dnsprivacy.org/public_resolvers/
- * @see https://datatracker.ietf.org/doc/html/rfc8427
- */
-export function dnsJsonOverHttps (url: string): DNSResolver {
-  // browsers limit concurrent connections per host,
-  // we don't want preload calls to exhaust the limit (~6)
-  const httpQueue = new PQueue({ concurrency: 4 })
-
-  const resolve = async (fqdn: string, options: ResolveDnsLinkOptions = {}): Promise<string> => {
-    const searchParams = new URLSearchParams()
-    searchParams.set('name', fqdn)
-    searchParams.set('type', 'TXT')
-
-    const query = searchParams.toString()
-
-    // try cache first
-    if (options.nocache !== true && cache.has(query)) {
-      const response = cache.get(query)
-
-      if (response != null) {
-        options.onProgress?.(new CustomProgressEvent<string>('dnslink:cache', { detail: response }))
-        return response
-      }
-    }
-
-    options.onProgress?.(new CustomProgressEvent<string>('dnslink:query', { detail: fqdn }))
-
-    // query DNS-JSON over HTTPS server
-    const response = await httpQueue.add(async () => {
-      const res = await fetch(`${url}?${searchParams}`, {
-        headers: {
-          accept: 'application/dns-json'
-        },
-        signal: options.signal
-      })
-
-      if (res.status !== 200) {
-        throw new Error(`Unexpected HTTP status: ${res.status} - ${res.statusText}`)
-      }
-
-      const query = new URL(res.url).search.slice(1)
-      const json: DNSResponse = await res.json()
-
-      options.onProgress?.(new CustomProgressEvent<DNSResponse>('dnslink:answer', { detail: json }))
-
-      const { ipfsPath, answer } = ipfsPathAndAnswer(fqdn, json)
-
-      cache.set(query, ipfsPath, answer.TTL ?? ttl)
-
-      return ipfsPath
-    }, {
-      signal: options.signal
-    })
-
-    if (response == null) {
-      throw new Error('No DNS response received')
-    }
-
-    return response
-  }
-
-  return async (domain: string, options: ResolveDnsLinkOptions = {}) => {
-    return recursiveResolveDnslink(domain, MAX_RECURSIVE_DEPTH, resolve, options)
-  }
-}

package/src/dns-resolvers/dns-over-https.ts

@@ -1,146 +0,0 @@
-/* eslint-env browser */
-
-import { Buffer } from 'buffer'
-import dnsPacket, { type DecodedPacket } from 'dns-packet'
-import { base64url } from 'multiformats/bases/base64'
-import PQueue from 'p-queue'
-import { CustomProgressEvent } from 'progress-events'
-import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
-import { type DNSResponse, MAX_RECURSIVE_DEPTH, recursiveResolveDnslink, ipfsPathAndAnswer } from '../utils/dns.js'
-import { TLRU } from '../utils/tlru.js'
-import type { ResolveDnsLinkOptions, DNSResolver } from '../index.js'
-
-// Avoid sending multiple queries for the same hostname by caching results
-const cache = new TLRU<string>(1000)
-// This TTL will be used if the remote service does not return one
-const ttl = 60 * 1000
-
-/**
- * Uses the RFC 1035 'application/dns-message' content-type to resolve DNS
- * queries.
- *
- * This resolver needs more dependencies than the non-standard
- * DNS-JSON-over-HTTPS resolver so can result in a larger bundle size and
- * consequently is not preferred for browser use.
- *
- * @see https://datatracker.ietf.org/doc/html/rfc1035
- * @see https://developers.cloudflare.com/1.1.1.1/encryption/dns-over-https/make-api-requests/dns-wireformat/
- * @see https://github.com/curl/curl/wiki/DNS-over-HTTPS#publicly-available-servers
- * @see https://dnsprivacy.org/public_resolvers/
- */
-export function dnsOverHttps (url: string): DNSResolver {
-  // browsers limit concurrent connections per host,
-  // we don't want preload calls to exhaust the limit (~6)
-  const httpQueue = new PQueue({ concurrency: 4 })
-
-  const resolve = async (fqdn: string, options: ResolveDnsLinkOptions = {}): Promise<string> => {
-    const dnsQuery = dnsPacket.encode({
-      type: 'query',
-      id: 0,
-      flags: dnsPacket.RECURSION_DESIRED,
-      questions: [{
-        type: 'TXT',
-        name: fqdn
-      }]
-    })
-
-    const searchParams = new URLSearchParams()
-    searchParams.set('dns', base64url.encode(dnsQuery).substring(1))
-
-    const query = searchParams.toString()
-
-    // try cache first
-    if (options.nocache !== true && cache.has(query)) {
-      const response = cache.get(query)
-
-      if (response != null) {
-        options.onProgress?.(new CustomProgressEvent<string>('dnslink:cache', { detail: response }))
-        return response
-      }
-    }
-
-    options.onProgress?.(new CustomProgressEvent<string>('dnslink:query', { detail: fqdn }))
-
-    // query DNS over HTTPS server
-    const response = await httpQueue.add(async () => {
-      const res = await fetch(`${url}?${searchParams}`, {
-        headers: {
-          accept: 'application/dns-message'
-        },
-        signal: options.signal
-      })
-
-      if (res.status !== 200) {
-        throw new Error(`Unexpected HTTP status: ${res.status} - ${res.statusText}`)
-      }
-
-      const query = new URL(res.url).search.slice(1)
-      const buf = await res.arrayBuffer()
-      // map to expected response format
-      const json = toDNSResponse(dnsPacket.decode(Buffer.from(buf)))
-
-      options.onProgress?.(new CustomProgressEvent<DNSResponse>('dnslink:answer', { detail: json }))
-
-      const { ipfsPath, answer } = ipfsPathAndAnswer(fqdn, json)
-
-      cache.set(query, ipfsPath, answer.TTL ?? ttl)
-
-      return ipfsPath
-    }, {
-      signal: options.signal
-    })
-
-    if (response == null) {
-      throw new Error('No DNS response received')
-    }
-
-    return response
-  }
-
-  return async (domain: string, options: ResolveDnsLinkOptions = {}) => {
-    return recursiveResolveDnslink(domain, MAX_RECURSIVE_DEPTH, resolve, options)
-  }
-}
-
-function toDNSResponse (response: DecodedPacket): DNSResponse {
-  const txtType = 16
-
-  return {
-    Status: 0,
-    TC: response.flag_tc ?? false,
-    RD: response.flag_rd ?? false,
-    RA: response.flag_ra ?? false,
-    AD: response.flag_ad ?? false,
-    CD: response.flag_cd ?? false,
-    Question: response.questions?.map(q => ({
-      name: q.name,
-      type: txtType
-    })) ?? [],
-    Answer: response.answers?.map(a => {
-      if (a.type !== 'TXT' || a.data.length < 1) {
-        return {
-          name: a.name,
-          type: txtType,
-          TTL: 0,
-          data: 'invalid'
-        }
-      }
-
-      if (!Buffer.isBuffer(a.data[0])) {
-        return {
-          name: a.name,
-          type: txtType,
-          TTL: a.ttl ?? ttl,
-          data: String(a.data[0])
-        }
-      }
-
-      return {
-        name: a.name,
-        type: txtType,
-        TTL: a.ttl ?? ttl,
-        data: uint8ArrayToString(a.data[0])
-      }
-    }) ?? []
-  }
-}

package/src/dns-resolvers/index.ts

@@ -1,2 +0,0 @@
-export { dnsOverHttps } from './dns-over-https.js'
-export { dnsJsonOverHttps } from './dns-json-over-https.js'

package/src/dns-resolvers/resolver.browser.ts

@@ -1,50 +0,0 @@
-import Resolver from 'dns-over-http-resolver'
-import PQueue from 'p-queue'
-import { CustomProgressEvent } from 'progress-events'
-import { resolveFn, type DNSResponse } from '../utils/dns.js'
-import { TLRU } from '../utils/tlru.js'
-import type { DNSResolver } from '../index.js'
-
-const cache = new TLRU<string>(1000)
-// We know browsers themselves cache DNS records for at least 1 minute,
-// which acts a provisional default ttl: https://stackoverflow.com/a/36917902/11518426
-const ttl = 60 * 1000
-
-// browsers limit concurrent connections per host,
-// we don't want to exhaust the limit (~6)
-const httpQueue = new PQueue({ concurrency: 4 })
-
-const resolve: DNSResolver = async function resolve (domain, options = {}) {
-  const resolver = new Resolver({ maxCache: 0 })
-  // try cache first
-  if (options.nocache !== true && cache.has(domain)) {
-    const response = cache.get(domain)
-
-    if (response != null) {
-      options?.onProgress?.(new CustomProgressEvent<string>('dnslink:cache', { detail: response }))
-      return response
-    }
-  }
-
-  options.onProgress?.(new CustomProgressEvent<string>('dnslink:query', { detail: domain }))
-
-  // Add the query to the queue
-  const response = await httpQueue.add(async () => {
-    const dnslinkRecord = await resolveFn(resolver, domain)
-
-    options.onProgress?.(new CustomProgressEvent<DNSResponse>('dnslink:answer', { detail: dnslinkRecord }))
-    cache.set(domain, dnslinkRecord, ttl)
-
-    return dnslinkRecord
-  }, {
-    signal: options?.signal
-  })
-
-  if (response == null) {
-    throw new Error('No DNS response received')
-  }
-
-  return response
-}
-
-export default resolve

package/src/dns-resolvers/resolver.ts

@@ -1,25 +0,0 @@
-import { Resolver } from 'dns/promises'
-import { CustomProgressEvent } from 'progress-events'
-import { resolveFn, type DNSResponse } from '../utils/dns.js'
-import type { DNSResolver } from '../index.js'
-
-const resolve: DNSResolver = async function resolve (domain, options = {}) {
-  const resolver = new Resolver()
-  const listener = (): void => {
-    resolver.cancel()
-  }
-
-  options.signal?.addEventListener('abort', listener)
-
-  try {
-    options.onProgress?.(new CustomProgressEvent<string>('dnslink:query', { detail: domain }))
-    const dnslinkRecord = await resolveFn(resolver, domain)
-
-    options.onProgress?.(new CustomProgressEvent<DNSResponse>('dnslink:answer', { detail: dnslinkRecord }))
-    return dnslinkRecord
-  } finally {
-    options.signal?.removeEventListener('abort', listener)
-  }
-}
-
-export default resolve

package/src/utils/dns.ts

@@ -1,126 +0,0 @@
-import { CodeError } from '@libp2p/interface'
-import * as isIPFS from 'is-ipfs'
-import type { DNSResolver, ResolveDnsLinkOptions } from '../index.js'
-
-export interface Question {
-  name: string
-  type: number
-}
-
-export interface Answer {
-  name: string
-  type: number
-  TTL: number
-  data: string
-}
-
-export interface DNSResponse {
-  Status: number
-  TC: boolean
-  RD: boolean
-  RA: boolean
-  AD: boolean
-  CD: boolean
-  Question: Question[]
-  Answer?: Answer[]
-}
-
-export const ipfsPathForAnswer = (answer: Answer): string => {
-  let data = answer.data
-
-  if (data.startsWith('"')) {
-    data = data.substring(1)
-  }
-
-  if (data.endsWith('"')) {
-    data = data.substring(0, data.length - 1)
-  }
-
-  return data.replace('dnslink=', '')
-}
-
-export const ipfsPathAndAnswer = (domain: string, response: DNSResponse): { ipfsPath: string, answer: Answer } => {
-  const answer = findDNSLinkAnswer(domain, response)
-
-  return {
-    ipfsPath: ipfsPathForAnswer(answer),
-    answer
-  }
-}
-
-export const findDNSLinkAnswer = (domain: string, response: DNSResponse): Answer => {
-  const answer = response.Answer?.filter(a => a.data.includes('dnslink=/ipfs') || a.data.includes('dnslink=/ipns')).pop()
-
-  if (answer == null) {
-    throw new CodeError(`No dnslink records found for domain: ${domain}`, 'ERR_DNSLINK_NOT_FOUND')
-  }
-
-  return answer
-}
-
-export const MAX_RECURSIVE_DEPTH = 32
-
-export const recursiveResolveDnslink = async (domain: string, depth: number, resolve: DNSResolver, options: ResolveDnsLinkOptions = {}): Promise<string> => {
-  if (depth === 0) {
-    throw new Error('recursion limit exceeded')
-  }
-
-  let dnslinkRecord: string
-
-  try {
-    dnslinkRecord = await resolve(domain, options)
-  } catch (err: any) {
-    // If the code is not ENOTFOUND or ERR_DNSLINK_NOT_FOUND or ENODATA then throw the error
-    if (err.code !== 'ENOTFOUND' && err.code !== 'ERR_DNSLINK_NOT_FOUND' && err.code !== 'ENODATA') {
-      throw err
-    }
-
-    if (domain.startsWith('_dnslink.')) {
-      // The supplied domain contains a _dnslink component
-      // Check the non-_dnslink domain
-      domain = domain.replace('_dnslink.', '')
-    } else {
-      // Check the _dnslink subdomain
-      domain = `_dnslink.${domain}`
-    }
-
-    // If this throws then we propagate the error
-    dnslinkRecord = await resolve(domain, options)
-  }
-
-  const result = dnslinkRecord.replace('dnslink=', '')
-  // result is now a `/ipfs/<cid>` or `/ipns/<cid>` string
-  const domainOrCID = result.split('/')[2] // e.g. ["", "ipfs", "<cid>"]
-  const isIPFSCID = isIPFS.cid(domainOrCID)
-
-  // if the result is a CID, or depth is 1, we've reached the end of the recursion
-  // if depth is 1, another recursive call will be made, but it would throw.
-  // we could return if depth is 1 and allow users to handle, but that may be a breaking change
-  if (isIPFSCID) {
-    return result
-  }
-
-  return recursiveResolveDnslink(domainOrCID, depth - 1, resolve, options)
-}
-
-interface DnsResolver {
-  resolveTxt(domain: string): Promise<string[][]>
-}
-
-const DNSLINK_REGEX = /^dnslink=.+$/
-export const resolveFn = async (resolver: DnsResolver, domain: string): Promise<string> => {
-  const records = await resolver.resolveTxt(domain)
-  const dnslinkRecords = records.flat()
-    .filter(record => DNSLINK_REGEX.test(record))
-
-  // we now have dns text entries as an array of strings
-  // only records passing the DNSLINK_REGEX text are included
-  // TODO: support multiple dnslink records
-  const dnslinkRecord = dnslinkRecords[0]
-
-  if (dnslinkRecord == null) {
-    throw new CodeError(`No dnslink records found for domain: ${domain}`, 'ERR_DNSLINK_NOT_FOUND')
-  }
-
-  return dnslinkRecord
-}