Merge pull request #80 from ssssota/initialize-with-wasm

feat: initializing with wasm binary

Author: ssssota

packages/libraw.wasm/src/index.ts

@@ -1,7 +1,6 @@
 import * as typ from "typed-cstruct";
 
 import {
-	libraw_data_t,
 	libraw_imgother_t,
 	libraw_iparams_t,
 	libraw_lensinfo_t,
@@ -23,6 +22,9 @@ import type {
 	LibRawWasmModule,
 } from "./types/index.js";
 
+type PromiseOr<T> = T | Promise<T>;
+type WasmInput = PromiseOr<Response | ArrayBuffer>;
+
 export class LibRaw implements Disposable {
 	private static modulePromise: Promise<LibRawWasmModule> | undefined;
 	private static module: LibRawWasmModule;
@@ -34,14 +36,29 @@ export class LibRaw implements Disposable {
 	constructor() {
 		this.setup();
 	}
-	static async initialize() {
+	static async initialize(wasm?: WasmInput) {
 		if (LibRaw.modulePromise === undefined) {
-			const mod: Promise<LibRawWasmModule> = initializeLibRawWasm();
+			const mod: Promise<LibRawWasmModule> = initializeLibRawWasm({
+				instantiateWasm: LibRaw.createInstantiateWasm(wasm),
+			});
 			LibRaw.modulePromise = mod;
 			LibRaw.module = await mod;
 		}
 		return await LibRaw.modulePromise;
 	}
+	private static createInstantiateWasm(wasm?: WasmInput) {
+		if (wasm === undefined) return undefined;
+		return async (
+			importObject: WebAssembly.Imports,
+			cb: (instance: WebAssembly.Instance, module: WebAssembly.Module) => void,
+		) => {
+			const wasmResponse = await wasm;
+			const instantiated = await (wasmResponse instanceof Response
+				? WebAssembly.instantiateStreaming(wasmResponse, importObject)
+				: WebAssembly.instantiate(wasmResponse, importObject));
+			cb(instantiated.instance, instantiated.module);
+		};
+	}
 	async waitUntilReady() {
 		await LibRaw.modulePromise;
 	}

tests/wasm.spec.ts

@@ -0,0 +1,21 @@
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { fileURLToPath } from "node:url";
+import { LibRaw } from "libraw.wasm";
+import { expect, it } from "vitest";
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const wasmPath = path.join(
+	__dirname,
+	"node_modules",
+	"libraw.wasm",
+	"dist",
+	"libraw.wasm",
+);
+
+it("specify wasm binary", async () => {
+	const wasm = fs.readFile(wasmPath).then((buf) => new Uint8Array(buf).buffer);
+	await LibRaw.initialize(wasm);
+	expect(LibRaw.version()).toMatchInlineSnapshot(`"0.22.0-Devel202502"`);
+	expect(LibRaw.versionNumber()).toMatchInlineSnapshot("5632");
+});