fix: signal not working without node-fetch

Signed-off-by: Avior <[email protected]>
tcgdex · May 7, 2024 · f70ea19 · f70ea19
1 parent d939144
commit f70ea19
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/server/bun.lockb b/server/bun.lockb
diff --git a/server/compiler/utils/util.ts b/server/compiler/utils/util.ts
@@ -1,6 +1,5 @@
-import { Card, Set } from '../../../interfaces'
 import { glob } from 'glob'
-import fetch from 'node-fetch'
+import { Card, Set } from '../../../interfaces'
 import * as legals from '../../../meta/legals'
 
 interface fileCacheInterface {
@@ -18,9 +17,16 @@ const fileCache: fileCacheInterface = {}
  */
 export async function fetchRemoteFile<T = any>(url: string): Promise<T> {
 	if (!fileCache[url]) {
+		const signal = new AbortController()
+
+		const finished = setTimeout(() => {
+			signal.abort()
+		}, 60 * 1000);
+
 		const resp = await fetch(url, {
-			timeout: 60 * 1000
+			signal: signal.signal
 		})
+		clearTimeout(finished)
 		fileCache[url] = resp.json()
 	}
 	return fileCache[url]

diff --git a/server/package.json b/server/package.json
@@ -25,7 +25,6 @@
     "@types/express": "^4",
     "@types/node": "^20",
     "glob": "^10",
-    "node-fetch": "^3",
     "ts-node": "^10",
     "ts-node-dev": "^2",
     "typescript": "^5"