@logbrew/sdk 0.1.22 → 0.1.24

package/core.cjs

@@ -334,14 +334,7 @@ class LogBrewClient {
     this.eventStore = resolvedEventStore;
     let recovered;
     try {
-      recovered = loadStoredEvents({
-        batchPrefixBytes: this.batchPrefixBytes,
-        batchSuffixBytes: this.batchSuffixBytes,
-        eventStore: resolvedEventStore,
-        maxBatchBytes,
-        maxQueueBytes,
-        maxQueueSize
-      });
+      recovered = loadStoredEvents(this);
     } catch (error) {
       if (ownsEventStore) {
         try {
@@ -822,6 +815,7 @@ class LogBrewClient {
   }
 
   async #flushSnapshot(transport) {
+    this.#synchronizeEventStore();
     let remainingEvents = this.events.length;
     if (remainingEvents === 0) {
       return { statusCode: 204, attempts: 0, batches: 0 };
@@ -851,15 +845,31 @@ class LogBrewClient {
     return { statusCode, attempts, batches };
   }
 
+  #synchronizeEventStore() {
+    if (!this.eventStore) return;
+    const recovered = loadStoredEvents(this);
+    if (!isOrderedSubsequence(this.serializedEvents, recovered.serializedEvents))
+      throw new SdkError("persistence_error", "event store lost a queued record");
+    this.events = recovered.events;
+    this.serializedEvents = recovered.serializedEvents;
+    this.serializedEventBytes = recovered.serializedEventBytes;
+    this.queuedEventBytes = recovered.queuedEventBytes;
+  }
+
   #nextBatch(maxEvents) {
     let bodyBytes = this.batchPrefixBytes + this.batchSuffixBytes;
     let eventsCount = 0;
+    const eventIds = new Set();
     for (let index = 0; index < maxEvents; index += 1) {
+      if (eventIds.has(this.events[index].id)) {
+        break;
+      }
       const separatorBytes = eventsCount === 0 ? 0 : 1;
       const nextBodyBytes = bodyBytes + separatorBytes + this.serializedEventBytes[index];
       if (nextBodyBytes > this.maxBatchBytes) {
         break;
       }
+      eventIds.add(this.events[index].id);
       bodyBytes = nextBodyBytes;
       eventsCount += 1;
     }
@@ -1194,6 +1204,14 @@ function loadStoredEvents({
   return { events, queuedEventBytes, serializedEventBytes, serializedEvents };
 }
 
+function isOrderedSubsequence(expected, actual) {
+  let index = 0;
+  for (const value of actual) {
+    index += value === expected[index] ? 1 : 0;
+  }
+  return index === expected.length;
+}
+
 function structuralJson(value) {
   return JSON.stringify(value, (_, entry) => entry && !Array.isArray(entry) && typeof entry === "object"
     ? Object.fromEntries(Object.entries(entry).sort(([left], [right]) => left.localeCompare(right))) : entry);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logbrew/sdk",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "Public LogBrew JavaScript SDK for building, validating, and flushing event batches.",
   "type": "module",
   "main": "./index.cjs",