rascal 13.1.2 → 13.1.3

package/lib/counters/inMemoryCluster.js

@@ -1,8 +1,8 @@
-const cluster = require('cluster');
-const inMemory = require('./inMemory');
-const uuid = require('uuid').v4;
-const Stashback = require('stashback');
-const debug = 'rascal:counters:inMemoryCluster';
+const cluster = require("cluster");
+const inMemory = require("./inMemory");
+const uuid = require("uuid").v4;
+const Stashback = require("stashback");
+const debug = "rascal:counters:inMemoryCluster";
 
 module.exports = {
   master: function master(options) {
@@ -10,49 +10,67 @@ module.exports = {
     const counter = inMemory(options);
 
     function handleMessage(worker, message) {
-      if (message.sender !== 'rascal-in-memory-cluster-counter' || message.cmd !== 'incrementAndGet') return;
+      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 });
 
-    process.on('message', (message) => {
-      if (message.sender !== 'rascal-in-memory-cluster-counter') return;
+    process.on("message", (message) => {
+      if (message.sender !== "rascal-in-memory-cluster-counter") return;
       stashback.unstash(message.correlationId, (err, cb) => {
         err ? cb(null, 1) : cb(null, message.value);
       });
     });
 
     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

@@ -1,5 +1,5 @@
 module.exports = {
-  stub: require('./stub'),
-  inMemory: require('./inMemory'),
-  inMemoryCluster: require('./inMemoryCluster'),
-};
+  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

@@ -1,46 +1,76 @@
-const debug = require('debug')('rascal:management:client');
-const format = require('util').format;
-const _ = require('lodash');
-const agent = require('superagent');
+const debug = require("debug")("rascal:management:client");
+const format = require("util").format;
+const _ = require("lodash");
+const agent = require("superagent");
 
 function assertVhost(name, config, next) {
-  debug('Asserting vhost: %s', name);
+  debug("Asserting vhost: %s", name);
   const options = getVhostOptions(name, config);
-  request('put', options.url, options.timeout, (err) => {
+  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);
+      ? 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));
   });
 }
 
 function checkVhost(name, config, next) {
-  debug('Checking vhost: %s', name);
+  debug("Checking vhost: %s", name);
   const options = getVhostOptions(name, config);
-  request('get', options.url, options.timeout, (err) => {
+  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);
+      ? 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));
   });
 }
 
 function deleteVhost(name, config, next) {
-  debug('Deleting vhost: %s', name);
+  debug("Deleting vhost: %s", name);
   const options = getVhostOptions(name, config);
-  request('delete', options.url, options.timeout, (err) => {
+  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);
+      ? 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));
   });
 }
 
 function getVhostOptions(name, config) {
-  const url = format('%s/%s/%s', config.url, 'api/vhosts', name);
+  const url = format("%s/%s/%s", config.url, "api/vhosts", name);
   return _.defaultsDeep({ url }, config.options);
 }
 

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.2",
+  "version": "13.1.3",
   "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",