arri 0.0.27 → 0.0.28

package/dist/chunks/index.cjs

@@ -3819,14 +3819,26 @@ const Pack = warner$1(class Pack extends Minipass {
 
     this.portable = !!opt.portable;
     this.zip = null;
-    if (opt.gzip) {
-      if (typeof opt.gzip !== 'object') {
-        opt.gzip = {};
+
+    if (opt.gzip || opt.brotli) {
+      if (opt.gzip && opt.brotli) {
+        throw new TypeError('gzip and brotli are mutually exclusive')
+      }
+      if (opt.gzip) {
+        if (typeof opt.gzip !== 'object') {
+          opt.gzip = {};
+        }
+        if (this.portable) {
+          opt.gzip.portable = true;
+        }
+        this.zip = new zlib$1.Gzip(opt.gzip);
       }
-      if (this.portable) {
-        opt.gzip.portable = true;
+      if (opt.brotli) {
+        if (typeof opt.brotli !== 'object') {
+          opt.brotli = {};
+        }
+        this.zip = new zlib$1.BrotliCompress(opt.brotli);
       }
-      this.zip = new zlib$1.Gzip(opt.gzip);
       this.zip.on('data', chunk => super.write(chunk));
       this.zip.on('end', _ => super.end());
       this.zip.on('drain', _ => this[ONDRAIN]());
@@ -4678,6 +4690,16 @@ var parse$1 = warner(class Parser extends EE {
     this.strict = !!opt.strict;
     this.maxMetaEntrySize = opt.maxMetaEntrySize || maxMetaEntrySize;
     this.filter = typeof opt.filter === 'function' ? opt.filter : noop;
+    // Unlike gzip, brotli doesn't have any magic bytes to identify it
+    // Users need to explicitly tell us they're extracting a brotli file
+    // Or we infer from the file extension
+    const isTBR = (opt.file && (
+        opt.file.endsWith('.tar.br') || opt.file.endsWith('.tbr')));
+    // if it's a tbr file it MIGHT be brotli, but we don't know until
+    // we look at it and verify it's not a valid tar file.
+    this.brotli = !opt.gzip && opt.brotli !== undefined ? opt.brotli
+      : isTBR ? undefined
+      : false;
 
     // have to set this so that streams are ok piping into it
     this.writable = true;
@@ -4928,7 +4950,9 @@ var parse$1 = warner(class Parser extends EE {
     }
 
     // first write, might be gzipped
-    if (this[UNZIP] === null && chunk) {
+    const needSniff = this[UNZIP] === null ||
+      this.brotli === undefined && this[UNZIP] === false;
+    if (needSniff && chunk) {
       if (this[BUFFER]) {
         chunk = Buffer.concat([this[BUFFER], chunk]);
         this[BUFFER] = null;
@@ -4937,15 +4961,45 @@ var parse$1 = warner(class Parser extends EE {
         this[BUFFER] = chunk;
         return true
       }
+
+      // look for gzip header
       for (let i = 0; this[UNZIP] === null && i < gzipHeader.length; i++) {
         if (chunk[i] !== gzipHeader[i]) {
           this[UNZIP] = false;
         }
       }
-      if (this[UNZIP] === null) {
+
+      const maybeBrotli = this.brotli === undefined;
+      if (this[UNZIP] === false && maybeBrotli) {
+        // read the first header to see if it's a valid tar file. If so,
+        // we can safely assume that it's not actually brotli, despite the
+        // .tbr or .tar.br file extension.
+        // if we ended before getting a full chunk, yes, def brotli
+        if (chunk.length < 512) {
+          if (this[ENDED$1]) {
+            this.brotli = true;
+          } else {
+            this[BUFFER] = chunk;
+            return true
+          }
+        } else {
+          // if it's tar, it's pretty reliably not brotli, chances of
+          // that happening are astronomical.
+          try {
+            new Header(chunk.slice(0, 512));
+            this.brotli = false;
+          } catch (_) {
+            this.brotli = true;
+          }
+        }
+      }
+
+      if (this[UNZIP] === null || (this[UNZIP] === false && this.brotli)) {
         const ended = this[ENDED$1];
         this[ENDED$1] = false;
-        this[UNZIP] = new zlib.Unzip();
+        this[UNZIP] = this[UNZIP] === null
+          ? new zlib.Unzip()
+          : new zlib.BrotliDecompress();
         this[UNZIP].on('data', chunk => this[CONSUMECHUNK](chunk));
         this[UNZIP].on('error', er => this.abort(er));
         this[UNZIP].on('end', _ => {
@@ -5083,6 +5137,7 @@ var parse$1 = warner(class Parser extends EE {
         this[UNZIP].end(chunk);
       } else {
         this[ENDED$1] = true;
+        if (this.brotli === undefined) chunk = chunk || Buffer.alloc(0);
         this.write(chunk);
       }
     }

package/dist/chunks/index.mjs

@@ -3798,14 +3798,26 @@ const Pack = warner$1(class Pack extends Minipass {
 
     this.portable = !!opt.portable;
     this.zip = null;
-    if (opt.gzip) {
-      if (typeof opt.gzip !== 'object') {
-        opt.gzip = {};
+
+    if (opt.gzip || opt.brotli) {
+      if (opt.gzip && opt.brotli) {
+        throw new TypeError('gzip and brotli are mutually exclusive')
+      }
+      if (opt.gzip) {
+        if (typeof opt.gzip !== 'object') {
+          opt.gzip = {};
+        }
+        if (this.portable) {
+          opt.gzip.portable = true;
+        }
+        this.zip = new zlib$1.Gzip(opt.gzip);
       }
-      if (this.portable) {
-        opt.gzip.portable = true;
+      if (opt.brotli) {
+        if (typeof opt.brotli !== 'object') {
+          opt.brotli = {};
+        }
+        this.zip = new zlib$1.BrotliCompress(opt.brotli);
       }
-      this.zip = new zlib$1.Gzip(opt.gzip);
       this.zip.on('data', chunk => super.write(chunk));
       this.zip.on('end', _ => super.end());
       this.zip.on('drain', _ => this[ONDRAIN]());
@@ -4657,6 +4669,16 @@ var parse$1 = warner(class Parser extends EE {
     this.strict = !!opt.strict;
     this.maxMetaEntrySize = opt.maxMetaEntrySize || maxMetaEntrySize;
     this.filter = typeof opt.filter === 'function' ? opt.filter : noop;
+    // Unlike gzip, brotli doesn't have any magic bytes to identify it
+    // Users need to explicitly tell us they're extracting a brotli file
+    // Or we infer from the file extension
+    const isTBR = (opt.file && (
+        opt.file.endsWith('.tar.br') || opt.file.endsWith('.tbr')));
+    // if it's a tbr file it MIGHT be brotli, but we don't know until
+    // we look at it and verify it's not a valid tar file.
+    this.brotli = !opt.gzip && opt.brotli !== undefined ? opt.brotli
+      : isTBR ? undefined
+      : false;
 
     // have to set this so that streams are ok piping into it
     this.writable = true;
@@ -4907,7 +4929,9 @@ var parse$1 = warner(class Parser extends EE {
     }
 
     // first write, might be gzipped
-    if (this[UNZIP] === null && chunk) {
+    const needSniff = this[UNZIP] === null ||
+      this.brotli === undefined && this[UNZIP] === false;
+    if (needSniff && chunk) {
       if (this[BUFFER]) {
         chunk = Buffer.concat([this[BUFFER], chunk]);
         this[BUFFER] = null;
@@ -4916,15 +4940,45 @@ var parse$1 = warner(class Parser extends EE {
         this[BUFFER] = chunk;
         return true
       }
+
+      // look for gzip header
       for (let i = 0; this[UNZIP] === null && i < gzipHeader.length; i++) {
         if (chunk[i] !== gzipHeader[i]) {
           this[UNZIP] = false;
         }
       }
-      if (this[UNZIP] === null) {
+
+      const maybeBrotli = this.brotli === undefined;
+      if (this[UNZIP] === false && maybeBrotli) {
+        // read the first header to see if it's a valid tar file. If so,
+        // we can safely assume that it's not actually brotli, despite the
+        // .tbr or .tar.br file extension.
+        // if we ended before getting a full chunk, yes, def brotli
+        if (chunk.length < 512) {
+          if (this[ENDED$1]) {
+            this.brotli = true;
+          } else {
+            this[BUFFER] = chunk;
+            return true
+          }
+        } else {
+          // if it's tar, it's pretty reliably not brotli, chances of
+          // that happening are astronomical.
+          try {
+            new Header(chunk.slice(0, 512));
+            this.brotli = false;
+          } catch (_) {
+            this.brotli = true;
+          }
+        }
+      }
+
+      if (this[UNZIP] === null || (this[UNZIP] === false && this.brotli)) {
         const ended = this[ENDED$1];
         this[ENDED$1] = false;
-        this[UNZIP] = new zlib.Unzip();
+        this[UNZIP] = this[UNZIP] === null
+          ? new zlib.Unzip()
+          : new zlib.BrotliDecompress();
         this[UNZIP].on('data', chunk => this[CONSUMECHUNK](chunk));
         this[UNZIP].on('error', er => this.abort(er));
         this[UNZIP].on('end', _ => {
@@ -5062,6 +5116,7 @@ var parse$1 = warner(class Parser extends EE {
         this[UNZIP].end(chunk);
       } else {
         this[ENDED$1] = true;
+        if (this.brotli === undefined) chunk = chunk || Buffer.alloc(0);
         this.write(chunk);
       }
     }

package/package.json

@@ -12,7 +12,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@sinclair/typebox": "^0.31.8",
+    "@sinclair/typebox": "^0.31.14",
     "h3": "^1.8.1",
     "esbuild": "^0.19.2",
     "scule": "^1.0.0",
@@ -25,7 +25,7 @@
     "chokidar": "^3.5.3",
     "listhen": "^1.4.4"
   },
-  "version": "0.0.27",
+  "version": "0.0.28",
   "repository": {
     "url": "https://github.com/modiimedia/arri"
   }