From d49ba0cc7e8ad133e170eba411949900020fcc9a Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Wed, 20 Sep 2023 14:43:37 -0700
Subject: [PATCH 1/2] feat(resolve): allow configurable dnsServers

---
 src/index.ts           | 20 +++++++++++++++++---
 src/resolvers/dns.ts   |  2 +-
 src/resolvers/index.ts |  7 +++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index 2936e934..5269facc 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -68,7 +68,7 @@ export type MultiaddrInput = string | Multiaddr | Uint8Array | null
  * A Resolver is a function that takes a {@link Multiaddr} and resolves it into one
  * or more string representations of that {@link Multiaddr}.
  */
-export interface Resolver { (addr: Multiaddr, options?: AbortOptions): Promise<string[]> }
+export interface Resolver { (addr: Multiaddr, options?: AbortOptions & ResolverOptions): Promise<string[]> }
 
 /**
  * A code/value pair
@@ -87,6 +87,20 @@ export interface AbortOptions {
   signal?: AbortSignal
 }
 
+/**
+ * Options for DNS resolvers.
+ * dns-over-http-resolver in the browser and 'node:dns' in Node.js
+ */
+export interface ResolverOptions {
+  /**
+   * DNS servers to use for resolution.
+   *
+   * In the browser, this is passed to dns-over-http-resolver, so the servers should be a DoH compatible url such as https://cloudflare-dns.com/dns-query
+   * In Node.js, this is passed to dns.resolve, so the servers should be an IP address or hostname (with optional port) such as '9.9.9.9'
+   */
+  dnsServers?: string[]
+}
+
 /**
  * All configured {@link Resolver}s
  */
@@ -351,7 +365,7 @@ export interface Multiaddr {
    * // ]
    * ```
    */
-  resolve: (options?: AbortOptions) => Promise<Multiaddr[]>
+  resolve: (options?: AbortOptions & ResolverOptions) => Promise<Multiaddr[]>
 
   /**
    * Gets a Multiaddrs node-friendly address object. Note that protocol information
@@ -678,7 +692,7 @@ class DefaultMultiaddr implements Multiaddr {
     return uint8ArrayEquals(this.bytes, addr.bytes)
   }
 
-  async resolve (options?: AbortOptions): Promise<Multiaddr[]> {
+  async resolve (options?: AbortOptions & ResolverOptions ): Promise<Multiaddr[]> {
     const resolvableProto = this.protos().find((p) => p.resolvable)
 
     // Multiaddr is not resolvable?
diff --git a/src/resolvers/dns.ts b/src/resolvers/dns.ts
index 681d36aa..b5731375 100644
--- a/src/resolvers/dns.ts
+++ b/src/resolvers/dns.ts
@@ -1,3 +1,3 @@
-import { Resolver } from 'dns/promises'
+import { Resolver } from 'node:dns/promises'
 
 export default Resolver
diff --git a/src/resolvers/index.ts b/src/resolvers/index.ts
index 648b7c91..31a17e12 100644
--- a/src/resolvers/index.ts
+++ b/src/resolvers/index.ts
@@ -6,7 +6,7 @@
 
 import { getProtocol } from '../protocols-table.js'
 import Resolver from './dns.js'
-import type { AbortOptions, Multiaddr } from '../index.js'
+import type { AbortOptions, Multiaddr, ResolverOptions } from '../index.js'
 
 const { code: dnsaddrCode } = getProtocol('dnsaddr')
 
@@ -31,8 +31,11 @@ const { code: dnsaddrCode } = getProtocol('dnsaddr')
  * //]
  * ```
  */
-export async function dnsaddrResolver (addr: Multiaddr, options: AbortOptions = {}): Promise<string[]> {
+export async function dnsaddrResolver (addr: Multiaddr, options: AbortOptions & ResolverOptions = {}): Promise<string[]> {
   const resolver = new Resolver()
+  if (options.dnsServers != null) {
+    resolver.setServers(options.dnsServers)
+  }
 
   if (options.signal != null) {
     options.signal.addEventListener('abort', () => {

From 5edf8759734d70ea32d662f5a0812975cb78cf3d Mon Sep 17 00:00:00 2001
From: Russell Dempsey <1173416+SgtPooki@users.noreply.github.com>
Date: Wed, 20 Sep 2023 14:49:09 -0700
Subject: [PATCH 2/2] chore(lint): fix lint spacing

---
 src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.ts b/src/index.ts
index 5269facc..182a2e32 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -692,7 +692,7 @@ class DefaultMultiaddr implements Multiaddr {
     return uint8ArrayEquals(this.bytes, addr.bytes)
   }
 
-  async resolve (options?: AbortOptions & ResolverOptions ): Promise<Multiaddr[]> {
+  async resolve (options?: AbortOptions & ResolverOptions): Promise<Multiaddr[]> {
     const resolvableProto = this.protos().find((p) => p.resolvable)
 
     // Multiaddr is not resolvable?