Merge branch 'main' of https://github.com/the-hideout/tarkov-api into improve-origin-handling

Author: Razzmatazzz

.github/workflows/branch-deploy.yml

@@ -56,7 +56,7 @@ jobs:
           environment: "development"
 
       # Post comment on PR with development deploy info
-      - uses: GrantBirki/[email protected].0
+      - uses: GrantBirki/[email protected].1
         if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
           steps.branch-deploy.outputs.noop != 'true' &&
           steps.branch-deploy.outputs.environment == 'development' }}
@@ -82,7 +82,7 @@ jobs:
           apiToken: ${{ secrets.CF_API_TOKEN }}
 
       # Post comment on PR with production deploy info
-      - uses: GrantBirki/[email protected].0
+      - uses: GrantBirki/[email protected].1
         if: ${{ steps.branch-deploy.outputs.continue == 'true' &&
           steps.branch-deploy.outputs.noop != 'true' &&
           steps.branch-deploy.outputs.environment == 'production' }}

.github/workflows/new-pr.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: comment
-        uses: GrantBirki/[email protected].0
+        uses: GrantBirki/[email protected].1
         continue-on-error: true
         with:
           file: .github/new-pr-comment.md

index.mjs

@@ -29,6 +29,7 @@ import fetchWithTimeout from './utils/fetch-with-timeout.mjs';
 import { getNightbotResponse, useNightbotOnUrl } from './plugins/plugin-nightbot.mjs';
 import { getTwitchResponse } from './plugins/plugin-twitch.mjs';
 import { getLiteApiResponse, useLiteApiOnUrl } from './plugins/plugin-lite-api.mjs';
+import { getSpecialCache } from './plugins/plugin-use-cache-machine.mjs';
 
 let dataAPI;
 
@@ -84,11 +85,7 @@ async function graphqlHandler(request, env, ctx) {
         //return new Response(JSON.stringify({}), responseOptions);
     }
 
-    let specialCache = '';
-    const contentType = request.headers.get('content-type');
-    if (!contentType || !contentType.startsWith('application/json')) {
-        specialCache = 'application/json';
-    }
+    const specialCache = getSpecialCache(request);
 
     let key;
     // Check the cache service for data first - If cached data exists, return it

plugins/plugin-use-cache-machine.mjs

@@ -1,10 +1,10 @@
 import cacheMachine from '../utils/cache-machine.mjs';
 import setCors from '../utils/setCors.mjs';
 
-function specialCache(request) {
+export function getSpecialCache(request) {
     const contentType = request.headers.get('content-type');
-    if (!contentType || !contentType.startsWith('application/json')) {
-        return 'application/json';
+    if (request.method === 'POST' && !contentType?.startsWith('application/json')) {
+        //return 'application/json'; // don't enforce content type
     }
     return undefined;
 }
@@ -22,7 +22,7 @@ export default function useCacheMachine(env) {
                 console.log(`Skipping cache check already performed by worker`);
                 return;
             }
-            const cachedResponse = await cacheMachine.get(env, {query: params.query, variables: params.variables, specialCache: specialCache(request)});
+            const cachedResponse = await cacheMachine.get(env, {query: params.query, variables: params.variables, specialCache: getSpecialCache(request)});
             if (cachedResponse) {
                 console.log('Request served from cache');
                 request.cached = true;
@@ -82,7 +82,7 @@ export default function useCacheMachine(env) {
 
             let ttl = request.data?.getRequestTtl(request.requestId) ?? 60 * 5;
 
-            const sCache = specialCache(request);
+            const sCache = getSpecialCache(request);
             if (result.errors?.some(err => err.message === 'Unexpected error.')) {
                 ttl = 0;
             } else if (result.errors?.some(err => err.message.startsWith('Syntax Error'))) {