nuxt-og-image 2.0.0-beta.2 → 2.0.0-beta.22

package/dist/runtime/nitro/utils.mjs

@@ -1,53 +1,75 @@
 import { existsSync, promises as fsp } from "node:fs";
-import { getHeaders, getQuery, getRequestHeader } from "h3";
+import { Buffer } from "node:buffer";
+import { getHeaders, getQuery } from "h3";
 import { join } from "pathe";
-import { useRuntimeConfig } from "#internal/nitro";
-export function wasmLoader(key, fallback, baseUrl) {
+import { prefixStorage } from "unstorage";
+import { useHostname } from "./util-hostname.mjs";
+import { useRuntimeConfig, useStorage } from "#imports";
+export * from "./util-hostname.mjs";
+export function wasmLoader(asyncModuleLoad, fallback) {
   let promise;
-  let loaded = false;
+  let wasm;
   return {
-    loaded() {
-      if (loaded)
-        return true;
+    async load(options) {
       if (typeof promise !== "undefined")
         return promise;
-      return false;
-    },
-    async load() {
+      if (wasm)
+        return wasm;
       promise = promise || new Promise(async (resolve) => {
-        let wasm;
         try {
-          wasm = await key;
+          wasm = await asyncModuleLoad;
           if (typeof wasm === "string")
             wasm = void 0;
         } catch (e) {
         }
-        if (!wasm)
-          wasm = await readPublicAsset(fallback);
         if (!wasm) {
-          const url = new URL(baseUrl);
-          wasm = await (await fetch(`${url.origin}${fallback}`)).arrayBuffer();
+          wasm = await readPublicAsset(fallback, "base64");
+          if (wasm)
+            wasm = Buffer.from(wasm, "base64");
+        }
+        if (!wasm) {
+          const url = new URL(options.baseUrl);
+          wasm = await (await globalThis.$fetch(fallback, { baseURL: url.origin })).arrayBuffer();
+          wasm = Buffer.from(wasm);
         }
-        loaded = true;
         resolve(wasm);
       });
       return promise;
     }
   };
 }
-export function fetchOptions(e, path) {
+export async function fetchOptions(e, path) {
+  const { runtimeCacheStorage } = useRuntimeConfig()["nuxt-og-image"];
+  const cache = runtimeCacheStorage ? prefixStorage(useStorage(), "og-image-cache:options") : false;
+  if (cache && await cache.hasItem(path)) {
+    const cachedValue = await cache.getItem(path);
+    if (cachedValue && cachedValue.expiresAt < Date.now())
+      return cachedValue.value;
+    else
+      await cache.removeItem(path);
+  }
   const fetchOptions2 = process.dev || process.env.prerender ? {
     headers: getHeaders(e)
   } : {
     baseURL: useHostname(e)
   };
-  return globalThis.$fetch("/api/og-image-options", {
+  const res = await globalThis.$fetch("/api/og-image-options", {
     query: {
-      ...getQuery(e),
       path
     },
     ...fetchOptions2
   });
+  if (cache) {
+    await cache.setItem(path, {
+      value: res,
+      expiresAt: Date.now() + (res.static ? 60 * 60 * 1e3 : 5 * 1e3)
+    });
+  }
+  return {
+    ...res,
+    // use query data
+    ...getQuery(e)
+  };
 }
 export function base64ToArrayBuffer(base64) {
   const buffer = Buffer.from(base64, "base64");
@@ -58,20 +80,9 @@ export function renderIsland(payload) {
     query: { props: JSON.stringify(payload) }
   });
 }
-export function useHostname(e) {
-  const config = useRuntimeConfig()["nuxt-og-image"];
-  if (!process.dev && config.siteUrl)
-    return config.siteUrl;
-  const host = getRequestHeader(e, "host") || process.env.NITRO_HOST || process.env.HOST || "localhost";
-  const protocol = getRequestHeader(e, "x-forwarded-proto") || "http";
-  const useHttp = process.env.NODE_ENV === "development" || host.includes("127.0.0.1") || host.includes("localhost") || protocol === "http";
-  const port = host.includes(":") ? host.split(":").pop() : process.env.NITRO_PORT || process.env.PORT;
-  const base = useRuntimeConfig().app.baseURL;
-  return `http${useHttp ? "" : "s"}://${host.includes(":") ? host.split(":")[0] : host}${port ? `:${port}` : ""}${base}`;
-}
-const r = (base, key) => {
+function r(base, key) {
   return join(base, key.replace(/:/g, "/"));
-};
+}
 export async function readPublicAsset(file, encoding) {
   const { assetDirs } = useRuntimeConfig()["nuxt-og-image"];
   for (const assetDir of assetDirs) {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "2.0.0-beta.2",
-  "packageManager": "pnpm@7.8.0",
+  "version": "2.0.0-beta.22",
+  "packageManager": "pnpm@8.1.0",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
   "homepage": "https://github.com/harlan-zw/nuxt-og-image#readme",
@@ -26,24 +26,28 @@
     "dist"
   ],
   "dependencies": {
-    "@nuxt/kit": "3.3.1",
+    "@nuxt/kit": "3.4.2",
+    "@resvg/resvg-wasm": "^2.4.1",
     "@types/fs-extra": "^11.0.1",
-    "birpc": "^0.2.10",
+    "birpc": "^0.2.11",
     "chalk": "^5.2.0",
-    "chrome-launcher": "^0.15.1",
+    "chrome-launcher": "^0.15.2",
     "defu": "^6.1.2",
     "execa": "^7.1.1",
     "fast-glob": "^3.2.12",
     "flatted": "^3.2.7",
     "fs-extra": "^11.1.1",
+    "globby": "^13.1.4",
     "launch-editor": "^2.6.0",
-    "ohash": "^1.0.0",
+    "nypm": "^0.2.0",
+    "ofetch": "^1.0.1",
+    "ohash": "^1.1.2",
     "pathe": "^1.1.0",
-    "playwright-core": "^1.31.2",
-    "radix3": "^1.0.0",
-    "satori": "0.4.4",
+    "playwright-core": "^1.33.0",
+    "radix3": "^1.0.1",
+    "satori": "0.7.2",
     "satori-html": "^0.3.2",
-    "sirv": "^2.0.2",
+    "sirv": "^2.0.3",
     "std-env": "^3.3.2",
     "svg2png-wasm": "^1.3.4",
     "tinyws": "^0.1.0",
@@ -53,18 +57,22 @@
     "yoga-wasm-web": "^0.3.3"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^0.37.0",
-    "@nuxt/devtools-edge": "0.2.5-27992993.59d3c52",
-    "@nuxt/module-builder": "^0.2.1",
-    "@nuxt/test-utils": "3.3.1",
+    "@antfu/eslint-config": "^0.38.5",
+    "@nuxt/devtools-edge": "0.4.2-28041905.19fda12",
+    "@nuxt/module-builder": "^0.3.0",
+    "@nuxt/test-utils": "3.4.2",
     "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@types/ws": "^8.5.4",
-    "bumpp": "^9.0.0",
-    "eslint": "8.36.0",
+    "bumpp": "^9.1.0",
+    "eslint": "8.39.0",
     "jest-image-snapshot": "^6.1.0",
-    "nuxt": "^3.3.1",
-    "puppeteer": "^19.7.5",
-    "vitest": "^0.29.7"
+    "nuxt": "^3.4.2",
+    "vitest": "^0.30.1"
+  },
+  "resolutions": {
+    "nitropack": "npm:nitropack-edge@2.4.0-28027501.1cf01bf",
+    "unstorage": "^1.5.0",
+    "unenv": "^1.4.1"
   },
   "scripts": {
     "build": "pnpm dev:prepare && pnpm build:module && pnpm build:client",

package/dist/client/_nuxt/IconCSS.a041aca0.js

@@ -1 +0,0 @@
-import{a as p,b as u,e as l,f as t,o as f,h as m,i as _,u as o,j as d}from"./entry.74018bda.js";const x=p({__name:"IconCSS",props:{name:{type:String,required:!0},size:{type:String,default:""}},setup(c){const s=c;u(e=>({"387181c2":o(r)}));const n=l();n?.nuxtIcon?.aliases;const i=t(()=>(n?.nuxtIcon?.aliases||{})[s.name]||s.name),r=t(()=>`url('https://api.iconify.design/${i.value.replace(":","/")}.svg')`),a=t(()=>{if(!s.size&&typeof n.nuxtIcon?.size=="boolean"&&!n.nuxtIcon?.size)return;const e=s.size||n.nuxtIcon?.size||"1em";return String(Number(e))===e?`${e}px`:e});return(e,z)=>(f(),m("span",{style:_({width:o(a),height:o(a)})},null,4))}}),g=d(x,[["__scopeId","data-v-3c47f034"]]);export{g as default};