emdash 1.3.1 → 1.4.0

package/src/transfer/import/stages.ts

@@ -6,6 +6,8 @@
 
 import { sql } from "kysely";
 
+import { processMediaUsageCollectionDeletion } from "../../media/usage/collection-deletion-processor.js";
+import { MediaUsageCollectionDeletionRepository } from "../../media/usage/collection-deletion.js";
 import { SchemaError, SchemaRegistry } from "../../schema/registry.js";
 import { chunks, SQL_BATCH_SIZE } from "../../utils/chunks.js";
 import { TransferError } from "../errors.js";
@@ -51,11 +53,19 @@ export const STAGE_STREAMS: Readonly<Record<ImportRecordStage, readonly RecordKi
 
 const DEFAULT_BATCH = 100;
 const ENTRY_BATCH = 50;
-const COLLECTION_STATEMENTS = 80;
+const COLLECTION_STATEMENTS = 81;
+const COLLECTION_DELETION_STATEMENTS = 40;
 
 /** Thrown out of a stage when the operation was asked to cancel. */
 export class ImportCancelledSignal extends Error {}
 
+/** Yield without checkpointing a unit whose collection slug is still being released. */
+export class ImportCollectionDeletionSignal extends Error {
+	constructor(readonly waiting: boolean) {
+		super();
+	}
+}
+
 export type Checkpoint = (position: StreamPosition) => Promise<void>;
 
 export function firstPosition(stage: ImportRecordStage): StreamPosition {
@@ -211,6 +221,42 @@ async function importCollection(
 	context: ImportContext,
 	record: RecordOfKind<"collection">,
 ): Promise<void> {
+	const deletions = new MediaUsageCollectionDeletionRepository(context.db);
+	let deletion = await deletions.findBySlug(record.slug);
+	const hadDeletion = deletion !== null;
+	while (deletion) {
+		if (!context.budget.canStart({ queries: COLLECTION_DELETION_STATEMENTS })) {
+			throw new ImportCollectionDeletionSignal(false);
+		}
+		context.budget.start();
+		const operation = await context.ops.require(context.operationId);
+		if (operation.cancelRequestedAt !== null) throw new ImportCancelledSignal();
+		const outcome =
+			deletion.state === "failed"
+				? "failed"
+				: await processMediaUsageCollectionDeletion(context.db, deletion);
+		if (outcome === "failed") {
+			throw new TransferError("TRANSFER_IMPORT_ERROR", "Previous collection deletion failed", {
+				detail: {
+					kind: "collection",
+					id: record.id,
+					reason: "COLLECTION_DELETION_FAILED",
+					deletedCollectionId: deletion.collectionId,
+					message: `Deletion of the previous collection "${record.slug}" failed. Abandon this import with \`emdash site import abandon ${context.operationId}\`, then send {"collectionId":"${deletion.collectionId}"} to POST /_emdash/api/admin/media-usage/collection-deletions/retry. After cleanup finishes, reset this site or set up a new one before analyzing and running the import again.`,
+				},
+			});
+		}
+		if (outcome === "finalized") break;
+		if (outcome !== "progress") throw new ImportCollectionDeletionSignal(true);
+		deletion = await deletions.findBySlug(record.slug);
+	}
+	if (hadDeletion) {
+		if (!context.budget.canStart({ queries: COLLECTION_STATEMENTS + 3 })) {
+			throw new ImportCollectionDeletionSignal(false);
+		}
+		const operation = await context.ops.require(context.operationId);
+		if (operation.cancelRequestedAt !== null) throw new ImportCancelledSignal();
+	}
 	const fields = (await context.allRecords("field")).filter(
 		(field) => field.collectionId === record.id,
 	);
@@ -219,7 +265,12 @@ async function importCollection(
 	} catch (error) {
 		if (error instanceof SchemaError) {
 			throw new TransferError("TRANSFER_IMPORT_ERROR", "Collection could not be imported", {
-				detail: { kind: "collection", id: record.id, reason: error.code },
+				detail: {
+					kind: "collection",
+					id: record.id,
+					reason: error.code,
+					message: error.message.slice(0, 512),
+				},
 				cause: error,
 			});
 		}

package/src/utils/revalidating-cache.ts

@@ -0,0 +1,85 @@
+import { after } from "../after.js";
+import {
+	createSingleFlightCache,
+	invalidateSingleFlightCache,
+	singleFlightCached,
+	type SingleFlightCache,
+} from "./single-flight-cache.js";
+
+export const REVALIDATING_CACHE_TTL_MS = 30_000;
+
+export interface RevalidatingCache<T> {
+	snapshot: { value: T } | null;
+	expiresAt: number;
+	generation: number;
+	revalidatingUntil: number;
+	refresh: SingleFlightCache<T>;
+}
+
+export function createRevalidatingCache<T>(): RevalidatingCache<T> {
+	return {
+		snapshot: null,
+		expiresAt: 0,
+		generation: 0,
+		revalidatingUntil: 0,
+		refresh: createSingleFlightCache<T>(),
+	};
+}
+
+export function invalidateRevalidatingCache<T>(cache: RevalidatingCache<T>): void {
+	cache.generation++;
+	cache.snapshot = null;
+	cache.expiresAt = 0;
+	cache.revalidatingUntil = 0;
+	invalidateSingleFlightCache(cache.refresh);
+}
+
+/** Serve the last good snapshot while an expired value refreshes via after(). */
+export async function revalidatingCached<T>(
+	cache: RevalidatingCache<T>,
+	load: () => Promise<T>,
+	onError: (error: unknown) => void,
+): Promise<T> {
+	const refresh = (): Promise<T> =>
+		singleFlightCached(cache.refresh, load, {
+			anchor: (promise) => after(() => promise),
+			ownerTimeoutMs: REVALIDATING_CACHE_TTL_MS,
+		});
+
+	const install = (value: T) => {
+		cache.snapshot = { value };
+		cache.expiresAt = Date.now() + REVALIDATING_CACHE_TTL_MS;
+	};
+
+	const revalidate = () => {
+		const now = Date.now();
+		if (cache.revalidatingUntil > now) return;
+		cache.revalidatingUntil = now + REVALIDATING_CACHE_TTL_MS;
+		const generation = ++cache.generation;
+		invalidateSingleFlightCache(cache.refresh);
+		after(async () => {
+			try {
+				const value = await refresh();
+				if (generation === cache.generation) install(value);
+			} catch (error) {
+				onError(error);
+			}
+		});
+	};
+
+	for (let attempt = 0; attempt < 3; attempt++) {
+		const snapshot = cache.snapshot;
+		if (snapshot) {
+			if (Date.now() >= cache.expiresAt) revalidate();
+			return snapshot.value;
+		}
+		const generation = cache.generation;
+		const loaded = await refresh();
+		if (generation === cache.generation) {
+			install(loaded);
+			return loaded;
+		}
+		if (attempt === 2) return loaded;
+	}
+	throw new Error("Revalidating cache refresh exhausted without loading value");
+}

package/src/visual-editing/toolbar.ts

@@ -83,7 +83,7 @@ export function renderToolbar(config: ToolbarConfig): string {
 
     <span class="emdash-tb-save-status" id="emdash-tb-save-status"></span>
 
-    <a class="emdash-tb-admin" id="emdash-tb-admin" href="#" target="emdash-admin" style="display:none" title="${escapeHtml(labels.openInAdmin)}">
+    <a class="emdash-tb-admin" id="emdash-tb-admin" href="#" style="display:none" title="${escapeHtml(labels.openInAdmin)}">
       <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"/><polyline points="15 3 21 3 21 9"/><line x1="10" y1="14" x2="21" y2="3"/></svg>
     </a>
 
@@ -775,6 +775,7 @@ export function renderToolbar(config: ToolbarConfig): string {
       var adminLink = document.getElementById("emdash-tb-admin");
       if (adminLink) {
         adminLink.href = "/_emdash/admin/content/" + encodeURIComponent(ref.collection) + "/" + encodeURIComponent(ref.id);
+        adminLink.target = adminWindowName(ref.collection, ref.id);
         adminLink.style.display = "";
       }
 
@@ -1076,13 +1077,17 @@ export function renderToolbar(config: ToolbarConfig): string {
     });
   }
 
+  function adminWindowName(collection, id) {
+    return "emdash-admin-" + encodeURIComponent(collection) + "/" + encodeURIComponent(id);
+  }
+
   // Fallback: open admin
   function openAdmin(annotation) {
     var url = "/_emdash/admin/content/" + encodeURIComponent(annotation.collection) + "/" + encodeURIComponent(annotation.id);
     if (annotation.field) {
       url += "?field=" + encodeURIComponent(annotation.field);
     }
-    window.open(url, "emdash-admin");
+    window.open(url, adminWindowName(annotation.collection, annotation.id));
   }
 
   // --- Inline image editing ---

package/src/widgets/index.ts

@@ -3,6 +3,7 @@ import type { Kysely } from "kysely";
 import { widgetAreaTag } from "../cache/chrome-tags.js";
 import type { Database } from "../database/types.js";
 import { getDb } from "../loader.js";
+import { cachedQuery, CacheNamespace } from "../object-cache/index.js";
 import type { CacheHint } from "../query.js";
 import { peekRequestCache, requestCached } from "../request-cache.js";
 import { getWidgetComponents as getComponentRegistry } from "./components.js";
@@ -19,6 +20,7 @@ export type {
 	UpdateWidgetInput,
 	ReorderWidgetsInput,
 } from "./types.js";
+export { invalidateWidgetObjectCache } from "../object-cache/index.js";
 
 /**
  * Get a widget area by name, with all its widgets.
@@ -35,12 +37,18 @@ export async function getWidgetArea(name: string): Promise<WidgetArea | null> {
 			}
 		}
 
-		const db = await getDb();
-		const rows = await selectAreasWithWidgets(db)
-			.where("a.name", "=", name)
-			.orderBy("w.sort_order", "asc")
-			.execute();
-		return groupAreaRows(rows)[0] ?? null;
+		return cachedQuery({
+			namespace: CacheNamespace.WIDGETS,
+			key: `area:${name}`,
+			load: async () => {
+				const db = await getDb();
+				const rows = await selectAreasWithWidgets(db)
+					.where("a.name", "=", name)
+					.orderBy("w.sort_order", "asc")
+					.execute();
+				return groupAreaRows(rows)[0] ?? null;
+			},
+		});
 	});
 }
 
@@ -127,13 +135,19 @@ export async function getWidgetAreaWithCacheHint(name: string): Promise<{
  * Get all widget areas with their widgets
  */
 export async function getWidgetAreas(): Promise<WidgetArea[]> {
-	const db = await getDb();
-	const rows = await selectAreasWithWidgets(db)
-		.orderBy("a.created_at", "asc")
-		.orderBy("a.id", "asc")
-		.orderBy("w.sort_order", "asc")
-		.execute();
-	return groupAreaRows(rows);
+	return cachedQuery({
+		namespace: CacheNamespace.WIDGETS,
+		key: "areas",
+		load: async () => {
+			const db = await getDb();
+			const rows = await selectAreasWithWidgets(db)
+				.orderBy("a.created_at", "asc")
+				.orderBy("a.id", "asc")
+				.orderBy("w.sort_order", "asc")
+				.execute();
+			return groupAreaRows(rows);
+		},
+	});
 }
 
 /**

package/dist/action-token-B1ds4laA.mjs

@@ -1,26 +0,0 @@
-import { r as verifyPreviewToken, t as generatePreviewToken } from "./tokens-U5vzgSrM.mjs";
-
-//#region src/visual-editing/action-token.ts
-const VISUAL_ACTION_SECRET_DOMAIN = "emdash:visual-editing-action:v1:";
-const VISUAL_ACTION_TOKEN_INVALID = "VISUAL_ACTION_TOKEN_INVALID";
-function visualActionSecret(previewSecret) {
-	return `${VISUAL_ACTION_SECRET_DOMAIN}${previewSecret}`;
-}
-function generateVisualEditingActionToken(previewSecret, userId) {
-	return generatePreviewToken({
-		contentId: `visual-editing:${userId}`,
-		expiresIn: "5m",
-		secret: visualActionSecret(previewSecret)
-	});
-}
-async function verifyVisualEditingActionToken(token, previewSecret, userId) {
-	const verification = await verifyPreviewToken({
-		token,
-		secret: visualActionSecret(previewSecret)
-	});
-	return verification.valid && verification.payload.cid === `visual-editing:${userId}`;
-}
-
-//#endregion
-export { generateVisualEditingActionToken as n, verifyVisualEditingActionToken as r, VISUAL_ACTION_TOKEN_INVALID as t };
-//# sourceMappingURL=action-token-B1ds4laA.mjs.map

package/dist/action-token-B1ds4laA.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"action-token-B1ds4laA.mjs","names":[],"sources":["../src/visual-editing/action-token.ts"],"sourcesContent":["import { generatePreviewToken, verifyPreviewToken } from \"../preview/tokens.js\";\n\nconst VISUAL_ACTION_SECRET_DOMAIN = \"emdash:visual-editing-action:v1:\";\nexport const VISUAL_ACTION_TOKEN_INVALID = \"VISUAL_ACTION_TOKEN_INVALID\";\n\nfunction visualActionSecret(previewSecret: string): string {\n\treturn `${VISUAL_ACTION_SECRET_DOMAIN}${previewSecret}`;\n}\n\nexport function generateVisualEditingActionToken(\n\tpreviewSecret: string,\n\tuserId: string,\n): Promise<string> {\n\treturn generatePreviewToken({\n\t\tcontentId: `visual-editing:${userId}`,\n\t\texpiresIn: \"5m\",\n\t\tsecret: visualActionSecret(previewSecret),\n\t});\n}\n\nexport async function verifyVisualEditingActionToken(\n\ttoken: string,\n\tpreviewSecret: string,\n\tuserId: string,\n): Promise<boolean> {\n\tconst verification = await verifyPreviewToken({\n\t\ttoken,\n\t\tsecret: visualActionSecret(previewSecret),\n\t});\n\treturn verification.valid && verification.payload.cid === `visual-editing:${userId}`;\n}\n"],"mappings":";;;AAEA,MAAM,8BAA8B;AACpC,MAAa,8BAA8B;AAE3C,SAAS,mBAAmB,eAA+B;AAC1D,QAAO,GAAG,8BAA8B;;AAGzC,SAAgB,iCACf,eACA,QACkB;AAClB,QAAO,qBAAqB;EAC3B,WAAW,kBAAkB;EAC7B,WAAW;EACX,QAAQ,mBAAmB,cAAc;EACzC,CAAC;;AAGH,eAAsB,+BACrB,OACA,eACA,QACmB;CACnB,MAAM,eAAe,MAAM,mBAAmB;EAC7C;EACA,QAAQ,mBAAmB,cAAc;EACzC,CAAC;AACF,QAAO,aAAa,SAAS,aAAa,QAAQ,QAAQ,kBAAkB"}