From a188c58c277224d91f092237f15d8a5d4e032c96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 13 May 2024 09:47:41 +0200
Subject: [PATCH 1/2] refactor: Remove `cli/src/helpers` (no-changelog)

---
 packages/cli/src/Queue.ts                     | 20 +++++++++++++++++--
 .../cli/src/helpers/decodeWebhookResponse.ts  | 18 -----------------
 2 files changed, 18 insertions(+), 20 deletions(-)
 delete mode 100644 packages/cli/src/helpers/decodeWebhookResponse.ts

diff --git a/packages/cli/src/Queue.ts b/packages/cli/src/Queue.ts
index e524aed0495fa..c27d114327868 100644
--- a/packages/cli/src/Queue.ts
+++ b/packages/cli/src/Queue.ts
@@ -2,11 +2,12 @@ import type Bull from 'bull';
 import { Service } from 'typedi';
 import {
 	ApplicationError,
+	BINARY_ENCODING,
+	IDataObject,
 	type ExecutionError,
 	type IExecuteResponsePromiseData,
 } from 'n8n-workflow';
 import { ActiveExecutions } from '@/ActiveExecutions';
-import { decodeWebhookResponse } from '@/helpers/decodeWebhookResponse';
 
 import {
 	getRedisClusterClient,
@@ -68,11 +69,26 @@ export class Queue {
 		this.jobQueue.on('global:progress', (jobId, progress: WebhookResponse) => {
 			this.activeExecutions.resolveResponsePromise(
 				progress.executionId,
-				decodeWebhookResponse(progress.response),
+				this.decodeWebhookResponse(progress.response),
 			);
 		});
 	}
 
+	decodeWebhookResponse(response: IExecuteResponsePromiseData): IExecuteResponsePromiseData {
+		if (
+			typeof response === 'object' &&
+			typeof response.body === 'object' &&
+			(response.body as IDataObject)['__@N8nEncodedBuffer@__']
+		) {
+			response.body = Buffer.from(
+				(response.body as IDataObject)['__@N8nEncodedBuffer@__'] as string,
+				BINARY_ENCODING,
+			);
+		}
+
+		return response;
+	}
+
 	async add(jobData: JobData, jobOptions: object): Promise<Job> {
 		return await this.jobQueue.add(jobData, jobOptions);
 	}
diff --git a/packages/cli/src/helpers/decodeWebhookResponse.ts b/packages/cli/src/helpers/decodeWebhookResponse.ts
deleted file mode 100644
index dd0e464b5e992..0000000000000
--- a/packages/cli/src/helpers/decodeWebhookResponse.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { BINARY_ENCODING, type IDataObject, type IExecuteResponsePromiseData } from 'n8n-workflow';
-
-export function decodeWebhookResponse(
-	response: IExecuteResponsePromiseData,
-): IExecuteResponsePromiseData {
-	if (
-		typeof response === 'object' &&
-		typeof response.body === 'object' &&
-		(response.body as IDataObject)['__@N8nEncodedBuffer@__']
-	) {
-		response.body = Buffer.from(
-			(response.body as IDataObject)['__@N8nEncodedBuffer@__'] as string,
-			BINARY_ENCODING,
-		);
-	}
-
-	return response;
-}

From b3bc27c197a57c108cbbecb3d7366717cb272cae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 13 May 2024 10:03:18 +0200
Subject: [PATCH 2/2] Lint fix

---
 packages/cli/src/Queue.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/src/Queue.ts b/packages/cli/src/Queue.ts
index c27d114327868..ba02dc4250d8c 100644
--- a/packages/cli/src/Queue.ts
+++ b/packages/cli/src/Queue.ts
@@ -3,7 +3,7 @@ import { Service } from 'typedi';
 import {
 	ApplicationError,
 	BINARY_ENCODING,
-	IDataObject,
+	type IDataObject,
 	type ExecutionError,
 	type IExecuteResponsePromiseData,
 } from 'n8n-workflow';