add module service adapter, unify route handling to handleRequestWithEdgeSpec

src/adapters/module-service.ts

@@ -32,11 +32,16 @@ export const createModuleService: EdgeSpecAdapter<[], ModuleService> = (
       return await pathnameOverrideResult.failed(request)
     }
 
+    const url = new URL(request.url)
+
+    if (pathnameOverrideResult.pathnameOverride) {
+      url.pathname = pathnameOverrideResult.pathnameOverride
+    }
+
     const response = await handleRequestWithEdgeSpec(
       edgeSpec,
-      request,
       pathnameOverrideResult.pathnameOverride
-    )
+    )(request)
 
     return response
   }

src/adapters/node.ts

@@ -15,7 +15,7 @@ export const startServer: EdgeSpecAdapter<[EdgeSpecNodeAdapterOptions]> = (
   })
 
   const server = http.createServer(
-    transformToNode((req) => handleRequestWithEdgeSpec(edgeSpec, req))
+    transformToNode(handleRequestWithEdgeSpec(edgeSpec))
   )
   server.listen(port)
 

src/adapters/wintercg-minimal.ts

@@ -7,7 +7,7 @@ export const addFetchListener: EdgeSpecAdapter = (edgeSpec) => {
     const fetchEvent = event as unknown as EdgeSpecFetchEvent
 
     fetchEvent.respondWith(
-      await handleRequestWithEdgeSpec(edgeSpec, fetchEvent.request)
+      await handleRequestWithEdgeSpec(edgeSpec)(fetchEvent.request)
     )
   })
 }

src/serve/create-server-from-route-map.ts

@@ -43,7 +43,7 @@ export const createNodeServerFromRouteMap = async (
   const transformToNode = transformToNodeBuilder(transformToNodeOptions)
 
   const server = createServer(
-    transformToNode((req) => handleRequestWithEdgeSpec(edgeSpec, req))
+    transformToNode(handleRequestWithEdgeSpec(edgeSpec))
   )
 
   return server

src/types/edge-spec.ts

@@ -32,35 +32,36 @@ export type EdgeSpecAdapter<
   ReturnValue = void,
 > = (edgeSpec: EdgeSpecRouteBundle, ...options: Options) => ReturnValue
 
-export async function handleRequestWithEdgeSpec(
+export function handleRequestWithEdgeSpec(
   edgeSpec: EdgeSpecRouteBundle,
-  request: Request,
   pathnameOverride?: string
-): Promise<Response> {
-  const {
-    routeMatcher,
-    routeMapWithHandlers,
-    handle404 = () =>
-      new Response("Not found", {
-        status: 404,
-      }),
-  } = edgeSpec
+): (request: Request) => Promise<Response> {
+  return async (request: Request) => {
+    const {
+      routeMatcher,
+      routeMapWithHandlers,
+      handle404 = () =>
+        new Response("Not found", {
+          status: 404,
+        }),
+    } = edgeSpec
 
-  const pathname = pathnameOverride ?? new URL(request.url).pathname
-  const { matchedRoute, routeParams } = routeMatcher(pathname) ?? {}
+    const pathname = pathnameOverride ?? new URL(request.url).pathname
+    const { matchedRoute, routeParams } = routeMatcher(pathname) ?? {}
 
-  const routeFn = matchedRoute && routeMapWithHandlers[matchedRoute]
+    const routeFn = matchedRoute && routeMapWithHandlers[matchedRoute]
 
-  const edgeSpecRequest = createEdgeSpecRequest(request, {
-    edgeSpec,
-    pathParams: routeParams,
-  })
+    const edgeSpecRequest = createEdgeSpecRequest(request, {
+      edgeSpec,
+      pathParams: routeParams,
+    })
 
-  if (!routeFn) {
-    return await handle404(edgeSpecRequest)
-  }
+    if (!routeFn) {
+      return await handle404(edgeSpecRequest)
+    }
 
-  const response: Response = await routeFn(edgeSpecRequest)
+    const response: Response = await routeFn(edgeSpecRequest)
 
-  return response
+    return response
+  }
 }

src/types/web-handler.ts

@@ -25,7 +25,7 @@ export type EdgeSpecFetchEvent = FetchEvent & {
 
 export function createEdgeSpecRequest(
   request: Request,
-  options: EdgeSpecRequestOptions
+  options: EdgeSpecRequestOptions & { url?: URL }
 ): EdgeSpecRequest {
   return Object.assign(request, options)
 }

tests/adapters/module-service.test.ts

@@ -6,7 +6,9 @@ import { createEdgeSpecFromRouteMap } from "src/serve/create-server-from-route-m
 test("module service with simple endpoint", async (t) => {
   const ModuleService = createModuleService(
     createEdgeSpecFromRouteMap({
-      "/health": async () => {
+      "/health": async (req) => {
+        console.log(req.url)
+
         return new Response(
           JSON.stringify({
             ok: true,