Merge branch 'master' of https://github.com/101arrowz/fflate

README.md

@@ -339,6 +339,9 @@ unzipper.onfile = file => {
   }
 };
 
+// Try to keep under 5,000 files per chunk to avoid stack limit errors
+// For example, if all files are a few kB, multi-megabyte chunks are OK
+// If files are mostly under 100 bytes, 64kB chunks are the limit
 unzipper.push(zipChunk1);
 unzipper.push(zipChunk2);
 unzipper.push(zipChunk3, true);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fflate",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "High performance (de)compression in an 8kB package",
   "main": "./lib/index.cjs",
   "module": "./esm/browser.js",

src/index.ts

@@ -3004,7 +3004,7 @@ export class Unzip {
    */
   push(chunk: Uint8Array, final?: boolean) {
     if (!this.onfile) throw 'no callback';
-    if (!this.k) throw 'stream finished';
+    if (!this.p) throw 'stream finished';
     if (this.c > 0) {
       const len = Math.min(this.c, chunk.length);
       const toAdd = chunk.subarray(0, len);
@@ -3039,6 +3039,7 @@ export class Unzip {
             else if (dd) sc = -1;
             i += es;
             this.c = sc;
+            let d: UnzipDecoder;
             const file = {
               name: fn,
               compression: cmp,
@@ -3048,15 +3049,15 @@ export class Unzip {
                 else {
                   const ctr = this.o[cmp];
                   if (!ctr) throw 'unknown compression type ' + cmp;
-                  const d = sc < 0 ? new ctr(fn) : new ctr(fn, sc, su);
+                  d = sc < 0 ? new ctr(fn) : new ctr(fn, sc, su);
                   d.ondata = (err, dat, final) => { file.ondata(err, dat, final); }
                   for (const dat of chks) d.push(dat, false);
-                  if (this.k[0] == chks) this.d = d;
+                  if (this.k[0] == chks && this.c) this.d = d;
                   else d.push(et, true);
                 }
               },
               terminate: () => {
-                if (this.k[0] == chks && this.d.terminate) this.d.terminate();
+                if (d && d.terminate) d.terminate();
               }
             } as UnzipFile;
             if (sc >= 0) file.size = sc, file.originalSize = su;
@@ -3084,7 +3085,7 @@ export class Unzip {
     }
     if (final) {
       if (this.c) throw 'invalid zip file';
-      this.k = null;
+      this.p = null;
     }
   }
 

test/util.ts

@@ -15,8 +15,7 @@ const testFiles = {
 
 const testZipFiles = {
   model3D: 'https://raw.githubusercontent.com/mrdoob/three.js/dev/examples/models/kmz/Box.kmz',
-  largeModel3D: 'https://raw.githubusercontent.com/mrdoob/three.js/dev/examples/models/3mf/truck.3mf',
-  repo: 'https://codeload.github.com/parcel-bundler/parcel/zip/v2'
+  largeModel3D: 'https://raw.githubusercontent.com/mrdoob/three.js/dev/examples/models/3mf/truck.3mf'
 };
 
 const dlCached = async <T extends Record<string, string | Buffer>>(files: T) => {