wasm-image-optimization 1.4.5 → 2.0.0

package/dist/workerd.d.ts

@@ -0,0 +1,19 @@
+import { ImageConverter as ImageConverterBase, OptimizeParams, OptimizeResult } from "./index.js";
+export * from "./core.js";
+/**
+ * Cloudflare Workers (workerd) specialized wrapper for Satoru.
+ * Handles the specific WASM instantiation requirements for the environment.
+ */
+export declare class ImageConverter extends ImageConverterBase {
+    private constructor();
+    /**
+     * Create Satoru instance for Cloudflare Workers.
+     * @param wasm The compiled WASM module (defaults to the bundled one)
+     */
+    static create(wasm?: WebAssembly.Module): Promise<ImageConverter>;
+}
+/**
+ * High-level convert function for Cloudflare Workers.
+ * Automatically creates and reuses a Satoru instance.
+ */
+export declare function optimizeImage(params: OptimizeParams): Promise<OptimizeResult>;

package/dist/workerd.js

@@ -0,0 +1,48 @@
+// @ts-ignore
+import createModule from "../dist/wasm-image-optimization.js";
+import { ImageConverter as ImageConverterBase, } from "./index.js";
+export * from "./core.js";
+// @ts-ignore
+import satoruWasm from "../dist/wasm-image-optimization.wasm";
+/**
+ * Cloudflare Workers (workerd) specialized wrapper for Satoru.
+ * Handles the specific WASM instantiation requirements for the environment.
+ */
+export class ImageConverter extends ImageConverterBase {
+    // Use protected constructor from base
+    constructor(factory) {
+        super(factory);
+    }
+    /**
+     * Create Satoru instance for Cloudflare Workers.
+     * @param wasm The compiled WASM module (defaults to the bundled one)
+     */
+    static async create(wasm = satoruWasm) {
+        const factory = async (o) => createModule({
+            ...o,
+            instantiateWasm: (imports, successCallback) => {
+                // Cloudflare Workers requires using the pre-compiled WebAssembly.Module
+                WebAssembly.instantiate(wasm, imports)
+                    .then((instance) => {
+                    successCallback(instance, wasm);
+                })
+                    .catch((e) => {
+                    console.error("wasm-image-optimization [workerd]: Wasm instantiation failed:", e);
+                });
+                return {}; // Return empty object as emscripten expects
+            },
+        });
+        return ImageConverterBase.create(factory);
+    }
+}
+let instance = null;
+/**
+ * High-level convert function for Cloudflare Workers.
+ * Automatically creates and reuses a Satoru instance.
+ */
+export async function optimizeImage(params) {
+    if (!instance) {
+        instance = await ImageConverter.create();
+    }
+    return instance.optimizeImage(params);
+}

package/dist/workers.d.ts

@@ -0,0 +1,7 @@
+export type { ImageConverterWorker } from "./child-workers.js";
+import { type OptimizeParams, type OptimizeResult } from "./index.js";
+export { ImageConverter } from "./index.js";
+export * from "./index.js";
+export type { OptimizeParams, OptimizeResult };
+declare const close: () => void, optimizeImage: (options: OptimizeParams) => Promise<OptimizeResult>, launchWorker: () => Promise<void[]>, setLimit: (newLimit: number) => void, waitAll: () => Promise<void>, waitReady: (retryTime?: number) => Promise<void>;
+export { close, optimizeImage, launchWorker, setLimit, waitAll, waitReady };

package/dist/workers.js

@@ -0,0 +1,50 @@
+import { createWorker, Worker } from "worker-lib";
+export { ImageConverter } from "./index.js";
+export * from "./index.js";
+/**
+ * Create a Satoru worker proxy using worker-lib.
+ * @param params Initialization parameters
+ * @param params.worker Optional: Path to the worker file, a URL, or a factory function.
+ *                      Defaults to the bundled workers.js in the same directory.
+ * @param params.maxParallel Maximum number of parallel workers
+ */
+const createImageConverterWorker = (params) => {
+    const { worker, maxParallel = 4 } = params ?? {};
+    const factory = () => {
+        let w;
+        if (worker) {
+            w = typeof worker === "function" ? worker() : worker;
+        }
+        else {
+            const workerUrl = typeof window !== "undefined"
+                ? new URL("./web-workers.js", import.meta.url)
+                : new URL("./child-workers.js", import.meta.url);
+            if (typeof Worker !== "undefined") {
+                w = new Worker(workerUrl, { type: "module" });
+            }
+        }
+        if (!w)
+            throw new Error("Worker is not supported in this environment.");
+        return w;
+    };
+    const workerInstance = createWorker(factory, maxParallel);
+    const proxy = new Proxy(workerInstance, {
+        get(target, prop, receiver) {
+            if (prop === "optimizeImage") {
+                return async (options) => {
+                    return await target.execute("optimizeImage", {
+                        ...options,
+                        image: new Uint8Array(options.image),
+                    });
+                };
+            }
+            if (prop in target) {
+                return Reflect.get(target, prop, receiver);
+            }
+            return (...args) => target.execute(prop, ...args);
+        },
+    });
+    return proxy;
+};
+const { close, optimizeImage, launchWorker, setLimit, waitAll, waitReady } = createImageConverterWorker({ maxParallel: 4 });
+export { close, optimizeImage, launchWorker, setLimit, waitAll, waitReady };

package/package.json

@@ -1,117 +1,90 @@
 {
   "name": "wasm-image-optimization",
+  "version": "2.0.0",
   "description": "Optimize images with wasm on edge runtime",
-  "version": "1.4.5",
+  "type": "module",
+  "main": "./dist/index.js",
+  "bin": {
+    "wasm-image-optimization": "./dist/cli.js"
+  },
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "test": "yarn ts-node test",
-    "lint:fix": "eslint --fix src/ && prettier -w src",
-    "build": "tsc && tsc -p ./tsconfig.csj.json && cpy esm dist && tsx bin/build",
-    "build:wasm": "mkdirp dist && docker compose -f docker/docker-compose.yml run --build --rm emcc make -j",
-    "docker:shell": "mkdirp dist && docker compose -f docker/docker-compose.yml run --build --rm emcc bash -l"
+    "build": "tsc -b && rolldown -c rolldown.config.js"
   },
   "exports": {
-    "./esm": {
-      "import": "./dist/esm/index.js",
-      "types": "./dist/esm/index.d.ts"
-    },
-    "./node": {
-      "types": "./dist/cjs/node/index.d.ts",
-      "default": "./dist/cjs/node/index.js"
-    },
-    "./web-worker": {
-      "types": "./dist/web-worker/index.d.ts",
-      "browser": "./dist/web-worker/index.js",
-      "node": "./dist/dummy/index.js"
-    },
-    "./node-worker": {
-      "types": "./dist/cjs/node/cjs-worker.d.ts",
-      "require": "./dist/cjs/node/cjs-worker.js",
-      "import": "./dist/cjs/node/cjs-worker.js"
-    },
     ".": {
-      "require": {
-        "types": "./dist/cjs/node/index.d.ts",
-        "node": "./dist/cjs/node/index.js",
-        "edge-light": "./dist/esm/index.js",
-        "workerd": "./dist/workers/index.js",
-        "worker": "./dist/workers/index.js",
-        "browser": "./dist/esm/index.js"
+      "workerd": {
+        "types": "./dist/workerd.d.ts",
+        "import": "./dist/workerd.js"
+      },
+      "deno": {
+        "types": "./dist/single.d.ts",
+        "import": "./dist/single.js"
       },
-      "import": {
-        "types": "./dist/cjs/node/index.d.ts",
-        "node": "./dist/cjs/node/index.js",
-        "edge-light": "./dist/esm/index.js",
-        "workerd": "./dist/workers/index.js",
-        "worker": "./dist/workers/index.js",
-        "browser": "./dist/esm/index.js"
+      "single": {
+        "types": "./dist/single.d.ts",
+        "import": "./dist/single.js"
       },
-      "default": {
-        "types": "./dist/workers/index.d.ts",
-        "default": "./dist/workers/index.js"
-      }
+      "types": "./dist/single.d.ts",
+      "import": "./dist/single.js",
+      "default": "./dist/single.js"
     },
-    "./vite-plugin": {
-      "types": "./dist/vite-plugin/index.d.ts",
-      "default": "./dist/vite-plugin/index.js"
-    }
+    "./workerd": {
+      "types": "./dist/workerd.d.ts",
+      "import": "./dist/workerd.js"
+    },
+    "./workers": {
+      "types": "./dist/workers.d.ts",
+      "import": "./dist/workers.js"
+    },
+    "./single": {
+      "types": "./dist/single.d.ts",
+      "import": "./dist/single.js"
+    },
+    "./wasm-image-optimization.js": "./dist/wasm-image-optimization.js",
+    "./wasm-image-optimization.wasm": "./dist/wasm-image-optimization.wasm"
   },
   "typesVersions": {
     "*": {
-      "edge": [
-        "./dist/esm/index.d.ts"
+      "workers": [
+        "./dist/workers.d.ts"
       ],
-      "web-worker": [
-        "./dist/web-worker/index.d.ts"
+      "workerd": [
+        "./dist/workerd.d.ts"
       ],
-      "node-worker": [
-        "./dist/cjs/node/cjs-worker.d.ts"
-      ],
-      "node": [
-        "./dist/cjs/node/index.d.ts"
-      ],
-      "vite": [
-        "./dist/esm/index.d.ts"
+      "single": [
+        "./dist/single.d.ts"
       ],
       "*": [
-        "./dist/workers/index.d.ts"
+        "./dist/single.d.ts"
       ]
     }
   },
+  "files": [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  "author": "SoraKumo <info@croud.jp>",
   "license": "MIT",
-  "dependencies": {
-    "mkdirp": "3.0.1",
-    "worker-lib": "2.0.8"
-  },
-  "devDependencies": {
-    "@eslint/js": "9.39.2",
-    "@types/node": "25.0.9",
-    "@typescript-eslint/eslint-plugin": "^8.53.1",
-    "@typescript-eslint/parser": "^8.53.1",
-    "cpy-cli": "^6.0.0",
-    "esbuild": "0.27.2",
-    "eslint": "9.39.2",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-import-resolver-typescript": "^4.4.4",
-    "eslint-plugin-import": "^2.32.0",
-    "prettier": "^3.8.0",
-    "ts-node": "^10.9.2",
-    "tsx": "4.21.0",
-    "typescript": "^5.9.3",
-    "typescript-eslint": "^8.53.1",
-    "vite": "7.3.1"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
   "keywords": [
+    "image",
+    "converter",
     "webp",
-    "encode",
+    "png",
+    "jpeg",
+    "avif",
     "wasm",
-    "cloudflare",
-    "workers",
-    "WebAssembly"
+    "skia",
+    "webassembly"
   ],
-  "repository": "https://github.com/node-libraries/wasm-image-optimization",
-  "author": "SoraKumo <info@croud.jp>",
-  "main": "index.js"
+  "devDependencies": {
+    "rolldown": "1.0.0-rc.7",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.18"
+  },
+  "dependencies": {
+    "commander": "14.0.3",
+    "worker-lib": "2.2.0"
+  }
 }

package/dist/cjs/dummy/index.d.ts

@@ -1,9 +0,0 @@
-import type { OptimizeParams, OptimizeResult } from "../types/index.js";
-export type { OptimizeParams, OptimizeResult };
-export declare const optimizeImage: (_params: OptimizeParams) => OptimizeResult;
-export declare const optimizeImageExt: (_params: OptimizeParams) => OptimizeResult;
-export declare const setLimit: (_limit: number) => void;
-export declare const close: () => void;
-export declare const waitAll: () => Promise<void>;
-export declare const waitReady: (_retryTime?: number) => Promise<void>;
-export declare const launchWorker: () => Promise<void>;

package/dist/cjs/dummy/index.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.launchWorker = exports.waitReady = exports.waitAll = exports.close = exports.setLimit = exports.optimizeImageExt = exports.optimizeImage = void 0;
-const optimizeImage = (_params) => {
-    return undefined;
-};
-exports.optimizeImage = optimizeImage;
-const optimizeImageExt = (_params) => {
-    return undefined;
-};
-exports.optimizeImageExt = optimizeImageExt;
-const setLimit = (_limit) => { };
-exports.setLimit = setLimit;
-const close = () => { };
-exports.close = close;
-const waitAll = () => Promise.resolve();
-exports.waitAll = waitAll;
-const waitReady = (_retryTime) => Promise.resolve();
-exports.waitReady = waitReady;
-const launchWorker = () => Promise.resolve();
-exports.launchWorker = launchWorker;
-//# sourceMappingURL=index.js.map

package/dist/cjs/dummy/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/dummy/index.ts"],"names":[],"mappings":";;;AAIO,MAAM,aAAa,GAAG,CAAC,OAAuB,EAAkB,EAAE;IACvE,OAAO,SAAkB,CAAC;AAC5B,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AACK,MAAM,gBAAgB,GAAG,CAAC,OAAuB,EAAkB,EAAE;IAC1E,OAAO,SAAkB,CAAC;AAC5B,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AACK,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAQ,EAAE,GAAE,CAAC,CAAC;AAAxC,QAAA,QAAQ,YAAgC;AAC9C,MAAM,KAAK,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAAjB,QAAA,KAAK,SAAY;AACvB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;AAAlC,QAAA,OAAO,WAA2B;AACxC,MAAM,SAAS,GAAG,CAAC,UAAmB,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;AAAvD,QAAA,SAAS,aAA8C;AAC7D,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;AAAvC,QAAA,YAAY,gBAA2B","sourcesContent":["import { _optimizeImage, _optimizeImageExt } from \"../lib/optimizeImage.js\";\nimport type { OptimizeParams, OptimizeResult } from \"../types/index.js\";\nexport type { OptimizeParams, OptimizeResult };\n\nexport const optimizeImage = (_params: OptimizeParams): OptimizeResult => {\n  return undefined as never;\n};\nexport const optimizeImageExt = (_params: OptimizeParams): OptimizeResult => {\n  return undefined as never;\n};\nexport const setLimit = (_limit: number): void => {};\nexport const close = () => {};\nexport const waitAll = () => Promise.resolve();\nexport const waitReady = (_retryTime?: number) => Promise.resolve();\nexport const launchWorker = () => Promise.resolve();\n"]}

package/dist/cjs/lib/optimizeImage.d.ts

@@ -1,14 +0,0 @@
-import type { ModuleType } from "../esm/libImage.js";
-import type { OptimizeParams } from "../types/index.js";
-export declare const _optimizeImage: ({ image, width, height, quality, format, speed, filter, libImage, }: OptimizeParams & {
-    libImage: Promise<ModuleType>;
-}) => Promise<Uint8Array<ArrayBuffer> | undefined>;
-export declare const _optimizeImageExt: ({ image, width, height, quality, format, speed, filter, libImage, }: OptimizeParams & {
-    libImage: Promise<ModuleType>;
-}) => Promise<{
-    data: Uint8Array<ArrayBuffer>;
-    originalWidth: number;
-    originalHeight: number;
-    width: number;
-    height: number;
-} | undefined>;

package/dist/cjs/lib/optimizeImage.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports._optimizeImageExt = exports._optimizeImage = void 0;
-const result = (result, releaseResult) => {
-    const r = result
-        ? { ...result, data: Uint8Array.from(result.data) }
-        : undefined;
-    releaseResult();
-    return r;
-};
-const _optimizeImage = async ({ image, width = 0, height = 0, quality = 100, format = "avif", speed = 6, filter = true, libImage, }) => (0, exports._optimizeImageExt)({
-    image,
-    width,
-    height,
-    quality,
-    format,
-    speed,
-    filter,
-    libImage,
-}).then((r) => r?.data);
-exports._optimizeImage = _optimizeImage;
-const _optimizeImageExt = async ({ image, width = 0, height = 0, quality = 100, format = "avif", speed = 6, filter = true, libImage, }) => libImage.then(({ optimize, releaseResult }) => result(optimize(image, width, height, quality, format, speed, filter), releaseResult));
-exports._optimizeImageExt = _optimizeImageExt;
-//# sourceMappingURL=optimizeImage.js.map

package/dist/cjs/lib/optimizeImage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"optimizeImage.js","sourceRoot":"","sources":["../../../src/lib/optimizeImage.ts"],"names":[],"mappings":";;;AAGA,MAAM,MAAM,GAAG,CACb,MAAsD,EACtD,aAAyB,EACzB,EAAE;IACF,MAAM,CAAC,GAAG,MAAM;QACd,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;QACnD,CAAC,CAAC,SAAS,CAAC;IACd,aAAa,EAAE,CAAC;IAChB,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AACK,MAAM,cAAc,GAAG,KAAK,EAAE,EACnC,KAAK,EACL,KAAK,GAAG,CAAC,EACT,MAAM,GAAG,CAAC,EACV,OAAO,GAAG,GAAG,EACb,MAAM,GAAG,MAAM,EACf,KAAK,GAAG,CAAC,EACT,MAAM,GAAG,IAAI,EACb,QAAQ,GAGT,EAAE,EAAE,CACH,IAAA,yBAAiB,EAAC;IAChB,KAAK;IACL,KAAK;IACL,MAAM;IACN,OAAO;IACP,MAAM;IACN,KAAK;IACL,MAAM;IACN,QAAQ;CACT,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AArBb,QAAA,cAAc,kBAqBD;AAEnB,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACtC,KAAK,EACL,KAAK,GAAG,CAAC,EACT,MAAM,GAAG,CAAC,EACV,OAAO,GAAG,GAAG,EACb,MAAM,GAAG,MAAM,EACf,KAAK,GAAG,CAAC,EACT,MAAM,GAAG,IAAI,EACb,QAAQ,GAGT,EAAE,EAAE,CACH,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,EAAE,CAC5C,MAAM,CACJ,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,EAC9D,aAAa,CACd,CACF,CAAC;AAjBS,QAAA,iBAAiB,qBAiB1B","sourcesContent":["import type { ModuleType } from \"../esm/libImage.js\";\nimport type { OptimizeParams } from \"../types/index.js\";\n\nconst result = (\n  result: ReturnType<ModuleType[\"optimize\"]> | undefined,\n  releaseResult: () => void\n) => {\n  const r = result\n    ? { ...result, data: Uint8Array.from(result.data) }\n    : undefined;\n  releaseResult();\n  return r;\n};\nexport const _optimizeImage = async ({\n  image,\n  width = 0,\n  height = 0,\n  quality = 100,\n  format = \"avif\",\n  speed = 6,\n  filter = true,\n  libImage,\n}: OptimizeParams & {\n  libImage: Promise<ModuleType>;\n}) =>\n  _optimizeImageExt({\n    image,\n    width,\n    height,\n    quality,\n    format,\n    speed,\n    filter,\n    libImage,\n  }).then((r) => r?.data);\n\nexport const _optimizeImageExt = async ({\n  image,\n  width = 0,\n  height = 0,\n  quality = 100,\n  format = \"avif\",\n  speed = 6,\n  filter = true,\n  libImage,\n}: OptimizeParams & {\n  libImage: Promise<ModuleType>;\n}) =>\n  libImage.then(({ optimize, releaseResult }) =>\n    result(\n      optimize(image, width, height, quality, format, speed, filter),\n      releaseResult\n    )\n  );\n"]}