jamdesk 1.0.5 → 1.0.7

package/vendored/lib/revalidation-trigger.ts

@@ -1,57 +1,59 @@
 /**
- * Revalidation Trigger
- *
- * Triggers cache revalidation on the Vercel ISR deployment
+ * Triggers cache revalidation on the Vercel ISR app and proxy
  * after content updates from the build service.
  */
 
 import { log } from './logger.js';
 
-/**
- * Options for triggering revalidation.
- */
 export interface RevalidationOptions {
-  /** Project slug */
   projectSlug: string;
   /** Specific paths that changed (without .mdx extension) */
   changedPaths?: string[];
-  /** Revalidate all pages for this project */
   all?: boolean;
 }
 
 /**
- * Trigger cache revalidation on the ISR app.
- *
- * Called by the build service after uploading content to R2.
- * This ensures that cached pages are refreshed with new content.
- *
- * Environment variables:
- * - ISR_APP_URL: URL of the ISR deployment (preferred)
- * - VERCEL_DEPLOYMENT_URL: Fallback for backward compatibility
- *
- * @param options - Revalidation options
+ * Trigger cache revalidation on the ISR app and proxy.
+ * Called after uploading content to R2.
  */
 export async function triggerRevalidation(options: RevalidationOptions): Promise<void> {
   const { projectSlug, changedPaths, all } = options;
 
-  // ISR_APP_URL is the preferred env var, VERCEL_DEPLOYMENT_URL is for backward compatibility
   const isrAppUrl = process.env.ISR_APP_URL || process.env.VERCEL_DEPLOYMENT_URL || 'https://docs.jamdesk.app';
-  const secret = process.env.REVALIDATE_SECRET || '';
+  const secret = (process.env.REVALIDATE_SECRET || '').trim();
 
   const body: Record<string, unknown> = {
     project: projectSlug,
   };
 
-  if (all) {
+  if (all || !changedPaths?.length) {
     body.all = true;
-  } else if (changedPaths && changedPaths.length > 0) {
-    // Convert file paths to URL paths (add leading slash)
-    body.paths = changedPaths.map(p => `/${p}`);
   } else {
-    // If no specific paths, revalidate all for this project
-    body.all = true;
+    body.paths = changedPaths.map(p => `/${p}`);
   }
 
+  // Proxy failure is non-fatal — cache will expire on its own
+  const [isrResult] = await Promise.all([
+    revalidateIsrApp(isrAppUrl, secret, body),
+    revalidateProxy(secret, projectSlug),
+  ]);
+
+  // Only throw if ISR revalidation failed (it's the critical one)
+  if (!isrResult.ok) {
+    throw new Error(`Revalidation failed: ${isrResult.status} - ${isrResult.error}`);
+  }
+
+  log('info', 'Revalidation triggered successfully', {
+    projectSlug,
+    revalidated: isrResult.revalidated || ['all'],
+  });
+}
+
+async function revalidateIsrApp(
+  isrAppUrl: string,
+  secret: string,
+  body: Record<string, unknown>,
+): Promise<{ ok: boolean; status?: number; error?: string; revalidated?: string[] }> {
   const response = await fetch(`${isrAppUrl}/api/revalidate`, {
     method: 'POST',
     headers: {
@@ -63,32 +65,43 @@ export async function triggerRevalidation(options: RevalidationOptions): Promise
 
   if (!response.ok) {
     const error = await response.text();
-    throw new Error(`Revalidation failed: ${response.status} - ${error}`);
+    return { ok: false, status: response.status, error };
   }
 
   const result = (await response.json()) as { success: boolean; revalidated?: string[] };
-  log('info', 'Revalidation triggered successfully', {
-    projectSlug,
-    revalidated: result.revalidated || ['all'],
-  });
+  return { ok: true, revalidated: result.revalidated };
+}
+
+/** Purge the proxy's Vercel CDN cache. Non-fatal on failure. */
+async function revalidateProxy(secret: string, projectSlug: string): Promise<void> {
+  const proxyUrl = process.env.PROXY_REVALIDATE_URL;
+  if (!proxyUrl) return;
+
+  try {
+    const response = await fetch(`${proxyUrl}/api/revalidate`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ project: projectSlug, secret }),
+    });
+
+    if (!response.ok) {
+      const error = await response.text();
+      log('warn', 'Proxy revalidation failed (non-fatal)', {
+        projectSlug, status: response.status, error,
+      });
+    }
+  } catch (err) {
+    log('warn', 'Proxy revalidation error (non-fatal)', {
+      projectSlug, error: (err as Error).message,
+    });
+  }
 }
 
-/**
- * Manifest structure for comparing file changes.
- */
 export interface Manifest {
   files: Record<string, { hash: string }>;
 }
 
-/**
- * Compare manifests and return paths that changed.
- *
- * Used to determine which pages need revalidation after a build.
- *
- * @param oldManifest - Previous manifest (null for first build)
- * @param newManifest - New manifest after build
- * @returns Array of changed paths (without .mdx extension)
- */
+/** Compare manifests and return paths that changed (without .mdx extension). */
 export function getChangedPaths(
   oldManifest: Manifest | null,
   newManifest: Manifest
@@ -118,15 +131,7 @@ export function getChangedPaths(
   return changed;
 }
 
-/**
- * Trigger revalidation for changed files between manifests.
- *
- * Convenience function that combines getChangedPaths and triggerRevalidation.
- *
- * @param projectSlug - Project identifier
- * @param oldManifest - Previous manifest (null for first build)
- * @param newManifest - New manifest after build
- */
+/** Trigger revalidation for changed files between manifests. */
 export async function triggerRevalidationForChanges(
   projectSlug: string,
   oldManifest: Manifest | null,

package/vendored/next.config.js

@@ -14,6 +14,18 @@
 const nextConfig = {
   // Hide dev indicator (floating icon in bottom-left)
   devIndicators: false,
+  // Allow /_jd/ image paths with ?v= cache-busting query strings in <Image>
+  images: {
+    localPatterns: [
+      {
+        pathname: '/_jd/**',
+      },
+      {
+        pathname: '/**',
+        search: '',
+      },
+    ],
+  },
   // Keep swagger-parser external (uses Node.js APIs)
   serverExternalPackages: ['@apidevtools/swagger-parser'],
   // Turbopack config - only resolveAlias, NOT root (root causes caching issues)