@astrale-os/adapter-cloudflare 0.5.0-beta.12 → 0.5.0-beta.13

package/src/worker/index.ts

@@ -259,20 +259,35 @@ async function frontendAsset<S extends schema.DomainSchema>(
 ): Promise<Response | undefined> {
   const frontend = definition.frontend
   if (frontend === undefined || frontend.source.kind === 'external') return undefined
+  if (isReservedServicePath(url.pathname)) return undefined
+  if (request.method !== 'GET' && request.method !== 'HEAD') return undefined
+  const dev = environment.FRONTEND_DEV_URL?.replace(/\/+$/u, '')
+  if (dev !== undefined && dev.length > 0) {
+    return fetch(new Request(new URL(`${url.pathname}${url.search}`, `${dev}/`), request))
+  }
   const routes = frontend.routes as Readonly<Record<string, FrontendRoute>>
-  const route = Object.values(routes).find((candidate) => candidate.path === url.pathname)
+  const spa = frontend.source.kind === 'vite' && frontend.source.spa
+  const route = Object.values(routes)
+    .filter(
+      (candidate) =>
+        candidate.path === url.pathname ||
+        (spa && (candidate.path === '/' || url.pathname.startsWith(`${candidate.path}/`))),
+    )
+    .sort((left, right) => right.path.length - left.path.length)[0]
   const staticAsset = url.pathname.startsWith('/assets/')
   if (route === undefined && !staticAsset) return undefined
-  if (request.method !== 'GET' && request.method !== 'HEAD') return undefined
   const binding = environment.ASSETS
   if (binding === undefined) return undefined
-  const dev = environment.FRONTEND_DEV_URL?.replace(/\/+$/u, '')
-  if (dev !== undefined && dev.length > 0) {
-    return fetch(new Request(`${dev}${url.pathname}${url.search}`, request))
-  }
-  const path =
-    route === undefined ? `${url.pathname}${url.search}` : `/${route.document}${url.search}`
-  return binding.fetch(new Request(new URL(path, url.origin), request))
+  const asset = await binding.fetch(request)
+  if (asset.status !== 404 || route === undefined) return asset
+  await asset.body?.cancel()
+  return binding.fetch(new Request(new URL(`/${route.document}${url.search}`, url.origin), request))
+}
+
+function isReservedServicePath(path: string): boolean {
+  return ['/invoke', '/install', '/health', '/meta', '/.well-known'].some(
+    (reserved) => path === reserved || path.startsWith(`${reserved}/`),
+  )
 }
 
 function requestOrigin(url: URL, request: Request): string {