amqplib 0.9.1 → 0.10.2

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change log for amqplib
 
+## Changes in v0.10.2
+
+    git log v0.10.1..v0.10.2
+
+- Use Buffer.allocUnsafe when sending messages to improve performance ([PR
+  695](https://github.com/amqp-node/amqplib/pull/695), thank you
+  @chkimes and @Uzlopak)
+
+## 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

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_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/connection.js

@@ -560,7 +560,11 @@ C.sendMessage = function(channel,
   var allLen = methodHeaderLen + bodyLen;
 
   if (allLen < SINGLE_CHUNK_THRESHOLD) {
-    var all = Buffer.alloc(allLen);
+    // Use `allocUnsafe` to avoid excessive allocations and CPU usage
+    // from zeroing. The returned Buffer is not zeroed and so must be
+    // completely filled to be used safely.
+    // See https://github.com/amqp-node/amqplib/pull/695
+    var all = Buffer.allocUnsafe(allLen);
     var offset = mframe.copy(all, 0);
     offset += pframe.copy(all, offset);
 
@@ -570,7 +574,11 @@ C.sendMessage = function(channel,
   }
   else {
     if (methodHeaderLen < SINGLE_CHUNK_THRESHOLD) {
-      var both = Buffer.alloc(methodHeaderLen);
+      // Use `allocUnsafe` to avoid excessive allocations and CPU usage
+      // from zeroing. The returned Buffer is not zeroed and so must be
+      // completely filled to be used safely.
+      // See https://github.com/amqp-node/amqplib/pull/695
+      var both = Buffer.allocUnsafe(methodHeaderLen);
       var offset = mframe.copy(both, 0);
       pframe.copy(both, offset);
       buffer.write(both);

package/package.json

@@ -2,7 +2,7 @@
   "name": "amqplib",
   "homepage": "http://amqp-node.github.io/amqplib/",
   "main": "./channel_api.js",
-  "version": "0.9.1",
+  "version": "0.10.2",
   "description": "An AMQP 0-9-1 (e.g., RabbitMQ) library and client.",
   "repository": {
     "type": "git",
@@ -13,7 +13,6 @@
   },
   "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 =