update assets endpoint (#2288)

ui/packages/workers/src/assets/index.ts

@@ -1,8 +1,8 @@
-import { IRequest } from "itty-router";
+import {IRequest} from 'itty-router';
 
 export async function handleAssets(
   request: IRequest,
-  event: FetchEvent
+  event: FetchEvent,
 ): Promise<Response> {
   const cacheUrl = new URL(request.url);
   const cacheKey = new Request(cacheUrl.toString(), request);
@@ -12,30 +12,27 @@ export async function handleAssets(
 
   if (!response) {
     console.log(
-      `Response for request url: ${request.url} not present in cache. Fetching and caching request.`
+      `Response for request url: ${request.url} not present in cache. Fetching and caching request.`,
     );
 
-    ///api/assets/avatar/cyno.png
-    const key = new URL(request.url).pathname.replace("/api/assets/", "");
-    console.log(`getting ${key}`);
+    const x = new URL(request.url);
+    const resp = await fetch(
+      new Request(ASSETS_ENDPOINT + x.pathname + x.search),
+      {
+        cf: {
+          cacheTtl: 60 * 24 * 60 * 60,
+          cacheEverything: true,
+        },
+      },
+    );
 
-    const object = await GCSIM_ASSETS.get(key);
+    response = new Response(resp.body, resp);
+    response.headers.set('Cache-Control', 'max-age=5184000');
 
-    if (object === null) {
-      console.log(`${key} not found in r2`);
-      return new Response(`Not Found`, { status: 404 });
+    // only cache if response = 200
+    if (resp.status === 200) {
+      event.waitUntil(cache.put(cacheKey, response.clone()));
     }
-
-    const headers = new Headers();
-    object.writeHttpMetadata(headers);
-    headers.set("etag", object.httpEtag);
-    headers.set("Cache-Control", "max-age=5184000");
-
-    response = new Response(object.body, {
-      headers,
-    });
-
-    event.waitUntil(cache.put(cacheKey, response.clone()));
   }
 
   return response;

ui/packages/workers/src/bindings.d.ts

@@ -3,6 +3,7 @@ export {};
 declare global {
   const API_ENDPOINT: string;
   const PREVIEW_ENDPOINT: string;
+  const ASSETS_ENDPOINT: string;
   const GCSIM_ASSETS: R2Bucket; //bucket
   const GCSIM_WASM: R2Bucket; //bucket
 }