@helia/dnslink 1.0.1 → 1.1.0-eb91b810

package/dist/src/constants.d.ts

@@ -1,2 +1,5 @@
 export declare const MAX_RECURSIVE_DEPTH = 32;
+export declare const CACHE_SIZE = 1000;
+export declare const CACHE_MAX_AGE = 30000;
+export declare const CACHE_MAX_ANSWERS = 10;
 //# sourceMappingURL=constants.d.ts.map

package/dist/src/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,KAAK,CAAA"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,KAAK,CAAA;AACrC,eAAO,MAAM,UAAU,OAAQ,CAAA;AAC/B,eAAO,MAAM,aAAa,QAAS,CAAA;AACnC,eAAO,MAAM,iBAAiB,KAAK,CAAA"}

package/dist/src/constants.js

@@ -1,2 +1,5 @@
 export const MAX_RECURSIVE_DEPTH = 32;
+export const CACHE_SIZE = 1_000;
+export const CACHE_MAX_AGE = 30_000;
+export const CACHE_MAX_ANSWERS = 10;
 //# sourceMappingURL=constants.js.map

package/dist/src/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,CAAA"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,CAAA;AACrC,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,CAAA;AAC/B,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAA;AACnC,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAA"}

package/dist/src/dnslink.d.ts

@@ -1,11 +1,13 @@
-import type { DNSLink as DNSLinkInterface, ResolveDNSLinkOptions, DNSLinkOptions, DNSLinkComponents, DNSLinkResult } from './index.js';
-export declare class DNSLink implements DNSLinkInterface {
+import type { DNSLink as DNSLinkInterface, ResolveDNSLinkOptions, DNSLinkOptions, DNSLinkComponents, DNSLinkParser, DNSLinkResolveResult } from './index.js';
+export declare class DNSLink<Namespaces extends Record<string, DNSLinkParser<DNSLinkResolveResult>>> implements DNSLinkInterface<ReturnType<Namespaces[keyof Namespaces]>> {
     private readonly dns;
     private readonly log;
     private readonly namespaces;
-    constructor(components: DNSLinkComponents, init?: DNSLinkOptions);
-    resolve(domain: string, options?: ResolveDNSLinkOptions): Promise<DNSLinkResult[]>;
-    recursiveResolveDomain(domain: string, depth: number, options?: ResolveDNSLinkOptions): Promise<DNSLinkResult[]>;
-    recursiveResolveDnslink(domain: string, depth: number, options?: ResolveDNSLinkOptions): Promise<DNSLinkResult[]>;
+    private readonly cache;
+    private readonly cacheMaxAnswers;
+    constructor(components: DNSLinkComponents, init?: DNSLinkOptions<Namespaces>);
+    resolve(domain: string, options?: ResolveDNSLinkOptions): Promise<Array<ReturnType<Namespaces[keyof Namespaces]>>>;
+    recursiveResolveDomain(domain: string, depth: number, options?: ResolveDNSLinkOptions): Promise<Array<ReturnType<Namespaces[keyof Namespaces]>>>;
+    recursiveResolveDnslink(domain: string, depth: number, options?: ResolveDNSLinkOptions): Promise<Array<ReturnType<Namespaces[keyof Namespaces]>>>;
 }
 //# sourceMappingURL=dnslink.d.ts.map

package/dist/src/dnslink.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dnslink.d.ts","sourceRoot":"","sources":["../../src/dnslink.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,qBAAqB,EAAE,cAAc,EAAE,iBAAiB,EAAE,aAAa,EAAoB,MAAM,YAAY,CAAA;AAIxJ,qBAAa,OAAQ,YAAW,gBAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAK;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAkC;gBAEhD,UAAU,EAAE,iBAAiB,EAAE,IAAI,GAAE,cAAmB;IAU/D,OAAO,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAIvF,sBAAsB,CAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IAkCrH,uBAAuB,CAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CA0F7H"}
+{"version":3,"file":"dnslink.d.ts","sourceRoot":"","sources":["../../src/dnslink.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,IAAI,gBAAgB,EAAE,qBAAqB,EAAE,cAAc,EAAE,iBAAiB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AAI5J,qBAAa,OAAO,CAAE,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,oBAAoB,CAAC,CAAC,CAAE,YAAW,gBAAgB,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC;IACjK,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAK;IACzB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAQ;IAC5B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAoC;IAC/D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA8E;IACpG,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAQ;gBAE3B,UAAU,EAAE,iBAAiB,EAAE,IAAI,GAAE,cAAc,CAAC,UAAU,CAAM;IAe3E,OAAO,CAAE,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC;IAmDvH,sBAAsB,CAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC;IAkCrJ,uBAAuB,CAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,GAAE,qBAA0B,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,MAAM,UAAU,CAAC,CAAC,CAAC,CAAC;CA0F7J"}

package/dist/src/dnslink.js

@@ -1,4 +1,6 @@
 import { MAX_RECURSIVE_DEPTH, RecordType } from '@multiformats/dns';
+import QuickLRU from 'quick-lru';
+import { CACHE_MAX_AGE, CACHE_MAX_ANSWERS, CACHE_SIZE } from "./constants.js";
 import { DNSLinkNotFoundError } from './errors.js';
 import { ipfs } from "./namespaces/ipfs.js";
 import { ipns } from "./namespaces/ipns.js";
@@ -6,6 +8,8 @@ export class DNSLink {
     dns;
     log;
     namespaces;
+    cache;
+    cacheMaxAnswers;
     constructor(components, init = {}) {
         this.dns = components.dns;
         this.log = components.logger.forComponent('helia:dnslink');
@@ -14,9 +18,50 @@ export class DNSLink {
             ipns,
             ...init.namespaces
         };
+        this.cache = new QuickLRU({
+            maxSize: init.cacheSize ?? CACHE_SIZE,
+            maxAge: init.cacheMaxAge ?? CACHE_MAX_AGE
+        });
+        this.cacheMaxAnswers = init.cacheMaxAnswers ?? CACHE_MAX_ANSWERS;
     }
     async resolve(domain, options = {}) {
-        return this.recursiveResolveDomain(domain, options.maxRecursiveDepth ?? MAX_RECURSIVE_DEPTH, options);
+        if (options.nocache !== true) {
+            // check the cache if allowed
+            const cached = this.cache.get(domain);
+            if (cached != null) {
+                const answers = [...cached.values()];
+                if (answers.length > 0) {
+                    return answers;
+                }
+            }
+        }
+        const result = await this.recursiveResolveDomain(domain, options.maxRecursiveDepth ?? MAX_RECURSIVE_DEPTH, options);
+        // cache answers according to individual TTLs
+        const cache = new QuickLRU({
+            maxSize: this.cacheMaxAnswers
+        });
+        result.forEach((result, index) => {
+            cache.set(index, result, {
+                maxAge: (result.answer.TTL * 1000)
+            });
+        });
+        // find longest answer TTL
+        let maxTTL = result.reduce((acc, curr) => {
+            const ttl = (curr.answer.TTL * 1000);
+            if (ttl > acc) {
+                return ttl;
+            }
+            return acc;
+        }, 0);
+        // if the configured max age is less than the longest answer TTL, use that
+        // instead
+        if (this.cache.maxAge < maxTTL) {
+            maxTTL = this.cache.maxAge;
+        }
+        this.cache.set(domain, cache, {
+            maxAge: maxTTL
+        });
+        return result;
     }
     async recursiveResolveDomain(domain, depth, options = {}) {
         if (depth === 0) {
@@ -89,7 +134,7 @@ export class DNSLink {
                     this.log('unknown protocol "%s" in DNSLink record for domain: %s', protocol, domain);
                     continue;
                 }
-                output.push(parser.parse(result, answer));
+                output.push(parser(result, answer));
             }
             catch (err) {
                 this.log.error('could not parse DNS link record for domain %s, %s', domain, answer.data, err);

package/dist/src/dnslink.js.map

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

package/dist/src/index.d.ts

@@ -105,10 +105,11 @@
  * ```
  */
 import type { AbortOptions, ComponentLogger, PeerId } from '@libp2p/interface';
-import type { Answer, DNS, ResolveDnsProgressEvents } from '@multiformats/dns';
+import type { Answer, DNS, ResolveDnsProgressEvents as ResolveProgressEvents } from '@multiformats/dns';
 import type { CID } from 'multiformats/cid';
 import type { ProgressOptions } from 'progress-events';
-export interface ResolveDNSLinkOptions extends AbortOptions, ProgressOptions<ResolveDnsProgressEvents> {
+export type { ResolveProgressEvents };
+export interface ResolveDNSLinkOptions extends AbortOptions, ProgressOptions<ResolveProgressEvents> {
     /**
      * Do not query the network for the IPNS record
      *
@@ -153,7 +154,7 @@ export interface DNSLinkIPNSResult {
      */
     answer: Answer;
     /**
-     * The IPFS namespace
+     * The IPNS namespace
      */
     namespace: 'ipns';
     /**
@@ -165,24 +166,23 @@ export interface DNSLinkIPNSResult {
      */
     path: string;
 }
-export interface DNSLinkOtherResult {
+export interface DNSLinkResolveResult {
     /**
      * The resolved record
      */
     answer: Answer;
     /**
-     * The IPFS namespace
+     * The namespace
      */
     namespace: string;
 }
-export type DNSLinkResult = DNSLinkIPFSResult | DNSLinkIPNSResult | DNSLinkOtherResult;
-export interface DNSLinkNamespace {
+export interface DNSLinkParser<T extends DNSLinkResolveResult> {
     /**
      * Return a result parsed from a DNSLink value
      */
-    parse(value: string, answer: Answer): DNSLinkResult;
+    (value: string, answer: Answer): T;
 }
-export interface DNSLink {
+export interface DNSLink<DNSLinkResolveResults extends DNSLinkResolveResult = DNSLinkIPFSResult | DNSLinkIPNSResult> {
     /**
      * Resolve a CID from a dns-link style IPNS record
      *
@@ -202,18 +202,39 @@ export interface DNSLink {
      * console.info(result) // { answer: ..., value: ... }
      * ```
      */
-    resolve(domain: string, options?: ResolveDNSLinkOptions): Promise<DNSLinkResult[]>;
+    resolve(domain: string, options?: ResolveDNSLinkOptions): Promise<Array<DNSLinkResolveResults | DNSLinkIPFSResult | DNSLinkIPNSResult>>;
 }
 export interface DNSLinkComponents {
     dns: DNS;
     logger: ComponentLogger;
 }
-export interface DNSLinkOptions {
+export interface DNSLinkOptions<Namespaces extends Record<string, DNSLinkParser<any>> = Record<string, DNSLinkParser<any>>> {
     /**
      * By default `/ipfs/...`, `/ipns/...` and `/dnslink/...` record values are
      * supported - to support other prefixes pass other value parsers here
      */
-    namespaces?: Record<string, DNSLinkNamespace>;
+    namespaces?: Namespaces;
+    /**
+     * How many DNSLink lookups to cache in memory
+     *
+     * @default 1_000
+     */
+    cacheSize?: number;
+    /**
+     * The maximum number of Answers to cache for each domain
+     *
+     * @default 10
+     */
+    cacheMaxAnswers?: number;
+    /**
+     * By default the DNS TTL will be used to calculate when a DNSLink lookup
+     * should be evicted from the cache, unless one is not available in which case
+     * this number of ms will be used.
+     *
+     * @default 30_000
+     */
+    cacheMaxAge?: number;
 }
+export declare function dnsLink<R extends DNSLinkResolveResult, T extends Record<string, DNSLinkParser<R>>>(components: DNSLinkComponents, options: DNSLinkOptions<T>): DNSLink<ReturnType<T[keyof T]>>;
 export declare function dnsLink(components: DNSLinkComponents, options?: DNSLinkOptions): DNSLink;
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyGG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAA;AAC9E,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,MAAM,WAAW,qBAAsB,SAAQ,YAAY,EAAE,eAAe,CAAC,wBAAwB,CAAC;IACpG;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IAEjB;;OAEG;IACH,GAAG,EAAE,GAAG,CAAA;IAER;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;IAEjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;IACH,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAA;IAEd;;OAEG;IACH,SAAS,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,aAAa,GAAG,iBAAiB,GAAG,iBAAiB,GAAG,kBAAkB,CAAA;AAEtF,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAAA;CACpD;AAED,MAAM,WAAW,OAAO;IACtB;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAAA;CACnF;AAED,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,GAAG,CAAA;IACR,MAAM,EAAE,eAAe,CAAA;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAA;CAC9C;AAED,wBAAgB,OAAO,CAAE,UAAU,EAAE,iBAAiB,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAE7F"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyGG;AAEH,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AAmItD,MAAM,UAAU,OAAO,CAAE,UAA6B,EAAE,UAA0B,EAAE;IAClF,OAAO,IAAI,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;AAC9C,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyGG;AAEH,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AA4JtD,MAAM,UAAU,OAAO,CAAE,UAA6B,EAAE,UAA0B,EAAE;IAClF,OAAO,IAAI,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;AAC9C,CAAC"}

package/dist/src/namespaces/ipfs.d.ts

@@ -1,3 +1,3 @@
-import type { DNSLinkNamespace } from '../index.js';
-export declare const ipfs: DNSLinkNamespace;
+import type { DNSLinkParser, DNSLinkIPFSResult } from '../index.js';
+export declare const ipfs: DNSLinkParser<DNSLinkIPFSResult>;
 //# sourceMappingURL=ipfs.d.ts.map

package/dist/src/namespaces/ipfs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ipfs.d.ts","sourceRoot":"","sources":["../../../src/namespaces/ipfs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAGlE,eAAO,MAAM,IAAI,EAAE,gBAgBlB,CAAA"}
+{"version":3,"file":"ipfs.d.ts","sourceRoot":"","sources":["../../../src/namespaces/ipfs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAGnE,eAAO,MAAM,IAAI,EAAE,aAAa,CAAC,iBAAiB,CAcjD,CAAA"}

package/dist/src/namespaces/ipfs.js

@@ -1,18 +1,16 @@
 import { CID } from 'multiformats/cid';
 import { InvalidNamespaceError } from "../errors.js";
-export const ipfs = {
-    parse: (value, answer) => {
-        const [, protocol, cid, ...rest] = value.split('/');
-        if (protocol !== 'ipfs') {
-            throw new InvalidNamespaceError(`Namespace ${protocol} was not "ipfs"`);
-        }
-        // if the result is a CID, we've reached the end of the recursion
-        return {
-            namespace: 'ipfs',
-            cid: CID.parse(cid),
-            path: rest.length > 0 ? `/${rest.join('/')}` : '',
-            answer
-        };
+export const ipfs = (value, answer) => {
+    const [, protocol, cid, ...rest] = value.split('/');
+    if (protocol !== 'ipfs') {
+        throw new InvalidNamespaceError(`Namespace ${protocol} was not "ipfs"`);
     }
+    // if the result is a CID, we've reached the end of the recursion
+    return {
+        namespace: 'ipfs',
+        cid: CID.parse(cid),
+        path: rest.length > 0 ? `/${rest.join('/')}` : '',
+        answer
+    };
 };
 //# sourceMappingURL=ipfs.js.map

package/dist/src/namespaces/ipfs.js.map

@@ -1 +1 @@
-{"version":3,"file":"ipfs.js","sourceRoot":"","sources":["../../../src/namespaces/ipfs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAIpD,MAAM,CAAC,MAAM,IAAI,GAAqB;IACpC,KAAK,EAAE,CAAC,KAAa,EAAE,MAAc,EAAiB,EAAE;QACtD,MAAM,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEnD,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,qBAAqB,CAAC,aAAa,QAAQ,iBAAiB,CAAC,CAAA;QACzE,CAAC;QAED,iEAAiE;QACjE,OAAO;YACL,SAAS,EAAE,MAAM;YACjB,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;YACnB,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACjD,MAAM;SACP,CAAA;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"ipfs.js","sourceRoot":"","sources":["../../../src/namespaces/ipfs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAIpD,MAAM,CAAC,MAAM,IAAI,GAAqC,CAAC,KAAa,EAAE,MAAc,EAAqB,EAAE;IACzG,MAAM,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEnD,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;QACxB,MAAM,IAAI,qBAAqB,CAAC,aAAa,QAAQ,iBAAiB,CAAC,CAAA;IACzE,CAAC;IAED,iEAAiE;IACjE,OAAO;QACL,SAAS,EAAE,MAAM;QACjB,GAAG,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;QACnB,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;QACjD,MAAM;KACP,CAAA;AACH,CAAC,CAAA"}

package/dist/src/namespaces/ipns.d.ts

@@ -1,3 +1,3 @@
-import type { DNSLinkNamespace } from '../index.js';
-export declare const ipns: DNSLinkNamespace;
+import type { DNSLinkParser, DNSLinkIPNSResult } from '../index.js';
+export declare const ipns: DNSLinkParser<DNSLinkIPNSResult>;
 //# sourceMappingURL=ipns.d.ts.map

package/dist/src/namespaces/ipns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ipns.d.ts","sourceRoot":"","sources":["../../../src/namespaces/ipns.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAGlE,eAAO,MAAM,IAAI,EAAE,gBAgBlB,CAAA"}
+{"version":3,"file":"ipns.d.ts","sourceRoot":"","sources":["../../../src/namespaces/ipns.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAGnE,eAAO,MAAM,IAAI,EAAE,aAAa,CAAC,iBAAiB,CAcjD,CAAA"}

package/dist/src/namespaces/ipns.js

@@ -1,18 +1,16 @@
 import { peerIdFromString } from '@libp2p/peer-id';
 import { InvalidNamespaceError } from "../errors.js";
-export const ipns = {
-    parse: (value, answer) => {
-        const [, protocol, peerId, ...rest] = value.split('/');
-        if (protocol !== 'ipns') {
-            throw new InvalidNamespaceError(`Namespace ${protocol} was not "ipns"`);
-        }
-        // if the result is a CID, we've reached the end of the recursion
-        return {
-            namespace: 'ipns',
-            peerId: peerIdFromString(peerId),
-            path: rest.length > 0 ? `/${rest.join('/')}` : '',
-            answer
-        };
+export const ipns = (value, answer) => {
+    const [, protocol, peerId, ...rest] = value.split('/');
+    if (protocol !== 'ipns') {
+        throw new InvalidNamespaceError(`Namespace ${protocol} was not "ipns"`);
     }
+    // if the result is a CID, we've reached the end of the recursion
+    return {
+        namespace: 'ipns',
+        peerId: peerIdFromString(peerId),
+        path: rest.length > 0 ? `/${rest.join('/')}` : '',
+        answer
+    };
 };
 //# sourceMappingURL=ipns.js.map

package/dist/src/namespaces/ipns.js.map

@@ -1 +1 @@
-{"version":3,"file":"ipns.js","sourceRoot":"","sources":["../../../src/namespaces/ipns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAIpD,MAAM,CAAC,MAAM,IAAI,GAAqB;IACpC,KAAK,EAAE,CAAC,KAAa,EAAE,MAAc,EAAiB,EAAE;QACtD,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAEtD,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,MAAM,IAAI,qBAAqB,CAAC,aAAa,QAAQ,iBAAiB,CAAC,CAAA;QACzE,CAAC;QAED,iEAAiE;QACjE,OAAO;YACL,SAAS,EAAE,MAAM;YACjB,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC;YAChC,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;YACjD,MAAM;SACP,CAAA;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"ipns.js","sourceRoot":"","sources":["../../../src/namespaces/ipns.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAA;AAIpD,MAAM,CAAC,MAAM,IAAI,GAAqC,CAAC,KAAa,EAAE,MAAc,EAAqB,EAAE;IACzG,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEtD,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;QACxB,MAAM,IAAI,qBAAqB,CAAC,aAAa,QAAQ,iBAAiB,CAAC,CAAA;IACzE,CAAC;IAED,iEAAiE;IACjE,OAAO;QACL,SAAS,EAAE,MAAM;QACjB,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC;QAChC,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;QACjD,MAAM;KACP,CAAA;AACH,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helia/dnslink",
-  "version": "1.0.1",
+  "version": "1.1.0-eb91b810",
   "description": "DNSLink operations using Helia",
   "license": "Apache-2.0 OR MIT",
   "homepage": "https://github.com/ipfs/helia/tree/main/packages/dnslink#readme",
@@ -68,12 +68,14 @@
     "@libp2p/peer-id": "^6.0.3",
     "@multiformats/dns": "^1.0.9",
     "multiformats": "^13.4.1",
-    "progress-events": "^1.0.1"
+    "progress-events": "^1.0.1",
+    "quick-lru": "^7.3.0"
   },
   "devDependencies": {
     "@libp2p/logger": "^6.0.5",
     "@types/dns-packet": "^5.6.5",
     "aegir": "^47.0.22",
+    "delay": "^6.0.0",
     "sinon-ts": "^2.0.0"
   },
   "browser": {

package/src/constants.ts

@@ -1 +1,4 @@
 export const MAX_RECURSIVE_DEPTH = 32
+export const CACHE_SIZE = 1_000
+export const CACHE_MAX_AGE = 30_000
+export const CACHE_MAX_ANSWERS = 10

package/src/dnslink.ts

@@ -1,17 +1,21 @@
 import { MAX_RECURSIVE_DEPTH, RecordType } from '@multiformats/dns'
+import QuickLRU from 'quick-lru'
+import { CACHE_MAX_AGE, CACHE_MAX_ANSWERS, CACHE_SIZE } from './constants.ts'
 import { DNSLinkNotFoundError } from './errors.js'
 import { ipfs } from './namespaces/ipfs.ts'
 import { ipns } from './namespaces/ipns.ts'
-import type { DNSLink as DNSLinkInterface, ResolveDNSLinkOptions, DNSLinkOptions, DNSLinkComponents, DNSLinkResult, DNSLinkNamespace } from './index.js'
+import type { DNSLink as DNSLinkInterface, ResolveDNSLinkOptions, DNSLinkOptions, DNSLinkComponents, DNSLinkParser, DNSLinkResolveResult } from './index.js'
 import type { Logger } from '@libp2p/interface'
 import type { DNS } from '@multiformats/dns'
 
-export class DNSLink implements DNSLinkInterface {
+export class DNSLink <Namespaces extends Record<string, DNSLinkParser<DNSLinkResolveResult>>> implements DNSLinkInterface<ReturnType<Namespaces[keyof Namespaces]>> {
   private readonly dns: DNS
   private readonly log: Logger
-  private readonly namespaces: Record<string, DNSLinkNamespace>
+  private readonly namespaces: Record<string, DNSLinkParser<any>>
+  private readonly cache: QuickLRU<string, QuickLRU<number, ReturnType<Namespaces[keyof Namespaces]>>>
+  private readonly cacheMaxAnswers: number
 
-  constructor (components: DNSLinkComponents, init: DNSLinkOptions = {}) {
+  constructor (components: DNSLinkComponents, init: DNSLinkOptions<Namespaces> = {}) {
     this.dns = components.dns
     this.log = components.logger.forComponent('helia:dnslink')
     this.namespaces = {
@@ -19,13 +23,65 @@ export class DNSLink implements DNSLinkInterface {
       ipns,
       ...init.namespaces
     }
+    this.cache = new QuickLRU({
+      maxSize: init.cacheSize ?? CACHE_SIZE,
+      maxAge: init.cacheMaxAge ?? CACHE_MAX_AGE
+    })
+    this.cacheMaxAnswers = init.cacheMaxAnswers ?? CACHE_MAX_ANSWERS
   }
 
-  async resolve (domain: string, options: ResolveDNSLinkOptions = {}): Promise<DNSLinkResult[]> {
-    return this.recursiveResolveDomain(domain, options.maxRecursiveDepth ?? MAX_RECURSIVE_DEPTH, options)
+  async resolve (domain: string, options: ResolveDNSLinkOptions = {}): Promise<Array<ReturnType<Namespaces[keyof Namespaces]>>> {
+    if (options.nocache !== true) {
+      // check the cache if allowed
+      const cached = this.cache.get(domain)
+
+      if (cached != null) {
+        const answers = [...cached.values()]
+
+        if (answers.length > 0) {
+          return answers
+        }
+      }
+    }
+
+    const result = await this.recursiveResolveDomain(domain, options.maxRecursiveDepth ?? MAX_RECURSIVE_DEPTH, options)
+
+    // cache answers according to individual TTLs
+    const cache = new QuickLRU<number, ReturnType<Namespaces[keyof Namespaces]>>({
+      maxSize: this.cacheMaxAnswers
+    })
+
+    result.forEach((result, index) => {
+      cache.set(index, result, {
+        maxAge: (result.answer.TTL * 1000)
+      })
+    })
+
+    // find longest answer TTL
+    let maxTTL = result.reduce((acc, curr) => {
+      const ttl = (curr.answer.TTL * 1000)
+
+      if (ttl > acc) {
+        return ttl
+      }
+
+      return acc
+    }, 0)
+
+    // if the configured max age is less than the longest answer TTL, use that
+    // instead
+    if (this.cache.maxAge < maxTTL) {
+      maxTTL = this.cache.maxAge
+    }
+
+    this.cache.set(domain, cache, {
+      maxAge: maxTTL
+    })
+
+    return result
   }
 
-  async recursiveResolveDomain (domain: string, depth: number, options: ResolveDNSLinkOptions = {}): Promise<DNSLinkResult[]> {
+  async recursiveResolveDomain (domain: string, depth: number, options: ResolveDNSLinkOptions = {}): Promise<Array<ReturnType<Namespaces[keyof Namespaces]>>> {
     if (depth === 0) {
       throw new Error('recursion limit exceeded')
     }
@@ -59,7 +115,7 @@ export class DNSLink implements DNSLinkInterface {
     }
   }
 
-  async recursiveResolveDnslink (domain: string, depth: number, options: ResolveDNSLinkOptions = {}): Promise<DNSLinkResult[]> {
+  async recursiveResolveDnslink (domain: string, depth: number, options: ResolveDNSLinkOptions = {}): Promise<Array<ReturnType<Namespaces[keyof Namespaces]>>> {
     if (depth === 0) {
       throw new Error('recursion limit exceeded')
     }
@@ -78,7 +134,7 @@ export class DNSLink implements DNSLinkInterface {
 
     this.log('found %d TXT records for %s', txtRecords.length, domain)
 
-    const output: DNSLinkResult[] = []
+    const output: Array<ReturnType<Namespaces[keyof Namespaces]>> = []
 
     for (const answer of txtRecords) {
       try {
@@ -113,7 +169,7 @@ export class DNSLink implements DNSLinkInterface {
           continue
         }
 
-        output.push(parser.parse(result, answer))
+        output.push(parser(result, answer))
       } catch (err: any) {
         this.log.error('could not parse DNS link record for domain %s, %s', domain, answer.data, err)
       }

package/src/index.ts

@@ -107,11 +107,13 @@
 
 import { DNSLink as DNSLinkClass } from './dnslink.js'
 import type { AbortOptions, ComponentLogger, PeerId } from '@libp2p/interface'
-import type { Answer, DNS, ResolveDnsProgressEvents } from '@multiformats/dns'
+import type { Answer, DNS, ResolveDnsProgressEvents as ResolveProgressEvents } from '@multiformats/dns'
 import type { CID } from 'multiformats/cid'
 import type { ProgressOptions } from 'progress-events'
 
-export interface ResolveDNSLinkOptions extends AbortOptions, ProgressOptions<ResolveDnsProgressEvents> {
+export type { ResolveProgressEvents }
+
+export interface ResolveDNSLinkOptions extends AbortOptions, ProgressOptions<ResolveProgressEvents> {
   /**
    * Do not query the network for the IPNS record
    *
@@ -164,7 +166,7 @@ export interface DNSLinkIPNSResult {
   answer: Answer
 
   /**
-   * The IPFS namespace
+   * The IPNS namespace
    */
   namespace: 'ipns'
 
@@ -179,28 +181,26 @@ export interface DNSLinkIPNSResult {
   path: string
 }
 
-export interface DNSLinkOtherResult {
+export interface DNSLinkResolveResult {
   /**
    * The resolved record
    */
   answer: Answer
 
   /**
-   * The IPFS namespace
+   * The namespace
    */
   namespace: string
 }
 
-export type DNSLinkResult = DNSLinkIPFSResult | DNSLinkIPNSResult | DNSLinkOtherResult
-
-export interface DNSLinkNamespace {
+export interface DNSLinkParser<T extends DNSLinkResolveResult> {
   /**
    * Return a result parsed from a DNSLink value
    */
-  parse(value: string, answer: Answer): DNSLinkResult
+  (value: string, answer: Answer): T
 }
 
-export interface DNSLink {
+export interface DNSLink<DNSLinkResolveResults extends DNSLinkResolveResult = DNSLinkIPFSResult | DNSLinkIPNSResult> {
   /**
    * Resolve a CID from a dns-link style IPNS record
    *
@@ -220,7 +220,7 @@ export interface DNSLink {
    * console.info(result) // { answer: ..., value: ... }
    * ```
    */
-  resolve(domain: string, options?: ResolveDNSLinkOptions): Promise<DNSLinkResult[]>
+  resolve(domain: string, options?: ResolveDNSLinkOptions): Promise<Array<DNSLinkResolveResults | DNSLinkIPFSResult | DNSLinkIPNSResult>>
 }
 
 export interface DNSLinkComponents {
@@ -228,14 +228,39 @@ export interface DNSLinkComponents {
   logger: ComponentLogger
 }
 
-export interface DNSLinkOptions {
+export interface DNSLinkOptions<Namespaces extends Record<string, DNSLinkParser<any>> = Record<string, DNSLinkParser<any>>> {
   /**
    * By default `/ipfs/...`, `/ipns/...` and `/dnslink/...` record values are
    * supported - to support other prefixes pass other value parsers here
    */
-  namespaces?: Record<string, DNSLinkNamespace>
+  namespaces?: Namespaces
+
+  /**
+   * How many DNSLink lookups to cache in memory
+   *
+   * @default 1_000
+   */
+  cacheSize?: number
+
+  /**
+   * The maximum number of Answers to cache for each domain
+   *
+   * @default 10
+   */
+  cacheMaxAnswers?: number
+
+  /**
+   * By default the DNS TTL will be used to calculate when a DNSLink lookup
+   * should be evicted from the cache, unless one is not available in which case
+   * this number of ms will be used.
+   *
+   * @default 30_000
+   */
+  cacheMaxAge?: number
 }
 
+export function dnsLink <R extends DNSLinkResolveResult, T extends Record<string, DNSLinkParser<R>>> (components: DNSLinkComponents, options: DNSLinkOptions<T>): DNSLink<ReturnType<T[keyof T]>>
+export function dnsLink (components: DNSLinkComponents, options?: DNSLinkOptions): DNSLink
 export function dnsLink (components: DNSLinkComponents, options: DNSLinkOptions = {}): DNSLink {
   return new DNSLinkClass(components, options)
 }