@zdavison/matador 2.0.2 → 2.0.4

package/dist/core/matador.d.ts

@@ -5,7 +5,7 @@ import type { RetryPolicy } from '../retry/index.js';
 import type { MatadorSchema } from '../schema/index.js';
 import type { Topology } from '../topology/index.js';
 import type { Transport } from '../transport/index.js';
-import type { AnySubscriber, Event, EventClass, EventOptions } from '../types/index.js';
+import type { AnySubscriber, Dispatcher, Event, EventClass, EventOptions } from '../types/index.js';
 import type { SendResult } from './fanout.js';
 import type { HandlersState, ShutdownConfig } from './shutdown.js';
 /**
@@ -44,7 +44,7 @@ export interface MatadorConfig {
  * - Fanout: Event sending
  * - Shutdown: Graceful termination
  */
-export declare class Matador {
+export declare class Matador implements Dispatcher {
     private readonly transport;
     private readonly topology;
     private readonly schema;

package/dist/core/matador.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matador.d.ts","sourceRoot":"","sources":["../../src/core/matador.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"matador.d.ts","sourceRoot":"","sources":["../../src/core/matador.ts"],"names":[],"mappings":"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"}

package/dist/core/matador.js

@@ -56,6 +56,7 @@ export class Matador {
             retryPolicy: this.retryPolicy,
             hooks: this.hooks,
             checkpointStore: config.checkpointStore,
+            dispatcher: this,
         });
         // Create fanout engine
         const defaultQueue = this.topology.queues[0]?.name ?? 'default';
@@ -124,10 +125,15 @@ export class Matador {
             throw new InvalidSchemaError('Schema validation failed', errors.map((e) => e.message).join(', '));
         }
         // Connect transport
+        this.hooks.logger.info(`[Matador] ⏳ Starting backend '${this.transport.name}'...`);
         await this.transport.connect();
+        this.hooks.logger.info(`[Matador] 🟢 Backend '${this.transport.name}' started.`);
         // Apply topology
         await this.transport.applyTopology(this.topology);
         // Subscribe to queues
+        if (this.consumeFrom.length > 0) {
+            this.hooks.logger.info(`[Matador] 🟢 Worker subscribing to '${this.consumeFrom.join(',')}'.`);
+        }
         for (const queueName of this.consumeFrom) {
             const qualifiedName = getQualifiedQueueName(this.topology.namespace, queueName);
             const queueDef = this.topology.queues.find((q) => q.name === queueName);

package/dist/index.cjs

@@ -330,8 +330,17 @@ function getDeadLetterQueueName(namespace, queueName, dlqType) {
 function getRetryQueueName(namespace, queueName) {
   return `${namespace}.${queueName}.retry`;
 }
+function resolveQueueName(namespace, queueDef) {
+  if (queueDef.exact) {
+    return queueDef.name;
+  }
+  return `${namespace}.${queueDef.name}`;
+}
 
 // src/topology/builder.ts
+function isQueueDefinition(arg) {
+  return typeof arg === "object" && arg !== null && "name" in arg;
+}
 var TopologyValidationError = class extends Error {
   constructor(message, issues) {
     super(message);
@@ -366,18 +375,19 @@ var TopologyBuilder = class _TopologyBuilder {
     this.namespace = namespace;
     return this;
   }
-  /**
-   * Adds a queue to the topology.
-   */
-  addQueue(name, options = {}) {
-    this.queues.push({ name, ...options });
+  addQueue(nameOrDefinition, options = {}) {
+    if (isQueueDefinition(nameOrDefinition)) {
+      this.queues.push(nameOrDefinition);
+    } else {
+      this.queues.push({ name: nameOrDefinition, ...options });
+    }
     return this;
   }
-  /**
-   * Alias for addQueue().
-   */
-  queue(name, options = {}) {
-    return this.addQueue(name, options);
+  queue(nameOrDefinition, options = {}) {
+    if (isQueueDefinition(nameOrDefinition)) {
+      return this.addQueue(nameOrDefinition);
+    }
+    return this.addQueue(nameOrDefinition, options);
   }
   /**
    * Configures dead-letter queue settings.
@@ -436,7 +446,7 @@ var TopologyBuilder = class _TopologyBuilder {
     for (const queue of this.queues) {
       if (!queue.name || queue.name.trim() === "") {
         issues.push("Queue name cannot be empty");
-      } else if (!/^[a-zA-Z][a-zA-Z0-9_-]*$/.test(queue.name)) {
+      } else if (!queue.exact && !/^[a-zA-Z][a-zA-Z0-9_-]*$/.test(queue.name)) {
         issues.push(
           `Queue name "${queue.name}" must start with a letter and contain only alphanumeric characters, underscores, and hyphens`
         );
@@ -1402,6 +1412,7 @@ var ProcessingPipeline = class {
   retryPolicy;
   hooks;
   checkpointStore;
+  dispatcher;
   constructor(config) {
     this.transport = config.transport;
     this.schema = config.schema;
@@ -1409,6 +1420,7 @@ var ProcessingPipeline = class {
     this.retryPolicy = config.retryPolicy;
     this.hooks = config.hooks;
     this.checkpointStore = config.checkpointStore ?? new NoOpCheckpointStore();
+    this.dispatcher = config.dispatcher;
   }
   /**
    * Processes a raw message from the transport.
@@ -1495,15 +1507,23 @@ var ProcessingPipeline = class {
         }
       });
     }
+    const callbackContext = { matador: this.dispatcher };
     await this.hooks.onWorkerWrap(envelope, subscriberDef, async () => {
       await this.hooks.onWorkerBeforeProcess(envelope, subscriberDef);
       try {
         if (isResumable && context) {
           const resumableCallback = subscriber.callback;
-          result = await resumableCallback(envelope, context);
+          const fullContext = {
+            io: context.io.bind(context),
+            all: context.all.bind(context),
+            attempt: context.attempt,
+            isRetry: context.isRetry,
+            matador: this.dispatcher
+          };
+          result = await resumableCallback(envelope, fullContext);
         } else {
           const standardCallback = subscriber.callback;
-          result = await standardCallback(envelope);
+          result = await standardCallback(envelope, callbackContext);
         }
       } catch (e) {
         error = e instanceof Error ? e : new Error(String(e));
@@ -1936,7 +1956,8 @@ var Matador = class {
       codec: this.codec,
       retryPolicy: this.retryPolicy,
       hooks: this.hooks,
-      checkpointStore: config.checkpointStore
+      checkpointStore: config.checkpointStore,
+      dispatcher: this
     });
     const defaultQueue = this.topology.queues[0]?.name ?? "default";
     this.fanout = new FanoutEngine({
@@ -2005,8 +2026,19 @@ var Matador = class {
         errors.map((e) => e.message).join(", ")
       );
     }
+    this.hooks.logger.info(
+      `[Matador] \u23F3 Starting backend '${this.transport.name}'...`
+    );
     await this.transport.connect();
+    this.hooks.logger.info(
+      `[Matador] \u{1F7E2} Backend '${this.transport.name}' started.`
+    );
     await this.transport.applyTopology(this.topology);
+    if (this.consumeFrom.length > 0) {
+      this.hooks.logger.info(
+        `[Matador] \u{1F7E2} Worker subscribing to '${this.consumeFrom.join(",")}'.`
+      );
+    }
     for (const queueName of this.consumeFrom) {
       const qualifiedName = getQualifiedQueueName(
         this.topology.namespace,
@@ -2350,7 +2382,10 @@ var LocalTransport = class {
       try {
         await sub.handler(message.envelope, receipt);
       } catch (error) {
-        this.logger.error("[Matador] \u{1F534} Handler error in message processing", error);
+        this.logger.error(
+          "[Matador] \u{1F534} Handler error in message processing",
+          error
+        );
       }
     }
   }
@@ -2600,6 +2635,10 @@ var MultiTransport = class {
     throw new Error("Transport does not support dead letter routing");
   }
 };
+function redactAmqpUrl(url) {
+  const regex = /^(amqps?:\/\/)[^:]+:[^@]+@/;
+  return url.replace(regex, "$1****:****@");
+}
 var RabbitMQTransport = class {
   name = "rabbitmq";
   _capabilities = {
@@ -2856,6 +2895,9 @@ var RabbitMQTransport = class {
     return queueChannel;
   }
   async doConnect() {
+    this.logger.info(
+      `[Matador] \u23F3 Connecting to RabbitMQ at '${redactAmqpUrl(this.config.url)}'.`
+    );
     const connection = await amqplib__default.default.connect(this.config.url);
     this.connection = connection;
     connection.on("error", (err) => {
@@ -2961,24 +3003,29 @@ var RabbitMQTransport = class {
   }
   async assertWorkQueue(channel, topology, queueDef) {
     const queueName = queueDef.exact ? queueDef.name : `${topology.namespace}.${queueDef.name}`;
-    const queueOptions = {
-      durable: true,
-      arguments: {}
-    };
-    if (this.config.quorumQueues && !queueDef.exact) {
-      queueOptions.arguments["x-queue-type"] = "quorum";
-    }
-    const dlxExchange = this.getDLXExchangeName(topology.namespace);
-    if (topology.deadLetter.unhandled.enabled || topology.deadLetter.undeliverable.enabled) {
-      queueOptions.arguments["x-dead-letter-exchange"] = dlxExchange;
-    }
-    if (queueDef.priorities) {
-      queueOptions.arguments["x-max-priority"] = 10;
-    }
-    if (queueDef.consumerTimeout) {
-      queueOptions.arguments["x-consumer-timeout"] = queueDef.consumerTimeout;
+    const rabbitmqOptions = queueDef.transport?.rabbitmq?.options;
+    if (rabbitmqOptions) {
+      await channel.assertQueue(queueName, rabbitmqOptions);
+    } else {
+      const queueOptions = {
+        durable: true,
+        arguments: {}
+      };
+      if (this.config.quorumQueues && !queueDef.exact) {
+        queueOptions.arguments["x-queue-type"] = "quorum";
+      }
+      const dlxExchange = this.getDLXExchangeName(topology.namespace);
+      if (topology.deadLetter.unhandled.enabled || topology.deadLetter.undeliverable.enabled) {
+        queueOptions.arguments["x-dead-letter-exchange"] = dlxExchange;
+      }
+      if (queueDef.priorities) {
+        queueOptions.arguments["x-max-priority"] = 10;
+      }
+      if (queueDef.consumerTimeout) {
+        queueOptions.arguments["x-consumer-timeout"] = queueDef.consumerTimeout;
+      }
+      await channel.assertQueue(queueName, queueOptions);
     }
-    await channel.assertQueue(queueName, queueOptions);
     const mainExchange = this.getMainExchangeName(topology.namespace);
     await channel.bindQueue(queueName, mainExchange, queueName);
     if (this.delayedExchangeAvailable) {
@@ -3149,6 +3196,7 @@ exports.isSubscriber = isSubscriber;
 exports.isSubscriberNotRegisteredError = isSubscriberNotRegisteredError;
 exports.isSubscriberStub = isSubscriberStub;
 exports.isTransportNotConnectedError = isTransportNotConnectedError;
+exports.resolveQueueName = resolveQueueName;
 exports.supportsDelayedMessages = supportsDelayedMessages;
 exports.supportsDeliveryMode = supportsDeliveryMode;
 exports.validResult = validResult;