mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-12 05:17:28 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Prevent NodeApiError rewraping (no-changelog) (#9627)

Browse source
This commit is contained in:
Michael Kret 2024-06-05 14:21:32 +03:00 committed by GitHub
parent 411ffbda7f
commit 37531cdb7d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/workflow/src/errors/node-api.error.ts
View file

@ -113,7 +113,7 @@ const STATUS_CODE_MESSAGES: IStatusCodeMessages = {
* with an HTTP error code, an error message and a description. * with an HTTP error code, an error message and a description.
*/ */
export class NodeApiError extends NodeError { export class NodeApiError extends NodeError {
httpCode: string | null; httpCode: string | null = null;
// eslint-disable-next-line complexity // eslint-disable-next-line complexity
constructor( constructor(
@ -131,6 +131,10 @@ export class NodeApiError extends NodeError {
messageMapping, messageMapping,
}: NodeApiErrorOptions = {}, }: NodeApiErrorOptions = {},
) { ) {
if (errorResponse instanceof NodeApiError) {
return errorResponse;
}
super(node, errorResponse); super(node, errorResponse);
this.addToMessages(errorResponse.message as string); this.addToMessages(errorResponse.message as string);

4
packages/workflow/src/errors/node-operation.error.ts
View file

@ -13,9 +13,13 @@ export class NodeOperationError extends NodeError {
error: Error | string | JsonObject, error: Error | string | JsonObject,
options: NodeOperationErrorOptions = {}, options: NodeOperationErrorOptions = {},
) { ) {
if (error instanceof NodeOperationError) {
return error;
}
if (typeof error === 'string') { if (typeof error === 'string') {
error = new Error(error); error = new Error(error);
} }
super(node, error); super(node, error);
if (error instanceof NodeError && error?.messages?.length) { if (error instanceof NodeError && error?.messages?.length) {

8
packages/workflow/test/errors/node.error.test.ts
View file

@ -12,11 +12,7 @@ describe('NodeError', () => {
const wrapped1 = new NodeOperationError(node, apiError); const wrapped1 = new NodeOperationError(node, apiError);
const wrapped2 = new NodeOperationError(node, opsError); const wrapped2 = new NodeOperationError(node, opsError);
expect(wrapped1.level).toEqual('error'); expect(wrapped1).toEqual(apiError);
expect(wrapped1.message).toEqual('The service was not able to process your request'); expect(wrapped2).toEqual(opsError);
expect(wrapped1.tags).toEqual(expect.objectContaining({ reWrapped: true }));
expect(wrapped2.level).toEqual('error');
expect(wrapped2.message).toEqual('Some operation failed');
expect(wrapped2.tags).toEqual(expect.objectContaining({ reWrapped: true }));
}); });
}); });