rascal 14.4.3 → 14.4.4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 14.4.4
+
+- Fixed issue where channels were not returned to the pool after publishing a large messag - See https://github.com/guidesmiths/rascal/issues/199
+
 ## 14.4.3
 
 - Bump dependencies

package/lib/amqp/Publication.js

@@ -169,6 +169,7 @@ function addListeners(channel, errorHandler, returnHandler) {
 }
 
 function removeListeners(channel, errorHandler, returnHandler) {
+  channel.removeAllListeners('drain');
   channel.removeListener('error', errorHandler);
   channel.removeListener('return', returnHandler);
   channel.connection.removeListener('error', errorHandler);
@@ -177,37 +178,65 @@ function removeListeners(channel, errorHandler, returnHandler) {
 
 function publishToExchange(channel, content, config, next) {
   debug('Publishing %d bytes to exchange: %s with routingKeys: %s', content.length, config.exchange, _.compact([].concat(config.routingKey, config.options.CC, config.options.BCC)).join(', '));
-  const ok = channel.publish(config.destination, config.routingKey, content, config.options);
-  next(null, ok);
+
+  const fn = () => {
+    return channel.publish(config.destination, config.routingKey, content, config.options);
+  };
+
+  publishNoConfirm(fn, channel, next);
 }
 
 function publishToConfirmExchange(channel, content, config, next) {
   debug('Publishing %d bytes to confirm exchange: %s with routingKeys: %s', content.length, config.exchange, _.compact([].concat(config.routingKey, config.options.CC, config.options.BCC)).join(', '));
 
-  const once = _.once(next);
-  const timeout = config.timeout ? setConfirmationTimeout(config.timeout, config.destination, once) : null;
+  const fn = (cb) => {
+    return channel.publish(config.destination, config.routingKey, content, config.options, cb);
+  };
 
-  const ok = channel.publish(config.destination, config.routingKey, content, config.options, (err) => {
-    clearTimeout(timeout);
-    once(err, ok);
-  });
+  publishAndConfirm(fn, channel, config, next);
 }
 
 function sendToQueue(channel, content, config, next) {
   debug('Publishing %d bytes to queue: %s', content.length, config.queue);
-  const ok = channel.sendToQueue(config.destination, content, config.options);
-  next(null, ok);
+
+  const fn = () => {
+    return channel.sendToQueue(config.destination, content, config.options);
+  };
+
+  publishNoConfirm(fn, channel, next);
 }
 
 function sendToConfirmQueue(channel, content, config, next) {
   debug('Publishing %d bytes to queue: %s', content.length, config.queue);
 
+  const fn = (cb) => {
+    return channel.sendToQueue(config.destination, content, config.options, cb);
+  };
+
+  publishAndConfirm(fn, channel, config, next);
+}
+
+function publishNoConfirm(fn, channel, next) {
+  let drained = false;
+  channel.once('drain', () => {
+    drained = true;
+  });
+
+  const ok = fn();
+  next(null, ok || drained);
+}
+
+function publishAndConfirm(fn, channel, config, next) {
   const once = _.once(next);
   const timeout = config.timeout ? setConfirmationTimeout(config.timeout, config.destination, once) : null;
+  let drained = false;
+  channel.once('drain', () => {
+    drained = true;
+  });
 
-  const ok = channel.sendToQueue(config.destination, content, config.options, (err) => {
+  const ok = fn((err) => {
     clearTimeout(timeout);
-    next(err, ok);
+    next(err, ok || drained);
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rascal",
-  "version": "14.4.3",
+  "version": "14.4.4",
   "description": "A config driven wrapper for amqplib supporting multi-host connections, automatic error recovery, redelivery flood protection, transparent encryption / decryption,  channel pooling and publication timeouts",
   "main": "index.js",
   "dependencies": {