don't waituntil in http server

the-hideout · Aug 11, 2024 · 7e5299f · 7e5299f
1 parent 1fbb178
commit 7e5299f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/index.mjs b/index.mjs
@@ -1,5 +1,5 @@
 
-/*import getYoga from './graphql-yoga.mjs';
+import getYoga from './graphql-yoga.mjs';
 import graphQLOptions from './utils/graphql-options.mjs';
 
 export default {
@@ -12,8 +12,8 @@ export default {
             return new Response(graphQLOptions.debug ? err : 'Something went wrong', { status: 500 });
         }
 	},
-};*/
-import { graphql } from 'graphql';
+};
+/*import { graphql } from 'graphql';
 import { v4 as uuidv4 } from 'uuid';
 
 import DataSource from './datasources/index.mjs';
@@ -242,4 +242,4 @@ export default {
             return new Response(graphQLOptions.debug ? err : 'Something went wrong', { status: 500 });
         }
 	},
-};
+};*/
diff --git a/plugins/plugin-nightbot.mjs b/plugins/plugin-nightbot.mjs
@@ -13,6 +13,7 @@ const usePaths = [
 ];
 
 export async function getNightbotResponse(request, url, env, serverContext) {
+    console.log('serverContext', Object.keys(serverContext));
     if (request.method.toUpperCase() !== 'GET') {
         return new Response(null, {
             status: 405,
@@ -75,9 +76,9 @@ export async function getNightbotResponse(request, url, env, serverContext) {
         // using waitUntil doens't hold up returning a response but keeps the worker alive as long as needed
         if (request.ctx?.waitUntil) {
             request.ctx.waitUntil(putCachePromise);
-        } else if (serverContext.waitUntil) {
+        } /*else if (serverContext.waitUntil) {
             serverContext.waitUntil(putCachePromise);
-        }
+        }*/
     }
     return new Response(responseBody)
 }

diff --git a/plugins/plugin-use-cache-machine.mjs b/plugins/plugin-use-cache-machine.mjs
@@ -77,7 +77,10 @@ export default function useCacheMachine(env) {
                 // 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) {
-                    request.ctx.waitUntil(cacheMachine.put(env, request.params.query, request.params.variables, cacheBody, String(ttl), sCache));
+                    const cachePut = cacheMachine.put(env, request.params.query, request.params.variables, cacheBody, String(ttl), sCache);
+                    if (typeof process === 'undefined') {
+                        request.ctx.waitUntil(cachePut);
+                    }
                 } else {
                     console.warn('Skipping cache for zero-length response');
                     console.log(`Request method: ${request.method}`);