@minnowdb/core 0.4.0 → 0.4.1

package/dist/engine/database.js

@@ -8395,6 +8395,7 @@ export class MinnowDatabase {
         let writtenBytes = 0;
         let batchBytes = 0;
         let metadataBatchBytes = 0;
+        let batchBlockCount = 0;
         const batch = [];
         const flush = async () => {
             if (batch.length === 0 || identity === undefined)
@@ -8410,6 +8411,7 @@ export class MinnowDatabase {
             });
             batchBytes = 0;
             metadataBatchBytes = 0;
+            batchBlockCount = 0;
             writtenBytes = session.stagedBytes;
             options.onProgress?.({ phase: "blocks", writtenBytes, totalBytes });
         };
@@ -8439,6 +8441,7 @@ export class MinnowDatabase {
                     if (batch.length > 0 &&
                         (batch.length >= MAX_SNAPSHOT_FRAME_BATCH_ITEMS ||
                             batchBytes + entry.frame.payload.byteLength > MAX_SNAPSHOT_FRAME_BATCH_BYTES ||
+                            (entry.frame.kind === "block" && batchBlockCount > 0) ||
                             (entry.frame.kind !== "block" &&
                                 metadataBatchBytes + entry.frame.payload.byteLength >
                                     MAX_SNAPSHOT_METADATA_BATCH_BYTES))) {
@@ -8449,6 +8452,9 @@ export class MinnowDatabase {
                     if (entry.frame.kind !== "block") {
                         metadataBatchBytes = safeWholeNumberSum([metadataBatchBytes, entry.frame.payload.byteLength], "Snapshot import metadata batch bytes");
                     }
+                    else {
+                        batchBlockCount += 1;
+                    }
                     continue;
                 }
                 if (identity === undefined)

package/dist/storage/opfs/leader.js

@@ -4488,7 +4488,7 @@ function validateSnapshotFrameExportState(value) {
     requireStorageId(value.sessionId, "snapshot frame export session id");
     requireStorageId(value.ownerId, "snapshot frame export owner id");
     requireStorageId(value.ledgerId, "snapshot frame export ledger id");
-    validateSnapshotLifetime(value.createdAt, value.expiresAt, "Snapshot frame export");
+    validateSnapshotStateLifetime(value.createdAt, value.expiresAt, "Snapshot frame export");
     requireNonNegativeInteger(value.leaseRevision, "snapshot frame export lease revision");
     requireNonNegativeInteger(value.manifestVersion, "snapshot frame export manifest version");
     requireNonNegativeInteger(value.ledgerLength, "snapshot frame export ledger length");
@@ -4552,7 +4552,7 @@ function validateSnapshotFrameImportState(value) {
     requireStorageId(value.identity, "snapshot frame import identity");
     requireStorageId(value.ownerId, "snapshot frame import owner id");
     requireStorageId(value.ledgerId, "snapshot frame import ledger id");
-    validateSnapshotLifetime(value.createdAt, value.expiresAt, "Snapshot frame import");
+    validateSnapshotStateLifetime(value.createdAt, value.expiresAt, "Snapshot frame import");
     for (const field of [
         "version",
         "ledgerLength",
@@ -4612,6 +4612,18 @@ function validateSnapshotLifetime(createdAt, expiresAt, label) {
         throw new RangeError(`${label} expiration interval is invalid`);
     }
 }
+/**
+ * A durable state keeps the session's original creation time while a valid renewal moves its
+ * expiry forward. The renewal WAL input carries the bounded cutoff-to-expiry interval, so state
+ * validation must not mistake a session older than one TTL for one lease longer than the TTL.
+ */
+function validateSnapshotStateLifetime(createdAt, expiresAt, label) {
+    requireTimestamp(createdAt, `${label} creation time`);
+    requireTimestamp(expiresAt, `${label} expiration`);
+    if (Date.parse(expiresAt) <= Date.parse(createdAt)) {
+        throw new RangeError(`${label} expiration interval is invalid`);
+    }
+}
 function validateSnapshotRenewal(input, label) {
     validateId(input.ownerId);
     if (input.identity !== undefined)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minnowdb/core",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "A columnar SQL database for the browser: PostgreSQL-style SQL over durable IndexedDB or OPFS data, with no server or WebAssembly module.",
   "license": "MIT",
   "author": "Eric Wilhite",