amqplib 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change log for amqplib
 
+## v1.1.1
+- Forward `handler-error` events from the underlying connection to the recovery wrapper, so listeners attached to `RecoveringPromiseModel`/`RecoveringCallbackModel` receive handler errors
+
 ## v1.1.0
 - Add connection recovery via `connectWithRecoveryPromise` and `connectWithRecoveryCallback` — automatically reconnects on connection loss with configurable backoff delay, jitter, and retry limits (thanks [@ShiriNmi1520](https://github.com/ShiriNmi1520))
 

package/lib/recovery.js

@@ -220,12 +220,14 @@ class RecoveringCore extends EventEmitter {
     const onUnblocked = () => this.emit('unblocked');
     const onConnectionError = (err) => this.emit('error', err);
     const onUpdateSecretOk = () => this.emit('update-secret-ok');
+    const onHandlerError = (err, event) => this.emit('handler-error', err, event);
 
     model.on('close', onClose);
     model.on('blocked', onBlocked);
     model.on('unblocked', onUnblocked);
     model.on('error', onConnectionError);
     model.on('update-secret-ok', onUpdateSecretOk);
+    model.on('handler-error', onHandlerError);
 
     this._modelListeners = {
       model,
@@ -234,17 +236,19 @@ class RecoveringCore extends EventEmitter {
       onUnblocked,
       onConnectionError,
       onUpdateSecretOk,
+      onHandlerError,
     };
   }
 
   _unbindModel() {
     if (!this._modelListeners) return;
-    const { model, onClose, onBlocked, onUnblocked, onConnectionError, onUpdateSecretOk } = this._modelListeners;
+    const { model, onClose, onBlocked, onUnblocked, onConnectionError, onUpdateSecretOk, onHandlerError } = this._modelListeners;
     model.removeListener('close', onClose);
     model.removeListener('blocked', onBlocked);
     model.removeListener('unblocked', onUnblocked);
     model.removeListener('error', onConnectionError);
     model.removeListener('update-secret-ok', onUpdateSecretOk);
+    model.removeListener('handler-error', onHandlerError);
     model.on('error', () => {});
     this._modelListeners = null;
   }
@@ -366,6 +370,7 @@ function wireCommonEvents(source, target) {
     'unblocked',
     'error',
     'update-secret-ok',
+    'handler-error',
   ].forEach((eventName) => {
     source.on(eventName, (...args) => target.emit(eventName, ...args));
   });

package/package.json

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

package/test/recovery.test.js

@@ -167,6 +167,38 @@ describe('recovery', () => {
     assert(client);
   });
 
+  it('handler-error from underlying model is forwarded to recovery wrapper', async () => {
+    const models = [];
+    let opened = 0;
+
+    function openModel() {
+      const model = new FakePromiseModel(++opened);
+      models.push(model);
+      return Promise.resolve(model);
+    }
+
+    const client = await recovery.connectWithRecoveryPromise(openModel, {
+      initialDelay: 1,
+      maxDelay: 1,
+      jitter: 0,
+    });
+
+    const expectedErr = new Error('user close handler explodes');
+
+    await new Promise((resolve) => {
+      client.on('handler-error', (err, event) => {
+        assert.strictEqual(err, expectedErr);
+        assert.strictEqual(event, 'close');
+        resolve();
+      });
+
+      // Simulate a handler throwing in a 'close' listener on the underlying model
+      models[0].emit('handler-error', expectedErr, 'close');
+    });
+
+    await client.close();
+  });
+
   it('promise recovery fails after max retries', async () => {
     let attempts = 0;