From 3852753a89b90263ab28c30e684ca1c6facd4b21 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Thu, 18 Jul 2024 23:36:26 +0300
Subject: [PATCH] server-esm: Avoid passing async to express

---
 src/routes/setup.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/routes/setup.ts b/src/routes/setup.ts
index b38f95a30..f9fab6b34 100644
--- a/src/routes/setup.ts
+++ b/src/routes/setup.ts
@@ -7,15 +7,11 @@ import assetPath from "../services/asset_path.js";
 import appPath from "../services/app_path.js";
 import { Request, Response } from 'express';
 
-async function setupPage(req: Request, res: Response) {
+function setupPage(req: Request, res: Response) {
     if (sqlInit.isDbInitialized()) {
         if (utils.isElectron()) {
-            const windowService = (await import("../services/window")).default;
-            const { app } = await import("electron");
-            windowService.createMainWindow(app);
-            windowService.closeSetupWindow();
-        }
-        else {
+            handleElectronRedirect();  
+        } else {
             res.redirect('.');
         }
 
@@ -38,6 +34,13 @@ async function setupPage(req: Request, res: Response) {
     });
 }
 
+async function handleElectronRedirect() {
+    const windowService = (await import("../services/window")).default;
+    const { app } = await import("electron");
+    windowService.createMainWindow(app);
+    windowService.closeSetupWindow();
+}
+
 export default {
     setupPage
 };