Merge branch 'main' into dev

Author: codercatdev

app/api/cron/check-renders/route.ts

@@ -292,7 +292,13 @@ async function createSanityDocuments(
 			_type: "reference",
 			_ref: contentIdea._id,
 		},
-		script: script.script,
+		script: {
+			...script.script,
+			scenes: script.script.scenes.map((scene, i) => ({
+				...scene,
+				_key: `scene-${i + 1}`,
+			})),
+		},
 		scriptQualityScore: criticResult.score,
 		status: isFlagged ? "flagged" : "script_ready",
 		...(isFlagged && {

app/api/cron/ingest/route.ts

@@ -1,4 +1,4 @@
-import { NextResponse } from 'next/server';
+import { NextResponse, after } from 'next/server';
 import { isValidSignature, SIGNATURE_HEADER_NAME } from '@sanity/webhook';
 import { processVideoProduction } from '@/lib/services/video-pipeline';
 
@@ -82,10 +82,16 @@ export async function POST(request: Request) {
       );
     }
 
-    // Fire and forget — trigger pipeline in background, return 200 immediately
+    // Use after() to run the pipeline after the response is sent.
+    // On Vercel, serverless functions terminate after the response — fire-and-forget
+    // (promise.catch() without await) silently dies. after() keeps the function alive.
     console.log(`[WEBHOOK] Triggering video production for document: ${body._id}`);
-    processVideoProduction(body._id).catch((error) => {
-      console.log(`[WEBHOOK] Background processing error for ${body._id}:`, error);
+    after(async () => {
+      try {
+        await processVideoProduction(body._id);
+      } catch (error) {
+        console.error(`[WEBHOOK] Background processing error for ${body._id}:`, error);
+      }
     });
 
     return NextResponse.json({ triggered: true }, { status: 200 });

app/api/webhooks/sanity-content/route.ts

@@ -1,31 +1,12 @@
 import { type NextRequest, NextResponse } from "next/server";
-import * as crypto from "node:crypto";
+import { isValidSignature, SIGNATURE_HEADER_NAME } from "@sanity/webhook";
 import { writeClient } from "@/lib/sanity-write-client";
 import { generateWithGemini } from "@/lib/gemini";
 import { uploadVideo, uploadShort, generateShortsMetadata } from "@/lib/youtube-upload";
 import { notifySubscribers } from "@/lib/resend-notify";
 import { postVideoAnnouncement } from "@/lib/x-social";
 
-// ---------------------------------------------------------------------------
-// Webhook signature validation
-// ---------------------------------------------------------------------------
-
-function isValidSignature(body: string, signature: string | null): boolean {
-  const secret = process.env.SANITY_WEBHOOK_SECRET;
-  if (!secret) {
-    console.warn("[sanity-distribute] SANITY_WEBHOOK_SECRET not set");
-    return true;
-  }
-  if (!signature) return false;
-  const hmac = crypto.createHmac("sha256", secret);
-  hmac.update(body);
-  const digest = hmac.digest("base64");
-  try {
-    return crypto.timingSafeEqual(Buffer.from(signature), Buffer.from(digest));
-  } catch {
-    return false;
-  }
-}
+const WEBHOOK_SECRET = process.env.SANITY_WEBHOOK_SECRET;
 
 // ---------------------------------------------------------------------------
 // Types
@@ -122,8 +103,15 @@ async function updateStatus(docId: string, status: string, extra: Record<string,
 
 export async function POST(req: NextRequest): Promise<NextResponse> {
   const rawBody = await req.text();
-  const signature = req.headers.get("sanity-webhook-signature");
-  if (!isValidSignature(rawBody, signature)) {
+  const signature = req.headers.get(SIGNATURE_HEADER_NAME);
+
+  if (!WEBHOOK_SECRET) {
+    console.error("[sanity-distribute] Missing SANITY_WEBHOOK_SECRET");
+    return NextResponse.json({ error: "Server misconfigured" }, { status: 500 });
+  }
+
+  if (!signature || !(await isValidSignature(rawBody, signature, WEBHOOK_SECRET))) {
+    console.log("[sanity-distribute] Invalid signature");
     return NextResponse.json({ error: "Invalid signature" }, { status: 401 });
   }