amqplib 0.5.5 → 0.5.6

package/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Change log for amqplib
 
-## Changes in v0.5.4
+## Changes in v0.5.5
 
-    git log v0.5.3..v0.5.4
+    git log v0.5.3..v0.5.5
 
 **NB** this includes a minor but possibly breaking change: after [PR
 498](https://github.com/squaremo/amqp.node/pull/498), all confirmation
@@ -16,9 +16,14 @@ channel is closed.
   498](https://github.com/squaremo/amqp.node/pull/498)); thanks
   @johanneswuerbach
  * Update supported NodeJS versions in package.json ([PR
-   525](https://github.com/squaremo/amqp.node/pull/525)); thenks
+   525](https://github.com/squaremo/amqp.node/pull/525)); thanks
    @tingwai
 
+## (Deprecated v0.5.4)
+
+This release was mistakenly published without the generated file
+`./defs.js`. It has been deprecated in favour of v0.5.5.
+
 ## Changes in v0.5.3
 
     git log v0.5.2..v0.5.3

package/bin/generate-defs.js

@@ -124,7 +124,7 @@ println('var encodeTable = codec.encodeTable;');
 println('var decodeFields = codec.decodeFields;');
 nl();
 
-println('var SCRATCH = Buffer.alloc(16384);');
+println('var SCRATCH = Buffer.alloc(65536);');
 println('var EMPTY_OBJECT = Object.freeze({});');
 
 println('module.exports.constants = %s',

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

@@ -3077,7 +3077,7 @@ function decodeBasicProperties(buffer) {
   return fields;
 }
 
-var Buffer = require("safe-buffer").Buffer, codec = require("./codec"), ints = require("buffer-more-ints"), encodeTable = codec.encodeTable, decodeFields = codec.decodeFields, SCRATCH = Buffer.alloc(16384), EMPTY_OBJECT = Object.freeze({});
+var Buffer = require("safe-buffer").Buffer, codec = require("./codec"), ints = require("buffer-more-ints"), encodeTable = codec.encodeTable, decodeFields = codec.decodeFields, SCRATCH = Buffer.alloc(65536), EMPTY_OBJECT = Object.freeze({});
 
 module.exports.constants = {
   FRAME_METHOD: 1,

package/lib/mux.js

@@ -55,26 +55,11 @@ Mux.prototype._readIncoming = function() {
   // are empty, or we exhaust our ability to accept chunks.
   function roundrobin(streams) {
     var s;
-    // if there's just one incoming stream we don't have to
-    // go through all the dequeue/enqueueing
-    if (streams.length === 1) {
-      s = streams.shift();
-      while (accepting) {
-        var chunk = s.read();
-        if (chunk !== null) {
-          accepting = out.write(chunk);
-        }
-        else break;
-      }
-      if (!accepting) streams.push(s);
-    }
-    else {
-      while (accepting && (s = streams.shift())) {
-        var chunk = s.read();
-        if (chunk !== null) {
-          accepting = out.write(chunk);
-          streams.push(s);
-        }
+    while (accepting && (s = streams.shift())) {
+      var chunk = s.read();
+      if (chunk !== null) {
+        accepting = out.write(chunk);
+        streams.push(s);
       }
     }
   }
@@ -105,7 +90,7 @@ Mux.prototype._readIncoming = function() {
 
 Mux.prototype._scheduleRead = function() {
   var self = this;
-  
+
   if (!self.scheduledRead) {
     schedule(function() {
       self.scheduledRead = false;

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "amqplib",
-  "version": "0.5.3",
+  "version": "0.5.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package/package.json

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

package/test/mux.js

@@ -51,6 +51,40 @@ test("single input", function(done) {
   input.end();
 });
 
+test("single input, resuming stream", function(done) {
+  var input = stream();
+  var output = stream();
+  input.on('end', function() { output.end() });
+
+  var mux = new Mux(output);
+  mux.pipeFrom(input);
+
+  // Streams might be blocked and become readable again, simulate this
+  // using a special read function and a marker
+  var data = [1,2,3,4,'skip',6,7,8,9];
+
+  var oldRead  = input.read;
+  input.read = function(size) {
+    var val = oldRead.call(input, size)
+
+    if (val === 'skip') {
+      input.emit('readable');
+      return null
+    }
+
+    return val;
+  }
+
+  data.forEach(input.write.bind(input));
+
+  readAllObjects(output, function(vals) {
+    assert.deepEqual([1,2,3,4,6,7,8,9], vals);
+    done();
+  });
+
+  input.end();
+});
+
 test("two sequential inputs", function(done) {
   var input1 = stream();
   var input2 = stream();