dineway 0.1.48 → 0.2.0

package/dist/runtime.d.mts

@@ -1,11 +1,11 @@
-import { Gn as EntryFilter, Jn as dinewayLoader, Un as CollectionFilter, Wn as EntryData, Yn as getDb } from "./runtime-DEWQpZ-4.mjs";
-import "./types-eu5UDgHN.mjs";
-import "./types-DSPGWjxO.mjs";
-import "./types-Dryvv7LH.mjs";
-import "./runner-D4FL9usy.mjs";
-import "./index-CwRuZ-u8.mjs";
-import "./byline-fields-BX7rWKNU.mjs";
-import "./types-GaCtZ1k9.mjs";
-import "./validate-BMs11tan.mjs";
-import { t as getMediaProvider } from "./provider-loader-9it4vd6L.mjs";
+import { $i as EntryData, Qi as CollectionFilter, ea as EntryFilter, ia as getDb, ra as dinewayLoader } from "./runtime-BOeiQsCv.mjs";
+import "./types-DU0bU2Wu.mjs";
+import "./types-C8XW6L19.mjs";
+import "./types-Rc3gQqqw.mjs";
+import "./runner-1tC2tIRV.mjs";
+import "./index-D4y6NGiy.mjs";
+import "./byline-fields-CUvbslGc.mjs";
+import "./types-CDpH6MA4.mjs";
+import "./validate-CZvb-BKB.mjs";
+import { t as getMediaProvider } from "./provider-loader-MD8zAbnH.mjs";
 export { type CollectionFilter, type EntryData, type EntryFilter, dinewayLoader, getDb, getMediaProvider };

package/dist/runtime.mjs

@@ -1,7 +1,7 @@
 import "./dialect-helpers-fk43GbDb.mjs";
-import "./base64-C1Q9yr0B.mjs";
-import "./types-DfuD0Afl.mjs";
-import { n as dinewayLoader, r as getDb } from "./loader-tg63WSY2.mjs";
-import { t as getMediaProvider } from "./provider-loader-DzUxejk7.mjs";
+import "./base64-F8-DUraK.mjs";
+import "./types-Dq1qT19x.mjs";
+import { n as dinewayLoader, r as getDb } from "./loader-CjWqjweO.mjs";
+import { t as getMediaProvider } from "./provider-loader-D0w9dqjm.mjs";
 
 export { dinewayLoader, getDb, getMediaProvider };

package/dist/schema-DXdYj4R3.mjs

@@ -0,0 +1,8 @@
+import { a as __exportAll } from "./runner-DB7CRfOF.mjs";
+import { n as SchemaRegistry } from "./registry-CtyVedcN.mjs";
+
+//#region src/schema/index.ts
+var schema_exports = /* @__PURE__ */ __exportAll({ SchemaRegistry: () => SchemaRegistry });
+
+//#endregion
+export { schema_exports as t };

package/dist/{search-axGQ1KY3.mjs → search-DSaLgEFI.mjs}

@@ -1,7 +1,7 @@
-import { a as __exportAll } from "./runner-B-tbV751.mjs";
+import { a as __exportAll } from "./runner-DB7CRfOF.mjs";
 import { t as validateIdentifier } from "./validate-VPnKoIzW.mjs";
-import { t as FTSManager } from "./fts-manager-CIZlScg5.mjs";
-import { r as getDb } from "./loader-tg63WSY2.mjs";
+import { r as getDb } from "./loader-CjWqjweO.mjs";
+import { t as FTSManager } from "./fts-manager-Crzypjqu.mjs";
 import { sql } from "kysely";
 import { toPlainText } from "@portabletext/toolkit";
 
@@ -174,6 +174,7 @@ async function getSuggestions(db, query, options = {}) {
 		const results = await sql`
 			SELECT
 				c.id,
+				c.slug,
 				${displayColumnSql} as title
 			FROM "${sql.raw(ftsTable)}" f
 			JOIN "${sql.raw(contentTable)}" c ON f.id = c.id
@@ -188,6 +189,7 @@ async function getSuggestions(db, query, options = {}) {
 		for (const row of results.rows) suggestions.push({
 			collection,
 			id: row.id,
+			slug: row.slug,
 			title: row.title
 		});
 	}

package/dist/{secrets-062Izo8i.mjs → secrets-CDZo2k8L.mjs}

@@ -1,5 +1,7 @@
-import { i as encodeBase64url, n as decodeBase64url } from "./base64-C1Q9yr0B.mjs";
-import { t as OptionsRepository } from "./options-BvJoSSJR.mjs";
+import { i as encodeBase64url, n as decodeBase64url } from "./base64-F8-DUraK.mjs";
+import { t as after } from "./after-BfniwgIf.mjs";
+import { t as OptionsRepository } from "./options-DQPTH5n0.mjs";
+import { r as processCachedAsync, t as createProcessCache } from "./process-cache-7xgAO9JY.mjs";
 
 //#region src/config/secrets.ts
 const ENCRYPTION_KEY_PREFIX = "dineway_enc_v1_";
@@ -9,7 +11,7 @@ const ENCRYPTION_KEY_BODY_LENGTH = 43;
 const GENERATED_SECRET_BYTES = 32;
 const BASE64URL_CHARSET_PATTERN = /^[A-Za-z0-9_-]+$/;
 const ENCRYPTION_KEY_PATTERN = new RegExp(`^${ENCRYPTION_KEY_PREFIX.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[A-Za-z0-9_-]{${ENCRYPTION_KEY_BODY_LENGTH}}$`);
-const SECRETS_CACHE_KEY = Symbol.for("@dineway-ai/core/secrets-cache@1");
+const SECRETS_CACHE_KEY = Symbol.for("@dineway-ai/core/secrets-cache@2");
 var DinewaySecretsError = class extends Error {
 	name = "DinewaySecretsError";
 	constructor(message, code) {
@@ -93,15 +95,16 @@ function getSecretsCache() {
 	return entry.cache;
 }
 function resolveSecretsCached(db) {
-	const cache = getSecretsCache();
-	const cached = cache.get(db);
-	if (cached) return cached;
-	const promise = resolveSecrets({ db }).catch((error) => {
-		cache.delete(db);
-		throw error;
+	const caches = getSecretsCache();
+	let cache = caches.get(db);
+	if (!cache) {
+		cache = createProcessCache();
+		caches.set(db, cache);
+	}
+	return processCachedAsync(cache, () => resolveSecrets({ db }), {
+		anchor: (promise) => after(() => promise),
+		ownerTimeoutMs: 3e4
 	});
-	cache.set(db, promise);
-	return promise;
 }
 async function ensureGeneratedOption(repo, optionKey) {
 	const existing = await repo.get(optionKey);
@@ -157,4 +160,4 @@ function readDefaultEnv() {
 }
 
 //#endregion
-export { validateEncryptionKeyAtStartup as a, resolveSecretsCached as i, fingerprintKey as n, generateEncryptionKey as r, DinewaySecretsError as t };
+export { resolveSecretsCached as a, parseEncryptionKeys as i, fingerprintKey as n, validateEncryptionKeyAtStartup as o, generateEncryptionKey as r, DinewaySecretsError as t };

package/dist/{sections-OLKgXL10.mjs → sections-PVVXHGfp.mjs}

@@ -1,5 +1,5 @@
-import { i as encodeCursor, r as decodeCursor } from "./types-DfuD0Afl.mjs";
-import { r as getDb } from "./loader-tg63WSY2.mjs";
+import { i as encodeCursor, r as decodeCursor } from "./types-Dq1qT19x.mjs";
+import { r as getDb } from "./loader-CjWqjweO.mjs";
 import { ulid } from "ulidx";
 
 //#region src/sections/index.ts

package/dist/seed/index.d.mts

@@ -1,3 +1,3 @@
-import "../types-eu5UDgHN.mjs";
-import { _ as SeedTaxonomyTerm, a as applySeed, b as ValidationResult, c as SeedCollection, d as SeedFile, f as SeedMenu, g as SeedTaxonomy, h as SeedSection, i as defaultSeed, l as SeedContentEntry, m as SeedRedirect, n as loadSeed, o as SeedApplyOptions, p as SeedMenuItem, r as loadUserSeed, s as SeedApplyResult, t as validateSeed, u as SeedField, v as SeedWidget, y as SeedWidgetArea } from "../validate-BMs11tan.mjs";
+import "../types-DU0bU2Wu.mjs";
+import { _ as SeedTaxonomyTerm, a as applySeed, b as ValidationResult, c as SeedCollection, d as SeedFile, f as SeedMenu, g as SeedTaxonomy, h as SeedSection, i as defaultSeed, l as SeedContentEntry, m as SeedRedirect, n as loadSeed, o as SeedApplyOptions, p as SeedMenuItem, r as loadUserSeed, s as SeedApplyResult, t as validateSeed, u as SeedField, v as SeedWidget, y as SeedWidgetArea } from "../validate-CZvb-BKB.mjs";
 export { type SeedApplyOptions, type SeedApplyResult, type SeedCollection, type SeedContentEntry, type SeedField, type SeedFile, type SeedMenu, type SeedMenuItem, type SeedRedirect, type SeedSection, type SeedTaxonomy, type SeedTaxonomyTerm, type SeedWidget, type SeedWidgetArea, type ValidationResult, applySeed, defaultSeed, loadSeed, loadUserSeed, validateSeed };

package/dist/seed/index.mjs

@@ -1,22 +1,25 @@
 import "../dialect-helpers-fk43GbDb.mjs";
-import "../content-QaryevFO.mjs";
-import "../base64-C1Q9yr0B.mjs";
-import "../types-DfuD0Afl.mjs";
-import "../media-DUAjMfvR.mjs";
-import "../taxonomy-CBmkmMuU.mjs";
-import "../options-BvJoSSJR.mjs";
-import "../redirect-C2zXRj3c.mjs";
-import "../request-cache-CYMbwZc6.mjs";
-import "../byline-registry-CUSvkasJ.mjs";
-import "../byline-1ntDwv8c.mjs";
-import "../fts-manager-CIZlScg5.mjs";
-import "../registry-CTkbIDB9.mjs";
-import "../loader-tg63WSY2.mjs";
-import "../settings-yLjz_I4T.mjs";
-import "../ssrf-DiKqWd3N.mjs";
-import { t as validateSeed } from "../validate-7SYRbz2f.mjs";
-import { t as applySeed } from "../apply-CX3no7XE.mjs";
-import { t as defaultSeed } from "../default-B6iaLvP7.mjs";
-import { n as loadUserSeed, t as loadSeed } from "../load-xE01Jm0V.mjs";
+import "../base64-F8-DUraK.mjs";
+import "../types-Dq1qT19x.mjs";
+import "../loader-CjWqjweO.mjs";
+import "../object-cache-D51qOseS.mjs";
+import "../content-Bh4BDjv8.mjs";
+import "../media-DMj0grzC.mjs";
+import "../taxonomy-Dvsw6BOs.mjs";
+import "../options-DQPTH5n0.mjs";
+import "../redirect-BAjt4Z6b.mjs";
+import "../request-cache-D9GQBxMP.mjs";
+import "../byline-registry-87nNnYl4.mjs";
+import "../field-defs-cache-DRNdhBJv.mjs";
+import "../byline-e51-fWRs.mjs";
+import "../content-refresh-CgutSUfO.mjs";
+import "../fts-manager-Crzypjqu.mjs";
+import "../registry-CtyVedcN.mjs";
+import "../settings-BbqgHWpU.mjs";
+import "../ssrf-DWe8jwAp.mjs";
+import { t as validateSeed } from "../validate-DNs0pTSc.mjs";
+import { t as applySeed } from "../apply-bZswmZPm.mjs";
+import { t as defaultSeed } from "../default--K40jqm0.mjs";
+import { n as loadUserSeed, t as loadSeed } from "../load-DmYeniXl.mjs";
 
 export { applySeed, defaultSeed, loadSeed, loadUserSeed, validateSeed };

package/dist/seo/index.d.mts

@@ -1,4 +1,4 @@
-import { a as ContentSeo } from "../types-DRIKLmJI.mjs";
+import { a as ContentSeo } from "../types-C_ly5eTp.mjs";
 
 //#region src/seo/index.d.ts
 /**

package/dist/seo/index.mjs

@@ -1,3 +1,5 @@
+import { t as buildSeoImageUrl } from "../media-url-lEKSrpr9.mjs";
+
 //#region src/seo/index.ts
 const TRAILING_SLASH_RE = /\/$/;
 const ABSOLUTE_URL_RE = /^https?:\/\//i;
@@ -24,7 +26,7 @@ function getSeoMeta(content, options = {}) {
 	const pageTitle = seo.title || (typeof content.data.title === "string" ? content.data.title : null) || "";
 	const fullTitle = siteTitle && pageTitle ? `${pageTitle}${separator}${siteTitle}` : pageTitle;
 	const description = seo.description || (typeof content.data.excerpt === "string" ? content.data.excerpt : null) || null;
-	const ogImage = seo.image ? buildMediaUrl(seo.image, siteUrl) : defaultOgImage ?? null;
+	const ogImage = seo.image ? buildSeoImageUrl(seo.image, siteUrl) : defaultOgImage ?? null;
 	let canonical = null;
 	if (seo.canonical) if (siteUrl && !seo.canonical.startsWith("/") && !ABSOLUTE_URL_RE.test(seo.canonical)) canonical = `${siteUrl.replace(TRAILING_SLASH_RE, "")}/${seo.canonical}`;
 	else canonical = seo.canonical;
@@ -54,17 +56,6 @@ function getSeoMeta(content, options = {}) {
 function getContentSeo(content) {
 	return content.seo ?? content.data.seo;
 }
-/**
-* Build a media URL from a media reference ID.
-* If it's already an absolute URL, return as-is.
-*/
-function buildMediaUrl(imageRef, siteUrl) {
-	if (ABSOLUTE_URL_RE.test(imageRef)) return imageRef;
-	if (imageRef.startsWith("/")) return siteUrl ? `${siteUrl.replace(TRAILING_SLASH_RE, "")}${imageRef}` : imageRef;
-	const mediaPath = `/_dineway/api/media/file/${imageRef}`;
-	if (siteUrl) return `${siteUrl.replace(TRAILING_SLASH_RE, "")}${mediaPath}`;
-	return mediaPath;
-}
 
 //#endregion
 export { getContentSeo, getSeoMeta };

package/dist/{seo-Cd45Po8L.mjs → seo-CQG3GCHQ.mjs}

@@ -1,4 +1,5 @@
-import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-C5zp2xir.mjs";
+import { o as invalidateCollectionCache } from "./object-cache-D51qOseS.mjs";
+import { n as chunks, t as SQL_BATCH_SIZE } from "./chunks-CxBt-GxR.mjs";
 import { sql } from "kysely";
 
 //#region src/database/repositories/seo.ts
@@ -100,7 +101,8 @@ var SeoRepository = class {
 				seo_canonical = ${input.canonical !== void 0 ? sql`${input.canonical}` : sql`_dineway_seo.seo_canonical`},
 				seo_no_index = ${input.noIndex !== void 0 ? sql`${input.noIndex ? 1 : 0}` : sql`_dineway_seo.seo_no_index`},
 				updated_at = ${now}
-		`.execute(this.db);
+			`.execute(this.db);
+		invalidateCollectionCache(collection);
 		return this.get(collection, contentId);
 	}
 	/**
@@ -108,6 +110,7 @@ var SeoRepository = class {
 	*/
 	async delete(collection, contentId) {
 		await this.db.deleteFrom("_dineway_seo").where("collection", "=", collection).where("content_id", "=", contentId).execute();
+		invalidateCollectionCache(collection);
 	}
 	/**
 	* Copy SEO data from one content item to another.

package/dist/{seo-contributions-CqVvReEj.mjs → seo-contributions-C1EnikHB.mjs}

@@ -78,6 +78,13 @@ const JSONLD_U2029_RE = /\u2029/g;
 function safeJsonLdSerialize(value) {
 	return JSON.stringify(value).replace(JSONLD_LT_RE, "\\u003c").replace(JSONLD_GT_RE, "\\u003e").replace(JSONLD_U2028_RE, "\\u2028").replace(JSONLD_U2029_RE, "\\u2029");
 }
+async function createSha256CspHash(value) {
+	const digest = await crypto.subtle.digest("SHA-256", new TextEncoder().encode(value));
+	const bytes = new Uint8Array(digest);
+	let binary = "";
+	for (const byte of bytes) binary += String.fromCharCode(byte);
+	return `sha256-${btoa(binary)}`;
+}
 /**
 * Resolve a flat list of contributions into deduplicated metadata.
 * First contribution wins for any given dedupe key.
@@ -148,8 +155,9 @@ function resolvePageMetadata(contributions) {
 	return result;
 }
 /** Render resolved metadata to an HTML string for embedding in <head> */
-function renderPageMetadata(metadata) {
+function renderPageMetadata(metadata, options = {}) {
 	const parts = [];
+	const includeJsonLd = options.includeJsonLd ?? true;
 	for (const m of metadata.meta) parts.push(`<meta name="${escapeHtmlAttr(m.name)}" content="${escapeHtmlAttr(m.content)}">`);
 	for (const p of metadata.properties) parts.push(`<meta property="${escapeHtmlAttr(p.property)}" content="${escapeHtmlAttr(p.content)}">`);
 	for (const l of metadata.links) {
@@ -158,7 +166,7 @@ function renderPageMetadata(metadata) {
 		tag += ">";
 		parts.push(tag);
 	}
-	for (const j of metadata.jsonld) parts.push(`<script type="application/ld+json">${j.json}<\/script>`);
+	if (includeJsonLd) for (const j of metadata.jsonld) parts.push(`<script type="application/ld+json">${j.json}<\/script>`);
 	return parts.join("\n");
 }
 
@@ -426,4 +434,4 @@ function generateSiteSeoContributions(seoSettings) {
 }
 
 //#endregion
-export { cleanJsonLd as a, escapeHtmlAttr as c, safeJsonLdSerialize as d, createPublicPageContext as f, buildWebSiteJsonLd as i, renderPageMetadata as l, generateSiteSeoContributions as n, renderFragments as o, buildBlogPostingJsonLd as r, resolveFragments as s, generateBaseSeoContributions as t, resolvePageMetadata as u };
+export { cleanJsonLd as a, createSha256CspHash as c, resolvePageMetadata as d, safeJsonLdSerialize as f, buildWebSiteJsonLd as i, escapeHtmlAttr as l, generateSiteSeoContributions as n, renderFragments as o, createPublicPageContext as p, buildBlogPostingJsonLd as r, resolveFragments as s, generateBaseSeoContributions as t, renderPageMetadata as u };

package/dist/{seo-5lJOtB5J.mjs → seo-qa7Dn0jK.mjs}

@@ -9,6 +9,23 @@ import { sql } from "kysely";
 */
 /** Maximum entries per sitemap (per spec) */
 const SITEMAP_MAX_ENTRIES = 5e4;
+/** Matches a trailing timezone designator (`Z` or `+08`, `+0800`, `+08:00`). */
+const TZ_SUFFIX_RE = /([zZ]|[+-]\d{2}(?::?\d{2})?)$/;
+/**
+* Normalize stored timestamps to W3C Datetime for sitemap <lastmod>.
+*
+* Content rows can store SQLite/Postgres defaults like `YYYY-MM-DD HH:MM:SS`
+* or imported date shapes. When no timezone is present, assume UTC to match
+* SQLite's `datetime('now')`. Unparseable values are returned unchanged.
+*/
+function toW3CDate(value) {
+	if (!value) return value;
+	let normalized = value.trim();
+	if (normalized.includes(" ") && !normalized.includes("T")) normalized = normalized.replace(" ", "T");
+	if (!TZ_SUFFIX_RE.test(normalized)) normalized += "Z";
+	const parsed = Date.parse(normalized);
+	return Number.isNaN(parsed) ? value : new Date(parsed).toISOString();
+}
 /**
 * Collect all published, indexable content across SEO-enabled collections
 * for sitemap generation, grouped by collection.
@@ -36,7 +53,7 @@ async function handleSitemapData(db, collectionSlug) {
 			const tableName = `ec_${col.slug}`;
 			try {
 				const rows = await sql`
-					SELECT c.slug, c.id, c.updated_at, c.locale, c.translation_group
+					SELECT c.slug, c.id, c.updated_at, c.locale, c.translation_group, s.seo_image
 					FROM ${sql.ref(tableName)} c
 					LEFT JOIN _dineway_seo s
 						ON s.collection = ${col.slug}
@@ -52,14 +69,15 @@ async function handleSitemapData(db, collectionSlug) {
 				for (const row of rows.rows) entries.push({
 					id: row.id,
 					slug: row.slug,
-					updatedAt: row.updated_at,
+					updatedAt: toW3CDate(row.updated_at),
 					locale: row.locale,
-					translationGroup: row.translation_group
+					translationGroup: row.translation_group,
+					image: row.seo_image ?? null
 				});
 				result.push({
 					collection: col.slug,
 					urlPattern: col.url_pattern,
-					lastmod: rows.rows[0].updated_at,
+					lastmod: toW3CDate(rows.rows[0].updated_at),
 					entries
 				});
 			} catch (err) {

package/dist/{service-Bwad8s5h.mjs → service-DiN4ZuPp.mjs}

@@ -1,6 +1,6 @@
 import { t as validateIdentifier } from "./validate-VPnKoIzW.mjs";
-import { t as CommentRepository } from "./comment-CXDOQ93N.mjs";
-import { t as escapeHtml } from "./escape-BDgouFFY.mjs";
+import { t as CommentRepository } from "./comment-DlA4iChg.mjs";
+import { t as escapeHtml } from "./escape-Bd4P_xKg.mjs";
 
 //#region src/comments/notifications.ts
 const NOTIFICATION_SOURCE = "dineway-comments";

package/dist/session-user-CAKImna3.mjs

@@ -0,0 +1,22 @@
+import { t as after } from "./after-BfniwgIf.mjs";
+
+//#region src/astro/session-user.ts
+const SESSION_GET_TIMEOUT_MS = 3e3;
+async function resolveSessionUser(session, timeoutMs = SESSION_GET_TIMEOUT_MS) {
+	if (!session) return void 0;
+	const read = Promise.resolve(session.get("user")).catch(() => void 0);
+	after(() => read.then(() => void 0));
+	if (timeoutMs <= 0) return read;
+	let timer;
+	const timeout = new Promise((resolve) => {
+		timer = setTimeout(resolve, timeoutMs, void 0);
+	});
+	try {
+		return await Promise.race([read, timeout]);
+	} finally {
+		if (timer) clearTimeout(timer);
+	}
+}
+
+//#endregion
+export { resolveSessionUser as t };

package/dist/{settings-yLjz_I4T.mjs → settings-BbqgHWpU.mjs}

@@ -1,52 +1,26 @@
-import { t as MediaRepository } from "./media-DUAjMfvR.mjs";
-import { t as OptionsRepository } from "./options-BvJoSSJR.mjs";
-import { n as peekRequestCache, r as requestCached } from "./request-cache-CYMbwZc6.mjs";
-import { r as getDb } from "./loader-tg63WSY2.mjs";
+import { getRequestContext } from "./request-context.mjs";
+import { r as getDb } from "./loader-CjWqjweO.mjs";
+import { t as after } from "./after-BfniwgIf.mjs";
+import { l as invalidateObjectCache, n as cachedQuery, t as CacheNamespace } from "./object-cache-D51qOseS.mjs";
+import { t as MediaRepository } from "./media-DMj0grzC.mjs";
+import { t as OptionsRepository } from "./options-DQPTH5n0.mjs";
+import { n as peekRequestCache, r as requestCached } from "./request-cache-D9GQBxMP.mjs";
+import { n as invalidateProcessCache, r as processCachedAsync, t as createProcessCache } from "./process-cache-7xgAO9JY.mjs";
+import { i as resolvePublicMediaUrl } from "./url-Cac7a9QZ.mjs";
 
-//#region src/media/url.ts
-const INTERNAL_MEDIA_PREFIX = "/_dineway/api/media/file/";
-const SAFE_STORAGE_KEY = /^[A-Za-z0-9._-]+$/;
-function resolvePublicMediaUrl(storage, storageKey) {
-	if (!storageKey) return "";
-	if (storage) return storage.getPublicUrl(storageKey);
-	return `${INTERNAL_MEDIA_PREFIX}${storageKey}`;
-}
-function createPublicMediaUrlResolver(storage) {
-	return (key) => resolvePublicMediaUrl(storage, key);
-}
-function buildRenderMediaUrl(resolve, ref) {
-	const { storageKey, url, id } = ref;
-	if (storageKey) return resolve ? resolve(storageKey) : `${INTERNAL_MEDIA_PREFIX}${storageKey}`;
-	if (url) {
-		if (resolve && url.startsWith(INTERNAL_MEDIA_PREFIX)) {
-			const key = url.slice(25);
-			if (SAFE_STORAGE_KEY.test(key)) return resolve(key);
-		}
-		return url;
-	}
-	if (id) return `${INTERNAL_MEDIA_PREFIX}${id}`;
-	return "";
-}
-
-//#endregion
 //#region src/settings/index.ts
 /** Prefix for site settings in the options table */
 const SETTINGS_PREFIX = "site:";
 const SITE_SETTINGS_CACHE_KEY = Symbol.for("dineway:site-settings");
 const globalCache = globalThis;
 const siteSettingsCache = globalCache[SITE_SETTINGS_CACHE_KEY] ?? (() => {
-	const holder = {
-		version: 0,
-		cached: null,
-		cachedVersion: -1
-	};
-	globalCache[SITE_SETTINGS_CACHE_KEY] = holder;
-	return holder;
+	const cache = createProcessCache();
+	globalCache[SITE_SETTINGS_CACHE_KEY] = cache;
+	return cache;
 })();
 function invalidateSiteSettingsCache() {
-	siteSettingsCache.version++;
-	siteSettingsCache.cached = null;
-	siteSettingsCache.cachedVersion = -1;
+	invalidateProcessCache(siteSettingsCache);
+	invalidateObjectCache(CacheNamespace.SETTINGS);
 }
 /**
 * Type guard for MediaReference values
@@ -131,21 +105,20 @@ async function getSiteSettingWithDb(key, db, storage = null) {
 * ```
 */
 async function getSiteSettings() {
-	return requestCached("siteSettings", () => {
-		const versionAtCall = siteSettingsCache.version;
-		if (siteSettingsCache.cached && siteSettingsCache.cachedVersion === versionAtCall) return siteSettingsCache.cached;
-		const fetchPromise = (async () => {
-			return getSiteSettingsWithDb(await getDb());
-		})().catch((error) => {
-			if (siteSettingsCache.cached === fetchPromise) {
-				siteSettingsCache.cached = null;
-				siteSettingsCache.cachedVersion = -1;
-			}
-			throw error;
+	return requestCached("siteSettings", async () => {
+		if (getRequestContext()?.dbIsIsolated) return getSiteSettingsWithDb(await getDb());
+		return processCachedAsync(siteSettingsCache, async () => {
+			return cachedQuery({
+				namespace: CacheNamespace.SETTINGS,
+				key: "all",
+				load: async () => {
+					return getSiteSettingsWithDb(await getDb());
+				}
+			});
+		}, {
+			anchor: (promise) => after(() => promise),
+			ownerTimeoutMs: 3e4
 		});
-		siteSettingsCache.cached = fetchPromise;
-		siteSettingsCache.cachedVersion = versionAtCall;
-		return fetchPromise;
 	});
 }
 /**
@@ -245,4 +218,4 @@ async function getPluginSettingsWithDb(pluginId, db) {
 }
 
 //#endregion
-export { getSiteSettingsWithDb as a, createPublicMediaUrlResolver as c, getSiteSettings as i, getPluginSettings as n, setSiteSettings as o, getSiteSetting as r, buildRenderMediaUrl as s, getPluginSetting as t };
+export { getSiteSettingsWithDb as a, getSiteSettings as i, getPluginSettings as n, invalidateSiteSettingsCache as o, getSiteSetting as r, setSiteSettings as s, getPluginSetting as t };

package/dist/{settings-lAHjaUit.mjs → settings-i4VPP8bT.mjs}

@@ -1,5 +1,5 @@
-import { a as __exportAll } from "./runner-B-tbV751.mjs";
-import { a as getSiteSettingsWithDb, o as setSiteSettings } from "./settings-yLjz_I4T.mjs";
+import { a as __exportAll } from "./runner-DB7CRfOF.mjs";
+import { a as getSiteSettingsWithDb, s as setSiteSettings } from "./settings-BbqgHWpU.mjs";
 
 //#region src/api/handlers/settings.ts
 var settings_exports = /* @__PURE__ */ __exportAll({

package/dist/{setup-complete--PradA4R.mjs → setup-complete-B8fl-mjV.mjs}

@@ -1,4 +1,4 @@
-import { t as OptionsRepository } from "./options-BvJoSSJR.mjs";
+import { t as OptionsRepository } from "./options-DQPTH5n0.mjs";
 
 //#region src/api/setup-complete.ts
 /**

package/dist/{site-activity-D7Xyropw.mjs → site-activity-Dy3FROs0.mjs}

@@ -1,4 +1,4 @@
-import { i as encodeCursor, r as decodeCursor } from "./types-DfuD0Afl.mjs";
+import { i as encodeCursor, r as decodeCursor } from "./types-Dq1qT19x.mjs";
 import { ulid } from "ulidx";
 
 //#region src/database/repositories/site-activity.ts