From c2eefad28766c1a194e5b897db05a593d598bab5 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sun, 7 Apr 2024 14:13:57 +0300 Subject: [PATCH] server-ts: Convert routes/error_handlers --- src/app.js | 2 +- src/routes/{error_handlers.js => error_handlers.ts} | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) rename src/routes/{error_handlers.js => error_handlers.ts} (73%) diff --git a/src/app.js b/src/app.js index ba4d2da87..8c812dafe 100644 --- a/src/app.js +++ b/src/app.js @@ -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'); diff --git a/src/routes/error_handlers.js b/src/routes/error_handlers.ts similarity index 73% rename from src/routes/error_handlers.js rename to src/routes/error_handlers.ts index 4d17b0d5d..96d326bd9 100644 --- a/src/routes/error_handlers.js +++ b/src/routes/error_handlers.ts @@ -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 };