@harperfast/harper 5.0.30 → 5.1.0-beta.2

package/resources/blob.ts

@@ -34,16 +34,14 @@ import type { StatsFs } from 'node:fs';
 import { createDeflate, deflate } from 'node:zlib';
 import { Readable, pipeline } from 'node:stream';
 import { ensureDirSync } from 'fs-extra';
-import { get as envGet, getHdbBasePath } from '../utility/environment/environmentManager.js';
+import { get as envGet, getHdbBasePath } from '../utility/environment/environmentManager.ts';
 import { CONFIG_PARAMS } from '../utility/hdbTerms.ts';
 import { join, dirname } from 'path';
 import { logger } from '../utility/logging/logger.ts';
-import type { LMDBStore } from 'lmdb';
+import type { RootDatabase } from 'lmdb';
 import { asyncSerialization, hasAsyncSerialization } from '../server/serverHelpers/contentTypes.ts';
-import { HAS_BLOBS } from './auditStore.ts';
 import { getHeapStatistics } from 'node:v8';
 import { setTimeout as delay, setImmediate as rest } from 'node:timers/promises';
-import { RocksDatabase } from '@harperfast/rocksdb-js';
 import { _assignPackageExport } from '../globals.js';
 
 type StorageInfo = {
@@ -52,7 +50,7 @@ type StorageInfo = {
 	store?: any;
 	filePath?: string;
 	recordId?: number;
-	contentBuffer?: Buffer;
+	contentBuffer?: any;
 	source?: NodeJS.ReadableStream;
 	storageBuffer?: Buffer;
 	compress?: boolean;
@@ -72,7 +70,7 @@ const ERROR_TYPE = 0xff;
 const DEFAULT_HEADER = new Uint8Array([0, UNCOMPRESSED_TYPE, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);
 const COMPRESS_HEADER = new Uint8Array([0, DEFLATE_TYPE, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff]);
 const UNKNOWN_SIZE = 0xffffffffffff;
-const storageInfoForBlob = new WeakMap<Blob, StorageInfo>();
+const storageInfoForBlob = new WeakMap<any, StorageInfo>();
 let currentBlobCallback: (blob: Blob) => Blob | void;
 export const Blob = global.Blob || polyfillBlob(); // use the global Blob class if it exists (it doesn't on Node v16)
 let encodeForStorageForRecordId: number = undefined; // only enable encoding of the file path if we are saving to the DB, not for serialization to external clients, and only for one record
@@ -94,7 +92,7 @@ InstanceOfBlobWithNoConstructor.prototype = Blob.prototype;
  * 3. This also avoids the Blob constructor which is expensive due to the transferred setup
  * Harper still supports saving native Blobs, but when they blobs are retrieved from storage, they always use this class.
  */
-class FileBackedBlob extends InstanceOfBlobWithNoConstructor {
+class FileBackedBlob extends (Blob as unknown as { new (): Blob }) implements Blob {
 	type = '';
 	size: number;
 	declare finished: Promise<void>;
@@ -115,7 +113,7 @@ class FileBackedBlob extends InstanceOfBlobWithNoConstructor {
 			this.#onError.push(callback);
 		} else if (type === 'size') {
 			this.#onSize ??= [];
-			this.#onSize.push(callback);
+			this.#onSize.push(callback as any);
 		} else throw new Error("Only 'error' and 'size' events are supported");
 	}
 
@@ -147,7 +145,7 @@ class FileBackedBlob extends InstanceOfBlobWithNoConstructor {
 	async text(): Promise<string> {
 		return (await this.bytes()).toString();
 	}
-	bytes(): Promise<Buffer> {
+	bytes(): Promise<any> {
 		const storageInfo = storageInfoForBlob.get(this);
 		let { start, end, contentBuffer } = storageInfo;
 		if (contentBuffer) {
@@ -318,7 +316,7 @@ class FileBackedBlob extends InstanceOfBlobWithNoConstructor {
 							}
 							size = Number(headerValue & 0xffffffffffffn);
 							if (size < UNKNOWN_SIZE && blob.size !== size) {
-								blob.size = size;
+								(blob as any).size = size;
 								if (blob.#onSize) {
 									for (const callback of blob.#onSize) callback(size);
 								}
@@ -481,7 +479,7 @@ class FileBackedBlob extends InstanceOfBlobWithNoConstructor {
 			// TODO: Implement this
 			throw new Error('Can not slice a streaming blob that is not backed by a file');
 		}
-		return slicedBlob;
+		return slicedBlob as any;
 	}
 	get written() {
 		return storageInfoForBlob.get(this)?.saving ?? Promise.resolve();
@@ -494,7 +492,7 @@ let deletionDelay = 500;
  */
 export function deleteBlob(blob: Blob): void {
 	// do we even need to check for completion here?
-	const filePath = getFilePathForBlob(blob);
+	const filePath = getFilePathForBlob(blob as any);
 	if (!filePath) {
 		return;
 	}
@@ -538,9 +536,10 @@ export function createBlob(
 	} else if (source instanceof Readable) {
 		storageInfo.source = source;
 	} else if (typeof source === 'string') storageInfo.contentBuffer = Buffer.from(source);
-	else if (source?.[Symbol.asyncIterator] || source?.[Symbol.iterator]) storageInfo.source = Readable.from(source);
+	else if (source?.[Symbol.asyncIterator] || source?.[Symbol.iterator])
+		storageInfo.source = Readable.from(source as any);
 	else throw new Error('Invalid source type');
-	return blob;
+	return blob as any;
 }
 _assignPackageExport('createBlob', createBlob);
 
@@ -562,11 +561,11 @@ export function saveBlob(blob: FileBackedBlob, deleteOnFailure = false) {
 		return storageInfo; // nothing more to do if it supposed to be saved in the record
 	}
 	generateFilePath(storageInfo);
-	if (storageInfo.source) writeBlobWithStream(blob, storageInfo.source, storageInfo);
-	else if (storageInfo.contentBuffer) writeBlobWithBuffer(blob, storageInfo);
+	if (storageInfo.source) writeBlobWithStream(blob as any, storageInfo.source, storageInfo);
+	else if (storageInfo.contentBuffer) writeBlobWithBuffer(blob as any, storageInfo);
 	else {
 		// for native blobs, we have to read them from the stream
-		writeBlobWithStream(blob, Readable.from(blob.stream()), storageInfo);
+		writeBlobWithStream(blob as any, Readable.from(blob.stream()), storageInfo);
 	}
 	return storageInfo;
 }
@@ -589,7 +588,7 @@ function writeBlobWithStream(blob: Blob, stream: NodeJS.ReadableStream, storageI
 			writeStream.write(createHeader(blob.size)); // write the default header
 			wroteSize = true;
 		}
-		let compressedStream: NodeJS.Stream;
+		let compressedStream: any;
 		if (compress) {
 			if (!wroteSize) writeStream.write(COMPRESS_HEADER); // write the default header to the file
 			compressedStream = createDeflate();
@@ -608,12 +607,12 @@ function writeBlobWithStream(blob: Blob, stream: NodeJS.ReadableStream, storageI
 		}
 		// when the stream is finished, we may need to flush, and then close the handle and resolve the promise
 		function finished(error?: Error) {
-			const fd = writeStream.fd;
+			const fd = (writeStream as any).fd;
 			if (error) {
 				store.unlock(lockKey);
 				if (fd) {
 					close(fd);
-					writeStream.fd = null; // do not close the same fd twice, that is very dangerous because it might represent a new fd
+					(writeStream as any).fd = null; // do not close the same fd twice, that is very dangerous because it might represent a new fd
 				}
 				if (storageInfo.deleteOnFailure) {
 					unlink(filePath, (error) => {
@@ -641,7 +640,7 @@ function writeBlobWithStream(blob: Blob, stream: NodeJS.ReadableStream, storageI
 				if (!wroteSize) {
 					wroteSize = true;
 					const size = compressedStream ? compressedStream.bytesWritten : writeStream.bytesWritten - HEADER_SIZE;
-					blob.size = size;
+					(blob as any).size = size;
 					write(fd, createHeader(size), 0, HEADER_SIZE, 0, finished);
 					return; // not finished yet, wait for this write and then we are finished
 				}
@@ -652,12 +651,12 @@ function writeBlobWithStream(blob: Blob, stream: NodeJS.ReadableStream, storageI
 						if (error) reject(error);
 						resolve();
 						close(fd);
-						writeStream.fd = null; // do not close the same fd twice, that is very dangerous because it might represent a new fd
+						(writeStream as any).fd = null; // do not close the same fd twice, that is very dangerous because it might represent a new fd
 					});
 				} else {
 					resolve();
 					close(fd);
-					writeStream.fd = null; // do not close the same fd twice, that is very dangerous because it might represent a new fd
+					(writeStream as any).fd = null; // do not close the same fd twice, that is very dangerous because it might represent a new fd
 				}
 			}
 		}
@@ -669,7 +668,7 @@ export function getFileId(blob: Blob): string {
 	return storageInfoForBlob.get(blob)?.fileId;
 }
 
-export function isSaving(blob: Blob): string {
+export function isSaving(blob: Blob): Promise<void> {
 	return storageInfoForBlob.get(blob)?.saving;
 }
 
@@ -677,28 +676,28 @@ export function getFilePathForBlob(blob: FileBackedBlob): string {
 	const storageInfo = storageInfoForBlob.get(blob);
 	return storageInfo?.fileId && getFilePath(storageInfo);
 }
-export const databasePaths = new Map<LMDBStore, string[]>();
-export function getRootBlobPathsForDB(store: LMDBStore) {
+export const databasePaths = new Map<RootDatabase, string[]>();
+export function getRootBlobPathsForDB(store: RootDatabase) {
 	if (!store) {
 		throw new Error('No store specified, can not determine blob storage path');
 	}
 	let paths: string[] = databasePaths.get(store);
 	if (!paths) {
-		if (!store.databaseName) {
+		if (!(store as any).databaseName) {
 			logger.warn?.('No database name specified, can not determine blob storage path');
 			return [];
 		}
 		const blobPaths: string[] = envGet(CONFIG_PARAMS.STORAGE_BLOBPATHS);
 		if (blobPaths) {
-			paths = blobPaths.map((path) => join(path, store.databaseName));
+			paths = blobPaths.map((path) => join(path, (store as any).databaseName));
 		} else {
-			paths = [join(getHdbBasePath(), 'blobs', store.databaseName)];
+			paths = [join(getHdbBasePath(), 'blobs', (store as any).databaseName)];
 		}
 		databasePaths.set(store, paths);
 	}
 	return paths;
 }
-export async function deleteRootBlobPathsForDB(store: LMDBStore): Promise<any[]> {
+export async function deleteRootBlobPathsForDB(store: RootDatabase): Promise<void> {
 	const paths = getRootBlobPathsForDB(store);
 	if (paths) {
 		await Promise.all(paths.map((path) => rimrafSteadily(path)));
@@ -751,7 +750,7 @@ function writeBlobWithBuffer(blob: Blob, storageInfo: StorageInfo): Blob {
 		// if the buffer is small enough, just store it in memory
 		return;
 	}
-	blob.size = size;
+	(blob as any).size = size;
 	return writeBlobWithStream(blob, Readable.from([buffer]), storageInfo);
 }
 
@@ -772,7 +771,7 @@ function generateFilePath(storageInfo: StorageInfo) {
 	if (!existsSync(fileDir)) ensureDirSync(fileDir);
 	storageInfo.filePath = filePath;
 }
-const idIncrementers = new Map<LMDBStore, BigInt64Array>();
+const idIncrementers = new Map<RootDatabase, BigInt64Array>();
 function getNextFileId(): number {
 	// all threads will use a shared buffer to atomically increment the id
 	// first, we create our proposed incrementer buffer that will be used if we are the first thread to get here
@@ -821,21 +820,21 @@ const FREQUENCY_TABLE_SIZE = 128;
  */
 function getNextStorageIndex(blobStoragePaths: string[], fileId: number) {
 	const now = Date.now();
-	if (!blobStoragePaths.frequencyTable) {
-		blobStoragePaths.lastUpdated = 0;
+	if (!(blobStoragePaths as any).frequencyTable) {
+		(blobStoragePaths as any).lastUpdated = 0;
 		// setup default frequency table with even distribution
 		const frequencyTable = new Array(FREQUENCY_TABLE_SIZE);
 		for (let i = 0; i < frequencyTable.length; i++) {
 			frequencyTable[i] = i % blobStoragePaths.length;
 		}
-		blobStoragePaths.frequencyTable = frequencyTable;
+		(blobStoragePaths as any).frequencyTable = frequencyTable;
 	}
-	if ((blobStoragePaths.lastUpdated ?? 0) + 60000 < now) {
-		blobStoragePaths.lastUpdated = now;
+	if (((blobStoragePaths as any).lastUpdated ?? 0) + 60000 < now) {
+		(blobStoragePaths as any).lastUpdated = now;
 		// create a new frequency table based on the available space
 		createFrequencyTableForStoragePaths(blobStoragePaths);
 	}
-	const nextIndex = blobStoragePaths.frequencyTable[fileId % FREQUENCY_TABLE_SIZE];
+	const nextIndex = (blobStoragePaths as any).frequencyTable[fileId % FREQUENCY_TABLE_SIZE];
 	return nextIndex;
 }
 
@@ -878,7 +877,7 @@ async function createFrequencyTableForStoragePaths(blobStoragePaths: string[]) {
 		pathPeriods[nextIndex] += 1 / availableSpaces[nextIndex];
 		frequencyTable[i] = nextIndex;
 	}
-	blobStoragePaths.frequencyTable = frequencyTable;
+	(blobStoragePaths as any).frequencyTable = frequencyTable;
 }
 
 /**
@@ -887,7 +886,7 @@ async function createFrequencyTableForStoragePaths(blobStoragePaths: string[]) {
  * @param encodingId
  * @param objectToClear
  */
-export function encodeBlobsWithFilePath<T>(callback: () => T, encodingId: number, store: LMDBStore): T {
+export function encodeBlobsWithFilePath<T>(callback: () => T, encodingId: number, store: RootDatabase): T {
 	encodeForStorageForRecordId = encodingId;
 	currentStore = store;
 	blobsWereEncoded = false;
@@ -923,7 +922,7 @@ export function encodeBlobsAsBuffers<T>(callback: () => T): Promise<T> {
  * Decode blobs, creating local storage to hold the blogs and returning a promise that resolves when all the blobs are written to disk
  * @param callback
  */
-export function decodeBlobsWithWrites(callback: () => void, store?: LMDBStore, blobCallback?: (blob: Blob) => void) {
+export function decodeBlobsWithWrites(callback: () => void, store?: RootDatabase, blobCallback?: (blob: Blob) => void) {
 	try {
 		promisedWrites = [];
 		currentBlobCallback = blobCallback;
@@ -949,7 +948,7 @@ export function decodeBlobsWithWrites(callback: () => void, store?: LMDBStore, b
 export function decodeWithBlobCallback(
 	callback: () => void,
 	blobCallback: (blob: Blob) => void,
-	rootStore?: LMDBStore
+	rootStore?: RootDatabase
 ) {
 	currentStore = rootStore;
 	try {
@@ -963,7 +962,7 @@ export function decodeWithBlobCallback(
  * Decode with a callback for when blobs are encountered, allowing for detecting of blobs
  * @param callback
  */
-export function decodeFromDatabase<T>(callback: () => T, rootStore: LMDBStore) {
+export function decodeFromDatabase<T>(callback: () => T, rootStore: RootDatabase) {
 	// note that this is actually called recursively (but always the same root store), so we don't clear afterwards
 	currentStore = rootStore;
 	return callback();
@@ -1028,7 +1027,7 @@ export interface PreCommitBlobs {
  */
 export function startPreCommitBlobsForRecord(
 	record: any,
-	store: LMDBStore | RocksDatabase,
+	store: any,
 	saveInRecord?: boolean
 ): PreCommitBlobs | undefined {
 	const blobsNeedingSaving: Blob[] = [];
@@ -1050,7 +1049,7 @@ export function startPreCommitBlobsForRecord(
 				currentStore = store;
 				return Promise.all(
 					blobsNeedingSaving.map((blob) => {
-						return saveBlob(blob, true).saving ?? Promise.resolve();
+						return saveBlob(blob as any, true).saving ?? Promise.resolve();
 					})
 				);
 			},
@@ -1106,8 +1105,8 @@ addExtension({
 			storageInfoForBlob.set(blob, {
 				storageIndex: 0,
 				fileId: null,
-				storageBuffer: buffer,
-				contentBuffer: blobInfo[1],
+				storageBuffer: buffer as any,
+				contentBuffer: blobInfo[1] as any,
 			});
 			blob.size = blobInfo[1]?.length;
 		}
@@ -1230,8 +1229,9 @@ function polyfillBlob() {
  * @param database
  */
 export async function cleanupOrphans(database: any, databaseName?: string) {
-	let store: LMDBStore;
-	let auditStore: LMDBStore;
+	const { HAS_BLOBS } = await import('./auditStore.ts');
+	let store: RootDatabase;
+	let auditStore: RootDatabase;
 	let orphansDeleted = 0;
 	for (const tableName in database) {
 		const table = database[tableName];
@@ -1306,13 +1306,13 @@ export async function cleanupOrphans(database: any, databaseName?: string) {
 		}
 		logger.warn?.('Checking for references to potential orphaned blobs in the audit log');
 		// search the audit store for references
-		for (const auditRecord of auditStore.getRange({ start: 1, snapshot: false, lazy: true })) {
+		for (const auditRecord of auditStore.getRange({ start: 1, snapshot: false } as any)) {
 			try {
-				const primaryStore = auditStore.tableStores[auditRecord.tableId];
+				const primaryStore = (auditStore as any).tableStores[(auditRecord as any).tableId];
 				if (!primaryStore) continue;
-				const entry = primaryStore?.getEntry(auditRecord.recordId);
+				const entry = primaryStore?.getEntry((auditRecord as any).recordId);
 				if (!entry || entry.version !== auditRecord.version || !entry.value) {
-					checkObjectForReferences(auditRecord.getValue(primaryStore));
+					checkObjectForReferences((auditRecord as any).getValue(primaryStore));
 				}
 				// slow this down a bit to reduce excessive load, this runs approximately at 10k per second
 				if (i++ % perMS === 0)

package/resources/dataLoader.ts

@@ -3,9 +3,9 @@ import { createHash } from 'node:crypto';
 import { parseDocument } from 'yaml';
 import { Databases, databases, table, Tables, tables } from './databases.ts';
 import { getWorkerIndex } from '../server/threads/manageThreads';
-import { HTTP_STATUS_CODES } from '../utility/errors/commonErrors.js';
-import { ClientError } from '../utility/errors/hdbError.js';
-import harperLogger from '../utility/logging/harper_logger.js';
+import { HTTP_STATUS_CODES } from '../utility/errors/commonErrors.ts';
+import { ClientError } from '../utility/errors/hdbError.ts';
+import harperLogger from '../utility/logging/harper_logger.ts';
 import { Attribute } from './Table.ts';
 import { FileEntry } from '../components/EntryHandler.ts';
 
@@ -42,7 +42,7 @@ export function computeRecordHash(record: Record<string, any>): string {
  * Gets or creates the hash tracking table in the system database.
  * Lazy-initializes the table on first access.
  */
-function getHashTrackingTable(databasesRef: Databases) {
+function getHashTrackingTable(databasesRef: Databases): any {
 	// Always check databasesRef first (important for testing with mocks)
 	if (databasesRef.system && databasesRef.system[DATA_LOADER_HASH_TABLE]) {
 		return databasesRef.system[DATA_LOADER_HASH_TABLE];