Merge pull request #327 from the-hideout/no-cache-errors

Don't cache error responses
the-hideout · Sep 2, 2024 · cf91430 · cf91430
2 parents 8b6a1cb + 90bbdad
commit cf91430
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/index.mjs b/index.mjs
@@ -159,7 +159,11 @@ async function graphqlHandler(request, env, ctx) {
         result.warnings.push(...context.warnings);
     }
 
-    if (specialCache === 'application/json') {
+    if (result.errors?.some(err => err.message === 'Unexpected error.')) {
+        ttl = 0;
+    } else if (result.errors?.some(err => err.message.startsWith('Syntax Error'))) {
+        ttl = 1800;
+    } else if (specialCache === 'application/json') {
         if (!result.warnings) {
             result = Object.assign({warnings: []}, result);
         }

diff --git a/plugins/plugin-use-cache-machine.mjs b/plugins/plugin-use-cache-machine.mjs
@@ -83,7 +83,11 @@ export default function useCacheMachine(env) {
             let ttl = request.data?.getRequestTtl(request.requestId) ?? 60 * 5;
 
             const sCache = specialCache(request);
-            if (sCache === 'application/json') {
+            if (result.errors?.some(err => err.message === 'Unexpected error.')) {
+                ttl = 0;
+            } else if (result.errors?.some(err => err.message.startsWith('Syntax Error'))) {
+                ttl = 1800;
+            } else if (sCache === 'application/json') {
                 if (!result.warnings) {
                     result = Object.assign({warnings: []}, result);
                 }

diff --git a/utils/graphql-util.mjs b/utils/graphql-util.mjs
@@ -56,7 +56,7 @@ const graphqlUtil =  {
             for (const arg of selection.arguments) {
                 if (arg.name.value === argumentName) {
                     if (arg.value.kind === 'Variable') {
-                        argValue = info.variableValues[argumentName];
+                        argValue = info.variableValues[arg.value.name.value];
                     } else {
                         argValue = arg.value.value;
                     }