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

🐛 Fix issue of Redis never returning (#1716)

Browse source 
Fixes #1709. When the node returned an error the reject method was not called. Hence, the process kept running forever.
This commit is contained in:
Ricardo Espinoza 2021-04-30 16:38:51 -04:00 committed by GitHub
parent 7c418aafe7
commit efd40ea7a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 62 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
packages/nodes-base/nodes/Redis/Redis.node.ts
View file

@ -451,77 +451,80 @@ export class Redis implements INodeType {
}); });
client.on('ready', async (err: Error | null) => { client.on('ready', async (err: Error | null) => {
try {
if (operation === 'info') {
const clientInfo = util.promisify(client.info).bind(client);
const result = await clientInfo();
if (operation === 'info') { resolve(this.prepareOutputData([{ json: convertInfoToObject(result as unknown as string) }]));
const clientInfo = util.promisify(client.info).bind(client); client.quit();
const result = await clientInfo();
resolve(this.prepareOutputData([{ json: convertInfoToObject(result as unknown as string) }])); } else if (['delete', 'get', 'keys', 'set'].includes(operation)) {
client.quit(); const items = this.getInputData();
const returnItems: INodeExecutionData[] = [];
} else if (['delete', 'get', 'keys', 'set'].includes(operation)) { let item: INodeExecutionData;
const items = this.getInputData(); for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
const returnItems: INodeExecutionData[] = []; item = { json: {} };
let item: INodeExecutionData; if (operation === 'delete') {
for (let itemIndex = 0; itemIndex < items.length; itemIndex++) { const keyDelete = this.getNodeParameter('key', itemIndex) as string;
item = { json: {} };
if (operation === 'delete') { const clientDel = util.promisify(client.del).bind(client);
const keyDelete = this.getNodeParameter('key', itemIndex) as string; // @ts-ignore
await clientDel(keyDelete);
returnItems.push(items[itemIndex]);
} else if (operation === 'get') {
const propertyName = this.getNodeParameter('propertyName', itemIndex) as string;
const keyGet = this.getNodeParameter('key', itemIndex) as string;
const keyType = this.getNodeParameter('keyType', itemIndex) as string;
const clientDel = util.promisify(client.del).bind(client); const value = await getValue(client, keyGet, keyType) || null;
// @ts-ignore
await clientDel(keyDelete);
returnItems.push(items[itemIndex]);
} else if (operation === 'get') {
const propertyName = this.getNodeParameter('propertyName', itemIndex) as string;
const keyGet = this.getNodeParameter('key', itemIndex) as string;
const keyType = this.getNodeParameter('keyType', itemIndex) as string;
const value = await getValue(client, keyGet, keyType) || null; const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject;
const options = this.getNodeParameter('options', itemIndex, {}) as IDataObject; if (options.dotNotation === false) {
item.json[propertyName] = value;
} else {
set(item.json, propertyName, value);
}
if (options.dotNotation === false) { returnItems.push(item);
item.json[propertyName] = value; } else if (operation === 'keys') {
} else { const keyPattern = this.getNodeParameter('keyPattern', itemIndex) as string;
set(item.json, propertyName, value);
const clientKeys = util.promisify(client.keys).bind(client);
const keys = await clientKeys(keyPattern);
const promises: {
[key: string]: GenericValue;
} = {};
for (const keyName of keys) {
promises[keyName] = await getValue(client, keyName);
}
for (const keyName of keys) {
item.json[keyName] = await promises[keyName];
}
returnItems.push(item);
} else if (operation === 'set') {
const keySet = this.getNodeParameter('key', itemIndex) as string;
const value = this.getNodeParameter('value', itemIndex) as string;
const keyType = this.getNodeParameter('keyType', itemIndex) as string;
const expire = this.getNodeParameter('expire', itemIndex, false) as boolean;
const ttl = this.getNodeParameter('ttl', itemIndex, -1) as number;
await setValue(client, keySet, value, expire, ttl, keyType);
returnItems.push(items[itemIndex]);
} }
returnItems.push(item);
} else if (operation === 'keys') {
const keyPattern = this.getNodeParameter('keyPattern', itemIndex) as string;
const clientKeys = util.promisify(client.keys).bind(client);
const keys = await clientKeys(keyPattern);
const promises: {
[key: string]: GenericValue;
} = {};
for (const keyName of keys) {
promises[keyName] = await getValue(client, keyName);
}
for (const keyName of keys) {
item.json[keyName] = await promises[keyName];
}
returnItems.push(item);
} else if (operation === 'set') {
const keySet = this.getNodeParameter('key', itemIndex) as string;
const value = this.getNodeParameter('value', itemIndex) as string;
const keyType = this.getNodeParameter('keyType', itemIndex) as string;
const expire = this.getNodeParameter('expire', itemIndex, false) as boolean;
const ttl = this.getNodeParameter('ttl', itemIndex, -1) as number;
await setValue(client, keySet, value, expire, ttl, keyType);
returnItems.push(items[itemIndex]);
} }
}
client.quit(); client.quit();
resolve(this.prepareOutputData(returnItems)); resolve(this.prepareOutputData(returnItems));
}
} catch (error) {
reject(error);
} }
}); });
}); });