From b267bf07e365d8bb82a9847fb3c490437dc1010e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 16 Jan 2024 16:18:34 +0100
Subject: [PATCH] fix(core): Prevent NodeErrors from being wrapped multiple
 times (#8301)

---
 .../workflow/src/errors/abstract/node.error.ts | 18 +++++++++---------
 .../workflow/test/errors/node.error.test.ts    | 16 ++++++++++++++++
 2 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 packages/workflow/test/errors/node.error.test.ts

diff --git a/packages/workflow/src/errors/abstract/node.error.ts b/packages/workflow/src/errors/abstract/node.error.ts
index 6b22e71adab50..adaa2e4516bc2 100644
--- a/packages/workflow/src/errors/abstract/node.error.ts
+++ b/packages/workflow/src/errors/abstract/node.error.ts
@@ -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;
 
-		this.node = node;
+		const isError = error instanceof Error;
+		const message = isError ? error.message : '';
+		const options = isError ? { cause: error } : { errorResponse: error };
+		super(message, options);
 	}
 
 	/**
diff --git a/packages/workflow/test/errors/node.error.test.ts b/packages/workflow/test/errors/node.error.test.ts
new file mode 100644
index 0000000000000..d5dcf1652d2c5
--- /dev/null
+++ b/packages/workflow/test/errors/node.error.test.ts
@@ -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);
+	});
+});