emdash 0.20.0 → 0.22.0

package/dist/astro/middleware.mjs

@@ -1,70 +1,77 @@
-import { i as runMigrations, t as MIGRATION_RACE_WAIT_MS } from "../runner--4wMWwKM.mjs";
+import { i as runMigrations, t as MIGRATION_RACE_WAIT_MS } from "../runner-DYYnW530.mjs";
 import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
 import { o as isSqlite } from "../dialect-helpers-DRI5pyY3.mjs";
 import { i as setI18nConfig } from "../config-CVssduLe.mjs";
-import { _ as resolveExclusiveHooks, g as createHookPipeline, m as EmailPipeline, p as PluginRouteRegistry, v as definePlugin } from "../menus-DrQLusqj.mjs";
-import { r as RevisionRepository, t as ContentRepository } from "../content-BIlVx-RX.mjs";
-import "../base64-CqR-7kqF.mjs";
-import "../types-BXSUSAjt.mjs";
-import { t as MediaRepository } from "../media-JOf3pNkw.mjs";
-import "../user-C0um7wrg.mjs";
-import "../taxonomy-CdllE4oq.mjs";
-import "../comment-sqQxNpN3.mjs";
-import { t as OptionsRepository } from "../options-BPCVnesz.mjs";
-import "../context-Y7BRkWes.mjs";
-import "../menus-DX4_E01q.mjs";
-import "../redirect-CRWIt8Zj.mjs";
+import { _ as resolveExclusiveHooks, g as createHookPipeline, m as EmailPipeline, p as PluginRouteRegistry, t as getMenu, v as definePlugin } from "../menus-DOs1MQJg.mjs";
+import { t as after } from "../after-B1IIdH3Y.mjs";
 import { createRequestMetrics, getRequestContext, runWithContext } from "../request-context.mjs";
-import { r as requestCached } from "../request-cache-D32LpnmI.mjs";
-import "../byline-registry-CWP7I71B.mjs";
-import "../byline-DUx48sJp.mjs";
-import { n as normalizeMediaValue } from "../normalize-CK5o04zr.mjs";
-import "../placeholder-BZxr8W1j.mjs";
-import "../seo-B5e6y9Wk.mjs";
-import { n as isMissingTableError } from "../db-errors-CtzxKBxe.mjs";
-import { $ as handleContentGet, B as handleMediaUpdate, G as handleContentAuthors, H as handleRevisionList, I as handleMediaCreate, J as handleContentCountTrashed, K as handleContentCompare, L as handleMediaDelete, Q as handleContentDuplicate, R as handleMediaGet, S as PluginStateRepository, U as handleRevisionRestore, V as handleRevisionGet, X as handleContentDelete, Y as handleContentCreate, Z as handleContentDiscardDraft, _ as loadBundleFromR2, at as handleContentRestore, ct as handleContentUnpublish, dt as validateRev, et as handleContentGetIncludingTrashed, it as handleContentPublish, lt as handleContentUnschedule, nt as handleContentListTrashed, ot as handleContentSchedule, q as handleContentCountScheduled, rt as handleContentPermanentDelete, s as normalizeRegistryConfig, st as handleContentTranslations, tt as handleContentList, ut as handleContentUpdate, z as handleMediaList } from "../api-DStv36ik.mjs";
-import "../dashboard-2JgAMWxK.mjs";
-import { n as hashString } from "../hash-9w3pd3-m.mjs";
-import { t as FTSManager } from "../fts-manager-1RgHmopc.mjs";
-import { n as SchemaRegistry } from "../registry-brYh-rAT.mjs";
+import "../object-cache-SEb2IM4Z.mjs";
+import { r as RevisionRepository, t as ContentRepository } from "../content-2PTDNnoh.mjs";
+import "../base64-CmWvODNW.mjs";
+import "../types-DXOIbece.mjs";
+import { t as MediaRepository } from "../media-Bw0sA6rb.mjs";
+import "../user-Db-Rti_z.mjs";
+import "../taxonomy-B2HQuVf5.mjs";
+import "../comment-80UyJJUR.mjs";
+import { t as OptionsRepository } from "../options-DTTML-Tx.mjs";
+import "../context-f1__jpzF.mjs";
+import "../menus-CYs0WZoL.mjs";
+import "../redirect-Bifv_yHv.mjs";
+import { i as setRequestCacheEntry, r as requestCached } from "../request-cache-KCNHp_RJ.mjs";
+import "../byline-registry-BOjqDOim.mjs";
+import { n as initWithLock, t as createInitLock } from "../init-lock-6b309ZrF.mjs";
+import "../byline-CC0WS4Gu.mjs";
+import { n as normalizeMediaValue } from "../normalize-Uam4_Vkr.mjs";
+import "../placeholder-CIDCpyEY.mjs";
+import "../seo-Cu47j3mJ.mjs";
+import { n as isMissingTableError } from "../db-errors-CrC5w3Jz.mjs";
+import { $ as handleContentGet, B as handleMediaUpdate, G as handleContentAuthors, H as handleRevisionList, I as handleMediaCreate, J as handleContentCountTrashed, K as handleContentCompare, L as handleMediaDelete, Q as handleContentDuplicate, R as handleMediaGet, S as PluginStateRepository, U as handleRevisionRestore, V as handleRevisionGet, X as handleContentDelete, Y as handleContentCreate, Z as handleContentDiscardDraft, _ as loadBundleFromR2, at as handleContentRestore, ct as handleContentUnpublish, dt as validateRev, et as handleContentGetIncludingTrashed, it as handleContentPublish, lt as handleContentUnschedule, nt as handleContentListTrashed, ot as handleContentSchedule, q as handleContentCountScheduled, rt as handleContentPermanentDelete, s as normalizeRegistryConfig, st as handleContentTranslations, tt as handleContentList, ut as handleContentUpdate, z as handleMediaList } from "../api-BDuM4bEy.mjs";
+import "../dashboard-BOESNcwE.mjs";
+import { n as hashString } from "../hash-BowcuPwv.mjs";
+import { t as FTSManager } from "../fts-manager-DtiWqwNJ.mjs";
+import { n as SchemaRegistry } from "../registry-CjK96fHD.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
-import { r as getDb } from "../loader-ZN1ll-d-.mjs";
-import "../schema-C1E70ug_.mjs";
-import "../zod-generator-Djo_VHCt.mjs";
-import "../seo-D_LPkOtu.mjs";
-import "../sections-D_lVzwRZ.mjs";
-import { c as createIsolateCache, d as initWithLock, f as after, l as isolateCachedAsync, o as invalidateSiteSettingsCache, u as createInitLock } from "../settings-DfxiWY_s.mjs";
-import "../settings-Cv47v9u8.mjs";
-import "../resolve-BqYMVG0D.mjs";
-import "../taxonomies-BdAmbOwx.mjs";
-import "../taxonomies-BILwiyGk.mjs";
-import { r as normalizeManifestRoute } from "../manifest-schema-BtwbL_vj.mjs";
-import "../types-CZI4E3qG.mjs";
-import "../ssrf-BsVGIE0Z.mjs";
-import "../error-RwM4dD35.mjs";
-import "../parse-CrGndy1A.mjs";
-import "../redirects-CCbCqCCd.mjs";
-import "../byline-fields-8TMtkBnH.mjs";
-import { a as invalidateUrlPatternCache } from "../query-CbUcI4Xk.mjs";
-import "../import-Dh8bWmyq.mjs";
-import { t as getTrustedProxyHeaders } from "../trusted-proxy-B4AfnoAp.mjs";
-import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-7ByVLxB-.mjs";
-import "../ssrf-BvgVcfNQ.mjs";
-import { n as CronExecutor } from "../cron-BJ2ClIlj.mjs";
-import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from "../email-console-DHT2Fbpj.mjs";
-import "../utils-C4Ih4DML.mjs";
-import "../tokens-Bx2afeT-.mjs";
-import "../preview-BfuRkVKW.mjs";
-import "../bylines-s8c2DXbH.mjs";
-import "../widgets-DZfmAbE4.mjs";
-import "../apply-Dr7snAMT.mjs";
-import "../load-BBetCvLC.mjs";
-import "../search-B3SGZw91.mjs";
+import { r as getDb } from "../loader-C8Z48Uof.mjs";
+import "../schema-5z2Jfnbm.mjs";
+import "../zod-generator-D481JjzD.mjs";
+import "../seo-DRnqnstF.mjs";
+import "../sections-DWYZo6HK.mjs";
+import { r as singleFlightCached, t as createSingleFlightCache } from "../single-flight-cache-B5p5cNOL.mjs";
+import { i as getSiteSettings, o as invalidateSiteSettingsCache } from "../settings-yaxu9mU-.mjs";
+import "../settings-DUrVDN0c.mjs";
+import "../resolve-CpbBglV0.mjs";
+import { a as getTaxonomyDefs, o as getTaxonomyTerms } from "../taxonomies-Be9B1jEj.mjs";
+import "../taxonomies-CJmkEpdS.mjs";
+import { r as normalizeManifestRoute } from "../manifest-schema-DDSbwkAL.mjs";
+import "../types-Bfr2Pj6z.mjs";
+import "../ssrf-B0VeRLrp.mjs";
+import "../error-BQ1pxs0L.mjs";
+import "../parse-qrHlnzTy.mjs";
+import "../redirects-DUvXgzCX.mjs";
+import "../byline-fields-53i9Et0x.mjs";
+import "../status-CB2basWJ.mjs";
+import { a as invalidateUrlPatternCache } from "../query-B1RVFUNM.mjs";
+import "../import-DqSGOlmR.mjs";
+import { t as getTrustedProxyHeaders } from "../trusted-proxy-DY1_UqHr.mjs";
+import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-ei3ATilC.mjs";
+import "../ssrf-Cz1e2QPn.mjs";
+import { n as CronExecutor } from "../cron-CQPxBjYs.mjs";
+import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from "../email-console-B9VS6eN4.mjs";
+import "../utils-LbHcSRTj.mjs";
+import "../tokens-BvrJvIB6.mjs";
+import "../preview-IDye9SPQ.mjs";
+import "../comment-reaction-B6AdcpXw.mjs";
+import "../bylines-CCO1CYnH.mjs";
+import { n as getWidgetAreas } from "../widgets-8GONuRHo.mjs";
+import "../apply-wDqQoxX4.mjs";
+import "../load-Dtoo7KcJ.mjs";
+import "../search-D9FkoM-k.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-D-5txk2m.mjs";
-import { t as getAuthMode } from "../mode-CO2vQHfq.mjs";
-import { t as cleanupExpiredChallenges } from "../challenge-store-DXX3rfdI.mjs";
-import { a as validateEncryptionKeyAtStartup } from "../secrets-ChPTmy9x.mjs";
+import { n as VERSION, t as COMMIT } from "../version-RnYXYjzD.mjs";
+import { t as getAuthMode } from "../mode-CFh8Dw8G.mjs";
+import { t as cleanupExpiredChallenges } from "../challenge-store-C6E_kWTs.mjs";
+import { a as validateEncryptionKeyAtStartup } from "../secrets-BUE5UQys.mjs";
+import { t as resolveSessionUser } from "../session-user-DmtPMNa1.mjs";
 import { Kysely, sql } from "kysely";
 import { defineMiddleware } from "astro:middleware";
 import virtualConfig from "virtual:emdash/config";
@@ -412,10 +419,10 @@ var EmDashRuntime = class EmDashRuntime {
 	/**
 	* Isolate-lifetime guard so FTS indexes are verified at most once per
 	* worker rather than on every admin request. See ensureSearchHealthy().
-	* Uses the poison-immune isolate cache (never a shared awaitable promise)
-	* so a cancelled first caller can't wedge later ones.
+	* Uses the poison-immune single-flight cache (never a shared awaitable
+	* promise) so a cancelled first caller can't wedge later ones.
 	*/
-	_searchHealthCache = createIsolateCache();
+	_searchHealthCache = createSingleFlightCache();
 	/** Current hook pipeline. Use the `hooks` getter for external access. */
 	get hooks() {
 		return this._hooks;
@@ -1041,9 +1048,9 @@ var EmDashRuntime = class EmDashRuntime {
 					}
 				})();
 				if (collectionCount.count === 0 && !setupDone) {
-					const { applySeed } = await import("../apply-Dr7snAMT.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-BBetCvLC.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-Bz4vqcX1.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply-wDqQoxX4.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-Dtoo7KcJ.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-Bwl64sxv.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -1106,7 +1113,9 @@ var EmDashRuntime = class EmDashRuntime {
 				allowedHosts: entry.allowedHosts,
 				storage: entry.storage,
 				adminPages,
-				adminWidgets
+				adminWidgets,
+				portableTextBlocks: entry.portableTextBlocks,
+				fieldWidgets: entry.fieldWidgets
 			});
 			plugins.push(resolved);
 			console.log(`EmDash: Loaded plugin ${entry.id}:${entry.version} in-process (sandbox bypassed)`);
@@ -1418,7 +1427,9 @@ var EmDashRuntime = class EmDashRuntime {
 				sandboxed: true,
 				adminMode: hasAdminPages || hasWidgets ? "blocks" : "none",
 				adminPages: entry.adminPages ?? [],
-				dashboardWidgets: entry.adminWidgets ?? []
+				dashboardWidgets: entry.adminWidgets ?? [],
+				portableTextBlocks: entry.portableTextBlocks,
+				fieldWidgets: entry.fieldWidgets
 			};
 		}
 		for (const [pluginId, meta] of marketplaceManifestCache) {
@@ -1500,7 +1511,7 @@ var EmDashRuntime = class EmDashRuntime {
 	async ensureSearchHealthy() {
 		if (!isSqlite(this._db)) return;
 		try {
-			await isolateCachedAsync(this._searchHealthCache, async () => {
+			await singleFlightCached(this._searchHealthCache, async () => {
 				try {
 					const repaired = await new FTSManager(this._db).verifyAndRepairAll();
 					if (repaired > 0) console.log(`Repaired ${repaired} corrupted FTS index(es)`);
@@ -1573,7 +1584,7 @@ var EmDashRuntime = class EmDashRuntime {
 		if (this.hooks.hasHooks("content:beforeSave")) processedData = (await this.hooks.runContentBeforeSave(body.data, collection, true)).content;
 		processedData = await this.runSandboxedBeforeSave(processedData, collection, true);
 		processedData = await this.normalizeMediaFields(collection, processedData);
-		const { validateContentData } = await import("../validation-DgGTJm3u.mjs");
+		const { validateContentData } = await import("../validation-C_yOvFaO.mjs");
 		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
 		if (!validation.ok) return {
 			success: false,
@@ -1589,7 +1600,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-BIlVx-RX.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-2PTDNnoh.mjs").then((n) => n.n);
 		const repo = new ContentRepository(this.db);
 		const resolvedItem = await repo.findByIdOrSlug(collection, id, body.locale);
 		const resolvedId = resolvedItem?.id ?? id;
@@ -1616,7 +1627,7 @@ var EmDashRuntime = class EmDashRuntime {
 			if (this.hooks.hasHooks("content:beforeSave")) processedData = (await this.hooks.runContentBeforeSave(bodyWithoutRev.data, collection, false)).content;
 			processedData = await this.runSandboxedBeforeSave(processedData, collection, false);
 			processedData = await this.normalizeMediaFields(collection, processedData);
-			const { validateContentData } = await import("../validation-DgGTJm3u.mjs");
+			const { validateContentData } = await import("../validation-C_yOvFaO.mjs");
 			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
 			if (!validation.ok) return {
 				success: false,
@@ -2198,6 +2209,7 @@ function wrapBodyForStreamMetrics(response) {
 	const metrics = ctx?.metrics;
 	if (!metrics) return response;
 	const recorder = ctx?.queryRecorder;
+	if (recorder) recorder.deferredFlush = true;
 	const transform = new TransformStream({ flush() {
 		const snapshot = {
 			route: recorder?.route,
@@ -2212,6 +2224,7 @@ function wrapBodyForStreamMetrics(response) {
 			cacheMisses: metrics.cacheMisses
 		};
 		console.log(`${STREAM_END_PREFIX} ${JSON.stringify(snapshot)}`);
+		if (recorder) flushRecorder(recorder);
 	} });
 	const wrapped = new Response(response.body.pipeThrough(transform), response);
 	const astroCookies = Reflect.get(response, ASTRO_COOKIES_SYMBOL$1);
@@ -2220,6 +2233,66 @@ function wrapBodyForStreamMetrics(response) {
 	return wrapped;
 }
 
+//#endregion
+//#region src/astro/prefetch.ts
+/**
+* Eager, transparent prefetch of site-global "chrome" data.
+*
+* On a public page render, the shared layout pulls the same site-global data on
+* every request -- menus, widget areas, taxonomy term lists, site settings --
+* but each is awaited inside a separately-rendered Astro component, so they
+* execute as serial DB round trips. This fires them all CONCURRENTLY at the
+* very start of the request, before `next()`:
+*
+*   - On remote backends (D1, Durable Objects) the round trips overlap instead
+*     of serializing, collapsing ~N sequential RTTs into ~1 wall-clock RTT. On
+*     a coalescing backend they additionally batch into a single round trip.
+*   - The results land in the per-request `requestCached` store under the exact
+*     keys the layout helpers use, so when the components render they hit a warm
+*     (in-flight or resolved) cache entry instead of issuing their own query.
+*
+* Nothing here changes what templates call -- it warms the real helpers, so the
+* cache keys and value shapes are guaranteed identical. The caller gates this to
+* the public-page path on a request-scoped (remote) backend; it is a no-op-ish
+* waste on synchronous local SQLite, so don't call it there.
+*
+* Fire-and-forget: never awaited by middleware, never throws (a prefetch failure
+* must not affect the request -- the helpers will simply run on demand).
+*/
+/** Warm widget areas: one bulk load, primed under each per-area cache key. */
+async function prefetchWidgetAreas() {
+	const areas = await getWidgetAreas();
+	for (const area of areas) setRequestCacheEntry(`widget-area:${area.name}`, area);
+}
+/** Warm every taxonomy's term list via the real helper (primes per-name keys). */
+async function prefetchTaxonomyTerms() {
+	const defs = await getTaxonomyDefs();
+	await Promise.allSettled(defs.map((def) => getTaxonomyTerms(def.name)));
+}
+/** 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))];
+	await Promise.allSettled(names.map((name) => getMenu(name)));
+}
+/**
+* Concurrently warm the site-global layout data for the current request.
+* Safe to call only inside the request ALS frame that owns the (remote)
+* request-scoped db. Never throws.
+*/
+async function prefetchLayoutData() {
+	try {
+		await Promise.allSettled([
+			getSiteSettings(),
+			prefetchMenus(),
+			prefetchWidgetAreas(),
+			prefetchTaxonomyTerms()
+		]);
+	} catch (error) {
+		console.error("[emdash] layout prefetch failed (non-fatal):", error);
+	}
+}
+
 //#endregion
 //#region src/astro/public-plugin-api-routes.ts
 function pluginRouteNotFound() {
@@ -2480,15 +2553,15 @@ const onRequest = defineMiddleware(async (context, next) => {
 		const hasPreviewToken = url.searchParams.has("_preview");
 		const playgroundDb = locals.__playgroundDb;
 		const hasSessionCookie = cookies.get("astro-session") !== void 0;
-		const sessionUser = context.isPrerendered || !hasSessionCookie ? null : await context.session?.get("user");
+		const sessionUser = context.isPrerendered || !hasSessionCookie ? null : await resolveSessionUser(context.session);
 		if (!isEmDashRoute && !isPublicRuntimeRoute && !hasEditCookie && !hasPreviewToken) {
 			if (!sessionUser && !playgroundDb) {
 				const timings = [];
 				const mwStart = performance.now();
-				if (!isSetupVerified()) {
+				if (!isSetupVerified() && !context.isPrerendered) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-ZN1ll-d-.mjs").then((n) => n.i);
+						const { getDb } = await import("../loader-C8Z48Uof.mjs").then((n) => n.i);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						markSetupVerified();
 					} catch (error) {
@@ -2512,7 +2585,8 @@ const onRequest = defineMiddleware(async (context, next) => {
 							handlePublicPluginApiRoute: createPublicPluginApiRouteHandler(runtime),
 							collectPageMetadata: runtime.collectPageMetadata.bind(runtime),
 							collectPageFragments: runtime.collectPageFragments.bind(runtime),
-							getPublicMediaUrl: createPublicMediaUrlResolver(runtime.storage)
+							getPublicMediaUrl: createPublicMediaUrlResolver(runtime.storage),
+							storage: runtime.storage
 						};
 					} catch {}
 					timings.push({
@@ -2547,14 +2621,17 @@ const onRequest = defineMiddleware(async (context, next) => {
 				};
 				if (anonScoped) {
 					const parent = getRequestContext();
-					return runWithContext(parent ? {
+					const ctx = parent ? {
 						...parent,
 						db: anonScoped.db
 					} : {
 						editMode: false,
 						db: anonScoped.db,
 						metrics
-					}, async () => {
+					};
+					const acceptsHtml = (request.headers.get("accept") ?? "").split(",", 1)[0].trim().startsWith("text/html");
+					return runWithContext(ctx, async () => {
+						if (acceptsHtml) after(() => prefetchLayoutData());
 						try {
 							return await runAnon();
 						} finally {
@@ -2704,7 +2781,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 			metrics
 		}, run);
 	} finally {
-		if (queryRecorder) flushRecorder(queryRecorder);
+		if (queryRecorder && !queryRecorder.deferredFlush) flushRecorder(queryRecorder);
 	}
 });