@powerhousedao/reactor 6.2.0-dev.9 → 6.2.0-rc.1

package/dist/index.js

@@ -1,9 +1,9 @@
-import { A as parsePagingOptions, C as DuplicateManifestError, D as DocumentDeletedError, E as ModuleNotFoundError, O as DocumentNotFoundError, S as CollectionMembershipCache, T as InvalidModuleError, _ as KyselyWriteCache, a as createForwardingPoolInstrumentation, b as createConsistencyToken, c as DuplicateOperationError, d as KyselyKeyframeStore, f as DocumentModelRegistry, g as EventBus, h as KyselyExecutionScope, i as runMigrations, j as throwIfAborted, k as matchesScope, l as OptimisticLockError, m as driveCollectionId, n as REACTOR_SCHEMA, o as instrumentPgPool, p as SimpleJobExecutor, r as getMigrationStatus, s as KyselyOperationStore, t as DEFAULT_DRIVE_CONTAINER_TYPES, u as RevisionMismatchError, v as KyselyOperationIndex, w as DuplicateModuleError, x as createEmptyConsistencyToken, y as DocumentMetaCache } from "./drive-container-types-BNpMlgT_.js";
+import { A as parsePagingOptions, C as DuplicateManifestError, D as DocumentDeletedError, E as ModuleNotFoundError, O as DocumentNotFoundError, S as CollectionMembershipCache, T as InvalidModuleError, _ as KyselyWriteCache, a as createForwardingPoolInstrumentation, b as createConsistencyToken, c as DuplicateOperationError, d as KyselyKeyframeStore, f as DocumentModelRegistry, g as EventBus, h as KyselyExecutionScope, i as runMigrations, j as throwIfAborted, k as matchesScope, l as OptimisticLockError, m as DriveCollectionId, n as REACTOR_SCHEMA, o as instrumentPgPool, p as SimpleJobExecutor, r as getMigrationStatus, s as KyselyOperationStore, t as DEFAULT_DRIVE_CONTAINER_TYPES, u as RevisionMismatchError, v as KyselyOperationIndex, w as DuplicateModuleError, x as createEmptyConsistencyToken, y as DocumentMetaCache } from "./drive-container-types-BxnXaOAp.js";
 import { n as ReactorEventTypes, t as EventBusAggregateError } from "./types-CxSpmNGK.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-B2iLRB0o.js";
+import { a as ReadModelCoordinator, i as KyselyDocumentView, n as ConsistencyTracker, o as BaseReadModel, r as makeConsistencyKey, t as KyselyDocumentIndexer } from "./document-indexer-DLEyUQxU.js";
 import { n as errorToInfo, r as sanitizeArg, t as createForwardingLogger } from "./forwarding-logger-BBkMSxuJ.js";
-import { t as workerEntryPath } from "./worker-SUoDhurA.js";
+import { t as workerEntryPath } from "./worker-XYrQaEmt.js";
 import { actions, actions as documentActions, createPresignedHeader, generateId, hashDocumentStateForScope, replayDocument } 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";
@@ -737,6 +737,14 @@ var ReactorClient = class {
 		return await this.reactor.getByIdOrSlug(identifier, view, void 0, signal);
 	}
 	/**
+	* Resolves an identifier (id or slug) to the canonical document id, using the
+	* same lookup as the data path. Resolves against the "main" branch. Throws if
+	* the identifier cannot be resolved or is ambiguous.
+	*/
+	async resolveIdOrSlug(identifier, signal) {
+		return this.documentView.resolveIdOrSlug(identifier, void 0, void 0, signal);
+	}
+	/**
 	* Retrieves operations for a document
 	*/
 	async getOperations(documentIdentifier, view, filter, paging, signal) {
@@ -1858,6 +1866,7 @@ var InMemoryJobTracker = class {
 		if (!job) {
 			this.jobs.set(jobId, {
 				id: jobId,
+				documentId: "",
 				status: JobStatus.RUNNING,
 				createdAtUtcIso: (/* @__PURE__ */ new Date()).toISOString(),
 				consistencyToken: createEmptyConsistencyToken(),
@@ -1878,6 +1887,7 @@ var InMemoryJobTracker = class {
 		if (!existing) {
 			this.jobs.set(jobId, {
 				id: jobId,
+				documentId: job?.documentId ?? "",
 				status: JobStatus.FAILED,
 				createdAtUtcIso: (/* @__PURE__ */ new Date()).toISOString(),
 				completedAtUtcIso: (/* @__PURE__ */ new Date()).toISOString(),
@@ -3295,6 +3305,20 @@ var GraphQLRequestError = class extends Error {
 		this.statusCode = statusCode;
 	}
 };
+/** Auth-rejection message fragments the switchboard emits. Shared with
+* reactor-api so server throws and this client check can't drift. */
+const DRIVE_AUTH_ERROR_MESSAGES = {
+	forbidden: "Forbidden: insufficient permissions",
+	authenticationRequired: "Forbidden: authentication required"
+};
+/** True when the remote rejected the caller as unauthenticated/unauthorized:
+* an HTTP 401/403, or a Forbidden/Unauthorized GraphQL error. */
+function isDriveAuthError(error) {
+	if (!(error instanceof GraphQLRequestError)) return false;
+	if (error.category === "http") return error.statusCode === 401 || error.statusCode === 403;
+	if (error.category === "graphql") return Object.values(DRIVE_AUTH_ERROR_MESSAGES).some((m) => error.message.includes(m));
+	return false;
+}
 var PollingChannelError = class extends Error {
 	constructor(message) {
 		super(message);
@@ -3946,7 +3970,10 @@ var GqlRequestChannel = class {
 	isPushing = false;
 	pendingDrain = false;
 	receivingPages = false;
+	isRecovering = false;
 	connectionState = "connecting";
+	/** Latest unrecoverable error was an auth rejection; cleared on connect. */
+	requiresAuth = false;
 	connectionStateCallbacks = /* @__PURE__ */ new Set();
 	constructor(logger, channelId, remoteName, cursorStorage, config, operationIndex, pollTimer) {
 		this.logger = logger;
@@ -4038,7 +4065,8 @@ var GqlRequestChannel = class {
 			lastFailureUtcMs: this.lastFailureUtcMs ?? 0,
 			pushBlocked: this.pushBlocked,
 			pushFailureCount: this.pushFailureCount,
-			receivingPages: this.receivingPages
+			receivingPages: this.receivingPages,
+			requiresAuth: this.requiresAuth
 		};
 	}
 	onConnectionStateChange(callback) {
@@ -4069,6 +4097,7 @@ var GqlRequestChannel = class {
 		this.transitionConnectionState("connected");
 	}
 	transitionConnectionState(next) {
+		if (next === "connected") this.requiresAuth = false;
 		if (this.connectionState === next) return;
 		this.connectionState = next;
 		const snapshot = this.getConnectionState();
@@ -4143,6 +4172,7 @@ var GqlRequestChannel = class {
 		this.logger.error("GqlChannel poll error (@FailureCount, @Classification): @Error", this.failureCount, classification, channelError);
 		if (classification === "unrecoverable") {
 			this.pollTimer.stop();
+			this.requiresAuth = isDriveAuthError(err);
 			this.transitionConnectionState("error");
 			return true;
 		}
@@ -4154,16 +4184,23 @@ var GqlRequestChannel = class {
 	* Self-retries with backoff instead of restarting the poll timer on failure.
 	*/
 	recoverFromChannelNotFound() {
+		if (this.isRecovering) return;
+		this.isRecovering = true;
 		this.logger.info("GqlChannel @ChannelId not found on remote, re-registering...", this.channelId);
 		this.pollTimer.stop();
 		const attemptRecovery = (attempt) => {
-			if (this.isShutdown) return;
+			if (this.isShutdown) {
+				this.isRecovering = false;
+				return;
+			}
 			this.touchRemoteChannel().then(({ ackOrdinal }) => {
 				this.logger.info("GqlChannel @ChannelId re-registered successfully", this.channelId);
+				this.isRecovering = false;
 				this.failureCount = 0;
 				if (ackOrdinal > 0) trimMailboxFromAckOrdinal(this.outbox, ackOrdinal);
 				this.pollTimer.start();
 				this.transitionConnectionState("connected");
+				this.resumePushAfterRecovery();
 			}).catch((recoveryError) => {
 				const err = recoveryError instanceof Error ? recoveryError : new Error(String(recoveryError));
 				const classification = this.classifyError(err);
@@ -4171,6 +4208,8 @@ var GqlRequestChannel = class {
 				this.failureCount++;
 				this.lastFailureUtcMs = Date.now();
 				if (classification === "unrecoverable") {
+					this.isRecovering = false;
+					this.requiresAuth = isDriveAuthError(err);
 					this.transitionConnectionState("error");
 					return;
 				}
@@ -4182,6 +4221,22 @@ var GqlRequestChannel = class {
 		attemptRecovery(1);
 	}
 	/**
+	* Resumes pushing outbox items that were blocked while the channel was being
+	* recreated. Called after a successful re-registration.
+	*/
+	resumePushAfterRecovery() {
+		if (this.isShutdown) return;
+		if (!this.pushBlocked) return;
+		if (this.pushRetryTimer) {
+			clearTimeout(this.pushRetryTimer);
+			this.pushRetryTimer = null;
+		}
+		this.pushBlocked = false;
+		this.pushFailureCount = 0;
+		const items = this.outbox.items;
+		if (items.length > 0) this.attemptPush([...items]);
+	}
+	/**
 	* Queries the remote GraphQL endpoint for sync envelopes.
 	*/
 	async pollSyncEnvelopes(ackOrdinal, latestOrdinal) {
@@ -4272,7 +4327,7 @@ var GqlRequestChannel = class {
 	async touchRemoteChannel() {
 		let sinceTimestampUtcMs = "0";
 		try {
-			const result = await this.operationIndex.getLatestTimestampForCollection(this.config.collectionId);
+			const result = await this.operationIndex.getLatestTimestampForCollection(this.config.collectionId.key);
 			if (result) sinceTimestampUtcMs = result;
 		} catch {}
 		const mutation = `
@@ -4286,7 +4341,7 @@ var GqlRequestChannel = class {
 		const variables = { input: {
 			id: this.channelId,
 			name: this.channelId,
-			collectionId: this.config.collectionId,
+			collectionId: this.config.collectionId.key,
 			filter: {
 				documentId: this.config.filter.documentId,
 				scope: this.config.filter.scope,
@@ -4317,6 +4372,12 @@ var GqlRequestChannel = class {
 			this.pendingDrain = false;
 			if (this.isShutdown) return;
 			const err = error instanceof Error ? error : new Error(String(error));
+			if (err.message.includes("Channel not found")) {
+				this.pushBlocked = true;
+				this.transitionConnectionState("reconnecting");
+				this.recoverFromChannelNotFound();
+				return;
+			}
 			if (this.classifyError(err) === "recoverable") {
 				this.pushFailureCount++;
 				this.pushBlocked = true;
@@ -4328,6 +4389,7 @@ var GqlRequestChannel = class {
 				for (const syncOp of syncOps) syncOp.failed(channelError);
 				this.deadLetter.add(...syncOps);
 				this.outbox.remove(...syncOps);
+				this.requiresAuth = isDriveAuthError(err);
 				this.transitionConnectionState("error");
 			}
 		});
@@ -4620,7 +4682,8 @@ var GqlResponseChannel = class {
 			lastFailureUtcMs: 0,
 			pushBlocked: false,
 			pushFailureCount: 0,
-			receivingPages: false
+			receivingPages: false,
+			requiresAuth: false
 		};
 	}
 	onConnectionStateChange(callback) {
@@ -4819,7 +4882,7 @@ function rowToRemoteRecord(row) {
 	return {
 		id: row.channel_id,
 		name: row.name,
-		collectionId: row.collection_id,
+		collectionId: DriveCollectionId.fromKey(row.collection_id),
 		channelConfig: {
 			type: row.channel_type,
 			parameters: row.channel_parameters ?? {}
@@ -4849,13 +4912,13 @@ function rowToRemoteRecord(row) {
 function remoteRecordToRow(remote) {
 	return {
 		name: remote.name,
-		collection_id: remote.collectionId,
+		collection_id: remote.collectionId.key,
 		channel_type: remote.channelConfig.type,
 		channel_id: remote.id,
 		remote_name: remote.name,
 		channel_parameters: remote.channelConfig.parameters,
-		filter_document_ids: remote.filter.documentId.length > 0 ? remote.filter.documentId : null,
-		filter_scopes: remote.filter.scope.length > 0 ? remote.filter.scope : null,
+		filter_document_ids: remote.filter.documentId.length > 0 ? JSON.stringify(remote.filter.documentId) : null,
+		filter_scopes: remote.filter.scope.length > 0 ? JSON.stringify(remote.filter.scope) : null,
 		filter_branch: remote.filter.branch,
 		push_state: remote.status.push.state,
 		push_last_success_utc_ms: remote.status.push.lastSuccessUtcMs ? new Date(remote.status.push.lastSuccessUtcMs).toISOString() : null,
@@ -5002,7 +5065,7 @@ var BatchAggregator = class {
 				if (!this.driveContainerTypes.has(op.context.documentType)) continue;
 				const input = action.input;
 				if (!input?.sourceId || !input.targetId) continue;
-				const collectionId = driveCollectionId(op.context.branch, input.sourceId);
+				const collectionId = DriveCollectionId.forDrive(input.sourceId, op.context.branch).key;
 				if (!(input.targetId in mergedMemberships)) mergedMemberships[input.targetId] = [];
 				if (!mergedMemberships[input.targetId].includes(collectionId)) mergedMemberships[input.targetId].push(collectionId);
 			}
@@ -5369,7 +5432,7 @@ var SyncManager = class {
 	}, options = { sinceTimestampUtcMs: "0" }, id) {
 		if (this.isShutdown) throw new Error("SyncManager is shutdown and cannot add remotes");
 		if (this.remotes.has(name)) throw new Error(`Remote with name '${name}' already exists`);
-		this.logger.debug("Adding remote (@name, @collectionId, @channelConfig, @filter, @options, @id)", name, collectionId, channelConfig, filter, options, id);
+		this.logger.debug("Adding remote (@name, @collectionId, @channelConfig, @filter, @options, @id)", name, collectionId.key, channelConfig, filter, options, id);
 		const remoteId = id ?? crypto.randomUUID();
 		const remoteRecord = {
 			id: remoteId,
@@ -5527,7 +5590,7 @@ var SyncManager = class {
 		this.logger.debug("Loaded @count persisted dead letters for remote @name", records.length, remote.name);
 	}
 	getRemotesForCollection(collectionId) {
-		return Array.from(this.remotes.values()).filter((remote) => remote.collectionId === collectionId);
+		return Array.from(this.remotes.values()).filter((remote) => remote.collectionId.key === collectionId);
 	}
 	async processCompleteBatch(batch) {
 		if (this.isShutdown) return;
@@ -5710,7 +5773,7 @@ var SyncManager = class {
 			}
 			remote.channel.outbox.add(...syncOps);
 		};
-		let page = await this.operationIndex.find(remote.collectionId, ackOrdinal, { excludeSourceRemote: remote.name }, void 0, composedSignal);
+		let page = await this.operationIndex.find(remote.collectionId.key, ackOrdinal, { excludeSourceRemote: remote.name }, void 0, composedSignal);
 		let carry = [];
 		let hasMore;
 		do {
@@ -6029,6 +6092,7 @@ var Reactor = class {
 		};
 		const jobInfo = {
 			id: jobId,
+			documentId: job.documentId,
 			status: JobStatus.PENDING,
 			createdAtUtcIso,
 			consistencyToken: {
@@ -6067,6 +6131,7 @@ var Reactor = class {
 		};
 		const jobInfo = {
 			id: jobId,
+			documentId: job.documentId,
 			status: JobStatus.PENDING,
 			createdAtUtcIso,
 			consistencyToken: {
@@ -6104,6 +6169,7 @@ var Reactor = class {
 		};
 		const jobInfo = {
 			id: jobId,
+			documentId: job.documentId,
 			status: JobStatus.PENDING,
 			createdAtUtcIso,
 			consistencyToken: {
@@ -6143,6 +6209,7 @@ var Reactor = class {
 		};
 		const jobInfo = {
 			id: jobId,
+			documentId: job.documentId,
 			status: JobStatus.PENDING,
 			createdAtUtcIso,
 			consistencyToken: {
@@ -6177,6 +6244,7 @@ var Reactor = class {
 		for (const jobPlan of request.jobs) {
 			const jobInfo = {
 				id: planKeyToJobId.get(jobPlan.key),
+				documentId: jobPlan.documentId,
 				status: JobStatus.PENDING,
 				createdAtUtcIso,
 				consistencyToken: {
@@ -6246,6 +6314,7 @@ var Reactor = class {
 		for (const jobPlan of request.jobs) {
 			const jobInfo = {
 				id: planKeyToJobId.get(jobPlan.key),
+				documentId: jobPlan.documentId,
 				status: JobStatus.PENDING,
 				createdAtUtcIso,
 				consistencyToken: {
@@ -6318,6 +6387,7 @@ var Reactor = class {
 			const now = (/* @__PURE__ */ new Date()).toISOString();
 			return Promise.resolve({
 				id: jobId,
+				documentId: "",
 				status: JobStatus.FAILED,
 				createdAtUtcIso: now,
 				completedAtUtcIso: now,
@@ -6793,7 +6863,7 @@ var ReactorBuilder = class {
 		const [{ WorkerHandle }, { createThreadTransport }, { workerEntryPath }] = await Promise.all([
 			import("./worker-handle-B1w03nRA.js"),
 			import("./transport-ByGviWdZ.js"),
-			import("./worker-SUoDhurA.js").then((n) => n.n)
+			import("./worker-XYrQaEmt.js").then((n) => n.n)
 		]);
 		const db = this.workerDbConfig;
 		const signatureVerifier = this.workerSignatureVerifierSpec;
@@ -7160,6 +7230,6 @@ var DocumentIntegrityService = class {
 	}
 };
 //#endregion
-export { BaseReadModel, ChannelError, ChannelErrorSource, ChannelScheme, ConsistencyTracker, DEFAULT_DRIVE_CONTAINER_TYPES, DefaultSubscriptionErrorHandler, DocumentChangeType, DocumentIntegrityService, DocumentModelRegistry, DocumentModelResolver, DriveClient, DuplicateManifestError, DuplicateModuleError, DuplicateOperationError, EventBus, EventBusAggregateError, GqlRequestChannel, GqlRequestChannelFactory, GqlResponseChannel, GqlResponseChannelFactory, SimpleJobExecutor as InMemoryJobExecutor, SimpleJobExecutor, InMemoryJobTracker, InMemoryQueue, IntervalPollTimer, InvalidModuleError, JobAwaiter, JobExecutorEventTypes, JobStatus, KyselyDocumentIndexer, KyselyDocumentView, KyselyKeyframeStore, KyselyOperationStore, KyselySyncCursorStorage, KyselySyncRemoteStorage, KyselyWriteCache, Mailbox, ModuleNotFoundError, NullDocumentModelResolver, OptimisticLockError, PollBehavior, PollingChannelError, ProcessorManager, PropagationMode, QueueEventTypes, REACTOR_SCHEMA, Reactor, ReactorBuilder, ReactorClient, ReactorClientBuilder, ReactorEventTypes, ReactorSubscriptionManager, ReadModelCoordinator, RelationalDbProcessor, RelationshipChangeType, RevisionMismatchError, SimpleJobExecutorManager, SyncBuilder, SyncEventTypes, SyncOperation, SyncOperationAggregateError, SyncOperationStatus, SyncStatus, SyncStatusTracker, addRelationshipAction, batchOperationsByDocument, consolidateSyncOperations, createDocumentAction, createForwardingLogger, createMutableShutdownStatus, createRelationalDb, deleteDocumentAction, documentActions, driveCollectionId, driveIdFromUrl, envelopesToSyncOperations, errorToInfo, getMigrationStatus, instrumentPgPool, makeConsistencyKey, parseDriveUrl, parsePagingOptions, removeRelationshipAction, runMigrations, sanitizeArg, trimMailboxFromAckOrdinal, updateRelationshipAction, upgradeDocumentAction, workerEntryPath };
+export { BaseReadModel, ChannelError, ChannelErrorSource, ChannelScheme, ConsistencyTracker, DEFAULT_DRIVE_CONTAINER_TYPES, DRIVE_AUTH_ERROR_MESSAGES, DefaultSubscriptionErrorHandler, DocumentChangeType, DocumentIntegrityService, DocumentModelRegistry, DocumentModelResolver, DriveClient, DriveCollectionId, DuplicateManifestError, DuplicateModuleError, DuplicateOperationError, EventBus, EventBusAggregateError, GqlRequestChannel, GqlRequestChannelFactory, GqlResponseChannel, GqlResponseChannelFactory, SimpleJobExecutor as InMemoryJobExecutor, SimpleJobExecutor, InMemoryJobTracker, InMemoryQueue, IntervalPollTimer, InvalidModuleError, JobAwaiter, JobExecutorEventTypes, JobStatus, KyselyDocumentIndexer, KyselyDocumentView, KyselyKeyframeStore, KyselyOperationStore, KyselySyncCursorStorage, KyselySyncRemoteStorage, KyselyWriteCache, Mailbox, ModuleNotFoundError, NullDocumentModelResolver, OptimisticLockError, PollBehavior, PollingChannelError, ProcessorManager, PropagationMode, QueueEventTypes, REACTOR_SCHEMA, Reactor, ReactorBuilder, ReactorClient, ReactorClientBuilder, ReactorEventTypes, ReactorSubscriptionManager, ReadModelCoordinator, RelationalDbProcessor, RelationshipChangeType, RevisionMismatchError, SimpleJobExecutorManager, SyncBuilder, SyncEventTypes, SyncOperation, SyncOperationAggregateError, SyncOperationStatus, SyncStatus, SyncStatusTracker, addRelationshipAction, batchOperationsByDocument, consolidateSyncOperations, createDocumentAction, createForwardingLogger, createMutableShutdownStatus, createRelationalDb, deleteDocumentAction, documentActions, driveIdFromUrl, envelopesToSyncOperations, errorToInfo, getMigrationStatus, instrumentPgPool, isDriveAuthError, makeConsistencyKey, parseDriveUrl, parsePagingOptions, removeRelationshipAction, runMigrations, sanitizeArg, trimMailboxFromAckOrdinal, updateRelationshipAction, upgradeDocumentAction, workerEntryPath };
 
 //# sourceMappingURL=index.js.map