Merge pull request #392 from the-hideout/normal-fetch-timeout

Use normal fetch timeout signal

Author: Razzmatazzz

http/cloudflare-kv.mjs

@@ -1,7 +1,5 @@
 import { EventEmitter } from 'node:events';
 
-import fetchWithTimeout from '../utils/fetch-with-timeout.mjs';
-
 const completeEmitter = new EventEmitter();
 
 const accountId = '424ad63426a1ae47d559873f929eb9fc';
@@ -28,13 +26,13 @@ const checkQueue = async () => {
     const url = `https://api.cloudflare.com/client/v4/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${kvName}`;
     let response;
     try {
-        response = await fetchWithTimeout(url, {
+        response = await fetch(url, {
             method: 'GET',
             headers: {
                 'Content-Type': 'application/json',
                 Authorization: `Bearer ${process.env.CLOUDFLARE_TOKEN}`,
             },
-            timeout: 9000,
+            signal: AbortSignal.timeout(9000),
         });
         completeEmitter.emit(kvName, response);
     } catch (error) {

index.mjs

@@ -24,7 +24,6 @@ import schema from './schema.mjs';
 import graphqlUtil from './utils/graphql-util.mjs';
 import graphQLOptions from './utils/graphql-options.mjs';
 import cacheMachine from './utils/cache-machine.mjs';
-import fetchWithTimeout from './utils/fetch-with-timeout.mjs';
 
 import { getNightbotResponse, useNightbotOnUrl } from './plugins/plugin-nightbot.mjs';
 import { getTwitchResponse } from './plugins/plugin-twitch.mjs';
@@ -114,7 +113,7 @@ async function graphqlHandler(request, env, ctx) {
                 originUrl.protocol = env.ORIGIN_PROTOCOL;
             } 
             console.log(`Querying origin server ${originUrl}`);
-            const originResponse = await fetchWithTimeout(originUrl, {
+            const originResponse = await fetch(originUrl, {
                 method: 'POST',
                 body: JSON.stringify({
                     query,
@@ -124,7 +123,7 @@ async function graphqlHandler(request, env, ctx) {
                     'Content-Type': 'application/json',
                     'cache-check-complete': 'true',
                 },
-                timeout: 20000
+                signal: AbortSignal.timeout(20000),
             });
             if (originResponse.status !== 200) {
                 throw new Error(`${originResponse.status} ${await originResponse.text()}`);

plugins/plugin-graphql-origin.mjs

@@ -1,5 +1,4 @@
 // Pass the request to an origin server if USE_ORIGIN is set to 'true'
-import fetchWithTimeout from '../utils/fetch-with-timeout.mjs';
 
 export default function useGraphQLOrigin(env) {
     return {
@@ -12,13 +11,13 @@ export default function useGraphQLOrigin(env) {
                 if (env.ORIGIN_OVERRIDE) {
                     originUrl.host = env.ORIGIN_OVERRIDE;
                 }
-                const queryResult = await fetchWithTimeout(originUrl, {
+                const queryResult = await fetch(originUrl, {
                     method: request.method,
                     body: JSON.stringify(params),
                     headers: {
                         'Content-Type': 'application/json',
                     },
-                    timeout: 20000
+                    signal: AbortSignal.timeout(20000),
                 });
                 if (queryResult.status !== 200) {
                     throw new Error(`${queryResult.status} ${queryResult.statusText}: ${await queryResult.text()}`);

plugins/plugin-lite-api.mjs

@@ -1,7 +1,6 @@
 import DataSource from '../datasources/index.mjs';
 import graphqlUtil from '../utils/graphql-util.mjs';
 import cacheMachine from '../utils/cache-machine.mjs';
-import fetchWithTimeout from '../utils/fetch-with-timeout.mjs';
 
 export const liteApiPathRegex = /\/api\/v1(?<gameMode>\/\w+)?\/(?<endpoint>item[\w\/]*)/;
 
@@ -74,7 +73,7 @@ export async function getLiteApiResponse(request, url, env, serverContext) {
             if (env.ORIGIN_OVERRIDE) {
                 originUrl.host = env.ORIGIN_OVERRIDE;
             }
-            const response = await fetchWithTimeout(originUrl, {
+            const response = await fetch(originUrl, {
                 method: 'POST',
                 body: JSON.stringify({
                     q,
@@ -87,7 +86,7 @@ export async function getLiteApiResponse(request, url, env, serverContext) {
                 headers: {
                     'cache-check-complete': 'true',
                 },
-                timeout: 20000
+                signal: AbortSignal.timeout(20000),
             });
             if (response.status !== 200) {
                 throw new Error(`${response.status} ${await response.text()}`);

plugins/plugin-nightbot.mjs

@@ -1,7 +1,6 @@
 import DataSource from '../datasources/index.mjs';
 import cacheMachine from '../utils/cache-machine.mjs';
 import graphqlUtil from '../utils/graphql-util.mjs';
-import fetchWithTimeout from '../utils/fetch-with-timeout.mjs';
 
 function capitalize(s) {
     return s && s[0].toUpperCase() + s.slice(1);
@@ -63,12 +62,12 @@ export async function getNightbotResponse(request, url, env, serverContext) {
             if (env.ORIGIN_OVERRIDE) {
                 originUrl.host = env.ORIGIN_OVERRIDE;
             }
-            const response = await fetchWithTimeout(originUrl, {
+            const response = await fetch(originUrl, {
                 method: 'GET',
                 headers: {
                     'cache-check-complete': 'true',
                 },
-                timeout: 20000
+                signal: AbortSignal.timeout(20000),
             });
             if (response.status !== 200) {
                 throw new Error(`${response.status} ${await response.text()}`);

utils/cache-machine.mjs

@@ -1,5 +1,3 @@
-import fetchWithTimeout from './fetch-with-timeout.mjs';
-
 // cache url
 const cacheUrl = 'https://cache.tarkov.dev'
 
@@ -74,10 +72,11 @@ const cacheMachine = {
                 return false;
             }
 
-            const response = await fetchWithTimeout(`${cacheUrl}/api/cache?key=${key}`, { 
+            const response = await fetch(`${cacheUrl}/api/cache?key=${key}`, { 
                 headers: {
                     'Authorization': `Basic ${env.CACHE_BASIC_AUTH}`
-                }, 
+                },
+                signal: AbortSignal.timeout(5000),
             });
             cacheFailCount = 0;
             if (response.status === 200) {
@@ -125,14 +124,14 @@ const cacheMachine = {
             console.log(`Caching ${body.length} byte response for ${env.ENVIRONMENT} environment${ttl ? ` for ${ttl} seconds` : ''}`);
 
             // Update the cache
-            const response = await fetchWithTimeout(`${cacheUrl}/api/cache`, {
+            const response = await fetch(`${cacheUrl}/api/cache`, {
                 body: JSON.stringify({ key, value: body, ttl }),
                 method: 'POST',
                 headers: {
                     'content-type': 'application/json;charset=UTF-8',
                     'Authorization': `Basic ${env.CACHE_BASIC_AUTH}`
                 },
-                timeout: 20000,
+                signal: AbortSignal.timeout(20000),
             });
             console.log('Response cached');
             response.body.cancel();