lol

* Adds code for encoders and decoders
* Cleans up some obsolete QOI-related code

.gitattributes

@@ -1,2 +1,2 @@
-/codecs/**/*.js linguist-generated=true
-/codecs/*/pkg*/*.d.ts linguist-generated=true
+/codecs/**/*.js linguist-generated -diff
+/codecs/*/pkg*/*.d.ts linguist-generated

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

README.md

@@ -1,36 +1,38 @@
 # [Squoosh]!
 
-[Squoosh] is an image compression web app that allows you to dive into the advanced options provided
-by various image compressors.
-
-# API & CLI
-
-Squoosh now has [an API](https://github.com/GoogleChromeLabs/squoosh/tree/dev/libsquoosh) and [a CLI](https://github.com/GoogleChromeLabs/squoosh/tree/dev/cli) that allows you to compress many images at once.
+[Squoosh] is an image compression web app that reduces image sizes through numerous formats.
 
 # Privacy
 
-Google Analytics is used to record the following:
+Squoosh does not send your image to a server. All image compression processes locally.
 
-- [Basic visit data](https://support.google.com/analytics/answer/6004245?ref_topic=2919631).
-- Before and after image size once an image is downloaded. These values are rounded to the nearest
-  kilobyte.
-- If install is available, when Squoosh is installed, and what method was used to install Squoosh.
+However, Squoosh utilizes Google Analytics to collect the following:
 
-Image compression is handled locally; no additional data is sent to the server.
+- [Basic visitor data](https://support.google.com/analytics/answer/6004245?ref_topic=2919631).
+- The before and after image size value.
+- If Squoosh PWA, the type of Squoosh installation.
+- If Squoosh PWA, the installation time and date.
 
-# Building locally
+# Developing
 
-Clone the repo, and:
+To develop for Squoosh:
 
-```sh
-npm install
-npm run build
-```
+1. Clone the repository
+1. To install node packages, run:
+   ```sh
+   npm install
+   ```
+1. Then build the app by running:
+   ```sh
+   npm run build
+   ```
+1. After building, start the development server by running:
+   ```sh
+   npm run dev
+   ```
 
-You can run the development server with:
+# Contributing
 
-```sh
-npm run dev
-```
+Squoosh is an open-source project that appreciates all community involvement. To contribute to the project, follow the [contribute guide](/CONTRIBUTING.md).
 
 [squoosh]: https://squoosh.app

cli/.gitignore

@@ -1,3 +0,0 @@
-node_modules
-build
-.DS_Store

cli/.npmignore

@@ -1 +0,0 @@
-node_modules

cli/README.md

@@ -1,59 +0,0 @@
-# Squoosh CLI
-
-Squoosh CLI is an _experimental_ way to run all the codecs you know from the [Squoosh] web app on your command line using WebAssembly. The Squoosh CLI uses a worker pool to parallelize processing images. This way you can apply the same codec to many images at once.
-
-Squoosh CLI is currently not the fastest image compression tool in town and doesn’t aim to be. It is, however, fast enough to compress many images sufficiently quick at once.
-
-## Installation
-
-The Squoosh CLI can be used straight from the command line without installing using `npx`:
-
-```
-$ npx @squoosh/cli <options...>
-```
-
-Of course, you can also install the Squoosh CLI:
-
-```
-$ npm i -g @squoosh/cli
-$ squoosh-cli <options...>
-```
-
-## Usage
-
-```
-Usage: squoosh-cli [options] <files...>
-
-Options:
-  -V, --version                                          output the version number
-  -d, --output-dir <dir>                                 Output directory (default: ".")
-  -s, --suffix <suffix>                                  Append suffix to output files (default: "")
-  --max-optimizer-rounds <rounds>                        Maximum number of compressions to use for auto optimizations (default: "6")
-  --optimizer-butteraugli-target <butteraugli distance>  Target Butteraugli distance for auto optimizer (default: "1.4")
-  --resize [config]                                      Resize the image before compressing
-  --quant [config]                                       Reduce the number of colors used (aka. paletting)
-  --rotate [config]                                      Rotate image
-  --mozjpeg [config]                                     Use MozJPEG to generate a .jpg file with the given configuration
-  --webp [config]                                        Use WebP to generate a .webp file with the given configuration
-  --avif [config]                                        Use AVIF to generate a .avif file with the given configuration
-  --jxl [config]                                         Use JPEG-XL to generate a .jxl file with the given configuration
-  --wp2 [config]                                         Use WebP2 to generate a .wp2 file with the given configuration
-  --oxipng [config]                                      Use OxiPNG to generate a .png file with the given configuration
-  -h, --help                                             display help for command
-```
-
-The default values for each `config` option can be found in the [`codecs.js`][codecs.js] file under `defaultEncoderOptions`. Every unspecified value will use the default value specified here. _Better documentation is needed here._
-
-## Auto optimizer
-
-Squoosh CLI has an _experimental_ auto optimizer that compresses an image as much as possible, trying to hit a specific [Butteraugli] target value. The higher the Butteraugli target value, the more artifacts can be introduced.
-
-You can make use of the auto optimizer by using “auto” as the config object.
-
-```
-$ npx @squoosh/cli --wp2 auto test.png
-```
-
-[squoosh]: https://squoosh.app
-[codecs.js]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/libsquoosh/src/codecs.js
-[butteraugli]: https://github.com/google/butteraugli

cli/package-lock.json

@@ -1,595 +0,0 @@
-{
-  "name": "@squoosh/cli",
-  "version": "0.7.0",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@squoosh/cli",
-      "version": "0.7.0",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@squoosh/lib": "^0.2.0",
-        "commander": "^7.2.0",
-        "json5": "^2.2.0",
-        "kleur": "^4.1.4",
-        "ora": "^5.4.0"
-      },
-      "bin": {
-        "cli": "src/index.js",
-        "squoosh-cli": "src/index.js"
-      }
-    },
-    "node_modules/@squoosh/lib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@squoosh/lib/-/lib-0.2.0.tgz",
-      "integrity": "sha512-zKId9h/LzEnCdoOGnIgjzvqbk5g2aHgfEqgKQ+S+r5K3TasgD/DAsT6r7v6gXft1ao0f/00CTcwIp1KviWTQbw==",
-      "dependencies": {
-        "web-streams-polyfill": "^3.0.3"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-    },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
-      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "dependencies": {
-        "clone": "^1.0.2"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.4.tgz",
-      "integrity": "sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/ora": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.0.tgz",
-      "integrity": "sha512-1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==",
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "dependencies": {
-        "ansi-regex": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/web-streams-polyfill": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.0.3.tgz",
-      "integrity": "sha512-d2H/t0eqRNM4w2WvmTdoeIvzAUSpK7JmATB8Nr2lb7nQ9BTIJVjbQ/TRFVEh2gUH1HwclPdoPtfMoFfetXaZnA==",
-      "engines": {
-        "node": ">= 8"
-      }
-    }
-  },
-  "dependencies": {
-    "@squoosh/lib": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@squoosh/lib/-/lib-0.2.0.tgz",
-      "integrity": "sha512-zKId9h/LzEnCdoOGnIgjzvqbk5g2aHgfEqgKQ+S+r5K3TasgD/DAsT6r7v6gXft1ao0f/00CTcwIp1KviWTQbw==",
-      "requires": {
-        "web-streams-polyfill": "^3.0.3"
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
-      "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-    },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "chalk": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
-      "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-spinners": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz",
-      "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q=="
-    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
-    },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="
-    },
-    "json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "requires": {
-        "minimist": "^1.2.5"
-      }
-    },
-    "kleur": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-4.1.4.tgz",
-      "integrity": "sha512-8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA=="
-    },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-    },
-    "minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "ora": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.0.tgz",
-      "integrity": "sha512-1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==",
-      "requires": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      }
-    },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "signal-exit": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
-      "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
-      "requires": {
-        "ansi-regex": "^5.0.0"
-      }
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
-    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "web-streams-polyfill": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.0.3.tgz",
-      "integrity": "sha512-d2H/t0eqRNM4w2WvmTdoeIvzAUSpK7JmATB8Nr2lb7nQ9BTIJVjbQ/TRFVEh2gUH1HwclPdoPtfMoFfetXaZnA=="
-    }
-  }
-}

cli/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "@squoosh/cli",
-  "version": "0.7.0",
-  "description": "A CLI for Squoosh",
-  "public": true,
-  "type": "module",
-  "bin": {
-    "squoosh-cli": "src/index.js",
-    "@squoosh/cli": "src/index.js"
-  },
-  "files": [
-    "/src/index.js"
-  ],
-  "keywords": [],
-  "author": "Google Chrome Developers <chromium-dev@google.com>",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "@squoosh/lib": "^0.2.0",
-    "commander": "^7.2.0",
-    "json5": "^2.2.0",
-    "kleur": "^4.1.4",
-    "ora": "^5.4.0"
-  }
-}

cli/src/index.js

@@ -1,232 +0,0 @@
-#!/usr/bin/env node
-
-import { program } from 'commander/esm.mjs';
-import JSON5 from 'json5';
-import path from 'path';
-import { promises as fsp } from 'fs';
-import ora from 'ora';
-import kleur from 'kleur';
-
-import { ImagePool, preprocessors, encoders } from '@squoosh/lib';
-
-function clamp(v, min, max) {
-  if (v < min) return min;
-  if (v > max) return max;
-  return v;
-}
-
-const suffix = ['B', 'KB', 'MB'];
-function prettyPrintSize(size) {
-  const base = Math.floor(Math.log2(size) / 10);
-  const index = clamp(base, 0, 2);
-  return (size / 2 ** (10 * index)).toFixed(2) + suffix[index];
-}
-
-function progressTracker(results) {
-  const spinner = ora();
-  const tracker = {};
-  tracker.spinner = spinner;
-  tracker.progressOffset = 0;
-  tracker.totalOffset = 0;
-  let status = '';
-  tracker.setStatus = (text) => {
-    status = text || '';
-    update();
-  };
-  let progress = '';
-  tracker.setProgress = (done, total) => {
-    spinner.prefixText = kleur.dim(`${done}/${total}`);
-    const completeness =
-      (tracker.progressOffset + done) / (tracker.totalOffset + total);
-    progress = kleur.cyan(
-      `▐${'▨'.repeat((completeness * 10) | 0).padEnd(10, '╌')}▌ `,
-    );
-    update();
-  };
-  function update() {
-    spinner.text = progress + kleur.bold(status) + getResultsText();
-  }
-  tracker.finish = (text) => {
-    spinner.succeed(kleur.bold(text) + getResultsText());
-  };
-  function getResultsText() {
-    let out = '';
-    for (const result of results.values()) {
-      out += `\n ${kleur.cyan(result.file)}: ${prettyPrintSize(result.size)}`;
-      for (const { outputFile, size: outputSize, infoText } of result.outputs) {
-        out += `\n  ${kleur.dim('└')} ${kleur.cyan(
-          outputFile.padEnd(5),
-        )} → ${prettyPrintSize(outputSize)}`;
-        const percent = ((outputSize / result.size) * 100).toPrecision(3);
-        out += ` (${kleur[outputSize > result.size ? 'red' : 'green'](
-          percent + '%',
-        )})`;
-        if (infoText) out += kleur.yellow(infoText);
-      }
-    }
-    return out || '\n';
-  }
-  spinner.start();
-  return tracker;
-}
-
-async function getInputFiles(paths) {
-  const validFiles = [];
-
-  for (const inputPath of paths) {
-    const files = (await fsp.lstat(inputPath)).isDirectory()
-      ? (await fsp.readdir(inputPath, {withFileTypes: true})).filter(dirent => dirent.isFile()).map(dirent => path.join(inputPath, dirent.name))
-      : [inputPath];
-    for (const file of files) {
-      try {
-        await fsp.stat(file);
-      } catch (err) {
-        if (err.code === 'ENOENT') {
-          console.warn(
-            `Warning: Input file does not exist: ${path.resolve(file)}`,
-          );
-          continue;
-        } else {
-          throw err;
-        }
-      }
-
-      validFiles.push(file);
-    }
-  }
-
-  return validFiles;
-}
-
-async function processFiles(files) {
-  files = await getInputFiles(files);
-
-  const imagePool = new ImagePool();
-
-  const results = new Map();
-  const progress = progressTracker(results);
-
-  progress.setStatus('Decoding...');
-  progress.totalOffset = files.length;
-  progress.setProgress(0, files.length);
-
-  // Create output directory
-  await fsp.mkdir(program.opts().outputDir, { recursive: true });
-
-  let decoded = 0;
-  let decodedFiles = await Promise.all(
-    files.map(async (file) => {
-      const image = imagePool.ingestImage(file);
-      await image.decoded;
-      results.set(image, {
-        file,
-        size: (await image.decoded).size,
-        outputs: [],
-      });
-      progress.setProgress(++decoded, files.length);
-      return image;
-    }),
-  );
-
-  const preprocessOptions = {};
-
-  for (const preprocessorName of Object.keys(preprocessors)) {
-    if (!program.opts()[preprocessorName]) {
-      continue;
-    }
-    preprocessOptions[preprocessorName] = JSON5.parse(
-      program.opts()[preprocessorName],
-    );
-  }
-
-  for (const image of decodedFiles) {
-    image.preprocess(preprocessOptions);
-  }
-
-  await Promise.all(decodedFiles.map((image) => image.decoded));
-
-  progress.progressOffset = decoded;
-  progress.setStatus(
-    'Encoding ' + kleur.dim(`(${imagePool.workerPool.numWorkers} threads)`),
-  );
-  progress.setProgress(0, files.length);
-
-  const jobs = [];
-  let jobsStarted = 0;
-  let jobsFinished = 0;
-  for (const image of decodedFiles) {
-    const originalFile = results.get(image).file;
-
-    const encodeOptions = {
-      optimizerButteraugliTarget: Number(
-        program.opts().optimizerButteraugliTarget,
-      ),
-      maxOptimizerRounds: Number(program.opts().maxOptimizerRounds),
-    };
-    for (const encName of Object.keys(encoders)) {
-      if (!program.opts()[encName]) {
-        continue;
-      }
-      const encParam = program.opts()[encName];
-      const encConfig =
-        encParam.toLowerCase() === 'auto' ? 'auto' : JSON5.parse(encParam);
-      encodeOptions[encName] = encConfig;
-    }
-    jobsStarted++;
-    const job = image.encode(encodeOptions).then(async () => {
-      jobsFinished++;
-      const outputPath = path.join(
-        program.opts().outputDir,
-        program.opts().suffix +
-          path.basename(originalFile, path.extname(originalFile)),
-      );
-      for (const output of Object.values(image.encodedWith)) {
-        const outputFile = `${outputPath}.${(await output).extension}`;
-        await fsp.writeFile(outputFile, (await output).binary);
-        results
-          .get(image)
-          .outputs.push(Object.assign(await output, { outputFile }));
-      }
-      progress.setProgress(jobsFinished, jobsStarted);
-    });
-    jobs.push(job);
-  }
-
-  // update the progress to account for multi-format
-  progress.setProgress(jobsFinished, jobsStarted);
-  // Wait for all jobs to finish
-  await Promise.all(jobs);
-  await imagePool.close();
-  progress.finish('Squoosh results:');
-}
-
-program
-  .name('squoosh-cli')
-  .arguments('<files...>')
-  .option('-d, --output-dir <dir>', 'Output directory', '.')
-  .option('-s, --suffix <suffix>', 'Append suffix to output files', '')
-  .option(
-    '--max-optimizer-rounds <rounds>',
-    'Maximum number of compressions to use for auto optimizations',
-    '6',
-  )
-  .option(
-    '--optimizer-butteraugli-target <butteraugli distance>',
-    'Target Butteraugli distance for auto optimizer',
-    '1.4',
-  )
-  .action(processFiles);
-
-// Create a CLI option for each supported preprocessor
-for (const [key, value] of Object.entries(preprocessors)) {
-  program.option(`--${key} [config]`, value.description);
-}
-// Create a CLI option for each supported encoder
-for (const [key, value] of Object.entries(encoders)) {
-  program.option(
-    `--${key} [config]`,
-    `Use ${value.name} to generate a .${value.extension} file with the given configuration`,
-  );
-}
-
-program.parse(process.argv);

client-tsconfig.json

@@ -14,6 +14,7 @@
     // for comlink
     "src/features/**/worker/**/*",
     "src/features-worker/**/*",
-    "src/features/worker-utils/**/*"
+    "src/features/worker-utils/**/*",
+    "src/worker-shared/**/*"
   ]
 }

codecs/avif/Makefile

@@ -1,9 +1,9 @@
 # libavif and libaom versions are from
-# https://docs.google.com/document/d/1wEEA5rRU7wT54k41u3qyZIZHDCJArIMzLuzsrLAwaK8/edit
-CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/1c39e772c2c0d687691dd4b589a12c323f5f767d.tar.gz
+# google3/third_party/libavif/METADATA
+CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/647c3c208cf152395d777c1bf7240d2ecf7df5a9.tar.gz
 CODEC_PACKAGE = node_modules/libavif.tar.gz
 
-LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/v3.1.0.tar.gz
+LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/v3.6.0.tar.gz
 LIBAOM_PACKAGE = node_modules/libaom.tar.gz
 
 export CODEC_DIR = node_modules/libavif
@@ -16,10 +16,10 @@ export
 OUT_ENC_JS = enc/avif_enc.js
 OUT_NODE_ENC_JS = enc/avif_node_enc.js
 OUT_ENC_MT_JS = enc/avif_enc_mt.js
+OUT_NODE_ENC_MT_JS = enc/avif_node_enc_mt.js
 OUT_DEC_JS = dec/avif_dec.js
 OUT_NODE_DEC_JS = dec/avif_node_dec.js
 
-OUT_ENC_CPP = enc/avif_enc.cpp
 OUT_ENC_CPP = enc/avif_enc.cpp
 OUT_DEC_CPP = dec/avif_dec.cpp
 ENVIRONMENT = worker
@@ -28,9 +28,9 @@ HELPER_MAKEFLAGS := -f helper.Makefile
 
 .PHONY: all clean
 
-all: $(OUT_ENC_JS) $(OUT_DEC_JS) $(OUT_ENC_MT_JS) $(OUT_NODE_ENC_JS) $(OUT_NODE_DEC_JS)
+all: $(OUT_ENC_JS) $(OUT_DEC_JS) $(OUT_ENC_MT_JS) $(OUT_NODE_ENC_JS) $(OUT_NODE_ENC_MT_JS) $(OUT_NODE_DEC_JS)
 
-$(OUT_NODE_ENC_JS): ENVIRONMENT=node
+$(OUT_NODE_ENC_JS) $(OUT_NODE_ENC_MT_JS): ENVIRONMENT=node
 $(OUT_NODE_ENC_JS) $(OUT_ENC_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt
 	$(MAKE) \
 		$(HELPER_MAKEFLAGS) \
@@ -44,7 +44,7 @@ $(OUT_NODE_ENC_JS) $(OUT_ENC_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(L
 		ENVIRONMENT=$(ENVIRONMENT) \
 		LIBAVIF_FLAGS="-DAVIF_CODEC_AOM_DECODE=0"
 
-$(OUT_ENC_MT_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt
+$(OUT_ENC_MT_JS) $(OUT_NODE_ENC_MT_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt
 	$(MAKE) \
 		$(HELPER_MAKEFLAGS) \
 		OUT_JS=$@ \
@@ -89,4 +89,7 @@ $(LIBAOM_DIR)/CMakeLists.txt: $(LIBAOM_PACKAGE)
 clean:
 	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_ENC_JS) clean
 	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_ENC_MT_JS) clean
+	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_ENC_NODE_JS) clean
+	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_ENC_NODE_MT_JS) clean
 	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_DEC_JS) clean
+	$(MAKE) $(HELPER_MAKEFLAGS) OUT_JS=$(OUT_DEV_NODE_JS) clean

codecs/avif/enc/avif_node_enc_mt.worker.js

@@ -0,0 +1 @@
+"use strict";var Module={};if(typeof process==="object"&&typeof process.versions==="object"&&typeof process.versions.node==="string"){var nodeWorkerThreads=require("worker_threads");var parentPort=nodeWorkerThreads.parentPort;parentPort.on("message",function(data){onmessage({data:data})});var nodeFS=require("fs");Object.assign(global,{self:global,require:require,Module:Module,location:{href:__filename},Worker:nodeWorkerThreads.Worker,importScripts:function(f){(0,eval)(nodeFS.readFileSync(f,"utf8"))},postMessage:function(msg){parentPort.postMessage(msg)},performance:global.performance||{now:function(){return Date.now()}}})}var initializedJS=false;function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:Module["_pthread_self"]()})}var err=threadPrintErr;self.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);receiveInstance(instance);Module["wasmModule"]=null;return instance.exports};function moduleLoaded(){}self.onmessage=function(e){try{if(e.data.cmd==="load"){Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;(e.data.urlOrBlob?import(e.data.urlOrBlob):import("./avif_node_enc_mt.js")).then(function(exports){return exports.default(Module)}).then(function(instance){Module=instance;moduleLoaded()})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;Module["__emscripten_thread_init"](e.data.threadInfoStruct,0,0);var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].threadInit();if(!initializedJS){Module["___embind_register_native_and_builtin_types"]();initializedJS=true}try{var result=Module["invokeEntryPoint"](e.data.start_routine,e.data.arg);if(Module["keepRuntimeAlive"]()){Module["PThread"].setExitStatus(result)}else{Module["PThread"].threadExit(result)}}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){if(ex instanceof Module["ExitStatus"]){if(Module["keepRuntimeAlive"]()){}else{Module["PThread"].threadExit(ex.status)}}else{Module["PThread"].threadExit(-2);throw ex}}}}else if(e.data.cmd==="cancel"){if(Module["_pthread_self"]()){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(Module["_pthread_self"]()){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex&&ex.stack)err(ex.stack);throw ex}};

codecs/jxl/Makefile

@@ -1,5 +1,5 @@
-CODEC_URL = https://gitlab.com/wg1/jpeg-xl.git
-CODEC_VERSION = ab7c5e9b6795134377aa4846ceaae2c5bc504f76
+CODEC_URL = https://github.com/libjxl/libjxl.git
+CODEC_VERSION = 9f544641ec83f6abd9da598bdd08178ee8a003e0
 CODEC_DIR = node_modules/jxl
 CODEC_BUILD_ROOT := $(CODEC_DIR)/build
 CODEC_MT_BUILD_DIR := $(CODEC_BUILD_ROOT)/mt
@@ -75,6 +75,9 @@ $(CODEC_MT_SIMD_BUILD_DIR)/Makefile: CXXFLAGS+=-msimd128
 	-DCMAKE_CROSSCOMPILING_EMULATOR=node \
 	-B $(@D) \
 	$(<D)
+	emcc -Wall -O3 -o $(CODEC_DIR)/third_party/skcms/skcms.cc.o -I$(CODEC_DIR)/third_party/skcms -c $(CODEC_DIR)/third_party/skcms/skcms.cc
+	llvm-ar rc $(CODEC_BUILD_DIR)/third_party/libskcms.a $(CODEC_DIR)/third_party/skcms/skcms.cc.o
+	rm $(CODEC_DIR)/third_party/skcms/skcms.cc.o
 
 $(CODEC_DIR)/CMakeLists.txt:
 	$(RM) -r $(@D)

codecs/jxl/enc/jxl_enc.cpp

@@ -4,21 +4,21 @@
 #include "lib/jxl/base/thread_pool_internal.h"
 #include "lib/jxl/enc_external_image.h"
 #include "lib/jxl/enc_file.h"
+#include "lib/jxl/enc_color_management.h"
 
 using namespace emscripten;
 
 thread_local const val Uint8Array = val::global("Uint8Array");
 
 struct JXLOptions {
-  // 1 = slowest
-  // 7 = fastest
-  int speed;
+  int effort;
   float quality;
   bool progressive;
   int epf;
-  int nearLossless;
   bool lossyPalette;
   size_t decodingSpeedTier;
+  float photonNoiseIso;
+  bool lossyModular;
 };
 
 val encode(std::string image, int width, int height, JXLOptions options) {
@@ -33,25 +33,35 @@ val encode(std::string image, int width, int height, JXLOptions options) {
   pool_ptr = &pool;
 #endif
 
+  size_t st = 10 - options.effort;
+  cparams.speed_tier = jxl::SpeedTier(st);
+
   cparams.epf = options.epf;
-  cparams.speed_tier = static_cast<jxl::SpeedTier>(options.speed);
-  cparams.near_lossless = options.nearLossless;
   cparams.decoding_speed_tier = options.decodingSpeedTier;
+  cparams.photon_noise_iso = options.photonNoiseIso;
 
   if (options.lossyPalette) {
     cparams.lossy_palette = true;
     cparams.palette_colors = 0;
     cparams.options.predictor = jxl::Predictor::Zero;
+    // Near-lossless assumes -R 0
+    cparams.responsive = 0;
+    cparams.modular_mode = true;
   }
 
   float quality = options.quality;
 
   // Quality settings roughly match libjpeg qualities.
-  if (quality < 7 || quality == 100) {
+  if (options.lossyModular || quality == 100) {
     cparams.modular_mode = true;
     // Internal modular quality to roughly match VarDCT size.
-    cparams.quality_pair.first = cparams.quality_pair.second =
-        std::min(35 + (quality - 7) * 3.0f, 100.0f);
+    if (quality < 7) {
+      cparams.quality_pair.first = cparams.quality_pair.second =
+          std::min(35 + (quality - 7) * 3.0f, 100.0f);
+    } else {
+      cparams.quality_pair.first = cparams.quality_pair.second =
+          std::min(35 + (quality - 7) * 65.f / 93.f, 100.0f);
+    }
   } else {
     cparams.modular_mode = false;
     if (quality >= 30) {
@@ -77,12 +87,6 @@ val encode(std::string image, int width, int height, JXLOptions options) {
     }
   }
 
-  if (cparams.near_lossless) {
-    // Near-lossless assumes -R 0
-    cparams.responsive = 0;
-    cparams.modular_mode = true;
-  }
-
   io.metadata.m.SetAlphaBits(8);
   if (!io.metadata.size.Set(width, height)) {
     return val::null();
@@ -94,14 +98,14 @@ val encode(std::string image, int width, int height, JXLOptions options) {
       jxl::Span<const uint8_t>(reinterpret_cast<const uint8_t*>(image.data()), image.size()), width,
       height, jxl::ColorEncoding::SRGB(/*is_gray=*/false), /*has_alpha=*/true,
       /*alpha_is_premultiplied=*/false, /*bits_per_sample=*/8, /*endiannes=*/JXL_LITTLE_ENDIAN,
-      /*flipped_y=*/false, pool_ptr, main);
+      /*flipped_y=*/false, pool_ptr, main, /*(only true if bits_per_sample==32) float_in=*/false);
 
   if (!result) {
     return val::null();
   }
 
   auto js_result = val::null();
-  if (EncodeFile(cparams, &io, &passes_enc_state, &bytes, /*aux=*/nullptr, pool_ptr)) {
+  if (EncodeFile(cparams, &io, &passes_enc_state, &bytes, jxl::GetJxlCms(), /*aux=*/nullptr, pool_ptr)) {
     js_result = Uint8Array.new_(typed_memory_view(bytes.size(), bytes.data()));
   }
 
@@ -110,12 +114,13 @@ val encode(std::string image, int width, int height, JXLOptions options) {
 
 EMSCRIPTEN_BINDINGS(my_module) {
   value_object<JXLOptions>("JXLOptions")
-      .field("speed", &JXLOptions::speed)
+      .field("effort", &JXLOptions::effort)
       .field("quality", &JXLOptions::quality)
       .field("progressive", &JXLOptions::progressive)
-      .field("nearLossless", &JXLOptions::nearLossless)
       .field("lossyPalette", &JXLOptions::lossyPalette)
       .field("decodingSpeedTier", &JXLOptions::decodingSpeedTier)
+      .field("photonNoiseIso", &JXLOptions::photonNoiseIso)
+      .field("lossyModular", &JXLOptions::lossyModular)
       .field("epf", &JXLOptions::epf);
 
   function("encode", &encode);

codecs/jxl/enc/jxl_enc.d.ts

@@ -1,11 +1,12 @@
 export interface EncodeOptions {
-  speed: number;
+  effort: number;
   quality: number;
   progressive: boolean;
   epf: number;
-  nearLossless: number;
   lossyPalette: boolean;
   decodingSpeedTier: number;
+  photonNoiseIso: number;
+  lossyModular: boolean;
 }
 
 export interface JXLModule extends EmscriptenWasm.Module {

codecs/mozjpeg/enc/mozjpeg_enc.cpp

@@ -158,6 +158,11 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
   if (!opts.auto_subsample && opts.color_space == JCS_YCbCr) {
     cinfo.comp_info[0].h_samp_factor = opts.chroma_subsample;
     cinfo.comp_info[0].v_samp_factor = opts.chroma_subsample;
+
+    if (opts.chroma_subsample > 2) {
+      // Otherwise encoding fails.
+      jpeg_c_set_int_param(&cinfo, JINT_DC_SCAN_OPT_MODE, 1);
+    }
   }
 
   if (!opts.baseline && opts.progressive) {

codecs/png/src/lib.rs

@@ -53,7 +53,11 @@ where
 #[wasm_bindgen]
 pub fn decode(mut data: &[u8]) -> ImageData {
     let mut decoder = png::Decoder::new(&mut data);
-    decoder.set_transformations(png::Transformations::EXPAND);
+    decoder.set_transformations(
+        png::Transformations::EXPAND | // Turn paletted images into RGB
+        png::Transformations::PACKING | // Turn images <8bit to 8bit
+        png::Transformations::STRIP_16, // Turn 16bit into 8 bit
+    );
     let (info, mut reader) = decoder.read_info().unwrap_throw();
     let num_pixels = (info.width * info.height) as usize;
     let mut buf = vec![0; num_pixels * 4];

codecs/qoi/Makefile

@@ -0,0 +1,42 @@
+CODEC_URL = https://github.com/phoboslab/qoi/archive/8d35d93cdca85d2868246c2a8a80a1e2c16ba2a8.tar.gz
+
+CODEC_DIR = node_modules/qoi
+CODEC_BUILD_DIR:= $(CODEC_DIR)/build
+ENVIRONMENT = worker
+
+OUT_JS = enc/qoi_enc.js dec/qoi_dec.js
+OUT_WASM := $(OUT_JS:.js=.wasm)
+
+.PHONY: all clean
+
+all: $(OUT_JS)
+
+$(filter enc/%,$(OUT_JS)): enc/qoi_enc.o
+$(filter dec/%,$(OUT_JS)): dec/qoi_dec.o
+
+# ALL .js FILES
+$(OUT_JS):
+	$(LD) \
+		$(LDFLAGS) \
+		--bind \
+		-s ENVIRONMENT=$(ENVIRONMENT) \
+		-s EXPORT_ES6=1 \
+		-o $@ \
+		$+
+
+# ALL .o FILES
+%.o: %.cpp $(CODEC_DIR)
+	$(CXX) -c \
+		$(CXXFLAGS) \
+		-I $(CODEC_DIR) \
+		-o $@ \
+		$<
+
+# CREATE DIRECTORY
+$(CODEC_DIR):
+	mkdir -p $(CODEC_DIR)
+	curl -sL $(CODEC_URL) | tar xz --strip 1 -C $(CODEC_DIR)
+
+clean:
+	$(RM) $(OUT_JS) $(OUT_WASM)
+	$(MAKE) -C $(CODEC_DIR) clean

codecs/qoi/dec/qoi_dec.cpp

@@ -0,0 +1,29 @@
+#include <emscripten/bind.h>
+#include <emscripten/val.h>
+
+#define QOI_IMPLEMENTATION
+#include "qoi.h"
+
+using namespace emscripten;
+
+thread_local const val Uint8ClampedArray = val::global("Uint8ClampedArray");
+thread_local const val ImageData = val::global("ImageData");
+
+val decode(std::string qoiimage) {
+  qoi_desc desc;
+  uint8_t* rgba = (uint8_t*)qoi_decode(qoiimage.c_str(), qoiimage.length(), &desc, 4);
+
+  // Resultant width and height stored in descriptor
+  int decodedWidth = desc.width;
+  int decodedHeight = desc.height;
+
+  val result = ImageData.new_(
+      Uint8ClampedArray.new_(typed_memory_view(4 * decodedWidth * decodedHeight, rgba)),
+      decodedWidth, decodedHeight);
+
+  return result;
+}
+
+EMSCRIPTEN_BINDINGS(my_module) {
+  function("decode", &decode);
+}

codecs/qoi/dec/qoi_dec.d.ts

@@ -0,0 +1,7 @@
+export interface QOIModule extends EmscriptenWasm.Module {
+  decode(data: BufferSource): ImageData | null;
+}
+
+declare var moduleFactory: EmscriptenWasm.ModuleFactory<QOIModule>;
+
+export default moduleFactory;

codecs/qoi/enc/qoi_enc.cpp

@@ -0,0 +1,45 @@
+#include <emscripten/bind.h>
+#include <emscripten/val.h>
+
+#include <vector>
+
+#define QOI_IMPLEMENTATION
+#include "qoi.h"
+
+using namespace emscripten;
+
+struct QoiOptions {};
+
+thread_local const val Uint8Array = val::global("Uint8Array");
+
+val encode(std::string buffer, int width, int height, QoiOptions options) {
+  int compressedSizeInBytes;
+  qoi_desc desc;
+  desc.width = width;
+  desc.height = height;
+  desc.channels = 3;
+  desc.colorspace = QOI_SRGB;
+
+  auto rgba_buffer = buffer.c_str();
+  auto num_pixels = width * height;
+  std::vector<uint8_t> rgb_buffer(num_pixels * 3);
+  for(auto i = 0; i < num_pixels; i ++) {
+    rgb_buffer[i*3 + 0] = rgba_buffer[i*4 +0];
+    rgb_buffer[i*3 + 1] = rgba_buffer[i*4 +1];
+    rgb_buffer[i*3 + 2] = rgba_buffer[i*4 +2];
+  }
+
+  void* encodedData = qoi_encode(rgb_buffer.data(), &desc, &compressedSizeInBytes);
+  if (encodedData == NULL)
+    return val::null();
+
+  auto js_result =
+      Uint8Array.new_(typed_memory_view(compressedSizeInBytes, (const uint8_t*)encodedData));
+  return js_result;
+}
+
+EMSCRIPTEN_BINDINGS(my_module) {
+  value_object<QoiOptions>("QoiOptions");
+
+  function("encode", &encode);
+}

codecs/qoi/enc/qoi_enc.d.ts

@@ -0,0 +1,14 @@
+export interface EncodeOptions {}
+
+export interface QoiModule extends EmscriptenWasm.Module {
+    encode(
+        data: BufferSource,
+        width: number,
+        height: number,
+        options: EncodeOptions,
+    ): Uint8Array;
+}
+
+declare var moduleFactory: EmscriptenWasm.ModuleFactory<QoiModule>;
+
+export default moduleFactory;

codecs/qoi/package.json

@@ -0,0 +1,7 @@
+{
+    "name": "qoi",
+    "scripts": {
+      "build": "../build-cpp.sh"
+    }
+  }
+  

codecs/visdif/BUILD.md

@@ -0,0 +1,14 @@
+This codec currently needs monkey-patching of Emscripten
+
+```
+$ docker run --rm -it -v $(PWD):/src squoosh-cpp "/bin/bash"
+# cat << EOF | patch /emsdk/upstream/emscripten/system/lib/dlmalloc.c
+659c659
+< #define MALLOC_ALIGNMENT ((size_t)(2 * sizeof(void *)))
+---
+> #define MALLOC_ALIGNMENT ((size_t)(16U))
+EOF
+# emcc --clear-cache
+# /emsdk/upstream/emscripten/embuilder build libdlmalloc --force
+# emmake make
+```

codecs/visdif/test.mjs

@@ -1,22 +0,0 @@
-
-import {dirname} from "path";
-globalThis.__dirname = dirname(import.meta.url);
-import { createRequire } from 'module';
-
-globalThis.require = createRequire(import.meta.url);
-import visdif from './visdif.js';
-
-const {VisDiff} = await visdif({
-	locateFile() {
-		return new URL("./visdif.wasm", import.meta.url).pathname;
-	}
-});
-
-const comparator = new VisDiff(
-	new Uint8ClampedArray([0, 0, 0, 255]),
-	1,	
-	1
-);
-
-const distance = comparator.distance(new Uint8ClampedArray([1,1,1,255]));
-console.log({distance});

codecs/visdif/visdif.cpp

@@ -5,12 +5,19 @@
 using namespace emscripten;
 using namespace butteraugli;
 
+#define GAMMA 2.2
+
+static float SrgbToLinear[256];
+
+inline void gammaLookupTable() {
+  SrgbToLinear[0] = 0;
+  for (int i = 1; i < 256; ++i) {
+    SrgbToLinear[i] = static_cast<float>(255.0 * pow(i / 255.0, GAMMA));
+  }
+}
+
 // Turns an interleaved RGBA buffer into 4 planes for each color channel
-void planarize(std::vector<ImageF>& img,
-               const uint8_t* rgba,
-               int width,
-               int height,
-               float gamma = 2.2) {
+void planarize(std::vector<ImageF>& img, const uint8_t* rgba, int width, int height) {
   assert(img.size() == 0);
   img.push_back(ImageF(width, height));
   img.push_back(ImageF(width, height));
@@ -22,10 +29,10 @@ void planarize(std::vector<ImageF>& img,
     float* const row_b = img[2].Row(y);
     float* const row_a = img[3].Row(y);
     for (int x = 0; x < width; x++) {
-      row_r[x] = 255.0 * pow(rgba[(y * width + x) * 4 + 0] / 255.0, gamma);
-      row_g[x] = 255.0 * pow(rgba[(y * width + x) * 4 + 1] / 255.0, gamma);
-      row_b[x] = 255.0 * pow(rgba[(y * width + x) * 4 + 2] / 255.0, gamma);
-      row_a[x] = 255.0 * pow(rgba[(y * width + x) * 4 + 3] / 255.0, gamma);
+      row_r[x] = SrgbToLinear[rgba[(y * width + x) * 4 + 0]];
+      row_g[x] = SrgbToLinear[rgba[(y * width + x) * 4 + 1]];
+      row_b[x] = SrgbToLinear[rgba[(y * width + x) * 4 + 2]];
+      row_a[x] = SrgbToLinear[rgba[(y * width + x) * 4 + 3]];
     }
   }
 }
@@ -37,6 +44,7 @@ class VisDiff {
 
  public:
   VisDiff(std::string ref_img, int width, int height) {
+    gammaLookupTable();
     planarize(this->ref_img, (uint8_t*)ref_img.c_str(), width, height);
     this->width = width;
     this->height = height;

codecs/visdif/visdif.test.mjs

@@ -1,21 +0,0 @@
-import {dirname} from "path";
-globalThis.__dirname = dirname(import.meta.url);
-import { createRequire } from 'module';
-
-globalThis.require = createRequire(import.meta.url);
-import visdif from './visdif.js';
-
-const {VisDiff} = await visdif({
-	locateFile() {
-		return new URL("./visdif.wasm", import.meta.url).pathname;
-	}
-});
-
-const comparator = new VisDiff(
-	new Uint8ClampedArray([0, 0, 0, 255]),
-	1,	
-	1
-);
-
-const distance = comparator.distance(new Uint8ClampedArray([1,1,1,255]));
-console.log({distance});

generic-tsconfig.json

@@ -17,7 +17,8 @@
       "static-build/*": ["src/static-build/*"],
       "client/*": ["src/client/*"],
       "shared/*": ["src/shared/*"],
-      "features/*": ["src/features/*"]
+      "features/*": ["src/features/*"],
+      "worker-shared/*": ["src/worker-shared/*"]
     }
   }
 }

lib/data-url-plugin.js

@@ -14,28 +14,40 @@ import { promises as fs } from 'fs';
 
 import { lookup as lookupMime } from 'mime-types';
 
-const prefix = 'data-url:';
+const prefix = /^data-url(-text)?:/;
 
 export default function dataURLPlugin() {
   return {
     name: 'data-url-plugin',
     async resolveId(id, importer) {
-      if (!id.startsWith(prefix)) return;
+      const match = prefix.exec(id);
+      if (!match) return;
       return (
-        prefix + (await this.resolve(id.slice(prefix.length), importer)).id
+        match[0] + (await this.resolve(id.slice(match[0].length), importer)).id
       );
     },
     async load(id) {
-      if (!id.startsWith(prefix)) return;
-      const realId = id.slice(prefix.length);
+      const match = prefix.exec(id);
+      if (!match) return;
+
+      const isText = !!match[1];
+      const realId = id.slice(match[0].length);
       this.addWatchFile(realId);
 
       const source = await fs.readFile(realId);
       const type = lookupMime(realId) || 'text/plain';
 
-      return `export default 'data:${type};base64,${source.toString(
-        'base64',
-      )}';`;
+      if (isText) {
+        const encodedBody = encodeURIComponent(source.toString('utf8'));
+
+        return `export default ${JSON.stringify(
+          `data:${type};charset=utf-8,${encodedBody}`,
+        )};`;
+      }
+
+      return `export default ${JSON.stringify(
+        `data:${type};base64,${source.toString('base64')}`,
+      )};`;
     },
   };
 }

lib/entry-data-plugin.js

@@ -77,7 +77,9 @@ export default function entryDataPlugin() {
             }
 
             return JSON.stringify(
-              getDependencies(chunks, chunk).map((filename) => fileNameToURL(filename)),
+              getDependencies(chunks, chunk).map((filename) =>
+                fileNameToURL(filename),
+              ),
             );
           },
         );

lib/omt.ejs

@@ -28,10 +28,17 @@ if (!self.<%- amdFunctionName %>) {
       <% } else { %>
         new Promise(resolve => {
           if ("document" in self) {
-            const script = document.createElement("script");
-            script.src = uri;
-            script.onload = resolve;
-            document.head.appendChild(script);
+            const link = document.createElement("link");
+            link.rel = "preload";
+            link.as = "script";
+            link.href = uri;
+            link.onload = () => {
+              const script = document.createElement("script");
+              script.src = uri;
+              script.onload = resolve;
+              document.head.appendChild(script);
+            };
+            document.head.appendChild(link);
           } else {
             self.nextDefineUri = uri;
             importScripts(uri);

libsquoosh/.gitignore

@@ -1,3 +0,0 @@
-node_modules
-build
-.DS_Store

libsquoosh/.npmignore

@@ -1 +0,0 @@
-node_modules

libsquoosh/README.md

@@ -1,163 +0,0 @@
-# libSquoosh
-
-libSquoosh is an _experimental_ way to run all the codecs you know from the [Squoosh] web app directly inside your own JavaScript program. libSquoosh uses a worker pool to parallelize processing images. This way you can apply the same codec to many images at once.
-
-libSquoosh is currently not the fastest image compression tool in town and doesn’t aim to be. It is, however, fast enough to compress many images sufficiently quick at once.
-
-## Installation
-
-libSquoosh can be installed to your local project with the following command:
-
-```
-$ npm install @squoosh/lib
-```
-
-You can start using the libSquoosh by adding these lines to the top of your JS program:
-
-```js
-import { ImagePool } from '@squoosh/lib';
-const imagePool = new ImagePool();
-```
-
-This will create an image pool with an underlying processing pipeline that you can use to ingest and encode images. The ImagePool constructor takes one argument that defines how many parallel operations it is allowed to run at any given time. By default, this number is set to the amount of CPU cores available in the system it is running on.
-
-## Ingesting images
-
-You can ingest a new image like so:
-
-```js
-const imagePath = 'path/to/image.png';
-const image = imagePool.ingestImage(imagePath);
-```
-
-The `ingestImage` function can take anything the node [`readFile`][readfile] function can take, uncluding a buffer and `FileHandle`.
-
-The returned `image` object is a representation of the original image, that you can now preprocess, encode, and extract information about.
-
-## Preprocessing and encoding images
-
-When an image has been ingested, you can start preprocessing it and encoding it to other formats. This example will resize the image and then encode it to a `.jpg` and `.jxl` image:
-
-```js
-await image.decoded; //Wait until the image is decoded before running preprocessors. 
-
-const preprocessOptions = {
-  resize: {
-    enabled: true,
-    width: 100,
-    height: 50,
-  }
-}
-await image.preprocess(preprocessOptions);
-
-const encodeOptions = {
-  mozjpeg: {}, //an empty object means 'use default settings'
-  jxl: {
-    quality: 90,
-  },
-}
-await image.encode(encodeOptions);
-
-```
-
-The default values for each option can be found in the [`codecs.js`][codecs.js] file under `defaultEncoderOptions`. Every unspecified value will use the default value specified there. _Better documentation is needed here._
-
-You can run your own code inbetween the different steps, if, for example, you want to change how much the image should be resized based on its original height. (See [Extracting image information](#extracting-image-information) to learn how to get the image dimensions).
-
-## Closing the ImagePool
-
-When you have encoded everything you need, it is recommended to close the processing pipeline in the ImagePool. This will not delete the images you have already encoded, but it will prevent you from ingesting and encoding new images.
-
-Close the ImagePool pipeline with this line:
-
-```js
-await imagePool.close();
-```
-
-## Writing encoded images to the file system
-
-When you have encoded an image, you normally want to write it to a file.
-
-This example takes an image that has been encoded as a `jpg` and writes it to a file:
-
-```js
-const rawEncodedImage = (await image.encodedWith.mozjpeg).binary;
-
-fs.writeFile('/path/to/new/image.jpg', rawEncodedImage);
-```
-
-This example iterates through all encoded versions of the image and writes them to a specific path:
-
-```js
-const newImagePath = '/path/to/image.'; //extension is added automatically
-
-for (const encodedImage of Object.values(image.encodedWith)) {
-  fs.writeFile(
-    newImagePath + (await encodedImage).extension,
-    (await encodedImage).binary,
-  );
-}
-```
-
-## Extracting image information
-
-Information about a decoded image is available at `Image.decoded`. It looks something like this:
-
-```js
-console.log(await image.decoded);
-// Returns:
-{
- bitmap: {
-    data: Uint8ClampedArray(47736584) [
-      225, 228, 237, 255, 225, 228, 237, 255, 225, 228, 237, 255,
-      225, 228, 237, 255, 225, 228, 237, 255, 225, 228, 237, 255,
-      225, 228, 237, 255,
-      ... //the entire raw image
-    ],
-    width: 4606,  //pixels
-    height: 2591  //pixels
-  },
-  size: 2467795  //bytes
-}
-```
-
-Information about an encoded image can be found at `Image.encodedWith[encoderName]`. It looks something like this:
-
-```js
-console.log(await image.encodedWith.jxl);
-// Returns:
-{
-  optionsUsed: {
-    quality: 75,
-    baseline: false,
-    arithmetic: false,
-    progressive: true,
-    ... //all the possible options for this encoder
-  },
-  binary: Uint8Array(1266975) [
-      1,   0,   0,   1,   0,  1,  0,  0, 255, 219,  0, 132,
-    113, 119, 156, 156, 209,  1,  8,  8,   8,   8,  9,   8,
-      9,  10,  10,   9,
-    ... //the entire raw encoded image
-  ],
-  extension: 'jxl',
-  size: 1266975  //bytes
-}
-```
-
-## Auto optimizer
-
-libSquoosh has an _experimental_ auto optimizer that compresses an image as much as possible, trying to hit a specific [Butteraugli] target value. The higher the Butteraugli target value, the more artifacts can be introduced.
-
-You can make use of the auto optimizer by using “auto” as the config object.
-
-```js
-const encodeOptions: {
-  mozjpeg: 'auto',
-}
-```
-
-[squoosh]: https://squoosh.app
-[codecs.js]: https://github.com/GoogleChromeLabs/squoosh/blob/dev/libsquoosh/src/codecs.js
-[butteraugli]: https://github.com/google/butteraugli
-[readfile]: https://nodejs.org/api/fs.html#fs_fspromises_readfile_path_options

libsquoosh/lib/asset-plugin.js

@@ -1,75 +0,0 @@
-/**
- * Copyright 2020 Google Inc. All Rights Reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { promises as fs } from 'fs';
-import { basename } from 'path';
-
-const defaultOpts = {
-  prefix: 'asset-url',
-};
-
-export default function assetPlugin(opts) {
-  opts = { ...defaultOpts, ...opts };
-
-  /** @type {Map<string, Buffer>} */
-  let assetIdToSourceBuffer;
-
-  const prefix = opts.prefix + ':';
-  return {
-    name: 'asset-plugin',
-    buildStart() {
-      assetIdToSourceBuffer = new Map();
-    },
-    augmentChunkHash(info) {
-      // Get the sources for all assets imported by this chunk.
-      const buffers = Object.keys(info.modules)
-        .map((moduleId) => assetIdToSourceBuffer.get(moduleId))
-        .filter(Boolean);
-
-      if (buffers.length === 0) return;
-
-      for (const moduleId of Object.keys(info.modules)) {
-        const buffer = assetIdToSourceBuffer.get(moduleId);
-        if (buffer) buffers.push(buffer);
-      }
-
-      const combinedBuffer =
-        buffers.length === 1 ? buffers[0] : Buffer.concat(buffers);
-
-      return combinedBuffer;
-    },
-    async resolveId(id, importer) {
-      if (!id.startsWith(prefix)) return;
-      const realId = id.slice(prefix.length);
-      const resolveResult = await this.resolve(realId, importer);
-
-      if (!resolveResult) {
-        throw Error(`Cannot find ${realId}`);
-      }
-      // Add an additional .js to the end so it ends up with .js at the end in the _virtual folder.
-      return prefix + resolveResult.id + '.js';
-    },
-    async load(id) {
-      if (!id.startsWith(prefix)) return;
-      const realId = id.slice(prefix.length, -'.js'.length);
-      const source = await fs.readFile(realId);
-      assetIdToSourceBuffer.set(id, source);
-      this.addWatchFile(realId);
-
-      return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({
-        type: 'asset',
-        source,
-        name: basename(realId),
-      })}`;
-    },
-  };
-}

libsquoosh/lib/autojson-plugin.js

@@ -1,12 +0,0 @@
-import { promises as fsp } from 'fs';
-
-export default function autojsonPlugin() {
-  return {
-    name: 'autojson-plugin',
-    async load(id) {
-      if (id.endsWith('.json') && !id.startsWith('json:')) {
-        return 'export default ' + (await fsp.readFile(id, 'utf8'));
-      }
-    },
-  };
-}

libsquoosh/lib/json-plugin.js

@@ -1,38 +0,0 @@
-import { promises as fsp } from 'fs';
-
-const prefix = 'json:';
-
-const reservedKeys = ['public'];
-
-export default function jsonPlugin() {
-  return {
-    name: 'json-plugin',
-    async resolveId(id, importer) {
-      if (!id.startsWith(prefix)) return;
-      const realId = id.slice(prefix.length);
-      const resolveResult = await this.resolve(realId, importer);
-
-      if (!resolveResult) {
-        throw Error(`Cannot find ${realId}`);
-      }
-      // Add an additional .js to the end so it ends up with .js at the end in the _virtual folder.
-      return prefix + resolveResult.id;
-    },
-    async load(id) {
-      if (!id.startsWith(prefix)) return;
-      const realId = id.slice(prefix.length);
-      const source = await fsp.readFile(realId, 'utf8');
-
-      let code = '';
-      for (const [key, value] of Object.entries(JSON.parse(source))) {
-        if (reservedKeys.includes(key)) {
-          continue;
-        }
-        code += `
-        export const ${key} = ${JSON.stringify(value)};
-      `;
-      }
-      return code;
-    },
-  };
-}

libsquoosh/lib/simple-ts.js

@@ -1,133 +0,0 @@
-/**
- * Copyright 2020 Google Inc. All Rights Reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { spawn } from 'child_process';
-import { relative, join } from 'path';
-import { promises as fsp } from 'fs';
-import { promisify } from 'util';
-
-import * as ts from 'typescript';
-import glob from 'glob';
-import { sync as whichSync } from 'which';
-
-const globP = promisify(glob);
-
-const tscPath = whichSync('tsc');
-
-const extRe = /\.tsx?$/;
-
-function loadConfig(mainPath) {
-  const fileName = ts.findConfigFile(mainPath, ts.sys.fileExists);
-  if (!fileName) throw Error('tsconfig not found');
-  const text = ts.sys.readFile(fileName);
-  const loadedConfig = ts.parseConfigFileTextToJson(fileName, text).config;
-  const parsedTsConfig = ts.parseJsonConfigFileContent(
-    loadedConfig,
-    ts.sys,
-    process.cwd(),
-    undefined,
-    fileName,
-  );
-  return parsedTsConfig;
-}
-
-export default function simpleTS(mainPath, { noBuild, watch } = {}) {
-  const config = loadConfig(mainPath);
-  const args = ['-b', mainPath];
-
-  let tsBuildDone;
-
-  async function watchBuiltFiles(rollupContext) {
-    const matches = await globP(config.options.outDir + '/**/*.js');
-    for (const match of matches) rollupContext.addWatchFile(match);
-  }
-
-  async function tsBuild(rollupContext) {
-    if (tsBuildDone) {
-      // Watch lists are cleared on each build, so we need to rewatch all the JS files.
-      await watchBuiltFiles(rollupContext);
-      return tsBuildDone;
-    }
-    if (noBuild) {
-      return (tsBuildDone = Promise.resolve());
-    }
-    tsBuildDone = Promise.resolve().then(async () => {
-      await new Promise((resolve) => {
-        const proc = spawn(tscPath, args, {
-          stdio: 'inherit',
-        });
-
-        proc.on('exit', (code) => {
-          if (code !== 0) {
-            throw Error('TypeScript build failed');
-          }
-          resolve();
-        });
-      });
-
-      await watchBuiltFiles(rollupContext);
-
-      if (watch) {
-        tsBuildDone.then(() => {
-          spawn(tscPath, [...args, '--watch', '--preserveWatchOutput'], {
-            stdio: 'inherit',
-          });
-        });
-      }
-    });
-
-    return tsBuildDone;
-  }
-
-  return {
-    name: 'simple-ts',
-    resolveId(id, importer) {
-      // If there isn't an importer, it's an entry point, so we don't need to resolve it relative
-      // to something.
-      if (!importer) return null;
-
-      const tsResolve = ts.resolveModuleName(
-        id,
-        importer,
-        config.options,
-        ts.sys,
-      );
-
-      if (
-        // It didn't find anything
-        !tsResolve.resolvedModule ||
-        // Or if it's linking to a definition file, it's something in node_modules,
-        // or something local like css.d.ts
-        tsResolve.resolvedModule.extension === '.d.ts'
-      ) {
-        return null;
-      }
-      return tsResolve.resolvedModule.resolvedFileName;
-    },
-    async load(id) {
-      if (!extRe.test(id)) return null;
-
-      // TypeScript building is deferred until the first TS file load.
-      // This allows prerequisites to happen first,
-      // such as css.d.ts generation in css-plugin.
-      await tsBuild(this);
-
-      // Look for the JS equivalent in the tmp folder
-      const newId = join(
-        config.options.outDir,
-        relative(config.options.rootDir, id),
-      ).replace(extRe, '.js');
-
-      return fsp.readFile(newId, { encoding: 'utf8' });
-    },
-  };
-}

libsquoosh/libsquoosh.test.mjs

@@ -1,18 +0,0 @@
-import { ImagePool } from './build/index.js';
-
-console.log("Starting");
-const imagePool = new ImagePool();
-// const imagePath = '/Users/surma/Downloads/happy_dog.png';
-const imagePath = './squoosh.png';
-console.log("INgesting");
-const image = imagePool.ingestImage(imagePath);
-console.log("Decoding");
-await image.decoded;
-const encodeOptions = {
-  mozjpeg: 'auto',
-};
-console.log("Encoding");
-await image.encode(encodeOptions);
-console.log("Closing");
-await imagePool.close();
-console.log("Done");

libsquoosh/package.json

@@ -1,31 +0,0 @@
-{
-  "name": "@squoosh/lib",
-  "version": "0.2.3",
-  "description": "A Node library for Squoosh",
-  "public": true,
-  "main": "./build/index.js",
-  "files": [
-    "/build/*"
-  ],
-  "scripts": {
-    "build": "rollup -c"
-  },
-  "keywords": [],
-  "author": "Google Chrome Developers <chromium-dev@google.com>",
-  "license": "Apache-2.0",
-  "dependencies": {
-    "web-streams-polyfill": "^3.0.3"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.14.0",
-    "@babel/preset-env": "^7.14.0",
-    "@rollup/plugin-babel": "^5.3.0",
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@types/node": "^15.6.1",
-    "rollup": "^2.46.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "typescript": "^4.1.3",
-    "which": "^2.0.2"
-  }
-}

libsquoosh/rollup.config.js

@@ -1,44 +0,0 @@
-import resolve from '@rollup/plugin-node-resolve';
-import cjs from '@rollup/plugin-commonjs';
-import simpleTS from './lib/simple-ts';
-import asset from './lib/asset-plugin.js';
-import json from './lib/json-plugin.js';
-import autojson from './lib/autojson-plugin.js';
-import { getBabelOutputPlugin } from '@rollup/plugin-babel';
-import { builtinModules } from 'module';
-
-/** @type {import('rollup').RollupOptions} */
-export default {
-  input: 'src/index.js',
-  output: {
-    dir: 'build',
-    format: 'cjs',
-    assetFileNames: '[name]-[hash][extname]',
-  },
-  plugins: [
-    resolve(),
-    cjs(),
-    asset(),
-    autojson(),
-    json(),
-    simpleTS('.'),
-    getBabelOutputPlugin({
-      babelrc: false,
-      configFile: false,
-      minified: process.env.DEBUG != '',
-      comments: true,
-      presets: [
-        [
-          '@babel/preset-env',
-          {
-            targets: {
-              node: 12,
-            },
-            loose: true,
-          },
-        ],
-      ],
-    }),
-  ],
-  external: [...builtinModules, 'web-streams-polyfill'],
-};

libsquoosh/src/WebAssembly.d.ts

@@ -1,132 +0,0 @@
-/**
- * WebAssembly definitions are not available in `@types/node` yet,
- * so these are copied from `lib.dom.d.ts`
- */
-declare namespace WebAssembly {
-  interface CompileError {}
-
-  var CompileError: {
-    prototype: CompileError;
-    new (): CompileError;
-  };
-
-  interface Global {
-    value: any;
-    valueOf(): any;
-  }
-
-  var Global: {
-    prototype: Global;
-    new (descriptor: GlobalDescriptor, v?: any): Global;
-  };
-
-  interface Instance {
-    readonly exports: Exports;
-  }
-
-  var Instance: {
-    prototype: Instance;
-    new (module: Module, importObject?: Imports): Instance;
-  };
-
-  interface LinkError {}
-
-  var LinkError: {
-    prototype: LinkError;
-    new (): LinkError;
-  };
-
-  interface Memory {
-    readonly buffer: ArrayBuffer;
-    grow(delta: number): number;
-  }
-
-  var Memory: {
-    prototype: Memory;
-    new (descriptor: MemoryDescriptor): Memory;
-  };
-
-  interface Module {}
-
-  var Module: {
-    prototype: Module;
-    new (bytes: BufferSource): Module;
-    customSections(moduleObject: Module, sectionName: string): ArrayBuffer[];
-    exports(moduleObject: Module): ModuleExportDescriptor[];
-    imports(moduleObject: Module): ModuleImportDescriptor[];
-  };
-
-  interface RuntimeError {}
-
-  var RuntimeError: {
-    prototype: RuntimeError;
-    new (): RuntimeError;
-  };
-
-  interface Table {
-    readonly length: number;
-    get(index: number): Function | null;
-    grow(delta: number): number;
-    set(index: number, value: Function | null): void;
-  }
-
-  var Table: {
-    prototype: Table;
-    new (descriptor: TableDescriptor): Table;
-  };
-
-  interface GlobalDescriptor {
-    mutable?: boolean;
-    value: ValueType;
-  }
-
-  interface MemoryDescriptor {
-    initial: number;
-    maximum?: number;
-  }
-
-  interface ModuleExportDescriptor {
-    kind: ImportExportKind;
-    name: string;
-  }
-
-  interface ModuleImportDescriptor {
-    kind: ImportExportKind;
-    module: string;
-    name: string;
-  }
-
-  interface TableDescriptor {
-    element: TableKind;
-    initial: number;
-    maximum?: number;
-  }
-
-  interface WebAssemblyInstantiatedSource {
-    instance: Instance;
-    module: Module;
-  }
-
-  type ImportExportKind = 'function' | 'global' | 'memory' | 'table';
-  type TableKind = 'anyfunc';
-  type ValueType = 'f32' | 'f64' | 'i32' | 'i64';
-  type ExportValue = Function | Global | Memory | Table;
-  type Exports = Record<string, ExportValue>;
-  type ImportValue = ExportValue | number;
-  type ModuleImports = Record<string, ImportValue>;
-  type Imports = Record<string, ModuleImports>;
-  function compile(bytes: BufferSource): Promise<Module>;
-  // `compileStreaming` does not exist in NodeJS
-  // function compileStreaming(source: Response | Promise<Response>): Promise<Module>;
-  function instantiate(
-    bytes: BufferSource,
-    importObject?: Imports,
-  ): Promise<WebAssemblyInstantiatedSource>;
-  function instantiate(
-    moduleObject: Module,
-    importObject?: Imports,
-  ): Promise<Instance>;
-  // `instantiateStreaming` does not exist in NodeJS
-  // function instantiateStreaming(response: Response | PromiseLike<Response>, importObject?: Imports): Promise<WebAssemblyInstantiatedSource>;
-  function validate(bytes: BufferSource): boolean;
-}

libsquoosh/src/auto-optimizer.js

@@ -1,70 +0,0 @@
-import { instantiateEmscriptenWasm } from './emscripten-utils.js';
-
-import visdif from '../../codecs/visdif/visdif.js';
-import visdifWasm from 'asset-url:../../codecs/visdif/visdif.wasm';
-
-// `measure` is a (async) function that takes exactly one numeric parameter and
-// returns a value. The function is assumed to be monotonic (an increase in `parameter`
-// will result in an increase in the return value. The function uses binary search
-// to find `parameter` such that `measure` returns `measureGoal`, within an error
-// of `epsilon`. It will use at most `maxRounds` attempts.
-export async function binarySearch(
-  measureGoal,
-  measure,
-  { min = 0, max = 100, epsilon = 0.1, maxRounds = 6 } = {},
-) {
-  let parameter = (max - min) / 2 + min;
-  let delta = (max - min) / 4;
-  let value;
-  let round = 1;
-  while (true) {
-    value = await measure(parameter);
-    if (Math.abs(value - measureGoal) < epsilon || round >= maxRounds) {
-      return { parameter, round, value };
-    }
-    if (value > measureGoal) {
-      parameter -= delta;
-    } else if (value < measureGoal) {
-      parameter += delta;
-    }
-    delta /= 2;
-    round++;
-  }
-}
-
-export async function autoOptimize(
-  bitmapIn,
-  encode,
-  decode,
-  { butteraugliDistanceGoal = 1.4, ...otherOpts } = {},
-) {
-  const { VisDiff } = await instantiateEmscriptenWasm(visdif, visdifWasm);
-
-  const comparator = new VisDiff(
-    bitmapIn.data,
-    bitmapIn.width,
-    bitmapIn.height,
-  );
-
-  let bitmapOut;
-  let binaryOut;
-  // Increasing quality means _decrease_ in Butteraugli distance.
-  // `binarySearch` assumes that increasing `parameter` will
-  // increase the metric value. So multipliy Butteraugli values by -1.
-  const { parameter } = await binarySearch(
-    -1 * butteraugliDistanceGoal,
-    async (quality) => {
-      binaryOut = await encode(bitmapIn, quality);
-      bitmapOut = await decode(binaryOut);
-      return -1 * comparator.distance(bitmapOut.data);
-    },
-    otherOpts,
-  );
-  comparator.delete();
-
-  return {
-    bitmap: bitmapOut,
-    binary: binaryOut,
-    quality: parameter,
-  };
-}

libsquoosh/src/codecs.ts

@@ -1,427 +0,0 @@
-import { promises as fsp } from 'fs';
-import { instantiateEmscriptenWasm, pathify } from './emscripten-utils.js';
-
-interface RotateModuleInstance {
-  exports: {
-    memory: WebAssembly.Memory;
-    rotate(width: number, height: number, rotate: number): void;
-  };
-}
-
-interface ResizeWithAspectParams {
-  input_width: number;
-  input_height: number;
-  target_width: number;
-  target_height: number;
-}
-
-interface ResizeInstantiateOptions {
-  width: number;
-  height: number;
-  method: string;
-  premultiply: boolean;
-  linearRGB: boolean;
-}
-
-declare global {
-  // Needed for being able to use ImageData as type in codec types
-  type ImageData = typeof import('./image_data.js');
-  // Needed for being able to assign to `globalThis.ImageData`
-  var ImageData: ImageData['constructor'];
-}
-
-import type { QuantizerModule } from '../../codecs/imagequant/imagequant.js';
-
-// MozJPEG
-import mozEnc from '../../codecs/mozjpeg/enc/mozjpeg_node_enc.js';
-import mozEncWasm from 'asset-url:../../codecs/mozjpeg/enc/mozjpeg_node_enc.wasm';
-import mozDec from '../../codecs/mozjpeg/dec/mozjpeg_node_dec.js';
-import mozDecWasm from 'asset-url:../../codecs/mozjpeg/dec/mozjpeg_node_dec.wasm';
-
-// WebP
-import webpEnc from '../../codecs/webp/enc/webp_node_enc.js';
-import webpEncWasm from 'asset-url:../../codecs/webp/enc/webp_node_enc.wasm';
-import webpDec from '../../codecs/webp/dec/webp_node_dec.js';
-import webpDecWasm from 'asset-url:../../codecs/webp/dec/webp_node_dec.wasm';
-
-// AVIF
-import avifEnc from '../../codecs/avif/enc/avif_node_enc.js';
-import avifEncWasm from 'asset-url:../../codecs/avif/enc/avif_node_enc.wasm';
-import avifDec from '../../codecs/avif/dec/avif_node_dec.js';
-import avifDecWasm from 'asset-url:../../codecs/avif/dec/avif_node_dec.wasm';
-
-// JXL
-import jxlEnc from '../../codecs/jxl/enc/jxl_node_enc.js';
-import jxlEncWasm from 'asset-url:../../codecs/jxl/enc/jxl_node_enc.wasm';
-import jxlDec from '../../codecs/jxl/dec/jxl_node_dec.js';
-import jxlDecWasm from 'asset-url:../../codecs/jxl/dec/jxl_node_dec.wasm';
-
-// WP2
-import wp2Enc from '../../codecs/wp2/enc/wp2_node_enc.js';
-import wp2EncWasm from 'asset-url:../../codecs/wp2/enc/wp2_node_enc.wasm';
-import wp2Dec from '../../codecs/wp2/dec/wp2_node_dec.js';
-import wp2DecWasm from 'asset-url:../../codecs/wp2/dec/wp2_node_dec.wasm';
-
-// PNG
-import * as pngEncDec from '../../codecs/png/pkg/squoosh_png.js';
-import pngEncDecWasm from 'asset-url:../../codecs/png/pkg/squoosh_png_bg.wasm';
-const pngEncDecPromise = pngEncDec.default(
-  fsp.readFile(pathify(pngEncDecWasm)),
-);
-
-// OxiPNG
-import * as oxipng from '../../codecs/oxipng/pkg/squoosh_oxipng.js';
-import oxipngWasm from 'asset-url:../../codecs/oxipng/pkg/squoosh_oxipng_bg.wasm';
-const oxipngPromise = oxipng.default(fsp.readFile(pathify(oxipngWasm)));
-
-// Resize
-import * as resize from '../../codecs/resize/pkg/squoosh_resize.js';
-import resizeWasm from 'asset-url:../../codecs/resize/pkg/squoosh_resize_bg.wasm';
-const resizePromise = resize.default(fsp.readFile(pathify(resizeWasm)));
-
-// rotate
-import rotateWasm from 'asset-url:../../codecs/rotate/rotate.wasm';
-
-// TODO(ergunsh): Type definitions of some modules do not exist
-// Figure out creating type definitions for them and remove `allowJs` rule
-// We shouldn't need to use Promise<QuantizerModule> below after getting type definitions for imageQuant
-// ImageQuant
-import imageQuant from '../../codecs/imagequant/imagequant_node.js';
-import imageQuantWasm from 'asset-url:../../codecs/imagequant/imagequant_node.wasm';
-const imageQuantPromise: Promise<QuantizerModule> = instantiateEmscriptenWasm(
-  imageQuant,
-  imageQuantWasm,
-);
-
-// Our decoders currently rely on a `ImageData` global.
-import ImageData from './image_data.js';
-globalThis.ImageData = ImageData;
-
-function resizeNameToIndex(name: string) {
-  switch (name) {
-    case 'triangle':
-      return 0;
-    case 'catrom':
-      return 1;
-    case 'mitchell':
-      return 2;
-    case 'lanczos3':
-      return 3;
-    default:
-      throw Error(`Unknown resize algorithm "${name}"`);
-  }
-}
-
-function resizeWithAspect({
-  input_width,
-  input_height,
-  target_width,
-  target_height,
-}: ResizeWithAspectParams): { width: number; height: number } {
-  if (!target_width && !target_height) {
-    throw Error('Need to specify at least width or height when resizing');
-  }
-
-  if (target_width && target_height) {
-    return { width: target_width, height: target_height };
-  }
-
-  if (!target_width) {
-    return {
-      width: Math.round((input_width / input_height) * target_height),
-      height: target_height,
-    };
-  }
-
-  return {
-    width: target_width,
-    height: Math.round((input_height / input_width) * target_width),
-  };
-}
-
-export const preprocessors = {
-  resize: {
-    name: 'Resize',
-    description: 'Resize the image before compressing',
-    instantiate: async () => {
-      await resizePromise;
-      return (
-        buffer: Uint8Array,
-        input_width: number,
-        input_height: number,
-        {
-          width,
-          height,
-          method,
-          premultiply,
-          linearRGB,
-        }: ResizeInstantiateOptions,
-      ) => {
-        ({ width, height } = resizeWithAspect({
-          input_width,
-          input_height,
-          target_width: width,
-          target_height: height,
-        }));
-        return new ImageData(
-          resize.resize(
-            buffer,
-            input_width,
-            input_height,
-            width,
-            height,
-            resizeNameToIndex(method),
-            premultiply,
-            linearRGB,
-          ),
-          width,
-          height,
-        );
-      };
-    },
-    defaultOptions: {
-      method: 'lanczos3',
-      fitMethod: 'stretch',
-      premultiply: true,
-      linearRGB: true,
-    },
-  },
-  // // TODO: Need to handle SVGs and HQX
-  quant: {
-    name: 'ImageQuant',
-    description: 'Reduce the number of colors used (aka. paletting)',
-    instantiate: async () => {
-      const imageQuant = await imageQuantPromise;
-      return (
-        buffer: Uint8Array,
-        width: number,
-        height: number,
-        { numColors, dither }: { numColors: number; dither: number },
-      ) =>
-        new ImageData(
-          imageQuant.quantize(buffer, width, height, numColors, dither),
-          width,
-          height,
-        );
-    },
-    defaultOptions: {
-      numColors: 255,
-      dither: 1.0,
-    },
-  },
-  rotate: {
-    name: 'Rotate',
-    description: 'Rotate image',
-    instantiate: async () => {
-      return async (
-        buffer: Uint8Array,
-        width: number,
-        height: number,
-        { numRotations }: { numRotations: number },
-      ) => {
-        const degrees = (numRotations * 90) % 360;
-        const sameDimensions = degrees == 0 || degrees == 180;
-        const size = width * height * 4;
-        const instance = (
-          await WebAssembly.instantiate(await fsp.readFile(pathify(rotateWasm)))
-        ).instance as RotateModuleInstance;
-        const { memory } = instance.exports;
-        const additionalPagesNeeded = Math.ceil(
-          (size * 2 - memory.buffer.byteLength + 8) / (64 * 1024),
-        );
-        if (additionalPagesNeeded > 0) {
-          memory.grow(additionalPagesNeeded);
-        }
-        const view = new Uint8ClampedArray(memory.buffer);
-        view.set(buffer, 8);
-        instance.exports.rotate(width, height, degrees);
-        return new ImageData(
-          view.slice(size + 8, size * 2 + 8),
-          sameDimensions ? width : height,
-          sameDimensions ? height : width,
-        );
-      };
-    },
-    defaultOptions: {
-      numRotations: 0,
-    },
-  },
-};
-
-export const codecs = {
-  mozjpeg: {
-    name: 'MozJPEG',
-    extension: 'jpg',
-    detectors: [/^\xFF\xD8\xFF/],
-    dec: () => instantiateEmscriptenWasm(mozDec, mozDecWasm),
-    enc: () => instantiateEmscriptenWasm(mozEnc, mozEncWasm),
-    defaultEncoderOptions: {
-      quality: 75,
-      baseline: false,
-      arithmetic: false,
-      progressive: true,
-      optimize_coding: true,
-      smoothing: 0,
-      color_space: 3 /*YCbCr*/,
-      quant_table: 3,
-      trellis_multipass: false,
-      trellis_opt_zero: false,
-      trellis_opt_table: false,
-      trellis_loops: 1,
-      auto_subsample: true,
-      chroma_subsample: 2,
-      separate_chroma_quality: false,
-      chroma_quality: 75,
-    },
-    autoOptimize: {
-      option: 'quality',
-      min: 0,
-      max: 100,
-    },
-  },
-  webp: {
-    name: 'WebP',
-    extension: 'webp',
-    detectors: [/^RIFF....WEBPVP8[LX ]/],
-    dec: () => instantiateEmscriptenWasm(webpDec, webpDecWasm),
-    enc: () => instantiateEmscriptenWasm(webpEnc, webpEncWasm),
-    defaultEncoderOptions: {
-      quality: 75,
-      target_size: 0,
-      target_PSNR: 0,
-      method: 4,
-      sns_strength: 50,
-      filter_strength: 60,
-      filter_sharpness: 0,
-      filter_type: 1,
-      partitions: 0,
-      segments: 4,
-      pass: 1,
-      show_compressed: 0,
-      preprocessing: 0,
-      autofilter: 0,
-      partition_limit: 0,
-      alpha_compression: 1,
-      alpha_filtering: 1,
-      alpha_quality: 100,
-      lossless: 0,
-      exact: 0,
-      image_hint: 0,
-      emulate_jpeg_size: 0,
-      thread_level: 0,
-      low_memory: 0,
-      near_lossless: 100,
-      use_delta_palette: 0,
-      use_sharp_yuv: 0,
-    },
-    autoOptimize: {
-      option: 'quality',
-      min: 0,
-      max: 100,
-    },
-  },
-  avif: {
-    name: 'AVIF',
-    extension: 'avif',
-    detectors: [/^\x00\x00\x00 ftypavif\x00\x00\x00\x00/],
-    dec: () => instantiateEmscriptenWasm(avifDec, avifDecWasm),
-    enc: () => instantiateEmscriptenWasm(avifEnc, avifEncWasm),
-    defaultEncoderOptions: {
-      cqLevel: 33,
-      cqAlphaLevel: -1,
-      denoiseLevel: 0,
-      tileColsLog2: 0,
-      tileRowsLog2: 0,
-      speed: 6,
-      subsample: 1,
-      chromaDeltaQ: false,
-      sharpness: 0,
-      tune: 0 /* AVIFTune.auto */,
-    },
-    autoOptimize: {
-      option: 'cqLevel',
-      min: 62,
-      max: 0,
-    },
-  },
-  jxl: {
-    name: 'JPEG-XL',
-    extension: 'jxl',
-    detectors: [/^\xff\x0a/],
-    dec: () => instantiateEmscriptenWasm(jxlDec, jxlDecWasm),
-    enc: () => instantiateEmscriptenWasm(jxlEnc, jxlEncWasm),
-    defaultEncoderOptions: {
-      speed: 4,
-      quality: 75,
-      progressive: false,
-      epf: -1,
-      nearLossless: 0,
-      lossyPalette: false,
-      decodingSpeedTier: 0,
-    },
-    autoOptimize: {
-      option: 'quality',
-      min: 0,
-      max: 100,
-    },
-  },
-  wp2: {
-    name: 'WebP2',
-    extension: 'wp2',
-    detectors: [/^\xF4\xFF\x6F/],
-    dec: () => instantiateEmscriptenWasm(wp2Dec, wp2DecWasm),
-    enc: () => instantiateEmscriptenWasm(wp2Enc, wp2EncWasm),
-    defaultEncoderOptions: {
-      quality: 75,
-      alpha_quality: 75,
-      effort: 5,
-      pass: 1,
-      sns: 50,
-      uv_mode: 0 /*UVMode.UVModeAuto*/,
-      csp_type: 0 /*Csp.kYCoCg*/,
-      error_diffusion: 0,
-      use_random_matrix: false,
-    },
-    autoOptimize: {
-      option: 'quality',
-      min: 0,
-      max: 100,
-    },
-  },
-  oxipng: {
-    name: 'OxiPNG',
-    extension: 'png',
-    detectors: [/^\x89PNG\x0D\x0A\x1A\x0A/],
-    dec: async () => {
-      await pngEncDecPromise;
-      return { decode: pngEncDec.decode };
-    },
-    enc: async () => {
-      await pngEncDecPromise;
-      await oxipngPromise;
-      return {
-        encode: (
-          buffer: Uint8Array,
-          width: number,
-          height: number,
-          opts: { level: number },
-        ) => {
-          const simplePng = pngEncDec.encode(
-            new Uint8Array(buffer),
-            width,
-            height,
-          );
-          return oxipng.optimise(simplePng, opts.level, false);
-        },
-      };
-    },
-    defaultEncoderOptions: {
-      level: 2,
-    },
-    autoOptimize: {
-      option: 'level',
-      min: 6,
-      max: 1,
-    },
-  },
-};

libsquoosh/src/emscripten-utils.ts

@@ -1,19 +0,0 @@
-import { fileURLToPath } from 'url';
-
-export function pathify(path: string): string {
-  if (path.startsWith('file://')) {
-    path = fileURLToPath(path);
-  }
-  return path;
-}
-
-export function instantiateEmscriptenWasm<T extends EmscriptenWasm.Module>(
-  factory: EmscriptenWasm.ModuleFactory<T>,
-  path: string,
-): Promise<T> {
-  return factory({
-    locateFile() {
-      return pathify(path);
-    },
-  });
-}

libsquoosh/src/image_data.ts

@@ -1,11 +0,0 @@
-export default class ImageData {
-  readonly data: Uint8ClampedArray;
-  readonly width: number;
-  readonly height: number;
-
-  constructor(data: Uint8ClampedArray, width: number, height: number) {
-    this.data = data;
-    this.width = width;
-    this.height = height;
-  }
-}

libsquoosh/src/index.js

@@ -1,224 +0,0 @@
-import { isMainThread } from 'worker_threads';
-import { cpus } from 'os';
-import { promises as fsp } from 'fs';
-
-import { codecs as encoders, preprocessors } from './codecs.js';
-import WorkerPool from './worker_pool.js';
-import { autoOptimize } from './auto-optimizer.js';
-
-export { ImagePool, encoders, preprocessors };
-
-async function decodeFile({ file }) {
-  let buffer;
-  if (ArrayBuffer.isView(file)) {
-    buffer = Buffer.from(file.buffer);
-    file = 'Binary blob';
-  } else if (file instanceof ArrayBuffer) {
-    buffer = Buffer.from(file);
-    file = 'Binary blob';
-  } else if (file instanceof Buffer) {
-    buffer = file;
-    file = 'Binary blob';
-  } else if (typeof file === 'string') {
-    buffer = await fsp.readFile(file);
-  } else {
-    throw Error('Unexpected input type');
-  }
-  const firstChunk = buffer.slice(0, 16);
-  const firstChunkString = Array.from(firstChunk)
-    .map((v) => String.fromCodePoint(v))
-    .join('');
-  const key = Object.entries(encoders).find(([name, { detectors }]) =>
-    detectors.some((detector) => detector.exec(firstChunkString)),
-  )?.[0];
-  if (!key) {
-    throw Error(`${file} has an unsupported format`);
-  }
-  const rgba = (await encoders[key].dec()).decode(new Uint8Array(buffer));
-  return {
-    bitmap: rgba,
-    size: buffer.length,
-  };
-}
-
-async function preprocessImage({ preprocessorName, options, image }) {
-  const preprocessor = await preprocessors[preprocessorName].instantiate();
-  image.bitmap = await preprocessor(
-    image.bitmap.data,
-    image.bitmap.width,
-    image.bitmap.height,
-    options,
-  );
-  return image;
-}
-
-async function encodeImage({
-  bitmap: bitmapIn,
-  encName,
-  encConfig,
-  optimizerButteraugliTarget,
-  maxOptimizerRounds,
-}) {
-  let binary;
-  let optionsUsed = encConfig;
-  const encoder = await encoders[encName].enc();
-  if (encConfig === 'auto') {
-    const optionToOptimize = encoders[encName].autoOptimize.option;
-    const decoder = await encoders[encName].dec();
-    const encode = (bitmapIn, quality) =>
-      encoder.encode(
-        bitmapIn.data,
-        bitmapIn.width,
-        bitmapIn.height,
-        Object.assign({}, encoders[encName].defaultEncoderOptions, {
-          [optionToOptimize]: quality,
-        }),
-      );
-    const decode = (binary) => decoder.decode(binary);
-    const { binary: optimizedBinary, quality } = await autoOptimize(
-      bitmapIn,
-      encode,
-      decode,
-      {
-        min: encoders[encName].autoOptimize.min,
-        max: encoders[encName].autoOptimize.max,
-        butteraugliDistanceGoal: optimizerButteraugliTarget,
-        maxRounds: maxOptimizerRounds,
-      },
-    );
-    binary = optimizedBinary;
-    optionsUsed = {
-      // 5 significant digits is enough
-      [optionToOptimize]: Math.round(quality * 10000) / 10000,
-    };
-  } else {
-    binary = encoder.encode(
-      bitmapIn.data.buffer,
-      bitmapIn.width,
-      bitmapIn.height,
-      encConfig,
-    );
-  }
-  return {
-    optionsUsed,
-    binary,
-    extension: encoders[encName].extension,
-    size: binary.length,
-  };
-}
-
-// both decoding and encoding go through the worker pool
-function handleJob(params) {
-  const { operation } = params;
-  switch (operation) {
-    case 'encode':
-      return encodeImage(params);
-    case 'decode':
-      return decodeFile(params);
-    case 'preprocess':
-      return preprocessImage(params);
-    default:
-      throw Error(`Invalid job "${operation}"`);
-  }
-}
-
-/**
- * Represents an ingested image.
- */
-class Image {
-  constructor(workerPool, file) {
-    this.file = file;
-    this.workerPool = workerPool;
-    this.decoded = workerPool.dispatchJob({ operation: 'decode', file });
-    this.encodedWith = {};
-  }
-
-  /**
-   * Define one or several preprocessors to use on the image.
-   * @param {object} preprocessOptions - An object with preprocessors to use, and their settings.
-   * @returns {Promise<undefined>} - A promise that resolves when all preprocessors have completed their work.
-   */
-  async preprocess(preprocessOptions = {}) {
-    for (const [name, options] of Object.entries(preprocessOptions)) {
-      if (!Object.keys(preprocessors).includes(name)) {
-        throw Error(`Invalid preprocessor "${name}"`);
-      }
-      const preprocessorOptions = Object.assign(
-        {},
-        preprocessors[name].defaultOptions,
-        options,
-      );
-      this.decoded = this.workerPool.dispatchJob({
-        operation: 'preprocess',
-        preprocessorName: name,
-        image: await this.decoded,
-        options: preprocessorOptions,
-      });
-      await this.decoded;
-    }
-  }
-
-  /**
-   * Define one or several encoders to use on the image.
-   * @param {object} encodeOptions - An object with encoders to use, and their settings.
-   * @returns {Promise<undefined>} - A promise that resolves when the image has been encoded with all the specified encoders.
-   */
-  async encode(encodeOptions = {}) {
-    const { bitmap } = await this.decoded;
-    for (const [encName, options] of Object.entries(encodeOptions)) {
-      if (!Object.keys(encoders).includes(encName)) {
-        continue;
-      }
-      const encRef = encoders[encName];
-      const encConfig =
-        typeof options === 'string'
-          ? options
-          : Object.assign({}, encRef.defaultEncoderOptions, options);
-      this.encodedWith[encName] = this.workerPool.dispatchJob({
-        operation: 'encode',
-        bitmap,
-        encName,
-        encConfig,
-        optimizerButteraugliTarget: Number(
-          encodeOptions.optimizerButteraugliTarget ?? 1.4,
-        ),
-        maxOptimizerRounds: Number(encodeOptions.maxOptimizerRounds ?? 6),
-      });
-    }
-    await Promise.all(Object.values(this.encodedWith));
-  }
-}
-
-/**
- * A pool where images can be ingested and squooshed.
- */
-class ImagePool {
-  /**
-   * Create a new pool.
-   * @param {number} [threads] - Number of concurrent image processes to run in the pool. Defaults to the number of CPU cores in the system.
-   */
-  constructor(threads) {
-    this.workerPool = new WorkerPool(threads || cpus().length, __filename);
-  }
-
-  /**
-   * Ingest an image into the image pool.
-   * @param {string | Buffer | URL | object} image - The image or path to the image that should be ingested and decoded.
-   * @returns {Image} - A custom class reference to the decoded image.
-   */
-  ingestImage(image) {
-    return new Image(this.workerPool, image);
-  }
-
-  /**
-   * Closes the underlying image processing pipeline. The already processed images will still be there, but no new processing can start.
-   * @returns {Promise<undefined>} - A promise that resolves when the underlying pipeline has closed.
-   */
-  async close() {
-    await this.workerPool.join();
-  }
-}
-
-if (!isMainThread) {
-  WorkerPool.useThisThreadAsWorker(handleJob);
-}

libsquoosh/src/missing-types.d.ts

@@ -1,38 +0,0 @@
-/// <reference path="../../missing-types.d.ts" />
-
-declare module 'asset-url:*' {
-  const value: string;
-  export default value;
-}
-
-// Somehow TS picks up definitions from the module itself
-// instead of using `asset-url:*`. It is probably related to
-// specifity of the module declaration and these declarations below fix it
-declare module 'asset-url:../../codecs/png/pkg/squoosh_png_bg.wasm' {
-  const value: string;
-  export default value;
-}
-
-declare module 'asset-url:../../codecs/oxipng/pkg/squoosh_oxipng_bg.wasm' {
-  const value: string;
-  export default value;
-}
-
-declare module 'asset-url:../../codecs/resize/pkg/squoosh_resize_bg.wasm' {
-  const value: string;
-  export default value;
-}
-
-// These don't exist in NodeJS types so we're not able to use them but they are referenced in some emscripten and codec types
-// Thus, we need to explicitly assign them to be `never`
-// We're also not able to use the APIs that use these types
-// So, if we want to use those APIs we need to supply its dependencies ourselves
-// However, probably those APIs are more suited to be used in web (i.e. there can be other
-// dependencies to web APIs that might not work in Node)
-type RequestInfo = never;
-type Response = never;
-type WebGLRenderingContext = never;
-type MessageEvent = never;
-
-type BufferSource = ArrayBufferView | ArrayBuffer;
-type URL = import('url').URL;

libsquoosh/src/worker_pool.js

@@ -1,104 +0,0 @@
-import { Worker, parentPort } from 'worker_threads';
-import { TransformStream } from 'web-streams-polyfill';
-
-function uuid() {
-  return Array.from({ length: 16 }, () =>
-    Math.floor(Math.random() * 256).toString(16),
-  ).join('');
-}
-
-function jobPromise(worker, msg) {
-  return new Promise((resolve, reject) => {
-    const id = uuid();
-    worker.postMessage({ msg, id });
-    worker.on('message', function f({ error, result, id: rid }) {
-      if (rid !== id) {
-        return;
-      }
-      if (error) {
-        reject(error);
-        return;
-      }
-      worker.off('message', f);
-      resolve(result);
-    });
-  });
-}
-
-export default class WorkerPool {
-  constructor(numWorkers, workerFile) {
-    this.numWorkers = numWorkers;
-    this.jobQueue = new TransformStream();
-    this.workerQueue = new TransformStream();
-
-    const writer = this.workerQueue.writable.getWriter();
-    for (let i = 0; i < numWorkers; i++) {
-      writer.write(new Worker(workerFile));
-    }
-    writer.releaseLock();
-
-    this.done = this._readLoop();
-  }
-
-  async _readLoop() {
-    const reader = this.jobQueue.readable.getReader();
-    while (true) {
-      const { value, done } = await reader.read();
-      if (done) {
-        await this._terminateAll();
-        return;
-      }
-      const { msg, resolve, reject } = value;
-      const worker = await this._nextWorker();
-      jobPromise(worker, msg)
-        .then((result) => resolve(result))
-        .catch((reason) => reject(reason))
-        .finally(() => {
-          // Return the worker to the pool
-          const writer = this.workerQueue.writable.getWriter();
-          writer.write(worker);
-          writer.releaseLock();
-        });
-    }
-  }
-
-  async _nextWorker() {
-    const reader = this.workerQueue.readable.getReader();
-    const { value, done } = await reader.read();
-    reader.releaseLock();
-    return value;
-  }
-
-  async _terminateAll() {
-    for (let n = 0; n < this.numWorkers; n++) {
-      const worker = await this._nextWorker();
-      worker.terminate();
-    }
-    this.workerQueue.writable.close();
-  }
-
-  async join() {
-    this.jobQueue.writable.getWriter().close();
-    await this.done;
-  }
-
-  dispatchJob(msg) {
-    return new Promise((resolve, reject) => {
-      const writer = this.jobQueue.writable.getWriter();
-      writer.write({ msg, resolve, reject });
-      writer.releaseLock();
-    });
-  }
-
-  static useThisThreadAsWorker(cb) {
-    parentPort.on('message', async (data) => {
-      const { msg, id } = data;
-      try {
-        const result = await cb(msg);
-        parentPort.postMessage({ result, id });
-      } catch (e) {
-        parentPort.postMessage({ error: e.message, id });
-      }
-    });
-  }
-}

libsquoosh/tsconfig.json

@@ -1,9 +0,0 @@
-{
-  "extends": "../generic-tsconfig.json",
-  "compilerOptions": {
-    "lib": ["esnext"],
-    "types": ["node"],
-    "allowJs": true
-  },
-  "include": ["src/**/*", "../codecs/**/*"]
-}

missing-types.d.ts

@@ -44,6 +44,11 @@ declare module 'data-url:*' {
   export default url;
 }
 
+declare module 'data-url-text:*' {
+  const url: string;
+  export default url;
+}
+
 declare module 'service-worker:*' {
   const url: string;
   export default url;

package-lock.json

@@ -5,26 +5,24 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "squoosh",
       "version": "2.0.0",
       "license": "apache-2.0",
-      "dependencies": {
-        "wasm-feature-detect": "^1.2.11"
-      },
       "devDependencies": {
         "@rollup/plugin-commonjs": "^17.0.0",
         "@rollup/plugin-node-resolve": "^11.1.0",
         "@rollup/plugin-replace": "^2.3.4",
         "@surma/rollup-plugin-off-main-thread": "^2.2.2",
         "@types/dedent": "^0.7.0",
-        "@types/mime-types": "^2.1.0",
-        "@types/node": "^14.14.7",
+        "@types/mime-types": "^2.1.1",
+        "@types/node": "^16.11.1",
         "@web/rollup-plugin-import-meta-assets": "^1.0.6",
         "comlink": "^4.3.0",
         "cssnano": "^4.1.10",
         "dedent": "^0.7.0",
         "del": "^5.1.0",
         "file-drop-element": "^1.0.1",
-        "husky": "^4.3.0",
+        "husky": "^7.0.2",
         "idb-keyval": "^3.2.0",
         "image-size": "^0.9.3",
         "linkstate": "^2.0.0",
@@ -32,7 +30,7 @@
         "lodash.camelcase": "^4.3.0",
         "mime-types": "^2.1.28",
         "npm-run-all": "^4.1.5",
-        "pointer-tracker": "^2.4.0",
+        "pointer-tracker": "^2.5.3",
         "postcss": "^7.0.35",
         "postcss-modules": "^3.2.2",
         "postcss-nested": "^4.2.3",
@@ -40,14 +38,29 @@
         "postcss-url": "^8.0.0",
         "preact": "^10.5.5",
         "preact-render-to-string": "^5.1.11",
-        "prettier": "^2.1.2",
+        "prettier": "^2.4.1",
         "rollup": "^2.38.0",
         "rollup-plugin-terser": "^7.0.2",
         "serve": "^11.3.2",
-        "typescript": "^4.1.3",
+        "typescript": "^4.4.4",
+        "wasm-feature-detect": "^1.2.11",
         "which": "^2.0.2"
       }
     },
+    "../pointer-tracker": {
+      "version": "2.5.0",
+      "extraneous": true,
+      "license": "Apache-2.0",
+      "devDependencies": {
+        "husky": "^4.2.5",
+        "lint-staged": "^10.2.11",
+        "prettier": "^2.0.5",
+        "rollup": "^2.23.1",
+        "rollup-plugin-terser": "^7.0.0",
+        "rollup-plugin-typescript2": "^0.27.2",
+        "typescript": "^3.9.7"
+      }
+    },
     "node_modules/@babel/code-frame": {
       "version": "7.10.4",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
@@ -301,9 +314,9 @@
       }
     },
     "node_modules/@types/mime-types": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz",
-      "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
+      "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
       "dev": true
     },
     "node_modules/@types/minimatch": {
@@ -313,9 +326,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "14.14.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz",
-      "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==",
+      "version": "16.11.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.1.tgz",
+      "integrity": "sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
@@ -852,12 +865,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
     "node_modules/clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -1162,12 +1169,6 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "node_modules/compare-versions": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
-      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
-      "dev": true
-    },
     "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -2270,31 +2271,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/find-versions": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz",
-      "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
-      "dev": true,
-      "dependencies": {
-        "semver-regex": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -2471,28 +2447,18 @@
       }
     },
     "node_modules/husky": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.0.tgz",
-      "integrity": "sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz",
+      "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==",
       "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "ci-info": "^2.0.0",
-        "compare-versions": "^3.6.0",
-        "cosmiconfig": "^7.0.0",
-        "find-versions": "^3.2.0",
-        "opencollective-postinstall": "^2.0.2",
-        "pkg-dir": "^4.2.0",
-        "please-upgrade-node": "^3.2.0",
-        "slash": "^3.0.0",
-        "which-pm-runs": "^1.0.0"
-      },
       "bin": {
-        "husky-run": "bin/run.js",
-        "husky-upgrade": "lib/upgrader/bin.js"
+        "husky": "lib/bin.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
       }
     },
     "node_modules/icss-replace-symbols": {
@@ -3150,18 +3116,6 @@
         "node": ">=4.0.0"
       }
     },
-    "node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/lodash.camelcase": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
@@ -3675,15 +3629,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/opencollective-postinstall": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
-      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
-      "dev": true,
-      "bin": {
-        "opencollective-postinstall": "index.js"
-      }
-    },
     "node_modules/p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
@@ -3693,30 +3638,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/p-map": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
@@ -3729,15 +3650,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -3765,15 +3677,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -3849,18 +3752,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/please-upgrade-node": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
@@ -3871,9 +3762,9 @@
       }
     },
     "node_modules/pointer-tracker": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/pointer-tracker/-/pointer-tracker-2.4.0.tgz",
-      "integrity": "sha512-pWI2tpaM/XNtc9mUTv42Rmjf6mkHvE8LT5DDEq0G7baPNhxNM9E3CepubPplSoSLk9E5bwQrAMyDcPVmJyTW4g==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/pointer-tracker/-/pointer-tracker-2.5.3.tgz",
+      "integrity": "sha512-LiJUeIbzk4dXq678YeyrZ++mdY17q4n/2sBHfU9wIuvmSzdiPgMvmvWN2g8mY4J7YwYOIrqrZUWP/MfFHVwYtg==",
       "dev": true
     },
     "node_modules/postcss": {
@@ -7515,9 +7406,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz",
-      "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz",
+      "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==",
       "dev": true,
       "bin": {
         "prettier": "bin-prettier.js"
@@ -7794,15 +7685,6 @@
       "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
       "dev": true
     },
-    "node_modules/semver-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
-      "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/serialize-javascript": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
@@ -8588,9 +8470,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz",
-      "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -8677,7 +8559,8 @@
     "node_modules/wasm-feature-detect": {
       "version": "1.2.11",
       "resolved": "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.2.11.tgz",
-      "integrity": "sha512-HUqwaodrQGaZgz1lZaNioIkog9tkeEJjrM3eq4aUL04whXOVDRc/o2EGb/8kV0QX411iAYWEqq7fMBmJ6dKS6w=="
+      "integrity": "sha512-HUqwaodrQGaZgz1lZaNioIkog9tkeEJjrM3eq4aUL04whXOVDRc/o2EGb/8kV0QX411iAYWEqq7fMBmJ6dKS6w==",
+      "dev": true
     },
     "node_modules/which": {
       "version": "2.0.2",
@@ -8694,12 +8577,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/which-pm-runs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
-      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
-      "dev": true
-    },
     "node_modules/widest-line": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",
@@ -9026,9 +8903,9 @@
       }
     },
     "@types/mime-types": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz",
-      "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.1.tgz",
+      "integrity": "sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==",
       "dev": true
     },
     "@types/minimatch": {
@@ -9038,9 +8915,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "14.14.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz",
-      "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==",
+      "version": "16.11.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.1.tgz",
+      "integrity": "sha512-PYGcJHL9mwl1Ek3PLiYgyEKtwTMmkMw4vbiyz/ps3pfdRYLVv+SN7qHVAImrjdAXxgluDEw6Ph4lyv+m9UpRmA==",
       "dev": true
     },
     "@types/parse-json": {
@@ -9480,12 +9357,6 @@
         "supports-color": "^7.1.0"
       }
     },
-    "ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
     "clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -9739,12 +9610,6 @@
       "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
       "dev": true
     },
-    "compare-versions": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
-      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
-      "dev": true
-    },
     "compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -10662,25 +10527,6 @@
         "to-regex-range": "^5.0.1"
       }
     },
-    "find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dev": true,
-      "requires": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      }
-    },
-    "find-versions": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-3.2.0.tgz",
-      "integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
-      "dev": true,
-      "requires": {
-        "semver-regex": "^2.0.0"
-      }
-    },
     "fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -10827,22 +10673,10 @@
       "dev": true
     },
     "husky": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-4.3.0.tgz",
-      "integrity": "sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.0.0",
-        "ci-info": "^2.0.0",
-        "compare-versions": "^3.6.0",
-        "cosmiconfig": "^7.0.0",
-        "find-versions": "^3.2.0",
-        "opencollective-postinstall": "^2.0.2",
-        "pkg-dir": "^4.2.0",
-        "please-upgrade-node": "^3.2.0",
-        "slash": "^3.0.0",
-        "which-pm-runs": "^1.0.0"
-      }
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz",
+      "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==",
+      "dev": true
     },
     "icss-replace-symbols": {
       "version": "1.1.0",
@@ -11380,15 +11214,6 @@
         "json5": "^1.0.1"
       }
     },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
     "lodash.camelcase": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
@@ -11801,36 +11626,12 @@
         "mimic-fn": "^2.1.0"
       }
     },
-    "opencollective-postinstall": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
-      "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
-      "dev": true
-    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
       "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
       "dev": true
     },
-    "p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.2.0"
-      }
-    },
     "p-map": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
@@ -11840,12 +11641,6 @@
         "aggregate-error": "^3.0.0"
       }
     },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -11867,12 +11662,6 @@
         "lines-and-columns": "^1.1.6"
       }
     },
-    "path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true
-    },
     "path-is-absolute": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
@@ -11927,15 +11716,6 @@
       "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
       "dev": true
     },
-    "pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dev": true,
-      "requires": {
-        "find-up": "^4.0.0"
-      }
-    },
     "please-upgrade-node": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
@@ -11946,9 +11726,9 @@
       }
     },
     "pointer-tracker": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/pointer-tracker/-/pointer-tracker-2.4.0.tgz",
-      "integrity": "sha512-pWI2tpaM/XNtc9mUTv42Rmjf6mkHvE8LT5DDEq0G7baPNhxNM9E3CepubPplSoSLk9E5bwQrAMyDcPVmJyTW4g==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/pointer-tracker/-/pointer-tracker-2.5.3.tgz",
+      "integrity": "sha512-LiJUeIbzk4dXq678YeyrZ++mdY17q4n/2sBHfU9wIuvmSzdiPgMvmvWN2g8mY4J7YwYOIrqrZUWP/MfFHVwYtg==",
       "dev": true
     },
     "postcss": {
@@ -15015,9 +14795,9 @@
       }
     },
     "prettier": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz",
-      "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.1.tgz",
+      "integrity": "sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA==",
       "dev": true
     },
     "pretty-format": {
@@ -15243,12 +15023,6 @@
       "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=",
       "dev": true
     },
-    "semver-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-2.0.0.tgz",
-      "integrity": "sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==",
-      "dev": true
-    },
     "serialize-javascript": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
@@ -15903,9 +15677,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz",
-      "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==",
+      "version": "4.4.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.4.tgz",
+      "integrity": "sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==",
       "dev": true
     },
     "uniq": {
@@ -15982,7 +15756,8 @@
     "wasm-feature-detect": {
       "version": "1.2.11",
       "resolved": "https://registry.npmjs.org/wasm-feature-detect/-/wasm-feature-detect-1.2.11.tgz",
-      "integrity": "sha512-HUqwaodrQGaZgz1lZaNioIkog9tkeEJjrM3eq4aUL04whXOVDRc/o2EGb/8kV0QX411iAYWEqq7fMBmJ6dKS6w=="
+      "integrity": "sha512-HUqwaodrQGaZgz1lZaNioIkog9tkeEJjrM3eq4aUL04whXOVDRc/o2EGb/8kV0QX411iAYWEqq7fMBmJ6dKS6w==",
+      "dev": true
     },
     "which": {
       "version": "2.0.2",
@@ -15993,12 +15768,6 @@
         "isexe": "^2.0.0"
       }
     },
-    "which-pm-runs": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.0.0.tgz",
-      "integrity": "sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=",
-      "dev": true
-    },
     "widest-line": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.1.tgz",

package.json

@@ -6,9 +6,10 @@
   "scripts": {
     "build": "rollup -c && node lib/move-output.js",
     "debug": "node --inspect-brk node_modules/.bin/rollup -c",
-    "dev": "run-p watch serve",
+    "dev": "DEV_PORT=\"${DEV_PORT:=5000}\" run-p watch serve",
     "watch": "rollup -cw",
-    "serve": "serve --config ../../../serve.json .tmp/build/static"
+    "serve": "serve --listen=$DEV_PORT --config ../../../serve.json .tmp/build/static",
+    "prepare": "husky install"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^17.0.0",
@@ -16,15 +17,15 @@
     "@rollup/plugin-replace": "^2.3.4",
     "@surma/rollup-plugin-off-main-thread": "^2.2.2",
     "@types/dedent": "^0.7.0",
-    "@types/mime-types": "^2.1.0",
-    "@types/node": "^14.14.7",
+    "@types/mime-types": "^2.1.1",
+    "@types/node": "^16.11.1",
     "@web/rollup-plugin-import-meta-assets": "^1.0.6",
     "comlink": "^4.3.0",
     "cssnano": "^4.1.10",
     "dedent": "^0.7.0",
     "del": "^5.1.0",
     "file-drop-element": "^1.0.1",
-    "husky": "^4.3.0",
+    "husky": "^7.0.2",
     "idb-keyval": "^3.2.0",
     "image-size": "^0.9.3",
     "linkstate": "^2.0.0",
@@ -32,7 +33,7 @@
     "lodash.camelcase": "^4.3.0",
     "mime-types": "^2.1.28",
     "npm-run-all": "^4.1.5",
-    "pointer-tracker": "^2.4.0",
+    "pointer-tracker": "^2.5.3",
     "postcss": "^7.0.35",
     "postcss-modules": "^3.2.2",
     "postcss-nested": "^4.2.3",
@@ -40,24 +41,17 @@
     "postcss-url": "^8.0.0",
     "preact": "^10.5.5",
     "preact-render-to-string": "^5.1.11",
-    "prettier": "^2.1.2",
+    "prettier": "^2.4.1",
     "rollup": "^2.38.0",
     "rollup-plugin-terser": "^7.0.2",
     "serve": "^11.3.2",
-    "typescript": "^4.1.3",
-    "which": "^2.0.2"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
+    "typescript": "^4.4.4",
+    "which": "^2.0.2",
+    "wasm-feature-detect": "^1.2.11"
   },
   "lint-staged": {
     "*.{js,css,json,md,ts,tsx}": "prettier --write",
     "*.{c,h,cpp,hpp}": "clang-format -i",
     "*.rs": "rustfmt"
-  },
-  "dependencies": {
-    "wasm-feature-detect": "^1.2.11"
   }
 }

rollup.config.js

@@ -86,6 +86,7 @@ export default async function ({ watch }) {
       'src/features-worker',
       'src/features-worker-worker-bridge',
       'src/sw',
+      'src/worker-shared',
       'codecs',
     ]),
     urlPlugin(),

src/client/initial-app/index.tsx

@@ -37,8 +37,10 @@ main();
   ga('set', 'transport', 'beacon');
   ga('set', 'dimension1', displayMode);
   ga('send', 'pageview', '/index.html', { title: 'Squoosh' });
-  // Load the GA script
-  const script = document.createElement('script');
-  script.src = 'https://www.google-analytics.com/analytics.js';
-  document.head.appendChild(script);
+  // Load the GA script without keeping the browser spinner going.
+  addEventListener('load', () => {
+    const script = document.createElement('script');
+    script.src = 'https://www.google-analytics.com/analytics.js';
+    document.head.appendChild(script);
+  });
 }

src/client/lazy-app/Compress/Options/Checkbox/index.tsx

@@ -11,7 +11,11 @@ export default class Checkbox extends Component<Props, State> {
     return (
       <div class={style.checkbox}>
         {props.checked ? (
-          <CheckedIcon class={`${style.icon} ${style.checked}`} />
+          props.disabled ? (
+            <CheckedIcon class={`${style.icon} ${style.disabled}`} />
+          ) : (
+            <CheckedIcon class={`${style.icon} ${style.checked}`} />
+          )
         ) : (
           <UncheckedIcon class={style.icon} />
         )}

src/client/lazy-app/Compress/Options/Checkbox/style.css

@@ -2,6 +2,26 @@
   display: inline-block;
   position: relative;
   --size: 17px;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 200%;
+    height: 200%;
+    background-color: var(--main-theme-color);
+    border-radius: 999px;
+    opacity: 0.25;
+
+    transform: translate(-50%, -50%) scale(0);
+    transition-property: transform;
+    transition-duration: 250ms;
+  }
+
+  &:focus-within::before {
+    transform: translate(-50%, -50%) scale(1);
+  }
 }
 
 .real-checkbox {
@@ -20,3 +40,7 @@
 .checked {
   fill: var(--main-theme-color);
 }
+
+.disabled {
+  fill: var(--dark-gray);
+}

src/client/lazy-app/Compress/Options/Range/custom-els/RangeInput/index.ts

@@ -20,7 +20,7 @@ const REFLECTED_ATTRIBUTES = [
   'disabled',
 ];
 
-function getPrescision(value: string): number {
+function getPrecision(value: string): number {
   const afterDecimal = value.split('.')[1];
   return afterDecimal ? afterDecimal.length : 0;
 }
@@ -112,18 +112,24 @@ class RangeInputElement extends HTMLElement {
     this.dispatchEvent(retargetted);
   };
 
+  private _getDisplayValue(value: number): string {
+    if (value >= 10000) return (value / 1000).toFixed(1) + 'k';
+
+    const labelPrecision =
+      Number(this.labelPrecision) || getPrecision(this.step) || 0;
+    return labelPrecision
+      ? value.toFixed(labelPrecision)
+      : Math.round(value).toString();
+  }
+
   private _update = () => {
     // Not connected?
     if (!this._valueDisplay) return;
     const value = Number(this.value) || 0;
     const min = Number(this.min) || 0;
     const max = Number(this.max) || 100;
-    const labelPrecision =
-      Number(this.labelPrecision) || getPrescision(this.step) || 0;
     const percent = (100 * (value - min)) / (max - min);
-    const displayValue = labelPrecision
-      ? value.toFixed(labelPrecision)
-      : Math.round(value).toString();
+    const displayValue = this._getDisplayValue(value);
 
     this._valueDisplay!.textContent = displayValue;
     this.style.setProperty('--value-percent', percent + '%');

src/client/lazy-app/Compress/Options/Range/custom-els/RangeInput/style.css

@@ -47,6 +47,10 @@ range-input::before {
   height: 12px;
 }
 
+range-input:focus-within .thumb {
+  outline: white solid 2px;
+}
+
 .thumb-wrapper {
   position: absolute;
   left: 6px;

src/client/lazy-app/Compress/Options/Range/index.tsx

@@ -6,10 +6,13 @@ import './custom-els/RangeInput';
 import { linkRef } from 'shared/prerendered-app/util';
 
 interface Props extends preact.JSX.HTMLAttributes {}
-interface State {}
+interface State {
+  textFocused: boolean;
+}
 
 export default class Range extends Component<Props, State> {
   rangeWc?: RangeInputElement;
+  inputEl?: HTMLInputElement;
 
   private onTextInput = (event: Event) => {
     const input = event.target as HTMLInputElement;
@@ -23,10 +26,19 @@ export default class Range extends Component<Props, State> {
     );
   };
 
-  render(props: Props) {
+  private onTextFocus = () => {
+    this.setState({ textFocused: true });
+  };
+
+  private onTextBlur = () => {
+    this.setState({ textFocused: false });
+  };
+
+  render(props: Props, state: State) {
     const { children, ...otherProps } = props;
 
     const { value, min, max, step } = props;
+    const textValue = state.textFocused ? this.inputEl!.value : value;
 
     return (
       <label class={style.range}>
@@ -41,13 +53,16 @@ export default class Range extends Component<Props, State> {
           />
         </div>
         <input
+          ref={linkRef(this, 'inputEl')}
           type="number"
           class={style.textInput}
-          value={value}
+          value={textValue}
           min={min}
           max={max}
           step={step}
           onInput={this.onTextInput}
+          onFocus={this.onTextFocus}
+          onBlur={this.onTextBlur}
         />
       </label>
     );

src/client/lazy-app/Compress/Options/Range/style.css

@@ -35,7 +35,7 @@
   text-decoration-style: dotted;
   text-decoration-color: var(--main-theme-color);
   text-underline-position: under;
-  width: 48px;
+  width: 54px;
   position: relative;
   left: 5px;
 

src/client/lazy-app/Compress/Options/Toggle/style.css

@@ -11,6 +11,10 @@
   padding: 3px calc(var(--thumb-size) / 2 + 3px);
 }
 
+.checkbox:focus-within .track {
+  outline: white solid 2px;
+}
+
 .thumb {
   position: relative;
   width: var(--thumb-size);

src/client/lazy-app/Compress/Options/index.tsx

@@ -17,7 +17,7 @@ import Toggle from './Toggle';
 import Select from './Select';
 import { Options as QuantOptionsComponent } from 'features/processors/quantize/client';
 import { Options as ResizeOptionsComponent } from 'features/processors/resize/client';
-import { CLIIcon, SwapIcon } from 'client/lazy-app/icons';
+import { ImportIcon, SaveIcon, SwapIcon } from 'client/lazy-app/icons';
 
 interface Props {
   index: 0 | 1;
@@ -29,39 +29,43 @@ interface Props {
   onEncoderOptionsChange(index: 0 | 1, newOptions: EncoderOptions): void;
   onProcessorOptionsChange(index: 0 | 1, newOptions: ProcessorState): void;
   onCopyToOtherSideClick(index: 0 | 1): void;
-  onCopyCliClick(index: 0 | 1): void;
+  onSaveSideSettingsClick(index: 0 | 1): void;
+  onImportSideSettingsClick(index: 0 | 1): void;
 }
 
 interface State {
   supportedEncoderMap?: PartialButNotUndefined<typeof encoderMap>;
+  leftSideSettings?: string | null;
+  rightSideSettings?: string | null;
 }
 
 type PartialButNotUndefined<T> = {
   [P in keyof T]: T[P];
 };
 
-const supportedEncoderMapP: Promise<PartialButNotUndefined<
-  typeof encoderMap
->> = (async () => {
-  const supportedEncoderMap: PartialButNotUndefined<typeof encoderMap> = {
-    ...encoderMap,
-  };
+const supportedEncoderMapP: Promise<PartialButNotUndefined<typeof encoderMap>> =
+  (async () => {
+    const supportedEncoderMap: PartialButNotUndefined<typeof encoderMap> = {
+      ...encoderMap,
+    };
 
-  // Filter out entries where the feature test fails
-  await Promise.all(
-    Object.entries(encoderMap).map(async ([encoderName, details]) => {
-      if ('featureTest' in details && !(await details.featureTest())) {
-        delete supportedEncoderMap[encoderName as keyof typeof encoderMap];
-      }
-    }),
-  );
+    // Filter out entries where the feature test fails
+    await Promise.all(
+      Object.entries(encoderMap).map(async ([encoderName, details]) => {
+        if ('featureTest' in details && !(await details.featureTest())) {
+          delete supportedEncoderMap[encoderName as keyof typeof encoderMap];
+        }
+      }),
+    );
 
-  return supportedEncoderMap;
-})();
+    return supportedEncoderMap;
+  })();
 
 export default class Options extends Component<Props, State> {
   state: State = {
     supportedEncoderMap: undefined,
+    leftSideSettings: localStorage.getItem('leftSideSettings'),
+    rightSideSettings: localStorage.getItem('rightSideSettings'),
   };
 
   constructor() {
@@ -71,6 +75,29 @@ export default class Options extends Component<Props, State> {
     );
   }
 
+  private setLeftSideSettings = () => {
+    this.setState({
+      leftSideSettings: localStorage.getItem('leftSideSettings'),
+    });
+  };
+
+  private setRightSideSettings = () => {
+    this.setState({
+      rightSideSettings: localStorage.getItem('rightSideSettings'),
+    });
+  };
+
+  componentDidMount(): void {
+    // Changing the state when side setting is stored in localstorage
+    window.addEventListener('leftSideSettings', this.setLeftSideSettings);
+    window.addEventListener('rightSideSettings', this.setRightSideSettings);
+  }
+
+  componentWillUnmount(): void {
+    window.removeEventListener('leftSideSettings', this.setLeftSideSettings);
+    window.removeEventListener('removeSideSettings', this.setRightSideSettings);
+  }
+
   private onEncoderTypeChange = (event: Event) => {
     const el = event.currentTarget as HTMLSelectElement;
 
@@ -108,14 +135,18 @@ export default class Options extends Component<Props, State> {
     this.props.onEncoderOptionsChange(this.props.index, newOptions);
   };
 
-  private onCopyCliClick = () => {
-    this.props.onCopyCliClick(this.props.index);
-  };
-
   private onCopyToOtherSideClick = () => {
     this.props.onCopyToOtherSideClick(this.props.index);
   };
 
+  private onSaveSideSettingClick = () => {
+    this.props.onSaveSideSettingsClick(this.props.index);
+  };
+
+  private onImportSideSettingsClick = () => {
+    this.props.onImportSideSettingsClick(this.props.index);
+  };
+
   render(
     { source, encoderState, processorState }: Props,
     { supportedEncoderMap }: State,
@@ -138,13 +169,6 @@ export default class Options extends Component<Props, State> {
               <h3 class={style.optionsTitle}>
                 <div class={style.titleAndButtons}>
                   Edit
-                  <button
-                    class={style.cliButton}
-                    title="Copy npx command"
-                    onClick={this.onCopyCliClick}
-                  >
-                    <CLIIcon />
-                  </button>
                   <button
                     class={style.copyOverButton}
                     title="Copy settings to other side"
@@ -152,6 +176,36 @@ export default class Options extends Component<Props, State> {
                   >
                     <SwapIcon />
                   </button>
+                  <button
+                    class={style.saveButton}
+                    title="Save side settings"
+                    onClick={this.onSaveSideSettingClick}
+                  >
+                    <SaveIcon />
+                  </button>
+                  <button
+                    class={
+                      style.importButton +
+                      ' ' +
+                      (!this.state.leftSideSettings && this.props.index === 0
+                        ? style.buttonOpacity
+                        : '') +
+                      ' ' +
+                      (!this.state.rightSideSettings && this.props.index === 1
+                        ? style.buttonOpacity
+                        : '')
+                    }
+                    title="Import saved side settings"
+                    onClick={this.onImportSideSettingsClick}
+                    disabled={
+                      // Disabled if this side's settings haven't been saved
+                      (!this.state.leftSideSettings &&
+                        this.props.index === 0) ||
+                      (!this.state.rightSideSettings && this.props.index === 1)
+                    }
+                  >
+                    <ImportIcon />
+                  </button>
                 </div>
               </h3>
               <label class={style.sectionEnabler}>
@@ -203,7 +257,9 @@ export default class Options extends Component<Props, State> {
               onChange={this.onEncoderTypeChange}
               large
             >
-              <option value="identity">Original Image</option>
+              <option value="identity">{`Original Image ${
+                this.props.source ? `(${this.props.source.file.name})` : ''
+              }`}</option>
               {Object.entries(supportedEncoderMap).map(([type, encoder]) => (
                 <option value={type}>{encoder.meta.label}</option>
               ))}

src/client/lazy-app/Compress/Options/style.css

@@ -1,6 +1,7 @@
 .options-scroller {
   --horizontal-padding: 15px;
   border-radius: var(--scroller-radius);
+  overflow: hidden;
 
   /* At smaller widths, the multi-panel handles the scrolling */
   @media (min-width: 600px) {
@@ -52,6 +53,16 @@
   composes: option-toggle;
   grid-template-columns: auto 1fr;
   gap: 1em;
+
+  border-top: 1px solid #fff4;
+
+  transition-property: background-color;
+  transition-duration: 250ms;
+}
+
+.option-reveal:focus-within,
+.option-reveal:hover {
+  background-color: #fff2;
 }
 
 .option-one-cell {
@@ -72,11 +83,11 @@
 }
 
 .text-field {
-  background: var(--white);
-  color: var(--black);
+  background-color: var(--black);
+  color: var(--white);
   font: inherit;
   border: none;
-  padding: 6px 0 6px 10px;
+  padding: 6px 6px 6px 10px;
   width: 100%;
   box-sizing: border-box;
   border-radius: 4px;
@@ -111,7 +122,37 @@
 .copy-over-button {
   composes: title-button;
 
+  /* Make the filled arrow point towards the other options element */
+  transform: rotate(var(--rotate-copyoverbutton-angle));
+
   svg {
     fill: var(--header-text-color);
   }
+
+  &:focus {
+    outline: var(--header-text-color) solid 2px;
+    outline-offset: 0.25em;
+  }
+}
+
+.save-button,
+.import-button {
+  composes: title-button;
+
+  svg {
+    stroke: var(--header-text-color);
+  }
+
+  &:focus {
+    outline: var(--header-text-color) solid 2px;
+    outline-offset: 0.25em;
+  }
+}
+
+.button-opacity {
+  pointer-events: none;
+  cursor: not-allowed;
+  svg {
+    opacity: 0.5;
+  }
 }