@harperfast/harper-pro 5.0.13 → 5.0.15

package/core/bin/copyDb.ts

@@ -291,7 +291,7 @@ function openRocksDb(path: string, options: RocksDatabaseOptions & { dupSort?: b
 	}
 	let db;
 	if (options.dupSort) {
-		db = RocksDatabase.open(new RocksIndexStore(path, options));
+		db = new RocksIndexStore(path, options).open();
 	} else {
 		db = RocksDatabase.open(path, options);
 		db.encoder.name = options.name;
@@ -309,8 +309,10 @@ export async function migrateOnStart() {
 	updateConfigValue(CONFIG_PARAMS.STORAGE_MIGRATEONSTART, false);
 
 	try {
-		for (const databaseName in databases) {
-			if (databaseName === 'system') continue;
+		let databaseNames = Object.keys(databases);
+		// system is a dontenum property, so we have to manually add it
+		if (!databaseNames.includes('system')) databaseNames.push('system');
+		for (const databaseName of databaseNames) {
 			if (databaseName.endsWith('-copy')) continue;
 			let rootStore;
 			for (const tableName in databases[databaseName]) {

package/core/bin/run.js

@@ -24,6 +24,7 @@ const minimist = require('minimist');
 const keys = require('../security/keys.js');
 const { startHTTPThreads } = require('../server/threads/socketRouter.ts');
 const hdbInfoController = require('../dataLayer/hdbInfoController.js');
+const { getThisNodeName } = require('../server/nodeName.ts');
 const hdbTerms = require('../utility/hdbTerms.ts');
 const { getHdbPid, isProcessRunning } = require('../utility/processManagement/processManagement.js');
 const { PACKAGE_ROOT } = require('../utility/packageUtils');
@@ -255,7 +256,7 @@ function startupLog(portResolutions) {
 	const pad = (param) => param.padEnd(padding);
 	let logMsg = '\n';
 
-	logMsg += `${pad('Hostname:')}${env.get(CONFIG_PARAMS.NODE_HOSTNAME)}\n`;
+	logMsg += `${pad('Hostname:')}${getThisNodeName()}\n`;
 
 	logMsg += `${pad('Worker Threads:')}${env.get(CONFIG_PARAMS.THREADS_COUNT)}\n`;
 
@@ -295,20 +296,14 @@ function startupLog(portResolutions) {
 	}`;
 	logMsg += `, unix socket: ${configUtils.getConfigPath(CONFIG_PARAMS.OPERATIONSAPI_NETWORK_DOMAINSOCKET)}\n`;
 	if (env.get(CONFIG_PARAMS.OPERATIONSAPI_NETWORK_PORT)) {
-		logMsg +=
-			pad('') +
-			'http://' +
-			env.get(CONFIG_PARAMS.NODE_HOSTNAME) +
-			':' +
-			env.get(CONFIG_PARAMS.OPERATIONSAPI_NETWORK_PORT) +
-			'/\n';
+		logMsg += pad('') + 'http://' + getThisNodeName() + ':' + env.get(CONFIG_PARAMS.OPERATIONSAPI_NETWORK_PORT) + '/\n';
 	}
 	if (env.get(CONFIG_PARAMS.OPERATIONSAPI_NETWORK_SECUREPORT)) {
 		logMsg +=
 			'\n' +
 			pad('') +
 			'https://' +
-			env.get(CONFIG_PARAMS.NODE_HOSTNAME) +
+			getThisNodeName() +
 			':' +
 			env.get(CONFIG_PARAMS.OPERATIONSAPI_NETWORK_SECUREPORT) +
 			'/\n';
@@ -363,7 +358,7 @@ function startupLog(portResolutions) {
 			if (!restLog.includes(pair) && name === 'rest') {
 				restLog += pair;
 				if (value.protocol_name === 'HTTP' || value.protocol_name === 'HTTPS') {
-					restHostnames.push(`${value.protocol_name.toLowerCase()}://${env.get(CONFIG_PARAMS.NODE_HOSTNAME)}:${key}/`);
+					restHostnames.push(`${value.protocol_name.toLowerCase()}://${getThisNodeName()}:${key}/`);
 				}
 			}
 

package/core/config/configUtils.js

@@ -7,6 +7,8 @@ const { configValidator } = require('../validation/configValidator.js');
 const fs = require('fs-extra');
 const YAML = require('yaml');
 const path = require('path');
+const { threadId } = require('node:worker_threads');
+const { randomBytes } = require('node:crypto');
 const isNumber = require('is-number');
 const PropertiesReader = require('properties-reader');
 const _ = require('lodash');
@@ -89,9 +91,11 @@ function getConfigPath(param) {
 	return path.resolve(rootPath, value);
 }
 
-// Write atomically via temp file + rename so readers don't observe a truncated/empty file
+// Write atomically via temp file + rename so readers don't observe a truncated/empty file.
+// Temp path includes randomness so two worker threads in the same process (same pid) writing
+// in the same millisecond can't collide on the temp name and then race the rename.
 function atomicWriteFile(filePath, content) {
-	const tempPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
+	const tempPath = `${filePath}.${process.pid}.${threadId}.${randomBytes(4).toString('hex')}.tmp`;
 	fs.writeFileSync(tempPath, content);
 	fs.renameSync(tempPath, filePath);
 }