Loop through Wasm re-init for issue repro

These days Emscripten returns a Promise to the module directly without hacks.

.gitattributes

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

.github/workflows/node.js.yml

@@ -1,22 +0,0 @@
-name: Node.js CI
-
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
-
-    steps:
-    - uses: actions/checkout@v2
-    - id: nvmrc
-      uses: browniebroke/read-nvmrc-action@v1
-    - uses: actions/setup-node@v1
-      with:
-        node-version: '${{ steps.nvmrc.outputs.node_version }}'
-    - run: npm ci
-    - run: npm run build

.gitignore

@@ -1,11 +1,6 @@
-.tmp
 node_modules
+/build
+/*.log
 *.scss.d.ts
 *.css.d.ts
-build
 *.o
-
-# Auto-generated by lib/feature-plugin.js
-src/features-worker/index.ts
-src/client/lazy-app/worker-bridge/meta.ts
-src/client/lazy-app/feature-meta/index.ts

.nvmrc

@@ -1 +1 @@
-14.15.1
+10.16.2

.prettierignore

@@ -1,12 +0,0 @@
-codecs
-.tmp
-node_modules
-*.scss.d.ts
-*.css.d.ts
-build
-*.o
-
-# Auto-generated by lib/feature-plugin.js
-src/features-worker/index.ts
-src/client/lazy-app/worker-bridge/meta.ts
-src/client/lazy-app/feature-meta/index.ts

.prettierrc.json

@@ -1,4 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all"
-}

.travis.yml

@@ -0,0 +1,7 @@
+language: node_js
+cache: npm
+script: npm run build
+after_success: npm run sizereport
+os:
+  - linux
+  - windows

_headers.ejs

@@ -0,0 +1,18 @@
+# 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

client-tsconfig.json

@@ -1,19 +0,0 @@
-{
-  "extends": "./generic-tsconfig.json",
-  "compilerOptions": {
-    "lib": ["esnext", "dom", "dom.iterable"],
-    "types": []
-  },
-  "include": [
-    "src/features/**/client/**/*",
-    "src/features/**/shared/**/*",
-    "src/features/client-utils/**/*",
-    "src/shared/**/*",
-    "src/client/**/*",
-    // Not really clean, but we need these to access the type of the functions
-    // for comlink
-    "src/features/**/worker/**/*",
-    "src/features-worker/**/*",
-    "src/features/worker-utils/**/*"
-  ]
-}

codecs/avif/Makefile

@@ -1,15 +1,13 @@
-CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/31d7c6d1e32cf467ac24fb8c7a76c4902a4c00db.tar.gz
+CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/v0.8.1.tar.gz
 CODEC_PACKAGE = node_modules/libavif.tar.gz
 
 LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/v2.0.0.tar.gz
 LIBAOM_PACKAGE = node_modules/libaom.tar.gz
 
-export CODEC_DIR = node_modules/libavif
-BUILD_DIR := node_modules/build
-ENC_BUILD_DIR := $(BUILD_DIR)/enc
-ENC_MT_BUILD_DIR := $(BUILD_DIR)/enc-mt
-DEC_BUILD_DIR := $(BUILD_DIR)/dec
-export LIBAOM_DIR = node_modules/libaom
+CODEC_ENC_DIR = node_modules/libavif-enc
+CODEC_ENC_MT_DIR = node_modules/libavif-enc-mt
+CODEC_DEC_DIR = node_modules/libavif-dec
+LIBAOM_DIR = node_modules/libaom
 
 OUT_ENC_JS = enc/avif_enc.js
 OUT_ENC_MT_JS = enc/avif_enc_mt.js
@@ -18,49 +16,47 @@ OUT_DEC_JS = dec/avif_dec.js
 OUT_ENC_CPP = enc/avif_enc.cpp
 OUT_DEC_CPP = dec/avif_dec.cpp
 
-HELPER_MAKEFLAGS := -f helper.Makefile
+HELPER_MAKEFLAGS := -f helper.Makefile \
+	LIBAOM_DIR=$(LIBAOM_DIR) \
+	CODEC_PACKAGE=$(CODEC_PACKAGE) \
+	LIBAOM_PACKAGE=$(LIBAOM_PACKAGE)
 
 .PHONY: all clean
 
 all: $(OUT_ENC_JS) $(OUT_DEC_JS) $(OUT_ENC_MT_JS)
 
-$(OUT_ENC_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt
+$(OUT_ENC_JS): $(OUT_ENC_CPP) $(CODEC_PACKAGE) $(LIBAOM_DIR)/CMakeLists.txt
 	$(MAKE) \
 		$(HELPER_MAKEFLAGS) \
-		BUILD_DIR=$(ENC_BUILD_DIR) \
+		CODEC_DIR=$(CODEC_ENC_DIR) \
 		OUT_JS=$@ \
 		OUT_CPP=$< \
 		LIBAOM_FLAGS="\
 			-DCONFIG_AV1_DECODER=0 \
 			-DCONFIG_MULTITHREAD=0 \
-			-DCONFIG_AV1_HIGHBITDEPTH=0 \
-		" \
-		LIBAVIF_FLAGS="-DAVIF_CODEC_AOM_DECODE=0"
+		"
 
-$(OUT_ENC_MT_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt
+$(OUT_ENC_MT_JS): $(OUT_ENC_CPP) $(CODEC_PACKAGE) $(LIBAOM_DIR)/CMakeLists.txt
 	$(MAKE) \
 		$(HELPER_MAKEFLAGS) \
-		BUILD_DIR=$(ENC_MT_BUILD_DIR) \
+		CODEC_DIR=$(CODEC_ENC_MT_DIR) \
 		OUT_JS=$@ \
 		OUT_CPP=$< \
 		LIBAOM_FLAGS="\
 			-DCONFIG_AV1_DECODER=0 \
-			-DCONFIG_AV1_HIGHBITDEPTH=0 \
 		" \
-		LIBAVIF_FLAGS="-DAVIF_CODEC_AOM_DECODE=0" \
 		OUT_FLAGS="-pthread"
 
-$(OUT_DEC_JS): $(OUT_DEC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt
+$(OUT_DEC_JS): $(OUT_DEC_CPP) $(CODEC_PACKAGE) $(LIBAOM_DIR)/CMakeLists.txt
 	$(MAKE) \
 		$(HELPER_MAKEFLAGS) \
-		BUILD_DIR=$(DEC_BUILD_DIR) \
+		CODEC_DIR=$(CODEC_DEC_DIR) \
 		OUT_JS=$@ \
 		OUT_CPP=$< \
 		LIBAOM_FLAGS="\
 			-DCONFIG_AV1_ENCODER=0 \
 			-DCONFIG_MULTITHREAD=0 \
-		" \
-		LIBAVIF_FLAGS="-DAVIF_CODEC_AOM_ENCODE=0"
+		"
 
 $(CODEC_PACKAGE):
 	mkdir -p $(@D)
@@ -70,15 +66,11 @@ $(LIBAOM_PACKAGE):
 	mkdir -p $(@D)
 	curl -sL $(LIBAOM_URL) -o $@
 
-$(CODEC_DIR)/CMakeLists.txt: $(CODEC_PACKAGE)
-	mkdir -p $(@D)
-	tar xzm --strip 1 -C $(@D) -f $(CODEC_PACKAGE)
-
 $(LIBAOM_DIR)/CMakeLists.txt: $(LIBAOM_PACKAGE)
 	mkdir -p $(@D)
 	tar xzm -C $(@D) -f $(LIBAOM_PACKAGE)
 
 clean:
-	$(MAKE) $(HELPER_MAKEFLAGS) BUILD_DIR=$(ENC_BUILD_DIR) OUT_JS=$(OUT_ENC_JS) clean
-	$(MAKE) $(HELPER_MAKEFLAGS) BUILD_DIR=$(ENC_MT_BUILD_DIR) OUT_JS=$(OUT_ENC_MT_JS) clean
-	$(MAKE) $(HELPER_MAKEFLAGS) BUILD_DIR=$(DEC_BUILD_DIR) OUT_JS=$(OUT_DEC_JS) clean
+	$(MAKE) $(HELPER_MAKEFLAGS) CODEC_DIR=$(CODEC_ENC_DIR) OUT_JS=$(OUT_ENC_JS) clean
+	$(MAKE) $(HELPER_MAKEFLAGS) CODEC_DIR=$(CODEC_ENC_MT_DIR) OUT_JS=$(OUT_ENC_MT_JS) clean
+	$(MAKE) $(HELPER_MAKEFLAGS) CODEC_DIR=$(CODEC_DEC_DIR) OUT_JS=$(OUT_DEC_JS) clean

codecs/avif/dec/avif_dec.cpp

@@ -8,10 +8,15 @@ thread_local const val Uint8ClampedArray = val::global("Uint8ClampedArray");
 thread_local const val ImageData = val::global("ImageData");
 
 val decode(std::string avifimage) {
+  // point raw.data and raw.size to the contents of an .avif(s)
+  avifROData raw = {
+    .data = (uint8_t*)avifimage.c_str(),
+    .size = avifimage.length()
+  };
+
   avifImage* image = avifImageCreateEmpty();
   avifDecoder* decoder = avifDecoderCreate();
-  avifResult decodeResult =
-      avifDecoderReadMemory(decoder, image, (uint8_t*)avifimage.c_str(), avifimage.length());
+  avifResult decodeResult = avifDecoderRead(decoder, image, &raw);
   // image is an independent copy of decoded data, decoder may be destroyed here
   avifDecoderDestroy(decoder);
 
@@ -20,8 +25,7 @@ val decode(std::string avifimage) {
   if (decodeResult == AVIF_RESULT_OK) {
     // Convert to interleaved RGB(A)/BGR(A) using a libavif-allocated buffer.
     avifRGBImage rgb;
-    avifRGBImageSetDefaults(&rgb,
-                            image);  // Defaults to AVIF_RGB_FORMAT_RGBA which is what we want.
+    avifRGBImageSetDefaults(&rgb, image);  // Defaults to AVIF_RGB_FORMAT_RGBA which is what we want.
     rgb.depth = 8;  // Does not need to match image->depth. We always want 8-bit pixels.
 
     avifRGBImageAllocatePixels(&rgb);
@@ -29,9 +33,7 @@ val decode(std::string avifimage) {
 
     // We want to create a *copy* of the decoded data to be owned by the JavaScript side.
     // For that, we perform `new Uint8Array(wasmMemBuffer, wasmPtr, wasmSize).slice()`:
-    result = ImageData.new_(
-        Uint8ClampedArray.new_(typed_memory_view(rgb.rowBytes * rgb.height, rgb.pixels)), rgb.width,
-        rgb.height);
+    result = ImageData.new_(Uint8ClampedArray.new_(typed_memory_view(rgb.rowBytes * rgb.height, rgb.pixels)), rgb.width, rgb.height);
 
     // Now we can safely free the RGB pixels:
     avifRGBImageFreePixels(&rgb);

codecs/avif/dec/avif_dec.d.ts

@@ -1,7 +1,6 @@
-export interface AVIFModule extends EmscriptenWasm.Module {
+interface AVIFModule extends EmscriptenWasm.Module {
   decode(data: BufferSource): ImageData | null;
 }
 
-declare var moduleFactory: EmscriptenWasm.ModuleFactory<AVIFModule>;
+export default function(opts: EmscriptenWasm.ModuleOpts): Promise<AVIFModule>;
 
-export default moduleFactory;

codecs/avif/enc/avif_enc.cpp

@@ -1,6 +1,6 @@
 #include <emscripten/bind.h>
-#include <emscripten/threading.h>
 #include <emscripten/val.h>
+#include <emscripten/threading.h>
 #include "avif/avif.h"
 
 using namespace emscripten;
@@ -51,10 +51,13 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
 
   avifImage* image = avifImageCreate(width, height, depth, format);
 
-  if (options.maxQuantizer == AVIF_QUANTIZER_LOSSLESS &&
-      options.minQuantizer == AVIF_QUANTIZER_LOSSLESS &&
-      options.minQuantizerAlpha == AVIF_QUANTIZER_LOSSLESS &&
-      options.maxQuantizerAlpha == AVIF_QUANTIZER_LOSSLESS && format == AVIF_PIXEL_FORMAT_YUV444) {
+  if (
+    options.maxQuantizer == AVIF_QUANTIZER_LOSSLESS &&
+    options.minQuantizer == AVIF_QUANTIZER_LOSSLESS &&
+    options.minQuantizerAlpha == AVIF_QUANTIZER_LOSSLESS &&
+    options.maxQuantizerAlpha == AVIF_QUANTIZER_LOSSLESS &&
+    format == AVIF_PIXEL_FORMAT_YUV444
+  ) {
     image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_IDENTITY;
   } else {
     image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_BT709;

codecs/avif/enc/avif_enc.d.ts

@@ -1,23 +1,7 @@
-export interface EncodeOptions {
-  minQuantizer: number;
-  maxQuantizer: number;
-  minQuantizerAlpha: number;
-  maxQuantizerAlpha: number;
-  tileRowsLog2: number;
-  tileColsLog2: number;
-  speed: number;
-  subsample: number;
+import { EncodeOptions } from '../../../src/codecs/avif/encoder-meta';
+
+interface AVIFModule extends EmscriptenWasm.Module {
+  encode(data: BufferSource, width: number, height: number, options: EncodeOptions): Uint8Array | null;
 }
 
-export interface AVIFModule extends EmscriptenWasm.Module {
-  encode(
-    data: BufferSource,
-    width: number,
-    height: number,
-    options: EncodeOptions,
-  ): Uint8Array | null;
-}
-
-declare var moduleFactory: EmscriptenWasm.ModuleFactory<AVIFModule>;
-
-export default moduleFactory;
+export default function(opts: EmscriptenWasm.ModuleOpts): Promise<AVIFModule>;

codecs/avif/enc/avif_enc_mt.d.ts

@@ -1,2 +0,0 @@
-export * from './avif_enc';
-export { default } from './avif_enc';

codecs/avif/enc/avif_enc_mt.worker.js

@@ -1,103 +1 @@
-var threadInfoStruct = 0;
-var selfThreadId = 0;
-var parentThreadId = 0;
-var initializedJS = false;
-var Module = {};
-function threadPrintErr() {
-  var text = Array.prototype.slice.call(arguments).join(' ');
-  console.error(text);
-}
-function threadAlert() {
-  var text = Array.prototype.slice.call(arguments).join(' ');
-  postMessage({ cmd: 'alert', text: text, threadId: selfThreadId });
-}
-var err = threadPrintErr;
-this.alert = threadAlert;
-Module['instantiateWasm'] = function (info, receiveInstance) {
-  var instance = new WebAssembly.Instance(Module['wasmModule'], info);
-  Module['wasmModule'] = null;
-  receiveInstance(instance);
-  return instance.exports;
-};
-this.onmessage = function (e) {
-  try {
-    if (e.data.cmd === 'load') {
-      Module['wasmModule'] = e.data.wasmModule;
-      Module['wasmMemory'] = e.data.wasmMemory;
-      Module['buffer'] = Module['wasmMemory'].buffer;
-      Module['ENVIRONMENT_IS_PTHREAD'] = true;
-      import(e.data.urlOrBlob)
-        .then(function (avif_enc_mt) {
-          return avif_enc_mt.default(Module);
-        })
-        .then(function (instance) {
-          Module = instance;
-          postMessage({ cmd: 'loaded' });
-        });
-    } else if (e.data.cmd === 'objectTransfer') {
-      Module['PThread'].receiveObjectTransfer(e.data);
-    } else if (e.data.cmd === 'run') {
-      Module['__performance_now_clock_drift'] = performance.now() - e.data.time;
-      threadInfoStruct = e.data.threadInfoStruct;
-      Module['registerPthreadPtr'](
-        threadInfoStruct,
-        /*isMainBrowserThread=*/ 0,
-        /*isMainRuntimeThread=*/ 0,
-      );
-      selfThreadId = e.data.selfThreadId;
-      parentThreadId = e.data.parentThreadId;
-      var max = e.data.stackBase;
-      var top = e.data.stackBase + e.data.stackSize;
-      Module['establishStackSpace'](top, max);
-      Module['_emscripten_tls_init']();
-      Module['PThread'].receiveObjectTransfer(e.data);
-      Module['PThread'].setThreadStatus(Module['_pthread_self'](), 1);
-      if (!initializedJS) {
-        Module['___embind_register_native_and_builtin_types']();
-        initializedJS = true;
-      }
-      try {
-        var result = Module['dynCall']('ii', e.data.start_routine, [
-          e.data.arg,
-        ]);
-        if (!Module['getNoExitRuntime']()) Module['PThread'].threadExit(result);
-      } catch (ex) {
-        if (ex === 'Canceled!') {
-          Module['PThread'].threadCancel();
-        } else if (ex != 'unwind') {
-          Atomics.store(
-            Module['HEAPU32'],
-            (threadInfoStruct + 4) >> /*C_STRUCTS.pthread.threadExitCode*/ 2,
-            ex instanceof Module['ExitStatus'] ? ex.status : -2,
-          );
-          /*A custom entry specific to Emscripten denoting that the thread crashed.*/ Atomics.store(
-            Module['HEAPU32'],
-            (threadInfoStruct + 0) >> /*C_STRUCTS.pthread.threadStatus*/ 2,
-            1,
-          );
-          Module['_emscripten_futex_wake'](
-            threadInfoStruct + 0,
-            /*C_STRUCTS.pthread.threadStatus*/ 2147483647,
-          );
-          if (!(ex instanceof Module['ExitStatus'])) throw ex;
-        }
-      }
-    } else if (e.data.cmd === 'cancel') {
-      if (threadInfoStruct) {
-        Module['PThread'].threadCancel();
-      }
-    } else if (e.data.target === 'setimmediate') {
-    } else if (e.data.cmd === 'processThreadQueue') {
-      if (threadInfoStruct) {
-        Module['_emscripten_current_thread_process_queued_calls']();
-      }
-    } else {
-      err('worker.js received unknown command ' + e.data.cmd);
-      err(e.data);
-    }
-  } catch (ex) {
-    err('worker.js onmessage() captured an uncaught exception: ' + ex);
-    if (ex && ex.stack) err(ex.stack);
-    throw ex;
-  }
-};
+var threadInfoStruct=0;var selfThreadId=0;var parentThreadId=0;var Module={};function threadPrintErr(){var text=Array.prototype.slice.call(arguments).join(" ");console.error(text)}function threadAlert(){var text=Array.prototype.slice.call(arguments).join(" ");postMessage({cmd:"alert",text:text,threadId:selfThreadId})}var err=threadPrintErr;this.alert=threadAlert;Module["instantiateWasm"]=function(info,receiveInstance){var instance=new WebAssembly.Instance(Module["wasmModule"],info);Module["wasmModule"]=null;receiveInstance(instance);return instance.exports};this.onmessage=function(e){try{if(e.data.cmd==="load"){Module["DYNAMIC_BASE"]=e.data.DYNAMIC_BASE;Module["DYNAMICTOP_PTR"]=e.data.DYNAMICTOP_PTR;Module["wasmModule"]=e.data.wasmModule;Module["wasmMemory"]=e.data.wasmMemory;Module["buffer"]=Module["wasmMemory"].buffer;Module["ENVIRONMENT_IS_PTHREAD"]=true;if(typeof e.data.urlOrBlob==="string"){importScripts(e.data.urlOrBlob)}else{var objectUrl=URL.createObjectURL(e.data.urlOrBlob);importScripts(objectUrl);URL.revokeObjectURL(objectUrl)}avif_enc_mt(Module).then(function(instance){Module=instance;postMessage({"cmd":"loaded"})})}else if(e.data.cmd==="objectTransfer"){Module["PThread"].receiveObjectTransfer(e.data)}else if(e.data.cmd==="run"){Module["__performance_now_clock_drift"]=performance.now()-e.data.time;threadInfoStruct=e.data.threadInfoStruct;Module["registerPthreadPtr"](threadInfoStruct,/*isMainBrowserThread=*/0,/*isMainRuntimeThread=*/0);selfThreadId=e.data.selfThreadId;parentThreadId=e.data.parentThreadId;var max=e.data.stackBase;var top=e.data.stackBase+e.data.stackSize;Module["establishStackSpace"](top,max);Module["_emscripten_tls_init"]();Module["PThread"].receiveObjectTransfer(e.data);Module["PThread"].setThreadStatus(Module["_pthread_self"](),1);/*EM_THREAD_STATUS_RUNNING*/try{var result=Module["dynCall_ii"](e.data.start_routine,e.data.arg);if(!Module["getNoExitRuntime"]())Module["PThread"].threadExit(result)}catch(ex){if(ex==="Canceled!"){Module["PThread"].threadCancel()}else if(ex!="unwind"){Atomics.store(Module["HEAPU32"],(threadInfoStruct+4)>>/*C_STRUCTS.pthread.threadExitCode*/2,(ex instanceof Module["ExitStatus"])?ex.status:-2);/*A custom entry specific to Emscripten denoting that the thread crashed.*/Atomics.store(Module["HEAPU32"],(threadInfoStruct+0)>>/*C_STRUCTS.pthread.threadStatus*/2,1);Module["_emscripten_futex_wake"](threadInfoStruct+0,/*C_STRUCTS.pthread.threadStatus*/2147483647);if(!(ex instanceof Module["ExitStatus"]))throw ex}}}else if(e.data.cmd==="cancel"){if(threadInfoStruct){Module["PThread"].threadCancel()}}else if(e.data.target==="setimmediate"){}else if(e.data.cmd==="processThreadQueue"){if(threadInfoStruct){Module["_emscripten_current_thread_process_queued_calls"]()}}else{err("worker.js received unknown command "+e.data.cmd);err(e.data)}}catch(ex){err("worker.js onmessage() captured an uncaught exception: "+ex);if(ex.stack)err(ex.stack);throw ex}};if(typeof process==="object"&&typeof process.versions==="object"&&typeof process.versions.node==="string"){self={location:{href:__filename}};var onmessage=this.onmessage;var nodeWorkerThreads=require("worker_threads");global.Worker=nodeWorkerThreads.Worker;var parentPort=nodeWorkerThreads.parentPort;parentPort.on("message",function(data){onmessage({data:data})});var nodeFS=require("fs");var nodeRead=function(filename){return nodeFS.readFileSync(filename,"utf8")};function globalEval(x){global.require=require;global.Module=Module;eval.call(null,x)}importScripts=function(f){globalEval(nodeRead(f))};postMessage=function(msg){parentPort.postMessage(msg)};if(typeof performance==="undefined"){performance={now:function(){return Date.now()}}}}

codecs/avif/helper.Makefile

@@ -3,16 +3,16 @@
 # Params that must be supplied by the caller:
 #   $(CODEC_DIR)
 #   $(LIBAOM_DIR)
-#   $(BUILD_DIR)
 #   $(OUT_JS)
 #   $(OUT_CPP)
 #   $(LIBAOM_FLAGS)
-#   $(LIBAVIF_FLAGS)
+#   $(CODEC_PACKAGE)
+#   $(LIBAOM_PACKAGE)
 
-CODEC_BUILD_DIR := $(BUILD_DIR)/libavif
+CODEC_BUILD_DIR := $(CODEC_DIR)/build
 CODEC_OUT := $(CODEC_BUILD_DIR)/libavif.a
 
-LIBAOM_BUILD_DIR := $(BUILD_DIR)/libaom
+LIBAOM_BUILD_DIR := $(CODEC_DIR)/ext/aom/build.libavif
 LIBAOM_OUT := $(LIBAOM_BUILD_DIR)/libaom.a
 
 OUT_WASM = $(OUT_JS:.js=.wasm)
@@ -23,6 +23,7 @@ OUT_WORKER=$(OUT_JS:.js=.worker.js)
 all: $(OUT_JS)
 
 $(OUT_JS): $(OUT_CPP) $(LIBAOM_OUT) $(CODEC_OUT)
+	# ERROR_ON_UNDEFINED_SYMBOLS=0 is needed to separate the encoder and decoder
 	$(CXX) \
 		-I $(CODEC_DIR)/include \
 		$(CXXFLAGS) \
@@ -32,10 +33,8 @@ $(OUT_JS): $(OUT_CPP) $(LIBAOM_OUT) $(CODEC_OUT)
 		--closure 1 \
 		-s ALLOW_MEMORY_GROWTH=1 \
 		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
-		-s ENVIRONMENT='worker' \
-		-s EXPORT_ES6=1 \
-		-s EXPORT_NAME="$(basename $(@F))" \
+		-s ERROR_ON_UNDEFINED_SYMBOLS=0 \
+		-s 'EXPORT_NAME="$(basename $(@F))"' \
 		-o $@ \
 		$+
 
@@ -44,9 +43,8 @@ $(CODEC_OUT): $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_OUT)
 		-DCMAKE_BUILD_TYPE=Release \
 		-DBUILD_SHARED_LIBS=0 \
 		-DAVIF_CODEC_AOM=1 \
-		-DAOM_LIBRARY=$(LIBAOM_OUT) \
-		-DAOM_INCLUDE_DIR=$(LIBAOM_DIR) \
-		$(LIBAVIF_FLAGS) \
+		-DAVIF_LOCAL_AOM=1 \
+		-DAVIF_CODEC_INCLUDES=$(abspath $(LIBAOM_DIR)) \
 		-B $(CODEC_BUILD_DIR) \
 		$(CODEC_DIR) && \
 	$(MAKE) -C $(CODEC_BUILD_DIR)
@@ -64,11 +62,16 @@ $(LIBAOM_OUT): $(LIBAOM_DIR)/CMakeLists.txt
 		-DCONFIG_INSPECTION=0 \
 		-DCONFIG_RUNTIME_CPU_DETECT=0 \
 		-DCONFIG_WEBM_IO=0 \
+		-DCONFIG_AV1_HIGHBITDEPTH=0 \
 		$(LIBAOM_FLAGS) \
 		-B $(LIBAOM_BUILD_DIR) \
 		$(LIBAOM_DIR) && \
 	$(MAKE) -C $(LIBAOM_BUILD_DIR)
 
+$(CODEC_DIR)/CMakeLists.txt: $(CODEC_PACKAGE)
+	mkdir -p $(@D)
+	tar xzm --strip 1 -C $(@D) -f $(CODEC_PACKAGE)
+
 clean:
 	$(RM) $(OUT_JS) $(OUT_WASM) $(OUT_WORKER)
 	$(MAKE) -C $(CODEC_BUILD_DIR) clean

codecs/build-rust-nightly.sh

@@ -0,0 +1,4 @@
+set -e
+
+docker build -t squoosh-rust-nightly --build-arg RUST_IMG=rustlang/rust:nightly - < ../rust.Dockerfile
+docker run --rm -v $PWD:/src squoosh-rust-nightly "$@"

codecs/build-rust.sh

@@ -1,10 +1,4 @@
 set -e
 
-if [ ! -z "$RUST_IMG" ]
-then
-  # Get part after ":" (https://stackoverflow.com/a/15149278/439965).
-  IMG_SUFFIX=-${RUST_IMG#*:}
-fi
-IMG_NAME=squoosh-rust$IMG_SUFFIX
-docker build -t $IMG_NAME --build-arg RUST_IMG - < ../rust.Dockerfile
-docker run --rm -v $PWD:/src $IMG_NAME "$@"
+docker build -t squoosh-rust - < ../rust.Dockerfile
+docker run --rm -v $PWD:/src squoosh-rust "$@"

codecs/cpp.Dockerfile

@@ -1,6 +1,6 @@
-FROM emscripten/emsdk:2.0.8
+FROM emscripten/emsdk:1.40.0
 RUN apt-get update && apt-get install -qqy autoconf libtool pkg-config
-ENV CFLAGS "-O3 -flto"
+ENV CFLAGS "-Os -flto"
 ENV CXXFLAGS "${CFLAGS} -std=c++17"
 ENV LDFLAGS "${CFLAGS} -s PTHREAD_POOL_SIZE=navigator.hardwareConcurrency"
 # Build and cache standard libraries with these flags

codecs/hqx/Dockerfile

@@ -0,0 +1,11 @@
+# This is intentionally an old version of Rust. Newer versions
+# generate _significantly_ bigger Wasm binaries.
+FROM rust:1.37
+RUN rustup target add wasm32-unknown-unknown
+RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
+
+RUN mkdir /opt/binaryen && \
+ curl -L https://github.com/WebAssembly/binaryen/releases/download/1.38.32/binaryen-1.38.32-x86-linux.tar.gz  | tar -xzf - -C /opt/binaryen --strip 1
+
+ENV PATH="/opt/binaryen:${PATH}"
+WORKDIR /src

codecs/hqx/package.json

@@ -1,6 +1,7 @@
 {
   "name": "hqx",
   "scripts": {
-    "build": "RUST_IMG=rust:1.40 ../build-rust.sh"
+    "build:image": "docker build -t squoosh-hqx - < Dockerfile",
+    "build": "docker run --rm -v $(pwd):/src squoosh-hqx ./build.sh"
   }
 }

codecs/hqx/pkg/README.md

@@ -1,5 +0,0 @@
-# HQX
-
-- Source: <https://github.com/CryZe/wasmboy-rs>
-- Version: v0.1.2
-- License: Apache 2.0

codecs/hqx/pkg/squooshhqx.d.ts

@@ -1,48 +1,10 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
- * @param {Uint32Array} input_image
- * @param {number} input_width
- * @param {number} input_height
- * @param {number} factor
- * @returns {Uint32Array}
- */
-export function resize(
-  input_image: Uint32Array,
-  input_width: number,
-  input_height: number,
-  factor: number,
-): Uint32Array;
-
-export type InitInput =
-  | RequestInfo
-  | URL
-  | Response
-  | BufferSource
-  | WebAssembly.Module;
-
-export interface InitOutput {
-  readonly memory: WebAssembly.Memory;
-  readonly resize: (
-    a: number,
-    b: number,
-    c: number,
-    d: number,
-    e: number,
-    f: number,
-  ) => void;
-  readonly __wbindgen_malloc: (a: number) => number;
-  readonly __wbindgen_free: (a: number, b: number) => void;
-}
-
-/**
- * If `module_or_path` is {RequestInfo} or {URL}, makes a request and
- * for everything else, calls `WebAssembly.instantiate` directly.
- *
- * @param {InitInput | Promise<InitInput>} module_or_path
- *
- * @returns {Promise<InitOutput>}
- */
-export default function init(
-  module_or_path?: InitInput | Promise<InitInput>,
-): Promise<InitOutput>;
+* @param {Uint32Array} input_image
+* @param {number} input_width
+* @param {number} input_height
+* @param {number} factor
+* @returns {Uint32Array}
+*/
+export function resize(input_image: Uint32Array, input_width: number, input_height: number, factor: number): Uint32Array;

codecs/hqx/pkg/squooshhqx.js

@@ -1,107 +1,2 @@
-let wasm;
-
-let cachegetUint32Memory0 = null;
-function getUint32Memory0() {
-  if (
-    cachegetUint32Memory0 === null ||
-    cachegetUint32Memory0.buffer !== wasm.memory.buffer
-  ) {
-    cachegetUint32Memory0 = new Uint32Array(wasm.memory.buffer);
-  }
-  return cachegetUint32Memory0;
-}
-
-let WASM_VECTOR_LEN = 0;
-
-function passArray32ToWasm0(arg, malloc) {
-  const ptr = malloc(arg.length * 4);
-  getUint32Memory0().set(arg, ptr / 4);
-  WASM_VECTOR_LEN = arg.length;
-  return ptr;
-}
-
-let cachegetInt32Memory0 = null;
-function getInt32Memory0() {
-  if (
-    cachegetInt32Memory0 === null ||
-    cachegetInt32Memory0.buffer !== wasm.memory.buffer
-  ) {
-    cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer);
-  }
-  return cachegetInt32Memory0;
-}
-
-function getArrayU32FromWasm0(ptr, len) {
-  return getUint32Memory0().subarray(ptr / 4, ptr / 4 + len);
-}
-/**
- * @param {Uint32Array} input_image
- * @param {number} input_width
- * @param {number} input_height
- * @param {number} factor
- * @returns {Uint32Array}
- */
-export function resize(input_image, input_width, input_height, factor) {
-  var ptr0 = passArray32ToWasm0(input_image, wasm.__wbindgen_malloc);
-  var len0 = WASM_VECTOR_LEN;
-  wasm.resize(8, ptr0, len0, input_width, input_height, factor);
-  var r0 = getInt32Memory0()[8 / 4 + 0];
-  var r1 = getInt32Memory0()[8 / 4 + 1];
-  var v1 = getArrayU32FromWasm0(r0, r1).slice();
-  wasm.__wbindgen_free(r0, r1 * 4);
-  return v1;
-}
-
-async function load(module, imports) {
-  if (typeof Response === 'function' && module instanceof Response) {
-    if (typeof WebAssembly.instantiateStreaming === 'function') {
-      try {
-        return await WebAssembly.instantiateStreaming(module, imports);
-      } catch (e) {
-        if (module.headers.get('Content-Type') != 'application/wasm') {
-          console.warn(
-            '`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n',
-            e,
-          );
-        } else {
-          throw e;
-        }
-      }
-    }
-
-    const bytes = await module.arrayBuffer();
-    return await WebAssembly.instantiate(bytes, imports);
-  } else {
-    const instance = await WebAssembly.instantiate(module, imports);
-
-    if (instance instanceof WebAssembly.Instance) {
-      return { instance, module };
-    } else {
-      return instance;
-    }
-  }
-}
-
-async function init(input) {
-  if (typeof input === 'undefined') {
-    input = import.meta.url.replace(/\.js$/, '_bg.wasm');
-  }
-  const imports = {};
-
-  if (
-    typeof input === 'string' ||
-    (typeof Request === 'function' && input instanceof Request) ||
-    (typeof URL === 'function' && input instanceof URL)
-  ) {
-    input = fetch(input);
-  }
-
-  const { instance, module } = await load(await input, imports);
-
-  wasm = instance.exports;
-  init.__wbindgen_wasm_module = module;
-
-  return wasm;
-}
-
-export default init;
+import * as wasm from "./squooshhqx_bg.wasm";
+export * from "./squooshhqx_bg.js";

codecs/hqx/pkg/squooshhqx_bg.js

@@ -0,0 +1,48 @@
+import * as wasm from './squooshhqx_bg.wasm';
+
+let cachegetUint32Memory0 = null;
+function getUint32Memory0() {
+    if (cachegetUint32Memory0 === null || cachegetUint32Memory0.buffer !== wasm.memory.buffer) {
+        cachegetUint32Memory0 = new Uint32Array(wasm.memory.buffer);
+    }
+    return cachegetUint32Memory0;
+}
+
+let WASM_VECTOR_LEN = 0;
+
+function passArray32ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 4);
+    getUint32Memory0().set(arg, ptr / 4);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+let cachegetInt32Memory0 = null;
+function getInt32Memory0() {
+    if (cachegetInt32Memory0 === null || cachegetInt32Memory0.buffer !== wasm.memory.buffer) {
+        cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer);
+    }
+    return cachegetInt32Memory0;
+}
+
+function getArrayU32FromWasm0(ptr, len) {
+    return getUint32Memory0().subarray(ptr / 4, ptr / 4 + len);
+}
+/**
+* @param {Uint32Array} input_image
+* @param {number} input_width
+* @param {number} input_height
+* @param {number} factor
+* @returns {Uint32Array}
+*/
+export function resize(input_image, input_width, input_height, factor) {
+    var ptr0 = passArray32ToWasm0(input_image, wasm.__wbindgen_malloc);
+    var len0 = WASM_VECTOR_LEN;
+    wasm.resize(8, ptr0, len0, input_width, input_height, factor);
+    var r0 = getInt32Memory0()[8 / 4 + 0];
+    var r1 = getInt32Memory0()[8 / 4 + 1];
+    var v1 = getArrayU32FromWasm0(r0, r1).slice();
+    wasm.__wbindgen_free(r0, r1 * 4);
+    return v1;
+}
+

codecs/imagequant/Makefile

@@ -18,9 +18,7 @@ all: $(OUT_JS)
 		--closure 1 \
 		-s ALLOW_MEMORY_GROWTH=1 \
 		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
-		-s ENVIRONMENT='worker' \
-		-s EXPORT_ES6=1 \
+		-s 'EXPORT_NAME="$(basename $(@F))"' \
 		-o $@ \
 		$+
 

codecs/imagequant/example.html

@@ -1,17 +1,18 @@
-<!DOCTYPE html>
+<!doctype html>
 <style>
   canvas {
     image-rendering: pixelated;
   }
 </style>
-<script type="module">
-  import imagequant from './imagequant.js';
+<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));
+    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];
@@ -21,32 +22,19 @@
     return ctx.getImageData(0, 0, img.width, img.height);
   }
 
-  async function main() {
-    const module = await imagequant();
-
-    console.log('Version:', module.version().toString(16));
+  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.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');
 
-    const imageData = new ImageData(
-      new Uint8ClampedArray(rawImage.buffer),
-      image.width,
-      image.height,
-    );
+    const imageData = new ImageData(new Uint8ClampedArray(rawImage.buffer), image.width, image.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);
-  }
-
-  main();
+  };
 </script>

codecs/imagequant/imagequant.d.ts

@@ -1,19 +1,6 @@
-export interface QuantizerModule extends EmscriptenWasm.Module {
-  quantize(
-    data: BufferSource,
-    width: number,
-    height: number,
-    numColors: number,
-    dither: number,
-  ): Uint8ClampedArray;
-  zx_quantize(
-    data: BufferSource,
-    width: number,
-    height: number,
-    dither: number,
-  ): Uint8ClampedArray;
+interface QuantizerModule extends EmscriptenWasm.Module {
+  quantize(data: BufferSource, width: number, height: number, numColors: number, dither: number): Uint8ClampedArray;
+  zx_quantize(data: BufferSource, width: number, height: number, dither: number): Uint8ClampedArray;
 }
 
-declare var moduleFactory: EmscriptenWasm.ModuleFactory<QuantizerModule>;
-
-export default moduleFactory;
+export default function(opts: EmscriptenWasm.ModuleOpts): Promise<QuantizerModule>;

codecs/jxl/Makefile

@@ -1,59 +0,0 @@
-CODEC_URL = https://gitlab.com/wg1/jpeg-xl.git
-CODEC_VERSION = v0.1
-CODEC_DIR = node_modules/jxl
-CODEC_BUILD_DIR := $(CODEC_DIR)/build
-CODEC_OUT := $(CODEC_BUILD_DIR)/lib/libjxl.a
-
-OUT_JS = enc/jxl_enc.js dec/jxl_dec.js
-OUT_WASM = $(OUT_JS:.js=.wasm)
-
-.PHONY: all clean
-
-all: $(OUT_JS)
-
-%.js: %.cpp $(LIBAOM_OUT) $(CODEC_OUT)
-	$(CXX) \
-		-I $(CODEC_DIR) \
-		-I $(CODEC_DIR)/lib \
-		-I $(CODEC_DIR)/lib/include \
-		-I $(CODEC_BUILD_DIR)/lib/include \
-		-I $(CODEC_DIR)/third_party/highway \
-		-I $(CODEC_DIR)/third_party/skcms \
-		-I $(CODEC_DIR)/third_party/brunsli \
-		-I $(CODEC_DIR)/third_party/brunsli/c/include \
-		${CXXFLAGS} \
-		${LDFLAGS} \
-		--bind \
-		--closure 1 \
-		-s ALLOW_MEMORY_GROWTH=1 \
-		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
-		-s ENVIRONMENT='worker' \
-		-s EXPORT_ES6=1 \
-		-s EXPORT_NAME="$(basename $(@F))" \
-		-o $@ \
-		$+ \
-		$(CODEC_BUILD_DIR)/artifacts/libbrunslienc-static.bc \
-		$(CODEC_BUILD_DIR)/artifacts/libbrunslicommon-static.bc \
-		$(CODEC_BUILD_DIR)/artifacts/libbrunslidec-static.bc \
-		$(CODEC_BUILD_DIR)/third_party/brotli/libbrotlidec-static.a \
-		$(CODEC_BUILD_DIR)/third_party/brotli/libbrotlienc-static.a \
-		$(CODEC_BUILD_DIR)/third_party/brotli/libbrotlicommon-static.a \
-		$(CODEC_BUILD_DIR)/third_party/libskcms.a \
-		$(CODEC_BUILD_DIR)/third_party/highway/libhwy.a
-
-$(CODEC_OUT): $(CODEC_DIR)/CMakeLists.txt
-	mkdir -p $(CODEC_BUILD_DIR)
-	cd $(CODEC_BUILD_DIR) && \
-	emcmake cmake ../ && \
-	$(MAKE) jxl-static
-
-$(CODEC_DIR)/CMakeLists.txt: $(CODEC_DIR)
-
-$(CODEC_DIR):
-	mkdir -p $@
-	git clone $(CODEC_URL) --recursive -j`nproc` --depth 1 --branch $(CODEC_VERSION) $@
-
-clean:
-	$(RM) $(OUT_JS) $(OUT_WASM)
-	$(MAKE) -C $(CODEC_BUILD_DIR) clean

codecs/jxl/dec/jxl_dec.cpp

@@ -1,93 +0,0 @@
-#include <emscripten/bind.h>
-#include <emscripten/val.h>
-
-#include <jxl/decode.h>
-#include "lib/jxl/color_encoding_internal.h"
-
-#include "skcms.h"
-
-using namespace emscripten;
-
-thread_local const val Uint8ClampedArray = val::global("Uint8ClampedArray");
-thread_local const val ImageData = val::global("ImageData");
-
-// R, G, B, A
-#define COMPONENTS_PER_PIXEL 4
-
-#ifndef JXL_DEBUG_ON_ALL_ERROR
-#define JXL_DEBUG_ON_ALL_ERROR 0
-#endif
-
-#if JXL_DEBUG_ON_ALL_ERROR
-#define EXPECT_TRUE(a)                                             \
-  if (!(a)) {                                                      \
-    fprintf(stderr, "Assertion failure (%d): %s\n", __LINE__, #a); \
-    return val::null();                                            \
-  }
-#define EXPECT_EQ(a, b)                                                                          \
-  {                                                                                              \
-    int a_ = a;                                                                                  \
-    int b_ = b;                                                                                  \
-    if (a_ != b_) {                                                                              \
-      fprintf(stderr, "Assertion failure (%d): %s (%d) != %s (%d)\n", __LINE__, #a, a_, #b, b_); \
-      return val::null();                                                                        \
-    }                                                                                            \
-  }
-#else
-#define EXPECT_TRUE(a)  \
-  if (!(a)) {           \
-    return val::null(); \
-  }
-
-#define EXPECT_EQ(a, b) EXPECT_TRUE((a) == (b));
-#endif
-
-val decode(std::string data) {
-  std::unique_ptr<JxlDecoder,
-                  std::integral_constant<decltype(&JxlDecoderDestroy), JxlDecoderDestroy>>
-      dec(JxlDecoderCreate(nullptr));
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderSubscribeEvents(
-                dec.get(), JXL_DEC_BASIC_INFO | JXL_DEC_COLOR_ENCODING | JXL_DEC_FULL_IMAGE));
-
-  auto next_in = (const uint8_t*)data.c_str();
-  auto avail_in = data.size();
-  EXPECT_EQ(JXL_DEC_BASIC_INFO, JxlDecoderProcessInput(dec.get(), &next_in, &avail_in));
-  JxlBasicInfo info;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetBasicInfo(dec.get(), &info));
-  size_t pixel_count = info.xsize * info.ysize;
-  size_t component_count = pixel_count * COMPONENTS_PER_PIXEL;
-
-  EXPECT_EQ(JXL_DEC_COLOR_ENCODING, JxlDecoderProcessInput(dec.get(), &next_in, &avail_in));
-  static const JxlPixelFormat format = {COMPONENTS_PER_PIXEL, JXL_TYPE_FLOAT, JXL_LITTLE_ENDIAN, 0};
-  size_t icc_size;
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderGetICCProfileSize(dec.get(), &format,
-                                                         JXL_COLOR_PROFILE_TARGET_DATA, &icc_size));
-  std::vector<uint8_t> icc_profile(icc_size);
-  EXPECT_EQ(JXL_DEC_SUCCESS,
-            JxlDecoderGetColorAsICCProfile(dec.get(), &format, JXL_COLOR_PROFILE_TARGET_DATA,
-                                           icc_profile.data(), icc_profile.size()));
-
-  auto float_pixels = std::make_unique<float[]>(component_count);
-  EXPECT_EQ(JXL_DEC_SUCCESS, JxlDecoderSetImageOutBuffer(dec.get(), &format, float_pixels.get(),
-                                                         component_count * sizeof(float)));
-  EXPECT_EQ(JXL_DEC_FULL_IMAGE, JxlDecoderProcessInput(dec.get(), &next_in, &avail_in));
-
-  auto byte_pixels = std::make_unique<uint8_t[]>(component_count);
-  // Convert to sRGB.
-  skcms_ICCProfile jxl_profile;
-  EXPECT_TRUE(skcms_Parse(icc_profile.data(), icc_profile.size(), &jxl_profile));
-  EXPECT_TRUE(skcms_Transform(
-      float_pixels.get(), skcms_PixelFormat_RGBA_ffff,
-      info.alpha_premultiplied ? skcms_AlphaFormat_PremulAsEncoded : skcms_AlphaFormat_Unpremul,
-      &jxl_profile, byte_pixels.get(), skcms_PixelFormat_RGBA_8888, skcms_AlphaFormat_Unpremul,
-      skcms_sRGB_profile(), pixel_count));
-
-  return ImageData.new_(
-      Uint8ClampedArray.new_(typed_memory_view(component_count, byte_pixels.get())), info.xsize,
-      info.ysize);
-}
-
-EMSCRIPTEN_BINDINGS(my_module) {
-  function("decode", &decode);
-}

codecs/jxl/dec/jxl_dec.d.ts

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

codecs/jxl/enc/jxl_enc.cpp

@@ -1,124 +0,0 @@
-#include <emscripten/bind.h>
-#include <emscripten/val.h>
-
-#include "lib/jxl/enc_file.h"
-#include "lib/jxl/external_image.h"
-
-using namespace emscripten;
-
-thread_local const val Uint8Array = val::global("Uint8Array");
-
-struct JXLOptions {
-  // 1 = slowest
-  // 7 = fastest
-  int speed;
-  float quality;
-  bool progressive;
-  int epf;
-  int nearLossless;
-  bool lossyPalette;
-};
-
-val encode(std::string image, int width, int height, JXLOptions options) {
-  jxl::CompressParams cparams;
-  jxl::PassesEncoderState passes_enc_state;
-  jxl::CodecInOut io;
-  jxl::PaddedBytes bytes;
-  jxl::ImageBundle* main = &io.Main();
-
-  cparams.epf = options.epf;
-  cparams.speed_tier = static_cast<jxl::SpeedTier>(options.speed);
-  cparams.near_lossless = options.nearLossless;
-
-  if (options.lossyPalette) {
-    cparams.lossy_palette = true;
-    cparams.palette_colors = 0;
-    cparams.options.predictor = jxl::Predictor::Zero;
-  }
-
-  // Reduce memory usage of tree learning for lossless data.
-  // TODO(veluca93): this is a mitigation for excessive memory usage in the JXL encoder.
-  float megapixels = width * height * 0.000001;
-  if (megapixels > 8) {
-    cparams.options.nb_repeats = 0.1;
-  } else if (megapixels > 4) {
-    cparams.options.nb_repeats = 0.3;
-  } else {
-    // default is OK.
-  }
-
-  float quality = options.quality;
-
-  // Quality settings roughly match libjpeg qualities.
-  if (quality < 7 || quality == 100) {
-    cparams.modular_mode = true;
-    // Internal modular quality to roughly match VarDCT size.
-    cparams.quality_pair.first = cparams.quality_pair.second =
-        std::min(35 + (quality - 7) * 3.0f, 100.0f);
-  } else {
-    cparams.modular_mode = false;
-    if (quality >= 30) {
-      cparams.butteraugli_distance = 0.1 + (100 - quality) * 0.09;
-    } else {
-      cparams.butteraugli_distance = 6.4 + pow(2.5, (30 - quality) / 5.0f) / 6.25f;
-    }
-  }
-
-  if (options.progressive) {
-    cparams.qprogressive_mode = true;
-    cparams.responsive = 1;
-    if (!cparams.modular_mode) {
-      cparams.progressive_dc = 1;
-    }
-  }
-
-  if (cparams.modular_mode) {
-    if (cparams.quality_pair.first != 100 || cparams.quality_pair.second != 100) {
-      cparams.color_transform = jxl::ColorTransform::kXYB;
-    } else {
-      cparams.color_transform = jxl::ColorTransform::kNone;
-    }
-  }
-
-  if (cparams.near_lossless) {
-    // Near-lossless assumes -R 0
-    cparams.responsive = 0;
-    cparams.modular_mode = true;
-  }
-
-  io.metadata.m.SetAlphaBits(8);
-  if (!io.metadata.size.Set(width, height)) {
-    return val::null();
-  }
-
-  uint8_t* inBuffer = (uint8_t*)image.c_str();
-
-  auto result = jxl::ConvertImage(
-      jxl::Span<const uint8_t>(reinterpret_cast<const uint8_t*>(image.data()), image.size()), width,
-      height, jxl::ColorEncoding::SRGB(/*is_gray=*/false), /*has_alpha=*/true,
-      /*alpha_is_premultiplied=*/false, /*bits_per_alpha=*/8, /*bits_per_sample=*/8,
-      /*big_endian=*/false, /*flipped_y=*/false, /*pool=*/nullptr, main);
-
-  if (!result) {
-    return val::null();
-  }
-
-  auto js_result = val::null();
-  if (EncodeFile(cparams, &io, &passes_enc_state, &bytes)) {
-    js_result = Uint8Array.new_(typed_memory_view(bytes.size(), bytes.data()));
-  }
-
-  return js_result;
-}
-
-EMSCRIPTEN_BINDINGS(my_module) {
-  value_object<JXLOptions>("JXLOptions")
-      .field("speed", &JXLOptions::speed)
-      .field("quality", &JXLOptions::quality)
-      .field("progressive", &JXLOptions::progressive)
-      .field("nearLossless", &JXLOptions::nearLossless)
-      .field("lossyPalette", &JXLOptions::lossyPalette)
-      .field("epf", &JXLOptions::epf);
-
-  function("encode", &encode);
-}

codecs/jxl/enc/jxl_enc.d.ts

@@ -1,21 +0,0 @@
-export interface EncodeOptions {
-  speed: number;
-  quality: number;
-  progressive: boolean;
-  epf: number;
-  nearLossless: number;
-  lossyPalette: boolean;
-}
-
-export interface JXLModule extends EmscriptenWasm.Module {
-  encode(
-    data: BufferSource,
-    width: number,
-    height: number,
-    options: EncodeOptions,
-  ): Uint8Array | null;
-}
-
-declare var moduleFactory: EmscriptenWasm.ModuleFactory<JXLModule>;
-
-export default moduleFactory;

codecs/jxl/package.json

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

codecs/mozjpeg_enc/Makefile

@@ -14,13 +14,11 @@ all: $(OUT_JS)
 		-I $(CODEC_DIR) \
 		${CXXFLAGS} \
 		${LDFLAGS} \
-		--closure 1 \
 		--bind \
+		--closure 1 \
 		-s ALLOW_MEMORY_GROWTH=1 \
 		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
-		-s ENVIRONMENT='worker' \
-		-s EXPORT_ES6=1 \
+		-s 'EXPORT_NAME="$(basename $(@F))"' \
 		-o $@ \
 		$+
 

codecs/mozjpeg_enc/example.html

@@ -1,12 +1,13 @@
-<!DOCTYPE html>
-<script type="module">
-  import mozjpeg_enc from './mozjpeg_enc.js';
+<!doctype html>
+<script src='mozjpeg_enc.js'></script>
+<script>
+  const module = mozjpeg_enc();
 
   async function loadImage(src) {
     // Load image
     const img = document.createElement('img');
     img.src = src;
-    await new Promise((resolve) => (img.onload = resolve));
+    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];
@@ -16,9 +17,7 @@
     return ctx.getImageData(0, 0, img.width, img.height);
   }
 
-  async function main() {
-    const module = await mozjpeg_enc();
-
+  module.onRuntimeInitialized = async _ => {
     console.log('Version:', module.version().toString(16));
     const image = await loadImage('../example.png');
     const result = module.encode(image.data, image.width, image.height, {
@@ -40,12 +39,10 @@
       chroma_quality: 75,
     });
 
-    const blob = new Blob([result], { type: 'image/jpeg' });
+    const blob = new Blob([result], {type: 'image/jpeg'});
     const blobURL = URL.createObjectURL(blob);
     const img = document.createElement('img');
     img.src = blobURL;
     document.body.appendChild(img);
-  }
-
-  main();
+  };
 </script>

codecs/mozjpeg_enc/mozjpeg_enc.d.ts

@@ -1,37 +1,7 @@
-export const enum MozJpegColorSpace {
-  GRAYSCALE = 1,
-  RGB,
-  YCbCr,
+import { EncodeOptions } from '../../src/codecs/mozjpeg/encoder-meta';
+
+interface MozJPEGModule extends EmscriptenWasm.Module {
+  encode(data: BufferSource, width: number, height: number, options: EncodeOptions): Uint8Array;
 }
 
-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 MozJPEGModule extends EmscriptenWasm.Module {
-  encode(
-    data: BufferSource,
-    width: number,
-    height: number,
-    options: EncodeOptions,
-  ): Uint8Array;
-}
-
-declare var moduleFactory: EmscriptenWasm.ModuleFactory<MozJPEGModule>;
-
-export default moduleFactory;
+export default function(opts: EmscriptenWasm.ModuleOpts): Promise<MozJPEGModule>;

codecs/oxipng/Cargo.lock

@@ -56,9 +56,9 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"
 
 [[package]]
 name = "cc"
-version = "1.0.62"
+version = "1.0.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1770ced377336a88a67c473594ccc14eca6f4559217c34f64aac8f83d641b40"
+checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c"
 
 [[package]]
 name = "cfg-if"
@@ -66,12 +66,6 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
 
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
 [[package]]
 name = "cloudflare-zlib"
 version = "0.2.5"
@@ -90,18 +84,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "color_quant"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
-
-[[package]]
-name = "const_fn"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c478836e029dcef17fb47c89023448c64f781a046e0300e257ad8225ae59afab"
-
 [[package]]
 name = "crc"
 version = "1.8.1"
@@ -113,57 +95,57 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
+checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.0"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
+checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87"
 dependencies = [
- "cfg-if 1.0.0",
  "crossbeam-utils",
+ "maybe-uninit",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
+checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285"
 dependencies = [
- "cfg-if 1.0.0",
  "crossbeam-epoch",
  "crossbeam-utils",
+ "maybe-uninit",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f"
+checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
 dependencies = [
- "cfg-if 1.0.0",
- "const_fn",
+ "autocfg",
+ "cfg-if",
  "crossbeam-utils",
  "lazy_static",
+ "maybe-uninit",
  "memoffset",
  "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec91540d98355f690a86367e566ecad2e9e579f230230eb7c21398372be73ea5"
+checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
  "autocfg",
- "cfg-if 1.0.0",
- "const_fn",
+ "cfg-if",
  "lazy_static",
 ]
 
@@ -185,28 +167,27 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
 
 [[package]]
 name = "hashbrown"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
+checksum = "00d63df3d41950fb462ed38308eea019113ad1508da725bbedcd0fa5a85ef5f7"
 
 [[package]]
 name = "hermit-abi"
-version = "0.1.17"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8"
+checksum = "4c30f6d0bc6b00693347368a67d41b58f2fb851215ff1da49e90fe2c5c667151"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "image"
-version = "0.23.11"
+version = "0.23.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f0a8345b33b082aedec2f4d7d4a926b845cee184cbe78b703413066564431b"
+checksum = "974e194911d1f7efe3cd8a8f9db3b767e43536327e899e8bc9a12ef5711b74d2"
 dependencies = [
  "bytemuck",
  "byteorder",
- "color_quant",
  "num-iter",
  "num-rational",
  "num-traits",
@@ -241,24 +222,24 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.80"
+version = "0.2.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614"
+checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235"
 
 [[package]]
 name = "libdeflate-sys"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f5b1582a0ebf8c55a46166c04d7c66f6bb17add3a6cbf69a082ac2219f31671"
+checksum = "21e39efa87b84db3e13ff4e2dfac1e57220abcbd7fe8ec44d238f7f4f787cc1f"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "libdeflater"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93edd93a53970951da84ef733a8b6e30189a8f8a9e19610f69e4cc5bb1f4d654"
+checksum = "a4810980d791f26d470e2d7d91a3d4d22aa3a4b709fb7e9c5e43ee54f83a01f2"
 dependencies = [
  "libdeflate-sys",
 ]
@@ -269,9 +250,15 @@ version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
 ]
 
+[[package]]
+name = "maybe-uninit"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
+
 [[package]]
 name = "memoffset"
 version = "0.5.6"
@@ -292,9 +279,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.4.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d"
+checksum = "c60c0dfe32c10b43a144bad8fc83538c52f58302c92300ea7ec7bf7b38d5a7b9"
 dependencies = [
  "adler",
  "autocfg",
@@ -302,9 +289,9 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.44"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
+checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b"
 dependencies = [
  "autocfg",
  "num-traits",
@@ -312,9 +299,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.42"
+version = "0.1.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59"
+checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -323,9 +310,9 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.3.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
+checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -334,9 +321,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.14"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
 dependencies = [
  "autocfg",
 ]
@@ -353,15 +340,14 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.5.2"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad"
 
 [[package]]
 name = "oxipng"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fefb26bde273c3db896a313151301a69e698a7495ee577fe2168ed7065c29c4"
+version = "3.0.1"
+source = "git+https://github.com/RReverser/oxipng?branch=crossbeam#d0f86d2e84eb55b423b8ad194a176e71ba3aa2c3"
 dependencies = [
  "bit-vec",
  "byteorder",
@@ -373,19 +359,11 @@ dependencies = [
  "itertools",
  "libdeflater",
  "log",
- "miniz_oxide 0.4.3",
+ "miniz_oxide 0.4.2",
  "rayon",
  "rgb",
  "rustc_version",
-]
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
+ "zopfli",
 ]
 
 [[package]]
@@ -402,9 +380,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c"
 dependencies = [
  "unicode-xid",
 ]
@@ -420,9 +398,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.5.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
+checksum = "cfd016f0c045ad38b5251be2c9c0ab806917f82da4d36b2a327e5166adad9270"
 dependencies = [
  "autocfg",
  "crossbeam-deque",
@@ -432,9 +410,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.9.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
+checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-deque",
@@ -454,9 +432,9 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.3.0"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65c94201b44764d6d1f7e37c15a8289ed55e546c1762c7f1d57f616966e0c181"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 dependencies = [
  "semver",
 ]
@@ -469,21 +447,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "semver"
-version = "0.11.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 dependencies = [
  "semver-parser",
 ]
 
 [[package]]
 name = "semver-parser"
-version = "0.10.1"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ef146c2ad5e5f4b037cd6ce2ebb775401729b19a82040c1beac9d36c7d1428"
-dependencies = [
- "pest",
-]
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "squoosh-oxipng"
@@ -499,9 +474,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.48"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac"
+checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -509,10 +484,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "ucd-trie"
-version = "0.1.3"
+name = "typed-arena"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d"
 
 [[package]]
 name = "unicode-xid"
@@ -526,7 +501,7 @@ version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
@@ -573,3 +548,15 @@ name = "wasm-bindgen-shared"
 version = "0.2.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307"
+
+[[package]]
+name = "zopfli"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4079b79464426ade2a1b0177fb0ce8396ba6b4084267407e333573c666073964"
+dependencies = [
+ "adler32",
+ "byteorder",
+ "crc",
+ "typed-arena",
+]

codecs/oxipng/Cargo.toml

@@ -5,19 +5,19 @@ authors = ["Ingvar Stepanyan <me@rreverser.com>"]
 edition = "2018"
 publish = false
 
-[package.metadata.wasm-pack.profile.release]
-wasm-opt = ["-O", "--no-validation"]
-
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-oxipng = { version = "4.0.0", default-features = false, features = ["libdeflater"] }
-wasm-bindgen = "0.2.68"
-log = { version = "0.4.11", features = ["release_max_level_off"] }
-rayon = { version = "1.5.0", optional = true }
-once_cell = { version = "1.5.2", optional = true }
-crossbeam-channel = { version = "0.5.0", optional = true }
+oxipng = { version = "3.0.0", default-features = false }
+wasm-bindgen = "0.2.64"
+log = { version = "0.4", features = ["release_max_level_off"] }
+rayon = { version = "1.3.0", optional = true }
+once_cell = { version = "1.3.1", optional = true }
+crossbeam-channel = { version = "0.4.2", optional = true }
+
+[patch.crates-io]
+oxipng = { git = "https://github.com/RReverser/oxipng", branch = "crossbeam" }
 
 [profile.release]
 lto = true
@@ -25,3 +25,6 @@ opt-level = "s"
 
 [features]
 parallel = ["oxipng/parallel", "rayon", "crossbeam-channel", "once_cell"]
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = ["-O", "--no-validation"]

codecs/oxipng/build.sh

@@ -3,8 +3,7 @@
 set -e
 
 rm -rf pkg,{-parallel}
-wasm-pack build -t web
+wasm-pack build
 RUSTFLAGS='-C target-feature=+atomics,+bulk-memory' wasm-pack build -t web -d pkg-parallel -- -Z build-std=panic_abort,std --features=parallel
-# Workaround https://github.com/rustwasm/wasm-bindgen/issues/2133:
-sed -i "s|maybe_memory:|maybe_memory?:|" pkg-parallel/squoosh_oxipng.d.ts
+sed -i "s|input = import.meta.url.replace(/\\\.js$/, '_bg.wasm');||" pkg{,-parallel}/squoosh_oxipng.js
 rm pkg{,-parallel}/.gitignore

codecs/oxipng/index.ts

@@ -0,0 +1,10 @@
+import { threads } from 'wasm-feature-detect';
+
+async function init() {
+  if (await threads()) {
+    return (await import('./spawn')).default;
+  }
+  return import('./pkg');
+}
+
+export default init();

codecs/oxipng/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oxipng",
   "scripts": {
-    "build": "RUST_IMG=rustlang/rust@sha256:744aeea5a38f95aa7a96ec37269a65f0c6197a1cdd87d6534e12bb869141d807 ../build-rust.sh ./build.sh"
+    "build": "../build-rust-nightly.sh ./build.sh"
   }
 }

codecs/oxipng/pkg-parallel/squoosh_oxipng.d.ts

@@ -1,12 +1,6 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
-* @param {Uint8Array} data
-* @param {number} level
-* @returns {Uint8Array}
-*/
-export function optimise(data: Uint8Array, level: number): Uint8Array;
-/**
 * @param {number} num
 * @returns {any}
 */
@@ -17,16 +11,22 @@ export function start_main_thread(): void;
 /**
 */
 export function start_worker_thread(): void;
+/**
+* @param {Uint8Array} data
+* @param {number} level
+* @returns {Uint8Array}
+*/
+export function optimise(data: Uint8Array, level: number): Uint8Array;
 
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
-  readonly optimise: (a: number, b: number, c: number, d: number) => void;
   readonly malloc: (a: number) => number;
   readonly free: (a: number) => void;
   readonly worker_initializer: (a: number) => number;
   readonly start_main_thread: () => void;
   readonly start_worker_thread: () => void;
+  readonly optimise: (a: number, b: number, c: number, d: number) => void;
   readonly __wbindgen_export_0: WebAssembly.Memory;
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
@@ -42,5 +42,5 @@ export interface InitOutput {
 *
 * @returns {Promise<InitOutput>}
 */
-export default function init (module_or_path?: InitInput | Promise<InitInput>, maybe_memory?: WebAssembly.Memory): Promise<InitOutput>;
+export default function init (module_or_path?: InitInput | Promise<InitInput>, maybe_memory: WebAssembly.Memory): Promise<InitOutput>;
         

codecs/oxipng/pkg-parallel/squoosh_oxipng.js

@@ -33,6 +33,40 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8Memory0().slice(ptr, ptr + len));
 }
 
+function getObject(idx) { return heap[idx]; }
+
+function dropObject(idx) {
+    if (idx < 36) return;
+    heap[idx] = heap_next;
+    heap_next = idx;
+}
+
+function takeObject(idx) {
+    const ret = getObject(idx);
+    dropObject(idx);
+    return ret;
+}
+/**
+* @param {number} num
+* @returns {any}
+*/
+export function worker_initializer(num) {
+    var ret = wasm.worker_initializer(num);
+    return takeObject(ret);
+}
+
+/**
+*/
+export function start_main_thread() {
+    wasm.start_main_thread();
+}
+
+/**
+*/
+export function start_worker_thread() {
+    wasm.start_worker_thread();
+}
+
 let WASM_VECTOR_LEN = 0;
 
 function passArray8ToWasm0(arg, malloc) {
@@ -75,40 +109,6 @@ export function optimise(data, level) {
     }
 }
 
-function getObject(idx) { return heap[idx]; }
-
-function dropObject(idx) {
-    if (idx < 36) return;
-    heap[idx] = heap_next;
-    heap_next = idx;
-}
-
-function takeObject(idx) {
-    const ret = getObject(idx);
-    dropObject(idx);
-    return ret;
-}
-/**
-* @param {number} num
-* @returns {any}
-*/
-export function worker_initializer(num) {
-    var ret = wasm.worker_initializer(num);
-    return takeObject(ret);
-}
-
-/**
-*/
-export function start_main_thread() {
-    wasm.start_main_thread();
-}
-
-/**
-*/
-export function start_worker_thread() {
-    wasm.start_worker_thread();
-}
-
 async function load(module, imports, maybe_memory) {
     if (typeof Response === 'function' && module instanceof Response) {
         memory = imports.wbg.memory = new WebAssembly.Memory({initial:17,maximum:16384,shared:true});
@@ -144,7 +144,7 @@ async function load(module, imports, maybe_memory) {
 
 async function init(input, maybe_memory) {
     if (typeof input === 'undefined') {
-        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
+        
     }
     const imports = {};
     imports.wbg = {};

codecs/oxipng/pkg-parallel/squoosh_oxipng_bg.wasm.d.ts

@@ -1,11 +1,11 @@
 /* tslint:disable */
 /* eslint-disable */
-export function optimise(a: number, b: number, c: number, d: number): void;
 export function malloc(a: number): number;
 export function free(a: number): void;
 export function worker_initializer(a: number): number;
 export function start_main_thread(): void;
 export function start_worker_thread(): void;
+export function optimise(a: number, b: number, c: number, d: number): void;
 export const __wbindgen_export_0: WebAssembly.Memory;
 export function __wbindgen_malloc(a: number): number;
 export function __wbindgen_free(a: number, b: number): void;

codecs/oxipng/pkg/squoosh_oxipng.d.ts

@@ -6,25 +6,3 @@
 * @returns {Uint8Array}
 */
 export function optimise(data: Uint8Array, level: number): Uint8Array;
-
-export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
-
-export interface InitOutput {
-  readonly memory: WebAssembly.Memory;
-  readonly optimise: (a: number, b: number, c: number, d: number) => void;
-  readonly malloc: (a: number) => number;
-  readonly free: (a: number) => void;
-  readonly __wbindgen_malloc: (a: number) => number;
-  readonly __wbindgen_free: (a: number, b: number) => void;
-}
-
-/**
-* If `module_or_path` is {RequestInfo} or {URL}, makes a request and
-* for everything else, calls `WebAssembly.instantiate` directly.
-*
-* @param {InitInput | Promise<InitInput>} module_or_path
-*
-* @returns {Promise<InitOutput>}
-*/
-export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
-        

codecs/oxipng/pkg/squoosh_oxipng.js

@@ -1,118 +1,2 @@
-
-let wasm;
-
-let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true });
-
-cachedTextDecoder.decode();
-
-let cachegetUint8Memory0 = null;
-function getUint8Memory0() {
-    if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) {
-        cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer);
-    }
-    return cachegetUint8Memory0;
-}
-
-function getStringFromWasm0(ptr, len) {
-    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
-}
-
-let WASM_VECTOR_LEN = 0;
-
-function passArray8ToWasm0(arg, malloc) {
-    const ptr = malloc(arg.length * 1);
-    getUint8Memory0().set(arg, ptr / 1);
-    WASM_VECTOR_LEN = arg.length;
-    return ptr;
-}
-
-let cachegetInt32Memory0 = null;
-function getInt32Memory0() {
-    if (cachegetInt32Memory0 === null || cachegetInt32Memory0.buffer !== wasm.memory.buffer) {
-        cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer);
-    }
-    return cachegetInt32Memory0;
-}
-
-function getArrayU8FromWasm0(ptr, len) {
-    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
-}
-/**
-* @param {Uint8Array} data
-* @param {number} level
-* @returns {Uint8Array}
-*/
-export function optimise(data, level) {
-    try {
-        const retptr = wasm.__wbindgen_export_0.value - 16;
-        wasm.__wbindgen_export_0.value = retptr;
-        var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
-        var len0 = WASM_VECTOR_LEN;
-        wasm.optimise(retptr, ptr0, len0, level);
-        var r0 = getInt32Memory0()[retptr / 4 + 0];
-        var r1 = getInt32Memory0()[retptr / 4 + 1];
-        var v1 = getArrayU8FromWasm0(r0, r1).slice();
-        wasm.__wbindgen_free(r0, r1 * 1);
-        return v1;
-    } finally {
-        wasm.__wbindgen_export_0.value += 16;
-    }
-}
-
-async function load(module, imports) {
-    if (typeof Response === 'function' && module instanceof Response) {
-
-        if (typeof WebAssembly.instantiateStreaming === 'function') {
-            try {
-                return await WebAssembly.instantiateStreaming(module, imports);
-
-            } catch (e) {
-                if (module.headers.get('Content-Type') != 'application/wasm') {
-                    console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
-
-                } else {
-                    throw e;
-                }
-            }
-        }
-
-        const bytes = await module.arrayBuffer();
-        return await WebAssembly.instantiate(bytes, imports);
-
-    } else {
-
-        const instance = await WebAssembly.instantiate(module, imports);
-
-        if (instance instanceof WebAssembly.Instance) {
-            return { instance, module };
-
-        } else {
-            return instance;
-        }
-    }
-}
-
-async function init(input) {
-    if (typeof input === 'undefined') {
-        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
-    }
-    const imports = {};
-    imports.wbg = {};
-    imports.wbg.__wbindgen_throw = function(arg0, arg1) {
-        throw new Error(getStringFromWasm0(arg0, arg1));
-    };
-
-    if (typeof input === 'string' || (typeof Request === 'function' && input instanceof Request) || (typeof URL === 'function' && input instanceof URL)) {
-        input = fetch(input);
-    }
-
-    const { instance, module } = await load(await input, imports);
-
-    wasm = instance.exports;
-    init.__wbindgen_wasm_module = module;
-
-    return wasm;
-}
-
-export default init;
-
+import * as wasm from "./squoosh_oxipng_bg.wasm";
+export * from "./squoosh_oxipng_bg.js";

codecs/oxipng/pkg/squoosh_oxipng_bg.js

@@ -0,0 +1,66 @@
+import * as wasm from './squoosh_oxipng_bg.wasm';
+
+const lTextDecoder = typeof TextDecoder === 'undefined' ? (0, module.require)('util').TextDecoder : TextDecoder;
+
+let cachedTextDecoder = new lTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+
+cachedTextDecoder.decode();
+
+let cachegetUint8Memory0 = null;
+function getUint8Memory0() {
+    if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) {
+        cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer);
+    }
+    return cachegetUint8Memory0;
+}
+
+function getStringFromWasm0(ptr, len) {
+    return cachedTextDecoder.decode(getUint8Memory0().subarray(ptr, ptr + len));
+}
+
+let WASM_VECTOR_LEN = 0;
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1);
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+let cachegetInt32Memory0 = null;
+function getInt32Memory0() {
+    if (cachegetInt32Memory0 === null || cachegetInt32Memory0.buffer !== wasm.memory.buffer) {
+        cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer);
+    }
+    return cachegetInt32Memory0;
+}
+
+function getArrayU8FromWasm0(ptr, len) {
+    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
+}
+/**
+* @param {Uint8Array} data
+* @param {number} level
+* @returns {Uint8Array}
+*/
+export function optimise(data, level) {
+    try {
+        const retptr = wasm.__wbindgen_export_0.value - 16;
+        wasm.__wbindgen_export_0.value = retptr;
+        var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
+        var len0 = WASM_VECTOR_LEN;
+        wasm.optimise(retptr, ptr0, len0, level);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        var v1 = getArrayU8FromWasm0(r0, r1).slice();
+        wasm.__wbindgen_free(r0, r1 * 1);
+        return v1;
+    } finally {
+        wasm.__wbindgen_export_0.value += 16;
+    }
+}
+
+export const __wbindgen_throw = function(arg0, arg1) {
+    throw new Error(getStringFromWasm0(arg0, arg1));
+};
+

codecs/oxipng/spawn.ts

@@ -0,0 +1,65 @@
+import initOxiPNG, {
+  worker_initializer,
+  start_main_thread,
+  optimise,
+} from './pkg-parallel';
+// @ts-ignore
+import wasmUrl from './pkg-parallel/squoosh_oxipng_bg.wasm';
+import { WorkerInit } from './worker';
+
+function initWorker(worker: Worker, workerInit: WorkerInit) {
+  return new Promise((resolve) => {
+    worker.postMessage(workerInit);
+    worker.addEventListener('message', () => resolve(), { once: true });
+  });
+}
+
+async function startMainThread() {
+  const num = navigator.hardwareConcurrency;
+
+  // First, let browser fetch and spawn Workers for our pool in the background.
+  // This is fairly expensive, so we want to start it as early as possible.
+  const workers = Array.from({ length: num }, () => new Promise<Worker>((resolve) => {
+    const w = new Worker('./worker', { type: 'module' });
+    w.addEventListener('message', () => resolve(w), { once: true });
+  }));
+
+  // Meanwhile, asynchronously compile, instantiate and initialise Wasm on our main thread.
+  await initOxiPNG(fetch(wasmUrl), undefined as any);
+
+  // Get module+memory from the Wasm instance.
+  //
+  // Ideally we wouldn't go via Wasm bindings here, since both are just JS variables, but memory is
+  // currently not exposed on the Wasm instance correctly by wasm-bindgen.
+  const workerInit: WorkerInit = worker_initializer(num);
+
+  // Once done, we want to send module+memory to each Worker so that they instantiate Wasm too.
+  // While doing so, we need to wait for Workers to acknowledge that they have received our message.
+  // Ideally this shouldn't be necessary, but Chromium currently doesn't conform to the spec:
+  // https://bugs.chromium.org/p/chromium/issues/detail?id=1075645
+  //
+  // If we didn't do this ping-pong game, the `start_main_thread` below would block the current
+  // thread on an atomic before even *sending* the `postMessage` containing memory,
+  // so Workers would never be able to unblock us back.
+
+  // TODO: remove this line.
+  // It waits for all workers to be created just to repro a possible V8 bug.
+  const resolvedWorkers = await Promise.all(workers);
+
+  await Promise.all(resolvedWorkers.map(worker => initWorker(worker, workerInit)));
+
+  // Finally, instantiate rayon pool - this will use shared Wasm memory to send tasks to the
+  // Workers and then block until they're all ready.
+  start_main_thread();
+
+  return {
+    optimise,
+    freeWorkers: () => {
+      for (const worker of resolvedWorkers) {
+        worker.terminate();
+      }
+    },
+  };
+}
+
+export default () => startMainThread();

codecs/oxipng/src/lib.rs

@@ -1,5 +1,5 @@
-use oxipng::AlphaOptim;
 use wasm_bindgen::prelude::*;
+use oxipng::AlphaOptim;
 
 mod malloc_shim;
 
@@ -8,14 +8,14 @@ pub mod parallel;
 
 #[wasm_bindgen]
 pub fn optimise(data: &[u8], level: u8) -> Vec<u8> {
-    let mut options = oxipng::Options::from_preset(level);
-    options.alphas.insert(AlphaOptim::Black);
-    options.alphas.insert(AlphaOptim::White);
-    options.alphas.insert(AlphaOptim::Up);
-    options.alphas.insert(AlphaOptim::Down);
-    options.alphas.insert(AlphaOptim::Left);
-    options.alphas.insert(AlphaOptim::Right);
+  let mut options = oxipng::Options::from_preset(level);
+  options.alphas.insert(AlphaOptim::Black);
+  options.alphas.insert(AlphaOptim::White);
+  options.alphas.insert(AlphaOptim::Up);
+  options.alphas.insert(AlphaOptim::Down);
+  options.alphas.insert(AlphaOptim::Left);
+  options.alphas.insert(AlphaOptim::Right);
 
-    options.deflate = oxipng::Deflaters::Libdeflater;
-    oxipng::optimize_from_memory(data, &options).unwrap_throw()
+  options.deflate = oxipng::Deflaters::Libdeflater;
+  oxipng::optimize_from_memory(data, &options).unwrap_throw()
 }

codecs/oxipng/src/parallel.rs

@@ -1,4 +1,4 @@
-use crossbeam_channel::{bounded, Receiver, Sender};
+use crossbeam_channel::{Sender, Receiver, bounded};
 use once_cell::sync::OnceCell;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::JsValue;
@@ -35,8 +35,7 @@ extern "C" {
 //    shared memory and blocks the current thread until they're all grabbed.
 // 4) Provide a `worker_initializer` that is expected to be invoked from various workers,
 //    reads one `threadPtr` from the shared channel and starts running it.
-static CHANNEL: OnceCell<(Sender<rayon::ThreadBuilder>, Receiver<rayon::ThreadBuilder>)> =
-    OnceCell::new();
+static CHANNEL: OnceCell<(Sender<rayon::ThreadBuilder>, Receiver<rayon::ThreadBuilder>)> = OnceCell::new();
 
 #[wasm_bindgen]
 pub fn worker_initializer(num: usize) -> JsValue {

codecs/oxipng/worker.ts

@@ -1,9 +1,13 @@
-import initOxiPNG, {
-  start_worker_thread,
-} from 'codecs/oxipng/pkg-parallel/squoosh_oxipng';
+/// <reference lib="webworker" />
+
+import initOxiPNG, { start_worker_thread } from './pkg-parallel';
 
 export type WorkerInit = [WebAssembly.Module, WebAssembly.Memory];
 
+// TODO: remove this line.
+// It allows main thread to wait for a Worker to be created just to repro a possible V8 bug.
+postMessage(null);
+
 addEventListener(
   'message',
   async (event) => {
@@ -15,7 +19,6 @@ addEventListener(
     // Note that we don't need to wait for Wasm instantiation here - it's
     // better to start main thread as early as possible, and then it blocks
     // on a shared atomic anyway until Worker is fully ready.
-    // @ts-ignore
     postMessage(null);
 
     await initOxiPNG(...(event.data as WorkerInit));

codecs/resize/pkg/squoosh_resize.d.ts

@@ -1,60 +1,14 @@
 /* tslint:disable */
 /* eslint-disable */
 /**
- * @param {Uint8Array} input_image
- * @param {number} input_width
- * @param {number} input_height
- * @param {number} output_width
- * @param {number} output_height
- * @param {number} typ_idx
- * @param {boolean} premultiply
- * @param {boolean} color_space_conversion
- * @returns {Uint8Array}
- */
-export function resize(
-  input_image: Uint8Array,
-  input_width: number,
-  input_height: number,
-  output_width: number,
-  output_height: number,
-  typ_idx: number,
-  premultiply: boolean,
-  color_space_conversion: boolean,
-): Uint8Array;
-
-export type InitInput =
-  | RequestInfo
-  | URL
-  | Response
-  | BufferSource
-  | WebAssembly.Module;
-
-export interface InitOutput {
-  readonly memory: WebAssembly.Memory;
-  readonly resize: (
-    a: number,
-    b: number,
-    c: number,
-    d: number,
-    e: number,
-    f: number,
-    g: number,
-    h: number,
-    i: number,
-    j: number,
-  ) => void;
-  readonly __wbindgen_malloc: (a: number) => number;
-  readonly __wbindgen_free: (a: number, b: number) => void;
-}
-
-/**
- * If `module_or_path` is {RequestInfo} or {URL}, makes a request and
- * for everything else, calls `WebAssembly.instantiate` directly.
- *
- * @param {InitInput | Promise<InitInput>} module_or_path
- *
- * @returns {Promise<InitOutput>}
- */
-export default function init(
-  module_or_path?: InitInput | Promise<InitInput>,
-): Promise<InitOutput>;
+* @param {Uint8Array} input_image
+* @param {number} input_width
+* @param {number} input_height
+* @param {number} output_width
+* @param {number} output_height
+* @param {number} typ_idx
+* @param {boolean} premultiply
+* @param {boolean} color_space_conversion
+* @returns {Uint8Array}
+*/
+export function resize(input_image: Uint8Array, input_width: number, input_height: number, output_width: number, output_height: number, typ_idx: number, premultiply: boolean, color_space_conversion: boolean): Uint8Array;

codecs/resize/pkg/squoosh_resize.js

@@ -1,131 +1,2 @@
-let wasm;
-
-let cachegetUint8Memory0 = null;
-function getUint8Memory0() {
-  if (
-    cachegetUint8Memory0 === null ||
-    cachegetUint8Memory0.buffer !== wasm.memory.buffer
-  ) {
-    cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer);
-  }
-  return cachegetUint8Memory0;
-}
-
-let WASM_VECTOR_LEN = 0;
-
-function passArray8ToWasm0(arg, malloc) {
-  const ptr = malloc(arg.length * 1);
-  getUint8Memory0().set(arg, ptr / 1);
-  WASM_VECTOR_LEN = arg.length;
-  return ptr;
-}
-
-let cachegetInt32Memory0 = null;
-function getInt32Memory0() {
-  if (
-    cachegetInt32Memory0 === null ||
-    cachegetInt32Memory0.buffer !== wasm.memory.buffer
-  ) {
-    cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer);
-  }
-  return cachegetInt32Memory0;
-}
-
-function getArrayU8FromWasm0(ptr, len) {
-  return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
-}
-/**
- * @param {Uint8Array} input_image
- * @param {number} input_width
- * @param {number} input_height
- * @param {number} output_width
- * @param {number} output_height
- * @param {number} typ_idx
- * @param {boolean} premultiply
- * @param {boolean} color_space_conversion
- * @returns {Uint8Array}
- */
-export function resize(
-  input_image,
-  input_width,
-  input_height,
-  output_width,
-  output_height,
-  typ_idx,
-  premultiply,
-  color_space_conversion,
-) {
-  var ptr0 = passArray8ToWasm0(input_image, wasm.__wbindgen_malloc);
-  var len0 = WASM_VECTOR_LEN;
-  wasm.resize(
-    8,
-    ptr0,
-    len0,
-    input_width,
-    input_height,
-    output_width,
-    output_height,
-    typ_idx,
-    premultiply,
-    color_space_conversion,
-  );
-  var r0 = getInt32Memory0()[8 / 4 + 0];
-  var r1 = getInt32Memory0()[8 / 4 + 1];
-  var v1 = getArrayU8FromWasm0(r0, r1).slice();
-  wasm.__wbindgen_free(r0, r1 * 1);
-  return v1;
-}
-
-async function load(module, imports) {
-  if (typeof Response === 'function' && module instanceof Response) {
-    if (typeof WebAssembly.instantiateStreaming === 'function') {
-      try {
-        return await WebAssembly.instantiateStreaming(module, imports);
-      } catch (e) {
-        if (module.headers.get('Content-Type') != 'application/wasm') {
-          console.warn(
-            '`WebAssembly.instantiateStreaming` failed because your server does not serve wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n',
-            e,
-          );
-        } else {
-          throw e;
-        }
-      }
-    }
-
-    const bytes = await module.arrayBuffer();
-    return await WebAssembly.instantiate(bytes, imports);
-  } else {
-    const instance = await WebAssembly.instantiate(module, imports);
-
-    if (instance instanceof WebAssembly.Instance) {
-      return { instance, module };
-    } else {
-      return instance;
-    }
-  }
-}
-
-async function init(input) {
-  if (typeof input === 'undefined') {
-    input = import.meta.url.replace(/\.js$/, '_bg.wasm');
-  }
-  const imports = {};
-
-  if (
-    typeof input === 'string' ||
-    (typeof Request === 'function' && input instanceof Request) ||
-    (typeof URL === 'function' && input instanceof URL)
-  ) {
-    input = fetch(input);
-  }
-
-  const { instance, module } = await load(await input, imports);
-
-  wasm = instance.exports;
-  init.__wbindgen_wasm_module = module;
-
-  return wasm;
-}
-
-export default init;
+import * as wasm from "./squoosh_resize_bg.wasm";
+export * from "./squoosh_resize_bg.js";

codecs/resize/pkg/squoosh_resize_bg.js

@@ -0,0 +1,52 @@
+import * as wasm from './squoosh_resize_bg.wasm';
+
+let cachegetUint8Memory0 = null;
+function getUint8Memory0() {
+    if (cachegetUint8Memory0 === null || cachegetUint8Memory0.buffer !== wasm.memory.buffer) {
+        cachegetUint8Memory0 = new Uint8Array(wasm.memory.buffer);
+    }
+    return cachegetUint8Memory0;
+}
+
+let WASM_VECTOR_LEN = 0;
+
+function passArray8ToWasm0(arg, malloc) {
+    const ptr = malloc(arg.length * 1);
+    getUint8Memory0().set(arg, ptr / 1);
+    WASM_VECTOR_LEN = arg.length;
+    return ptr;
+}
+
+let cachegetInt32Memory0 = null;
+function getInt32Memory0() {
+    if (cachegetInt32Memory0 === null || cachegetInt32Memory0.buffer !== wasm.memory.buffer) {
+        cachegetInt32Memory0 = new Int32Array(wasm.memory.buffer);
+    }
+    return cachegetInt32Memory0;
+}
+
+function getArrayU8FromWasm0(ptr, len) {
+    return getUint8Memory0().subarray(ptr / 1, ptr / 1 + len);
+}
+/**
+* @param {Uint8Array} input_image
+* @param {number} input_width
+* @param {number} input_height
+* @param {number} output_width
+* @param {number} output_height
+* @param {number} typ_idx
+* @param {boolean} premultiply
+* @param {boolean} color_space_conversion
+* @returns {Uint8Array}
+*/
+export function resize(input_image, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion) {
+    var ptr0 = passArray8ToWasm0(input_image, wasm.__wbindgen_malloc);
+    var len0 = WASM_VECTOR_LEN;
+    wasm.resize(8, ptr0, len0, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion);
+    var r0 = getInt32Memory0()[8 / 4 + 0];
+    var r1 = getInt32Memory0()[8 / 4 + 1];
+    var v1 = getArrayU8FromWasm0(r0, r1).slice();
+    wasm.__wbindgen_free(r0, r1 * 1);
+    return v1;
+}
+

codecs/rust.Dockerfile

@@ -1,13 +1,13 @@
-ARG RUST_IMG=rust:1.47
+ARG RUST_IMG=rust:1.44-stretch
 
-FROM emscripten/emsdk:2.0.8 AS wasm-tools
+FROM emscripten/emsdk:1.39.19 AS wasm-tools
 WORKDIR /opt/wasm-tools
 RUN wget -qO- https://github.com/rustwasm/wasm-pack/releases/download/v0.9.1/wasm-pack-v0.9.1-x86_64-unknown-linux-musl.tar.gz | tar -xzf - --strip 1
 
 FROM $RUST_IMG AS rust
 ARG RUST_IMG
 RUN rustup target add wasm32-unknown-unknown
-RUN case $RUST_IMG in rustlang/rust@*) rustup component add rust-src; esac
+RUN if [ "$RUST_IMG" = "rustlang/rust:nightly" ] ; then rustup component add rust-src ; fi
 COPY --from=wasm-tools /emsdk/upstream/bin/wasm-opt /emsdk/upstream/bin/clang /usr/local/bin/
 COPY --from=wasm-tools /emsdk/upstream/lib/ /usr/local/lib/
 COPY --from=wasm-tools /emsdk/upstream/emscripten/system/include/libc/ /wasm32/include/
@@ -16,4 +16,4 @@ COPY --from=wasm-tools /opt/wasm-tools/wasm-pack /usr/local/cargo/bin/
 
 ENV CPATH="/wasm32/include"
 WORKDIR /src
-CMD ["sh", "-c", "rm -rf pkg && wasm-pack build --target web -- --verbose --locked && rm pkg/.gitignore"]
+CMD ["sh", "-c", "rm -rf pkg && wasm-pack build -- --verbose --locked && rm pkg/.gitignore"]

codecs/webp/Makefile

@@ -1,4 +1,4 @@
-CODEC_URL := https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.1.0.tar.gz
+CODEC_URL := https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-1.0.2.tar.gz
 CODEC_DIR = node_modules/libwebp
 CODEC_OUT_RELATIVE = src/.libs/libwebp.a
 CODEC_OUT := $(addprefix $(CODEC_DIR)/, $(CODEC_OUT_RELATIVE))
@@ -18,9 +18,7 @@ all: $(OUT_JS)
 		--closure 1 \
 		-s ALLOW_MEMORY_GROWTH=1 \
 		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
-		-s ENVIRONMENT='worker' \
-		-s EXPORT_ES6=1 \
+		-s 'EXPORT_NAME="$(basename $(@F))"' \
 		-o $@ \
 		$+
 

codecs/webp/dec/example.html

@@ -1,20 +1,22 @@
 <!doctype html>
 <script src='webp_dec.js'></script>
 <script>
+  const Module = webp_dec();
+
   async function loadFile(src) {
     const resp = await fetch(src);
     return await resp.arrayBuffer();
   }
 
-  webp_dec().then(async module => {
-    console.log('Version:', module.version().toString(16));
+  Module.onRuntimeInitialized = async _ => {
+    console.log('Version:', Module.version().toString(16));
     const image = await loadFile('../../example.webp');
-    const imageData = module.decode(image);
+    const imageData = Module.decode(image);
     const canvas = document.createElement('canvas');
-    canvas.width = imageData.width;
-    canvas.height = imageData.height;
+    canvas.width = result.width;
+    canvas.height = result.height;
     document.body.appendChild(canvas);
     const ctx = canvas.getContext('2d');
     ctx.putImageData(imageData, 0, 0);
-  });
+  };
 </script>

codecs/webp/dec/webp_dec.cpp

@@ -17,10 +17,7 @@ val decode(std::string buffer) {
   int width, height;
   std::unique_ptr<uint8_t[]> rgba(
       WebPDecodeRGBA((const uint8_t*)buffer.c_str(), buffer.size(), &width, &height));
-  return rgba ? ImageData.new_(
-                    Uint8ClampedArray.new_(typed_memory_view(width * height * 4, rgba.get())),
-                    width, height)
-              : val::null();
+  return rgba ? ImageData.new_(Uint8ClampedArray.new_(typed_memory_view(width * height * 4, rgba.get())), width, height) : val::null();
 }
 
 EMSCRIPTEN_BINDINGS(my_module) {

codecs/webp/dec/webp_dec.d.ts

@@ -1,7 +1,5 @@
-export interface WebPModule extends EmscriptenWasm.Module {
+interface WebPModule extends EmscriptenWasm.Module {
   decode(data: BufferSource): ImageData | null;
 }
 
-declare var moduleFactory: EmscriptenWasm.ModuleFactory<WebPModule>;
-
-export default moduleFactory;
+export default function(opts: EmscriptenWasm.ModuleOpts): Promise<WebPModule>;

codecs/webp/enc/example.html

@@ -1,6 +1,8 @@
 <!doctype html>
 <script src='webp_enc.js'></script>
 <script>
+  const module = webp_enc();
+
   async function loadImage(src) {
     // Load image
     const img = document.createElement('img');
@@ -15,7 +17,7 @@
     return ctx.getImageData(0, 0, img.width, img.height);
   }
 
-  webp_enc().then(async module => {
+  module.onRuntimeInitialized = async _ => {
     console.log('Version:', module.version().toString(16));
     const image = await loadImage('../../example.png');
     const result = module.encode(image.data, image.width, image.height, {
@@ -54,5 +56,5 @@
     const img = document.createElement('img');
     img.src = blobURL;
     document.body.appendChild(img);
-  });
+  };
 </script>

codecs/webp/enc/webp_enc.d.ts

@@ -1,42 +1,7 @@
-export interface EncodeOptions {
-  quality: number;
-  target_size: number;
-  target_PSNR: number;
-  method: number;
-  sns_strength: number;
-  filter_strength: number;
-  filter_sharpness: number;
-  filter_type: number;
-  partitions: number;
-  segments: number;
-  pass: number;
-  show_compressed: number;
-  preprocessing: number;
-  autofilter: number;
-  partition_limit: number;
-  alpha_compression: number;
-  alpha_filtering: number;
-  alpha_quality: number;
-  lossless: number;
-  exact: number;
-  image_hint: number;
-  emulate_jpeg_size: number;
-  thread_level: number;
-  low_memory: number;
-  near_lossless: number;
-  use_delta_palette: number;
-  use_sharp_yuv: number;
+import { EncodeOptions } from '../../../src/codecs/webp/encoder-meta';
+
+interface WebPModule extends EmscriptenWasm.Module {
+  encode(data: BufferSource, width: number, height: number, options: EncodeOptions): Uint8Array | null;
 }
 
-export interface WebPModule extends EmscriptenWasm.Module {
-  encode(
-    data: BufferSource,
-    width: number,
-    height: number,
-    options: EncodeOptions,
-  ): Uint8Array | null;
-}
-
-declare var moduleFactory: EmscriptenWasm.ModuleFactory<WebPModule>;
-
-export default moduleFactory;
+export default function(opts: EmscriptenWasm.ModuleOpts): Promise<WebPModule>;

codecs/wp2/Makefile

@@ -1,50 +0,0 @@
-CODEC_URL = https://chromium.googlesource.com/codecs/libwebp2/+archive/c90b5b476004c9a98731ae1c175cebab5de50fbf.tar.gz
-CODEC_DIR = node_modules/wp2
-CODEC_BUILD_DIR := $(CODEC_DIR)/.build
-CODEC_OUT := $(CODEC_BUILD_DIR)/libwebp2.a
-
-OUT_JS = enc/wp2_enc.js dec/wp2_dec.js
-OUT_WASM = $(OUT_JS:.js=.wasm)
-
-.PHONY: all clean
-
-all: $(OUT_JS)
-
-%.js: %.cpp $(CODEC_OUT)
-	$(CXX) \
-		-I $(CODEC_DIR) \
-		${CXXFLAGS} \
-		${LDFLAGS} \
-		--bind \
-		--closure 1 \
-		-s ALLOW_MEMORY_GROWTH=1 \
-		-s MODULARIZE=1 \
-		-s TEXTDECODER=2 \
-		-s ENVIRONMENT='worker' \
-		-s EXPORT_ES6=1 \
-		-s EXPORT_NAME="$(basename $(@F))" \
-		-o $@ \
-		$+
-
-$(CODEC_OUT): $(CODEC_BUILD_DIR)/Makefile
-	cd $(CODEC_BUILD_DIR) && \
-	$(MAKE)
-
-$(CODEC_BUILD_DIR)/Makefile: $(CODEC_DIR)/CMakeLists.txt
-	mkdir -p $(CODEC_BUILD_DIR)
-	cd $(CODEC_BUILD_DIR) && \
-	emcmake cmake \
-		-DWP2_ENABLE_SIMD=0 \
-		-DWP2_BUILD_TESTS=0 \
-		-DWP2_ENABLE_TESTS=0 \
-		-DWP2_BUILD_EXAMPLES=0 \
-		-DWP2_BUILD_EXTRAS=0 \
-		../
-
-$(CODEC_DIR)/CMakeLists.txt:
-	mkdir -p $(CODEC_DIR)
-	curl -sL $(CODEC_URL) | tar xz -C $(CODEC_DIR)
-
-clean:
-	$(RM) $(OUT_JS) $(OUT_WASM)
-	$(MAKE) -C $(CODEC_BUILD_DIR) clean

codecs/wp2/dec/README.md

@@ -1,17 +0,0 @@
-# WebP2 decoder
-
-- Source: <https://chromium.googlesource.com/codecs/libwebp2>
-
-## Dependencies
-
-- Docker
-
-## Example
-
-N/A
-
-## API
-
-### `ImageData decode(uint8_t* image_buffer, int image_width, int image_height)`
-
-Decodes the given WebP2 buffer into raw RGBA represented as an `ImageData`.

codecs/wp2/dec/wp2_dec.cpp

@@ -1,24 +0,0 @@
-#include <emscripten/bind.h>
-#include <emscripten/val.h>
-#include <cstdio>
-#include "src/wp2/decode.h"
-
-using namespace emscripten;
-
-thread_local const val Uint8ClampedArray = val::global("Uint8ClampedArray");
-thread_local const val ImageData = val::global("ImageData");
-
-val decode(std::string image_in) {
-  WP2::ArgbBuffer buffer(WP2_rgbA_32);
-  WP2Status status = WP2::Decode(image_in, &buffer);
-  if (status != WP2_STATUS_OK) {
-    return val::null();
-  }
-  return ImageData.new_(
-      Uint8ClampedArray.new_(typed_memory_view(buffer.stride * buffer.height, buffer.GetRow8(0))),
-      buffer.width, buffer.height);
-}
-
-EMSCRIPTEN_BINDINGS(my_module) {
-  function("decode", &decode);
-}

codecs/wp2/dec/wp2_dec.d.ts

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

codecs/wp2/enc/README.md

@@ -1,17 +0,0 @@
-# WebP2 encoder
-
-- Source: <https://chromium.googlesource.com/codecs/libwebp2>
-
-## Dependencies
-
-- Docker
-
-## Example
-
-N/A
-
-## API
-
-### `UInt8Array encode(uint8_t* image_buffer, int image_width, int image_height, WP2::EncoderConfig config)`
-
-Encodes the given image with given dimension to WebP2.

codecs/wp2/enc/wp2_enc.cpp

@@ -1,66 +0,0 @@
-#include <emscripten/bind.h>
-#include <emscripten/val.h>
-#include <cstdio>
-#include "src/wp2/encode.h"
-
-using namespace emscripten;
-
-thread_local const val Uint8Array = val::global("Uint8Array");
-
-struct WP2Options {
-  float quality;
-  float alpha_quality;
-  int speed;
-  int pass;
-  int uv_mode;
-  float sns;
-  int csp_type;
-  int error_diffusion;
-  bool use_random_matrix;
-};
-
-val encode(std::string image_in, int image_width, int image_height, WP2Options options) {
-  WP2::EncoderConfig config = {};
-
-  config.quality = options.quality;
-  config.alpha_quality = options.alpha_quality;
-  config.speed = options.speed;
-  config.pass = options.pass;
-  config.uv_mode = static_cast<WP2::EncoderConfig::UVMode>(options.uv_mode);
-  config.csp_type = static_cast<WP2::Csp>(options.csp_type);
-  config.sns = options.sns;
-  config.error_diffusion = options.error_diffusion;
-  config.use_random_matrix = options.use_random_matrix;
-
-  uint8_t* image_buffer = (uint8_t*)image_in.c_str();
-  WP2::ArgbBuffer src = WP2::ArgbBuffer();
-  WP2Status status =
-      src.Import(WP2_rgbA_32,  // Format. WP2_RGBA_32 is the same but NOT premultiplied alpha
-                 image_width, image_height, image_buffer, 4 * image_width);
-  if (status != WP2_STATUS_OK) {
-    return val::null();
-  }
-
-  WP2::MemoryWriter memory_writer;
-  status = WP2::Encode(src, &memory_writer, config);
-  if (status != WP2_STATUS_OK) {
-    return val::null();
-  }
-
-  return Uint8Array.new_(typed_memory_view(memory_writer.size_, memory_writer.mem_));
-}
-
-EMSCRIPTEN_BINDINGS(my_module) {
-  value_object<WP2Options>("WP2Options")
-      .field("quality", &WP2Options::quality)
-      .field("alpha_quality", &WP2Options::alpha_quality)
-      .field("speed", &WP2Options::speed)
-      .field("pass", &WP2Options::pass)
-      .field("uv_mode", &WP2Options::uv_mode)
-      .field("csp_type", &WP2Options::csp_type)
-      .field("error_diffusion", &WP2Options::error_diffusion)
-      .field("use_random_matrix", &WP2Options::use_random_matrix)
-      .field("sns", &WP2Options::sns);
-
-  function("encode", &encode);
-}

codecs/wp2/enc/wp2_enc.d.ts

@@ -1,38 +0,0 @@
-export interface EncodeOptions {
-  quality: number;
-  alpha_quality: number;
-  speed: number;
-  pass: number;
-  sns: number;
-  uv_mode: UVMode;
-  csp_type: Csp;
-  error_diffusion: number;
-  use_random_matrix: boolean;
-}
-
-export const enum UVMode {
-  UVModeAdapt = 0, // Mix of 420 and 444 (per block)
-  UVMode420, // All blocks 420
-  UVMode444, // All blocks 444
-  UVModeAuto, // Choose any of the above automatically
-}
-
-export const enum Csp {
-  kYCoCg,
-  kYCbCr,
-  kCustom,
-  kYIQ,
-}
-
-export interface WP2Module extends EmscriptenWasm.Module {
-  encode(
-    data: BufferSource,
-    width: number,
-    height: number,
-    options: EncodeOptions,
-  ): Uint8Array | null;
-}
-
-declare var moduleFactory: EmscriptenWasm.ModuleFactory<WP2Module>;
-
-export default moduleFactory;

codecs/wp2/package.json

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

config/add-css-types.js

@@ -0,0 +1,76 @@
+const DtsCreator = require('typed-css-modules');
+const chokidar = require('chokidar');
+const util = require('util');
+const sass = require('node-sass');
+const normalizePath = require('normalize-path');
+
+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) {
+      const rootPathUnix = normalizePath(rootPath);
+      // Look for scss & css in each path.
+      paths.push(rootPathUnix + '/**/*.scss');
+      paths.push(rootPathUnix + '/**/*.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;