add missing chai dep

.babelrc

@@ -0,0 +1,13 @@
+{
+  "plugins": [
+    "transform-class-properties",
+    "transform-react-constant-elements",
+    "transform-react-remove-prop-types",
+    [
+      "transform-react-jsx",
+      {
+        "pragma": "h"
+      }
+    ]
+  ]
+}

.firebaserc

@@ -0,0 +1,5 @@
+{
+  "projects": {
+    "default": "squoosh-beta"
+  }
+}

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,36 +0,0 @@
----
-name: Bug report
-about: Something is not working as expected
-labels: 
-
----
-
-**Before you start**
-Please take a look at the [FAQ](https://github.com/GoogleChromeLabs/squoosh/wiki/FAQ) as well as the already opened issues! If nothing fits your problem, go ahead and fill out the following template:
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Version:**
- - OS w/ version: [e.g. iOS 12]
- - Browser w/ version [e.g. Chrome 70]
- - Node version: [e.g. 10.11.0]
- - npm version: [e.g. 6.4.1]
-
-**Is your issue related to the quality of image compression?**
-Please attach original and output images (you can drag & drop to attach). 
-- Original image 
-- Output image from Squoosh
-
-**Additional context, screenshots, screencasts**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,18 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-labels: 
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Does other service/app have this feature?**
-Add any service you know/use that has this feature (We want to know for research)
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.gitignore

@@ -3,4 +3,3 @@ node_modules
 /*.log
 *.scss.d.ts
 *.css.d.ts
-*.o

.travis.yml

@@ -1,7 +0,0 @@
-language: node_js
-node_js:
-- node
-- 10
-- 8
-cache: npm
-script: npm run build

Dockerfile

@@ -0,0 +1,20 @@
+FROM selenium/node-chrome:latest
+
+USER root
+
+RUN apt-get update -qqy \
+  && apt-get -qqy install python git build-essential \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
+  && rm /bin/sh && ln -s /bin/bash /bin/sh \
+  && chown seluser /usr/local
+
+ENV NVM_DIR /usr/local/nvm
+RUN wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash \
+  && source $NVM_DIR/nvm.sh \
+  && nvm install v8
+
+ENV CHROME_BIN /opt/google/chrome/chrome
+ENV INSIDE_DOCKER=1
+
+WORKDIR /usr/src
+ENTRYPOINT source $NVM_DIR/nvm.sh && npm i && npm test

README.md

@@ -1,31 +1,5 @@
-# [Squoosh]!
+# Squoosh!
 
-[Squoosh] is an image compression web app that allows you to dive into the advanced options provided
+Squoosh will be an image compression web app that allows you to dive into the
-by various image compressors.
+advanced options provided by various image compressors.
 
-# Privacy
-
-Google Analytics is used to record the following:
-
-* [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.
-
-Image compression is handled locally; no additional data is sent to the server.
-
-# Building locally
-
-Clone the repo, and:
-
-```sh
-npm install
-npm run build
-```
-
-You can run the development server with:
-
-```sh
-npm start
-```
-
-[Squoosh]: https://squoosh.app

_headers.ejs

@@ -1,18 +0,0 @@
-# Long-term cache by default.
-/*
-  Cache-Control: max-age=31536000
-
-# And here are the exceptions:
-/
-  Cache-Control: no-cache
-
-/serviceworker.js
-  Cache-Control: no-cache
-
-/manifest.json
-  Cache-Control: must-revalidate, max-age=3600
-
-# URLs in /assets do not include a hash and are mutable.
-# But it isn't a big deal if the user gets an old version.
-/assets/*
-  Cache-Control: must-revalidate, max-age=3600

codecs/README.md

@@ -11,6 +11,6 @@ $ npm install
 $ npm run build
 ```
 
-This will build two files: `<codec name>_<enc or dec>.js` and `<codec name>_<enc or dec>.wasm`. It will most likely be necessary to set [`Module["locateFile"]`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html#affecting-execution) to successfully load the `.wasm` file. When the `.js` file is loaded, a global `<codec name>_<enc or dec>` is created with the same API as an [Emscripten `Module`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html).
+This will build two files: `<codec name>_<enc or dec>.js` and `<codec name>_<enc or dec>.wasm`. It will most likely be necessary to set [`Module["locateFile"]`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html#affecting-execution) to sucessfully load the `.wasm` file. When the `.js` file is loaded, a global `<codec name>_<enc or dec>` is created with the same API as an [Emscripten `Module`](https://kripken.github.io/emscripten-site/docs/api_reference/module.html).
 
 Each codec will document its API in its README.

codecs/imagequant/README.md

@@ -1,30 +0,0 @@
-# ImageQuant
-
-- Source: <https://github.com/ImageOptim/libimagequant>
-- Version: v2.12.1
-
-## Dependencies
-
-- Docker
-
-## Example
-
-See `example.html`
-
-## API
-
-### `int version()`
-
-Returns the version of libimagequant as a number. va.b.c is encoded as 0x0a0b0c
-
-### `RawImage quantize(std::string buffer, int image_width, int image_height, int numColors, float dithering)`
-
-Quantizes the given images, using at most `numColors`, a value between 2 and 256. `dithering` is a value between 0 and 1 controlling the amount of dithering. `RawImage` is a class with 3 fields: `buffer`, `width`, and `height`.
-
-### `RawImage zx_quantize(std::string buffer, int image_width, int image_height, float dithering)`
-
-???
-
-### `void free_result()`
-
-Frees the result created by `quantize()`.

codecs/imagequant/build.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export OPTIMIZE="-Os"
-export LDFLAGS="${OPTIMIZE}"
-export CFLAGS="${OPTIMIZE}"
-export CPPFLAGS="${OPTIMIZE}"
-
-echo "============================================="
-echo "Compiling libimagequant"
-echo "============================================="
-(
-  emcc \
-    --bind \
-    ${OPTIMIZE} \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s MODULARIZE=1 \
-    -s 'EXPORT_NAME="imagequant"' \
-    -I node_modules/libimagequant \
-    --std=c99 \
-    -c \
-    node_modules/libimagequant/{libimagequant,pam,mediancut,blur,mempool,kmeans,nearest}.c
-)
-echo "============================================="
-echo "Compiling wasm module"
-echo "============================================="
-(
-  emcc \
-    --bind \
-    ${OPTIMIZE} \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s MODULARIZE=1 \
-    -s 'EXPORT_NAME="imagequant"' \
-    -I node_modules/libimagequant \
-    -o ./imagequant.js \
-    --std=c++11 *.o \
-    -x c++ \
-    imagequant.cpp
-)
-echo "============================================="
-echo "Compiling wasm module done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull trzeci/emscripten\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/imagequant/example.html

@@ -1,41 +0,0 @@
-<!doctype html>
-<style>
-  canvas {
-    image-rendering: pixelated;
-  }
-</style>
-<script src='imagequant.js'></script>
-<script>
-  const Module = imagequant();
-
-  async function loadImage(src) {
-    // Load image
-    const img = document.createElement('img');
-    img.src = src;
-    await new Promise(resolve => img.onload = resolve);
-    // Make canvas same size as image
-    const canvas = document.createElement('canvas');
-    [canvas.width, canvas.height] = [img.width, img.height];
-    // Draw image onto canvas
-    const ctx = canvas.getContext('2d');
-    ctx.drawImage(img, 0, 0);
-    return ctx.getImageData(0, 0, img.width, img.height);
-  }
-
-  Module.onRuntimeInitialized = async _ => {
-    console.log('Version:', Module.version().toString(16));
-    const image = await loadImage('../example.png');
-    // const rawImage = Module.quantize(image.data, image.width, image.height, 256, 1.0);
-    const rawImage = Module.zx_quantize(image.data, image.width, image.height, 1.0);
-    console.log('done');
-    Module.free_result();
-
-    const imageData = new ImageData(new Uint8ClampedArray(rawImage.buffer), rawImage.width, rawImage.height);
-    const canvas = document.createElement('canvas');
-    canvas.width = image.width;
-    canvas.height = image.height;
-    const ctx = canvas.getContext('2d');
-    ctx.putImageData(imageData, 0, 0);
-    document.body.appendChild(canvas);
-  };
-</script>

codecs/imagequant/imagequant.cpp

@@ -1,245 +0,0 @@
-#include "emscripten/bind.h"
-#include "emscripten/val.h"
-#include <stdlib.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-
-#include "libimagequant.h"
-
-using namespace emscripten;
-
-int version() {
-  return (((LIQ_VERSION/10000) % 100) << 16) |
-         (((LIQ_VERSION/100  ) % 100) << 8) |
-         (((LIQ_VERSION/1    ) % 100) << 0);
-}
-
-class RawImage {
-public:
-  val buffer;
-  int width;
-  int height;
-
-  RawImage(val b, int w, int h)
-    : buffer(b), width(w), height(h) {}
-};
-
-
-liq_attr *attr;
-liq_image *image;
-liq_result *res;
-uint8_t* result;
-RawImage quantize(std::string rawimage, int image_width, int image_height, int num_colors, float dithering) {
-  const uint8_t* image_buffer = (uint8_t*)rawimage.c_str();
-  int size = image_width * image_height;
-  attr = liq_attr_create();
-  image = liq_image_create_rgba(attr, image_buffer, image_width, image_height, 0);
-  liq_set_max_colors(attr, num_colors);
-  liq_image_quantize(image, attr, &res);
-  liq_set_dithering_level(res, dithering);
-  uint8_t* image8bit = (uint8_t*) malloc(size);
-  result = (uint8_t*) malloc(size * 4);
-  liq_write_remapped_image(res, image, image8bit, size);
-  const liq_palette *pal = liq_get_palette(res);
-  // Turn palletted image back into an RGBA image
-  for(int i = 0; i < size; i++) {
-    result[i * 4 + 0] = pal->entries[image8bit[i]].r;
-    result[i * 4 + 1] = pal->entries[image8bit[i]].g;
-    result[i * 4 + 2] = pal->entries[image8bit[i]].b;
-    result[i * 4 + 3] = pal->entries[image8bit[i]].a;
-  }
-  free(image8bit);
-  liq_result_destroy(res);
-  liq_image_destroy(image);
-  liq_attr_destroy(attr);
-  return {
-    val(typed_memory_view(image_width*image_height*4, result)),
-    image_width,
-    image_height
-  };
-}
-
-const liq_color zx_colors[] = {
-  {.a = 255, .r = 0, .g = 0, .b = 0},       // regular black
-  {.a = 255, .r = 0, .g = 0, .b = 215},     // regular blue
-  {.a = 255, .r = 215, .g = 0, .b = 0},     // regular red
-  {.a = 255, .r = 215, .g = 0, .b = 215},   // regular magenta
-  {.a = 255, .r = 0, .g = 215, .b = 0},     // regular green
-  {.a = 255, .r = 0, .g = 215, .b = 215},   // regular cyan
-  {.a = 255, .r = 215, .g = 215, .b = 0},   // regular yellow
-  {.a = 255, .r = 215, .g = 215, .b = 215}, // regular white
-  {.a = 255, .r = 0, .g = 0, .b = 255},     // bright blue
-  {.a = 255, .r = 255, .g = 0, .b = 0},     // bright red
-  {.a = 255, .r = 255, .g = 0, .b = 255},   // bright magenta
-  {.a = 255, .r = 0, .g = 255, .b = 0},     // bright green
-  {.a = 255, .r = 0, .g = 255, .b = 255},   // bright cyan
-  {.a = 255, .r = 255, .g = 255, .b = 0},   // bright yellow
-  {.a = 255, .r = 255, .g = 255, .b = 255}  // bright white
-};
-
-uint8_t block[8 * 8 * 4];
-
-/**
- * The ZX has one bit per pixel, but can assign two colours to an 8x8 block. The two colours must
- * both be 'regular' or 'bright'. Black exists as both regular and bright.
- */
-RawImage zx_quantize(std::string rawimage, int image_width, int image_height, float dithering) {
-  const uint8_t* image_buffer = (uint8_t*) rawimage.c_str();
-  int size = image_width * image_height;
-  int bytes_per_pixel = 4;
-  result = (uint8_t*) malloc(size * bytes_per_pixel);
-  uint8_t* image8bit = (uint8_t*) malloc(8 * 8);
-
-  // For each 8x8 grid
-  for (int block_start_y = 0; block_start_y < image_height; block_start_y += 8) {
-    for (int block_start_x = 0; block_start_x < image_width; block_start_x += 8) {
-      int color_popularity[15] = {0};
-      int block_index = 0;
-      int block_width = 8;
-      int block_height = 8;
-
-      // If the block hangs off the right/bottom of the image dimensions, make it smaller to fit.
-      if (block_start_y + block_height > image_height) {
-        block_height = image_height - block_start_y;
-      }
-
-      if (block_start_x + block_width > image_width) {
-        block_width = image_width - block_start_x;
-      }
-
-      // For each pixel in that block:
-      for (int y = block_start_y; y < block_start_y + block_height; y++) {
-        for (int x = block_start_x; x < block_start_x + block_width; x++) {
-          int pixel_start = (y * image_width * bytes_per_pixel) + (x * bytes_per_pixel);
-          int smallest_distance = INT_MAX;
-          int winning_index = -1;
-
-          // Copy pixel data for quantizing later
-          block[block_index++] = image_buffer[pixel_start];
-          block[block_index++] = image_buffer[pixel_start + 1];
-          block[block_index++] = image_buffer[pixel_start + 2];
-          block[block_index++] = image_buffer[pixel_start + 3];
-
-          // Which zx color is this pixel closest to?
-          for (int color_index = 0; color_index < 15; color_index++) {
-            liq_color color = zx_colors[color_index];
-
-            // Using Euclidean distance. LibQuant has better methods, but it requires conversion to
-            // LAB, so I don't think it's worth it.
-            int distance =
-              pow(color.r - image_buffer[pixel_start + 0], 2) +
-              pow(color.g - image_buffer[pixel_start + 1], 2) +
-              pow(color.b - image_buffer[pixel_start + 2], 2);
-
-            if (distance < smallest_distance) {
-              winning_index = color_index;
-              smallest_distance = distance;
-            }
-          }
-          color_popularity[winning_index]++;
-        }
-      }
-
-      // Get the three most popular colours for the block.
-      int first_color_index = 0;
-      int second_color_index = 0;
-      int third_color_index = 0;
-      int highest_popularity = -1;
-      int second_highest_popularity = -1;
-      int third_highest_popularity = -1;
-
-      for (int color_index = 0; color_index < 15; color_index++) {
-        if (color_popularity[color_index] > highest_popularity) {
-          // Store this as the most popular pixel, and demote the current values:
-          third_color_index = second_color_index;
-          third_highest_popularity = second_highest_popularity;
-          second_color_index = first_color_index;
-          second_highest_popularity = highest_popularity;
-          first_color_index = color_index;
-          highest_popularity = color_popularity[color_index];
-        } else if (color_popularity[color_index] > second_highest_popularity) {
-          third_color_index = second_color_index;
-          third_highest_popularity = second_highest_popularity;
-          second_color_index = color_index;
-          second_highest_popularity = color_popularity[color_index];
-        } else if (color_popularity[color_index] > third_highest_popularity) {
-          third_color_index = color_index;
-          third_highest_popularity = color_popularity[color_index];
-        }
-      }
-
-      // ZX images can't mix bright and regular colours, except black which appears in both.
-      // Resolve any conflict:
-      while (1) {
-        // If either colour is black, there's no conflict to resolve.
-        if (first_color_index != 0 && second_color_index != 0) {
-          if (first_color_index >= 8 && second_color_index < 8) {
-            // Make the second color bright
-            second_color_index = second_color_index + 7;
-          } else if (first_color_index < 8 && second_color_index >= 8) {
-            // Make the second color regular
-            second_color_index = second_color_index - 7;
-          }
-        }
-
-        // If, during conflict resolving, we now have two of the same colour (because we initially
-        // selected the bright & regular version of the same colour), retry again with the third
-        // most popular colour.
-        if (first_color_index == second_color_index) {
-          second_color_index = third_color_index;
-        } else break;
-      }
-
-      // Quantize
-      attr = liq_attr_create();
-      image = liq_image_create_rgba(attr, block, block_width, block_height, 0);
-      liq_set_max_colors(attr, 2);
-      liq_image_add_fixed_color(image, zx_colors[first_color_index]);
-      liq_image_add_fixed_color(image, zx_colors[second_color_index]);
-      liq_image_quantize(image, attr, &res);
-      liq_set_dithering_level(res, dithering);
-      liq_write_remapped_image(res, image, image8bit, size);
-      const liq_palette *pal = liq_get_palette(res);
-
-      // Turn palletted image back into an RGBA image, and write it into the full size result image.
-      for(int y = 0; y < block_height; y++) {
-        for(int x = 0; x < block_width; x++) {
-          int image8BitPos = y * block_width + x;
-          int resultStartPos = ((block_start_y + y) * bytes_per_pixel * image_width) + ((block_start_x + x) * bytes_per_pixel);
-          result[resultStartPos + 0] = pal->entries[image8bit[image8BitPos]].r;
-          result[resultStartPos + 1] = pal->entries[image8bit[image8BitPos]].g;
-          result[resultStartPos + 2] = pal->entries[image8bit[image8BitPos]].b;
-          result[resultStartPos + 3] = pal->entries[image8bit[image8BitPos]].a;
-        }
-      }
-
-      liq_result_destroy(res);
-      liq_image_destroy(image);
-      liq_attr_destroy(attr);
-    }
-  }
-
-  free(image8bit);
-  return {
-    val(typed_memory_view(image_width*image_height*4, result)),
-    image_width,
-    image_height
-  };
-}
-
-void free_result() {
-  free(result);
-}
-
-EMSCRIPTEN_BINDINGS(my_module) {
-  class_<RawImage>("RawImage")
-    .property("buffer", &RawImage::buffer)
-    .property("width", &RawImage::width)
-    .property("height", &RawImage::height);
-
-  function("quantize", &quantize);
-  function("zx_quantize", &zx_quantize);
-  function("version", &version);
-  function("free_result", &free_result);
-}

codecs/imagequant/imagequant.d.ts

@@ -1,15 +0,0 @@
-interface RawImage {
-  buffer: Uint8Array;
-  width: number;
-  height: number;
-}
-
-interface QuantizerModule extends EmscriptenWasm.Module {
-  quantize(data: BufferSource, width: number, height: number, numColors: number, dither: number): RawImage;
-  zx_quantize(data: BufferSource, width: number, height: number, dither: number): RawImage;
-  free_result(): void;
-}
-
-export default function(opts: EmscriptenWasm.ModuleOpts): QuantizerModule;
-
-

codecs/imagequant/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "imagequant",
-  "scripts": {
-    "install": "napa",
-    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
-  },
-  "napa": {
-    "libimagequant": "ImageOptim/libimagequant#2.12.1"
-  },
-  "devDependencies": {
-    "napa": "^3.0.0"
-  }
-}

codecs/mozjpeg_enc/README.md

@@ -6,6 +6,8 @@
 ## Dependencies
 
 - Docker
+- Automake
+- pkg-config
 
 ## Example
 
@@ -17,31 +19,26 @@ See `example.html`
 
 Returns the version of MozJPEG as a number. va.b.c is encoded as 0x0a0b0c
 
+### `uint8_t* create_buffer(int width, int height)`
+
+Allocates an RGBA buffer for an image with the given dimension.
+
+### `void destroy_buffer(uint8_t* p)`
+
+Frees a buffer created with `create_buffer`.
+
+### `void encode(uint8_t* image_buffer, int image_width, int image_height, int quality)`
+
+Encodes the given image with given dimension to JPEG. `quality` is a number between 0 and 100. The higher the number, the better the quality of the encoded image. The result is implicitly stored and can be accessed using the `get_result_*()` functions.
+
 ### `void free_result()`
 
 Frees the result created by `encode()`.
 
-### `Uint8Array encode(std::string image_in, int image_width, int image_height, MozJpegOptions opts)`
+### `int get_result_pointer()`
 
-Encodes the given image with given dimension to JPEG. Options looks like this:
+Returns the pointer to the start of the buffer holding the encoded data.
 
-```c++
+### `int get_result_size()`
-struct MozJpegOptions {
+
-  int quality;
+Returns the length of the buffer holding the encoded data.
-  bool baseline;
-  bool arithmetic;
-  bool progressive;
-  bool optimize_coding;
-  int smoothing;
-  int color_space;
-  int quant_table;
-  bool trellis_multipass;
-  bool trellis_opt_zero;
-  bool trellis_opt_table;
-  int trellis_loops;
-  bool auto_subsample;
-  int chroma_subsample;
-  bool separate_chroma_quality;
-  int chroma_quality;
-};
-```

codecs/mozjpeg_enc/build.sh

@@ -1,53 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export OPTIMIZE="-Os"
-export LDFLAGS="${OPTIMIZE}"
-export CFLAGS="${OPTIMIZE}"
-export CPPFLAGS="${OPTIMIZE}"
-
-apt-get update
-apt-get install -qqy autoconf libtool libpng-dev pkg-config
-
-echo "============================================="
-echo "Compiling mozjpeg"
-echo "============================================="
-(
-  cd node_modules/mozjpeg
-  autoreconf -fiv
-  emconfigure ./configure --without-simd
-  emmake make libjpeg.la
-)
-echo "============================================="
-echo "Compiling mozjpeg done"
-echo "============================================="
-
-echo "============================================="
-echo "Compiling wasm bindings"
-echo "============================================="
-(
-  emcc \
-    --bind \
-    ${OPTIMIZE} \
-    -s WASM=1 \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s MODULARIZE=1 \
-    -s 'EXPORT_NAME="mozjpeg_enc"' \
-    -I node_modules/mozjpeg \
-    -o ./mozjpeg_enc.js \
-    -Wno-deprecated-register \
-    -Wno-writable-strings \
-    node_modules/mozjpeg/rdswitch.c \
-    -x c++ -std=c++11 \
-    mozjpeg_enc.cpp \
-    node_modules/mozjpeg/.libs/libjpeg.a
-)
-echo "============================================="
-echo "Compiling wasm bindings done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull trzeci/emscripten\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/mozjpeg_enc/example.html

@@ -1,7 +1,7 @@
 <!doctype html>
 <script src='mozjpeg_enc.js'></script>
 <script>
-  const module = mozjpeg_enc();
+  const Module = mozjpeg_enc();
 
   async function loadImage(src) {
     // Load image
@@ -17,27 +17,27 @@
     return ctx.getImageData(0, 0, img.width, img.height);
   }
 
-  module.onRuntimeInitialized = async _ => {
+  Module.onRuntimeInitialized = async _ => {
-    console.log('Version:', module.version().toString(16));
+    const api = {
+      version: Module.cwrap('version', 'number', []),
+      create_buffer: Module.cwrap('create_buffer', 'number', ['number', 'number']),
+      destroy_buffer: Module.cwrap('destroy_buffer', '', ['number']),
+      encode: Module.cwrap('encode', '', ['number', 'number', 'number', 'number']),
+      free_result: Module.cwrap('free_result', '', ['number']),
+      get_result_pointer: Module.cwrap('get_result_pointer', 'number', []),
+      get_result_size: Module.cwrap('get_result_size', 'number', []),
+    };
+    console.log('Version:', api.version().toString(16));
     const image = await loadImage('../example.png');
-    const result = module.encode(image.data, image.width, image.height, {
+    const p = api.create_buffer(image.width, image.height);
-      quality: 75,
+    Module.HEAP8.set(image.data, p);
-      baseline: false,
+    api.encode(p, image.width, image.height, 2);
-      arithmetic: false,
+    const resultPointer = api.get_result_pointer();
-      progressive: true,
+    const resultSize = api.get_result_size();
-      optimize_coding: true,
+    const resultView = new Uint8Array(Module.HEAP8.buffer, resultPointer, resultSize);
-      smoothing: 0,
+    const result = new Uint8Array(resultView);
-      color_space: 3,
+    api.free_result(resultPointer);
-      quant_table: 3,
+    api.destroy_buffer(p);
-      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,
-    });
 
     const blob = new Blob([result], {type: 'image/jpeg'});
     const blobURL = URL.createObjectURL(blob);

codecs/mozjpeg_enc/mozjpeg_enc.c

@@ -1,40 +1,17 @@
-#include <emscripten/bind.h>
+#include "emscripten.h"
-#include <emscripten/val.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <setjmp.h>
 #include <string.h>
-#include "config.h"
 #include "jpeglib.h"
-#include "cdjpeg.h"
+#include "config.h"
 
-using namespace emscripten;
+// MozJPEG doesn’t expose a numeric version, so I have to do some fun C macro hackery to turn it into a string. More details here: https://gcc.gnu.org/onlinedocs/cpp/Stringizing.html
-
-// MozJPEG doesn’t expose a numeric version, so I have to do some fun C macro hackery to turn it
-// into a string. More details here: https://gcc.gnu.org/onlinedocs/cpp/Stringizing.html
 #define xstr(s) str(s)
 #define str(s) #s
 
-struct MozJpegOptions {
+EMSCRIPTEN_KEEPALIVE
-  int quality;
-  bool baseline;
-  bool arithmetic;
-  bool progressive;
-  bool optimize_coding;
-  int smoothing;
-  int color_space;
-  int quant_table;
-  bool trellis_multipass;
-  bool trellis_opt_zero;
-  bool trellis_opt_table;
-  int trellis_loops;
-  bool auto_subsample;
-  int chroma_subsample;
-  bool separate_chroma_quality;
-  int chroma_quality;
-};
-
 int version() {
   char buffer[] = xstr(MOZJPEG_VERSION);
   int version = 0;
@@ -51,11 +28,27 @@ int version() {
   return version;
 }
 
-uint8_t* last_result;
+EMSCRIPTEN_KEEPALIVE
-struct jpeg_compress_struct cinfo;
+uint8_t* create_buffer(int width, int height) {
+  return malloc(width * height * 4 * sizeof(uint8_t));
+}
 
-val encode(std::string image_in, int image_width, int image_height, MozJpegOptions opts) {
+EMSCRIPTEN_KEEPALIVE
-  uint8_t* image_buffer = (uint8_t*) image_in.c_str();
+void destroy_buffer(uint8_t* p) {
+  free(p);
+}
+
+int result[2];
+EMSCRIPTEN_KEEPALIVE
+void encode(uint8_t* image_buffer, int image_width, int image_height, int quality) {
+  // Manually convert RGBA data into RGB
+  for(int y = 0; y < image_height; y++) {
+    for(int x = 0; x < image_width; x++) {
+      image_buffer[(y*image_width + x)*3 + 0] = image_buffer[(y*image_width + x)*4 + 0];
+      image_buffer[(y*image_width + x)*3 + 1] = image_buffer[(y*image_width + x)*4 + 1];
+      image_buffer[(y*image_width + x)*3 + 2] = image_buffer[(y*image_width + x)*4 + 2];
+    }
+  }
 
   // The code below is basically the `write_JPEG_file` function from
   // https://github.com/mozilla/mozjpeg/blob/master/example.c
@@ -68,6 +61,7 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
    * compression/decompression processes, in existence at once.  We refer
    * to any one struct (and its associated working data) as a "JPEG object".
    */
+  struct jpeg_compress_struct cinfo;
   /* This struct represents a JPEG error handler.  It is declared separately
    * because applications often want to supply a specialized error handler
    * (see the second half of this file for an example).  But here we just
@@ -115,57 +109,18 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
    */
   cinfo.image_width = image_width;      /* image width and height, in pixels */
   cinfo.image_height = image_height;
-  cinfo.input_components = 4;           /* # of color components per pixel */
+  cinfo.input_components = 3;           /* # of color components per pixel */
-  cinfo.in_color_space = JCS_EXT_RGBA;  /* colorspace of input image */
+  cinfo.in_color_space = JCS_RGB;       /* colorspace of input image */
   /* Now use the library's routine to set default compression parameters.
    * (You must set at least cinfo.in_color_space before calling this,
    * since the defaults depend on the source color space.)
    */
   jpeg_set_defaults(&cinfo);
+  /* Now you can set any non-default parameters you wish to.
+   * Here we just illustrate the use of quality (quantization table) scaling:
+   */
+  jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
 
-  jpeg_set_colorspace(&cinfo, (J_COLOR_SPACE) opts.color_space);
-
-  if (opts.quant_table != -1) {
-    jpeg_c_set_int_param(&cinfo, JINT_BASE_QUANT_TBL_IDX, opts.quant_table);
-  }
-
-  cinfo.optimize_coding = opts.optimize_coding;
-
-  if (opts.arithmetic) {
-    cinfo.arith_code = TRUE;
-    cinfo.optimize_coding = FALSE;
-  }
-
-  cinfo.smoothing_factor = opts.smoothing;
-
-  jpeg_c_set_bool_param(&cinfo, JBOOLEAN_USE_SCANS_IN_TRELLIS, opts.trellis_multipass);
-  jpeg_c_set_bool_param(&cinfo, JBOOLEAN_TRELLIS_EOB_OPT, opts.trellis_opt_zero);
-  jpeg_c_set_bool_param(&cinfo, JBOOLEAN_TRELLIS_Q_OPT, opts.trellis_opt_table);
-  jpeg_c_set_int_param(&cinfo, JINT_TRELLIS_NUM_LOOPS, opts.trellis_loops);
-
-  // A little hacky to build a string for this, but it means we can use set_quality_ratings which
-  // does some useful heuristic stuff.
-  std::string quality_str = std::to_string(opts.quality);
-
-  if (opts.separate_chroma_quality && opts.color_space == JCS_YCbCr) {
-    quality_str += "," + std::to_string(opts.chroma_quality);
-  }
-
-  char const *pqual = quality_str.c_str();
-
-  set_quality_ratings(&cinfo, (char*) pqual, opts.baseline);
-
-  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.baseline && opts.progressive) {
-    jpeg_simple_progression(&cinfo);
-  } else {
-    cinfo.num_scans = 0;
-    cinfo.scan_info = NULL;
-  }
   /* Step 4: Start compressor */
 
   /* TRUE ensures that we will write a complete interchange-JPEG file.
@@ -181,7 +136,7 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
    * To keep things simple, we pass one scanline per call; you can pass
    * more if you wish, though.
    */
-  row_stride = image_width * 4; /* JSAMPLEs per row in image_buffer */
+  row_stride = image_width * 3; /* JSAMPLEs per row in image_buffer */
 
   while (cinfo.next_scanline < cinfo.image_height) {
     /* jpeg_write_scanlines expects an array of pointers to scanlines.
@@ -197,38 +152,27 @@ val encode(std::string image_in, int image_width, int image_height, MozJpegOptio
   jpeg_finish_compress(&cinfo);
   /* Step 7: release JPEG compression object */
 
-  last_result = output;
+  result[0] = (int)output;
+  result[1] = size;
 
-  /* And we're done! */
-  return val(typed_memory_view(size, output));
-}
-
-void free_result() {
   /* This is an important step since it will release a good deal of memory. */
   jpeg_destroy_compress(&cinfo);
+
+  /* And we're done! */
 }
 
-EMSCRIPTEN_BINDINGS(my_module) {
+EMSCRIPTEN_KEEPALIVE
-  value_object<MozJpegOptions>("MozJpegOptions")
+void free_result() {
-    .field("quality", &MozJpegOptions::quality)
+  free(result[0]); // not sure if this is right with mozjpeg
-    .field("baseline", &MozJpegOptions::baseline)
-    .field("arithmetic", &MozJpegOptions::arithmetic)
-    .field("progressive", &MozJpegOptions::progressive)
-    .field("optimize_coding", &MozJpegOptions::optimize_coding)
-    .field("smoothing", &MozJpegOptions::smoothing)
-    .field("color_space", &MozJpegOptions::color_space)
-    .field("quant_table", &MozJpegOptions::quant_table)
-    .field("trellis_multipass", &MozJpegOptions::trellis_multipass)
-    .field("trellis_opt_zero", &MozJpegOptions::trellis_opt_zero)
-    .field("trellis_opt_table", &MozJpegOptions::trellis_opt_table)
-    .field("trellis_loops", &MozJpegOptions::trellis_loops)
-    .field("chroma_subsample", &MozJpegOptions::chroma_subsample)
-    .field("auto_subsample", &MozJpegOptions::auto_subsample)
-    .field("separate_chroma_quality", &MozJpegOptions::separate_chroma_quality)
-    .field("chroma_quality", &MozJpegOptions::chroma_quality)
-    ;
-
-  function("version", &version);
-  function("encode", &encode);
-  function("free_result", &free_result);
 }
+
+EMSCRIPTEN_KEEPALIVE
+int get_result_pointer() {
+  return result[0];
+}
+
+EMSCRIPTEN_KEEPALIVE
+int get_result_size() {
+  return result[1];
+}
+

codecs/mozjpeg_enc/mozjpeg_enc.d.ts

@@ -1,8 +1 @@
-import { EncodeOptions } from '../../src/codecs/mozjpeg/encoder-meta';
+export default function(opts: EmscriptenWasm.ModuleOpts): EmscriptenWasm.Module;
-
-interface MozJPEGModule extends EmscriptenWasm.Module {
-  encode(data: BufferSource, width: number, height: number, options: EncodeOptions): Uint8Array;
-  free_result(): void;
-}
-
-export default function(opts: EmscriptenWasm.ModuleOpts): MozJPEGModule;

codecs/mozjpeg_enc/package.json

@@ -2,7 +2,9 @@
   "name": "mozjpeg_enc",
   "scripts": {
     "install": "napa",
-    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
+    "build": "npm run build:library && npm run build:wasm",
+    "build:library": "cd node_modules/mozjpeg && autoreconf -fiv && docker run --rm -v $(pwd):/src trzeci/emscripten emconfigure ./configure --without-simd && docker run --rm -v $(pwd):/src trzeci/emscripten emmake make libjpeg.la",
+    "build:wasm": "docker run --rm -v $(pwd):/src trzeci/emscripten emcc -O3 -s WASM=1 -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]' -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME=\"mozjpeg_enc\"' -I node_modules/mozjpeg -o ./mozjpeg_enc.js mozjpeg_enc.c node_modules/mozjpeg/.libs/libjpeg.a"
   },
   "napa": {
     "mozjpeg": "mozilla/mozjpeg#v3.3.1"

codecs/optipng/.gitignore

@@ -1,2 +0,0 @@
-build/
-*.o

codecs/optipng/README.md

@@ -1,26 +0,0 @@
-# OptiPNG
-
-- Source: <https://sourceforge.net/project/optipng>
-- Version: v0.7.7
-
-## Dependencies
-
-- Docker
-
-## Example
-
-See `example.html`
-
-## API
-
-### `int version()`
-
-Returns the version of optipng as a number. va.b.c is encoded as 0x0a0b0c
-
-### `ArrayBuffer compress(std::string buffer, {level})`;
-
-`compress` will re-compress the given PNG image via `buffer`. `level` is a number between 0 and 7.
-
-### `void free_result()`
-
-Frees the result created by `compress()`.

codecs/optipng/build.sh

@@ -1,87 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export OPTIMIZE="-Os"
-export PREFIX="/src/build"
-export CFLAGS="${OPTIMIZE} -I${PREFIX}/include/"
-export CPPFLAGS="${OPTIMIZE} -I${PREFIX}/include/"
-export LDFLAGS="${OPTIMIZE} -L${PREFIX}/lib/"
-
-apt-get update
-apt-get install -qqy autoconf libtool
-
-echo "============================================="
-echo "Compiling zlib"
-echo "============================================="
-test -n "$SKIP_ZLIB" || (
-  cd node_modules/zlib
-  emconfigure ./configure --prefix=${PREFIX}/
-  emmake make
-  emmake make install
-)
-echo "============================================="
-echo "Compiling zlib done"
-echo "============================================="
-
-echo "============================================="
-echo "Compiling libpng"
-echo "============================================="
-test -n "$SKIP_LIBPNG" || (
-  cd node_modules/libpng
-  autoreconf -i
-  emconfigure ./configure --with-zlib-prefix=${PREFIX}/ --prefix=${PREFIX}/
-  emmake make
-  emmake make install
-)
-echo "============================================="
-echo "Compiling libpng done"
-echo "============================================="
-
-echo "============================================="
-echo "Compiling optipng"
-echo "============================================="
-(
-  emcc \
-    ${OPTIMIZE} \
-    -Wno-implicit-function-declaration \
-    -I ${PREFIX}/include \
-    -I node_modules/optipng/src/opngreduc \
-    -I node_modules/optipng/src/pngxtern \
-    -I node_modules/optipng/src/cexcept \
-    -I node_modules/optipng/src/gifread \
-    -I node_modules/optipng/src/pnmio \
-    -I node_modules/optipng/src/minitiff \
-    --std=c99 -c \
-    node_modules/optipng/src/opngreduc/*.c \
-    node_modules/optipng/src/pngxtern/*.c \
-    node_modules/optipng/src/gifread/*.c \
-    node_modules/optipng/src/minitiff/*.c \
-    node_modules/optipng/src/pnmio/*.c \
-    node_modules/optipng/src/optipng/*.c
-
-  emcc \
-    --bind \
-    ${OPTIMIZE} \
-    -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME="optipng"' \
-    -I ${PREFIX}/include \
-    -I node_modules/optipng/src/opngreduc \
-    -I node_modules/optipng/src/pngxtern \
-    -I node_modules/optipng/src/cexcept \
-    -I node_modules/optipng/src/gifread \
-    -I node_modules/optipng/src/pnmio \
-    -I node_modules/optipng/src/minitiff \
-    -o "optipng.js" \
-    --std=c++11 \
-    optipng.cpp \
-    *.o \
-    ${PREFIX}/lib/libz.so ${PREFIX}/lib/libpng.a
-)
-echo "============================================="
-echo "Compiling optipng done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull trzeci/emscripten\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/optipng/example.html

@@ -1,19 +0,0 @@
-<!doctype html>
-<script src='optipng.js'></script>
-<script>
-  const Module = optipng();
-
-  Module.onRuntimeInitialized = async _ => {
-    console.log('Version:', Module.version().toString(16));
-    const image = await fetch('../example_palette.png').then(r => r.arrayBuffer());
-    const newImage = Module.compress(image, {level: 3});
-    console.log('done');
-    Module.free_result();
-
-    console.log(`Old size: ${image.byteLength}, new size: ${newImage.byteLength} (${newImage.byteLength/image.byteLength*100}%)`);
-    const blobURL = URL.createObjectURL(new Blob([newImage], {type: 'image/png'}));
-    const img = document.createElement('img');
-    img.src = blobURL;
-    document.body.appendChild(img);
-  };
-</script>

codecs/optipng/optipng.cpp

@@ -1,53 +0,0 @@
-#include "emscripten/bind.h"
-#include "emscripten/val.h"
-
-#include <stdio.h>
-
-using namespace emscripten;
-
-extern "C" int main(int argc, char *argv[]);
-
-int version() {
-  // FIXME (@surma): Haven’t found a version in optipng :(
-  return 0;
-}
-
-struct OptiPngOpts {
-  int level;
-};
-
-uint8_t* result;
-val compress(std::string png, OptiPngOpts opts) {
-  remove("input.png");
-  remove("output.png");
-  FILE* infile = fopen("input.png", "wb");
-  fwrite(png.c_str(), png.length(), 1, infile);
-  fflush(infile);
-  fclose(infile);
-
-  char optlevel[8];
-  sprintf(&optlevel[0], "-o%d", opts.level);
-  char* args[] = {"optipng", optlevel, "-out", "output.png", "input.png"};
-  main(5, args);
-
-  FILE *outfile = fopen("output.png", "rb");
-  fseek(outfile, 0, SEEK_END);
-  int fsize = ftell(outfile);
-  result = (uint8_t*) malloc(fsize);
-  fseek(outfile, 0, SEEK_SET);
-  fread(result, fsize, 1, outfile);
-  return val(typed_memory_view(fsize, result));
-}
-
-void free_result() {
-  free(result);
-}
-
-EMSCRIPTEN_BINDINGS(my_module) {
-  value_object<OptiPngOpts>("OptiPngOpts")
-    .field("level", &OptiPngOpts::level);
-
-  function("version", &version);
-  function("compress", &compress);
-  function("free_result", &free_result);
-}

codecs/optipng/optipng.d.ts

@@ -1,10 +0,0 @@
-import {EncodeOptions} from "src/codecs/optipng/encoder";
-
-export interface OptiPngModule extends EmscriptenWasm.Module {
-  compress(data: BufferSource, opts: EncodeOptions): Uint8Array;
-  free_result(): void;
-}
-
-export default function(opts: EmscriptenWasm.ModuleOpts): OptiPngModule;
-
-

codecs/optipng/package.json

@@ -1,22 +0,0 @@
-{
-  "name": "optipng",
-  "scripts": {
-    "install": "tar-dependency install && napa",
-    "build": "npm run build:wasm",
-    "build:wasm": "docker run --rm -v $(pwd):/src -e SKIP_ZLIB=\"${SKIP_ZLIB}\" -e SKIP_LIBPNG=\"${SKIP_LIBPNG}\" trzeci/emscripten ./build.sh"
-  },
-  "tarDependencies": {
-    "node_modules/optipng": {
-      "url": "https://netcologne.dl.sourceforge.net/project/optipng/OptiPNG/optipng-0.7.7/optipng-0.7.7.tar.gz",
-      "strip": 1
-    }
-  },
-  "napa": {
-    "libpng": "emscripten-ports/libpng",
-    "zlib": "emscripten-ports/zlib"
-  },
-  "dependencies": {
-    "napa": "^3.0.0",
-    "tar-dependency": "0.0.3"
-  }
-}

codecs/webp_dec/README.md

@@ -13,10 +13,30 @@ See `example.html`
 
 Returns the version of libwebp as a number. va.b.c is encoded as 0x0a0b0c
 
-### `RawImage decode(std::string buffer)`
+### `uint8_t* create_buffer(int size)`
 
-Decodes the given webp buffer into raw RGBA. `RawImage` is a class with 3 fields: `buffer`, `width`, and `height`.
+Allocates an buffer for the file data.
+
+### `void destroy_buffer(uint8_t* p)`
+
+Frees a buffer created with `create_buffer`.
+
+### `void decode(uint8_t* img_in, int size)`
+
+Decodes the given webp file into raw RGBA. The result is implicitly stored and can be accessed using the `get_result_*()` functions.
 
 ### `void free_result()`
 
 Frees the result created by `decode()`.
+
+### `int get_result_pointer()`
+
+Returns the pointer to the start of the buffer holding the encoded data. Length is width x height x 4 bytes.
+
+### `int get_result_width()`
+
+Returns the width of the image.
+
+### `int get_result_height()`
+
+Returns the height of the image.

codecs/webp_dec/build.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export OPTIMIZE="-Os"
-export LDFLAGS="${OPTIMIZE}"
-export CFLAGS="${OPTIMIZE}"
-export CPPFLAGS="${OPTIMIZE}"
-
-echo "============================================="
-echo "Compiling wasm bindings"
-echo "============================================="
-(
-  emcc \
-    ${OPTIMIZE} \
-    --bind \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s MODULARIZE=1 \
-    -s 'EXPORT_NAME="webp_dec"' \
-    --std=c++11 \
-    -I node_modules/libwebp \
-    -o ./webp_dec.js \
-    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
-    -x c++ \
-    webp_dec.cpp
-)
-echo "============================================="
-echo "Compiling wasm bindings done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull trzeci/emscripten\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/webp_dec/example.html

@@ -9,14 +9,35 @@
   }
 
   Module.onRuntimeInitialized = async _ => {
-    console.log('Version:', Module.version().toString(16));
+    const api = {
+      version: Module.cwrap('version', 'number', []),
+      create_buffer: Module.cwrap('create_buffer', 'number', ['number', 'number']),
+      destroy_buffer: Module.cwrap('destroy_buffer', '', ['number']),
+      decode: Module.cwrap('decode', '', ['number', 'number']),
+      free_result: Module.cwrap('free_result', '', ['number']),
+      get_result_pointer: Module.cwrap('get_result_pointer', 'number', []),
+      get_result_width: Module.cwrap('get_result_width', 'number', []),
+      get_result_height: Module.cwrap('get_result_height', 'number', []),
+    };
+    console.log('Version:', api.version().toString(16));
     const image = await loadFile('../example.webp');
-    const result = Module.decode(image);
+    const p = api.create_buffer(image.byteLength);
-    const imageData = new ImageData(new Uint8ClampedArray(result.buffer), result.width, result.height);
+    Module.HEAP8.set(new Uint8Array(image), p);
-    Module.free_result();
+    api.decode(p, image.byteLength);
+    const resultPointer = api.get_result_pointer();
+    if(resultPointer === 0) {
+      throw new Error("Could not decode image");
+    }
+    const resultWidth = api.get_result_width();
+    const resultHeight = api.get_result_height();
+    const resultView = new Uint8Array(Module.HEAP8.buffer, resultPointer, resultWidth * resultHeight * 4);
+    const result = new Uint8ClampedArray(resultView);
+    const imageData = new ImageData(result, resultWidth, resultHeight);
+    api.free_result(resultPointer);
+    api.destroy_buffer(p);
     const canvas = document.createElement('canvas');
-    canvas.width = result.width;
+    canvas.width = resultWidth;
-    canvas.height = result.height;
+    canvas.height = resultHeight;
     document.body.appendChild(canvas);
     const ctx = canvas.getContext('2d');
     ctx.putImageData(imageData, 0, 0);

codecs/webp_dec/package.json

@@ -2,7 +2,7 @@
   "name": "webp_dec",
   "scripts": {
     "install": "napa",
-    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
+    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten emcc -O3 -s WASM=1 -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]' -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME=\"webp_dec\"' -I node_modules/libwebp -o ./webp_dec.js webp_dec.c node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c"
   },
   "napa": {
     "libwebp": "webmproject/libwebp#v1.0.0"

codecs/webp_dec/webp_dec.c

@@ -0,0 +1,51 @@
+#include "emscripten.h"
+#include "src/webp/decode.h"
+#include "src/webp/demux.h"
+#include <stdlib.h>
+
+EMSCRIPTEN_KEEPALIVE
+int version() {
+  return WebPGetDecoderVersion();
+}
+
+EMSCRIPTEN_KEEPALIVE
+uint8_t* create_buffer(int size) {
+  return malloc(size);
+}
+
+EMSCRIPTEN_KEEPALIVE
+void destroy_buffer(uint8_t* p) {
+  free(p);
+}
+
+int result[3];
+EMSCRIPTEN_KEEPALIVE
+void decode(uint8_t* img_in, int size) {
+  int width, height;
+  uint8_t* img_out = WebPDecodeRGBA(img_in, size, &width, &height);
+  result[0] = (int)img_out;
+  result[1] = width;
+  result[2] = height;
+
+}
+
+EMSCRIPTEN_KEEPALIVE
+void free_result() {
+  WebPFree(result[0]);
+}
+
+EMSCRIPTEN_KEEPALIVE
+int get_result_pointer() {
+  return result[0];
+}
+
+EMSCRIPTEN_KEEPALIVE
+int get_result_width() {
+  return result[1];
+}
+
+EMSCRIPTEN_KEEPALIVE
+int get_result_height() {
+  return result[2];
+}
+

codecs/webp_dec/webp_dec.cpp

@@ -1,47 +0,0 @@
-#include "emscripten/bind.h"
-#include "emscripten/val.h"
-#include "src/webp/decode.h"
-#include "src/webp/demux.h"
-#include <string>
-
-using namespace emscripten;
-
-int version() {
-  return WebPGetDecoderVersion();
-}
-
-class RawImage {
-public:
-  val buffer;
-  int width;
-  int height;
-
-  RawImage(val b, int w, int h)
-    : buffer(b), width(w), height(h) {}
-};
-
-uint8_t* last_result;
-RawImage decode(std::string buffer) {
-  int width, height;
-  last_result = WebPDecodeRGBA((const uint8_t*)buffer.c_str(), buffer.size(), &width, &height);
-  return RawImage(
-    val(typed_memory_view(width*height*4, last_result)),
-    width,
-    height
-  );
-}
-
-void free_result() {
-  free(last_result);
-}
-
-EMSCRIPTEN_BINDINGS(my_module) {
-  class_<RawImage>("RawImage")
-    .property("buffer", &RawImage::buffer)
-    .property("width", &RawImage::width)
-    .property("height", &RawImage::height);
-
-  function("decode", &decode);
-  function("version", &version);
-  function("free_result", &free_result);
-}

codecs/webp_dec/webp_dec.d.ts

@@ -1,13 +0,0 @@
-interface RawImage {
-  buffer: Uint8Array;
-  width: number;
-  height: number;
-}
-
-interface WebPModule extends EmscriptenWasm.Module {
-  decode(data: BufferSource): RawImage;
-  free_result(): void;
-}
-
-export default function(opts: EmscriptenWasm.ModuleOpts): WebPModule;
-

codecs/webp_enc/README.md

@@ -17,10 +17,26 @@ See `example.html`
 
 Returns the version of libwebp as a number. va.b.c is encoded as 0x0a0b0c
 
-### `UInt8Array encode(uint8_t* image_buffer, int image_width, int image_height, WebPConfig config)`
+### `uint8_t* create_buffer(int width, int height)`
 
-Encodes the given image with given dimension to WebP.
+Allocates an RGBA buffer for an image with the given dimension.
+
+### `void destroy_buffer(uint8_t* p)`
+
+Frees a buffer created with `create_buffer`.
+
+### `void encode(uint8_t* image_buffer, int image_width, int image_height, float quality)`
+
+Encodes the given image with given dimension to WebP. `quality` is a number between 0 and 100. The higher the number, the better the quality of the encoded image. The result is implicitly stored and can be accessed using the `get_result_*()` functions.
 
 ### `void free_result()`
 
-Frees the last result created by `encode()`.
+Frees the result created by `encode()`.
+
+### `int get_result_pointer()`
+
+Returns the pointer to the start of the buffer holding the encoded data.
+
+### `int get_result_size()`
+
+Returns the length of the buffer holding the encoded data.

codecs/webp_enc/build.sh

@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export OPTIMIZE="-Os"
-export LDFLAGS="${OPTIMIZE}"
-export CFLAGS="${OPTIMIZE}"
-export CPPFLAGS="${OPTIMIZE}"
-
-echo "============================================="
-echo "Compiling wasm bindings"
-echo "============================================="
-(
-  emcc \
-    ${OPTIMIZE} \
-    --bind \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s MODULARIZE=1 \
-    -s 'EXPORT_NAME="webp_enc"' \
-    --std=c++11 \
-    -I node_modules/libwebp \
-    -o ./webp_enc.js \
-    node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c \
-    -x c++ \
-    webp_enc.cpp
-)
-echo "============================================="
-echo "Compiling wasm bindings done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull trzeci/emscripten\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

codecs/webp_enc/example.html

@@ -1,7 +1,7 @@
 <!doctype html>
 <script src='webp_enc.js'></script>
 <script>
-  const module = webp_enc();
+  const Module = webp_enc();
 
   async function loadImage(src) {
     // Load image
@@ -17,43 +17,29 @@
     return ctx.getImageData(0, 0, img.width, img.height);
   }
 
-  module.onRuntimeInitialized = async _ => {
+  Module.onRuntimeInitialized = async _ => {
-    console.log('Version:', module.version().toString(16));
+    const api = {
+      version: Module.cwrap('version', 'number', []),
+      create_buffer: Module.cwrap('create_buffer', 'number', ['number', 'number']),
+      destroy_buffer: Module.cwrap('destroy_buffer', '', ['number']),
+      encode: Module.cwrap('encode', '', ['number', 'number', 'number', 'number']),
+      free_result: Module.cwrap('free_result', '', ['number']),
+      get_result_pointer: Module.cwrap('get_result_pointer', 'number', []),
+      get_result_size: Module.cwrap('get_result_size', 'number', []),
+    };
+    console.log('Version:', api.version().toString(16));
     const image = await loadImage('../example.png');
-    const result = module.encode(image.data, image.width, image.height, {
+    const p = api.create_buffer(image.width, image.height);
-      quality: 75,
+    Module.HEAP8.set(image.data, p);
-      target_size: 0,
+    api.encode(p, image.width, image.height, 2);
-      target_PSNR: 0,
+    const resultPointer = api.get_result_pointer();
-      method: 4,
+    const resultSize = api.get_result_size();
-      sns_strength: 50,
+    const resultView = new Uint8Array(Module.HEAP8.buffer, resultPointer, resultSize);
-      filter_strength: 60,
+    const result = new Uint8Array(resultView);
-      filter_sharpness: 0,
+    api.free_result(resultPointer);
-      filter_type: 1,
+    api.destroy_buffer(p);
-      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,
-    });
-    console.log('size', result.length);
     const blob = new Blob([result], {type: 'image/webp'});
-
-    module.free_result();
-
     const blobURL = URL.createObjectURL(blob);
     const img = document.createElement('img');
     img.src = blobURL;

codecs/webp_enc/package.json

@@ -2,7 +2,7 @@
   "name": "webp_enc",
   "scripts": {
     "install": "napa",
-    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten ./build.sh"
+    "build": "docker run --rm -v $(pwd):/src trzeci/emscripten emcc -O3 -s WASM=1 -s EXTRA_EXPORTED_RUNTIME_METHODS='[\"cwrap\"]' -s ALLOW_MEMORY_GROWTH=1 -s MODULARIZE=1 -s 'EXPORT_NAME=\"webp_enc\"' -I node_modules/libwebp -o ./webp_enc.js webp_enc.c node_modules/libwebp/src/{dec,dsp,demux,enc,mux,utils}/*.c"
   },
   "napa": {
     "libwebp": "webmproject/libwebp#v1.0.0"

codecs/webp_enc/webp_enc.c

@@ -0,0 +1,44 @@
+#include "emscripten.h"
+#include "src/webp/encode.h"
+#include <stdlib.h>
+
+EMSCRIPTEN_KEEPALIVE
+int version() {
+  return WebPGetEncoderVersion();
+}
+
+EMSCRIPTEN_KEEPALIVE
+uint8_t* create_buffer(int width, int height) {
+  return malloc(width * height * 4 * sizeof(uint8_t));
+}
+
+EMSCRIPTEN_KEEPALIVE
+void destroy_buffer(uint8_t* p) {
+  free(p);
+}
+
+int result[2];
+EMSCRIPTEN_KEEPALIVE
+void encode(uint8_t* img_in, int width, int height, float quality) {
+  uint8_t* img_out;
+  size_t size;
+  size = WebPEncodeRGBA(img_in, width, height, width * 4, quality, &img_out);
+  result[0] = (int)img_out;
+  result[1] = size;
+}
+
+EMSCRIPTEN_KEEPALIVE
+void free_result() {
+  WebPFree(result[0]);
+}
+
+EMSCRIPTEN_KEEPALIVE
+int get_result_pointer() {
+  return result[0];
+}
+
+EMSCRIPTEN_KEEPALIVE
+int get_result_size() {
+  return result[1];
+}
+

codecs/webp_enc/webp_enc.cpp

@@ -1,95 +0,0 @@
-#include <emscripten/bind.h>
-#include <emscripten/val.h>
-#include "src/webp/encode.h"
-#include <stdlib.h>
-#include <string.h>
-#include <stdexcept>
-
-using namespace emscripten;
-
-int version() {
-  return WebPGetEncoderVersion();
-}
-
-uint8_t* last_result;
-
-val encode(std::string img, int width, int height, WebPConfig config) {
-  uint8_t* img_in = (uint8_t*) img.c_str();
-
-  // A lot of this is duplicated from Encode in picture_enc.c
-  WebPPicture pic;
-  WebPMemoryWriter wrt;
-  int ok;
-
-  if (!WebPPictureInit(&pic)) {
-    // shouldn't happen, except if system installation is broken
-    throw std::runtime_error("Unexpected error");
-  }
-
-  pic.use_argb = !!config.lossless;
-  pic.width = width;
-  pic.height = height;
-  pic.writer = WebPMemoryWrite;
-  pic.custom_ptr = &wrt;
-
-  WebPMemoryWriterInit(&wrt);
-
-  ok = WebPPictureImportRGBA(&pic, (uint8_t*) img_in, width * 4) && WebPEncode(&config, &pic);
-  WebPPictureFree(&pic);
-  if (!ok) {
-    WebPMemoryWriterClear(&wrt);
-    throw std::runtime_error("Encode failed");
-  }
-
-  last_result = wrt.mem;
-
-  return val(typed_memory_view(wrt.size, wrt.mem));
-}
-
-void free_result() {
-  WebPFree(last_result);
-}
-
-
-EMSCRIPTEN_BINDINGS(my_module) {
-  enum_<WebPImageHint>("WebPImageHint")
-    .value("WEBP_HINT_DEFAULT", WebPImageHint::WEBP_HINT_DEFAULT)
-    .value("WEBP_HINT_PICTURE", WebPImageHint::WEBP_HINT_PICTURE)
-    .value("WEBP_HINT_PHOTO", WebPImageHint::WEBP_HINT_PHOTO)
-    .value("WEBP_HINT_GRAPH", WebPImageHint::WEBP_HINT_GRAPH)
-    ;
-
-  value_object<WebPConfig>("WebPConfig")
-    .field("lossless", &WebPConfig::lossless)
-    .field("quality", &WebPConfig::quality)
-    .field("method", &WebPConfig::method)
-    .field("image_hint", &WebPConfig::image_hint)
-    .field("target_size", &WebPConfig::target_size)
-    .field("target_PSNR", &WebPConfig::target_PSNR)
-    .field("segments", &WebPConfig::segments)
-    .field("sns_strength", &WebPConfig::sns_strength)
-    .field("filter_strength", &WebPConfig::filter_strength)
-    .field("filter_sharpness", &WebPConfig::filter_sharpness)
-    .field("filter_type", &WebPConfig::filter_type)
-    .field("autofilter", &WebPConfig::autofilter)
-    .field("alpha_compression", &WebPConfig::alpha_compression)
-    .field("alpha_filtering", &WebPConfig::alpha_filtering)
-    .field("alpha_quality", &WebPConfig::alpha_quality)
-    .field("pass", &WebPConfig::pass)
-    .field("show_compressed", &WebPConfig::show_compressed)
-    .field("preprocessing", &WebPConfig::preprocessing)
-    .field("partitions", &WebPConfig::partitions)
-    .field("partition_limit", &WebPConfig::partition_limit)
-    .field("emulate_jpeg_size", &WebPConfig::emulate_jpeg_size)
-    .field("thread_level", &WebPConfig::thread_level)
-    .field("low_memory", &WebPConfig::low_memory)
-    .field("near_lossless", &WebPConfig::near_lossless)
-    .field("exact", &WebPConfig::exact)
-    .field("use_delta_palette", &WebPConfig::use_delta_palette)
-    .field("use_sharp_yuv", &WebPConfig::use_sharp_yuv)
-    ;
-
-  function("version", &version);
-  function("encode", &encode);
-  function("free_result", &free_result);
-}

codecs/webp_enc/webp_enc.d.ts

@@ -1,9 +0,0 @@
-import { EncodeOptions } from '../../src/codecs/webp/encoder-meta';
-
-interface WebPModule extends EmscriptenWasm.Module {
-  encode(data: BufferSource, width: number, height: number, options: EncodeOptions): Uint8Array;
-  free_result(): void;
-}
-
-
-export default function(opts: EmscriptenWasm.ModuleOpts): WebPModule;

config/add-css-types.js

@@ -1,74 +0,0 @@
-const DtsCreator = require('typed-css-modules');
-const chokidar = require('chokidar');
-const util = require('util');
-const sass = require('node-sass');
-
-const sassRender = util.promisify(sass.render);
-
-async function sassToCss(path) {
-  const result = await sassRender({ file: path });
-  return result.css;
-}
-
-/**
- * @typedef {Object} Opts
- * @property {boolean} watch Watch for changes
- */
-/**
- * Create typing files for CSS & SCSS.
- *
- * @param {string[]} rootPaths Paths to search within
- * @param {Opts} [opts={}] Options.
- */
-function addCssTypes(rootPaths, opts = {}) {
-  return new Promise((resolve) => {
-    const { watch = false } = opts;
-
-    const paths = [];
-    const preReadyPromises = [];
-    let ready = false;
-
-    for (const rootPath of rootPaths) {
-      // Look for scss & css in each path.
-      paths.push(rootPath + '/**/*.scss');
-      paths.push(rootPath + '/**/*.css');
-    }
-
-    // For simplicity, the watcher is used even if we're not watching.
-    // If we're not watching, we stop the watcher after the initial files are found.
-    const watcher = chokidar.watch(paths, {
-      // Avoid processing already-processed files.
-      ignored: '*.d.*',
-      // Without this, travis and netlify builds never complete. I'm not sure why, but it might be
-      // related to https://github.com/paulmillr/chokidar/pull/758
-      persistent: watch,
-    });
-
-    function change(path) {
-      const promise = (async function() {
-        const creator = new DtsCreator({ camelCase: true });
-        const result = path.endsWith('.scss') ?
-          await creator.create(path, await sassToCss(path)) :
-          await creator.create(path);
-
-        await result.writeFile();
-      })();
-
-      if (!ready) preReadyPromises.push(promise);
-    }
-
-    watcher.on('change', change);
-    watcher.on('add', change);
-
-    // 'ready' is when events have been fired for file discovery.
-    watcher.on('ready', () => {
-      ready = true;
-      // Wait for the current set of processing to finish.
-      Promise.all(preReadyPromises).then(resolve);
-      // And if we're not watching, close the watcher.
-      if (!watch) watcher.close();
-    });
-  })
-}
-
-module.exports = addCssTypes;

config/asset-template-plugin.js

@@ -1,47 +0,0 @@
-const path = require('path');
-const fs = require('fs');
-const ejs = require('ejs');
-const AssetsPlugin = require('assets-webpack-plugin');
-
-module.exports = class AssetTemplatePlugin extends AssetsPlugin {
-  constructor(options) {
-    options = options || {};
-    if (!options.template) throw Error('AssetTemplatePlugin: template option is required.');
-    super({
-      useCompilerPath: true,
-      filename: options.filename,
-      processOutput: files => this._processOutput(files)
-    });
-    this._template = path.resolve(process.cwd(), options.template);
-    const ignore = options.ignore || /(manifest\.json|\.DS_Store)$/;
-    this._ignore = typeof ignore === 'function' ? ({ test: ignore }) : ignore;
-  }
-
-  _processOutput(files) {
-    const mapping = {
-      all: [],
-      byType: {},
-      entries: {}
-    };
-    for (const entryName in files) {
-      // non-entry-point-derived assets are collected under an empty string key
-      // since that's a bit awkward, we'll call them "assets"
-      const name = entryName === '' ? 'assets' : entryName;
-      const listing = files[entryName];
-      const entry = mapping.entries[name] = {
-        all: [],
-        byType: {}
-      };
-      for (let type in listing) {
-        const list = [].concat(listing[type]).filter(file => !this._ignore.test(file));
-        if (!list.length) continue;
-        mapping.all = mapping.all.concat(list);
-        mapping.byType[type] = (mapping.byType[type] || []).concat(list);
-        entry.all = entry.all.concat(list);
-        entry.byType[type] = (entry.byType[type] || []).concat(list);
-      }
-    }
-    mapping.files = mapping.all;
-    return ejs.render(fs.readFileSync(this._template, 'utf8'), mapping);
-  }
-};

config/auto-sw-plugin.js

@@ -1,158 +0,0 @@
-const util = require('util');
-const minimatch = require('minimatch');
-const SingleEntryPlugin = require('webpack/lib/SingleEntryPlugin');
-const WebWorkerTemplatePlugin = require('webpack/lib/webworker/WebWorkerTemplatePlugin');
-const ParserHelpers = require('webpack/lib/ParserHelpers');
-
-const NAME = 'auto-sw-plugin';
-const JS_TYPES = ['auto', 'esm', 'dynamic'];
-
-/**
- * Automatically finds and bundles Service Workers by looking for navigator.serviceWorker.register(..).
- * An Array of webpack assets is injected into the Service Worker bundle as a `BUILD_ASSETS` global.
- * Hidden and `.map` files are excluded by default, and this can be customized using the include & exclude options.
- * @example
- *  // webpack config
- *  plugins: [
- *    new AutoSWPlugin({
- *      exclude: [
- *        '**\/.*',     // don't expose hidden files (default)
- *        '**\/*.map',  // don't precache sourcemaps (default)
- *        'index.html'  // don't cache the page itself
- *      ]
- *    })
- *  ]
- * @param {Object} [options={}]
- * @param {string[]} [options.exclude]  Minimatch pattern(s) of which assets to omit from BUILD_ASSETS.
- * @param {string[]} [options.include]  Minimatch pattern(s) of assets to allow in BUILD_ASSETS.
- */
-module.exports = class AutoSWPlugin {
-  constructor(options) {
-    this.options = Object.assign({
-      exclude: [
-        '**/*.map',
-        '**/.*'
-      ]
-    }, options || {});
-  }
-
-  apply(compiler) {
-    const serviceWorkers = [];
-
-    compiler.hooks.emit.tapPromise(NAME, compilation => this.emit(compiler, compilation, serviceWorkers));
-
-    compiler.hooks.normalModuleFactory.tap(NAME, (factory) => {
-      for (const type of JS_TYPES) {
-        factory.hooks.parser.for(`javascript/${type}`).tap(NAME, parser => {
-          let counter = 0;
-
-          const processRegisterCall = expr => {
-            const dep = parser.evaluateExpression(expr.arguments[0]);
-
-            if (!dep.isString()) {
-              parser.state.module.warnings.push({
-                message: 'navigator.serviceWorker.register() will only be bundled if passed a String literal.'
-              });
-              return false;
-            }
-
-            const filename = dep.string;
-            const outputFilename = this.options.filename || 'serviceworker.js'
-            const context = parser.state.current.context;
-            serviceWorkers.push({
-              outputFilename,
-              filename,
-              context
-            });
-
-            const id = `__webpack__serviceworker__${++counter}`;
-            ParserHelpers.toConstantDependency(parser, id)(expr.arguments[0]);
-            return ParserHelpers.addParsedVariableToModule(parser, id, '__webpack_public_path__ + ' + JSON.stringify(outputFilename));
-          };
-
-          parser.hooks.call.for('navigator.serviceWorker.register').tap(NAME, processRegisterCall);
-          parser.hooks.call.for('self.navigator.serviceWorker.register').tap(NAME, processRegisterCall);
-          parser.hooks.call.for('window.navigator.serviceWorker.register').tap(NAME, processRegisterCall);
-        });
-      }
-    });
-  }
-
-  createFilter(list) {
-    const filters = [].concat(list);
-    for (let i=0; i<filters.length; i++) {
-      if (typeof filters[i] === 'string') {
-        filters[i] = minimatch.filter(filters[i]);
-      }
-    }
-    return filters;
-  }
-
-  async emit(compiler, compilation, serviceWorkers) {
-    let assetMapping = Object.keys(compilation.assets);
-    if (this.options.include) {
-      const filters = this.createFilter(this.options.include);
-      assetMapping = assetMapping.filter(filename => {
-        for (const filter of filters) {
-          if (filter(filename)) return true;
-        }
-        return false;
-      });
-    }
-    if (this.options.exclude) {
-      const filters = this.createFilter(this.options.exclude);
-      assetMapping = assetMapping.filter(filename => {
-        for (const filter of filters) {
-          if (filter(filename)) return false;
-        }
-        return true;
-      });
-    }
-    await Promise.all(serviceWorkers.map(
-      (serviceWorker, index) => this.compileServiceWorker(compiler, compilation, serviceWorker, index, assetMapping)
-    ));
-  }
-
-  async compileServiceWorker(compiler, compilation, options, index, assetMapping) {
-    const entryFilename = options.filename;
-
-    const chunkFilename = compiler.options.output.chunkFilename.replace(/\.([a-z]+)$/i, '.serviceworker.$1');
-    const workerOptions = {
-      filename: options.outputFilename, // chunkFilename.replace(/\.?\[(?:chunkhash|contenthash|hash)(:\d+(?::\d+)?)?\]/g, ''),
-      chunkFilename: this.options.chunkFilename || chunkFilename,
-      globalObject: 'self'
-    };
-
-    const childCompiler = compilation.createChildCompiler(NAME, { filename: workerOptions.filename });
-    (new WebWorkerTemplatePlugin(workerOptions)).apply(childCompiler);
-
-    /* The duplication DefinePlugin ends up causing is problematic (it doesn't hoist injections), so we'll do it manually. */
-    // (new DefinePlugin({
-    //   BUILD_ASSETS: JSON.stringify(assetMapping)
-    // })).apply(childCompiler);
-    (new SingleEntryPlugin(options.context, entryFilename, workerOptions.filename)).apply(childCompiler);
-
-    const subCache = `subcache ${__dirname} ${entryFilename} ${index}`;
-    let childCompilation;
-    childCompiler.hooks.compilation.tap(NAME, c => {
-      childCompilation = c;
-      if (childCompilation.cache) {
-        if (!childCompilation.cache[subCache]) childCompilation.cache[subCache] = {};
-        childCompilation.cache = childCompilation.cache[subCache];
-      }
-    });
-
-    await (util.promisify(childCompiler.runAsChild.bind(childCompiler)))();
-
-    const versionVar = this.options.version ?
-      `var VERSION = ${JSON.stringify(this.options.version)};` : '';
-    const original = childCompilation.assets[workerOptions.filename].source();
-    const source = `${versionVar}var BUILD_ASSETS=${JSON.stringify(assetMapping)};${original}`;
-    childCompilation.assets[workerOptions.filename] = {
-      source: () => source,
-      size: () => Buffer.byteLength(source, 'utf8')
-    };
-
-    Object.assign(compilation.assets, childCompilation.assets);
-  }
-};

firebase.json

@@ -0,0 +1,54 @@
+{
+  "hosting": {
+    "public": "build",
+    "ignore": [
+      "firebase.json",
+      "**/.*",
+      "**/node_modules/**"
+    ],
+    "rewrites": [
+      {
+        "source": "**",
+        "destination": "/index.html"
+      }
+    ],
+    "headers": [
+      {
+        "source": "**/*.@(eot|otf|ttf|ttc|woff|font.css)",
+        "headers": [
+          {
+            "key": "Access-Control-Allow-Origin",
+            "value": "*"
+          }
+        ]
+      },
+      {
+        "source": "**/*.@(jpg|jpeg|gif|png|ico)",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "max-age=7200"
+          }
+        ]
+      },
+      {
+        "source": "**/*.@(js|css|json|manifest|map)",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "max-age=31536000"
+          }
+        ]
+      },
+      {
+        "source": "sw.js",
+        "headers": [
+          {
+            "key": "Cache-Control",
+            "value": "max-age=0"
+          }
+        ]
+      }
+    ]
+  }
+}

global.d.ts

@@ -1,23 +1,22 @@
 declare const __webpack_public_path__: string;
-declare const PRERENDER: boolean;
 
 declare interface NodeModule {
   hot: any;
 }
 
 declare interface Window {
-  STATE: any;
+  STATE: any
-  ga: typeof ga;
 }
 
 declare namespace JSX {
   interface Element { }
   interface IntrinsicElements { }
-  interface HTMLAttributes {
-    decoding?: string;
-  }
 }
 
+declare module 'preact-i18n';
+declare module 'preact-material-components-drawer';
+declare module 'material-radial-progress';
+
 declare module 'classnames' {
   export default function classnames(...args: any[]): string;
 }

package.json

@@ -1,13 +1,18 @@
 {
   "private": true,
   "name": "squoosh",
-  "version": "1.2.1",
+  "version": "0.0.0",
   "license": "apache-2.0",
   "scripts": {
-    "start": "webpack-dev-server --host 0.0.0.0 --hot",
+    "build:mozjpeg_enc": "cd codecs/mozjpeg_enc && npm run build",
+    "build:codecs": "npm run build:mozjpeg_enc",
+    "start": "webpack serve --host 0.0.0.0 --hot",
     "build": "webpack -p",
-    "lint": "tslint -c tslint.json  -p tsconfig.json -t verbose 'src/**/*.{ts,tsx,js,jsx}'",
+    "lint": "tslint -c tslint.json -t verbose 'src/**/*.{ts,js}'",
-    "lintfix": "tslint -c tslint.json -p tsconfig.json -t verbose --fix 'src/**/*.{ts,tsx,js,jsx}'"
+    "lintfix": "tslint -c tslint.json -t verbose --fix 'src/**/*.{ts,js}'",
+    "test": "npm run lint && npm run build && npm run test:e2e && npm run test:unit",
+    "test:e2e": "mocha -R spec test/e2e",
+    "test:unit": "karmatic"
   },
   "husky": {
     "hooks": {
@@ -15,55 +20,66 @@
     }
   },
   "devDependencies": {
-    "@types/node": "^10.12.6",
+    "@types/chai": "^4.1.3",
-    "@types/pretty-bytes": "^5.1.0",
+    "@types/karma": "^1.7.3",
+    "@types/mocha": "^5.2.0",
+    "@types/node": "^9.4.7",
     "@types/webassembly-js-api": "0.0.1",
-    "@webcomponents/custom-elements": "^1.2.1",
+    "babel-loader": "^7.1.4",
-    "@webpack-cli/serve": "^0.1.2",
+    "babel-plugin-jsx-pragmatic": "^1.0.2",
-    "assets-webpack-plugin": "^3.9.7",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "chokidar": "^2.0.4",
+    "babel-plugin-transform-class-properties": "^6.24.1",
-    "classnames": "^2.2.6",
+    "babel-plugin-transform-decorators-legacy": "^1.3.4",
-    "clean-webpack-plugin": "^1.0.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "comlink": "^3.0.3",
+    "babel-plugin-transform-react-constant-elements": "^6.23.0",
-    "copy-webpack-plugin": "^4.6.0",
+    "babel-plugin-transform-react-jsx": "^6.24.1",
-    "critters-webpack-plugin": "^2.0.1",
+    "babel-plugin-transform-react-remove-prop-types": "^0.4.13",
-    "css-loader": "^1.0.1",
+    "babel-preset-env": "^1.6.1",
-    "ejs": "^2.6.1",
+    "babel-register": "^6.26.0",
+    "chai": "^4.1.2",
+    "clean-webpack-plugin": "^0.1.19",
+    "copy-webpack-plugin": "^4.5.1",
+    "css-loader": "^0.28.11",
     "exports-loader": "^0.7.0",
-    "file-drop-element": "^0.0.9",
+    "express": "^4.16.3",
-    "file-loader": "^2.0.0",
+    "file-loader": "^1.1.11",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^3.0.6",
-    "husky": "^1.1.4",
+    "husky": "^1.0.0-rc.9",
-    "idb-keyval": "^3.1.0",
+    "if-env": "^1.0.4",
-    "linkstate": "^1.1.1",
+    "karmatic": "^1.1.7",
     "loader-utils": "^1.1.0",
-    "mini-css-extract-plugin": "^0.4.4",
+    "mini-css-extract-plugin": "^0.3.0",
-    "minimatch": "^3.0.4",
+    "mocha": "^5.2.0",
-    "node-sass": "^4.11.0",
+    "node-sass": "^4.7.2",
-    "optimize-css-assets-webpack-plugin": "^5.0.1",
+    "optimize-css-assets-webpack-plugin": "^4.0.0",
-    "pointer-tracker": "^2.0.3",
-    "preact": "^8.3.1",
-    "prerender-loader": "^1.2.0",
-    "pretty-bytes": "^5.1.0",
     "progress-bar-webpack-plugin": "^1.11.0",
+    "puppeteer": "^1.3.0",
     "raw-loader": "^0.5.1",
-    "sass-loader": "^7.1.0",
+    "sass-loader": "^6.0.7",
-    "script-ext-html-webpack-plugin": "^2.1.3",
+    "script-ext-html-webpack-plugin": "^2.0.1",
-    "source-map-loader": "^0.2.4",
+    "source-map-loader": "^0.2.3",
-    "style-loader": "^0.23.1",
+    "style-loader": "^0.20.3",
-    "terser-webpack-plugin": "^1.1.0",
+    "ts-loader": "^4.0.1",
-    "ts-loader": "^5.3.0",
+    "tslint": "^5.10.0",
-    "tslint": "^5.11.0",
+    "tslint-config-airbnb": "^5.9.2",
-    "tslint-config-airbnb": "^5.11.0",
     "tslint-config-semistandard": "^7.0.0",
-    "tslint-react": "^3.6.0",
+    "tslint-react": "^3.5.1",
-    "typed-css-modules": "^0.3.7",
+    "typescript": "^2.7.2",
-    "typescript": "^3.1.6",
+    "typings-for-css-modules-loader": "^1.7.0",
-    "url-loader": "^1.1.2",
+    "webpack": "^4.3.0",
-    "webpack": "^4.25.1",
+    "webpack-bundle-analyzer": "^2.11.1",
-    "webpack-bundle-analyzer": "^3.0.3",
+    "webpack-cli": "^2.0.13",
-    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.1",
-    "webpack-dev-server": "^3.1.10",
+    "webpack-plugin-replace": "^1.1.1"
-    "worker-plugin": "^1.1.1"
+  },
+  "dependencies": {
+    "classnames": "^2.2.5",
+    "comlink": "^3.0.3",
+    "comlink-loader": "^1.0.0",
+    "material-components-web": "^0.32.0",
+    "preact": "^8.2.7",
+    "preact-i18n": "^1.2.0",
+    "preact-material-components": "^1.3.7",
+    "preact-router": "^2.6.0"
   }
 }

src/codecs/browser-bmp/encoder-meta.ts

@@ -1,11 +0,0 @@
-import { canvasEncodeTest } from '../generic/util';
-
-export interface EncodeOptions { }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-bmp';
-export const label = 'Browser BMP';
-export const mimeType = 'image/bmp';
-export const extension = 'bmp';
-export const defaultOptions: EncodeOptions = {};
-export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-bmp/encoder.ts

@@ -1,6 +0,0 @@
-import { mimeType } from './encoder-meta';
-import { canvasEncode } from '../../lib/util';
-
-export function encode(data: ImageData) {
-  return canvasEncode(data, mimeType);
-}

src/codecs/browser-gif/encoder-meta.ts

@@ -1,11 +0,0 @@
-import { canvasEncodeTest } from '../generic/util';
-
-export interface EncodeOptions {}
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-gif';
-export const label = 'Browser GIF';
-export const mimeType = 'image/gif';
-export const extension = 'gif';
-export const defaultOptions: EncodeOptions = {};
-export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-gif/encoder.ts

@@ -1,6 +0,0 @@
-import { mimeType } from './encoder-meta';
-import { canvasEncode } from '../../lib/util';
-
-export function encode(data: ImageData) {
-  return canvasEncode(data, mimeType);
-}

src/codecs/browser-jp2/encoder-meta.ts

@@ -1,11 +0,0 @@
-import { canvasEncodeTest } from '../generic/util';
-
-export interface EncodeOptions { }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-jp2';
-export const label = 'Browser JPEG 2000';
-export const mimeType = 'image/jp2';
-export const extension = 'jp2';
-export const defaultOptions: EncodeOptions = {};
-export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-jp2/encoder.ts

@@ -1,6 +0,0 @@
-import { mimeType } from './encoder-meta';
-import { canvasEncode } from '../../lib/util';
-
-export function encode(data: ImageData) {
-  return canvasEncode(data, mimeType);
-}

src/codecs/browser-jpeg/encoder-meta.ts

@@ -1,8 +0,0 @@
-export interface EncodeOptions { quality: number; }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-jpeg';
-export const label = 'Browser JPEG';
-export const mimeType = 'image/jpeg';
-export const extension = 'jpg';
-export const defaultOptions: EncodeOptions = { quality: 0.75 };

src/codecs/browser-jpeg/encoder.ts

@@ -1,6 +0,0 @@
-import { EncodeOptions, mimeType } from './encoder-meta';
-import { canvasEncode } from '../../lib/util';
-
-export function encode(data: ImageData, { quality }: EncodeOptions) {
-  return canvasEncode(data, mimeType, quality);
-}

src/codecs/browser-jpeg/options.ts

@@ -1,3 +0,0 @@
-import qualityOption from '../generic/quality-option';
-
-export default qualityOption({ min: 0, max: 1, step: 0.01 });

src/codecs/browser-pdf/encoder-meta.ts

@@ -1,11 +0,0 @@
-import { canvasEncodeTest } from '../generic/util';
-
-export interface EncodeOptions { }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-pdf';
-export const label = 'Browser PDF';
-export const mimeType = 'application/pdf';
-export const extension = 'pdf';
-export const defaultOptions: EncodeOptions = {};
-export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-pdf/encoder.ts

@@ -1,6 +0,0 @@
-import { mimeType } from './encoder-meta';
-import { canvasEncode } from '../../lib/util';
-
-export function encode(data: ImageData) {
-  return canvasEncode(data, mimeType);
-}

src/codecs/browser-png/encoder-meta.ts

@@ -1,8 +0,0 @@
-export interface EncodeOptions {}
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-png';
-export const label = 'Browser PNG';
-export const mimeType = 'image/png';
-export const extension = 'png';
-export const defaultOptions: EncodeOptions = {};

src/codecs/browser-png/encoder.tsx

@@ -1,6 +0,0 @@
-import { mimeType } from './encoder-meta';
-import { canvasEncode } from '../../lib/util';
-
-export function encode(data: ImageData) {
-  return canvasEncode(data, mimeType);
-}

src/codecs/browser-tiff/encoder-meta.ts

@@ -1,11 +0,0 @@
-import { canvasEncodeTest } from '../generic/util';
-
-export interface EncodeOptions { }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-tiff';
-export const label = 'Browser TIFF';
-export const mimeType = 'image/tiff';
-export const extension = 'tiff';
-export const defaultOptions: EncodeOptions = {};
-export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-tiff/encoder.ts

@@ -1,6 +0,0 @@
-import { mimeType } from './encoder-meta';
-import { canvasEncode } from '../../lib/util';
-
-export function encode(data: ImageData) {
-  return canvasEncode(data, mimeType);
-}

src/codecs/browser-webp/encoder-meta.ts

@@ -1,11 +0,0 @@
-import { canvasEncodeTest } from '../generic/util';
-
-export interface EncodeOptions { quality: number; }
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'browser-webp';
-export const label = 'Browser WebP';
-export const mimeType = 'image/webp';
-export const extension = 'webp';
-export const defaultOptions: EncodeOptions = { quality: 0.75 };
-export const featureTest = () => canvasEncodeTest(mimeType);

src/codecs/browser-webp/encoder.ts

@@ -1,6 +0,0 @@
-import { EncodeOptions, mimeType } from './encoder-meta';
-import { canvasEncode } from '../../lib/util';
-
-export function encode(data: ImageData, { quality }: EncodeOptions) {
-  return canvasEncode(data, mimeType, quality);
-}

src/codecs/browser-webp/options.ts

@@ -1,3 +0,0 @@
-import qualityOption from '../generic/quality-option';
-
-export default qualityOption({ min: 0, max: 1, step: 0.01 });

src/codecs/decoders.ts

@@ -1,20 +0,0 @@
-import { nativeDecode, sniffMimeType, canDecodeImage } from '../lib/util';
-import Processor from './processor';
-import webpDataUrl from 'url-loader!./tiny.webp';
-
-const nativeWebPSupported = canDecodeImage(webpDataUrl);
-
-export async function decodeImage(blob: Blob, processor: Processor): Promise<ImageData> {
-  const mimeType = await sniffMimeType(blob);
-
-  try {
-    if (mimeType === 'image/webp' && !(await nativeWebPSupported)) {
-      return await processor.webpDecode(blob);
-    }
-
-    // Otherwise, just throw it at the browser's decoder.
-    return await nativeDecode(blob);
-  } catch (err) {
-    throw Error("Couldn't decode image");
-  }
-}

src/codecs/encoders.ts

@@ -1,78 +1,13 @@
-import * as identity from './identity/encoder-meta';
+import * as mozJPEG from './mozjpeg/encoder';
-import * as optiPNG from './optipng/encoder-meta';
+import * as identity from './identity/encoder';
-import * as mozJPEG from './mozjpeg/encoder-meta';
-import * as webP from './webp/encoder-meta';
-import * as browserPNG from './browser-png/encoder-meta';
-import * as browserJPEG from './browser-jpeg/encoder-meta';
-import * as browserWebP from './browser-webp/encoder-meta';
-import * as browserGIF from './browser-gif/encoder-meta';
-import * as browserTIFF from './browser-tiff/encoder-meta';
-import * as browserJP2 from './browser-jp2/encoder-meta';
-import * as browserBMP from './browser-bmp/encoder-meta';
-import * as browserPDF from './browser-pdf/encoder-meta';
-
-export interface EncoderSupportMap {
-  [key: string]: boolean;
-}
-
-export type EncoderState =
-  identity.EncoderState |
-  optiPNG.EncoderState |
-  mozJPEG.EncoderState |
-  webP.EncoderState |
-  browserPNG.EncoderState |
-  browserJPEG.EncoderState |
-  browserWebP.EncoderState |
-  browserGIF.EncoderState |
-  browserTIFF.EncoderState |
-  browserJP2.EncoderState |
-  browserBMP.EncoderState |
-  browserPDF.EncoderState;
-
-export type EncoderOptions =
-  identity.EncodeOptions |
-  optiPNG.EncodeOptions |
-  mozJPEG.EncodeOptions |
-  webP.EncodeOptions |
-  browserPNG.EncodeOptions |
-  browserJPEG.EncodeOptions |
-  browserWebP.EncodeOptions |
-  browserGIF.EncodeOptions |
-  browserTIFF.EncodeOptions |
-  browserJP2.EncodeOptions |
-  browserBMP.EncodeOptions |
-  browserPDF.EncodeOptions;
 
+export type EncoderState = identity.EncoderState | mozJPEG.EncoderState;
+export type EncoderOptions = identity.EncodeOptions | mozJPEG.EncodeOptions;
 export type EncoderType = keyof typeof encoderMap;
 
 export const encoderMap = {
   [identity.type]: identity,
-  [optiPNG.type]: optiPNG,
   [mozJPEG.type]: mozJPEG,
-  [webP.type]: webP,
-  [browserPNG.type]: browserPNG,
-  [browserJPEG.type]: browserJPEG,
-  [browserWebP.type]: browserWebP,
-  // Safari & Firefox only:
-  [browserBMP.type]: browserBMP,
-  // Safari only:
-  [browserGIF.type]: browserGIF,
-  [browserTIFF.type]: browserTIFF,
-  [browserJP2.type]: browserJP2,
-  [browserPDF.type]: browserPDF,
 };
 
 export const encoders = Array.from(Object.values(encoderMap));
-
-/** Does this browser support a given encoder? Indexed by label */
-export const encodersSupported = Promise.resolve().then(async () => {
-  const encodersSupported: EncoderSupportMap = {};
-
-  await Promise.all(encoders.map(async (encoder) => {
-    // If the encoder provides a featureTest, call it, otherwise assume supported.
-    const isSupported = !('featureTest' in encoder) || await encoder.featureTest();
-    encodersSupported[encoder.type] = isSupported;
-  }));
-
-  return encodersSupported;
-});

src/codecs/generic/quality-option.tsx

@@ -1,56 +0,0 @@
-import { h, Component } from 'preact';
-import { bind } from '../../lib/initial-util';
-import * as style from '../../components/Options/style.scss';
-import Range from '../../components/range';
-
-interface EncodeOptions {
-  quality: number;
-}
-
-type Props = {
-  options: EncodeOptions,
-  onChange(newOptions: EncodeOptions): void,
-};
-
-interface QualityOptionArg {
-  min?: number;
-  max?: number;
-  step?: number;
-}
-
-export default function qualityOption(opts: QualityOptionArg = {}) {
-  const {
-    min = 0,
-    max = 100,
-    step = 1,
-  } = opts;
-
-  class QualityOptions extends Component<Props, {}> {
-    @bind
-    onChange(event: Event) {
-      const el = event.currentTarget as HTMLInputElement;
-      this.props.onChange({ quality: Number(el.value) });
-    }
-
-    render({ options }: Props) {
-      return (
-        <div class={style.optionsSection}>
-          <div class={style.optionOneCell}>
-            <Range
-              name="quality"
-              min={min}
-              max={max}
-              step={step || 'any'}
-              value={options.quality}
-              onInput={this.onChange}
-            >
-              Quality:
-            </Range>
-          </div>
-        </div>
-      );
-    }
-  }
-
-  return QualityOptions;
-}

src/codecs/generic/util.ts

@@ -1,13 +0,0 @@
-import { canvasEncode } from '../../lib/util';
-
-export async function canvasEncodeTest(mimeType: string) {
-  try {
-    const blob = await canvasEncode(new ImageData(1, 1), mimeType);
-    // According to the spec, the blob should be null if the format isn't supported…
-    if (!blob) return false;
-    // …but Safari & Firefox fall back to PNG, so we need to check the mime type.
-    return blob.type === mimeType;
-  } catch (err) {
-    return false;
-  }
-}

src/codecs/imagequant/options.tsx

@@ -1,91 +0,0 @@
-import { h, Component } from 'preact';
-import { bind } from '../../lib/initial-util';
-import { inputFieldValueAsNumber, konami, preventDefault } from '../../lib/util';
-import { QuantizeOptions } from './processor-meta';
-import * as style from '../../components/Options/style.scss';
-import Expander from '../../components/expander';
-import Select from '../../components/select';
-import Range from '../../components/range';
-
-const konamiPromise = konami();
-
-interface Props {
-  options: QuantizeOptions;
-  onChange(newOptions: QuantizeOptions): void;
-}
-
-interface State {
-  extendedSettings: boolean;
-}
-
-export default class QuantizerOptions extends Component<Props, State> {
-  state: State = { extendedSettings: false };
-
-  componentDidMount() {
-    konamiPromise.then(() => {
-      this.setState({ extendedSettings: true });
-    });
-  }
-
-  @bind
-  onChange(event: Event) {
-    const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
-    const { options } = this.props;
-
-    const newOptions: QuantizeOptions = {
-      zx: inputFieldValueAsNumber(form.zx, options.zx),
-      maxNumColors: inputFieldValueAsNumber(form.maxNumColors, options.maxNumColors),
-      dither: inputFieldValueAsNumber(form.dither),
-    };
-    this.props.onChange(newOptions);
-  }
-
-  render({ options }: Props, { extendedSettings }: State) {
-    return (
-      <form class={style.optionsSection} onSubmit={preventDefault}>
-        <Expander>
-          {extendedSettings ?
-            <label class={style.optionTextFirst}>
-              Type:
-              <Select
-                name="zx"
-                value={'' + options.zx}
-                onChange={this.onChange}
-              >
-                <option value="0">Standard</option>
-                <option value="1">ZX</option>
-              </Select>
-            </label>
-          : null}
-        </Expander>
-        <Expander>
-          {options.zx ? null :
-            <div class={style.optionOneCell}>
-              <Range
-                name="maxNumColors"
-                min="2"
-                max="256"
-                value={options.maxNumColors}
-                onInput={this.onChange}
-              >
-                Colors:
-              </Range>
-            </div>
-          }
-        </Expander>
-        <div class={style.optionOneCell}>
-          <Range
-            name="dither"
-            min="0"
-            max="1"
-            step="0.01"
-            value={options.dither}
-            onInput={this.onChange}
-          >
-            Dithering:
-          </Range>
-        </div>
-      </form>
-    );
-  }
-}

src/codecs/imagequant/processor-meta.ts

@@ -1,11 +0,0 @@
-export interface QuantizeOptions {
-  zx: number;
-  maxNumColors: number;
-  dither: number;
-}
-
-export const defaultOptions: QuantizeOptions = {
-  zx: 0,
-  maxNumColors: 256,
-  dither: 1.0,
-};

src/codecs/imagequant/processor.ts

@@ -1,21 +0,0 @@
-import imagequant, { QuantizerModule } from '../../../codecs/imagequant/imagequant';
-import wasmUrl from '../../../codecs/imagequant/imagequant.wasm';
-import { QuantizeOptions } from './processor-meta';
-import { initWasmModule } from '../util';
-
-let emscriptenModule: Promise<QuantizerModule>;
-
-export async function process(data: ImageData, opts: QuantizeOptions): Promise<ImageData> {
-  if (!emscriptenModule) emscriptenModule = initWasmModule(imagequant, wasmUrl);
-
-  const module = await emscriptenModule;
-
-  const result = opts.zx ?
-      module.zx_quantize(data.data, data.width, data.height, opts.dither)
-    :
-      module.quantize(data.data, data.width, data.height, opts.maxNumColors, opts.dither);
-
-  module.free_result();
-
-  return new ImageData(new Uint8ClampedArray(result.buffer), result.width, result.height);
-}

src/codecs/input-processors.ts

@@ -1,9 +0,0 @@
-import { defaultOptions as rotateDefaultOptions } from './rotate/processor-meta';
-
-export interface InputProcessorState {
-  rotate: import('./rotate/processor-meta').RotateOptions;
-}
-
-export const defaultInputProcessorState: InputProcessorState = {
-  rotate: rotateDefaultOptions,
-};

src/codecs/mozjpeg/EncoderWorker.ts

@@ -0,0 +1,79 @@
+import mozjpeg_enc from '../../../codecs/mozjpeg_enc/mozjpeg_enc';
+// Using require() so TypeScript doesn’t complain about this not being a module.
+import { EncodeOptions } from './encoder';
+const wasmBinaryUrl = require('../../../codecs/mozjpeg_enc/mozjpeg_enc.wasm');
+
+// API exposed by wasm module. Details in the codec’s README.
+interface ModuleAPI {
+  version(): number;
+  create_buffer(width: number, height: number): number;
+  destroy_buffer(pointer: number): void;
+  encode(buffer: number, width: number, height: number, quality: number): void;
+  free_result(): void;
+  get_result_pointer(): number;
+  get_result_size(): number;
+}
+
+export default class MozJpegEncoder {
+  private emscriptenModule: Promise<EmscriptenWasm.Module>;
+  private api: Promise<ModuleAPI>;
+
+  constructor() {
+    this.emscriptenModule = new Promise((resolve) => {
+      const m = mozjpeg_enc({
+        // Just to be safe, don’t automatically invoke any wasm functions
+        noInitialRun: false,
+        locateFile(url: string): string {
+          // Redirect the request for the wasm binary to whatever webpack gave us.
+          if (url.endsWith('.wasm')) {
+            return wasmBinaryUrl;
+          }
+          return url;
+        },
+        onRuntimeInitialized() {
+          // An Emscripten is a then-able that, for some reason, `then()`s itself,
+          // causing an infite loop when you wrap it in a real promise. Deleten the `then`
+          // prop solves this for now.
+          // See: https://github.com/kripken/emscripten/blob/incoming/src/postamble.js#L129
+          // TODO(surma@): File a bug with Emscripten on this.
+          delete (m as any).then;
+          resolve(m);
+        },
+      });
+    });
+
+    this.api = (async () => {
+      // Not sure why, but TypeScript complains that I am using
+      // `emscriptenModule` before it’s getting assigned, which is clearly not
+      // true :shrug: Using `any`
+      const m = await (this as any).emscriptenModule;
+      return {
+        version: m.cwrap('version', 'number', []),
+        create_buffer: m.cwrap('create_buffer', 'number', ['number', 'number']),
+        destroy_buffer: m.cwrap('destroy_buffer', '', ['number']),
+        encode: m.cwrap('encode', '', ['number', 'number', 'number', 'number']),
+        free_result: m.cwrap('free_result', '', []),
+        get_result_pointer: m.cwrap('get_result_pointer', 'number', []),
+        get_result_size: m.cwrap('get_result_size', 'number', []),
+      };
+    })();
+  }
+
+  async encode(data: ImageData, options: EncodeOptions): Promise<ArrayBuffer> {
+    const m = await this.emscriptenModule;
+    const api = await this.api;
+
+    const p = api.create_buffer(data.width, data.height);
+    m.HEAP8.set(data.data, p);
+    api.encode(p, data.width, data.height, options.quality);
+    const resultPointer = api.get_result_pointer();
+    const resultSize = api.get_result_size();
+    const resultView = new Uint8Array(m.HEAP8.buffer, resultPointer, resultSize);
+    const result = new Uint8Array(resultView);
+    api.free_result();
+    api.destroy_buffer(p);
+
+    // wasm can’t run on SharedArrayBuffers, so we hard-cast to ArrayBuffer.
+    return result.buffer as ArrayBuffer;
+  }
+}

src/codecs/mozjpeg/encoder-meta.ts

@@ -1,49 +0,0 @@
-export enum MozJpegColorSpace {
-  GRAYSCALE = 1,
-  RGB,
-  YCbCr,
-}
-
-export interface EncodeOptions {
-  quality: number;
-  baseline: boolean;
-  arithmetic: boolean;
-  progressive: boolean;
-  optimize_coding: boolean;
-  smoothing: number;
-  color_space: MozJpegColorSpace;
-  quant_table: number;
-  trellis_multipass: boolean;
-  trellis_opt_zero: boolean;
-  trellis_opt_table: boolean;
-  trellis_loops: number;
-  auto_subsample: boolean;
-  chroma_subsample: number;
-  separate_chroma_quality: boolean;
-  chroma_quality: number;
-}
-
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'mozjpeg';
-export const label = 'MozJPEG';
-export const mimeType = 'image/jpeg';
-export const extension = 'jpg';
-export const defaultOptions: EncodeOptions = {
-  quality: 75,
-  baseline: false,
-  arithmetic: false,
-  progressive: true,
-  optimize_coding: true,
-  smoothing: 0,
-  color_space: MozJpegColorSpace.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,
-};

src/codecs/mozjpeg/encoder.ts

@@ -1,18 +1,16 @@
-import mozjpeg_enc, { MozJPEGModule } from '../../../codecs/mozjpeg_enc/mozjpeg_enc';
+import EncoderWorker from './EncoderWorker';
-import wasmUrl from '../../../codecs/mozjpeg_enc/mozjpeg_enc.wasm';
-import { EncodeOptions } from './encoder-meta';
-import { initWasmModule } from '../util';
 
-let emscriptenModule: Promise<MozJPEGModule>;
+export interface EncodeOptions { quality: number; }
+export interface EncoderState { type: typeof type; options: EncodeOptions; }
 
-export async function encode(data: ImageData, options: EncodeOptions): Promise<ArrayBuffer> {
+export const type = 'mozjpeg';
-  if (!emscriptenModule) emscriptenModule = initWasmModule(mozjpeg_enc, wasmUrl);
+export const label = 'MozJPEG';
+export const mimeType = 'image/jpeg';
+export const extension = 'jpg';
+export const defaultOptions: EncodeOptions = { quality: 7 };
 
-  const module = await emscriptenModule;
+export async function encode(data: ImageData, options: EncodeOptions) {
-  const resultView = module.encode(data.data, data.width, data.height, options);
+  // We need to await this because it's been comlinked.
-  const result = new Uint8Array(resultView);
+  const encoder = await new EncoderWorker();
-  module.free_result();
+  return encoder.encode(data, options);
-
-  // wasm can’t run on SharedArrayBuffers, so we hard-cast to ArrayBuffer.
-  return result.buffer as ArrayBuffer;
 }

src/codecs/mozjpeg/options.tsx

@@ -1,258 +1,35 @@
 import { h, Component } from 'preact';
-import { bind } from '../../lib/initial-util';
+import { EncodeOptions } from './encoder';
-import { inputFieldChecked, inputFieldValueAsNumber, preventDefault } from '../../lib/util';
+import { bind } from '../../lib/util';
-import { EncodeOptions, MozJpegColorSpace } from './encoder-meta';
-import * as style from '../../components/Options/style.scss';
-import Checkbox from '../../components/checkbox';
-import Expander from '../../components/expander';
-import Select from '../../components/select';
-import Range from '../../components/range';
-import linkState from 'linkstate';
 
-interface Props {
+type Props = {
-  options: EncodeOptions;
+  options: EncodeOptions,
-  onChange(newOptions: EncodeOptions): void;
+  onChange(newOptions: EncodeOptions): void
-}
+};
-
-interface State {
-  showAdvanced: boolean;
-}
-
-export default class MozJPEGEncoderOptions extends Component<Props, State> {
-  state: State = {
-    showAdvanced: false,
-  };
 
+export default class MozJpegCodecOptions extends Component<Props, {}> {
   @bind
   onChange(event: Event) {
-    const form = (event.currentTarget as HTMLInputElement).closest('form') as HTMLFormElement;
+    const el = event.currentTarget as HTMLInputElement;
-    const { options } = this.props;
+    this.props.onChange({ quality: Number(el.value) });
-
-    const newOptions: EncodeOptions = {
-      // Copy over options the form doesn't currently care about, eg arithmetic
-      ...this.props.options,
-      // And now stuff from the form:
-      // .checked
-      baseline: inputFieldChecked(form.baseline, options.baseline),
-      progressive: inputFieldChecked(form.progressive, options.progressive),
-      optimize_coding: inputFieldChecked(form.optimize_coding, options.optimize_coding),
-      trellis_multipass: inputFieldChecked(form.trellis_multipass, options.trellis_multipass),
-      trellis_opt_zero: inputFieldChecked(form.trellis_opt_zero, options.trellis_opt_zero),
-      trellis_opt_table: inputFieldChecked(form.trellis_opt_table, options.trellis_opt_table),
-      auto_subsample: inputFieldChecked(form.auto_subsample, options.auto_subsample),
-      separate_chroma_quality:
-        inputFieldChecked(form.separate_chroma_quality, options.separate_chroma_quality),
-      // .value
-      quality: inputFieldValueAsNumber(form.quality, options.quality),
-      chroma_quality: inputFieldValueAsNumber(form.chroma_quality, options.chroma_quality),
-      chroma_subsample: inputFieldValueAsNumber(form.chroma_subsample, options.chroma_subsample),
-      smoothing: inputFieldValueAsNumber(form.smoothing, options.smoothing),
-      color_space: inputFieldValueAsNumber(form.color_space, options.color_space),
-      quant_table: inputFieldValueAsNumber(form.quant_table, options.quant_table),
-      trellis_loops: inputFieldValueAsNumber(form.trellis_loops, options.trellis_loops),
-    };
-    this.props.onChange(newOptions);
   }
 
-  render({ options }: Props, { showAdvanced }: State) {
+  render({ options }: Props) {
-    // I'm rendering both lossy and lossless forms, as it becomes much easier when
-    // gathering the data.
     return (
-      <form class={style.optionsSection} onSubmit={preventDefault}>
+      <div>
-        <div class={style.optionOneCell}>
+        <label>
-          <Range
+          Quality:
+          <input
             name="quality"
-            min="0"
+            type="range"
+            min="1"
             max="100"
-            value={options.quality}
+            step="1"
-            onInput={this.onChange}
+            value={'' + options.quality}
-          >
+            onChange={this.onChange}
-            Quality:
-          </Range>
-        </div>
-        <label class={style.optionInputFirst}>
-          <Checkbox
-            checked={showAdvanced}
-            onChange={linkState(this, 'showAdvanced')}
           />
-          Show advanced settings
         </label>
-        <Expander>
+      </div>
-          {showAdvanced ?
-            <div>
-              <label class={style.optionTextFirst}>
-                Channels:
-                <Select
-                  name="color_space"
-                  value={options.color_space}
-                  onChange={this.onChange}
-                >
-                  <option value={MozJpegColorSpace.GRAYSCALE}>Grayscale</option>
-                  <option value={MozJpegColorSpace.RGB}>RGB</option>
-                  <option value={MozJpegColorSpace.YCbCr}>YCbCr</option>
-                </Select>
-              </label>
-              <Expander>
-                {options.color_space === MozJpegColorSpace.YCbCr ?
-                  <div>
-                    <label class={style.optionInputFirst}>
-                      <Checkbox
-                        name="auto_subsample"
-                        checked={options.auto_subsample}
-                        onChange={this.onChange}
-                      />
-                      Auto subsample chroma
-                    </label>
-                    <Expander>
-                      {options.auto_subsample ? null :
-                        <div class={style.optionOneCell}>
-                          <Range
-                            name="chroma_subsample"
-                            min="1"
-                            max="4"
-                            value={options.chroma_subsample}
-                            onInput={this.onChange}
-                          >
-                            Subsample chroma by:
-                          </Range>
-                        </div>
-                      }
-                    </Expander>
-                    <label class={style.optionInputFirst}>
-                      <Checkbox
-                        name="separate_chroma_quality"
-                        checked={options.separate_chroma_quality}
-                        onChange={this.onChange}
-                      />
-                      Separate chroma quality
-                    </label>
-                    <Expander>
-                      {options.separate_chroma_quality ?
-                        <div class={style.optionOneCell}>
-                          <Range
-                            name="chroma_quality"
-                            min="0"
-                            max="100"
-                            value={options.chroma_quality}
-                            onInput={this.onChange}
-                          >
-                            Chroma quality:
-                          </Range>
-                        </div>
-                        : null
-                      }
-                    </Expander>
-                  </div>
-                  : null
-                }
-              </Expander>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="baseline"
-                  checked={options.baseline}
-                  onChange={this.onChange}
-                />
-                Pointless spec compliance
-              </label>
-              <Expander>
-                {options.baseline ? null :
-                  <label class={style.optionInputFirst}>
-                    <Checkbox
-                      name="progressive"
-                      checked={options.progressive}
-                      onChange={this.onChange}
-                    />
-                    Progressive rendering
-                  </label>
-                }
-              </Expander>
-              <Expander>
-                {options.baseline ?
-                  <label class={style.optionInputFirst}>
-                    <Checkbox
-                      name="optimize_coding"
-                      checked={options.optimize_coding}
-                      onChange={this.onChange}
-                    />
-                    Optimize Huffman table
-                  </label>
-                  : null
-                }
-              </Expander>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="smoothing"
-                  min="0"
-                  max="100"
-                  value={options.smoothing}
-                  onInput={this.onChange}
-                >
-                  Smoothing:
-                </Range>
-              </div>
-              <label class={style.optionTextFirst}>
-                Quantization:
-                <Select
-                  name="quant_table"
-                  value={options.quant_table}
-                  onChange={this.onChange}
-                >
-                  <option value="0">JPEG Annex K</option>
-                  <option value="1">Flat</option>
-                  <option value="2">MSSIM-tuned Kodak</option>
-                  <option value="3">ImageMagick</option>
-                  <option value="4">PSNR-HVS-M-tuned Kodak</option>
-                  <option value="5">Klein et al</option>
-                  <option value="6">Watson et al</option>
-                  <option value="7">Ahumada et al</option>
-                  <option value="8">Peterson et al</option>
-                </Select>
-              </label>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="trellis_multipass"
-                  checked={options.trellis_multipass}
-                  onChange={this.onChange}
-                />
-                Trellis multipass
-              </label>
-              <Expander>
-                {options.trellis_multipass ?
-                  <label class={style.optionInputFirst}>
-                    <Checkbox
-                      name="trellis_opt_zero"
-                      checked={options.trellis_opt_zero}
-                      onChange={this.onChange}
-                    />
-                    Optimize zero block runs
-                  </label>
-                  : null
-                }
-              </Expander>
-              <label class={style.optionInputFirst}>
-                <Checkbox
-                  name="trellis_opt_table"
-                  checked={options.trellis_opt_table}
-                  onChange={this.onChange}
-                />
-                Optimize after trellis quantization
-              </label>
-              <div class={style.optionOneCell}>
-                <Range
-                  name="trellis_loops"
-                  min="1"
-                  max="50"
-                  value={options.trellis_loops}
-                  onInput={this.onChange}
-                >
-                  Trellis quantization passes:
-                </Range>
-              </div>
-            </div>
-            : null
-          }
-        </Expander>
-      </form>
     );
   }
 }

src/codecs/optipng/encoder-meta.ts

@@ -1,13 +0,0 @@
-export interface EncodeOptions {
-  level: number;
-}
-export interface EncoderState { type: typeof type; options: EncodeOptions; }
-
-export const type = 'png';
-export const label = 'OptiPNG';
-export const mimeType = 'image/png';
-export const extension = 'png';
-
-export const defaultOptions: EncodeOptions = {
-  level: 2,
-};

src/codecs/optipng/encoder.ts

@@ -1,18 +0,0 @@
-import optipng, { OptiPngModule } from '../../../codecs/optipng/optipng';
-import wasmUrl from '../../../codecs/optipng/optipng.wasm';
-import { EncodeOptions } from './encoder-meta';
-import { initWasmModule } from '../util';
-
-let emscriptenModule: Promise<OptiPngModule>;
-
-export async function compress(data: BufferSource, options: EncodeOptions): Promise<ArrayBuffer> {
-  if (!emscriptenModule) emscriptenModule = initWasmModule(optipng, wasmUrl);
-
-  const module = await emscriptenModule;
-  const resultView = module.compress(data, options);
-  const result = new Uint8Array(resultView);
-  module.free_result();
-
-  // wasm can’t run on SharedArrayBuffers, so we hard-cast to ArrayBuffer.
-  return result.buffer as ArrayBuffer;
-}