Further speed improvements

- Store Emscripten cache inside node_modules/.em_cache. Docker image ships without LTO libs, so Emscripten has to rebuild stdlibs on every build otherwise.
 - Merge webp_enc + webp_dec build scripts. Core libwebp library is same in both cases, so there's no point in storing and building two copies of it.

codecs/imagequant/build.sh

@@ -2,6 +2,7 @@
 
 set -e
 
+export EM_CACHE="${PWD}/node_modules/.em_cache"
 export OPTIMIZE="-Os -flto --llvm-lto 1"
 export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"

codecs/mozjpeg_enc/build.sh

@@ -2,6 +2,7 @@
 
 set -e
 
+export EM_CACHE="${PWD}/node_modules/.em_cache"
 export OPTIMIZE="-Os -flto --llvm-lto 1"
 export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"

codecs/webp/build.sh

@@ -2,6 +2,7 @@
 
 set -e
 
+export EM_CACHE="${PWD}/node_modules/.em_cache"
 export OPTIMIZE="-Os -flto --llvm-lto 1"
 export LDFLAGS="${OPTIMIZE}"
 export CFLAGS="${OPTIMIZE}"
@@ -43,8 +44,21 @@ echo "============================================="
     -s MODULARIZE=1 \
     -s 'EXPORT_NAME="webp_dec"' \
     -I node_modules/libwebp \
-    -o ./webp_dec.js \
+    -o dec/webp_dec.js \
-    webp_dec.cpp \
+    dec/webp_dec.cpp \
+    node_modules/libwebp/src/.libs/libwebp.a
+)
+(
+  emcc \
+    ${OPTIMIZE} \
+    --closure 1 \
+    --bind \
+    -s ALLOW_MEMORY_GROWTH=1 \
+    -s MODULARIZE=1 \
+    -s 'EXPORT_NAME="webp_enc"' \
+    -I node_modules/libwebp \
+    -o enc/webp_enc.js \
+    enc/webp_enc.cpp \
     node_modules/libwebp/src/.libs/libwebp.a
 )
 echo "============================================="

codecs/webp/dec/example.html

@@ -10,7 +10,7 @@
 
   Module.onRuntimeInitialized = async _ => {
     console.log('Version:', Module.version().toString(16));
-    const image = await loadFile('../example.webp');
+    const image = await loadFile('../../example.webp');
     const result = Module.decode(image);
     const imageData = new ImageData(new Uint8ClampedArray(result.buffer), result.width, result.height);
     Module.free_result();

codecs/webp/enc/example.html

@@ -19,7 +19,7 @@
 
   module.onRuntimeInitialized = async _ => {
     console.log('Version:', module.version().toString(16));
-    const image = await loadImage('../example.png');
+    const image = await loadImage('../../example.png');
     const result = module.encode(image.data, image.width, image.height, {
       quality: 75,
       target_size: 0,

codecs/webp/package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "webp_enc",
+  "name": "webp",
   "requires": true,
   "lockfileVersion": 1,
   "dependencies": {

codecs/webp/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "webp_enc",
+  "name": "webp",
   "scripts": {
     "install": "napa",
     "build": "docker run -v $(pwd):/src trzeci/emscripten-upstream ./build.sh"

codecs/webp_dec/package.json

@@ -1,13 +0,0 @@
-{
-  "name": "webp_dec",
-  "scripts": {
-    "install": "napa",
-    "build": "docker run -v $(pwd):/src trzeci/emscripten-upstream ./build.sh"
-  },
-  "napa": {
-    "libwebp": "webmproject/libwebp#v1.0.2"
-  },
-  "devDependencies": {
-    "napa": "3.0.0"
-  }
-}

codecs/webp_enc/build.sh

@@ -1,58 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export OPTIMIZE="-Os -flto --llvm-lto 1"
-export LDFLAGS="${OPTIMIZE}"
-export CFLAGS="${OPTIMIZE}"
-export CPPFLAGS="${OPTIMIZE}"
-
-apt-get update
-apt-get install -qqy autoconf libtool pkg-config
-
-echo "============================================="
-echo "Compiling libwebp"
-echo "============================================="
-test -n "$SKIP_LIBWEBP" || (
-  cd node_modules/libwebp
-  autoreconf -iv
-  emconfigure ./configure -C \
-    --disable-libwebpdemux \
-    --disable-wic \
-    --disable-gif \
-    --disable-tiff \
-    --disable-jpeg \
-    --disable-png \
-    --disable-sdl \
-    --disable-gl \
-    --disable-threading \
-    --disable-neon-rtcd \
-    --disable-neon \
-    --disable-sse2 \
-    --disable-sse4.1
-  emmake make -j`nproc`
-)
-echo "============================================="
-echo "Compiling wasm bindings"
-echo "============================================="
-(
-  emcc \
-    ${OPTIMIZE} \
-    --closure 1 \
-    --bind \
-    -s ALLOW_MEMORY_GROWTH=1 \
-    -s MODULARIZE=1 \
-    -s 'EXPORT_NAME="webp_enc"' \
-    -I node_modules/libwebp \
-    -o ./webp_enc.js \
-    webp_enc.cpp \
-    node_modules/libwebp/src/.libs/libwebp.a
-)
-echo "============================================="
-echo "Compiling wasm bindings done"
-echo "============================================="
-
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-echo "Did you update your docker image?"
-echo "Run \`docker pull trzeci/emscripten-upstream\`"
-echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"

src/codecs/webp/decoder.ts

@@ -1,5 +1,5 @@
-import webp_dec, { WebPModule } from '../../../codecs/webp_dec/webp_dec';
+import webp_dec, { WebPModule } from '../../../codecs/webp/dec/webp_dec';
-import wasmUrl from '../../../codecs/webp_dec/webp_dec.wasm';
+import wasmUrl from '../../../codecs/webp/dec/webp_dec.wasm';
 import { initEmscriptenModule } from '../util';
 
 let emscriptenModule: Promise<WebPModule>;

src/codecs/webp/encoder.ts

@@ -1,5 +1,5 @@
-import webp_enc, { WebPModule } from '../../../codecs/webp_enc/webp_enc';
+import webp_enc, { WebPModule } from '../../../codecs/webp/enc/webp_enc';
-import wasmUrl from '../../../codecs/webp_enc/webp_enc.wasm';
+import wasmUrl from '../../../codecs/webp/enc/webp_enc.wasm';
 import { EncodeOptions } from './encoder-meta';
 import { initEmscriptenModule } from '../util';