diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index 43170e0bd..9c35c6aed 100644 --- a/apps/server/src/app.ts +++ b/apps/server/src/app.ts @@ -4,7 +4,6 @@ import favicon from "serve-favicon"; import cookieParser from "cookie-parser"; import helmet from "helmet"; import compression from "compression"; -import sessionParser from "./routes/session_parser.js"; import config from "./services/config.js"; import utils, { getResourceDir } from "./services/utils.js"; import assets from "./routes/assets.js"; @@ -111,6 +110,8 @@ export default async function buildApp() { app.use(`/manifest.webmanifest`, express.static(path.join(publicAssetsDir, "manifest.webmanifest"))); app.use(`/robots.txt`, express.static(path.join(publicAssetsDir, "robots.txt"))); app.use(`/icon.png`, express.static(path.join(publicAssetsDir, "icon.png"))); + + const sessionParser = (await import("./routes/session_parser.js")).default; app.use(sessionParser); app.use(favicon(path.join(assetsDir, "icon.ico"))); diff --git a/apps/server/src/www.ts b/apps/server/src/www.ts index 3261a80e3..4d2e0b412 100644 --- a/apps/server/src/www.ts +++ b/apps/server/src/www.ts @@ -1,6 +1,4 @@ #!/usr/bin/env node - -import sessionParser from "./routes/session_parser.js"; import fs from "fs"; import http from "http"; import https from "https"; @@ -79,6 +77,7 @@ async function startTrilium() { const httpServer = startHttpServer(app); + const sessionParser = (await import("./routes/session_parser.js")).default; ws.init(httpServer, sessionParser as any); // TODO: Not sure why session parser is incompatible. if (utils.isElectron) {