fabricjs-document-engine 1.1.0 → 1.2.0

package/dist/pdf/export-pdf.js

@@ -3,12 +3,13 @@ import { readObjectId } from "../fabric/object-ids.js";
 import { walkObjects } from "../fabric/walk-objects.js";
 import { withSvgOverrides } from "../export/svg/overrides.js";
 import { isTextOnPath, textOnPathToSVG } from "../export/svg/text-on-path.js";
+import { rasterMarkup, safeMultiplier } from "../export/svg/raster-object.js";
+import { decoratedTextToSVG, hasStraightDecorations } from "../export/svg/text-decorations.js";
 import { repairFabricSvg, withExportView } from "../export/render-export.js";
 import { embedSvgAssets } from "../export/svg/embed-assets.js";
 import { disposeObjects } from "../export/batch-render.js";
 import { jsPdfStyle, loadFonts, registerFonts, standardFamily } from "./fonts.js";
 import { layoutPage } from "./page-layout.js";
-import { decoratedTextToSVG, hasStraightDecorations } from "./text-decorations.js";
 //#region src/pdf/export-pdf.ts
 const RASTER_REASONS = {
 	shadow: "it has a shadow, which PDF vectors cannot draw",
@@ -16,7 +17,8 @@ const RASTER_REASONS = {
 	gradientStroke: "its outline is a gradient or pattern",
 	uniformStroke: "it keeps its outline width while scaled (strokeUniform)",
 	font: "its font has no TrueType file in fonts",
-	characters: "it uses characters the built-in PDF fonts do not have; add a TrueType font that has them"
+	characters: "it uses characters the built-in PDF fonts do not have; add a TrueType font that has them",
+	mask: "it uses an inverted or nested clip path, which PDF vectors cannot draw"
 };
 function stop(signal) {
 	if (signal?.aborted) throw new DocumentEngineError("EXPORT_ABORTED", "The PDF export was cancelled");
@@ -74,6 +76,7 @@ function rasterReason(object, registered, missingFonts) {
 	walkObjects([object], (child) => {
 		if (reason) return;
 		if (child.shadow) reason = "shadow";
+		else if (child.clipPath?.inverted || child.clipPath?.clipPath) reason = "mask";
 		else if (child.globalCompositeOperation && child.globalCompositeOperation !== "source-over") reason = "blend";
 		else if (typeof child.stroke === "object" && child.stroke !== null && child.strokeWidth > 0) reason = "gradientStroke";
 		else if (child.strokeUniform && child.stroke && child.strokeWidth > 0) {
@@ -90,69 +93,6 @@ function rasterReason(object, registered, missingFonts) {
 	});
 	return reason;
 }
-function shadowPadding(object) {
-	let padding = 0;
-	walkObjects([object], (child) => {
-		const shadow = child.shadow;
-		if (shadow) padding = Math.max(padding, shadow.blur + Math.max(Math.abs(shadow.offsetX), Math.abs(shadow.offsetY)));
-	});
-	return padding + 2;
-}
-function usesBlendMode(object) {
-	let blends = false;
-	walkObjects([object], (child) => {
-		if (child.globalCompositeOperation && child.globalCompositeOperation !== "source-over") blends = true;
-	});
-	return blends;
-}
-/**
-* An object as a picture placed where it sits on the canvas. Usually the
-* object alone, so the vectors underneath show through. An object with a
-* blend mode mixes with what lies below it, so its picture includes
-* everything below it within its bounds, which covers those vectors exactly.
-*/
-function rasterMarkup(canvas, object, multiplier) {
-	object.setCoords();
-	const bounds = object.getBoundingRect();
-	const padding = shadowPadding(object);
-	const left = Math.max(0, Math.floor(bounds.left - padding));
-	const top = Math.max(0, Math.floor(bounds.top - padding));
-	const right = Math.min(canvas.getWidth(), Math.ceil(bounds.left + bounds.width + padding));
-	const bottom = Math.min(canvas.getHeight(), Math.ceil(bounds.top + bounds.height + padding));
-	if (right <= left || bottom <= top) return "";
-	const blends = usesBlendMode(object);
-	const stack = canvas.getObjects();
-	const position = stack.indexOf(object);
-	const saved = {
-		backgroundColor: canvas.backgroundColor,
-		backgroundImage: canvas.backgroundImage,
-		overlayColor: canvas.overlayColor,
-		overlayImage: canvas.overlayImage
-	};
-	if (!blends) {
-		canvas.backgroundColor = "";
-		canvas.backgroundImage = void 0;
-	}
-	canvas.overlayColor = "";
-	canvas.overlayImage = void 0;
-	let element;
-	try {
-		const filter = (candidate) => blends ? stack.indexOf(candidate) <= position : candidate === object;
-		element = canvas.toCanvasElement(multiplier, {
-			left,
-			top,
-			width: right - left,
-			height: bottom - top,
-			filter
-		});
-	} finally {
-		Object.assign(canvas, saved);
-	}
-	const url = element.toDataURL("image/png");
-	element.width = 0;
-	element.height = 0;
-	return `<image x="${left}" y="${top}" width="${right - left}" height="${bottom - top}" preserveAspectRatio="none" xlink:href="${url}" />\n`;
-}
 function quoteFamily(name) {
 	return /^[a-z-]+$/i.test(name) ? name : `"${name.replace(/"/g, "")}"`;
 }
@@ -238,7 +178,7 @@ function clipTo(context, draw) {
 }
 async function drawRasterPage(canvas, context) {
 	const { layout, options } = context;
-	const multiplier = layout.scale * (options.dpi ?? 300) / 72;
+	const multiplier = safeMultiplier(layout.scale * (options.dpi ?? 300) / 72, canvas.getWidth(), canvas.getHeight(), options.limits);
 	const element = withExportView(canvas, options.background ?? "keep", "png", () => canvas.toCanvasElement(multiplier));
 	try {
 		await clipTo(context, () => {
@@ -262,7 +202,7 @@ async function drawVectorPage(canvas, context) {
 			const reason = rasterReason(object, registered, missingFonts);
 			if (!reason) continue;
 			if (mode === "hybrid") {
-				rasters.set(object, rasterMarkup(canvas, object, multiplier));
+				rasters.set(object, rasterMarkup(canvas, object, multiplier, options.limits));
 				warnings.push({
 					code: "PDF_RASTERIZED",
 					message: `An object was drawn as a picture at ${options.dpi ?? 300} dpi because ${RASTER_REASONS[reason]}`,
@@ -295,6 +235,7 @@ async function drawVectorPage(canvas, context) {
 	});
 	const embedded = await embedSvgAssets(repairFabricSvg(svg), canvas, {
 		textOnPath: "vector",
+		textDecorations: "shapes",
 		embedImages: true,
 		maxEmbeddedImageBytes: Number.MAX_SAFE_INTEGER,
 		embedFonts: {}

package/dist/recovery/recovery-controller.cjs

@@ -1,4 +1,5 @@
 const require_asset_pipeline = require("../assets/asset-pipeline.cjs");
+const require_ids = require("../document/ids.cjs");
 //#region src/recovery/recovery-controller.ts
 async function toStoredFiles(files) {
 	const entries = await Promise.all(Object.entries(files).map(async ([url, blob]) => [url, {
@@ -12,22 +13,55 @@ function fromStoredFiles(files) {
 	for (const [url, file] of Object.entries(files ?? {})) restored[url] = file instanceof Blob ? file : new Blob([file.bytes], { type: file.type });
 	return restored;
 }
-function fromStoredRecord(value) {
+function fromStoredRecord(value, sessionId, active) {
 	if (!isRecoveryRecord(value)) return void 0;
 	const stored = value;
 	return {
 		...stored,
+		sessionId,
+		active,
 		files: fromStoredFiles(stored.files)
 	};
 }
-const documentKeyPrefix = "document:";
-const unloadKeyPrefix = "unload:";
-const loadingKey = "loading";
-function documentKey(documentId) {
-	return `${documentKeyPrefix}${documentId}`;
+const LEGACY_SESSION = "legacy";
+const checkpointPrefix = "checkpoint:";
+const closingPrefix = "closing:";
+const loadingPrefix = "loading:";
+const legacyDocumentPrefix = "document:";
+const legacyUnloadPrefix = "unload:";
+const legacyLoadingKey = "loading";
+function branchKeys({ sessionId, documentId }) {
+	if (sessionId === LEGACY_SESSION) return {
+		checkpoint: `${legacyDocumentPrefix}${documentId}`,
+		closing: `${legacyUnloadPrefix}${documentId}`
+	};
+	const document = encodeURIComponent(documentId);
+	return {
+		checkpoint: `${checkpointPrefix}${sessionId}:${document}`,
+		closing: `${closingPrefix}${sessionId}:${document}`
+	};
+}
+/** The branch a key belongs to, or undefined for keys that are not copies. */
+function parseBranch(key) {
+	for (const prefix of [checkpointPrefix, closingPrefix]) {
+		if (!key.startsWith(prefix)) continue;
+		const rest = key.slice(prefix.length);
+		const separator = rest.indexOf(":");
+		if (separator <= 0) return void 0;
+		return {
+			sessionId: rest.slice(0, separator),
+			documentId: decodeURIComponent(rest.slice(separator + 1))
+		};
+	}
+	for (const prefix of [legacyDocumentPrefix, legacyUnloadPrefix]) if (key.startsWith(prefix)) return {
+		sessionId: LEGACY_SESSION,
+		documentId: key.slice(prefix.length)
+	};
 }
-function unloadKey(documentId) {
-	return `${unloadKeyPrefix}${documentId}`;
+const LOCK_PREFIX = "fabricjs-document-engine/recovery/";
+function lockManager() {
+	const locks = globalThis.navigator?.locks;
+	return typeof locks?.request === "function" && typeof locks.query === "function" ? locks : void 0;
 }
 function newerRecord(checkpoint, unloadCopy) {
 	if (!unloadCopy) return checkpoint;
@@ -58,6 +92,24 @@ async function restoreRecordedFiles(record) {
 }
 function createRecoveryController(options) {
 	const { store } = options;
+	const sessionId = require_ids.createId();
+	const own = (documentId) => ({
+		sessionId,
+		documentId
+	});
+	const adopted = /* @__PURE__ */ new Map();
+	const locks = lockManager();
+	let releaseLock;
+	locks?.request(`${LOCK_PREFIX}${sessionId}`, () => new Promise((resolve) => releaseLock = resolve)).catch(() => void 0);
+	async function liveSessions() {
+		const live = /* @__PURE__ */ new Set([sessionId]);
+		if (!locks) return live;
+		try {
+			const { held = [] } = await locks.query();
+			for (const lock of held) if (lock.name?.startsWith(LOCK_PREFIX)) live.add(lock.name.slice(34));
+		} catch {}
+		return live;
+	}
 	const interval = options.interval ?? 2e3;
 	const capturedFiles = /* @__PURE__ */ new Map();
 	const readyFiles = /* @__PURE__ */ new Map();
@@ -88,6 +140,8 @@ function createRecoveryController(options) {
 	function createRecord(document, files) {
 		return {
 			documentId: document.id,
+			sessionId,
+			active: true,
 			savedAt: (/* @__PURE__ */ new Date()).toISOString(),
 			baseRevision: document.revision ?? 0,
 			document,
@@ -99,7 +153,7 @@ function createRecoveryController(options) {
 		if (!options.shouldWrite()) return;
 		const document = options.createDocument();
 		const record = createRecord(document, await captureTabOnlyFiles(document));
-		await store.set(documentKey(document.id), {
+		await store.set(branchKeys(own(document.id)).checkpoint, {
 			...record,
 			files: await toStoredFiles(record.files)
 		});
@@ -109,20 +163,52 @@ function createRecoveryController(options) {
 		cancel();
 		if (!options.shouldWrite()) return;
 		const document = options.createDocument();
+		const keys = branchKeys(own(document.id));
 		if (store.setNow) {
-			store.setNow(unloadKey(document.id), createRecord(document, {}));
+			store.setNow(keys.closing, createRecord(document, {}));
 			return;
 		}
 		const record = createRecord(document, Object.fromEntries(readyFiles));
-		toStoredFiles(record.files).then((files) => store.set(documentKey(document.id), {
+		toStoredFiles(record.files).then((files) => store.set(keys.checkpoint, {
 			...record,
 			files
 		})).then(() => options.onCheckpoint(record), options.onError);
 	}
-	async function read(documentId) {
+	async function readBranch(branch, live) {
+		const keys = branchKeys(branch);
+		const [checkpoint, closing] = await Promise.all([store.get(keys.checkpoint), store.get(keys.closing)]);
+		const active = live.has(branch.sessionId);
+		return newerRecord(fromStoredRecord(checkpoint, branch.sessionId, active), fromStoredRecord(closing, branch.sessionId, active));
+	}
+	/** Every branch in the store, de-duplicated, in one pass over the keys. */
+	async function branches(documentId) {
+		const found = /* @__PURE__ */ new Map();
+		for (const key of await store.keys()) {
+			const branch = parseBranch(key);
+			if (!branch || documentId !== void 0 && branch.documentId !== documentId) continue;
+			found.set(`${branch.sessionId}\u0000${branch.documentId}`, branch);
+		}
+		return [...found.values()];
+	}
+	async function readAll(documentId) {
 		await queue;
-		const [checkpoint, unloadCopy] = await Promise.all([store.get(documentKey(documentId)), store.get(unloadKey(documentId))]);
-		return newerRecord(fromStoredRecord(checkpoint), fromStoredRecord(unloadCopy));
+		const live = await liveSessions();
+		return (await Promise.all((await branches(documentId)).map((branch) => readBranch(branch, live)))).filter((record) => record !== void 0).sort((first, second) => second.savedAt.localeCompare(first.savedAt));
+	}
+	async function read(documentId, branchSession) {
+		if (branchSession !== void 0) {
+			await queue;
+			return readBranch({
+				sessionId: branchSession,
+				documentId
+			}, await liveSessions());
+		}
+		return (await readAll(documentId))[0];
+	}
+	async function deleteBranch(branch) {
+		const keys = branchKeys(branch);
+		await store.delete(keys.closing);
+		await store.delete(keys.checkpoint);
 	}
 	function cancel() {
 		if (timer !== void 0) clearTimeout(timer);
@@ -151,31 +237,64 @@ function createRecoveryController(options) {
 		flush,
 		writeNow: writeCheckpointBeforeThePageCloses,
 		cancel,
+		sessionId,
 		remove: (documentId) => enqueue(async () => {
-			await store.delete(unloadKey(documentId));
-			await store.delete(documentKey(documentId));
+			await deleteBranch(own(documentId));
+			await deleteBranch({
+				sessionId: LEGACY_SESSION,
+				documentId
+			});
+			for (const other of adopted.get(documentId) ?? []) await deleteBranch({
+				sessionId: other,
+				documentId
+			});
+			adopted.delete(documentId);
 		}),
-		read,
-		async list() {
-			await queue;
-			const documentIds = /* @__PURE__ */ new Set();
-			for (const key of await store.keys()) {
-				if (key.startsWith(documentKeyPrefix)) documentIds.add(key.slice(9));
-				if (key.startsWith(unloadKeyPrefix)) documentIds.add(key.slice(7));
-			}
-			return (await Promise.all([...documentIds].map(read))).filter((record) => record !== void 0).sort((first, second) => second.savedAt.localeCompare(first.savedAt));
+		adopt(documentId, other) {
+			if (other === sessionId) return;
+			const sessions = adopted.get(documentId) ?? /* @__PURE__ */ new Set();
+			sessions.add(other);
+			adopted.set(documentId, sessions);
 		},
-		markLoadStarted: (documentId) => store.set(loadingKey, {
+		discard: (documentId, branchSession) => enqueue(async () => {
+			const targets = branchSession === void 0 ? await branches(documentId) : [{
+				sessionId: branchSession,
+				documentId
+			}];
+			for (const branch of targets) await deleteBranch(branch);
+		}),
+		read,
+		list: () => readAll(),
+		markLoadStarted: (documentId) => store.set(`${loadingPrefix}${sessionId}`, {
 			documentId,
 			startedAt: (/* @__PURE__ */ new Date()).toISOString()
 		}).catch(options.onError),
-		markLoadFinished: () => store.delete(loadingKey).catch(options.onError),
+		markLoadFinished: async () => {
+			try {
+				await store.delete(`${loadingPrefix}${sessionId}`);
+				const live = await liveSessions();
+				for (const key of await store.keys()) {
+					const markerSession = key === legacyLoadingKey ? LEGACY_SESSION : key.startsWith(loadingPrefix) ? key.slice(8) : void 0;
+					if (markerSession !== void 0 && !live.has(markerSession)) await store.delete(key);
+				}
+			} catch (error) {
+				options.onError(error);
+			}
+		},
 		async interruptedLoad() {
-			const marker = await store.get(loadingKey);
-			return marker && typeof marker.startedAt === "string" ? marker : void 0;
+			const live = await liveSessions();
+			let newest;
+			for (const key of await store.keys()) {
+				const markerSession = key === legacyLoadingKey ? LEGACY_SESSION : key.startsWith(loadingPrefix) ? key.slice(8) : void 0;
+				if (markerSession === void 0 || live.has(markerSession)) continue;
+				const marker = await store.get(key);
+				if (marker && typeof marker.startedAt === "string" && (!newest || marker.startedAt > newest.startedAt)) newest = marker;
+			}
+			return newest;
 		},
 		destroy() {
 			cancel();
+			releaseLock?.();
 			pageEvents?.removeEventListener("pagehide", handlePageHidden);
 			pageEvents?.document.removeEventListener("visibilitychange", handleVisibilityChange);
 		}

package/dist/recovery/recovery-controller.d.cts

@@ -7,6 +7,14 @@ export interface RecoveryOptions {
 }
 export interface RecoveryRecord {
   documentId: string;
+  /**
+   * The editor session (one per engine, so one per tab) that wrote this copy.
+   * Two tabs editing the same document keep separate copies. `legacy` marks
+   * a copy written before 1.2.
+   */
+  sessionId: string;
+  /** True while the session that wrote the copy is still open in a tab, when the browser can tell. */
+  active: boolean;
   savedAt: string;
   baseRevision: number;
   document: FabricDocument;

package/dist/recovery/recovery-controller.d.ts

@@ -7,6 +7,14 @@ export interface RecoveryOptions {
 }
 export interface RecoveryRecord {
   documentId: string;
+  /**
+   * The editor session (one per engine, so one per tab) that wrote this copy.
+   * Two tabs editing the same document keep separate copies. `legacy` marks
+   * a copy written before 1.2.
+   */
+  sessionId: string;
+  /** True while the session that wrote the copy is still open in a tab, when the browser can tell. */
+  active: boolean;
   savedAt: string;
   baseRevision: number;
   document: FabricDocument;

package/dist/recovery/recovery-controller.js

@@ -1,4 +1,5 @@
 import { rewriteUrls } from "../assets/asset-pipeline.js";
+import { createId } from "../document/ids.js";
 //#region src/recovery/recovery-controller.ts
 async function toStoredFiles(files) {
 	const entries = await Promise.all(Object.entries(files).map(async ([url, blob]) => [url, {
@@ -12,22 +13,55 @@ function fromStoredFiles(files) {
 	for (const [url, file] of Object.entries(files ?? {})) restored[url] = file instanceof Blob ? file : new Blob([file.bytes], { type: file.type });
 	return restored;
 }
-function fromStoredRecord(value) {
+function fromStoredRecord(value, sessionId, active) {
 	if (!isRecoveryRecord(value)) return void 0;
 	const stored = value;
 	return {
 		...stored,
+		sessionId,
+		active,
 		files: fromStoredFiles(stored.files)
 	};
 }
-const documentKeyPrefix = "document:";
-const unloadKeyPrefix = "unload:";
-const loadingKey = "loading";
-function documentKey(documentId) {
-	return `${documentKeyPrefix}${documentId}`;
+const LEGACY_SESSION = "legacy";
+const checkpointPrefix = "checkpoint:";
+const closingPrefix = "closing:";
+const loadingPrefix = "loading:";
+const legacyDocumentPrefix = "document:";
+const legacyUnloadPrefix = "unload:";
+const legacyLoadingKey = "loading";
+function branchKeys({ sessionId, documentId }) {
+	if (sessionId === LEGACY_SESSION) return {
+		checkpoint: `${legacyDocumentPrefix}${documentId}`,
+		closing: `${legacyUnloadPrefix}${documentId}`
+	};
+	const document = encodeURIComponent(documentId);
+	return {
+		checkpoint: `${checkpointPrefix}${sessionId}:${document}`,
+		closing: `${closingPrefix}${sessionId}:${document}`
+	};
+}
+/** The branch a key belongs to, or undefined for keys that are not copies. */
+function parseBranch(key) {
+	for (const prefix of [checkpointPrefix, closingPrefix]) {
+		if (!key.startsWith(prefix)) continue;
+		const rest = key.slice(prefix.length);
+		const separator = rest.indexOf(":");
+		if (separator <= 0) return void 0;
+		return {
+			sessionId: rest.slice(0, separator),
+			documentId: decodeURIComponent(rest.slice(separator + 1))
+		};
+	}
+	for (const prefix of [legacyDocumentPrefix, legacyUnloadPrefix]) if (key.startsWith(prefix)) return {
+		sessionId: LEGACY_SESSION,
+		documentId: key.slice(prefix.length)
+	};
 }
-function unloadKey(documentId) {
-	return `${unloadKeyPrefix}${documentId}`;
+const LOCK_PREFIX = "fabricjs-document-engine/recovery/";
+function lockManager() {
+	const locks = globalThis.navigator?.locks;
+	return typeof locks?.request === "function" && typeof locks.query === "function" ? locks : void 0;
 }
 function newerRecord(checkpoint, unloadCopy) {
 	if (!unloadCopy) return checkpoint;
@@ -58,6 +92,24 @@ async function restoreRecordedFiles(record) {
 }
 function createRecoveryController(options) {
 	const { store } = options;
+	const sessionId = createId();
+	const own = (documentId) => ({
+		sessionId,
+		documentId
+	});
+	const adopted = /* @__PURE__ */ new Map();
+	const locks = lockManager();
+	let releaseLock;
+	locks?.request(`${LOCK_PREFIX}${sessionId}`, () => new Promise((resolve) => releaseLock = resolve)).catch(() => void 0);
+	async function liveSessions() {
+		const live = /* @__PURE__ */ new Set([sessionId]);
+		if (!locks) return live;
+		try {
+			const { held = [] } = await locks.query();
+			for (const lock of held) if (lock.name?.startsWith(LOCK_PREFIX)) live.add(lock.name.slice(34));
+		} catch {}
+		return live;
+	}
 	const interval = options.interval ?? 2e3;
 	const capturedFiles = /* @__PURE__ */ new Map();
 	const readyFiles = /* @__PURE__ */ new Map();
@@ -88,6 +140,8 @@ function createRecoveryController(options) {
 	function createRecord(document, files) {
 		return {
 			documentId: document.id,
+			sessionId,
+			active: true,
 			savedAt: (/* @__PURE__ */ new Date()).toISOString(),
 			baseRevision: document.revision ?? 0,
 			document,
@@ -99,7 +153,7 @@ function createRecoveryController(options) {
 		if (!options.shouldWrite()) return;
 		const document = options.createDocument();
 		const record = createRecord(document, await captureTabOnlyFiles(document));
-		await store.set(documentKey(document.id), {
+		await store.set(branchKeys(own(document.id)).checkpoint, {
 			...record,
 			files: await toStoredFiles(record.files)
 		});
@@ -109,20 +163,52 @@ function createRecoveryController(options) {
 		cancel();
 		if (!options.shouldWrite()) return;
 		const document = options.createDocument();
+		const keys = branchKeys(own(document.id));
 		if (store.setNow) {
-			store.setNow(unloadKey(document.id), createRecord(document, {}));
+			store.setNow(keys.closing, createRecord(document, {}));
 			return;
 		}
 		const record = createRecord(document, Object.fromEntries(readyFiles));
-		toStoredFiles(record.files).then((files) => store.set(documentKey(document.id), {
+		toStoredFiles(record.files).then((files) => store.set(keys.checkpoint, {
 			...record,
 			files
 		})).then(() => options.onCheckpoint(record), options.onError);
 	}
-	async function read(documentId) {
+	async function readBranch(branch, live) {
+		const keys = branchKeys(branch);
+		const [checkpoint, closing] = await Promise.all([store.get(keys.checkpoint), store.get(keys.closing)]);
+		const active = live.has(branch.sessionId);
+		return newerRecord(fromStoredRecord(checkpoint, branch.sessionId, active), fromStoredRecord(closing, branch.sessionId, active));
+	}
+	/** Every branch in the store, de-duplicated, in one pass over the keys. */
+	async function branches(documentId) {
+		const found = /* @__PURE__ */ new Map();
+		for (const key of await store.keys()) {
+			const branch = parseBranch(key);
+			if (!branch || documentId !== void 0 && branch.documentId !== documentId) continue;
+			found.set(`${branch.sessionId}\u0000${branch.documentId}`, branch);
+		}
+		return [...found.values()];
+	}
+	async function readAll(documentId) {
 		await queue;
-		const [checkpoint, unloadCopy] = await Promise.all([store.get(documentKey(documentId)), store.get(unloadKey(documentId))]);
-		return newerRecord(fromStoredRecord(checkpoint), fromStoredRecord(unloadCopy));
+		const live = await liveSessions();
+		return (await Promise.all((await branches(documentId)).map((branch) => readBranch(branch, live)))).filter((record) => record !== void 0).sort((first, second) => second.savedAt.localeCompare(first.savedAt));
+	}
+	async function read(documentId, branchSession) {
+		if (branchSession !== void 0) {
+			await queue;
+			return readBranch({
+				sessionId: branchSession,
+				documentId
+			}, await liveSessions());
+		}
+		return (await readAll(documentId))[0];
+	}
+	async function deleteBranch(branch) {
+		const keys = branchKeys(branch);
+		await store.delete(keys.closing);
+		await store.delete(keys.checkpoint);
 	}
 	function cancel() {
 		if (timer !== void 0) clearTimeout(timer);
@@ -151,31 +237,64 @@ function createRecoveryController(options) {
 		flush,
 		writeNow: writeCheckpointBeforeThePageCloses,
 		cancel,
+		sessionId,
 		remove: (documentId) => enqueue(async () => {
-			await store.delete(unloadKey(documentId));
-			await store.delete(documentKey(documentId));
+			await deleteBranch(own(documentId));
+			await deleteBranch({
+				sessionId: LEGACY_SESSION,
+				documentId
+			});
+			for (const other of adopted.get(documentId) ?? []) await deleteBranch({
+				sessionId: other,
+				documentId
+			});
+			adopted.delete(documentId);
 		}),
-		read,
-		async list() {
-			await queue;
-			const documentIds = /* @__PURE__ */ new Set();
-			for (const key of await store.keys()) {
-				if (key.startsWith(documentKeyPrefix)) documentIds.add(key.slice(9));
-				if (key.startsWith(unloadKeyPrefix)) documentIds.add(key.slice(7));
-			}
-			return (await Promise.all([...documentIds].map(read))).filter((record) => record !== void 0).sort((first, second) => second.savedAt.localeCompare(first.savedAt));
+		adopt(documentId, other) {
+			if (other === sessionId) return;
+			const sessions = adopted.get(documentId) ?? /* @__PURE__ */ new Set();
+			sessions.add(other);
+			adopted.set(documentId, sessions);
 		},
-		markLoadStarted: (documentId) => store.set(loadingKey, {
+		discard: (documentId, branchSession) => enqueue(async () => {
+			const targets = branchSession === void 0 ? await branches(documentId) : [{
+				sessionId: branchSession,
+				documentId
+			}];
+			for (const branch of targets) await deleteBranch(branch);
+		}),
+		read,
+		list: () => readAll(),
+		markLoadStarted: (documentId) => store.set(`${loadingPrefix}${sessionId}`, {
 			documentId,
 			startedAt: (/* @__PURE__ */ new Date()).toISOString()
 		}).catch(options.onError),
-		markLoadFinished: () => store.delete(loadingKey).catch(options.onError),
+		markLoadFinished: async () => {
+			try {
+				await store.delete(`${loadingPrefix}${sessionId}`);
+				const live = await liveSessions();
+				for (const key of await store.keys()) {
+					const markerSession = key === legacyLoadingKey ? LEGACY_SESSION : key.startsWith(loadingPrefix) ? key.slice(8) : void 0;
+					if (markerSession !== void 0 && !live.has(markerSession)) await store.delete(key);
+				}
+			} catch (error) {
+				options.onError(error);
+			}
+		},
 		async interruptedLoad() {
-			const marker = await store.get(loadingKey);
-			return marker && typeof marker.startedAt === "string" ? marker : void 0;
+			const live = await liveSessions();
+			let newest;
+			for (const key of await store.keys()) {
+				const markerSession = key === legacyLoadingKey ? LEGACY_SESSION : key.startsWith(loadingPrefix) ? key.slice(8) : void 0;
+				if (markerSession === void 0 || live.has(markerSession)) continue;
+				const marker = await store.get(key);
+				if (marker && typeof marker.startedAt === "string" && (!newest || marker.startedAt > newest.startedAt)) newest = marker;
+			}
+			return newest;
 		},
 		destroy() {
 			cancel();
+			releaseLock?.();
 			pageEvents?.removeEventListener("pagehide", handlePageHidden);
 			pageEvents?.document.removeEventListener("visibilitychange", handleVisibilityChange);
 		}