amqplib 0.8.0 → 0.10.0

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,29 +1,26 @@
-
 {
   "name": "amqplib",
-  "homepage": "http://squaremo.github.io/amqp.node/",
+  "homepage": "http://amqp-node.github.io/amqplib/",
   "main": "./channel_api.js",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "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",
-    "safe-buffer": "~5.2.1",
-    "url-parse": "~1.5.1"
+    "url-parse": "~1.5.10"
   },
   "devDependencies": {
     "claire": "0.4.1",
-    "istanbul": "0.1.x",
-    "mocha": "^3.5.3",
+    "mocha": "^9.2.2",
+    "nyc": "^15.1.0",
     "uglify-js": "2.8.x"
   },
   "scripts": {

package/test/bitset.js

@@ -1,68 +1,69 @@
 'use strict';
 
-var claire = require('claire');
+const claire = require('claire');
+const {BitSet} = require('../lib/bitset');
 
-var forAll = claire.forAll,
-    arb = claire.data,
-    label = claire.label,
-    choice = claire.choice,
-    transform = claire.transform;
+const {
+  forAll,
+  data: arb,
+  label,
+  choice,
+  transform
+} = claire;
 
-var BitSet = require('../lib/bitset').BitSet;
-var PosInt = transform(Math.floor, arb.Positive);
+const PosInt = transform(Math.floor, arb.Positive);
 
-var EmptyBitSet = label('bitset', transform(
-  function(size) {
+const EmptyBitSet = label('bitset', transform(
+  size => {
     return new BitSet(size);
   },
   choice(arb.Nothing, PosInt)));
 
-suite('BitSet', function() {
+suite('BitSet', () => {
 
 test('get bit', forAll(EmptyBitSet, PosInt)
-     .satisfy(function(b, bit) {
+     .satisfy((b, bit) => {
        b.set(bit);
        return b.get(bit);
      }).asTest());
-  
+
 test('clear bit', forAll(EmptyBitSet, PosInt)
-     .satisfy(function(b, bit) {
+     .satisfy((b, bit) => {
        b.set(bit);
        b.clear(bit);
        return !b.get(bit);
      }).asTest());
 
 test('next set of empty', forAll(EmptyBitSet)
-     .satisfy(function(b) {
+     .satisfy(b => {
        return b.nextSetBit(0) === -1;
      }).asTest());
 
 test('next set of one bit', forAll(EmptyBitSet, PosInt)
-     .satisfy(function(b, bit) {
+     .satisfy((b, bit) => {
        b.set(bit);
        return b.nextSetBit(0) === bit;
      }).asTest());
 
 test('next set same bit', forAll(EmptyBitSet, PosInt)
-     .satisfy(function(b, bit) {
+     .satisfy((b, bit) => {
        b.set(bit);
        return b.nextSetBit(bit) === bit;
      }).asTest());
 
 test('next set following bit', forAll(EmptyBitSet, PosInt)
-     .satisfy(function(b, bit) {
+     .satisfy((b, bit) => {
        b.set(bit);
        return b.nextSetBit(bit+1) === -1;
      }).asTest());
 
 test('next clear of empty', forAll(EmptyBitSet, PosInt)
-     .satisfy(function(b, bit) { return b.nextClearBit(bit) === bit; })
+     .satisfy((b, bit) => { return b.nextClearBit(bit) === bit; })
      .asTest());
 
 test('next clear of one set', forAll(EmptyBitSet, PosInt)
-     .satisfy(function(b, bit) {
+     .satisfy((b, bit) => {
        b.set(bit);
        return b.nextClearBit(bit) === bit + 1;
      }).asTest());
-
 });

package/test/callback_api.js

@@ -8,7 +8,6 @@ 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';
 

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');
@@ -12,7 +12,6 @@ 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;
 
@@ -77,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() {
@@ -286,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,8 +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 Buffer = require('safe-buffer').Buffer;
+var promisify = require('util').promisify;
 
 var URL = process.env.URL || 'amqp://localhost';
 
@@ -119,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() {
@@ -130,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() {
@@ -178,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);
@@ -195,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);})
@@ -219,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);})
@@ -257,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);})
@@ -290,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) {
@@ -320,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);})
@@ -354,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`'
@@ -362,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});
       })
@@ -391,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);
       });
@@ -409,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));
@@ -439,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);})
@@ -464,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);})
@@ -485,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'));
@@ -524,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'));
     });
@@ -538,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) {
@@ -550,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/codec.js

@@ -4,7 +4,6 @@ var codec = require('../lib/codec');
 var defs = require('../lib/defs');
 var assert = require('assert');
 var ints = require('buffer-more-ints');
-var Buffer = require('safe-buffer').Buffer
 var C = require('claire');
 var forAll = C.forAll;
 

package/test/connect.js

@@ -1,12 +1,12 @@
 'use strict';
 
 var connect = require('../lib/connect').connect;
-var Buffer = require('safe-buffer').Buffer
 var credentialsFromUrl = require('../lib/connect').credentialsFromUrl;
+var defs = require('../lib/defs');
 var assert = require('assert');
 var util = require('./util');
 var net = require('net');
-var fail = util.fail, succeed = util.succeed,
+var fail = util.fail, succeed = util.succeed, latch = util.latch,
     kCallback = util.kCallback,
     succeedIfAttributeEquals = util.succeedIfAttributeEquals;
 var format = require('util').format;
@@ -148,5 +148,50 @@ suite("Connect API", function() {
         else done();
     });
   });
+});
 
+suite('Errors on connect', function() {
+  var server
+  teardown(function() {
+    if (server) {
+      server.close();
+    }
+  })
+
+  test("closes underlying connection on authentication error", function(done) {
+    var bothDone = latch(2, done);
+    server = net.createServer(function(socket) {
+      socket.once('data', function(protocolHeader) {
+        assert.deepStrictEqual(
+          protocolHeader,
+          Buffer.from("AMQP" + String.fromCharCode(0,0,9,1))
+        );
+        util.runServer(socket, function(send, wait) {
+          send(defs.ConnectionStart,
+            {versionMajor: 0,
+              versionMinor: 9,
+              serverProperties: {},
+              mechanisms: Buffer.from('PLAIN'),
+              locales: Buffer.from('en_US')});
+          wait(defs.ConnectionStartOk)().then(function() {
+            send(defs.ConnectionClose,
+              {replyCode: 403,
+              replyText: 'ACCESS_REFUSED - Login was refused using authentication mechanism PLAIN',
+              classId: 0,
+              methodId: 0});
+          });
+        });
+      });
+
+      // Wait for the connection to be closed after the authentication error
+      socket.once('end', function() {
+        bothDone();
+      });
+    }).listen(0);
+
+    connect('amqp://localhost:' + server.address().port, {}, function(err) {
+      if (!err) bothDone(new Error('Expected authentication error'));
+      bothDone();
+    });
+  });
 });

package/test/connection.js

@@ -2,7 +2,6 @@
 
 var assert = require('assert');
 var defs = require('../lib/defs');
-var Buffer = require('safe-buffer').Buffer;
 var Connection = require('../lib/connection').Connection;
 var HEARTBEAT = require('../lib/frame').HEARTBEAT;
 var HB_BUF = require('../lib/frame').HEARTBEAT_BUF;

package/test/data.js

@@ -3,7 +3,6 @@
 'use strict';
 
 var C = require('claire');
-var Buffer = require('safe-buffer').Buffer;
 var forAll = C.forAll;
 var arb = C.data;
 var transform = C.transform;

package/test/frame.js

@@ -3,7 +3,6 @@
 var assert = require('assert');
 var succeed = require('./util').succeed;
 var fail = require('./util').fail;
-var Buffer = require('safe-buffer').Buffer;
 var connection = require('../lib/connection');
 var Frames = connection.Connection;
 var HEARTBEAT = require('../lib/frame').HEARTBEAT;
@@ -27,7 +26,7 @@ var HB = Buffer.from([defs.constants.FRAME_HEARTBEAT,
                      defs.constants.FRAME_END]);
 
 suite("Explicit parsing", function() {
-  
+
   test('Parse heartbeat', function() {
     var input = inputs();
     var frames = new Frames(input);
@@ -117,7 +116,7 @@ suite("Parsing", function() {
         }
         i++;
       };
-      
+
       t.forEach(function(f) {
         f.channel = 0;
         bufs.push(defs.encodeMethod(f.id, 0, f.fields));

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 =

package/.npmignore

@@ -1,8 +0,0 @@
-*~
-scratch
-# do not ignore lib/defs.js, we need that
-# node_modules is ignored anyway
-.travis.yml
-bin/amqp-rabbitmq-0.9.1.json
-etc/
-coverage/