nuxt-og-image 2.0.5 → 2.0.6

package/dist/runtime/nitro/routes/vnode.mjs

@@ -1,12 +1,12 @@
 import { createError, defineEventHandler, getQuery, setHeader } from "h3";
 import { withBase } from "ufo";
-import { fetchOptions } from "../utils.mjs";
+import { fetchOptionsCached } from "../utils.mjs";
 import { useProvider } from "#nuxt-og-image/provider";
 import { useRuntimeConfig } from "#imports";
 export default defineEventHandler(async (e) => {
   const query = getQuery(e);
   const path = withBase(query.path || "/", useRuntimeConfig().app.baseURL);
-  const options = await fetchOptions(e, path);
+  const options = await fetchOptionsCached(e, path);
   setHeader(e, "Content-Type", "application/json");
   const provider = await useProvider(options.provider);
   if (!provider) {

package/dist/runtime/nitro/utils.d.ts

@@ -5,6 +5,7 @@ import type { RuntimeOgImageOptions } from '../types';
 export declare function wasmLoader(asyncModuleLoad: Promise<any> | Buffer | string, fallback: string): {
     load(options: RuntimeOgImageOptions): Promise<any>;
 };
+export declare function fetchOptionsCached(e: H3Event, path: string): Promise<RuntimeOgImageOptions>;
 export declare function fetchOptions(e: H3Event, path: string): Promise<RuntimeOgImageOptions>;
 export declare function base64ToArrayBuffer(base64: string): ArrayBuffer;
 export declare function readPublicAsset(file: string, encoding?: BufferEncoding): Promise<string | Buffer | undefined>;

package/dist/runtime/nitro/utils.mjs

@@ -2,9 +2,11 @@ import { existsSync, promises as fsp } from "node:fs";
 import { Buffer } from "node:buffer";
 import { getQuery } from "h3";
 import { join } from "pathe";
-import { prefixStorage } from "unstorage";
 import sizeOf from "image-size";
-import { useNitroOrigin, useRuntimeConfig, useStorage } from "#imports";
+import { defu } from "defu";
+import { withoutLeadingSlash } from "ufo";
+import { useNitroCache } from "../cache.mjs";
+import { useNitroOrigin, useRuntimeConfig } from "#imports";
 export function wasmLoader(asyncModuleLoad, fallback) {
   let promise;
   let wasm;
@@ -36,40 +38,37 @@ export function wasmLoader(asyncModuleLoad, fallback) {
     }
   };
 }
+export async function fetchOptionsCached(e, path) {
+  const key = [
+    withoutLeadingSlash(path === "/" || !path ? "index" : path).replaceAll("/", "-"),
+    "options"
+  ].join(":");
+  const { cachedItem, update } = await useNitroCache(e, "nuxt-og-image", {
+    key,
+    // allow internal requests to be cached
+    cacheTtl: 5 * 1e3,
+    cache: !process.dev,
+    headers: false
+  });
+  if (cachedItem)
+    return cachedItem;
+  const options = await fetchOptions(e, path);
+  await update(options);
+  return options;
+}
 export async function fetchOptions(e, path) {
-  const { runtimeCacheStorage, version } = useRuntimeConfig()["nuxt-og-image"];
-  const baseCacheKey = runtimeCacheStorage === "default" ? `/cache/og-image${version}` : `/og-image/${version}`;
-  const cache = runtimeCacheStorage || process.env.prerender ? prefixStorage(useStorage(), `${baseCacheKey}/options`) : false;
-  const key = [path === "/" || !path ? "index" : path].join(":");
-  let options;
-  if (!process.dev && cache && await cache.hasItem(key)) {
-    const cachedValue = await cache.getItem(key);
-    if (cachedValue && cachedValue.value && cachedValue.expiresAt < Date.now())
-      options = cachedValue.value;
-    else
-      await cache.removeItem(key);
-  }
-  if (!options) {
-    options = await globalThis.$fetch("/api/og-image-options", {
-      query: {
-        path
-      },
-      responseType: "json"
-    });
-    if (cache) {
-      await cache.setItem(key, {
-        value: options,
-        // cache for 1 minute or 5 seconds, avoids subsequent internal fetches
-        expiresAt: Date.now() + (options.cache ? 60 * 1e3 : 5 * 1e3)
-      });
-    }
-  }
-  return {
-    ...options,
+  const options = await globalThis.$fetch("/api/og-image-options", {
+    query: {
+      path
+    },
+    responseType: "json"
+  });
+  return defu(
+    { requestOrigin: useNitroOrigin(e) },
+    options,
     // use query data
-    ...getQuery(e),
-    requestOrigin: useNitroOrigin(e)
-  };
+    getQuery(e)
+  );
 }
 export function base64ToArrayBuffer(base64) {
   const buffer = Buffer.from(base64, "base64");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "packageManager": "pnpm@8.6.6",
   "description": "Enlightened OG Image generation for Nuxt.",
   "license": "MIT",
@@ -43,8 +43,8 @@
     "image-size": "^1.0.2",
     "inline-css": "^4.0.2",
     "launch-editor": "^2.6.0",
-    "nuxt-site-config": "^1.0.3",
-    "nuxt-site-config-kit": "^1.0.3",
+    "nuxt-site-config": "^1.0.5",
+    "nuxt-site-config-kit": "^1.0.5",
     "nypm": "^0.2.2",
     "ofetch": "^1.1.1",
     "ohash": "^1.1.2",