remove GITBOOK_API binding

Author: Nicolas Dorseuil

packages/gitbook-v2/openNext/customWorkers/defaultWrangler.jsonc

@@ -29,10 +29,6 @@
                     "binding": "WORKER_SELF_REFERENCE",
                     "service": "gitbook-open-v2-server-dev"
                 },
-                {
-                    "binding": "GITBOOK_API",
-                    "service": "gitbook-x-prod-api-cache"
-                },
                 {
                     "binding": "MIDDLEWARE_REFERENCE",
                     "service": "gitbook-open-v2-dev"
@@ -54,10 +50,6 @@
                     "binding": "WORKER_SELF_REFERENCE",
                     "service": "gitbook-open-v2-server-preview"
                 },
-                {
-                    "binding": "GITBOOK_API",
-                    "service": "gitbook-x-prod-api-cache"
-                },
                 {
                     "binding": "MIDDLEWARE_REFERENCE",
                     "service": "gitbook-open-v2-preview"
@@ -78,10 +70,6 @@
                     "binding": "WORKER_SELF_REFERENCE",
                     "service": "gitbook-open-v2-server-staging"
                 },
-                {
-                    "binding": "GITBOOK_API",
-                    "service": "gitbook-x-staging-api-cache"
-                },
                 {
                     "binding": "MIDDLEWARE_REFERENCE",
                     "service": "gitbook-open-v2-staging"
@@ -105,10 +93,6 @@
                     "binding": "WORKER_SELF_REFERENCE",
                     "service": "gitbook-open-v2-server-production"
                 },
-                {
-                    "binding": "GITBOOK_API",
-                    "service": "gitbook-x-prod-api-cache"
-                },
                 {
                     "binding": "MIDDLEWARE_REFERENCE",
                     "service": "gitbook-open-v2-production"

packages/gitbook-v2/openNext/customWorkers/middlewareWrangler.jsonc

@@ -33,10 +33,6 @@
                     "binding": "WORKER_SELF_REFERENCE",
                     "service": "gitbook-open-v2-dev"
                 },
-                {
-                    "binding": "GITBOOK_API",
-                    "service": "gitbook-x-prod-api-cache"
-                },
                 {
                     "binding": "DEFAULT_WORKER",
                     "service": "gitbook-open-v2-server-dev"
@@ -60,10 +56,6 @@
                     "binding": "WORKER_SELF_REFERENCE",
                     "service": "gitbook-open-v2-preview"
                 },
-                {
-                    "binding": "GITBOOK_API",
-                    "service": "gitbook-x-prod-api-cache"
-                },
                 {
                     "binding": "DEFAULT_WORKER",
                     "service": "gitbook-open-v2-server-preview"
@@ -98,10 +90,6 @@
                     "binding": "WORKER_SELF_REFERENCE",
                     "service": "gitbook-open-v2-staging"
                 },
-                {
-                    "binding": "GITBOOK_API",
-                    "service": "gitbook-x-staging-api-cache"
-                },
                 {
                     "binding": "DEFAULT_WORKER",
                     "service": "gitbook-open-v2-server-staging"
@@ -163,10 +151,6 @@
                     "binding": "WORKER_SELF_REFERENCE",
                     "service": "gitbook-open-v2-production"
                 },
-                {
-                    "binding": "GITBOOK_API",
-                    "service": "gitbook-x-prod-api-cache"
-                },
                 {
                     "binding": "DEFAULT_WORKER",
                     "service": "gitbook-open-v2-server-production"

packages/gitbook-v2/openNext/tagCache/server.ts

@@ -2,12 +2,16 @@ import type { NextModeTagCache } from '@opennextjs/aws/types/overrides.js';
 import { getCloudflareContext } from '@opennextjs/cloudflare';
 
 interface Env {
-    MIDDLEWARE_REFERENCE?: Pick<NextModeTagCache, 'writeTags' | 'getLastRevalidated'>;
+    MIDDLEWARE_REFERENCE?: Pick<
+        NextModeTagCache,
+        'writeTags' | 'getLastRevalidated' | 'hasBeenRevalidated'
+    >;
 }
 
 export default {
     name: 'GitbookTagCache',
     mode: 'nextMode',
+    // This one is used for the composable cache.
     getLastRevalidated: async (tags: string[]) => {
         try {
             const { env } = getCloudflareContext();
@@ -20,13 +24,19 @@ export default {
             return 0; // Fallback to 0 if there's an error
         }
     },
+    // This one get called for ISR/SSG cache, if we reach here, it very likely means that we need to revalidate the page.
+    // TODO: see if we could just return true.
     hasBeenRevalidated: async (tags: string[]) => {
-        // We should never reach this point in the server. If that's the case, we should log it.
-        console.warn(
-            'GitbookTagCache: hasBeenRevalidated called on server side, this should not happen.',
-            tags
-        );
-        return false;
+        try {
+            const { env } = getCloudflareContext();
+            const hasBeenRevalidated = await (env as Env).MIDDLEWARE_REFERENCE?.hasBeenRevalidated(
+                tags
+            );
+            return hasBeenRevalidated ?? false; // Fallback to false if there's no revalidation status
+        } catch (error) {
+            console.error('GitbookTagCache: Error checking revalidation:', error);
+            return false; // Fallback to false if there's an error
+        }
     },
     writeTags: async (tags: string[]) => {
         try {

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

@@ -2,7 +2,6 @@ import { trace } from '@/lib/tracing';
 import {
     type ComputedContentSource,
     GitBookAPI,
-    type GitBookAPIServiceBinding,
     type HttpResponse,
     type RenderIntegrationUI,
 } from '@gitbook/api';
@@ -828,37 +827,18 @@ async function* streamAIResponse(
     }
 }
 
-// const loggedServiceBinding = false;
-
 /**
  * Create a new API client.
+ * We don't use the binding because it can cause Error: Response closed due to connection limit
+ * Connection limit are shared between all the bindings.
  */
 export function apiClient(input: DataFetcherInput = { apiToken: null }) {
     const { apiToken } = input;
-    let serviceBinding: GitBookAPIServiceBinding | undefined;
-
-    // TODO: Don't forget to uncomment if it wasn't the issue.
-    // const cloudflareContext = getCloudflareContext();
-    // if (cloudflareContext) {
-    //     // @ts-expect-error
-    //     serviceBinding = cloudflareContext.env.GITBOOK_API as GitBookAPIServiceBinding | undefined;
-    //     if (!loggedServiceBinding) {
-    //         loggedServiceBinding = true;
-    //         if (serviceBinding) {
-    //             // biome-ignore lint/suspicious/noConsole: we want to log here
-    //             console.log(`using service binding for the API (${GITBOOK_API_URL})`);
-    //         } else {
-    //             // biome-ignore lint/suspicious/noConsole: we want to log here
-    //             console.warn(`no service binding for the API (${GITBOOK_API_URL})`);
-    //         }
-    //     }
-    // }
 
     const api = new GitBookAPI({
         authToken: apiToken || GITBOOK_API_TOKEN || undefined,
         endpoint: GITBOOK_API_URL,
         userAgent: GITBOOK_USER_AGENT,
-        serviceBinding,
     });
 
     return api;