emdash 1.2.0 → 1.3.1

package/dist/astro/middleware/redirect.mjs

@@ -1,16 +1,29 @@
 import "../../dialect-helpers-7_IqPdh9.mjs";
-import "../../config-CvmjJcVw.mjs";
+import "../../config-Cs_AwWXI.mjs";
 import { t as after } from "../../after-PcEvMY_6.mjs";
+import { getRequestContext, runWithContext } from "../../request-context.mjs";
+import "../../options-DhrI7eMv.mjs";
+import "../../secrets-Cc_O3Kp-.mjs";
 import "../../base64-BQBZwXCx.mjs";
-import "../../request-cache-C4CIo5ad.mjs";
-import "../../types-C-Xp0CcN.mjs";
-import "../../resolve-D-kqyKns.mjs";
-import { t as isSiteRelativeDestination } from "../../destination-r2zIAZ2S.mjs";
-import { t as RedirectRepository } from "../../redirect-B39kTQ_0.mjs";
-import { i as matchCachedPatterns, r as loadCachedRedirects } from "../../cache-x0z8t_m9.mjs";
-import { n as createRedirectSource } from "../../artifacts-D-O-qj9C.mjs";
-import { c as getDb } from "../../loader-CetY659y.mjs";
-import { n as isTerminalStatus } from "../../status-Dl85BK39.mjs";
+import "../../query-BFHjCzSh.mjs";
+import "../../object-cache-EjasjtoQ.mjs";
+import { n as peekRequestCache } from "../../request-cache-5z2WzWmh.mjs";
+import "../../types-DwhEvIVb.mjs";
+import "../../media-B_x5B9EA.mjs";
+import "../../resolve-DdNXBJSr.mjs";
+import { t as isSiteRelativeDestination } from "../../destination-DR3IHjmy.mjs";
+import { t as RedirectRepository } from "../../redirect-DcmNMvOs.mjs";
+import "../../version-BOFfLiVT.mjs";
+import { i as matchCachedPatterns, r as loadCachedRedirects } from "../../cache-BWzswWB-.mjs";
+import { n as createRedirectSource } from "../../artifacts-DwOYYBQm.mjs";
+import { c as getDb } from "../../loader-D4w4XE7q.mjs";
+import "../../json-recordset-BjYIWFkV.mjs";
+import "../../errors-DlJwot7q.mjs";
+import "../../errors-BMaCpLeS.mjs";
+import { l as invalidateSiteSettingsSnapshot, u as peekSiteSettingsSnapshot } from "../../settings-yIqoN-Ok.mjs";
+import "../../error-CT2SsX5S.mjs";
+import "../../fence-BOD3SxZG.mjs";
+import { n as isTerminalStatus } from "../../status-DSURZwKS.mjs";
 import { defineMiddleware } from "astro:middleware";
 
 //#region src/astro/middleware/redirect.ts
@@ -33,6 +46,39 @@ function recordHitInBackground(repo, id) {
 		}
 	});
 }
+/** Exact rules first, with or without a trailing slash, then patterns in precedence order. */
+function matchRedirect(cached, pathname) {
+	let exact = cached.exact.get(pathname);
+	if (!exact && pathname.length > 1) {
+		const alt = pathname.endsWith("/") ? pathname.slice(0, -1) : `${pathname}/`;
+		exact = cached.exact.get(alt);
+	}
+	if (exact) return {
+		redirect: exact,
+		destination: exact.destination
+	};
+	return matchCachedPatterns(cached.patterns, pathname);
+}
+/** The response for a matched rule, or null when its destination is not safe to send. */
+function redirectResponse(context, repo, { redirect, destination }) {
+	if (isTerminalStatus(redirect.type)) {
+		recordHitInBackground(repo, redirect.id);
+		return new Response(null, { status: redirect.type });
+	}
+	if (!isSiteRelativeDestination(destination)) {
+		warnUnsafeDestination(redirect.id);
+		return null;
+	}
+	recordHitInBackground(repo, redirect.id);
+	const code = isRedirectCode(redirect.type) ? redirect.type : 301;
+	return context.redirect(destination, code);
+}
+/** Whether Astro's route cache will store the response: it does once a max age or a tag is set. */
+function routeCacheStores(cache) {
+	if (!cache?.enabled) return false;
+	const { maxAge, tags } = cache.options;
+	return maxAge !== void 0 || (tags?.length ?? 0) > 0;
+}
 const onRequest = defineMiddleware(async (context, next) => {
 	const { pathname } = context.url;
 	if (SKIP_PREFIXES.some((prefix) => pathname.startsWith(prefix))) return next();
@@ -43,66 +89,120 @@ const onRequest = defineMiddleware(async (context, next) => {
 	} catch {
 		return next();
 	}
-	try {
-		const repo = new RedirectRepository(db);
-		const cached = await loadCachedRedirects(createRedirectSource(db));
-		let exact = cached.exact.get(pathname);
-		if (!exact && pathname.length > 1) {
-			const alt = pathname.endsWith("/") ? pathname.slice(0, -1) : `${pathname}/`;
-			exact = cached.exact.get(alt);
+	const routeCache = context.cache;
+	const renderedSettings = /* @__PURE__ */ new Set();
+	let currentSettingsVersion;
+	const checkSettings = () => {
+		if (currentSettingsVersion === void 0 || renderedSettings.size === 0) return;
+		if (currentSettingsVersion === null) routeCache?.set(false);
+		else if ([...renderedSettings].some((v) => v !== currentSettingsVersion)) {
+			routeCache?.set(false);
+			invalidateSiteSettingsSnapshot();
 		}
-		if (exact) {
-			if (isTerminalStatus(exact.type)) {
-				recordHitInBackground(repo, exact.id);
-				return new Response(null, { status: exact.type });
-			}
-			const dest = exact.destination;
-			if (!isSiteRelativeDestination(dest)) {
-				warnUnsafeDestination(exact.id);
-				return next();
-			}
-			recordHitInBackground(repo, exact.id);
-			const code = isRedirectCode(exact.type) ? exact.type : 301;
-			return context.redirect(dest, code);
+	};
+	const requestSettings = { onRead(version) {
+		renderedSettings.add(version);
+		checkSettings();
+	} };
+	const finalizeSettings = async () => {
+		if (!routeCacheStores(routeCache)) return;
+		if (requestSettings.live) {
+			if (currentSettingsVersion == null) routeCache?.set(false);
+			return;
 		}
-		const patternMatch = matchCachedPatterns(cached.patterns, pathname);
-		if (patternMatch) {
-			const { redirect, destination } = patternMatch;
-			if (isTerminalStatus(redirect.type)) {
-				recordHitInBackground(repo, redirect.id);
-				return new Response(null, { status: redirect.type });
-			}
-			if (!isSiteRelativeDestination(destination)) {
-				warnUnsafeDestination(redirect.id);
-				return next();
+		const prefetched = await peekRequestCache("siteSettingsSnapshot");
+		if (prefetched) requestSettings.onRead(prefetched.version);
+		const snapshot = peekSiteSettingsSnapshot();
+		if (currentSettingsVersion == null) routeCache?.set(false);
+		else if (!snapshot) requestSettings.version = currentSettingsVersion;
+		else if (snapshot.version !== currentSettingsVersion) {
+			routeCache?.set(false);
+			invalidateSiteSettingsSnapshot();
+		} else requestSettings.snapshot = snapshot;
+	};
+	const run = async () => {
+		let repo;
+		let source;
+		let cached;
+		let match = null;
+		let verified = false;
+		try {
+			repo = new RedirectRepository(db);
+			source = createRedirectSource(db, routeCache?.enabled ? (version) => {
+				currentSettingsVersion = version;
+				checkSettings();
+			} : void 0);
+			cached = await loadCachedRedirects(source);
+			match = matchRedirect(cached, pathname);
+			if (match && routeCacheStores(routeCache)) {
+				cached = await loadCachedRedirects(source, { verify: true });
+				verified = true;
+				match = matchRedirect(cached, pathname);
 			}
-			recordHitInBackground(repo, redirect.id);
-			const code = isRedirectCode(redirect.type) ? redirect.type : 301;
-			return context.redirect(destination, code);
+		} catch {
+			currentSettingsVersion = null;
+			routeCache?.set(false);
+			return next();
+		}
+		if (match) {
+			const redirected = redirectResponse(context, repo, match);
+			if (redirected) return redirected;
 		}
 		const response = await next();
-		if (response.status === 404) context.cache?.set(false);
-		const location = response.headers.get("location");
-		const missedByRedirect = isRedirectCode(response.status) && (location === "/404" || location === "/404/");
-		if (response.status === 404 && pathname !== "/404" && pathname !== "/404/" || missedByRedirect) {
-			const referrer = context.request.headers.get("referer") ?? null;
-			const userAgent = context.request.headers.get("user-agent") ?? null;
-			after(async () => {
-				try {
-					await repo.log404({
-						path: pathname,
-						referrer,
-						userAgent
-					});
-				} catch (error) {
-					console.error("[emdash:redirects] failed to log 404:", error);
+		try {
+			if (response.status === 404) routeCache?.set(false);
+			if (!verified && routeCacheStores(routeCache) && source && cached) {
+				currentSettingsVersion = void 0;
+				const current = await loadCachedRedirects(source, { verify: true }).catch(() => cached);
+				if (currentSettingsVersion === void 0) {
+					currentSettingsVersion = null;
+					checkSettings();
+				}
+				const late = current === cached ? null : matchRedirect(current, pathname);
+				const redirected = late && redirectResponse(context, repo, late);
+				if (redirected) {
+					routeCache?.set(false);
+					after(() => response.body?.pipeTo(new WritableStream()));
+					return redirected;
 				}
-			});
+			}
+			try {
+				await finalizeSettings();
+			} catch {
+				routeCache?.set(false);
+			}
+			const location = response.headers.get("location");
+			const missedByRedirect = isRedirectCode(response.status) && (location === "/404" || location === "/404/");
+			if (response.status === 404 && pathname !== "/404" && pathname !== "/404/" || missedByRedirect) {
+				const referrer = context.request.headers.get("referer") ?? null;
+				const userAgent = context.request.headers.get("user-agent") ?? null;
+				after(async () => {
+					try {
+						await repo.log404({
+							path: pathname,
+							referrer,
+							userAgent
+						});
+					} catch (error) {
+						console.error("[emdash:redirects] failed to log 404:", error);
+					}
+				});
+			}
+		} catch (error) {
+			console.error("[emdash:redirects] post-response step failed:", error);
 		}
 		return response;
-	} catch {
-		return next();
+	};
+	if (!routeCache?.enabled) return run();
+	const parent = getRequestContext();
+	if (parent) {
+		parent.siteSettings = requestSettings;
+		return run();
 	}
+	return runWithContext({
+		editMode: false,
+		siteSettings: requestSettings
+	}, run);
 });
 
 //#endregion

package/dist/astro/middleware/redirect.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"redirect.mjs","names":[],"sources":["../../../src/astro/middleware/redirect.ts"],"sourcesContent":["/**\n * Redirect middleware\n *\n * Intercepts incoming requests and checks for matching redirect rules.\n * Runs after runtime init (needs db) but before setup/auth (should handle\n * ALL routes, including public ones, and should be fast).\n *\n * Skip paths:\n * - /_emdash/* (admin UI, API routes, auth endpoints)\n * - /_image (Astro image optimization)\n * - Static assets (files with extensions)\n *\n * 404 logging happens post-response: if next() returns 404 and the path\n * wasn't already matched by a redirect, log it.\n */\n\nimport type { APIContext } from \"astro\";\nimport { defineMiddleware } from \"astro:middleware\";\n\nimport { after } from \"../../after.js\";\nimport { RedirectRepository } from \"../../database/repositories/redirect.js\";\nimport { getDb } from \"../../loader.js\";\nimport { createRedirectSource } from \"../../redirects/artifacts.js\";\nimport { loadCachedRedirects, matchCachedPatterns } from \"../../redirects/cache.js\";\nimport { isSiteRelativeDestination } from \"../../redirects/destination.js\";\nimport { isTerminalStatus } from \"../../redirects/status.js\";\n\n/** Paths that should never be intercepted by redirects */\nconst SKIP_PREFIXES = [\"/_emdash\", \"/_image\"];\n\n/** Static asset extensions -- don't redirect file requests */\nconst ASSET_EXTENSION = /\\.\\w{1,10}$/;\n\ntype RedirectCode = 301 | 302 | 303 | 307 | 308;\n\nfunction isRedirectCode(code: number): code is RedirectCode {\n\treturn code === 301 || code === 302 || code === 303 || code === 307 || code === 308;\n}\n\nfunction warnUnsafeDestination(id: string): void {\n\tconsole.warn(\n\t\t`[emdash:redirects] Skipping redirect ${id}: destination is not a site-relative path`,\n\t);\n}\n\nfunction recordHitInBackground(repo: RedirectRepository, id: string): void {\n\tafter(async () => {\n\t\ttry {\n\t\t\tawait repo.recordHit(id);\n\t\t} catch (error) {\n\t\t\tconsole.error(\"[emdash:redirects] failed to record redirect hit:\", error);\n\t\t}\n\t});\n}\n\nexport const onRequest = defineMiddleware(async (context, next) => {\n\tconst { pathname } = context.url;\n\n\t// Skip internal paths and static assets\n\tif (SKIP_PREFIXES.some((prefix) => pathname.startsWith(prefix))) {\n\t\treturn next();\n\t}\n\tif (ASSET_EXTENSION.test(pathname)) {\n\t\treturn next();\n\t}\n\n\t// Public visitors hit the runtime's anonymous fast path, which intentionally\n\t// omits `db` from `locals.emdash` to keep the public render boundary minimal\n\t// (issue #808). Fall back to `getDb()`, which transparently returns the\n\t// per-request scoped db (set in ALS by the runtime middleware) or the\n\t// singleton — same path the loader and template helpers use.\n\tlet db = context.locals.emdash?.db;\n\tif (!db) {\n\t\ttry {\n\t\t\tdb = await getDb();\n\t\t} catch {\n\t\t\treturn next();\n\t\t}\n\t}\n\n\ttry {\n\t\tconst repo = new RedirectRepository(db);\n\n\t\t// One query loads the published rules into the cache; warm requests\n\t\t// issue zero queries, and an expired cache checks the published version\n\t\t// in the background. Empty-redirect sites cache an empty Map + array.\n\t\tconst cached = await loadCachedRedirects(createRedirectSource(db));\n\n\t\t// 1. Exact match (O(1) Map lookup)\n\t\tlet exact = cached.exact.get(pathname);\n\t\tif (!exact && pathname.length > 1) {\n\t\t\tconst alt = pathname.endsWith(\"/\") ? pathname.slice(0, -1) : `${pathname}/`;\n\t\t\texact = cached.exact.get(alt);\n\t\t}\n\t\tif (exact) {\n\t\t\t// Terminal statuses (410 Gone / 451): serve the status directly,\n\t\t\t// with no Location header.\n\t\t\tif (isTerminalStatus(exact.type)) {\n\t\t\t\trecordHitInBackground(repo, exact.id);\n\t\t\t\treturn new Response(null, { status: exact.type });\n\t\t\t}\n\t\t\tconst dest = exact.destination;\n\t\t\tif (!isSiteRelativeDestination(dest)) {\n\t\t\t\twarnUnsafeDestination(exact.id);\n\t\t\t\treturn next();\n\t\t\t}\n\t\t\trecordHitInBackground(repo, exact.id);\n\t\t\tconst code = isRedirectCode(exact.type) ? exact.type : 301;\n\t\t\treturn context.redirect(dest, code);\n\t\t}\n\n\t\t// 2. Pattern match (compile once, match every request)\n\t\tconst patternMatch = matchCachedPatterns(cached.patterns, pathname);\n\t\tif (patternMatch) {\n\t\t\tconst { redirect, destination } = patternMatch;\n\t\t\t// Terminal statuses (410 Gone / 451): serve the status directly.\n\t\t\tif (isTerminalStatus(redirect.type)) {\n\t\t\t\trecordHitInBackground(repo, redirect.id);\n\t\t\t\treturn new Response(null, { status: redirect.type });\n\t\t\t}\n\t\t\tif (!isSiteRelativeDestination(destination)) {\n\t\t\t\twarnUnsafeDestination(redirect.id);\n\t\t\t\treturn next();\n\t\t\t}\n\t\t\trecordHitInBackground(repo, redirect.id);\n\t\t\tconst code = isRedirectCode(redirect.type) ? redirect.type : 301;\n\t\t\treturn context.redirect(destination, code);\n\t\t}\n\n\t\t// No redirect matched -- proceed and check for 404\n\t\tconst response = await next();\n\n\t\t// Keep a 404 out of the route cache: publishing the missing entry later\n\t\t// purges content tags, not the missed path, so a cached 404 would outlive\n\t\t// the fix. Astro has no cache handle for URLs that match no route, but a\n\t\t// page answering a content miss with Astro.rewrite(\"/404\") has one.\n\t\tif (response.status === 404) {\n\t\t\tconst routeCache: APIContext[\"cache\"] | undefined = context.cache;\n\t\t\trouteCache?.set(false);\n\t\t}\n\n\t\t// Log misses under the path the visitor requested.\n\t\t// Two shapes count as a miss: a 404 response (an unmatched route, or a\n\t\t// page answering a content miss with Astro.rewrite(\"/404\")), and a\n\t\t// matched route answering a content miss with a redirect to /404 —\n\t\t// there the missed path exists only on this first pass, before the\n\t\t// browser follows the redirect. The error page itself is never logged: /404\n\t\t// answers 404 by design and carries no path information.\n\t\tconst location = response.headers.get(\"location\");\n\t\tconst missedByRedirect =\n\t\t\tisRedirectCode(response.status) && (location === \"/404\" || location === \"/404/\");\n\t\tconst missedDirectly = response.status === 404 && pathname !== \"/404\" && pathname !== \"/404/\";\n\t\tif (missedDirectly || missedByRedirect) {\n\t\t\tconst referrer = context.request.headers.get(\"referer\") ?? null;\n\t\t\tconst userAgent = context.request.headers.get(\"user-agent\") ?? null;\n\t\t\tafter(async () => {\n\t\t\t\ttry {\n\t\t\t\t\tawait repo.log404({\n\t\t\t\t\t\tpath: pathname,\n\t\t\t\t\t\treferrer,\n\t\t\t\t\t\tuserAgent,\n\t\t\t\t\t});\n\t\t\t\t} catch (error) {\n\t\t\t\t\tconsole.error(\"[emdash:redirects] failed to log 404:\", error);\n\t\t\t\t}\n\t\t\t});\n\t\t}\n\n\t\treturn response;\n\t} catch {\n\t\t// If the redirects table doesn't exist yet (pre-migration), skip silently\n\t\treturn next();\n\t}\n});\n"],"mappings":"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"}
+{"version":3,"file":"redirect.mjs","names":[],"sources":["../../../src/astro/middleware/redirect.ts"],"sourcesContent":["/**\n * Redirect middleware\n *\n * Intercepts incoming requests and checks for matching redirect rules.\n * Runs after runtime init (needs db) but before setup/auth (should handle\n * ALL routes, including public ones, and should be fast).\n *\n * Skip paths:\n * - /_emdash/* (admin UI, API routes, auth endpoints)\n * - /_image (Astro image optimization)\n * - Static assets (files with extensions)\n *\n * 404 logging happens post-response: if next() returns 404 and the path\n * wasn't already matched by a redirect, log it.\n */\n\nimport type { APIContext } from \"astro\";\nimport { defineMiddleware } from \"astro:middleware\";\n\nimport { after } from \"../../after.js\";\nimport { RedirectRepository } from \"../../database/repositories/redirect.js\";\nimport { getDb } from \"../../loader.js\";\nimport { createRedirectSource } from \"../../redirects/artifacts.js\";\nimport type { CachedRedirects, RedirectRule } from \"../../redirects/cache.js\";\nimport { loadCachedRedirects, matchCachedPatterns } from \"../../redirects/cache.js\";\nimport { isSiteRelativeDestination } from \"../../redirects/destination.js\";\nimport { isTerminalStatus } from \"../../redirects/status.js\";\nimport { peekRequestCache } from \"../../request-cache.js\";\nimport {\n\tgetRequestContext,\n\trunWithContext,\n\ttype EmDashRequestContext,\n} from \"../../request-context.js\";\nimport { invalidateSiteSettingsSnapshot, peekSiteSettingsSnapshot } from \"../../settings/index.js\";\n\n/** Paths that should never be intercepted by redirects */\nconst SKIP_PREFIXES = [\"/_emdash\", \"/_image\"];\n\n/** Static asset extensions -- don't redirect file requests */\nconst ASSET_EXTENSION = /\\.\\w{1,10}$/;\n\ntype RedirectCode = 301 | 302 | 303 | 307 | 308;\n\nfunction isRedirectCode(code: number): code is RedirectCode {\n\treturn code === 301 || code === 302 || code === 303 || code === 307 || code === 308;\n}\n\nfunction warnUnsafeDestination(id: string): void {\n\tconsole.warn(\n\t\t`[emdash:redirects] Skipping redirect ${id}: destination is not a site-relative path`,\n\t);\n}\n\nfunction recordHitInBackground(repo: RedirectRepository, id: string): void {\n\tafter(async () => {\n\t\ttry {\n\t\t\tawait repo.recordHit(id);\n\t\t} catch (error) {\n\t\t\tconsole.error(\"[emdash:redirects] failed to record redirect hit:\", error);\n\t\t}\n\t});\n}\n\ninterface RedirectMatch {\n\tredirect: RedirectRule;\n\tdestination: string;\n}\n\n/** Exact rules first, with or without a trailing slash, then patterns in precedence order. */\nfunction matchRedirect(cached: CachedRedirects, pathname: string): RedirectMatch | null {\n\tlet exact = cached.exact.get(pathname);\n\tif (!exact && pathname.length > 1) {\n\t\tconst alt = pathname.endsWith(\"/\") ? pathname.slice(0, -1) : `${pathname}/`;\n\t\texact = cached.exact.get(alt);\n\t}\n\tif (exact) return { redirect: exact, destination: exact.destination };\n\treturn matchCachedPatterns(cached.patterns, pathname);\n}\n\n/** The response for a matched rule, or null when its destination is not safe to send. */\nfunction redirectResponse(\n\tcontext: APIContext,\n\trepo: RedirectRepository,\n\t{ redirect, destination }: RedirectMatch,\n): Response | null {\n\t// Terminal statuses (410 Gone / 451): serve the status directly,\n\t// with no Location header.\n\tif (isTerminalStatus(redirect.type)) {\n\t\trecordHitInBackground(repo, redirect.id);\n\t\treturn new Response(null, { status: redirect.type });\n\t}\n\tif (!isSiteRelativeDestination(destination)) {\n\t\twarnUnsafeDestination(redirect.id);\n\t\treturn null;\n\t}\n\trecordHitInBackground(repo, redirect.id);\n\tconst code = isRedirectCode(redirect.type) ? redirect.type : 301;\n\treturn context.redirect(destination, code);\n}\n\n/** Whether Astro's route cache will store the response: it does once a max age or a tag is set. */\nfunction routeCacheStores(cache: APIContext[\"cache\"] | undefined): boolean {\n\tif (!cache?.enabled) return false;\n\tconst { maxAge, tags } = cache.options;\n\treturn maxAge !== undefined || (tags?.length ?? 0) > 0;\n}\n\nexport const onRequest = defineMiddleware(async (context, next) => {\n\tconst { pathname } = context.url;\n\n\t// Skip internal paths and static assets\n\tif (SKIP_PREFIXES.some((prefix) => pathname.startsWith(prefix))) {\n\t\treturn next();\n\t}\n\tif (ASSET_EXTENSION.test(pathname)) {\n\t\treturn next();\n\t}\n\n\t// Public visitors hit the runtime's anonymous fast path, which intentionally\n\t// omits `db` from `locals.emdash` to keep the public render boundary minimal\n\t// (issue #808). Fall back to `getDb()`, which transparently returns the\n\t// per-request scoped db (set in ALS by the runtime middleware) or the\n\t// singleton — same path the loader and template helpers use.\n\tlet db = context.locals.emdash?.db;\n\tif (!db) {\n\t\ttry {\n\t\t\tdb = await getDb();\n\t\t} catch {\n\t\t\treturn next();\n\t\t}\n\t}\n\n\tconst routeCache: APIContext[\"cache\"] | undefined = context.cache;\n\tconst renderedSettings = new Set<string>();\n\tlet currentSettingsVersion: string | null | undefined;\n\tconst checkSettings = () => {\n\t\tif (currentSettingsVersion === undefined || renderedSettings.size === 0) return;\n\t\tif (currentSettingsVersion === null) {\n\t\t\trouteCache?.set(false);\n\t\t} else if ([...renderedSettings].some((v) => v !== currentSettingsVersion)) {\n\t\t\trouteCache?.set(false);\n\t\t\tinvalidateSiteSettingsSnapshot();\n\t\t}\n\t};\n\tconst requestSettings: NonNullable<EmDashRequestContext[\"siteSettings\"]> = {\n\t\tonRead(version) {\n\t\t\trenderedSettings.add(version);\n\t\t\tcheckSettings();\n\t\t},\n\t};\n\tconst finalizeSettings = async () => {\n\t\tif (!routeCacheStores(routeCache)) return;\n\t\tif (requestSettings.live) {\n\t\t\tif (currentSettingsVersion == null) routeCache?.set(false);\n\t\t\treturn;\n\t\t}\n\t\tconst prefetched =\n\t\t\tawait peekRequestCache<NonNullable<ReturnType<typeof peekSiteSettingsSnapshot>>>(\n\t\t\t\t\"siteSettingsSnapshot\",\n\t\t\t);\n\t\tif (prefetched) requestSettings.onRead(prefetched.version);\n\t\tconst snapshot = peekSiteSettingsSnapshot();\n\t\t// Layouts and head components can first read settings after cache headers\n\t\t// are sent. Pin the verified snapshot before handing off the stream.\n\t\tif (currentSettingsVersion == null) {\n\t\t\trouteCache?.set(false);\n\t\t} else if (!snapshot) {\n\t\t\trequestSettings.version = currentSettingsVersion;\n\t\t} else if (snapshot.version !== currentSettingsVersion) {\n\t\t\trouteCache?.set(false);\n\t\t\tinvalidateSiteSettingsSnapshot();\n\t\t} else {\n\t\t\trequestSettings.snapshot = snapshot;\n\t\t}\n\t};\n\tconst run = async () => {\n\t\tlet repo: RedirectRepository | undefined;\n\t\tlet source: ReturnType<typeof createRedirectSource> | undefined;\n\t\tlet cached: CachedRedirects | undefined;\n\t\tlet match: RedirectMatch | null = null;\n\t\tlet verified = false;\n\n\t\ttry {\n\t\t\trepo = new RedirectRepository(db);\n\t\t\tsource = createRedirectSource(\n\t\t\t\tdb,\n\t\t\t\trouteCache?.enabled\n\t\t\t\t\t? (version) => {\n\t\t\t\t\t\t\tcurrentSettingsVersion = version;\n\t\t\t\t\t\t\tcheckSettings();\n\t\t\t\t\t\t}\n\t\t\t\t\t: undefined,\n\t\t\t);\n\n\t\t\t// One query loads the published rules into the cache; warm requests\n\t\t\t// issue zero queries, and an expired cache checks the published version\n\t\t\t// in the background. Empty-redirect sites cache an empty Map + array.\n\t\t\t// A response the route cache stores is served to every visitor until it\n\t\t\t// is purged, so before one is returned the rules are verified current.\n\t\t\tcached = await loadCachedRedirects(source);\n\t\t\tmatch = matchRedirect(cached, pathname);\n\t\t\tif (match && routeCacheStores(routeCache)) {\n\t\t\t\tcached = await loadCachedRedirects(source, { verify: true });\n\t\t\t\tverified = true;\n\t\t\t\tmatch = matchRedirect(cached, pathname);\n\t\t\t}\n\t\t} catch {\n\t\t\t// If the redirects table doesn't exist yet (pre-migration), skip silently.\n\t\t\t// Without a freshness check, a settings snapshot must not be edge-cached.\n\t\t\tcurrentSettingsVersion = null;\n\t\t\trouteCache?.set(false);\n\t\t\treturn next();\n\t\t}\n\n\t\tif (match) {\n\t\t\tconst redirected = redirectResponse(context, repo, match);\n\t\t\tif (redirected) return redirected;\n\t\t}\n\n\t\t// No redirect matched -- proceed and check for 404.\n\t\tconst response = await next();\n\n\t\t// Post-response work must not re-run the route either. Swallow errors here\n\t\t// and return the response the route already produced.\n\t\ttry {\n\t\t\t// Keep a 404 out of the route cache: publishing the missing entry later\n\t\t\t// purges content tags, not the missed path, so a cached 404 would outlive\n\t\t\t// the fix. Astro has no cache handle for URLs that match no route, but a\n\t\t\t// page answering a content miss with Astro.rewrite(\"/404\") has one.\n\t\t\tif (response.status === 404) {\n\t\t\t\trouteCache?.set(false);\n\t\t\t}\n\n\t\t\tif (!verified && routeCacheStores(routeCache) && source && cached) {\n\t\t\t\tcurrentSettingsVersion = undefined;\n\t\t\t\tconst current = await loadCachedRedirects(source, { verify: true }).catch(() => cached);\n\t\t\t\tif (currentSettingsVersion === undefined) {\n\t\t\t\t\tcurrentSettingsVersion = null;\n\t\t\t\t\tcheckSettings();\n\t\t\t\t}\n\t\t\t\tconst late = current === cached ? null : matchRedirect(current, pathname);\n\t\t\t\tconst redirected = late && redirectResponse(context, repo, late);\n\t\t\t\tif (redirected) {\n\t\t\t\t\trouteCache?.set(false);\n\t\t\t\t\t// Finish the discarded render instead of cancelling it: a render cut off\n\t\t\t\t\t// with its request never settles an isolate-wide fetch it started, and\n\t\t\t\t\t// every later render awaiting that fetch hangs.\n\t\t\t\t\tafter(() => response.body?.pipeTo(new WritableStream()));\n\t\t\t\t\treturn redirected;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\ttry {\n\t\t\t\tawait finalizeSettings();\n\t\t\t} catch {\n\t\t\t\trouteCache?.set(false);\n\t\t\t}\n\n\t\t\t// Log misses under the path the visitor requested.\n\t\t\t// Two shapes count as a miss: a 404 response (an unmatched route, or a\n\t\t\t// page answering a content miss with Astro.rewrite(\"/404\")), and a\n\t\t\t// matched route answering a content miss with a redirect to /404 —\n\t\t\t// there the missed path exists only on this first pass, before the\n\t\t\t// browser follows the redirect. The error page itself is never logged: /404\n\t\t\t// answers 404 by design and carries no path information.\n\t\t\tconst location = response.headers.get(\"location\");\n\t\t\tconst missedByRedirect =\n\t\t\t\tisRedirectCode(response.status) && (location === \"/404\" || location === \"/404/\");\n\t\t\tconst missedDirectly = response.status === 404 && pathname !== \"/404\" && pathname !== \"/404/\";\n\t\t\tif (missedDirectly || missedByRedirect) {\n\t\t\t\tconst referrer = context.request.headers.get(\"referer\") ?? null;\n\t\t\t\tconst userAgent = context.request.headers.get(\"user-agent\") ?? null;\n\t\t\t\tafter(async () => {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tawait repo.log404({\n\t\t\t\t\t\t\tpath: pathname,\n\t\t\t\t\t\t\treferrer,\n\t\t\t\t\t\t\tuserAgent,\n\t\t\t\t\t\t});\n\t\t\t\t\t} catch (error) {\n\t\t\t\t\t\tconsole.error(\"[emdash:redirects] failed to log 404:\", error);\n\t\t\t\t\t}\n\t\t\t\t});\n\t\t\t}\n\t\t} catch (error) {\n\t\t\tconsole.error(\"[emdash:redirects] post-response step failed:\", error);\n\t\t}\n\n\t\treturn response;\n\t};\n\tif (!routeCache?.enabled) return run();\n\tconst parent = getRequestContext();\n\tif (parent) {\n\t\tparent.siteSettings = requestSettings;\n\t\treturn run();\n\t}\n\treturn runWithContext({ editMode: false, siteSettings: requestSettings }, run);\n});\n"],"mappings":"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"}

package/dist/astro/middleware/request-context.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"request-context.d.mts","names":[],"sources":["../../../src/astro/middleware/request-context.ts"],"mappings":";;;;;;AAiLA;;;;;;;;;;;;cAAa,SAAA,EA8LX,KAAA,CA9LoB,iBAAA"}
+{"version":3,"file":"request-context.d.mts","names":[],"sources":["../../../src/astro/middleware/request-context.ts"],"mappings":";;;;;;AAiLA;;;;;;;;;;;;cAAa,SAAA,EA+LX,KAAA,CA/LoB,iBAAA"}

package/dist/astro/middleware/request-context.mjs

@@ -3,9 +3,9 @@ import { getRequestContext, runWithContext } from "../../request-context.mjs";
 import "../../options-DhrI7eMv.mjs";
 import { a as resolveSecretsCached } from "../../secrets-Cc_O3Kp-.mjs";
 import "../../base64-BQBZwXCx.mjs";
-import { n as parseContentId, r as verifyPreviewToken } from "../../tokens-j5L0as2H.mjs";
-import { t as escapeHtml } from "../../escape-ESFhYzwG.mjs";
-import { n as generateVisualEditingActionToken, t as VISUAL_ACTION_TOKEN_INVALID } from "../../action-token-BdWad2YG.mjs";
+import { n as parseContentId, r as verifyPreviewToken } from "../../tokens-U5vzgSrM.mjs";
+import { t as escapeHtml } from "../../escape-BfbDyuQ-.mjs";
+import { n as generateVisualEditingActionToken, t as VISUAL_ACTION_TOKEN_INVALID } from "../../action-token-B1ds4laA.mjs";
 import { defineMiddleware } from "astro:middleware";
 import virtualConfig from "virtual:emdash/config";
 import { loadVisualEditingToolbarLabels } from "@emdash-cms/admin/locales/server";
@@ -1049,7 +1049,37 @@ function renderToolbar(config) {
     return text;
   }
 
-  function startTextEdit(element, annotation, multiline) {
+  function caretRangeAt(x, y) {
+    if (document.caretPositionFromPoint) {
+      var position = document.caretPositionFromPoint(x, y);
+      // Over a text input the offset counts into its value, which a range can't hold.
+      if (!position || position.offsetNode.nodeType !== Node.TEXT_NODE) return null;
+      var range = document.createRange();
+      range.setStart(position.offsetNode, position.offset);
+      return range;
+    }
+    return document.caretRangeFromPoint ? document.caretRangeFromPoint(x, y) : null;
+  }
+
+  function selectionPoints() {
+    var selection = window.getSelection();
+    return [selection.anchorNode, selection.anchorOffset, selection.focusNode, selection.focusOffset];
+  }
+
+  // A click on text moves the selection to where it landed (a caret, or the
+  // end of a drag), and focusing the field keeps it there. A click on a link
+  // leaves the selection where it was.
+  var selectionAtMousedown = null;
+
+  // Where to put the caret for a click, or null when the click placed it.
+  function caretForClick(e) {
+    var moved = !selectionAtMousedown || selectionPoints().some(function(point, i) {
+      return point !== selectionAtMousedown[i];
+    });
+    return moved ? null : caretRangeAt(e.clientX, e.clientY);
+  }
+
+  function startTextEdit(element, annotation, caret, multiline) {
     if (currentlyEditing === element) return;
     if (currentlyEditing) endCurrentEdit();
 
@@ -1064,13 +1094,9 @@ function renderToolbar(config) {
     element.setAttribute("data-emdash-editing", "");
     element.contentEditable = "plaintext-only";
     element.focus();
-
-    // Select all text
-    var range = document.createRange();
-    range.selectNodeContents(element);
-    var sel = window.getSelection();
-    sel.removeAllRanges();
-    sel.addRange(range);
+    if (caret && element.contains(caret.startContainer)) {
+      window.getSelection().collapse(caret.startContainer, caret.startOffset);
+    }
 
     // Track dirty state via input events
     function handleInput() {
@@ -1124,7 +1150,7 @@ function renderToolbar(config) {
   // Text fields are often rendered transformed (Markdown to HTML, truncated
   // excerpts). Saving the page text over the stored value would lose content,
   // so they are edited in place only when the page shows the stored text.
-  function startTextEditIfShownAsStored(element, annotation) {
+  function startTextEditIfShownAsStored(element, annotation, caret) {
     // Rendered markup means the text was transformed. Open the admin before the
     // lookup, while the click still lets popup blockers allow window.open().
     if (element.children.length > 0) {
@@ -1139,7 +1165,7 @@ function renderToolbar(config) {
       var item = body && body.data && body.data.item;
       var stored = item && item.data ? item.data[annotation.field] : null;
       if (typeof stored === "string" && stored.trim() === (element.textContent || "").trim()) {
-        startTextEdit(element, annotation, true);
+        startTextEdit(element, annotation, caret, true);
       } else {
         openAdmin(annotation);
       }
@@ -1606,6 +1632,10 @@ function renderToolbar(config) {
 
   // Click handler for edit mode
   if (isEditMode) {
+    document.addEventListener("mousedown", function() {
+      selectionAtMousedown = selectionPoints();
+    }, true);
+
     document.addEventListener("click", function(e) {
       var target = e.target;
 
@@ -1629,6 +1659,10 @@ function renderToolbar(config) {
               continue;
             }
 
+            // Read now: editing may only start once the manifest or the stored
+            // value has loaded, and the page can scroll in the meantime.
+            var caret = caretForClick(e);
+
             function dispatchInline(kind) {
               closeImagePopover();
               // Portable Text is edited in-page by InlinePortableTextEditor — do not open admin
@@ -1638,9 +1672,9 @@ function renderToolbar(config) {
               e.preventDefault();
               e.stopPropagation();
               if (kind === "string" || kind === "text") {
-                startTextEdit(target, annotation);
+                startTextEdit(target, annotation, caret);
               } else if (kind === "richText") {
-                startTextEditIfShownAsStored(target, annotation);
+                startTextEditIfShownAsStored(target, annotation, caret);
               } else if (kind === "image") {
                 startImageEdit(target, annotation);
               } else {
@@ -1831,11 +1865,15 @@ const onRequest = defineMiddleware(async (context, next) => {
 			const response = await next();
 			return toolbarMode === "client" ? injectBootstrap(response) : response;
 		};
-		if (virtualConfig?.objectCacheEnabled && context.cache?.enabled) return runWithContext({
-			...getRequestContext(),
-			editMode: false,
-			routeCacheFill: true
-		}, render);
+		if (virtualConfig?.objectCacheEnabled && context.cache?.enabled) {
+			const parent = getRequestContext();
+			if (parent?.siteSettings) parent.siteSettings.live = true;
+			return runWithContext({
+				...parent,
+				editMode: false,
+				routeCacheFill: true
+			}, render);
+		}
 		return render();
 	}
 	const editMode = hasEditCookie && isEditor;