rascal 14.4.1 → 14.4.4

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # 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
+  - superagent
+  - chance
+  - zUnit
+  - debug
+  - generic-pool
+  - lru-cache
+  - xregexp
+  - stashback
+  - chalk
+  - amqplib
+
+## 14.4.2
+
+- Remove timeout for filling the channel pool since generic-pool already has this option.
+
 ## 14.4.1
 
 - Bump dependencies / fix audit warnings

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/lib/amqp/Vhost.js

@@ -357,15 +357,13 @@ function Vhost(config, components) {
   function createChannelWhenInitialised(confirm, next) {
     if (connection) return createChannel(confirm, next);
     debug('Vhost: %s is not initialised. Deferring channel creation', self.name);
-    setTimeoutUnref(() => {
-      self.removeListener('vhost_initialised', onVhostInitialised);
-      next(new Error('Timedout acquiring channel'), 5000);
-    });
     function onVhostInitialised() {
       debug('Vhost: %s was initialised. Resuming channel creation', self.name);
       createChannel(confirm, next);
     }
-    self.once('vhost_initialised', onVhostInitialised);
+    self.once('vhost_initialised', () => {
+      onVhostInitialised();
+    });
   }
 
   function createChannel(confirm, next) {

package/lib/counters/inMemoryCluster.js

@@ -35,7 +35,7 @@ module.exports = {
       });
   },
   worker: function worker(options) {
-    if (!cluster.isWorker) throw new Error("You cannot use Rascal's in memmory cluster counter outside of a cluster");
+    if (!cluster.isWorker) throw new Error("You cannot use Rascal's in memory cluster counter outside of a cluster");
     if (!options) return worker({});
     const timeout = options.timeout || 100;
     const stashback = Stashback({ timeout });

package/package.json

@@ -1,35 +1,35 @@
 {
   "name": "rascal",
-  "version": "14.4.1",
+  "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": {
     "async": "^3.2.3",
-    "debug": "^4.1.1",
+    "debug": "^4.3.4",
     "forward-emitter": "^0.1.1",
-    "generic-pool": "^3.7.1",
+    "generic-pool": "^3.8.2",
     "lodash": "^4.17.21",
-    "lru-cache": "^6.0.0",
+    "lru-cache": "^7.10.1",
     "safe-json-parse": "^4.0.0",
-    "stashback": "^1.1.2",
-    "superagent": "^6.1.0",
+    "stashback": "^2.0.1",
+    "superagent": "^7.1.3",
     "uuid": "^8.3.2",
-    "xregexp": "^5.0.1"
+    "xregexp": "^5.1.0"
   },
   "devDependencies": {
-    "amqplib": "^0.8.0",
-    "chalk": "^4.0.0",
-    "chance": "^1.1.4",
+    "amqplib": "^0.9.1",
+    "chalk": "^4.1.2",
+    "chance": "^1.1.8",
     "eslint": "^7.32.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-prettier": "^4.0.0",
     "husky": "^6.0.0",
     "lint-staged": "^11.2.4",
     "nyc": "^15.1.0",
-    "prettier": "2.4.1",
+    "prettier": "^2.4.1",
     "random-readable": "^1.0.1",
     "superagent-defaults": "^0.1.14",
-    "zunit": "^3.0.8"
+    "zunit": "^3.2.1"
   },
   "peerDependencies": {
     "amqplib": ">=0.5.5"