Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): Prevent NodeErrors from being wrapped multiple times #8301

Merged
merged 3 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions packages/workflow/src/errors/abstract/node.error.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ const COMMON_ERRORS: IDataObject = {
* a value recursively inside an error object.
*/
export abstract class NodeError extends ExecutionBaseError {
node: INode;

constructor(node: INode, error: Error | JsonObject) {
if (error instanceof Error) {
super(error.message, { cause: error });
} else {
super('', { errorResponse: error });
}
constructor(
readonly node: INode,
error: Error | JsonObject,
) {
if (error instanceof NodeError) return error;
netroy marked this conversation as resolved.
Show resolved Hide resolved

this.node = node;
const isError = error instanceof Error;
const message = isError ? error.message : '';
const options = isError ? { cause: error } : { errorResponse: error };
super(message, options);
}

/**
Expand Down
16 changes: 16 additions & 0 deletions packages/workflow/test/errors/node.error.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { mock } from 'jest-mock-extended';
import type { INode } from '@/Interfaces';
import { NodeApiError } from '@/errors/node-api.error';
import { NodeOperationError } from '@/errors/node-operation.error';

describe('NodeError', () => {
const node = mock<INode>();

it('should prevent errors from being re-wrapped', () => {
const apiError = new NodeApiError(node, mock({ message: 'Some error happened', code: 500 }));
const opsError = new NodeOperationError(node, mock());

expect(new NodeOperationError(node, apiError)).toEqual(apiError);
expect(new NodeOperationError(node, opsError)).toEqual(opsError);
});
});
Loading