amqplib 0.4.2 → 0.5.3

package/test/connect.js

@@ -1,21 +1,67 @@
 'use strict';
 
 var connect = require('../lib/connect').connect;
+var Buffer = require('safe-buffer').Buffer
+var credentialsFromUrl = require('../lib/connect').credentialsFromUrl;
 var assert = require('assert');
 var util = require('./util');
 var net = require('net');
 var fail = util.fail, succeed = util.succeed,
-    kCallback = util.kCallback;
+    kCallback = util.kCallback,
+    succeedIfAttributeEquals = util.succeedIfAttributeEquals;
+var format = require('util').format;
 
 var URL = process.env.URL || 'amqp://localhost';
 
+var urlparse = require('url-parse');
+
+suite("Credentials", function() {
+
+  function checkCreds(creds, user, pass, done) {
+    if (creds.mechanism != 'PLAIN') {
+      return done('expected mechanism PLAIN');
+    }
+    if (creds.username != user || creds.password != pass) {
+      return done(format("expected '%s', '%s'; got '%s', '%s'",
+                         user, pass, creds.username, creds.password));
+    }
+    done();
+  }
+
+  test("no creds", function(done) {
+    var parts = urlparse('amqp://localhost');
+    var creds = credentialsFromUrl(parts);
+    checkCreds(creds, 'guest', 'guest', done);
+  });
+  test("usual user:pass", function(done) {
+    var parts = urlparse('amqp://user:pass@localhost')
+    var creds = credentialsFromUrl(parts);
+    checkCreds(creds, 'user', 'pass', done);
+  });
+  test("missing user", function(done) {
+    var parts = urlparse('amqps://:password@localhost');
+    var creds = credentialsFromUrl(parts);
+    checkCreds(creds, '', 'password', done);
+  });
+  test("missing password", function(done) {
+    var parts = urlparse('amqps://username:@localhost');
+    var creds = credentialsFromUrl(parts);
+    checkCreds(creds, 'username', '', done);
+  });
+  test("escaped colons", function(done) {
+    var parts = urlparse('amqp://user%3Aname:pass%3Aword@localhost')
+    var creds = credentialsFromUrl(parts);
+    checkCreds(creds, 'user:name', 'pass:word', done);
+  });
+});
+
 suite("Connect API", function() {
 
   test("Connection refused", function(done) {
     connect('amqp://localhost:23450', {},
             kCallback(fail(done), succeed(done)));
   });
-  
+
   // %% this ought to fail the promise, rather than throwing an error
   test("bad URL", function() {
     assert.throws(function() {
@@ -33,6 +79,33 @@ suite("Connect API", function() {
     connect(u, {}, kCallback(fail(done), succeed(done)));
   });
 
+  test("serverProperties", function(done) {
+    var url = require('url');
+    var parts = url.parse(URL, true);
+    var config = parts.query || {};
+    connect(config, {}, function(err, connection) {
+      if (err) { return done(err); }
+      assert.equal(connection.serverProperties.product, 'RabbitMQ');
+      done();
+    });
+  });
+
+  test("using custom heartbeat option", function(done) {
+    var url = require('url');
+    var parts = url.parse(URL, true);
+    var config = parts.query || {};
+    config.heartbeat = 20;
+    connect(config, {}, kCallback(succeedIfAttributeEquals('heartbeat', 20, done), fail(done)));
+  });
+
+  test("wrongly typed heartbeat option", function(done) {
+    var url = require('url');
+    var parts = url.parse(URL, true);
+    var config = parts.query || {};
+    config.heartbeat = 'NOT A NUMBER';
+    connect(config, {}, kCallback(fail(done), succeed(done)));
+  });
+
   test("using plain credentials", function(done) {
     var url = require('url');
     var parts = url.parse(URL, true);
@@ -45,10 +118,22 @@ suite("Connect API", function() {
             kCallback(succeed(done), fail(done)));
   });
 
+  test("using amqplain credentials", function(done) {
+    var url = require('url');
+    var parts = url.parse(URL, true);
+    var u = 'guest', p = 'guest';
+    if (parts.auth) {
+      var auth = parts.auth.split(":");
+      u = auth[0], p = auth[1];
+    }
+    connect(URL, {credentials: require('../lib/credentials').amqplain(u, p)},
+            kCallback(succeed(done), fail(done)));
+  });
+
   test("using unsupported mechanism", function(done) {
     var creds = {
       mechanism: 'UNSUPPORTED',
-      response: function() { return new Buffer(''); }
+      response: function() { return Buffer.from(''); }
     };
     connect(URL, {credentials: creds},
             kCallback(fail(done), succeed(done)));

package/test/connection.js

@@ -2,6 +2,7 @@
 
 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;
@@ -16,14 +17,14 @@ var OPEN_OPTS = {
   // start-ok
   'clientProperties': {},
   'mechanism': 'PLAIN',
-  'response': new Buffer(['', 'guest', 'guest'].join(String.fromCharCode(0))),
+  'response': Buffer.from(['', 'guest', 'guest'].join(String.fromCharCode(0))),
   'locale': 'en_US',
-  
+
   // tune-ok
   'channelMax': 0,
   'frameMax': 0,
   'heartbeat': 0,
-  
+
   // open
   'virtualHost': '/',
   'capabilities': '',
@@ -31,23 +32,23 @@ var OPEN_OPTS = {
 };
 module.exports.OPEN_OPTS = OPEN_OPTS;
 
-function happy_open(send, await) {
+function happy_open(send, wait) {
   // kick it off
   send(defs.ConnectionStart,
        {versionMajor: 0,
         versionMinor: 9,
         serverProperties: {},
-        mechanisms: new Buffer('PLAIN'),
-        locales: new Buffer('en_US')});
-  return await(defs.ConnectionStartOk)()
+        mechanisms: Buffer.from('PLAIN'),
+        locales: Buffer.from('en_US')});
+  return wait(defs.ConnectionStartOk)()
     .then(function(f) {
       send(defs.ConnectionTune,
            {channelMax: 0,
             heartbeat: 0,
             frameMax: 0});
     })
-    .then(await(defs.ConnectionTuneOk))
-    .then(await(defs.ConnectionOpen))
+    .then(wait(defs.ConnectionTuneOk))
+    .then(wait(defs.ConnectionOpen))
     .then(function(f) {
       send(defs.ConnectionOpenOk,
            {knownHosts: ''});
@@ -65,11 +66,11 @@ function connectionTest(client, server) {
 
     // NB only not a race here because the writes are synchronous
     var protocolHeader = pair.server.read(8);
-    assert.deepEqual(new Buffer("AMQP" + String.fromCharCode(0,0,9,1)),
+    assert.deepEqual(Buffer.from("AMQP" + String.fromCharCode(0,0,9,1)),
                      protocolHeader);
 
-    var s = util.runServer(pair.server, function(send, await) {
-      server(send, await, bothDone, pair.server);
+    var s = util.runServer(pair.server, function(send, wait) {
+      server(send, wait, bothDone, pair.server);
     });
   };
 }
@@ -92,7 +93,7 @@ suite("Connection errors", function() {
     var ss = util.socketPair();
     var conn = new (require('../lib/connection').Connection)(ss.client);
     ss.server.on('readable', function() {
-      ss.server.write(new Buffer([0, 0, 0, 0, 0, 0, 0, 0, 0, 0]));
+      ss.server.write(Buffer.from([0, 0, 0, 0, 0, 0, 0, 0, 0, 0]));
     });
     conn.open({}, kCallback(fail(done), succeed(done)));
   });
@@ -105,15 +106,15 @@ test("happy", connectionTest(
   function(c, done) {
     c.open(OPEN_OPTS, kCallback(succeed(done), fail(done)));
   },
-  function(send, await, done) {
-    happy_open(send, await).then(succeed(done), fail(done));
+  function(send, wait, done) {
+    happy_open(send, wait).then(succeed(done), fail(done));
   }));
 
 test("wrong first frame", connectionTest(
   function(c, done) {
     c.open(OPEN_OPTS, kCallback(fail(done), succeed(done)));
   },
-  function(send, await, done) {
+  function(send, wait, done) {
     // bad server! bad! whatever were you thinking?
     completes(function() {
       send(defs.ConnectionTune,
@@ -127,14 +128,14 @@ test("unexpected socket close", connectionTest(
   function(c, done) {
     c.open(OPEN_OPTS, kCallback(fail(done), succeed(done)));
   },
-  function(send, await, done, socket) {
+  function(send, wait, done, socket) {
     send(defs.ConnectionStart,
          {versionMajor: 0,
           versionMinor: 9,
           serverProperties: {},
-          mechanisms: new Buffer('PLAIN'),
-          locales: new Buffer('en_US')});
-    return await(defs.ConnectionStartOk)()
+          mechanisms: Buffer.from('PLAIN'),
+          locales: Buffer.from('en_US')});
+    return wait(defs.ConnectionStartOk)()
       .then(function() {
         socket.end();
       })
@@ -150,15 +151,15 @@ test("wrong frame on channel 0", connectionTest(
     c.on('error', succeed(done));
     c.open(OPEN_OPTS);
   },
-  function(send, await, done) {
-    happy_open(send, await)
+  function(send, wait, done) {
+    happy_open(send, wait)
       .then(function() {
         // there's actually nothing that would plausibly be sent to a
         // just opened connection, so this is violating more than one
         // rule. Nonetheless.
-        send(defs.ChannelOpenOk, {channelId: new Buffer('')}, 0);
+        send(defs.ChannelOpenOk, {channelId: Buffer.from('')}, 0);
       })
-      .then(await(defs.ConnectionClose))
+      .then(wait(defs.ConnectionClose))
       .then(function(close) {
         send(defs.ConnectionCloseOk, {}, 0);
       }).then(succeed(done), fail(done));
@@ -169,15 +170,15 @@ test("unopened channel",  connectionTest(
     c.on('error', succeed(done));
     c.open(OPEN_OPTS);
   },
-  function(send, await, done) {
-    happy_open(send, await)
+  function(send, wait, done) {
+    happy_open(send, wait)
       .then(function() {
         // there's actually nothing that would plausibly be sent to a
         // just opened connection, so this is violating more than one
         // rule. Nonetheless.
-        send(defs.ChannelOpenOk, {channelId: new Buffer('')}, 3);
+        send(defs.ChannelOpenOk, {channelId: Buffer.from('')}, 3);
       })
-      .then(await(defs.ConnectionClose))
+      .then(wait(defs.ConnectionClose))
       .then(function(close) {
         send(defs.ConnectionCloseOk, {}, 0);
       }).then(succeed(done), fail(done));
@@ -192,9 +193,9 @@ test("unexpected socket close", connectionTest(
       c.sendHeartbeat();
     }, fail(errorAndClosed)));
   },
-  function(send, await, done, socket) {
-    happy_open(send, await)
-      .then(await())
+  function(send, wait, done, socket) {
+    happy_open(send, wait)
+      .then(wait())
       .then(function() {
         socket.end();
       }).then(succeed(done));
@@ -205,8 +206,8 @@ test("connection.blocked", connectionTest(
     c.on('blocked', succeed(done));
     c.open(OPEN_OPTS);
   },
-  function(send, await, done, socket) {
-    happy_open(send, await)
+  function(send, wait, done, socket) {
+    happy_open(send, wait)
       .then(function() {
         send(defs.ConnectionBlocked, {reason: 'felt like it'}, 0);
       })
@@ -218,8 +219,8 @@ test("connection.unblocked", connectionTest(
     c.on('unblocked', succeed(done));
     c.open(OPEN_OPTS);
   },
-  function(send, await, done, socket) {
-    happy_open(send, await)
+  function(send, wait, done, socket) {
+    happy_open(send, wait)
       .then(function() {
         send(defs.ConnectionUnblocked, {}, 0);
       })
@@ -239,9 +240,9 @@ test("happy", connectionTest(
       c.close(kCallback(succeed(done), fail(done)));
     }, function() {}));
   },
-  function(send, await, done) {
-    happy_open(send, await)
-      .then(await(defs.ConnectionClose))
+  function(send, wait, done) {
+    happy_open(send, wait)
+      .then(wait(defs.ConnectionClose))
       .then(function(close) {
         send(defs.ConnectionCloseOk, {});
       })
@@ -256,9 +257,9 @@ test("interleaved close frames", connectionTest(
       c.close(kCallback(succeed(done), fail(done)));
     }, done));
   },
-  function(send, await, done) {
-    happy_open(send, await)
-      .then(await(defs.ConnectionClose))
+  function(send, wait, done) {
+    happy_open(send, wait)
+      .then(wait(defs.ConnectionClose))
       .then(function(f) {
         send(defs.ConnectionClose, {
           replyText: "Ha!",
@@ -266,7 +267,7 @@ test("interleaved close frames", connectionTest(
           methodId: 0, classId: 0
         });
       })
-      .then(await(defs.ConnectionCloseOk))
+      .then(wait(defs.ConnectionCloseOk))
       .then(function(f) {
         send(defs.ConnectionCloseOk, {});
       })
@@ -280,8 +281,8 @@ test("server error close", connectionTest(
     c.on('error', succeed(done));
     c.open(OPEN_OPTS);
   },
-  function(send, await, done) {
-    happy_open(send, await)
+  function(send, wait, done) {
+    happy_open(send, wait)
       .then(function(f) {
         send(defs.ConnectionClose, {
           replyText: "Begone",
@@ -289,7 +290,7 @@ test("server error close", connectionTest(
           methodId: 0, classId: 0
         });
       })
-      .then(await(defs.ConnectionCloseOk))
+      .then(wait(defs.ConnectionCloseOk))
       .then(succeed(done), fail(done));
   }));
 
@@ -299,8 +300,8 @@ test("operator-intiated close", connectionTest(
     c.on('error', fail(done));
     c.open(OPEN_OPTS);
   },
-  function(send, await, done) {
-    happy_open(send, await)
+  function(send, wait, done) {
+    happy_open(send, wait)
       .then(function(f) {
         send(defs.ConnectionClose, {
           replyText: "Begone",
@@ -308,7 +309,7 @@ test("operator-intiated close", connectionTest(
           methodId: 0, classId: 0
         });
       })
-      .then(await(defs.ConnectionCloseOk))
+      .then(wait(defs.ConnectionCloseOk))
       .then(succeed(done), fail(done));
   }));
 
@@ -324,9 +325,9 @@ test("double close", connectionTest(
       done();
     }, done));
   },
-  function(send, await, done) {
-    happy_open(send, await)
-      .then(await(defs.ConnectionClose))
+  function(send, wait, done) {
+    happy_open(send, wait)
+      .then(wait(defs.ConnectionClose))
       .then(function() {
         send(defs.ConnectionCloseOk, {});
       })
@@ -358,15 +359,15 @@ test("send heartbeat after open", connectionTest(
       c.open(opts);
     }, done);
   },
-  function(send, await, done, socket) {
+  function(send, wait, done, socket) {
     var timer;
-    happy_open(send, await)
+    happy_open(send, wait)
       .then(function() {
         timer = setInterval(function() {
           socket.write(HB_BUF);
         }, heartbeat.UNITS_TO_MS);
       })
-      .then(await())
+      .then(wait())
       .then(function(hb) {
         if (hb === HEARTBEAT) done();
         else done("Next frame after silence not a heartbeat");
@@ -381,8 +382,8 @@ test("detect lack of heartbeats", connectionTest(
     c.on('error', succeed(done));
     c.open(opts);
   },
-  function(send, await, done, socket) {
-    happy_open(send, await)
+  function(send, wait, done, socket) {
+    happy_open(send, wait)
       .then(succeed(done), fail(done));
     // conspicuously not sending anything ...
   }));

package/test/data.js

@@ -3,7 +3,7 @@
 'use strict';
 
 var C = require('claire');
-
+var Buffer = require('safe-buffer').Buffer;
 var forAll = C.forAll;
 var arb = C.data;
 var transform = C.transform;
@@ -18,7 +18,7 @@ var Undefined = C.Undefined;
 
 // Stub these out so we can use outside tests
 // if (!suite) var suite = function() {}
-// if (!test) var test = function() {} 
+// if (!test) var test = function() {}
 
 // These aren't exported in claire/index. so I could have to reproduce
 // them I guess.
@@ -36,7 +36,7 @@ function rangeInt(name, a, b) {
 }
 
 function toFloat32(i) {
-  var b = new Buffer(4);
+  var b = Buffer.alloc(4);
   b.writeFloatBE(i, 0);
   return b.readFloatBE(0);
 }
@@ -53,6 +53,12 @@ function floatChooser(maxExp) {
   }
 }
 
+function explicitType(t, underlying) {
+    return label(t, transform(function(n) {
+        return {'!': t, value: n};
+    }, underlying));
+}
+
 // FIXME null, byte array, others?
 
 var Octet = rangeInt('octet', 0, 255);
@@ -63,7 +69,7 @@ var ShortStr = label('shortstr',
 
 var LongStr = label('longstr',
                     transform(
-                      function(bytes) { return new Buffer(bytes); },
+                      function(bytes) { return Buffer.from(bytes); },
                       repeat(Octet)));
 
 var UShort = rangeInt('short-uint', 0, 0xffff);
@@ -85,12 +91,27 @@ var Decimal = label('decimal', transform(
     return {'!': 'decimal', value: {places: args[1], digits: args[0]}};
   }, sequence(arb.UInt, Octet)));
 
+// Signed 8 bit int
+var Byte = rangeInt('byte', -128, 127);
+
+// Explicitly typed values
+var ExByte = explicitType('byte', Byte);
+var ExInt8 = explicitType('int8', Byte);
+var ExShort = explicitType('short', Short);
+var ExInt16 = explicitType('int16', Short);
+var ExInt = explicitType('int', Long);
+var ExInt32 = explicitType('int32', Long);
+var ExLong = explicitType('long', LongLong);
+var ExInt64 = explicitType('int64', LongLong);
+
 var FieldArray = label('field-array', recursive(function() {
   return arb.Array(
     arb.Null,
-    LongStr, ShortStr, Octet,
-    UShort, ULong, ULongLong,
-    Short, Long, LongLong,
+    LongStr, ShortStr,
+    Octet, UShort, ULong, ULongLong,
+    Byte, Short, Long, LongLong,
+    ExByte, ExInt8, ExShort, ExInt16,
+    ExInt, ExInt32, ExLong, ExInt64,
     Bit, Float, Double, FieldTable, FieldArray)
 }));
 
@@ -100,7 +121,9 @@ var FieldTable = label('table', recursive(function() {
                  arb.Null,
                  LongStr, ShortStr, Octet,
                  UShort, ULong, ULongLong,
-                 Short, Long, LongLong,
+                 Byte, Short, Long, LongLong,
+                 ExByte, ExInt8, ExShort, ExInt16,
+                 ExInt, ExInt32, ExLong, ExInt64,
                  Bit, Float, Double, FieldArray, FieldTable))
 }));
 
@@ -184,7 +207,7 @@ function method(info) {
 function properties(info) {
   var types = info.args.map(argtype);
   types.unshift(ULongLong); // size
-  var domain = sequence.apply(null, types); 
+  var domain = sequence.apply(null, types);
   var names = info.args.map(name);
   return label(info.name, transform(function(fieldVals) {
     return {id: info.id,

package/test/frame.js

@@ -3,7 +3,7 @@
 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;
@@ -21,7 +21,7 @@ function inputs() {
   return new PassThrough({objectMode: true});
 }
 
-var HB = new Buffer([defs.constants.FRAME_HEARTBEAT,
+var HB = Buffer.from([defs.constants.FRAME_HEARTBEAT,
                      0, 0, // channel 0
                      0, 0, 0, 0, // zero size
                      defs.constants.FRAME_END]);
@@ -51,7 +51,7 @@ suite("Explicit parsing", function() {
       var input = inputs();
       var frames = new Frames(input);
       frames.frameMax = 5; //for the max frame test
-      input.write(new Buffer(bytes));
+      input.write(Buffer.from(bytes));
       frames.step(function(err, frame) {
         if (err != null) done();
         else done(new Error('Was a bogus frame!'));
@@ -166,7 +166,7 @@ var Content = transform(function(args) {
   return {
     method: args[0].fields,
     header: args[1].fields,
-    body: new Buffer(args[2])
+    body: Buffer.from(args[2])
   }
 }, sequence(amqp.methods['BasicDeliver'],
             amqp.properties['BasicProperties'], Body));

package/test/mux.js

@@ -37,7 +37,7 @@ test("single input", function(done) {
   var mux = new Mux(output);
   mux.pipeFrom(input);
 
-  var data = [1,2,3,4,5,6,7,8,9]; 
+  var data = [1,2,3,4,5,6,7,8,9];
   // not 0, it's treated specially by PassThrough for some reason. By
   // 'specially' I mean it breaks the stream. See e.g.,
   // https://github.com/isaacs/readable-stream/pull/55
@@ -112,16 +112,20 @@ test("unpipe", function(done) {
 
   schedule(function() {
     pipedData.forEach(input.write.bind(input));
-    mux.unpipeFrom(input);
 
     schedule(function() {
-      unpipedData.forEach(input.write.bind(input));
-      input.end();
+      mux.unpipeFrom(input);
+
       schedule(function() {
-        // exhaust so that 'end' fires
-        var v; while (v = input.read());
+        unpipedData.forEach(input.write.bind(input));
+        input.end();
+        schedule(function() {
+          // exhaust so that 'end' fires
+          var v; while (v = input.read());
+        });
       });
     });
+
   });
 
   input.on('end', function() {

package/test/util.js

@@ -1,11 +1,11 @@
 'use strict';
 
+var Promise = require('bluebird');
 var crypto = require('crypto');
 var Connection = require('../lib/connection').Connection;
 var PassThrough =
   require('stream').PassThrough ||
   require('readable-stream/passthrough');
-var defer = require('when').defer;
 var defs = require('../lib/defs');
 var assert = require('assert');
 
@@ -76,29 +76,29 @@ function runServer(socket, run) {
     }
   }
 
-  function await(method) {
+  function wait(method) {
     return function() {
-      var d = defer();
-      if (method) {
-        frames.step(function(e, f) {
-          if (e !== null) return d.reject(e);
-          if (f.id === method)
-            d.resolve(f);
-          else
-            d.reject(new Error("Expected method: " + method +
-                               ", got " + f.id));
-        });
-      }
-      else {
-        frames.step(function(e, f) {
-          if (e !== null) return d.reject(e);
-          else d.resolve(f);
-        });
-      }
-      return d.promise;
+      return new Promise(function(resolve, reject) {
+        if (method) {
+          frames.step(function(e, f) {
+            if (e !== null) return reject(e);
+            if (f.id === method)
+              resolve(f);
+            else
+              reject(new Error("Expected method: " + method +
+                                 ", got " + f.id));
+          });
+        }
+        else {
+          frames.step(function(e, f) {
+            if (e !== null) return reject(e);
+            else resolve(f);
+          });
+        }
+      });
     };
   }
-  run(send, await);
+  run(send, wait);
   return frames;
 }
 
@@ -107,6 +107,19 @@ function succeed(done) {
   return function() { done(); }
 }
 
+// Produce a callback that will complete the test successfully
+// only if the value is an object, it has the specified
+// attribute, and its value is equals to the expected value
+function succeedIfAttributeEquals(attribute, value, done) {
+  return function(object) {
+    if (object && !(object instanceof Error) && value === object[attribute]) {
+      return done();
+    }
+
+    done(new Error(attribute + " is not equal to " + value));
+  };
+}
+
 // Produce a callback that will fail the test, given either an error
 // (to be used as a failure continuation) or any other value (to be
 // used as a success continuation when failure is expected)
@@ -196,6 +209,7 @@ module.exports = {
   socketPair: socketPair,
   runServer: runServer,
   succeed: succeed,
+  succeedIfAttributeEquals: succeedIfAttributeEquals,
   fail: fail,
   latch: latch,
   completes: completes,