nuxt-og-image 0.5.0 → 0.5.3

package/dist/module.d.ts

@@ -36,9 +36,9 @@ interface ModuleOptions extends ScreenshotOptions {
      */
     host: string;
     /**
-     * Should images be allowed to generated at runtime.
+     * Are we edge-side rendering images.
      */
-    runtimeImages: boolean;
+    edgeSideRender: boolean;
 }
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions>;
 

package/dist/module.json

@@ -5,5 +5,5 @@
     "bridge": false
   },
   "configKey": "ogImage",
-  "version": "0.5.0"
+  "version": "0.5.3"
 }

package/dist/module.mjs

@@ -9,34 +9,16 @@ import { withBase, joinURL } from 'ufo';
 import fg from 'fast-glob';
 import { join } from 'pathe';
 
-const debugBinaryUsage = (s, error) => {
-  if (!process.dev) {
-    console.log(s, error);
-  }
-};
 async function createBrowser() {
   try {
-    const playwrightCore = await import('playwright-core');
-    process.env.AWS_LAMBDA_FUNCTION_NAME = process.env.AWS_LAMBDA_FUNCTION_NAME || "RUNTIME_HACK";
-    const awsChrome = await import(String("chrome-aws-lambda"));
-    return await playwrightCore.chromium.launch({
-      args: awsChrome.args,
-      executablePath: await awsChrome.executablePath,
-      headless: awsChrome.headless
-    });
-  } catch (e) {
-    debugBinaryUsage("[nuxt-og-image] Skipping chrome-aws-lambda", e);
-  }
-  try {
-    const playwrightCore = await import('playwright-core');
-    const { Launcher } = await import('chrome-launcher');
+    const playwrightCore = await import(String("playwright-core"));
+    const { Launcher } = await import(String("chrome-launcher"));
     const chromePath = Launcher.getFirstInstallation();
     return await playwrightCore.chromium.launch({
       headless: true,
       executablePath: chromePath
     });
   } catch (e) {
-    debugBinaryUsage("[nuxt-og-image] Skipping chrome-launcher", e);
   }
   try {
     const playwright = await import(String("playwright"));
@@ -44,13 +26,9 @@ async function createBrowser() {
       headless: true
     });
   } catch (e) {
-    if (!process.dev)
-      debugBinaryUsage("[nuxt-og-image] Playwright failed", e);
-    throw new Error(`
-      Missing chromium binary. Please run "npx playwright install".
-    `);
   }
 }
+
 async function screenshot(browser, url, options) {
   const page = await browser.newPage({
     colorScheme: options.colorScheme
@@ -103,12 +81,13 @@ const module = defineNuxtModule({
       height: 630,
       defaultIslandComponent: "OgImageTemplate",
       outputDir: "_og-images",
-      runtimeImages: nuxt.options.dev
+      edgeSideRender: nuxt.options.dev || (process.env.NITRO_PRESET || "").includes("edge")
     };
   },
   async setup(config, nuxt) {
     const { resolve } = createResolver(import.meta.url);
     nuxt.options.experimental.componentIslands = true;
+    const isEdge = (process.env.NITRO_PRESET || "").includes("edge");
     addTemplate({
       filename: "nuxt-og-image.d.ts",
       getContents: () => {
@@ -128,7 +107,7 @@ declare module 'nitropack' {
       addServerHandler({
         handler: resolve("./runtime/nitro/html")
       });
-      if (config.runtimeImages) {
+      if (config.edgeSideRender) {
         addServerHandler({
           handler: resolve("./runtime/nitro/image")
         });
@@ -166,6 +145,12 @@ declare module 'nitropack' {
         inline: [runtimeDir]
       });
       nitroConfig.virtual["#nuxt-og-image/constants"] = constScript;
+      nitroConfig.virtual["#nuxt-og-image/browser"] = `export { createBrowser } from '${runtimeDir}/browsers/${isEdge ? "lambda" : "default"}'`;
+      if (isEdge) {
+        ["puppeteer", "bufferutil", "utf-8-validate"].forEach((name) => {
+          nitroConfig.alias[name] = "unenv/runtime/mock/proxy";
+        });
+      }
     });
     nuxt.hooks.hook("nitro:init", async (nitro) => {
       let entries = [];

package/dist/runtime/{browserService.d.ts → browserUtil.d.ts}

@@ -1,5 +1,4 @@
 /// <reference types="node" />
 import type { Browser } from 'playwright-core';
 import type { ScreenshotOptions } from '../types';
-export declare function createBrowser(): Promise<any>;
 export declare function screenshot(browser: Browser, url: string, options: ScreenshotOptions): Promise<Buffer>;

package/dist/runtime/browserUtil.mjs

@@ -0,0 +1,22 @@
+export async function screenshot(browser, url, options) {
+  const page = await browser.newPage({
+    colorScheme: options.colorScheme
+  });
+  await page.setViewportSize({
+    width: options.width,
+    height: options.height
+  });
+  await page.goto(url, {
+    timeout: 1e4,
+    waitUntil: "networkidle"
+  });
+  if (options.mask) {
+    await page.evaluate((mask) => {
+      for (const el of document.querySelectorAll(mask))
+        el.style.display = "none";
+    }, options.mask);
+  }
+  if (options.selector)
+    await page.locator(options.selector).screenshot();
+  return await page.screenshot();
+}

package/dist/runtime/browsers/default.d.ts

@@ -0,0 +1 @@
+export declare function createBrowser(): Promise<any>;

package/dist/runtime/browsers/default.mjs

@@ -0,0 +1,19 @@
+export async function createBrowser() {
+  try {
+    const playwrightCore = await import(String("playwright-core"));
+    const { Launcher } = await import(String("chrome-launcher"));
+    const chromePath = Launcher.getFirstInstallation();
+    return await playwrightCore.chromium.launch({
+      headless: true,
+      executablePath: chromePath
+    });
+  } catch (e) {
+  }
+  try {
+    const playwright = await import(String("playwright"));
+    return await playwright.chromium.launch({
+      headless: true
+    });
+  } catch (e) {
+  }
+}

package/dist/runtime/browsers/lambda.d.ts

@@ -0,0 +1 @@
+export declare function createBrowser(): Promise<import("puppeteer-core").Browser>;

package/dist/runtime/browsers/lambda.mjs

@@ -0,0 +1,9 @@
+import edgeChromium from "chrome-aws-lambda";
+import puppeteer from "puppeteer-core";
+export async function createBrowser() {
+  return puppeteer.launch({
+    args: edgeChromium.args,
+    executablePath: await edgeChromium.executablePath,
+    headless: true
+  });
+}

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

@@ -1,3 +1,3 @@
 /// <reference types="node" />
-declare const _default: import("h3").EventHandler<Buffer | undefined>;
+declare const _default: import("h3").EventHandler<Buffer | import("h3").H3Error | undefined>;
 export default _default;

package/dist/runtime/nitro/image.mjs

@@ -1,12 +1,15 @@
-import { defineEventHandler, getRequestHeader, setHeader } from "h3";
-import { createBrowser, screenshot } from "../browserService.mjs";
+import { createError, defineEventHandler, getRequestHeader, setHeader } from "h3";
+import { screenshot } from "../browserUtil.mjs";
 import { DefaultRuntimeImageSuffix, HtmlRendererRoute } from "#nuxt-og-image/constants";
+import { createBrowser } from "#nuxt-og-image/browser";
 export default defineEventHandler(async (e) => {
   if (!e.path?.endsWith(DefaultRuntimeImageSuffix))
     return;
   const path = e.path.replace(DefaultRuntimeImageSuffix, HtmlRendererRoute);
   const host = getRequestHeader(e, "host") || "localhost:3000";
   const browser = await createBrowser();
+  if (!browser)
+    return createError("Could not create browser");
   setHeader(e, "Content-Type", "image/png");
   return await screenshot(browser, `http${host.startsWith("localhost") ? "" : "s"}://${host}/${path}`, {
     width: 1200,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-og-image",
   "type": "module",
-  "version": "0.5.0",
+  "version": "0.5.3",
   "packageManager": "pnpm@7.8.0",
   "license": "MIT",
   "funding": "https://github.com/sponsors/harlan-zw",
@@ -34,7 +34,6 @@
     "fast-glob": "^3.2.12",
     "ohash": "^1.0.0",
     "pathe": "^1.0.0",
-    "playwright-core": "^1.28.1",
     "radix3": "^1.0.0",
     "ufo": "^1.0.1"
   },
@@ -47,6 +46,7 @@
     "bumpp": "^8.2.1",
     "eslint": "8.29.0",
     "nuxt": "npm:nuxt3@latest",
+    "playwright-core": "^1.28.1",
     "puppeteer": "^19.4.0",
     "vitest": "^0.25.5"
   },

package/dist/runtime/browserService.mjs

@@ -1,64 +0,0 @@
-const debugBinaryUsage = (s, error) => {
-  if (!process.dev) {
-    console.log(s, error);
-  }
-};
-export async function createBrowser() {
-  try {
-    const playwrightCore = await import("playwright-core");
-    process.env.AWS_LAMBDA_FUNCTION_NAME = process.env.AWS_LAMBDA_FUNCTION_NAME || "RUNTIME_HACK";
-    const awsChrome = await import(String("chrome-aws-lambda"));
-    return await playwrightCore.chromium.launch({
-      args: awsChrome.args,
-      executablePath: await awsChrome.executablePath,
-      headless: awsChrome.headless
-    });
-  } catch (e) {
-    debugBinaryUsage("[nuxt-og-image] Skipping chrome-aws-lambda", e);
-  }
-  try {
-    const playwrightCore = await import("playwright-core");
-    const { Launcher } = await import("chrome-launcher");
-    const chromePath = Launcher.getFirstInstallation();
-    return await playwrightCore.chromium.launch({
-      headless: true,
-      executablePath: chromePath
-    });
-  } catch (e) {
-    debugBinaryUsage("[nuxt-og-image] Skipping chrome-launcher", e);
-  }
-  try {
-    const playwright = await import(String("playwright"));
-    return await playwright.chromium.launch({
-      headless: true
-    });
-  } catch (e) {
-    if (!process.dev)
-      debugBinaryUsage("[nuxt-og-image] Playwright failed", e);
-    throw new Error(`
-      Missing chromium binary. Please run "npx playwright install".
-    `);
-  }
-}
-export async function screenshot(browser, url, options) {
-  const page = await browser.newPage({
-    colorScheme: options.colorScheme
-  });
-  await page.setViewportSize({
-    width: options.width,
-    height: options.height
-  });
-  await page.goto(url, {
-    timeout: 1e4,
-    waitUntil: "networkidle"
-  });
-  if (options.mask) {
-    await page.evaluate((mask) => {
-      for (const el of document.querySelectorAll(mask))
-        el.style.display = "none";
-    }, options.mask);
-  }
-  if (options.selector)
-    await page.locator(options.selector).screenshot();
-  return await page.screenshot();
-}