Log and use same function for service binding

Author: SamyPesse

packages/gitbook-v2/src/lib/data/cloudflare.ts

@@ -1,3 +1,5 @@
+import { getCloudflareContext as getCloudflareContextOpenNext } from '@opennextjs/cloudflare';
+
 /**
  * Load the cloudflare context.
  * This is a workaround to avoid webpack trying to bundle this cloudflare only module.
@@ -19,17 +21,26 @@ export async function getCloudflareContext(): Promise<{
     ctx: Record<string, unknown>;
 } | null> {
     try {
-        // HACK: This is a workaround to avoid webpack trying to bundle this cloudflare only module
         // @ts-ignore
-        const cloudflareContext = await import(
-            /* webpackIgnore: true */ `${'__cloudflare:workers'.replaceAll('_', '')}`
-        );
-        return cloudflareContext;
+        return await getCloudflareContextOpenNext();
     } catch (error) {
         if (process.env.NODE_ENV === 'production' && !process.env.VERCEL) {
             throw error;
         }
     }
 
     return null;
+    // try {
+    //     // HACK: This is a workaround to avoid webpack trying to bundle this cloudflare only module
+    //     // @ts-ignore
+    //     const cloudflareContext = await import(
+    //         /* webpackIgnore: true */ `${'__cloudflare:workers'.replaceAll('_', '')}`
+    //     );
+    //     return cloudflareContext;
+    // } catch (error) {
+    //     if (process.env.NODE_ENV === 'production' && !process.env.VERCEL) {
+    //         throw error;
+    //     }
+    // }
+    // return null;
 }

packages/gitbook-v2/src/lib/data/memoize.ts

@@ -70,9 +70,12 @@ async function getRequestCacheWeakMap(): Promise<WeakMap<any, CacheStorage<strin
             // `cf` changes for each request, we can use it as an identifier of the request to isolate the cache per request
             const requestCache = perRequestCache.get(cloudflareContext.cf);
             if (requestCache) {
+                console.log('Reusing per-request cache', cloudflareContext.cf);
                 return requestCache;
             }
 
+            console.log('Allocating per-request cache', cloudflareContext.cf);
+
             const newRequestCache = new WeakMap<any, CacheStorage<string, unknown>>();
             perRequestCache.set(cloudflareContext.cf, newRequestCache);
             return newRequestCache;
@@ -81,6 +84,8 @@ async function getRequestCacheWeakMap(): Promise<WeakMap<any, CacheStorage<strin
         if (process.env.NODE_ENV === 'production' && !process.env.VERCEL) {
             throw error;
         }
+
+        console.warn('Failed to get cloudflare context, using global cache', error);
     }
 
     return globalCache;