Update to latest AOM

codecs/avif/Makefile

@@ -1,15 +1,16 @@
-# libavif and libaom versions are from
-# https://docs.google.com/document/d/1wEEA5rRU7wT54k41u3qyZIZHDCJArIMzLuzsrLAwaK8/edit
-CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/d37ef74127986184500e571bf1f9793cc0bdef50.tar.gz
+CODEC_URL = https://github.com/AOMediaCodec/libavif/archive/31d7c6d1e32cf467ac24fb8c7a76c4902a4c00db.tar.gz
 CODEC_PACKAGE = node_modules/libavif.tar.gz
 
-LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/0a5da45c7f942908974f5ab8e107c9fa82048ae7.tar.gz
+LIBAOM_URL = https://aomedia.googlesource.com/aom/+archive/4a8e276e3e0ef3c76083f3975d5caa85bc9593ce.tar.gz
 LIBAOM_PACKAGE = node_modules/libaom.tar.gz
 
 export CODEC_DIR = node_modules/libavif
 export BUILD_DIR = node_modules/build
 export LIBAOM_DIR = node_modules/libaom
 
+export CFLAGS += -g
+export CXXFLAGS += -g
+
 OUT_ENC_JS = enc/avif_enc.js
 OUT_NODE_ENC_JS = enc/avif_node_enc.js
 OUT_ENC_MT_JS = enc/avif_enc_mt.js
@@ -52,7 +53,7 @@ $(OUT_ENC_MT_JS): $(OUT_ENC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMake
 		" \
 		ENVIRONMENT=$(ENVIRONMENT) \
 		LIBAVIF_FLAGS="-DAVIF_CODEC_AOM_DECODE=0" \
-		OUT_FLAGS="-pthread"
+		OUT_FLAGS="-pthread -s PROXY_TO_PTHREAD=1 -g"
 
 $(OUT_NODE_DEC_JS): ENVIRONMENT=node
 $(OUT_NODE_DEC_JS) $(OUT_DEC_JS): $(OUT_DEC_CPP) $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_DIR)/CMakeLists.txt

codecs/avif/enc/avif_enc.cpp

@@ -9,9 +9,10 @@ struct AvifOptions {
   // [0 - 63]
   // 0 = lossless
   // 63 = worst quality
-  int cqLevel;
-  // As above, but -1 means 'use cqLevel'
-  int cqAlphaLevel;
+  int minQuantizer;
+  int maxQuantizer;
+  int minQuantizerAlpha;
+  int maxQuantizerAlpha;
   // [0 - 6]
   // Creates 2^n tiles in that dimension
   int tileRowsLog2;
@@ -25,14 +26,6 @@ struct AvifOptions {
   // 2 = 4:2:2
   // 3 = 4:4:4
   int subsample;
-  // Extra chroma compression
-  bool chromaDeltaQ;
-  // 0-7
-  int sharpness;
-  // Target ssim rather than psnr
-  bool targetSsim;
-  // 0-50
-  int denoiseLevel;
 };
 
 thread_local const val Uint8Array = val::global("Uint8Array");
@@ -56,19 +49,18 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
       break;
   }
 
-  bool lossless = options.cqLevel == AVIF_QUANTIZER_LOSSLESS &&
-                  options.cqAlphaLevel <= AVIF_QUANTIZER_LOSSLESS &&
-                  format == AVIF_PIXEL_FORMAT_YUV444;
-
   avifImage* image = avifImageCreate(width, height, depth, format);
 
-  if (lossless) {
+  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_BT601;
+    image->matrixCoefficients = AVIF_MATRIX_COEFFICIENTS_BT709;
   }
 
-  uint8_t* rgba = reinterpret_cast<uint8_t*>(const_cast<char*>(buffer.data()));
+  uint8_t* rgba = (uint8_t*)buffer.c_str();
 
   avifRGBImage srcRGB;
   avifRGBImageSetDefaults(&srcRGB, image);
@@ -77,44 +69,14 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
   avifImageRGBToYUV(image, &srcRGB);
 
   avifEncoder* encoder = avifEncoderCreate();
-
-  if (lossless) {
-    encoder->minQuantizer = AVIF_QUANTIZER_LOSSLESS;
-    encoder->maxQuantizer = AVIF_QUANTIZER_LOSSLESS;
-    encoder->minQuantizerAlpha = AVIF_QUANTIZER_LOSSLESS;
-    encoder->maxQuantizerAlpha = AVIF_QUANTIZER_LOSSLESS;
-  } else {
-    encoder->minQuantizer = AVIF_QUANTIZER_BEST_QUALITY;
-    encoder->maxQuantizer = AVIF_QUANTIZER_WORST_QUALITY;
-    encoder->minQuantizerAlpha = AVIF_QUANTIZER_BEST_QUALITY;
-    encoder->maxQuantizerAlpha = AVIF_QUANTIZER_WORST_QUALITY;
-    avifEncoderSetCodecSpecificOption(encoder, "end-usage", "q");
-    avifEncoderSetCodecSpecificOption(encoder, "cq-level", std::to_string(options.cqLevel).c_str());
-    avifEncoderSetCodecSpecificOption(encoder, "sharpness",
-                                      std::to_string(options.sharpness).c_str());
-
-    if (options.cqAlphaLevel != -1) {
-      avifEncoderSetCodecSpecificOption(encoder, "alpha:cq-level",
-                                        std::to_string(options.cqAlphaLevel).c_str());
-    }
-
-    if (options.targetSsim) {
-      avifEncoderSetCodecSpecificOption(encoder, "tune", "ssim");
-    }
-
-    if (options.chromaDeltaQ) {
-      avifEncoderSetCodecSpecificOption(encoder, "enable-chroma-deltaq", "1");
-    }
-
-    avifEncoderSetCodecSpecificOption(encoder, "color:denoise-noise-level",
-                                      std::to_string(options.denoiseLevel).c_str());
-  }
-
   encoder->maxThreads = emscripten_num_logical_cores();
+  encoder->minQuantizer = options.minQuantizer;
+  encoder->maxQuantizer = options.maxQuantizer;
+  encoder->minQuantizerAlpha = options.minQuantizerAlpha;
+  encoder->maxQuantizerAlpha = options.maxQuantizerAlpha;
   encoder->tileRowsLog2 = options.tileRowsLog2;
   encoder->tileColsLog2 = options.tileColsLog2;
   encoder->speed = options.speed;
-
   avifResult encodeResult = avifEncoderWrite(encoder, image, &output);
   auto js_result = val::null();
   if (encodeResult == AVIF_RESULT_OK) {
@@ -129,15 +91,13 @@ val encode(std::string buffer, int width, int height, AvifOptions options) {
 
 EMSCRIPTEN_BINDINGS(my_module) {
   value_object<AvifOptions>("AvifOptions")
-      .field("cqLevel", &AvifOptions::cqLevel)
-      .field("cqAlphaLevel", &AvifOptions::cqAlphaLevel)
+      .field("minQuantizer", &AvifOptions::minQuantizer)
+      .field("maxQuantizer", &AvifOptions::maxQuantizer)
+      .field("minQuantizerAlpha", &AvifOptions::minQuantizerAlpha)
+      .field("maxQuantizerAlpha", &AvifOptions::maxQuantizerAlpha)
       .field("tileRowsLog2", &AvifOptions::tileRowsLog2)
       .field("tileColsLog2", &AvifOptions::tileColsLog2)
       .field("speed", &AvifOptions::speed)
-      .field("chromaDeltaQ", &AvifOptions::chromaDeltaQ)
-      .field("sharpness", &AvifOptions::sharpness)
-      .field("targetSsim", &AvifOptions::targetSsim)
-      .field("denoiseLevel", &AvifOptions::denoiseLevel)
       .field("subsample", &AvifOptions::subsample);
 
   function("encode", &encode);

codecs/avif/enc/avif_enc.d.ts

@@ -1,14 +1,12 @@
 export interface EncodeOptions {
-  cqLevel: number;
-  denoiseLevel: number;
-  cqAlphaLevel: number;
+  minQuantizer: number;
+  maxQuantizer: number;
+  minQuantizerAlpha: number;
+  maxQuantizerAlpha: number;
   tileRowsLog2: number;
   tileColsLog2: number;
   speed: number;
   subsample: number;
-  chromaDeltaQ: boolean;
-  sharpness: number;
-  targetSsim: boolean;
 }
 
 export interface AVIFModule extends EmscriptenWasm.Module {

codecs/avif/enc/avif_enc_mt.worker.js

@@ -1 +1,144 @@
-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}};
+/**
+ * @license
+ * Copyright 2015 The Emscripten Authors
+ * SPDX-License-Identifier: MIT
+ */
+
+// Pthread Web Worker startup routine:
+// This is the entry point file that is loaded first by each Web Worker
+// that executes pthreads on the Emscripten application.
+
+// Thread-local:
+var threadInfoStruct = 0; // Info area for this thread in Emscripten HEAP (shared). If zero, this worker is not currently hosting an executing pthread.
+var selfThreadId = 0; // The ID of this thread. 0 if not hosting a pthread.
+var parentThreadId = 0; // The ID of the parent pthread that launched this thread.
+var initializedJS = false; // Guard variable for one-time init of the JS state (currently only embind types registration)
+
+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) {
+  // Instantiate from the module posted from the main thread.
+  // We can just use sync instantiation in the worker.
+  var instance = new WebAssembly.Instance(Module['wasmModule'], info);
+  // We don't need the module anymore; new threads will be spawned from the main thread.
+  Module['wasmModule'] = null;
+  receiveInstance(instance); // The second 'module' parameter is intentionally null here, we don't need to keep a ref to the Module object from here.
+  return instance.exports;
+};
+
+this.onmessage = function(e) {
+  try {
+    if (e.data.cmd === 'load') { // Preload command that is called once per worker to parse and load the Emscripten code.
+
+      // Module and memory were sent from main thread
+      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') {
+      // This worker was idle, and now should start executing its pthread entry
+      // point.
+      // performance.now() is specced to return a wallclock time in msecs since
+      // that Web Worker/main thread launched. However for pthreads this can
+      // cause subtle problems in emscripten_get_now() as this essentially
+      // would measure time from pthread_create(), meaning that the clocks
+      // between each threads would be wildly out of sync. Therefore sync all
+      // pthreads to the clock on the main browser thread, so that different
+      // threads see a somewhat coherent clock across each of them
+      // (+/- 0.1msecs in testing).
+      Module['__performance_now_clock_drift'] = performance.now() - e.data.time;
+      threadInfoStruct = e.data.threadInfoStruct;
+
+      // Pass the thread address inside the asm.js scope to store it for fast access that avoids the need for a FFI out.
+      Module['registerPthreadPtr'](threadInfoStruct, /*isMainBrowserThread=*/0, /*isMainRuntimeThread=*/0);
+
+      selfThreadId = e.data.selfThreadId;
+      parentThreadId = e.data.parentThreadId;
+      // Establish the stack frame for this thread in global scope
+      // The stack grows downwards
+      var max = e.data.stackBase;
+      var top = e.data.stackBase + e.data.stackSize;
+      // Also call inside JS module to set up the stack frame for this pthread in JS module scope
+      Module['establishStackSpace'](top, max);
+      Module['_emscripten_tls_init']();
+
+      Module['PThread'].receiveObjectTransfer(e.data);
+      Module['PThread'].setThreadStatus(Module['_pthread_self'](), 1/*EM_THREAD_STATUS_RUNNING*/);
+
+      // Embind must initialize itself on all threads, as it generates support JS.
+      // We only do this once per worker since they get reused
+      if (!initializedJS) {
+        Module['___embind_register_native_and_builtin_types']();
+        initializedJS = true;
+      }
+
+      try {
+        // pthread entry points are always of signature 'void *ThreadMain(void *arg)'
+        // Native codebases sometimes spawn threads with other thread entry point signatures,
+        // such as void ThreadMain(void *arg), void *ThreadMain(), or void ThreadMain().
+        // That is not acceptable per C/C++ specification, but x86 compiler ABI extensions
+        // enable that to work. If you find the following line to crash, either change the signature
+        // to "proper" void *ThreadMain(void *arg) form, or try linking with the Emscripten linker
+        // flag -s EMULATE_FUNCTION_POINTER_CASTS=1 to add in emulation for this x86 ABI extension.
+        var result = Module['dynCall']('ii', e.data.start_routine, [e.data.arg]);
+
+        // The thread might have finished without calling pthread_exit(). If so, then perform the exit operation ourselves.
+        // (This is a no-op if explicit pthread_exit() had been called prior.)
+        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); // Mark the thread as no longer running.
+          Module['_emscripten_futex_wake'](threadInfoStruct + 0 /*C_STRUCTS.pthread.threadStatus*/, 0x7FFFFFFF/*INT_MAX*/); // Wake all threads waiting on this thread to finish.
+          if (!(ex instanceof Module['ExitStatus'])) throw ex;
+        }
+      }
+    } else if (e.data.cmd === 'cancel') { // Main thread is asking for a pthread_cancel() on this thread.
+      if (threadInfoStruct) {
+        Module['PThread'].threadCancel();
+      }
+    } else if (e.data.target === 'setimmediate') {
+      // no-op
+    } else if (e.data.cmd === 'processThreadQueue') {
+      if (threadInfoStruct) { // If this thread is actually running?
+        Module['_emscripten_current_thread_process_queued_calls']();
+      }
+    } else {
+      err('worker.js received unknown command ' + e.data.cmd);
+      err(e.data);
+    }
+  } catch(ex) {
+    err('worker.js onmessage() captured an uncaught exception: ' + ex);
+    if (ex && ex.stack) err(ex.stack);
+    throw ex;
+  }
+};
+
+

codecs/avif/helper.Makefile

@@ -32,7 +32,6 @@ $(OUT_JS): $(OUT_CPP) $(LIBAOM_OUT) $(CODEC_OUT)
 		$(LDFLAGS) \
 		$(OUT_FLAGS) \
 		--bind \
-		--closure 1 \
 		-s ALLOW_MEMORY_GROWTH=1 \
 		-s MODULARIZE=1 \
 		-s TEXTDECODER=2 \
@@ -44,7 +43,7 @@ $(OUT_JS): $(OUT_CPP) $(LIBAOM_OUT) $(CODEC_OUT)
 
 $(CODEC_OUT): $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_OUT)
 	emcmake cmake \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DBUILD_SHARED_LIBS=0 \
 		-DAVIF_CODEC_AOM=1 \
 		-DAOM_LIBRARY=$(LIBAOM_OUT) \
@@ -56,7 +55,7 @@ $(CODEC_OUT): $(CODEC_DIR)/CMakeLists.txt $(LIBAOM_OUT)
 
 $(LIBAOM_OUT): $(LIBAOM_DIR)/CMakeLists.txt
 	emcmake cmake \
-		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DENABLE_CCACHE=0 \
 		-DAOM_TARGET_CPU=generic \
 		-DENABLE_DOCS=0 \

codecs/build-wasi-sdk.sh

@@ -1,3 +0,0 @@
-#!/bin/sh -e
-docker build -t squoosh-wasi-sdk - < ../wasi-sdk.Dockerfile
-docker run -it --rm -v $PWD:/src squoosh-wasi-sdk "$@"

codecs/hqx/pkg/squooshhqx.d.ts

@@ -14,6 +14,7 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 export interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly resize: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
+  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
 }
@@ -27,4 +28,3 @@ export interface InitOutput {
 * @returns {Promise<InitOutput>}
 */
 export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
-        

codecs/hqx/pkg/squooshhqx.js

@@ -37,14 +37,19 @@ function getArrayU32FromWasm0(ptr, len) {
 * @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;
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        var ptr0 = passArray32ToWasm0(input_image, wasm.__wbindgen_malloc);
+        var len0 = WASM_VECTOR_LEN;
+        wasm.resize(retptr, ptr0, len0, input_width, input_height, factor);
+        var r0 = getInt32Memory0()[retptr / 4 + 0];
+        var r1 = getInt32Memory0()[retptr / 4 + 1];
+        var v1 = getArrayU32FromWasm0(r0, r1).slice();
+        wasm.__wbindgen_free(r0, r1 * 4);
+        return v1;
+    } finally {
+        wasm.__wbindgen_add_to_stack_pointer(16);
+    }
 }
 
 async function load(module, imports) {
@@ -82,7 +87,7 @@ async function load(module, imports) {
 
 async function init(input) {
     if (typeof input === 'undefined') {
-        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
+        input = new URL('squooshhqx_bg.wasm', import.meta.url);
     }
     const imports = {};
 

codecs/hqx/pkg/squooshhqx_bg.d.ts

@@ -1,6 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export const memory: WebAssembly.Memory;
-export function resize(a: number, b: number, c: number, d: number, e: number, f: number): void;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_free(a: number, b: number): void;

codecs/jxl/Makefile

@@ -1,5 +1,5 @@
 CODEC_URL = https://gitlab.com/wg1/jpeg-xl.git
-CODEC_VERSION = v0.3.3
+CODEC_VERSION = 5175d11717f3c48cf506a2c0e0afb070392ae296
 CODEC_DIR = node_modules/jxl
 CODEC_BUILD_ROOT := $(CODEC_DIR)/build
 CODEC_MT_BUILD_DIR := $(CODEC_BUILD_ROOT)/mt

codecs/jxl/enc/jxl_enc.cpp

@@ -2,8 +2,8 @@
 #include <emscripten/val.h>
 
 #include "lib/jxl/base/thread_pool_internal.h"
-#include "lib/jxl/enc_external_image.h"
 #include "lib/jxl/enc_file.h"
+#include "lib/jxl/external_image.h"
 
 using namespace emscripten;
 
@@ -88,7 +88,7 @@ val encode(std::string image, int width, int height, JXLOptions options) {
 
   uint8_t* inBuffer = (uint8_t*)image.c_str();
 
-  auto result = jxl::ConvertFromExternal(
+  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_sample=*/8, /*endiannes=*/JXL_LITTLE_ENDIAN,

codecs/jxl/enc/jxl_enc_mt.js

@@ -17,7 +17,7 @@ function Da(a){return 2*a.length}function Ea(a,b){for(var c=0,d="";!(c>=b/4);){v
 function Ga(a){for(var b=0,c=0;c<a.length;++c){var d=a.charCodeAt(c);55296<=d&&57343>=d&&++c;b+=4}return b}function Ha(a,b){e().set(a,b)}var n,aa,ba,ca,fa,ha,ia,ka,ma;function u(a){n=a;D.HEAP8=aa=new Int8Array(a);D.HEAP16=ca=new Int16Array(a);D.HEAP32=ha=new Int32Array(a);D.HEAPU8=ba=new Uint8Array(a);D.HEAPU16=fa=new Uint16Array(a);D.HEAPU32=ia=new Uint32Array(a);D.HEAPF32=ka=new Float32Array(a);D.HEAPF64=ma=new Float64Array(a)}var Ia=D.INITIAL_MEMORY||16777216;
 if(G)m=D.wasmMemory,n=D.buffer;else if(D.wasmMemory)m=D.wasmMemory;else if(m=new WebAssembly.Memory({initial:Ia/65536,maximum:32768,shared:!0}),!(m.buffer instanceof SharedArrayBuffer))throw J("requested a shared WebAssembly.Memory but the returned buffer is not a SharedArrayBuffer, indicating that while the browser has SharedArrayBuffer it does not have WebAssembly threads support - you may need to set a flag"),Error("bad memory");m&&(n=m.buffer);Ia=n.byteLength;u(n);var M,Ja=[],Ka=[],La=[],Ma=[];
 function Na(){var a=D.preRun.shift();Ja.unshift(a)}var N=0,Oa=null,Pa=null;D.preloadedImages={};D.preloadedAudios={};function K(a){if(D.onAbort)D.onAbort(a);G&&console.error("Pthread aborting at "+Error().stack);J(a);va=!0;a=new WebAssembly.RuntimeError("abort("+a+"). Build with -s ASSERTIONS=1 for more info.");oa(a);throw a;}function Qa(){var a=O;return String.prototype.startsWith?a.startsWith("data:application/octet-stream;base64,"):0===a.indexOf("data:application/octet-stream;base64,")}var O="jxl_enc_mt.wasm";
-Qa()||(O=qa(O));function Ra(){try{if(ta)return new Uint8Array(ta);if(ra)return ra(O);throw"both async and sync fetching of the wasm failed";}catch(a){K(a)}}function Sa(){return ta||"function"!==typeof fetch?Promise.resolve().then(Ra):fetch(O,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+O+"'";return a.arrayBuffer()}).catch(function(){return Ra()})}var Ua={60053:function(a,b){setTimeout(function(){Ta(a,b)},0)},60131:function(){throw"Canceled!";}};
+Qa()||(O=qa(O));function Ra(){try{if(ta)return new Uint8Array(ta);if(ra)return ra(O);throw"both async and sync fetching of the wasm failed";}catch(a){K(a)}}function Sa(){return ta||"function"!==typeof fetch?Promise.resolve().then(Ra):fetch(O,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+O+"'";return a.arrayBuffer()}).catch(function(){return Ra()})}var Ua={60805:function(a,b){setTimeout(function(){Ta(a,b)},0)},60883:function(){throw"Canceled!";}};
 function Va(a){for(;0<a.length;){var b=a.shift();if("function"==typeof b)b(D);else{var c=b.Bb;"number"===typeof c?void 0===b.Va?M.get(c)():M.get(c)(b.Va):c(void 0===b.Va?null:b.Va)}}}function Wa(a,b,c){var d;-1!=a.indexOf("j")?d=c&&c.length?D["dynCall_"+a].apply(null,[b].concat(c)):D["dynCall_"+a].call(null,b):d=M.get(b).apply(null,c);return d}D.dynCall=Wa;var P=0,Xa=0,Ya=0;function Za(a,b,c){P=a|0;Ya=b|0;Xa=c|0}D.registerPthreadPtr=Za;
 function $a(a,b){if(0>=a||a>e().length||a&1||0>b)return-28;if(0==b)return 0;2147483647<=b&&(b=Infinity);var c=Atomics.load(A(),Q.rb>>2),d=0;if(c==a&&Atomics.compareExchange(A(),Q.rb>>2,c,0)==c&&(--b,d=1,0>=b))return 1;a=Atomics.notify(A(),a>>2,b);if(0<=a)return a+d;throw"Atomics.notify returned an unexpected value "+a;}D._emscripten_futex_wake=$a;
 function ab(a){if(G)throw"Internal Error! cleanupThread() can only ever be called from main application thread!";if(!a)throw"Internal Error! Null pthread_ptr in cleanupThread!";A()[a+12>>2]=0;(a=Q.Oa[a])&&Q.bb(a.worker)}
@@ -98,7 +98,7 @@ D._emscripten_sync_run_in_main_thread_1=function(){return(D._emscripten_sync_run
 D._emscripten_sync_run_in_main_thread_3=function(){return(D._emscripten_sync_run_in_main_thread_3=D.asm.va).apply(null,arguments)};var Ec=D._emscripten_sync_run_in_main_thread_4=function(){return(Ec=D._emscripten_sync_run_in_main_thread_4=D.asm.wa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_5=function(){return(D._emscripten_sync_run_in_main_thread_5=D.asm.xa).apply(null,arguments)};
 D._emscripten_sync_run_in_main_thread_6=function(){return(D._emscripten_sync_run_in_main_thread_6=D.asm.ya).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_7=function(){return(D._emscripten_sync_run_in_main_thread_7=D.asm.za).apply(null,arguments)};
 var Ub=D._emscripten_run_in_main_runtime_thread_js=function(){return(Ub=D._emscripten_run_in_main_runtime_thread_js=D.asm.Aa).apply(null,arguments)},$b=D.__emscripten_call_on_thread=function(){return($b=D.__emscripten_call_on_thread=D.asm.Ba).apply(null,arguments)};D._emscripten_tls_init=function(){return(D._emscripten_tls_init=D.asm.Ca).apply(null,arguments)};D.dynCall_viijii=function(){return(D.dynCall_viijii=D.asm.Da).apply(null,arguments)};
-D.dynCall_iiji=function(){return(D.dynCall_iiji=D.asm.Ea).apply(null,arguments)};D.dynCall_jiji=function(){return(D.dynCall_jiji=D.asm.Fa).apply(null,arguments)};D.dynCall_iiiiiijj=function(){return(D.dynCall_iiiiiijj=D.asm.Ga).apply(null,arguments)};D.dynCall_iiiiij=function(){return(D.dynCall_iiiiij=D.asm.Ha).apply(null,arguments)};D.dynCall_iiiiijj=function(){return(D.dynCall_iiiiijj=D.asm.Ia).apply(null,arguments)};var cb=D._main_thread_futex=4638520;D.PThread=Q;D.PThread=Q;D._pthread_self=pc;
+D.dynCall_iiji=function(){return(D.dynCall_iiji=D.asm.Ea).apply(null,arguments)};D.dynCall_jiji=function(){return(D.dynCall_jiji=D.asm.Fa).apply(null,arguments)};D.dynCall_iiiiiijj=function(){return(D.dynCall_iiiiiijj=D.asm.Ga).apply(null,arguments)};D.dynCall_iiiiij=function(){return(D.dynCall_iiiiij=D.asm.Ha).apply(null,arguments)};D.dynCall_iiiiijj=function(){return(D.dynCall_iiiiijj=D.asm.Ia).apply(null,arguments)};var cb=D._main_thread_futex=4639544;D.PThread=Q;D.PThread=Q;D._pthread_self=pc;
 D.wasmMemory=m;D.ExitStatus=Hc;var Ic;function Hc(a){this.name="ExitStatus";this.message="Program terminated with exit("+a+")";this.status=a}Pa=function Jc(){Ic||Kc();Ic||(Pa=Jc)};
 function Kc(){function a(){if(!Ic&&(Ic=!0,D.calledRun=!0,!va)){Va(Ka);G||Va(La);na(D);if(D.onRuntimeInitialized)D.onRuntimeInitialized();if(!G){if(D.postRun)for("function"==typeof D.postRun&&(D.postRun=[D.postRun]);D.postRun.length;){var b=D.postRun.shift();Ma.unshift(b)}Va(Ma)}}}if(!(0<N)){if(!G){if(D.preRun)for("function"==typeof D.preRun&&(D.preRun=[D.preRun]);D.preRun.length;)Na();Va(Ja)}0<N||(D.setStatus?(D.setStatus("Running..."),setTimeout(function(){setTimeout(function(){D.setStatus("")},
 1);a()},1)):a())}}D.run=Kc;if(D.preInit)for("function"==typeof D.preInit&&(D.preInit=[D.preInit]);0<D.preInit.length;)D.preInit.pop()();G||(noExitRuntime=!0);G?Q.Lb():Kc();

codecs/jxl/enc/jxl_enc_mt_simd.js

@@ -17,7 +17,7 @@ function Da(a){return 2*a.length}function Ea(a,b){for(var c=0,d="";!(c>=b/4);){v
 function Ga(a){for(var b=0,c=0;c<a.length;++c){var d=a.charCodeAt(c);55296<=d&&57343>=d&&++c;b+=4}return b}function Ha(a,b){e().set(a,b)}var n,aa,ba,ca,fa,ha,ia,ka,ma;function u(a){n=a;D.HEAP8=aa=new Int8Array(a);D.HEAP16=ca=new Int16Array(a);D.HEAP32=ha=new Int32Array(a);D.HEAPU8=ba=new Uint8Array(a);D.HEAPU16=fa=new Uint16Array(a);D.HEAPU32=ia=new Uint32Array(a);D.HEAPF32=ka=new Float32Array(a);D.HEAPF64=ma=new Float64Array(a)}var Ia=D.INITIAL_MEMORY||16777216;
 if(G)m=D.wasmMemory,n=D.buffer;else if(D.wasmMemory)m=D.wasmMemory;else if(m=new WebAssembly.Memory({initial:Ia/65536,maximum:32768,shared:!0}),!(m.buffer instanceof SharedArrayBuffer))throw J("requested a shared WebAssembly.Memory but the returned buffer is not a SharedArrayBuffer, indicating that while the browser has SharedArrayBuffer it does not have WebAssembly threads support - you may need to set a flag"),Error("bad memory");m&&(n=m.buffer);Ia=n.byteLength;u(n);var M,Ja=[],Ka=[],La=[],Ma=[];
 function Na(){var a=D.preRun.shift();Ja.unshift(a)}var N=0,Oa=null,Pa=null;D.preloadedImages={};D.preloadedAudios={};function K(a){if(D.onAbort)D.onAbort(a);G&&console.error("Pthread aborting at "+Error().stack);J(a);va=!0;a=new WebAssembly.RuntimeError("abort("+a+"). Build with -s ASSERTIONS=1 for more info.");oa(a);throw a;}function Qa(){var a=O;return String.prototype.startsWith?a.startsWith("data:application/octet-stream;base64,"):0===a.indexOf("data:application/octet-stream;base64,")}var O="jxl_enc_mt_simd.wasm";
-Qa()||(O=qa(O));function Ra(){try{if(ta)return new Uint8Array(ta);if(ra)return ra(O);throw"both async and sync fetching of the wasm failed";}catch(a){K(a)}}function Sa(){return ta||"function"!==typeof fetch?Promise.resolve().then(Ra):fetch(O,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+O+"'";return a.arrayBuffer()}).catch(function(){return Ra()})}var Ua={60165:function(a,b){setTimeout(function(){Ta(a,b)},0)},60243:function(){throw"Canceled!";}};
+Qa()||(O=qa(O));function Ra(){try{if(ta)return new Uint8Array(ta);if(ra)return ra(O);throw"both async and sync fetching of the wasm failed";}catch(a){K(a)}}function Sa(){return ta||"function"!==typeof fetch?Promise.resolve().then(Ra):fetch(O,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+O+"'";return a.arrayBuffer()}).catch(function(){return Ra()})}var Ua={60933:function(a,b){setTimeout(function(){Ta(a,b)},0)},61011:function(){throw"Canceled!";}};
 function Va(a){for(;0<a.length;){var b=a.shift();if("function"==typeof b)b(D);else{var c=b.Bb;"number"===typeof c?void 0===b.Va?M.get(c)():M.get(c)(b.Va):c(void 0===b.Va?null:b.Va)}}}function Wa(a,b,c){var d;-1!=a.indexOf("j")?d=c&&c.length?D["dynCall_"+a].apply(null,[b].concat(c)):D["dynCall_"+a].call(null,b):d=M.get(b).apply(null,c);return d}D.dynCall=Wa;var P=0,Xa=0,Ya=0;function Za(a,b,c){P=a|0;Ya=b|0;Xa=c|0}D.registerPthreadPtr=Za;
 function $a(a,b){if(0>=a||a>e().length||a&1||0>b)return-28;if(0==b)return 0;2147483647<=b&&(b=Infinity);var c=Atomics.load(A(),Q.rb>>2),d=0;if(c==a&&Atomics.compareExchange(A(),Q.rb>>2,c,0)==c&&(--b,d=1,0>=b))return 1;a=Atomics.notify(A(),a>>2,b);if(0<=a)return a+d;throw"Atomics.notify returned an unexpected value "+a;}D._emscripten_futex_wake=$a;
 function ab(a){if(G)throw"Internal Error! cleanupThread() can only ever be called from main application thread!";if(!a)throw"Internal Error! Null pthread_ptr in cleanupThread!";A()[a+12>>2]=0;(a=Q.Oa[a])&&Q.bb(a.worker)}
@@ -99,7 +99,7 @@ D._emscripten_sync_run_in_main_thread_1=function(){return(D._emscripten_sync_run
 D._emscripten_sync_run_in_main_thread_3=function(){return(D._emscripten_sync_run_in_main_thread_3=D.asm.va).apply(null,arguments)};var Ec=D._emscripten_sync_run_in_main_thread_4=function(){return(Ec=D._emscripten_sync_run_in_main_thread_4=D.asm.wa).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_5=function(){return(D._emscripten_sync_run_in_main_thread_5=D.asm.xa).apply(null,arguments)};
 D._emscripten_sync_run_in_main_thread_6=function(){return(D._emscripten_sync_run_in_main_thread_6=D.asm.ya).apply(null,arguments)};D._emscripten_sync_run_in_main_thread_7=function(){return(D._emscripten_sync_run_in_main_thread_7=D.asm.za).apply(null,arguments)};
 var Ub=D._emscripten_run_in_main_runtime_thread_js=function(){return(Ub=D._emscripten_run_in_main_runtime_thread_js=D.asm.Aa).apply(null,arguments)},$b=D.__emscripten_call_on_thread=function(){return($b=D.__emscripten_call_on_thread=D.asm.Ba).apply(null,arguments)};D._emscripten_tls_init=function(){return(D._emscripten_tls_init=D.asm.Ca).apply(null,arguments)};D.dynCall_viijii=function(){return(D.dynCall_viijii=D.asm.Da).apply(null,arguments)};
-D.dynCall_iiji=function(){return(D.dynCall_iiji=D.asm.Ea).apply(null,arguments)};D.dynCall_jiji=function(){return(D.dynCall_jiji=D.asm.Fa).apply(null,arguments)};D.dynCall_iiiiiijj=function(){return(D.dynCall_iiiiiijj=D.asm.Ga).apply(null,arguments)};D.dynCall_iiiiij=function(){return(D.dynCall_iiiiij=D.asm.Ha).apply(null,arguments)};D.dynCall_iiiiijj=function(){return(D.dynCall_iiiiijj=D.asm.Ia).apply(null,arguments)};var cb=D._main_thread_futex=4638632;D.PThread=Q;D.PThread=Q;D._pthread_self=pc;
+D.dynCall_iiji=function(){return(D.dynCall_iiji=D.asm.Ea).apply(null,arguments)};D.dynCall_jiji=function(){return(D.dynCall_jiji=D.asm.Fa).apply(null,arguments)};D.dynCall_iiiiiijj=function(){return(D.dynCall_iiiiiijj=D.asm.Ga).apply(null,arguments)};D.dynCall_iiiiij=function(){return(D.dynCall_iiiiij=D.asm.Ha).apply(null,arguments)};D.dynCall_iiiiijj=function(){return(D.dynCall_iiiiijj=D.asm.Ia).apply(null,arguments)};var cb=D._main_thread_futex=4639672;D.PThread=Q;D.PThread=Q;D._pthread_self=pc;
 D.wasmMemory=m;D.ExitStatus=Hc;var Ic;function Hc(a){this.name="ExitStatus";this.message="Program terminated with exit("+a+")";this.status=a}Pa=function Jc(){Ic||Kc();Ic||(Pa=Jc)};
 function Kc(){function a(){if(!Ic&&(Ic=!0,D.calledRun=!0,!va)){Va(Ka);G||Va(La);na(D);if(D.onRuntimeInitialized)D.onRuntimeInitialized();if(!G){if(D.postRun)for("function"==typeof D.postRun&&(D.postRun=[D.postRun]);D.postRun.length;){var b=D.postRun.shift();Ma.unshift(b)}Va(Ma)}}}if(!(0<N)){if(!G){if(D.preRun)for("function"==typeof D.preRun&&(D.preRun=[D.preRun]);D.preRun.length;)Na();Va(Ja)}0<N||(D.setStatus?(D.setStatus("Running..."),setTimeout(function(){setTimeout(function(){D.setStatus("")},
 1);a()},1)):a())}}D.run=Kc;if(D.preInit)for("function"==typeof D.preInit&&(D.preInit=[D.preInit]);0<D.preInit.length;)D.preInit.pop()();G||(noExitRuntime=!0);G?Q.Lb():Kc();

codecs/mozjpeg/Makefile

@@ -1,51 +1,47 @@
 CODEC_URL := https://github.com/mozilla/mozjpeg/archive/v3.3.1.tar.gz
 CODEC_DIR := node_modules/mozjpeg
-CODEC_BUILD_DIR := $(CODEC_DIR)/build
 CODEC_OUT_RELATIVE := .libs/libjpeg.a rdswitch.o
-CODEC_OUT := $(addprefix $(CODEC_BUILD_DIR)/, $(CODEC_OUT_RELATIVE))
+CODEC_OUT := $(addprefix $(CODEC_DIR)/, $(CODEC_OUT_RELATIVE))
+ENVIRONMENT = worker
 
-OUT_WASM := enc/mozjpeg_enc.wasm
-
-OPTIMIZE := 3
-
-override CC = $(WASI_SDK_PREFIX)/bin/clang
-override CXX = $(WASI_SDK_PREFIX)/bin/clang++
-override CXXFLAGS += --sysroot=$(WASI_SDK_PREFIX)/share/wasi-sysroot -O$(OPTIMIZE) 
-override CFLAGS += --sysroot=$(WASI_SDK_PREFIX)/share/wasi-sysroot -O$(OPTIMIZE)
-override RANLIB = $(WASI_SDK_PREFIX)/bin/ranlib
-
-# Without this export, configure doesn’t seem to see $CC and $CFLAGS
-export
+OUT_JS := enc/mozjpeg_enc.js enc/mozjpeg_node_enc.js dec/mozjpeg_node_dec.js
+OUT_WASM := $(OUT_JS:.js=.wasm)
 
 .PHONY: all clean
 
-all: $(OUT_WASM)
+all: $(OUT_JS)
 
-$(OUT_WASM): $(CODEC_OUT)
+# Define dependencies for all variations of build artifacts.
+$(filter enc/%,$(OUT_JS)): enc/mozjpeg_enc.cpp
+$(filter dec/%,$(OUT_JS)): dec/mozjpeg_dec.cpp
+
+enc/mozjpeg_node_enc.js dec/mozjpeg_node_dec.js: ENVIRONMENT = node
+
+%.js: $(CODEC_OUT)
 	$(CXX) \
-		-I $(CODEC_BUILD_DIR) \
 		-I $(CODEC_DIR) \
 		${CXXFLAGS} \
 		${LDFLAGS} \
+		--closure 1 \
+		--bind \
+		-s ALLOW_MEMORY_GROWTH=1 \
+		-s MODULARIZE=1 \
+		-s TEXTDECODER=2 \
+		-s ENVIRONMENT=$(ENVIRONMENT) \
+		-s EXPORT_ES6=1 \
 		-o $@ \
-		enc/mozjpeg_enc.cpp \
-		$(CODEC_OUT)
-	$(BINARYEN_PREFIX)/bin/wasm-opt --strip-debug --strip-dwarf --strip-producers --strip-target-features -O4 -o $(OUT_WASM) $(OUT_WASM)
+		$+
 
 # This one is a bit special: there is no rule for .libs/libjpeg.a
 #  so we use libjpeg.la which implicitly builds that one instead.
-$(CODEC_BUILD_DIR)/.libs/libjpeg.a: $(CODEC_BUILD_DIR)/Makefile
-	$(MAKE) -C $(CODEC_BUILD_DIR) libjpeg.la
+$(CODEC_DIR)/.libs/libjpeg.a: $(CODEC_DIR)/Makefile
+	$(MAKE) -C $(CODEC_DIR) libjpeg.la
 
-$(CODEC_BUILD_DIR)/rdswitch.o: $(CODEC_BUILD_DIR)/Makefile
-	$(MAKE) -C $(CODEC_BUILD_DIR) rdswitch.o
+$(CODEC_DIR)/rdswitch.o: $(CODEC_DIR)/Makefile
+	$(MAKE) -C $(CODEC_DIR) rdswitch.o
 
-$(CODEC_BUILD_DIR)/Makefile: $(CODEC_DIR)/configure
-	mkdir -p $(CODEC_BUILD_DIR) && \
-	cd $(CODEC_BUILD_DIR) && \
-	../configure \
-		--target=wasm32-wasi \
-		--host=wasm32-wasi \
+$(CODEC_DIR)/Makefile: $(CODEC_DIR)/configure
+	cd $(CODEC_DIR) && ./configure \
 		--disable-shared \
 		--without-turbojpeg \
 		--without-simd \
@@ -63,10 +59,7 @@ $(CODEC_DIR)/configure.ac: $(CODEC_DIR)
 $(CODEC_DIR):
 	mkdir -p $@
 	curl -sL $(CODEC_URL) | tar xz --strip 1 -C $@
-	cp $(WASI_SDK_PREFIX)/share/misc/config.* $(CODEC_DIR)
-	# ^ Monkey-path autoconf files as Ubuntu’s autoconf tools are too old
-  # to recognize WASI
 
 clean:
-	$(RM) $(OUT_WASM)
-	$(RM) -r $(CODEC_BUILD_DIR)
+	$(RM) $(OUT_JS) $(OUT_WASM)
+	$(MAKE) -C $(CODEC_DIR) clean

codecs/mozjpeg/enc/mozjpeg_enc.cpp

@@ -1,6 +1,10 @@
-#include <stdint.h>
-#include <string>
-
+#include <emscripten/bind.h>
+#include <emscripten/val.h>
+#include <inttypes.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "config.h"
 #include "jpeglib.h"
 
@@ -8,6 +12,14 @@ extern "C" {
 #include "cdjpeg.h"
 }
 
+using namespace emscripten;
+
+// MozJPEG doesn’t expose a numeric version, so I have to do some fun C macro
+// hackery to turn it into a string. More details here:
+// https://gcc.gnu.org/onlinedocs/cpp/Stringizing.html
+#define xstr(s) str(s)
+#define str(s) #s
+
 struct MozJpegOptions {
   int quality;
   bool baseline;
@@ -27,17 +39,26 @@ struct MozJpegOptions {
   int chroma_quality;
 };
 
-thread_local struct MozJpegOptions opts = {};
+int version() {
+  char buffer[] = xstr(MOZJPEG_VERSION);
+  int version = 0;
+  int last_index = 0;
+  for (int i = 0; i < strlen(buffer); i++) {
+    if (buffer[i] == '.') {
+      buffer[i] = '\0';
+      version = version << 8 | atoi(&buffer[last_index]);
+      buffer[i] = '.';
+      last_index = i + 1;
+    }
+  }
+  version = version << 8 | atoi(&buffer[last_index]);
+  return version;
+}
 
-struct DynArray {
-  size_t size;
-  uint8_t* ptr;
-};
+thread_local const val Uint8Array = val::global("Uint8Array");
 
-__attribute__((export_name("encode"))) intptr_t* encode(uintptr_t* image_in,
-                                                        int image_width,
-                                                        int image_height) {
-  uint8_t* image_buffer = reinterpret_cast<uint8_t*>(image_in);
+val encode(std::string image_in, int image_width, int image_height, MozJpegOptions opts) {
+  uint8_t* image_buffer = (uint8_t*)image_in.c_str();
 
   // The code below is basically the `write_JPEG_file` function from
   // https://github.com/mozilla/mozjpeg/blob/master/example.c
@@ -178,47 +199,35 @@ __attribute__((export_name("encode"))) intptr_t* encode(uintptr_t* image_in,
 
   /* Step 7: release JPEG compression object */
 
+  auto js_result = Uint8Array.new_(typed_memory_view(size, output));
+
   /* This is an important step since it will release a good deal of memory. */
   jpeg_destroy_compress(&cinfo);
+  free(output);
 
   /* And we're done! */
-  auto result = new DynArray();
-  result->size = size;
-  result->ptr = output;
-  return reinterpret_cast<intptr_t*>(result);
+  return js_result;
 }
 
-__attribute__((export_name("alloc"))) uintptr_t* alloc(size_t size) {
-  return reinterpret_cast<uintptr_t*>(malloc(size));
+EMSCRIPTEN_BINDINGS(my_module) {
+  value_object<MozJpegOptions>("MozJpegOptions")
+      .field("quality", &MozJpegOptions::quality)
+      .field("baseline", &MozJpegOptions::baseline)
+      .field("arithmetic", &MozJpegOptions::arithmetic)
+      .field("progressive", &MozJpegOptions::progressive)
+      .field("optimize_coding", &MozJpegOptions::optimize_coding)
+      .field("smoothing", &MozJpegOptions::smoothing)
+      .field("color_space", &MozJpegOptions::color_space)
+      .field("quant_table", &MozJpegOptions::quant_table)
+      .field("trellis_multipass", &MozJpegOptions::trellis_multipass)
+      .field("trellis_opt_zero", &MozJpegOptions::trellis_opt_zero)
+      .field("trellis_opt_table", &MozJpegOptions::trellis_opt_table)
+      .field("trellis_loops", &MozJpegOptions::trellis_loops)
+      .field("chroma_subsample", &MozJpegOptions::chroma_subsample)
+      .field("auto_subsample", &MozJpegOptions::auto_subsample)
+      .field("separate_chroma_quality", &MozJpegOptions::separate_chroma_quality)
+      .field("chroma_quality", &MozJpegOptions::chroma_quality);
+
+  function("version", &version);
+  function("encode", &encode);
 }
-
-__attribute__((export_name("dealloc"))) void dealloc(uintptr_t* ptr) {
-  return free(ptr);
-}
-
-#define MAKE_SETTER(type, name)                                                    \
-  __attribute__((export_name("set_opts_" #name))) void set_opts_##name(type val) { \
-    opts.name = val;                                                               \
-  }
-
-MAKE_SETTER(int, quality);
-MAKE_SETTER(bool, baseline);
-MAKE_SETTER(bool, arithmetic);
-MAKE_SETTER(bool, progressive);
-MAKE_SETTER(bool, optimize_coding);
-MAKE_SETTER(int, smoothing);
-MAKE_SETTER(int, color_space);
-MAKE_SETTER(int, quant_table);
-MAKE_SETTER(bool, trellis_multipass);
-MAKE_SETTER(bool, trellis_opt_zero);
-MAKE_SETTER(bool, trellis_opt_table);
-MAKE_SETTER(int, trellis_loops);
-MAKE_SETTER(bool, auto_subsample);
-MAKE_SETTER(int, chroma_subsample);
-MAKE_SETTER(bool, separate_chroma_quality);
-MAKE_SETTER(int, chroma_quality);
-
-// To satisfy WASI SDK compiler and make sure that init code runs.
-int main() {
-  return 0;
-}

codecs/mozjpeg/enc/mozjpeg_enc.d.ts

@@ -23,29 +23,15 @@ export interface EncodeOptions {
   chroma_quality: number;
 }
 
-export interface MozJPEGModuleExports {
-  memory: WebAssembly.Memory;
-  alloc(size: number): number;
-  dealloc(ptr: number): void;
+export interface MozJPEGModule extends EmscriptenWasm.Module {
   encode(
-    data: number,
+    data: BufferSource,
     width: number,
-    height: number
-  ): number;
-  set_opts_quality( quality: number): void;
-  set_opts_baseline( baseline: boolean): void;
-  set_opts_arithmetic( arithmetic: boolean): void;
-  set_opts_progressive( progressive: boolean): void;
-  set_opts_optimize_coding( optimize_coding: boolean): void;
-  set_opts_smoothing( smoothing: number): void;
-  set_opts_color_space( color_space: number): void;
-  set_opts_quant_table( quant_table: number): void;
-  set_opts_trellis_multipass( trellis_multipass: boolean): void;
-  set_opts_trellis_opt_zero( trellis_opt_zero: boolean): void;
-  set_opts_trellis_opt_table( trellis_opt_table: boolean): void;
-  set_opts_trellis_loops( trellis_loops: number): void;
-  set_opts_auto_subsample( auto_subsample: boolean): void;
-  set_opts_chroma_subsample( chroma_subsample: number): void;
-  set_opts_separate_chroma_quality( separate_chroma_quality: boolean): void;
-  set_opts_chroma_quality( chroma_quality: number): void;
-}
+    height: number,
+    options: EncodeOptions,
+  ): Uint8Array;
+}
+
+declare var moduleFactory: EmscriptenWasm.ModuleFactory<MozJPEGModule>;
+
+export default moduleFactory;

codecs/mozjpeg/enc/mozjpeg_enc.js

@@ -0,0 +1,60 @@
+
+var Module = (function() {
+  var _scriptDir = import.meta.url;
+  
+  return (
+function(Module) {
+  Module = Module || {};
+
+
+var f;f||(f=typeof Module !== 'undefined' ? Module : {});var aa,ba;f.ready=new Promise(function(a,b){aa=a;ba=b});var r={},t;for(t in f)f.hasOwnProperty(t)&&(r[t]=f[t]);var ca="./this.program";function ea(a,b){throw b;}var u="",fa;u=self.location.href;_scriptDir&&(u=_scriptDir);0!==u.indexOf("blob:")?u=u.substr(0,u.lastIndexOf("/")+1):u="";fa=function(a){var b=new XMLHttpRequest;b.open("GET",a,!1);b.responseType="arraybuffer";b.send(null);return new Uint8Array(b.response)};
+var ha=f.print||console.log.bind(console),v=f.printErr||console.warn.bind(console);for(t in r)r.hasOwnProperty(t)&&(f[t]=r[t]);r=null;f.thisProgram&&(ca=f.thisProgram);f.quit&&(ea=f.quit);var w;f.wasmBinary&&(w=f.wasmBinary);var noExitRuntime;f.noExitRuntime&&(noExitRuntime=f.noExitRuntime);"object"!==typeof WebAssembly&&A("no native wasm support detected");var B,ia=!1,ja=new TextDecoder("utf8");
+function ka(a,b,c){var d=C;if(0<c){c=b+c-1;for(var e=0;e<a.length;++e){var g=a.charCodeAt(e);if(55296<=g&&57343>=g){var m=a.charCodeAt(++e);g=65536+((g&1023)<<10)|m&1023}if(127>=g){if(b>=c)break;d[b++]=g}else{if(2047>=g){if(b+1>=c)break;d[b++]=192|g>>6}else{if(65535>=g){if(b+2>=c)break;d[b++]=224|g>>12}else{if(b+3>=c)break;d[b++]=240|g>>18;d[b++]=128|g>>12&63}d[b++]=128|g>>6&63}d[b++]=128|g&63}}d[b]=0}}var la=new TextDecoder("utf-16le");
+function ma(a,b){var c=a>>1;for(b=c+b/2;!(c>=b)&&D[c];)++c;return la.decode(C.subarray(a,c<<1))}function na(a,b,c){void 0===c&&(c=2147483647);if(2>c)return 0;c-=2;var d=b;c=c<2*a.length?c/2:a.length;for(var e=0;e<c;++e)E[b>>1]=a.charCodeAt(e),b+=2;E[b>>1]=0;return b-d}function oa(a){return 2*a.length}function pa(a,b){for(var c=0,d="";!(c>=b/4);){var e=G[a+4*c>>2];if(0==e)break;++c;65536<=e?(e-=65536,d+=String.fromCharCode(55296|e>>10,56320|e&1023)):d+=String.fromCharCode(e)}return d}
+function qa(a,b,c){void 0===c&&(c=2147483647);if(4>c)return 0;var d=b;c=d+c-4;for(var e=0;e<a.length;++e){var g=a.charCodeAt(e);if(55296<=g&&57343>=g){var m=a.charCodeAt(++e);g=65536+((g&1023)<<10)|m&1023}G[b>>2]=g;b+=4;if(b+4>c)break}G[b>>2]=0;return b-d}function ra(a){for(var b=0,c=0;c<a.length;++c){var d=a.charCodeAt(c);55296<=d&&57343>=d&&++c;b+=4}return b}var H,I,C,E,D,G,J,sa,ta;
+function ua(a){H=a;f.HEAP8=I=new Int8Array(a);f.HEAP16=E=new Int16Array(a);f.HEAP32=G=new Int32Array(a);f.HEAPU8=C=new Uint8Array(a);f.HEAPU16=D=new Uint16Array(a);f.HEAPU32=J=new Uint32Array(a);f.HEAPF32=sa=new Float32Array(a);f.HEAPF64=ta=new Float64Array(a)}var va=f.INITIAL_MEMORY||16777216;f.wasmMemory?B=f.wasmMemory:B=new WebAssembly.Memory({initial:va/65536,maximum:32768});B&&(H=B.buffer);va=H.byteLength;ua(H);var K,wa=[],xa=[],ya=[],za=[];
+function Aa(){var a=f.preRun.shift();wa.unshift(a)}var L=0,Ba=null,M=null;f.preloadedImages={};f.preloadedAudios={};function A(a){if(f.onAbort)f.onAbort(a);v(a);ia=!0;a=new WebAssembly.RuntimeError("abort("+a+"). Build with -s ASSERTIONS=1 for more info.");ba(a);throw a;}function Ca(){var a=N;return String.prototype.startsWith?a.startsWith("data:application/octet-stream;base64,"):0===a.indexOf("data:application/octet-stream;base64,")}var N="mozjpeg_enc.wasm";
+if(!Ca()){var Da=N;N=f.locateFile?f.locateFile(Da,u):u+Da}function Ea(){try{if(w)return new Uint8Array(w);if(fa)return fa(N);throw"both async and sync fetching of the wasm failed";}catch(a){A(a)}}function Fa(){return w||"function"!==typeof fetch?Promise.resolve().then(Ea):fetch(N,{credentials:"same-origin"}).then(function(a){if(!a.ok)throw"failed to load wasm binary file at '"+N+"'";return a.arrayBuffer()}).catch(function(){return Ea()})}
+function O(a){for(;0<a.length;){var b=a.shift();if("function"==typeof b)b(f);else{var c=b.R;"number"===typeof c?void 0===b.L?K.get(c)():K.get(c)(b.L):c(void 0===b.L?null:b.L)}}}var P={};function Ga(a){for(;a.length;){var b=a.pop();a.pop()(b)}}function Q(a){return this.fromWireType(J[a>>2])}var R={},S={},Ha={};function Ia(a){if(void 0===a)return"_unknown";a=a.replace(/[^a-zA-Z0-9_]/g,"$");var b=a.charCodeAt(0);return 48<=b&&57>=b?"_"+a:a}
+function Ja(a,b){a=Ia(a);return(new Function("body","return function "+a+'() {\n    "use strict";    return body.apply(this, arguments);\n};\n'))(b)}function Ka(a){var b=Error,c=Ja(a,function(d){this.name=a;this.message=d;d=Error(d).stack;void 0!==d&&(this.stack=this.toString()+"\n"+d.replace(/^Error(:[^\n]*)?\n/,""))});c.prototype=Object.create(b.prototype);c.prototype.constructor=c;c.prototype.toString=function(){return void 0===this.message?this.name:this.name+": "+this.message};return c}
+var La=void 0;function Ma(a,b,c){function d(h){h=c(h);if(h.length!==a.length)throw new La("Mismatched type converter count");for(var n=0;n<a.length;++n)T(a[n],h[n])}a.forEach(function(h){Ha[h]=b});var e=Array(b.length),g=[],m=0;b.forEach(function(h,n){S.hasOwnProperty(h)?e[n]=S[h]:(g.push(h),R.hasOwnProperty(h)||(R[h]=[]),R[h].push(function(){e[n]=S[h];++m;m===g.length&&d(e)}))});0===g.length&&d(e)}
+function Na(a){switch(a){case 1:return 0;case 2:return 1;case 4:return 2;case 8:return 3;default:throw new TypeError("Unknown type size: "+a);}}var Oa=void 0;function U(a){for(var b="";C[a];)b+=Oa[C[a++]];return b}var Pa=void 0;function W(a){throw new Pa(a);}
+function T(a,b,c){c=c||{};if(!("argPackAdvance"in b))throw new TypeError("registerType registeredInstance requires argPackAdvance");var d=b.name;a||W('type "'+d+'" must have a positive integer typeid pointer');if(S.hasOwnProperty(a)){if(c.V)return;W("Cannot register type '"+d+"' twice")}S[a]=b;delete Ha[a];R.hasOwnProperty(a)&&(b=R[a],delete R[a],b.forEach(function(e){e()}))}var Qa=[],X=[{},{value:void 0},{value:null},{value:!0},{value:!1}];
+function Ra(a){4<a&&0===--X[a].M&&(X[a]=void 0,Qa.push(a))}function Sa(a){switch(a){case void 0:return 1;case null:return 2;case !0:return 3;case !1:return 4;default:var b=Qa.length?Qa.pop():X.length;X[b]={M:1,value:a};return b}}function Ta(a){if(null===a)return"null";var b=typeof a;return"object"===b||"array"===b||"function"===b?a.toString():""+a}
+function Ua(a,b){switch(b){case 2:return function(c){return this.fromWireType(sa[c>>2])};case 3:return function(c){return this.fromWireType(ta[c>>3])};default:throw new TypeError("Unknown float type: "+a);}}function Va(a){var b=Function;if(!(b instanceof Function))throw new TypeError("new_ called with constructor type "+typeof b+" which is not a function");var c=Ja(b.name||"unknownFunctionName",function(){});c.prototype=b.prototype;c=new c;a=b.apply(c,a);return a instanceof Object?a:c}
+function Wa(a,b){var c=f;if(void 0===c[a].J){var d=c[a];c[a]=function(){c[a].J.hasOwnProperty(arguments.length)||W("Function '"+b+"' called with an invalid number of arguments ("+arguments.length+") - expects one of ("+c[a].J+")!");return c[a].J[arguments.length].apply(this,arguments)};c[a].J=[];c[a].J[d.O]=d}}
+function Xa(a,b,c){f.hasOwnProperty(a)?((void 0===c||void 0!==f[a].J&&void 0!==f[a].J[c])&&W("Cannot register public name '"+a+"' twice"),Wa(a,a),f.hasOwnProperty(c)&&W("Cannot register multiple overloads of a function with the same number of arguments ("+c+")!"),f[a].J[c]=b):(f[a]=b,void 0!==c&&(f[a].ba=c))}function Ya(a,b){for(var c=[],d=0;d<a;d++)c.push(G[(b>>2)+d]);return c}
+function Za(a,b){0<=a.indexOf("j")||A("Assertion failed: getDynCaller should only be called with i64 sigs");var c=[];return function(){c.length=arguments.length;for(var d=0;d<arguments.length;d++)c[d]=arguments[d];var e;-1!=a.indexOf("j")?e=c&&c.length?f["dynCall_"+a].apply(null,[b].concat(c)):f["dynCall_"+a].call(null,b):e=K.get(b).apply(null,c);return e}}
+function Y(a,b){a=U(a);var c=-1!=a.indexOf("j")?Za(a,b):K.get(b);"function"!==typeof c&&W("unknown function pointer with signature "+a+": "+b);return c}var $a=void 0;function ab(a){a=bb(a);var b=U(a);Z(a);return b}function cb(a,b){function c(g){e[g]||S[g]||(Ha[g]?Ha[g].forEach(c):(d.push(g),e[g]=!0))}var d=[],e={};b.forEach(c);throw new $a(a+": "+d.map(ab).join([", "]));}
+function db(a,b,c){switch(b){case 0:return c?function(d){return I[d]}:function(d){return C[d]};case 1:return c?function(d){return E[d>>1]}:function(d){return D[d>>1]};case 2:return c?function(d){return G[d>>2]}:function(d){return J[d>>2]};default:throw new TypeError("Unknown integer type: "+a);}}var eb={};function fb(){return"object"===typeof globalThis?globalThis:Function("return this")()}function gb(a,b){var c=S[a];void 0===c&&W(b+" has unknown type "+ab(a));return c}var hb={},ib={};
+function jb(){if(!kb){var a={USER:"web_user",LOGNAME:"web_user",PATH:"/",PWD:"/",HOME:"/home/web_user",LANG:("object"===typeof navigator&&navigator.languages&&navigator.languages[0]||"C").replace("-","_")+".UTF-8",_:ca||"./this.program"},b;for(b in ib)a[b]=ib[b];var c=[];for(b in a)c.push(b+"="+a[b]);kb=c}return kb}var kb,lb=[null,[],[]];La=f.InternalError=Ka("InternalError");for(var mb=Array(256),nb=0;256>nb;++nb)mb[nb]=String.fromCharCode(nb);Oa=mb;Pa=f.BindingError=Ka("BindingError");
+f.count_emval_handles=function(){for(var a=0,b=5;b<X.length;++b)void 0!==X[b]&&++a;return a};f.get_first_emval=function(){for(var a=5;a<X.length;++a)if(void 0!==X[a])return X[a];return null};$a=f.UnboundTypeError=Ka("UnboundTypeError");xa.push({R:function(){ob()}});
+var rb={B:function(){},n:function(a){var b=P[a];delete P[a];var c=b.W,d=b.X,e=b.N,g=e.map(function(m){return m.U}).concat(e.map(function(m){return m.Z}));Ma([a],g,function(m){var h={};e.forEach(function(n,k){var l=m[k],q=n.S,x=n.T,y=m[k+e.length],p=n.Y,da=n.$;h[n.P]={read:function(z){return l.fromWireType(q(x,z))},write:function(z,F){var V=[];p(da,z,y.toWireType(V,F));Ga(V)}}});return[{name:b.name,fromWireType:function(n){var k={},l;for(l in h)k[l]=h[l].read(n);d(n);return k},toWireType:function(n,
+k){for(var l in h)if(!(l in k))throw new TypeError('Missing field:  "'+l+'"');var q=c();for(l in h)h[l].write(q,k[l]);null!==n&&n.push(d,q);return q},argPackAdvance:8,readValueFromPointer:Q,K:d}]})},y:function(a,b,c,d,e){var g=Na(c);b=U(b);T(a,{name:b,fromWireType:function(m){return!!m},toWireType:function(m,h){return h?d:e},argPackAdvance:8,readValueFromPointer:function(m){if(1===c)var h=I;else if(2===c)h=E;else if(4===c)h=G;else throw new TypeError("Unknown boolean type size: "+b);return this.fromWireType(h[m>>
+g])},K:null})},x:function(a,b){b=U(b);T(a,{name:b,fromWireType:function(c){var d=X[c].value;Ra(c);return d},toWireType:function(c,d){return Sa(d)},argPackAdvance:8,readValueFromPointer:Q,K:null})},k:function(a,b,c){c=Na(c);b=U(b);T(a,{name:b,fromWireType:function(d){return d},toWireType:function(d,e){if("number"!==typeof e&&"boolean"!==typeof e)throw new TypeError('Cannot convert "'+Ta(e)+'" to '+this.name);return e},argPackAdvance:8,readValueFromPointer:Ua(b,c),K:null})},g:function(a,b,c,d,e,g){var m=
+Ya(b,c);a=U(a);e=Y(d,e);Xa(a,function(){cb("Cannot call "+a+" due to unbound types",m)},b-1);Ma([],m,function(h){var n=a,k=a;h=[h[0],null].concat(h.slice(1));var l=e,q=h.length;2>q&&W("argTypes array size mismatch! Must at least get return value and 'this' types!");for(var x=null!==h[1]&&!1,y=!1,p=1;p<h.length;++p)if(null!==h[p]&&void 0===h[p].K){y=!0;break}var da="void"!==h[0].name,z="",F="";for(p=0;p<q-2;++p)z+=(0!==p?", ":"")+"arg"+p,F+=(0!==p?", ":"")+"arg"+p+"Wired";k="return function "+Ia(k)+
+"("+z+") {\nif (arguments.length !== "+(q-2)+") {\nthrowBindingError('function "+k+" called with ' + arguments.length + ' arguments, expected "+(q-2)+" args!');\n}\n";y&&(k+="var destructors = [];\n");var V=y?"destructors":"null";z="throwBindingError invoker fn runDestructors retType classParam".split(" ");l=[W,l,g,Ga,h[0],h[1]];x&&(k+="var thisWired = classParam.toWireType("+V+", this);\n");for(p=0;p<q-2;++p)k+="var arg"+p+"Wired = argType"+p+".toWireType("+V+", arg"+p+"); // "+h[p+2].name+"\n",
+z.push("argType"+p),l.push(h[p+2]);x&&(F="thisWired"+(0<F.length?", ":"")+F);k+=(da?"var rv = ":"")+"invoker(fn"+(0<F.length?", ":"")+F+");\n";if(y)k+="runDestructors(destructors);\n";else for(p=x?1:2;p<h.length;++p)q=1===p?"thisWired":"arg"+(p-2)+"Wired",null!==h[p].K&&(k+=q+"_dtor("+q+"); // "+h[p].name+"\n",z.push(q+"_dtor"),l.push(h[p].K));da&&(k+="var ret = retType.fromWireType(rv);\nreturn ret;\n");z.push(k+"}\n");h=Va(z).apply(null,l);p=b-1;if(!f.hasOwnProperty(n))throw new La("Replacing nonexistant public symbol");
+void 0!==f[n].J&&void 0!==p?f[n].J[p]=h:(f[n]=h,f[n].O=p);return[]})},d:function(a,b,c,d,e){function g(k){return k}b=U(b);-1===e&&(e=4294967295);var m=Na(c);if(0===d){var h=32-8*c;g=function(k){return k<<h>>>h}}var n=-1!=b.indexOf("unsigned");T(a,{name:b,fromWireType:g,toWireType:function(k,l){if("number"!==typeof l&&"boolean"!==typeof l)throw new TypeError('Cannot convert "'+Ta(l)+'" to '+this.name);if(l<d||l>e)throw new TypeError('Passing a number "'+Ta(l)+'" from JS side to C/C++ side to an argument of type "'+
+b+'", which is outside the valid range ['+d+", "+e+"]!");return n?l>>>0:l|0},argPackAdvance:8,readValueFromPointer:db(b,m,0!==d),K:null})},c:function(a,b,c){function d(g){g>>=2;var m=J;return new e(H,m[g+1],m[g])}var e=[Int8Array,Uint8Array,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array][b];c=U(c);T(a,{name:c,fromWireType:d,argPackAdvance:8,readValueFromPointer:d},{V:!0})},l:function(a,b){b=U(b);var c="std::string"===b;T(a,{name:b,fromWireType:function(d){var e=J[d>>2];if(c)for(var g=
+d+4,m=0;m<=e;++m){var h=d+4+m;if(m==e||0==C[h]){if(g){for(var n=g+(h-g),k=g;!(k>=n)&&C[k];)++k;g=ja.decode(C.subarray(g,k))}else g="";if(void 0===l)var l=g;else l+=String.fromCharCode(0),l+=g;g=h+1}}else{l=Array(e);for(m=0;m<e;++m)l[m]=String.fromCharCode(C[d+4+m]);l=l.join("")}Z(d);return l},toWireType:function(d,e){e instanceof ArrayBuffer&&(e=new Uint8Array(e));var g="string"===typeof e;g||e instanceof Uint8Array||e instanceof Uint8ClampedArray||e instanceof Int8Array||W("Cannot pass non-string to std::string");
+var m=(c&&g?function(){for(var k=0,l=0;l<e.length;++l){var q=e.charCodeAt(l);55296<=q&&57343>=q&&(q=65536+((q&1023)<<10)|e.charCodeAt(++l)&1023);127>=q?++k:k=2047>=q?k+2:65535>=q?k+3:k+4}return k}:function(){return e.length})(),h=pb(4+m+1);J[h>>2]=m;if(c&&g)ka(e,h+4,m+1);else if(g)for(g=0;g<m;++g){var n=e.charCodeAt(g);255<n&&(Z(h),W("String has UTF-16 code units that do not fit in 8 bits"));C[h+4+g]=n}else for(g=0;g<m;++g)C[h+4+g]=e[g];null!==d&&d.push(Z,h);return h},argPackAdvance:8,readValueFromPointer:Q,
+K:function(d){Z(d)}})},f:function(a,b,c){c=U(c);if(2===b){var d=ma;var e=na;var g=oa;var m=function(){return D};var h=1}else 4===b&&(d=pa,e=qa,g=ra,m=function(){return J},h=2);T(a,{name:c,fromWireType:function(n){for(var k=J[n>>2],l=m(),q,x=n+4,y=0;y<=k;++y){var p=n+4+y*b;if(y==k||0==l[p>>h])x=d(x,p-x),void 0===q?q=x:(q+=String.fromCharCode(0),q+=x),x=p+b}Z(n);return q},toWireType:function(n,k){"string"!==typeof k&&W("Cannot pass non-string to C++ string type "+c);var l=g(k),q=pb(4+l+b);J[q>>2]=l>>
+h;e(k,q+4,l+b);null!==n&&n.push(Z,q);return q},argPackAdvance:8,readValueFromPointer:Q,K:function(n){Z(n)}})},o:function(a,b,c,d,e,g){P[a]={name:U(b),W:Y(c,d),X:Y(e,g),N:[]}},b:function(a,b,c,d,e,g,m,h,n,k){P[a].N.push({P:U(b),U:c,S:Y(d,e),T:g,Z:m,Y:Y(h,n),$:k})},z:function(a,b){b=U(b);T(a,{aa:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},h:Ra,v:function(a){if(0===a)return Sa(fb());var b=eb[a];a=void 0===b?U(a):b;return Sa(fb()[a])},m:function(a){4<a&&(X[a].M+=1)},
+p:function(a,b,c,d){a||W("Cannot use deleted val. handle = "+a);a=X[a].value;var e=hb[b];if(!e){e="";for(var g=0;g<b;++g)e+=(0!==g?", ":"")+"arg"+g;var m="return function emval_allocator_"+b+"(constructor, argTypes, args) {\n";for(g=0;g<b;++g)m+="var argType"+g+" = requireRegisteredType(Module['HEAP32'][(argTypes >>> 2) + "+g+'], "parameter '+g+'");\nvar arg'+g+" = argType"+g+".readValueFromPointer(args);\nargs += argType"+g+"['argPackAdvance'];\n";e=(new Function("requireRegisteredType","Module",
+"__emval_register",m+("var obj = new constructor("+e+");\nreturn __emval_register(obj);\n}\n")))(gb,f,Sa);hb[b]=e}return e(a,c,d)},i:function(){A()},s:function(a,b,c){C.copyWithin(a,b,b+c)},e:function(a){a>>>=0;var b=C.length;if(2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%65536);a:{try{B.grow(Math.min(2147483648,d)-H.byteLength+65535>>>16);ua(B.buffer);var e=1;break a}catch(g){}e=void 0}if(e)return!0}return!1},
+t:function(a,b){var c=0;jb().forEach(function(d,e){var g=b+c;e=G[a+4*e>>2]=g;for(g=0;g<d.length;++g)I[e++>>0]=d.charCodeAt(g);I[e>>0]=0;c+=d.length+1});return 0},u:function(a,b){var c=jb();G[a>>2]=c.length;var d=0;c.forEach(function(e){d+=e.length+1});G[b>>2]=d;return 0},A:function(a){if(!noExitRuntime){if(f.onExit)f.onExit(a);ia=!0}ea(a,new qb(a))},w:function(){return 0},q:function(){},j:function(a,b,c,d){for(var e=0,g=0;g<c;g++){for(var m=G[b+8*g>>2],h=G[b+(8*g+4)>>2],n=0;n<h;n++){var k=C[m+n],
+l=lb[a];if(0===k||10===k){for(k=0;l[k]&&!(NaN<=k);)++k;k=ja.decode(l.subarray?l.subarray(0,k):new Uint8Array(l.slice(0,k)));(1===a?ha:v)(k);l.length=0}else l.push(k)}e+=h}G[d>>2]=e;return 0},a:B,r:function(){}};
+(function(){function a(e){f.asm=e.exports;K=f.asm.C;L--;f.monitorRunDependencies&&f.monitorRunDependencies(L);0==L&&(null!==Ba&&(clearInterval(Ba),Ba=null),M&&(e=M,M=null,e()))}function b(e){a(e.instance)}function c(e){return Fa().then(function(g){return WebAssembly.instantiate(g,d)}).then(e,function(g){v("failed to asynchronously prepare wasm: "+g);A(g)})}var d={a:rb};L++;f.monitorRunDependencies&&f.monitorRunDependencies(L);if(f.instantiateWasm)try{return f.instantiateWasm(d,a)}catch(e){return v("Module.instantiateWasm callback failed with error: "+
+e),!1}(function(){return w||"function"!==typeof WebAssembly.instantiateStreaming||Ca()||"function"!==typeof fetch?c(b):fetch(N,{credentials:"same-origin"}).then(function(e){return WebAssembly.instantiateStreaming(e,d).then(b,function(g){v("wasm streaming compile failed: "+g);v("falling back to ArrayBuffer instantiation");return c(b)})})})().catch(ba);return{}})();
+var ob=f.___wasm_call_ctors=function(){return(ob=f.___wasm_call_ctors=f.asm.D).apply(null,arguments)},pb=f._malloc=function(){return(pb=f._malloc=f.asm.E).apply(null,arguments)},Z=f._free=function(){return(Z=f._free=f.asm.F).apply(null,arguments)},bb=f.___getTypeName=function(){return(bb=f.___getTypeName=f.asm.G).apply(null,arguments)};f.___embind_register_native_and_builtin_types=function(){return(f.___embind_register_native_and_builtin_types=f.asm.H).apply(null,arguments)};
+f.dynCall_jiji=function(){return(f.dynCall_jiji=f.asm.I).apply(null,arguments)};var sb;function qb(a){this.name="ExitStatus";this.message="Program terminated with exit("+a+")";this.status=a}M=function tb(){sb||ub();sb||(M=tb)};
+function ub(){function a(){if(!sb&&(sb=!0,f.calledRun=!0,!ia)){O(xa);O(ya);aa(f);if(f.onRuntimeInitialized)f.onRuntimeInitialized();if(f.postRun)for("function"==typeof f.postRun&&(f.postRun=[f.postRun]);f.postRun.length;){var b=f.postRun.shift();za.unshift(b)}O(za)}}if(!(0<L)){if(f.preRun)for("function"==typeof f.preRun&&(f.preRun=[f.preRun]);f.preRun.length;)Aa();O(wa);0<L||(f.setStatus?(f.setStatus("Running..."),setTimeout(function(){setTimeout(function(){f.setStatus("")},1);a()},1)):a())}}
+f.run=ub;if(f.preInit)for("function"==typeof f.preInit&&(f.preInit=[f.preInit]);0<f.preInit.length;)f.preInit.pop()();noExitRuntime=!0;ub();
+
+
+  return Module.ready
+}
+);
+})();
+export default Module;

codecs/mozjpeg/enc/mozjpeg_node_enc.js

@@ -0,0 +1,61 @@
+
+var Module = (function() {
+  var _scriptDir = import.meta.url;
+  
+  return (
+function(Module) {
+  Module = Module || {};
+
+
+var f;f||(f=typeof Module !== 'undefined' ? Module : {});var aa,ba;f.ready=new Promise(function(a,b){aa=a;ba=b});var r={},t;for(t in f)f.hasOwnProperty(t)&&(r[t]=f[t]);var da="./this.program";function ea(a,b){throw b;}var fa="",ha,ia,ja,ka;fa=__dirname+"/";ha=function(a){ja||(ja=require("fs"));ka||(ka=require("path"));a=ka.normalize(a);return ja.readFileSync(a,null)};ia=function(a){a=ha(a);a.buffer||(a=new Uint8Array(a));a.buffer||u("Assertion failed: undefined");return a};
+1<process.argv.length&&(da=process.argv[1].replace(/\\/g,"/"));process.argv.slice(2);process.on("uncaughtException",function(a){if(!(a instanceof la))throw a;});process.on("unhandledRejection",u);ea=function(a){process.exit(a)};f.inspect=function(){return"[Emscripten Module object]"};var ma=f.print||console.log.bind(console),v=f.printErr||console.warn.bind(console);for(t in r)r.hasOwnProperty(t)&&(f[t]=r[t]);r=null;f.thisProgram&&(da=f.thisProgram);f.quit&&(ea=f.quit);var w;f.wasmBinary&&(w=f.wasmBinary);
+var noExitRuntime;f.noExitRuntime&&(noExitRuntime=f.noExitRuntime);"object"!==typeof WebAssembly&&u("no native wasm support detected");var A,na=!1,oa=new TextDecoder("utf8");
+function pa(a,b,c){var d=B;if(0<c){c=b+c-1;for(var e=0;e<a.length;++e){var g=a.charCodeAt(e);if(55296<=g&&57343>=g){var m=a.charCodeAt(++e);g=65536+((g&1023)<<10)|m&1023}if(127>=g){if(b>=c)break;d[b++]=g}else{if(2047>=g){if(b+1>=c)break;d[b++]=192|g>>6}else{if(65535>=g){if(b+2>=c)break;d[b++]=224|g>>12}else{if(b+3>=c)break;d[b++]=240|g>>18;d[b++]=128|g>>12&63}d[b++]=128|g>>6&63}d[b++]=128|g&63}}d[b]=0}}var qa=new TextDecoder("utf-16le");
+function ra(a,b){var c=a>>1;for(b=c+b/2;!(c>=b)&&C[c];)++c;return qa.decode(B.subarray(a,c<<1))}function sa(a,b,c){void 0===c&&(c=2147483647);if(2>c)return 0;c-=2;var d=b;c=c<2*a.length?c/2:a.length;for(var e=0;e<c;++e)D[b>>1]=a.charCodeAt(e),b+=2;D[b>>1]=0;return b-d}function ta(a){return 2*a.length}function ua(a,b){for(var c=0,d="";!(c>=b/4);){var e=F[a+4*c>>2];if(0==e)break;++c;65536<=e?(e-=65536,d+=String.fromCharCode(55296|e>>10,56320|e&1023)):d+=String.fromCharCode(e)}return d}
+function va(a,b,c){void 0===c&&(c=2147483647);if(4>c)return 0;var d=b;c=d+c-4;for(var e=0;e<a.length;++e){var g=a.charCodeAt(e);if(55296<=g&&57343>=g){var m=a.charCodeAt(++e);g=65536+((g&1023)<<10)|m&1023}F[b>>2]=g;b+=4;if(b+4>c)break}F[b>>2]=0;return b-d}function wa(a){for(var b=0,c=0;c<a.length;++c){var d=a.charCodeAt(c);55296<=d&&57343>=d&&++c;b+=4}return b}var G,H,B,D,C,F,I,xa,ya;
+function za(a){G=a;f.HEAP8=H=new Int8Array(a);f.HEAP16=D=new Int16Array(a);f.HEAP32=F=new Int32Array(a);f.HEAPU8=B=new Uint8Array(a);f.HEAPU16=C=new Uint16Array(a);f.HEAPU32=I=new Uint32Array(a);f.HEAPF32=xa=new Float32Array(a);f.HEAPF64=ya=new Float64Array(a)}var Aa=f.INITIAL_MEMORY||16777216;f.wasmMemory?A=f.wasmMemory:A=new WebAssembly.Memory({initial:Aa/65536,maximum:32768});A&&(G=A.buffer);Aa=G.byteLength;za(G);var J,Ba=[],Ca=[],Da=[],Ea=[];
+function Fa(){var a=f.preRun.shift();Ba.unshift(a)}var K=0,Ga=null,L=null;f.preloadedImages={};f.preloadedAudios={};function u(a){if(f.onAbort)f.onAbort(a);v(a);na=!0;a=new WebAssembly.RuntimeError("abort("+a+"). Build with -s ASSERTIONS=1 for more info.");ba(a);throw a;}function Ha(){var a=M;return String.prototype.startsWith?a.startsWith("data:application/octet-stream;base64,"):0===a.indexOf("data:application/octet-stream;base64,")}var M="mozjpeg_node_enc.wasm";
+if(!Ha()){var Ia=M;M=f.locateFile?f.locateFile(Ia,fa):fa+Ia}function Ja(){try{if(w)return new Uint8Array(w);if(ia)return ia(M);throw"both async and sync fetching of the wasm failed";}catch(a){u(a)}}function N(a){for(;0<a.length;){var b=a.shift();if("function"==typeof b)b(f);else{var c=b.R;"number"===typeof c?void 0===b.L?J.get(c)():J.get(c)(b.L):c(void 0===b.L?null:b.L)}}}var O={};function Ka(a){for(;a.length;){var b=a.pop();a.pop()(b)}}function P(a){return this.fromWireType(I[a>>2])}
+var Q={},R={},S={};function La(a){if(void 0===a)return"_unknown";a=a.replace(/[^a-zA-Z0-9_]/g,"$");var b=a.charCodeAt(0);return 48<=b&&57>=b?"_"+a:a}function Ma(a,b){a=La(a);return(new Function("body","return function "+a+'() {\n    "use strict";    return body.apply(this, arguments);\n};\n'))(b)}
+function Na(a){var b=Error,c=Ma(a,function(d){this.name=a;this.message=d;d=Error(d).stack;void 0!==d&&(this.stack=this.toString()+"\n"+d.replace(/^Error(:[^\n]*)?\n/,""))});c.prototype=Object.create(b.prototype);c.prototype.constructor=c;c.prototype.toString=function(){return void 0===this.message?this.name:this.name+": "+this.message};return c}var Oa=void 0;
+function Pa(a,b,c){function d(h){h=c(h);if(h.length!==a.length)throw new Oa("Mismatched type converter count");for(var k=0;k<a.length;++k)U(a[k],h[k])}a.forEach(function(h){S[h]=b});var e=Array(b.length),g=[],m=0;b.forEach(function(h,k){R.hasOwnProperty(h)?e[k]=R[h]:(g.push(h),Q.hasOwnProperty(h)||(Q[h]=[]),Q[h].push(function(){e[k]=R[h];++m;m===g.length&&d(e)}))});0===g.length&&d(e)}
+function Qa(a){switch(a){case 1:return 0;case 2:return 1;case 4:return 2;case 8:return 3;default:throw new TypeError("Unknown type size: "+a);}}var Ra=void 0;function V(a){for(var b="";B[a];)b+=Ra[B[a++]];return b}var Sa=void 0;function W(a){throw new Sa(a);}
+function U(a,b,c){c=c||{};if(!("argPackAdvance"in b))throw new TypeError("registerType registeredInstance requires argPackAdvance");var d=b.name;a||W('type "'+d+'" must have a positive integer typeid pointer');if(R.hasOwnProperty(a)){if(c.V)return;W("Cannot register type '"+d+"' twice")}R[a]=b;delete S[a];Q.hasOwnProperty(a)&&(b=Q[a],delete Q[a],b.forEach(function(e){e()}))}var Ta=[],X=[{},{value:void 0},{value:null},{value:!0},{value:!1}];
+function Ua(a){4<a&&0===--X[a].M&&(X[a]=void 0,Ta.push(a))}function Va(a){switch(a){case void 0:return 1;case null:return 2;case !0:return 3;case !1:return 4;default:var b=Ta.length?Ta.pop():X.length;X[b]={M:1,value:a};return b}}function Wa(a){if(null===a)return"null";var b=typeof a;return"object"===b||"array"===b||"function"===b?a.toString():""+a}
+function Xa(a,b){switch(b){case 2:return function(c){return this.fromWireType(xa[c>>2])};case 3:return function(c){return this.fromWireType(ya[c>>3])};default:throw new TypeError("Unknown float type: "+a);}}function Ya(a){var b=Function;if(!(b instanceof Function))throw new TypeError("new_ called with constructor type "+typeof b+" which is not a function");var c=Ma(b.name||"unknownFunctionName",function(){});c.prototype=b.prototype;c=new c;a=b.apply(c,a);return a instanceof Object?a:c}
+function Za(a,b){var c=f;if(void 0===c[a].J){var d=c[a];c[a]=function(){c[a].J.hasOwnProperty(arguments.length)||W("Function '"+b+"' called with an invalid number of arguments ("+arguments.length+") - expects one of ("+c[a].J+")!");return c[a].J[arguments.length].apply(this,arguments)};c[a].J=[];c[a].J[d.O]=d}}
+function $a(a,b,c){f.hasOwnProperty(a)?((void 0===c||void 0!==f[a].J&&void 0!==f[a].J[c])&&W("Cannot register public name '"+a+"' twice"),Za(a,a),f.hasOwnProperty(c)&&W("Cannot register multiple overloads of a function with the same number of arguments ("+c+")!"),f[a].J[c]=b):(f[a]=b,void 0!==c&&(f[a].ba=c))}function ab(a,b){for(var c=[],d=0;d<a;d++)c.push(F[(b>>2)+d]);return c}
+function bb(a,b){0<=a.indexOf("j")||u("Assertion failed: getDynCaller should only be called with i64 sigs");var c=[];return function(){c.length=arguments.length;for(var d=0;d<arguments.length;d++)c[d]=arguments[d];var e;-1!=a.indexOf("j")?e=c&&c.length?f["dynCall_"+a].apply(null,[b].concat(c)):f["dynCall_"+a].call(null,b):e=J.get(b).apply(null,c);return e}}
+function Y(a,b){a=V(a);var c=-1!=a.indexOf("j")?bb(a,b):J.get(b);"function"!==typeof c&&W("unknown function pointer with signature "+a+": "+b);return c}var cb=void 0;function db(a){a=eb(a);var b=V(a);Z(a);return b}function fb(a,b){function c(g){e[g]||R[g]||(S[g]?S[g].forEach(c):(d.push(g),e[g]=!0))}var d=[],e={};b.forEach(c);throw new cb(a+": "+d.map(db).join([", "]));}
+function gb(a,b,c){switch(b){case 0:return c?function(d){return H[d]}:function(d){return B[d]};case 1:return c?function(d){return D[d>>1]}:function(d){return C[d>>1]};case 2:return c?function(d){return F[d>>2]}:function(d){return I[d>>2]};default:throw new TypeError("Unknown integer type: "+a);}}var hb={};function ib(){return"object"===typeof globalThis?globalThis:Function("return this")()}function jb(a,b){var c=R[a];void 0===c&&W(b+" has unknown type "+db(a));return c}var kb={},lb={};
+function mb(){if(!nb){var a={USER:"web_user",LOGNAME:"web_user",PATH:"/",PWD:"/",HOME:"/home/web_user",LANG:("object"===typeof navigator&&navigator.languages&&navigator.languages[0]||"C").replace("-","_")+".UTF-8",_:da||"./this.program"},b;for(b in lb)a[b]=lb[b];var c=[];for(b in a)c.push(b+"="+a[b]);nb=c}return nb}var nb,ob=[null,[],[]];Oa=f.InternalError=Na("InternalError");for(var pb=Array(256),qb=0;256>qb;++qb)pb[qb]=String.fromCharCode(qb);Ra=pb;Sa=f.BindingError=Na("BindingError");
+f.count_emval_handles=function(){for(var a=0,b=5;b<X.length;++b)void 0!==X[b]&&++a;return a};f.get_first_emval=function(){for(var a=5;a<X.length;++a)if(void 0!==X[a])return X[a];return null};cb=f.UnboundTypeError=Na("UnboundTypeError");Ca.push({R:function(){rb()}});
+var tb={B:function(){},n:function(a){var b=O[a];delete O[a];var c=b.W,d=b.X,e=b.N,g=e.map(function(m){return m.U}).concat(e.map(function(m){return m.Z}));Pa([a],g,function(m){var h={};e.forEach(function(k,n){var l=m[n],p=k.S,x=k.T,y=m[n+e.length],q=k.Y,ca=k.$;h[k.P]={read:function(z){return l.fromWireType(p(x,z))},write:function(z,E){var T=[];q(ca,z,y.toWireType(T,E));Ka(T)}}});return[{name:b.name,fromWireType:function(k){var n={},l;for(l in h)n[l]=h[l].read(k);d(k);return n},toWireType:function(k,
+n){for(var l in h)if(!(l in n))throw new TypeError('Missing field:  "'+l+'"');var p=c();for(l in h)h[l].write(p,n[l]);null!==k&&k.push(d,p);return p},argPackAdvance:8,readValueFromPointer:P,K:d}]})},y:function(a,b,c,d,e){var g=Qa(c);b=V(b);U(a,{name:b,fromWireType:function(m){return!!m},toWireType:function(m,h){return h?d:e},argPackAdvance:8,readValueFromPointer:function(m){if(1===c)var h=H;else if(2===c)h=D;else if(4===c)h=F;else throw new TypeError("Unknown boolean type size: "+b);return this.fromWireType(h[m>>
+g])},K:null})},x:function(a,b){b=V(b);U(a,{name:b,fromWireType:function(c){var d=X[c].value;Ua(c);return d},toWireType:function(c,d){return Va(d)},argPackAdvance:8,readValueFromPointer:P,K:null})},k:function(a,b,c){c=Qa(c);b=V(b);U(a,{name:b,fromWireType:function(d){return d},toWireType:function(d,e){if("number"!==typeof e&&"boolean"!==typeof e)throw new TypeError('Cannot convert "'+Wa(e)+'" to '+this.name);return e},argPackAdvance:8,readValueFromPointer:Xa(b,c),K:null})},g:function(a,b,c,d,e,g){var m=
+ab(b,c);a=V(a);e=Y(d,e);$a(a,function(){fb("Cannot call "+a+" due to unbound types",m)},b-1);Pa([],m,function(h){var k=[h[0],null].concat(h.slice(1)),n=h=a,l=e,p=k.length;2>p&&W("argTypes array size mismatch! Must at least get return value and 'this' types!");for(var x=null!==k[1]&&!1,y=!1,q=1;q<k.length;++q)if(null!==k[q]&&void 0===k[q].K){y=!0;break}var ca="void"!==k[0].name,z="",E="";for(q=0;q<p-2;++q)z+=(0!==q?", ":"")+"arg"+q,E+=(0!==q?", ":"")+"arg"+q+"Wired";n="return function "+La(n)+"("+
+z+") {\nif (arguments.length !== "+(p-2)+") {\nthrowBindingError('function "+n+" called with ' + arguments.length + ' arguments, expected "+(p-2)+" args!');\n}\n";y&&(n+="var destructors = [];\n");var T=y?"destructors":"null";z="throwBindingError invoker fn runDestructors retType classParam".split(" ");l=[W,l,g,Ka,k[0],k[1]];x&&(n+="var thisWired = classParam.toWireType("+T+", this);\n");for(q=0;q<p-2;++q)n+="var arg"+q+"Wired = argType"+q+".toWireType("+T+", arg"+q+"); // "+k[q+2].name+"\n",z.push("argType"+
+q),l.push(k[q+2]);x&&(E="thisWired"+(0<E.length?", ":"")+E);n+=(ca?"var rv = ":"")+"invoker(fn"+(0<E.length?", ":"")+E+");\n";if(y)n+="runDestructors(destructors);\n";else for(q=x?1:2;q<k.length;++q)p=1===q?"thisWired":"arg"+(q-2)+"Wired",null!==k[q].K&&(n+=p+"_dtor("+p+"); // "+k[q].name+"\n",z.push(p+"_dtor"),l.push(k[q].K));ca&&(n+="var ret = retType.fromWireType(rv);\nreturn ret;\n");z.push(n+"}\n");k=Ya(z).apply(null,l);q=b-1;if(!f.hasOwnProperty(h))throw new Oa("Replacing nonexistant public symbol");
+void 0!==f[h].J&&void 0!==q?f[h].J[q]=k:(f[h]=k,f[h].O=q);return[]})},d:function(a,b,c,d,e){function g(n){return n}b=V(b);-1===e&&(e=4294967295);var m=Qa(c);if(0===d){var h=32-8*c;g=function(n){return n<<h>>>h}}var k=-1!=b.indexOf("unsigned");U(a,{name:b,fromWireType:g,toWireType:function(n,l){if("number"!==typeof l&&"boolean"!==typeof l)throw new TypeError('Cannot convert "'+Wa(l)+'" to '+this.name);if(l<d||l>e)throw new TypeError('Passing a number "'+Wa(l)+'" from JS side to C/C++ side to an argument of type "'+
+b+'", which is outside the valid range ['+d+", "+e+"]!");return k?l>>>0:l|0},argPackAdvance:8,readValueFromPointer:gb(b,m,0!==d),K:null})},c:function(a,b,c){function d(g){g>>=2;var m=I;return new e(G,m[g+1],m[g])}var e=[Int8Array,Uint8Array,Int16Array,Uint16Array,Int32Array,Uint32Array,Float32Array,Float64Array][b];c=V(c);U(a,{name:c,fromWireType:d,argPackAdvance:8,readValueFromPointer:d},{V:!0})},l:function(a,b){b=V(b);var c="std::string"===b;U(a,{name:b,fromWireType:function(d){var e=I[d>>2];if(c)for(var g=
+d+4,m=0;m<=e;++m){var h=d+4+m;if(m==e||0==B[h]){if(g){for(var k=g+(h-g),n=g;!(n>=k)&&B[n];)++n;g=oa.decode(B.subarray(g,n))}else g="";if(void 0===l)var l=g;else l+=String.fromCharCode(0),l+=g;g=h+1}}else{l=Array(e);for(m=0;m<e;++m)l[m]=String.fromCharCode(B[d+4+m]);l=l.join("")}Z(d);return l},toWireType:function(d,e){e instanceof ArrayBuffer&&(e=new Uint8Array(e));var g="string"===typeof e;g||e instanceof Uint8Array||e instanceof Uint8ClampedArray||e instanceof Int8Array||W("Cannot pass non-string to std::string");
+var m=(c&&g?function(){for(var n=0,l=0;l<e.length;++l){var p=e.charCodeAt(l);55296<=p&&57343>=p&&(p=65536+((p&1023)<<10)|e.charCodeAt(++l)&1023);127>=p?++n:n=2047>=p?n+2:65535>=p?n+3:n+4}return n}:function(){return e.length})(),h=sb(4+m+1);I[h>>2]=m;if(c&&g)pa(e,h+4,m+1);else if(g)for(g=0;g<m;++g){var k=e.charCodeAt(g);255<k&&(Z(h),W("String has UTF-16 code units that do not fit in 8 bits"));B[h+4+g]=k}else for(g=0;g<m;++g)B[h+4+g]=e[g];null!==d&&d.push(Z,h);return h},argPackAdvance:8,readValueFromPointer:P,
+K:function(d){Z(d)}})},f:function(a,b,c){c=V(c);if(2===b){var d=ra;var e=sa;var g=ta;var m=function(){return C};var h=1}else 4===b&&(d=ua,e=va,g=wa,m=function(){return I},h=2);U(a,{name:c,fromWireType:function(k){for(var n=I[k>>2],l=m(),p,x=k+4,y=0;y<=n;++y){var q=k+4+y*b;if(y==n||0==l[q>>h])x=d(x,q-x),void 0===p?p=x:(p+=String.fromCharCode(0),p+=x),x=q+b}Z(k);return p},toWireType:function(k,n){"string"!==typeof n&&W("Cannot pass non-string to C++ string type "+c);var l=g(n),p=sb(4+l+b);I[p>>2]=l>>
+h;e(n,p+4,l+b);null!==k&&k.push(Z,p);return p},argPackAdvance:8,readValueFromPointer:P,K:function(k){Z(k)}})},o:function(a,b,c,d,e,g){O[a]={name:V(b),W:Y(c,d),X:Y(e,g),N:[]}},b:function(a,b,c,d,e,g,m,h,k,n){O[a].N.push({P:V(b),U:c,S:Y(d,e),T:g,Z:m,Y:Y(h,k),$:n})},z:function(a,b){b=V(b);U(a,{aa:!0,name:b,argPackAdvance:0,fromWireType:function(){},toWireType:function(){}})},h:Ua,v:function(a){if(0===a)return Va(ib());var b=hb[a];a=void 0===b?V(a):b;return Va(ib()[a])},m:function(a){4<a&&(X[a].M+=1)},
+p:function(a,b,c,d){a||W("Cannot use deleted val. handle = "+a);a=X[a].value;var e=kb[b];if(!e){e="";for(var g=0;g<b;++g)e+=(0!==g?", ":"")+"arg"+g;var m="return function emval_allocator_"+b+"(constructor, argTypes, args) {\n";for(g=0;g<b;++g)m+="var argType"+g+" = requireRegisteredType(Module['HEAP32'][(argTypes >>> 2) + "+g+'], "parameter '+g+'");\nvar arg'+g+" = argType"+g+".readValueFromPointer(args);\nargs += argType"+g+"['argPackAdvance'];\n";e=(new Function("requireRegisteredType","Module",
+"__emval_register",m+("var obj = new constructor("+e+");\nreturn __emval_register(obj);\n}\n")))(jb,f,Va);kb[b]=e}return e(a,c,d)},i:function(){u()},s:function(a,b,c){B.copyWithin(a,b,b+c)},e:function(a){a>>>=0;var b=B.length;if(2147483648<a)return!1;for(var c=1;4>=c;c*=2){var d=b*(1+.2/c);d=Math.min(d,a+100663296);d=Math.max(16777216,a,d);0<d%65536&&(d+=65536-d%65536);a:{try{A.grow(Math.min(2147483648,d)-G.byteLength+65535>>>16);za(A.buffer);var e=1;break a}catch(g){}e=void 0}if(e)return!0}return!1},
+t:function(a,b){var c=0;mb().forEach(function(d,e){var g=b+c;e=F[a+4*e>>2]=g;for(g=0;g<d.length;++g)H[e++>>0]=d.charCodeAt(g);H[e>>0]=0;c+=d.length+1});return 0},u:function(a,b){var c=mb();F[a>>2]=c.length;var d=0;c.forEach(function(e){d+=e.length+1});F[b>>2]=d;return 0},A:function(a){if(!noExitRuntime){if(f.onExit)f.onExit(a);na=!0}ea(a,new la(a))},w:function(){return 0},q:function(){},j:function(a,b,c,d){for(var e=0,g=0;g<c;g++){for(var m=F[b+8*g>>2],h=F[b+(8*g+4)>>2],k=0;k<h;k++){var n=B[m+k],
+l=ob[a];if(0===n||10===n){n=1===a?ma:v;var p;for(p=0;l[p]&&!(NaN<=p);)++p;p=oa.decode(l.subarray?l.subarray(0,p):new Uint8Array(l.slice(0,p)));n(p);l.length=0}else l.push(n)}e+=h}F[d>>2]=e;return 0},a:A,r:function(){}};
+(function(){function a(e){f.asm=e.exports;J=f.asm.C;K--;f.monitorRunDependencies&&f.monitorRunDependencies(K);0==K&&(null!==Ga&&(clearInterval(Ga),Ga=null),L&&(e=L,L=null,e()))}function b(e){a(e.instance)}function c(e){return Promise.resolve().then(Ja).then(function(g){return WebAssembly.instantiate(g,d)}).then(e,function(g){v("failed to asynchronously prepare wasm: "+g);u(g)})}var d={a:tb};K++;f.monitorRunDependencies&&f.monitorRunDependencies(K);if(f.instantiateWasm)try{return f.instantiateWasm(d,
+a)}catch(e){return v("Module.instantiateWasm callback failed with error: "+e),!1}(function(){return w||"function"!==typeof WebAssembly.instantiateStreaming||Ha()||"function"!==typeof fetch?c(b):fetch(M,{credentials:"same-origin"}).then(function(e){return WebAssembly.instantiateStreaming(e,d).then(b,function(g){v("wasm streaming compile failed: "+g);v("falling back to ArrayBuffer instantiation");return c(b)})})})().catch(ba);return{}})();
+var rb=f.___wasm_call_ctors=function(){return(rb=f.___wasm_call_ctors=f.asm.D).apply(null,arguments)},sb=f._malloc=function(){return(sb=f._malloc=f.asm.E).apply(null,arguments)},Z=f._free=function(){return(Z=f._free=f.asm.F).apply(null,arguments)},eb=f.___getTypeName=function(){return(eb=f.___getTypeName=f.asm.G).apply(null,arguments)};f.___embind_register_native_and_builtin_types=function(){return(f.___embind_register_native_and_builtin_types=f.asm.H).apply(null,arguments)};
+f.dynCall_jiji=function(){return(f.dynCall_jiji=f.asm.I).apply(null,arguments)};var ub;function la(a){this.name="ExitStatus";this.message="Program terminated with exit("+a+")";this.status=a}L=function vb(){ub||wb();ub||(L=vb)};
+function wb(){function a(){if(!ub&&(ub=!0,f.calledRun=!0,!na)){N(Ca);N(Da);aa(f);if(f.onRuntimeInitialized)f.onRuntimeInitialized();if(f.postRun)for("function"==typeof f.postRun&&(f.postRun=[f.postRun]);f.postRun.length;){var b=f.postRun.shift();Ea.unshift(b)}N(Ea)}}if(!(0<K)){if(f.preRun)for("function"==typeof f.preRun&&(f.preRun=[f.preRun]);f.preRun.length;)Fa();N(Ba);0<K||(f.setStatus?(f.setStatus("Running..."),setTimeout(function(){setTimeout(function(){f.setStatus("")},1);a()},1)):a())}}
+f.run=wb;if(f.preInit)for("function"==typeof f.preInit&&(f.preInit=[f.preInit]);0<f.preInit.length;)f.preInit.pop()();noExitRuntime=!0;wb();
+
+
+  return Module.ready
+}
+);
+})();
+export default Module;

codecs/mozjpeg/package.json

@@ -1,5 +1,5 @@
 {
   "scripts": {
-    "build": "../build-wasi-sdk.sh"
+    "build": "../build-cpp.sh"
   }
 }

codecs/png/Cargo.lock

@@ -18,12 +18,6 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820"
 
-[[package]]
-name = "bytemuck"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bed57e2090563b83ba8f83366628ce535a7584c9afa4c9fc0612a03925c6df58"
-
 [[package]]
 name = "byteorder"
 version = "1.3.4"
@@ -118,21 +112,11 @@ dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rgb"
-version = "0.8.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287f3c3f8236abb92d8b7e36797f19159df4b58f0a658cc3fb6dd3004b1f3bd3"
-dependencies = [
- "bytemuck",
-]
-
 [[package]]
 name = "squoosh-png"
 version = "0.1.0"
 dependencies = [
  "png",
- "rgb",
  "wasm-bindgen",
  "web-sys",
 ]

codecs/png/Cargo.toml

@@ -15,7 +15,6 @@ crate-type = ["cdylib"]
 png = "0.16.7"
 wasm-bindgen = "0.2.68"
 web-sys = { version = "0.3.45", features = ["ImageData"] }
-rgb = "0.8.25"
 
 [profile.release]
 lto = true

codecs/png/pkg/squoosh_png.d.ts

@@ -20,6 +20,7 @@ export interface InitOutput {
   readonly encode: (a: number, b: number, c: number, d: number, e: number) => void;
   readonly decode: (a: number, b: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
+  readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_malloc: (a: number) => number;
 }
 
@@ -32,4 +33,3 @@ export interface InitOutput {
 * @returns {Promise<InitOutput>}
 */
 export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
-        

codecs/png/pkg/squoosh_png.js

@@ -1,22 +1,6 @@
 
 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 cachegetUint8ClampedMemory0 = null;
 function getUint8ClampedMemory0() {
     if (cachegetUint8ClampedMemory0 === null || cachegetUint8ClampedMemory0.buffer !== wasm.memory.buffer) {
@@ -44,6 +28,14 @@ function addHeapObject(obj) {
     return idx;
 }
 
+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) {
@@ -72,8 +64,7 @@ function getArrayU8FromWasm0(ptr, len) {
 */
 export function encode(data, width, height) {
     try {
-        const retptr = wasm.__wbindgen_export_1.value - 16;
-        wasm.__wbindgen_export_1.value = retptr;
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
         var ptr0 = passArray8ToWasm0(data, wasm.__wbindgen_malloc);
         var len0 = WASM_VECTOR_LEN;
         wasm.encode(retptr, ptr0, len0, width, height);
@@ -83,7 +74,7 @@ export function encode(data, width, height) {
         wasm.__wbindgen_free(r0, r1 * 1);
         return v1;
     } finally {
-        wasm.__wbindgen_export_1.value += 16;
+        wasm.__wbindgen_add_to_stack_pointer(16);
     }
 }
 
@@ -146,7 +137,7 @@ async function load(module, imports) {
 
 async function init(input) {
     if (typeof input === 'undefined') {
-        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
+        input = new URL('squoosh_png_bg.wasm', import.meta.url);
     }
     const imports = {};
     imports.wbg = {};
@@ -156,9 +147,6 @@ async function init(input) {
         var ret = new ImageData(v0, arg2 >>> 0, arg3 >>> 0);
         return addHeapObject(ret);
     };
-    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);

codecs/png/pkg/squoosh_png_bg.wasm.d.ts

@@ -4,4 +4,5 @@ export const memory: WebAssembly.Memory;
 export function encode(a: number, b: number, c: number, d: number, e: number): void;
 export function decode(a: number, b: number): number;
 export function __wbindgen_free(a: number, b: number): void;
+export function __wbindgen_add_to_stack_pointer(a: number): number;
 export function __wbindgen_malloc(a: number): number;

codecs/png/src/lib.rs

@@ -1,7 +1,5 @@
-use rgb::{
-    alt::{GRAY8, GRAYA8},
-    AsPixels, FromSlice, RGB8, RGBA8,
-};
+use std::io::Cursor;
+
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::Clamped;
 
@@ -20,57 +18,38 @@ extern "C" {
     ) -> ImageData;
 }
 
-#[wasm_bindgen]
+#[wasm_bindgen(catch)]
 pub fn encode(data: &[u8], width: u32, height: u32) -> Vec<u8> {
-    let mut buffer = Vec::new();
+    let mut buffer = Cursor::new(Vec::<u8>::new());
 
     {
         let mut encoder = png::Encoder::new(&mut buffer, width, height);
         encoder.set_color(png::ColorType::RGBA);
         encoder.set_depth(png::BitDepth::Eight);
-        let mut writer = encoder.write_header().unwrap_throw();
-        writer.write_image_data(data).unwrap_throw();
+        let mut writer = encoder.write_header().unwrap();
+        writer.write_image_data(data).unwrap();
     }
 
-    buffer
+    buffer.into_inner()
 }
 
-// Convert pixels in-place within buffer containing source data but preallocated
-// for entire [num_pixels * sizeof(RGBA)].
-// This works because all the color types are <= RGBA by size.
-fn expand_pixels<Src: Copy>(buf: &mut [u8], to_rgba: impl Fn(Src) -> RGBA8)
-where
-    [u8]: AsPixels<Src> + FromSlice<u8>,
-{
-    assert!(std::mem::size_of::<Src>() <= std::mem::size_of::<RGBA8>());
-    let num_pixels = buf.len() / 4;
-    for i in (0..num_pixels).rev() {
-        let src_pixel = buf.as_pixels()[i];
-        buf.as_rgba_mut()[i] = to_rgba(src_pixel);
-    }
-}
-
-#[wasm_bindgen]
-pub fn decode(mut data: &[u8]) -> ImageData {
-    let mut decoder = png::Decoder::new(&mut data);
+#[wasm_bindgen(catch)]
+pub fn decode(data: &[u8]) -> ImageData {
+    let mut decoder = png::Decoder::new(Cursor::new(data));
     decoder.set_transformations(png::Transformations::EXPAND);
-    let (info, mut reader) = decoder.read_info().unwrap_throw();
+    let (info, mut reader) = decoder.read_info().unwrap();
     let num_pixels = (info.width * info.height) as usize;
     let mut buf = vec![0; num_pixels * 4];
-    reader.next_frame(&mut buf).unwrap_throw();
+    reader.next_frame(&mut buf).unwrap();
 
-    // Transformations::EXPAND will expand indexed palettes and lower-bit
-    // grayscales to higher color types, but we still need to transform
-    // the rest to RGBA.
-    match info.color_type {
-        png::ColorType::RGBA => {}
-        png::ColorType::RGB => expand_pixels(&mut buf, RGB8::into),
-        png::ColorType::GrayscaleAlpha => expand_pixels(&mut buf, GRAYA8::into),
-        png::ColorType::Grayscale => {
-            expand_pixels(&mut buf, |gray: GRAY8| GRAYA8::from(gray).into())
-        }
-        png::ColorType::Indexed => {
-            unreachable!("Found indexed color type, but expected it to be already expanded")
+    // Transformations::EXPAND will make sure color_type is either
+    // RGBA or RGB. If it’s RGB, we need inject an alpha channel.
+    if info.color_type == png::ColorType::RGB {
+        for i in (0..num_pixels).rev() {
+            buf[i * 4 + 0] = buf[i * 3 + 0];
+            buf[i * 4 + 1] = buf[i * 3 + 1];
+            buf[i * 4 + 2] = buf[i * 3 + 2];
+            buf[i * 4 + 3] = 255;
         }
     }
 

codecs/resize/pkg/squoosh_resize.d.ts

@@ -18,6 +18,7 @@ export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembl
 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_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_malloc: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number) => void;
 }
@@ -31,4 +32,3 @@ export interface InitOutput {
 * @returns {Promise<InitOutput>}
 */
 export default function init (module_or_path?: InitInput | Promise<InitInput>): Promise<InitOutput>;
-        

codecs/resize/pkg/squoosh_resize.js

@@ -41,14 +41,19 @@ function getArrayU8FromWasm0(ptr, len) {
 * @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;
+    try {
+        const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
+        var ptr0 = passArray8ToWasm0(input_image, wasm.__wbindgen_malloc);
+        var len0 = WASM_VECTOR_LEN;
+        wasm.resize(retptr, ptr0, len0, input_width, input_height, output_width, output_height, typ_idx, premultiply, color_space_conversion);
+        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_add_to_stack_pointer(16);
+    }
 }
 
 async function load(module, imports) {
@@ -86,7 +91,7 @@ async function load(module, imports) {
 
 async function init(input) {
     if (typeof input === 'undefined') {
-        input = import.meta.url.replace(/\.js$/, '_bg.wasm');
+        input = new URL('squoosh_resize_bg.wasm', import.meta.url);
     }
     const imports = {};
 

codecs/resize/pkg/squoosh_resize_bg.d.ts

@@ -1,6 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export const memory: WebAssembly.Memory;
-export function resize(a: number, b: number, c: number, d: number, e: number, f: number, g: number, h: number, i: number, j: number): void;
-export function __wbindgen_malloc(a: number): number;
-export function __wbindgen_free(a: number, b: number): void;

codecs/resize/src/lib.rs

@@ -133,9 +133,8 @@ pub fn resize(
                 unprocessed_output_image[4 * i + 3],
             ));
         }
-        output_image[4 * i + 3] = (unprocessed_output_image[4 * i + 3] * 255.0)
-            .round()
-            .clamp(0.0, 255.0) as u8;
+        output_image[4 * i + 3] =
+            (unprocessed_output_image[4 * i + 3] * 255.0).clamp(0.0, 255.0) as u8;
     }
 
     return output_image;

codecs/wasi-sdk.Dockerfile

@@ -1,15 +0,0 @@
-FROM ubuntu:20.10
-RUN apt-get update && apt-get install -qqy autoconf libtool pkg-config curl build-essential
-ENV WASI_SDK_VERSION "12"
-ENV WASI_SDK_PREFIX "/opt/wasi-sdk"
-RUN mkdir -p ${WASI_SDK_PREFIX} && \
-  curl -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-linux.tar.gz | tar -xz --strip 1 -C /opt/wasi-sdk
-ENV BINARYEN_PREFIX "/opt/binaryen"
-RUN mkdir -p ${BINARYEN_PREFIX} && \
-  curl -L https://github.com/WebAssembly/binaryen/releases/download/version_101/binaryen-version_101-x86_64-linux.tar.gz | tar -xz --strip 1 -C ${BINARYEN_PREFIX}
-# Maybe we need it later. Leaving it here for now.
-# ENV WABT_PREFIX "/opt/wabt"
-# RUN mkdir -p ${WABT_PREFIX} && \
-#   curl -L https://github.com/WebAssembly/wabt/releases/download/1.0.23/wabt-1.0.23-ubuntu.tar.gz | tar -xz --strip 1 -C ${WABT_PREFIX}
-WORKDIR /src
-CMD ["sh", "-c", "make -j`nproc`"]

serve.json

@@ -6,14 +6,6 @@
         {
           "key": "Cache-Control",
           "value": "no-cache"
-        },
-        {
-          "key": "Cross-Origin-Embedder-Policy",
-          "value": "require-corp"
-        },
-        {
-          "key": "Cross-Origin-Opener-Policy",
-          "value": "same-origin"
         }
       ]
     }

src/client/lazy-app/Compress/Output/custom-els/TwoUp/index.ts

@@ -69,7 +69,7 @@ export default class TwoUp extends HTMLElement {
       },
     });
 
-    window.addEventListener('keydown', (event) => this._onKeyDown(event));
+    window.addEventListener('keydown', event => this._onKeyDown(event));
   }
 
   connectedCallback() {
@@ -98,24 +98,19 @@ export default class TwoUp extends HTMLElement {
 
   // KeyDown event handler
   private _onKeyDown(event: KeyboardEvent) {
-    const target = event.target;
-    if (target instanceof HTMLElement && target.closest('input')) return;
-
     if (event.code === 'Digit1' || event.code === 'Numpad1') {
       this._position = 0;
       this._relativePosition = 0;
       this._setPosition();
     } else if (event.code === 'Digit2' || event.code === 'Numpad2') {
-      const dimensionAxis =
-        this.orientation === 'vertical' ? 'height' : 'width';
+      const dimensionAxis = this.orientation === 'vertical' ? 'height' : 'width';
       const bounds = this.getBoundingClientRect();
 
       this._position = bounds[dimensionAxis] / 2;
-      this._relativePosition = this._position / bounds[dimensionAxis] / 2;
+      this._relativePosition = (this._position / bounds[dimensionAxis]) / 2;
       this._setPosition();
     } else if (event.code === 'Digit3' || event.code === 'Numpad3') {
-      const dimensionAxis =
-        this.orientation === 'vertical' ? 'height' : 'width';
+      const dimensionAxis = this.orientation === 'vertical' ? 'height' : 'width';
       const bounds = this.getBoundingClientRect();
 
       this._position = bounds[dimensionAxis];

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

@@ -11,7 +11,6 @@ import {
   canDecodeImageType,
   abortable,
   assertSignal,
-  ImageMimeTypes,
 } from '../util';
 import {
   PreprocessorState,
@@ -103,7 +102,7 @@ async function decodeImage(
       if (mimeType === 'image/webp') {
         return await workerBridge.webpDecode(signal, blob);
       }
-      if (mimeType === 'image/jxl') {
+      if (mimeType === 'image/jpegxl') {
         return await workerBridge.jxlDecode(signal, blob);
       }
       if (mimeType === 'image/webp2') {
@@ -179,13 +178,10 @@ async function compressImage(
     encodeData.options as any,
   );
 
-  // This type ensures the image mimetype is consistent with our mimetype sniffer
-  const type: ImageMimeTypes = encoder.meta.mimeType;
-
   return new File(
     [compressedData],
     sourceFilename.replace(/.[^.]*$/, `.${encoder.meta.extension}`),
-    { type },
+    { type: encoder.meta.mimeType },
   );
 }
 

src/client/lazy-app/util/index.ts

@@ -137,7 +137,7 @@ export function blobToText(blob: Blob): Promise<string> {
   return new Response(blob).text();
 }
 
-const magicNumberMapInput = [
+const magicNumberToMimeType = new Map<RegExp, string>([
   [/^%PDF-/, 'application/pdf'],
   [/^GIF87a/, 'image/gif'],
   [/^GIF89a/, 'image/gif'],
@@ -150,17 +150,10 @@ const magicNumberMapInput = [
   [/^RIFF....WEBPVP8[LX ]/, 'image/webp'],
   [/^\xF4\xFF\x6F/, 'image/webp2'],
   [/^\x00\x00\x00 ftypavif\x00\x00\x00\x00/, 'image/avif'],
-  [/^\xff\x0a/, 'image/jxl'],
-  [/^\x00\x00\x00\x0cJXL \x0d\x0a\x87\x0a/, 'image/jxl'],
-] as const;
+  [/^\xff\x0a/, 'image/jpegxl'],
+]);
 
-export type ImageMimeTypes = typeof magicNumberMapInput[number][1];
-
-const magicNumberToMimeType = new Map<RegExp, ImageMimeTypes>(
-  magicNumberMapInput,
-);
-
-export async function sniffMimeType(blob: Blob): Promise<ImageMimeTypes | ''> {
+export async function sniffMimeType(blob: Blob): Promise<string> {
   const firstChunk = await blobToArrayBuffer(blob.slice(0, 16));
   const firstChunkString = Array.from(new Uint8Array(firstChunk))
     .map((v) => String.fromCodePoint(v))

src/features/encoders/avif/client/index.tsx

@@ -25,19 +25,18 @@ interface Props {
 interface State {
   options: EncodeOptions;
   lossless: boolean;
-  quality: number;
-  showAdvanced: boolean;
+  maxQuality: number;
+  minQuality: number;
   separateAlpha: boolean;
-  alphaQuality: number;
-  chromaDeltaQ: boolean;
+  losslessAlpha: boolean;
+  maxAlphaQuality: number;
+  minAlphaQuality: number;
+  showAdvanced: boolean;
+  grayscale: boolean;
   subsample: number;
   tileRows: number;
   tileCols: number;
   effort: number;
-  sharpness: number;
-  denoiseLevel: number;
-  aqMode: number;
-  tune: 'ssim' | 'psnr';
 }
 
 const maxQuant = 63;
@@ -54,24 +53,35 @@ export class Options extends Component<Props, State> {
 
     const { options } = props;
 
-    const lossless =
-      options.cqLevel === 0 &&
-      options.cqAlphaLevel <= 0 &&
-      options.subsample == 3;
-
-    const separateAlpha = options.cqAlphaLevel !== -1;
-
-    const cqLevel = lossless ? defaultOptions.cqLevel : options.cqLevel;
+    const lossless = options.maxQuantizer === 0 && options.minQuantizer === 0;
+    const minQuantizerValue = lossless
+      ? defaultOptions.minQuantizer
+      : options.minQuantizer;
+    const maxQuantizerValue = lossless
+      ? defaultOptions.maxQuantizer
+      : options.maxQuantizer;
+    const losslessAlpha =
+      options.maxQuantizerAlpha === 0 && options.minQuantizerAlpha === 0;
+    const minQuantizerAlphaValue = losslessAlpha
+      ? defaultOptions.minQuantizerAlpha
+      : options.minQuantizerAlpha;
+    const maxQuantizerAlphaValue = losslessAlpha
+      ? defaultOptions.maxQuantizerAlpha
+      : options.maxQuantizerAlpha;
 
     // Create default form state from options
     return {
       options,
       lossless,
-      quality: maxQuant - cqLevel,
-      separateAlpha,
-      alphaQuality:
-        maxQuant -
-        (separateAlpha ? options.cqAlphaLevel : defaultOptions.cqLevel),
+      losslessAlpha,
+      maxQuality: maxQuant - minQuantizerValue,
+      minQuality: maxQuant - maxQuantizerValue,
+      separateAlpha:
+        options.maxQuantizer !== options.maxQuantizerAlpha ||
+        options.minQuantizer !== options.minQuantizerAlpha,
+      maxAlphaQuality: maxQuant - minQuantizerAlphaValue,
+      minAlphaQuality: maxQuant - maxQuantizerAlphaValue,
+      grayscale: options.subsample === 0,
       subsample:
         options.subsample === 0 || lossless
           ? defaultOptions.subsample
@@ -79,10 +89,6 @@ export class Options extends Component<Props, State> {
       tileRows: options.tileRowsLog2,
       tileCols: options.tileColsLog2,
       effort: maxSpeed - options.speed,
-      chromaDeltaQ: options.chromaDeltaQ,
-      sharpness: options.sharpness,
-      denoiseLevel: options.denoiseLevel,
-      tune: options.targetSsim ? 'ssim' : 'psnr',
     };
   }
 
@@ -93,10 +99,7 @@ export class Options extends Component<Props, State> {
 
   private _inputChangeCallbacks = new Map<string, (event: Event) => void>();
 
-  private _inputChange = (
-    prop: keyof State,
-    type: 'number' | 'boolean' | 'string',
-  ) => {
+  private _inputChange = (prop: keyof State, type: 'number' | 'boolean') => {
     // Cache the callback for performance
     if (!this._inputChangeCallbacks.has(prop)) {
       this._inputChangeCallbacks.set(prop, (event: Event) => {
@@ -106,34 +109,70 @@ export class Options extends Component<Props, State> {
             ? 'checked' in formEl
               ? formEl.checked
               : !!formEl.value
-            : type === 'number'
-            ? Number(formEl.value)
-            : formEl.value;
+            : Number(formEl.value);
 
         const newState: Partial<State> = {
           [prop]: newVal,
         };
 
+        // Ensure that min cannot be greater than max
+        switch (prop) {
+          case 'maxQuality':
+            if (newVal < this.state.minQuality) {
+              newState.minQuality = newVal as number;
+            }
+            break;
+          case 'minQuality':
+            if (newVal > this.state.maxQuality) {
+              newState.maxQuality = newVal as number;
+            }
+            break;
+          case 'maxAlphaQuality':
+            if (newVal < this.state.minAlphaQuality) {
+              newState.minAlphaQuality = newVal as number;
+            }
+            break;
+          case 'minAlphaQuality':
+            if (newVal > this.state.maxAlphaQuality) {
+              newState.maxAlphaQuality = newVal as number;
+            }
+            break;
+        }
+
         const optionState = {
           ...this.state,
           ...newState,
         };
 
+        const maxQuantizer = optionState.lossless
+          ? 0
+          : maxQuant - optionState.minQuality;
+        const minQuantizer = optionState.lossless
+          ? 0
+          : maxQuant - optionState.maxQuality;
+
         const newOptions: EncodeOptions = {
-          cqLevel: optionState.lossless ? 0 : maxQuant - optionState.quality,
-          cqAlphaLevel:
-            optionState.lossless || !optionState.separateAlpha
-              ? -1
-              : maxQuant - optionState.alphaQuality,
+          maxQuantizer,
+          minQuantizer,
+          maxQuantizerAlpha: optionState.separateAlpha
+            ? optionState.losslessAlpha
+              ? 0
+              : maxQuant - optionState.minAlphaQuality
+            : maxQuantizer,
+          minQuantizerAlpha: optionState.separateAlpha
+            ? optionState.losslessAlpha
+              ? 0
+              : maxQuant - optionState.maxAlphaQuality
+            : minQuantizer,
           // Always set to 4:4:4 if lossless
-          subsample: optionState.lossless ? 3 : optionState.subsample,
+          subsample: optionState.grayscale
+            ? 0
+            : optionState.lossless
+            ? 3
+            : optionState.subsample,
           tileColsLog2: optionState.tileCols,
           tileRowsLog2: optionState.tileRows,
           speed: maxSpeed - optionState.effort,
-          chromaDeltaQ: optionState.chromaDeltaQ,
-          sharpness: optionState.sharpness,
-          denoiseLevel: optionState.denoiseLevel,
-          targetSsim: optionState.tune === 'ssim',
         };
 
         // Updating options, so we don't recalculate in getDerivedStateFromProps.
@@ -155,18 +194,18 @@ export class Options extends Component<Props, State> {
     _: Props,
     {
       effort,
+      grayscale,
       lossless,
-      alphaQuality,
+      losslessAlpha,
+      maxAlphaQuality,
+      maxQuality,
+      minAlphaQuality,
+      minQuality,
       separateAlpha,
-      quality,
       showAdvanced,
       subsample,
       tileCols,
       tileRows,
-      chromaDeltaQ,
-      sharpness,
-      denoiseLevel,
-      tune,
     }: State,
   ) {
     return (
@@ -180,15 +219,73 @@ export class Options extends Component<Props, State> {
         </label>
         <Expander>
           {!lossless && (
-            <div class={style.optionOneCell}>
-              <Range
-                min="0"
-                max="63"
-                value={quality}
-                onInput={this._inputChange('quality', 'number')}
-              >
-                Quality:
-              </Range>
+            <div>
+              <div class={style.optionOneCell}>
+                <Range
+                  min="0"
+                  max="62"
+                  value={maxQuality}
+                  onInput={this._inputChange('maxQuality', 'number')}
+                >
+                  Max quality:
+                </Range>
+              </div>
+              <div class={style.optionOneCell}>
+                <Range
+                  min="0"
+                  max="62"
+                  value={minQuality}
+                  onInput={this._inputChange('minQuality', 'number')}
+                >
+                  Min quality:
+                </Range>
+              </div>
+            </div>
+          )}
+        </Expander>
+        <label class={style.optionToggle}>
+          Separate alpha quality
+          <Checkbox
+            checked={separateAlpha}
+            onChange={this._inputChange('separateAlpha', 'boolean')}
+          />
+        </label>
+        <Expander>
+          {separateAlpha && (
+            <div>
+              <label class={style.optionToggle}>
+                Lossless alpha
+                <Checkbox
+                  checked={losslessAlpha}
+                  onChange={this._inputChange('losslessAlpha', 'boolean')}
+                />
+              </label>
+              <Expander>
+                {!losslessAlpha && (
+                  <div>
+                    <div class={style.optionOneCell}>
+                      <Range
+                        min="0"
+                        max="62"
+                        value={maxAlphaQuality}
+                        onInput={this._inputChange('maxAlphaQuality', 'number')}
+                      >
+                        Max alpha quality:
+                      </Range>
+                    </div>
+                    <div class={style.optionOneCell}>
+                      <Range
+                        min="0"
+                        max="62"
+                        value={minAlphaQuality}
+                        onInput={this._inputChange('minAlphaQuality', 'number')}
+                      >
+                        Min alpha quality:
+                      </Range>
+                    </div>
+                  </div>
+                )}
+              </Expander>
             </div>
           )}
         </Expander>
@@ -202,82 +299,28 @@ export class Options extends Component<Props, State> {
         <Expander>
           {showAdvanced && (
             <div>
+              {/*<label class={style.optionToggle}>
+                Grayscale
+                <Checkbox
+                  data-set-state="grayscale"
+                  checked={grayscale}
+                  onChange={this._inputChange('grayscale', 'boolean')}
+                />
+              </label>*/}
               <Expander>
-                {!lossless && (
-                  <div>
-                    <label class={style.optionTextFirst}>
-                      Subsample chroma:
-                      <Select
-                        value={subsample}
-                        onChange={this._inputChange('subsample', 'number')}
-                      >
-                        <option value="1">Half</option>
-                        {/*<option value="2">4:2:2</option>*/}
-                        <option value="3">Off</option>
-                      </Select>
-                    </label>
-                    <label class={style.optionToggle}>
-                      Separate alpha quality
-                      <Checkbox
-                        checked={separateAlpha}
-                        onChange={this._inputChange('separateAlpha', 'boolean')}
-                      />
-                    </label>
-                    <Expander>
-                      {separateAlpha && (
-                        <div class={style.optionOneCell}>
-                          <Range
-                            min="0"
-                            max="63"
-                            value={alphaQuality}
-                            onInput={this._inputChange(
-                              'alphaQuality',
-                              'number',
-                            )}
-                          >
-                            Alpha quality:
-                          </Range>
-                        </div>
-                      )}
-                    </Expander>
-                    <label class={style.optionToggle}>
-                      Extra chroma compression
-                      <Checkbox
-                        checked={chromaDeltaQ}
-                        onChange={this._inputChange('chromaDeltaQ', 'boolean')}
-                      />
-                    </label>
-                    <div class={style.optionOneCell}>
-                      <Range
-                        min="0"
-                        max="7"
-                        value={sharpness}
-                        onInput={this._inputChange('sharpness', 'number')}
-                      >
-                        Sharpness:
-                      </Range>
-                    </div>
-                    <div class={style.optionOneCell}>
-                      <Range
-                        min="0"
-                        max="50"
-                        value={denoiseLevel}
-                        onInput={this._inputChange('denoiseLevel', 'number')}
-                      >
-                        Noise synthesis:
-                      </Range>
-                    </div>
-                    <label class={style.optionTextFirst}>
-                      Tune for:
-                      <Select
-                        value={tune}
-                        onChange={this._inputChange('tune', 'string')}
-                      >
-                        <option value="psnr">PSNR</option>
-                        <option value="ssim">SSIM</option>
-                      </Select>
-                    </label>
-                  </div>
+                {!grayscale && !lossless && (
+                  <label class={style.optionTextFirst}>
+                    Subsample chroma:
+                    <Select
+                      data-set-state="subsample"
+                      value={subsample}
+                      onChange={this._inputChange('subsample', 'number')}
+                    >
+                      <option value="1">Half</option>
+                      {/*<option value="2">4:2:2</option>*/}
+                      <option value="3">Off</option>
+                    </Select>
+                  </label>
                 )}
               </Expander>
               <div class={style.optionOneCell}>

src/features/encoders/avif/shared/meta.ts

@@ -18,14 +18,12 @@ export const label = 'AVIF';
 export const mimeType = 'image/avif';
 export const extension = 'avif';
 export const defaultOptions: EncodeOptions = {
-  cqLevel: 33,
-  cqAlphaLevel: -1,
-  denoiseLevel: 0,
+  minQuantizer: 33,
+  maxQuantizer: 63,
+  minQuantizerAlpha: 33,
+  maxQuantizerAlpha: 63,
   tileColsLog2: 0,
   tileRowsLog2: 0,
-  speed: 6,
+  speed: 8,
   subsample: 1,
-  chromaDeltaQ: false,
-  sharpness: 0,
-  targetSsim: false,
 };

src/features/encoders/jxl/shared/meta.ts

@@ -15,7 +15,7 @@ import type { EncodeOptions } from 'codecs/jxl/enc/jxl_enc';
 export { EncodeOptions };
 
 export const label = 'JPEG XL (beta)';
-export const mimeType = 'image/jxl';
+export const mimeType = 'image/jpegxl';
 export const extension = 'jxl';
 export const defaultOptions: EncodeOptions = {
   speed: 4,

src/features/encoders/mozJPEG/shared/meta.ts

@@ -13,9 +13,8 @@
 import {
   EncodeOptions,
   MozJpegColorSpace,
-  MozJPEGModuleExports,
 } from 'codecs/mozjpeg/enc/mozjpeg_enc';
-export { EncodeOptions, MozJpegColorSpace, MozJPEGModuleExports };
+export { EncodeOptions, MozJpegColorSpace };
 
 export const label = 'MozJPEG';
 export const mimeType = 'image/jpeg';

src/features/encoders/mozJPEG/worker/mozjpegEncode.ts

@@ -10,44 +10,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { MozJPEGModuleExports, EncodeOptions } from '../shared/meta';
+import mozjpeg_enc, { MozJPEGModule } from 'codecs/mozjpeg/enc/mozjpeg_enc';
+import { EncodeOptions } from '../shared/meta';
 import wasmUrl from 'url:codecs/mozjpeg/enc/mozjpeg_enc.wasm';
-import { instantiateStreaming } from 'features/worker-utils';
-import {
-  makeEverythingElseThrow,
-  makeWasiEnv,
-} from 'features/worker-utils/wasi-utils';
+import { initEmscriptenModule } from 'features/worker-utils';
 
-const instancePromise: Promise<WebAssembly.Instance> = instantiateStreaming(
-  fetch(wasmUrl),
-  {
-    wasi_snapshot_preview1: makeEverythingElseThrow(makeWasiEnv()),
-  },
-).then(({ instance }) => instance);
+let emscriptenModule: Promise<MozJPEGModule>;
 
 export default async function encode(
   data: ImageData,
   options: EncodeOptions,
 ): Promise<ArrayBuffer> {
-  const instance = await instancePromise;
-  const exports: MozJPEGModuleExports = (instance.exports as unknown) as MozJPEGModuleExports;
-
-  for (const [opt, value] of Object.entries(options)) {
-    // @ts-ignore Can’t be bothered to make these typings works
-    exports[`set_opts_${opt}`](value);
+  if (!emscriptenModule) {
+    emscriptenModule = initEmscriptenModule(mozjpeg_enc, wasmUrl);
   }
-  const inPtr = exports.alloc(data.data.byteLength);
-  new Uint8ClampedArray(exports.memory.buffer, inPtr, data.data.length).set(
-    data.data,
-  );
-  const resultPtr = exports.encode(inPtr, data.width, data.height);
-  const dv = new DataView(exports.memory.buffer);
-  const length = dv.getUint32(resultPtr, true);
-  const outPtr = dv.getUint32(resultPtr + 4, true);
-  const result = new Uint8Array(exports.memory.buffer, outPtr, length).slice();
-  exports.dealloc(inPtr);
-  exports.dealloc(outPtr);
-  exports.dealloc(resultPtr);
+
+  const module = await emscriptenModule;
+  const resultView = module.encode(data.data, data.width, data.height, options);
   // wasm can’t run on SharedArrayBuffers, so we hard-cast to ArrayBuffer.
-  return result.buffer;
+  return resultView.buffer as ArrayBuffer;
 }

src/features/worker-utils/index.ts

@@ -29,16 +29,3 @@ export function initEmscriptenModule<T extends EmscriptenWasm.Module>(
 export function blobToArrayBuffer(blob: Blob): Promise<ArrayBuffer> {
   return new Response(blob).arrayBuffer();
 }
-
-export async function instantiateStreaming(
-  resp: Response | PromiseLike<Response>,
-  importObj?: WebAssembly.Imports,
-): Promise<WebAssembly.WebAssemblyInstantiatedSource> {
-  if (WebAssembly.instantiateStreaming) {
-    return WebAssembly.instantiateStreaming(resp, importObj);
-  }
-  return WebAssembly.instantiate(
-    await Promise.resolve(resp).then((r) => r.arrayBuffer()),
-    importObj,
-  );
-}

src/features/worker-utils/wasi-utils.ts

@@ -1,32 +0,0 @@
-/**
- * Copyright 2021 Google Inc. All Rights Reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-export function makeEverythingElseThrow(obj: { [x: string]: {} }): {} {
-  return new Proxy(obj, {
-    get(target, prop: string) {
-      if (prop in target) {
-        return target[prop];
-      }
-      return () => {
-        throw Error(`${prop} not implemented`);
-      };
-    },
-  });
-}
-
-export function makeWasiEnv() {
-  return {
-    environ_sizes_get: () => 0,
-    environ_get: () => 0,
-  };
-}

src/static-build/index.tsx

@@ -29,9 +29,13 @@ const manifestSize = ({ width, height }: { width: number; height: number }) =>
 const branch = process.env.BRANCH;
 
 const branchOriginTrialIds = new Map([
+  [
+    'dev',
+    'As3b1fXjclhF8ZgvUkIqOo3r1/Jqvx0mNuT6Ilgb7SdpeJnV8lUdYr7i+OKgCmcVTWkqjkF23LJ+xZ111VYMEQIAAABheyJvcmlnaW4iOiJodHRwczovL2Rldi0tc3F1b29zaC5uZXRsaWZ5LmFwcDo0NDMiLCJmZWF0dXJlIjoiV2ViQXNzZW1ibHlTaW1kIiwiZXhwaXJ5IjoxNjA5NDI4Nzk4fQ==',
+  ],
   [
     'live',
-    'Aj5GY7W9AHM8di+yvMCajIhLRHoYN7slruwOYXE/Iub5hgmW/r2RQt07vrUuT4eUTkWxcyNCAVkiI+5ugdVW3gAAAABUeyJvcmlnaW4iOiJodHRwczovL3NxdW9vc2guYXBwOjQ0MyIsImZlYXR1cmUiOiJXZWJBc3NlbWJseVNpbWQiLCJleHBpcnkiOjE2MjM4MDE1OTl9',
+    'Ak9YMaDZyWUUZFbVJng8FM2LWWNeBcWaHTtHzzaTAq044kMlQH5/hsMb/90Ii2I7m/lPx8EpgOIUMWkWeoaKfgIAAABUeyJvcmlnaW4iOiJodHRwczovL3NxdW9vc2guYXBwOjQ0MyIsImZlYXR1cmUiOiJXZWJBc3NlbWJseVNpbWQiLCJleHBpcnkiOjE2MTExNTkwNjZ9',
   ],
 ]);