@squoosh-kit/webp 0.1.17 → 0.2.1

package/dist/webp.worker.node.cjs

@@ -2,27 +2,37 @@ var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __moduleCache = /* @__PURE__ */ new WeakMap;
+function __accessProp(key) {
+  return this[key];
+}
 var __toCommonJS = (from) => {
-  var entry = __moduleCache.get(from), desc;
+  var entry = (__moduleCache ??= new WeakMap).get(from), desc;
   if (entry)
     return entry;
   entry = __defProp({}, "__esModule", { value: true });
-  if (from && typeof from === "object" || typeof from === "function")
-    __getOwnPropNames(from).map((key) => !__hasOwnProp.call(entry, key) && __defProp(entry, key, {
-      get: () => from[key],
-      enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-    }));
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (var key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(entry, key))
+        __defProp(entry, key, {
+          get: __accessProp.bind(from, key),
+          enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+        });
+  }
   __moduleCache.set(from, entry);
   return entry;
 };
+var __moduleCache;
+var __returnValue = (v) => v;
+function __exportSetter(name, newValue) {
+  this[name] = __returnValue.bind(null, newValue);
+}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: (newValue) => all[name] = () => newValue
+      set: __exportSetter.bind(all, name)
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -88,6 +98,50 @@ function createCodecWorker(workerFilename, options) {
     "webp.worker.js": {
       package: "@squoosh-kit/webp",
       specifier: "webp.worker.js"
+    },
+    "avif.worker.js": {
+      package: "@squoosh-kit/avif",
+      specifier: "avif.worker.js"
+    },
+    "mozjpeg.worker.js": {
+      package: "@squoosh-kit/mozjpeg",
+      specifier: "mozjpeg.worker.js"
+    },
+    "jxl.worker.js": {
+      package: "@squoosh-kit/jxl",
+      specifier: "jxl.worker.js"
+    },
+    "oxipng.worker.js": {
+      package: "@squoosh-kit/oxipng",
+      specifier: "oxipng.worker.js"
+    },
+    "png.worker.js": {
+      package: "@squoosh-kit/png",
+      specifier: "png.worker.js"
+    },
+    "imagequant.worker.js": {
+      package: "@squoosh-kit/imagequant",
+      specifier: "imagequant.worker.js"
+    },
+    "qoi.worker.js": {
+      package: "@squoosh-kit/qoi",
+      specifier: "qoi.worker.js"
+    },
+    "wp2.worker.js": {
+      package: "@squoosh-kit/wp2",
+      specifier: "wp2.worker.js"
+    },
+    "hqx.worker.js": {
+      package: "@squoosh-kit/hqx",
+      specifier: "hqx.worker.js"
+    },
+    "rotate.worker.js": {
+      package: "@squoosh-kit/rotate",
+      specifier: "rotate.worker.js"
+    },
+    "visdif.worker.js": {
+      package: "@squoosh-kit/visdif",
+      specifier: "visdif.worker.js"
     }
   };
   const workerConfig = workerMap[normalizedName];
@@ -118,7 +172,7 @@ function createCodecWorker(workerFilename, options) {
           return worker;
         } catch (e) {
           console.error(`[worker-helper] Failed to load worker from assetPath URL: ${workerUrl}`, e);
-          throw new Error(`Worker failed to load from ${workerUrl}: ${e instanceof Error ? e.message : String(e)}`);
+          throw new Error(`Worker failed to load from ${workerUrl}: ${e instanceof Error ? e.message : String(e)}`, { cause: e });
         }
       }
       const pathStrategies = [
@@ -151,7 +205,8 @@ function createCodecWorker(workerFilename, options) {
     }
     const platformExt = isBun() ? ".bun.js" : ".node.mjs";
     const baseName = normalizedName.replace(".js", "");
-    const srcRelPath = workerConfig.package.includes("resize") ? `../../resize/src/${baseName}.ts` : `../../webp/src/${baseName}.ts`;
+    const pkgName = workerConfig.package.split("/")[1];
+    const srcRelPath = `../../${pkgName}/src/${baseName}.ts`;
     console.log("srcRelPath:", srcRelPath);
     console.log("import.meta.url:", "file:///home/bnowak/repos/squoosh-kit/packages/runtime/src/worker-helper.ts");
     try {
@@ -159,7 +214,7 @@ function createCodecWorker(workerFilename, options) {
         type: "module"
       });
     } catch {
-      const distRelPath = workerConfig.package.includes("resize") ? `../../resize/dist/${baseName}.${platformExt.slice(1)}` : `../../webp/dist/${baseName}.${platformExt.slice(1)}`;
+      const distRelPath = `../../${pkgName}/dist/${baseName}.${platformExt.slice(1)}`;
       console.log("distRelPath:", distRelPath);
       console.log("import.meta.url:", "file:///home/bnowak/repos/squoosh-kit/packages/runtime/src/worker-helper.ts");
       try {
@@ -179,7 +234,7 @@ function createCodecWorker(workerFilename, options) {
     throw new Error(`Failed to create worker from ${normalizedName}. ` + `Tried TypeScript source, dist output, and import.meta.resolve. ` + `Ensure the @squoosh-kit/resize and @squoosh-kit/webp packages are installed.`);
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
-    throw new Error(`Failed to create worker from ${normalizedName}: ${errorMessage}. ` + `Ensure the @squoosh-kit/resize and @squoosh-kit/webp packages are installed. ` + `If you're using Vite, ensure the worker files are not being optimized as dependencies.`);
+    throw new Error(`Failed to create worker from ${normalizedName}: ${errorMessage}. ` + `Ensure the @squoosh-kit/resize and @squoosh-kit/webp packages are installed. ` + `If you're using Vite, ensure the worker files are not being optimized as dependencies.`, { cause: error });
   }
 }
 function createReadyWorker(workerFilename, options, timeoutMs = 1e4) {
@@ -331,7 +386,7 @@ function validateWebpOptions(options) {
     if (typeof quality !== "number") {
       throw new TypeError("quality must be a number");
     }
-    if (!Number.isInteger(quality)) {
+    if (!Number.isFinite(quality) || !Number.isInteger(quality)) {
       throw new RangeError("quality must be an integer in the range 0-100, got floating point");
     }
     if (quality < 0 || quality > 100) {
@@ -343,81 +398,96 @@ function validateWebpOptions(options) {
 // src/webp.worker.ts
 var exports_webp_worker = {};
 __export(exports_webp_worker, {
-  webpEncodeClient: () => webpEncodeClient
+  webpEncodeClient: () => webpEncodeClient,
+  webpDecodeClient: () => webpDecodeClient
 });
 module.exports = __toCommonJS(exports_webp_worker);
 async function loadWebPModule() {
-  if (cachedModule) {
+  if (cachedModule)
     return cachedModule;
-  }
-  const simdSupported2 = await detectSimd();
-  const modulePath = simdSupported2 ? "webp/webp_enc_simd.js" : "webp/webp_enc.js";
-  try {
-    console.log("[WebP Worker] Initializing. SIMD support:", simdSupported2);
-    console.log(`[WebP Worker] Attempting to import module from path: ${modulePath}`);
-    const globalSelf = typeof self !== "undefined" ? self : globalThis;
-    if (!globalSelf.location) {
-      globalSelf.location = {
-        href: "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts"
-      };
-    }
-    if (typeof self === "undefined" && typeof globalThis !== "undefined") {
-      globalThis.self = globalThis;
-    }
-    let moduleFactory;
-    const pathsToTry = ["./wasm/" + modulePath, "../wasm/" + modulePath];
-    let lastError = null;
-    for (const importPath of pathsToTry) {
-      try {
-        moduleFactory = (await import(importPath)).default;
-        console.log(`[WebP Worker] Successfully loaded module from: ${importPath}`);
-        break;
-      } catch (error) {
-        lastError = error instanceof Error ? error : new Error(String(error));
-        console.warn(`[WebP Worker] Failed to load from ${importPath}, trying next path...`);
+  if (loadModulePromise)
+    return loadModulePromise;
+  loadModulePromise = (async () => {
+    const simdSupported2 = await detectSimd();
+    const modulePath = simdSupported2 ? "webp/webp_enc_simd.js" : "webp/webp_enc.js";
+    try {
+      console.log("[WebP Worker] Initializing. SIMD support:", simdSupported2);
+      console.log(`[WebP Worker] Attempting to import module from path: ${modulePath}`);
+      const globalSelf = typeof self !== "undefined" ? self : globalThis;
+      if (!globalSelf.location) {
+        globalSelf.location = {
+          href: "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts"
+        };
       }
-    }
-    if (!moduleFactory) {
-      throw lastError || new Error("Could not load WebP module from any path");
-    }
-    console.log("[WebP Worker] Module factory loaded successfully.");
-    const wasmPathsToTry = simdSupported2 ? ["./wasm/webp/webp_enc_simd.wasm", "../wasm/webp/webp_enc_simd.wasm"] : ["./wasm/webp/webp_enc.wasm", "../wasm/webp/webp_enc.wasm"];
-    console.log(`[WebP Worker] Preparing to load WASM binary. Will try paths: ${wasmPathsToTry.join(", ")}`);
-    const initModuleWithBinary = async (moduleFactory2, wasmPaths) => {
-      const workerBaseUrl = new URL(".", "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts");
-      let lastError2 = null;
-      for (const wasmPath of wasmPaths) {
+      if (typeof self === "undefined" && typeof globalThis !== "undefined") {
+        globalThis.self = globalThis;
+      }
+      let moduleFactory;
+      const isSource = "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts".includes("/src/");
+      const pathsToTry = isSource ? ["../wasm/" + modulePath, "./wasm/" + modulePath] : ["./wasm/" + modulePath, "../wasm/" + modulePath];
+      let lastError = null;
+      for (const importPath of pathsToTry) {
         try {
-          console.log(`[WebP Worker] Calling loadWasmBinary with path: ${wasmPath}`);
-          const wasmBinary = await loadWasmBinary(wasmPath, workerBaseUrl);
-          console.log(`[WebP Worker] Successfully fetched WASM binary from ${wasmPath}. Size: ${wasmBinary.byteLength} bytes.`);
-          const globalSelf2 = typeof self !== "undefined" ? self : globalThis;
-          if (!globalSelf2.location) {
-            globalSelf2.location = {
-              href: "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts"
-            };
-          }
-          if (typeof self === "undefined" && typeof globalThis !== "undefined") {
-            globalThis.self = globalThis;
-          }
-          return await moduleFactory2({
-            noInitialRun: true,
-            wasmBinary
-          });
-        } catch (err) {
-          lastError2 = err instanceof Error ? err : new Error(String(err));
-          console.warn(`[WebP Worker] Failed to load WASM from ${wasmPath}, trying next path...`);
+          moduleFactory = (await import(importPath)).default;
+          console.log(`[WebP Worker] Successfully loaded module from: ${importPath}`);
+          break;
+        } catch (error) {
+          lastError = error instanceof Error ? error : new Error(String(error));
+          console.warn(`[WebP Worker] Failed to load from ${importPath}, trying next path...`);
         }
       }
-      throw lastError2 || new Error("Could not load WASM binary from any of the attempted paths");
-    };
-    cachedModule = await initModuleWithBinary(moduleFactory, wasmPathsToTry);
-    console.log("[WebP Worker] WebP module initialized successfully.");
-    return cachedModule;
-  } catch (err) {
-    console.error(`[WebP Worker] CRITICAL: Failed to load WebP module from path: ${modulePath}`, err);
+      if (!moduleFactory) {
+        throw lastError || new Error("Could not load WebP module from any path");
+      }
+      console.log("[WebP Worker] Module factory loaded successfully.");
+      const wasmPathsToTry = simdSupported2 ? isSource ? [
+        "../wasm/webp/webp_enc_simd.wasm",
+        "./wasm/webp/webp_enc_simd.wasm"
+      ] : [
+        "./wasm/webp/webp_enc_simd.wasm",
+        "../wasm/webp/webp_enc_simd.wasm"
+      ] : isSource ? ["../wasm/webp/webp_enc.wasm", "./wasm/webp/webp_enc.wasm"] : ["./wasm/webp/webp_enc.wasm", "../wasm/webp/webp_enc.wasm"];
+      console.log(`[WebP Worker] Preparing to load WASM binary. Will try paths: ${wasmPathsToTry.join(", ")}`);
+      const initModuleWithBinary = async (moduleFactory2, wasmPaths) => {
+        const workerBaseUrl = new URL(".", "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts");
+        let lastError2 = null;
+        for (const wasmPath of wasmPaths) {
+          try {
+            console.log(`[WebP Worker] Calling loadWasmBinary with path: ${wasmPath}`);
+            const wasmBinary = await loadWasmBinary(wasmPath, workerBaseUrl);
+            console.log(`[WebP Worker] Successfully fetched WASM binary from ${wasmPath}. Size: ${wasmBinary.byteLength} bytes.`);
+            const globalSelf2 = typeof self !== "undefined" ? self : globalThis;
+            if (!globalSelf2.location) {
+              globalSelf2.location = {
+                href: "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts"
+              };
+            }
+            if (typeof self === "undefined" && typeof globalThis !== "undefined") {
+              globalThis.self = globalThis;
+            }
+            return await moduleFactory2({
+              noInitialRun: true,
+              wasmBinary
+            });
+          } catch (err) {
+            lastError2 = err instanceof Error ? err : new Error(String(err));
+            console.warn(`[WebP Worker] Failed to load WASM from ${wasmPath}, trying next path...`);
+          }
+        }
+        throw lastError2 || new Error("Could not load WASM binary from any of the attempted paths");
+      };
+      cachedModule = await initModuleWithBinary(moduleFactory, wasmPathsToTry);
+      console.log("[WebP Worker] WebP module initialized successfully.");
+      return cachedModule;
+    } catch (err) {
+      console.error(`[WebP Worker] CRITICAL: Failed to load WebP module from path: ${modulePath}`, err);
+      throw err;
+    }
+  })().catch((err) => {
+    loadModulePromise = null;
     throw err;
-  }
+  });
+  return loadModulePromise;
 }
 function createEncodeOptions(options) {
   return {
@@ -462,27 +532,13 @@ async function webpEncodeClient(image, options, signal) {
   if (!(data instanceof Uint8Array) && !(data instanceof Uint8ClampedArray)) {
     throw new Error("Image data must be Uint8Array or Uint8ClampedArray");
   }
-  const t0 = performance.now();
   const module2 = await loadWebPModule();
-  const t1 = performance.now();
-  if (typeof console !== "undefined" && console.log) {
-    console.log(`[WebP] module loading took ${(t1 - t0).toFixed(2)}ms`);
-    console.log(`[WebP] Module type: ${cachedModule && "encode" in cachedModule ? "Ready" : "Unknown"}`);
-  }
   if (signal?.aborted) {
     throw new DOMException("Aborted", "AbortError");
   }
   const encodeOptions = createEncodeOptions(options);
   const dataArray = data instanceof Uint8ClampedArray ? new Uint8Array(data.buffer, data.byteOffset, data.length) : new Uint8Array(data.buffer, data.byteOffset, data.length);
-  if (typeof console !== "undefined" && console.log) {
-    console.log(`[WebP] encode options:`, encodeOptions);
-  }
-  const t2 = performance.now();
   const result = module2.encode(dataArray, width, height, encodeOptions);
-  const t3 = performance.now();
-  if (typeof console !== "undefined" && console.log) {
-    console.log(`[WebP] actual encoding took ${(t3 - t2).toFixed(2)}ms`);
-  }
   if (signal?.aborted) {
     throw new DOMException("Aborted", "AbortError");
   }
@@ -491,45 +547,176 @@ async function webpEncodeClient(image, options, signal) {
   }
   return result;
 }
-var cachedModule = null;
+async function loadWebPDecModule() {
+  if (cachedDecModule)
+    return cachedDecModule;
+  if (loadDecModulePromise)
+    return loadDecModulePromise;
+  loadDecModulePromise = (async () => {
+    const modulePath = "webp-dec/webp_dec.js";
+    try {
+      console.log("[WebP Worker] Initializing dec module...");
+      console.log(`[WebP Worker] Attempting to import dec module from path: ${modulePath}`);
+      const globalSelf = typeof self !== "undefined" ? self : globalThis;
+      if (!globalSelf.location) {
+        globalSelf.location = {
+          href: "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts"
+        };
+      }
+      if (typeof self === "undefined" && typeof globalThis !== "undefined") {
+        globalThis.self = globalThis;
+      }
+      if (typeof ImageData === "undefined") {
+        globalThis.ImageData = class {
+          data;
+          width;
+          height;
+          colorSpace = "srgb";
+          constructor(data, width, height) {
+            this.data = data;
+            this.width = width;
+            this.height = height;
+          }
+        };
+      }
+      let moduleFactory;
+      const isSource = "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts".includes("/src/");
+      const pathsToTry = isSource ? ["../wasm/" + modulePath, "./wasm/" + modulePath] : ["./wasm/" + modulePath, "../wasm/" + modulePath];
+      let lastError = null;
+      for (const importPath of pathsToTry) {
+        try {
+          moduleFactory = (await import(importPath)).default;
+          console.log(`[WebP Worker] Successfully loaded dec module from: ${importPath}`);
+          break;
+        } catch (error) {
+          lastError = error instanceof Error ? error : new Error(String(error));
+          console.warn(`[WebP Worker] Failed to load dec from ${importPath}, trying next path...`);
+        }
+      }
+      if (!moduleFactory) {
+        throw lastError || new Error("Could not load WebP dec module from any path");
+      }
+      console.log("[WebP Worker] Dec module factory loaded successfully.");
+      const wasmPathsToTry = isSource ? ["../wasm/webp-dec/webp_dec.wasm", "./wasm/webp-dec/webp_dec.wasm"] : ["./wasm/webp-dec/webp_dec.wasm", "../wasm/webp-dec/webp_dec.wasm"];
+      console.log(`[WebP Worker] Preparing to load dec WASM binary. Will try paths: ${wasmPathsToTry.join(", ")}`);
+      const initDecModuleWithBinary = async (moduleFactory2, wasmPaths) => {
+        const workerBaseUrl = new URL(".", "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts");
+        let lastError2 = null;
+        for (const wasmPath of wasmPaths) {
+          try {
+            console.log(`[WebP Worker] Calling loadWasmBinary with dec path: ${wasmPath}`);
+            const wasmBinary = await loadWasmBinary(wasmPath, workerBaseUrl);
+            console.log(`[WebP Worker] Successfully fetched dec WASM binary from ${wasmPath}. Size: ${wasmBinary.byteLength} bytes.`);
+            const globalSelf2 = typeof self !== "undefined" ? self : globalThis;
+            if (!globalSelf2.location) {
+              globalSelf2.location = {
+                href: "file:///home/bnowak/repos/squoosh-kit/packages/webp/src/webp.worker.ts"
+              };
+            }
+            if (typeof self === "undefined" && typeof globalThis !== "undefined") {
+              globalThis.self = globalThis;
+            }
+            return await moduleFactory2({
+              noInitialRun: true,
+              wasmBinary
+            });
+          } catch (err) {
+            lastError2 = err instanceof Error ? err : new Error(String(err));
+            console.warn(`[WebP Worker] Failed to load dec WASM from ${wasmPath}, trying next path...`);
+          }
+        }
+        throw lastError2 || new Error("Could not load dec WASM binary from any of the attempted paths");
+      };
+      cachedDecModule = await initDecModuleWithBinary(moduleFactory, wasmPathsToTry);
+      console.log("[WebP Worker] WebP dec module initialized successfully.");
+      return cachedDecModule;
+    } catch (err) {
+      console.error("[WebP Worker] CRITICAL: Failed to load WebP dec module", err);
+      throw err;
+    }
+  })().catch((err) => {
+    loadDecModulePromise = null;
+    throw err;
+  });
+  return loadDecModulePromise;
+}
+async function webpDecodeClient(data, signal) {
+  if (signal?.aborted) {
+    throw new DOMException("Aborted", "AbortError");
+  }
+  const module2 = await loadWebPDecModule();
+  if (signal?.aborted) {
+    throw new DOMException("Aborted", "AbortError");
+  }
+  const result = module2.decode(data);
+  if (!result) {
+    throw new Error("WebP decoding failed");
+  }
+  return result;
+}
+var cachedModule = null, loadModulePromise = null, cachedDecModule = null, loadDecModulePromise = null;
 var init_webp_worker = __esm(() => {
   init_src();
   if (typeof self !== "undefined") {
+    loadWebPModule().catch(() => {});
     self.onmessage = async (event) => {
       const data = event.data;
       if (data?.type === "worker:ping") {
+        await loadWebPModule();
         self.postMessage({ type: "worker:ready" });
         return;
       }
+      if (data?.type === "webp:encode") {
+        const request2 = data;
+        const response2 = {
+          id: request2.id,
+          ok: false
+        };
+        try {
+          const { image, options } = request2.payload;
+          const result = await webpEncodeClient(image, options);
+          response2.ok = true;
+          response2.data = result;
+          const transferBuffer = result.buffer instanceof ArrayBuffer ? result.buffer : result.slice().buffer;
+          self.postMessage(response2, {
+            transfer: [transferBuffer]
+          });
+        } catch (error) {
+          response2.error = error instanceof Error ? error.message : String(error);
+          self.postMessage(response2);
+        }
+        return;
+      }
+      if (data?.type === "webp:decode") {
+        const request2 = data;
+        const response2 = {
+          id: request2.id,
+          ok: false
+        };
+        try {
+          const result = await webpDecodeClient(request2.payload.data);
+          response2.ok = true;
+          response2.data = result;
+          const transferBuffer = result.data.buffer instanceof ArrayBuffer ? result.data.buffer : result.data.slice().buffer;
+          self.postMessage(response2, {
+            transfer: [transferBuffer]
+          });
+        } catch (error) {
+          response2.error = error instanceof Error ? error.message : String(error);
+          self.postMessage(response2);
+        }
+        return;
+      }
       const request = data;
       const response = {
         id: request.id,
-        ok: false
+        ok: false,
+        error: `Unknown message type: ${data?.type}`
       };
-      try {
-        if (request.type === "webp:encode") {
-          const { image, options } = request.payload;
-          const t0 = performance.now();
-          const controller = new AbortController;
-          const result = await webpEncodeClient(image, options, controller.signal);
-          const t1 = performance.now();
-          if (typeof console !== "undefined" && console.log) {
-            console.log(`[WebP Worker] encode took ${(t1 - t0).toFixed(2)}ms`);
-          }
-          response.ok = true;
-          response.data = result;
-          self.postMessage(response);
-        } else {
-          response.error = `Unknown message type: ${request.type}`;
-          self.postMessage(response);
-        }
-      } catch (error) {
-        response.error = error instanceof Error ? error.message : String(error);
-        self.postMessage(response);
-      }
+      self.postMessage(response);
     };
   }
 });
 init_webp_worker();
 
-//# debugId=E6E4CD7B96B2B34464756E2164756E21
+//# debugId=FF4F5B79B5A10B2D64756E2164756E21