amqplib 0.5.2 → 0.5.6

package/examples/tutorials/package.json

@@ -5,7 +5,7 @@
   "main": "send.js",
   "dependencies": {
     "amqplib": "../..",
-    "node-uuid": "*"
+    "uuid": "*"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/lib/api_args.js

@@ -58,6 +58,8 @@ Args.assertQueue = function(queue, options) {
                options.deadLetterRoutingKey);
   setIfDefined(argt, 'x-max-length', options.maxLength);
   setIfDefined(argt, 'x-max-priority', options.maxPriority);
+  setIfDefined(argt, 'x-overflow', options.overflow);
+  setIfDefined(argt, 'x-queue-mode', options.queueMode);
 
   return {
     queue: queue,

package/lib/channel.js

@@ -33,6 +33,12 @@ function Channel(connection) {
   this.on('nack', this.handleConfirm.bind(this, function(cb) {
     if (cb) cb(new Error('message nacked'));
   }));
+  this.on('close', function () {
+    var cb;
+    while (cb = this.unconfirmed.shift()) {
+      if (cb) cb(new Error('channel closed'));
+    }
+  })
   // message frame state machine
   this.handleMessage = acceptDeliveryOrReturn;
 }
@@ -103,9 +109,10 @@ C._rpc = function(method, fields, expect, cb) {
         // We have detected a problem, so it's up to us to close the
         // channel
         var expectedName = methodName(expect);
+
         var e = new Error(fmt("Expected %s; got %s",
                               expectedName, inspect(f, false)));
-        self.closeWithError(fmt('Expected %s; got %s',
+        self.closeWithError(f.id, fmt('Expected %s; got %s',
                                 expectedName, methodName(f.id)),
                             defs.constants.UNEXPECTED_FRAME, e);
         return cb(e);
@@ -124,7 +131,11 @@ C._rpc = function(method, fields, expect, cb) {
         ? fmt("Operation failed: %s; %s",
               methodName(method), closeMsg(err))
         : fmt("Channel closed by server: %s", closeMsg(err));
-      return cb(new Error(e));
+      var closeFrameError = new Error(e);
+      closeFrameError.code = err.fields.replyCode;
+      closeFrameError.classId = err.fields.classId;
+      closeFrameError.methodId = err.fields.methodId;
+      return cb(closeFrameError);
     }
   }
 
@@ -186,7 +197,7 @@ C.toClosing = function(capturedStack, k) {
 };
 
 C._rejectPending = function() {
-  function rej(r) { 
+  function rej(r) {
     r(new Error("Channel ended, no reply will be forthcoming"));
   }
   if (this.reply !== null) rej(this.reply);
@@ -210,10 +221,15 @@ C.closeBecause = function(reason, code, k) {
 // If we close because there's been an error, we need to distinguish
 // between what we tell the server (`reason`) and what we report as
 // the cause in the client (`error`).
-C.closeWithError = function(reason, code, error) {
+C.closeWithError = function(id, reason, code, error) {
   var self = this;
   this.closeBecause(reason, code, function() {
     error.code = code;
+    // content frames and consumer errors do not provide a method a class/method ID
+    if (id) {
+      error.classId = defs.info(id).classId;
+      error.methodId = defs.info(id).methodId;
+    }
     self.emit('error', error);
   });
 };
@@ -232,15 +248,15 @@ C.acceptMessageFrame = function(f) {
   }
   catch (msg) {
     if (typeof msg === 'string') {
-      this.closeWithError(msg, defs.constants.UNEXPECTED_FRAME,
+      this.closeWithError(f.id, msg, defs.constants.UNEXPECTED_FRAME,
                           new Error(msg));
     }
     else if (msg instanceof Error) {
-      this.closeWithError('Error while processing message',
+      this.closeWithError(f.id, 'Error while processing message',
                           defs.constants.INTERNAL_ERROR, msg);
     }
     else {
-      this.closeWithError('Internal error while processing message',
+      this.closeWithError(f.id, 'Internal error while processing message',
                           defs.constants.INTERNAL_ERROR,
                           new Error(msg.toString()));
     }
@@ -283,7 +299,7 @@ function acceptMessage(continuation) {
     if (f.id === defs.BasicProperties) {
       message.properties = f.fields;
       totalSize = remaining = f.size;
-      
+
       // for zero-length messages, content frames aren't required.
       if (totalSize === 0) {
         message.content = Buffer.alloc(0);
@@ -291,7 +307,7 @@ function acceptMessage(continuation) {
         return acceptDeliveryOrReturn;
       }
       else {
-        return content;        
+        return content;
       }
     }
     else {
@@ -405,6 +421,8 @@ C.accept = function(f) {
 
     var error = new Error(emsg);
     error.code = f.fields.replyCode;
+    error.classId = f.fields.classId;
+    error.methodId = f.fields.methodId;
     this.emit('error', error);
 
     var s = stackCapture(emsg);
@@ -413,7 +431,7 @@ C.accept = function(f) {
 
   case defs.BasicFlow:
     // RabbitMQ doesn't send this, it just blocks the TCP socket
-    return this.closeWithError("Flow not implemented",
+    return this.closeWithError(f.id, "Flow not implemented",
                                defs.constants.NOT_IMPLEMENTED,
                                new Error('Flow not implemented'));
 

package/lib/connect.js

@@ -6,7 +6,7 @@
 
 'use strict';
 
-var URL = require('url');
+var URL = require('url-parse');
 var QS = require('querystring');
 var Connection = require('./connection').Connection;
 var fmt = require('util').format;
@@ -76,22 +76,12 @@ function openFrames(vhost, query, credentials, extraClientProperties) {
   };
 }
 
-// Decide on credentials based on what we're supplied. Note that in a
-// parsed URL, the auth part is already URL-decoded, so e.g., '%3a' in
-// the URL is already decoded to ':'. This is a bit unhelpful, as it
-// means we can't tell whether a colon is a separator, or part of the
-// username. Assume no colons in usernames.
+// Decide on credentials based on what we're supplied.
 function credentialsFromUrl(parts) {
   var user = 'guest', passwd = 'guest';
-  if (parts.auth) {
-    var colon = parts.auth.indexOf(':')
-    if (colon == -1) {
-      user = parts.auth;
-      passwd = '';
-    } else {
-      user = parts.auth.substring(0, colon);
-      passwd = parts.auth.substring(colon+1);
-    }
+  if (parts.username != '' || parts.password != '') {
+    user = (parts.username) ? unescape(parts.username) : '';
+    passwd = (parts.password) ? unescape(parts.password) : '';
   }
   return credentials.plain(user, passwd);
 }
@@ -137,7 +127,7 @@ function connect(url, socketOptions, openCallback) {
 
     fields = openFrames(url.vhost, config, sockopts.credentials || credentials.plain(user, pass), extraClientProperties);
   } else {
-    var parts = URL.parse(url, true); // yes, parse the query string
+    var parts = URL(url, true); // yes, parse the query string
     protocol = parts.protocol;
     sockopts.host = parts.hostname;
     sockopts.port = parseInt(parts.port) || ((protocol === 'amqp:') ? 5672 : 5671);

package/lib/connection.js

@@ -205,6 +205,7 @@ C.open = function(allFields, openCallback0) {
                          allFields.mechanism)));
       return;
     }
+    self.serverProperties = start.fields.serverProperties;
     send(defs.ConnectionStartOk);
     wait(afterStartOk);
   }
@@ -465,7 +466,7 @@ C.freshChannel = function(channel, options) {
 C.releaseChannel = function(channel) {
   this.freeChannels.clear(channel);
   var buffer = this.channels[channel].buffer;
-  this.muxer.unpipeFrom(buffer);
+  buffer.end(); // will also cause it to be unpiped
   this.channels[channel] = null;
 };
 

package/lib/credentials.js

@@ -9,6 +9,7 @@
 //  * EXTERNAL (assume the server will figure out who you are from
 //    context, i.e., your SSL certificate)
 var Buffer = require('safe-buffer').Buffer
+var codec = require('./codec')
 
 module.exports.plain = function(user, passwd) {
   return {
@@ -21,6 +22,19 @@ module.exports.plain = function(user, passwd) {
   }
 }
 
+module.exports.amqplain = function(user, passwd) {
+  return {
+    mechanism: 'AMQPLAIN',
+    response: function() {
+      const buffer = Buffer.alloc(16384);
+      const size = codec.encodeTable(buffer, { LOGIN: user, PASSWORD: passwd}, 0);
+      return buffer.slice(4, size);
+    },
+    username: user,
+    password: passwd
+  }
+}
+
 module.exports.external = function() {
   return {
     mechanism: 'EXTERNAL',