@harperfast/harper-pro 5.0.5 → 5.0.6

package/core/server/threads/threadServer.js

@@ -2,7 +2,8 @@
 
 const { isMainThread, parentPort, threadId, workerData } = require('node:worker_threads');
 const { createServer: createSocketServer } = require('node:net');
-const { unlinkSync, existsSync } = require('fs');
+const { unlinkSync, existsSync, mkdirSync } = require('fs');
+const { join } = require('path');
 let componentsLoadedResolve;
 exports.whenComponentsLoaded = new Promise((resolve) => {
 	componentsLoadedResolve = resolve;
@@ -144,6 +145,8 @@ function startServers() {
 								}, 5000).unref();
 							});
 						}
+						// Clean up per-thread UDS socket and metadata files
+						httpComponent.cleanupUdsFiles();
 						if (debugThreads || process.env.DEV_MODE) {
 							try {
 								require('inspector').close();
@@ -172,6 +175,8 @@ function startServers() {
 			});
 		});
 	componentsLoadedResolve(loaded);
+	// Clean up UDS files on unexpected process exit
+	process.on('exit', () => httpComponent.cleanupUdsFiles());
 	return loaded;
 }
 function listenOnPorts() {
@@ -180,7 +185,7 @@ function listenOnPorts() {
 		const server = SERVERS[port];
 
 		// If server is unix domain socket
-		if (port.includes?.('/') && getWorkerIndex() == 0) {
+		if (port.includes?.('/')) {
 			if (existsSync(port)) unlinkSync(port);
 			listening.push(
 				new Promise((resolve, reject) => {
@@ -265,6 +270,29 @@ function onSocket(listener, options) {
 		);
 		SNICallback.initialize(socketServer);
 		SERVERS[options.securePort] = socketServer;
+
+		// Create a corresponding Unix Domain Socket mirror for the secure socket
+		if (env.get(terms.CONFIG_PARAMS.TLS_UNIXDOMAINSOCKETS)) {
+			const socketsDir = join(env.getHdbBasePath(), 'sockets');
+			mkdirSync(socketsDir, { recursive: true });
+			const socketName = `${getWorkerIndex()}-${options.securePort}`;
+			const udsPath = join(socketsDir, `${socketName}.sock`);
+			const yamlPath = join(socketsDir, `${socketName}.yaml`);
+
+			const udsServer = createSocketServer(listener, {
+				noDelay: true,
+				keepAlive: true,
+				keepAliveInitialDelay: 600,
+			});
+
+			udsServer.isPerThreadSocket = true;
+			SERVERS[udsPath] = udsServer;
+			httpComponent.registerUdsCleanupPaths(udsPath, yamlPath);
+
+			const writeMetadata = () => httpComponent.writeUdsMetadata(yamlPath, options.securePort, socketServer);
+			SNICallback.ready.then(writeMetadata);
+			socketServer.secureContextsListeners.push(writeMetadata);
+		}
 	}
 	if (options.port) {
 		setPortServerMap(options.port, { protocol_name: 'TCP', name: getComponentName() });

package/core/server/throttle.ts

@@ -1,4 +1,5 @@
 import { logger } from '../utility/logging/logger.ts';
+import { Session, url as inspectorURL } from 'node:inspector';
 const MAX_EVENT_DELAY_TIME = 3000;
 const DEFAULT_MAX_QUEUE_TIME = 20_000; // 20 seconds
 let lastWarning = 0;
@@ -71,3 +72,20 @@ setInterval(() => {
 	}
 	lastEventQueueCheck = now;
 }, EVENT_QUEUE_MONITORING_INTERVAL).unref();
+
+// Reset lastEventQueueCheck if we are resuming from the debugger
+// so the event loop lag check ignores breakpoint pauses
+setTimeout(() => {
+	// wait for any debugger to register and then see if the inspector/debugger is actually enabled
+	if (inspectorURL()) {
+		const session = new Session();
+		session.connect();
+		session.post('Debugger.enable');
+		session.on('inspectorNotification', ({ method }) => {
+			if (method === 'Debugger.resumed') {
+				// reset if we are resuming
+				lastEventQueueCheck = performance.now();
+			}
+		});
+	}
+}, 1);

package/core/utility/environment/environmentManager.js

@@ -152,16 +152,22 @@ function initTestEnvironment(testConfigObj = {}) {
 		// __dirname is dist/utility/environment when running tests, so go up 3 levels to reach project root
 		const propsPath = path.join(__dirname, '../../../', 'unitTests');
 		installProps[BOOT_PROPS_FILE_PATH] = path.join(propsPath, 'hdb_boot_properties.file');
+		const TEST_HDB_PATH = path.join(propsPath, 'envDir', process.pid.toString());
 		try {
-			mkdirSync(path.join(propsPath, 'envDir'));
+			mkdirSync(TEST_HDB_PATH, { recursive: true });
 		} catch {}
 		setProperty(hdbTerms.HDB_SETTINGS_NAMES.SETTINGS_PATH_KEY, path.join(propsPath, 'settings.test'));
 		setProperty(hdbTerms.HDB_SETTINGS_NAMES.INSTALL_USER, os.userInfo() ? os.userInfo().username : undefined);
 		setProperty(hdbTerms.HDB_SETTINGS_NAMES.LOG_LEVEL_KEY, `debug`);
-		setProperty(hdbTerms.HDB_SETTINGS_NAMES.LOG_PATH_KEY, path.join(propsPath, 'envDir', 'log'));
+		setProperty(hdbTerms.HDB_SETTINGS_NAMES.LOG_PATH_KEY, path.join(TEST_HDB_PATH, 'log'));
 		setProperty(hdbTerms.HDB_SETTINGS_NAMES.LOG_DAILY_ROTATE_KEY, false);
-		setProperty(hdbTerms.HDB_SETTINGS_NAMES.HDB_ROOT_KEY, path.join(propsPath, 'envDir'));
-		setProperty(hdbTerms.CONFIG_PARAMS.STORAGE_PATH, path.join(propsPath, 'envDir'));
+		setProperty(hdbTerms.HDB_SETTINGS_NAMES.HDB_ROOT_KEY, TEST_HDB_PATH);
+		setProperty(hdbTerms.CONFIG_PARAMS.STORAGE_PATH, TEST_HDB_PATH);
+		const systemPath = typeof databases !== 'undefined' && databases.system?.hdb_user?.primaryStore?.path;
+		if (systemPath) {
+			setProperty(hdbTerms.CONFIG_PARAMS.DATABASES, { system: { path: path.dirname(systemPath) } });
+		}
+
 		if (https_enabled) {
 			setProperty(hdbTerms.CONFIG_PARAMS.HTTP_SECUREPORT, get(hdbTerms.CONFIG_PARAMS.HTTP_PORT));
 			setProperty(hdbTerms.CONFIG_PARAMS.HTTP_PORT, null);