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

⚡ Add continueOnFail support to SSH Node

Browse source
This commit is contained in:
Jan Oberhauser 2021-05-29 21:57:38 -05:00
parent a9184e38f8
commit cd8f4247e6
1 changed files with 72 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

127
packages/nodes-base/nodes/Ssh/Ssh.node.ts
View file

@ -328,75 +328,92 @@ export class Ssh implements INodeType {
} }
for (let i = 0; i < items.length; i++) { for (let i = 0; i < items.length; i++) {
try {
if (resource === 'command') {
if (resource === 'command') { if (operation === 'execute') {
if (operation === 'execute') { const command = this.getNodeParameter('command', i) as string;
const cwd = this.getNodeParameter('cwd', i) as string;
const command = this.getNodeParameter('command', i) as string; returnData.push(await ssh.execCommand(command, { cwd, }));
const cwd = this.getNodeParameter('cwd', i) as string;
returnData.push(await ssh.execCommand(command, { cwd, }));
}
}
if (resource === 'file') {
if (operation === 'download') {
const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i) as string;
const parameterPath = this.getNodeParameter('path', i) as string;
const { path } = await file({mode: 0x0777, prefix: 'prefix-'});
temporaryFiles.push(path);
await ssh.getFile(path, parameterPath);
const newItem: INodeExecutionData = {
json: items[i].json,
binary: {},
};
if (items[i].binary !== undefined) {
// Create a shallow copy of the binary data so that the old
// data references which do not get changed still stay behind
// but the incoming data does not get changed.
Object.assign(newItem.binary, items[i].binary);
} }
items[i] = newItem;
const data = await readFile(path as string);
items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(data, parameterPath);
} }
if (operation === 'upload') { if (resource === 'file') {
const parameterPath = this.getNodeParameter('path', i) as string; if (operation === 'download') {
const fileName = this.getNodeParameter('options.fileName', i, '') as string;
const item = items[i]; const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i) as string;
const parameterPath = this.getNodeParameter('path', i) as string;
if (item.binary === undefined) { const { path } = await file({ mode: 0x0777, prefix: 'prefix-' });
throw new Error('No binary data exists on item!'); temporaryFiles.push(path);
await ssh.getFile(path, parameterPath);
const newItem: INodeExecutionData = {
json: items[i].json,
binary: {},
};
if (items[i].binary !== undefined) {
// Create a shallow copy of the binary data so that the old
// data references which do not get changed still stay behind
// but the incoming data does not get changed.
Object.assign(newItem.binary, items[i].binary);
}
items[i] = newItem;
const data = await readFile(path as string);
items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(data, parameterPath);
} }
const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i) as string; if (operation === 'upload') {
const binaryData = item.binary[propertyNameUpload] as IBinaryData; const parameterPath = this.getNodeParameter('path', i) as string;
const fileName = this.getNodeParameter('options.fileName', i, '') as string;
if (item.binary[propertyNameUpload] === undefined) { const item = items[i];
throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
if (item.binary === undefined) {
throw new Error('No binary data exists on item!');
}
const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i) as string;
const binaryData = item.binary[propertyNameUpload] as IBinaryData;
if (item.binary[propertyNameUpload] === undefined) {
throw new Error(`No binary data property "${propertyNameUpload}" does not exists on item!`);
}
const { path } = await file();
temporaryFiles.push(path);
await writeFile(path, Buffer.from(binaryData.data, BINARY_ENCODING));
await ssh.putFile(path, `${parameterPath}${(parameterPath.charAt(parameterPath.length - 1) === '/') ? '' : '/'}${fileName || binaryData.fileName}`);
returnData.push({ success: true });
} }
const { path } = await file();
temporaryFiles.push(path);
await writeFile(path, Buffer.from(binaryData.data, BINARY_ENCODING));
await ssh.putFile(path, `${parameterPath}${(parameterPath.charAt(parameterPath.length -1) === '/') ? '' : '/'}${fileName || binaryData.fileName}`);
returnData.push({ success: true });
} }
} catch (error) {
console.log('error', error);
if (this.continueOnFail()) {
console.log('k1');
if (resource === 'file' && operation === 'download') {
items[i] = {
json: {
error: error.message,
}
};
} else {
returnData.push({ error: error.message });
}
continue;
}
throw error;
} }
} }
} catch (error) { } catch (error) {