amqplib 0.4.1 → 0.5.2

package/package.json

@@ -2,20 +2,21 @@
   "name": "amqplib",
   "homepage": "http://squaremo.github.io/amqp.node/",
   "main": "./channel_api.js",
-  "version": "0.4.1",
+  "version": "0.5.2",
   "description": "An AMQP 0-9-1 (e.g., RabbitMQ) library and client.",
   "repository": {
     "type": "git",
     "url": "https://github.com/squaremo/amqp.node.git"
   },
   "engines": {
-    "node": ">=0.8 <5 || ^5"
+    "node": ">=0.8 <=9"
   },
   "dependencies": {
     "bitsyntax": "~0.0.4",
+    "bluebird": "^3.4.6",
     "buffer-more-ints": "0.0.2",
     "readable-stream": "1.x >=1.1.9",
-    "when": "~3.6.2"
+    "safe-buffer": "^5.0.1"
   },
   "devDependencies": {
     "mocha": "~1",

package/test/callback_api.js

@@ -8,6 +8,7 @@ var schedule = util.schedule;
 var randomString = util.randomString;
 var kCallback = util.kCallback;
 var domain = require('domain');
+var Buffer = require('safe-buffer').Buffer;
 
 var URL = process.env.URL || 'amqp://localhost';
 
@@ -159,7 +160,7 @@ channel_test('send to queue and consume noAck', function(ch, done) {
       else done(new Error("message content doesn't match:" +
                           msg + " =/= " + m.content.toString()));
     }, {noAck: true, exclusive: true});
-    ch.sendToQueue(q.queue, new Buffer(msg));
+    ch.sendToQueue(q.queue, Buffer.from(msg));
   });
 });
 
@@ -175,7 +176,7 @@ channel_test('send to queue and consume ack', function(ch, done) {
       else done(new Error("message content doesn't match:" +
                           msg + " =/= " + m.content.toString()));
     }, {noAck: false, exclusive: true});
-    ch.sendToQueue(q.queue, new Buffer(msg));
+    ch.sendToQueue(q.queue, Buffer.from(msg));
   });
 });
 
@@ -183,7 +184,7 @@ channel_test('send to and get from queue', function(ch, done) {
   ch.assertQueue('', {exclusive: true}, function(e, q) {
     if (e != null) return done(e);
     var msg = randomString();
-    ch.sendToQueue(q.queue, new Buffer(msg));
+    ch.sendToQueue(q.queue, Buffer.from(msg));
     waitForMessages(ch, q.queue, function(e, _) {
       if (e != null) return done(e);
       ch.get(q.queue, {noAck: true}, function(e, m) {
@@ -210,12 +211,12 @@ confirm_channel_test('Receive confirmation', function(ch, done) {
   // An unroutable message, on the basis that you're not allowed a
   // queue with an empty name, and you can't make bindings to the
   // default exchange. Tricky eh?
-  ch.publish('', '', new Buffer('foo'), {}, done);
+  ch.publish('', '', Buffer.from('foo'), {}, done);
 });
 
 confirm_channel_test('Wait for confirms', function(ch, done) {
   for (var i=0; i < 1000; i++) {
-    ch.publish('', '', new Buffer('foo'), {});
+    ch.publish('', '', Buffer.from('foo'), {});
   }
   ch.waitForConfirms(done);
 });

package/test/channel.js

@@ -3,7 +3,7 @@
 'use strict';
 
 var assert = require('assert');
-var defer = require('when').defer;
+var Promise = require('bluebird');
 var Channel = require('../lib/channel').Channel;
 var Connection = require('../lib/connection').Connection;
 var util = require('./util');
@@ -12,6 +12,7 @@ var completes = util.completes;
 var defs = require('../lib/defs');
 var conn_handshake = require('./connection').connection_handshake;
 var OPEN_OPTS = require('./connection').OPEN_OPTS;
+var Buffer = require('safe-buffer').Buffer;
 
 var LOG_ERRORS = process.env.LOG_ERRORS;
 
@@ -59,7 +60,7 @@ function channel_handshake(send, await) {
   return await(defs.ChannelOpen)()
     .then(function(open) {
       assert.notEqual(0, open.channel);
-      send(defs.ChannelOpenOk, {channelId: new Buffer('')}, open.channel);
+      send(defs.ChannelOpenOk, {channelId: Buffer.from('')}, open.channel);
       return open.channel;
     });
 }
@@ -76,14 +77,12 @@ var DELIVER_FIELDS = {
 };
 
 function open(ch) {
-  var opened = defer();
-  ch.allocate();
-  ch._rpc(defs.ChannelOpen, {outOfBand: ''}, defs.ChannelOpenOk,
-          function(err, _) {
-            if (err === null) opened.resolve();
-            else opened.reject(err);
-          });
-  return opened.promise;
+  return Promise.try(function() {
+    ch.allocate();
+    return Promise.fromCallback(function(cb) {
+      ch._rpc(defs.ChannelOpen, {outOfBand: ''}, defs.ChannelOpenOk, cb);
+    });
+  });
 }
 
 suite("channel open and close", function() {
@@ -112,10 +111,9 @@ test("open, close", channelTest(
   function(ch, done) {
     open(ch)
       .then(function() {
-        var closed = defer();
-        ch.closeBecause("Bye", defs.constants.REPLY_SUCCESS,
-                        closed.resolve);
-        return closed.promise;
+        return new Promise(function(resolve) {
+          ch.closeBecause("Bye", defs.constants.REPLY_SUCCESS, resolve);
+        });
       })
       .then(succeed(done), fail(done));
   },
@@ -204,7 +202,7 @@ test("RPC", channelTest(
         prefetchSize: 0,
         global: false
       };
-      
+
       ch._rpc(defs.BasicQos, fields, defs.BasicQosOk, wheeboom);
       ch._rpc(defs.BasicQos, fields, defs.BasicQosOk, wheeboom);
       ch._rpc(defs.BasicQos, fields, defs.BasicQosOk, wheeboom);
@@ -233,7 +231,7 @@ test("Bad RPC", channelTest(
       assert.strictEqual(505, error.code);
       succeed(errLatch)();
     });
-    
+
     open(ch)
       .then(function() {
         ch._rpc(defs.BasicRecover, {requeue: true}, defs.BasicRecoverOk,
@@ -257,27 +255,34 @@ test("Bad RPC", channelTest(
 test("RPC on closed channel", channelTest(
   function(ch, done) {
     open(ch);
-    var close = defer(), fail1 = defer(), fail2 = defer();
-    ch.on('error', function(error) {
-      assert.strictEqual(504, error.code);
-      close.resolve();
+
+    var close = new Promise(function(resolve) {
+        ch.on('error', function(error) {
+          assert.strictEqual(504, error.code);
+          resolve();
+      });
     });
 
-    function failureCb(d) {
+    function failureCb(resolve, reject) {
       return function(err) {
-        if (err !== null) d.resolve();
-        else d.reject();
+        if (err !== null) resolve();
+        else reject();
       }
     }
 
-    ch._rpc(defs.BasicRecover, {requeue:true}, defs.BasicRecoverOk,
-            failureCb(fail1));
-    ch._rpc(defs.BasicRecover, {requeue:true}, defs.BasicRecoverOk, 
-            failureCb(fail2));
-    close.promise
-      .then(function() { return fail1.promise; })
-      .then(function() { return fail2.promise; })
-      .then(succeed(done), fail(done));
+    var fail1 = new Promise(function(resolve, reject) {
+      return ch._rpc(defs.BasicRecover, {requeue:true}, defs.BasicRecoverOk,
+        failureCb(resolve, reject));
+    });
+
+    var fail2 = new Promise(function(resolve, reject) {
+      return ch._rpc(defs.BasicRecover, {requeue:true}, defs.BasicRecoverOk,
+        failureCb(resolve, reject));
+    });
+
+    Promise.join(close, fail1, fail2)
+      .then(succeed(done))
+      .catch(fail(done));
   },
   function(send, await, done, ch) {
     await(defs.BasicRecover)()
@@ -289,7 +294,8 @@ test("RPC on closed channel", channelTest(
         }, ch);
         return await(defs.ChannelCloseOk);
       })
-      .then(succeed(done), fail(done));
+      .then(succeed(done))
+      .catch(fail(done));
   }));
 
 test("publish all < single chunk threshold", channelTest(
@@ -299,7 +305,7 @@ test("publish all < single chunk threshold", channelTest(
         ch.sendMessage({
           exchange: 'foo', routingKey: 'bar',
           mandatory: false, immediate: false, ticket: 0
-        }, {}, new Buffer('foobar'));
+        }, {}, Buffer.from('foobar'));
       })
       .then(succeed(done), fail(done));
   },
@@ -319,7 +325,7 @@ test("publish content > single chunk threshold", channelTest(
       ch.sendMessage({
         exchange: 'foo', routingKey: 'bar',
         mandatory: false, immediate: false, ticket: 0
-      }, {}, new Buffer(3000));
+      }, {}, Buffer.alloc(3000));
     }, done);
   },
   function(send, await, done, ch) {
@@ -339,8 +345,8 @@ test("publish method & headers > threshold", channelTest(
         exchange: 'foo', routingKey: 'bar',
         mandatory: false, immediate: false, ticket: 0
       }, {
-        headers: {foo: new Buffer(3000)}
-      }, new Buffer('foobar'));
+        headers: {foo: Buffer.alloc(3000)}
+      }, Buffer.from('foobar'));
     }, done);
   },
   function(send, await, done, ch) {
@@ -359,11 +365,11 @@ test("publish zero-length message", channelTest(
       ch.sendMessage({
         exchange: 'foo', routingKey: 'bar',
         mandatory: false, immediate: false, ticket: 0
-      }, {}, new Buffer(0));
+      }, {}, Buffer.alloc(0));
       ch.sendMessage({
         exchange: 'foo', routingKey: 'bar',
         mandatory: false, immediate: false, ticket: 0
-      }, {}, new Buffer(0));
+      }, {}, Buffer.alloc(0));
     }, done);
   },
   function(send, await, done, ch) {
@@ -385,7 +391,7 @@ test("delivery", channelTest(
   },
   function(send, await, done, ch) {
     completes(function() {
-      send(defs.BasicDeliver, DELIVER_FIELDS, ch, new Buffer('barfoo'));
+      send(defs.BasicDeliver, DELIVER_FIELDS, ch, Buffer.from('barfoo'));
     }, done);
   }));
 
@@ -394,13 +400,13 @@ test("zero byte msg", channelTest(
     open(ch);
     ch.on('delivery', function(m) {
       completes(function() {
-        assert.deepEqual(new Buffer(0), m.content);
+        assert.deepEqual(Buffer.alloc(0), m.content);
       }, done);
     });
   },
   function(send, await, done, ch) {
     completes(function() {
-      send(defs.BasicDeliver, DELIVER_FIELDS, ch, new Buffer(''));
+      send(defs.BasicDeliver, DELIVER_FIELDS, ch, Buffer.from(''));
     }, done);
   }));
 
@@ -447,13 +453,13 @@ test("bad properties send", channelTest(
         ch.sendMessage({routingKey: 'foo',
                         exchange: 'amq.direct'},
                        {contentEncoding: 7},
-                       new Buffer('foobar'));
+                       Buffer.from('foobar'));
       });
     }, done);
   },
   function(send, await, done, ch) {
     done();
-  }));  
+  }));
 
 test("bad consumer", channelTest(
   function(ch, done) {
@@ -469,7 +475,7 @@ test("bad consumer", channelTest(
     open(ch);
   },
   function(send, await, done, ch) {
-    send(defs.BasicDeliver, DELIVER_FIELDS, ch, new Buffer('barfoo'));
+    send(defs.BasicDeliver, DELIVER_FIELDS, ch, Buffer.from('barfoo'));
     return await(defs.ChannelClose)()
       .then(function() {
         send(defs.ChannelCloseOk, {}, ch);
@@ -496,7 +502,7 @@ test("bad send in consumer", channelTest(
   function(send, await, done, ch) {
     completes(function() {
       send(defs.BasicDeliver, DELIVER_FIELDS, ch,
-           new Buffer('barfoo'));
+           Buffer.from('barfoo'));
     }, done);
     return await(defs.ChannelClose)()
       .then(function() {
@@ -515,7 +521,7 @@ test("return", channelTest(
   },
   function(send, await, done, ch) {
     completes(function() {
-      send(defs.BasicReturn, DELIVER_FIELDS, ch, new Buffer('barfoo'));
+      send(defs.BasicReturn, DELIVER_FIELDS, ch, Buffer.from('barfoo'));
     }, done);
   }));