Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 10:26:08 +01:00
Code Issues Packages Projects Releases Activity

server-ts: Convert routes/error_handlers

Browse Source
This commit is contained in:
Elian Doran
2024-04-07 14:13:57 +03:00
parent 202fda3c30
commit c2eefad287
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app.js
View File

@@ -40,7 +40,7 @@ app.use(favicon(`${__dirname}/../images/app-icons/win/icon.ico`));
require('./routes/assets').register(app);
require('./routes/routes.js').register(app);
require('./routes/custom').register(app);
require('./routes/error_handlers.js').register(app);
require('./routes/error_handlers').register(app);
// triggers sync timer
require('./services/sync');

13
src/routes/error_handlers.js → src/routes/error_handlers.ts
View File

@@ -1,7 +1,8 @@
const log = require('../services/log');
import { Application, NextFunction, Request, Response } from 'express';
import log = require('../services/log');
function register(app) {
app.use((err, req, res, next) => {
function register(app: Application) {
app.use((err: any, req: Request, res: Response, next: NextFunction) => {
if (err.code !== 'EBADCSRFTOKEN') {
return next(err);
}
@@ -16,12 +17,12 @@ function register(app) {
// catch 404 and forward to error handler
app.use((req, res, next) => {
const err = new Error(`Router not found for request ${req.method} ${req.url}`);
err.status = 404;
(err as any).status = 404;
next(err);
});
// error handler
app.use((err, req, res, next) => {
app.use((err: any, req: Request, res: Response, next: NextFunction) => {
if (err && err.message && (
(err.message.includes("Router not found for request") && err.message.includes(".js.map"))
|| (err.message.includes("Router not found for request") && err.message.includes(".css.map"))
@@ -38,6 +39,6 @@ function register(app) {
});
}
module.exports = {
export = {
register
};