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

refactor(WhatsApp Node): Avoid using BinaryDataManager directly from n8n-core (#5544)

Browse source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2023-02-23 08:51:08 +01:00 committed by GitHub
parent e251439333
commit 1bff044252
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
View file

@ -3,38 +3,42 @@ import { NodeOperationError } from 'n8n-workflow';
import FormData from 'form-data';
export async function getUploadFormData(
this: IExecuteSingleFunctions,
): Promise<{ fileName: string; formData: FormData }> {
const mediaPropertyName = ((this.getNodeParameter('mediaPropertyName') as string) || '').trim();
if (!mediaPropertyName)
throw new NodeOperationError(this.getNode(), 'Parameter "mediaPropertyName" is not defined');
const { binary: binaryData } = this.getInputData();
if (!binaryData) throw new NodeOperationError(this.getNode(), 'Binary data missing in input');
const binaryFile = binaryData[mediaPropertyName];
if (binaryFile === undefined)
throw new NodeOperationError(this.getNode(), 'Could not find file in node input data');
const mediaFileName = (this.getNodeParameter('additionalFields') as IDataObject).mediaFileName as
| string
| undefined;
const fileName = mediaFileName || binaryFile.fileName;
if (!fileName)
throw new NodeOperationError(this.getNode(), 'No file name given for media upload.');
const buffer = await this.helpers.getBinaryDataBuffer(mediaPropertyName);
const formData = new FormData();
formData.append('file', buffer, { contentType: binaryFile.mimeType, filename: fileName });
formData.append('messaging_product', 'whatsapp');
return { fileName, formData };
}
export async function setupUpload(
this: IExecuteSingleFunctions,
requestOptions: IHttpRequestOptions,
) {
const mediaPropertyName = this.getNodeParameter('mediaPropertyName') as string;
if (!mediaPropertyName) {
return requestOptions;
}
if (this.getInputData().binary?.[mediaPropertyName] === undefined || !mediaPropertyName.trim()) {
throw new NodeOperationError(this.getNode(), 'Could not find file in node input data', {
description: `There’s no key called '${mediaPropertyName}' with binary data in it`,
});
}
const binaryFile = this.getInputData().binary![mediaPropertyName]!;
const mediaFileName = (this.getNodeParameter('additionalFields') as IDataObject).mediaFileName as
| string
| undefined;
const binaryFileName = binaryFile.fileName;
if (!mediaFileName && !binaryFileName) {
throw new NodeOperationError(this.getNode(), 'No file name given for media upload.');
}
const mimeType = binaryFile.mimeType;
const buffer = await this.helpers.getBinaryDataBuffer(mediaPropertyName);
const data = new FormData();
data.append('file', buffer, {
contentType: mimeType,
filename: mediaFileName || binaryFileName,
});
data.append('messaging_product', 'whatsapp');
requestOptions.body = data;
const uploadData = await getUploadFormData.call(this);
requestOptions.body = uploadData.formData;
return requestOptions;
}

37
packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
View file

@ -1,5 +1,4 @@
import set from 'lodash.set';
import { BinaryDataManager } from 'n8n-core';
import type {
IDataObject,
IExecuteSingleFunctions,
@ -8,9 +7,9 @@ import type {
INodeExecutionData,
JsonObject,
} from 'n8n-workflow';
import { NodeApiError, NodeOperationError } from 'n8n-workflow';
import { NodeApiError } from 'n8n-workflow';
import FormData from 'form-data';
import { getUploadFormData } from './MediaFunctions';
interface WhatsAppApiError {
error: {
@ -62,29 +61,7 @@ export async function mediaUploadFromItem(
this: IExecuteSingleFunctions,
requestOptions: IHttpRequestOptions,
) {
const mediaPropertyName = this.getNodeParameter('mediaPropertyName') as string;
if (this.getInputData().binary?.[mediaPropertyName] === undefined) {
throw new NodeOperationError(
this.getNode(),
`The binary property "${mediaPropertyName}" does not exist. So no file can be written!`,
);
}
const binaryFile = this.getInputData().binary![mediaPropertyName]!;
const mediaFileName = (this.getNodeParameter('additionalFields') as IDataObject).mediaFilename as
| string
| undefined;
const binaryFileName = binaryFile.fileName;
if (!mediaFileName && !binaryFileName) {
throw new NodeOperationError(this.getNode(), 'No file name given for media upload.');
}
const mimeType = binaryFile.mimeType;
const data = new FormData();
data.append('file', await BinaryDataManager.getInstance().retrieveBinaryData(binaryFile), {
contentType: mimeType,
filename: mediaFileName || binaryFileName,
});
data.append('messaging_product', 'whatsapp');
const uploadData = await getUploadFormData.call(this);
const phoneNumberId = this.getNodeParameter('phoneNumberId') as string;
@ -92,7 +69,7 @@ export async function mediaUploadFromItem(
url: `/${phoneNumberId}/media`,
baseURL: requestOptions.baseURL,
method: 'POST',
body: data,
body: uploadData.formData,
})) as IDataObject;
const operation = this.getNodeParameter('messageType') as string;
@ -101,11 +78,7 @@ export async function mediaUploadFromItem(
}
set(requestOptions.body as IDataObject, `${operation}.id`, result.id);
if (operation === 'document') {
set(
requestOptions.body as IDataObject,
`${operation}.filename`,
mediaFileName || binaryFileName,
);
set(requestOptions.body as IDataObject, `${operation}.filename`, uploadData.fileName);
}
return requestOptions;