Simplified wraper interdace

lib/deflate.js

@@ -11,9 +11,7 @@ var zstream = require('./zlib/zstream');
 function sliceBuf(buf, size) {
   if (buf.length === size) { return buf; }
 
-  var sliced = utils.arrayCreate(size);
+  return utils.typedOk() ? buf.subarray(0, size) : buf.slice(0, size);
-  utils.arraySet(sliced, buf, 0, size, 0);
-  return sliced;
 }
 
 /**
@@ -78,20 +76,27 @@ var Deflate = function(options) {
 };
 
 /**
- * Deflate#push(data) -> boolean
+ * Deflate#push(data[, mode]) -> Boolean
  *
  * - data (Uint8Array|Array) input data
+ * - mode (Number|Boolean) - 0..6 for corresponding Z_NO_FLUSH..Z_TREE modes.
+ *   See constants. Skipped or `false` means Z_NO_FLUSH, `true` meansh Z_FINISH.
  *
- * Compress input data, generating [Deflate.onData] calls with new data chunks.
+ * Pipe input data, generating [Deflate.onData] calls with new compressed
- * On fail call [Deflate.onEnd] and return false.
+ * chunks. Returns `true` on success. The last chunk must have mode Z_FINISH.
+ * That flush pending data & call [Deflate.onEnd].
+ *
+ * On fail call [Deflate.onEnd] with error code and return false.
  **/
-Deflate.prototype.push = function(data) {
+Deflate.prototype.push = function(data, mode) {
   var strm = this.strm;
   var chunkSize = this.options.chunkSize;
-  var status;
+  var status, _mode;
 
   if (this.ended) { return false; }
 
+  _mode = (mode === true) ? c.Z_FINISH : (isNaN(mode) ? c.Z_NO_FLUSH : mode);
+
   strm.next_in = data;
   strm.next_in_index = 0;
   strm.avail_in = strm.next_in.length;
@@ -100,7 +105,7 @@ Deflate.prototype.push = function(data) {
   do {
     strm.avail_out = this.options.chunkSize;
     strm.next_out_index = 0;
-    status = zlib_deflate.deflate(strm, c.Z_NO_FLUSH);    /* no bad return value */
+    status = zlib_deflate.deflate(strm, _mode);    /* no bad return value */
 
     if (status !== c.Z_STREAM_END && status !== c.Z_OK) {
       this.onEnd(status);
@@ -109,64 +114,24 @@ Deflate.prototype.push = function(data) {
     }
     if(strm.next_out_index) {
       this.onData(sliceBuf(strm.next_out, strm.next_out_index));
-      // Allocate buffer for next chunk
+      // Allocate buffer for next chunk, if not last
+      if (strm.avail_in > 0 || strm.avail_out === 0) {
         strm.next_out = utils.arrayCreate(this.options.chunkSize);
       }
+    }
   } while (strm.avail_in > 0 || strm.avail_out === 0);
 
-  return true;
+  // Finalize on the last chunk.
-};
+  if (_mode === c.Z_FINISH) {
-
+    status = zlib_deflate.deflateEnd(this.strm);
-/**
- * Deflate#flush() -> boolean
- *
- * Flush internal deflate data to output buffer. Does [Deflate.onData] call on
- * success. On fail call [Deflate.onEnd] and return false.
- **/
-Deflate.prototype.flush = function() {
-  var strm = this.strm;
-  var chunkSize = this.options.chunkSize;
-  var status;
-
-  if (this.ended) { return false; }
-
-  strm.next_out = utils.arrayCreate(chunkSize);
-
-  do {
-    strm.avail_out = this.options.chunkSize;
-    strm.next_out_index = 0;
-    status = zlib_deflate.deflate(strm, c.Z_FINISH);    /* no bad return value */
-
-    if (status !== c.Z_STREAM_END && status !== c.Z_OK) {
     this.onEnd(status);
     this.ended = true;
-      return false;
+    return status === c.Z_OK;
   }
-    if(strm.next_out_index) {
-      this.onData(sliceBuf(strm.next_out, strm.next_out_index));
-      // Allocate buffer for next chunk
-      strm.next_out = utils.arrayCreate(this.options.chunkSize);
-    }
-  } while (strm.avail_out === 0);
 
   return true;
 };
 
-/**
- * Deflate#finish() -> boolean
- *
- * Must be called when no more input data available. This function initiates
- * [Deflate#onEnd] call. Returns `false` if something gone wrong.
- **/
-Deflate.prototype.finish = function() {
-  if (this.ended) { return false; }
-  this.flush();
-  zlib_deflate.deflateEnd(this.strm);
-  this.onEnd(c.Z_OK);
-  this.ended = true;
-  return true;
-};
-
 
 /**
  * Deflate#onData(chunk) -> Void
@@ -226,9 +191,9 @@ Deflate.prototype.onEnd = function(status) {
 function deflate(input, options) {
   var deflator = new Deflate(options);
 
-  deflator.push(input);
+  deflator.push(input, true);
-  deflator.finish();
 
+  // That will never happens, if you don't cheat with options :)
   if (deflator.err) { throw msg[deflator.err]; }
 
   return deflator.result;