docker-stream-cleanser - npm Package Compare versions

Comparing version 0.1.1 to 0.1.2

app.js

@@ -33,2 +33,14 @@ 'use strict';
   var result = [];
+  parseDockerStream(
+    stream,
+    function (payload) {
+      result.push(payload);
+    },
+    encoding,
+    function () {
+    cb(Buffer.concat(result));
+  });
+};
+
+function parseDockerStream(stream, writeMethod, encoding, cb) {
   var array = [];
@@ -58,12 +70,12 @@ var dataBuffer = null;
         }
-        result.push(payload);
+        writeMethod(payload);
         if (dataBuffer.length > 8) {
           // Since we've moved the data to a buffer outside of the processing, we can use a
           // timeout to schedule the next iteration.
-          setImmediate(parseDataBuffer, ended);
+          setTimeout(parseDataBuffer, 0, ended);
         }
       }
     }
-    if (!dataBuffer.length && ended) {
-      cb(Buffer.concat(result));
+    if (!dataBuffer.length && ended && cb) {
+      cb();
     }
@@ -91,3 +103,3 @@ }
   stream.on('end', streamEnd);
-};
+}
 
@@ -98,3 +110,3 @@ /**
  * the data in case the message was broken up by docker (which seems to happen sometimes)
- * @param buildStream input stream
+ * @param logStream input stream
  * @param clientStream output stream
@@ -104,50 +116,11 @@ * @param encoding encoding of the stream
  */
-module.exports.cleanStreams = function (buildStream, clientStream, encoding, fixCarriageReturns) {
-  var dataBuffer = null;
-
-  function parseDataBuffer() {
-    // Sometimes messages get chopped up by docker, even in the header, so we need to handle this
-
-    //We need to make sure that this isn't a continuation of the message before it
-    if (!dataBuffer || dataBuffer.length <= 8 || dataBuffer[0] > 3) {
-      // If this is true, we don't have any data to process, so just exit (it'll get done next time)
-      return;
-    }
-    // We're going to be popping each message off of the top of dataBuffer
-    var header = dataBuffer.slice(0, 8);
-    var size = header.readUInt32BE(4);
-    // check if the size greater than the rest of the message.  If it is, slice off the
-    // whole message (-8 to grab the header as well), and store it in the buffer
-    if (8 + size <= dataBuffer.length) {
-
-      // Basically do a splice here
-      var payload = dataBuffer.slice(8, 8 + size);
-      dataBuffer = dataBuffer.slice(8 + size);
-      if (payload === null) return;
+module.exports.cleanStreams = function (logStream, clientStream, encoding, fixCarriageReturns) {
+  parseDockerStream(
+    logStream,
+    function(payload) {
       payload = (fixCarriageReturns) ?
         payload.toString().replace(/\r?\n/g, '\r\n') : payload.toString();
       clientStream.write(payload);
-      if (dataBuffer.length > 8) {
-        // Since we've moved the data to a buffer outside of the processing, we can use a
-        // timeout to schedule the next iteration.
-        setImmediate(parseDataBuffer);
-      }
-    }
-  }
-  // Subscribe to the data event here.
-  buildStream.on('data', function(data) {
-    // First, make sure the data is a buffer
-    if (!Buffer.isBuffer(data)) {
-      data= new Buffer(data, encoding);
-    }
-    if (dataBuffer) {
-      // Now append it to the dataBuffer
-      dataBuffer= Buffer.concat([dataBuffer, data], dataBuffer.length + data.length);
-    } else {
-      dataBuffer = data;
-    }
-
-    // Now send it off to the parseData function
-    parseDataBuffer();
-  });
+    },
+    encoding);
 };

package.json

 {
   "name": "docker-stream-cleanser",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "app.js",
@@ -5,0 +5,0 @@ "devDependencies": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

86523

increased by3.5%

Worsened metrics

Lines of code

443

decreased by-5.14%

No dependency changes