@event-driven-io/emmett-postgresql 0.43.0-beta.23 → 0.43.0-beta.26

package/dist/index.cjs

@@ -865,8 +865,8 @@ const getPostgreSQLEventStore = (connectionString, options = defaultPostgreSQLOp
 			await ensureSchemaExists();
 			return streamExists(pool.execute, streamName, options);
 		},
-		consumer: (options) => postgreSQLEventStoreConsumer({
-			...options ?? {},
+		consumer: (consumerOptions) => postgreSQLEventStoreConsumer({
+			...(0, _event_driven_io_emmett.mergeObservabilityOptions)(consumerOptions ?? {}, options.observability),
 			pool,
 			connectionString
 		}),
@@ -3037,11 +3037,6 @@ const postgreSQLEventStoreMessageBatchPuller = ({ executor, batchSize, eachBatch
 		}
 	};
 };
-const zipPostgreSQLEventStoreMessageBatchPullerStartFrom = (options) => {
-	if (options.length === 0 || options.some((o) => o === void 0 || o === "BEGINNING")) return "BEGINNING";
-	if (options.every((o) => o === "END")) return "END";
-	return options.filter((o) => o !== void 0 && o !== "BEGINNING" && o !== "END").sort((a, b) => a > b ? 1 : -1)[0];
-};
 
 //#endregion
 //#region src/eventStore/consumers/postgreSQLProcessor.ts
@@ -3169,7 +3164,7 @@ const postgreSQLProjector = (options) => {
 			processorId,
 			partition
 		}),
-		checkpoints: postgreSQLCheckpointer()
+		checkpoints: options.checkpoints === "DISABLED" ? (0, _event_driven_io_emmett.inMemoryCheckpointer)() : postgreSQLCheckpointer()
 	});
 };
 const postgreSQLWorkflowProcessor = (options) => {
@@ -3204,7 +3199,7 @@ const postgreSQLWorkflowProcessor = (options) => {
 			processorId,
 			partition
 		}),
-		checkpoints: postgreSQLCheckpointer()
+		checkpoints: options.checkpoints === "DISABLED" ? (0, _event_driven_io_emmett.inMemoryCheckpointer)() : postgreSQLCheckpointer()
 	});
 };
 const postgreSQLReactor = (options) => {
@@ -3239,7 +3234,7 @@ const postgreSQLReactor = (options) => {
 			processorId,
 			partition
 		}),
-		checkpoints: postgreSQLCheckpointer()
+		checkpoints: options.checkpoints === "DISABLED" ? (0, _event_driven_io_emmett.inMemoryCheckpointer)() : postgreSQLCheckpointer()
 	});
 };
 
@@ -3259,24 +3254,6 @@ const postgreSQLEventStoreConsumer = (options) => {
 		connectionString: options.connectionString,
 		serialization: options.serialization
 	});
-	const eachBatch = async (messagesBatch) => {
-		const activeProcessors = processors.filter((s) => s.isActive);
-		if (activeProcessors.length === 0) return {
-			type: "STOP",
-			reason: "No active processors"
-		};
-		return (await Promise.allSettled(activeProcessors.map(async (s) => {
-			try {
-				return await s.handle(messagesBatch, { connection: {
-					connectionString: options.connectionString,
-					pool
-				} });
-			} catch (error) {
-				console.log(`Error during message batch processing for processor: ${s.id}`, error);
-				throw error;
-			}
-		}))).some((r) => r.status === "fulfilled" && r.value?.type !== "STOP") ? void 0 : { type: "STOP" };
-	};
 	const processorContext = {
 		execute: pool.execute,
 		connection: {
@@ -3327,18 +3304,18 @@ const postgreSQLEventStoreConsumer = (options) => {
 		whenStarted: () => startedAwaiter.wait,
 		processors,
 		init,
-		reactor: (options) => {
-			const processor = postgreSQLReactor(options);
+		reactor: (processorOptions) => {
+			const processor = postgreSQLReactor((0, _event_driven_io_emmett.mergeObservabilityOptions)(processorOptions, options.observability));
 			processors.push(processor);
 			return processor;
 		},
-		projector: (options) => {
-			const processor = postgreSQLProjector(options);
+		projector: (processorOptions) => {
+			const processor = postgreSQLProjector((0, _event_driven_io_emmett.mergeObservabilityOptions)(processorOptions, options.observability));
 			processors.push(processor);
 			return processor;
 		},
-		workflowProcessor: (options) => {
-			const processor = postgreSQLWorkflowProcessor(options);
+		workflowProcessor: (processorOptions) => {
+			const processor = postgreSQLWorkflowProcessor((0, _event_driven_io_emmett.mergeObservabilityOptions)(processorOptions, options.observability));
 			processors.push(processor);
 			return processor;
 		},
@@ -3358,6 +3335,26 @@ const postgreSQLEventStoreConsumer = (options) => {
 			abortController = new AbortController();
 			start = (async () => {
 				if (!isRunning) return;
+				let startPositions = void 0;
+				const eachBatch = async (messagesBatch) => {
+					const activeProcessors = processors.filter((s) => s.isActive);
+					if (activeProcessors.length === 0) return {
+						type: "STOP",
+						reason: "No active processors"
+					};
+					return (await Promise.allSettled(activeProcessors.map(async (s) => {
+						const batch = startPositions.afterStartPosition(s.id, messagesBatch);
+						try {
+							return await s.handle(batch, { connection: {
+								connectionString: options.connectionString,
+								pool
+							} });
+						} catch (error) {
+							console.log(`Error during message batch processing for processor: ${s.id}`, error);
+							throw error;
+						}
+					}))).some((r) => r.status === "fulfilled" && r.value?.type !== "STOP") ? void 0 : { type: "STOP" };
+				};
 				try {
 					messagePuller = postgreSQLEventStoreMessageBatchPuller({
 						stopWhen: options.stopWhen,
@@ -3371,23 +3368,23 @@ const postgreSQLEventStoreConsumer = (options) => {
 						console.log("Initializing consumer before starting message pulling.");
 						await init();
 					}
-					const startFrom = zipPostgreSQLEventStoreMessageBatchPullerStartFrom(await Promise.all(processors.map(async (o) => {
-						try {
-							return await o.start({
-								execute: pool.execute,
-								connection: {
-									connectionString: options.connectionString,
-									pool
-								}
-							});
-						} catch (error) {
-							console.log(`Error during processor start position retrieval for processor: ${o.id}. Stopping it.`, error);
-							throw error;
+					startPositions = await pool.withConnection((connection) => _event_driven_io_emmett.ConsumerStartPositions.resolve({
+						processors,
+						handlerContext: {
+							execute: pool.execute,
+							connection: {
+								connectionString: options.connectionString,
+								pool
+							}
+						},
+						readLastMessageCheckpoint: async () => {
+							const { currentCheckpoint } = await readLastMessageCheckpoint(connection.execute);
+							return currentCheckpoint !== null ? PostgreSQLEventStoreCheckpoint.toProcessorCheckpoint(currentCheckpoint) : null;
 						}
-					})));
-					console.log(`Starting message pulling with start position: ${_event_driven_io_dumbo.JSONSerializer.serialize(startFrom)}. Waiting for messages...`);
+					}));
+					console.log(`Starting message pulling with start position: ${_event_driven_io_dumbo.JSONSerializer.serialize(startPositions.earliestPosition)}. Waiting for messages...`);
 					await messagePuller.start({
-						startFrom,
+						startFrom: startPositions.earliestPosition,
 						started: startedAwaiter
 					});
 				} catch (error) {
@@ -3527,5 +3524,4 @@ exports.toProjectionLockKey = toProjectionLockKey;
 exports.transactionToPostgreSQLProjectionHandlerContext = transactionToPostgreSQLProjectionHandlerContext;
 exports.tryAcquireProcessorLockSQL = tryAcquireProcessorLockSQL;
 exports.tryAcquireProjectionLockSQL = tryAcquireProjectionLockSQL;
-exports.zipPostgreSQLEventStoreMessageBatchPullerStartFrom = zipPostgreSQLEventStoreMessageBatchPullerStartFrom;
 //# sourceMappingURL=index.cjs.map