set cache headers

Razzmatazzz · Razzmatazzz · commit 145f4a368f72 · 2025-06-12T15:25:52.000-05:00
diff --git a/index.mjs b/index.mjs
@@ -64,13 +64,6 @@ async function graphqlHandler(request, env, ctx) {
         );
     }
 
-    // default headers
-    const responseOptions = {
-        headers: {
-            'Content-Type': 'application/json',
-        }
-    };
-
     if (!dataAPI) {
         dataAPI = new DataSource(env);
     }
@@ -95,9 +88,13 @@ async function graphqlHandler(request, env, ctx) {
         const cachedResponse = await cacheMachine.get(env, {key});
         if (cachedResponse) {
             // Construct a new response with the cached data
-            const newResponse = new Response(cachedResponse, responseOptions);
-            // Add a custom 'X-CACHE: HIT' header so we know the request hit the cache
-            newResponse.headers.append('X-CACHE', 'HIT');
+            const newResponse = new Response(await cachedResponse.json(), {
+                headers: {
+                    'Content-Type': 'application/json',
+                    'X-CACHE': 'HIT', // we know request hit the cache
+                    'Cache-Control': `public, max-age=${cachedResponse.headers.get('X-Cache-Ttl')}`,
+                },
+            });
             console.log('Request served from cache');
             // Return the new cached response
             return newResponse;
@@ -133,7 +130,15 @@ async function graphqlHandler(request, env, ctx) {
                 throw new Error(`${originResponse.status} ${await originResponse.text()}`);
             }
             console.log('Request served from origin server');
-            return new Response(originResponse.body, responseOptions);
+            const newResponse = new Response(originResponse.body, {
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (originResponse.headers.has('X-Cache-Ttl')) {
+                newResponse.headers.set('Cache-Control', `public, max-age=${originResponse.headers.get('X-Cache-Ttl')}`);
+            }
+            return newResponse;
         } catch (error) {
             console.error(`Error getting response from origin server: ${error}`);
         }
@@ -181,7 +186,14 @@ async function graphqlHandler(request, env, ctx) {
 
     const body = JSON.stringify(result);
 
-    const response = new Response(body, responseOptions);
+    const response = new Response(body, {
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    });
+    if (ttl > 0) {
+        response.headers.set('Cache-Control', `public, max-age=${ttl}`);
+    }
 
     if (env.SKIP_CACHE !== 'true' && ttl > 0) {
         key = key ?? await cacheMachine.createKey(env, query, variables, specialCache);
diff --git a/plugins/plugin-graphql-origin.mjs b/plugins/plugin-graphql-origin.mjs
@@ -24,8 +24,11 @@ export default function useGraphQLOrigin(env) {
                     throw new Error(`${queryResult.status} ${queryResult.statusText}: ${await queryResult.text()}`);
                 }
                 console.log('Request served from origin server');
-                setResult(await queryResult.json());
                 request.cached = true;
+                if (queryResult.headers.has('X-Cache-Ttl')) {
+                    request.resultTtl = queryResult.headers.get('X-Cache-Ttl');
+                }
+                setResult(await queryResult.json());
             } catch (error) {
                 console.error(`Error getting response from origin server: ${error}`);
             }
diff --git a/plugins/plugin-lite-api.mjs b/plugins/plugin-lite-api.mjs
@@ -55,9 +55,10 @@ export async function getLiteApiResponse(request, url, env, serverContext) {
             request.cached = true;
             // Construct a new response with the cached data
 
-            return new Response(cachedResponse, {
+            return new Response(await cachedResponse.json(), {
                 headers: {
                     'X-CACHE': 'HIT',
+                    'Cache-Control': `public, max-age=${cachedResponse.headers.get('X-Cache-Ttl')}`,
                 }
             });
         } else {
@@ -187,6 +188,10 @@ export async function getLiteApiResponse(request, url, env, serverContext) {
         });
     }
     const responseBody = JSON.stringify(items ?? [], null, 4);
+
+    if (ttl > 0) {
+        responseOptions.headers['Cache-Control'] = `public, max-age=${ttl}`;
+    }
     
     // Update the cache with the results of the query
     if (env.SKIP_CACHE !== 'true' && ttl > 0) {
diff --git a/plugins/plugin-nightbot.mjs b/plugins/plugin-nightbot.mjs
@@ -44,9 +44,10 @@ export async function getNightbotResponse(request, url, env, serverContext) {
         if (cachedResponse) {
             console.log(`Request served from cache: ${new Date() - requestStart} ms`);
             request.cached = true;
-            return new Response(cachedResponse, {
+            return new Response(await cachedResponse.json(), {
                 headers: {
                     'X-CACHE': 'HIT',
+                    'Cache-Control': `public, max-age=${cachedResponse.headers.get('X-Cache-Ttl')}`,
                 }
             });
         } else {
@@ -99,6 +100,11 @@ export async function getNightbotResponse(request, url, env, serverContext) {
     } finally {
         data.clearRequestData(context.requestId);
     }
+
+    const headers = {};
+    if (ttl > 0) {
+        headers['Cache-Control'] = `public, max-age=${ttl}`;
+    }
     
     // Update the cache with the results of the query
     if (env.SKIP_CACHE !== 'true' && ttl > 0) {
@@ -110,7 +116,9 @@ export async function getNightbotResponse(request, url, env, serverContext) {
             serverContext.waitUntil(putCachePromise);
         }
     }
-    return new Response(responseBody)
+    return new Response(responseBody, {
+        headers,
+    });
 }
 
 export default function useNightbot(env) {
diff --git a/plugins/plugin-use-cache-machine.mjs b/plugins/plugin-use-cache-machine.mjs
@@ -26,7 +26,8 @@ export default function useCacheMachine(env) {
             if (cachedResponse) {
                 console.log('Request served from cache');
                 request.cached = true;
-                setResult(JSON.parse(cachedResponse));
+                request.resultTtl = cachedResponse.headers.get('X-Cache-Ttl');
+                setResult(JSON.parse(await cachedResponse.json()));
             } 
         },
         onValidate({ context, extendContext, params, validateFn, addValidationRule, setValidationFn, setResult }) {
@@ -98,6 +99,7 @@ export default function useCacheMachine(env) {
                 ttl = 1800;
             }
             if (env.SKIP_CACHE !== 'true' && ttl > 0 && env.USE_ORIGIN !== 'true') {
+                request.resultTtl = String(ttl);
                 // using waitUntil doesn't hold up returning a response but keeps the worker alive as long as needed
                 const cacheBody = JSON.stringify(result);
                 if (cacheBody.length > 0) {
@@ -120,6 +122,10 @@ export default function useCacheMachine(env) {
             if (request.data && request.requestId) {
                 request.data.clearRequestData(request.requestId);
             }
+            if (request.resultTtl) {
+                response.headers.set('X-Cache-Ttl', request.resultTtl);
+                response.headers.set('Cache-Control', `public, max-age=${request.resultTtl}`);
+            }
             setCors(response);
         },
     }
diff --git a/utils/cache-machine.mjs b/utils/cache-machine.mjs
@@ -81,7 +81,7 @@ const cacheMachine = {
             });
             cacheFailCount = 0;
             if (response.status === 200) {
-                return await response.json();
+                return response;
             } else if (response.status !== 404) {
                 console.error(`failed to read from cache: ${response.status}`);
             }
@@ -132,7 +132,7 @@ const cacheMachine = {
                     'content-type': 'application/json;charset=UTF-8',
                     'Authorization': `Basic ${env.CACHE_BASIC_AUTH}`
                 },
-                timeout: 10000,
+                timeout: 20000,
             });
             console.log('Response cached');
             response.body.cancel();

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,11 @@ export default function useGraphQLOrigin(env) {`
`24`	`24`	throw new Error(`${queryResult.status} ${queryResult.statusText}: ${await queryResult.text()}`);
`25`	`25`	`}`
`26`	`26`	`console.log('Request served from origin server');`
`27`		`- setResult(await queryResult.json());`
`28`	`27`	`request.cached = true;`
	`28`	`+ if (queryResult.headers.has('X-Cache-Ttl')) {`
	`29`	`+ request.resultTtl = queryResult.headers.get('X-Cache-Ttl');`
	`30`	`+ }`
	`31`	`+ setResult(await queryResult.json());`
`29`	`32`	`} catch (error) {`
`30`	`33`	console.error(`Error getting response from origin server: ${error}`);
`31`	`34`	`}`