amqplib 0.9.0 → 0.10.1

package/.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 16.x]
+        node-version: [10.x, 12.x, 14.x, 16.x, 18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Change log for amqplib
 
+## Changes in v0.10.1
+
+    git log v0.10.0..v0.10.1
+
+ * Allow servername to be specified via socket options as discussed in as discussed in
+   [issue 697](https://github.com/squaremo/amqp.node/issues/697)
+
+## Changes in v0.10.0
+
+    git log v0.9.1..v0.10.0
+
+ * Use Native promises ([PR
+   689](https://github.com/amqp-node/amqplib/pull/689), thank you
+   @mohd-akram and @kibertoad)
+
+## Changes in v0.9.1
+
+    git log v0.9.0..v0.9.1
+
+ * Assorted readme changes
+ * Use Array.prototype.push.apply instead of concat in Mux ([PR
+   658](https://github.com/squaremo/amqp.node/pull/658), thank you
+   @Uzlopak and @kibertoad)
+ * Use Map instead of Object for BaseChannel.consumers ([PR
+   660](https://github.com/squaremo/amqp.node/pull/660), thank you
+   @Uzlopak)
+ * Delete consumer callback after cancellation to free memory ([PR
+   659](https://github.com/squaremo/amqp.node/pull/659), thank you
+   @Uzlopak and @kibertoad)
+
+
 ## Changes in v0.9.0
 
     git log v0.8.0..v0.9.0

package/Makefile

@@ -3,7 +3,7 @@ JSON=amqp-rabbitmq-0.9.1.json
 RABBITMQ_CODEGEN=https://raw.githubusercontent.com/rabbitmq/rabbitmq-codegen
 AMQP_JSON=$(RABBITMQ_CODEGEN)/$(RABBITMQ_SRC_VERSION)/$(JSON)
 
-NODEJS_VERSIONS='10.21' '11.15' '12.18' '13.14' '14.5' '15.8'
+NODEJS_VERSIONS='10.21' '11.15' '12.18' '13.14' '14.5' '15.8' '16.3.0' '18.1.0'
 
 MOCHA=./node_modules/.bin/mocha
 _MOCHA=./node_modules/.bin/_mocha

package/README.md

@@ -1,14 +1,19 @@
 # AMQP 0-9-1 library and client for Node.JS
 
-[![Build Status](https://travis-ci.org/squaremo/amqp.node.png)](https://travis-ci.org/squaremo/amqp.node)
+[![NPM version](https://img.shields.io/npm/v/amqplib.svg?style=flat-square)](https://www.npmjs.com/package/amqplib)
+[![NPM downloads](https://img.shields.io/npm/dm/amqplib.svg?style=flat-square)](https://www.npmjs.com/package/amqplib)
+[![Node.js CI](https://github.com/amqp-node/amqplib/workflows/Node.js%20CI/badge.svg)](https://github.com/amqp-node/amqplib/actions?query=workflow%3A%22Node.js+CI%22)
+[![amqplib](https://snyk.io/advisor/npm-package/amqplib/badge.svg)](https://snyk.io/advisor/npm-package/amqplib)
 
     npm install amqplib
 
  * [Change log][changelog]
  * [GitHub pages][gh-pages]
  * [API reference][gh-pages-apiref]
+ * [Troubleshooting][gh-pages-trouble]
  * [Examples from RabbitMQ tutorials][tutes]
 
+
 A library for making AMQP 0-9-1 clients for Node.JS, and an AMQP 0-9-1 client for Node.JS v10+.
 
 This library does not implement [AMQP
@@ -32,75 +37,71 @@ Still working on:
 ## Callback API example
 
 ```javascript
-var q = 'tasks';
-
-function bail(err) {
-  console.error(err);
-  process.exit(1);
-}
-
-// Publisher
-function publisher(conn) {
-  conn.createChannel(on_open);
-  function on_open(err, ch) {
-    if (err != null) bail(err);
-    ch.assertQueue(q);
-    ch.sendToQueue(q, Buffer.from('something to do'));
-  }
-}
-
-// Consumer
-function consumer(conn) {
-  var ok = conn.createChannel(on_open);
-  function on_open(err, ch) {
-    if (err != null) bail(err);
-    ch.assertQueue(q);
-    ch.consume(q, function(msg) {
+const amqplib = require('amqplib/callback_api');
+const queue = 'tasks';
+
+amqplib.connect('amqp://localhost', (err, conn) => {
+  if (err) throw err;
+
+  // Listener
+  conn.createChannel((err, ch2) => {
+    if (err) throw err;
+
+    ch2.assertQueue(queue);
+
+    ch2.consume(queue, (msg) => {
       if (msg !== null) {
         console.log(msg.content.toString());
-        ch.ack(msg);
+        ch2.ack(msg);
+      } else {
+        console.log('Consumer cancelled by server');
       }
     });
-  }
-}
-
-require('amqplib/callback_api')
-  .connect('amqp://localhost', function(err, conn) {
-    if (err != null) bail(err);
-    consumer(conn);
-    publisher(conn);
   });
+
+  // Sender
+  conn.createChannel((err, ch1) => {
+    if (err) throw err;
+
+    ch1.assertQueue(queue);
+
+    setInterval(() => {
+      ch1.sendToQueue(queue, Buffer.from('something to do'));
+    }, 1000);
+  });
+});
 ```
 
-## Promise API example
+## Promise/Async API example
 
 ```javascript
-var q = 'tasks';
+const amqplib = require('amqplib');
+
+(async () => {
+  const queue = 'tasks';
+  const conn = await amqplib.connect('amqp://localhost');
+
+  const ch1 = await conn.createChannel();
+  await ch1.assertQueue(queue);
+
+  // Listener
+  ch1.consume(queue, (msg) => {
+    if (msg !== null) {
+      console.log('Recieved:', msg.content.toString());
+      ch1.ack(msg);
+    } else {
+      console.log('Consumer cancelled by server');
+    }
+  });
 
-var open = require('amqplib').connect('amqp://localhost');
+  // Sender
+  const ch2 = await conn.createChannel();
+
+  setInterval(() => {
+    ch2.sendToQueue(queue, Buffer.from('something to do'));
+  }, 1000);
+})();
 
-// Publisher
-open.then(function(conn) {
-  return conn.createChannel();
-}).then(function(ch) {
-  return ch.assertQueue(q).then(function(ok) {
-    return ch.sendToQueue(q, Buffer.from('something to do'));
-  });
-}).catch(console.warn);
-
-// Consumer
-open.then(function(conn) {
-  return conn.createChannel();
-}).then(function(ch) {
-  return ch.assertQueue(q).then(function(ok) {
-    return ch.consume(q, function(msg) {
-      if (msg !== null) {
-        console.log(msg.content.toString());
-        ch.ack(msg);
-      }
-    });
-  });
-}).catch(console.warn);
 ```
 
 ## Running tests
@@ -127,7 +128,7 @@ dev.rabbitmq.com instance.
 
 You can run it under different versions of Node.JS using [nave][]:
 
-    nave use 0.8 npm test
+    nave use 10 npm test
 
 or run the tests on all supported versions of Node.JS in one go:
 
@@ -146,10 +147,11 @@ really only useful for checking the kind and formatting of the errors.
     make coverage
     open file://`pwd`/coverage/lcov-report/index.html
 
-[gh-pages]: http://www.squaremobius.net/amqp.node/
-[gh-pages-apiref]: http://www.squaremobius.net/amqp.node/channel_api.html
+[gh-pages]: https://amqp-node.github.io/amqplib/
+[gh-pages-apiref]: https://amqp-node.github.io/amqplib/channel_api.html
+[gh-pages-trouble]: https://amqp-node.github.io/amqplib/#troubleshooting
 [nave]: https://github.com/isaacs/nave
-[tutes]: https://github.com/squaremo/amqp.node/tree/main/examples/tutorials
+[tutes]: https://github.com/amqp-node/amqplib/tree/main/examples/tutorials
 [rabbitmq-tutes]: http://www.rabbitmq.com/getstarted.html
-[changelog]: https://github.com/squaremo/amqp.node/blob/main/CHANGELOG.md
+[changelog]: https://github.com/amqp-node/amqplib/blob/main/CHANGELOG.md
 [docker]: https://www.docker.com/

package/channel_api.js

@@ -1,11 +1,11 @@
 var raw_connect = require('./lib/connect').connect;
 var ChannelModel = require('./lib/channel_model').ChannelModel;
-var Promise = require('bluebird');
+var promisify = require('util').promisify;
 
 function connect(url, connOptions) {
-  return Promise.fromCallback(function(cb) {
+  return promisify(function(cb) {
     return raw_connect(url, connOptions, cb);
-  })
+  })()
   .then(function(conn) {
     return new ChannelModel(conn);
   });

package/examples/tutorials/receive_logs_direct.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env node
 
 var amqp = require('amqplib');
-var all = require('bluebird').all;
 var basename = require('path').basename;
 
 var severities = process.argv.slice(2);
@@ -24,7 +23,7 @@ amqp.connect('amqp://localhost').then(function(conn) {
 
     ok = ok.then(function(qok) {
       var queue = qok.queue;
-      return all(severities.map(function(sev) {
+      return Promise.all(severities.map(function(sev) {
         ch.bindQueue(queue, ex, sev);
       })).then(function() { return queue; });
     });

package/examples/tutorials/receive_logs_topic.js

@@ -2,7 +2,6 @@
 
 var amqp = require('amqplib');
 var basename = require('path').basename;
-var all = require('bluebird').all;
 
 var keys = process.argv.slice(2);
 if (keys.length < 1) {
@@ -23,7 +22,7 @@ amqp.connect('amqp://localhost').then(function(conn) {
 
     ok = ok.then(function(qok) {
       var queue = qok.queue;
-      return all(keys.map(function(rk) {
+      return Promise.all(keys.map(function(rk) {
         ch.bindQueue(queue, ex, rk);
       })).then(function() { return queue; });
     });

package/examples/tutorials/rpc_client.js

@@ -2,7 +2,6 @@
 
 var amqp = require('amqplib');
 var basename = require('path').basename;
-var Promise = require('bluebird');
 var uuid = require('node-uuid');
 
 // I've departed from the form of the original RPC tutorial, which

package/lib/callback_model.js

@@ -5,7 +5,6 @@
 'use strict';
 
 var defs = require('./defs');
-var Promise = require('bluebird');
 var inherits = require('util').inherits;
 var EventEmitter = require('events').EventEmitter;
 var BaseChannel = require('./channel').BaseChannel;

package/lib/channel.js

@@ -460,7 +460,7 @@ C.onBufferDrain = function() {
 // low-level machinery.
 function BaseChannel(connection) {
   Channel.call(this, connection);
-  this.consumers = {};
+  this.consumers = new Map();
 }
 inherits(BaseChannel, Channel);
 
@@ -469,16 +469,16 @@ module.exports.BaseChannel = BaseChannel;
 // Not sure I like the ff, it's going to be changing hidden classes
 // all over the place. On the other hand, whaddya do.
 BaseChannel.prototype.registerConsumer = function(tag, callback) {
-  this.consumers[tag] = callback;
+  this.consumers.set(tag, callback);
 };
 
 BaseChannel.prototype.unregisterConsumer = function(tag) {
-  delete this.consumers[tag];
+  this.consumers.delete(tag);
 };
 
 BaseChannel.prototype.dispatchMessage = function(fields, message) {
   var consumerTag = fields.consumerTag;
-  var consumer = this.consumers[consumerTag];
+  var consumer = this.consumers.get(consumerTag);
   if (consumer) {
     return consumer(message);
   }
@@ -493,5 +493,7 @@ BaseChannel.prototype.handleDelivery = function(message) {
 };
 
 BaseChannel.prototype.handleCancel = function(fields) {
-  return this.dispatchMessage(fields, null);
+  var result = this.dispatchMessage(fields, null);
+  this.unregisterConsumer(fields.consumerTag);
+  return result;
 };

package/lib/channel_model.js

@@ -5,7 +5,7 @@
 'use strict';
 
 const EventEmitter = require('events');
-const Promise = require('bluebird');
+const promisify = require('util').promisify;
 const defs = require('./defs');
 const {BaseChannel} = require('./channel');
 const {acceptMessage} = require('./channel');
@@ -23,7 +23,7 @@ class ChannelModel extends EventEmitter {
   }
 
   close() {
-    return Promise.fromCallback(this.connection.close.bind(this.connection));
+    return promisify(this.connection.close.bind(this.connection))();
   }
 
   async createChannel() {
@@ -53,27 +53,25 @@ class Channel extends BaseChannel {
   // response's fields; this is intended to be suitable for implementing
   // API procedures.
   async rpc(method, fields, expect) {
-    const f = await Promise.fromCallback(cb => {
+    const f = await promisify(cb => {
       return this._rpc(method, fields, expect, cb);
-    })
+    })();
 
     return f.fields;
   }
 
   // Do the remarkably simple channel open handshake
-  open() {
-    return Promise.try(this.allocate.bind(this)).then(
-      ch => {
-        return ch.rpc(defs.ChannelOpen, {outOfBand: ""},
-                      defs.ChannelOpenOk);
-      });
+  async open() {
+    const ch = await this.allocate.bind(this)();
+    return ch.rpc(defs.ChannelOpen, {outOfBand: ""},
+                  defs.ChannelOpenOk);
   }
 
   close() {
-    return Promise.fromCallback(cb => {
+    return promisify(cb => {
       return this.closeBecause("Goodbye", defs.constants.REPLY_SUCCESS,
                       cb);
-    });
+    })();
   }
 
   // === Public API, declaring queues and stuff ===
@@ -162,21 +160,21 @@ class Channel extends BaseChannel {
     // NB we want the callback to be run synchronously, so that we've
     // registered the consumerTag before any messages can arrive.
     const fields = Args.consume(queue, options);
-    return Promise.fromCallback(cb => {
-      this._rpc(defs.BasicConsume, fields, defs.BasicConsumeOk, cb);
-    })
-    .then(ok => {
-      this.registerConsumer(ok.fields.consumerTag, callback);
-      return ok.fields;
+    return new Promise((resolve, reject) => {
+      this._rpc(defs.BasicConsume, fields, defs.BasicConsumeOk, (err, ok) => {
+        if (err) return reject(err);
+        this.registerConsumer(ok.fields.consumerTag, callback);
+        resolve(ok.fields);
+      });
     });
   }
 
   async cancel(consumerTag) {
-    const ok = await Promise.fromCallback(cb => {
+    const ok = await promisify(cb => {
       this._rpc(defs.BasicCancel, Args.cancel(consumerTag),
             defs.BasicCancelOk,
             cb);
-    })
+    })()
     .then(ok => {
       this.unregisterConsumer(consumerTag);
       return ok.fields;
@@ -185,25 +183,23 @@ class Channel extends BaseChannel {
 
   get(queue, options) {
     const fields = Args.get(queue, options);
-    return Promise.fromCallback(cb => {
-      return this.sendOrEnqueue(defs.BasicGet, fields, cb);
-    })
-    .then(f => {
-      if (f.id === defs.BasicGetEmpty) {
-        return false;
-      }
-      else if (f.id === defs.BasicGetOk) {
-        const fields = f.fields;
-        return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
+      this.sendOrEnqueue(defs.BasicGet, fields, (err, f) => {
+        if (err) return reject(err);
+        if (f.id === defs.BasicGetEmpty) {
+          return resolve(false);
+        }
+        else if (f.id === defs.BasicGetOk) {
+          const fields = f.fields;
           this.handleMessage = acceptMessage(m => {
             m.fields = fields;
             resolve(m);
           });
-        });
-      }
-      else {
-        throw new Error(`Unexpected response to BasicGet: ${inspect(f)}`);
-      }
+        }
+        else {
+          reject(new Error(`Unexpected response to BasicGet: ${inspect(f)}`));
+        }
+      });
     });
   }
 
@@ -290,6 +286,13 @@ class ConfirmChannel extends Channel {
         awaiting.push(confirmed);
       }
     });
+    // Channel closed
+    if (!this.pending) {
+      var cb;
+      while (cb = this.unconfirmed.shift()) {
+        if (cb) cb(new Error('channel closed'));
+      }
+    }
     return Promise.all(awaiting);
   }
 }

package/lib/connect.js

@@ -106,7 +106,7 @@ function connect(url, socketOptions, openCallback) {
   if (typeof url === 'object') {
     protocol = (url.protocol || 'amqp') + ':';
     sockopts.host = url.hostname;
-    sockopts.servername = url.hostname;
+    sockopts.servername = sockopts.servername || url.hostname;
     sockopts.port = url.port || ((protocol === 'amqp:') ? 5672 : 5671);
 
     var user, pass;
@@ -131,7 +131,7 @@ function connect(url, socketOptions, openCallback) {
     var parts = URL(url, true); // yes, parse the query string
     protocol = parts.protocol;
     sockopts.host = parts.hostname;
-    sockopts.servername = parts.hostname;
+    sockopts.servername = sockopts.servername || parts.hostname;
     sockopts.port = parseInt(parts.port) || ((protocol === 'amqp:') ? 5672 : 5671);
     var vhost = parts.pathname ? parts.pathname.substr(1) : null;
     fields = openFrames(vhost, parts.query, sockopts.credentials || credentialsFromUrl(parts), extraClientProperties);

package/lib/mux.js

@@ -8,7 +8,6 @@
 // it then writes 'packets' from the upstreams to the given
 // downstream.
 
-var inherits = require('util').inherits;
 var assert = require('assert');
 
 var schedule = (typeof setImmediate === 'function') ?
@@ -47,7 +46,6 @@ Mux.prototype._readIncoming = function() {
   // become readable
   if (this.blocked) return;
 
-  var self = this;
   var accepting = true;
   var out = this.out;
 
@@ -79,7 +77,7 @@ Mux.prototype._readIncoming = function() {
   }
   else { // ran out of room
     assert(this.newStreams.length > 0, "Expect some new streams to remain");
-    this.oldStreams = this.oldStreams.concat(this.newStreams);
+    Array.prototype.push.apply(this.oldStreams, this.newStreams);
     this.newStreams = [];
   }
   // We may have exhausted all the old queues, or run out of room;

package/package.json

@@ -1,19 +1,18 @@
 {
   "name": "amqplib",
-  "homepage": "http://squaremo.github.io/amqp.node/",
+  "homepage": "http://amqp-node.github.io/amqplib/",
   "main": "./channel_api.js",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "description": "An AMQP 0-9-1 (e.g., RabbitMQ) library and client.",
   "repository": {
     "type": "git",
-    "url": "https://github.com/squaremo/amqp.node.git"
+    "url": "https://github.com/amqp-node/amqplib.git"
   },
   "engines": {
     "node": ">=10"
   },
   "dependencies": {
     "bitsyntax": "~0.1.0",
-    "bluebird": "^3.7.2",
     "buffer-more-ints": "~1.0.0",
     "readable-stream": "1.x >=1.1.9",
     "url-parse": "~1.5.10"

package/test/channel.js

@@ -3,7 +3,7 @@
 'use strict';
 
 var assert = require('assert');
-var Promise = require('bluebird');
+var promisify = require('util').promisify;
 var Channel = require('../lib/channel').Channel;
 var Connection = require('../lib/connection').Connection;
 var util = require('./util');
@@ -76,12 +76,10 @@ var DELIVER_FIELDS = {
 };
 
 function open(ch) {
-  return Promise.try(function() {
-    ch.allocate();
-    return Promise.fromCallback(function(cb) {
-      ch._rpc(defs.ChannelOpen, {outOfBand: ''}, defs.ChannelOpenOk, cb);
-    });
-  });
+  ch.allocate();
+  return promisify(function(cb) {
+    ch._rpc(defs.ChannelOpen, {outOfBand: ''}, defs.ChannelOpenOk, cb);
+  })();
 }
 
 suite("channel open and close", function() {
@@ -285,7 +283,7 @@ test("RPC on closed channel", channelTest(
         failureCb(resolve, reject));
     });
 
-    Promise.join(close, fail1, fail2)
+    Promise.all([close, fail1, fail2])
       .then(succeed(done))
       .catch(fail(done));
   },

package/test/channel_api.js

@@ -6,7 +6,7 @@ var util = require('./util');
 var succeed = util.succeed, fail = util.fail;
 var schedule = util.schedule;
 var randomString = util.randomString;
-var Promise = require('bluebird');
+var promisify = require('util').promisify;
 
 var URL = process.env.URL || 'amqp://localhost';
 
@@ -118,9 +118,9 @@ chtest("channel break on publishing to non-exchange", function(ch) {
 
 chtest("delete queue", function(ch) {
   var q = 'test.delete-queue';
-  return Promise.join(
+  return Promise.all([
     ch.assertQueue(q, QUEUE_OPTS),
-    ch.checkQueue(q))
+    ch.checkQueue(q)])
     .then(function() {
       return ch.deleteQueue(q);})
     .then(function() {
@@ -129,9 +129,9 @@ chtest("delete queue", function(ch) {
 
 chtest("delete exchange", function(ch) {
   var ex = 'test.delete-exchange';
-  return Promise.join(
+  return Promise.all([
     ch.assertExchange(ex, 'fanout', EX_OPTS),
-    ch.checkExchange(ex))
+    ch.checkExchange(ex)])
     .then(function() {
       return ch.deleteExchange(ex);})
     .then(function() {
@@ -177,7 +177,7 @@ suite("sendMessage", function() {
 chtest("send to queue and get from queue", function(ch) {
   var q = 'test.send-to-q';
   var msg = randomString();
-  return Promise.join(ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q))
+  return Promise.all([ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q)])
     .then(function() {
       ch.sendToQueue(q, Buffer.from(msg));
       return waitForMessages(q);
@@ -194,9 +194,9 @@ chtest("send to queue and get from queue", function(ch) {
 chtest("send (and get) zero content to queue", function(ch) {
   var q = 'test.send-to-q';
   var msg = Buffer.alloc(0);
-  return Promise.join(
+  return Promise.all([
     ch.assertQueue(q, QUEUE_OPTS),
-    ch.purgeQueue(q))
+    ch.purgeQueue(q)])
     .then(function() {
       ch.sendToQueue(q, msg);
       return waitForMessages(q);})
@@ -218,11 +218,11 @@ chtest("route message", function(ch) {
   var q = 'test.route-message-q';
   var msg = randomString();
 
-  return Promise.join(
+  return Promise.all([
     ch.assertExchange(ex, 'fanout', EX_OPTS),
     ch.assertQueue(q, QUEUE_OPTS),
     ch.purgeQueue(q),
-    ch.bindQueue(q, ex, '', {}))
+    ch.bindQueue(q, ex, '', {})])
     .then(function() {
       ch.publish(ex, '', Buffer.from(msg));
       return waitForMessages(q);})
@@ -256,11 +256,11 @@ chtest("unbind queue", function(ch) {
   var viabinding = randomString();
   var direct = randomString();
 
-  return Promise.join(
+  return Promise.all([
     ch.assertExchange(ex, 'fanout', EX_OPTS),
     ch.assertQueue(q, QUEUE_OPTS),
     ch.purgeQueue(q),
-    ch.bindQueue(q, ex, '', {}))
+    ch.bindQueue(q, ex, '', {})])
     .then(function() {
       ch.publish(ex, '', Buffer.from('foobar'));
       return waitForMessages(q);})
@@ -289,14 +289,14 @@ chtest("consume via exchange-exchange binding", function(ch) {
   var ex1 = 'test.ex-ex-binding1', ex2 = 'test.ex-ex-binding2';
   var q = 'test.ex-ex-binding-q';
   var rk = 'test.routing.key', msg = randomString();
-  return Promise.join(
+  return Promise.all([
     ch.assertExchange(ex1, 'direct', EX_OPTS),
     ch.assertExchange(ex2, 'fanout',
                       {durable: false, internal: true}),
     ch.assertQueue(q, QUEUE_OPTS),
     ch.purgeQueue(q),
     ch.bindExchange(ex2, ex1, rk, {}),
-    ch.bindQueue(q, ex2, '', {}))
+    ch.bindQueue(q, ex2, '', {})])
     .then(function() {
       return new Promise(function(resolve, reject) {
         function delivery(m) {
@@ -319,13 +319,13 @@ chtest("unbind exchange", function(ch) {
   var viabinding = randomString();
   var direct = randomString();
 
-  return Promise.join(
+  return Promise.all([
     ch.assertExchange(source, 'fanout', EX_OPTS),
     ch.assertExchange(dest, 'fanout', EX_OPTS),
     ch.assertQueue(q, QUEUE_OPTS),
     ch.purgeQueue(q),
     ch.bindExchange(dest, source, '', {}),
-    ch.bindQueue(q, dest, '', {}))
+    ch.bindQueue(q, dest, '', {})])
     .then(function() {
       ch.publish(source, '', Buffer.from('foobar'));
       return waitForMessages(q);})
@@ -353,7 +353,7 @@ chtest("cancel consumer", function(ch) {
   var q = 'test.consumer-cancel';
   var ctag;
   var recv1 = new Promise(function (resolve, reject) {
-      Promise.join(
+      Promise.all([
     ch.assertQueue(q, QUEUE_OPTS),
     ch.purgeQueue(q),
     // My callback is 'resolve the promise in `arrived`'
@@ -361,17 +361,17 @@ chtest("cancel consumer", function(ch) {
       .then(function(ok) {
         ctag = ok.consumerTag;
         ch.sendToQueue(q, Buffer.from('foo'));
-      }));
+      })]);
   });
 
   // A message should arrive because of the consume
   return recv1.then(function() {
-    var recv2 = Promise.join(
+    var recv2 = Promise.all([
       ch.cancel(ctag).then(function() {
         return ch.sendToQueue(q, Buffer.from('bar'));
       }),
       // but check a message did arrive in the queue
-      waitForMessages(q))
+      waitForMessages(q)])
       .then(function() {
         return ch.get(q, {noAck:true});
       })
@@ -390,13 +390,13 @@ chtest("cancel consumer", function(ch) {
 chtest("cancelled consumer", function(ch) {
   var q = 'test.cancelled-consumer';
   return new Promise(function(resolve, reject) {
-    return Promise.join(
+    return Promise.all([
       ch.assertQueue(q),
       ch.purgeQueue(q),
       ch.consume(q, function(msg) {
         if (msg === null) resolve();
         else reject(new Error('Message not expected'));
-      }))
+      })])
       .then(function() {
         return ch.deleteQueue(q);
       });
@@ -408,9 +408,9 @@ chtest("ack", function(ch) {
   var q = 'test.ack';
   var msg1 = randomString(), msg2 = randomString();
 
-  return Promise.join(
+  return Promise.all([
     ch.assertQueue(q, QUEUE_OPTS),
-    ch.purgeQueue(q))
+    ch.purgeQueue(q)])
     .then(function() {
       ch.sendToQueue(q, Buffer.from(msg1));
       ch.sendToQueue(q, Buffer.from(msg2));
@@ -438,8 +438,8 @@ chtest("nack", function(ch) {
   var q = 'test.nack';
   var msg1 = randomString();
 
-  return Promise.join(
-    ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q))
+  return Promise.all([
+    ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q)])
     .then(function() {
       ch.sendToQueue(q, Buffer.from(msg1));
       return waitForMessages(q);})
@@ -463,8 +463,8 @@ chtest("reject", function(ch) {
   var q = 'test.reject';
   var msg1 = randomString();
 
-  return Promise.join(
-    ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q))
+  return Promise.all([
+    ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q)])
     .then(function() {
       ch.sendToQueue(q, Buffer.from(msg1));
       return waitForMessages(q);})
@@ -484,9 +484,9 @@ chtest("reject", function(ch) {
 
 chtest("prefetch", function(ch) {
   var q = 'test.prefetch';
-  return Promise.join(
+  return Promise.all([
     ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q),
-    ch.prefetch(1))
+    ch.prefetch(1)])
     .then(function() {
       ch.sendToQueue(q, Buffer.from('foobar'));
       ch.sendToQueue(q, Buffer.from('foobar'));
@@ -523,8 +523,8 @@ suite("confirms", function() {
 
 confirmtest('message is confirmed', function(ch) {
   var q = 'test.confirm-message';
-  return Promise.join(
-    ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q))
+  return Promise.all([
+    ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q)])
     .then(function() {
       return ch.sendToQueue(q, Buffer.from('bleep'));
     });
@@ -537,8 +537,8 @@ confirmtest('message is confirmed', function(ch) {
 // multi-ack.
 confirmtest('multiple confirms', function(ch) {
   var q = 'test.multiple-confirms';
-  return Promise.join(
-    ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q))
+  return Promise.all([
+    ch.assertQueue(q, QUEUE_OPTS), ch.purgeQueue(q)])
     .then(function() {
       var multipleRainbows = false;
       ch.on('ack', function(a) {
@@ -549,9 +549,9 @@ confirmtest('multiple confirms', function(ch) {
         var cs = [];
 
         function sendAndPushPromise() {
-          var conf = Promise.fromCallback(function(cb) {
+          var conf = promisify(function(cb) {
             return ch.sendToQueue(q, Buffer.from('bleep'), {}, cb);
-          });
+          })();
           cs.push(conf);
         }
 

package/test/util.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var Promise = require('bluebird');
 var crypto = require('crypto');
 var Connection = require('../lib/connection').Connection;
 var PassThrough =