Revert "Investigate issue where icons and ogimage would occasionally fail. (#3099)"

This reverts commit f07982d.

Author: SamyPesse

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

@@ -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/src/app/middleware/(site)/(core)/~gitbook/icon/route.tsx

@@ -7,21 +7,8 @@ import { serveIcon } from '@/routes/icon';
 export const runtime = 'edge';
 
 export async function GET(req: NextRequest) {
-    try {
-        console.log('icon: getSiteContentPointer');
-        const pointer = await getSiteContentPointer();
-        console.log('icon: fetchV1context');
-        const context = await fetchV1ContextForSitePointer(pointer);
+    const pointer = await getSiteContentPointer();
+    const context = await fetchV1ContextForSitePointer(pointer);
 
-        // biome-ignore lint/suspicious/noConsole: we want to log here
-        console.log(`serving icon for ${context.site.id}`);
-
-        return await serveIcon(context, req);
-    } catch (err) {
-        if (err instanceof Error) {
-            console.error(`icon: ${err.toString()}`, err.stack);
-        }
-
-        throw err;
-    }
+    return serveIcon(context, req);
 }

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

@@ -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/v1.ts

@@ -285,7 +285,6 @@ async function getDataFetcherV1(): Promise<GitBookDataFetcher> {
 export async function fetchV1ContextForSitePointer(pointer: SiteContentPointer) {
     const baseContext = await getV1BaseContext();
 
-    console.log('icon: baseContext success');
     const context = await fetchSiteContextByIds(baseContext, {
         organization: pointer.organizationId,
         site: pointer.siteId,
@@ -296,10 +295,8 @@ export async function fetchV1ContextForSitePointer(pointer: SiteContentPointer)
         changeRequest: pointer.changeRequestId,
         revision: pointer.revisionId,
     });
-    console.log('icon: context inner success');
 
     context.customization = await getDynamicCustomizationSettings(context.customization);
-    console.log('icon: customization success');
 
     return context;
 }

packages/gitbook/src/routes/icon.tsx

@@ -27,7 +27,6 @@ const SIZES = {
  * Generate an icon for a site content.
  */
 export async function serveIcon(context: GitBookSiteContext, req: Request) {
-    console.log('icon: serveIcon', req.url);
     const options = getOptions(req.url);
     const size = SIZES[options.size];