mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(Telegram Node): Stream binary data for uploads and downloads (#5261)

Browse source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™ 2023-01-27 10:30:10 +01:00 committed by GitHub
parent 0a7ea89633
commit 266c50fb1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
packages/nodes-base/nodes/Telegram/Telegram.node.ts
View file

@ -1,4 +1,5 @@
import { IExecuteFunctions } from 'n8n-core'; import type { Readable } from 'stream';
import { BINARY_ENCODING, IExecuteFunctions } from 'n8n-core';
import { import {
IDataObject, IDataObject,
@ -1962,7 +1963,6 @@ export class Telegram implements INodeType {
if (binaryData) { if (binaryData) {
const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0); const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
const itemBinaryData = items[i].binary![binaryPropertyName]; const itemBinaryData = items[i].binary![binaryPropertyName];
const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
const propertyName = getPropertyName(operation); const propertyName = getPropertyName(operation);
const fileName = this.getNodeParameter('additionalFields.fileName', 0, '') as string; const fileName = this.getNodeParameter('additionalFields.fileName', 0, '') as string;
@ -1979,10 +1979,17 @@ export class Telegram implements INodeType {
body.disable_notification = body.disable_notification?.toString() || 'false'; body.disable_notification = body.disable_notification?.toString() || 'false';
let uploadData: Buffer | Readable;
if (itemBinaryData.id) {
uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
} else {
uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
}
const formData = { const formData = {
...body, ...body,
[propertyName]: { [propertyName]: {
value: dataBuffer, value: uploadData,
options: { options: {
filename, filename,
contentType: itemBinaryData.mimeType, contentType: itemBinaryData.mimeType,
@ -2011,20 +2018,16 @@ export class Telegram implements INodeType {
encoding: null, encoding: null,
uri: `https://api.telegram.org/file/bot${credentials.accessToken}/${filePath}`, uri: `https://api.telegram.org/file/bot${credentials.accessToken}/${filePath}`,
resolveWithFullResponse: true, resolveWithFullResponse: true,
useStream: true,
}, },
); );
const fileName = filePath.split('/').pop(); const fileName = filePath.split('/').pop();
const data = await this.helpers.prepareBinaryData( const data = await this.helpers.prepareBinaryData(file.body, fileName);
Buffer.from(file.body as string),
fileName,
);
returnData.push({ returnData.push({
json: responseData, json: responseData,
binary: { binary: { data },
data,
},
pairedItem: { item: i }, pairedItem: { item: i },
}); });
continue; continue;