From 99c459a21a51d2e0fb0c2179de9cad22f910809c Mon Sep 17 00:00:00 2001 From: Johann150 Date: Mon, 19 Dec 2022 21:29:29 +0100 Subject: [PATCH] server: better upload limit error Ref: https://akkoma.dev/FoundKeyGang/FoundKey/issues/293 --- packages/backend/src/server/api/index.ts | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts index 2d2680e55..af6026925 100644 --- a/packages/backend/src/server/api/index.ts +++ b/packages/backend/src/server/api/index.ts @@ -16,6 +16,7 @@ import signup from './private/signup.js'; import signin from './private/signin.js'; import signupPending from './private/signup-pending.js'; import { oauth } from './common/oauth.js'; +import { ApiError } from './error.js'; // Init app const app = new Koa(); @@ -40,6 +41,27 @@ const upload = multer({ files: 1, }, }); +/** + * Wrap multer to return an appropriate API error when something goes wrong, e.g. the file is too big. + */ +type KoaMiddleware = (ctx: Koa.Context, next: () => Promise) => Promise; +const wrapped = upload.single('file'); +function uploadWrapper(endpoint: string): KoaMiddleware { + return (ctx: Koa.Context, next: () => Promise): Promise => { + // pass a fake "next" so we can separate multer errors from other API errors + return wrapped(ctx, () => {}) + .then( + () => next(), + (err) => { + let apiErr = new ApiError('INTERNAL_ERROR', err); + if (err?.code === 'LIMIT_FILE_SIZE') { + apiErr = new ApiError('FILE_TOO_BIG', { maxFileSize: config.maxFileSize || 262144000 }); + } + apiErr.apply(ctx, endpoint); + } + ); + }; +} // Init router const router = new Router(); @@ -49,7 +71,7 @@ const router = new Router(); */ for (const endpoint of endpoints) { if (endpoint.meta.requireFile) { - router.post(`/${endpoint.name}`, upload.single('file'), handler.bind(null, endpoint)); + router.post(`/${endpoint.name}`, uploadWrapper(endpoint.name), handler.bind(null, endpoint)); } else { // 後方互換性のため if (endpoint.name.includes('-')) {