#1228 Configurable upload timeout

backend/config/__init__.py

@@ -95,5 +95,8 @@ def str_to_bool(value: str) -> bool:
 DISABLE_EMULATOR_JS = str_to_bool(os.environ.get("DISABLE_EMULATOR_JS", "false"))
 DISABLE_RUFFLE_RS = str_to_bool(os.environ.get("DISABLE_RUFFLE_RS", "false"))
 
+# FRONTEND
+UPLOAD_TIMEOUT = int(os.environ.get("UPLOAD_TIMEOUT", 600))
+
 # TESTING
 IS_PYTEST_RUN: Final = bool(os.environ.get("PYTEST_VERSION", False))

backend/endpoints/heartbeat.py

@@ -7,6 +7,7 @@
     RESCAN_ON_FILESYSTEM_CHANGE_DELAY,
     SCHEDULED_RESCAN_CRON,
     SCHEDULED_UPDATE_SWITCH_TITLEDB_CRON,
+    UPLOAD_TIMEOUT,
 )
 from endpoints.responses.heartbeat import HeartbeatResponse
 from handler.database import db_user_handler
@@ -61,4 +62,5 @@ def heartbeat() -> HeartbeatResponse:
             "DISABLE_EMULATOR_JS": DISABLE_EMULATOR_JS,
             "DISABLE_RUFFLE_RS": DISABLE_RUFFLE_RS,
         },
+        "FRONTEND": {"UPLOAD_TIMEOUT": UPLOAD_TIMEOUT},
     }

backend/endpoints/responses/heartbeat.py

@@ -27,6 +27,10 @@ class EmulationDict(TypedDict):
     DISABLE_RUFFLE_RS: bool
 
 
+class FrontendDict(TypedDict):
+    UPLOAD_TIMEOUT: int
+
+
 class HeartbeatResponse(TypedDict):
     VERSION: str
     SHOW_SETUP_WIZARD: bool
@@ -36,3 +40,4 @@ class HeartbeatResponse(TypedDict):
     METADATA_SOURCES: MetadataSourcesDict
     FS_PLATFORMS: list
     EMULATION: EmulationDict
+    FRONTEND: FrontendDict

backend/endpoints/tests/test_heartbeat.py

@@ -27,3 +27,4 @@ def test_heartbeat(client):
         heartbeat.get("SCHEDULER").get("SWITCH_TITLEDB").get("TITLE")
         == "Scheduled Switch TitleDB update"
     )
+    assert heartbeat.get("FRONTEND").get("UPLOAD_TIMEOUT") == 20

frontend/src/services/api/rom.ts

@@ -9,7 +9,9 @@ import storeUpload from "@/stores/upload";
 import type { DetailedRom, SimpleRom } from "@/stores/roms";
 import { getDownloadLink } from "@/utils";
 import type { AxiosProgressEvent } from "axios";
+import storeHeartbeat from "@/stores/heartbeat";
 
+const heartbeat = storeHeartbeat();
 export const romApi = api;
 
 async function uploadRoms({
@@ -27,7 +29,6 @@ async function uploadRoms({
     formData.append(file.name, file);
 
     uploadStore.start(file.name);
-
     return new Promise((resolve, reject) => {
       api
         .post("/roms", formData, {
@@ -36,7 +37,7 @@ async function uploadRoms({
             "X-Upload-Platform": platformId.toString(),
             "X-Upload-Filename": file.name,
           },
-          timeout: 600000,
+          timeout: heartbeat.value.FRONTEND.UPLOAD_TIMEOUT * 1000,
           params: {},
           onUploadProgress: (progressEvent: AxiosProgressEvent) => {
             uploadStore.update(file.name, progressEvent);

frontend/vite.config.js

@@ -11,7 +11,11 @@ import { defineConfig, loadEnv } from "vite";
 // https://vitejs.dev/config/
 export default defineConfig(({ mode }) => {
   // Load ENV variables from the parent directory and the current directory.
-  const env = { ...loadEnv(mode, "../"), ...loadEnv(mode, "./") };
+  const envPrefixes = ["VITE", "DEV"];
+  const env = {
+    ...loadEnv(mode, "../", envPrefixes),
+    ...loadEnv(mode, "./", envPrefixes),
+  };
   const backendPort = env.DEV_PORT ?? "5000";
 
   return {

pytest.ini

@@ -14,3 +14,4 @@ env =
    RESCAN_ON_FILESYSTEM_CHANGE_DELAY=5
    SCHEDULED_RESCAN_CRON=0 3 * * *
    SCHEDULED_UPDATE_SWITCH_TITLEDB_CRON=0 4 * * *
+   UPLOAD_TIMEOUT=20