@zdavison/matador 2.0.2 → 2.0.3

package/dist/topology/builder.d.ts

@@ -31,10 +31,24 @@ export declare class TopologyBuilder {
     withNamespace(namespace: string): this;
     /**
      * Adds a queue to the topology.
+     * @param definition - A complete QueueDefinition object
+     */
+    addQueue(definition: QueueDefinition): this;
+    /**
+     * Adds a queue to the topology.
+     * @param name - Queue name
+     * @param options - Queue options
      */
     addQueue(name: string, options?: QueueOptions): this;
     /**
      * Alias for addQueue().
+     * @param definition - A complete QueueDefinition object
+     */
+    queue(definition: QueueDefinition): this;
+    /**
+     * Alias for addQueue().
+     * @param name - Queue name
+     * @param options - Queue options
      */
     queue(name: string, options?: QueueOptions): this;
     /**

package/dist/topology/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/topology/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,QAAQ,EACT,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAEzD;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,KAAM,YAAW,cAAc;aASxD,MAAM,EAAE,SAAS,MAAM,EAAE;IAR3C,QAAQ,CAAC,WAAW,SAIuC;gBAGzD,OAAO,EAAE,MAAM,EACC,MAAM,EAAE,SAAS,MAAM,EAAE;CAK5C;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B;;OAEG;IACH,MAAM,CAAC,MAAM,IAAI,eAAe;IAIhC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,UAAU,CAGhB;IACF,OAAO,CAAC,KAAK,CAIX;IAEF;;OAEG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAKtC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,IAAI;IAKxD;;OAEG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,IAAI;IAIrD;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI;IAQvD;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAS7C;;OAEG;IACH,YAAY,IAAI,IAAI;IAKpB;;OAEG;IACH,iBAAiB,IAAI,IAAI;IAQzB;;OAEG;IACH,QAAQ,IAAI,SAAS,MAAM,EAAE;IAsD7B;;;OAGG;IACH,KAAK,IAAI,QAAQ;CAgBlB"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../../src/topology/builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,KAAK,EACV,gBAAgB,EAChB,eAAe,EACf,WAAW,EACX,QAAQ,EACT,MAAM,YAAY,CAAC;AAEpB;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;AAWzD;;GAEG;AACH,qBAAa,uBAAwB,SAAQ,KAAM,YAAW,cAAc;aASxD,MAAM,EAAE,SAAS,MAAM,EAAE;IAR3C,QAAQ,CAAC,WAAW,SAIuC;gBAGzD,OAAO,EAAE,MAAM,EACC,MAAM,EAAE,SAAS,MAAM,EAAE;CAK5C;AAED;;GAEG;AACH,qBAAa,eAAe;IAC1B;;OAEG;IACH,MAAM,CAAC,MAAM,IAAI,eAAe;IAIhC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,UAAU,CAGhB;IACF,OAAO,CAAC,KAAK,CAIX;IAEF;;OAEG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAKtC;;;OAGG;IACH,QAAQ,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI;IAC3C;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI;IAapD;;;OAGG;IACH,KAAK,CAAC,UAAU,EAAE,eAAe,GAAG,IAAI;IACxC;;;;OAIG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,IAAI;IAWjD;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,IAAI;IAQvD;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI;IAS7C;;OAEG;IACH,YAAY,IAAI,IAAI;IAKpB;;OAEG;IACH,iBAAiB,IAAI,IAAI;IAQzB;;OAEG;IACH,QAAQ,IAAI,SAAS,MAAM,EAAE;IAsD7B;;;OAGG;IACH,KAAK,IAAI,QAAQ;CAgBlB"}

package/dist/topology/builder.js

@@ -1,3 +1,9 @@
+/**
+ * Type guard to check if the argument is a QueueDefinition object.
+ */
+function isQueueDefinition(arg) {
+    return typeof arg === 'object' && arg !== null && 'name' in arg;
+}
 /**
  * Error thrown when topology validation fails.
  */
@@ -41,18 +47,20 @@ export 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.

package/dist/topology/builder.test.js

@@ -219,4 +219,74 @@ describe('TopologyBuilder', () => {
             expect(topology.queues[0]?.exact).toBe(true);
         });
     });
+    describe('addQueue with QueueDefinition object', () => {
+        it('should accept a QueueDefinition object', () => {
+            const queueDef = {
+                name: 'events',
+                concurrency: 5,
+                consumerTimeout: 30000,
+            };
+            const topology = TopologyBuilder.create()
+                .withNamespace('test')
+                .addQueue(queueDef)
+                .build();
+            expect(topology.queues).toHaveLength(1);
+            expect(topology.queues[0]?.name).toBe('events');
+            expect(topology.queues[0]?.concurrency).toBe(5);
+            expect(topology.queues[0]?.consumerTimeout).toBe(30000);
+        });
+        it('should allow reusing queue definitions across builders', () => {
+            const sharedQueue = {
+                name: 'shared-queue',
+                concurrency: 10,
+                exact: true,
+            };
+            const topology1 = TopologyBuilder.create()
+                .withNamespace('app1')
+                .addQueue(sharedQueue)
+                .build();
+            const topology2 = TopologyBuilder.create()
+                .withNamespace('app2')
+                .addQueue(sharedQueue)
+                .build();
+            expect(topology1.queues[0]).toEqual(sharedQueue);
+            expect(topology2.queues[0]).toEqual(sharedQueue);
+        });
+        it('should work with queue() alias', () => {
+            const queueDef = {
+                name: 'analytics',
+                priorities: true,
+            };
+            const topology = TopologyBuilder.create()
+                .withNamespace('test')
+                .queue(queueDef)
+                .build();
+            expect(topology.queues[0]?.name).toBe('analytics');
+            expect(topology.queues[0]?.priorities).toBe(true);
+        });
+        it('should mix QueueDefinition objects with name+options style', () => {
+            const reusableQueue = {
+                name: 'shared',
+                concurrency: 3,
+            };
+            const topology = TopologyBuilder.create()
+                .withNamespace('test')
+                .addQueue(reusableQueue)
+                .addQueue('local', { concurrency: 1 })
+                .build();
+            expect(topology.queues).toHaveLength(2);
+            expect(topology.queues[0]?.name).toBe('shared');
+            expect(topology.queues[1]?.name).toBe('local');
+        });
+        it('should validate QueueDefinition objects the same way', () => {
+            const invalidQueue = {
+                name: '123invalid',
+                concurrency: 5,
+            };
+            const builder = TopologyBuilder.create()
+                .withNamespace('test')
+                .addQueue(invalidQueue);
+            expect(() => builder.build()).toThrow('must start with a letter');
+        });
+    });
 });

package/dist/transport/local/local-transport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/local/local-transport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACV,MAAM,iBAAiB,CAAC;AAiCzB;;;GAGG;AACH,qBAAa,cAAe,YAAW,SAAS;IAC9C,QAAQ,CAAC,IAAI,WAAW;IACxB,QAAQ,CAAC,YAAY,wBAAqB;IAE1C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAC7D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA2C;IACzE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwB;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4C;IAC1E,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAEpB,MAAM,CAAC,EAAE,MAAM;IAIrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBjC,WAAW,IAAI,OAAO;IAIhB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBhD,IAAI,CACR,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAe7B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;YAkBhB,OAAO;YAgBP,oBAAoB;IA4B5B,SAAS,CACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EACvB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,YAAY,CAAC;IAsClB,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAMhD,gBAAgB,CACpB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAQhB;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAMnC;;OAEG;IACH,YAAY,IAAI,SAAS,cAAc,EAAE;IAIzC;;OAEG;IACH,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,QAAQ,EAAE;IAMtD;;OAEG;IACH,KAAK,IAAI,IAAI;IAYb;;;OAGG;IACG,UAAU,CACd,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE,GAAG,IAAI,CAAC;IAmBlE,OAAO,CAAC,gBAAgB;CAQzB"}
+{"version":3,"file":"local-transport.d.ts","sourceRoot":"","sources":["../../../src/transport/local/local-transport.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,MAAM,EAAiB,MAAM,sBAAsB,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EACV,cAAc,EACd,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACV,MAAM,iBAAiB,CAAC;AAiCzB;;;GAGG;AACH,qBAAa,cAAe,YAAW,SAAS;IAC9C,QAAQ,CAAC,IAAI,WAAW;IACxB,QAAQ,CAAC,YAAY,wBAAqB;IAE1C,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsC;IAC7D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA2C;IACzE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwB;IAC1D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA4C;IAC1E,OAAO,CAAC,gBAAgB,CAAK;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;gBAEpB,MAAM,CAAC,EAAE,MAAM;IAIrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAiBjC,WAAW,IAAI,OAAO;IAIhB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBhD,IAAI,CACR,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,WAAW,GACpB,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAe7B;;;OAGG;IACH,OAAO,CAAC,sBAAsB;YAkBhB,OAAO;YAgBP,oBAAoB;IA+B5B,SAAS,CACb,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,cAAc,EACvB,OAAO,GAAE,gBAAqB,GAC7B,OAAO,CAAC,YAAY,CAAC;IAsClB,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAMhD,gBAAgB,CACpB,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;IAQhB;;OAEG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAMnC;;OAEG;IACH,YAAY,IAAI,SAAS,cAAc,EAAE;IAIzC;;OAEG;IACH,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,QAAQ,EAAE;IAMtD;;OAEG;IACH,KAAK,IAAI,IAAI;IAYb;;;OAGG;IACG,UAAU,CACd,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,OAAO,EAAE,cAAc,CAAA;KAAE,GAAG,IAAI,CAAC;IAmBlE,OAAO,CAAC,gBAAgB;CAQzB"}

package/dist/transport/rabbitmq/rabbitmq-transport.d.ts

@@ -21,6 +21,14 @@ export interface RabbitMQTransportConfig {
     /** Logger for transport events (defaults to console) */
     readonly logger?: Logger | undefined;
 }
+/**
+ * Redacts credentials from an AMQP URL.
+ * Replaces username and password with '****' regardless of their length.
+ *
+ * @example
+ * redactAmqpUrl('amqp://user:pass@host:5672') // 'amqp://****:****@host:5672'
+ */
+export declare function redactAmqpUrl(url: string): string;
 /**
  * RabbitMQ transport implementation using amqplib.
  */

package/dist/transport/rabbitmq/rabbitmq-transport.d.ts.map

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

package/dist/transport/rabbitmq/rabbitmq-transport.js

@@ -3,6 +3,17 @@ import { RabbitMQCodec } from '../../codec/rabbitmq-codec.js';
 import { DelayedMessagesNotSupportedError, TransportNotConnectedError, } from '../../errors/index.js';
 import { consoleLogger } from '../../hooks/index.js';
 import { ConnectionManager, } from '../connection-manager.js';
+/**
+ * Redacts credentials from an AMQP URL.
+ * Replaces username and password with '****' regardless of their length.
+ *
+ * @example
+ * redactAmqpUrl('amqp://user:pass@host:5672') // 'amqp://****:****@host:5672'
+ */
+export function redactAmqpUrl(url) {
+    const regex = /^(amqps?:\/\/)[^:]+:[^@]+@/;
+    return url.replace(regex, '$1****:****@');
+}
 /**
  * RabbitMQ transport implementation using amqplib.
  */
@@ -260,6 +271,7 @@ export class RabbitMQTransport {
         return queueChannel;
     }
     async doConnect() {
+        this.logger.info(`[Matador] ⏳ Connecting to RabbitMQ at '${redactAmqpUrl(this.config.url)}'.`);
         const connection = await amqplib.connect(this.config.url);
         this.connection = connection;
         // Handle connection errors - let ConnectionManager handle reconnection

package/dist/transport/rabbitmq/rabbitmq-transport.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=rabbitmq-transport.test.d.ts.map

package/dist/transport/rabbitmq/rabbitmq-transport.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rabbitmq-transport.test.d.ts","sourceRoot":"","sources":["../../../src/transport/rabbitmq/rabbitmq-transport.test.ts"],"names":[],"mappings":""}

package/dist/transport/rabbitmq/rabbitmq-transport.test.js

@@ -0,0 +1,98 @@
+import { describe, expect, it, mock } from 'bun:test';
+import { redactAmqpUrl, RabbitMQTransport } from './rabbitmq-transport.js';
+describe('redactAmqpUrl', () => {
+    it('should redact username and password with 4 asterisks', () => {
+        const url = 'amqp://myuser:mypassword@localhost:5672';
+        const redacted = redactAmqpUrl(url);
+        expect(redacted).toBe('amqp://****:****@localhost:5672');
+    });
+    it('should redact credentials in amqps URLs', () => {
+        const url = 'amqps://admin:secret123@rabbitmq.example.com:5671';
+        const redacted = redactAmqpUrl(url);
+        expect(redacted).toBe('amqps://****:****@rabbitmq.example.com:5671');
+    });
+    it('should redact long credentials to exactly 4 asterisks', () => {
+        const url = 'amqp://verylongusername:verylongpassword@rabbitmq-cluster.svc.local:5672';
+        const redacted = redactAmqpUrl(url);
+        expect(redacted).toBe('amqp://****:****@rabbitmq-cluster.svc.local:5672');
+    });
+    it('should redact short credentials to exactly 4 asterisks', () => {
+        const url = 'amqp://a:b@host:5672';
+        const redacted = redactAmqpUrl(url);
+        expect(redacted).toBe('amqp://****:****@host:5672');
+    });
+    it('should preserve vhost in URL', () => {
+        const url = 'amqp://user:pass@host:5672/myvhost';
+        const redacted = redactAmqpUrl(url);
+        expect(redacted).toBe('amqp://****:****@host:5672/myvhost');
+    });
+    it('should not modify URL without credentials', () => {
+        const url = 'amqp://localhost:5672';
+        const redacted = redactAmqpUrl(url);
+        expect(redacted).toBe('amqp://localhost:5672');
+    });
+    it('should not modify URL with only username (no password)', () => {
+        const url = 'amqp://guest@localhost:5672';
+        const redacted = redactAmqpUrl(url);
+        expect(redacted).toBe('amqp://guest@localhost:5672');
+    });
+    it('should handle URL-encoded credentials', () => {
+        // URL-encoded @ in password: p%40ssword
+        const url = 'amqp://user:p%40ssword@host:5672';
+        const redacted = redactAmqpUrl(url);
+        expect(redacted).toBe('amqp://****:****@host:5672');
+    });
+});
+describe('RabbitMQTransport', () => {
+    describe('connection logging', () => {
+        it('should log redacted connection URL when connecting', async () => {
+            const mockLogger = {
+                debug: mock(() => { }),
+                info: mock(() => { }),
+                warn: mock(() => { }),
+                error: mock(() => { }),
+            };
+            const transport = new RabbitMQTransport({
+                url: 'amqp://testuser:testpass@localhost:5672',
+                logger: mockLogger,
+                connection: {
+                    maxReconnectAttempts: 1, // Only try once to avoid long retries
+                    initialReconnectDelay: 10,
+                },
+            });
+            // Attempt to connect - it will fail since there's no RabbitMQ server
+            // but the log should still be emitted before the connection attempt
+            try {
+                await transport.connect();
+            }
+            catch {
+                // Expected to fail - no RabbitMQ server running
+            }
+            // Verify the log was called with the redacted URL
+            expect(mockLogger.info).toHaveBeenCalledWith("[Matador] \u23F3 Connecting to RabbitMQ at 'amqp://****:****@localhost:5672'.");
+        });
+        it('should log connection URL as-is when no credentials provided', async () => {
+            const mockLogger = {
+                debug: mock(() => { }),
+                info: mock(() => { }),
+                warn: mock(() => { }),
+                error: mock(() => { }),
+            };
+            const transport = new RabbitMQTransport({
+                url: 'amqp://localhost:5672',
+                logger: mockLogger,
+                connection: {
+                    maxReconnectAttempts: 1,
+                    initialReconnectDelay: 10,
+                },
+            });
+            try {
+                await transport.connect();
+            }
+            catch {
+                // Expected to fail
+            }
+            expect(mockLogger.info).toHaveBeenCalledWith("[Matador] \u23F3 Connecting to RabbitMQ at 'amqp://localhost:5672'.");
+        });
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zdavison/matador",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A batteries-included event system.",
   "type": "module",
   "main": "./dist/index.cjs",

package/src/core/matador.ts

@@ -199,12 +199,23 @@ export class Matador {
     }
 
     // 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,

package/src/topology/builder.test.ts

@@ -272,4 +272,90 @@ describe('TopologyBuilder', () => {
       expect(topology.queues[0]?.exact).toBe(true);
     });
   });
+
+  describe('addQueue with QueueDefinition object', () => {
+    it('should accept a QueueDefinition object', () => {
+      const queueDef = {
+        name: 'events',
+        concurrency: 5,
+        consumerTimeout: 30000,
+      };
+
+      const topology = TopologyBuilder.create()
+        .withNamespace('test')
+        .addQueue(queueDef)
+        .build();
+
+      expect(topology.queues).toHaveLength(1);
+      expect(topology.queues[0]?.name).toBe('events');
+      expect(topology.queues[0]?.concurrency).toBe(5);
+      expect(topology.queues[0]?.consumerTimeout).toBe(30000);
+    });
+
+    it('should allow reusing queue definitions across builders', () => {
+      const sharedQueue = {
+        name: 'shared-queue',
+        concurrency: 10,
+        exact: true,
+      };
+
+      const topology1 = TopologyBuilder.create()
+        .withNamespace('app1')
+        .addQueue(sharedQueue)
+        .build();
+
+      const topology2 = TopologyBuilder.create()
+        .withNamespace('app2')
+        .addQueue(sharedQueue)
+        .build();
+
+      expect(topology1.queues[0]).toEqual(sharedQueue);
+      expect(topology2.queues[0]).toEqual(sharedQueue);
+    });
+
+    it('should work with queue() alias', () => {
+      const queueDef = {
+        name: 'analytics',
+        priorities: true,
+      };
+
+      const topology = TopologyBuilder.create()
+        .withNamespace('test')
+        .queue(queueDef)
+        .build();
+
+      expect(topology.queues[0]?.name).toBe('analytics');
+      expect(topology.queues[0]?.priorities).toBe(true);
+    });
+
+    it('should mix QueueDefinition objects with name+options style', () => {
+      const reusableQueue = {
+        name: 'shared',
+        concurrency: 3,
+      };
+
+      const topology = TopologyBuilder.create()
+        .withNamespace('test')
+        .addQueue(reusableQueue)
+        .addQueue('local', { concurrency: 1 })
+        .build();
+
+      expect(topology.queues).toHaveLength(2);
+      expect(topology.queues[0]?.name).toBe('shared');
+      expect(topology.queues[1]?.name).toBe('local');
+    });
+
+    it('should validate QueueDefinition objects the same way', () => {
+      const invalidQueue = {
+        name: '123invalid',
+        concurrency: 5,
+      };
+
+      const builder = TopologyBuilder.create()
+        .withNamespace('test')
+        .addQueue(invalidQueue);
+
+      expect(() => builder.build()).toThrow('must start with a letter');
+    });
+  });
 });

package/src/topology/builder.ts

@@ -12,6 +12,15 @@ import type {
  */
 export type QueueOptions = Omit<QueueDefinition, 'name'>;
 
+/**
+ * Type guard to check if the argument is a QueueDefinition object.
+ */
+function isQueueDefinition(
+  arg: string | QueueDefinition,
+): arg is QueueDefinition {
+  return typeof arg === 'object' && arg !== null && 'name' in arg;
+}
+
 /**
  * Error thrown when topology validation fails.
  */
@@ -64,17 +73,46 @@ export class TopologyBuilder {
 
   /**
    * Adds a queue to the topology.
+   * @param definition - A complete QueueDefinition object
+   */
+  addQueue(definition: QueueDefinition): this;
+  /**
+   * Adds a queue to the topology.
+   * @param name - Queue name
+   * @param options - Queue options
    */
-  addQueue(name: string, options: QueueOptions = {}): this {
-    this.queues.push({ name, ...options });
+  addQueue(name: string, options?: QueueOptions): this;
+  addQueue(
+    nameOrDefinition: string | QueueDefinition,
+    options: QueueOptions = {},
+  ): this {
+    if (isQueueDefinition(nameOrDefinition)) {
+      this.queues.push(nameOrDefinition);
+    } else {
+      this.queues.push({ name: nameOrDefinition, ...options });
+    }
     return this;
   }
 
   /**
    * Alias for addQueue().
+   * @param definition - A complete QueueDefinition object
+   */
+  queue(definition: QueueDefinition): this;
+  /**
+   * Alias for addQueue().
+   * @param name - Queue name
+   * @param options - Queue options
    */
-  queue(name: string, options: QueueOptions = {}): this {
-    return this.addQueue(name, options);
+  queue(name: string, options?: QueueOptions): this;
+  queue(
+    nameOrDefinition: string | QueueDefinition,
+    options: QueueOptions = {},
+  ): this {
+    if (isQueueDefinition(nameOrDefinition)) {
+      return this.addQueue(nameOrDefinition);
+    }
+    return this.addQueue(nameOrDefinition, options);
   }
 
   /**

package/src/transport/local/local-transport.ts

@@ -185,7 +185,10 @@ export class LocalTransport implements Transport {
         await sub.handler(message.envelope, receipt);
       } catch (error) {
         // Handler errors should be caught in the pipeline
-        this.logger.error('[Matador] 🔴 Handler error in message processing', error);
+        this.logger.error(
+          '[Matador] 🔴 Handler error in message processing',
+          error,
+        );
       }
     }
   }

package/src/transport/rabbitmq/rabbitmq-transport.test.ts

@@ -0,0 +1,118 @@
+import { describe, expect, it, mock } from 'bun:test';
+import type { Logger } from '../../hooks/index.js';
+import { redactAmqpUrl, RabbitMQTransport } from './rabbitmq-transport.js';
+
+describe('redactAmqpUrl', () => {
+  it('should redact username and password with 4 asterisks', () => {
+    const url = 'amqp://myuser:mypassword@localhost:5672';
+    const redacted = redactAmqpUrl(url);
+    expect(redacted).toBe('amqp://****:****@localhost:5672');
+  });
+
+  it('should redact credentials in amqps URLs', () => {
+    const url = 'amqps://admin:secret123@rabbitmq.example.com:5671';
+    const redacted = redactAmqpUrl(url);
+    expect(redacted).toBe('amqps://****:****@rabbitmq.example.com:5671');
+  });
+
+  it('should redact long credentials to exactly 4 asterisks', () => {
+    const url =
+      'amqp://verylongusername:verylongpassword@rabbitmq-cluster.svc.local:5672';
+    const redacted = redactAmqpUrl(url);
+    expect(redacted).toBe('amqp://****:****@rabbitmq-cluster.svc.local:5672');
+  });
+
+  it('should redact short credentials to exactly 4 asterisks', () => {
+    const url = 'amqp://a:b@host:5672';
+    const redacted = redactAmqpUrl(url);
+    expect(redacted).toBe('amqp://****:****@host:5672');
+  });
+
+  it('should preserve vhost in URL', () => {
+    const url = 'amqp://user:pass@host:5672/myvhost';
+    const redacted = redactAmqpUrl(url);
+    expect(redacted).toBe('amqp://****:****@host:5672/myvhost');
+  });
+
+  it('should not modify URL without credentials', () => {
+    const url = 'amqp://localhost:5672';
+    const redacted = redactAmqpUrl(url);
+    expect(redacted).toBe('amqp://localhost:5672');
+  });
+
+  it('should not modify URL with only username (no password)', () => {
+    const url = 'amqp://guest@localhost:5672';
+    const redacted = redactAmqpUrl(url);
+    expect(redacted).toBe('amqp://guest@localhost:5672');
+  });
+
+  it('should handle URL-encoded credentials', () => {
+    // URL-encoded @ in password: p%40ssword
+    const url = 'amqp://user:p%40ssword@host:5672';
+    const redacted = redactAmqpUrl(url);
+    expect(redacted).toBe('amqp://****:****@host:5672');
+  });
+});
+
+describe('RabbitMQTransport', () => {
+  describe('connection logging', () => {
+    it('should log redacted connection URL when connecting', async () => {
+      const mockLogger: Logger = {
+        debug: mock(() => {}),
+        info: mock(() => {}),
+        warn: mock(() => {}),
+        error: mock(() => {}),
+      };
+
+      const transport = new RabbitMQTransport({
+        url: 'amqp://testuser:testpass@localhost:5672',
+        logger: mockLogger,
+        connection: {
+          maxReconnectAttempts: 1, // Only try once to avoid long retries
+          initialReconnectDelay: 10,
+        },
+      });
+
+      // Attempt to connect - it will fail since there's no RabbitMQ server
+      // but the log should still be emitted before the connection attempt
+      try {
+        await transport.connect();
+      } catch {
+        // Expected to fail - no RabbitMQ server running
+      }
+
+      // Verify the log was called with the redacted URL
+      expect(mockLogger.info).toHaveBeenCalledWith(
+        "[Matador] \u23F3 Connecting to RabbitMQ at 'amqp://****:****@localhost:5672'.",
+      );
+    });
+
+    it('should log connection URL as-is when no credentials provided', async () => {
+      const mockLogger: Logger = {
+        debug: mock(() => {}),
+        info: mock(() => {}),
+        warn: mock(() => {}),
+        error: mock(() => {}),
+      };
+
+      const transport = new RabbitMQTransport({
+        url: 'amqp://localhost:5672',
+        logger: mockLogger,
+        connection: {
+          maxReconnectAttempts: 1,
+          initialReconnectDelay: 10,
+        },
+      });
+
+      try {
+        await transport.connect();
+      } catch {
+        // Expected to fail
+      }
+
+      expect(mockLogger.info).toHaveBeenCalledWith(
+        "[Matador] \u23F3 Connecting to RabbitMQ at 'amqp://localhost:5672'.",
+      );
+    });
+  });
+});