Stop messing with manual parsing of paths in the downloads handler, when hono can do all of this and more for us. Align with the other workers and use that framework.

Author: michaelherger

tools/bug-search/package-lock.json

@@ -10,9 +10,9 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20251014.0",
     "typescript": "^5.9.3",
-    "wrangler": "^4.44.0"
+    "wrangler": "^4.45.0"
   },
   "dependencies": {
-    "hono": "^4.10.2"
+    "hono": "^4.10.3"
   }
 }

tools/bug-search/package.json

@@ -2,6 +2,8 @@ name = "lms-bug-search"
 main = "src/index.ts"
 compatibility_date = "2024-04-05"
 compatibility_flags = ["nodejs_compat"]
+workers_dev = true
+preview_urls = false
 
 [observability]
 enabled = true

tools/bug-search/wrangler.toml

@@ -11,5 +11,8 @@
     "@cloudflare/workers-types": "^4.20251014.0",
     "typescript": "^5.9.3",
     "wrangler": "^4.45.0"
+  },
+  "dependencies": {
+    "hono": "^4.10.3"
   }
 }

tools/downloads-handler/package-lock.json

@@ -1,10 +1,12 @@
-// see https://developers.cloudflare.com/r2/examples/demo-worker/
+import { Hono, Context } from 'hono'
+
+const urlPrefix = 'downloads/listing/archive';
 
 interface Env {
     DOWNLOADS_BUCKET: R2Bucket
 }
 
-const allowedPrefixes = [
+const allowedPrefixes: Array<string> = [
     'LyrionMusicServer_v.*',
     'LogitechMediaServer_v.*',
     'SqueezeboxServer_v.*',
@@ -15,52 +17,51 @@ const allowedPrefixes = [
     'docs/*',
 ]
 
-const corsHeaders = {
+const corsHeaders: Record<string, string> = {
     "Access-Control-Allow-Origin": "*",
     "Access-Control-Allow-Methods": "GET, OPTIONS, HEAD",
     "Access-Control-Max-Age": "86400",
 }
 
-const urlPrefix = 'downloads/listing/archive/';
-
-export default {
-    async fetch(request, env): Promise<Response> {
-        const url = new URL(request.url)
-        const prefix = url.pathname.slice(1).replace(urlPrefix, '')
+const app = new Hono()
 
-        if (!prefix) {
-            return Response.redirect('https://lyrion.org/getting-started')
-        }
+app.on('GET', [`/${urlPrefix}/:prefix`, '/:prefix'], async (c: Context, ) => {
+    const prefix = c.req.param('prefix');
 
-        if (request.method === 'GET' && prefix && allowedPrefixes.some(p => new RegExp(p).test(prefix))) {
-            const listing = await env.DOWNLOADS_BUCKET.list({ prefix })
+    if (!prefix) {
+        return Response.redirect('https://lyrion.org/getting-started')
+    }
 
-            // we only want object with the given prefix, but no sub-folders
-            const filterRe = new RegExp(prefix + (prefix.match(new RegExp("/$")) ? "" : "/") + "[^\/]+$")
+    if (prefix && allowedPrefixes.some(p => new RegExp(p).test(prefix))) {
+        const listing = await c.env.DOWNLOADS_BUCKET.list({ prefix })
 
-            const body = listing.objects
-                .filter(i => filterRe.test(i.key))
-                .map(i => ({
-                    key: i.key,
-                    size: i.size,
-                }))
+        // we only want objects with the given prefix, but no sub-folders
+        const filterRe = new RegExp(prefix + (prefix.match(new RegExp("/$")) ? "" : "/") + "[^\/]+$")
 
-            return new Response(JSON.stringify(body), {
-                headers: {
-                    ...corsHeaders,
-                    'Access-Control-Allow-Headers': request.headers.get(
-                      "Access-Control-Request-Headers",
-                    ) || '',
-                    'content-type': 'application/json; charset=UTF-8',
-                }
-            })
-        }
+        const body = listing.objects
+            .filter((i: any) => filterRe.test(i.key))
+            .map((i: any) => ({
+                key: i.key,
+                size: i.size,
+            }))
 
-        // we don't want to reveal a path doesn't exist - return valid, but empty result set
-        return new Response('[]', {
-            headers: {
-                'content-type': 'application/json; charset=UTF-8',
-            }
+        Object.keys(corsHeaders).forEach(key => {
+            c.header(key, corsHeaders[key]);
         })
+
+        c.header('Access-Control-Allow-Headers', c.req.header(
+            "Access-Control-Request-Headers",
+        ) || '')
+
+        return c.json(body)
     }
-} satisfies ExportedHandler<Env>
+
+    // we don't want to reveal a path doesn't exist - return valid, but empty result set
+    return new Response('[]', {
+        headers: {
+            'content-type': 'application/json; charset=UTF-8',
+        }
+    })
+})
+
+export default app

tools/downloads-handler/package.json

@@ -2,7 +2,7 @@ name = "lms-downloads-handler"
 main = "src/index.ts"
 compatibility_date = "2024-04-05"
 compatibility_flags = ["nodejs_compat"]
-workers_dev = true
+workers_dev = false
 preview_urls = false
 
 [observability]
@@ -21,4 +21,5 @@ zone_name="lyrion.org"
 binding = 'DOWNLOADS_BUCKET'
 bucket_name = 'downloads'
 preview_bucket_name = 'downloads'
-jurisdiction = "eu"
+jurisdiction = "eu"
+remote = true