From 4d2115c163b041d9b640089ffa53ac29604d78f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Mon, 13 May 2024 10:22:11 +0200 Subject: [PATCH] refactor: Remove `cli/src/helpers` (no-changelog) (#9368) --- 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 e524aed049..ba02dc4250 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, + type 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 { 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 dd0e464b5e..0000000000 --- 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; -}