@decocms/nextjs 8.6.0 → 8.7.0

package/src/server/index.ts

@@ -34,8 +34,13 @@ import {
   parseAssignmentsSegment,
   withoutDarkTests,
 } from "../assignments.ts";
-import { DRAFT_PARAM, VERSION_HEADER } from "../draft.ts";
-import { allowedDraft, requestLike } from "../drafts.ts";
+import {
+  DRAFT_PARAM,
+  DRAFT_UNAVAILABLE_HEADER,
+  RELEASE_CHECK_HEADER,
+  VERSION_HEADER,
+} from "../draft.ts";
+import { allowedDraft, draftReleaseCheck, requestLike } from "../drafts.ts";
 import { VISITOR_HEADER } from "../visitor.ts";
 import { activeDraftPointer, draftSlot } from "./slot.ts";
 
@@ -56,7 +61,7 @@ export interface BindDraftOptions {
   searchParams?: SearchParams;
 }
 
-type BindCMS = Pick<CMS, "readVersion" | "forRelease">;
+type BindCMS = Pick<CMS, "readVersion" | "forRelease" | "checkRelease">;
 
 function firstParam(searchParams: SearchParams | undefined, key: string): string | null {
   const raw = searchParams?.[key];
@@ -123,12 +128,27 @@ async function bindVersion(cms: BindCMS, options: BindDraftOptions): Promise<boo
   const param = firstParam(searchParams, DRAFT_PARAM);
   if (param === "off") return false;
   const requestHeaders = await headers();
+  // The proxy read the link's draft and it's gone: the release, with the notice.
+  if (requestHeaders.get(DRAFT_UNAVAILABLE_HEADER) === "1") {
+    draftSlot().unavailable = true;
+    return false;
+  }
   const forwarded = param ?? requestHeaders.get(VERSION_HEADER);
   const query = forwarded ? `?${DRAFT_PARAM}=${encodeURIComponent(forwarded)}` : "";
   const request = requestLike(requestHeaders as Headers, `/${query}`);
-  const version = request ? await allowedDraft(cms, request) : null;
+  if (request === null) return false;
+  // The proxy's release check for this request (`x-deco-release-check`), or one of its own:
+  // the host check here and the page's draft reads share it.
+  const releaseCheck = await draftReleaseCheck(
+    cms,
+    request,
+    requestHeaders.get(RELEASE_CHECK_HEADER),
+  );
+  const version = await allowedDraft(cms, request, releaseCheck);
   if (version === null) return false;
-  draftSlot().version = version;
+  const slot = draftSlot();
+  slot.version = version;
+  slot.releaseCheck = releaseCheck ?? null;
   return true;
 }
 
@@ -140,8 +160,9 @@ async function bindVersion(cms: BindCMS, options: BindDraftOptions): Promise<boo
  * and campaigns decide instead. Create one per request.
  */
 export function contentClient(cms: Pick<CMS, "client">): Client {
-  const { version, visitor, assignments } = draftSlot();
+  const { version, visitor, assignments, releaseCheck } = draftSlot();
   const options: ClientOptions = { visitor, version: version?.version ?? null };
+  if (version !== null && releaseCheck !== null) options.releaseCheck = releaseCheck;
   if (version?.date !== undefined) options.date = version.date;
   const experiments = over(version?.experiments, assignments?.experiments);
   const campaigns = over(version?.campaigns, assignments?.campaigns);

package/src/server/slot.ts

@@ -15,13 +15,28 @@ interface DraftSlot {
   version: RequestVersion | null;
   visitor: Visitor | null;
   assignments: PathAssignments | null;
+  /** The link named a draft that can't be read anymore: the page renders the release. */
+  unavailable: boolean;
+  /** The request's release check (`cms.checkRelease()`), which its draft reads wait for. */
+  releaseCheck: string | null;
 }
 
 export const draftSlot = cache(
-  (): DraftSlot => ({ version: null, visitor: null, assignments: null }),
+  (): DraftSlot => ({
+    version: null,
+    visitor: null,
+    assignments: null,
+    unavailable: false,
+    releaseCheck: null,
+  }),
 );
 
 /** The version bound to this request (`bindDraft`), or `null` when it renders the current release. */
 export function activeDraftPointer(): string | null {
   return draftSlot().version?.version ?? null;
 }
+
+/** Whether the request's link named a draft that can't be read anymore (`bindDraft`). */
+export function draftUnavailable(): boolean {
+  return draftSlot().unavailable;
+}