Add zopfli support

cli.js

@@ -57,7 +57,8 @@ compress({
   formats,
   extWhiteList: params['ext-white-list'],
   concurrency: params['concurrency'],
-  fileSize: params['file-size']
+  fileSize: params['file-size'],
+  withZopfli: params['with-zopfli']
 })
   .then(() => {
     const diffTime = Math.round(performance.now() - startTime);

lib/constants.js

@@ -16,12 +16,20 @@ exports.DEFAULT_COMPRESS_SETTINGS = {
       [zlib.constants.BROTLI_PARAM_MODE]: zlib.constants.BROTLI_MODE_TEXT,
       [zlib.constants.BROTLI_PARAM_QUALITY]: zlib.constants.BROTLI_MAX_QUALITY
     }
+  },
+  ['ZOPFLI']: {
+    verbose: false,
+    verbose_more: false,
+    numiterations: 15,
+    blocksplitting: true,
+    blocksplittingmax: 15,
   }
 }
 
 exports.FORMAT_TO_EXT = {
   [FORMATS.GZIP]: '.gz',
-  [FORMATS.BROTLI]: '.br'
+  [FORMATS.BROTLI]: '.br',
+  ['ZOPFLI']: '.gz'
 }
 
 exports.EXT_WHITE_LIST = [

lib/functions.js

@@ -1,9 +1,10 @@
 const os = require('os');
 const fs = require('fs');
-const fsp = require('fs/promises');
 const path = require('path');
-const { pipeline } = require('stream/promises');
+const stream = require('stream');
 const zlib = require('zlib');
+const { Buffer } = require('buffer')
+const { gzipAsync } = require('@gfx/zopfli');
 
 const CONSTANTS = require('./constants');
 const { walk, makeDir } = require('./fs-utils');
@@ -16,15 +17,24 @@ const {
   flatMap
 } = require('./generators-utils');
 
-
 const FORMAT_TO_STREAM = {
   [CONSTANTS.FORMATS.GZIP]: zlib.createGzip,
-  [CONSTANTS.FORMATS.BROTLI]: zlib.createBrotliCompress
+  [CONSTANTS.FORMATS.BROTLI]: zlib.createBrotliCompress,
+  ['ZOPFLI']: function createZopfli() {
+    return stream.Duplex.from(async function* (source) {
+      const chunks = [];
+      for await (const chunk of source) {
+        chunks.push(chunk);
+      }
+      yield await gzipAsync(Buffer.concat(chunks));
+    })
+  }
 }
 
 
-function createCompressStream({ fromPath, toPath, format, compressOptions }) {
-  return pipeline(
+function createCompressStream({ fromPath, toPath, format, compressOptions, withZopfli }) {
+  format = (format === CONSTANTS.FORMATS.GZIP && withZopfli) ? 'ZOPFLI' : format;
+  return stream.promises.pipeline(
     fs.createReadStream(fromPath),
     FORMAT_TO_STREAM[format](compressOptions || CONSTANTS.DEFAULT_COMPRESS_SETTINGS[format]),
     fs.createWriteStream(toPath + CONSTANTS.FORMAT_TO_EXT[format])
@@ -48,14 +58,15 @@ async function compress(params) {
     formats = [CONSTANTS.FORMATS.GZIP],
     extWhiteList = CONSTANTS.EXT_WHITE_LIST,
     concurrency = getConcurrency(),
-    fileSize
+    fileSize,
+    withZopfli = false
   } = params;
 
   const handlers = [
     filter(item => item.dirent.isFile()),
     filter(item => extWhiteList.includes(path.extname(item.direntPath))),
     fileSize && map(async item => {
-      const stat = await fsp.stat(item.direntPath);
+      const stat = await fs.promises.stat(item.direntPath);
       return {
         ...item,
         size: stat.size
@@ -80,7 +91,7 @@ async function compress(params) {
 
         await makeDir(toBasePath);
 
-        return createCompressStream({ fromPath, toPath, format: item.format });
+        return createCompressStream({ fromPath, toPath, format: item.format, withZopfli });
       }
     }),
   ].filter(Boolean);

package.json

@@ -32,5 +32,8 @@
     "brotli",
     "archive",
     "CLI"
-  ]
+  ],
+  "dependencies": {
+    "@gfx/zopfli": "^1.0.15"
+  }
 }