emdash 0.19.0 → 0.21.0

package/dist/astro/middleware.mjs

@@ -2,7 +2,7 @@ import { i as runMigrations, t as MIGRATION_RACE_WAIT_MS } from "../runner--4wMW
 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, y as after } from "../menus-Dp9xporj.mjs";
+import { _ as resolveExclusiveHooks, g as createHookPipeline, m as EmailPipeline, p as PluginRouteRegistry, v as definePlugin } from "../menus-Ryk9L7fT.mjs";
 import { r as RevisionRepository, t as ContentRepository } from "../content-BIlVx-RX.mjs";
 import "../base64-CqR-7kqF.mjs";
 import "../types-BXSUSAjt.mjs";
@@ -11,60 +11,63 @@ import "../user-C0um7wrg.mjs";
 import "../taxonomy-CdllE4oq.mjs";
 import "../comment-sqQxNpN3.mjs";
 import { t as OptionsRepository } from "../options-BPCVnesz.mjs";
-import "../context-GG52SPgh.mjs";
+import "../context-Cm4pt1Ws.mjs";
 import "../menus-DX4_E01q.mjs";
 import "../redirect-CRWIt8Zj.mjs";
+import { n as initWithLock, r as after, t as createInitLock } from "../init-lock-DlBHjf9-.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-BZ6bhjYs.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 { r as requestCached } from "../request-cache-UwmBAiUK.mjs";
+import "../byline-registry-DedidtqC.mjs";
+import "../byline-V_Qp1Ziw.mjs";
+import { n as normalizeMediaValue } from "../normalize-DKsg36ty.mjs";
+import "../placeholder-2xumZh4g.mjs";
+import "../seo-DpNgGQjF.mjs";
+import { n as isMissingTableError } from "../db-errors-BluWkwGI.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-DxjIV2o8.mjs";
+import "../dashboard-C-UYpps0.mjs";
+import { n as hashString } from "../hash-DlvIFn0b.mjs";
+import { t as FTSManager } from "../fts-manager-Cx5z8jdA.mjs";
+import { n as SchemaRegistry } from "../registry-diMzD1Wf.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
-import { r as getDb } from "../loader-CpZKpFz0.mjs";
-import "../schema-CS7Eg5gh.mjs";
-import "../zod-generator-Djo_VHCt.mjs";
-import "../seo-DfjLvu8i.mjs";
-import "../sections-DhsZ0ns9.mjs";
-import { o as invalidateSiteSettingsCache } from "../settings-B1p-gPUK.mjs";
-import "../settings-DIsbHTRE.mjs";
-import "../resolve-BqYMVG0D.mjs";
-import "../taxonomies-BEW7S5AI.mjs";
-import "../taxonomies-UusDXv3C.mjs";
-import { r as normalizeManifestRoute } from "../manifest-schema-Cj-YrzrF.mjs";
-import "../types-Cj2S6FuC.mjs";
-import "../ssrf-BsVGIE0Z.mjs";
-import "../error-RwM4dD35.mjs";
-import "../parse-CrGndy1A.mjs";
-import "../redirects-DEygMrRO.mjs";
-import "../byline-fields-51kg6Vuv.mjs";
-import { a as invalidateUrlPatternCache } from "../query-BFQ029Ts.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-wurS258E.mjs";
-import "../widgets-ClEnYQCH.mjs";
-import "../apply-hQkKKBCf.mjs";
-import "../load-B84ohfBk.mjs";
-import "../search-o-aQzHI1.mjs";
+import { r as getDb } from "../loader-BqWjcH3h.mjs";
+import "../schema-BDOkd3OU.mjs";
+import "../zod-generator-CarzgPAu.mjs";
+import "../seo-CLhm-Fmb.mjs";
+import "../sections-P0zuBlyz.mjs";
+import { r as singleFlightCached, t as createSingleFlightCache } from "../single-flight-cache-C0UV1Npg.mjs";
+import { o as invalidateSiteSettingsCache } from "../settings-BjBsmVAo.mjs";
+import "../settings-sO0Fif4p.mjs";
+import "../resolve-B3NUUtVY.mjs";
+import "../taxonomies-BBxYA38v.mjs";
+import "../taxonomies-DuESHWKI.mjs";
+import { r as normalizeManifestRoute } from "../manifest-schema-DFPeqMAn.mjs";
+import "../types-BoRm8-pp.mjs";
+import "../ssrf-XO05Voq6.mjs";
+import "../error-CNn_w7jf.mjs";
+import "../parse-DzSrk1t8.mjs";
+import "../redirects-6Zg2SoYo.mjs";
+import "../byline-fields-B0NO1yUB.mjs";
+import "../status-2gZklYuj.mjs";
+import { a as invalidateUrlPatternCache } from "../query-Crm038Mc.mjs";
+import "../import-KyxT1Mbs.mjs";
+import { t as getTrustedProxyHeaders } from "../trusted-proxy-CHp41Fjj.mjs";
+import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-DPechd0W.mjs";
+import "../ssrf-CRZGzjdL.mjs";
+import { n as CronExecutor } from "../cron-DdEVrQ2Y.mjs";
+import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from "../email-console-BbU3RbWv.mjs";
+import "../utils-C4M981Br.mjs";
+import "../tokens-DMkVjxrx.mjs";
+import "../preview-Dqv2hwXr.mjs";
+import "../bylines-DfGDnred.mjs";
+import "../widgets-Ci6hLwfO.mjs";
+import "../apply-CLjxheyb.mjs";
+import "../load-Dq91b_DK.mjs";
+import "../search-Bs_J_EW-.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-Dw0JXu45.mjs";
-import { t as getAuthMode } from "../mode-BjlXswIw.mjs";
-import { t as cleanupExpiredChallenges } from "../challenge-store-DGwuCc4R.mjs";
-import { a as validateEncryptionKeyAtStartup } from "../secrets-C_ZtRos3.mjs";
+import { n as VERSION, t as COMMIT } from "../version-BOjj_cfz.mjs";
+import { t as getAuthMode } from "../mode-CGXzIbD8.mjs";
+import { t as cleanupExpiredChallenges } from "../challenge-store-woE0bbCf.mjs";
+import { a as validateEncryptionKeyAtStartup } from "../secrets-C8xmE6mR.mjs";
 import { Kysely, sql } from "kysely";
 import { defineMiddleware } from "astro:middleware";
 import virtualConfig from "virtual:emdash/config";
@@ -77,60 +80,6 @@ import { createScheduler } from "virtual:emdash/scheduler";
 import { createStorage } from "virtual:emdash/storage";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 
-//#region src/utils/init-lock.ts
-function createInitLock() {
-	return {
-		ownerStartedAt: null,
-		generation: 0
-	};
-}
-const DEFAULT_DEADLINE_MS = 15e3;
-const DEFAULT_POLL_MS = 50;
-const MAX_WAIT_HEADROOM_MS = 15e3;
-function sleep(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
-/**
-* Return the cached value if present, otherwise initialize it under the
-* lock. `init` is responsible for storing the value so that `getCached`
-* returns it on subsequent calls — waiters re-check `getCached` after the
-* owner finishes rather than sharing the owner's promise.
-*
-* `init` receives an `isCurrentClaim` predicate and must gate its cache
-* publication on it: a slow init that was reclaimed past the deadline
-* must not overwrite the value published by the reclaimer (for the
-* runtime singleton that would orphan the reclaimer's active cron
-* scheduler). A losing init should also tear down any side resources it
-* started, since its result will never be published.
-*/
-async function initWithLock(lock, getCached, init, options) {
-	const deadlineMs = options?.deadlineMs ?? DEFAULT_DEADLINE_MS;
-	const pollMs = options?.pollMs ?? DEFAULT_POLL_MS;
-	const maxWaitMs = options?.maxWaitMs ?? deadlineMs + MAX_WAIT_HEADROOM_MS;
-	const waitStart = Date.now();
-	for (;;) {
-		const cached = getCached();
-		if (cached !== null && cached !== void 0) return cached;
-		const ownerStartedAt = lock.ownerStartedAt;
-		if (ownerStartedAt === null || Date.now() - ownerStartedAt > deadlineMs) {
-			lock.generation += 1;
-			const claim = lock.generation;
-			lock.ownerStartedAt = Date.now();
-			try {
-				const isCurrentClaim = () => lock.generation === claim;
-				const initPromise = Promise.resolve().then(() => init(isCurrentClaim));
-				options?.anchor?.(initPromise.then(() => void 0, () => void 0));
-				return await initPromise;
-			} finally {
-				if (lock.generation === claim) lock.ownerStartedAt = null;
-			}
-		}
-		if (Date.now() - waitStart > maxWaitMs) throw new Error(`initWithLock: timed out after ${maxWaitMs}ms waiting for initialization`);
-		await sleep(pollMs);
-	}
-}
-
-//#endregion
 //#region src/cleanup.ts
 /**
 * System cleanup
@@ -464,12 +413,12 @@ var EmDashRuntime = class EmDashRuntime {
 	enabledPlugins;
 	pluginStates;
 	/**
-	* Set to true after FTS indexes have been verified for this worker
-	* lifetime so we don't re-scan on every admin request. See
-	* ensureSearchHealthy().
+	* 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 single-flight cache (never a shared awaitable
+	* promise) so a cancelled first caller can't wedge later ones.
 	*/
-	_searchHealthChecked = false;
-	_searchHealthPromise = null;
+	_searchHealthCache = createSingleFlightCache();
 	/** Current hook pipeline. Use the `hooks` getter for external access. */
 	get hooks() {
 		return this._hooks;
@@ -1095,9 +1044,9 @@ var EmDashRuntime = class EmDashRuntime {
 					}
 				})();
 				if (collectionCount.count === 0 && !setupDone) {
-					const { applySeed } = await import("../apply-hQkKKBCf.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-B84ohfBk.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-ZP9Dvg0P.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply-CLjxheyb.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-Dq91b_DK.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-DGhQPXzI.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -1552,22 +1501,18 @@ var EmDashRuntime = class EmDashRuntime {
 	* defend against FTS not existing yet (pre-setup).
 	*/
 	async ensureSearchHealthy() {
-		if (this._searchHealthChecked) return;
-		if (this._searchHealthPromise) return this._searchHealthPromise;
-		if (!isSqlite(this._db)) {
-			this._searchHealthChecked = true;
-			return;
-		}
-		this._searchHealthPromise = (async () => {
-			try {
-				const repaired = await new FTSManager(this._db).verifyAndRepairAll();
-				if (repaired > 0) console.log(`Repaired ${repaired} corrupted FTS index(es)`);
-			} catch {} finally {
-				this._searchHealthChecked = true;
-				this._searchHealthPromise = null;
-			}
-		})();
-		return this._searchHealthPromise;
+		if (!isSqlite(this._db)) return;
+		try {
+			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)`);
+				} catch {}
+			}, {
+				anchor: (promise) => after(() => promise),
+				ownerTimeoutMs: 3e4
+			});
+		} catch {}
 	}
 	async handleContentList(collection, params) {
 		return handleContentList(this.db, collection, params);
@@ -1631,7 +1576,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-CE5i4q0c.mjs");
+		const { validateContentData } = await import("../validation-DVHjPM1M.mjs");
 		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
 		if (!validation.ok) return {
 			success: false,
@@ -1674,7 +1619,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-CE5i4q0c.mjs");
+			const { validateContentData } = await import("../validation-DVHjPM1M.mjs");
 			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
 			if (!validation.ok) return {
 				success: false,
@@ -2492,6 +2437,11 @@ function pushMetricsTimings(timings, metrics) {
 			desc: "Last query at"
 		});
 	}
+	if (metrics.rpcCount > 0) timings.push({
+		name: "rpc.count",
+		dur: metrics.rpcCount,
+		desc: "DB round trips"
+	});
 	if (metrics.cacheHits + metrics.cacheMisses > 0) {
 		timings.push({
 			name: "cache.hit",
@@ -2541,7 +2491,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 				if (!isSetupVerified()) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-CpZKpFz0.mjs").then((n) => n.i);
+						const { getDb } = await import("../loader-BqWjcH3h.mjs").then((n) => n.i);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						markSetupVerified();
 					} catch (error) {
@@ -2608,9 +2558,11 @@ const onRequest = defineMiddleware(async (context, next) => {
 						db: anonScoped.db,
 						metrics
 					}, async () => {
-						const response = await runAnon();
-						anonScoped.commit();
-						return response;
+						try {
+							return await runAnon();
+						} finally {
+							anonScoped.commit();
+						}
 					});
 				}
 				return runAnon();
@@ -2722,9 +2674,11 @@ const onRequest = defineMiddleware(async (context, next) => {
 					db: scoped.db,
 					metrics
 				}, async () => {
-					const response = await renderAndFinalize();
-					scoped.commit();
-					return response;
+					try {
+						return await renderAndFinalize();
+					} finally {
+						scoped.commit();
+					}
 				});
 			}
 			return renderAndFinalize();