rascal 13.1.1 → 13.1.2

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+## 13.1.2
+- Fixed various issues when queue names contained period characters. Reported in https://github.com/guidesmiths/rascal/issues/166
+
 ## 13.1.1
 - Moved setMaxListeners to createConnection task to suppress misleading 'Possible EventEmitter memory leak detected' warning. See https://github.com/guidesmiths/rascal/issues/164 for more details.
 

package/lib/amqp/SubscriberError.js

@@ -64,7 +64,7 @@ module.exports = function SubscriptionRecovery(broker, vhost) {
         debug('Republishing message: %s', message.properties.messageId);
 
         const originalQueue = _.get(message, 'properties.headers.rascal.originalQueue');
-        const republished = _.get(message, format('properties.headers.rascal.recovery.%s.republished', originalQueue), 0);
+        const republished = _.get(message, ['properties', 'headers', 'rascal', 'recovery', originalQueue, 'republished'], 0);
 
         if (strategyConfig.attempts && strategyConfig.attempts <= republished) {
           debug('Skipping recovery - message: %s has already been republished %d times.', message.properties.messageId, republished);
@@ -72,14 +72,14 @@ module.exports = function SubscriptionRecovery(broker, vhost) {
         }
 
         const publishOptions = _.cloneDeep(message.properties);
-        _.set(publishOptions, format('headers.rascal.recovery.%s.republished', originalQueue), republished + 1);
+        _.set(publishOptions, ['headers', 'rascal', 'recovery', originalQueue, 'republished'], republished + 1);
         _.set(publishOptions, 'headers.rascal.originalExchange', message.fields.exchange);
         _.set(publishOptions, 'headers.rascal.originalRoutingKey', message.fields.routingKey);
         _.set(publishOptions, 'headers.rascal.error.message', _.truncate(err.message, { length: 1024 }));
         _.set(publishOptions, 'headers.rascal.error.code', err.code);
         _.set(publishOptions, 'headers.rascal.restoreRoutingHeaders', _.has(strategyConfig, 'restoreRoutingHeaders') ? strategyConfig.restoreRoutingHeaders : true);
 
-        if (strategyConfig.immediateNack) _.set(publishOptions, format('headers.rascal.recovery.%s.immediateNack', originalQueue), true);
+        if (strategyConfig.immediateNack) _.set(publishOptions, ['headers', 'rascal', 'recovery', originalQueue, 'immediateNack'], true);
 
         vhost.getConfirmChannel((err, publisherChannel) => {
 
@@ -105,7 +105,7 @@ module.exports = function SubscriptionRecovery(broker, vhost) {
         debug('Forwarding message: %s', message.properties.messageId);
 
         const originalQueue = _.get(message, 'properties.headers.rascal.originalQueue');
-        const forwarded = _.get(message, format('properties.headers.rascal.recovery.%s.forwarded', originalQueue), 0);
+        const forwarded = _.get(message, ['properties', 'headers', 'rascal', 'recovery', originalQueue, 'forwarded'], 0);
 
         if (strategyConfig.attempts && strategyConfig.attempts <= forwarded) {
           debug('Skipping recovery - message: %s has already been forwarded %d times.', message.properties.messageId, forwarded);
@@ -117,7 +117,7 @@ module.exports = function SubscriptionRecovery(broker, vhost) {
 
         const forwardOverrides = _.cloneDeep(strategyConfig.options) || {};
         _.set(forwardOverrides, 'restoreRoutingHeaders', _.has(strategyConfig, 'restoreRoutingHeaders') ? strategyConfig.restoreRoutingHeaders : true);
-        _.set(forwardOverrides, format('options.headers.rascal.recovery.%s.forwarded', originalQueue), forwarded + 1);
+        _.set(forwardOverrides, ['options', 'headers', 'rascal', 'recovery', originalQueue, 'forwarded'], forwarded + 1);
         _.set(forwardOverrides, 'options.headers.rascal.error.message', _.truncate(err.message, { length: 1024 }));
         _.set(forwardOverrides, 'options.headers.rascal.error.code', err.code);
 

package/lib/amqp/Subscription.js

@@ -198,8 +198,7 @@ function Subscription(broker, vhost, config, counter) {
   }
 
   function immediateNack(message) {
-    if (_.get(message, format('properties.headers.rascal.recovery.%s.immediateNack', message.properties.headers.rascal.originalQueue))) return true;
-    if (_.get(message, format('properties.headers.rascal.recovery.%s.immediateNack', message.properties.headers.rascal.originalQueue))) return true;
+    if (_.get(message, ['properties', 'headers', 'rascal', 'recovery', message.properties.headers.rascal.originalQueue, 'immediateNack'])) return true;
     return false;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rascal",
-  "version": "13.1.1",
+  "version": "13.1.2",
   "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": {