@harperfast/harper 5.2.9 → 5.2.10

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "harper",
-  "version": "5.2.9",
+  "version": "5.2.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "harper",
-      "version": "5.2.9",
+      "version": "5.2.10",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.1012.0",
@@ -17,7 +17,7 @@
         "@fastify/cors": "^11.2.0",
         "@fastify/static": "^9.1.3",
         "@harperfast/extended-iterable": "1.0.3",
-        "@harperfast/rocksdb-js": "2.8.0",
+        "@harperfast/rocksdb-js": "2.9.0",
         "@harperfast/skills": "^1.10.8",
         "@turf/area": "6.5.0",
         "@turf/boolean-contains": "6.5.0",
@@ -1063,14 +1063,14 @@
       "license": "Apache-2.0"
     },
     "node_modules/@harperfast/rocksdb-js": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js/-/rocksdb-js-2.8.0.tgz",
-      "integrity": "sha512-czswCG+1KCRMYe6XQcsh5u28IQ6EbIx9eXPQd0kmjiLbtoMjiszYE92756bZJSbDykbR2OJLOazMZg7+qfFSJA==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js/-/rocksdb-js-2.9.0.tgz",
+      "integrity": "sha512-EOQnnDo4aoxLidosuQGZ2xO4kDCqwridUQdJ7UF7Ui7d5gTh6tUfTkqRSYk2CbFehVJDgU1qQLJZePGsXRRaEg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@harperfast/extended-iterable": "1.0.3",
-        "msgpackr": "2.0.6",
-        "ordered-binary": "1.6.1"
+        "@harperfast/extended-iterable": "^1.0.3",
+        "msgpackr": "^2.0.6",
+        "ordered-binary": "^1.6.1"
       },
       "bin": {
         "rocksdb-js": "bin/rocksdb-js.mjs"
@@ -1079,20 +1079,20 @@
         "node": "^22.18.0 || >=24.0.0"
       },
       "optionalDependencies": {
-        "@harperfast/rocksdb-js-darwin-arm64": "2.8.0",
-        "@harperfast/rocksdb-js-darwin-x64": "2.8.0",
-        "@harperfast/rocksdb-js-linux-arm64-glibc": "2.8.0",
-        "@harperfast/rocksdb-js-linux-arm64-musl": "2.8.0",
-        "@harperfast/rocksdb-js-linux-x64-glibc": "2.8.0",
-        "@harperfast/rocksdb-js-linux-x64-musl": "2.8.0",
-        "@harperfast/rocksdb-js-win32-arm64": "2.8.0",
-        "@harperfast/rocksdb-js-win32-x64": "2.8.0"
+        "@harperfast/rocksdb-js-darwin-arm64": "2.9.0",
+        "@harperfast/rocksdb-js-darwin-x64": "2.9.0",
+        "@harperfast/rocksdb-js-linux-arm64-glibc": "2.9.0",
+        "@harperfast/rocksdb-js-linux-arm64-musl": "2.9.0",
+        "@harperfast/rocksdb-js-linux-x64-glibc": "2.9.0",
+        "@harperfast/rocksdb-js-linux-x64-musl": "2.9.0",
+        "@harperfast/rocksdb-js-win32-arm64": "2.9.0",
+        "@harperfast/rocksdb-js-win32-x64": "2.9.0"
       }
     },
     "node_modules/@harperfast/rocksdb-js-darwin-arm64": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-darwin-arm64/-/rocksdb-js-darwin-arm64-2.8.0.tgz",
-      "integrity": "sha512-v7cj3bGpRptZHXSbhVzYJ0k+jyMD0Z0kX0u8YNZH6Xq+ifZ6zBkBbyoSdvQ2waGLJXxBORylUxTgYMvTZWiQBA==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-darwin-arm64/-/rocksdb-js-darwin-arm64-2.9.0.tgz",
+      "integrity": "sha512-zgBjJKkHlyjiKJP+FkstFj1znZ/O8qXE9yIXIyKhTtxDeayobFY2x6M/KOWd9N1kaa8GrAQXGawUEXZnV1U+qw==",
       "cpu": [
         "arm64"
       ],
@@ -1106,9 +1106,9 @@
       }
     },
     "node_modules/@harperfast/rocksdb-js-darwin-x64": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-darwin-x64/-/rocksdb-js-darwin-x64-2.8.0.tgz",
-      "integrity": "sha512-9mMPPvRhxjLorE7u1gN3n+InzT4XHXQkHYdNKE6qN4iwZy0vM8iHoQLwIiN9GpzUiueEqBEilAP/9mIOHhMgBw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-darwin-x64/-/rocksdb-js-darwin-x64-2.9.0.tgz",
+      "integrity": "sha512-OfAtdB7GDjkKYaq6Db3mDfoRKnrnjXS1X4OaF4xFsQUoZRtmMvF3OTP9w4N8c2vvEff2kjlGqpj2Dewab1uGNQ==",
       "cpu": [
         "x64"
       ],
@@ -1122,9 +1122,9 @@
       }
     },
     "node_modules/@harperfast/rocksdb-js-linux-arm64-glibc": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-linux-arm64-glibc/-/rocksdb-js-linux-arm64-glibc-2.8.0.tgz",
-      "integrity": "sha512-H1nNimVbIB4/6Sxv5DrxmP1asHLbxTCHuZ2ZN/zudqPkp/bTTSs5RsczOH6JeKTEUxUsJDTXM4nGRcn6LwFaOg==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-linux-arm64-glibc/-/rocksdb-js-linux-arm64-glibc-2.9.0.tgz",
+      "integrity": "sha512-/CnIr6vy+D5M4c2WOAyoC9/2TKSEYCvvsyzz0AoWw3taUmEX6fR308eHMA0iKFHPp7xSI3fyz0fBOd+3TO250A==",
       "cpu": [
         "arm64"
       ],
@@ -1141,9 +1141,9 @@
       }
     },
     "node_modules/@harperfast/rocksdb-js-linux-arm64-musl": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-linux-arm64-musl/-/rocksdb-js-linux-arm64-musl-2.8.0.tgz",
-      "integrity": "sha512-EqG4lkYptNviIcPPaQjK+X4ufjqzSImIvVxP89GHFHrbOJkGgEwRpiya0gWfGu3vJ1iGL1XL1nsU/kEjeDOugg==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-linux-arm64-musl/-/rocksdb-js-linux-arm64-musl-2.9.0.tgz",
+      "integrity": "sha512-MBM4Vv4ERdRgbmXZXQrGPhgmTmb0EX22dwDEFrq57mpn5IEuuXU4S/RXGAcsoEmYqYb86lvtukD5AnvxcefoSA==",
       "cpu": [
         "arm64"
       ],
@@ -1160,9 +1160,9 @@
       }
     },
     "node_modules/@harperfast/rocksdb-js-linux-x64-glibc": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-linux-x64-glibc/-/rocksdb-js-linux-x64-glibc-2.8.0.tgz",
-      "integrity": "sha512-MZPKZ6gF8kCy/KXTav4tc7T2uq+iOunxDOYq7nifZkCCy+0+C9U7g9CZx0NErORRQRP29x3z0zEKkCQ/go5c6Q==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-linux-x64-glibc/-/rocksdb-js-linux-x64-glibc-2.9.0.tgz",
+      "integrity": "sha512-rhIoInrDAzwMx7N2H0K1mM8x/hY2D/NF2rhd8ERT2w2GoK4NqdBtPldVY8ein8fmtDdYaS6CpHmRSmq+xlhqhw==",
       "cpu": [
         "x64"
       ],
@@ -1179,9 +1179,9 @@
       }
     },
     "node_modules/@harperfast/rocksdb-js-linux-x64-musl": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-linux-x64-musl/-/rocksdb-js-linux-x64-musl-2.8.0.tgz",
-      "integrity": "sha512-PnMn1f/UxGOZKxlayR82tzsFCGoaMu0mBGKMmP/r2rbxzX5T89T0c+aVhuhpgNrFlWXTdawlA10Oh/YjfT/2qQ==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-linux-x64-musl/-/rocksdb-js-linux-x64-musl-2.9.0.tgz",
+      "integrity": "sha512-D/MfsqycP7ijIAAptUcITsMMzn7cnawdL3H1XUqe+h9fgNP7+y0gXk/9KxVA5D6cKPw1TkEDaeLuuBsiI2vFUA==",
       "cpu": [
         "x64"
       ],
@@ -1198,9 +1198,9 @@
       }
     },
     "node_modules/@harperfast/rocksdb-js-win32-arm64": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-win32-arm64/-/rocksdb-js-win32-arm64-2.8.0.tgz",
-      "integrity": "sha512-4khqmGbIebiCwY3FVIgcUXEmMapgWP8f97aNrbThPDCIkuJscB3yoAG4A8OJo+Jln/TdjJZOgy8e2ir9F926dA==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-win32-arm64/-/rocksdb-js-win32-arm64-2.9.0.tgz",
+      "integrity": "sha512-76PILBAErw0R9enoprg83FdyHk0UNG63pII4klFV5Xlrfj0gmJ0iqLEbocEwC+d2RTGkpgkUPjoNMw4BbMpyTA==",
       "cpu": [
         "arm64"
       ],
@@ -1214,9 +1214,9 @@
       }
     },
     "node_modules/@harperfast/rocksdb-js-win32-x64": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-win32-x64/-/rocksdb-js-win32-x64-2.8.0.tgz",
-      "integrity": "sha512-E5HpBAnRwotITq++534WCinMvYidkkPoaAD5uwBNHiQbNt6YYvNZllJAIh/bukXD+uO6DL6qUMmVkeBh3kWK5A==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@harperfast/rocksdb-js-win32-x64/-/rocksdb-js-win32-x64-2.9.0.tgz",
+      "integrity": "sha512-BRPIzbvx1NlOhA6vwAnUwFYuIQykmdsjGxnblb5ejvdf9HFw0b6durdKQfPyk8L+RO2uiXqpfkK4Da8V0vhgdQ==",
       "cpu": [
         "x64"
       ],

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@harperfast/harper",
 	"description": "Harper is an open-source Node.js performance platform that unifies database, cache, application, and messaging layers into one in-memory process.",
-	"version": "5.2.9",
+	"version": "5.2.10",
 	"license": "Apache-2.0",
 	"homepage": "https://harper.fast",
 	"bugs": {
@@ -179,7 +179,7 @@
 		"@fastify/cors": "^11.2.0",
 		"@fastify/static": "^9.1.3",
 		"@harperfast/extended-iterable": "1.0.3",
-		"@harperfast/rocksdb-js": "2.8.0",
+		"@harperfast/rocksdb-js": "2.9.0",
 		"@harperfast/skills": "^1.10.8",
 		"@turf/area": "6.5.0",
 		"@turf/boolean-contains": "6.5.0",

package/resources/DatabaseTransaction.ts

@@ -16,6 +16,7 @@ import type { Entry } from './RecordEncoder.ts';
 import { toBufferKey } from 'ordered-binary';
 
 const trackedTxns = new Set<DatabaseTransaction>();
+const readTransactionOwners = new WeakMap<ReadTransaction, DatabaseTransaction>();
 // Read options for a rotated generation's native transactions; shared because they never vary.
 const SNAPSHOT_FREE = Object.freeze({ disableSnapshot: true });
 // Logical transactions the monitor supervises for their WRITES, kept apart from trackedTxns because the
@@ -236,6 +237,76 @@ export function transactionOpenTooLongError(): ServerError {
 	);
 }
 
+class ReadSnapshotExpiredError extends ServerError {
+	constructor() {
+		super('Read scan snapshot expired; retry the read without replaying previously committed writes', 503);
+		this.name = 'ReadSnapshotExpiredError';
+	}
+}
+
+export function trackReadRange(transaction: ReadTransaction, createRange: () => any): any {
+	const owner = readTransactionOwners.get(transaction);
+	if (!owner) return createRange();
+	function checkActive() {
+		if (owner.timedOut) throw transactionOpenTooLongError();
+		if (owner.transaction !== transaction) {
+			throw new ReadSnapshotExpiredError();
+		}
+	}
+	checkActive();
+	const range = createRange();
+	const iterate = range.iterate;
+	range.iterate = function (options) {
+		const iterator = iterate.call(this, options);
+		let done = false;
+		// Closing the underlying iterator is the one step here that can throw for a reason the caller
+		// must not see: `next()` only reaches it once the snapshot is already gone, which is the
+		// likeliest moment for the native layer to object, and an error from cleanup would replace the
+		// named 503 with exactly the raw iterator error this wrapper exists to stop surfacing. The
+		// closure reference rather than `this` so a destructured `next` still cleans up.
+		const wrapper = {
+			[Symbol.iterator]() {
+				return this;
+			},
+			next() {
+				if (done) return { done: true, value: undefined };
+				try {
+					checkActive();
+					owner.rangeReadActive = true;
+					const result = iterator.next();
+					done = result.done === true;
+					return result;
+				} catch (error) {
+					closeQuietly();
+					throw error;
+				}
+			},
+			return(value?: any) {
+				if (!done) {
+					done = true;
+					iterator.return?.(value);
+				}
+				return { done: true, value };
+			},
+			throw(error) {
+				// Not delegated to `iterator.throw`: it closes and rethrows the same error anyway, and
+				// delegating after the close below would run it against an iterator already closed.
+				closeQuietly();
+				throw error;
+			},
+		};
+		function closeQuietly() {
+			try {
+				wrapper.return();
+			} catch {
+				// the error being propagated is the actionable one
+			}
+		}
+		return wrapper;
+	};
+	return range;
+}
+
 type MaybePromise<T> = T | Promise<T>;
 
 export type CommitOptions = {
@@ -419,8 +490,9 @@ export class DatabaseTransaction implements Transaction {
 	// back what it asked for.
 	snapshotFree = false;
 
-	getReadTxn(disableSnapshot?: boolean): ReadTransaction {
-		this.readTxnRefCount = (this.readTxnRefCount || 0) + 1;
+	rangeReadActive = false;
+
+	renewReadTimeout(): void {
 		// The limit is an IDLE limit. Writes always re-arm it (see addWrite), but reads only do so
 		// while no uncommitted writes are held: staged writes hold write intents that other writers'
 		// coordinated-retry commits park on, so a handler that wrote once and then only reads — an
@@ -433,6 +505,11 @@ export class DatabaseTransaction implements Transaction {
 		if ((this.writes.length === 0 && !this.next) || this.open !== TRANSACTION_STATE.OPEN || !this.hasPendingWrites()) {
 			this.timeout = Math.max(txnExpiration, this.timeoutBudget);
 		}
+	}
+
+	getReadTxn(disableSnapshot?: boolean): ReadTransaction {
+		this.readTxnRefCount = (this.readTxnRefCount || 0) + 1;
+		this.renewReadTimeout();
 		if (this.transaction) {
 			if ((this.transaction as any).openTimer) (this.transaction as any).openTimer = 0;
 			return this.transaction;
@@ -467,6 +544,8 @@ export class DatabaseTransaction implements Transaction {
 	// Monitor state is not ownership state: it stays with `trackedTxns.add` in getReadTxn().
 	private attachOwnedTransaction(transaction: RocksTransactionWithRetry): void {
 		this.transaction = transaction;
+		readTransactionOwners.set(transaction, this);
+		this.rangeReadActive = false;
 		this.readTxnsUsed = 1;
 		this.baseReadRefConsumed = false;
 	}
@@ -507,6 +586,7 @@ export class DatabaseTransaction implements Transaction {
 		trackedTxns.delete(this);
 		this.endWriteSupervision();
 		this.transaction = null;
+		this.rangeReadActive = false;
 		this.readTxnsUsed = 0;
 		this.readTxnRefCount = 0;
 		return transaction;
@@ -995,6 +1075,8 @@ export class DatabaseTransaction implements Transaction {
 					if (transaction) {
 						this.writes = this.writes.filter((write) => write); // filter out removed entries
 						if (this.writes.length > 0) {
+							// Commit retries can construct fresh ranges on this live handle after read ownership ends.
+							readTransactionOwners.delete(transaction);
 							// The transaction was created with coordinatedRetry:true (see
 							// getReadTxn), so commit() can resolve to RETRY_NOW_VALUE. That
 							// sentinel (a number) is why commitResolution is typed
@@ -1581,6 +1663,10 @@ function startMonitoringTxns() {
 	}, txnExpiration).unref();
 
 	function monitorTransaction(txn: DatabaseTransaction) {
+		if (txn.rangeReadActive) {
+			txn.rangeReadActive = false;
+			txn.renewReadTimeout();
+		}
 		{
 			// Decay write recency once per tick for every tracked link, independent of the `timeout`
 			// branches below — a tracked link that keeps its own idle limit alive by reading must not

package/resources/PrimaryRocksDatabase.ts

@@ -1,3 +1,4 @@
+import { trackReadRange } from './DatabaseTransaction.ts';
 import { RocksDatabase, type RocksDatabaseOptions, constants, type Store } from '@harperfast/rocksdb-js';
 
 const FRESH_VERSION_FLAG = constants.FRESH_VERSION_FLAG;
@@ -151,7 +152,7 @@ export class PrimaryRocksDatabase extends RocksDatabase {
 	}
 
 	getRange(options?: any): any {
-		const iterable = super.getRange(options);
+		const iterable = trackReadRange(options?.transaction, () => super.getRange(options));
 		if (options?.valuesForKey) return iterable.map((v: any) => v?.value);
 		if (options?.values === false || options?.onlyCount) return iterable;
 		if (!this.#enc.isRocksDB) return iterable;

package/resources/RocksIndexStore.ts

@@ -1,3 +1,4 @@
+import { trackReadRange } from './DatabaseTransaction.ts';
 import {
 	DBI,
 	type StoreIteratorOptions,
@@ -35,7 +36,7 @@ export class RocksIndexStore extends RocksDatabase {
 			end = [end, MAXIMUM_KEY];
 		}
 		const translatedOptions = { ...options, start, end };
-		return super.getRange(translatedOptions).map(({ key }) => {
+		return trackReadRange(options.transaction, () => super.getRange(translatedOptions)).map(({ key }) => {
 			return { key: key[0], value: key.length > 2 ? key.slice(1) : key[1] };
 		});
 	}

package/resources/Table.ts

@@ -86,7 +86,7 @@ import { rebuildUpdateBefore } from './crdt.ts';
 import { appendHeader } from '../server/serverHelpers/Headers.ts';
 import fs from 'node:fs';
 import { Blob, deleteBlobsInObject, findBlobsInObject, startPreCommitBlobsForRecord } from './blob.ts';
-import { onStorageReclamation, getStorageSpaceStats } from '../server/storageReclamation.ts';
+import { onStorageReclamation, removeStorageReclamation, getStorageSpaceStats } from '../server/storageReclamation.ts';
 import { RequestTarget } from './RequestTarget.ts';
 import harperLogger from '../utility/logging/harper_logger.ts';
 import { throttle } from '../server/throttle.ts';
@@ -1564,7 +1564,12 @@ export function makeTable(options) {
 					if (removeTombstonedCatalog()) await dbisDb.committed;
 				}
 			} else {
-				// legacy table per database
+				// legacy table per database. The store to retire is this table's own audit store: nothing
+				// assigns `primaryStore.auditStore` — openAuditStore() assigns `rootStore.auditStore`, and
+				// this is the reference makeTable() was handed. Awaited so a pass suspended mid-removal has
+				// released the primary DBI before it is closed and unlinked.
+				await auditStore?.stopAuditCleanup?.();
+				removeStorageReclamation(primaryStore.path);
 				await primaryStore.close();
 				fs.unlinkSync(primaryStore.path);
 			}
@@ -3335,6 +3340,7 @@ export function makeTable(options) {
 			// objects. Entries are small and shallow; the clone is cheap next to the query.
 			conditions = cloneConditions(conditions);
 			let orderAlignedCondition;
+			let syntheticOrderCondition;
 			const filtered = {};
 
 			function prepareConditions(conditions: any[], operator: string) {
@@ -3473,7 +3479,7 @@ export function makeTable(options) {
 							// if it is indexed, we add a pseudo-condition to align with the natural sort order of the index.
 							// the primary key has no secondary index, but the primary store is itself keyed in
 							// primary-key order, so scanning it is already aligned with the sort
-							orderAlignedCondition = { ...sort, comparator: 'sort' };
+							orderAlignedCondition = syntheticOrderCondition = { ...sort, comparator: 'sort' };
 							conditions.push(orderAlignedCondition);
 						} else if (conditions.length === 0 && !target.allowFullScan)
 							throw handleHDBError(
@@ -3503,8 +3509,10 @@ export function makeTable(options) {
 						};
 					}
 				} else {
-					// if we had to add an aligned condition that isn't first, we remove it and do ordering later
-					if (orderAlignedCondition) conditions.splice(conditions.indexOf(orderAlignedCondition), 1);
+					// if we had to add an aligned condition that isn't first, we remove it and do ordering later —
+					// only the one we added; a caller's own condition on the sort attribute is still a filter
+					const syntheticIndex = syntheticOrderCondition ? conditions.indexOf(syntheticOrderCondition) : -1;
+					if (syntheticIndex >= 0) conditions.splice(syntheticIndex, 1);
 					postOrdering = sort;
 				}
 			}