@powerhousedao/reactor 6.2.1-dev.1 → 6.2.1

package/dist/index.js

@@ -1,13 +1,13 @@
-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-BuFNr0j0.js";
-import { n as ReactorEventTypes, t as EventBusAggregateError } from "./types-DMKLa0Ok.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-B6iippzG.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-Dzrw1YMV.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";
-import { ConsoleLogger, childLogger } from "document-model";
+import { ConsoleLogger } from "document-model";
 import { sql } from "kysely";
 import { RelationalDbProcessor, createRelationalDb } from "@powerhousedao/shared/processors";
 //#region src/actions/index.ts
@@ -2696,8 +2696,6 @@ var DocumentModelResolver = class {
 	loadingModels = /* @__PURE__ */ new Map();
 	failedModelTypes = /* @__PURE__ */ new Set();
 	broadcastHook = null;
-	modelLoadedHook = null;
-	logger = childLogger(["reactor", "document-model-resolver"]);
 	constructor(registry, loader) {
 		this.registry = registry;
 		this.loader = loader;
@@ -2710,13 +2708,6 @@ var DocumentModelResolver = class {
 	setBroadcastHook(hook) {
 		this.broadcastHook = hook;
 	}
-	/**
-	* Post-success hook called with the document type after a model loads, so
-	* peers (tabs) can load the same type via the event bus.
-	*/
-	setModelLoadedHook(hook) {
-		this.modelLoadedHook = hook;
-	}
 	async ensureModelLoaded(documentType) {
 		try {
 			this.registry.getModule(documentType);
@@ -2729,32 +2720,20 @@ var DocumentModelResolver = class {
 		if (existing) return existing;
 		const loadPromise = (async () => {
 			try {
-				await this.loadRegisterAndBroadcast(documentType);
+				const module = await this.loader.load(documentType);
+				const [result] = this.registry.registerModules(module);
+				if (result.status === "error" && !DuplicateModuleError.isError(result.error)) throw result.error;
+				await this.broadcastIfPossible(documentType);
 			} catch (error) {
 				this.failedModelTypes.add(documentType);
 				throw error;
 			} finally {
 				this.loadingModels.delete(documentType);
 			}
-			await this.notifyPeersModelLoaded(documentType);
 		})();
 		this.loadingModels.set(documentType, loadPromise);
 		return loadPromise;
 	}
-	async loadRegisterAndBroadcast(documentType) {
-		const module = await this.loader.load(documentType);
-		const [result] = this.registry.registerModules(module);
-		if (result.status === "error" && !DuplicateModuleError.isError(result.error)) throw result.error;
-		await this.broadcastIfPossible(documentType);
-	}
-	async notifyPeersModelLoaded(documentType) {
-		if (!this.modelLoadedHook) return;
-		try {
-			await this.modelLoadedHook(documentType);
-		} catch (error) {
-			this.logger.warn(`MODEL_LOADED hook failed: ${documentType}`, error);
-		}
-	}
 	async broadcastIfPossible(documentType) {
 		if (!this.broadcastHook || !this.loader.resolveSpec) return;
 		const entry = await this.loader.resolveSpec(documentType);
@@ -4930,11 +4909,6 @@ function rowToRemoteRecord(row) {
 		}
 	};
 }
-/**
-* Maps a RemoteRecord to a row. jsonb array columns are JSON-encoded because the
-* pg driver would otherwise emit a Postgres array literal ("{a,b}"), which jsonb
-* rejects (matches sync-dead-letter-storage).
-*/
 function remoteRecordToRow(remote) {
 	return {
 		name: remote.name,
@@ -5381,14 +5355,11 @@ var SyncManager = class {
 		for (const record of remoteRecords) {
 			const channel = this.channelFactory.instance(record.id, record.name, record.channelConfig, this.cursorStorage, record.collectionId, record.filter, this.operationIndex, record.options);
 			const remote = {
-				meta: {
-					id: record.id,
-					name: record.name,
-					collectionId: record.collectionId,
-					channelConfig: record.channelConfig,
-					filter: record.filter,
-					options: record.options
-				},
+				id: record.id,
+				name: record.name,
+				collectionId: record.collectionId,
+				filter: record.filter,
+				options: record.options,
 				channel
 			};
 			this.remotes.set(record.name, remote);
@@ -5407,7 +5378,7 @@ var SyncManager = class {
 				this.backfillAbortControllers.set(record.name, backfillController);
 				this.updateOutbox(remote, outboxAckOrdinal, OutboxMode.Backfill, backfillController.signal).catch((error) => {
 					if (backfillController.signal.aborted) return;
-					this.logger.error("Backfill failed for remote @RemoteName: @Error", remote.meta.name, error instanceof Error ? error : new Error(String(error)));
+					this.logger.error("Backfill failed for remote @RemoteName: @Error", remote.name, error instanceof Error ? error : new Error(String(error)));
 				}).finally(() => {
 					this.backfillAbortControllers.delete(record.name);
 				});
@@ -5451,7 +5422,7 @@ var SyncManager = class {
 		return remote;
 	}
 	getById(id) {
-		for (const remote of this.remotes.values()) if (remote.meta.id === id) return remote;
+		for (const remote of this.remotes.values()) if (remote.id === id) return remote;
 		throw new Error(`Remote with id '${id}' does not exist`);
 	}
 	async add(name, collectionId, channelConfig, filter = {
@@ -5478,14 +5449,11 @@ var SyncManager = class {
 		await this.remoteStorage.upsert(remoteRecord);
 		const channel = this.channelFactory.instance(remoteId, name, channelConfig, this.cursorStorage, collectionId, filter, this.operationIndex, options);
 		const remote = {
-			meta: {
-				id: remoteId,
-				name,
-				collectionId,
-				channelConfig,
-				filter,
-				options
-			},
+			id: remoteId,
+			name,
+			collectionId,
+			filter,
+			options,
 			channel
 		};
 		this.remotes.set(name, remote);
@@ -5502,7 +5470,7 @@ var SyncManager = class {
 		this.backfillAbortControllers.set(name, backfillController);
 		this.updateOutbox(remote, 0, OutboxMode.Backfill, backfillController.signal).catch((error) => {
 			if (backfillController.signal.aborted) return;
-			this.logger.error("Backfill failed for remote @RemoteName: @Error", remote.meta.name, error instanceof Error ? error : new Error(String(error)));
+			this.logger.error("Backfill failed for remote @RemoteName: @Error", remote.name, error instanceof Error ? error : new Error(String(error)));
 		}).finally(() => {
 			this.backfillAbortControllers.delete(name);
 		});
@@ -5553,20 +5521,20 @@ var SyncManager = class {
 	}
 	wireChannelCallbacks(remote) {
 		remote.channel.inbox.onAdded((syncOps) => this.handleInboxAdded(remote, syncOps));
-		this.syncStatusTracker.trackRemote(remote.meta.name, remote.channel);
+		this.syncStatusTracker.trackRemote(remote.name, remote.channel);
 		const unsubscribe = remote.channel.onConnectionStateChange((snapshot) => {
 			this.eventBus.emit(SyncEventTypes.CONNECTION_STATE_CHANGED, {
-				remoteName: remote.meta.name,
-				remoteId: remote.meta.id,
+				remoteName: remote.name,
+				remoteId: remote.id,
 				previous: snapshot.state,
 				current: snapshot.state,
 				snapshot
 			}).catch(() => {});
 		});
-		this.connectionStateUnsubscribes.set(remote.meta.name, unsubscribe);
+		this.connectionStateUnsubscribes.set(remote.name, unsubscribe);
 		remote.channel.deadLetter.onAdded((syncOps) => {
 			for (const syncOp of syncOps) {
-				this.logger.error("Dead letter (@remote, @documentId, @jobId, @error, @dependencies)", remote.meta.name, syncOp.documentId, syncOp.jobId, syncOp.error?.message ?? "unknown", syncOp.jobDependencies);
+				this.logger.error("Dead letter (@remote, @documentId, @jobId, @error, @dependencies)", remote.name, syncOp.documentId, syncOp.jobId, syncOp.error?.message ?? "unknown", syncOp.jobDependencies);
 				this.quarantinedDocumentIds.add(syncOp.documentId);
 				const record = {
 					id: syncOp.id,
@@ -5602,12 +5570,12 @@ var SyncManager = class {
 	async loadDeadLetters(remote) {
 		let records;
 		try {
-			records = (await this.deadLetterStorage.list(remote.meta.name, {
+			records = (await this.deadLetterStorage.list(remote.name, {
 				cursor: "0",
 				limit: this.config.maxDeadLettersPerRemote
 			})).results;
 		} catch (error) {
-			this.logger.error("Failed to load dead letters for remote (@name, @error)", remote.meta.name, error instanceof Error ? error.message : String(error));
+			this.logger.error("Failed to load dead letters for remote (@name, @error)", remote.name, error instanceof Error ? error.message : String(error));
 			return;
 		}
 		if (records.length === 0) return;
@@ -5619,10 +5587,10 @@ var SyncManager = class {
 			syncOps.push(syncOp);
 		}
 		remote.channel.deadLetter.add(...syncOps);
-		this.logger.debug("Loaded @count persisted dead letters for remote @name", records.length, remote.meta.name);
+		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.meta.collectionId.key === collectionId);
+		return Array.from(this.remotes.values()).filter((remote) => remote.collectionId.key === collectionId);
 	}
 	async processCompleteBatch(batch) {
 		if (this.isShutdown) return;
@@ -5668,11 +5636,11 @@ var SyncManager = class {
 		const operations = syncOp.operations.map((op) => op.operation);
 		let jobInfo;
 		try {
-			jobInfo = await this.reactor.load(syncOp.documentId, syncOp.branch, operations, this.abortController.signal, { sourceRemote: remote.meta.name });
+			jobInfo = await this.reactor.load(syncOp.documentId, syncOp.branch, operations, this.abortController.signal, { sourceRemote: remote.name });
 		} catch (error) {
 			if (this.isShutdown) return;
 			const err = error instanceof Error ? error : new Error(String(error));
-			this.logger.error("Failed to load operations from inbox (@remote, @documentId, @error)", remote.meta.name, syncOp.documentId, err.message);
+			this.logger.error("Failed to load operations from inbox (@remote, @documentId, @error)", remote.name, syncOp.documentId, err.message);
 			const channelError = new ChannelError(ChannelErrorSource.Inbox, err);
 			syncOp.failed(channelError);
 			remote.channel.deadLetter.add(syncOp);
@@ -5685,7 +5653,7 @@ var SyncManager = class {
 		} catch (error) {
 			if (this.isShutdown) return;
 			const err = error instanceof Error ? error : new Error(String(error));
-			this.logger.error("Failed to wait for job completion (@remote, @documentId, @jobId, @error)", remote.meta.name, syncOp.documentId, jobInfo.id, err.message);
+			this.logger.error("Failed to wait for job completion (@remote, @documentId, @jobId, @error)", remote.name, syncOp.documentId, jobInfo.id, err.message);
 			const channelError = new ChannelError(ChannelErrorSource.Inbox, err);
 			syncOp.failed(channelError);
 			remote.channel.deadLetter.add(syncOp);
@@ -5695,7 +5663,7 @@ var SyncManager = class {
 		if (this.isShutdown) return;
 		if (completedJobInfo.status === JobStatus.FAILED) {
 			const errorMessage = completedJobInfo.error?.message || "Unknown error";
-			this.logger.error("Failed to apply operations from inbox (@remote, @documentId, @jobId, @error)", remote.meta.name, syncOp.documentId, completedJobInfo.id, errorMessage);
+			this.logger.error("Failed to apply operations from inbox (@remote, @documentId, @jobId, @error)", remote.name, syncOp.documentId, completedJobInfo.id, errorMessage);
 			const error = new ChannelError(ChannelErrorSource.Inbox, /* @__PURE__ */ new Error(`Failed to apply operations: ${errorMessage}`));
 			syncOp.failed(error);
 			remote.channel.deadLetter.add(syncOp);
@@ -5703,7 +5671,7 @@ var SyncManager = class {
 		remote.channel.inbox.remove(syncOp);
 	}
 	async applyInboxBatch(items) {
-		const sourceRemote = items[0].remote.meta.name;
+		const sourceRemote = items[0].remote.name;
 		const chunkKeys = new Set(items.map(({ syncOp }) => syncOp.jobId));
 		const jobs = items.map(({ syncOp }) => {
 			const dependsOn = [];
@@ -5753,7 +5721,7 @@ var SyncManager = class {
 		}
 		for (const { remote, syncOp } of items) {
 			if (!(syncOp.jobId in result.jobs)) {
-				this.logger.error("Job key missing from batch load result (@remote, @documentId, @jobId)", remote.meta.name, syncOp.documentId, syncOp.jobId);
+				this.logger.error("Job key missing from batch load result (@remote, @documentId, @jobId)", remote.name, syncOp.documentId, syncOp.jobId);
 				const error = new ChannelError(ChannelErrorSource.Inbox, /* @__PURE__ */ new Error(`Job key '${syncOp.jobId}' missing from batch load result`));
 				syncOp.failed(error);
 				remote.channel.deadLetter.add(syncOp);
@@ -5787,7 +5755,7 @@ var SyncManager = class {
 		let maxOrdinal = ackOrdinal;
 		const lastJobByDoc = /* @__PURE__ */ new Map();
 		let prevChainJobId;
-		const sinceTimestamp = remote.meta.options.sinceTimestampUtcMs;
+		const sinceTimestamp = remote.options.sinceTimestampUtcMs;
 		const emitBatches = (operations) => {
 			if (operations.length === 0) return;
 			const batches = batchOperationsByDocument(operations);
@@ -5798,14 +5766,14 @@ var SyncManager = class {
 				const deps = [];
 				if (prevJobId) deps.push(prevJobId);
 				if (mode === OutboxMode.BatchTriggered && prevChainJobId && prevChainJobId !== prevJobId) deps.push(prevChainJobId);
-				const syncOp = new SyncOperation(crypto.randomUUID(), jobId, deps, remote.meta.name, batch.documentId, [batch.scope], batch.branch, batch.operations);
+				const syncOp = new SyncOperation(crypto.randomUUID(), jobId, deps, remote.name, batch.documentId, [batch.scope], batch.branch, batch.operations);
 				syncOps.push(syncOp);
 				lastJobByDoc.set(batch.documentId, jobId);
 				if (mode === OutboxMode.BatchTriggered) prevChainJobId = jobId;
 			}
 			remote.channel.outbox.add(...syncOps);
 		};
-		let page = await this.operationIndex.find(remote.meta.collectionId.key, ackOrdinal, { excludeSourceRemote: remote.meta.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 {
@@ -5817,7 +5785,7 @@ var SyncManager = class {
 				carry = [];
 			}
 			if (sinceTimestamp && sinceTimestamp !== "0") operations = operations.filter((op) => op.operation.timestampUtcMs >= sinceTimestamp);
-			operations = filterOperations(operations, remote.meta.filter);
+			operations = filterOperations(operations, remote.filter);
 			operations = operations.filter((op) => !this.quarantinedDocumentIds.has(op.context.documentId));
 			hasMore = !!page.next;
 			if (operations.length > 0) {
@@ -6747,7 +6715,6 @@ var ReactorBuilder = class {
 		const keyframeStore = new KyselyKeyframeStore(database);
 		const eventBus = this.eventBus || new EventBus();
 		const resolver = this.documentModelLoader ? new DocumentModelResolver(documentModelRegistry, this.documentModelLoader) : new NullDocumentModelResolver(documentModelRegistry);
-		if (resolver instanceof DocumentModelResolver) resolver.setModelLoadedHook((documentType) => eventBus.emit(ReactorEventTypes.MODEL_LOADED, { documentType }));
 		const queue = this.queueInstance ?? new InMemoryQueue(eventBus, resolver);
 		const jobTracker = new InMemoryJobTracker(eventBus);
 		const writeCache = new KyselyWriteCache(keyframeStore, operationStore, documentModelRegistry, {
@@ -6863,7 +6830,7 @@ var ReactorBuilder = class {
 			poolInstrumentations.push(forwarder);
 			this.instrumentedPools.push(forwarder);
 		}
-		const { ProjectionShardManager } = await import("./projection-shard-manager-BnQKFqQd.js");
+		const { ProjectionShardManager } = await import("./projection-shard-manager-_c7orNo5.js");
 		const manager = new ProjectionShardManager({
 			shardCount: config.shardCount,
 			db,
@@ -6896,7 +6863,7 @@ var ReactorBuilder = class {
 		const [{ WorkerHandle }, { createThreadTransport }, { workerEntryPath }] = await Promise.all([
 			import("./worker-handle-B1w03nRA.js"),
 			import("./transport-ByGviWdZ.js"),
-			import("./worker-Dzrw1YMV.js").then((n) => n.n)
+			import("./worker-XYrQaEmt.js").then((n) => n.n)
 		]);
 		const db = this.workerDbConfig;
 		const signatureVerifier = this.workerSignatureVerifierSpec;