chore: fix interface

src/index.ts

@@ -155,6 +155,8 @@ export interface AbortOptions {
  */
 export const resolvers = new Map<string, Resolver>()
 
+export type { Resolver }
+
 export { MultiaddrFilter } from './filter/multiaddr-filter.js'
 
 export interface ResolveOptions extends AbortOptions {

src/multiaddr.ts

@@ -19,7 +19,7 @@ import { equals as uint8ArrayEquals } from 'uint8arrays/equals'
 import { toString as uint8ArrayToString } from 'uint8arrays/to-string'
 import { bytesToMultiaddrParts, stringToMultiaddrParts, type MultiaddrParts, tuplesToBytes } from './codec.js'
 import { getProtocol, names } from './protocols-table.js'
-import { isMultiaddr, resolvers } from './index.js'
+import { isMultiaddr, multiaddr, resolvers } from './index.js'
 import type { MultiaddrInput, Multiaddr as MultiaddrInterface, MultiaddrObject, Protocol, StringTuple, Tuple, NodeAddress, ResolveOptions } from './index.js'
 
 const inspect = Symbol.for('nodejs.util.inspect.custom')
@@ -235,7 +235,9 @@ export class Multiaddr implements MultiaddrInterface {
       throw new CodeError(`no available resolver for ${resolvableProto.name}`, 'ERR_NO_AVAILABLE_RESOLVER')
     }
 
-    return resolver(this, options)
+    const result = await resolver(this, options)
+
+    return result.map(str => multiaddr(str))
   }
 
   nodeAddress (): NodeAddress {

src/resolvers/dnsaddr.ts

@@ -25,7 +25,7 @@ export interface DNSADDROptions extends AbortOptions {
   maxRecursiveDepth?: number
 }
 
-export const dnsaddr: Resolver<DNSADDROptions> = async function dnsaddr (ma: Multiaddr, options: DNSADDROptions = {}): Promise<Multiaddr[]> {
+export const dnsaddrResolver: Resolver<DNSADDROptions> = async function dnsaddr (ma: Multiaddr, options: DNSADDROptions = {}): Promise<string[]> {
   const recursionLimit = options.maxRecursiveDepth ?? MAX_RECURSIVE_DEPTH
 
   if (recursionLimit === 0) {
@@ -43,7 +43,7 @@ export const dnsaddr: Resolver<DNSADDROptions> = async function dnsaddr (ma: Mul
   }), options.signal)
 
   const peerId = ma.getPeerId()
-  const output: Multiaddr[] = []
+  const output: string[] = []
 
   for (const answer of result.Answer) {
     const addr = answer.data.split('=')[1]
@@ -64,9 +64,9 @@ export const dnsaddr: Resolver<DNSADDROptions> = async function dnsaddr (ma: Mul
         maxRecursiveDepth: recursionLimit - 1
       })
 
-      output.push(...resolved)
+      output.push(...resolved.map(ma => ma.toString()))
     } else {
-      output.push(ma)
+      output.push(ma.toString())
     }
   }
 

src/resolvers/index.ts

@@ -1,7 +1,7 @@
 import type { AbortOptions, Multiaddr } from '../index.js'
 
 export interface Resolver<ResolveOptions extends AbortOptions = AbortOptions> {
-  (ma: Multiaddr, options?: ResolveOptions): Promise<Multiaddr[]>
+  (ma: Multiaddr, options?: ResolveOptions): Promise<string[]>
 }
 
-export { dnsaddr } from './dnsaddr.js'
+export { dnsaddrResolver } from './dnsaddr.js'

test/resolvers.spec.ts

@@ -3,7 +3,7 @@ import { expect } from 'aegir/chai'
 import sinon from 'sinon'
 import { stubInterface, type StubbedInstance } from 'sinon-ts'
 import { multiaddr, resolvers } from '../src/index.js'
-import { dnsaddr } from '../src/resolvers/index.js'
+import { dnsaddrResolver } from '../src/resolvers/index.js'
 import type { DNS } from '@multiformats/dns'
 
 const stubs: Record<string, string[]> = {
@@ -60,7 +60,7 @@ describe('multiaddr resolve', () => {
       })
     })
 
-    resolvers.set('dnsaddr', dnsaddr)
+    resolvers.set('dnsaddr', dnsaddrResolver)
   })
 
   it('should throw if no resolver is available', async () => {