rascal 13.1.1 → 14.0.1

package/lib/config/tests.js

@@ -1,41 +1,44 @@
 const _ = require('lodash').runInContext();
 const defaultConfig = require('./defaults');
 
-module.exports = _.defaultsDeep({
-  defaults: {
-    vhosts: {
-      connection: {
-        options: {
-          heartbeat: 50,
+module.exports = _.defaultsDeep(
+  {
+    defaults: {
+      vhosts: {
+        connection: {
+          options: {
+            heartbeat: 50,
+          },
         },
-      },
-      namespace: true,
-      exchanges: {
-        options: {
-          durable: false,
+        namespace: true,
+        exchanges: {
+          options: {
+            durable: false,
+          },
+        },
+        queues: {
+          purge: true,
+          options: {
+            durable: false,
+          },
         },
       },
-      queues: {
-        purge: true,
+      publications: {
         options: {
-          durable: false,
+          persistent: false,
         },
       },
-    },
-    publications: {
-      options: {
-        persistent: false,
+      subscriptions: {
+        closeTimeout: 500,
       },
     },
-    subscriptions: {
-      deferCloseChannel: 100,
-    },
-  },
-  redeliveries: {
-    "counters": {
-      "inMemory": {
-        "size": 1000,
+    redeliveries: {
+      counters: {
+        inMemory: {
+          size: 1000,
+        },
       },
     },
   },
-}, defaultConfig);
+  defaultConfig
+);

package/lib/config/validate.js

@@ -59,7 +59,6 @@ module.exports = _.curry((config, next) => {
     if (invalid.length) throw new Error(format('%s: %s in vhost: %s refers to an unsupported attribute: %s', type, childName, vhostName, invalid[0]));
   }
 
-
   function validateExchanges(vhost, vhostName, exchanges) {
     _.each(exchanges, validateExchange.bind(null, vhost, vhostName));
   }
@@ -104,7 +103,7 @@ module.exports = _.curry((config, next) => {
     validateAttributes('Publication', publication, publicationName, ['name', 'vhost', 'exchange', 'queue', 'routingKey', 'confirm', 'options', 'destination', 'autoCreated', 'deprecated', 'encryption', 'timeout']);
     if (!publication.vhost) throw new Error(format('Publication: %s is missing a vhost', publicationName));
     if (!(Object.prototype.hasOwnProperty.call(publication, 'exchange') || publication.queue)) throw new Error(format('Publication: %s is missing an exchange or a queue', publicationName));
-    if ((Object.prototype.hasOwnProperty.call(publication, 'exchange') && publication.queue)) throw new Error(format('Publication: %s has an exchange and a queue', publicationName));
+    if (Object.prototype.hasOwnProperty.call(publication, 'exchange') && publication.queue) throw new Error(format('Publication: %s has an exchange and a queue', publicationName));
 
     if (!config.vhosts) throw new Error(format('Publication: %s refers to an unknown vhost: %s', publicationName, publication.vhost));
     if (!config.vhosts[publication.vhost]) throw new Error(format('Publication: %s refers to an unknown vhost: %s', publicationName, publication.vhost));
@@ -125,7 +124,27 @@ module.exports = _.curry((config, next) => {
   }
 
   function validateSubscription(subscription, subscriptionName) {
-    validateAttributes('Subscription', subscription, subscriptionName, ['name', 'vhost', 'queue', 'contentType', 'options', 'prefetch', 'retry', 'source', 'recovery', 'workflow', 'handler', 'workflows', 'handlers', 'redeliveries', 'autoCreated', 'deprecated', 'deferCloseChannel', 'encryption', 'promisifyAckOrNack']);
+    validateAttributes('Subscription', subscription, subscriptionName, [
+      'name',
+      'vhost',
+      'queue',
+      'contentType',
+      'options',
+      'prefetch',
+      'retry',
+      'source',
+      'recovery',
+      'workflow',
+      'handler',
+      'workflows',
+      'handlers',
+      'redeliveries',
+      'autoCreated',
+      'deprecated',
+      'closeTimeout',
+      'encryption',
+      'promisifyAckOrNack',
+    ]);
 
     if (!subscription.vhost) throw new Error(format('Subscription: %s is missing a vhost', subscriptionName));
     if (!subscription.queue) throw new Error(format('Subscription: %s is missing a queue', subscriptionName));

package/lib/counters/inMemoryCluster.js

@@ -12,23 +12,30 @@ module.exports = {
     function handleMessage(worker, message) {
       if (message.sender !== 'rascal-in-memory-cluster-counter' || message.cmd !== 'incrementAndGet') return;
       counter.incrementAndGet(message.key, (err, value) => {
-        worker.send({ sender: 'rascal-in-memory-cluster-counter', correlationId: message.correlationId, value: err ? 1 : value });
+        worker.send({
+          sender: 'rascal-in-memory-cluster-counter',
+          correlationId: message.correlationId,
+          value: err ? 1 : value,
+        });
       });
     }
 
-    cluster.on('fork', (worker) => {
-      workers[worker.id] = worker;
-      worker.on('message', (message) => {
-        handleMessage(worker, message);
+    cluster
+      .on('fork', (worker) => {
+        workers[worker.id] = worker;
+        worker.on('message', (message) => {
+          handleMessage(worker, message);
+        });
+      })
+      .on('disconnect', (worker) => {
+        delete workers[worker.id];
+      })
+      .on('exit', (worker) => {
+        delete workers[worker.id];
       });
-    }).on('disconnect', (worker) => {
-      delete workers[worker.id];
-    }).on('exit', (worker) => {
-      delete workers[worker.id];
-    });
   },
   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 memmory cluster counter outside of a cluster");
     if (!options) return worker({});
     const timeout = options.timeout || 100;
     const stashback = Stashback({ timeout });
@@ -41,18 +48,22 @@ module.exports = {
     });
 
     return {
-      incrementAndGet (key, cb) {
+      incrementAndGet(key, cb) {
         const correlationId = uuid();
-        stashback.stash(correlationId, (err, value) => {
-          err ? cb(null, 1) : cb(null, value);
-        }, (err) => {
-          if (err) return cb(null, 1);
-          process.send({
-            sender: 'rascal-in-memory-cluster-counter',
-            correlationId,
-            cmd: 'incrementAndGet',
-          });
-        });
+        stashback.stash(
+          correlationId,
+          (err, value) => {
+            err ? cb(null, 1) : cb(null, value);
+          },
+          (err) => {
+            if (err) return cb(null, 1);
+            process.send({
+              sender: 'rascal-in-memory-cluster-counter',
+              correlationId,
+              cmd: 'incrementAndGet',
+            });
+          }
+        );
       },
     };
   },

package/lib/counters/index.js

@@ -2,4 +2,4 @@ module.exports = {
   stub: require('./stub'),
   inMemory: require('./inMemory'),
   inMemoryCluster: require('./inMemoryCluster'),
-};
+};

package/lib/counters/stub.js

@@ -1,8 +1,7 @@
-module.exports = function() {
-
+module.exports = function () {
   return {
     incrementAndGet(key, next) {
       next(null, 0);
     },
   };
-};
+};

package/lib/management/client.js

@@ -8,9 +8,7 @@ function assertVhost(name, config, next) {
   const options = getVhostOptions(name, config);
   request('put', options.url, options.timeout, (err) => {
     if (!err) return next();
-    const message = err.status
-      ? format('Failed to assert vhost: %s. %s returned status %d', name, config.loggableUrl, err.status)
-      : format('Failed to assert vhost: %s. %s errored with: %s', name, config.loggableUrl, err.message);
+    const message = err.status ? format('Failed to assert vhost: %s. %s returned status %d', name, config.loggableUrl, err.status) : format('Failed to assert vhost: %s. %s errored with: %s', name, config.loggableUrl, err.message);
     return next(new Error(message));
   });
 }
@@ -20,9 +18,7 @@ function checkVhost(name, config, next) {
   const options = getVhostOptions(name, config);
   request('get', options.url, options.timeout, (err) => {
     if (!err) return next();
-    const message = err.status
-      ? format('Failed to check vhost: %s. %s returned status %d', name, config.loggableUrl, err.status)
-      : format('Failed to check vhost: %s. %s errored with: %s', name, config.loggableUrl, err.message);
+    const message = err.status ? format('Failed to check vhost: %s. %s returned status %d', name, config.loggableUrl, err.status) : format('Failed to check vhost: %s. %s errored with: %s', name, config.loggableUrl, err.message);
     return next(new Error(message));
   });
 }
@@ -32,9 +28,7 @@ function deleteVhost(name, config, next) {
   const options = getVhostOptions(name, config);
   request('delete', options.url, options.timeout, (err) => {
     if (!err) return next();
-    const message = err.status
-      ? format('Failed to delete vhost: %s. %s returned status %d', name, config.loggableUrl, err.status)
-      : format('Failed to delete vhost: %s. %s errored with: %s', name, config.loggableUrl, err.message);
+    const message = err.status ? format('Failed to delete vhost: %s. %s returned status %d', name, config.loggableUrl, err.status) : format('Failed to delete vhost: %s. %s errored with: %s', name, config.loggableUrl, err.message);
     return next(new Error(message));
   });
 }

package/lib/utils/setTimeoutUnref.js

@@ -1,5 +1,5 @@
 // See https://github.com/guidesmiths/rascal/issues/89
-module.exports = function(fn, millis) {
+module.exports = function (fn, millis) {
   const t = setTimeout(fn, millis);
   return t.unref ? t.unref() : t;
 };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "rascal",
-  "version": "13.1.1",
+  "version": "14.0.1",
   "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.0",
+    "async": "^3.2.1",
     "debug": "^4.1.1",
     "deep-freeze": "0.0.1",
     "forward-emitter": "^0.1.1",
@@ -21,10 +21,13 @@
     "amqplib": "^0.8.0",
     "chalk": "^4.0.0",
     "chance": "^1.1.4",
-    "eslint": "^6.8.0",
-    "eslint-config-esnext": "^4.1.0",
+    "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",
     "random-readable": "^1.0.1",
     "zunit": "^3.0.8"
   },
@@ -36,11 +39,16 @@
   },
   "scripts": {
     "test": "zUnit",
+    "prettier": "prettier --check .",
     "lint": "eslint .",
+    "lint-staged": "lint-staged",
     "coverage": "nyc --report html --reporter lcov --reporter text-summary zUnit",
     "docker": "docker run -d --name rascal-rabbitmq -p 5672:5672 -p 15672:15672 rabbitmq:3-management",
     "prepare": "husky install"
   },
+  "lint-staged": {
+    "**/*": "prettier --write --ignore-unknown"
+  },
   "keywords": [
     "amqplib",
     "amqp",