gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server-esm: Avoid passing async to express

Browse Source
This commit is contained in:
Elian Doran 2024-07-18 23:36:26 +03:00
parent fe385bf2e4
commit 3852753a89
No known key found for this signature in database
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/routes/setup.ts
View File

@ -7,15 +7,11 @@ import assetPath from "../services/asset_path.js";
import appPath from "../services/app_path.js"; import appPath from "../services/app_path.js";
import { Request, Response } from 'express'; import { Request, Response } from 'express';
async function setupPage(req: Request, res: Response) { function setupPage(req: Request, res: Response) {
if (sqlInit.isDbInitialized()) { if (sqlInit.isDbInitialized()) {
if (utils.isElectron()) { if (utils.isElectron()) {
const windowService = (await import("../services/window")).default; handleElectronRedirect();
const { app } = await import("electron"); } else {
windowService.createMainWindow(app);
windowService.closeSetupWindow();
}
else {
res.redirect('.'); 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 { export default {
setupPage setupPage
}; };