amqplib 0.7.0 → 0.9.0

package/lib/frame.js

@@ -7,7 +7,6 @@
 var defs = require('./defs');
 var constants = defs.constants;
 var decode = defs.decode;
-var Buffer = require('safe-buffer').Buffer
 
 var Bits = require('bitsyntax');
 

package/package.json

@@ -2,28 +2,27 @@
   "name": "amqplib",
   "homepage": "http://squaremo.github.io/amqp.node/",
   "main": "./channel_api.js",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "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 <=15"
+    "node": ">=10"
   },
   "dependencies": {
     "bitsyntax": "~0.1.0",
-    "bluebird": "^3.5.2",
+    "bluebird": "^3.7.2",
     "buffer-more-ints": "~1.0.0",
     "readable-stream": "1.x >=1.1.9",
-    "safe-buffer": "~5.1.2",
-    "url-parse": "~1.4.3"
+    "url-parse": "~1.5.10"
   },
   "devDependencies": {
     "claire": "0.4.1",
-    "istanbul": "0.1.x",
-    "mocha": "^3.5.3",
-    "uglify-js": "2.6.x"
+    "mocha": "^9.2.2",
+    "nyc": "^15.1.0",
+    "uglify-js": "2.8.x"
   },
   "scripts": {
     "test": "make test",

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

@@ -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;
 

package/test/channel_api.js

@@ -7,7 +7,6 @@ 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 URL = process.env.URL || 'amqp://localhost';
 

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/.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/