feat(cdn): add R2 CDN bucket and /cdn/ Worker routes for WASM wheels

reecelikesramen · reecelikesramen · commit 258d27cd26a8 · 2026-04-13T11:05:45.000-06:00
Creates a pywire-cdn R2 bucket and exposes it via two Worker routes: - /cdn/simple/{package}/ — PEP 503 simple index (generated from R2 listing) - /cdn/{key} — serve object from R2 with immutable cache headers This hosts Pyodide WASM wheels (starting with tree-sitter-pywire) so micropip can resolve them by package name without pinning a full URL: micropip.install('tree-sitter-pywire', index_urls=['https://pywire.dev/cdn/simple', 'https://pypi.org/simple'])
diff --git a/infra/main.tf b/infra/main.tf
@@ -59,13 +59,25 @@ resource "cloudflare_pages_project" "landing" {
   }
 }
 
-# --- 3. The Router (Worker) ---
+# --- 3. CDN Bucket (R2) ---
+resource "cloudflare_r2_bucket" "cdn" {
+  account_id = var.account_id
+  name       = "pywire-cdn"
+  location   = "WNAM"
+}
+
+# --- 4. The Router (Worker) ---
 resource "cloudflare_workers_script" "router" {
   account_id     = var.account_id
   script_name    = "pywire-router"
   content_file   = "../worker/src/index.js"
   content_sha256 = filesha256("../worker/src/index.js")
   main_module    = "index.js"
+
+  r2_buckets = [{
+    binding     = "CDN_BUCKET"
+    bucket_name = cloudflare_r2_bucket.cdn.name
+  }]
 }
 
 # --- Nightly Environment ---
@@ -91,7 +103,7 @@ resource "cloudflare_dns_record" "vscode_verification" {
 
 
 
-# --- 4. The DNS & Routing ---
+# --- 5. The DNS & Routing ---
 resource "cloudflare_workers_route" "catch_all" {
   zone_id = var.zone_id
   pattern = "pywire.dev/*"
@@ -104,7 +116,7 @@ resource "cloudflare_workers_route" "nightly" {
   script  = cloudflare_workers_script.router.script_name
 }
 
-# --- 5. Allow AI crawlers to LLM documentation files ---
+# --- 6. Allow AI crawlers to LLM documentation files ---
 resource "cloudflare_ruleset" "allow_llm_crawlers" {
   zone_id     = var.zone_id
   name        = "Allow AI crawlers to LLM txt files"
@@ -123,7 +135,7 @@ resource "cloudflare_ruleset" "allow_llm_crawlers" {
   }]
 }
 
-# --- 6. Email Routing Setup ---
+# --- 7. Email Routing Setup ---
 
 resource "cloudflare_email_routing_settings" "main" {
   zone_id = var.zone_id
diff --git a/worker/src/index.js b/worker/src/index.js
@@ -11,14 +11,46 @@ export default {
     const landingTarget = isNightly ? "nightly.pywire-landing.pages.dev" : "pywire-landing.pages.dev";
     const docsTarget = isNightly ? "nightly.pywire-docs.pages.dev" : "pywire-docs.pages.dev";
 
-    // --- 1. HANDLE SHORTCUT REDIRECTS ---
+    // --- 1. CDN (R2 bucket proxy + PEP 503 simple index) ---
+    if (path.startsWith('/cdn/simple/')) {
+      const pkgName = path.slice('/cdn/simple/'.length).replace(/\/$/, '')
+      if (!pkgName) return new Response('Not Found', { status: 404 })
+      const listed = await env.CDN_BUCKET.list({ prefix: `${pkgName}/` })
+      const links = listed.objects
+        .map(obj => {
+          const filename = obj.key.split('/').pop()
+          return `<a href="/cdn/${obj.key}">${filename}</a>`
+        })
+        .join('\n')
+      return new Response(
+        `<!DOCTYPE html><html><head><title>Links for ${pkgName}</title></head>` +
+        `<body><h1>Links for ${pkgName}</h1>\n${links}\n</body></html>`,
+        { headers: { 'Content-Type': 'text/html; charset=utf-8' } }
+      )
+    }
+
+    if (path.startsWith('/cdn/')) {
+      const key = path.slice('/cdn/'.length)
+      if (!key) return new Response('Not Found', { status: 404 })
+      const obj = await env.CDN_BUCKET.get(key)
+      if (!obj) return new Response('Not Found', { status: 404 })
+      const contentType = obj.httpMetadata?.contentType ?? 'application/octet-stream'
+      return new Response(obj.body, {
+        headers: {
+          'Content-Type': contentType,
+          'Cache-Control': 'public, max-age=31536000, immutable',
+        },
+      })
+    }
+
+    // --- 2. HANDLE SHORTCUT REDIRECTS ---
     const redirects = {
       // "/discord": "https://discord.gg/pywire", // Update this!
       "/github": "https://github.com/pywire/pywire",
     };
     if (redirects[path]) return Response.redirect(redirects[path], 302);
 
-    // --- 2. DEFINE PROXY FUNCTION ---
+    // --- 3. DEFINE PROXY FUNCTION ---
     // This helper strips the 'Host' header so Pages accepts the request
     async function proxy(targetOrigin, pathOverride) {
       const newUrl = new URL(request.url);
@@ -43,14 +75,14 @@ export default {
       return fetch(newRequest);
     }
 
-    // --- 3. ROUTE TO DOCS ---
+    // --- 4. ROUTE TO DOCS ---
     if (path.startsWith("/docs")) {
       // Strip "/docs" so the origin sees "/_astro/..." or "/"
       const newPath = path.replace(/^\/docs/, "") || "/";
       return proxy(docsTarget, newPath);
     }
 
-    // --- 4. ROUTE TO LANDING ---
+    // --- 5. ROUTE TO LANDING ---
     return proxy(landingTarget);
   },
 };
