emdash 0.12.0 → 0.13.0

package/dist/astro/middleware.mjs

@@ -1,37 +1,68 @@
-import { r as runMigrations } from "../runner-DIcU2UCC.mjs";
+import { r as runMigrations } from "../runner-DdnQIwz_.mjs";
 import { createRequestMetrics, getRequestContext, runWithContext } from "../request-context.mjs";
 import { createRecorder, flushRecorder, isInstrumentationEnabled, kyselyLogOption } from "../database/instrumentation.mjs";
 import "../connection-2igzM-AT.mjs";
 import { t as validateIdentifier } from "../validate-VPnKoIzW.mjs";
 import { o as isSqlite } from "../dialect-helpers-BKCvISIQ.mjs";
 import { i as setI18nConfig } from "../config-CVssduLe.mjs";
-import { At as handleContentTranslations, Ct as handleContentGetIncludingTrashed, Dt as handleContentPublish, Et as handleContentPermanentDelete, G as sanitizeHeadersForSandbox, H as resolveExclusiveHooks, I as PluginRouteRegistry, K as getTrustedProxyHeaders, L as DEV_CONSOLE_EMAIL_PLUGIN_ID, Mt as handleContentUnschedule, Nt as handleContentUpdate, Ot as handleContentRestore, Pt as validateRev, R as devConsoleEmailDeliver, St as handleContentGet, Tt as handleContentListTrashed, U as CronExecutor, V as createHookPipeline, W as extractRequestMeta, X as after, _t as handleContentCountTrashed, bt as handleContentDiscardDraft, ct as handleMediaGet, dt as handleRevisionGet, ft as handleRevisionList, gt as handleContentCountScheduled, ht as handleContentCompare, it as PluginStateRepository, jt as handleContentUnpublish, kt as handleContentSchedule, lt as handleMediaList, ot as handleMediaCreate, pt as handleRevisionRestore, q as definePlugin, st as handleMediaDelete, tt as loadBundleFromR2, ut as handleMediaUpdate, vt as handleContentCreate, wt as handleContentList, xt as handleContentDuplicate, yt as handleContentDelete, z as EmailPipeline } from "../search-n-ZCMfr3.mjs";
-import { r as RevisionRepository } from "../content-CERxPUN0.mjs";
-import "../base64-MBPo9ozB.mjs";
-import "../types-BIgulNsW.mjs";
-import { a as invalidateSiteSettingsCache, s as MediaRepository } from "../settings-nTXPRi3D.mjs";
-import "../taxonomy-D6NvlKo8.mjs";
-import { t as OptionsRepository } from "../options-nPxWnrya.mjs";
-import "../redirect-C5H7VGIX.mjs";
-import "../byline-gFn1r0vA.mjs";
-import { n as normalizeMediaValue } from "../placeholder-Ci0RLeCk.mjs";
-import { n as requestCached } from "../request-cache-D4I69LeL.mjs";
-import { r as hashString } from "../zod-generator-CHnJUP2l.mjs";
-import { i as FTSManager, n as SchemaRegistry } from "../registry-Do34mz_P.mjs";
-import { r as getDb } from "../loader-ou_PXAjg.mjs";
-import "../taxonomies-JmQQZiG1.mjs";
-import { r as normalizeManifestRoute } from "../manifest-schema-Bp6d4d4n.mjs";
-import "../types-Cug_RO3W.mjs";
-import "../error-D6LuHLw9.mjs";
-import { a as invalidateUrlPatternCache } from "../query-yA3-rFji.mjs";
-import "../apply-C1ZORgcy.mjs";
-import "../tokens-CyRDPVW2.mjs";
-import "../bylines-DTFI8nDM.mjs";
-import "../load-DR1VwFXR.mjs";
+import { _ as after, d as PluginRouteRegistry, f as EmailPipeline, g as definePlugin, h as resolveExclusiveHooks, m as createHookPipeline } from "../menus-X4Z-eBA1.mjs";
+import { r as RevisionRepository } from "../content-D6YG26WG.mjs";
+import "../base64-CqR-7kqF.mjs";
+import "../types-CwXMEPRr.mjs";
+import { t as MediaRepository } from "../media-Dg7he9uK.mjs";
+import "../user-Dr1bOCqS.mjs";
+import "../taxonomy-wPfusMK9.mjs";
+import "../comment-Dd9MI82-.mjs";
+import { t as OptionsRepository } from "../options-BL4X94qY.mjs";
+import "../context-qF8d3IPR.mjs";
+import "../menus-DOzIecHi.mjs";
+import "../redirect-DkaDxq8e.mjs";
+import "../byline-D09BaS4j.mjs";
+import { t as normalizeMediaValue } from "../normalize-CN5kRSMC.mjs";
+import "../placeholder-LqmHqvBw.mjs";
+import "../seo-DRq9-EPP.mjs";
+import { $ as handleContentSchedule, A as handleMediaCreate, B as handleContentCountScheduled, F as handleRevisionGet, G as handleContentDuplicate, H as handleContentCreate, I as handleRevisionList, J as handleContentList, K as handleContentGet, L as handleRevisionRestore, M as handleMediaGet, N as handleMediaList, P as handleMediaUpdate, Q as handleContentRestore, U as handleContentDelete, V as handleContentCountTrashed, W as handleContentDiscardDraft, X as handleContentPermanentDelete, Y as handleContentListTrashed, Z as handleContentPublish, d as loadBundleFromR2, et as handleContentTranslations, g as PluginStateRepository, it as validateRev, j as handleMediaDelete, n as normalizeRegistryConfig, nt as handleContentUnschedule, q as handleContentGetIncludingTrashed, rt as handleContentUpdate, tt as handleContentUnpublish, z as handleContentCompare } from "../api-ayIQ7rIe.mjs";
+import { n as requestCached } from "../request-cache-dzCt8TZB.mjs";
+import "../dashboard-BmWSIUwY.mjs";
+import { n as hashString } from "../hash-DlUxGhQS.mjs";
+import { t as FTSManager } from "../fts-manager-B633C-kQ.mjs";
+import { n as SchemaRegistry } from "../registry-BnCeHYsf.mjs";
+import { r as getDb } from "../loader-Cs6-Bqe6.mjs";
+import "../schema-BmqagCwG.mjs";
+import "../zod-generator-DSyz01KE.mjs";
+import "../seo-BoR4wCUh.mjs";
+import "../sections-Cm-zb-gZ.mjs";
+import { o as invalidateSiteSettingsCache } from "../settings-xQKsWnzQ.mjs";
+import "../settings-CBBj7HUd.mjs";
+import "../taxonomies-Cn9UpaR2.mjs";
+import "../taxonomies-Dc0mzlms.mjs";
+import { r as normalizeManifestRoute } from "../manifest-schema-HCtSh4Jq.mjs";
+import "../types-Db67HHlU.mjs";
+import "../ssrf-DzFN_qV-.mjs";
+import "../error-tSQWIl5U.mjs";
+import "../parse-BFTPon-J.mjs";
+import "../redirects-Dmj6KRU3.mjs";
+import "../setup-BGAJ2uXs.mjs";
+import { a as invalidateUrlPatternCache } from "../query-axZmO6Tn.mjs";
+import "../import-CNfLOgDE.mjs";
+import { t as getTrustedProxyHeaders } from "../trusted-proxy-CJhQIk65.mjs";
+import { n as sanitizeHeadersForSandbox, t as extractRequestMeta } from "../request-meta-CLCwSQOS.mjs";
+import "../ssrf-CTul4uQi.mjs";
+import { n as CronExecutor } from "../cron-H8eJ46dv.mjs";
+import { r as devConsoleEmailDeliver, t as DEV_CONSOLE_EMAIL_PLUGIN_ID } from "../email-console-Dmp5Q-P2.mjs";
+import "../utils-_F-rWBTN.mjs";
+import "../tokens-DILYNZMi.mjs";
+import "../preview-C1LOEbWZ.mjs";
+import "../bylines-BTM2xtP8.mjs";
+import "../widgets-B9j_yzlk.mjs";
+import "../apply-v4DBgjPw.mjs";
+import "../load-QzYRpVN3.mjs";
+import "../search-CPrvO5u8.mjs";
 import "../index.mjs";
-import { n as VERSION, t as COMMIT } from "../version-BdP--J1g.mjs";
-import { t as getAuthMode } from "../mode-YhqNVef_.mjs";
-import { a as validateEncryptionKeyAtStartup } from "../secrets-CZ8rxLX3.mjs";
+import { n as VERSION, t as COMMIT } from "../version-Dw7Z5PVU.mjs";
+import { t as getAuthMode } from "../mode-DPRPvJYm.mjs";
+import { t as cleanupExpiredChallenges } from "../challenge-store-CJ0OOHOr.mjs";
+import { a as validateEncryptionKeyAtStartup } from "../secrets-6pgZyq0K.mjs";
 import { Kysely, sql } from "kysely";
 import { defineMiddleware } from "astro:middleware";
 import virtualConfig from "virtual:emdash/config";
@@ -43,18 +74,6 @@ import { sandboxedPlugins } from "virtual:emdash/sandboxed-plugins";
 import { createStorage } from "virtual:emdash/storage";
 import { createKyselyAdapter } from "@emdash-cms/auth/adapters/kysely";
 
-//#region src/auth/challenge-store.ts
-/**
-* Clean up expired challenges.
-* Should be called periodically (e.g., on startup, or via cron).
-*/
-async function cleanupExpiredChallenges(db) {
-	const now = (/* @__PURE__ */ new Date()).toISOString();
-	const result = await db.deleteFrom("auth_challenges").where("expires_at", "<", now).executeTakeFirst();
-	return Number(result.numDeletedRows ?? 0);
-}
-
-//#endregion
 //#region src/cleanup.ts
 /**
 * System cleanup
@@ -364,8 +383,19 @@ const dbCache = /* @__PURE__ */ new Map();
 let dbInitPromise = null;
 const storageCache = /* @__PURE__ */ new Map();
 const sandboxedPluginCache = /* @__PURE__ */ new Map();
+/**
+* Per-tier sets of `${pluginId}:${version}` keys present in
+* `sandboxedPluginCache`. Used during sync to know which entries belong
+* to which install source so we can invalidate only what belongs to the
+* tier currently being synced.
+*/
 const marketplacePluginKeys = /* @__PURE__ */ new Set();
-/** Manifest metadata for marketplace plugins: pluginId -> manifest admin config */
+const registryPluginKeys = /* @__PURE__ */ new Set();
+/**
+* Manifest metadata for runtime-installed sandboxed plugins (marketplace
+* and registry both). Keyed by `pluginId`; readers don't care which
+* source the plugin came from. Named `marketplace*` for legacy reasons.
+*/
 const marketplaceManifestCache = /* @__PURE__ */ new Map();
 /** Route metadata for sandboxed plugins: pluginId -> routeName -> RouteMeta */
 const sandboxedRouteMetaCache = /* @__PURE__ */ new Map();
@@ -517,20 +547,47 @@ var EmDashRuntime = class EmDashRuntime {
 	* current worker: loads newly active plugins and removes uninstalled ones.
 	*/
 	async syncMarketplacePlugins() {
-		if (!this.config.marketplace || !this.storage) return;
+		if (!this.config.marketplace) return;
+		await this.syncSandboxedSourcePlugins("marketplace");
+	}
+	/**
+	* Synchronize registry plugin runtime state with DB + storage.
+	*
+	* Mirrors {@link syncMarketplacePlugins} for plugins installed via the
+	* experimental decentralized plugin registry. Called after install,
+	* update, and uninstall handlers complete.
+	*/
+	async syncRegistryPlugins() {
+		if (!this.config.experimental?.registry) return;
+		await this.syncSandboxedSourcePlugins("registry");
+	}
+	/**
+	* Internal: reconcile in-memory sandboxed-plugin state with the
+	* `_plugin_state` table for the given source tier. Shared
+	* implementation behind `syncMarketplacePlugins` and
+	* `syncRegistryPlugins`.
+	*
+	* Each source tier has its own key set in `${source}PluginKeys` so a
+	* sync for one tier doesn't invalidate the other.
+	*/
+	async syncSandboxedSourcePlugins(source) {
+		if (!this.storage) return;
 		if (!sandboxRunner || !sandboxRunner.isAvailable()) return;
+		const keySet = source === "marketplace" ? marketplacePluginKeys : registryPluginKeys;
 		try {
-			const marketplaceStates = await new PluginStateRepository(this.db).getMarketplacePlugins();
+			const stateRepo = new PluginStateRepository(this.db);
+			const states = source === "marketplace" ? await stateRepo.getMarketplacePlugins() : await stateRepo.getRegistryPlugins();
 			const desired = /* @__PURE__ */ new Map();
-			for (const state of marketplaceStates) {
+			for (const state of states) {
 				this.pluginStates.set(state.pluginId, state.status);
 				if (state.status === "active") this.enabledPlugins.add(state.pluginId);
 				else this.enabledPlugins.delete(state.pluginId);
 				if (state.status !== "active") continue;
-				desired.set(state.pluginId, state.marketplaceVersion ?? state.version);
+				const desiredVersion = source === "marketplace" ? state.marketplaceVersion ?? state.version : state.version;
+				desired.set(state.pluginId, desiredVersion);
 			}
 			const keysToRemove = [];
-			for (const key of marketplacePluginKeys) {
+			for (const key of keySet) {
 				const [pluginId] = key.split(":");
 				if (!pluginId) continue;
 				const desiredVersion = desired.get(pluginId);
@@ -552,7 +609,7 @@ var EmDashRuntime = class EmDashRuntime {
 				}
 				sandboxedPluginCache.delete(key);
 				this.sandboxedPlugins.delete(key);
-				marketplacePluginKeys.delete(key);
+				keySet.delete(key);
 				if (pluginId) {
 					sandboxedRouteMetaCache.delete(pluginId);
 					marketplaceManifestCache.delete(pluginId);
@@ -561,18 +618,18 @@ var EmDashRuntime = class EmDashRuntime {
 			for (const [pluginId, version] of desired) {
 				const key = `${pluginId}:${version}`;
 				if (sandboxedPluginCache.has(key)) {
-					marketplacePluginKeys.add(key);
+					keySet.add(key);
 					continue;
 				}
-				const bundle = await loadBundleFromR2(this.storage, pluginId, version);
+				const bundle = await loadBundleFromR2(this.storage, pluginId, version, source);
 				if (!bundle) {
-					console.warn(`EmDash: Marketplace plugin ${pluginId}@${version} not found in R2`);
+					console.warn(`EmDash: ${source} plugin ${pluginId}@${version} not found in R2`);
 					continue;
 				}
 				const loaded = await sandboxRunner.load(bundle.manifest, bundle.backendCode);
 				sandboxedPluginCache.set(key, loaded);
 				this.sandboxedPlugins.set(key, loaded);
-				marketplacePluginKeys.add(key);
+				keySet.add(key);
 				marketplaceManifestCache.set(pluginId, {
 					id: bundle.manifest.id,
 					version: bundle.manifest.version,
@@ -588,7 +645,7 @@ var EmDashRuntime = class EmDashRuntime {
 				} else sandboxedRouteMetaCache.delete(pluginId);
 			}
 		} catch (error) {
-			console.error("EmDash: Failed to sync marketplace plugins:", error);
+			console.error(`EmDash: Failed to sync ${source} plugins:`, error);
 		}
 	}
 	/**
@@ -677,7 +734,8 @@ var EmDashRuntime = class EmDashRuntime {
 		};
 		const pipeline = createHookPipeline(enabledPluginList, pipelineFactoryOptions);
 		const sandboxedPlugins = await phase("rt.sandbox", "Sandboxed plugins", () => EmDashRuntime.loadSandboxedPlugins(deps, db));
-		if (deps.config.marketplace && storage) await phase("rt.market", "Marketplace plugins", () => EmDashRuntime.loadMarketplacePlugins(db, storage, deps, sandboxedPlugins));
+		if (deps.config.marketplace && storage) await phase("rt.market", "Marketplace plugins", () => EmDashRuntime.loadInstalledSandboxedPlugins("marketplace", db, storage, deps, sandboxedPlugins));
+		if (deps.config.experimental?.registry && storage) await phase("rt.registry", "Registry plugins", () => EmDashRuntime.loadInstalledSandboxedPlugins("registry", db, storage, deps, sandboxedPlugins));
 		const mediaProviders = /* @__PURE__ */ new Map();
 		const mediaProviderEntries = deps.mediaProviderEntries ?? [];
 		const providerContext = {
@@ -801,9 +859,9 @@ var EmDashRuntime = class EmDashRuntime {
 					}
 				})();
 				if (collectionCount.count === 0 && !setupDone) {
-					const { applySeed } = await import("../apply-C1ZORgcy.mjs").then((n) => n.n);
-					const { loadSeed } = await import("../load-DR1VwFXR.mjs").then((n) => n.r);
-					const { validateSeed } = await import("../validate-UK4Ja1uo.mjs").then((n) => n.n);
+					const { applySeed } = await import("../apply-v4DBgjPw.mjs").then((n) => n.n);
+					const { loadSeed } = await import("../load-QzYRpVN3.mjs").then((n) => n.r);
+					const { validateSeed } = await import("../validate-DlFxcVVK.mjs").then((n) => n.n);
 					const seed = await loadSeed();
 					if (validateSeed(seed).valid) {
 						await applySeed(db, seed, { onConflict: "skip" });
@@ -874,25 +932,35 @@ var EmDashRuntime = class EmDashRuntime {
 	* Queries _plugin_state for source='marketplace' rows, fetches each bundle
 	* from R2, and loads via SandboxRunner.
 	*/
-	static async loadMarketplacePlugins(db, storage, deps, cache) {
+	/**
+	* Cold-start load of all active sandboxed plugins for one install
+	* tier (marketplace or registry) from site-local R2.
+	*
+	* Mirrors {@link syncSandboxedSourcePlugins} but runs once at runtime
+	* creation, before request traffic arrives; the sync method runs on
+	* demand after install / update / uninstall handlers.
+	*/
+	static async loadInstalledSandboxedPlugins(source, db, storage, deps, cache) {
 		if (!sandboxRunner && deps.createSandboxRunner) sandboxRunner = deps.createSandboxRunner({ db });
 		if (!sandboxRunner || !sandboxRunner.isAvailable()) return;
+		const keySet = source === "marketplace" ? marketplacePluginKeys : registryPluginKeys;
 		try {
-			const marketplacePlugins = await new PluginStateRepository(db).getMarketplacePlugins();
-			for (const plugin of marketplacePlugins) {
+			const stateRepo = new PluginStateRepository(db);
+			const plugins = source === "marketplace" ? await stateRepo.getMarketplacePlugins() : await stateRepo.getRegistryPlugins();
+			for (const plugin of plugins) {
 				if (plugin.status !== "active") continue;
-				const version = plugin.marketplaceVersion ?? plugin.version;
+				const version = source === "marketplace" ? plugin.marketplaceVersion ?? plugin.version : plugin.version;
 				const pluginKey = `${plugin.pluginId}:${version}`;
 				if (cache.has(pluginKey)) continue;
 				try {
-					const bundle = await loadBundleFromR2(storage, plugin.pluginId, version);
+					const bundle = await loadBundleFromR2(storage, plugin.pluginId, version, source);
 					if (!bundle) {
-						console.warn(`EmDash: Marketplace plugin ${plugin.pluginId}@${version} not found in R2`);
+						console.warn(`EmDash: ${source} plugin ${plugin.pluginId}@${version} not found in R2`);
 						continue;
 					}
 					const loaded = await sandboxRunner.load(bundle.manifest, bundle.backendCode);
 					cache.set(pluginKey, loaded);
-					marketplacePluginKeys.add(pluginKey);
+					keySet.add(pluginKey);
 					marketplaceManifestCache.set(plugin.pluginId, {
 						id: bundle.manifest.id,
 						version: bundle.manifest.version,
@@ -906,9 +974,9 @@ var EmDashRuntime = class EmDashRuntime {
 						}
 						sandboxedRouteMetaCache.set(plugin.pluginId, routeMeta);
 					}
-					console.log(`EmDash: Loaded marketplace plugin ${pluginKey} with capabilities: [${bundle.manifest.capabilities.join(", ")}]`);
+					console.log(`EmDash: Loaded ${source} plugin ${pluginKey} with capabilities: [${bundle.manifest.capabilities.join(", ")}]`);
 				} catch (error) {
-					console.error(`EmDash: Failed to load marketplace plugin ${plugin.pluginId}:`, error);
+					console.error(`EmDash: Failed to load ${source} plugin ${plugin.pluginId}:`, error);
 				}
 			}
 		} catch {}
@@ -1075,6 +1143,7 @@ var EmDashRuntime = class EmDashRuntime {
 			defaultLocale: i18nConfig.defaultLocale,
 			locales: i18nConfig.locales
 		} : void 0;
+		const registry = normalizeRegistryConfig(this.config.experimental?.registry) ?? void 0;
 		return {
 			version: VERSION,
 			commit: COMMIT,
@@ -1084,7 +1153,8 @@ var EmDashRuntime = class EmDashRuntime {
 			taxonomies: manifestTaxonomies,
 			authMode: authModeValue,
 			i18n,
-			marketplace: !!this.config.marketplace
+			marketplace: !!this.config.marketplace,
+			registry
 		};
 	}
 	/**
@@ -1189,7 +1259,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-Vc5DQkJa.mjs");
+		const { validateContentData } = await import("../validation-BiFJqUp5.mjs");
 		const validation = await validateContentData(this.db, collection, processedData, { partial: false });
 		if (!validation.ok) return {
 			success: false,
@@ -1205,7 +1275,7 @@ var EmDashRuntime = class EmDashRuntime {
 		return result;
 	}
 	async handleContentUpdate(collection, id, body) {
-		const { ContentRepository } = await import("../content-CERxPUN0.mjs").then((n) => n.n);
+		const { ContentRepository } = await import("../content-D6YG26WG.mjs").then((n) => n.n);
 		const repo = new ContentRepository(this.db);
 		const resolvedItem = await repo.findByIdOrSlug(collection, id);
 		const resolvedId = resolvedItem?.id ?? id;
@@ -1232,7 +1302,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-Vc5DQkJa.mjs");
+			const { validateContentData } = await import("../validation-BiFJqUp5.mjs");
 			const validation = await validateContentData(this.db, collection, processedData, { partial: true });
 			if (!validation.ok) return {
 				success: false,
@@ -1957,7 +2027,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 				if (!setupVerified) {
 					const t0 = performance.now();
 					try {
-						const { getDb } = await import("../loader-ou_PXAjg.mjs").then((n) => n.i);
+						const { getDb } = await import("../loader-Cs6-Bqe6.mjs").then((n) => n.i);
 						await (await getDb()).selectFrom("_emdash_migrations").selectAll().limit(1).execute();
 						setupVerified = true;
 					} catch {
@@ -2095,6 +2165,7 @@ const onRequest = defineMiddleware(async (context, next) => {
 					invalidateUrlPatternCache,
 					getSandboxRunner: runtime.getSandboxRunner.bind(runtime),
 					syncMarketplacePlugins: runtime.syncMarketplacePlugins.bind(runtime),
+					syncRegistryPlugins: runtime.syncRegistryPlugins.bind(runtime),
 					setPluginStatus: runtime.setPluginStatus.bind(runtime)
 				};
 			} catch (error) {