From 2c143714817e62fcb2fec9b9cac208ef029f87fd Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 19 Jan 2024 13:39:18 +0200
Subject: [PATCH] fix(AMQP Trigger Node): Properly close connection after
 manual test step (#8396)

---
 packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index 7182fdfae5..e63bb9ad03 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -48,16 +48,18 @@ export class AmqpTrigger implements INodeType {
 				name: 'clientname',
 				type: 'string',
 				default: '',
-				placeholder: 'for durable/persistent topic subscriptions, example: "n8n"',
+				placeholder: 'e.g. n8n',
 				description: 'Leave empty for non-durable topic subscriptions or queues',
+				hint: 'for durable/persistent topic subscriptions',
 			},
 			{
 				displayName: 'Subscription',
 				name: 'subscription',
 				type: 'string',
 				default: '',
-				placeholder: 'for durable/persistent topic subscriptions, example: "order-worker"',
+				placeholder: 'e.g. order-worker',
 				description: 'Leave empty for non-durable topic subscriptions or queues',
+				hint: 'for durable/persistent topic subscriptions',
 			},
 			{
 				displayName: 'Options',
@@ -270,6 +272,10 @@ export class AmqpTrigger implements INodeType {
 		const manualTriggerFunction = async () => {
 			await new Promise((resolve, reject) => {
 				const timeoutHandler = setTimeout(() => {
+					container.removeAllListeners('receiver_open');
+					container.removeAllListeners('message');
+					connection.close();
+
 					reject(
 						new Error(
 							'Aborted, no message received within 30secs. This 30sec timeout is only set for "manually triggered execution". Active Workflows will listen indefinitely.',