@ethercorps/sveltekit-og 4.3.0-next.4 → 4.3.0-next.6

package/dist/helpers/utils.d.ts

@@ -1 +1,2 @@
 export declare const formatBytes: (bytes: number, decimals?: number) => string;
+export declare function importWasm(input: any): Promise<any>;

package/dist/helpers/utils.js

@@ -1,9 +1,25 @@
-const sizeFormats = ['Bytes', 'KB', 'MB', 'GB'];
+const sizeFormats = ["Bytes", "KB", "MB", "GB"];
 const kbSize = 1024;
 export const formatBytes = (bytes, decimals = 2) => {
     if (bytes === 0)
-        return '0 Bytes';
+        return "0 Bytes";
     const decimalPoint = decimals < 0 ? 0 : decimals;
     const sizeIndex = Math.min(Math.floor(Math.log(bytes) / Math.log(kbSize)), 3);
-    return parseFloat((bytes / Math.pow(kbSize, sizeIndex)).toFixed(decimalPoint)) + ' ' + sizeFormats[sizeIndex];
+    return (parseFloat((bytes / Math.pow(kbSize, sizeIndex)).toFixed(decimalPoint)) +
+        " " +
+        sizeFormats[sizeIndex]);
 };
+export async function importWasm(input) {
+    // may be a nested await for some reason
+    const _input = await input;
+    const _module = _input.default || _input;
+    // this is from rollup/wasm, it does some magic we need to recover from
+    if (typeof _module === "function") {
+        // empty input is to avoid instantiating the wasm module
+        // this will just compile it
+        const fnRes = await _module();
+        const _instance = fnRes.instance || fnRes;
+        return _instance.exports || _instance || _module;
+    }
+    return _module;
+}

package/dist/image-response.js

@@ -6,28 +6,14 @@ import { formatBytes } from "./helpers/utils.js";
 export class ImageResponse extends Response {
     constructor(element, options, props) {
         const extended_options = Object.assign({ ...DEFAULT_OPTIONS }, options);
-        const isDebug = extended_options.debug ?? false;
-        const log = createLogger(isDebug);
-        log.debug("ImageResponse created");
         const create_image_function = extended_options.format === "png" ? createPng : createSvg;
         const body = new ReadableStream({
             async start(controller) {
-                try {
-                    const buffer = (await handleAsync(() => create_image_function(element, extended_options, {
-                        props,
-                    }), ErrorCodes.UNKNOWN_ERROR, `Failed to generate ${extended_options.format?.toUpperCase()}`));
-                    log.debug(buffer.length.toLocaleString());
-                    log.info(`Generated ${extended_options.format.toUpperCase()}: ${formatBytes(buffer.length)}`);
-                    controller.enqueue(buffer);
-                    controller.close();
-                }
-                catch (error) {
-                    const err = error instanceof ImageResponseError
-                        ? error
-                        : new ImageResponseError(error instanceof Error ? error.message : String(error), ErrorCodes.UNKNOWN_ERROR, error instanceof Error ? error : new Error(String(error)));
-                    log.error("Failed to create image response:", err.message);
-                    controller.error(err);
-                }
+                const buffer = await create_image_function(element, extended_options, {
+                    props,
+                });
+                controller.enqueue(buffer);
+                controller.close();
             },
         });
         super(body, {

package/dist/providers/instances.js

@@ -15,20 +15,17 @@ export async function useResvg(debug = false) {
     if (resvgInstance.instance) {
         return resvgInstance.instance.Resvg;
     }
-    log.debug("Initializing Resvg WASM");
+    log.debug("Initializing ReSVG WASM");
     const isWorkerLikeRuntime = isEdgeLight || isWorkerd;
     log.info(`Detected runtime: ${isWorkerLikeRuntime ? "Edge Light or Workerd" : "Node.js"}`);
-    const moduleImport = await handleAsync(async () => {
-        if (isWorkerLikeRuntime) {
-            return import("./resvg/edge.js");
-        }
-        return import("./resvg/node.js");
-    }, ErrorCodes.RESVG_INIT_FAILED, "Failed to import ReSVG module");
-    resvgInstance.instance = await handleAsync(async () => {
-        const mod = await moduleImport;
-        return mod.default;
-    }, ErrorCodes.RESVG_INIT_FAILED, "Failed to load ReSVG default export");
-    await handleAsync(async () => resvgInstance.instance.initWasmPromise, ErrorCodes.RESVG_INIT_FAILED, "Failed to initialize ReSVG WASM");
+    // Keep both dynamic imports as direct expressions so the bundler (unwasm/Rollup)
+    // can statically analyse them and emit the `?module` wasm chunk correctly.
+    // Burying these inside nested async callbacks breaks wasm bundling on Cloudflare.
+    const moduleImport = isWorkerLikeRuntime
+        ? import("./resvg/edge.js")
+        : import("./resvg/node.js");
+    resvgInstance.instance = await handleAsync(() => moduleImport.then((m) => m.default), ErrorCodes.RESVG_INIT_FAILED, "Failed to import ReSVG module");
+    await handleAsync(() => resvgInstance.instance.initWasmPromise, ErrorCodes.RESVG_INIT_FAILED, "Failed to initialize ReSVG WASM");
     return resvgInstance.instance.Resvg;
 }
 export async function useSatori(debug = false) {
@@ -36,11 +33,13 @@ export async function useSatori(debug = false) {
     if (satoriInstance.instance) {
         return satoriInstance.instance.satori;
     }
-    log.debug("Initializing Satori WASM");
-    satoriInstance.instance = await handleAsync(async () => {
-        const mod = await import("./satori/node.js");
-        return mod.default;
-    }, ErrorCodes.SATORI_INIT_FAILED, "Failed to load Satori module");
-    await handleAsync(async () => satoriInstance.instance.initWasmPromise, ErrorCodes.SATORI_INIT_FAILED, "Failed to initialize Satori WASM");
+    log.debug("Initializing Satori");
+    const isWorkerLikeRuntime = isEdgeLight || isWorkerd;
+    log.info(`Detected runtime: ${isWorkerLikeRuntime ? "Edge Light or Workerd" : "Node.js"}`);
+    const moduleImport = isWorkerLikeRuntime
+        ? import("./satori/edge.js")
+        : import("./satori/node.js");
+    satoriInstance.instance = await handleAsync(() => moduleImport.then((m) => m.default), ErrorCodes.SATORI_INIT_FAILED, "Failed to import Satori module");
+    await handleAsync(() => satoriInstance.instance.initWasmPromise, ErrorCodes.SATORI_INIT_FAILED, "Failed to initialize Satori WASM");
     return satoriInstance.instance.satori;
 }

package/dist/providers/resvg/edge.js

@@ -3,9 +3,6 @@ import { Resvg as _Resvg, initWasm } from "@resvg/resvg-wasm";
 export default {
 	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
 	// @ts-ignore
-	initWasmPromise: initWasm(
-		// @ts-ignore
-		import("@resvg/resvg-wasm/index_bg.wasm?module").then((r) => r.default || r)
-	),
+	initWasmPromise: initWasm(import("./resvg.wasm?module").then((r) => r.default || r)),
 	Resvg: _Resvg,
 };

package/dist/providers/satori/edge.d.ts

@@ -0,0 +1,6 @@
+declare namespace _default {
+    export let initWasmPromise: Promise<void>;
+    export { _satori as satori };
+}
+export default _default;
+import _satori from "satori/standalone";

package/dist/providers/satori/edge.js

@@ -0,0 +1,16 @@
+import _satori, { init } from "satori/standalone";
+
+// On worker-like runtimes (Cloudflare Workers, Edge) the default `satori` entry
+// fails: it bundles yoga's layout wasm as base64 and compiles it at runtime,
+// which Workers block ("Wasm code generation disallowed by embedder").
+//
+// `satori/standalone` exposes `init()` so we can hand it a pre-compiled
+// WebAssembly.Module instead. Importing the vendored yoga.wasm with `?module`
+// makes the consumer bundler emit a real CompiledWasm module, so no runtime
+// byte compilation happens. Mirrors providers/resvg/edge.js.
+export default {
+	// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+	// @ts-ignore
+	initWasmPromise: init(import("./yoga.wasm?module").then((r) => r.default || r)),
+	satori: _satori,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethercorps/sveltekit-og",
-  "version": "4.3.0-next.4",
+  "version": "4.3.0-next.6",
   "license": "MIT",
   "homepage": "https://sveltekit-og.dev",
   "repository": "github:ethercorps/sveltekit-og",
@@ -91,7 +91,7 @@
     "@resvg/resvg-wasm": "^2.6.2",
     "satori": "^0.25.0",
     "satori-html": "0.3.2",
-    "std-env": "^3.10.0",
+    "std-env": "^4.1.0",
     "unwasm": "^0.5.3"
   },
   "peerDependencies": {