Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-12 00:05:50 +01:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' into feature/MFA

Browse Source
This commit is contained in:
Jin
2025-03-22 12:35:00 +01:00
parent 0916d87e3d 91dca2df35
commit 8df1e3263b
1746 changed files with 94347 additions and 39607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/app.ts
View File

@@ -19,8 +19,8 @@ import openID from "./services/open_id.js";
import * as dotenv from "dotenv";
import { t } from "i18next";
await import('./services/handlers.js');
await import('./becca/becca_loader.js');
await import("./services/handlers.js");
await import("./becca/becca_loader.js");
const app = express();
@@ -33,33 +33,35 @@ dotenv.config();
sql_init.initializeDb();
// view engine setup
app.set('views', path.join(scriptDir, 'views'));
app.set('view engine', 'ejs');
app.set("views", path.join(scriptDir, "views"));
app.set("view engine", "ejs");
app.use((req, res, next) => {
res.locals.t = t;
return next();
});
if (!utils.isElectron()) {
if (!utils.isElectron) {
app.use(compression()); // HTTP compression
}
app.use(helmet({
hidePoweredBy: false, // errors out in electron
contentSecurityPolicy: false,
crossOriginEmbedderPolicy: false
}));
app.use(
helmet({
hidePoweredBy: false, // errors out in electron
contentSecurityPolicy: false,
crossOriginEmbedderPolicy: false
})
);
app.use(express.text({ limit: '500mb' }));
app.use(express.json({ limit: '500mb' }));
app.use(express.raw({ limit: '500mb' }));
app.use(express.text({ limit: "500mb" }));
app.use(express.json({ limit: "500mb" }));
app.use(express.raw({ limit: "500mb" }));
app.use(express.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static(path.join(scriptDir, 'public/root')));
app.use(`/manifest.webmanifest`, express.static(path.join(scriptDir, 'public/manifest.webmanifest')));
app.use(`/robots.txt`, express.static(path.join(scriptDir, 'public/robots.txt')));
app.use(`/icon.png`, express.static(path.join(scriptDir, 'public/icon.png')));
app.use(express.static(path.join(scriptDir, "public/root")));
app.use(`/manifest.webmanifest`, express.static(path.join(scriptDir, "public/manifest.webmanifest")));
app.use(`/robots.txt`, express.static(path.join(scriptDir, "public/robots.txt")));
app.use(`/icon.png`, express.static(path.join(scriptDir, "public/icon.png")));
app.use(sessionParser);
app.use(favicon(`${scriptDir}/../images/app-icons/icon.ico`));
@@ -75,17 +77,17 @@ error_handlers.register(app);
await import("./services/sync.js");
// triggers backup timer
await import('./services/backup.js');
await import("./services/backup.js");
// trigger consistency checks timer
await import('./services/consistency_checks.js');
await import("./services/consistency_checks.js");
await import('./services/scheduler.js');
await import("./services/scheduler.js");
startScheduledCleanup();
if (utils.isElectron()) {
(await import('@electron/remote/main/index.js')).initialize();
if (utils.isElectron) {
(await import("@electron/remote/main/index.js")).initialize();
}
export default app;