nuxt-og-image 6.7.5 → 6.7.6

package/dist/chunks/tw4.cjs

@@ -4,17 +4,17 @@ const promises = require('node:fs/promises');
 const node_url = require('node:url');
 const exsolve = require('exsolve');
 const pathe = require('pathe');
-const module$1 = require('../shared/nuxt-og-image.Cctpuv4O.cjs');
+const module$1 = require('../shared/nuxt-og-image.CdpC3njh.cjs');
 require('node:crypto');
 require('node:fs');
 require('@nuxt/kit');
 require('defu');
 require('fnv1a-64');
 require('nuxt-site-config/kit');
+require('nuxtseo-shared/kit');
 require('pkg-types');
 require('std-env');
 require('oxc-walker');
-require('nuxtseo-shared/kit');
 require('../../dist/runtime/logger.js');
 require('chrome-launcher');
 require('nypm');

package/dist/chunks/tw4.mjs

@@ -2,17 +2,17 @@ import { readFile } from 'node:fs/promises';
 import { pathToFileURL } from 'node:url';
 import { resolveModulePath } from 'exsolve';
 import { dirname, join } from 'pathe';
-import { e as extractVariantBaseClasses, r as resolveVariantPrefixes, h as resolveExtractedVars, i as resolveVarsDeep, s as simplifyCss, p as postProcessStyles, l as loadLightningCss, a as extractCssVars, c as extractUniversalVars, d as extractPerClassVars, g as extractVarsFromCss, f as extractClassStyles } from '../shared/nuxt-og-image.D3mV8OQ9.mjs';
+import { e as extractVariantBaseClasses, r as resolveVariantPrefixes, h as resolveExtractedVars, l as resolveVarsDeep, s as simplifyCss, p as postProcessStyles, m as loadLightningCss, a as extractCssVars, c as extractUniversalVars, d as extractPerClassVars, g as extractVarsFromCss, f as extractClassStyles } from '../shared/nuxt-og-image.BIbfn5xQ.mjs';
 import 'node:crypto';
 import 'node:fs';
 import '@nuxt/kit';
 import 'defu';
 import 'fnv1a-64';
 import 'nuxt-site-config/kit';
+import 'nuxtseo-shared/kit';
 import 'pkg-types';
 import 'std-env';
 import 'oxc-walker';
-import 'nuxtseo-shared/kit';
 import '../../dist/runtime/logger.js';
 import 'chrome-launcher';
 import 'nypm';

package/dist/chunks/uno.cjs

@@ -3,18 +3,18 @@
 const promises = require('node:fs/promises');
 const defu = require('defu');
 const logger_js = require('../../dist/runtime/logger.js');
-const module$1 = require('../shared/nuxt-og-image.Cctpuv4O.cjs');
+const module$1 = require('../shared/nuxt-og-image.CdpC3njh.cjs');
 require('node:crypto');
 require('node:fs');
 require('node:url');
 require('@nuxt/kit');
 require('fnv1a-64');
 require('nuxt-site-config/kit');
+require('nuxtseo-shared/kit');
 require('pathe');
 require('pkg-types');
 require('std-env');
 require('oxc-walker');
-require('nuxtseo-shared/kit');
 require('chrome-launcher');
 require('nypm');
 require('nuxtseo-shared/devtools');
@@ -42,6 +42,8 @@ const RE_HEIGHT_ATTR = /\bheight=['"](\d+)['"]/;
 const RE_SVG_BODY = /<svg[^>]*>([\s\S]*)<\/svg>/;
 let unoConfig = null;
 let rootDir = null;
+let unocssCorePath;
+let unocssConfigPath;
 let generator = null;
 let pendingGenerator = null;
 let cachedExtracted = null;
@@ -60,6 +62,15 @@ function clearUnoCache() {
   pendingGenerator = null;
   cachedExtracted = null;
 }
+function setUnoModulePaths(options) {
+  const nextCorePath = options?.unocssCorePath;
+  const nextConfigPath = options?.unocssConfigPath;
+  if (nextCorePath === unocssCorePath && nextConfigPath === unocssConfigPath)
+    return;
+  unocssCorePath = nextCorePath;
+  unocssConfigPath = nextConfigPath;
+  clearUnoCache();
+}
 async function getGenerator() {
   if (generator)
     return generator;
@@ -68,17 +79,18 @@ async function getGenerator() {
   pendingGenerator = (async () => {
     let loadedConfig;
     try {
-      const { loadConfig } = await import('@unocss/config');
+      const { loadConfig } = await module$1.importOptionalPeer("@unocss/config", unocssConfigPath, "UnoCSS class extraction with OG images");
       const result = await loadConfig(rootDir || process.cwd());
       loadedConfig = result.config;
     } catch (e) {
-      logger_js.logger.warn("[og-image UnoCSS] Failed to load uno.config.ts:", e.message);
+      if (!unoConfig)
+        logger_js.logger.warn("[og-image UnoCSS] Failed to load uno.config.ts:", e.message);
     }
     const finalConfig = loadedConfig ? defu.defu(unoConfig || {}, loadedConfig) : unoConfig;
     if (!finalConfig) {
       throw new Error("UnoCSS config not found. Ensure uno.config.ts exists or @unocss/nuxt is loaded.");
     }
-    const { createGenerator } = await import('@unocss/core');
+    const { createGenerator } = await module$1.importOptionalPeer("@unocss/core", unocssCorePath, "UnoCSS class extraction with OG images");
     generator = await createGenerator(finalConfig);
     return generator;
   })();
@@ -116,6 +128,7 @@ function resolveUserVars(extracted, rootAttrs) {
   return module$1.resolveExtractedVars(extracted, rootAttrs);
 }
 function createUnoProvider(options) {
+  setUnoModulePaths(options);
   return {
     name: "unocss",
     async resolveClassesToStyles(classes, context, rootAttrs) {
@@ -227,6 +240,8 @@ function createUnoProvider(options) {
   };
 }
 
+exports.importResolvedModule = module$1.importResolvedModule;
+exports.resolveOptionalModulePath = module$1.resolveOptionalModulePath;
 exports.clearUnoCache = clearUnoCache;
 exports.clearUnoUserVarsCache = clearUnoUserVarsCache;
 exports.createUnoProvider = createUnoProvider;

package/dist/chunks/uno.mjs

@@ -1,18 +1,19 @@
 import { readFile } from 'node:fs/promises';
 import { defu } from 'defu';
 import { logger } from '../../dist/runtime/logger.js';
-import { e as extractVariantBaseClasses, s as simplifyCss, a as extractCssVars, b as extractPropertyInitialValues, c as extractUniversalVars, d as extractPerClassVars, f as extractClassStyles, p as postProcessStyles, r as resolveVariantPrefixes, g as extractVarsFromCss, h as resolveExtractedVars } from '../shared/nuxt-og-image.D3mV8OQ9.mjs';
+import { e as extractVariantBaseClasses, s as simplifyCss, a as extractCssVars, b as extractPropertyInitialValues, c as extractUniversalVars, d as extractPerClassVars, f as extractClassStyles, p as postProcessStyles, r as resolveVariantPrefixes, i as importOptionalPeer, g as extractVarsFromCss, h as resolveExtractedVars } from '../shared/nuxt-og-image.BIbfn5xQ.mjs';
+export { j as importResolvedModule, k as resolveOptionalModulePath } from '../shared/nuxt-og-image.BIbfn5xQ.mjs';
 import 'node:crypto';
 import 'node:fs';
 import 'node:url';
 import '@nuxt/kit';
 import 'fnv1a-64';
 import 'nuxt-site-config/kit';
+import 'nuxtseo-shared/kit';
 import 'pathe';
 import 'pkg-types';
 import 'std-env';
 import 'oxc-walker';
-import 'nuxtseo-shared/kit';
 import 'chrome-launcher';
 import 'nypm';
 import 'nuxtseo-shared/devtools';
@@ -40,6 +41,8 @@ const RE_HEIGHT_ATTR = /\bheight=['"](\d+)['"]/;
 const RE_SVG_BODY = /<svg[^>]*>([\s\S]*)<\/svg>/;
 let unoConfig = null;
 let rootDir = null;
+let unocssCorePath;
+let unocssConfigPath;
 let generator = null;
 let pendingGenerator = null;
 let cachedExtracted = null;
@@ -58,6 +61,15 @@ function clearUnoCache() {
   pendingGenerator = null;
   cachedExtracted = null;
 }
+function setUnoModulePaths(options) {
+  const nextCorePath = options?.unocssCorePath;
+  const nextConfigPath = options?.unocssConfigPath;
+  if (nextCorePath === unocssCorePath && nextConfigPath === unocssConfigPath)
+    return;
+  unocssCorePath = nextCorePath;
+  unocssConfigPath = nextConfigPath;
+  clearUnoCache();
+}
 async function getGenerator() {
   if (generator)
     return generator;
@@ -66,17 +78,18 @@ async function getGenerator() {
   pendingGenerator = (async () => {
     let loadedConfig;
     try {
-      const { loadConfig } = await import('@unocss/config');
+      const { loadConfig } = await importOptionalPeer("@unocss/config", unocssConfigPath, "UnoCSS class extraction with OG images");
       const result = await loadConfig(rootDir || process.cwd());
       loadedConfig = result.config;
     } catch (e) {
-      logger.warn("[og-image UnoCSS] Failed to load uno.config.ts:", e.message);
+      if (!unoConfig)
+        logger.warn("[og-image UnoCSS] Failed to load uno.config.ts:", e.message);
     }
     const finalConfig = loadedConfig ? defu(unoConfig || {}, loadedConfig) : unoConfig;
     if (!finalConfig) {
       throw new Error("UnoCSS config not found. Ensure uno.config.ts exists or @unocss/nuxt is loaded.");
     }
-    const { createGenerator } = await import('@unocss/core');
+    const { createGenerator } = await importOptionalPeer("@unocss/core", unocssCorePath, "UnoCSS class extraction with OG images");
     generator = await createGenerator(finalConfig);
     return generator;
   })();
@@ -114,6 +127,7 @@ function resolveUserVars(extracted, rootAttrs) {
   return resolveExtractedVars(extracted, rootAttrs);
 }
 function createUnoProvider(options) {
+  setUnoModulePaths(options);
   return {
     name: "unocss",
     async resolveClassesToStyles(classes, context, rootAttrs) {

package/dist/module.cjs

@@ -8,11 +8,11 @@ require('@nuxt/kit');
 require('defu');
 require('fnv1a-64');
 require('nuxt-site-config/kit');
+require('nuxtseo-shared/kit');
 require('pathe');
 require('pkg-types');
 require('std-env');
-const module$1 = require('./shared/nuxt-og-image.Cctpuv4O.cjs');
-require('nuxtseo-shared/kit');
+const module$1 = require('./shared/nuxt-og-image.CdpC3njh.cjs');
 require('../dist/runtime/logger.js');
 require('oxc-walker');
 require('chrome-launcher');

package/dist/module.json

@@ -4,7 +4,7 @@
     "nuxt": ">=3.16.0"
   },
   "configKey": "ogImage",
-  "version": "6.7.5",
+  "version": "6.7.6",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -6,11 +6,11 @@ import '@nuxt/kit';
 import 'defu';
 import 'fnv1a-64';
 import 'nuxt-site-config/kit';
+import 'nuxtseo-shared/kit';
 import 'pathe';
 import 'pkg-types';
 import 'std-env';
-export { m as default } from './shared/nuxt-og-image.D3mV8OQ9.mjs';
-import 'nuxtseo-shared/kit';
+export { n as default } from './shared/nuxt-og-image.BIbfn5xQ.mjs';
 import '../dist/runtime/logger.js';
 import 'oxc-walker';
 import 'chrome-launcher';

package/dist/runtime/app/utils/plugins.js

@@ -1,7 +1,7 @@
 import { TemplateParamsPlugin } from "@unhead/vue/plugins";
 import { defu } from "defu";
-import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
-import { parseURL, withoutBase } from "ufo";
+import { createNitroRouteRuleMatcher } from "nuxtseo-shared/server";
+import { parseURL } from "ufo";
 import { toValue } from "vue";
 import { defineNuxtPlugin, useRequestEvent } from "#app";
 import { withSiteUrl } from "#site-config/app/composables";
@@ -60,14 +60,8 @@ export const routeRuleOgImage = defineNuxtPlugin((nuxtApp) => {
     const path = parseURL(e?.path || "").pathname;
     if (isInternalRoute(path))
       return;
-    const _routeRulesMatcher = toRouteMatcher(
-      createRadixRouter({ routes: ssrContext?.runtimeConfig?.nitro?.routeRules })
-    );
-    const matchedRules = _routeRulesMatcher.matchAll(
-      withoutBase(path.split("?")?.[0] || "", ssrContext?.runtimeConfig?.app.baseURL || "")
-    ).reverse();
-    const combinedRules = defu({}, ...matchedRules);
-    let routeRules = combinedRules?.ogImage;
+    const matchRouteRules = createNitroRouteRuleMatcher(ssrContext?.runtimeConfig || {});
+    let routeRules = matchRouteRules(path).ogImage;
     if (typeof routeRules === "undefined")
       return;
     if (routeRules === false) {

package/dist/runtime/server/og-image/bindings/browser/chrome-launcher.d.ts

@@ -1,3 +1,3 @@
-import type { H3Event } from 'h3';
 import type { Browser } from 'playwright-core';
+import type { H3Event } from '#nuxtseo/h3';
 export declare function createBrowser(_event?: H3Event): Promise<Browser | void>;

package/dist/runtime/server/og-image/bindings/browser/cloudflare.d.ts

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 interface Browser {
     connected: boolean;
     newPage: () => Promise<any>;

package/dist/runtime/server/og-image/bindings/browser/on-demand.d.ts

@@ -1,3 +1,3 @@
-import type { H3Event } from 'h3';
 import type { Browser } from 'playwright-core';
+import type { H3Event } from '#nuxtseo/h3';
 export declare function createBrowser(_event?: H3Event): Promise<Browser | void>;

package/dist/runtime/server/og-image/bindings/browser/playwright.d.ts

@@ -1,3 +1,3 @@
-import type { H3Event } from 'h3';
 import type { Browser } from 'playwright-core';
+import type { H3Event } from '#nuxtseo/h3';
 export declare function createBrowser(_event?: H3Event): Promise<Browser | void>;

package/dist/runtime/server/og-image/bindings/font-assets/cloudflare.d.ts

@@ -1,3 +1,3 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 import type { FontConfig } from '../../../../types.js';
 export declare function resolve(event: H3Event, font: FontConfig): Promise<Buffer<ArrayBufferLike>>;

package/dist/runtime/server/og-image/bindings/font-assets/cloudflare.js

@@ -1,5 +1,5 @@
-import { useRuntimeConfig } from "nitropack/runtime";
 import { withBase } from "ufo";
+import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { getSiteConfig } from "#site-config/server/composables";
 import { getCloudflareAssets } from "../../../util/cloudflareAssets.js";
 import { fetchLocalAsset } from "../../../util/fetchLocalAsset.js";

package/dist/runtime/server/og-image/bindings/font-assets/dev-prerender.d.ts

@@ -1,3 +1,3 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 import type { FontConfig } from '../../../../types.js';
 export declare function resolve(event: H3Event, font: FontConfig): Promise<Buffer>;

package/dist/runtime/server/og-image/bindings/font-assets/dev-prerender.js

@@ -1,8 +1,8 @@
 import { readFile } from "node:fs/promises";
-import { getRequestURL } from "h3";
-import { useRuntimeConfig } from "nitropack/runtime";
 import { join } from "pathe";
 import { withBase } from "ufo";
+import { getRequestURL } from "#nuxtseo/h3";
+import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { buildDir, rootDir } from "#og-image-virtual/build-dir.mjs";
 import { getSiteConfig } from "#site-config/server/composables";
 import { getFetchTimeout } from "../../../util/fetchTimeout.js";

package/dist/runtime/server/og-image/bindings/font-assets/node.d.ts

@@ -1,3 +1,3 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 import type { FontConfig } from '../../../../types.js';
 export declare function resolve(event: H3Event, font: FontConfig): Promise<Buffer<ArrayBufferLike>>;

package/dist/runtime/server/og-image/bindings/font-assets/node.js

@@ -1,5 +1,5 @@
-import { useRuntimeConfig } from "nitropack/runtime";
 import { withBase } from "ufo";
+import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { getNitroOrigin, getSiteConfig } from "#site-config/server/composables";
 import { getFetchTimeout } from "../../../util/fetchTimeout.js";
 import { fetchWithRedirectValidation } from "../../../util/ssrf.js";

package/dist/runtime/server/og-image/bindings/resvg/node-dev.js

@@ -1,4 +1,5 @@
 import { Worker } from "node:worker_threads";
+import { createWorkerQueue, parseWorkerTimeout } from "../worker-queue.js";
 const workerCode = `
 const { createRequire } = require('node:module')
 const _require = createRequire(process.cwd() + '/')
@@ -12,78 +13,31 @@ parentPort.on('message', ({ id, svg, options }) => {
     // Always slice to create a standard ArrayBuffer \u2014 native addon buffers
     // use external memory that can't be transferred via postMessage
     const ab = png.buffer.slice(png.byteOffset, png.byteOffset + png.byteLength)
-    parentPort.postMessage({ id, png: ab }, [ab])
+    parentPort.postMessage({ _tag: 'response', id, payload: { _tag: 'success', png: ab } }, [ab])
   } catch (err) {
-    parentPort.postMessage({ id, error: err?.message || String(err) })
+    parentPort.postMessage({ _tag: 'response', id, payload: { _tag: 'failure', error: err?.message || String(err) } })
   }
 })
+parentPort.postMessage({ _tag: 'ready' })
 `;
-let worker = null;
-let requestId = 0;
-const pending = /* @__PURE__ */ new Map();
-function killWorker() {
-  if (!worker)
-    return;
-  worker.terminate();
-  worker = null;
-  for (const [id, p] of pending) {
-    clearTimeout(p.timer);
-    pending.delete(id);
-    p.reject(new Error("Resvg worker terminated"));
-  }
+const workerTimeout = parseWorkerTimeout(process.env.NUXT_OG_IMAGE_WORKER_TIMEOUT);
+const workerQueue = createWorkerQueue({
+  createWorker: () => new Worker(workerCode, { eval: true }),
+  executionTimeout: workerTimeout,
+  startupTimeout: workerTimeout,
+  label: "resvg"
+});
+function renderPng(svg, options) {
+  return workerQueue.enqueue(({ id }) => ({ id, svg, options })).then((result) => {
+    if (result._tag === "failure")
+      throw new Error(result.error);
+    return Buffer.from(result.png);
+  });
 }
 const signalKey = Symbol.for("og-image:resvg-worker-cleanup");
 if (!globalThis[signalKey]) {
   globalThis[signalKey] = true;
-  process.on("exit", killWorker);
-}
-function createWorker() {
-  const w = new Worker(workerCode, { eval: true });
-  w.on("message", ({ id, png, error }) => {
-    const p = pending.get(id);
-    if (p) {
-      clearTimeout(p.timer);
-      pending.delete(id);
-      if (error)
-        p.reject(new Error(error));
-      else
-        p.resolve(Buffer.from(png));
-    }
-  });
-  w.on("error", (err) => {
-    for (const [id, p] of pending) {
-      clearTimeout(p.timer);
-      pending.delete(id);
-      p.reject(err);
-    }
-    worker = null;
-  });
-  w.on("exit", (code) => {
-    if (code !== 0) {
-      for (const [id, p] of pending) {
-        clearTimeout(p.timer);
-        pending.delete(id);
-        p.reject(new Error(`Resvg worker exited with code ${code}`));
-      }
-    }
-    worker = null;
-  });
-  w.unref();
-  return w;
-}
-function renderPng(svg, options) {
-  return new Promise((resolve, reject) => {
-    if (!worker)
-      worker = createWorker();
-    const id = ++requestId;
-    const timer = setTimeout(() => {
-      pending.delete(id);
-      reject(new Error("resvg worker timed out \u2014 killing worker"));
-      killWorker();
-    }, 3e4);
-    pending.set(id, { resolve, reject, timer });
-    worker.postMessage({ id, svg, options });
-  });
+  process.on("exit", workerQueue.shutdown);
 }
 class ResvgWorkerProxy {
   svg;

package/dist/runtime/server/og-image/bindings/takumi/node-dev.js

@@ -1,4 +1,5 @@
 import { Worker } from "node:worker_threads";
+import { createWorkerQueue, parseWorkerTimeout } from "../worker-queue.js";
 import { extractResourceUrls as extractTakumiResourceUrls } from "./resource-urls.js";
 const workerCode = `
 const { createRequire } = require('node:module')
@@ -30,85 +31,24 @@ parentPort.on('message', async ({ id, type, newFonts, nodes, options }) => {
     // Always slice to create a standard ArrayBuffer \u2014 native addon buffers
     // use external memory that can't be transferred via postMessage
     const ab = image.buffer.slice(image.byteOffset, image.byteOffset + image.byteLength)
-    parentPort.postMessage({ id, image: ab, fontWarnings }, [ab])
+    parentPort.postMessage({ _tag: 'response', id, payload: { _tag: 'success', image: ab, fontWarnings } }, [ab])
   } catch (err) {
-    parentPort.postMessage({ id, error: err?.message || String(err) })
+    parentPort.postMessage({ _tag: 'response', id, payload: { _tag: 'failure', error: err?.message || String(err) } })
   }
 })
+parentPort.postMessage({ _tag: 'ready' })
 `;
-let worker = null;
-let workerGeneration = 0;
-let requestId = 0;
-const pending = /* @__PURE__ */ new Map();
-function killWorker() {
-  if (!worker)
-    return;
-  worker.terminate();
-  worker = null;
-  for (const [id, p] of pending) {
-    clearTimeout(p.timer);
-    pending.delete(id);
-    p.reject(new Error("Takumi worker terminated"));
-  }
-}
+const workerTimeout = parseWorkerTimeout(process.env.NUXT_OG_IMAGE_WORKER_TIMEOUT);
+const workerQueue = createWorkerQueue({
+  createWorker: () => new Worker(workerCode, { eval: true }),
+  executionTimeout: workerTimeout,
+  startupTimeout: workerTimeout,
+  label: "takumi"
+});
 const signalKey = Symbol.for("og-image:takumi-worker-cleanup");
 if (!globalThis[signalKey]) {
   globalThis[signalKey] = true;
-  process.on("exit", killWorker);
-}
-function createWorker() {
-  workerGeneration++;
-  const w = new Worker(workerCode, { eval: true });
-  w.on("message", ({ id, image, urls, error, fontWarnings }) => {
-    const p = pending.get(id);
-    if (p) {
-      clearTimeout(p.timer);
-      pending.delete(id);
-      if (error)
-        p.reject(new Error(error));
-      else if (urls !== void 0)
-        p.resolve(urls);
-      else
-        p.resolve({ image: Buffer.from(image), fontWarnings });
-    }
-  });
-  w.on("error", (err) => {
-    for (const [id, p] of pending) {
-      clearTimeout(p.timer);
-      pending.delete(id);
-      p.reject(err);
-    }
-    worker = null;
-  });
-  w.on("exit", (code) => {
-    if (code !== 0) {
-      for (const [id, p] of pending) {
-        clearTimeout(p.timer);
-        pending.delete(id);
-        p.reject(new Error(`Takumi worker exited with code ${code}`));
-      }
-    }
-    worker = null;
-  });
-  w.unref();
-  return w;
-}
-function ensureWorker() {
-  if (!worker)
-    worker = createWorker();
-}
-function postToWorker(msg, timeoutMs = 3e4) {
-  return new Promise((resolve, reject) => {
-    ensureWorker();
-    const id = ++requestId;
-    const timer = setTimeout(() => {
-      pending.delete(id);
-      reject(new Error("takumi worker timed out \u2014 killing worker"));
-      killWorker();
-    }, timeoutMs);
-    pending.set(id, { resolve, reject, timer });
-    worker.postMessage({ id, ...msg });
-  });
+  process.on("exit", workerQueue.shutdown);
 }
 function extractResourceUrls(nodes) {
   return Promise.resolve(extractTakumiResourceUrls(nodes));
@@ -130,21 +70,24 @@ class RendererWorkerProxy {
     this.loadFont(font);
   }
   render(nodes, options) {
-    ensureWorker();
-    let fontsToSend;
-    if (this.syncedGeneration !== workerGeneration) {
-      fontsToSend = [...this.allFonts];
-      this.pendingFonts = [];
-    } else {
-      fontsToSend = this.pendingFonts.splice(0);
-    }
-    this.syncedGeneration = workerGeneration;
-    return postToWorker({ type: "render", newFonts: fontsToSend, nodes, options }).then((result) => {
+    return workerQueue.enqueue(({ id, generation }) => {
+      let fontsToSend;
+      if (this.syncedGeneration !== generation) {
+        fontsToSend = [...this.allFonts];
+        this.pendingFonts = [];
+      } else {
+        fontsToSend = this.pendingFonts.splice(0);
+      }
+      this.syncedGeneration = generation;
+      return { id, type: "render", newFonts: fontsToSend, nodes, options };
+    }).then((result) => {
+      if (result._tag === "failure")
+        throw new Error(result.error);
       if (result.fontWarnings?.length) {
         for (const w of result.fontWarnings)
           console.warn(`[nuxt-og-image] Failed to load font "${w.name}" (weight: ${w.weight}) into takumi renderer: ${w.error}`);
       }
-      return result.image;
+      return Buffer.from(result.image);
     });
   }
 }

package/dist/runtime/server/og-image/bindings/worker-queue.d.ts

@@ -0,0 +1,34 @@
+interface WorkerHandle {
+    on: {
+        (event: 'message', listener: (message: unknown) => void): WorkerHandle;
+        (event: 'error', listener: (error: Error) => void): WorkerHandle;
+        (event: 'exit', listener: (code: number) => void): WorkerHandle;
+    };
+    postMessage: (message: unknown) => void;
+    removeAllListeners: () => WorkerHandle;
+    terminate: () => Promise<number>;
+    unref: () => void;
+}
+interface QueueOptions {
+    createWorker: () => WorkerHandle;
+    executionTimeout: number;
+    startupTimeout: number;
+    label: string;
+    maxAttempts?: number;
+}
+interface Job<TMessage, TResponse> {
+    id: number;
+    buildMessage: (context: {
+        id: number;
+        generation: number;
+    }) => TMessage;
+    resolve: (response: TResponse) => void;
+    reject: (error: Error) => void;
+    attempts: number;
+}
+export declare function parseWorkerTimeout(value: string | undefined, fallback?: number): number;
+export declare function createWorkerQueue<TMessage, TResponse>(options: QueueOptions): {
+    enqueue: (buildMessage: Job<TMessage, TResponse>["buildMessage"]) => Promise<TResponse>;
+    shutdown: () => void;
+};
+export {};