@harperfast/harper-pro 5.0.6 → 5.0.8

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/OptionsWatcher.ts

@@ -178,7 +178,9 @@ export class OptionsWatcher extends EventEmitter<OptionsWatcherEventMap> {
 		// First, ensure current and new config values are Config objects (not null, undefined, or a primitive)
 		if (!this.#isConfig(currentConfigValue) || !this.#isConfig(newConfigValue)) {
 			// If either is not a config, then just set as there is no need to diff/merge
-			this.#setValue(prevKeys, newConfigValue);
+			if (!isDeepStrictEqual(currentConfigValue, newConfigValue)) {
+				this.#setValue(prevKeys, newConfigValue);
+			}
 			return;
 		}
 
@@ -256,6 +258,12 @@ export class OptionsWatcher extends EventEmitter<OptionsWatcherEventMap> {
 			throw new InvalidValueTypeError(keys, value);
 		}
 
+		if (keys.length === 0) {
+			this.#scopedConfig = value;
+			this.emit('change', keys, value, this.#scopedConfig);
+			return;
+		}
+
 		let obj: ConfigValue = this.#scopedConfig;
 
 		for (const key of keys.slice(0, -1)) {

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;
-}