nuxt-og-image 6.5.1 → 6.5.2

package/dist/module.cjs

@@ -9,13 +9,13 @@ require('nuxt-site-config/kit');
 require('ohash');
 require('pathe');
 require('pkg-types');
-const module$1 = require('./shared/nuxt-og-image.PENnTk2D.cjs');
+require('std-env');
+const module$1 = require('./shared/nuxt-og-image.CgPzmzQY.cjs');
 require('nuxtseo-shared/kit');
 require('../dist/runtime/logger.js');
 require('node:crypto');
 require('oxc-walker');
 require('chrome-launcher');
-require('std-env');
 require('nypm');
 require('nuxtseo-shared/devtools');
 require('unstorage');

package/dist/module.json

@@ -4,7 +4,7 @@
     "nuxt": ">=3.16.0"
   },
   "configKey": "ogImage",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/module.mjs

@@ -7,13 +7,13 @@ import 'nuxt-site-config/kit';
 import 'ohash';
 import 'pathe';
 import 'pkg-types';
-export { m as default } from './shared/nuxt-og-image.OxKJTI9W.mjs';
+import 'std-env';
+export { m as default } from './shared/nuxt-og-image.DGAMxBol.mjs';
 import 'nuxtseo-shared/kit';
 import '../dist/runtime/logger.js';
 import 'node:crypto';
 import 'oxc-walker';
 import 'chrome-launcher';
-import 'std-env';
 import 'nypm';
 import 'nuxtseo-shared/devtools';
 import 'unstorage';

package/dist/runtime/server/util/cache.d.ts

@@ -1,5 +1,10 @@
 import type { H3Error } from 'h3';
 import type { OgImageRenderEventContext } from '../../types.js';
+declare module 'nitropack/types' {
+    interface NitroApp {
+        _ogImageCacheBackendWarned?: boolean;
+    }
+}
 export declare function useOgImageBufferCache(ctx: OgImageRenderEventContext, options: {
     baseCacheKey: string | false;
     cacheMaxAgeSeconds?: number;

package/dist/runtime/server/util/cache.js

@@ -12,9 +12,15 @@ function safeCompare(a, b) {
     mismatch |= a.charCodeAt(i) ^ b.charCodeAt(i);
   return mismatch === 0;
 }
+function warnCacheBackendUnreachable(ctx, baseCacheKey, e) {
+  if (ctx._nitro._ogImageCacheBackendWarned)
+    return;
+  ctx._nitro._ogImageCacheBackendWarned = true;
+  logger.warn(`[Nuxt OG Image] Cache backend "${baseCacheKey}" unreachable, continuing without cache: ${e?.message || e}`);
+}
 export async function useOgImageBufferCache(ctx, options) {
   const maxAge = Number(options.cacheMaxAgeSeconds);
-  const intentionallyEnabled = !import.meta.dev && maxAge > 0;
+  const intentionallyEnabled = !import.meta.dev && !import.meta.prerender && maxAge > 0;
   let enabled = intentionallyEnabled;
   const cache = prefixStorage(useStorage(), withTrailingSlash(options.baseCacheKey || "/"));
   const key = ctx.key;
@@ -22,19 +28,16 @@ export async function useOgImageBufferCache(ctx, options) {
   if (enabled) {
     const hasItem = await cache.hasItem(key).catch((e) => {
       enabled = false;
-      return createError({
-        cause: e,
-        statusCode: 500,
-        statusMessage: `[Nuxt OG Image] Failed to connect to cache ${options.baseCacheKey}. Response from cache: ${e.message}`
-      });
+      warnCacheBackendUnreachable(ctx, options.baseCacheKey, e);
+      return false;
     });
-    if (hasItem instanceof Error)
-      return hasItem;
-    if (hasItem) {
-      const { value, expiresAt, headers } = await cache.getItem(key).catch(() => ({
-        value: null,
-        expiresAt: Date.now()
-      }));
+    const entry = hasItem ? await cache.getItem(key).catch((e) => {
+      enabled = false;
+      warnCacheBackendUnreachable(ctx, options.baseCacheKey, e);
+      return null;
+    }) : null;
+    if (entry) {
+      const { value, expiresAt, headers } = entry;
       const purgeValue = getQuery(ctx.e).purge;
       if (typeof purgeValue !== "undefined") {
         if (options.secret && !safeCompare(String(purgeValue), options.secret)) {
@@ -64,7 +67,7 @@ export async function useOgImageBufferCache(ctx, options) {
       }
     }
   }
-  if (!enabled) {
+  if (!enabled && !import.meta.prerender) {
     setHeader(ctx.e, "Cache-Control", "no-cache, no-store, must-revalidate");
     setHeader(ctx.e, "Pragma", "no-cache");
     setHeader(ctx.e, "Expires", "0");
@@ -73,7 +76,7 @@ export async function useOgImageBufferCache(ctx, options) {
     enabled,
     cachedItem,
     async update(item) {
-      setHeader(ctx.e, "X-OG-Cache", intentionallyEnabled ? "MISS" : "DISABLED");
+      setHeader(ctx.e, "X-OG-Cache", enabled ? "MISS" : "DISABLED");
       if (!enabled)
         return;
       const value = Buffer.from(item).toString("base64");

package/dist/runtime/server/util/ssrf.js

@@ -66,11 +66,26 @@ function isPrivateIPv6(groups) {
     const b = g6 & 255;
     return isPrivateIPv4(a, b);
   }
+  if (g0 === 0 && g1 === 0 && g2 === 0 && g3 === 0 && g4 === 0 && g5 === 0) {
+    const a = g6 >> 8 & 255;
+    const b = g6 & 255;
+    return isPrivateIPv4(a, b);
+  }
+  if (g0 === 0 && g1 === 0 && g2 === 0 && g3 === 0 && g4 === 65535 && g5 === 0) {
+    const a = g6 >> 8 & 255;
+    const b = g6 & 255;
+    return isPrivateIPv4(a, b);
+  }
   if (g0 === 100 && g1 === 65435 && g2 === 0 && g3 === 0 && g4 === 0 && g5 === 0) {
     const a = g6 >> 8 & 255;
     const b = g6 & 255;
     return isPrivateIPv4(a, b);
   }
+  if (g0 === 8194) {
+    const a = g1 >> 8 & 255;
+    const b = g1 & 255;
+    return isPrivateIPv4(a, b);
+  }
   if (g0 === 100 && g1 === 65435 && g2 === 1)
     return true;
   if ((g0 & 65024) === 64512)

package/dist/shared/{nuxt-og-image.PENnTk2D.cjs → nuxt-og-image.CgPzmzQY.cjs}

@@ -9,12 +9,12 @@ const kit$2 = require('nuxt-site-config/kit');
 const ohash = require('ohash');
 const pathe = require('pathe');
 const pkgTypes = require('pkg-types');
+const stdEnv = require('std-env');
 const node_crypto = require('node:crypto');
 const oxcWalker = require('oxc-walker');
 const kit$1 = require('nuxtseo-shared/kit');
 const logger_js = require('../../dist/runtime/logger.js');
 const chromeLauncher = require('chrome-launcher');
-const stdEnv = require('std-env');
 const nypm = require('nypm');
 const devtools = require('nuxtseo-shared/devtools');
 const unstorage = require('unstorage');
@@ -610,6 +610,14 @@ async function ensureProviderDependencies(provider, binding, nuxt) {
   }
   return { success: true, installed };
 }
+function canPromptInteractively(env = {
+  hasTTY: stdEnv.hasTTY,
+  hasStdinTTY: Boolean(process.stdin?.isTTY),
+  isAgent: stdEnv.isAgent,
+  isCI: stdEnv.isCI
+}) {
+  return env.hasTTY && env.hasStdinTTY && !env.isAgent && !env.isCI;
+}
 async function promptForRendererSelection() {
   logger_js.logger.info("Welcome to Nuxt OG Image! No renderer dependencies detected.");
   const renderer = await logger_js.logger.prompt("Which renderer would you like to use?", {
@@ -4200,6 +4208,10 @@ async function onInstall(nuxt) {
     }
     return;
   }
+  if (!canPromptInteractively()) {
+    logger_js.logger.info("Skipping interactive onboarding (non-interactive environment). Defaulting to the takumi renderer.");
+    return;
+  }
   logger_js.logger.info("");
   logger_js.logger.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
   logger_js.logger.info("\u2502  nuxt-og-image                          \u2502");
@@ -4687,15 +4699,9 @@ const module$1 = kit.defineNuxtModule({
     await onUpgrade(nuxt, options, previousVersion);
   },
   async setup(config, nuxt) {
-    const _resolver = kit.createResolver((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/nuxt-og-image.PENnTk2D.cjs', document.baseURI).href)));
+    const _resolver = kit.createResolver((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('shared/nuxt-og-image.CgPzmzQY.cjs', document.baseURI).href)));
     const fixSharedPath = (p) => {
-      if (p.includes("/shared/runtime/"))
-        return p.replace("/shared/runtime/", "/runtime/");
-      if (p.includes("/shared/client"))
-        return p.replace("/shared/client", "/client");
-      if (p.includes("/shared/devtools"))
-        return p.replace("/shared/devtools", "/devtools");
-      return p;
+      return p.replace(/\/shared\/runtime(\/|$)/, "/runtime$1").replace(/\/shared\/client(\/|$)/, "/client$1").replace(/\/shared\/devtools(\/|$)/, "/devtools$1");
     };
     const resolve = (path) => fixSharedPath(_resolver.resolve(path));
     const resolver = {
@@ -5234,12 +5240,13 @@ ${familyInfo}`);
       if (preferred) {
         ogImageComponentCtx.detectedRenderers.add(preferred.provider);
         logger_js.logger.debug(`Using ${preferred.provider} renderer`);
-      } else if (nuxt.options.dev && !nuxt.options._prepare) {
+      } else if (nuxt.options.dev && !nuxt.options._prepare && canPromptInteractively()) {
         const renderer = await promptForRendererSelection();
         ogImageComponentCtx.detectedRenderers.add(renderer);
         logger_js.logger.debug(`Using ${renderer} renderer`);
       } else {
         ogImageComponentCtx.detectedRenderers.add("takumi");
+        logger_js.logger.warn("No OG image renderer dependency detected. Defaulting to `takumi` (non-interactive environment). Install `@takumi-rs/core`, or add a renderer component (e.g. components/OgImage/Default.satori.vue) to choose explicitly.");
       }
     }
     const availableRenderers = /* @__PURE__ */ new Set();
@@ -5255,9 +5262,13 @@ ${familyInfo}`);
             const { success } = await ensureProviderDependencies(renderer, binding, nuxt);
             if (success) {
               availableRenderers.add(renderer);
+            } else if (stdEnv.isAgent) {
+              throw new Error(`[nuxt-og-image] Failed to install ${renderer} dependencies: ${missing.join(", ")}. Install manually: npx nypm add ${missing.join(" ")}`);
             } else {
               logger_js.logger.error(`Failed to install ${renderer} dependencies. Templates using this renderer won't work.`);
             }
+          } else if (stdEnv.isAgent) {
+            throw new Error(`[nuxt-og-image] ${renderer} renderer missing dependencies: ${missing.join(", ")}. Install with: npx nypm add ${missing.join(" ")}`);
           } else {
             logger_js.logger.error(`${renderer} renderer missing dependencies: ${missing.join(", ")}. Install with: npx nypm add ${missing.join(" ")}`);
           }

package/dist/shared/{nuxt-og-image.OxKJTI9W.mjs → nuxt-og-image.DGAMxBol.mjs}

@@ -8,12 +8,12 @@ import { installNuxtSiteConfig } from 'nuxt-site-config/kit';
 import { hash } from 'ohash';
 import { basename, join, dirname, relative, isAbsolute, resolve } from 'pathe';
 import { readPackageJSON } from 'pkg-types';
+import { isCI, isAgent, hasTTY } from 'std-env';
 import { createHash } from 'node:crypto';
 import { parseAndWalk } from 'oxc-walker';
 import { resolveNitroPreset, getNuxtModuleOptions, isNuxtGenerate } from 'nuxtseo-shared/kit';
 import { logger } from '../../dist/runtime/logger.js';
 import { Launcher } from 'chrome-launcher';
-import { isCI } from 'std-env';
 import { detectPackageManager, addDependency } from 'nypm';
 import { setupDevToolsUI as setupDevToolsUI$1, setupDevToolsRpc } from 'nuxtseo-shared/devtools';
 import { createStorage } from 'unstorage';
@@ -590,6 +590,14 @@ async function ensureProviderDependencies(provider, binding, nuxt) {
   }
   return { success: true, installed };
 }
+function canPromptInteractively(env = {
+  hasTTY,
+  hasStdinTTY: Boolean(process.stdin?.isTTY),
+  isAgent,
+  isCI
+}) {
+  return env.hasTTY && env.hasStdinTTY && !env.isAgent && !env.isCI;
+}
 async function promptForRendererSelection() {
   logger.info("Welcome to Nuxt OG Image! No renderer dependencies detected.");
   const renderer = await logger.prompt("Which renderer would you like to use?", {
@@ -4180,6 +4188,10 @@ async function onInstall(nuxt) {
     }
     return;
   }
+  if (!canPromptInteractively()) {
+    logger.info("Skipping interactive onboarding (non-interactive environment). Defaulting to the takumi renderer.");
+    return;
+  }
   logger.info("");
   logger.info("\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
   logger.info("\u2502  nuxt-og-image                          \u2502");
@@ -4669,13 +4681,7 @@ const module$1 = defineNuxtModule({
   async setup(config, nuxt) {
     const _resolver = createResolver(import.meta.url);
     const fixSharedPath = (p) => {
-      if (p.includes("/shared/runtime/"))
-        return p.replace("/shared/runtime/", "/runtime/");
-      if (p.includes("/shared/client"))
-        return p.replace("/shared/client", "/client");
-      if (p.includes("/shared/devtools"))
-        return p.replace("/shared/devtools", "/devtools");
-      return p;
+      return p.replace(/\/shared\/runtime(\/|$)/, "/runtime$1").replace(/\/shared\/client(\/|$)/, "/client$1").replace(/\/shared\/devtools(\/|$)/, "/devtools$1");
     };
     const resolve = (path) => fixSharedPath(_resolver.resolve(path));
     const resolver = {
@@ -5214,12 +5220,13 @@ ${familyInfo}`);
       if (preferred) {
         ogImageComponentCtx.detectedRenderers.add(preferred.provider);
         logger.debug(`Using ${preferred.provider} renderer`);
-      } else if (nuxt.options.dev && !nuxt.options._prepare) {
+      } else if (nuxt.options.dev && !nuxt.options._prepare && canPromptInteractively()) {
         const renderer = await promptForRendererSelection();
         ogImageComponentCtx.detectedRenderers.add(renderer);
         logger.debug(`Using ${renderer} renderer`);
       } else {
         ogImageComponentCtx.detectedRenderers.add("takumi");
+        logger.warn("No OG image renderer dependency detected. Defaulting to `takumi` (non-interactive environment). Install `@takumi-rs/core`, or add a renderer component (e.g. components/OgImage/Default.satori.vue) to choose explicitly.");
       }
     }
     const availableRenderers = /* @__PURE__ */ new Set();
@@ -5235,9 +5242,13 @@ ${familyInfo}`);
             const { success } = await ensureProviderDependencies(renderer, binding, nuxt);
             if (success) {
               availableRenderers.add(renderer);
+            } else if (isAgent) {
+              throw new Error(`[nuxt-og-image] Failed to install ${renderer} dependencies: ${missing.join(", ")}. Install manually: npx nypm add ${missing.join(" ")}`);
             } else {
               logger.error(`Failed to install ${renderer} dependencies. Templates using this renderer won't work.`);
             }
+          } else if (isAgent) {
+            throw new Error(`[nuxt-og-image] ${renderer} renderer missing dependencies: ${missing.join(", ")}. Install with: npx nypm add ${missing.join(" ")}`);
           } else {
             logger.error(`${renderer} renderer missing dependencies: ${missing.join(", ")}. Install with: npx nypm add ${missing.join(" ")}`);
           }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "6.5.1",
+  "version": "6.5.2",
   "description": "Enlightened OG Image generation for Nuxt.",
   "author": {
     "website": "https://harlanzw.com",
@@ -60,7 +60,8 @@
     "sharp": "^0.34.0",
     "tailwindcss": "^4.0.0",
     "unifont": "^0.7.0",
-    "unstorage": "^1.15.0"
+    "unstorage": "^1.15.0",
+    "zod": ">=3"
   },
   "peerDependenciesMeta": {
     "@resvg/resvg-js": {
@@ -95,14 +96,17 @@
     },
     "unifont": {
       "optional": true
+    },
+    "zod": {
+      "optional": true
     }
   },
   "dependencies": {
-    "@clack/prompts": "^1.4.0",
-    "@nuxt/kit": "^4.4.6",
-    "@unocss/config": "^66.6.8",
-    "@unocss/core": "^66.6.8",
-    "@vue/compiler-sfc": "^3.5.34",
+    "@clack/prompts": "^1.5.1",
+    "@nuxt/kit": "^4.4.7",
+    "@unocss/config": "^66.7.0",
+    "@unocss/core": "^66.7.0",
+    "@vue/compiler-sfc": "^3.5.35",
     "chrome-launcher": "^1.2.1",
     "consola": "^3.4.2",
     "culori": "^4.0.2",
@@ -118,24 +122,23 @@
     "nypm": "^0.6.6",
     "ofetch": "^1.5.1",
     "ohash": "^2.0.11",
-    "oxc-parser": "^0.132.0",
+    "oxc-parser": "^0.134.0",
     "oxc-walker": "^1.0.0",
     "pathe": "^2.0.3",
     "pkg-types": "^2.3.1",
     "radix3": "^1.1.2",
     "std-env": "^4.1.0",
     "strip-literal": "^3.1.0",
-    "tinyexec": "^1.1.2",
-    "tinyglobby": "^0.2.16",
+    "tinyexec": "^1.2.4",
+    "tinyglobby": "^0.2.17",
     "ufo": "^1.6.4",
     "ultrahtml": "^1.6.0",
-    "unplugin": "^3.0.0",
-    "zod": "^4.4.3"
+    "unplugin": "^3.0.0"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^9.0.0",
     "@fontsource/noto-sans-sc": "^5.2.9",
-    "@iconify-json/carbon": "^1.2.21",
+    "@iconify-json/carbon": "^1.2.22",
     "@iconify-json/logos": "^1.2.11",
     "@iconify-json/noto": "^1.2.7",
     "@iconify-json/ri": "^1.2.10",
@@ -143,50 +146,50 @@
     "@iconify/types": "^2.0.0",
     "@img/sharp-linux-x64": "^0.34.5",
     "@nuxt/content": "^3.14.0",
-    "@nuxt/devtools": "4.0.0-alpha.4",
-    "@nuxt/devtools-kit": "4.0.0-alpha.4",
+    "@nuxt/devtools": "4.0.0-alpha.7",
+    "@nuxt/devtools-kit": "4.0.0-alpha.7",
     "@nuxt/fonts": "^0.14.0",
-    "@nuxt/icon": "^2.2.2",
+    "@nuxt/icon": "^2.2.3",
     "@nuxt/image": "^2.0.0",
     "@nuxt/module-builder": "^1.0.2",
     "@nuxt/test-utils": "^4.0.3",
-    "@nuxt/ui": "^4.7.1",
+    "@nuxt/ui": "^4.8.1",
     "@nuxtjs/color-mode": "^4.0.0",
     "@nuxtjs/eslint-config-typescript": "^12.1.0",
-    "@nuxtjs/i18n": "^10.3.0",
+    "@nuxtjs/i18n": "^10.4.0",
     "@nuxtjs/tailwindcss": "7.0.0-beta.1",
     "@resvg/resvg-js": "^2.6.2",
     "@resvg/resvg-wasm": "^2.6.2",
-    "@shikijs/langs": "^4.0.2",
-    "@shikijs/themes": "^4.0.2",
+    "@shikijs/langs": "^4.2.0",
+    "@shikijs/themes": "^4.2.0",
     "@tailwindcss/vite": "^4.3.0",
-    "@takumi-rs/core": "^1.2.1",
-    "@takumi-rs/helpers": "^1.2.1",
-    "@takumi-rs/wasm": "^1.2.1",
-    "@unocss/nuxt": "^66.6.8",
-    "@unocss/preset-icons": "^66.6.8",
-    "@unocss/preset-wind": "^66.6.8",
-    "@unocss/preset-wind4": "^66.6.8",
+    "@takumi-rs/core": "^1.7.0",
+    "@takumi-rs/helpers": "^1.7.0",
+    "@takumi-rs/wasm": "^1.7.0",
+    "@unocss/nuxt": "^66.7.0",
+    "@unocss/preset-icons": "^66.7.0",
+    "@unocss/preset-wind": "^66.7.0",
+    "@unocss/preset-wind4": "^66.7.0",
     "@vitejs/plugin-vue": "^6.0.7",
-    "@vue/compiler-core": "^3.5.34",
+    "@vue/compiler-core": "^3.5.35",
     "@vueuse/nuxt": "^14.3.0",
     "birpc": "^4.0.0",
     "bumpp": "^11.1.0",
-    "eslint": "^10.4.0",
-    "eslint-plugin-harlanzw": "^0.15.1",
+    "eslint": "^10.4.1",
+    "eslint-plugin-harlanzw": "^0.17.0",
     "fontless": "^0.2.1",
     "get-image-colors": "^4.0.1",
     "globby": "^16.2.0",
-    "happy-dom": "^20.9.0",
+    "happy-dom": "^20.10.1",
     "hookable": "^6.1.1",
     "jest-image-snapshot": "^6.5.2",
     "lightningcss": "^1.32.0",
     "nitropack": "^2.13.4",
-    "nuxt": "^4.4.6",
+    "nuxt": "^4.4.7",
     "nuxtseo-layer-devtools": "^5.1.3",
     "playwright": "^1.60.0",
     "playwright-core": "^1.60.0",
-    "sass": "^1.99.0",
+    "sass": "^1.100.0",
     "satori": "^0.26.0",
     "sharp": "^0.34.5",
     "sirv": "^3.0.2",
@@ -194,12 +197,13 @@
     "typescript": "^6.0.3",
     "unbuild": "^3.6.1",
     "unifont": "^0.7.4",
-    "unocss": "^66.6.8",
-    "vitest": "^4.1.6",
-    "vue": "^3.5.34",
-    "vue-tsc": "^3.3.0",
-    "wrangler": "^4.92.0",
-    "yoga-wasm-web": "^0.3.3"
+    "unocss": "^66.7.0",
+    "vitest": "^4.1.8",
+    "vue": "^3.5.35",
+    "vue-tsc": "^3.3.3",
+    "wrangler": "^4.97.0",
+    "yoga-wasm-web": "^0.3.3",
+    "zod": "^4.4.3"
   },
   "scripts": {
     "snapshots": "node --import jiti/register scripts/generate-template-snapshots.ts",