Improve handling of origin requests

Author: Razzmatazzz

index.mjs

@@ -66,7 +66,7 @@ async function graphqlHandler(request, env, ctx) {
     // default headers
     const responseOptions = {
         headers: {
-            'content-type': 'application/json;charset=UTF-8',
+            'Content-Type': 'application/json',
         }
     };
 
@@ -116,7 +116,11 @@ async function graphqlHandler(request, env, ctx) {
             if (env.ORIGIN_OVERRIDE) {
                 originUrl.host = env.ORIGIN_OVERRIDE;
             }
-            const queryResult = await fetchWithTimeout(originUrl, {
+            if (env.ORIGIN_PROTOCOL) {
+                originUrl.protocol = env.ORIGIN_PROTOCOL;
+            } 
+            console.log(`Querying origin server ${originUrl}`);
+            const originResponse = await fetchWithTimeout(originUrl, {
                 method: 'POST',
                 body: JSON.stringify({
                     query,
@@ -128,11 +132,11 @@ async function graphqlHandler(request, env, ctx) {
                 },
                 timeout: 20000
             });
-            if (queryResult.status !== 200) {
-                throw new Error(`${queryResult.status} ${await queryResult.text()}`);
+            if (originResponse.status !== 200) {
+                throw new Error(`${originResponse.status} ${await originResponse.text()}`);
             }
             console.log('Request served from origin server');
-            return new Response(await queryResult.text(), responseOptions);
+            return new Response(originResponse.body, responseOptions);
         } catch (error) {
             console.error(`Error getting response from origin server: ${error}`);
         }

package-lock.json

@@ -20,7 +20,7 @@
     "devDependencies": {
         "newman": "^6.2.1",
         "prettier": "^3.5.3",
-        "wrangler": "^4.18.0"
+        "wrangler": "^4.19.2"
     },
     "dependencies": {
         "@graphql-tools/merge": "9.0.24",

package.json

@@ -51,14 +51,15 @@ export async function getLiteApiResponse(request, url, env, serverContext) {
         key = await cacheMachine.createKey(env, url.pathname, { q, lang, gameMode, uid, tags, sort, sort_direction });
         const cachedResponse = await cacheMachine.get(env, {key});
         if (cachedResponse) {
-            // Construct a new response with the cached data
-            const newResponse = new Response(cachedResponse);
-            // Add a custom 'X-CACHE: HIT' header so we know the request hit the cache
-            newResponse.headers.append('X-CACHE', 'HIT');
             console.log(`Request served from cache: ${new Date() - requestStart} ms`);
-            // Return the new cached response
             request.cached = true;
-            return newResponse;
+            // Construct a new response with the cached data
+
+            return new Response(cachedResponse, {
+                headers: {
+                    'X-CACHE': 'HIT',
+                }
+            });
         } else {
             console.log('no cached response');
         }

plugins/plugin-lite-api.mjs

@@ -42,14 +42,13 @@ export async function getNightbotResponse(request, url, env, serverContext) {
         key = await cacheMachine.createKey(env, 'nightbot', { q: query, l: lang, m: gameMode });
         const cachedResponse = await cacheMachine.get(env, {key});
         if (cachedResponse) {
-            // Construct a new response with the cached data
-            const newResponse = new Response(cachedResponse);
-            // Add a custom 'X-CACHE: HIT' header so we know the request hit the cache
-            newResponse.headers.append('X-CACHE', 'HIT');
             console.log(`Request served from cache: ${new Date() - requestStart} ms`);
-            // Return the new cached response
             request.cached = true;
-            return newResponse;
+            return new Response(cachedResponse, {
+                headers: {
+                    'X-CACHE': 'HIT',
+                }
+            });
         } else {
             console.log('no cached response');
         }