@grupodiariodaregiao/bunstone 0.4.0 → 0.4.2

package/dist/index.js

@@ -117583,6 +117583,33 @@ if (document.readyState === 'loading') {
       return;
     }
     const injectables = Reflect.getMetadata("dip:injectables", module);
+    function matchRoutingKey(pattern, routingKey) {
+      if (pattern === routingKey)
+        return true;
+      if (!pattern.includes("*") && !pattern.includes("#"))
+        return false;
+      const pp = pattern.split(".");
+      const kp = routingKey.split(".");
+      function go2(pi3, ki3) {
+        if (pi3 === pp.length && ki3 === kp.length)
+          return true;
+        if (pi3 === pp.length)
+          return false;
+        if (pp[pi3] === "#") {
+          for (let j4 = ki3;j4 <= kp.length; j4++) {
+            if (go2(pi3 + 1, j4))
+              return true;
+          }
+          return false;
+        }
+        if (ki3 === kp.length)
+          return false;
+        if (pp[pi3] === "*" || pp[pi3] === kp[ki3])
+          return go2(pi3 + 1, ki3 + 1);
+        return false;
+      }
+      return go2(0, 0);
+    }
     (async () => {
       try {
         await RabbitMQConnection.initialise();
@@ -117590,6 +117617,7 @@ if (document.readyState === 'loading') {
         AppStartup.logger.error(`RabbitMQ initialisation failed: ${err.message}`);
         return;
       }
+      const queueMap = new Map;
       for (const [providerClass, descriptors] of providersRabbitMQ.entries()) {
         const instance = injectables?.get(providerClass) ?? new providerClass;
         for (const descriptor of descriptors) {
@@ -117638,38 +117666,75 @@ if (document.readyState === 'loading') {
             AppStartup.logger.warn(`@RabbitSubscribe on ${providerClass.name}.${descriptor.methodName}() has neither 'queue' nor 'exchange'+'routingKey' \u2013 skipping.`);
             continue;
           }
-          AppStartup.logger.log(`Registering RabbitMQ consumer for queue: "${queue2}" \u2192 ${providerClass.name}.${descriptor.methodName}()`);
-          try {
-            const channel = await RabbitMQConnection.getConsumerChannel(queue2);
-            await channel.consume(queue2, async (raw) => {
-              if (!raw)
-                return;
-              const data = (() => {
-                try {
-                  return JSON.parse(raw.content.toString());
-                } catch {
-                  return raw.content.toString();
-                }
-              })();
-              const msg = {
-                data,
-                raw,
-                ack: () => channel.ack(raw),
-                nack: (requeue = true) => channel.nack(raw, false, requeue),
-                reject: () => channel.reject(raw, false)
-              };
+          if (!queueMap.has(queue2))
+            queueMap.set(queue2, []);
+          const queueHandlers = queueMap.get(queue2);
+          queueHandlers.push({
+            instance,
+            descriptor,
+            noAck,
+            providerName: providerClass.name
+          });
+        }
+      }
+      for (const [queue2, handlers] of queueMap.entries()) {
+        const noAck = handlers.every((h3) => h3.noAck);
+        const handlerList = handlers.map((h3) => {
+          const rk = h3.descriptor.options.routingKey;
+          return `${h3.providerName}.${h3.descriptor.methodName}()${rk ? ` [${rk}]` : ""}`;
+        }).join(", ");
+        AppStartup.logger.log(`Registering RabbitMQ consumer for queue: "${queue2}" \u2192 [${handlerList}]`);
+        try {
+          const channel = await RabbitMQConnection.getConsumerChannel(queue2);
+          await channel.consume(queue2, async (raw) => {
+            if (!raw)
+              return;
+            const data = (() => {
+              try {
+                return JSON.parse(raw.content.toString());
+              } catch {
+                return raw.content.toString();
+              }
+            })();
+            let settled = false;
+            const settle = (fn3) => {
+              if (!settled) {
+                settled = true;
+                fn3();
+              }
+            };
+            const msg = {
+              data,
+              raw,
+              ack: () => settle(() => channel.ack(raw)),
+              nack: (requeue = true) => settle(() => channel.nack(raw, false, requeue)),
+              reject: () => settle(() => channel.reject(raw, false))
+            };
+            for (const {
+              instance,
+              descriptor,
+              noAck: handlerNoAck,
+              providerName
+            } of handlers) {
+              const handlerRoutingKey = descriptor.options.routingKey;
+              if (handlerRoutingKey && !matchRoutingKey(handlerRoutingKey, raw.fields.routingKey)) {
+                continue;
+              }
               try {
                 await instance[descriptor.methodName](msg);
               } catch (err) {
-                AppStartup.logger.error(`Unhandled error in RabbitMQ handler ${providerClass.name}.${descriptor.methodName}() on queue "${queue2}": ${err.message}`);
-                if (!noAck) {
-                  channel.nack(raw, false, true);
+                AppStartup.logger.error(`Unhandled error in RabbitMQ handler ${providerName}.${descriptor.methodName}() on queue "${queue2}": ${err.message}`);
+                if (!handlerNoAck && !settled) {
+                  settle(() => channel.nack(raw, false, true));
                 }
               }
-            }, { noAck });
-          } catch (err) {
-            AppStartup.logger.error(`Failed to register consumer for queue "${queue2}": ${err.message}`);
-          }
+            }
+            if (!noAck && !settled) {
+              settle(() => channel.ack(raw));
+            }
+          }, { noAck });
+        } catch (err) {
+          AppStartup.logger.error(`Failed to register consumer for queue "${queue2}": ${err.message}`);
         }
       }
     })();

package/dist/lib/app-startup.d.ts

@@ -80,6 +80,14 @@ export declare class AppStartup {
     /**
      * Sets up RabbitMQ consumers for every provider that has `@RabbitSubscribe`
      * methods registered in the given module.
+     *
+     * Queue mode (fan-out): all handlers subscribed to the same named queue share a
+     * single AMQP consumer. Every message is delivered to ALL handlers in declaration
+     * order. A "settle guard" ensures ack/nack/reject is called only once per message
+     * regardless of how many handlers invoke it.
+     *
+     * Routing-key mode: each handler gets its own exclusive auto-delete queue bound
+     * to the exchange, so the broker itself handles fan-out.
      */
     private static registerRabbitMQConsumers;
     private static registerCqrsHandlers;

package/lib/app-startup.ts

@@ -857,6 +857,14 @@ if (document.readyState === 'loading') {
 	/**
 	 * Sets up RabbitMQ consumers for every provider that has `@RabbitSubscribe`
 	 * methods registered in the given module.
+	 *
+	 * Queue mode (fan-out): all handlers subscribed to the same named queue share a
+	 * single AMQP consumer. Every message is delivered to ALL handlers in declaration
+	 * order. A "settle guard" ensures ack/nack/reject is called only once per message
+	 * regardless of how many handlers invoke it.
+	 *
+	 * Routing-key mode: each handler gets its own exclusive auto-delete queue bound
+	 * to the exchange, so the broker itself handles fan-out.
 	 */
 	private static registerRabbitMQConsumers(module: any): void {
 		const providersRabbitMQ: Map<any, RabbitMQMethodDescriptor[]> | undefined =
@@ -871,6 +879,41 @@ if (document.readyState === 'loading') {
 			module,
 		);
 
+		/**
+		 * Matches a RabbitMQ topic routing key pattern against a concrete routing key.
+		 * Supports `*` (exactly one word) and `#` (zero or more words).
+		 */
+		function matchRoutingKey(pattern: string, routingKey: string): boolean {
+			if (pattern === routingKey) return true;
+			if (!pattern.includes("*") && !pattern.includes("#")) return false;
+
+			const pp = pattern.split(".");
+			const kp = routingKey.split(".");
+
+			function go(pi: number, ki: number): boolean {
+				if (pi === pp.length && ki === kp.length) return true;
+				if (pi === pp.length) return false;
+				if (pp[pi] === "#") {
+					for (let j = ki; j <= kp.length; j++) {
+						if (go(pi + 1, j)) return true;
+					}
+					return false;
+				}
+				if (ki === kp.length) return false;
+				if (pp[pi] === "*" || pp[pi] === kp[ki]) return go(pi + 1, ki + 1);
+				return false;
+			}
+
+			return go(0, 0);
+		}
+
+		type QueueHandler = {
+			instance: any;
+			descriptor: RabbitMQMethodDescriptor;
+			noAck: boolean;
+			providerName: string;
+		};
+
 		// Fire-and-forget – connect asynchronously so startup is never blocked
 		(async () => {
 			try {
@@ -882,6 +925,12 @@ if (document.readyState === 'loading') {
 				return;
 			}
 
+			// ── Step 1: separate routing-key handlers from named-queue handlers ──
+			// Named-queue handlers are grouped by queue name so that a single AMQP
+			// consumer is created per queue and every message is fanned-out to all
+			// registered handlers in-process.
+			const queueMap = new Map<string, QueueHandler[]>();
+
 			for (const [providerClass, descriptors] of providersRabbitMQ.entries()) {
 				const instance = injectables?.get(providerClass) ?? new providerClass();
 
@@ -893,7 +942,7 @@ if (document.readyState === 'loading') {
 						noAck = false,
 					} = descriptor.options;
 
-					// ── Routing-key mode: exchange + routingKey ─────────────────────────
+					// ── Routing-key mode: exchange + routingKey ─────────────────────
 					if (exchange && routingKey) {
 						AppStartup.logger.log(
 							`Registering RabbitMQ consumer for exchange: "${exchange}" routingKey: "${routingKey}" → ${providerClass.name}.${descriptor.methodName}()`,
@@ -949,7 +998,7 @@ if (document.readyState === 'loading') {
 						continue;
 					}
 
-					// ── Direct queue mode ──────────────────────────────────────────────
+					// ── Queue mode: collect and group by queue name ─────────────────
 					if (!queue) {
 						AppStartup.logger.warn(
 							`@RabbitSubscribe on ${providerClass.name}.${descriptor.methodName}() has neither 'queue' nor 'exchange'+'routingKey' – skipping.`,
@@ -957,53 +1006,110 @@ if (document.readyState === 'loading') {
 						continue;
 					}
 
-					AppStartup.logger.log(
-						`Registering RabbitMQ consumer for queue: "${queue}" → ${providerClass.name}.${descriptor.methodName}()`,
-					);
+					if (!queueMap.has(queue)) queueMap.set(queue, []);
+					const queueHandlers = queueMap.get(queue) as QueueHandler[];
+					queueHandlers.push({
+						instance,
+						descriptor,
+						noAck,
+						providerName: providerClass.name,
+					});
+				}
+			}
 
-					try {
-						const channel = await RabbitMQConnection.getConsumerChannel(queue);
+			// ── Step 2: one AMQP consumer per unique queue, fan-out in-process ──
+			for (const [queue, handlers] of queueMap.entries()) {
+				// Use noAck only when every handler opts in; otherwise manual ack.
+				const noAck = handlers.every((h) => h.noAck);
 
-						await channel.consume(
-							queue,
-							async (raw) => {
-								if (!raw) return; // consumer cancelled
+				const handlerList = handlers
+					.map((h) => {
+						const rk = h.descriptor.options.routingKey;
+						return `${h.providerName}.${h.descriptor.methodName}()${rk ? ` [${rk}]` : ""}`;
+					})
+					.join(", ");
 
-								const data = (() => {
-									try {
-										return JSON.parse(raw.content.toString());
-									} catch {
-										return raw.content.toString();
-									}
-								})();
+				AppStartup.logger.log(
+					`Registering RabbitMQ consumer for queue: "${queue}" → [${handlerList}]`,
+				);
 
-								const msg: RabbitMessage = {
-									data,
-									raw,
-									ack: () => channel.ack(raw),
-									nack: (requeue = true) => channel.nack(raw, false, requeue),
-									reject: () => channel.reject(raw, false),
-								};
+				try {
+					const channel = await RabbitMQConnection.getConsumerChannel(queue);
+
+					await channel.consume(
+						queue,
+						async (raw) => {
+							if (!raw) return; // consumer cancelled
+
+							const data = (() => {
+								try {
+									return JSON.parse(raw.content.toString());
+								} catch {
+									return raw.content.toString();
+								}
+							})();
+
+							// Settle guard: ack/nack/reject may only be called once per
+							// delivery tag regardless of how many handlers invoke it.
+							let settled = false;
+							const settle = (fn: () => void) => {
+								if (!settled) {
+									settled = true;
+									fn();
+								}
+							};
+
+							const msg: RabbitMessage = {
+								data,
+								raw,
+								ack: () => settle(() => channel.ack(raw)),
+								nack: (requeue = true) =>
+									settle(() => channel.nack(raw, false, requeue)),
+								reject: () => settle(() => channel.reject(raw, false)),
+							};
+
+							for (const {
+								instance,
+								descriptor,
+								noAck: handlerNoAck,
+								providerName,
+							} of handlers) {
+								// ── Routing-key filter ─────────────────────────────────────────────
+								// When { queue, routingKey } is set without exchange, only dispatch
+								// if the message's routing key matches the declared pattern.
+								const handlerRoutingKey = descriptor.options.routingKey;
+								if (
+									handlerRoutingKey &&
+									!matchRoutingKey(handlerRoutingKey, raw.fields.routingKey)
+								) {
+									continue;
+								}
 
 								try {
 									await instance[descriptor.methodName](msg);
 								} catch (err: any) {
 									AppStartup.logger.error(
-										`Unhandled error in RabbitMQ handler ${providerClass.name}.${descriptor.methodName}() on queue "${queue}": ${err.message}`,
+										`Unhandled error in RabbitMQ handler ${providerName}.${descriptor.methodName}() on queue "${queue}": ${err.message}`,
 									);
-									if (!noAck) {
-										// Nack and requeue by default so the message isn't lost
-										channel.nack(raw, false, true);
+									if (!handlerNoAck && !settled) {
+										settle(() => channel.nack(raw, false, true));
 									}
 								}
-							},
-							{ noAck },
-						);
-					} catch (err: any) {
-						AppStartup.logger.error(
-							`Failed to register consumer for queue "${queue}": ${err.message}`,
-						);
-					}
+							}
+
+							// ── Auto-ack if no handler consumed the message ────────────────
+							// All handlers were filtered out by routingKey – ack silently
+							// to prevent the message from piling up as unacked.
+							if (!noAck && !settled) {
+								settle(() => channel.ack(raw));
+							}
+						},
+						{ noAck },
+					);
+				} catch (err: any) {
+					AppStartup.logger.error(
+						`Failed to register consumer for queue "${queue}": ${err.message}`,
+					);
 				}
 			}
 		})();

package/package.json

@@ -13,7 +13,7 @@
       "types": "./dist/*.d.ts"
     }
   },
-  "version": "0.4.0",
+  "version": "0.4.2",
   "homepage": "https://bunstone.diario.one/",
   "repository": {
     "url": "https://github.com/diariodaregiao/bunstone.git",