@gradial/aci 0.1.13 → 0.1.15

package/dist/next/middleware.d.ts

@@ -1,8 +1,7 @@
-import { type NextRequest } from 'next/server.js';
+import { NextResponse, type NextRequest } from 'next/server.js';
 export interface GradialMiddlewareConfig {
     siteId: string;
     edgeConfig?: string;
-    previewSignKey?: string;
     deploymentId?: string;
 }
-export declare function createGradialMiddleware(config: GradialMiddlewareConfig): (request: NextRequest) => Promise<Response>;
+export declare function createGradialMiddleware(config: GradialMiddlewareConfig): (request: NextRequest) => Promise<NextResponse<unknown>>;

package/dist/next/middleware.js

@@ -7,7 +7,15 @@ const DISPATCH_HEADER = 'x-gradial-dispatch';
 export function createGradialMiddleware(config) {
     return async function gradialMiddleware(request) {
         const url = request.nextUrl;
+        console.log('[gradial/mw] === middleware start ===');
+        console.log('[gradial/mw] path:', url.pathname, 'search:', url.search.slice(0, 100));
+        console.log('[gradial/mw] siteId:', config.siteId);
+        console.log('[gradial/mw] EDGE_CONFIG:', process.env.EDGE_CONFIG ? 'set' : 'NOT SET');
+        console.log('[gradial/mw] GRADIAL_PREVIEW_SIGN_KEY:', process.env.GRADIAL_PREVIEW_SIGN_KEY ? `set (${process.env.GRADIAL_PREVIEW_SIGN_KEY.length} chars, prefix: ${process.env.GRADIAL_PREVIEW_SIGN_KEY.slice(0, 6)})` : 'NOT SET');
+        console.log('[gradial/mw] VERCEL_DEPLOYMENT_ID:', process.env.VERCEL_DEPLOYMENT_ID || 'NOT SET');
+        // ?leave_preview=1 → clear cookies, redirect to clean URL
         if (url.searchParams.get('leave_preview') === '1') {
+            console.log('[gradial/mw] leave_preview=1, clearing cookies and redirecting');
             const cleanUrl = new URL(url.pathname, url.origin);
             const response = NextResponse.redirect(cleanUrl);
             response.cookies.delete('aci_preview');
@@ -15,36 +23,45 @@ export function createGradialMiddleware(config) {
             return response;
         }
         const requestHeaders = gradialHeaders(request.headers);
-        const preview = await releaseFromPreviewToken(request, config);
-        if (preview.invalid) {
-            return new Response('invalid preview token', { status: 403 });
-        }
-        const releaseId = preview.releaseId || await activeReleaseFromEdgeConfig(config);
+        // Try preview token first; if valid, use that release.
+        // If no token or invalid, fall through to active release from edge config.
+        const previewReleaseId = await releaseIdFromPreviewToken(request, config);
+        console.log('[gradial/mw] previewReleaseId from token:', previewReleaseId || '(none)');
+        const releaseId = previewReleaseId || await activeReleaseFromEdgeConfig(config);
+        console.log('[gradial/mw] final releaseId:', releaseId || '(none)');
         if (!releaseId) {
+            console.log('[gradial/mw] no releaseId, passing through with no headers');
             return NextResponse.next({ request: { headers: requestHeaders } });
         }
         requestHeaders.set(RELEASE_HEADER, releaseId);
         requestHeaders.set(ROUTE_HEADER, url.pathname);
         requestHeaders.set(DISPATCH_HEADER, 'ssr-page');
-        if (preview.releaseId) {
+        if (previewReleaseId) {
             requestHeaders.set('x-gradial-preview', '1');
+            console.log('[gradial/mw] set x-gradial-preview=1 and x-gradial-release-id:', releaseId);
+        }
+        else {
+            console.log('[gradial/mw] set x-gradial-release-id (active):', releaseId);
         }
         const response = NextResponse.next({ request: { headers: requestHeaders } });
+        // Persist preview token as cookie so navigation stays in preview
         const queryToken = url.searchParams.get('preview_token');
-        if (queryToken && preview.releaseId) {
+        if (queryToken && previewReleaseId) {
+            console.log('[gradial/mw] setting preview cookies for release:', previewReleaseId);
             response.cookies.set('aci_preview', queryToken, {
                 httpOnly: true,
                 sameSite: 'lax',
                 maxAge: 60 * 60,
                 path: '/',
             });
-            response.cookies.set('aci_preview_release', preview.releaseId, {
+            response.cookies.set('aci_preview_release', previewReleaseId, {
                 httpOnly: false,
                 sameSite: 'lax',
                 maxAge: 60 * 60,
                 path: '/',
             });
         }
+        console.log('[gradial/mw] === middleware end ===');
         return response;
     };
 }
@@ -57,15 +74,19 @@ function gradialHeaders(headers) {
 }
 async function activeReleaseFromEdgeConfig(config) {
     const edgeConfig = config.edgeConfig || process.env.EDGE_CONFIG || '';
-    if (!edgeConfig || !config.siteId)
+    if (!edgeConfig || !config.siteId) {
+        console.log('[gradial/mw] activeRelease: no edgeConfig or siteId, skipping');
         return '';
+    }
     const active = await activeReleasePointer(edgeConfig, config.siteId);
+    console.log('[gradial/mw] activeRelease pointer:', JSON.stringify(active));
     if (!active.releaseId)
         return '';
     const deploymentId = config.deploymentId || process.env.VERCEL_DEPLOYMENT_ID || '';
     if (!deploymentId)
         return active.releaseId;
     const compatibility = await getEdgeConfigJSON(edgeConfig, deploymentCompatibilityKey(config.siteId, deploymentId));
+    console.log('[gradial/mw] compatibility:', compatibility ? JSON.stringify(compatibility) : '(none)');
     if (!compatibility)
         return active.releaseId;
     return clampRelease(active.releaseId, active.sequence || 0, compatibility);
@@ -125,23 +146,34 @@ function clampRelease(activeReleaseId, activeSequence, compatibility) {
 function edgeKeySegment(value) {
     return value.replace(/[^A-Za-z0-9_-]/g, '_');
 }
-async function releaseFromPreviewToken(request, config) {
+async function releaseIdFromPreviewToken(request, config) {
     const token = previewTokenFromRequest(request);
+    console.log('[gradial/mw] previewToken: token found:', !!token, 'len:', token.length);
     if (!token)
-        return { releaseId: '', invalid: false };
-    const signKey = config.previewSignKey || process.env.ACI_PREVIEW_SIGN_KEY || process.env.GRADIAL_PREVIEW_SIGN_KEY || '';
+        return '';
+    const signKey = process.env.GRADIAL_PREVIEW_SIGN_KEY || '';
     if (!signKey) {
-        console.warn('[gradial] preview sign key not set (ACI_PREVIEW_SIGN_KEY or GRADIAL_PREVIEW_SIGN_KEY) — preview token ignored');
-        return { releaseId: '', invalid: false };
+        console.warn('[gradial/mw] GRADIAL_PREVIEW_SIGN_KEY not set — preview tokens will be ignored');
+        return '';
     }
+    console.log('[gradial/mw] signKey present, len:', signKey.length, 'prefix:', signKey.slice(0, 6));
+    console.log('[gradial/mw] calling validatePreviewToken...');
     const claims = await validatePreviewToken(token, signKey);
-    if (!claims || claims.scope !== 'preview' || !claims.releaseId)
-        return { releaseId: '', invalid: true };
-    if (claims.siteId && config.siteId && claims.siteId !== config.siteId)
-        return { releaseId: '', invalid: true };
-    if (!claims.expiresAt || Date.parse(claims.expiresAt) <= Date.now())
-        return { releaseId: '', invalid: true };
-    return { releaseId: claims.releaseId, invalid: false };
+    console.log('[gradial/mw] validatePreviewToken result:', claims ? JSON.stringify(claims) : 'null');
+    if (!claims || claims.scope !== 'preview' || !claims.releaseId) {
+        console.log('[gradial/mw] claims invalid: scope=', claims?.scope, 'releaseId=', claims?.releaseId);
+        return '';
+    }
+    if (claims.siteId && config.siteId && claims.siteId !== config.siteId) {
+        console.log('[gradial/mw] siteId mismatch: token=', claims.siteId, 'config=', config.siteId);
+        return '';
+    }
+    if (!claims.expiresAt || Date.parse(claims.expiresAt) <= Date.now()) {
+        console.log('[gradial/mw] token expired or no expiresAt:', claims.expiresAt);
+        return '';
+    }
+    console.log('[gradial/mw] preview token valid! releaseId:', claims.releaseId);
+    return claims.releaseId;
 }
 function previewTokenFromRequest(request) {
     const queryToken = request.nextUrl.searchParams.get('preview_token');

package/dist/next/preview.js

@@ -1,18 +1,32 @@
 export async function validatePreviewToken(token, signKey) {
     try {
+        console.log('[gradial/preview] validatePreviewToken start, token len:', token.length, 'key len:', signKey.length);
         const parts = token.split('.');
-        if (parts.length !== 3)
+        console.log('[gradial/preview] parts:', parts.length);
+        if (parts.length !== 3) {
+            console.log('[gradial/preview] invalid token structure, parts:', parts.length);
             return null;
+        }
         const signingInput = `${parts[0]}.${parts[1]}`;
         const signature = base64URLToBytes(parts[2]);
+        console.log('[gradial/preview] signature bytes:', signature.length);
         const key = await crypto.subtle.importKey('raw', new TextEncoder().encode(signKey), { name: 'HMAC', hash: 'SHA-256' }, false, ['sign']);
         const expected = new Uint8Array(await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(signingInput)));
-        if (!constantTimeEqual(signature, expected))
+        console.log('[gradial/preview] expected sig bytes:', expected.length);
+        console.log('[gradial/preview] sig match:', constantTimeEqual(signature, expected));
+        if (!constantTimeEqual(signature, expected)) {
+            console.log('[gradial/preview] signature mismatch!');
+            console.log('[gradial/preview] got sig:', Array.from(signature.slice(0, 8)).join(','));
+            console.log('[gradial/preview] exp sig:', Array.from(expected.slice(0, 8)).join(','));
             return null;
+        }
         const payload = new TextDecoder().decode(base64URLToBytes(parts[1]));
-        return JSON.parse(payload);
+        const claims = JSON.parse(payload);
+        console.log('[gradial/preview] valid token, claims:', JSON.stringify(claims));
+        return claims;
     }
-    catch {
+    catch (err) {
+        console.log('[gradial/preview] validation error:', String(err));
         return null;
     }
 }

package/dist/next/server.js

@@ -74,11 +74,16 @@ export async function getPageRuntimeRenderInput() {
 export async function isPreviewMode() {
     try {
         const current = await headers();
-        if (current.get(PREVIEW_HEADER) === '1') {
-            return current.get(RELEASE_HEADER) || '';
+        const previewFlag = current.get(PREVIEW_HEADER);
+        const releaseId = current.get(RELEASE_HEADER);
+        console.log('[gradial/server] isPreviewMode: x-gradial-preview=', previewFlag, 'x-gradial-release-id=', releaseId || '(none)');
+        if (previewFlag === '1') {
+            return releaseId || '';
         }
     }
-    catch { }
+    catch (err) {
+        console.log('[gradial/server] isPreviewMode error:', String(err));
+    }
     return '';
 }
 export async function routeFromNextParams(params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradial/aci",
-  "version": "0.1.13",
+  "version": "0.1.15",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",