camox 0.58.1 → 0.60.2

package/dist/features/runtime/runtime.js

@@ -1,8 +1,9 @@
 import { serializeJsonForHtml } from "../../lib/html.js";
 import { createRequestContext } from "../../core/requestContext.js";
-import { buildClearServerAuthCookieHeader, getServerAuthCookieHeader } from "../../lib/server-auth-cookie.js";
 import { UNNAMED_DEFAULT_LOCALE, localizedPath, parseLocalePath } from "../../lib/locale-path.js";
 import { draftNamedBy } from "../../lib/draft-scope.js";
+import { buildClearServerAuthCookieHeader, buildServerAuthCookieHeader, getServerAuthCookieHeader } from "../../lib/server-auth-cookie.js";
+import { getCookie, getSetCookie } from "../../lib/stored-auth-cookies.js";
 import { ARTIFACTS_PATH_PREFIX, RUNTIME_ROUTE_PATHS, matchRuntimeOwnedRoute } from "./runtimeRoutes.js";
 import { reads } from "../../lib/studio-reads.js";
 import { asCollectionItem, recordMarkdownTemplate, recordPageValues } from "../../core/recordItem.js";
@@ -26,7 +27,7 @@ import { getPageBlockTypes } from "./pageBlockTypes.js";
 import { withPageUrls } from "./structuredData.js";
 import { curatedPageDescription, pageRecords, placedBlockNodes, withStructuredData } from "./pageGraph.js";
 import { createProjectLogoResponse, projectLogo } from "./projectLogo.js";
-import { DEVELOPMENT_DRAFT, LOCALE_HEADER } from "@camox/api-contract/drafts";
+import { LOCALE_HEADER } from "@camox/api-contract/drafts";
 import { QueryClient, dehydrate } from "@tanstack/react-query";
 import { createHead, renderSSRHead } from "@unhead/react/server";
 
@@ -52,20 +53,16 @@ function getRuntimePathname(url, runtimeBasePath = DEFAULT_RUNTIME_BASE_PATH) {
 	if (!pathname.startsWith(`${basePath}/`)) return null;
 	return pathname.slice(basePath.length) || "/";
 }
-/**
-* The draft the request's URL names, if any, or in dev mode the development draft. Sitemaps and
-* Markdown ignore it: they read Live.
-*/
-function getRequestDraftId(request, options) {
-	if (options.developmentDraft) return DEVELOPMENT_DRAFT;
+/** The draft the request's URL names, if any. Sitemaps and Markdown ignore it: they read Live. */
+function getRequestDraftId(request) {
 	return draftNamedBy(request.url) ?? void 0;
 }
 /**
 * Whether a response may show what only this visitor sees: a session, or a draft named in the
 * URL. Shared caches must never keep it.
 */
-function isPrivateRender(request, options) {
-	return !!getServerAuthCookieHeader(request.headers) || getRequestDraftId(request, options) !== void 0;
+function isPrivateRender(request) {
+	return !!getServerAuthCookieHeader(request.headers) || getRequestDraftId(request) !== void 0;
 }
 /** The routes whose response is the same for every visitor, unless the request is private. */
 const PUBLIC_ROUTE_KINDS = /* @__PURE__ */ new Set([
@@ -83,7 +80,7 @@ const PUBLIC_ROUTE_KINDS = /* @__PURE__ */ new Set([
 */
 function isPublicRequest(request, options = {}) {
 	if (request.method !== "GET" && request.method !== "HEAD") return false;
-	if (isPrivateRender(request, options) || isPreviewHandoff(request, options)) return false;
+	if (isPrivateRender(request) || new URL(request.url).searchParams.has("ott")) return false;
 	const pathname = getRuntimePathname(request.url, options.runtimeBasePath);
 	return pathname !== null && PUBLIC_ROUTE_KINDS.has(matchRuntimeRoute(pathname).kind);
 }
@@ -316,7 +313,7 @@ async function createOgResponse(request, options) {
 			source.context,
 			style
 		])),
-		"Cache-Control": isPrivateRender(request, options) ? "private, no-store" : "public, no-cache"
+		"Cache-Control": isPrivateRender(request) ? "private, no-store" : "public, no-cache"
 	};
 	if (namesEtag(request, headers.ETag)) return new Response(null, {
 		status: 304,
@@ -337,7 +334,7 @@ async function readPageImageSource(request, options, app) {
 	const { project } = await resolveRequestMember(request, options);
 	const member = project !== void 0;
 	const authCookieHeader = member ? getServerAuthCookieHeader(request.headers) : void 0;
-	const requestedDraft = getRequestDraftId(request, options);
+	const requestedDraft = getRequestDraftId(request);
 	const api = (draftId) => createServerApiClient(apiUrl, {
 		authCookieHeader,
 		draftId,
@@ -534,11 +531,11 @@ function hydrationInputFor(input, html) {
 /**
 * The render input with its artifacts loaded by URL, where a visitor reads Live: each artifact
 * source becomes a reference to the document the website serves, so neither the page's HTML nor
-* its data carries a source, and the client renders the frames the server did. The studio, drafts
-* and dev mode keep inlined sources, so an agent's change shows at once.
+* its data carries a source, and the client renders the frames the server did. The studio and
+* drafts keep inlined sources, so an agent's change shows at once.
 */
 async function withArtifactsByUrl(input, options) {
-	if (input.presentation !== "public" || input.draftId || options.developmentDraft) return input;
+	if (input.presentation !== "public" || input.draftId) return input;
 	const shell = await readArtifactShell(options);
 	const artifactsPath = `${input.runtimeBasePath}${ARTIFACTS_PATH_PREFIX}${shell.hash}/`;
 	return {
@@ -551,10 +548,10 @@ function renderStudioThemeScript(enabled) {
 }
 /**
 * The analytics providers a render counts its reader with: only a visitor, meaning someone the
-* API didn't confirm as a member, on a Live page. A development draft never counts anyone.
+* API didn't confirm as a member, on a Live page.
 */
-function visitorAnalytics(options, render, project) {
-	if (render.studio || render.draftId || options.developmentDraft) return void 0;
+function visitorAnalytics(render, project) {
+	if (render.studio || render.draftId) return void 0;
 	return configuredProviders(project.analytics);
 }
 /** Whether a request is a preview link's token handoff, which signs in before reading anything. */
@@ -563,6 +560,51 @@ function isPreviewHandoff(request, options) {
 	return searchParams.has("camox-preview") && searchParams.has("ott") && !!options.apiUrl && !!options.authenticationUrl && !!options.projectUuid && !!options.renderPage;
 }
 /**
+* Whether a request lands from the studio's sign-in with its one-time token, which the Worker
+* exchanges itself. A preview link's handoff checks its target in the browser first.
+*/
+function isSignInHandoff(request) {
+	const { searchParams } = new URL(request.url);
+	return request.method === "GET" && searchParams.has("ott") && !searchParams.has("camox-preview");
+}
+/**
+* Exchanges a sign-in's one-time token for the studio's session, sets the cookie that mirrors it,
+* and sends the browser back to the URL without the token. The page then renders for the member
+* at once, rather than for a visitor, then again once the browser signed in. Null when the
+* exchange fails: the page loads with the token, and the browser tries it and says what failed.
+*/
+async function createSignInResponse(request, apiUrl) {
+	const url = new URL(request.url);
+	let setCookie;
+	try {
+		const response = await fetch(`${apiUrl.replace(/\/+$/, "")}/api/auth/one-time-token/verify`, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				"Better-Auth-Cookie": ""
+			},
+			body: JSON.stringify({ token: url.searchParams.get("ott") })
+		});
+		if (!response.ok) return null;
+		setCookie = response.headers.get("Set-Better-Auth-Cookie");
+	} catch (error) {
+		console.error("[camox] Sign-in token exchange failed.", error);
+		return null;
+	}
+	const session = setCookie ? getCookie(getSetCookie(setCookie)) : "";
+	if (!session) return null;
+	url.searchParams.delete("ott");
+	return new Response(null, {
+		status: 302,
+		headers: {
+			Location: `${url.pathname}${url.search}`,
+			"Cache-Control": "private, no-store",
+			"Referrer-Policy": "no-referrer",
+			"Set-Cookie": buildServerAuthCookieHeader(session, { secure: url.protocol === "https:" })
+		}
+	});
+}
+/**
 * The alternates of the page a request renders, where it exists in each of the scope's locales,
 * and its head with their `hreflang` links. Without a head, there is none to add them to.
 */
@@ -757,7 +799,7 @@ function readCuratedPage(options, request, { locale, path }) {
 		result: loadCamoxPageForRequest({
 			apiUrl: options.apiUrl,
 			authCookieHeader: getServerAuthCookieHeader(request.headers),
-			draftId: getRequestDraftId(request, options),
+			draftId: getRequestDraftId(request),
 			locale,
 			origin: new URL(request.url).origin,
 			pathname: path,
@@ -806,7 +848,7 @@ function curatedPageLocaleReads(options, request, located, queryClient) {
 		draftId,
 		queryClient
 	});
-	if (!(!getRequestDraftId(request, options) || !authCookieHeader)) return forDraft;
+	if (!(!getRequestDraftId(request) || !authCookieHeader)) return forDraft;
 	const live = forDraft(void 0);
 	if (located.locales.length > 1) for (const locale of located.locales) {
 		if (locale.tag === located.locale.tag || locale.isDefault) continue;
@@ -837,7 +879,7 @@ async function createPageHtmlResponse({ options, pathname, located, request, pag
 			Vary: "Cookie",
 			Link: llmsTxtLinkHeader(options)
 		});
-		if (isPrivateRender(request, options)) headers.set("Cache-Control", "private, no-store");
+		if (isPrivateRender(request)) headers.set("Cache-Control", "private, no-store");
 		if (result.shouldClearAuthCookie) headers.append("Set-Cookie", buildClearServerAuthCookieHeader());
 		const camoxApp = await options.getCamoxApp?.();
 		const document = await options.getDocument?.() ?? {};
@@ -854,7 +896,7 @@ async function createPageHtmlResponse({ options, pathname, located, request, pag
 		const dehydratedState = dehydrate(queryClient);
 		const { project } = result;
 		const studio = project !== void 0;
-		const analytics = visitorAnalytics(options, {
+		const analytics = visitorAnalytics({
 			studio,
 			draftId: result.draftId
 		}, result.data.page.project);
@@ -1071,7 +1113,7 @@ async function createLayoutMarkdownDataResponse(options, request, pathname) {
 	if (!match || matchLocalizedRoute(located.path)?.kind !== "page") return new Response("Not found", { status: 404 });
 	const { project, clearAuthCookie } = await resolveRequestMember(request, options);
 	const headers = {
-		...isPrivateRender(request, options) ? { "Cache-Control": "private, no-store" } : {},
+		...isPrivateRender(request) ? { "Cache-Control": "private, no-store" } : {},
 		Vary: "Cookie",
 		...clearAuthCookie ? { "Set-Cookie": buildClearServerAuthCookieHeader() } : {}
 	};
@@ -1082,7 +1124,7 @@ async function createLayoutMarkdownDataResponse(options, request, pathname) {
 		}, {
 			member: project !== void 0,
 			authCookieHeader: getServerAuthCookieHeader(request.headers),
-			requestedDraft: getRequestDraftId(request, options)
+			requestedDraft: getRequestDraftId(request)
 		});
 		return Response.json({ markdown }, { headers });
 	} catch (error) {
@@ -1103,7 +1145,7 @@ async function createDerivedResponse(options, pathname, located, request, { data
 		const { project, clearAuthCookie } = await resolveRequestMember(request, options);
 		const studio = project !== void 0;
 		const authCookieHeader = studio ? getServerAuthCookieHeader(request.headers) : void 0;
-		const requestedDraft = getRequestDraftId(request, options);
+		const requestedDraft = getRequestDraftId(request);
 		const readLayout = () => readDraftOrLive(requestedDraft, studio, (draftId) => createServerApiClient(options.apiUrl, {
 			authCookieHeader,
 			draftId,
@@ -1183,7 +1225,7 @@ async function createDerivedResponse(options, pathname, located, request, { data
 				draftId: read.draftId
 			})
 		});
-		const analytics = dataOnly ? void 0 : visitorAnalytics(options, {
+		const analytics = dataOnly ? void 0 : visitorAnalytics({
 			studio,
 			draftId: read.draftId
 		}, shared.project);
@@ -1220,7 +1262,7 @@ async function createDerivedResponse(options, pathname, located, request, { data
 		const document = await options.getDocument?.() ?? {};
 		preparePreviewDocument(input, options, document);
 		if (dataOnly) return Response.json(input, { headers: {
-			...isPrivateRender(request, options) ? { "Cache-Control": "private, no-store" } : {},
+			...isPrivateRender(request) ? { "Cache-Control": "private, no-store" } : {},
 			Vary: "Cookie",
 			...clearAuthCookie ? { "Set-Cookie": buildClearServerAuthCookieHeader() } : {}
 		} });
@@ -1230,7 +1272,7 @@ async function createDerivedResponse(options, pathname, located, request, { data
 			"Content-Type": "text/html; charset=utf-8",
 			Vary: "Cookie",
 			Link: llmsTxtLinkHeader(options),
-			...isPrivateRender(request, options) ? { "Cache-Control": "private, no-store" } : {},
+			...isPrivateRender(request) ? { "Cache-Control": "private, no-store" } : {},
 			...clearAuthCookie ? { "Set-Cookie": buildClearServerAuthCookieHeader() } : {}
 		} });
 	} catch (error) {
@@ -1261,7 +1303,8 @@ async function createStudioHtmlResponse({ match, options, pathname, located, req
 		routeKind: match.kind,
 		runtimeBasePath: normalizeRuntimeBasePath(options.runtimeBasePath),
 		locale: located.locale,
-		locales: located.locales
+		locales: located.locales,
+		draftId: project ? getRequestDraftId(request) : void 0
 	};
 	if (dataOnly) return Response.json(studioRenderInput, { headers: {
 		"Cache-Control": "private, no-store",
@@ -1319,7 +1362,7 @@ async function createCanvasOnlyResponse({ options, pathname, located, request, d
 		loaderData: null,
 		dehydratedState: dehydrate(new QueryClient()),
 		canvasOnly: true,
-		draftId: studio ? getRequestDraftId(request, options) : void 0
+		draftId: studio ? getRequestDraftId(request) : void 0
 	};
 	const headers = {
 		"Cache-Control": "private, no-store",
@@ -1353,7 +1396,7 @@ async function createPageDataResponse({ options, pathname, located, request, pag
 			"Content-Type": "application/json; charset=utf-8",
 			Vary: "Cookie"
 		});
-		if (isPrivateRender(request, options)) headers.set("Cache-Control", "private, no-store");
+		if (isPrivateRender(request)) headers.set("Cache-Control", "private, no-store");
 		if (result.shouldClearAuthCookie) headers.append("Set-Cookie", buildClearServerAuthCookieHeader());
 		const camoxApp = await options.getCamoxApp?.();
 		const { alternates, head } = await readAlternates(request, options, {
@@ -1433,6 +1476,10 @@ async function handleCamoxRequest(request, options = {}) {
 		pathname,
 		request
 	});
+	if (options.apiUrl && isSignInHandoff(request)) {
+		const signedIn = await createSignInResponse(request, options.apiUrl);
+		if (signedIn) return signedIn;
+	}
 	const { apiUrl, projectUuid } = options;
 	const markdownPathname = parseMarkdownPath(pathname);
 	if (apiUrl && projectUuid && (markdownPathname || prefersMarkdown(request.headers.get("Accept") ?? ""))) {
@@ -1529,7 +1576,7 @@ async function locateRequest(request, options, pathname) {
 		apiUrl,
 		projectUuid,
 		authCookieHeader: getServerAuthCookieHeader(request.headers),
-		draftId: getRequestDraftId(request, options)
+		draftId: getRequestDraftId(request)
 	}) : [UNNAMED_DEFAULT_LOCALE];
 	return {
 		...parseLocalePath(pathname, locales),

package/dist/features/runtime/worker.js

@@ -1,7 +1,4 @@
-import { rememberPublishingDraft } from "./publishingDraft.js";
-import { fetchLocalhostOnLoopback } from "./loopbackFetch.js";
-import { PUBLIC_CACHE_NAME, readLiveCacheKey, respondThroughPublicCache } from "./publicCache.js";
-import { shouldHandleRequest, withDevHtml } from "./workerRequest.js";
+import { PUBLIC_CACHE_NAME, fetchLocalhostOnLoopback, readLiveCacheKey, rememberPublishingDraft, respondThroughPublicCache, shouldHandleRequest, withDevHtml } from "camox/_internal/workerRuntime";
 import { WorkerEntrypoint } from "cloudflare:workers";
 import { devHtml, handleCamoxRequest, isPublicRequest, publicCacheSource, readDefinitionSet, runtimeBasePath } from "virtual:camox/server";
 
@@ -16,9 +13,9 @@ function notFound() {
 	return new Response("Not found", { status: 404 });
 }
 /**
-* Answers a request, from the edge cache when every visitor sees the same. Dev renders the
-* developer's development draft, which nothing shares, and a Worker calling this one without
-* its context can't keep anything past the response.
+* Answers a request, from the edge cache when every visitor sees the same. Dev serves code that
+* changes on every save, and a Worker calling this one without its context can't keep anything
+* past the response.
 */
 function respond(request, context) {
 	const caches = globalThis.caches;

package/dist/features/runtime/workerRequest.d.ts

@@ -0,0 +1,8 @@
+//#region src/features/runtime/workerRequest.d.ts
+export declare function shouldHandleRequest(request: Request, basePath: string): boolean;
+/** Adds what Vite injects into HTML in dev, such as its client and React Refresh. */
+export declare function withDevHtml(response: Response, html: {
+  head: string;
+  body: string;
+} | null): Promise<Response>;
+//#endregion

package/dist/features/runtime/workerRuntime.d.ts

@@ -0,0 +1,5 @@
+import { fetchLocalhostOnLoopback } from "./loopbackFetch.js";
+import { PUBLIC_CACHE_NAME, readLiveCacheKey, respondThroughPublicCache } from "./publicCache.js";
+import { rememberPublishingDraft } from "./publishingDraft.js";
+import { shouldHandleRequest, withDevHtml } from "./workerRequest.js";
+export { PUBLIC_CACHE_NAME, fetchLocalhostOnLoopback, readLiveCacheKey, rememberPublishingDraft, respondThroughPublicCache, shouldHandleRequest, withDevHtml };

package/dist/features/runtime/workerRuntime.js

@@ -0,0 +1,6 @@
+import { rememberPublishingDraft } from "./publishingDraft.js";
+import { fetchLocalhostOnLoopback } from "./loopbackFetch.js";
+import { PUBLIC_CACHE_NAME, readLiveCacheKey, respondThroughPublicCache } from "./publicCache.js";
+import { shouldHandleRequest, withDevHtml } from "./workerRequest.js";
+
+export { PUBLIC_CACHE_NAME, fetchLocalhostOnLoopback, readLiveCacheKey, rememberPublishingDraft, respondThroughPublicCache, shouldHandleRequest, withDevHtml };

package/dist/features/sdkBundle/buildSdkBundle.d.ts

@@ -0,0 +1,40 @@
+import { SdkBundleTarget } from "./specifiers.js";
+import { SdkBundleSettings } from "./sdkBundleName.js";
+//#region src/features/sdkBundle/buildSdkBundle.d.ts
+/** The manifest each target's folder holds, beside its files. */
+export declare const SDK_BUNDLE_MANIFEST = "sdk-bundle.json";
+export interface SdkBundleManifest {
+  name: string;
+  target: SdkBundleTarget;
+  builderVersion: string;
+  /** Each specifier's entry file, from the folder. */
+  entries: Record<string, string>;
+}
+/** One target's version of a built SDK Bundle. */
+export interface BuiltSdkBundle {
+  name: string;
+  /** Its files, every one at the root: entries, chunks and assets. */
+  dir: string;
+}
+export type SdkBundleBuild = Record<SdkBundleTarget, BuiltSdkBundle>;
+/** The lockfile a website installed from, and the website's importer in it. */
+export declare function readSdkBundleLockfile(root: string): Promise<{
+  lockfile: string;
+  importer: string;
+}>;
+/** The names of the website's SDK Bundle, per target, from its lockfile and settings. */
+export declare function sdkBundleNamesFor({ root, settings }: {
+  root: string;
+  settings: SdkBundleSettings;
+}): Promise<Record<SdkBundleTarget, string>>;
+/**
+ * Builds the SDK Bundle of the website in `root`, with its installed packages, into
+ * `<outDir>/browser` and `<outDir>/workerd`. Each folder is served or loaded as is, under its own
+ * name's path.
+ */
+export declare function buildSdkBundle({ root, outDir, settings }: {
+  root: string;
+  outDir: string;
+  settings: SdkBundleSettings;
+}): Promise<SdkBundleBuild>;
+//#endregion