amqplib 1.0.4 → 1.0.5

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change log for amqplib
 
+## v1.0.5
+- Fix ConfirmChannel callbacks silently dropped on channel close when some publishes had no callback (fixes #191)
+
 ## v1.0.4
 - Updated build to use RabbitMQ 4.2
 - Fix memory leak in ConfirmChannel.publish when channel is already closed (fixes #842)

package/Makefile

@@ -2,7 +2,7 @@ RABBITMQ_SRC_VERSION=v3.12.13
 JSON=amqp-rabbitmq-0.9.1.json
 AMQP_JSON=https://raw.githubusercontent.com/rabbitmq/rabbitmq-server/$(RABBITMQ_SRC_VERSION)/deps/rabbitmq_codegen/$(JSON)
 
-NODEJS_VERSIONS='18.1.0' '20.10.0' '22.14.0' '24.7.0'
+NODEJS_VERSIONS='18.13.0' '20.10.0' '22.14.0' '24.7.0'
 
 UGLIFY=./node_modules/.bin/uglifyjs
 

package/lib/channel.js

@@ -33,11 +33,12 @@ class Channel extends EventEmitter {
       }),
     );
     this.on('close', function () {
-      let cb = this.unconfirmed.shift();
-      while (cb) {
-        if (cb) cb(new Error('channel closed'));
-        cb = this.unconfirmed.shift();
+      const err = new Error('channel closed');
+      for (let i = 0; i < this.unconfirmed.length; i++) {
+        const cb = this.unconfirmed[i];
+        if (cb) cb(err);
       }
+      this.unconfirmed = this.unconfirmed.filter((cb) => cb === false);
     });
     // message frame state machine
     this.handleMessage = acceptDeliveryOrReturn;

package/lib/channel_model.js

@@ -236,11 +236,11 @@ class ConfirmChannel extends Channel {
   waitForConfirms() {
     const awaiting = [];
     const unconfirmed = this.unconfirmed;
-    unconfirmed.forEach((val, index) => {
-      if (val !== null) {
+    unconfirmed.forEach((cb, index) => {
+      if (cb !== null) {
         const confirmed = new Promise((resolve, reject) => {
           unconfirmed[index] = (err) => {
-            if (val) val(err);
+            if (cb) cb(err);
             if (err === null) resolve();
             else reject(err);
           };
@@ -250,10 +250,10 @@ class ConfirmChannel extends Channel {
     });
     // Channel closed
     if (!this.pending) {
-      let cb = this.unconfirmed.shift();
-      while (cb) {
-        if (cb) cb(new Error('channel closed'));
-        cb = this.unconfirmed.shift();
+      const err = new Error('channel closed');
+      while (unconfirmed.length > 0) {
+        const cb = unconfirmed.shift();
+        if (cb) cb(err);
       }
     }
     return Promise.all(awaiting);

package/package.json

@@ -2,7 +2,7 @@
   "name": "amqplib",
   "homepage": "http://amqp-node.github.io/amqplib/",
   "main": "./channel_api.js",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "An AMQP 0-9-1 (e.g., RabbitMQ) library and client.",
   "repository": {
     "type": "git",

package/test/channel.test.js

@@ -588,5 +588,25 @@ describe('Channel', () => {
         send(defs.BasicAck, { deliveryTag: 1, multiple: false }, ch);
       }, cb);
     }));
+
+    // Regression test for https://github.com/amqp-node/amqplib/issues/191
+    // pushConfirmCallback stores `false` for publishes with no callback.
+    // The close drain used `while (cb)` which stops at the first `false`,
+    // silently dropping all callbacks that follow it.
+    it('invokes all pending callbacks on close even when some publishes had no callback', channelTest((ch, cb) => {
+      let called = 0;
+      const countErr = (err) => { if (err) called++; };
+      ch.pushConfirmCallback(countErr); // tag = 1 — has callback
+      ch.pushConfirmCallback(null);     // tag = 2 — no callback, stored as `false`
+      ch.pushConfirmCallback(countErr); // tag = 3 — has callback, dropped by while(cb) bug
+      open(ch).then(() => {
+        ch.toClosed('test close');
+        completes(() => {
+          assert.equal(2, called);
+        }, cb);
+      }, cb);
+    }, (_send, _wait, cb) => {
+      cb();
+    }));
   });
 });