Fix bugs in worker

Author: frawleykid

package-lock.json

@@ -1,5 +1,4 @@
-import type { Fetcher, Request } from "@cloudflare/workers-types";
-import { minimatch } from 'minimatch'
+import { type Fetcher, type Request } from "@cloudflare/workers-types";
 
 interface Env {
   ASSETS: Fetcher;
@@ -13,12 +12,12 @@ interface Redirect {
 
 type Redirects = ReadonlyArray<Redirect>;
 
-type Headers = Record<string, Record<string, string>>;
+type HeaderPatterns = Record<string, Record<string, string>>;
 
-const headerPatterns: Headers = {
+const headerPatterns: HeaderPatterns = {
   // Headers which are common to all paths. This includes most security
   // headers.
-  "/*": {
+  "/.*": {
     "X-Content-Type-Options": "nosniff",
     "X-Frame-Options": "DENY",
     "Content-Security-Policy": "default-src 'self'; connect-src *; img-src 'self' data:; script-src 'self' 'sha256-dNGbdYMnwBYenrRGOHR0l33DkR37uJKlpRHFVeG85Lk=' https://umami.acearchive.lgbt; style-src 'self' 'unsafe-inline'; base-uri 'self'; frame-ancestors 'none';",
@@ -30,34 +29,34 @@ const headerPatterns: Headers = {
   // Path-specific caching headers. We want to employ a different caching
   // strategy with files that have cache-busting filenames (e.g. JS/CSS) vs
   // those that do not (e.g. HTML).
-  "/js/*.js": {
+  "/js/[^/]+\\.js": {
     "Cache-Control": "public, immutable, max-age=31536000",
   },
-  "/js/vendor/*": {
+  "/js/vendor/.+": {
     "Cache-Control": "no-cache",
   },
-  "/js/vendor/bootstrap/dist/js/*.js": {
+  "/js/vendor/bootstrap/dist/js/[^/]+\\.js": {
     "Cache-Control": "public, immutable, max-age=31536000",
   },
-  "/css/*.css": {
+  "/css/[^/]+\\.css": {
     "Cache-Control": "public, immutable, max-age=31536000",
   },
-  "/css/vendor/*": {
+  "/css/vendor/.+": {
     "Cache-Control": "no-cache",
   },
-  "/icons/*": {
+  "/icons/.+": {
     "Cache-Control": "public, immutable, max-age=31536000",
   },
-  "/fonts/*": {
+  "/fonts/.+": {
     "Cache-Control": "public, immutable, max-age=31536000",
   },
   // Headers specific to Stoplight Elements, the app we embed for rendering the
   // OpenAPI docs.
-  "/docs/api/*": {
+  "/docs/api/.+": {
     "Content-Security-Policy": "default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; connect-src https://raw.githubusercontent.com https://api.acearchive.lgbt; frame-ancestors 'none';",
   },
   // File-specific header overrides.
-  "/cute.gif": {
+  "/cute\\.gif": {
     "Content-Type": "image/webp",
   }
 };
@@ -66,35 +65,31 @@ export default {
   async fetch(request: Request, env: Env) {
     const requestUrl = new URL(request.url);
 
-    console.log(`Request URL: ${requestUrl.pathname}`);
-
     const redirectsUrl = new URL(request.url);
     redirectsUrl.pathname = "/redirects.json";
 
     const redirectsResponse = await env.ASSETS.fetch(redirectsUrl);
     const redirects: Redirects = await redirectsResponse.json();
 
     for (const redirect of redirects) {
-      console.log(`Checking redirect: ${redirect.from} -> ${redirect.to} (${redirect.status})`);
-
-      if (minimatch(requestUrl.pathname, redirect.from)) {
-        console.log(`Redirecting: ${redirect.from} -> ${redirect.to} (${redirect.status})`);
+      if (requestUrl.pathname === redirect.from) {
         const url = new URL(request.url);
         url.pathname = redirect.to;
         return Response.redirect(url.toString(), redirect.status);
       }
     }
 
-    const responseHeaders = new Headers();
+    const response = await env.ASSETS.fetch(request);
+    const newResponse = new Response(response.body, response);
 
     for (const [pattern, patternHeaders] of Object.entries(headerPatterns)) {
-      if (minimatch(requestUrl.pathname, pattern)) {
+      if (new RegExp(pattern).test(requestUrl.pathname)) {
         for (const [key, value] of Object.entries(patternHeaders)) {
-          responseHeaders.set(key, value);
+          newResponse.headers.set(key, value);
         }
       }
     }
 
-    return env.ASSETS.fetch(request, { headers: responseHeaders });
+    return newResponse;
   },
 };

worker/index.ts

@@ -5,7 +5,5 @@
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20250715.0"
   },
-  "dependencies": {
-    "minimatch": "^10.0.3"
-  }
+  "dependencies": {}
 }