fix: allow routings to use helia components

Accept factory functions as routings, not just implementations.

Author: achingbrain

packages/routers/src/delegated-http-routing.ts

@@ -100,7 +100,24 @@ class DelegatedHTTPRouter implements Routing {
 /**
  * Creates a Helia Router that connects to an endpoint that supports the [Delegated Routing V1 HTTP API](https://specs.ipfs.tech/routing/http-routing-v1/) spec.
  */
-export function delegatedHTTPRouting (url: string | URL, init?: DelegatedRoutingV1HttpApiClientInit): Routing {
-  const config = init ?? delegatedHTTPRoutingDefaults()
-  return new DelegatedHTTPRouter(new URL(url), config)
+export function delegatedHTTPRouting (init: DelegatedRoutingV1HttpApiClientInit & { url: string | URL }): (components: any) => Routing
+/**
+ * @deprecated Use `delegatedHTTPRouting(init)` instead
+ */
+export function delegatedHTTPRouting (url: string | URL, init?: DelegatedRoutingV1HttpApiClientInit): Routing
+export function delegatedHTTPRouting (url: string | URL | (DelegatedRoutingV1HttpApiClientInit & { url: string | URL }), init?: DelegatedRoutingV1HttpApiClientInit): Routing | ((components: any) => Routing) {
+  if (typeof url === 'string' || url instanceof URL) {
+    return new DelegatedHTTPRouter({
+      logger: defaultLogger()
+    }, {
+      ...delegatedHTTPRoutingDefaults(),
+      ...init,
+      url: new URL(url)
+    })
+  }
+
+  return (components: any) => new DelegatedHTTPRouter(components, {
+    ...delegatedHTTPRoutingDefaults(),
+    ...url
+  })
 }

packages/utils/src/index.ts

@@ -136,7 +136,7 @@ export interface HeliaInit<T extends Libp2p = Libp2p> {
    * Routers perform operations such as looking up content providers,
    * information about network peers or getting/putting records.
    */
-  routers?: Array<Partial<Routing>>
+  routers?: Array<Partial<Routing> | ((components: any) => Partial<Routing>)>
 
   /**
    * During provider lookups, peers can be returned from routing implementations
@@ -232,20 +232,26 @@ export class Helia<T extends Libp2p> implements HeliaInterface<T> {
     }
 
     this.routing = components.routing = new RoutingClass(components, {
-      routers: (init.routers ?? []).flatMap((router: any) => {
+      routers: (init.routers ?? []).flatMap((router: Partial<Routing> | ((components: any) => Partial<Routing>)) => {
+        if (typeof router === 'function') {
+          router = router(components)
+        }
+
         // if the router itself is a router
         const routers = [
           router
         ]
 
         // if the router provides a libp2p-style ContentRouter
-        if (router[contentRoutingSymbol] != null) {
-          routers.push(router[contentRoutingSymbol])
+        const contentRouting = asContentRouting(router)
+        if (contentRouting != null) {
+          routers.push(contentRouting)
         }
 
         // if the router provides a libp2p-style PeerRouter
-        if (router[peerRoutingSymbol] != null) {
-          routers.push(router[peerRoutingSymbol])
+        const peerRouting = asPeerRouting(router)
+        if (peerRouting != null) {
+          routers.push(peerRouting)
         }
 
         return routers
@@ -318,3 +324,11 @@ export class Helia<T extends Libp2p> implements HeliaInterface<T> {
     this.log('gc finished')
   }
 }
+
+function asContentRouting (obj?: any): ContentRouting | undefined {
+  return obj?.[contentRoutingSymbol]
+}
+
+function asPeerRouting (obj?: any): PeerRouting | undefined {
+  return obj?.[peerRoutingSymbol]
+}