@event-driven-io/emmett-esdb 0.43.0-beta.11 → 0.43.0-beta.13

package/dist/index.js

@@ -719,7 +719,40 @@ var reactor = (options) => {
     canHandle,
     stopAfter
   } = options;
-  const eachMessage = "eachMessage" in options && options.eachMessage ? options.eachMessage : () => Promise.resolve();
+  const isCustomBatch = "eachBatch" in options && !!options.eachBatch;
+  const eachBatch = isCustomBatch ? options.eachBatch : async (messages, context) => {
+    let result = void 0;
+    for (let i = 0; i < messages.length; i++) {
+      const message2 = messages[i];
+      const messageProcessingResult = await options.eachMessage(
+        message2,
+        context
+      );
+      if (messageProcessingResult && messageProcessingResult.type === "STOP") {
+        result = {
+          ...messageProcessingResult,
+          lastSuccessfulMessage: messageProcessingResult.error ? messages[i - 1] : message2
+        };
+        break;
+      }
+      if (stopAfter && stopAfter(message2)) {
+        result = {
+          type: "STOP",
+          reason: "Stop condition reached",
+          lastSuccessfulMessage: message2
+        };
+        break;
+      }
+      if (messageProcessingResult && messageProcessingResult.type === "SKIP") {
+        result = {
+          ...messageProcessingResult,
+          lastSuccessfulMessage: message2
+        };
+        continue;
+      }
+    }
+    return result;
+  };
   let isInitiated = false;
   let isActive = false;
   let lastCheckpoint = null;
@@ -757,10 +790,11 @@ var reactor = (options) => {
       await init(startOptions);
       isActive = true;
       closeSignal = onShutdown(() => close(startOptions));
-      if (lastCheckpoint !== null)
+      if (lastCheckpoint !== null) {
         return {
           lastCheckpoint
         };
+      }
       return await processingScope(async (context) => {
         if (hooks.onStart) {
           await hooks.onStart(context);
@@ -789,46 +823,48 @@ var reactor = (options) => {
     handle: async (messages, partialContext) => {
       if (!isActive) return Promise.resolve();
       return await processingScope(async (context) => {
-        let result = void 0;
-        for (const message2 of messages) {
-          if (wasMessageHandled(message2, lastCheckpoint)) continue;
-          const upcasted = upcastRecordedMessage(
+        const messagesAboveCheckpoint = messages.filter(
+          (message2) => !wasMessageHandled(message2, lastCheckpoint)
+        );
+        const upcastedMessages = messagesAboveCheckpoint.map(
+          (message2) => upcastRecordedMessage(
             // TODO: Make it smarter
             message2,
             options.messageOptions?.schema?.versioning
+          )
+        ).filter(
+          (upcasted) => !canHandle || canHandle.includes(upcasted.type)
+        );
+        const stopMessageIndex = isCustomBatch && stopAfter ? upcastedMessages.findIndex(stopAfter) : -1;
+        const unhandledMessages = stopMessageIndex !== -1 ? upcastedMessages.slice(0, stopMessageIndex + 1) : upcastedMessages;
+        const batchResult = await eachBatch(unhandledMessages, context);
+        const messageProcessingResult = batchResult?.type === "STOP" ? batchResult : stopMessageIndex !== -1 ? {
+          type: "STOP",
+          reason: "Stop condition reached",
+          lastSuccessfulMessage: unhandledMessages[stopMessageIndex]
+        } : batchResult;
+        const isStop = messageProcessingResult && messageProcessingResult.type === "STOP";
+        const checkpointMessage = messageProcessingResult?.type === "STOP" ? messageProcessingResult.lastSuccessfulMessage : messagesAboveCheckpoint[messagesAboveCheckpoint.length - 1];
+        if (checkpointMessage && checkpoints) {
+          const storeCheckpointResult = await checkpoints.store(
+            {
+              processorId,
+              version,
+              message: checkpointMessage,
+              lastCheckpoint,
+              partition
+            },
+            context
           );
-          if (canHandle !== void 0 && !canHandle.includes(upcasted.type))
-            continue;
-          const messageProcessingResult = await eachMessage(upcasted, context);
-          if (checkpoints) {
-            const storeCheckpointResult = await checkpoints.store(
-              {
-                processorId,
-                version,
-                message: upcasted,
-                lastCheckpoint,
-                partition
-              },
-              context
-            );
-            if (storeCheckpointResult.success) {
-              lastCheckpoint = storeCheckpointResult.newCheckpoint;
-            }
-          }
-          if (messageProcessingResult && messageProcessingResult.type === "STOP") {
-            isActive = false;
-            result = messageProcessingResult;
-            break;
+          if (storeCheckpointResult.success) {
+            lastCheckpoint = storeCheckpointResult.newCheckpoint;
           }
-          if (stopAfter && stopAfter(upcasted)) {
-            isActive = false;
-            result = { type: "STOP", reason: "Stop condition reached" };
-            break;
-          }
-          if (messageProcessingResult && messageProcessingResult.type === "SKIP")
-            continue;
         }
-        return result;
+        if (isStop) {
+          isActive = false;
+          return messageProcessingResult;
+        }
+        return void 0;
       }, partialContext);
     }
   };
@@ -856,7 +892,7 @@ var projector = (options) => {
       } : void 0,
       onClose: options.hooks?.onClose
     },
-    eachMessage: async (event2, context) => projection2.handle([event2], context)
+    eachBatch: async (events, context) => projection2.handle(events, context)
   });
 };
 var inMemoryCheckpointer = () => {