nuxt-og-image 6.7.4 → 6.7.6

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

@@ -0,0 +1,17 @@
+function toRecord(value) {
+  return typeof value === "object" && value !== null ? value : void 0;
+}
+export function getCloudflareEnv(event) {
+  const runtime = event && "runtime" in event ? toRecord(event.runtime) : void 0;
+  const runtimeCloudflare = toRecord(runtime?.cloudflare);
+  const runtimeEnv = toRecord(runtimeCloudflare?.env);
+  if (runtimeEnv)
+    return runtimeEnv;
+  const contextCloudflare = toRecord(event?.context.cloudflare);
+  const contextEnv = toRecord(contextCloudflare?.env);
+  if (contextEnv)
+    return contextEnv;
+  const platform = toRecord(event?.context._platform);
+  const platformCloudflare = toRecord(platform?.cloudflare);
+  return toRecord(platformCloudflare?.env);
+}

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

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 interface AssetsBinding {
     fetch: (request: string | Request, init?: RequestInit) => Promise<Response>;
 }

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

@@ -1,15 +1,18 @@
-import { getRequestHost } from "h3";
+import { getRequestURL } from "#nuxtseo/h3";
+import { getCloudflareEnv } from "./cloudflare.js";
 export function getCloudflareAssets(event) {
-  const assets = event.context.cloudflare?.env?.ASSETS || event.context.ASSETS;
-  return assets && typeof assets.fetch === "function" ? assets : void 0;
+  const assets = getCloudflareEnv(event)?.ASSETS || event.context.ASSETS;
+  return typeof assets === "object" && assets !== null && "fetch" in assets && typeof assets.fetch === "function" ? assets : void 0;
 }
 export async function tryCloudflareAssetsFetch(event, path, signal) {
   const assets = getCloudflareAssets(event);
   if (!assets)
     return;
-  const origin = event.context.cloudflare?.request?.url || `https://${getRequestHost(event) || "localhost"}`;
+  const origin = getRequestURL(event).origin;
   const url = new URL(path, origin).href;
-  const res = await assets.fetch(url, signal ? { signal } : void 0).catch(() => null);
+  const res = await assets.fetch(url, signal ? { signal } : void 0).catch(() => {
+    return null;
+  });
   if (!res || !res.ok)
     return;
   return res.arrayBuffer();

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

@@ -1,3 +1,2 @@
 export declare function htmlDecodeQuotes(html: string): string;
 export declare function decodeHtml(html: string): string;
-export declare function decodeObjectHtmlEntities(obj: Record<string, string | any>): Record<string, any>;

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

@@ -20,10 +20,3 @@ export function decodeHtml(html) {
     return String.fromCharCode(Number.parseInt(int));
   }).replace(RE_AMP, "&");
 }
-export function decodeObjectHtmlEntities(obj) {
-  Object.entries(obj).forEach(([key, value]) => {
-    if (typeof value === "string")
-      obj[key] = decodeHtml(value);
-  });
-  return obj;
-}

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

@@ -1,2 +1,2 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 export declare function imageEventHandler(e: H3Event): Promise<any>;

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

@@ -1,4 +1,4 @@
-import { createError, getRequestHost, H3Error, setHeader } from "h3";
+import { createError, getRequestHost, H3Error, setHeader } from "#nuxtseo/h3";
 import { getSiteConfig } from "#site-config/server/composables/getSiteConfig";
 import { logger } from "../../logger.js";
 import { getBuildCachedImage, setBuildCachedImage } from "../og-image/cache/buildCache.js";

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

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 export interface FetchLocalAssetOptions {
     fetchTimeout: number;
     headers?: Record<string, string>;

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

@@ -1,6 +1,9 @@
-import type { H3Event } from 'h3';
-import type { NitroRouteRules } from 'nitropack';
 import type { NuxtIslandResponse } from 'nuxt/app';
-export { withoutQuery } from 'nuxtseo-shared/utils';
+import type { H3Event } from '#nuxtseo/h3';
+import type { OgImageOptions } from '../../types.js';
+interface OgImageRouteRules {
+    ogImage?: false | OgImageOptions & Record<string, any>;
+}
 export declare function fetchIsland(e: H3Event, component: string, props: Record<string, any>, timeout?: number): Promise<NuxtIslandResponse>;
-export declare function createNitroRouteRuleMatcher(): ((path: string) => NitroRouteRules);
+export declare function createNitroRouteRuleMatcher(): ((path: string) => OgImageRouteRules);
+export {};

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

@@ -1,13 +1,10 @@
-import { defu } from "defu";
-import { useRuntimeConfig } from "nitropack/runtime";
-import { createRouter as createRadixRouter, toRouteMatcher } from "radix3";
-import { withoutBase, withoutTrailingSlash } from "ufo";
+import { createNitroRouteRuleMatcher as createRouteRuleMatcher } from "nuxtseo-shared/server";
+import { fetchWithEvent, useRuntimeConfig } from "#nuxtseo/nitro";
 import { getIslandHash } from "#og-image/island-hash";
-export { withoutQuery } from "nuxtseo-shared/utils";
 export function fetchIsland(e, component, props, timeout) {
   const hashId = getIslandHash({ name: component, props });
   const signal = timeout ? AbortSignal.timeout(timeout) : void 0;
-  return e.$fetch(`/__nuxt_island/${component}_${hashId}.json`, {
+  return fetchWithEvent(e, `/__nuxt_island/${component}_${hashId}.json`, {
     params: {
       props: JSON.stringify(props)
     },
@@ -16,17 +13,5 @@ export function fetchIsland(e, component, props, timeout) {
   });
 }
 export function createNitroRouteRuleMatcher() {
-  const { nitro, app } = useRuntimeConfig();
-  const _routeRulesMatcher = toRouteMatcher(
-    createRadixRouter({
-      routes: Object.fromEntries(
-        Object.entries(nitro?.routeRules || {}).map(([path, rules]) => [withoutTrailingSlash(path), rules])
-      )
-    })
-  );
-  return (path) => {
-    return defu({}, ..._routeRulesMatcher.matchAll(
-      withoutBase(withoutTrailingSlash(path.split("?")[0]), app.baseURL)
-    ).reverse());
-  };
+  return createRouteRuleMatcher(useRuntimeConfig());
 }

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

@@ -1,6 +1,2 @@
-import { createConsola } from "consola";
-export const logger = createConsola({
-  defaults: {
-    tag: "Nuxt OG Image"
-  }
-});
+import { createModuleLogger } from "nuxtseo-shared/utils";
+export const logger = createModuleLogger("Nuxt OG Image");

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

@@ -1,4 +1,4 @@
-import { createError } from "h3";
+import { createError } from "#nuxtseo/h3";
 import { componentNames } from "#og-image-virtual/component-names.mjs";
 const RENDERER_SUFFIXES = ["satori", "browser", "takumi"];
 const RE_RENDERER_SUFFIX_DOT = /\.?(satori|browser|takumi)$/i;

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

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 /**
  * Parse query parameters from the event path without relying on the H3 event
  * implementation. Nitro adapters can pass an H3 v1 event to bundled H3 v2

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

@@ -12,6 +12,3 @@ export interface Timings {
 }
 export declare function createTimings(): Timings;
 export declare const TIMING_CTX_KEY = "_ogImageTimings";
-export declare function getTimingsFromEvent(e: {
-    context: Record<string, any>;
-}): Timings | undefined;

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

@@ -70,6 +70,3 @@ export function createTimings() {
   return { start, record, measure, entries, header };
 }
 export const TIMING_CTX_KEY = "_ogImageTimings";
-export function getTimingsFromEvent(e) {
-  return e.context[TIMING_CTX_KEY];
-}

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

@@ -1,4 +1,4 @@
-import type { H3Event } from 'h3';
+import type { H3Event } from '#nuxtseo/h3';
 import type { OgImageOptionsInternal, OgImageRuntimeConfig } from '../types.js';
 export interface GetOgImagePathResult {
     path: string;

package/dist/runtime/server/utils.js

@@ -1,7 +1,8 @@
-import { useRuntimeConfig } from "nitropack/runtime";
 import { joinURL } from "ufo";
+import { useRuntimeConfig } from "#nuxtseo/nitro";
 import { componentNames } from "#og-image-virtual/component-names.mjs";
 import { buildOgImageUrl } from "../shared.js";
+import { getCloudflareEnv } from "./util/cloudflare.js";
 export function getOgImagePath(_pagePath, _options) {
   const baseURL = useRuntimeConfig().app.baseURL;
   const { defaults, security } = useOgImageRuntimeConfig();
@@ -20,9 +21,11 @@ export function getOgImagePath(_pagePath, _options) {
 }
 export function useOgImageRuntimeConfig(e) {
   const c = useRuntimeConfig(e);
-  const moduleCfg = c["nuxt-og-image"] || {};
-  const cloudflareEnv = e?.context.cloudflare?.env || e?.context?._platform?.cloudflare?.env;
-  const overrideSecret = c.ogImage?.secret || cloudflareEnv?.NUXT_OG_IMAGE_SECRET;
+  const moduleCfg = c["nuxt-og-image"];
+  const cloudflareEnv = getCloudflareEnv(e);
+  const runtimeSecret = c.ogImage?.secret;
+  const cloudflareSecret = cloudflareEnv?.NUXT_OG_IMAGE_SECRET;
+  const overrideSecret = typeof runtimeSecret === "string" && runtimeSecret ? runtimeSecret : typeof cloudflareSecret === "string" ? cloudflareSecret : void 0;
   const security = overrideSecret ? { ...moduleCfg.security || {}, secret: overrideSecret } : moduleCfg.security;
   return {
     defaults: {},

package/dist/runtime/types.d.ts

@@ -1,16 +1,10 @@
 import type { ResvgRenderOptions } from '@resvg/resvg-js';
 import type { AllowedComponentProps, Component, ComponentCustomProps, VNodeProps } from '@vue/runtime-core';
-import type { H3Error, H3Event } from 'h3';
-import type { Hookable } from 'hookable';
-import type { NitroRuntimeHooks } from 'nitropack/types';
 import type { SatoriOptions } from 'satori';
 import type { JpegOptions, SharpOptions } from 'sharp';
 import type { MaybeRefOrGetter, Ref } from 'vue';
+import type { H3Error, H3Event } from '#nuxtseo/h3';
 import type { Timings } from './server/util/timings.js';
-interface NitroApp {
-    hooks: Hookable<NitroRuntimeHooks>;
-    [key: string]: any;
-}
 export interface OgImageRenderEventContext {
     e: H3Event;
     extension: 'png' | 'jpeg' | 'jpg' | 'webp' | 'svg' | 'html' | 'json';
@@ -22,10 +16,19 @@ export interface OgImageRenderEventContext {
     publicStoragePath: string;
     runtimeConfig: OgImageRuntimeConfig;
     timings: Timings;
-    _nitro: NitroApp;
+    _nitro: ReturnType<typeof import('#nuxtseo/nitro').useNitroApp>;
 }
 export type IconifyEmojiIconSets = 'twemoji' | 'noto' | 'fluent-emoji' | 'fluent-emoji-flat' | 'fluent-emoji-high-contrast' | 'noto-v1' | 'emojione' | 'emojione-monotone' | 'emojione-v1' | 'streamline-emojis' | 'openmoji';
 export type EmojiStrategy = 'auto' | 'local' | 'fetch';
+export interface OgImageIconsData {
+    icons: Record<string, {
+        body: string;
+        width?: number;
+        height?: number;
+    }>;
+    width: number;
+    height: number;
+}
 export interface OgImageRuntimeConfig {
     version: string;
     satoriOptions: SatoriOptions;
@@ -298,4 +301,3 @@ export interface SocialPreviewMetaData {
 export interface RouteRulesOgImage extends Partial<OgImageOptions> {
     [key: string]: any;
 }
-export {};