@xopcai/xopc 0.0.246 → 0.0.248

package/dist/src/share/share-store.js

@@ -1,32 +1,24 @@
 import { resolveStateDir } from "../config/paths-state.js";
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
+import { requireXopcDatabase } from "../storage/sqlite/connection.js";
+import { runSqliteWriteTransaction } from "../storage/sqlite/transaction.js";
 import { init_paths } from "../config/paths.js";
+import { DurableState } from "../storage/sqlite/durable-state.js";
 import { SHARE_CONFIG_DEFAULTS } from "./share-types.js";
 import { isPathUnderWorkspace } from "../gateway/workspace-editor-path.js";
 import { logShareAudit } from "./share-audit.js";
 import { join, relative, resolve } from "node:path";
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { randomBytes, randomUUID } from "node:crypto";
 import { lstat, readdir, realpath, rm, stat } from "node:fs/promises";
 //#region src/share/share-store.ts
 init_paths();
 init_logger();
 const log = createLogger("ShareStore");
-const SHARES_FILE = "shares.json";
 const CLEANUP_INTERVAL_MS = 10 * 6e4;
 const EXPIRED_RETENTION_MS = 1440 * 6e4;
-const MAX_STORED_RECORDS = 500;
-const TRUNCATE_TO = 200;
-const COUNTER_DEBOUNCE_MS = 2e3;
-function resolveSharesPath() {
-	return join(resolveStateDir(), SHARES_FILE);
-}
 var ShareStore = class {
-	shares = /* @__PURE__ */ new Map();
-	tokenIndex = /* @__PURE__ */ new Map();
-	dirty = false;
-	debounceTimer = null;
+	shares = new DurableState("shares");
 	cleanupTimer = null;
 	config;
 	listingCache = /* @__PURE__ */ new Map();
@@ -37,9 +29,15 @@ var ShareStore = class {
 			...SHARE_CONFIG_DEFAULTS,
 			...config
 		};
-		this.load();
 		this.startCleanupTimer();
 	}
+	saveNew(record) {
+		requireXopcDatabase();
+		runSqliteWriteTransaction(() => {
+			if (this.getActiveShares().length >= this.config.maxActiveShares) throw new Error("Maximum active shares reached");
+			this.shares.set(record.id, record);
+		});
+	}
 	updateConfig(config) {
 		this.config = {
 			...this.config,
@@ -193,8 +191,7 @@ var ShareStore = class {
 			...common,
 			kind: "file"
 		};
-		this.shares.set(id, record);
-		this.tokenIndex.set(token, id);
+		this.saveNew(record);
 		return record;
 	}
 	createNoteShare(input) {
@@ -226,8 +223,7 @@ var ShareStore = class {
 			createdByTokenHash: input.gatewayTokenHash,
 			description: input.description
 		};
-		this.shares.set(record.id, record);
-		this.tokenIndex.set(record.token, record.id);
+		this.saveNew(record);
 		this.persistAndAudit(record, "share.create", `Note share created: ${record.fileName}`, {
 			noteId: record.sourceNoteId,
 			sourceVersion: record.sourceVersion,
@@ -237,20 +233,23 @@ var ShareStore = class {
 		return record;
 	}
 	updateNoteSnapshot(id, patch) {
-		const record = this.shares.get(id);
-		if (!record || record.kind !== "note") return null;
-		record.sourceVersion = patch.sourceVersion;
-		record.fileSize = patch.artifactSize;
-		record.attachmentCount = patch.attachmentCount;
-		record.fileName = patch.fileName;
-		record.snapshotRevision += 1;
-		this.persistSync();
-		logShareAudit("share.update", {
-			shareId: id,
-			noteId: record.sourceNoteId,
-			snapshotRevision: record.snapshotRevision
-		}, `Note share snapshot updated: ${record.fileName}`);
-		return record;
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			const record = this.shares.get(id);
+			if (!record || record.kind !== "note") return null;
+			record.sourceVersion = patch.sourceVersion;
+			record.fileSize = patch.artifactSize;
+			record.attachmentCount = patch.attachmentCount;
+			record.fileName = patch.fileName;
+			record.snapshotRevision += 1;
+			this.shares.set(record.id, record);
+			logShareAudit("share.update", {
+				shareId: id,
+				noteId: record.sourceNoteId,
+				snapshotRevision: record.snapshotRevision
+			}, `Note share snapshot updated: ${record.fileName}`);
+			return record;
+		});
 	}
 	getNoteShares(noteId) {
 		return this.getAllShares().filter((record) => record.kind === "note" && record.sourceNoteId === noteId);
@@ -286,8 +285,7 @@ var ShareStore = class {
 			createdByTokenHash: input.gatewayTokenHash,
 			description: input.description
 		};
-		this.shares.set(record.id, record);
-		this.tokenIndex.set(record.token, record.id);
+		this.saveNew(record);
 		this.persistAndAudit(record, "share.create", `Session share created: ${record.fileName}`, {
 			sourceSessionId: record.sourceSessionId,
 			cutoffSeq: record.cutoffSeq,
@@ -300,26 +298,29 @@ var ShareStore = class {
 		return this.getAllShares().filter((record) => record.kind === "session" && record.sourceSessionId === sessionId);
 	}
 	updateSessionSnapshot(id, patch) {
-		const record = this.shares.get(id);
-		if (!record || record.kind !== "session") return null;
-		record.cutoffSeq = patch.cutoffSeq;
-		record.fileSize = patch.artifactSize;
-		record.messageCount = patch.messageCount;
-		record.attachmentCount = patch.attachmentCount;
-		record.includeToolActivities = patch.includeToolActivities;
-		record.fileName = patch.fileName;
-		record.snapshotRevision += 1;
-		this.persistSync();
-		logShareAudit("share.update", {
-			shareId: id,
-			sourceSessionId: record.sourceSessionId,
-			cutoffSeq: record.cutoffSeq,
-			snapshotRevision: record.snapshotRevision
-		}, `Session share snapshot updated: ${record.fileName}`);
-		return record;
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			const record = this.shares.get(id);
+			if (!record || record.kind !== "session") return null;
+			record.cutoffSeq = patch.cutoffSeq;
+			record.fileSize = patch.artifactSize;
+			record.messageCount = patch.messageCount;
+			record.attachmentCount = patch.attachmentCount;
+			record.includeToolActivities = patch.includeToolActivities;
+			record.fileName = patch.fileName;
+			record.snapshotRevision += 1;
+			this.shares.set(record.id, record);
+			logShareAudit("share.update", {
+				shareId: id,
+				sourceSessionId: record.sourceSessionId,
+				cutoffSeq: record.cutoffSeq,
+				snapshotRevision: record.snapshotRevision
+			}, `Session share snapshot updated: ${record.fileName}`);
+			return record;
+		});
 	}
 	persistAndAudit(record, event, message, extra) {
-		this.persistSync();
+		this.shares.set(record.id, record);
 		logShareAudit(event, {
 			shareId: record.id,
 			tokenPrefix: record.token.slice(0, 8),
@@ -330,9 +331,7 @@ var ShareStore = class {
 		return this.shares.get(id) ?? null;
 	}
 	getByToken(token) {
-		const id = this.tokenIndex.get(token);
-		if (!id) return null;
-		return this.shares.get(id) ?? null;
+		return this.shares.values().find((record) => record.token === token) ?? null;
 	}
 	/** Validate a share is still accessible for download. Returns null reason if valid. */
 	validateAccess(record) {
@@ -350,28 +349,40 @@ var ShareStore = class {
 		};
 		return { valid: true };
 	}
-	/** Increment download counter (used by directory & file downloads). Debounced persist. */
+	/** Increment download counter (used by directory & file downloads). Persisted before returning. */
 	incrementDownloadCount(id) {
-		const record = this.shares.get(id);
-		if (!record) return;
-		record.downloadCount++;
-		this.scheduleDebouncedPersist();
+		this.shares.update(id, (record) => {
+			if (record) record.downloadCount++;
+			return {
+				value: record,
+				result: void 0
+			};
+		});
 	}
 	/** Atomically validate and consume one access in the single-threaded store. */
 	consumeAccess(id) {
-		const record = this.shares.get(id);
-		if (!record) return {
-			valid: false,
-			reason: "not_found"
-		};
-		const validation = this.validateAccess(record);
-		if (!validation.valid) return {
-			valid: false,
-			reason: validation.reason ?? "access_denied"
-		};
-		record.downloadCount++;
-		this.scheduleDebouncedPersist();
-		return { valid: true };
+		return this.shares.update(id, (record) => {
+			if (!record) return {
+				value: void 0,
+				result: {
+					valid: false,
+					reason: "not_found"
+				}
+			};
+			const validation = this.validateAccess(record);
+			if (!validation.valid) return {
+				value: record,
+				result: {
+					valid: false,
+					reason: validation.reason ?? "access_denied"
+				}
+			};
+			record.downloadCount++;
+			return {
+				value: record,
+				result: { valid: true }
+			};
+		});
 	}
 	/** Check if the file still exists and inode matches. */
 	async validateFileIntegrity(record) {
@@ -504,74 +515,89 @@ var ShareStore = class {
 	}
 	/** Update thumbnail status. Persists immediately so generator restart is safe. */
 	setThumbnailStatus(id, status) {
-		const record = this.shares.get(id);
-		if (!record) return;
-		record.thumbnailStatus = status;
-		if (status === "ready") record.thumbnailGeneratedAt = (/* @__PURE__ */ new Date()).toISOString();
-		if (status === "failed") record.thumbnailFailedAt = (/* @__PURE__ */ new Date()).toISOString();
-		this.persistSync();
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			const record = this.shares.get(id);
+			if (!record) return;
+			record.thumbnailStatus = status;
+			if (status === "ready") record.thumbnailGeneratedAt = (/* @__PURE__ */ new Date()).toISOString();
+			if (status === "failed") record.thumbnailFailedAt = (/* @__PURE__ */ new Date()).toISOString();
+			this.shares.set(record.id, record);
+		});
 	}
 	/** Drop the listing cache for a share (used on revoke/update). */
 	invalidateListingCache(shareId) {
 		for (const key of this.listingCache.keys()) if (key.startsWith(`${shareId}::`)) this.listingCache.delete(key);
 	}
 	revoke(id) {
-		const record = this.shares.get(id);
-		if (!record) return false;
-		record.revoked = true;
-		this.cleanupStateArtifact(record);
-		this.invalidateListingCache(id);
-		this.persistSync();
-		logShareAudit("share.revoke", {
-			shareId: id,
-			tokenPrefix: record.token.slice(0, 8),
-			fileName: record.fileName
-		}, `Share revoked: ${record.fileName}`);
-		return true;
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			const record = this.shares.get(id);
+			if (!record) return false;
+			record.revoked = true;
+			this.cleanupStateArtifact(record);
+			this.invalidateListingCache(id);
+			this.shares.set(record.id, record);
+			logShareAudit("share.revoke", {
+				shareId: id,
+				tokenPrefix: record.token.slice(0, 8),
+				fileName: record.fileName
+			}, `Share revoked: ${record.fileName}`);
+			return true;
+		});
 	}
 	revokeMany(ids) {
-		let count = 0;
-		for (const id of ids) {
-			const record = this.shares.get(id);
-			if (record && !record.revoked) {
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			let count = 0;
+			for (const id of ids) {
+				const record = this.shares.get(id);
+				if (record && !record.revoked) {
+					record.revoked = true;
+					this.shares.set(record.id, record);
+					this.cleanupStateArtifact(record);
+					this.invalidateListingCache(id);
+					count++;
+					logShareAudit("share.revoke", {
+						shareId: id,
+						tokenPrefix: record.token.slice(0, 8),
+						fileName: record.fileName
+					}, `Share revoked (batch): ${record.fileName}`);
+				}
+			}
+			return count;
+		});
+	}
+	revokeExpired() {
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			const now = Date.now();
+			let count = 0;
+			for (const record of this.shares.values()) if (!record.revoked && now >= new Date(record.expiresAt).getTime()) {
 				record.revoked = true;
+				this.shares.set(record.id, record);
 				this.cleanupStateArtifact(record);
-				this.invalidateListingCache(id);
+				this.invalidateListingCache(record.id);
 				count++;
-				logShareAudit("share.revoke", {
-					shareId: id,
-					tokenPrefix: record.token.slice(0, 8),
-					fileName: record.fileName
-				}, `Share revoked (batch): ${record.fileName}`);
 			}
-		}
-		if (count > 0) this.persistSync();
-		return count;
-	}
-	revokeExpired() {
-		const now = Date.now();
-		let count = 0;
-		for (const record of this.shares.values()) if (!record.revoked && now >= new Date(record.expiresAt).getTime()) {
-			record.revoked = true;
-			this.cleanupStateArtifact(record);
-			this.invalidateListingCache(record.id);
-			count++;
-		}
-		if (count > 0) this.persistSync();
-		return count;
+			return count;
+		});
 	}
 	update(id, patch) {
-		const record = this.shares.get(id);
-		if (!record) return null;
-		if (patch.extendTtlMs !== void 0) record.expiresAt = new Date(Date.now() + patch.extendTtlMs).toISOString();
-		if (patch.maxViews !== void 0) record.maxViews = patch.maxViews;
-		this.persistSync();
-		logShareAudit("share.update", {
-			shareId: id,
-			tokenPrefix: record.token.slice(0, 8),
-			patch
-		}, `Share updated: ${record.fileName}`);
-		return record;
+		requireXopcDatabase();
+		return runSqliteWriteTransaction(() => {
+			const record = this.shares.get(id);
+			if (!record) return null;
+			if (patch.extendTtlMs !== void 0) record.expiresAt = new Date(Date.now() + patch.extendTtlMs).toISOString();
+			if (patch.maxViews !== void 0) record.maxViews = patch.maxViews;
+			this.shares.set(record.id, record);
+			logShareAudit("share.update", {
+				shareId: id,
+				tokenPrefix: record.token.slice(0, 8),
+				patch
+			}, `Share updated: ${record.fileName}`);
+			return record;
+		});
 	}
 	getActiveShares() {
 		const now = Date.now();
@@ -580,62 +606,6 @@ var ShareStore = class {
 	getAllShares() {
 		return [...this.shares.values()].sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
 	}
-	load() {
-		const path = resolveSharesPath();
-		if (!existsSync(path)) return;
-		try {
-			const raw = readFileSync(path, "utf8");
-			const data = JSON.parse(raw);
-			if (data.version !== 1 && data.version !== 2 || !Array.isArray(data.shares)) return;
-			const now = Date.now();
-			let cleaned = 0;
-			for (const record of data.shares) {
-				if (now - new Date(record.expiresAt).getTime() > EXPIRED_RETENTION_MS) {
-					cleaned++;
-					continue;
-				}
-				this.shares.set(record.id, record);
-				this.tokenIndex.set(record.token, record.id);
-			}
-			if (cleaned > 0) {
-				log.info({ cleaned }, `Cleaned ${cleaned} expired share records on load`);
-				this.persistSync();
-			}
-		} catch (err) {
-			log.warn({ err }, "Failed to load shares.json");
-		}
-	}
-	persistSync() {
-		const path = resolveSharesPath();
-		mkdirSync(resolveStateDir(), { recursive: true });
-		let records = [...this.shares.values()];
-		if (records.length > MAX_STORED_RECORDS) {
-			records.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
-			records = records.filter((r) => !r.revoked && Date.now() < new Date(r.expiresAt).getTime()).slice(0, TRUNCATE_TO);
-			this.shares.clear();
-			this.tokenIndex.clear();
-			for (const r of records) {
-				this.shares.set(r.id, r);
-				this.tokenIndex.set(r.token, r.id);
-			}
-		}
-		writeFileSync(path, `${JSON.stringify({
-			version: 2,
-			shares: records
-		}, null, 2)}\n`, "utf8");
-	}
-	scheduleDebouncedPersist() {
-		this.dirty = true;
-		if (this.debounceTimer) return;
-		this.debounceTimer = setTimeout(() => {
-			this.debounceTimer = null;
-			if (this.dirty) {
-				this.dirty = false;
-				this.persistSync();
-			}
-		}, COUNTER_DEBOUNCE_MS);
-		this.debounceTimer.unref?.();
-	}
 	startCleanupTimer() {
 		this.cleanupTimer = setInterval(() => {
 			this.cleanupExpired();
@@ -650,7 +620,6 @@ var ShareStore = class {
 			if (expiredMs >= 0) this.cleanupStateArtifact(record);
 			if (expiredMs > EXPIRED_RETENTION_MS) {
 				this.shares.delete(id);
-				this.tokenIndex.delete(record.token);
 				this.invalidateListingCache(id);
 				if (this.onCleanup) try {
 					this.onCleanup(record);
@@ -663,24 +632,13 @@ var ShareStore = class {
 				removed++;
 			}
 		}
-		if (removed > 0) {
-			this.persistSync();
-			log.debug({ removed }, `Cleaned ${removed} expired shares`);
-		}
+		if (removed > 0) log.debug({ removed }, `Cleaned ${removed} expired shares`);
 	}
 	shutdown() {
 		if (this.cleanupTimer) {
 			clearInterval(this.cleanupTimer);
 			this.cleanupTimer = null;
 		}
-		if (this.debounceTimer) {
-			clearTimeout(this.debounceTimer);
-			this.debounceTimer = null;
-		}
-		if (this.dirty) {
-			this.dirty = false;
-			this.persistSync();
-		}
 		this.listingCache.clear();
 	}
 	async resolveAndValidatePath(relPath, workspaceRoot) {

package/dist/src/share/share-types.d.ts

@@ -126,10 +126,6 @@ export interface CreateShareParams {
     /** Directory: walk depth cap (default 20). */
     maxDepth?: number;
 }
-export interface ShareStoreData {
-    version: 1 | 2;
-    shares: ShareRecord[];
-}
 export type ShareReachability = 'public' | 'lan' | 'local-only';
 export interface ResolvedShareUrl {
     shareUrl: string;

package/dist/src/share/site-share-store.d.ts

@@ -1,15 +1,12 @@
 import { type CreateSiteShareParams, type SiteShareConfig, type SiteShareRecord } from './site-share-types.js';
 export declare class SiteShareStore {
     private shares;
-    private byToken;
-    private bySubdomain;
     private config;
-    private dirty;
-    private debounceTimer;
     private cleanupTimer;
     /** Optional cleanup hook invoked when a record is dropped (e.g. delete staging dir). */
     private onCleanup;
     constructor(config?: Partial<SiteShareConfig>);
+    private saveNew;
     updateConfig(config: Partial<SiteShareConfig>): void;
     setCleanupHook(hook: (record: SiteShareRecord) => void): void;
     getConfig(): SiteShareConfig;
@@ -33,7 +30,7 @@ export declare class SiteShareStore {
         valid: boolean;
         reason?: string;
     };
-    /** Increment counters when a request lands. Debounced persist. */
+    /** Increment counters when a request lands. Persisted before returning. */
     recordRequest(id: string, clientIp: string): void;
     setThumbnailStatus(id: string, status: 'pending' | 'ready' | 'failed'): void;
     revoke(id: string): boolean;
@@ -43,9 +40,7 @@ export declare class SiteShareStore {
         extendTtlMs?: number;
         maxRequests?: number | null;
     }): SiteShareRecord | null;
-    private load;
-    private persistSync;
-    private scheduleDebouncedPersist;
+    private hasSubdomain;
     private startCleanupTimer;
     shutdown(): void;
 }