Use incremental (un)compress APIs added in kjdev/php-ext-zstd#79

Author: thekid

src/main/php/io/streams/compress/ZStandardInputStream.class.php

@@ -11,8 +11,7 @@
  * @see  https://github.com/kjdev/php-ext-zstd
  */
 class ZStandardInputStream implements InputStream {
-  private $in;
-  private $buffer= null, $position= 0;
+  private $in, $handle;
 
   /**
    * Creates a new compressing output stream
@@ -21,24 +20,7 @@ class ZStandardInputStream implements InputStream {
    */
   public function __construct(InputStream $in) {
     $this->in= $in;
-  }
-
-  /** @see https://github.com/kjdev/php-ext-zstd/issues/64 */
-  private function buffer() {
-    if (null === $this->buffer) {
-      $compressed= '';
-      while ($this->in->available()) {
-        $compressed.= $this->in->read();
-      }
-
-      $this->buffer= zstd_uncompress($compressed);
-      if (false === $this->buffer) {
-        $e= new IOException('Failed to uncompress');
-        \xp::gc(__FILE__);
-        throw $e;
-      }
-    }
-    return $this->buffer;
+    $this->handle= zstd_uncompress_init();
   }
 
   /**
@@ -48,9 +30,13 @@ private function buffer() {
    * @return  string
    */
   public function read($limit= 8192) {
-    $chunk= substr($this->buffer(), $this->position, $limit);
-    $this->position+= strlen($chunk);
-    return $chunk;
+    $bytes= zstd_uncompress_add($this->handle, $this->in->read($limit));
+    if (false === $bytes) {
+      $e= new IOException('Failed to uncompress');
+      \xp::gc(__FILE__);
+      throw $e;
+    }
+    return $bytes;
   }
 
   /**
@@ -60,7 +46,7 @@ public function read($limit= 8192) {
    * @return int
    */
   public function available() {
-    return strlen($this->buffer()) - $this->position;
+    return $this->in->available();
   }
 
   /**
@@ -69,8 +55,10 @@ public function available() {
    * @return void
    */
   public function close() {
-    $this->buffer= null;
-    $this->in->close();
+    if ($this->handle) {
+      $this->handle= null;
+      $this->in->close();
+    }
   }
 
   /**

src/main/php/io/streams/compress/ZStandardOutputStream.class.php

@@ -11,8 +11,7 @@
  * @see  https://github.com/kjdev/php-ext-zstd
  */
 class ZStandardOutputStream implements OutputStream {
-  private $out, $level;
-  private $buffer= '';
+  private $out, $handle;
 
   /**
    * Creates a new compressing output stream
@@ -27,7 +26,7 @@ public function __construct(OutputStream $out, $level= ZSTD_COMPRESS_LEVEL_DEFAU
     }
 
     $this->out= $out;
-    $this->level= $level;
+    $this->handle= zstd_compress_init($level);
   }
 
   /**
@@ -37,7 +36,7 @@ public function __construct(OutputStream $out, $level= ZSTD_COMPRESS_LEVEL_DEFAU
    * @return void
    */
   public function write($arg) {
-    $this->buffer.= $arg;
+    $this->out->write(zstd_compress_add($this->handle, $arg, false));
   }
 
   /**
@@ -57,9 +56,9 @@ public function flush() {
    * @return void
    */
   public function close() {
-    if (null !== $this->buffer) {
-      $this->out->write(zstd_compress($this->buffer, $this->level));
-      $this->buffer= null;
+    if (null !== $this->handle) {
+      $this->out->write(zstd_compress_add($this->handle, '', true));
+      $this->handle= null;
     }
   }
 }