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

package/dist/fonts.js

@@ -1,5 +1,4 @@
 import { FONT_CACHE_MAP } from "./helpers/cache.js";
-import { logger } from "./helpers/logger.js";
 /** * Base font class defining the structure required by Satori.
  * All font types inherit from this class.
  */
@@ -64,26 +63,22 @@ export const loadGoogleFont = async (family, { text, weight = 400, style = "norm
     }
     const cssResponse = await fetch(cssUrl);
     if (!cssResponse.ok) {
-        logger.error(`Failed to fetch Google Font CSS for ${family}. Status: ${cssResponse.status}`);
         throw new Error(`Failed to fetch Google Font CSS for ${family}. Status: ${cssResponse.status}`);
     }
     const css = await cssResponse.text();
     // 3. Extract the font file URL (the actual TTF/OTF file)
     const fontUrl = css.match(/src: url\((.+)\) format\('(opentype|truetype)'\)/)?.[1];
     if (!fontUrl) {
-        logger.error(`Could not find a compatible truetype font source in the CSS for ${family}.`);
         throw new Error(`Could not find a compatible truetype font source in the CSS for ${family}.`);
     }
     // 4. Fetch the font buffer
     const fontResponse = await fetch(fontUrl);
     if (!fontResponse.ok) {
-        logger.error(`Failed to fetch font file from URL. Status: ${fontResponse.status}`);
         throw new Error(`Failed to fetch font file from URL. Status: ${fontResponse.status}`);
     }
     const buffer = await fontResponse.arrayBuffer();
     // 5. CACHE AND RETURN: Store the resolved ArrayBuffer in the Map, keyed by the CSS URL.
     FONT_CACHE_MAP.set(cssUrl, buffer);
-    logger.debug(`Loaded Google Font: ${family}`);
     return buffer;
 };
 export class GoogleFont extends BaseFont {

package/dist/helpers/create.js

@@ -2,10 +2,11 @@ import { loadDynamicAsset } from "./emoji.js";
 import { default_fonts, DEFAULT_WIDTH } from "../helpers/defaults.js";
 import { useResvg, useSatori } from "../providers/instances.js";
 import { createVNode } from "./toJSX.js";
-import { logger } from "./logger.js";
+import { createLogger } from "./logger.js";
 import { handleAsyncAll, handleAsync, ErrorCodes } from "./error-handler.js";
 export async function createSvg(element, imageOptions, componentOptions) {
-    const [satori, vnodes] = await handleAsyncAll([() => useSatori(), () => Promise.resolve(createVNode(element, componentOptions))], ErrorCodes.SATORI_RENDER_FAILED, "Failed to initialize Satori or create VNode");
+    const log = createLogger(imageOptions.debug ?? false);
+    const [satori, vnodes] = await handleAsyncAll([() => useSatori(imageOptions.debug), () => Promise.resolve(createVNode(element, componentOptions))], ErrorCodes.SATORI_RENDER_FAILED, "Failed to initialize Satori or create VNode");
     const satoriOptions = structuredClone(imageOptions);
     if (!Object.hasOwn(satoriOptions, "fonts")) {
         satoriOptions["fonts"] = await handleAsync(() => default_fonts(), ErrorCodes.FONT_LOAD_FAILED, "Failed to load default fonts for Satori");
@@ -13,23 +14,24 @@ export async function createSvg(element, imageOptions, componentOptions) {
     satoriOptions["loadAdditionalAsset"] = loadDynamicAsset({
         emoji: imageOptions.emoji,
     });
-    logger.debug("Generating SVG with Satori");
-    logger.info("VNode provided to satori:", JSON.stringify(vnodes, null, 2), "\n");
-    logger.info("Options provided to satori:", imageOptions);
+    log.debug("Generating SVG with Satori");
+    log.info("VNode provided to satori:", JSON.stringify(vnodes, null, 2), "\n");
+    log.info("Options provided to satori:", imageOptions);
     return handleAsync(() => satori(vnodes, satoriOptions), ErrorCodes.SATORI_RENDER_FAILED, "Failed to render SVG with Satori");
 }
 export async function createPng(element, imageOptions, componentOptions) {
+    const log = createLogger(imageOptions.debug ?? false);
     const svg = await handleAsync(() => createSvg(element, imageOptions, componentOptions), ErrorCodes.SATORI_RENDER_FAILED, "Failed to create SVG for PNG rendering");
-    logger.debug("SVG generated by satori for ReSVG: \n", svg, "\n");
-    const resvg_instance = await handleAsync(() => useResvg(), ErrorCodes.RESVG_INIT_FAILED, "Failed to initialize ReSVG");
+    log.debug("SVG generated by satori for ReSVG: \n", svg, "\n");
+    const resvg_instance = await handleAsync(() => useResvg(imageOptions.debug), ErrorCodes.RESVG_INIT_FAILED, "Failed to initialize ReSVG");
     const resvg_options = {
         fitTo: {
             mode: "width",
             value: imageOptions.width || DEFAULT_WIDTH,
         },
     };
-    logger.debug("Rendering PNG with ReSVG");
-    logger.info("Options provided to ReSVG:", resvg_options, "\n");
+    log.debug("Rendering PNG with ReSVG");
+    log.info("Options provided to ReSVG:", resvg_options, "\n");
     return handleAsync(async () => {
         const resvg = new resvg_instance(svg, resvg_options);
         const png_data = resvg.render();

package/dist/helpers/error-handler.js

@@ -1,4 +1,3 @@
-import { logger } from "./logger.js";
 export class ImageResponseError extends Error {
     code;
     originalError;
@@ -28,7 +27,6 @@ export async function handleAsync(operation, errorCode, errorMessage) {
     }
     catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));
-        logger.error(`${errorMessage}:`, err.message);
         throw new ImageResponseError(errorMessage, errorCode, err);
     }
 }
@@ -41,7 +39,6 @@ export function handleSync(operation, errorCode, errorMessage) {
     }
     catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));
-        logger.error(`${errorMessage}:`, err.message);
         throw new ImageResponseError(errorMessage, errorCode, err);
     }
 }
@@ -54,7 +51,6 @@ export async function handleAsyncAll(operations, errorCode, errorMessage) {
     }
     catch (error) {
         const err = error instanceof Error ? error : new Error(String(error));
-        logger.error(`${errorMessage}:`, err.message);
         throw new ImageResponseError(errorMessage, errorCode, err);
     }
 }
@@ -63,7 +59,6 @@ export async function handleAsyncAll(operations, errorCode, errorMessage) {
  */
 export async function validateResponse(response, errorCode, errorMessage) {
     if (!response.ok) {
-        logger.error(`${errorMessage}: HTTP ${response.status} ${response.statusText}`);
         throw new ImageResponseError(`${errorMessage} (HTTP ${response.status})`, errorCode);
     }
     const buffer = await response.arrayBuffer();

package/dist/helpers/logger.d.ts

@@ -1,13 +1,5 @@
-/**
- * Set the debug flag for the current request context
- * Call this once at the beginning of your request handler
- */
-export declare function setDebug(enabled: boolean): void;
-/**
- * Get the current debug flag from the request context
- */
-export declare function isDebugEnabled(): boolean;
-export declare const logger: {
+export type Logger = ReturnType<typeof createLogger>;
+export declare function createLogger(debug: boolean): {
     debug: (message: string, ...args: unknown[]) => void;
     info: (message: string, ...args: unknown[]) => void;
     warn: (message: string, ...args: unknown[]) => void;

package/dist/helpers/logger.js

@@ -1,39 +1,21 @@
-import { AsyncLocalStorage } from 'node:async_hooks';
 const PREFIX = '[SvelteKit-OG]';
-// Store for request-scoped debug flag
-const debugStorage = new AsyncLocalStorage();
-/**
- * Set the debug flag for the current request context
- * Call this once at the beginning of your request handler
- */
-export function setDebug(enabled) {
-    debugStorage.enterWith(enabled);
-}
-/**
- * Get the current debug flag from the request context
- */
-export function isDebugEnabled() {
-    return debugStorage.getStore() ?? false;
-}
-export const logger = {
-    debug: (message, ...args) => {
-        if (isDebugEnabled()) {
-            console.log(`${PREFIX} 🔍 ${message}`, ...args);
-        }
-    },
-    info: (message, ...args) => {
-        if (isDebugEnabled()) {
-            console.info(`${PREFIX} ℹ️ ${message}`, ...args);
+export function createLogger(debug) {
+    return {
+        debug: (message, ...args) => {
+            if (debug)
+                console.log(`${PREFIX} 🔍 ${message}`, ...args);
+        },
+        info: (message, ...args) => {
+            if (debug)
+                console.info(`${PREFIX} ℹ️ ${message}`, ...args);
+        },
+        warn: (message, ...args) => {
+            if (debug)
+                console.warn(`${PREFIX} ⚠️ ${message}`, ...args);
+        },
+        error: (message, ...args) => {
+            if (debug)
+                console.error(`${PREFIX} ❌ ${message}`, ...args);
         }
-    },
-    warn: (message, ...args) => {
-        if (isDebugEnabled()) {
-            console.warn(`${PREFIX} ⚠️ ${message}`, ...args);
-        }
-    },
-    error: (message, ...args) => {
-        if (isDebugEnabled()) {
-            console.error(`${PREFIX} ❌ ${message}`, ...args);
-        }
-    }
-};
+    };
+}

package/dist/image-response.js

@@ -1,13 +1,14 @@
 import { DEFAULT_OPTIONS, DEFAULT_STATUS_CODE, DEFAULT_STATUS_TEXT } from "./helpers/defaults.js";
 import { createPng, createSvg } from "./helpers/create.js";
-import { isDebugEnabled, logger, setDebug } from "./helpers/logger.js";
+import { createLogger } from "./helpers/logger.js";
 import { handleAsync, ImageResponseError, ErrorCodes } from "./helpers/error-handler.js";
 import { formatBytes } from "./helpers/utils.js";
 export class ImageResponse extends Response {
     constructor(element, options, props) {
         const extended_options = Object.assign({ ...DEFAULT_OPTIONS }, options);
-        setDebug(extended_options.debug ?? false);
-        logger.debug("Debug mode", isDebugEnabled());
+        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) {
@@ -15,8 +16,8 @@ export class ImageResponse extends Response {
                     const buffer = (await handleAsync(() => create_image_function(element, extended_options, {
                         props,
                     }), ErrorCodes.UNKNOWN_ERROR, `Failed to generate ${extended_options.format?.toUpperCase()}`));
-                    logger.debug(buffer.length.toLocaleString());
-                    logger.info(`Generated ${extended_options.format.toUpperCase()}: ${formatBytes(buffer.length)}`);
+                    log.debug(buffer.length.toLocaleString());
+                    log.info(`Generated ${extended_options.format.toUpperCase()}: ${formatBytes(buffer.length)}`);
                     controller.enqueue(buffer);
                     controller.close();
                 }
@@ -24,7 +25,7 @@ export class ImageResponse extends Response {
                     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)));
-                    logger.error("Failed to create image response:", err.message);
+                    log.error("Failed to create image response:", err.message);
                     controller.error(err);
                 }
             },

package/dist/providers/instances.d.ts

@@ -1,5 +1,5 @@
 import type _satori from "satori";
-export declare function useResvg(): Promise<new (svg: Uint8Array | string, options?: import("@resvg/resvg-wasm").ResvgRenderOptions) => {
+export declare function useResvg(debug?: boolean): Promise<new (svg: Uint8Array | string, options?: import("@resvg/resvg-wasm").ResvgRenderOptions) => {
     free(): void;
     render(): {
         free(): void;
@@ -35,4 +35,4 @@ export declare function useResvg(): Promise<new (svg: Uint8Array | string, optio
     readonly height: number;
     readonly width: number;
 }>;
-export declare function useSatori(): Promise<typeof _satori>;
+export declare function useSatori(debug?: boolean): Promise<typeof _satori>;

package/dist/providers/instances.js

@@ -1,5 +1,5 @@
 import { isEdgeLight, isWorkerd } from "std-env";
-import { logger } from "../helpers/logger.js";
+import { createLogger } from "../helpers/logger.js";
 import { handleAsync, ErrorCodes } from "../helpers/error-handler.js";
 // we keep instances alive to avoid re-importing them on every request, maybe not needed but
 // also helps with type inference
@@ -10,13 +10,14 @@ const resvgInstance = {
 const satoriInstance = {
     instance: undefined,
 };
-export async function useResvg() {
+export async function useResvg(debug = false) {
+    const log = createLogger(debug);
     if (resvgInstance.instance) {
         return resvgInstance.instance.Resvg;
     }
-    logger.debug("Initializing Resvg WASM");
+    log.debug("Initializing Resvg WASM");
     const isWorkerLikeRuntime = isEdgeLight || isWorkerd;
-    logger.info(`Detected runtime: ${isWorkerLikeRuntime ? "Edge Light or Workerd" : "Node.js"}`);
+    log.info(`Detected runtime: ${isWorkerLikeRuntime ? "Edge Light or Workerd" : "Node.js"}`);
     const moduleImport = await handleAsync(async () => {
         if (isWorkerLikeRuntime) {
             return import("./resvg/edge.js");
@@ -30,11 +31,12 @@ export async function useResvg() {
     await handleAsync(async () => resvgInstance.instance.initWasmPromise, ErrorCodes.RESVG_INIT_FAILED, "Failed to initialize ReSVG WASM");
     return resvgInstance.instance.Resvg;
 }
-export async function useSatori() {
+export async function useSatori(debug = false) {
+    const log = createLogger(debug);
     if (satoriInstance.instance) {
         return satoriInstance.instance.satori;
     }
-    logger.debug("Initializing Satori WASM");
+    log.debug("Initializing Satori WASM");
     satoriInstance.instance = await handleAsync(async () => {
         const mod = await import("./satori/node.js");
         return mod.default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ethercorps/sveltekit-og",
-  "version": "4.3.0-next.2",
+  "version": "4.3.0-next.4",
   "license": "MIT",
   "homepage": "https://sveltekit-og.dev",
   "repository": "github:ethercorps/sveltekit-og",