From 587de532317284428b9a004edd9723d3620090ae Mon Sep 17 00:00:00 2001
From: dangered wolf <d@ngeredwolf.me>
Date: Sun, 12 Nov 2023 03:58:41 -0500
Subject: [PATCH] Improve request retry experience in API

---
 src/helpers/utils.ts | 12 ++++++++----
 src/worker.ts        |  3 +--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts
index 91e626b..98b2a8b 100644
--- a/src/helpers/utils.ts
+++ b/src/helpers/utils.ts
@@ -34,26 +34,30 @@ export const truncateWithEllipsis = (str: string, maxLength: number): string =>
 
 export async function withTimeout<T>(
   asyncTask: (signal: AbortSignal) => Promise<T>,
-  timeout: number = 3000
+  timeout: number = 3500,
+  retries: number = 3
 ): Promise<T> {
   const controller = new AbortController();
   const timeoutId = setTimeout(() => controller.abort(), timeout);
 
   try {
     const result = await asyncTask(controller.signal);
-    /* Clear the timeout if the task completes in time */
     clearTimeout(timeoutId);
     return result;
   } catch (error) {
     if ((error as Error).name === 'AbortError') {
-      throw new Error('Asynchronous task was aborted due to timeout');
+      if (retries > 0) {
+        // Try again, reducing the retries count
+        return withTimeout(asyncTask, timeout, retries - 1);
+      }
+      throw new Error('Request has timed out too many times');
     } else {
-      /* Re-throw other errors for further handling */
       throw error as Error;
     }
   }
 }
 
+
 const numberFormat = new Intl.NumberFormat('en-US');
 
 export const formatNumber = (num: number) => numberFormat.format(num);
diff --git a/src/worker.ts b/src/worker.ts
index 5f5a74b..1306989 100644
--- a/src/worker.ts
+++ b/src/worker.ts
@@ -8,7 +8,6 @@ import { Constants } from './constants';
 import { api } from './realms/api/router';
 import { twitter } from './realms/twitter/router';
 import { cacheMiddleware } from './caches';
-import { withTimeout } from './helpers/utils';
 
 const noCache = 'max-age=0, no-cache, no-store, must-revalidate';
 
@@ -137,7 +136,7 @@ app.all('/error', async c => {
 export default {
   async fetch(request: Request, env: Env, ctx: ExecutionContext) {
     try {
-      return await withTimeout(async () => app.fetch(request, env, ctx), 10);
+      return await app.fetch(request, env, ctx);
     } catch (err) {
       console.error(err);
       const e = err as Error;