rascal 16.3.0 → 17.0.0

package/.eslintrc.json

@@ -1,15 +1,16 @@
 {
-  "extends": ["eslint-config-airbnb-base", "prettier"],
+  "extends": ["eslint-config-airbnb-base"],
   "env": {
     "node": true
   },
   "parserOptions": {
-    "ecmaVersion": "2015"
+    "ecmaVersion": "2018"
   },
   "rules": {
     "arrow-body-style": 0,
     "consistent-return": 0,
     "func-names": 0,
+    "max-len": 0,
     "no-param-reassign": 0,
     "no-plusplus": 0,
     "no-restricted-properties": 0,

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 
-## 16.3.0 Unreleased
+## 17.0.0
+
+- Updated the configuration processing as per https://github.com/guidesmiths/rascal/issues/219
+- Test on Node 20
+- Abandon dependabot (too noisy)
+- Bump deps
+- Add support for channel level prefetch as per https://github.com/guidesmiths/rascal/issues/221
+- Dropped prettier (it does nothing of the sort!)
+
+## 16.3.0
 
 - Simplify logic which determines whether ackOrNack should be a callback or a promise
 - Report repeated calls to ackOrNack

package/LICENSE.txt

@@ -1,15 +1,22 @@
-ISC License
+MIT License
 
-Copyright (c) 2016, GuideSmiths Ltd.
+Copyright (c) 2016-2022 GuideSmiths Ltd.
+Copyright (c) 2022-present One Beyond
 
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -7,7 +7,6 @@ Rascal is a rich pub/sub wrapper around [amqplib](https://www.npmjs.com/package/
 [![Node.js CI](https://github.com/guidesmiths/rascal/workflows/Node.js%20CI/badge.svg)](https://github.com/guidesmiths/rascal/actions?query=workflow%3A%22Node.js+CI%22)
 [![Code Climate](https://codeclimate.com/github/guidesmiths/rascal/badges/gpa.svg)](https://codeclimate.com/github/guidesmiths/rascal)
 [![Test Coverage](https://codeclimate.com/github/guidesmiths/rascal/badges/coverage.svg)](https://codeclimate.com/github/guidesmiths/rascal/coverage)
-[![Code Style](https://img.shields.io/badge/code%20style-prettier-brightgreen.svg)](https://github.com/prettier/prettier)
 [![rascal](https://snyk.io/advisor/npm-package/rascal/badge.svg)](https://snyk.io/advisor/npm-package/rascal)
 [![Discover zUnit](https://img.shields.io/badge/Discover-zUnit-brightgreen)](https://www.npmjs.com/package/zunit)
 
@@ -46,11 +45,11 @@ Rascal extends the existing [RabbitMQ Concepts](https://www.rabbitmq.com/tutoria
 1. Publications
 1. Subscriptions
 
-A **publication** is a named configuration for publishing a message, including the destination queue or exchange, routing configuration, encryption profile and reliability guarantees, message options, etc. A **subscription** is a named configuration for consuming messages, including the source queue, encryption profile, content encoding, delivery options (e.g. acknowledgement handling and prefetch), etc. These must be [configured](#configuration) and supplied when creating the Rascal broker. After the broker has been created the subscriptions and publications can be retrivied from the broker and used to publish and consume messages.
+A **publication** is a named configuration for publishing a message, including the destination queue or exchange, routing configuration, encryption profile and reliability guarantees, message options, etc. A **subscription** is a named configuration for consuming messages, including the source queue, encryption profile, content encoding, delivery options (e.g. acknowledgement handling and prefetch), etc. These must be [configured](#configuration) and supplied when creating the Rascal broker. After the broker has been created the subscriptions and publications can be retrieved from the broker and used to publish and consume messages.
 
 ### Breaking Changes in Rascal@14
 
-Rascal@14 waits for inflight messages to be acknowledged before closing subscriber channels. Prior to this version Rascal just waited an arbitary amount of time. If your application does not acknowledge a message for some reason (quite likely in tests) calling `subscription.cancel`, `broker.unsubscribeAll`, `broker.bounce`, `broker.shutdown` or `broker.nuke` will wait indefinitely. You can specify a `closeTimeout` in your subscription config, however if this is exceeded the `subscription.cancel` and `broker.unsubscribeAll` methods will yield an error via callback or rejection, while the `broker.bounce`, `broker.shutdown` and `broker.nuke` methods will emit an error event, but attempt to continue. In both cases the error will have a code of `ETIMEDOUT`.
+Rascal@14 waits for inflight messages to be acknowledged before closing subscriber channels. Prior to this version Rascal just waited an arbitrary amount of time. If your application does not acknowledge a message for some reason (quite likely in tests) calling `subscription.cancel`, `broker.unsubscribeAll`, `broker.bounce`, `broker.shutdown` or `broker.nuke` will wait indefinitely. You can specify a `closeTimeout` in your subscription config, however if this is exceeded the `subscription.cancel` and `broker.unsubscribeAll` methods will yield an error via callback or rejection, while the `broker.bounce`, `broker.shutdown` and `broker.nuke` methods will emit an error event, but attempt to continue. In both cases the error will have a code of `ETIMEDOUT`.
 
 ### Special Note
 
@@ -225,7 +224,7 @@ The reason Rascal nacks the message is because the alternatives are to leave the
 
 #### vhost_initialised
 
-The broker emits the `vhost_initialised` event after recovering from a connection error. An object containing the vhost name and connection url (with obfuscated password) are passed to he event handler. e.g.
+The broker emits the `vhost_initialised` event after recovering from a connection error. An object containing the vhost name and connection url (with obfuscated password) are passed to the event handler. e.g.
 
 ```js
 broker.on('vhost_initialised', ({ vhost, connectionUrl }) => {
@@ -565,7 +564,7 @@ Rascal useds pools channels it uses for publishing messages. It creates two pool
 }
 ```
 
-Unfortunately there is a [bug](https://github.com/coopernurse/node-pool/issues/197#issuecomment-477862861) in generic-pool's implementation, which means that if the pool fails to create a channel, it can enter a tight loop, thrashing your CPU and potentially crashing your node process due to a memory leak. While we assess the long term use of pooling, we have put in a workaround. Errors will only be rejected after a configurable delay. This defaults to one second but can be overriden through the `rejectionDelayMillis` pool attribute. Special thanks to @willthrom for helping diagnose and fix this issue.
+Unfortunately there is a [bug](https://github.com/coopernurse/node-pool/issues/197#issuecomment-477862861) in generic-pool's implementation, which means that if the pool fails to create a channel, it can enter a tight loop, thrashing your CPU and potentially crashing your node process due to a memory leak. While we assess the long term use of pooling, we have put in a workaround. Errors will only be rejected after a configurable delay. This defaults to one second but can be overridden through the `rejectionDelayMillis` pool attribute. Special thanks to @willthrom for helping diagnose and fix this issue.
 
 #### Flow Control
 
@@ -626,7 +625,7 @@ If you don't want to create exchanges on initialisation, but still want to valid
 
 ##### type
 
-Declares the exchange type. Must be one of direct, topic, headers or fanout. The default configuration sets the exchange type to "topic" unless overriden.
+Declares the exchange type. Must be one of direct, topic, headers or fanout. The default configuration sets the exchange type to "topic" unless overridden.
 
 ##### options
 
@@ -696,7 +695,7 @@ Enable to purge the queue during initialisation. Useful when running automated t
 
 ##### replyTo
 
-Sometimes you want to publish a message, and have the consumer of the message send a reply to the same application instance that published the original message. This can be difficult if you application is deployed using multiple instances which share a common configuration. Quite often the solution is to make your application stateless so it doesn't matter which instance receives the reply. An altnernative is to mark the queue as a reply queue using the replyTo.
+Sometimes you want to publish a message, and have the consumer of the message send a reply to the same application instance that published the original message. This can be difficult if you application is deployed using multiple instances which share a common configuration. Quite often the solution is to make your application stateless so it doesn't matter which instance receives the reply. An alternative is to mark the queue as a reply queue using the replyTo.
 
 ```json
 {
@@ -712,7 +711,7 @@ Sometimes you want to publish a message, and have the consumer of the message se
 }
 ```
 
-When true, Rascal will append a uuid to the queue name so that it is unique for each instance of the application. Use this conjunction with the publication replyTo property, to automaticlaly set the replyTo property on outbound messages to the unique queue name. You may also want to make make the queue non durable and exclusive too (see below).
+When true, Rascal will append a uuid to the queue name so that it is unique for each instance of the application. Use this conjunction with the publication replyTo property, to automatically set the replyTo property on outbound messages to the unique queue name. You may also want to make the queue non durable and exclusive too (see below).
 
 ##### options
 
@@ -946,7 +945,7 @@ try {
 }
 ```
 
-One publish option you should be aware of is the "persistent". Unless persistent is true, your messages will be discarded when you restart Rabbit. Despite having an impact on performance Rascal sets this in it's default configuration.
+One publish option you should be aware of is the "persistent". Unless persistent is true, your messages will be discarded when you restart Rabbit. Despite having an impact on performance Rascal sets this in its default configuration.
 
 Refer to the [amqplib](https://www.squaremobius.net/amqp.node/channel_api.html) documentation for further exchange options.
 
@@ -978,7 +977,7 @@ See the "default-exchange" in the examples directory for a full working example.
 
 #### Timeouts
 
-When you publish a message using a confirm channel, amqplib will wait for an acknowledgement that the message was safely received by the broker, and in a clustered environment replicated to all nodes. If something goes wrong, the broker will not send the acknowledgement, amqplib will never execute the callback, and the associated flow of execution will never be resumed. Rascal guards against this by adding publication timeouts. If the timeout expires, then Rascal will close the channel and emit a error event from the publication, however there will still be an unavoidable memory leak as amqplib's callback will never be cleared up. The default timeout is 10 seconds but can be overriden in config. The setting is ignored for normal channels and can be disabled by specifying 0.
+When you publish a message using a confirm channel, amqplib will wait for an acknowledgement that the message was safely received by the broker, and in a clustered environment replicated to all nodes. If something goes wrong, the broker will not send the acknowledgement, amqplib will never execute the callback, and the associated flow of execution will never be resumed. Rascal guards against this by adding publication timeouts. If the timeout expires, then Rascal will close the channel and emit a error event from the publication, however there will still be an unavoidable memory leak as amqplib's callback will never be cleared up. The default timeout is 10 seconds but can be overridden in config. The setting is ignored for normal channels and can be disabled by specifying 0.
 
 ```json
 {
@@ -1106,7 +1105,7 @@ try {
 
 Prior to version 10.0.0, if you used Rascal to consume a forwarded message, the subscriber would automatically restore the original routing key and exchange to the message.fields before emitting it. This was added to support the delayed retry loop advanced recovery strategy, but should not have been applied to `broker.forward`. From version 10.0.0 this behaviour has been disabled for `broker.forward` but you can turn it back on by setting `restoreRoutingHeaders` to true in the overrides. You can also disable this behaviour in the `forward` and `republish` recovery strategies by setting `restoreRoutingHeaders` to false.
 
-**Since there is no native, transactional support for forwarding in amqplib, you are at risk of receiving duplicate messages when using `broker.foward`**
+**Since there is no native, transactional support for forwarding in amqplib, you are at risk of receiving duplicate messages when using `broker.forward`**
 
 ### Subscriptions
 
@@ -1153,7 +1152,7 @@ try {
 
 It's **very** important that you handle errors emitted by the subscriber. If not an underlying channel error will bubble up to the uncaught error handler and crash your node process.
 
-Prior to Rascal 4.0.0 it was also **very** important not to go async between getting the subscription and listening for the message or error events. If you did, you risked leaking messages and not handling errors. For Rascal 4.0.0 and beyond, subsciptions are lazily applied when you add the `message` handller. Because registering event handlers is synchronous, but setting up RabbitMQ consumers is asynchronous, we've also added the `subscribed` event in case you need to wait until the subscription has been successfully established.
+Prior to Rascal 4.0.0 it was also **very** important not to go async between getting the subscription and listening for the message or error events. If you did, you risked leaking messages and not handling errors. For Rascal 4.0.0 and beyond, subscriptions are lazily applied when you add the `message` handler. Because registering event handlers is synchronous, but setting up RabbitMQ consumers is asynchronous, we've also added the `subscribed` event in case you need to wait until the subscription has been successfully established.
 
 Rascal supports text, buffers and anything it can JSON.parse, providing the contentType message property is set correctly. Text messages should be set to "text/plain" and JSON messages to "application/json". Other content types will be returned as a Buffer. If the publisher doesn't set the contentType or you want to override it you can do so in the subscriber configuration.
 
@@ -1416,7 +1415,7 @@ For messages which are not auto-acknowledged (the default) calling `ackOrNack()`
 
 When using the callback API, you can call ackOrNack without a callback and errors will be emitted by the subscription. Alternatively you can specify a callback as the final argument irrespective of what other arguments you provide.
 
-When using the promises API, ackOrNack will work as for the callback API unless you explicity set promisifyAckOrNack to true on the subscription. If you do enable this feature, be sure to catch rejections.
+When using the promises API, ackOrNack will work as for the callback API unless you explicitly set `promisifyAckOrNack` to true on the subscription. If you do enable this feature, be sure to catch rejections.
 
 ##### Nack (Reject or Dead Letter)
 
@@ -1427,7 +1426,7 @@ ackOrNack(err, { strategy: 'nack' });
 Nack causes the message to be discarded or routed to a dead letter exchange if configured. You can also negatively acknowledge all outstanding messages on a channel as follows
 
 ```js
-ackOrNac(err, { strategy: 'nack', all: true });
+ackOrNack(err, { strategy: 'nack', all: true });
 ```
 
 ##### Nack with Requeue
@@ -1436,7 +1435,7 @@ ackOrNac(err, { strategy: 'nack', all: true });
 ackOrNack(err, { strategy: 'nack', defer: 1000, requeue: true });
 ```
 
-The defer option is not mandatory, but without it you are likely retry your message thousands of times a second. Even then requeueing is a inadequate strategy for error handling, since the message will be rolled back to the front of the queue and there is no simple way to detect how many times the message has been redelivered.
+The defer option is not mandatory, but without it you are likely retry your message thousands of times a second. Even then requeuing is an inadequate strategy for error handling, since the message will be rolled back to the front of the queue and there is no simple way to detect how many times the message has been redelivered.
 
 Dead lettering is a good option for invalid messages but with one major flaw - because the message cannot be modified it cannot be annotated with the error details. This makes it difficult to do anything useful with messages once dead lettered.
 
@@ -1485,7 +1484,7 @@ ackOrNack(err, { strategy: 'forward', publication: 'some_exchange' });
 ```
 
 **Danger**
-As with the Republish strategy, you can limit the number of foward attempts. Whenever you specify a number of attempts you should always chain a fallback strategy, otherwise if the attempts are exceeded your message will be neither acked or nacked.
+As with the Republish strategy, you can limit the number of forward attempts. Whenever you specify a number of attempts you should always chain a fallback strategy, otherwise if the attempts are exceeded your message will be neither acked or nacked.
 
 Furthermore if the message is forwarded but cannot be routed (e.g. due to an incorrect binding), the message will be returned **after** Rascal receives a 'success' event from amqplib. Consequently the message will have been ack'd. Any subsequent fallback strategy which attempts to ack or nack the message will fail, and so the message may lost. The subscription will emit an error event under such circumstances.
 
@@ -1526,7 +1525,7 @@ ackOrNack(err, { strategy: 'ack' });
 
 #### Chaining Recovery Strategies
 
-By chaining Rascal's recovery strategies and leveraging some of RabbitMQs lesser used features such as message you can achieve some quite sophisticated error handling. A simple combination of republish and nack (with dead letter) will enable you to retry the message a maximum number of times before dead letting it.
+By chaining Rascal's recovery strategies and leveraging some of RabbitMQ's lesser used features such as message you can achieve some quite sophisticated error handling. A simple combination of republish and nack (with dead letter) will enable you to retry the message a maximum number of times before dead letting it.
 
 ```js
 ackOrNack(err, [
@@ -1559,7 +1558,35 @@ Steps 3 - 7 will repeat up to `attempts` times. If all attempts fail...
 
 #### prefetch
 
-Prefetch limits the number of unacknowledged messages your application can have outstanding. It's a great way to ensure that you don't overload your event loop or a downstream service. Rascal's default configuration sets the prefetch to 10 which may seem low, but we've managed to knock out firewalls, breach AWS thresholds and all sorts of other things by setting it to higher values.
+Prefetch limits the number of unacknowledged messages a subscription can have outstanding. It's a great way to ensure that you don't overload your event loop or a downstream service. Rascal's default configuration sets the prefetch to 10 which may seem low, but we've managed to knock out firewalls, breach AWS thresholds and all sorts of other things by setting it to higher values.
+
+#### channelPrefetch
+
+Channel prefetch is like prefetch but operates at a channel rather than a consumer level. Since Rascal uses a dedicated channel per subscriber there is rarely any point setting it. Moreover, a channel prefetch has a considerable overhead, especially in a clustered environment so can significantly impact performance. The only reason to set a channel prefetch is if you want to adjust the prefetch dynamically after the subscription has started, and without cancelling the subscription, e.g.
+
+```js
+broker.subscribe('s1', { prefetch: 0, channelPrefetch: 5 }, (err, subscription) => {
+  if (err) throw err;
+  subscription.on('message', (message, content, ackOrNack) => {
+    ackOrNack();
+    const prefetch = tunePrefetch();
+    subscription.setChannelPrefetch(prefetch, (err) => {
+      if (err) throw err;
+    });
+  });
+});
+```
+
+```js
+const subscription = await broker.subscribe('s1', { prefetch: 0, channelPrefetch: 5 });
+subscription.on('message', (message, content, ackOrNack) => {
+  ackOrNack();
+  const prefetch = tunePrefetch();
+  await subscription.setChannelPrefetch(prefetch);
+});
+```
+
+Don't forget to zero the regular consumer prefetch when specifying a channelPrefetch to prevent potential conflicts.
 
 #### retry
 
@@ -1643,7 +1670,7 @@ You can cancel subscriptions as follows
 broker.subscribe('s1', (err, subscription) => {
   if (err) throw err; // subscription didn't exist
   subscription.cancel((err) => {
-    console.err(err);
+    console.error(err);
   });
 });
 ```
@@ -1657,7 +1684,7 @@ try {
 }
 ```
 
-Cancelling a subscribion will stop consuming messages, but leave the channel open until any outstanding messages have been acknowledged, or the timeout specified by through the `closeTimeout` subscription property is exceeded.
+Cancelling a subscription will stop consuming messages, but leave the channel open until any outstanding messages have been acknowledged, or the timeout specified by through the `closeTimeout` subscription property is exceeded.
 
 ## Shutdown
 
@@ -1793,7 +1820,7 @@ after(async () => {
 
 ### Bounce
 
-Bounce disconnects and reinistialises the broker.
+Bounce disconnects and reinitialises the broker.
 
 ```js
 beforeEach((done) => {
@@ -1809,7 +1836,7 @@ beforeEach(async () => {
 
 ### Shovels
 
-RabbitMQ enables you to transfer messages between brokers using the [Shovel plugin](https://www.rabbitmq.com/shovel.html). You can do something similar with rascal by connecting a subscription to a publication. Shovel relies on rascals 'forward' feature, so all the caveates about duplicate messages apply.
+RabbitMQ enables you to transfer messages between brokers using the [Shovel plugin](https://www.rabbitmq.com/shovel.html). You can do something similar with rascal by connecting a subscription to a publication. Shovel relies on rascals 'forward' feature, so all the caveats about duplicate messages apply.
 
 ```json
 {

package/examples/busy-publisher/config.json

@@ -12,7 +12,6 @@
         }
       },
       "connection": {
-        "heartbeat": 5,
         "socketOptions": {
           "timeout": 1000
         }

package/examples/default-exchange/config.json

@@ -3,7 +3,6 @@
   "vhosts": {
     "/": {
       "connection": {
-        "heartbeat": 1,
         "socketOptions": {
           "timeout": 1000
         }

package/examples/promises/config.json

@@ -3,7 +3,9 @@
   "vhosts": {
     "/": {
       "connection": {
-        "heartbeat": 1,
+        "options": {
+          "heartbeat": 5
+        },
         "socketOptions": {
           "timeout": 1000
         }

package/index.js

@@ -21,4 +21,4 @@ module.exports = (function () {
     },
     counters,
   };
-})();
+}());

package/lib/amqp/Broker.js

@@ -81,7 +81,7 @@ function Broker(config, components) {
         if (err) return next(err);
         debug('Finished purging all queues in all vhosts');
         next();
-      }
+      },
     );
   };
 
@@ -106,10 +106,10 @@ function Broker(config, components) {
               clearInterval(self.keepActive);
               debug('Finished shutting down broker');
               next();
-            }
+            },
           );
         });
-      }
+      },
     );
   };
 
@@ -126,7 +126,7 @@ function Broker(config, components) {
           if (err) return next(err);
           debug('Finished bouncing broker');
           next();
-        }
+        },
       );
     });
   };
@@ -148,7 +148,7 @@ function Broker(config, components) {
           clearInterval(self.keepActive);
           debug('Finished nuking broker');
           next();
-        }
+        },
       );
     });
   };
@@ -178,10 +178,11 @@ function Broker(config, components) {
   };
 
   this.subscribeAll = function (filter, next) {
-    if (arguments.length === 1)
+    if (arguments.length === 1) {
       return self.subscribeAll(() => {
         return true;
       }, arguments[0]);
+    }
     const filteredSubscriptions = _.chain(config.subscriptions).values().filter(filter).value();
     async.mapSeries(
       filteredSubscriptions,
@@ -191,7 +192,7 @@ function Broker(config, components) {
           cb(null, subscription);
         });
       },
-      next
+      next,
     );
   };
 
@@ -202,7 +203,7 @@ function Broker(config, components) {
         sessions.shift();
         session.cancel(cb);
       },
-      next
+      next,
     );
   };
 

package/lib/amqp/BrokerAsPromised.js

@@ -21,7 +21,7 @@ module.exports = {
             value: brokerAsPromised,
           });
           return reject(err);
-        })
+        }),
       );
     });
   },
@@ -43,7 +43,7 @@ function BrokerAsPromised(broker) {
           ...args.concat((err, result) => {
             if (err) return reject(err);
             resolve(result);
-          })
+          }),
         );
       });
     };
@@ -59,7 +59,7 @@ function BrokerAsPromised(broker) {
         ...args.concat((err, session) => {
           if (err) return reject(err);
           resolve(new SubscriberSessionAsPromised(session));
-        })
+        }),
       );
     });
   };
@@ -73,9 +73,9 @@ function BrokerAsPromised(broker) {
           resolve(
             sessions.map((session) => {
               return new SubscriberSessionAsPromised(session);
-            })
+            }),
           );
-        })
+        }),
       );
     });
   };

package/lib/amqp/Publication.js

@@ -53,7 +53,8 @@ function Publication(vhost, borrowChannelFn, returnChannelFn, destroyChannelFn,
     _.set(publishConfig, 'options.headers.rascal.restoreRoutingHeaders', !!publishConfig.restoreRoutingHeaders);
     _.set(publishConfig, 'options.headers.rascal.originalExchange', message.fields.exchange);
     _.set(publishConfig, 'options.headers.rascal.originalRoutingKey', message.fields.routingKey);
-    _.set(publishConfig, 'options.CC', _.chain([]).concat(publishConfig.options.CC, format('%s.%s', originalQueue, publishConfig.routingKey)).uniq().compact().value());
+    _.set(publishConfig, 'options.CC', _.chain([]).concat(publishConfig.options.CC, format('%s.%s', originalQueue, publishConfig.routingKey)).uniq().compact()
+      .value());
 
     _publish(message.content, publishConfig, next);
   };

package/lib/amqp/SubscriberError.js

@@ -31,7 +31,7 @@ module.exports = function SubscriptionRecovery(broker, vhost) {
           });
         }, recoveryConfig.defer);
       },
-      next
+      next,
     );
   };
 
@@ -178,7 +178,7 @@ module.exports = function SubscriptionRecovery(broker, vhost) {
         },
       },
     ],
-    'name'
+    'name',
   );
 
   function getStrategy(recoveryConfig) {

package/lib/amqp/SubscriberSession.js

@@ -26,7 +26,9 @@ function SubscriberSession(sequentialChannelOperations, config) {
   this._open = function (channel, consumerTag, next) {
     if (cancelled) return next(new Error('Subscriber has been cancelled'));
     debug('Opening subscriber session: %s on channel: %s', consumerTag, channel._rascal_id);
-    channels[consumerTag] = { index: index++, channel, consumerTag, unacknowledgedMessages: 0 };
+    channels[consumerTag] = {
+      index: index++, channel, consumerTag, unacknowledgedMessages: 0,
+    };
     channel.once('close', unref.bind(null, consumerTag));
     channel.once('error', unref.bind(null, consumerTag));
     next();
@@ -40,6 +42,22 @@ function SubscriberSession(sequentialChannelOperations, config) {
     }, next);
   };
 
+  this.setChannelPrefetch = function (prefetch, next) {
+    sequentialChannelOperations.push((done) => {
+      config.channelPrefetch = prefetch;
+      withCurrentChannel(
+        (channel) => {
+          debug('Setting channel prefetch to %d on channel: %s', prefetch, channel._rascal_id);
+          channel.prefetch(prefetch, true, done);
+        },
+        () => {
+          debug('No current channel on which to set prefetch');
+          done();
+        },
+      );
+    }, next);
+  };
+
   this._close = function (next) {
     sequentialChannelOperations.push((done) => {
       self._unsafeClose(done);
@@ -63,9 +81,9 @@ function SubscriberSession(sequentialChannelOperations, config) {
         });
       },
       () => {
-        debug('No current subscriber session');
+        debug('No current channel to close');
         next();
-      }
+      },
     );
   };
 
@@ -116,7 +134,7 @@ function SubscriberSession(sequentialChannelOperations, config) {
         setImmediate(() => {
           next(new Error('The channel has been closed. Unable to ack message'));
         });
-      }
+      },
     );
   };
 
@@ -133,7 +151,7 @@ function SubscriberSession(sequentialChannelOperations, config) {
         setImmediate(() => {
           next(new Error('The channel has been closed. Unable to ack messages'));
         });
-      }
+      },
     );
   };
 
@@ -151,7 +169,7 @@ function SubscriberSession(sequentialChannelOperations, config) {
         setImmediate(() => {
           next(new Error('The channel has been closed. Unable to nack message'));
         });
-      }
+      },
     );
   };
 
@@ -169,7 +187,7 @@ function SubscriberSession(sequentialChannelOperations, config) {
         setImmediate(() => {
           next(new Error('The channel has been closed. Unable to nack messages'));
         });
-      }
+      },
     );
   };
 

package/lib/amqp/SubscriberSessionAsPromised.js

@@ -20,4 +20,13 @@ function SubscriberSessionAsPromised(session) {
       });
     });
   };
+
+  this.setChannelPrefetch = function (prefetch) {
+    return new Promise((resolve, reject) => {
+      session.setChannelPrefetch(prefetch, (err) => {
+        if (err) return reject(err);
+        resolve();
+      });
+    });
+  };
 }

package/lib/amqp/Subscription.js

@@ -31,8 +31,9 @@ function Subscription(broker, vhost, subscriptionConfig, counter) {
   };
 
   this.subscribe = function (overrides, next) {
-    const session = new SubscriberSession(sequentialChannelOperations, subscriptionConfig);
-    subscribeLater(session, _.defaultsDeep(overrides, subscriptionConfig));
+    const config = _.defaultsDeep(overrides, subscriptionConfig);
+    const session = new SubscriberSession(sequentialChannelOperations, config);
+    subscribeLater(session, config);
     return next(null, session);
   };
 
@@ -57,27 +58,36 @@ function Subscription(broker, vhost, subscriptionConfig, counter) {
         if (err) return done(err);
         if (!channel) return done();
 
-        if (config.prefetch) channel.prefetch(config.prefetch);
-
-        const removeErrorHandlers = attachErrorHandlers(channel, session, config);
-        const onMessage = _onMessage.bind(null, session, config, removeErrorHandlers);
-
-        channel.consume(config.source, onMessage, config.options, (err, response) => {
-          if (err) {
-            debug('Error subscribing to %s using channel: %s. %s', config.source, channel._rascal_id, err.message);
-            removeErrorHandlers();
-            return done(err);
-          }
-          session._open(channel, response.consumerTag, (err) => {
-            if (err) return done(err);
-            timer.reset();
-            done();
+        _configureQos(config, channel, (err) => {
+          if (err) return done(err);
+
+          const removeErrorHandlers = attachErrorHandlers(channel, session, config);
+          const onMessage = _onMessage.bind(null, session, config, removeErrorHandlers);
+
+          channel.consume(config.source, onMessage, config.options, (err, response) => {
+            if (err) {
+              debug('Error subscribing to %s using channel: %s. %s', config.source, channel._rascal_id, err.message);
+              removeErrorHandlers();
+              return done(err);
+            }
+            session._open(channel, response.consumerTag, (err) => {
+              if (err) return done(err);
+              timer.reset();
+              done();
+            });
           });
         });
       });
     }, next);
   }
 
+  function _configureQos(config, channel, next) {
+    const qos = [];
+    if (config.prefetch) qos.push((cb) => channel.prefetch(config.prefetch, false, cb));
+    if (config.channelPrefetch) qos.push((cb) => channel.prefetch(config.channelPrefetch, true, cb));
+    async.series(qos, next);
+  }
+
   function _onMessage(session, config, removeErrorHandlers, message) {
     if (!message) return handleConsumerCancel(session, config, removeErrorHandlers);
 
@@ -261,8 +271,8 @@ function Subscription(broker, vhost, subscriptionConfig, counter) {
     debug('Handling channel error: %s from %s using channel: %s', err.message, config.name, session._getRascalChannelId());
     if (removeErrorHandlers) removeErrorHandlers();
     session.emit('error', err);
-    config.retry &&
-      subscribeNow(session, config, (err) => {
+    config.retry
+      && subscribeNow(session, config, (err) => {
         if (!err) return;
         const delay = timer.next();
         debug('Will attempt resubscription(%d) to %s in %dms', attempts + 1, config.name, delay);
@@ -277,8 +287,8 @@ function Subscription(broker, vhost, subscriptionConfig, counter) {
       if (err) debug('Error cancelling subscription: %s', err.message);
       const cancelErr = new Error(format('Subscription: %s was cancelled by the broker', config.name));
       session.emit('cancelled', cancelErr) || session.emit('error', cancelErr);
-      config.retry &&
-        subscribeNow(session, config, (err) => {
+      config.retry
+        && subscribeNow(session, config, (err) => {
           if (!err) return;
           const delay = timer.next();
           debug('Will attempt resubscription(%d) to %s in %dms', 1, config.name, delay);

package/lib/amqp/Vhost.js

@@ -447,15 +447,13 @@ function Vhost(vhostConfig, components) {
   }
 
   function ensureChannelPools() {
-    regularChannelPool =
-      regularChannelPool ||
-      createChannelPool({
+    regularChannelPool = regularChannelPool
+      || createChannelPool({
         confirm: false,
         pool: vhostConfig.publicationChannelPools.regularPool,
       });
-    confirmChannelPool =
-      confirmChannelPool ||
-      createChannelPool({
+    confirmChannelPool = confirmChannelPool
+      || createChannelPool({
         confirm: true,
         pool: vhostConfig.publicationChannelPools.confirmPool,
       });
@@ -471,7 +469,7 @@ function Vhost(vhostConfig, components) {
           confirmChannelPool ? confirmChannelPool.drain(cb) : cb();
         },
       ],
-      next
+      next,
     );
   }
 
@@ -488,8 +486,8 @@ function Vhost(vhostConfig, components) {
     connection = undefined;
     self.emit('disconnect');
     self.emit('error', err, self.getConnectionDetails());
-    connectionConfig.retry &&
-      self.init((err) => {
+    connectionConfig.retry
+      && self.init((err) => {
         if (!err) return;
         const delay = timer.next();
         debug('Will attempt reconnection in in %dms', delay);

package/lib/amqp/tasks/applyBindings.js

@@ -18,7 +18,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/assertExchanges.js

@@ -12,7 +12,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/assertQueues.js

@@ -12,7 +12,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/assertVhost.js

@@ -24,6 +24,6 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });

package/lib/amqp/tasks/checkExchanges.js

@@ -12,7 +12,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/checkQueues.js

@@ -12,7 +12,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/checkVhost.js

@@ -24,6 +24,6 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });

package/lib/amqp/tasks/closeChannels.js

@@ -13,6 +13,6 @@ module.exports = _.curry((config, ctx, next) => {
     (err) => {
       delete ctx.channels;
       return next(err, config, ctx);
-    }
+    },
   );
 });

package/lib/amqp/tasks/createChannels.js

@@ -14,6 +14,6 @@ module.exports = _.curry((config, ctx, next) => {
       if (err) return next(err, config, ctx);
       ctx.channels = channels;
       next(null, config, ctx);
-    }
+    },
   );
 });

package/lib/amqp/tasks/createConnection.js

@@ -24,7 +24,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/deleteExchanges.js

@@ -12,7 +12,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/deleteQueues.js

@@ -12,7 +12,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/deleteVhost.js

@@ -25,6 +25,6 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });

package/lib/amqp/tasks/initCounters.js

@@ -15,7 +15,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/initPublications.js

@@ -15,7 +15,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/initShovels.js

@@ -10,7 +10,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/initSubscriptions.js

@@ -14,7 +14,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/initVhosts.js

@@ -22,7 +22,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/amqp/tasks/purgeQueues.js

@@ -12,7 +12,7 @@ module.exports = _.curry((config, ctx, next) => {
     },
     (err) => {
       next(err, config, ctx);
-    }
+    },
   );
 });
 

package/lib/config/configure.js

@@ -1,6 +1,7 @@
 const debug = require('debug')('rascal:config:configure');
 const format = require('util').format;
 const url = require('url');
+const { URL } = require('node:url');
 const _ = require('lodash');
 const uuid = require('uuid').v4;
 const XRegExp = require('xregexp');
@@ -47,7 +48,7 @@ module.exports = _.curry((rascalConfig, next) => {
         connectionStrategy: rascalConfig.defaults.vhosts.connectionStrategy,
         publicationChannelPools: rascalConfig.defaults.vhosts.publicationChannelPools,
       },
-      { defaults: rascalConfig.defaults.vhosts }
+      { defaults: rascalConfig.defaults.vhosts },
     );
     rascalConfig.vhosts[name].namespace = vhostConfig.namespace === true ? uuid() : vhostConfig.namespace;
     configureConnections(vhostConfig, name);
@@ -66,39 +67,77 @@ module.exports = _.curry((rascalConfig, next) => {
     _.each(vhostConfig.connections, (connection, index) => {
       configureConnection(vhostConfig, vhostName, connection, index);
     });
-    vhostConfig.connections = _.sortBy(vhostConfig.connections, 'index');
+    vhostConfig.connections = _.sortBy(vhostConfig.connections, 'index').map((connection) => _.omit(connection, 'index'));
     delete vhostConfig.connection;
   }
 
   function configureConnection(vhostConfig, vhostName, connection, index) {
-    _.defaultsDeep(connection, vhostConfig.defaults.connection);
-    connection.vhost = connection.vhost !== undefined ? connection.vhost : vhostName;
-    connection.auth = connection.auth || getAuth(connection.user, connection.password);
-    connection.pathname = connection.vhost === '/' ? '' : connection.vhost;
-    connection.query = connection.options;
-    connection.url = connection.url || url.format(connection);
-    connection.loggableUrl = connection.url.replace(/:[^:]*@/, ':***@');
-    connection.index = getConnectionIndex(vhostConfig.connectionStrategy, connection, index);
+    const attributesFromUrl = parseConnectionUrl(connection.url);
+    const attributesFromConfig = getConnectionAttributes(connection);
+    const defaults = { ...vhostConfig.defaults.connection, vhost: vhostName };
+    const connectionAttributes = _.defaultsDeep({}, attributesFromUrl, attributesFromConfig, defaults);
+
+    setConnectionAttributes(connection, connectionAttributes);
+    setConnectionUrls(connection);
+    setConnectionIndex(connection, vhostConfig.connectionStrategy, index);
+
     configureManagementConnection(vhostConfig, vhostName, connection);
   }
 
+  function parseConnectionUrl(connectionString) {
+    if (!connectionString) return {};
+    const {
+      protocol, username: user, password, hostname, port, pathname: vhost, searchParams,
+    } = new URL(connectionString);
+    const options = Array.from(searchParams).reduce((attributes, entry) => ({ ...attributes, [entry[0]]: entry[1] }), {});
+    return {
+      protocol, hostname, port, user, password, vhost, options,
+    };
+  }
+
+  function getConnectionAttributes(attributes) {
+    const {
+      protocol, hostname, port, user, password, vhost, options, socketOptions, management,
+    } = attributes;
+    return {
+      protocol, hostname, port, user, password, vhost, options, socketOptions, management,
+    };
+  }
+
   function configureManagementConnection(vhostConfig, vhostName, connection) {
     _.defaultsDeep(connection.management, { hostname: connection.hostname });
-    connection.management.auth = connection.management.auth || getAuth(connection.management.user, connection.management.password) || connection.auth;
-    connection.management.url = connection.management.url || url.format(connection.management);
+    const auth = connection.management.auth || getAuth(connection.management.user, connection.management.password) || getAuth(connection.user, connection.password);
+    connection.management.url = connection.management.url || url.format({ ...connection.management, auth });
     connection.management.loggableUrl = connection.management.url.replace(/:[^:]*?@/, ':***@');
   }
 
+  function setConnectionAttributes(connection, attributes, defaults) {
+    Object.keys(connection).forEach((key) => delete connection[key]);
+    _.defaultsDeep(connection, attributes, defaults);
+  }
+
+  function setConnectionUrls(connection) {
+    const auth = getAuth(connection.user, connection.password);
+    const pathname = connection.vhost === '/' ? '' : connection.vhost;
+    const query = connection.options;
+
+    connection.url = url.format({
+      slashes: true, ...connection, auth, pathname, query,
+    });
+    connection.loggableUrl = connection.url.replace(/:[^:]*@/, ':***@');
+  }
+
   function getAuth(user, password) {
     return user && password ? `${user}:${password}` : undefined;
   }
 
-  function getConnectionIndex(strategy, connection, index) {
-    if (strategy === 'fixed') return index;
-    const host = url.parse(connection.url).host;
-    if (_.has(connectionIndexes, host)) return connectionIndexes[host];
-    connectionIndexes[host] = Math.random();
-    return connectionIndexes[host];
+  function setConnectionIndex(connection, strategy, index) {
+    connection.index = strategy === 'fixed' ? index : getConnectionIndex(strategy, `${connection.host}:${connection.port}`);
+  }
+
+  function getConnectionIndex(strategy, hostname) {
+    if (connectionIndexes[hostname] === undefined) connectionIndexes[hostname] = Math.random();
+    return connectionIndexes[hostname];
   }
 
   function configureVhostPublications(vhostConfig) {
@@ -132,7 +171,7 @@ module.exports = _.curry((rascalConfig, next) => {
         });
         return publications;
       },
-      {}
+      {},
     );
     _.each(_.defaults({}, publications, defaultPublications), configurePublication);
   }
@@ -181,7 +220,7 @@ module.exports = _.curry((rascalConfig, next) => {
         });
         return subscriptions;
       },
-      {}
+      {},
     );
     _.each(_.defaults({}, subscriptions, defaultSubscriptions), configureSubscription);
   }
@@ -211,10 +250,10 @@ module.exports = _.curry((rascalConfig, next) => {
     const match = XRegExp.exec(name, pattern);
     return match
       ? {
-          name,
-          subscription: match.groups.subscription,
-          publication: match.groups.publication,
-        }
+        name,
+        subscription: match.groups.subscription,
+        publication: match.groups.publication,
+      }
       : { name };
   }
 
@@ -252,7 +291,7 @@ module.exports = _.curry((rascalConfig, next) => {
           name,
           fullyQualifiedName: fqn.qualify(name, config.namespace, queueConfig.replyTo),
         },
-        config.defaults.queues
+        config.defaults.queues,
       );
     });
   }
@@ -276,11 +315,11 @@ module.exports = _.curry((rascalConfig, next) => {
     const match = XRegExp.exec(name, pattern);
     return match
       ? {
-          name,
-          source: match.groups.source,
-          destination: match.groups.destination,
-          bindingKeys: splitBindingKeys(match.groups.keys),
-        }
+        name,
+        source: match.groups.source,
+        destination: match.groups.destination,
+        bindingKeys: splitBindingKeys(match.groups.keys),
+      }
       : { name };
   }
 
@@ -292,7 +331,8 @@ module.exports = _.curry((rascalConfig, next) => {
     const result = {};
     _.each(definitions, (bindingConfig, name) => {
       const parsedConfig = parseBindingName(name);
-      const bindingKeys = _.chain([]).concat(bindingConfig.bindingKeys, bindingConfig.bindingKey, parsedConfig.bindingKeys).compact().uniq().value();
+      const bindingKeys = _.chain([]).concat(bindingConfig.bindingKeys, bindingConfig.bindingKey, parsedConfig.bindingKeys).compact().uniq()
+        .value();
       if (bindingKeys.length <= 1) {
         result[name] = _({ bindingKey: bindingKeys[0] }).defaults(bindingConfig, parsedConfig).omit('bindingKeys').value();
         return result[name];

package/lib/config/schema.json

@@ -576,6 +576,10 @@
           "type": "integer",
           "minimum": 0
         },
+        "channelPrefetch": {
+          "type": "integer",
+          "minimum": 0
+        },
         "retry": {
           "$ref": "#/definitions/retry"
         },

package/lib/config/tests.js

@@ -40,5 +40,5 @@ module.exports = _.defaultsDeep(
       },
     },
   },
-  defaultConfig
+  defaultConfig,
 );

package/lib/config/validate.js

@@ -132,6 +132,7 @@ module.exports = _.curry((config, next) => {
       'contentType',
       'options',
       'prefetch',
+      'channelPrefetch',
       'retry',
       'source',
       'recovery',

package/lib/counters/inMemoryCluster.js

@@ -63,7 +63,7 @@ module.exports = {
               correlationId,
               cmd: 'incrementAndGet',
             });
-          }
+          },
         );
       },
     };

package/lib/management/Client.js

@@ -12,8 +12,8 @@ function Client(suppliedAgent) {
     const options = getVhostOptions(name, config);
     self._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);
-      return next(new Error(message));
+      const _err = err.status ? new Error(format('Failed to assert vhost: %s. %s returned status %d', name, config.loggableUrl, err.status)) : err;
+      return next(_err);
     });
   };
 
@@ -22,8 +22,8 @@ function Client(suppliedAgent) {
     const options = getVhostOptions(name, config);
     self._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);
-      return next(new Error(message));
+      const _err = err.status ? new Error(format('Failed to check vhost: %s. %s returned status %d', name, config.loggableUrl, err.status)) : err;
+      return next(_err);
     });
   };
 
@@ -32,8 +32,8 @@ function Client(suppliedAgent) {
     const options = getVhostOptions(name, config);
     self._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);
-      return next(new Error(message));
+      const _err = err.status ? new Error(format('Failed to delete vhost: %s. %s returned status %d', name, config.loggableUrl, err.status)) : err;
+      return next(_err);
     });
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rascal",
-  "version": "16.3.0",
+  "version": "17.0.0",
   "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": {
@@ -20,14 +20,12 @@
     "amqplib": "^0.10.2",
     "chalk": "^4.1.2",
     "chance": "^1.1.8",
-    "eslint": "^8.33.0",
+    "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-import": "^2.27.5",
-    "husky": "^8.0.1",
+    "husky": "^8.0.3",
     "lint-staged": "^11.2.4",
     "nyc": "^15.1.0",
-    "prettier": "^2.4.1",
     "random-readable": "^1.0.1",
     "superagent-defaults": "^0.1.14",
     "zunit": "^4.0.0"
@@ -40,8 +38,6 @@
   },
   "scripts": {
     "test": "zUnit",
-    "prettier": "prettier --check .",
-    "prettier:fix": "prettier --write .",
     "lint": "eslint .",
     "lint:fix": "eslint --fix .",
     "lint-staged": "lint-staged",
@@ -50,7 +46,6 @@
     "prepare": "husky install"
   },
   "lint-staged": {
-    "**/*": "prettier --write --ignore-unknown",
     "**/*.js": "eslint --fix"
   },
   "keywords": [
@@ -71,7 +66,7 @@
   },
   "homepage": "https://guidesmiths.github.io/rascal/",
   "author": "Stephen Cresswell",
-  "license": "ISC",
+  "license": "MIT",
   "zUnit": {
     "pollute": true,
     "pattern": "^[\\w-]+.tests.js$"

package/.prettierrc.json

@@ -1,4 +0,0 @@
-{
-  "singleQuote": true,
-  "printWidth": 300
-}

package/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: 'npm'
-    directory: '/'
-    allow:
-      - dependency-type: 'direct'