admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-21 11:49:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Read Binary File Node): Do not crash the execution when the source file does not exist (#5100)

Browse Source 
This issue was introduced in https://github.com/n8n-io/n8n/pull/5069
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-01-06 14:15:46 +01:00
committed by GitHub
parent c4df2049a8
commit c97f3cad59
5 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
View File

@@ -1,12 +1,5 @@
import { IExecuteFunctions } from 'n8n-core';
import {
INodeExecutionData,
INodeType,
INodeTypeDescription,
NodeOperationError,
} from 'n8n-workflow';
import { createReadStream } from 'fs';
import type { IExecuteFunctions } from 'n8n-core';
import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
export class ReadBinaryFile implements INodeType {
description: INodeTypeDescription = {
@@ -53,23 +46,6 @@ export class ReadBinaryFile implements INodeType {
for (let itemIndex = 0; itemIndex < length; itemIndex++) {
try {
item = items[itemIndex];
const dataPropertyName = this.getNodeParameter('dataPropertyName', itemIndex) as string;
const filePath = this.getNodeParameter('filePath', itemIndex) as string;
let data;
try {
data = createReadStream(filePath);
} catch (error) {
if (error.code === 'ENOENT') {
throw new NodeOperationError(
this.getNode(),
`The file "${filePath}" could not be found.`,
);
}
throw error;
}
const newItem: INodeExecutionData = {
json: item.json,
binary: {},
@@ -85,7 +61,10 @@ export class ReadBinaryFile implements INodeType {
Object.assign(newItem.binary, item.binary);
}
newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(data, filePath);
const filePath = this.getNodeParameter('filePath', itemIndex) as string;
const stream = await this.helpers.createReadStream(filePath);
const dataPropertyName = this.getNodeParameter('dataPropertyName', itemIndex) as string;
newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(stream, filePath);
returnData.push(newItem);
} catch (error) {
if (this.continueOnFail()) {

19
packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
View File

@@ -1,8 +1,6 @@
import { IExecuteFunctions } from 'n8n-core';
import { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
import type { IExecuteFunctions } from 'n8n-core';
import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
import glob from 'fast-glob';
import { createReadStream } from 'fs';
import type { Readable } from 'stream';
export class ReadBinaryFiles implements INodeType {
description: INodeTypeDescription = {
@@ -46,22 +44,17 @@ export class ReadBinaryFiles implements INodeType {
const files = await glob(fileSelector);
const items: INodeExecutionData[] = [];
let item: INodeExecutionData;
let data: Readable;
for (const filePath of files) {
data = createReadStream(filePath);
item = {
const stream = await this.helpers.createReadStream(filePath);
items.push({
binary: {
[dataPropertyName]: await this.helpers.prepareBinaryData(data, filePath),
[dataPropertyName]: await this.helpers.prepareBinaryData(stream, filePath),
},
json: {},
pairedItem: {
item: 0,
},
};
items.push(item);
});
}
return this.prepareOutputData(items);