⚡ Fix issue with thrown errors for nodes with multiple webhooks

packages/cli/src/ActiveWorkflowRunner.ts

@@ -258,17 +258,20 @@ export class ActiveWorkflowRunner {
 				await Db.collections.Webhook?.insert(webhook);
 
 				const webhookExists = await workflow.runWebhookMethod('checkExists', webhookData, NodeExecuteFunctions, mode, false);
-				if (webhookExists === false) {
+				if (webhookExists !== true) {
 					// If webhook does not exist yet create it
 					await workflow.runWebhookMethod('create', webhookData, NodeExecuteFunctions, mode, false);
 				}
 
 			} catch (error) {
+				try {
+					await this.removeWorkflowWebhooks(workflow.id as string);
+				} catch (error) {
+					console.error(`Could not remove webhooks of workflow "${workflow.id}" because of error: "${error.message}"`);
+				}
 
 				let errorMessage = '';
 
-				await Db.collections.Webhook?.delete({ workflowId: workflow.id });
-
 				// if it's a workflow from the the insert
 				// TODO check if there is standard error code for deplicate key violation that works
 				// with all databases

packages/cli/src/TestWebhooks.ts

@@ -156,9 +156,12 @@ export class TestWebhooks {
 		}, 120000);
 
 		let key: string;
+		const activatedKey: string[] = [];
 		for (const webhookData of webhooks) {
 			key = this.activeWebhooks!.getWebhookKey(webhookData.httpMethod, webhookData.path);
 
+			activatedKey.push(key);
+
 			this.testWebhookData[key] = {
 				sessionId,
 				timeout,
@@ -166,7 +169,13 @@ export class TestWebhooks {
 				workflowData,
 			};
 
-			await this.activeWebhooks!.add(workflow, webhookData, mode);
+			try {
+				await this.activeWebhooks!.add(workflow, webhookData, mode);
+			} catch (error) {
+				activatedKey.forEach(deleteKey => delete this.testWebhookData[deleteKey] );
+				await this.activeWebhooks!.removeWorkflow(workflow);
+				throw error;
+			}
 		}
 
 		return true;
@@ -189,8 +198,6 @@ export class TestWebhooks {
 				continue;
 			}
 
-			foundWebhook = true;
-
 			clearTimeout(this.testWebhookData[webhookKey].timeout);
 
 			// Inform editor-ui that webhook got received
@@ -207,7 +214,13 @@ export class TestWebhooks {
 
 			// Remove the webhook
 			delete this.testWebhookData[webhookKey];
-			this.activeWebhooks!.removeWorkflow(workflow);
+
+			if (foundWebhook === false) {
+				// As it removes all webhooks of the workflow execute only once
+				this.activeWebhooks!.removeWorkflow(workflow);
+			}
+
+			foundWebhook = true;
 		}
 
 		return foundWebhook;