✨ Make it possible to retry node on error

packages/core/src/WorkflowExecute.ts

@@ -360,22 +360,51 @@ export class WorkflowExecute {
 				//       is very slow so only do if needed
 				startTime = new Date().getTime();
 
-				try {
+				let maxTries = 1;
-					runExecutionData.resultData.lastNodeExecuted = executionData.node.name;
+				if (executionData.node.retryOnFail === true) {
-					nodeSuccessData = await workflow.runNode(executionData.node, JSON.parse(JSON.stringify(executionData.data)), runExecutionData, runIndex, this.additionalData, NodeExecuteFunctions, this.mode);
+					// TODO: Remove the hardcoded default-values here and also in NodeSettings.vue
+					maxTries = Math.min(5, Math.max(2, executionData.node.maxTries || 3));
+				}
 
-					if (nodeSuccessData === null) {
+				let waitBetweenTries = 0;
-						// If null gets returned it means that the node did succeed
+				if (executionData.node.retryOnFail === true) {
-						// but did not have any data. So the branch should end
+					// TODO: Remove the hardcoded default-values here and also in NodeSettings.vue
-						// (meaning the nodes afterwards should not be processed)
+					waitBetweenTries = Math.min(5000, Math.max(0, executionData.node.waitBetweenTries || 1000));
-						continue;
+				}
+
+				for (let tryIndex = 0; tryIndex < maxTries; tryIndex++) {
+					try {
+						if (tryIndex !== 0) {
+							// Reset executionError from previous error try
+							executionError = undefined;
+							if (waitBetweenTries !== 0) {
+								// TODO: Improve that in the future and check if other nodes can
+								//       be executed in the meantime
+								await new Promise((resolve) => {
+									setTimeout(() => {
+										resolve();
+									}, waitBetweenTries);
+								});
+							}
+						}
+
+						runExecutionData.resultData.lastNodeExecuted = executionData.node.name;
+						nodeSuccessData = await workflow.runNode(executionData.node, JSON.parse(JSON.stringify(executionData.data)), runExecutionData, runIndex, this.additionalData, NodeExecuteFunctions, this.mode);
+
+						if (nodeSuccessData === null) {
+							// If null gets returned it means that the node did succeed
+							// but did not have any data. So the branch should end
+							// (meaning the nodes afterwards should not be processed)
+							continue executionLoop;
+						}
+
+						break;
+					} catch (error) {
+						executionError = {
+							message: error.message,
+							stack: error.stack,
+						};
 					}
-
-				} catch (error) {
-					executionError = {
-						message: error.message,
-						stack: error.stack,
-					};
 				}
 
 				// Add the data to return to the user

packages/editor-ui/src/components/NodeSettings.vue

@@ -24,34 +24,7 @@
 					</div>
 				</el-tab-pane>
 				<el-tab-pane label="Node">
-
+					<parameter-input-list :parameters="nodeSettings" :hideDelete="true" :nodeValues="nodeValues" path="" @valueChanged="valueChanged" />
-					<parameter-input-full
-						:parameter="nodeSettingsParameterColor"
-						:value="nodeValues.color"
-						:displayOptions="false"
-						path="color"
-						@valueChanged="valueChanged"
-					/>
-					<div v-if="!isColorDefaultValue" class="color-reset-button-wrapper">
-						<font-awesome-icon icon="redo" @click="resetColor('color')" class="color-reset-button clickable" title="Reset node color" />
-					</div>
-
-					<parameter-input-full
-						:parameter="nodeSettingsParameterNotes"
-						:value="nodeValues.notes"
-						:displayOptions="false"
-						path="notes"
-						@valueChanged="valueChanged"
-					/>
-
-					<parameter-input-full
-						:parameter="nodeSettingsParameterContinueOnFail"
-						:value="nodeValues.continueOnFail"
-						:displayOptions="false"
-						path="continueOnFail"
-						@valueChanged="valueChanged"
-					/>
-
 					<parameter-input-list :parameters="parametersSetting" :nodeValues="nodeValues" path="parameters" @valueChanged="valueChanged" />
 				</el-tab-pane>
 			</el-tabs>
@@ -160,35 +133,88 @@ export default mixins(
 				nodeValues: {
 					color: '#ff0000',
 					continueOnFail: false,
+					retryOnFail: false,
+					maxTries: 3,
+					waitBetweenTries: 1000,
 					notes: '',
 					parameters: {},
 				} as INodeParameters,
-				nodeSettingsParameterNotes: {
+
-					displayName: 'Notes',
+				nodeSettings: [
-					name: 'notes',
+					{
-					type: 'string',
+						displayName: 'Notes',
-					typeOptions: {
+						name: 'notes',
-						rows: 5,
+						type: 'string',
+						typeOptions: {
+							rows: 5,
+						},
+						default: '',
+						noDataExpression: true,
+						description: 'Notes to save with the node.',
 					},
-					default: '',
+					{
-					description: 'Notes to save with the node.',
+						displayName: 'Node Color',
-				} as INodeProperties,
+						name: 'color',
-
+						type: 'color',
-				nodeSettingsParameterColor: {
+						default: '#ff0000',
-					displayName: 'Node Color',
+						noDataExpression: true,
-					name: 'color',
+						description: 'The color of the node in the flow.',
-					type: 'color',
+					},
-					default: '',
+					{
-					description: 'The color of the node in the flow.',
+						displayName: 'Retry On Fail',
-				} as INodeProperties,
+						name: 'retryOnFail',
-
+						type: 'boolean',
-				nodeSettingsParameterContinueOnFail: {
+						default: false,
-					displayName: 'Continue On Fail',
+						noDataExpression: true,
-					name: 'continueOnFail',
+						description: 'If activated it will automatically retry the node again multiple times.',
-					type: 'boolean',
+					},
-					default: false,
+					{
-					description: 'If set and the node fails the workflow will simply continue running.<br />It will then simply pass through the input data so the workflow has<br />to be set up to handle the case that different data gets returned.',
+						displayName: 'Max. Tries',
-				} as INodeProperties,
+						name: 'maxTries',
+						type: 'number',
+						typeOptions: {
+							minValue: 2,
+							maxValue: 5,
+						},
+						default: 3,
+						displayOptions: {
+							show: {
+								retryOnFail: [
+									true,
+								],
+							},
+						},
+						noDataExpression: true,
+						description: 'How often it should try to execute the node before it should fail.',
+					},
+					{
+						displayName: 'Wait Between Tries',
+						name: 'waitBetweenTries',
+						type: 'number',
+						typeOptions: {
+							minValue: 0,
+							maxValue: 5000,
+						},
+						default: 1000,
+						displayOptions: {
+							show: {
+								retryOnFail: [
+									true,
+								],
+							},
+						},
+						noDataExpression: true,
+						description: 'How long to wait between ties. Value in ms.',
+					},
+					{
+						displayName: 'Continue On Fail',
+						name: 'continueOnFail',
+						type: 'boolean',
+						default: false,
+						noDataExpression: true,
+						description: 'If activated and the node fails the workflow will simply continue running.<br />It will then simply pass through the input data so the workflow has<br />to be set up to handle the case that different data gets returned.',
+					},
+				] as INodeProperties[],
 
 			};
 		},
@@ -199,14 +225,6 @@ export default mixins(
 		},
 		methods: {
 			noOp () {},
-			resetColor () {
-				const activeNode = this.node as INodeUi;
-				const activeNodeType = this.nodeType;
-				if (activeNodeType !== null) {
-					this.setValue('color', activeNodeType.defaults.color as NodeParameterValue);
-					this.valueChanged({ name: 'color', value: activeNodeType.defaults.color } as IUpdateInformation);
-				}
-			},
 			setValue (name: string, value: NodeParameterValue) {
 				const nameParts = name.split('.');
 				let lastNamePart: string | undefined = nameParts.pop();
@@ -405,20 +423,50 @@ export default mixins(
 				if (this.nodeType !== null) {
 					this.nodeValid = true;
 
+					const foundNodeSettings = [];
 					if (this.node.color) {
+						foundNodeSettings.push('color');
 						Vue.set(this.nodeValues, 'color', this.node.color);
-					} else {
-						Vue.set(this.nodeValues, 'color', '#ff0000');
 					}
 
 					if (this.node.notes) {
+						foundNodeSettings.push('notes');
 						Vue.set(this.nodeValues, 'notes', this.node.notes);
 					}
 
 					if (this.node.continueOnFail) {
+						foundNodeSettings.push('continueOnFail');
 						Vue.set(this.nodeValues, 'continueOnFail', this.node.continueOnFail);
 					}
 
+					if (this.node.retryOnFail) {
+						foundNodeSettings.push('retryOnFail');
+						Vue.set(this.nodeValues, 'retryOnFail', this.node.retryOnFail);
+					}
+
+					if (this.node.maxTries) {
+						foundNodeSettings.push('maxTries');
+						Vue.set(this.nodeValues, 'maxTries', this.node.maxTries);
+					}
+
+					if (this.node.waitBetweenTries) {
+						foundNodeSettings.push('waitBetweenTries');
+						Vue.set(this.nodeValues, 'waitBetweenTries', this.node.waitBetweenTries);
+					}
+
+					// Set default node settings
+					for (const nodeSetting of this.nodeSettings) {
+						if (!foundNodeSettings.includes(nodeSetting.name)) {
+							// Set default value
+							Vue.set(this.nodeValues, nodeSetting.name, nodeSetting.default);
+						}
+						if (nodeSetting.name === 'color') {
+							// For color also apply the default node color to the node settings
+							nodeSetting.default = this.nodeType.defaults.color;
+						}
+					}
+
+
 					Vue.set(this.nodeValues, 'parameters', JSON.parse(JSON.stringify(this.node.parameters)));
 				} else {
 					this.nodeValid = false;

packages/editor-ui/src/components/ParameterInput.vue

@@ -77,8 +77,8 @@
 					<font-awesome-icon icon="cogs" class="reset-icon clickable" title="Parameter Options"/>
 				</span>
 				<el-dropdown-menu slot="dropdown">
-					<el-dropdown-item command="addExpression" v-if="!isValueExpression">Add Expression</el-dropdown-item>
+					<el-dropdown-item command="addExpression" v-if="parameter.noDataExpression !== true && !isValueExpression">Add Expression</el-dropdown-item>
-					<el-dropdown-item command="removeExpression" v-if="isValueExpression">Remove Expression</el-dropdown-item>
+					<el-dropdown-item command="removeExpression" v-if="parameter.noDataExpression !== true && isValueExpression">Remove Expression</el-dropdown-item>
 					<el-dropdown-item command="resetValue" :disabled="isDefault" divided>Reset Value</el-dropdown-item>
 				</el-dropdown-menu>
 			</el-dropdown>
@@ -325,6 +325,9 @@ export default mixins(
 				return this.parameter.default === this.value;
 			},
 			isValueExpression () {
+				if (this.parameter.noDataExpression === true) {
+					return false;
+				}
 				if (typeof this.value === 'string' && this.value.charAt(0) === '=') {
 					return true;
 				}

packages/workflow/src/Interfaces.ts

@@ -215,6 +215,9 @@ export interface INode {
 	type: string;
 	position: [number, number];
 	disabled?: boolean;
+	retryOnFail?: boolean;
+	maxTries?: number;
+	waitBetweenTries?: number;
 	continueOnFail?: boolean;
 	parameters: INodeParameters;
 	credentials?: INodeCredentials;