fix(core): Retain original error cause when throwing InternalServerError

This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2024-11-28 18:14:55 +01:00
parent fcbf0ea771
commit c0a9063afd
No known key found for this signature in database
10 changed files with 17 additions and 21 deletions

View file

@ -1,6 +1,5 @@
import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
import type { Response } from 'express';
import { ErrorReporterProxy } from 'n8n-workflow';
import { strict as assert } from 'node:assert';
import { WritableStream } from 'node:stream/web';
@ -33,8 +32,7 @@ export class AiController {
}
} catch (e) {
assert(e instanceof Error);
ErrorReporterProxy.error(e);
throw new InternalServerError(`Something went wrong: ${e.message}`);
throw new InternalServerError(`Something went wrong: ${e.message}`, e);
}
}
@ -46,8 +44,7 @@ export class AiController {
return await this.aiService.applySuggestion(req.body, req.user);
} catch (e) {
assert(e instanceof Error);
ErrorReporterProxy.error(e);
throw new InternalServerError(`Something went wrong: ${e.message}`);
throw new InternalServerError(`Something went wrong: ${e.message}`, e);
}
}
@ -57,8 +54,7 @@ export class AiController {
return await this.aiService.askAi(req.body, req.user);
} catch (e) {
assert(e instanceof Error);
ErrorReporterProxy.error(e);
throw new InternalServerError(`Something went wrong: ${e.message}`);
throw new InternalServerError(`Something went wrong: ${e.message}`, e);
}
}
}

View file

@ -201,7 +201,7 @@ export class CommunityPackagesController {
error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
].join(':');
throw new InternalServerError(message);
throw new InternalServerError(message, error);
}
// broadcast to connected frontends that node list has been updated
@ -283,7 +283,7 @@ export class CommunityPackagesController {
error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
].join(':');
throw new InternalServerError(message);
throw new InternalServerError(message, error);
}
}
}

View file

@ -120,7 +120,7 @@ export class PasswordResetController {
publicApi: false,
});
if (error instanceof Error) {
throw new InternalServerError(`Please contact your administrator: ${error.message}`);
throw new InternalServerError(`Please contact your administrator: ${error.message}`, error);
}
}

View file

@ -54,7 +54,7 @@ export class TranslationController {
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
return require(NODE_HEADERS_PATH);
} catch (error) {
throw new InternalServerError('Failed to load headers file');
throw new InternalServerError('Failed to load headers file', error);
}
}
}

View file

@ -16,8 +16,9 @@ export abstract class ResponseError extends ApplicationError {
readonly errorCode: number = httpStatusCode,
// The error hint the response
readonly hint: string | undefined = undefined,
cause: unknown,
) {
super(message);
super(message, { cause });
this.name = 'ResponseError';
}
}

View file

@ -1,7 +1,7 @@
import { ResponseError } from './abstract/response.error';
export class InternalServerError extends ResponseError {
constructor(message: string, errorCode = 500) {
super(message, 500, errorCode);
constructor(message: string, cause?: unknown) {
super(message, 500, 500, undefined, cause);
}
}

View file

@ -251,7 +251,7 @@ export class ExecutionService {
requestFilters = requestFiltersRaw as IGetExecutionsQueryFilter;
}
} catch (error) {
throw new InternalServerError('Parameter "filter" contained invalid JSON string.');
throw new InternalServerError('Parameter "filter" contained invalid JSON string.', error);
}
}

View file

@ -1,5 +1,5 @@
import type { IUserSettings } from 'n8n-workflow';
import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
import { ApplicationError } from 'n8n-workflow';
import { Service } from 'typedi';
import type { User, AssignableRole } from '@/databases/entities/user';
@ -213,9 +213,8 @@ export class UserService {
),
);
} catch (error) {
ErrorReporter.error(error);
this.logger.error('Failed to create user shells', { userShells: createdUsers });
throw new InternalServerError('An error occurred during user creation');
throw new InternalServerError('An error occurred during user creation', error);
}
pendingUsersToInvite.forEach(({ email, id }) => createdUsers.set(email, id));

View file

@ -125,7 +125,7 @@ export class UserManagementMailer {
const error = toError(e);
throw new InternalServerError(`Please contact your administrator: ${error.message}`);
throw new InternalServerError(`Please contact your administrator: ${error.message}`, e);
}
}
@ -180,7 +180,7 @@ export class UserManagementMailer {
const error = toError(e);
throw new InternalServerError(`Please contact your administrator: ${error.message}`);
throw new InternalServerError(`Please contact your administrator: ${error.message}`, e);
}
}

View file

@ -762,7 +762,7 @@ export async function executeWebhook(
);
}
const internalServerError = new InternalServerError(e.message);
const internalServerError = new InternalServerError(e.message, e);
if (e instanceof ExecutionCancelledError) internalServerError.level = 'warning';
throw internalServerError;
});