@powerhousedao/reactor 6.2.2-dev.42 → 6.2.2-dev.43

package/dist/index.js

@@ -1,10 +1,10 @@
-import { A as OptimisticLockError, B as ExcessiveReshuffleError, C as DocumentMetaCache, D as APPEND_CONDITION_FAILED_PREFIX, E as CollectionMembershipCache, F as ModuleNotFoundError, H as matchesScope, I as AuthTimestampNotMonotonicError, L as AuthorizationDeniedError, M as DuplicateManifestError, N as DuplicateModuleError, O as AppendConditionFailedError, P as InvalidModuleError, R as DocumentDeletedError, S as KyselyOperationIndex, T as createEmptyConsistencyToken, U as parsePagingOptions, V as InvalidOperationTimestampError, W as throwIfAborted, _ as KyselyExecutionScope, a as createForwardingPoolInstrumentation, b as EventBus, c as KyselyKeyframeStore, d as DriveCollectionId, f as decideAtHead, g as authDecisionModel, h as buildDecisionModel, i as runMigrations, j as RevisionMismatchError, k as DuplicateOperationError, l as DocumentModelRegistry, m as documentDecisionModel, n as REACTOR_SCHEMA, o as instrumentPgPool, p as selectDecisionModel, r as getMigrationStatus, s as KyselyOperationStore, t as DEFAULT_DRIVE_CONTAINER_TYPES, u as SimpleJobExecutor, v as FLAG_PREREQUISITES, w as createConsistencyToken, x as KyselyWriteCache, y as validateFeatureFlags, z as DocumentNotFoundError } from "./drive-container-types-BJCKXJwH.js";
+import { A as OptimisticLockError, B as ExcessiveReshuffleError, C as DocumentMetaCache, D as APPEND_CONDITION_FAILED_PREFIX, E as CollectionMembershipCache, F as ModuleNotFoundError, G as throwIfAborted, H as UpgradePreconditionFailedError, I as AuthTimestampNotMonotonicError, L as AuthorizationDeniedError, M as DuplicateManifestError, N as DuplicateModuleError, O as AppendConditionFailedError, P as InvalidModuleError, R as DocumentDeletedError, S as KyselyOperationIndex, T as createEmptyConsistencyToken, U as matchesScope, V as InvalidOperationTimestampError, W as parsePagingOptions, _ as KyselyExecutionScope, a as createForwardingPoolInstrumentation, b as EventBus, c as KyselyKeyframeStore, d as DriveCollectionId, f as decideAtHead, g as authDecisionModel, h as buildDecisionModel, i as runMigrations, j as RevisionMismatchError, k as DuplicateOperationError, l as DocumentModelRegistry, m as documentDecisionModel, n as REACTOR_SCHEMA, o as instrumentPgPool, p as selectDecisionModel, r as getMigrationStatus, s as KyselyOperationStore, t as DEFAULT_DRIVE_CONTAINER_TYPES, u as SimpleJobExecutor, v as FLAG_PREREQUISITES, w as createConsistencyToken, x as KyselyWriteCache, y as validateFeatureFlags, z as DocumentNotFoundError } from "./drive-container-types-CU1ZUfD1.js";
 import { n as ReactorEventTypes, t as EventBusAggregateError } from "./types-DMKLa0Ok.js";
 import { i as WorkerInitFailedError, r as WorkerExitedError, t as WorkerAbortTimeoutError } from "./errors-D3S6Eysd.js";
-import { a as ReadModelCoordinator, i as KyselyDocumentView, n as ConsistencyTracker, o as BaseReadModel, r as makeConsistencyKey, t as KyselyDocumentIndexer } from "./document-indexer-C0GB0b8Q.js";
+import { a as ReadModelCoordinator, i as KyselyDocumentView, n as ConsistencyTracker, o as BaseReadModel, r as makeConsistencyKey, t as KyselyDocumentIndexer } from "./document-indexer-BfdCgjG-.js";
 import { n as errorToInfo, r as sanitizeArg, t as createForwardingLogger } from "./forwarding-logger-BBkMSxuJ.js";
-import { t as workerEntryPath } from "./worker-jEJW6_j7.js";
-import { actions, actions as documentActions, createPresignedHeader, decide, garbageCollect, generateId, hashDocumentStateForScope, replayDocument, sortOperations } from "@powerhousedao/shared/document-model";
+import { t as workerEntryPath } from "./worker-CeW6WsVF.js";
+import { DowngradeNotSupportedError, UnsupportedDocumentModelVersionError, actions, actions as documentActions, createPresignedHeader, decide, garbageCollect, generateId, hashDocumentStateForScope, normalizeDocumentModelVersion, sortOperations } from "@powerhousedao/shared/document-model";
 import { addFile, addFolder, copyNode, deleteNode, driveCreateDocument, generateNodesCopy, getDescendants, handleTargetNameCollisions, isFileNode, isFolderNode, moveNode, updateNode } from "@powerhousedao/shared/document-drive";
 import { v4 } from "uuid";
 import { ConsoleLogger, childLogger } from "document-model";
@@ -365,7 +365,7 @@ var DriveClient = class {
 				documentId: document.header.id,
 				model: document.header.documentType,
 				fromVersion: 0,
-				toVersion: 1,
+				toVersion: normalizeDocumentModelVersion(document.state.document?.version),
 				initialState: document.state
 			}),
 			addRelationshipAction(driveIdentifier, documentId, "child")
@@ -470,8 +470,12 @@ var DriveClient = class {
 			const node = drive.state.global.nodes.find((n) => n.id === entry.srcId);
 			if (!node || !isFileNode(node)) continue;
 			const srcDoc = await this.client.get(entry.srcId, void 0, signal);
-			const module = await this.client.getDocumentModelModule(srcDoc.header.documentType);
-			const duplicated = replayDocument(srcDoc.initialState, srcDoc.operations, module.reducer, createPresignedHeader(entry.targetId, srcDoc.header.documentType));
+			const duplicated = {
+				...srcDoc,
+				header: createPresignedHeader(entry.targetId, srcDoc.header.documentType),
+				initialState: srcDoc.state,
+				operations: {}
+			};
 			const resolvedName = resolvedNamesByTargetId.get(entry.targetId);
 			if (resolvedName) duplicated.header.name = resolvedName;
 			await this.addFile(driveIdentifier, duplicated, entry.targetParentFolder ?? void 0, signal);
@@ -769,9 +773,37 @@ var ReactorClient = class {
 	* @returns The document model module
 	*/
 	async getDocumentModelModule(documentType) {
-		const module = (await this.reactor.getDocumentModels()).results.find((m) => m.documentModel.global.id === documentType);
-		if (!module) throw new Error(`Document model module not found for type: ${documentType}`);
-		return module;
+		const modules = await this.reactor.getDocumentModels();
+		let latestModule;
+		let latestVersion = -1;
+		for (const module of modules.results) {
+			if (module.documentModel.global.id !== documentType) continue;
+			const version = module.version ?? 1;
+			if (version > latestVersion) {
+				latestVersion = version;
+				latestModule = module;
+			}
+		}
+		if (!latestModule) throw new Error(`Document model module not found for type: ${documentType}`);
+		return latestModule;
+	}
+	/**
+	* Retrieves the document model module matching the version the document is
+	* stamped with, so not-yet-upgraded documents get the reducer their
+	* history was written with rather than the latest.
+	*/
+	async getDocumentModelModuleForDocument(document) {
+		const documentType = document.header.documentType;
+		const version = normalizeDocumentModelVersion(document.state.document?.version);
+		const modules = await this.reactor.getDocumentModels();
+		const availableVersions = [];
+		for (const module of modules.results) {
+			if (module.documentModel.global.id !== documentType) continue;
+			const moduleVersion = normalizeDocumentModelVersion(module.version);
+			if (moduleVersion === version) return module;
+			availableVersions.push(moduleVersion);
+		}
+		throw new UnsupportedDocumentModelVersionError(documentType, version, availableVersions.sort((a, b) => a - b));
 	}
 	/**
 	* Retrieves a specific PHDocument
@@ -925,7 +957,7 @@ var ReactorClient = class {
 			documentId,
 			model: document.header.documentType,
 			fromVersion: 0,
-			toVersion: document.state.document.version,
+			toVersion: normalizeDocumentModelVersion(document.state.document?.version),
 			initialState: document.state
 		})], this.signer, signal);
 		const jobs = [{
@@ -960,20 +992,61 @@ var ReactorClient = class {
 		const matchingModules = (await this.reactor.getDocumentModels(void 0, void 0, signal)).results.filter((m) => m.documentModel.global.id === documentModelType);
 		let module;
 		if (options?.documentModelVersion !== void 0) {
-			module = matchingModules.find((m) => m.version === options.documentModelVersion);
+			const requestedVersion = normalizeDocumentModelVersion(options.documentModelVersion);
+			module = matchingModules.find((m) => normalizeDocumentModelVersion(m.version) === requestedVersion);
 			if (!module) throw new Error(`Document model not found for type: ${documentModelType} with version: ${options.documentModelVersion}`);
 		} else {
 			module = matchingModules.reduce((latest, current) => {
 				if (latest === void 0) return current;
-				return (current.version ?? 0) > (latest.version ?? 0) ? current : latest;
+				return normalizeDocumentModelVersion(current.version) > normalizeDocumentModelVersion(latest.version) ? current : latest;
 			}, void 0);
 			if (!module) throw new Error(`Document model not found for type: ${documentModelType}`);
 		}
 		const document = module.utils.createDocument();
-		document.state.document.version = module.version ?? 1;
+		document.state.document.version = normalizeDocumentModelVersion(module.version);
 		return this.create(document, options?.parentIdentifier, signal);
 	}
 	/**
+	* Upgrades a document to a newer document model version by dispatching an
+	* UPGRADE_DOCUMENT action. When toVersion is omitted, upgrades to the
+	* latest registered module version for the document's type. Returns the
+	* document unchanged when it is already at the target version.
+	*
+	* The executor validates the action's version and revision snapshot against
+	* the state the migration actually runs on. When a concurrent edit
+	* invalidates the snapshot, the upgrade is rebuilt from a fresh read and
+	* retried up to maxConflictRetries times before the conflict is surfaced.
+	*/
+	async upgradeDocument(documentIdentifier, toVersion, options, signal) {
+		this.logger.verbose("upgradeDocument(@documentIdentifier, @toVersion)", documentIdentifier, toVersion);
+		const maxConflictRetries = options?.maxConflictRetries ?? 3;
+		let lastConflictMessage = "";
+		for (let attempt = 0; attempt <= maxConflictRetries; attempt++) {
+			const document = await this.reactor.getByIdOrSlug(documentIdentifier, void 0, void 0, signal);
+			const documentId = document.header.id;
+			const documentType = document.header.documentType;
+			const branch = document.header.branch || "main";
+			const fromVersion = normalizeDocumentModelVersion(document.state.document?.version);
+			let targetVersion = toVersion;
+			if (targetVersion === void 0) targetVersion = normalizeDocumentModelVersion((await this.getDocumentModelModule(documentType)).version);
+			if (targetVersion === fromVersion) return document;
+			if (targetVersion < fromVersion) throw new DowngradeNotSupportedError(documentType, fromVersion, targetVersion);
+			const signedActions = await signActions([upgradeDocumentAction({
+				documentId,
+				model: documentType,
+				fromVersion,
+				toVersion: targetVersion,
+				revision: { ...document.header.revision }
+			})], this.signer, signal);
+			const jobInfo = await this.reactor.execute(documentId, branch, signedActions, signal);
+			const completedJob = await this.waitForJob(jobInfo, signal);
+			if (completedJob.status !== JobStatus.FAILED) return await this.reactor.getByIdOrSlug(documentId, { branch }, completedJob.consistencyToken, signal);
+			if (completedJob.error?.name !== "UpgradePreconditionFailedError") throw new Error(completedJob.error?.message);
+			lastConflictMessage = completedJob.error.message;
+		}
+		throw new Error(`Upgrade of document ${documentIdentifier} conflicted with concurrent edits after ${maxConflictRetries + 1} attempts: ${lastConflictMessage}`);
+	}
+	/**
 	* Creates an empty document in a drive as a single batched operation.
 	* Delegates to {@link IDriveClient.addFile}.
 	*
@@ -1274,7 +1347,7 @@ var JobResultHandler = class {
 			callbacks.deferJob(handle.job.documentId, handle.job);
 			return;
 		}
-		if (result.error && (DocumentDeletedError.isError(result.error) || AuthorizationDeniedError.isError(result.error) || AuthTimestampNotMonotonicError.isError(result.error) || InvalidOperationTimestampError.isError(result.error) || ExcessiveReshuffleError.isError(result.error))) {
+		if (result.error && (DocumentDeletedError.isError(result.error) || AuthorizationDeniedError.isError(result.error) || AuthTimestampNotMonotonicError.isError(result.error) || InvalidOperationTimestampError.isError(result.error) || ExcessiveReshuffleError.isError(result.error) || UpgradePreconditionFailedError.isError(result.error))) {
 			const errorInfo = toErrorInfo(result.error);
 			this.jobTracker.markFailed(handle.job.id, errorInfo, handle.job);
 			this.eventBus.emit(ReactorEventTypes.JOB_FAILED, {
@@ -2668,9 +2741,11 @@ var InMemoryQueue = class {
 		this.jobIndex.delete(jobId);
 		this.completedJobs.add(jobId);
 		await this.remove(jobId);
+		const emittedError = new Error(error?.message ?? "Job failed");
+		if (error?.name) emittedError.name = error.name;
 		this.eventBus.emit(ReactorEventTypes.JOB_FAILED, {
 			jobId,
-			error: new Error(error?.message ?? "Job failed"),
+			error: emittedError,
 			job
 		}).catch(() => {});
 		this.checkDrained();
@@ -6385,7 +6460,7 @@ var Reactor = class {
 			documentId: document.header.id,
 			model: document.header.documentType,
 			fromVersion: 0,
-			toVersion: document.state.document.version,
+			toVersion: normalizeDocumentModelVersion(document.state.document?.version),
 			initialState: document.state
 		})];
 		if (signer) actions = await signActions(actions, signer, signal);
@@ -7162,7 +7237,7 @@ var ReactorBuilder = class {
 		const [{ WorkerHandle }, { createThreadTransport }, { workerEntryPath }] = await Promise.all([
 			import("./worker-handle-CrERzl8s.js"),
 			import("./transport-ByGviWdZ.js"),
-			import("./worker-jEJW6_j7.js").then((n) => n.n)
+			import("./worker-CeW6WsVF.js").then((n) => n.n)
 		]);
 		const poolConfig = {
 			enabled: true,