feat: add abort signal for both fetch

yeecord · Dec 3, 2024 · c7b4372 · c7b4372
1 parent f73e9be
commit c7b4372
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/src/routes/api.ts b/src/routes/api.ts
@@ -15,10 +15,8 @@ export async function handleApiRequest(request: Request, url: URL) {
   request.headers.set("Host", "discord.com");
 
   if (request.method !== "GET" && request.method !== "HEAD") {
-    return fetch(url.toString(), {
-      method: request.method,
-      headers: request.headers,
-      body: request.body,
+    return fetch(url, {
+      ...request,
       signal: AbortSignal.timeout(10_000),
     });
   }
@@ -47,10 +45,9 @@ export async function handleApiRequest(request: Request, url: URL) {
 }
 
 async function makeRequest(cacheKey: bigint, url: URL, request: Request) {
-  const response = await fetch(url.toString(), {
-    method: request.method,
-    headers: request.headers,
-    body: request.body,
+  const response = await fetch(url, {
+    ...request,
+    signal: AbortSignal.timeout(10_000),
   });
 
   const content =