@harperfast/harper-pro 5.0.6 → 5.0.7

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 systemInformation = require('../utility/environment/systemInformation.ts');
+const sysInfo = require('../utility/environment/systemInformation.js');
 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 systemInformation.getHDBProcessInfo();
+	const hdbSysInfo = await sysInfo.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 systemInformation = require('../utility/environment/systemInformation.ts');
+const sysInfo = require('../utility/environment/systemInformation.js');
 
 const STOP_MSG = 'Stopping Harper Pro.';
 
@@ -14,8 +14,9 @@ async function stop() {
 	console.log(STOP_MSG);
 	hdbLogger.notify(STOP_MSG);
 
-	const processes = await systemInformation.getHDBProcessInfo();
-	for (const { pid } of processes.core) {
-		exec(`kill ${pid}`);
-	}
+	const processes = await sysInfo.getHDBProcessInfo();
+
+	processes.core.forEach((p) => {
+		exec(`kill ${p.pid}`);
+	});
 }

package/core/components/EntryHandler.ts

@@ -189,14 +189,12 @@ 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.includes('/node_modules') ||
-						(normalizedPath !== this.#component.directory.replace(/\\/g, '/') &&
-							normalizedBases.every((base) => !normalizedPath.startsWith(base)))
+						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 = loggerWithTag(this.#appName);
+		this.#logger = logger || loggerWithTag(this.#appName);
 
 		this.databaseEvents = databaseEventsEmitter;
 		this.applicationScope = applicationScope;

package/core/components/componentLoader.ts

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

package/core/components/requestRestart.ts

@@ -1,19 +1,11 @@
 import { Status } from '../server/status/index.ts';
 
-interface NotifyingArrayBuffer extends ArrayBuffer {
-	notify(): void;
-	cancel(): void;
-}
-
-let restartArrayBuffer: NotifyingArrayBuffer;
+let restartArrayBuffer: ArrayBuffer;
 let restartNeededArray: Uint8Array;
-let onRestartRequestedCallback: (() => void) | null = null;
 
 function ensureInitialized() {
 	if (!restartArrayBuffer) {
-		restartArrayBuffer = Status.primaryStore.getUserSharedBuffer('restart-needed', new ArrayBuffer(1), {
-			callback: () => onRestartRequestedCallback?.(),
-		}) as NotifyingArrayBuffer;
+		restartArrayBuffer = Status.primaryStore.getUserSharedBuffer('restart-needed', new ArrayBuffer(1));
 		restartNeededArray = new Uint8Array(restartArrayBuffer);
 	}
 }
@@ -21,7 +13,6 @@ function ensureInitialized() {
 export function requestRestart() {
 	ensureInitialized();
 	restartNeededArray[0] = 1;
-	restartArrayBuffer.notify();
 }
 
 export function restartNeeded() {
@@ -33,9 +24,3 @@ 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/lmdbBridge/lmdbUtility/TableSizeObject.js

@@ -0,0 +1,25 @@
+'use strict';
+
+/**
+ * represents the table size entry for a table
+ */
+class TableSizeObject {
+	/**
+	 * @param {String} schema
+	 * @param {String} table
+	 * @param {Number} tableSize - data size of the table in bytes
+	 * @param {Number} recordCount - number of entries in the table
+	 * @param {Number} transactionLogSize - number of entries in the transaction log
+	 * @param {Number} transactionLogRecordCount - data size of the transaction log in bytes
+	 */
+	constructor(schema, table, tableSize = 0, recordCount = 0, transactionLogSize = 0, transactionLogRecordCount = 0) {
+		this.schema = schema;
+		this.table = table;
+		this.table_size = tableSize;
+		this.record_count = recordCount;
+		this.transaction_log_size = transactionLogSize;
+		this.transaction_log_record_count = transactionLogRecordCount;
+	}
+}
+
+module.exports = TableSizeObject;

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

@@ -0,0 +1,34 @@
+'use strict';
+
+const TableSizeObject = require('./TableSizeObject.js');
+const log = require('../../../../utility/logging/harper_logger.js');
+const { getDatabases } = require('../../../../resources/databases.ts');
+
+module.exports = lmdbGetTableSize;
+
+/**
+ * calculates the number of entries & data size in bytes for a table & its transaction log
+ * @param tableObject
+ * @returns {Promise<TableSizeObject>}
+ */
+async function lmdbGetTableSize(tableObject) {
+	let tableStats = new TableSizeObject();
+	try {
+		//get the table record count
+		let table = getDatabases()[tableObject.schema]?.[tableObject.name];
+
+		let dbiStat = table.primaryStore.getStats();
+
+		//get the txn log record count
+		let txnDbiStat = table.auditStore?.getStats();
+
+		tableStats.schema = tableObject.schema;
+		tableStats.table = tableObject.name;
+		tableStats.record_count = dbiStat.entryCount;
+		tableStats.transaction_log_record_count = txnDbiStat.entryCount;
+	} catch (e) {
+		log.warn(`unable to stat table dbi due to ${e}`);
+	}
+
+	return tableStats;
+}