CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change log for amqplib
 
+## v0.10.6
+- Replace references to the old squaremo/amqp.name repo with ones to amqp-node/amqplib
+- Use a frame_max of 131072 by default for RabbitMQ 4.1.0 compatibility
+
 ## Changes in v0.10.5
 
     git log v0.10.4..v0.10.5

README.md

@@ -16,8 +16,8 @@
 A library for making AMQP 0-9-1 clients for Node.JS, and an AMQP 0-9-1 client for Node.JS v10+.
 
 This library does not implement [AMQP
-1.0](https://github.com/squaremo/amqp.node/issues/63) or [AMQP
-0-10](https://github.com/squaremo/amqp.node/issues/94).
+1.0](https://github.com/amqp-node/amqplib/issues/63) or [AMQP
+0-10](https://github.com/amqp-node/amqplib/issues/94).
 
 Project status:
 

bin/generate-defs.js

@@ -112,7 +112,7 @@ println(
 '/** @preserve This file is generated by the script\n',
 '* ../bin/generate-defs.js, which is not in general included in a\n',
 '* distribution, but is available in the source repository e.g. at\n',
-'* https://github.com/squaremo/amqp.node/\n',
+'* https://github.com/amqp-node/amqplib/\n',
 '*/');
 
 println("'use strict';"); nl();

lib/callback_model.js

@@ -28,8 +28,13 @@ class CallbackModel extends EventEmitter {
     this.connection._updateSecret(newSecret, reason, cb);
   }
 
-  createChannel (cb) {
+  createChannel (options, cb) {
+    if (arguments.length === 1) {
+      cb = options;
+      options = undefined;
+    }
     var ch = new Channel(this.connection);
+    ch.setOptions(options);
     ch.open(function (err, ok) {
       if (err === null)
         cb && cb(null, ch);
@@ -39,8 +44,13 @@ class CallbackModel extends EventEmitter {
     return ch;
   }
 
-  createConfirmChannel (cb) {
+  createConfirmChannel (options, cb) {
+    if (arguments.length === 1) {
+      cb = options;
+      options = undefined;
+    }
     var ch = new ConfirmChannel(this.connection);
+    ch.setOptions(options);
     ch.open(function (err) {
       if (err !== null)
         return cb && cb(err);

lib/channel.js

@@ -47,8 +47,12 @@ class Channel extends EventEmitter {
     this.handleMessage = acceptDeliveryOrReturn;
   }
 
+  setOptions(options) {
+    this.options = options;
+  }
+
   allocate () {
-    this.ch = this.connection.freshChannel(this);
+    this.ch = this.connection.freshChannel(this, this.options);
     return this;
   }
 

lib/channel_model.js

@@ -30,14 +30,16 @@ class ChannelModel extends EventEmitter {
     return promisify(this.connection._updateSecret.bind(this.connection))(newSecret, reason);
   }
 
-  async createChannel() {
+  async createChannel(options) {
     const channel = new Channel(this.connection);
+    channel.setOptions(options);
     await channel.open();
     return channel;
   }
 
-  async createConfirmChannel() {
+  async createConfirmChannel(options) {
     const channel = new ConfirmChannel(this.connection);
+    channel.setOptions(options);
     await channel.open();
     await channel.rpc(defs.ConfirmSelect, {nowait: false}, defs.ConfirmSelectOk);
     return channel;

lib/connect.js

@@ -31,7 +31,7 @@ var CLIENT_PROPERTIES = {
   "product": "amqplib",
   "version": require('../package.json').version,
   "platform": fmt('Node.JS %s', process.version),
-  "information": "http://squaremo.github.io/amqp.node",
+  "information": "https://amqp-node.github.io/amqplib/",
   "capabilities": {
     "publisher_confirms": true,
     "exchange_exchange_bindings": true,
@@ -66,7 +66,7 @@ function openFrames(vhost, query, credentials, extraClientProperties) {
 
     // tune-ok
     'channelMax': intOrDefault(query.channelMax, 0),
-    'frameMax': intOrDefault(query.frameMax, 0x1000),
+    'frameMax': intOrDefault(query.frameMax, 131072),
     'heartbeat': intOrDefault(query.heartbeat, 0),
 
     // open

package.json

@@ -2,7 +2,7 @@
   "name": "amqplib",
   "homepage": "http://amqp-node.github.io/amqplib/",
   "main": "./channel_api.js",
-  "version": "0.10.5",
+  "version": "0.10.6",
   "description": "An AMQP 0-9-1 (e.g., RabbitMQ) library and client.",
   "repository": {
     "type": "git",

test/callback_api.js

@@ -72,10 +72,14 @@ suite('updateSecret', function() {
 });
 
 function channel_test_fn(method) {
-  return function(name, chfun) {
+  return function(name, options, chfun) {
+    if (arguments.length === 2) {
+      chfun = options;
+      options = {};
+    }
     test(name, function(done) {
       connect(kCallback(function(c) {
-        c[method](kCallback(function(ch) {
+        c[method](options, kCallback(function(ch) {
           chfun(ch, done);
         }, done));
       }, done));
@@ -210,6 +214,33 @@ suite('sending messages', function() {
     });
   });
 
+  var channelOptions = {};
+
+  channel_test('find high watermark', function(ch, done) {
+    var msg = randomString();
+    var baseline = 0;
+    ch.assertQueue('', {exclusive: true}, function(e, q) {
+      if (e !== null) return done(e);
+      while (ch.sendToQueue(q.queue, Buffer.from(msg))) {
+        baseline++;
+      };
+      channelOptions.highWaterMark = baseline * 2;
+      done();
+    })
+  });
+
+  channel_test('set high watermark', channelOptions, function(ch, done) {
+    var msg = randomString();
+    ch.assertQueue('', {exclusive: true}, function(e, q) {
+      if (e !== null) return done(e);
+      var ok;
+      for (var i = 0; i < channelOptions.highWaterMark; i++) {
+        ok = ch.sendToQueue(q.queue, Buffer.from(msg));
+        assert.equal(ok, true);
+      }
+      done();
+    });
+  });
 });
 
 suite('ConfirmChannel', function() {
@@ -228,6 +259,34 @@ suite('ConfirmChannel', function() {
     ch.waitForConfirms(done);
   });
 
+  var channelOptions = {};
+
+  confirm_channel_test('find high watermark', function(ch, done) {
+    var msg = randomString();
+    var baseline = 0;
+    ch.assertQueue('', {exclusive: true}, function(e, q) {
+      if (e !== null) return done(e);
+      while (ch.sendToQueue(q.queue, Buffer.from(msg))) {
+        baseline++;
+      };
+      channelOptions.highWaterMark = baseline * 2;
+      done();
+    })
+  });
+
+  confirm_channel_test('set high watermark', channelOptions, function(ch, done) {
+    var msg = randomString();
+    ch.assertQueue('', {exclusive: true}, function(e, q) {
+      if (e !== null) return done(e);
+      var ok;
+      for (var i = 0; i < channelOptions.highWaterMark; i++) {
+        ok = ch.sendToQueue(q.queue, Buffer.from(msg));
+        assert.equal(ok, true);
+      }
+      done();
+    });
+  });
+
 });
 
 suite("Error handling", function() {