emdash 1.0.1 → 1.1.0

package/dist/astro/middleware.mjs

@@ -1,127 +1,128 @@
-import "../runner-CLpxmhl8.mjs";
+import "../runner-CskI4Hmq.mjs";
 import { n as isMissingTableError } from "../db-errors-CBD5yMro.mjs";
 import "../dialect-helpers-7_IqPdh9.mjs";
 import { c as setI18nConfig } from "../config-CvmjJcVw.mjs";
 import "../datetime-normalization-PeiEdcRY.mjs";
-import { j as EmDashConfigurationError, t as getMenu } from "../menus-BYyeRemR.mjs";
+import { j as EmDashConfigurationError, t as getMenu } from "../menus-AuCTaO9W.mjs";
 import { n as createDeferredTaskTracker, t as after } from "../after-PcEvMY_6.mjs";
 import { createRequestMetrics, getRequestContext, runWithContext } from "../request-context.mjs";
 import "../options-DhrI7eMv.mjs";
-import "../base64-DvnNgP7e.mjs";
-import { n as initWithLock, t as createInitLock } from "../init-lock-4eRRB4Le.mjs";
-import "../secrets-CIi0nFiR.mjs";
-import "../content-RzEXY3QX.mjs";
-import { s as getLastContentWriteAt } from "../object-cache-Bo6DGaC9.mjs";
+import { s as markRequestScopedDb } from "../secrets-Cc_O3Kp-.mjs";
+import "../base64-BQBZwXCx.mjs";
+import { n as initWithLock, t as createInitLock } from "../init-lock-BGmew3r1.mjs";
+import "../content-Dji9vEiW.mjs";
+import { n as cachedQuery, s as getLastContentWriteAt, t as CacheNamespace } from "../object-cache-Bo6DGaC9.mjs";
 import "../slugify-T5GHH42D.mjs";
 import { i as setRequestCacheEntry, r as requestCached } from "../request-cache-C4CIo5ad.mjs";
 import "../url-Dn3IStq8.mjs";
-import "../types-j6MBDjlZ.mjs";
-import "../revision-CGkQA0e5.mjs";
-import "../media-CputjGE1.mjs";
-import "../user-BOvuF1sQ.mjs";
-import "../taxonomy-BesdHIwi.mjs";
-import "../comment-Cq1UYN8_.mjs";
-import "../audit-BszbE_BP.mjs";
-import "../context-BpTIzY5h.mjs";
-import "../menus-trvc6_fW.mjs";
+import "../types-C-Xp0CcN.mjs";
+import "../revision-BWEH2qQB.mjs";
+import "../media-BzUDu7nl.mjs";
+import "../user-Dnp53zTq.mjs";
+import "../taxonomy-XzLE95Vx.mjs";
+import "../comment-Bu08Wvr3.mjs";
+import "../audit-CCH3MA4Y.mjs";
+import "../context-Ctcxc8Ia.mjs";
+import "../menus-6RHNq4ZK.mjs";
 import "../resolve-D-kqyKns.mjs";
-import "../redirect-BvFKh8Sz.mjs";
+import "../redirect-xZNpBoGp.mjs";
 import "../byline-registry-dvt4N3xV.mjs";
-import "../field-defs-cache-DEkFYCDE.mjs";
-import "../byline-02tu_Uc-.mjs";
-import "../staged-Bw5eHbKS.mjs";
+import "../field-defs-cache-Bw8w499w.mjs";
+import "../byline-BhVslYLz.mjs";
+import "../staged-Q7pnEVvI.mjs";
 import "../dist-Cfu8mMBs.mjs";
-import "../enrich-BDdVNeDK.mjs";
+import "../enrich-Duu4sV3a.mjs";
 import "../entry-locks-DJAqVweV.mjs";
-import "../seo-DpYxmGaL.mjs";
-import "../cache-CPanL9IO.mjs";
-import "../fts-manager-DU03MxWu.mjs";
-import { s as getDb } from "../loader-D4edocWH.mjs";
+import "../seo-BdeEPDNW.mjs";
+import "../cache-aTYCL9nK.mjs";
+import "../artifacts-UzWbysb8.mjs";
+import "../fts-manager-DacCYIe4.mjs";
+import { c as getDb } from "../loader-1DMiOq5s.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled } from "../database/instrumentation.mjs";
-import "../collection-slugs-cache-BNRAPNiu.mjs";
-import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-DK_XBrmT.mjs";
-import "../api-BBZlif0y.mjs";
-import "../capture-triggers-CdZfvHtF.mjs";
-import "../activation-DDuqAat2.mjs";
-import "../media-usage-work-VO108Q9E.mjs";
-import "../registry-CzPJNu3H.mjs";
-import "../hash-CY4QdeMJ.mjs";
-import "../zod-generator-DnfG5sGQ.mjs";
-import "../errors-CjXd1LgH.mjs";
-import "../canonical-CAecl1UQ.mjs";
-import "../digest-DiYAoZpf.mjs";
-import "../block-values-Bho1nsZF.mjs";
-import "../query-BRNTde3V.mjs";
-import "../schema-27XefSYG.mjs";
-import "../relations-C8JpSkU6.mjs";
-import "../dashboard-BoV4pwPP.mjs";
-import "../config-CXPcy2iY.mjs";
-import "../errors-CNvATh_7.mjs";
-import "../update-check-D8No-E5s.mjs";
-import "../media-3v7mqAVX.mjs";
-import "../media-folders-D2VdVBf6.mjs";
-import "../content-repair-BDVsYXWK.mjs";
-import "../settings-CwcrX-Ay.mjs";
-import "../site-settings-B7vGFRDT.mjs";
-import "../media-usage-v43L0kR_.mjs";
-import "../media-usage-activation-BaT4AlNI.mjs";
-import "../media-usage-work-CY8gIeU-.mjs";
-import "../schema-Btvj3BMh.mjs";
-import "../block-types-nNEaPkvx.mjs";
-import "../seo-DifeiGdl.mjs";
-import { i as getSiteSettings } from "../settings-D_cJtT48.mjs";
-import "../sections-CIhqs3Ao.mjs";
-import "../settings-tnPQN3Z2.mjs";
-import "../taxonomies-S1M3rUC0.mjs";
-import "../manifest-schema-DcZjRNEv.mjs";
-import "../marketplace-CNxjq10S.mjs";
-import "../types-ClFEExxn.mjs";
-import { t as EmDashStorageError } from "../types-d2Szb1oz.mjs";
-import "../artifact-fetch-CGK0DQLj.mjs";
-import "../ssrf-CRJ-xom5.mjs";
-import "../authoritative-records-ChM8dTeV.mjs";
-import { t as apiError } from "../error-DIYXAVk4.mjs";
-import "../parse-5Y0W39xR.mjs";
-import "../redirects-1nhdEaTq.mjs";
-import "../entry-lock-yIkBduqJ.mjs";
-import "../media-Bs6qmlVl.mjs";
-import "../comments-zrTgWBSg.mjs";
-import "../byline-fields-BYbTptTU.mjs";
-import "../menus-mC_XTxD7.mjs";
-import "../status-C6IrSLMT.mjs";
-import { o as createPublicMediaUrlResolver } from "../apply-CDNV4JJ-.mjs";
-import { o as invalidateUrlPatternCache } from "../query-DyYYWOKk.mjs";
-import "../import-DEfuIgRz.mjs";
-import "../redirects-D1yMnSR9.mjs";
-import "../ssrf-sC4_5rxm.mjs";
-import "../credits-JOE92Gr7.mjs";
-import "../cron-ktyapbdB.mjs";
-import "../email-console-Dm78wSmg.mjs";
-import "../fence-8MaKKWhp.mjs";
-import "../route-wire-ClUVQduA.mjs";
-import "../routes-D2GFl3B7.mjs";
-import "../utils-Dr01wRKt.mjs";
-import "../tokens-B_ffPF1q.mjs";
-import "../preview--2VDLaND.mjs";
-import "../hreflang-Bterc3b7.mjs";
-import "../comment-reaction-B5sZzSoA.mjs";
-import "../bylines-gyWBWUUc.mjs";
-import { r as getWidgetAreas } from "../widgets-DMAgGcQt.mjs";
-import "../validate-BttYU7NK.mjs";
-import "../load-BR1NEa_3.mjs";
-import "../search-pZRRmWjh.mjs";
-import { i as resolveRuntimeMigrationMode, t as PendingMigrationsError } from "../policy-DMRiMdLn.mjs";
-import { n as EmDashRuntime, t as DB_INIT_DEADLINE_MS } from "../emdash-runtime-BakQ6io7.mjs";
-import "../site-url-wEYRMHBv.mjs";
-import "../public-submission-BRyK76U8.mjs";
-import "../ownership-Bd77AmJz.mjs";
-import "../snapshot-W36KbLmc.mjs";
-import "../backup-CDrPP8fI.mjs";
-import "../comments-B3F-ETyh.mjs";
-import "../rate-limit-D0BcE76H.mjs";
-import "../service-COVdVpSK.mjs";
-import "../lifecycle-BWtBGNEn.mjs";
-import { n as resolveSessionUser } from "../session-user-C6IEjuty.mjs";
+import "../collection-slugs-cache-B2Gs9Jwx.mjs";
+import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-DAZU9VDd.mjs";
+import "../api-CltsXhiX.mjs";
+import "../capture-triggers-C9JKoIdT.mjs";
+import "../activation-xomsCMJg.mjs";
+import "../media-usage-work-C734aq6s.mjs";
+import "../registry-DaXmUsD4.mjs";
+import "../hash-C4DFoJ7Z.mjs";
+import "../zod-generator-BQilAboC.mjs";
+import "../errors-CuHQRiBW.mjs";
+import "../canonical-Y1dpjCnp.mjs";
+import "../digest-xIpR3o64.mjs";
+import "../block-values-H4E0XwE8.mjs";
+import "../query-DHqFiqqH.mjs";
+import "../schema-VtaZSrC-.mjs";
+import "../relations-JvBP8nGP.mjs";
+import "../dashboard-B5hVHOtf.mjs";
+import "../config-BsJHiQxC.mjs";
+import "../errors-DTE6C3K_.mjs";
+import "../update-check-DOc2aBIU.mjs";
+import "../media-Bw-Q65ve.mjs";
+import "../media-folders-kabR1oJf.mjs";
+import "../content-repair-B7wnbzhN.mjs";
+import "../settings-WHr45II1.mjs";
+import "../site-settings-KJOqJW6W.mjs";
+import "../media-usage-CHHpV7ee.mjs";
+import "../media-usage-activation-BinYqC_r.mjs";
+import "../media-usage-work-lxvV0-UO.mjs";
+import "../schema-CK0ihqMR.mjs";
+import "../block-types-C0YFSfR7.mjs";
+import "../seo-C61bnPuV.mjs";
+import { i as getSiteSettings } from "../settings-m5tIYnF0.mjs";
+import "../sections-CBDCf7qR.mjs";
+import "../settings-0u0lTthS.mjs";
+import "../taxonomies-BS40Wxvi.mjs";
+import "../manifest-schema-gy37bD_D.mjs";
+import "../marketplace-tHWSsCUo.mjs";
+import "../types-CxwtnuSS.mjs";
+import { t as EmDashStorageError } from "../types-DGw8KMX_.mjs";
+import "../artifact-fetch-CWxyELVI.mjs";
+import "../ssrf-DsmvZB80.mjs";
+import "../authoritative-records-dSvXCfzb.mjs";
+import { t as apiError } from "../error-B0rgPgsQ.mjs";
+import "../parse-CmFDTGzp.mjs";
+import "../redirects-D4EWeXAo.mjs";
+import "../entry-lock-sxz2PGAT.mjs";
+import "../media-aahnKHze.mjs";
+import "../comments-BRtp992B.mjs";
+import "../byline-fields-DHJs0Mja.mjs";
+import "../menus-BQKqf0Up.mjs";
+import "../status-D39Fpy8R.mjs";
+import { o as createPublicMediaUrlResolver } from "../apply-Q7uvzBWW.mjs";
+import { o as invalidateUrlPatternCache } from "../query-DT85BehD.mjs";
+import "../import-ROBvhbNc.mjs";
+import "../redirects-DCKqwiWp.mjs";
+import "../ssrf-tA45vIPX.mjs";
+import "../credits-Bu7dlobo.mjs";
+import "../cron-xe5XKqA-.mjs";
+import "../email-console-DmqVF5J_.mjs";
+import "../fence-CGw57S4v.mjs";
+import "../route-wire-DK600v4u.mjs";
+import "../routes-BeZyaCzv.mjs";
+import "../utils-CoV-PYhg.mjs";
+import "../tokens-DSQan4p7.mjs";
+import "../preview-xWNSR1Li.mjs";
+import "../hreflang-CKPunvU0.mjs";
+import "../comment-reaction-B8SfT-yM.mjs";
+import "../bylines-C71YACkL.mjs";
+import { r as getWidgetAreas } from "../widgets-BkxBAgZ_.mjs";
+import "../validate-DBX3DKtL.mjs";
+import "../load-DMxRl4VK.mjs";
+import "../search-D6-XK1Sn.mjs";
+import { i as resolveRuntimeMigrationMode, t as PendingMigrationsError } from "../policy-C5wrDXYV.mjs";
+import { n as EmDashRuntime, t as DB_INIT_DEADLINE_MS } from "../emdash-runtime-BlybX9Ui.mjs";
+import "../site-url-Ceq_AUK0.mjs";
+import "../public-submission-CkmT2SKv.mjs";
+import "../ownership-DoeAIuTg.mjs";
+import "../snapshot-Dzsn3NZa.mjs";
+import "../backup-CFnbdTSJ.mjs";
+import "../comments-DVUYqdyC.mjs";
+import "../rate-limit-iMvcu3eu.mjs";
+import "../service-BuRKLMxa.mjs";
+import "../lifecycle-DGQI7itS.mjs";
+import { n as resolveSessionUser } from "../session-user-CqkPtrPL.mjs";
 import { defineMiddleware } from "astro:middleware";
 import { buildTime } from "virtual:emdash/build";
 import virtualConfig from "virtual:emdash/config";
@@ -383,8 +384,14 @@ async function prefetchTaxonomyTerms() {
 }
 /** Warm every menu via the real helper (primes `menu:${name}:${locale}`). */
 async function prefetchMenus() {
-	const rows = await (await getDb()).selectFrom("_emdash_menus").select("name").distinct().execute();
-	const names = [...new Set(rows.map((r) => r.name))];
+	const names = await cachedQuery({
+		namespace: CacheNamespace.MENUS,
+		key: "names",
+		load: async () => {
+			const rows = await (await getDb()).selectFrom("_emdash_menus").select("name").distinct().execute();
+			return [...new Set(rows.map((r) => r.name))];
+		}
+	});
 	await Promise.allSettled(names.map((name) => getMenu(name)));
 }
 /**
@@ -801,15 +808,79 @@ function pushMetricsTimings(timings, metrics) {
 /** Public routes that require the runtime (sitemap, robots.txt, etc.) */
 const PUBLIC_RUNTIME_ROUTES = new Set(["/sitemap.xml", "/robots.txt"]);
 const SITEMAP_COLLECTION_RE = /^\/sitemap-[a-z][a-z0-9_]*\.xml$/;
+function isImageEndpointRequest(context) {
+	const route = virtualConfig?.imageEndpointRoute;
+	return typeof route === "string" && context.routePattern === route;
+}
+/** The runtime's storage adapter, or null when none is configured or it cannot be created. */
+function tryGetStorage(config, migrationMode) {
+	try {
+		return EmDashRuntime.getStorage(buildDependencies(config, migrationMode));
+	} catch {
+		return null;
+	}
+}
+/**
+* Run an image endpoint request on the adapter's request-scoped db. Anything
+* on its path that queries (host middleware, the redirect middleware under a
+* custom endpoint route) must not fall back to the per-isolate singleton: a
+* request-bound connection (pg over Hyperdrive) reused by another request fails
+* or hangs on workerd's cross-request I/O guard. A signed-in request also gets
+* the db as `locals.emdash.db`, which the auth middleware resolves `locals.user`
+* with.
+*
+* The adapter's `commit()` is skipped: on D1 it sets the bookmark cookie, and a
+* response that sets a cookie is never stored by Workers Cache. This assumes
+* nothing on the image path writes data the client must read back; the
+* bookmark it sent still covers its earlier writes.
+*/
+async function runImageRequest(config, context, imageLocals, signedIn, metrics, next) {
+	const scoped = createRequestScopedDb$1({
+		config: config.database?.config,
+		isAuthenticated: signedIn,
+		isWrite: false,
+		canUseCachedBinding: false,
+		cookies: context.cookies,
+		url: context.url
+	});
+	if (!scoped) {
+		if (signedIn) try {
+			const { getDb } = await import("../loader-1DMiOq5s.mjs").then((n) => n.u);
+			imageLocals.db = await getDb();
+		} catch (error) {
+			console.error("[emdash] image request could not open the database:", error);
+		}
+		return finalizeResponse(await next());
+	}
+	if (signedIn) imageLocals.db = scoped.db;
+	const { deferredTasks, lifecycle } = coordinateScopedDbLifecycle({
+		...scoped,
+		commit: () => {}
+	});
+	const parent = getRequestContext();
+	return runWithContext(parent ? {
+		...parent,
+		db: scoped.db,
+		deferredTasks
+	} : {
+		editMode: false,
+		db: scoped.db,
+		metrics,
+		deferredTasks
+	}, () => finishScoped(lifecycle, async () => finalizeResponse(await next())));
+}
 /**
 * Ask the configured database adapter for a per-request scoped Kysely. The
 * adapter encapsulates any per-request semantics (D1 sessions, read-replica
 * routing, bookmark cookies, etc.); core just forwards the cookie jar and
-* request flags and wraps next() in ALS if a scope was returned.
+* request flags, registers the returned handle as a view of the configured
+* database, and wraps next() in ALS if a scope was returned.
 */
 function createRequestScopedDb$1(opts) {
 	if (typeof createRequestScopedDb !== "function") return null;
-	return createRequestScopedDb(opts);
+	const scoped = createRequestScopedDb(opts);
+	if (scoped) markRequestScopedDb(scoped.db);
+	return scoped;
 }
 const buildDate = buildTime ? new Date(buildTime) : null;
 /**
@@ -821,6 +892,10 @@ const buildDate = buildTime ? new Date(buildTime) : null;
 * returning visitor's conditional request with 304, leaving them on HTML whose
 * assets 404.
 *
+* Only a route that set a content validator gets the build dimension. The build
+* alone does not move when content is published, so as a page's only validator
+* it would answer every returning visitor with 304 until the next deploy.
+*
 * Prerendered pages are served by the host's static layer, which manages its
 * own validators — only on-demand responses need the build dimension.
 *
@@ -828,13 +903,14 @@ const buildDate = buildTime ? new Date(buildTime) : null;
 * different, so after a rollback the earlier build still answers a conditional
 * request with 304 and the browser stays on the newer build's HTML.
 *
-* Must run before next(): Astro keeps the later of two dates, so a route's own
-* hint still wins when content is newer, and a route that opts out with
-* `Astro.cache.set(false)` stays opted out — calling set() afterwards would
-* clear that opt-out.
+* Must run after next(), once the route has set its hint. Astro keeps the later
+* of two dates, so a route's own hint still wins when content is newer.
+* `Astro.cache.set(false)` also clears `lastModified`, so for an opted-out
+* route the guard skips the build `set()` below, which would re-enable caching.
 */
 function applyBuildValidator(context) {
 	if (context.isPrerendered || !buildDate || !context.cache?.enabled) return;
+	if (!context.cache.options.lastModified) return;
 	context.cache.set({ lastModified: buildDate });
 }
 const onRequest = defineMiddleware(async (context, next) => {
@@ -843,7 +919,6 @@ const onRequest = defineMiddleware(async (context, next) => {
 	if (!url.pathname.startsWith("/_emdash") && virtualConfig?.authProviders) {
 		if (virtualConfig.authProviders.some((p) => p.routes?.some((r) => r.pattern && url.pathname === r.pattern))) return finalizeResponse(await next());
 	}
-	applyBuildValidator(context);
 	const queryRecorder = isInstrumentationEnabled() ? createRecorder(url.pathname, request.method, request.headers.get("x-perf-phase") ?? "default") : void 0;
 	const metrics = createRequestMetrics(performance.now());
 	const run = async () => {
@@ -856,6 +931,12 @@ const onRequest = defineMiddleware(async (context, next) => {
 		const playgroundDb = locals.__playgroundDb;
 		const hasSessionCookie = cookies.get("astro-session") !== void 0;
 		const sessionUser = context.isPrerendered || !hasSessionCookie ? null : await resolveSessionUser(context.session);
+		const imageStorage = config && !playgroundDb && isImageEndpointRequest(context) ? tryGetStorage(config, migrationMode) : null;
+		if (imageStorage) {
+			const imageLocals = { storage: imageStorage };
+			locals.emdash = imageLocals;
+			return runImageRequest(config, context, imageLocals, !!sessionUser, metrics, next);
+		}
 		const hasBearerAuth = (request.headers.get("authorization") ?? "").toLowerCase().startsWith("bearer ");
 		const isWrite = request.method !== "GET" && request.method !== "HEAD";
 		const isAuthenticated = !!sessionUser || hasBearerAuth;
@@ -870,7 +951,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 				if (migrationMode === "auto" && !isSetupVerified() && !context.isPrerendered) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-D4edocWH.mjs").then((n) => n.l);
+						const { getDb } = await import("../loader-1DMiOq5s.mjs").then((n) => n.u);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						markSetupVerified();
 					} catch (error) {
@@ -1126,11 +1207,13 @@ const onRequest = defineMiddleware(async (context, next) => {
 		return doInit();
 	};
 	try {
-		return await runWithContext({
+		const response = await runWithContext({
 			editMode: false,
 			queryRecorder,
 			metrics
 		}, run);
+		applyBuildValidator(context);
+		return response;
 	} finally {
 		if (queryRecorder && !queryRecorder.deferredFlush) flushRecorder(queryRecorder);
 	}