Raise AMQPError when channelMax is reached

carlhoerberg · carlhoerberg · commit ab0db59cb3a9 · 2022-12-14T12:52:49.000+01:00
Rather then letting the server close the whole connection with a connection error. Fixes #43
diff --git a/src/amqp-base-client.ts b/src/amqp-base-client.ts
@@ -66,7 +66,8 @@ export abstract class AMQPBaseClient {
     if (!id)
       id = this.channels.findIndex((ch) => ch === undefined)
     if (id === -1) id = this.channels.length
-    // FIXME: check max channels (or let the server deal with that?)
+    if (id > this.channelMax) return Promise.reject(new AMQPError("Max number of channels reached", this))
+
     const channel = new AMQPChannel(this, id)
     this.channels[id] = channel
 
diff --git a/test/test.ts b/test/test.ts
@@ -664,3 +664,17 @@ test("can republish in consume block without race condition", async t => {
   await t.notThrowsAsync(() => conn.close())
   console.log(conn.bufferPool.length)
 })
+
+test("raises when channelMax is reached", async t => {
+  const amqp = new AMQPClient("amqp://127.0.0.1")
+  const conn = await amqp.connect()
+  for (let i = 0; i < conn.channelMax; i++) {
+    await conn.channel()
+  }
+  const error = await t.throwsAsync(conn.channel())
+  t.is(error.message, 'Max number of channels reached');
+
+  // make sure other channels still work
+  const ch1 = await conn.channel(1)
+  await t.notThrowsAsync(ch1.basicQos(10))
+})
