Revert debugging of ogimage errors (#3105)

Author: SamyPesse

bun.lock

@@ -72,17 +72,6 @@ export function createLinker(
 
     const siteBasePath = withTrailingSlash(withLeadingSlash(servedOn.siteBasePath));
     const spaceBasePath = withTrailingSlash(withLeadingSlash(servedOn.spaceBasePath));
-    const protocol = (() => {
-        if (servedOn.protocol) {
-            return servedOn.protocol;
-        }
-
-        if (servedOn.host) {
-            return servedOn.host.startsWith('localhost') ? 'http:' : 'https:';
-        }
-
-        return 'https:';
-    })();
 
     const linker: GitBookLinker = {
         toPathInSpace(relativePath: string): string {
@@ -108,7 +97,7 @@ export function createLinker(
                 return absolutePath;
             }
 
-            return `${protocol}//${joinPaths(servedOn.host, absolutePath)}`;
+            return `${servedOn.protocol ?? 'https:'}//${joinPaths(servedOn.host, absolutePath)}`;
         },
 
         toPathForPage({ pages, page, anchor }) {

packages/gitbook-v2/src/lib/links.ts

@@ -33,7 +33,6 @@
         "@sindresorhus/fnv1a": "^3.1.0",
         "@tailwindcss/container-queries": "^0.1.1",
         "@tailwindcss/typography": "^0.5.16",
-        "@vercel/og": "0.6.8.",
         "ai": "^4.2.2",
         "assert-never": "^1.2.1",
         "bun-types": "^1.1.20",

packages/gitbook/package.json

@@ -1,103 +1,14 @@
-import { ImageResponse } from '@vercel/og';
-import { notFound, redirect } from 'next/navigation';
 import type { NextRequest } from 'next/server';
 
-import { getEmojiForCode } from '@/lib/emojis';
 import { getSiteContentPointer } from '@/lib/pointer';
-import { tcls } from '@/lib/tailwind';
 import { fetchV1ContextForSitePointer } from '@/lib/v1';
-import { getResizedImageURL } from '@v2/lib/images';
+import { serveIcon } from '@/routes/icon';
 
 export const runtime = 'edge';
 
-const SIZES = {
-    /** Size for a favicon */
-    small: {
-        width: 48,
-        height: 48,
-        textSize: 'text-[32px]',
-        boxStyle: 'rounded-[8px]',
-    },
-    /** Size for display as an app icon or in the header */
-    medium: {
-        width: 256,
-        height: 256,
-        textSize: 'text-[164px]',
-        boxStyle: 'rounded-[32px]',
-    },
-};
-
-/**
- * Generate an icon for a site content.
- */
 export async function GET(req: NextRequest) {
-    const options = getOptions(req.url);
     const pointer = await getSiteContentPointer();
     const context = await fetchV1ContextForSitePointer(pointer);
 
-    const size = SIZES[options.size];
-    const { site, customization } = context;
-    const customIcon = 'icon' in customization.favicon ? customization.favicon.icon : null;
-
-    // If the site has a custom icon, redirect to it
-    if (customIcon) {
-        const iconUrl = options.theme === 'light' ? customIcon.light : customIcon.dark;
-        redirect(
-            await getResizedImageURL(context.imageResizer, iconUrl, {
-                width: size.width,
-                height: size.height,
-            })
-        );
-    }
-
-    const contentTitle = site.title;
-    return new ImageResponse(
-        <div
-            tw={tcls(options.theme === 'light' ? 'bg-white' : 'bg-black', size.boxStyle)}
-            style={{
-                width: '100%',
-                height: '100%',
-                display: 'flex',
-                alignItems: 'center',
-                justifyContent: 'center',
-            }}
-        >
-            <h2
-                tw={tcls(
-                    size.textSize,
-                    'font-bold',
-                    'tracking-tight',
-                    options.theme === 'light' ? 'text-black' : 'text-white'
-                )}
-            >
-                {'emoji' in customization.favicon
-                    ? getEmojiForCode(customization.favicon.emoji)
-                    : contentTitle.slice(0, 1).toUpperCase()}
-            </h2>
-        </div>,
-        {
-            width: size.width,
-            height: size.height,
-        }
-    );
-}
-
-function getOptions(inputUrl: string): {
-    size: keyof typeof SIZES;
-    theme: 'light' | 'dark';
-} {
-    const url = new URL(inputUrl);
-    const sizeParam = (url.searchParams.get('size') ?? 'small') as keyof typeof SIZES;
-    const themeParam = url.searchParams.get('theme') ?? 'light';
-
-    if (!SIZES[sizeParam] || !['light', 'dark'].includes(themeParam)) {
-        notFound();
-    }
-
-    return {
-        // @ts-ignore
-        size: sizeParam,
-        // @ts-ignore
-        theme: themeParam,
-    };
+    return serveIcon(context, req);
 }

packages/gitbook/src/app/middleware/(site)/(core)/~gitbook/icon/route.tsx

@@ -26,12 +26,7 @@ export const cloudflareDOCache: CacheBackend = {
                     return null;
                 }
 
-                try {
-                    return (await stub.get<CacheEntry>(key)) ?? null;
-                } catch (err) {
-                    console.error('cloudflareDO.get', err);
-                    return null;
-                }
+                return (await stub.get<CacheEntry>(key)) ?? null;
             }
         );
     },

packages/gitbook/src/lib/cache/cloudflare-do.ts

@@ -1,5 +1,5 @@
-import { ImageResponse } from '@vercel/og';
 import { notFound, redirect } from 'next/navigation';
+import { ImageResponse } from 'next/og';
 
 import { getEmojiForCode } from '@/lib/emojis';
 import { tcls } from '@/lib/tailwind';
@@ -32,6 +32,7 @@ export async function serveIcon(context: GitBookSiteContext, req: Request) {
 
     const { site, customization } = context;
     const customIcon = 'icon' in customization.favicon ? customization.favicon.icon : null;
+
     // If the site has a custom icon, redirect to it
     if (customIcon) {
         const iconUrl = options.theme === 'light' ? customIcon.light : customIcon.dark;
@@ -44,6 +45,7 @@ export async function serveIcon(context: GitBookSiteContext, req: Request) {
     }
 
     const contentTitle = site.title;
+
     return new ImageResponse(
         <div
             tw={tcls(options.theme === 'light' ? 'bg-white' : 'bg-black', size.boxStyle)}