@harperfast/harper-pro 5.0.5 → 5.0.6

package/core/bin/status.js

@@ -6,7 +6,7 @@ const YAML = require('yaml');
 
 const hdbTerms = require('../utility/hdbTerms.ts');
 const hdbLog = require('../utility/logging/harper_logger.js');
-const sysInfo = require('../utility/environment/systemInformation.js');
+const systemInformation = require('../utility/environment/systemInformation.ts');
 const envMgr = require('../utility/environment/environmentManager.js');
 const installation = require('../utility/installation.ts');
 envMgr.initSync();
@@ -51,7 +51,7 @@ async function status() {
 	}
 
 	// Check the saved pid against any running hdb processes
-	const hdbSysInfo = await sysInfo.getHDBProcessInfo();
+	const hdbSysInfo = await systemInformation.getHDBProcessInfo();
 	for (const proc of hdbSysInfo.core) {
 		if (proc.pid === hdbPid) {
 			status.harperdb.status = STATUSES.RUNNING;

package/core/bin/stop.js

@@ -4,7 +4,7 @@ const hdbLogger = require('../utility/logging/harper_logger.js');
 const util = require('util');
 const childProcess = require('child_process');
 const exec = util.promisify(childProcess.exec);
-const sysInfo = require('../utility/environment/systemInformation.js');
+const systemInformation = require('../utility/environment/systemInformation.ts');
 
 const STOP_MSG = 'Stopping Harper Pro.';
 
@@ -14,9 +14,8 @@ async function stop() {
 	console.log(STOP_MSG);
 	hdbLogger.notify(STOP_MSG);
 
-	const processes = await sysInfo.getHDBProcessInfo();
-
-	processes.core.forEach((p) => {
-		exec(`kill ${p.pid}`);
-	});
+	const processes = await systemInformation.getHDBProcessInfo();
+	for (const { pid } of processes.core) {
+		exec(`kill ${pid}`);
+	}
 }

package/core/components/EntryHandler.ts

@@ -189,12 +189,14 @@ export class EntryHandler extends EventEmitter<EntryHandlerEventMap> {
 			.watch(this.#component.commonPatternBase, {
 				cwd: this.#component.directory,
 				persistent: false,
+				followSymlinks: false,
 				ignored: (path) => {
 					const normalizedPath = path.replace(/\\/g, '/');
 					const normalizedBases = allowedBases.map((base) => base.replace(/\\/g, '/'));
 					return (
-						normalizedPath !== this.#component.directory.replace(/\\/g, '/') &&
-						normalizedBases.every((base) => !normalizedPath.startsWith(base))
+						normalizedPath.includes('/node_modules') ||
+						(normalizedPath !== this.#component.directory.replace(/\\/g, '/') &&
+							normalizedBases.every((base) => !normalizedPath.startsWith(base)))
 					);
 				},
 			})

package/core/components/Scope.ts

@@ -63,7 +63,7 @@ export class Scope extends EventEmitter<ScopeEventsMap> {
 		this.#pluginName = pluginName;
 		this.#directory = directory;
 		this.#configFilePath = configFilePath;
-		this.#logger = logger || loggerWithTag(this.#appName);
+		this.#logger = loggerWithTag(this.#appName);
 
 		this.databaseEvents = databaseEventsEmitter;
 		this.applicationScope = applicationScope;

package/core/components/componentLoader.ts

@@ -17,7 +17,8 @@ import * as staticFiles from '../server/static.ts';
 import * as loadEnv from '../resources/loadEnv.ts';
 import harperLogger from '../utility/logging/harper_logger.js';
 import * as dataLoader from '../resources/dataLoader.ts';
-import { watchDir, getWorkerIndex } from '../server/threads/manageThreads.js';
+import { restartWorkers, getWorkerIndex } from '../server/threads/manageThreads.js';
+import { resetRestartNeeded, subscribeToRestartRequests } from './requestRestart.ts';
 import { scopedImport } from '../security/jsLoader.ts';
 import { server } from '../server/Server.ts';
 import { Resources } from '../resources/Resources.ts';
@@ -515,10 +516,16 @@ export async function loadComponent(
 		}
 
 		compName = parentCompName;
-		// Auto restart threads on changes to any app folder. TODO: Make this configurable
 		if (isMainThread && !watchesSetup && autoReload) {
-			watchDir(componentDirectory, async () => {
-				return loadComponentDirectories(); // return the promise
+			let debounceTimer: ReturnType<typeof setTimeout> | null = null;
+			subscribeToRestartRequests(() => {
+				if (debounceTimer) clearTimeout(debounceTimer);
+				debounceTimer = setTimeout(async () => {
+					debounceTimer = null;
+					resetRestartNeeded();
+					await loadComponentDirectories();
+					restartWorkers();
+				}, 500);
 			});
 		}
 		if ((config.extensionModule || config.pluginModule) && (!isMainThread || config.runOnMainThread)) {

package/core/components/requestRestart.ts

@@ -1,11 +1,19 @@
 import { Status } from '../server/status/index.ts';
 
-let restartArrayBuffer: ArrayBuffer;
+interface NotifyingArrayBuffer extends ArrayBuffer {
+	notify(): void;
+	cancel(): void;
+}
+
+let restartArrayBuffer: NotifyingArrayBuffer;
 let restartNeededArray: Uint8Array;
+let onRestartRequestedCallback: (() => void) | null = null;
 
 function ensureInitialized() {
 	if (!restartArrayBuffer) {
-		restartArrayBuffer = Status.primaryStore.getUserSharedBuffer('restart-needed', new ArrayBuffer(1));
+		restartArrayBuffer = Status.primaryStore.getUserSharedBuffer('restart-needed', new ArrayBuffer(1), {
+			callback: () => onRestartRequestedCallback?.(),
+		}) as NotifyingArrayBuffer;
 		restartNeededArray = new Uint8Array(restartArrayBuffer);
 	}
 }
@@ -13,6 +21,7 @@ function ensureInitialized() {
 export function requestRestart() {
 	ensureInitialized();
 	restartNeededArray[0] = 1;
+	restartArrayBuffer.notify();
 }
 
 export function restartNeeded() {
@@ -24,3 +33,9 @@ export function resetRestartNeeded() {
 	ensureInitialized();
 	restartNeededArray[0] = 0;
 }
+
+export function subscribeToRestartRequests(callback: () => void) {
+	ensureInitialized();
+	if (onRestartRequestedCallback) throw new Error('A restart-request subscriber is already registered');
+	onRestartRequestedCallback = callback;
+}

package/core/dataLayer/harperBridge/TableSizeObject.ts

@@ -0,0 +1,35 @@
+/**
+ * Represents the table size entry for a RocksDB or LMDB table.
+ */
+export class TableSizeObject {
+	schema: string;
+	table: string;
+	tableSize: number;
+	recordCount: number;
+	transactionLogSize: number;
+	transactionLogRecordCount?: number;
+
+	/**
+	 * @param schema - The schema of the table
+	 * @param table - The name of the table
+	 * @param tableSize - The data size of the table in bytes
+	 * @param recordCount - The number of entries in the table
+	 * @param transactionLogSize - The number of entries in the transaction log
+	 * @param transactionLogRecordCount - The data size of the transaction log in bytes
+	 */
+	constructor(
+		schema: string,
+		table: string,
+		tableSize: number = 0,
+		recordCount: number = 0,
+		transactionLogSize: number = 0,
+		transactionLogRecordCount?: number
+	) {
+		this.schema = schema;
+		this.table = table;
+		this.tableSize = tableSize;
+		this.recordCount = recordCount;
+		this.transactionLogSize = transactionLogSize;
+		this.transactionLogRecordCount = transactionLogRecordCount;
+	}
+}

package/core/dataLayer/harperBridge/lmdbBridge/lmdbUtility/lmdbGetTableSize.ts

@@ -0,0 +1,24 @@
+import { TableSizeObject } from '../../TableSizeObject.ts';
+import logger from '../../../../utility/logging/harper_logger.js';
+import type { Table } from '../../../../resources/databases.ts';
+
+/**
+ * Calculates the number of entries & data size in bytes for a table & its transaction log
+ * @param table
+ * @returns {TableSizeObject}
+ */
+export function lmdbGetTableSize(table: Table) {
+	const tableStats = new TableSizeObject(table.databaseName, table.tableName);
+	try {
+		const dbiStat = table.primaryStore.getStats();
+
+		//get the txn log record count
+		const txnDbiStat = table.auditStore?.getStats();
+
+		tableStats.recordCount = dbiStat.entryCount;
+		tableStats.transactionLogRecordCount = txnDbiStat.entryCount;
+	} catch (e) {
+		logger.warn(`unable to stat table dbi due to ${e}`);
+	}
+	return tableStats;
+}