feat!: use custom DNS resolver in @helia/ipns for DNSLink

packages/helia/package.json

@@ -78,12 +78,13 @@
     "@libp2p/webrtc": "^4.0.20",
     "@libp2p/websockets": "^8.0.16",
     "@libp2p/webtransport": "^4.0.20",
+    "@multiformats/dns": "^1.0.1",
     "blockstore-core": "^4.4.0",
     "datastore-core": "^9.2.9",
     "interface-blockstore": "^5.2.10",
     "interface-datastore": "^8.2.11",
     "ipns": "^9.0.0",
-    "libp2p": "^1.2.4",
+    "libp2p": "^1.3.0",
     "multiformats": "^13.1.0"
   },
   "devDependencies": {

packages/helia/src/index.ts

@@ -100,6 +100,7 @@ export async function createHelia (init: Partial<HeliaInit> = {}): Promise<Helia
     libp2p = await createLibp2p<DefaultLibp2pServices>({
       ...init,
       libp2p: {
+        dns: init.dns,
         ...init.libp2p,
 
         // ignore the libp2p start parameter as it should be on the main init

packages/helia/src/utils/libp2p-defaults.browser.ts

@@ -34,6 +34,7 @@ export interface DefaultLibp2pServices extends Record<string, unknown> {
 export function libp2pDefaults (options: Libp2pDefaultsOptions = {}): Libp2pOptions<DefaultLibp2pServices> {
   return {
     peerId: options.peerId,
+    dns: options.dns,
     addresses: {
       listen: [
         '/webrtc'

packages/helia/src/utils/libp2p-defaults.ts

@@ -38,6 +38,7 @@ export interface DefaultLibp2pServices extends Record<string, unknown> {
 export function libp2pDefaults (options: Libp2pDefaultsOptions = {}): Libp2pOptions<DefaultLibp2pServices> {
   return {
     peerId: options.peerId,
+    dns: options.dns,
     addresses: {
       listen: [
         '/ip4/0.0.0.0/tcp/0',

packages/helia/src/utils/libp2p.ts

@@ -6,6 +6,7 @@ import { libp2pDefaults } from './libp2p-defaults.js'
 import type { DefaultLibp2pServices } from './libp2p-defaults.js'
 import type { ComponentLogger, Libp2p, PeerId } from '@libp2p/interface'
 import type { Keychain, KeychainInit } from '@libp2p/keychain'
+import type { DNS } from '@multiformats/dns'
 import type { Datastore } from 'interface-datastore'
 import type { Libp2pOptions } from 'libp2p'
 
@@ -20,6 +21,7 @@ export interface CreateLibp2pOptions<T extends Record<string, unknown>> {
 export interface Libp2pDefaultsOptions {
   peerId?: PeerId
   keychain?: KeychainInit
+  dns?: DNS
 }
 
 export async function createLibp2p <T extends Record<string, unknown> = DefaultLibp2pServices> (options: CreateLibp2pOptions<T>): Promise<Libp2p<T>> {

packages/interface/package.json

@@ -71,6 +71,7 @@
   },
   "dependencies": {
     "@libp2p/interface": "^1.1.4",
+    "@multiformats/dns": "^1.0.1",
     "interface-blockstore": "^5.2.10",
     "interface-datastore": "^8.2.11",
     "interface-store": "^5.1.8",

packages/interface/src/index.ts

@@ -18,6 +18,7 @@ import type { Blocks } from './blocks.js'
 import type { Pins } from './pins.js'
 import type { Routing } from './routing.js'
 import type { AbortOptions, ComponentLogger } from '@libp2p/interface'
+import type { DNS } from '@multiformats/dns'
 import type { Datastore } from 'interface-datastore'
 import type { MultihashHasher } from 'multiformats'
 import type { CID } from 'multiformats/cid'
@@ -67,6 +68,12 @@ export interface Helia {
    */
   hashers: Record<number, MultihashHasher>
 
+  /**
+   * The DNS property can be used to perform lookups of various record types and
+   * will use a resolver appropriate to the current platform.
+   */
+  dns: DNS
+
   /**
    * Starts the Helia node
    */

packages/interop/src/ipns-dnslink.spec.ts

@@ -0,0 +1,45 @@
+/* eslint-env mocha */
+
+import { ipns } from '@helia/ipns'
+import { expect } from 'aegir/chai'
+import { createHeliaNode } from './fixtures/create-helia.js'
+import type { IPNS } from '@helia/ipns'
+import type { HeliaLibp2p } from 'helia'
+
+const TEST_DOMAINS: string[] = [
+  'ipfs.io',
+  'docs.ipfs.tech',
+  'en.wikipedia-on-ipfs.org',
+  'blog.libp2p.io',
+  'consensuslab.world',
+  'n0.computer',
+  'protocol.ai',
+  'research.protocol.ai',
+  'probelab.io',
+  'singularity.storage',
+  'saturn.tech'
+]
+
+describe('@helia/ipns - dnslink', () => {
+  let helia: HeliaLibp2p
+  let name: IPNS
+
+  beforeEach(async () => {
+    helia = await createHeliaNode()
+    name = ipns(helia)
+  })
+
+  afterEach(async () => {
+    if (helia != null) {
+      await helia.stop()
+    }
+  })
+
+  TEST_DOMAINS.forEach(domain => {
+    it(`should resolve ${domain}`, async () => {
+      const result = await name.resolveDNSLink(domain)
+
+      expect(result).to.have.property('cid')
+    })
+  })
+})

packages/ipns/package.json

@@ -169,13 +169,10 @@
     "@libp2p/kad-dht": "^12.0.8",
     "@libp2p/logger": "^4.0.7",
     "@libp2p/peer-id": "^4.0.7",
-    "dns-over-http-resolver": "^3.0.2",
-    "dns-packet": "^5.6.1",
-    "hashlru": "^2.3.0",
+    "@multiformats/dns": "^1.0.1",
     "interface-datastore": "^8.2.11",
     "ipns": "^9.0.0",
     "multiformats": "^13.1.0",
-    "p-queue": "^8.0.1",
     "progress-events": "^1.0.0",
     "uint8arrays": "^5.0.2"
   },