@onify/fake-amqplib 3.0.0 → 3.2.0

package/README.md

@@ -17,6 +17,7 @@ Mocked version of https://www.npmjs.com/package/amqplib.
 RabbitMQ behaviour differs between versions. To specify your version of RabbitMQ you can call `setVersion(minorVersionFloatOrString)`. Default version is 3.5.
 
 Example:
+
 ```js
 var fakeAmqp = require('@onify/fake-amqplib');
 
@@ -30,7 +31,7 @@ var fakeAmqp = require('@onify/fake-amqplib');
 
   fakeAmqp.setVersion('3.7');
   const conn37 = await fakeAmqp.connect('amqp://rabbit3-7');
-})()
+})();
 ```
 
 ## Mocking amqplib
@@ -41,7 +42,7 @@ You might want to override `amqplib` with `@onify/fake-amqplib` in tests. This c
 
 Example on how to mock amqplib when working with commonjs.
 
-```javascript
+```js
 const amqplib = require('amqplib');
 const fakeAmqp = require('@onify/fake-amqplib');
 
@@ -50,7 +51,7 @@ amqplib.connect = fakeAmqp.connect;
 
 or:
 
-```javascript
+```js
 const mock = require('mock-require');
 const fakeAmqp = require('@onify/fake-amqplib');
 
@@ -59,7 +60,7 @@ mock('amqplib/callback_api', fakeAmqp);
 
 or just mock the entire amqplib with:
 
-```javascript
+```js
 const mock = require('mock-require');
 const fakeAmqp = require('@onify/fake-amqplib');
 
@@ -75,36 +76,34 @@ Example on how to mock amqplib import when working with modules.
 Both amqplib and fake-amqplib have to be quibbled if reset mock is used during testing.
 
 _test/setup.js_
-```js
+
+```javascript
 import * as fakeAmqpLib from '@onify/fake-amqplib';
 import { connect as fakeConnect } from '@onify/fake-amqplib';
 import quibble from 'quibble';
 
 (async () => {
   await quibble.esm('amqplib', { connect: fakeConnect });
-  await quibble.esm('amqplib/callback_api', { connect: fakeConnect });
   await quibble.esm('@onify/fake-amqplib', { ...fakeAmqpLib });
 })();
 ```
 
 _.mocharc.json_ (true for node version < 20)
+
 ```json
 {
   "recursive": true,
   "require": ["test/setup.js"],
-  "node-option": [
-    "experimental-specifier-resolution=node",
-    "no-warnings",
-    "loader=quibble"
-  ]
+  "node-option": ["experimental-specifier-resolution=node", "no-warnings", "loader=quibble"]
 }
 ```
 
 _test/amqplib-connection-test.js_
-```js
+
+```javascript
 import assert from 'node:assert';
 import { connect } from 'amqplib';
-import { connect as connectCb } from 'amqplib/callback_api';
+import { connect as connectCb } from 'amqplib';
 
 import { resetMock } from '@onify/fake-amqplib';
 

package/index.d.ts

@@ -1,8 +1,7 @@
 /// <reference types="amqplib" />
 /// <reference types="node" />
 
-import { Options, Connection, Channel } from "amqplib";
-import { EventEmitter } from "events";
+import { Options, Connection, Channel } from 'amqplib';
 import { Broker } from 'smqp';
 
 export interface FakeAmqplibChannel extends Channel {
@@ -10,7 +9,7 @@ export interface FakeAmqplibChannel extends Channel {
   _channelName: string;
   _broker: Broker;
   _version: number;
-  new(broker: Broker, connection: FakeAmqplibConnection): FakeAmqplibChannel;
+  new (broker: Broker, connection: FakeAmqplibConnection): FakeAmqplibChannel;
   get _closed(): boolean;
 }
 
@@ -21,7 +20,7 @@ export interface FakeAmqplibConnection extends Connection {
   _id: string;
   _broker: Broker;
   _version: number;
-  new(broker: Broker, version: number, amqpUrl: string, options?: any): FakeAmqplibConnection;
+  new (broker: Broker, version: number, amqpUrl: string, options?: any): FakeAmqplibConnection;
   get _closed(): boolean;
 }
 
@@ -36,14 +35,11 @@ interface SocketOptions {
   [x: string]: any;
 }
 
-type connectCallback = (
-  err: Error,
-  connection: FakeAmqplibConnection
-) => void;
+type connectCallback = (err: Error, connection: FakeAmqplibConnection) => void;
 
 export class FakeAmqplib {
   connections: FakeAmqplibConnection[];
-  constructor(version?: number)
+  constructor(version?: number);
   connect(url: string | Options.Connect, socketOptions?: SocketOptions): Promise<FakeAmqplibConnection>;
   connect(url: string | Options.Connect, socketOptions: SocketOptions, callback: connectCallback): void;
   connect(url: string | Options.Connect, callback: (err: Error, connection: FakeAmqplibConnection) => void): void;

package/index.js

@@ -36,13 +36,23 @@ class FakeAmqpError extends Error {
 
 class FakeAmqpNotFoundError extends FakeAmqpError {
   constructor(type, name, vhost, killConnection = false) {
-    super(`Channel closed by server: 404 (NOT-FOUND) with message "NOT_FOUND - no ${type} '${name}' in vhost '${vhost || '/'}'`, 404, true, killConnection);
+    super(
+      `Channel closed by server: 404 (NOT-FOUND) with message "NOT_FOUND - no ${type} '${name}' in vhost '${vhost || '/'}'`,
+      404,
+      true,
+      killConnection,
+    );
   }
 }
 
 class FakeAmqpUnknownDeliveryTag extends FakeAmqpError {
   constructor(deliveryTag) {
-    super(`Channel closed by server: 406 (PRECONDITION-FAILED) with message "PRECONDITION_FAILED - unknown delivery tag ${deliveryTag}`, 406, true, false);
+    super(
+      `Channel closed by server: 406 (PRECONDITION-FAILED) with message "PRECONDITION_FAILED - unknown delivery tag ${deliveryTag}`,
+      406,
+      true,
+      false,
+    );
   }
   get _emit() {
     return true;
@@ -64,7 +74,7 @@ export class FakeAmqplibChannel extends EventEmitter {
     this[kPrefetch] = 10000;
     this[kChannelPrefetch] = Infinity;
     this[kClosed] = false;
-    const channelName = this._channelName = `channel-${generateId()}`;
+    const channelName = (this._channelName = `channel-${generateId()}`);
     this._version = connection._version;
     this._broker = broker;
 
@@ -104,12 +114,12 @@ export class FakeAmqplibChannel extends EventEmitter {
   }
   bindExchange(destination, source, ...args) {
     const broker = this._broker;
-    return Promise.all([ this.checkExchange(source), this.checkExchange(destination) ]).then(() => {
+    return Promise.all([this.checkExchange(source), this.checkExchange(destination)]).then(() => {
       return this._callBroker(broker.bindExchange, source, destination, ...args);
     });
   }
   bindQueue(queue, source, ...args) {
-    return Promise.all([ this.checkQueue(queue), this.checkExchange(source) ]).then(() => {
+    return Promise.all([this.checkQueue(queue), this.checkExchange(source)]).then(() => {
       return this._callBroker(this._broker.bindQueue, queue, source, ...args);
     });
   }
@@ -176,15 +186,17 @@ export class FakeAmqplibChannel extends EventEmitter {
     if (!Buffer.isBuffer(content)) throw new TypeError('content is not a buffer');
     if (exchange === '') return this.sendToQueue(routingKey, content, options, callback);
 
-    const args = [ this._broker.publish, exchange, routingKey, content ];
+    const args = [this._broker.publish, exchange, routingKey, content];
 
     args.push(options, callback);
 
-    this.checkExchange(exchange).then(() => {
-      return this._callBroker(...args);
-    }).catch((err) => {
-      this.emit('error', err);
-    });
+    this.checkExchange(exchange)
+      .then(() => {
+        return this._callBroker(...args);
+      })
+      .catch((err) => {
+        this.emit('error', err);
+      });
 
     return true;
   }
@@ -201,15 +213,17 @@ export class FakeAmqplibChannel extends EventEmitter {
   sendToQueue(queue, content, options, callback) {
     if (!Buffer.isBuffer(content)) throw new TypeError('content is not a buffer');
 
-    const args = [ this._broker.sendToQueue, queue, content ];
+    const args = [this._broker.sendToQueue, queue, content];
 
     args.push(options, callback);
 
-    this.checkQueue(queue).then(() => {
-      return this._callBroker(...args);
-    }).catch((err) => {
-      this.emit('error', err);
-    });
+    this.checkQueue(queue)
+      .then(() => {
+        return this._callBroker(...args);
+      })
+      .catch((err) => {
+        this.emit('error', err);
+      });
 
     return true;
   }
@@ -266,7 +280,12 @@ export class FakeAmqplibChannel extends EventEmitter {
       }
 
       if (q.exclusive || (q.options.exclusive && q.options._connectionId !== connId)) {
-        throw new FakeAmqpError(`Channel closed by server: 403 (ACCESS-REFUSED) with message "ACCESS_REFUSED - queue '${queue}' in vhost '${connUrl.pathname}' in exclusive use"`, 403, true, true);
+        throw new FakeAmqpError(
+          `Channel closed by server: 403 (ACCESS-REFUSED) with message "ACCESS_REFUSED - queue '${queue}' in vhost '${connUrl.pathname}' in exclusive use"`,
+          403,
+          true,
+          true,
+        );
       }
 
       const consumer = this.consume(queue, onMessage && handler, {
@@ -425,7 +444,7 @@ export class FakeAmqplibChannel extends EventEmitter {
     }
   }
   _callBroker(fn, ...args) {
-    let [ poppedCb ] = args.slice(-1);
+    let [poppedCb] = args.slice(-1);
     if (typeof poppedCb === 'function') args.splice(-1);
     else poppedCb = null;
 
@@ -494,30 +513,34 @@ export class FakeAmqplibConfirmChannel extends FakeAmqplibChannel {
     if (!Buffer.isBuffer(content)) throw new TypeError('content is not a buffer');
     if (exchange === '') return this.sendToQueue(routingKey, content, options, callback);
 
-    const args = [ this._broker.publish, exchange, routingKey, content ];
+    const args = [this._broker.publish, exchange, routingKey, content];
 
     args.push(...addConfirmCallback(this._broker, options, callback));
 
-    this.checkExchange(exchange).then(() => {
-      return this._callBroker(...args);
-    }).catch((err) => {
-      this.emit('error', err);
-    });
+    this.checkExchange(exchange)
+      .then(() => {
+        return this._callBroker(...args);
+      })
+      .catch((err) => {
+        this.emit('error', err);
+      });
 
     return true;
   }
   sendToQueue(queue, content, options, callback) {
     if (!Buffer.isBuffer(content)) throw new TypeError('content is not a buffer');
 
-    const args = [ this._broker.sendToQueue, queue, content ];
+    const args = [this._broker.sendToQueue, queue, content];
 
     args.push(...addConfirmCallback(this._broker, options, callback));
 
-    this.checkQueue(queue).then(() => {
-      return this._callBroker(...args);
-    }).catch((err) => {
-      this.emit('error', err);
-    });
+    this.checkQueue(queue)
+      .then(() => {
+        return this._callBroker(...args);
+      })
+      .catch((err) => {
+        this.emit('error', err);
+      });
 
     return true;
   }
@@ -644,27 +667,21 @@ function normalizeAmqpUrl(url) {
   if (typeof url === 'string') url = new URL(url);
 
   if (!(url instanceof URL)) {
-    const {
-      protocol = 'amqp',
-      hostname = 'localhost',
-      port = 5672,
-      vhost = '/',
-      username,
-      password,
-      ...rest
-    } = url;
+    const { protocol = 'amqp', hostname = 'localhost', port = 5672, vhost = '/', username, password, ...rest } = url;
     let auth = username;
     if (auth && password) {
       auth += `:${password}`;
     }
-    url = new URL(urlFormat({
-      protocol,
-      hostname,
-      port,
-      pathname: vhost,
-      slashes: true,
-      auth,
-    }));
+    url = new URL(
+      urlFormat({
+        protocol,
+        hostname,
+        port,
+        pathname: vhost,
+        slashes: true,
+        auth,
+      }),
+    );
 
     for (const k in rest) {
       switch (k) {
@@ -700,7 +717,7 @@ function addConfirmCallback(broker, options, callback) {
   }
 
   function confirmCallback() {
-    broker.off('message.*', consumerTag);
+    broker.off('message.*', { consumerTag });
     switch (undelivered) {
       case 'message.nack':
         return callback(new Error('message nacked'));
@@ -711,20 +728,23 @@ function addConfirmCallback(broker, options, callback) {
     }
   }
 
-  return [ options, confirmCallback ];
+  return [options, confirmCallback];
 }
 
 function allUpToDeliveryTag(q, deliveryTag, op, ...args) {
   const brokerMessages = [];
 
-  const consumer = q.consume((_, cmsg) => {
-    const msgDeliveryTag = cmsg.fields.deliveryTag;
-    if (msgDeliveryTag >= deliveryTag) {
-      return q.cancel(cmsg.fields.consumerTag);
-    }
-    brokerMessages.push(cmsg.content[kSmqp]);
-    cmsg[op](...args);
-  }, { prefetch: Infinity });
+  const consumer = q.consume(
+    (_, cmsg) => {
+      const msgDeliveryTag = cmsg.fields.deliveryTag;
+      if (msgDeliveryTag >= deliveryTag) {
+        return q.cancel(cmsg.fields.consumerTag);
+      }
+      brokerMessages.push(cmsg.content[kSmqp]);
+      cmsg[op](...args);
+    },
+    { prefetch: Infinity },
+  );
 
   consumer.cancel();
 

package/main.cjs

@@ -38,13 +38,23 @@ class FakeAmqpError extends Error {
 
 class FakeAmqpNotFoundError extends FakeAmqpError {
   constructor(type, name, vhost, killConnection = false) {
-    super(`Channel closed by server: 404 (NOT-FOUND) with message "NOT_FOUND - no ${type} '${name}' in vhost '${vhost || '/'}'`, 404, true, killConnection);
+    super(
+      `Channel closed by server: 404 (NOT-FOUND) with message "NOT_FOUND - no ${type} '${name}' in vhost '${vhost || '/'}'`,
+      404,
+      true,
+      killConnection,
+    );
   }
 }
 
 class FakeAmqpUnknownDeliveryTag extends FakeAmqpError {
   constructor(deliveryTag) {
-    super(`Channel closed by server: 406 (PRECONDITION-FAILED) with message "PRECONDITION_FAILED - unknown delivery tag ${deliveryTag}`, 406, true, false);
+    super(
+      `Channel closed by server: 406 (PRECONDITION-FAILED) with message "PRECONDITION_FAILED - unknown delivery tag ${deliveryTag}`,
+      406,
+      true,
+      false,
+    );
   }
   get _emit() {
     return true;
@@ -66,7 +76,7 @@ class FakeAmqplibChannel extends events.EventEmitter {
     this[kPrefetch] = 10000;
     this[kChannelPrefetch] = Infinity;
     this[kClosed] = false;
-    const channelName = this._channelName = `channel-${generateId()}`;
+    const channelName = (this._channelName = `channel-${generateId()}`);
     this._version = connection._version;
     this._broker = broker;
 
@@ -106,12 +116,12 @@ class FakeAmqplibChannel extends events.EventEmitter {
   }
   bindExchange(destination, source, ...args) {
     const broker = this._broker;
-    return Promise.all([ this.checkExchange(source), this.checkExchange(destination) ]).then(() => {
+    return Promise.all([this.checkExchange(source), this.checkExchange(destination)]).then(() => {
       return this._callBroker(broker.bindExchange, source, destination, ...args);
     });
   }
   bindQueue(queue, source, ...args) {
-    return Promise.all([ this.checkQueue(queue), this.checkExchange(source) ]).then(() => {
+    return Promise.all([this.checkQueue(queue), this.checkExchange(source)]).then(() => {
       return this._callBroker(this._broker.bindQueue, queue, source, ...args);
     });
   }
@@ -178,15 +188,17 @@ class FakeAmqplibChannel extends events.EventEmitter {
     if (!Buffer.isBuffer(content)) throw new TypeError('content is not a buffer');
     if (exchange === '') return this.sendToQueue(routingKey, content, options, callback);
 
-    const args = [ this._broker.publish, exchange, routingKey, content ];
+    const args = [this._broker.publish, exchange, routingKey, content];
 
     args.push(options, callback);
 
-    this.checkExchange(exchange).then(() => {
-      return this._callBroker(...args);
-    }).catch((err) => {
-      this.emit('error', err);
-    });
+    this.checkExchange(exchange)
+      .then(() => {
+        return this._callBroker(...args);
+      })
+      .catch((err) => {
+        this.emit('error', err);
+      });
 
     return true;
   }
@@ -203,15 +215,17 @@ class FakeAmqplibChannel extends events.EventEmitter {
   sendToQueue(queue, content, options, callback) {
     if (!Buffer.isBuffer(content)) throw new TypeError('content is not a buffer');
 
-    const args = [ this._broker.sendToQueue, queue, content ];
+    const args = [this._broker.sendToQueue, queue, content];
 
     args.push(options, callback);
 
-    this.checkQueue(queue).then(() => {
-      return this._callBroker(...args);
-    }).catch((err) => {
-      this.emit('error', err);
-    });
+    this.checkQueue(queue)
+      .then(() => {
+        return this._callBroker(...args);
+      })
+      .catch((err) => {
+        this.emit('error', err);
+      });
 
     return true;
   }
@@ -268,7 +282,12 @@ class FakeAmqplibChannel extends events.EventEmitter {
       }
 
       if (q.exclusive || (q.options.exclusive && q.options._connectionId !== connId)) {
-        throw new FakeAmqpError(`Channel closed by server: 403 (ACCESS-REFUSED) with message "ACCESS_REFUSED - queue '${queue}' in vhost '${connUrl.pathname}' in exclusive use"`, 403, true, true);
+        throw new FakeAmqpError(
+          `Channel closed by server: 403 (ACCESS-REFUSED) with message "ACCESS_REFUSED - queue '${queue}' in vhost '${connUrl.pathname}' in exclusive use"`,
+          403,
+          true,
+          true,
+        );
       }
 
       const consumer = this.consume(queue, onMessage && handler, {
@@ -427,7 +446,7 @@ class FakeAmqplibChannel extends events.EventEmitter {
     }
   }
   _callBroker(fn, ...args) {
-    let [ poppedCb ] = args.slice(-1);
+    let [poppedCb] = args.slice(-1);
     if (typeof poppedCb === 'function') args.splice(-1);
     else poppedCb = null;
 
@@ -496,30 +515,34 @@ class FakeAmqplibConfirmChannel extends FakeAmqplibChannel {
     if (!Buffer.isBuffer(content)) throw new TypeError('content is not a buffer');
     if (exchange === '') return this.sendToQueue(routingKey, content, options, callback);
 
-    const args = [ this._broker.publish, exchange, routingKey, content ];
+    const args = [this._broker.publish, exchange, routingKey, content];
 
     args.push(...addConfirmCallback(this._broker, options, callback));
 
-    this.checkExchange(exchange).then(() => {
-      return this._callBroker(...args);
-    }).catch((err) => {
-      this.emit('error', err);
-    });
+    this.checkExchange(exchange)
+      .then(() => {
+        return this._callBroker(...args);
+      })
+      .catch((err) => {
+        this.emit('error', err);
+      });
 
     return true;
   }
   sendToQueue(queue, content, options, callback) {
     if (!Buffer.isBuffer(content)) throw new TypeError('content is not a buffer');
 
-    const args = [ this._broker.sendToQueue, queue, content ];
+    const args = [this._broker.sendToQueue, queue, content];
 
     args.push(...addConfirmCallback(this._broker, options, callback));
 
-    this.checkQueue(queue).then(() => {
-      return this._callBroker(...args);
-    }).catch((err) => {
-      this.emit('error', err);
-    });
+    this.checkQueue(queue)
+      .then(() => {
+        return this._callBroker(...args);
+      })
+      .catch((err) => {
+        this.emit('error', err);
+      });
 
     return true;
   }
@@ -646,27 +669,21 @@ function normalizeAmqpUrl(url$1) {
   if (typeof url$1 === 'string') url$1 = new URL(url$1);
 
   if (!(url$1 instanceof URL)) {
-    const {
-      protocol = 'amqp',
-      hostname = 'localhost',
-      port = 5672,
-      vhost = '/',
-      username,
-      password,
-      ...rest
-    } = url$1;
+    const { protocol = 'amqp', hostname = 'localhost', port = 5672, vhost = '/', username, password, ...rest } = url$1;
     let auth = username;
     if (auth && password) {
       auth += `:${password}`;
     }
-    url$1 = new URL(url.format({
-      protocol,
-      hostname,
-      port,
-      pathname: vhost,
-      slashes: true,
-      auth,
-    }));
+    url$1 = new URL(
+      url.format({
+        protocol,
+        hostname,
+        port,
+        pathname: vhost,
+        slashes: true,
+        auth,
+      }),
+    );
 
     for (const k in rest) {
       switch (k) {
@@ -702,7 +719,7 @@ function addConfirmCallback(broker, options, callback) {
   }
 
   function confirmCallback() {
-    broker.off('message.*', consumerTag);
+    broker.off('message.*', { consumerTag });
     switch (undelivered) {
       case 'message.nack':
         return callback(new Error('message nacked'));
@@ -713,20 +730,23 @@ function addConfirmCallback(broker, options, callback) {
     }
   }
 
-  return [ options, confirmCallback ];
+  return [options, confirmCallback];
 }
 
 function allUpToDeliveryTag(q, deliveryTag, op, ...args) {
   const brokerMessages = [];
 
-  const consumer = q.consume((_, cmsg) => {
-    const msgDeliveryTag = cmsg.fields.deliveryTag;
-    if (msgDeliveryTag >= deliveryTag) {
-      return q.cancel(cmsg.fields.consumerTag);
-    }
-    brokerMessages.push(cmsg.content[kSmqp]);
-    cmsg[op](...args);
-  }, { prefetch: Infinity });
+  const consumer = q.consume(
+    (_, cmsg) => {
+      const msgDeliveryTag = cmsg.fields.deliveryTag;
+      if (msgDeliveryTag >= deliveryTag) {
+        return q.cancel(cmsg.fields.consumerTag);
+      }
+      brokerMessages.push(cmsg.content[kSmqp]);
+      cmsg[op](...args);
+    },
+    { prefetch: Infinity },
+  );
 
   consumer.cancel();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onify/fake-amqplib",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "description": "Fake amqplib",
   "type": "module",
   "exports": {
@@ -14,7 +14,7 @@
   "scripts": {
     "test": "mocha",
     "posttest": "npm run lint && npm run dist",
-    "lint": "eslint . --cache",
+    "lint": "eslint . --cache && prettier . -c --cache",
     "dist": "rollup -c",
     "prepack": "npm run dist",
     "cov:html": "c8 -r html -r text mocha",
@@ -33,17 +33,21 @@
   },
   "license": "MIT",
   "dependencies": {
-    "smqp": "^8.2.0"
+    "smqp": "^9.0.1"
   },
   "devDependencies": {
-    "@bonniernews/eslint-config": "^1.0.1",
-    "@rollup/plugin-commonjs": "^25.0.5",
+    "@rollup/plugin-commonjs": "^28.0.0",
     "@types/amqplib": "^0.10.2",
-    "c8": "^8.0.1",
-    "chai": "^4.3.10",
-    "eslint": "^8.51.0",
+    "amqplib": "^0.10.4",
+    "c8": "^10.1.2",
+    "chai": "^5.1.0",
+    "eslint": "^9.0.0",
+    "globals": "^15.0.0",
     "mocha": "^10.2.0",
-    "rollup": "^4.0.2"
+    "prettier": "^3.2.5",
+    "quibble": "^0.9.2",
+    "rollup": "^4.0.2",
+    "texample": "^0.0.6"
   },
   "keywords": [
     "fake",