Accept AMQPExchange handle in AMQPQueue bind/unbind

baelter · baelter · commit 0a2ae9179b09 · 2026-05-07T15:21:12.000+02:00
AMQPExchange.bind/unbind already accept `string | AMQPExchange`. Mirror
that on AMQPQueue so users don't have to reach for `exchange.name` after
working with the exchange handle.

  await queue.bind(exchange, "user-id")  // now works
diff --git a/src/amqp-queue.ts b/src/amqp-queue.ts
@@ -5,6 +5,7 @@ import { AMQPConsumer, AMQPGeneratorConsumer } from "./amqp-consumer.js"
 import { AMQPSubscription, AMQPGeneratorSubscription } from "./amqp-subscription.js"
 import type { ConsumerDefinition } from "./amqp-subscription.js"
 import type { AMQPSession } from "./amqp-session.js"
+import type { AMQPExchange } from "./amqp-exchange.js"
 import type { ResolveBody } from "./amqp-publisher.js"
 import { serializeAndEncode, decodeMessage } from "./amqp-codec-registry.js"
 import type { ParserMap, CoderMap } from "./amqp-codec-registry.js"
@@ -153,9 +154,14 @@ export class AMQPQueue<
    * Bind this queue to an exchange.
    * @returns `this` for chaining
    */
-  async bind(exchange: string, routingKey = "", args: Record<string, unknown> = {}): Promise<AMQPQueue<P, C, KP, KC>> {
+  async bind(
+    exchange: string | AMQPExchange<P, C, KP, KC>,
+    routingKey = "",
+    args: Record<string, unknown> = {},
+  ): Promise<AMQPQueue<P, C, KP, KC>> {
+    const exchangeName = typeof exchange === "string" ? exchange : exchange.name
     const ch = await this.session.getOpsChannel()
-    await ch.queueBind(this.name, exchange, routingKey, args)
+    await ch.queueBind(this.name, exchangeName, routingKey, args)
     return this
   }
 
@@ -164,12 +170,13 @@ export class AMQPQueue<
    * @returns `this` for chaining
    */
   async unbind(
-    exchange: string,
+    exchange: string | AMQPExchange<P, C, KP, KC>,
     routingKey = "",
     args: Record<string, unknown> = {},
   ): Promise<AMQPQueue<P, C, KP, KC>> {
+    const exchangeName = typeof exchange === "string" ? exchange : exchange.name
     const ch = await this.session.getOpsChannel()
-    await ch.queueUnbind(this.name, exchange, routingKey, args)
+    await ch.queueUnbind(this.name, exchangeName, routingKey, args)
     return this
   }
 
diff --git a/test/amqp-session.ts b/test/amqp-session.ts
@@ -430,6 +430,15 @@ test("AMQPQueue.bind() and unbind()", () =>
     await expect(q.unbind("amq.topic", "test.key")).resolves.toBeInstanceOf(AMQPQueue)
   }))
 
+test("AMQPQueue.bind() and unbind() accept an AMQPExchange handle", () =>
+  withSession(async (session) => {
+    const x = await session.topicExchange("amq.topic")
+    const q = await session.queue("test-q-bind-handle-" + Math.random(), { durable: false, autoDelete: true })
+
+    await expect(q.bind(x, "test.key")).resolves.toBeInstanceOf(AMQPQueue)
+    await expect(q.unbind(x, "test.key")).resolves.toBeInstanceOf(AMQPQueue)
+  }))
+
 test("AMQPQueue.purge() empties the queue", () =>
   withSession(async (session) => {
     const q = await session.queue("test-q-purge-" + Math.random(), { durable: false, autoDelete: true })
