X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fmiddlewares%2Ferror.ts;h=96a85012ac495353b87453913de3ffdaa64b83e3;hb=4f3814808791d8f380e75d152e0e14a01b758b9a;hp=af5a9c29a00e58ff887d879837d4959374ebf4df;hpb=ac27887774e63d99f4e227fbe18846f143cc4b3c;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/middlewares/error.ts b/server/middlewares/error.ts index af5a9c29a..96a85012a 100644 --- a/server/middlewares/error.ts +++ b/server/middlewares/error.ts @@ -1,5 +1,6 @@ -import * as express from 'express' +import express from 'express' import { ProblemDocument, ProblemDocumentExtension } from 'http-problem-details' +import { logger } from '@server/helpers/logger' import { HttpStatusCode } from '@shared/models' function apiFailMiddleware (req: express.Request, res: express.Response, next: express.NextFunction) { @@ -18,7 +19,8 @@ function apiFailMiddleware (req: express.Request, res: express.Response, next: e res.status(status) res.setHeader('Content-Type', 'application/problem+json') - res.json(new ProblemDocument({ + + const json = new ProblemDocument({ status, title, instance, @@ -28,12 +30,31 @@ function apiFailMiddleware (req: express.Request, res: express.Response, next: e type: type ? `https://docs.joinpeertube.org/api-rest-reference.html#section/Errors/${type}` : undefined - }, extension)) + }, extension) + + logger.debug('Bad HTTP request.', { json }) + + res.json(json) } if (next) next() } +function handleStaticError (err: any, req: express.Request, res: express.Response, next: express.NextFunction) { + const message = err.message || '' + + if (message.includes('ENOENT')) { + return res.fail({ + status: err.status || HttpStatusCode.INTERNAL_SERVER_ERROR_500, + message: err.message, + type: err.name + }) + } + + return next(err) +} + export { - apiFailMiddleware + apiFailMiddleware, + handleStaticError }