@harperfast/harper 5.0.30 → 5.1.0-beta.2

package/utility/logging/{harper_logger.js → harper_logger.ts}

@@ -1,17 +1,17 @@
 'use strict';
 
 // Note - do not import/use commonUtils.js in this module, it will cause circular dependencies.
-const fs = require('fs-extra');
-const { workerData, threadId, isMainThread } = require('worker_threads');
-const pathModule = require('path');
-const YAML = require('yaml');
+import * as fs from 'fs-extra';
+import { workerData, threadId, isMainThread } from 'worker_threads';
+import * as pathModule from 'path';
+import * as YAML from 'yaml';
 const PropertiesReader = require('properties-reader');
-const hdbTerms = require('../hdbTerms.ts');
-const assignCMDENVVariables = require('../assignCmdEnvVariables.js');
-const os = require('os');
-const { PACKAGE_ROOT } = require('../../utility/packageUtils.js');
-const { _assignPackageExport } = require('../../globals.js');
-const { Console } = require('console');
+import * as hdbTerms from '../hdbTerms.ts';
+import assignCMDENVVariables from '../assignCmdEnvVariables.ts';
+import * as os from 'os';
+import { PACKAGE_ROOT } from '../../utility/packageUtils.js';
+import { _assignPackageExport } from '../../globals.js';
+import { Console } from 'console';
 // store the native write function so we can call it after we write to the log file (and store it on process.stdout
 // because unit tests will create multiple instances of this module)
 let nativeStdWrite = process.env.IS_SCRIPTED_SERVICE
@@ -19,7 +19,7 @@ let nativeStdWrite = process.env.IS_SCRIPTED_SERVICE
 			// if this is a child process started by a start/restart
 			// command, we can't write to stdout/stderr, we make this a noop
 		}
-	: process.stdout.nativeWrite || (process.stdout.nativeWrite = process.stdout.write);
+	: (process.stdout as any).nativeWrite || ((process.stdout as any).nativeWrite = process.stdout.write);
 let fileLoggers = new Map();
 const { join } = pathModule;
 
@@ -34,7 +34,7 @@ const LOG_LEVEL_HIERARCHY = {
 	trace: 1,
 };
 
-const OUTPUTS = {
+export const OUTPUTS = {
 	STDOUT: 'stdOut',
 	STDERR: 'stdErr',
 };
@@ -48,12 +48,45 @@ let logConsole;
 let log_to_file;
 let logToStdstreams;
 let colorMode;
-let logLevel;
+export let logLevel: any;
 let logName;
 let logRoot;
 let logFilePath;
 let mainLogger;
-let externalLogger; // default logger used for the global used by external components
+export let externalLogger: any = {
+	notify(...args) {
+		externalLogger.notify(...args);
+	},
+	fatal(...args) {
+		externalLogger.fatal(...args);
+	},
+	error(...args) {
+		externalLogger.error(...args);
+	},
+	warn(...args) {
+		externalLogger.warn(...args);
+	},
+	info(...args) {
+		externalLogger.info(...args);
+	},
+	debug(...args) {
+		externalLogger.debug(...args);
+	},
+	trace(...args) {
+		externalLogger.trace(...args);
+	},
+	withTag(tag) {
+		return externalLogger.withTag(tag);
+	},
+	loggerWithTag(tag) {
+		return externalLogger.withTag(tag);
+	},
+	forComponent(name: string) {
+		return externalLogger.forComponent(name);
+	},
+};
+_assignPackageExport('logger', externalLogger);
+// default logger used for the global used by external components
 let mainLogFd;
 let writeToLogFile;
 let logImmediately;
@@ -64,7 +97,7 @@ let hdbProperties;
 
 let rootConfig;
 
-function updateLogger(logger, logOptions, name) {
+function updateLogger(logger: any, logOptions: any, name?: string) {
 	logger.rotation = logOptions.rotation;
 	let path = logOptions.path;
 	if (path) {
@@ -88,7 +121,7 @@ function updateLogger(logger, logOptions, name) {
 // Using this conditional logger means that every method call must be optional like log.trace?.('message),
 // but there can be performance benefits to using this since it means that the arguments
 // do not need to be evaluated at all.
-function updateConditional(logger) {
+function updateConditional(logger: any) {
 	const conditional = logger.conditional ?? (logger.conditional = {});
 	conditional.notify = LOG_LEVEL_HIERARCHY.notify >= logger.level ? logger.notify.bind(logger) : undefined;
 	conditional.fatal = LOG_LEVEL_HIERARCHY.fatal >= logger.level ? logger.fatal.bind(logger) : undefined;
@@ -101,7 +134,7 @@ function updateConditional(logger) {
 /**
  * Resolve a config path value against rootPath if it is relative.
  */
-function resolveLogPath(configPath, rootPath) {
+function resolveLogPath(configPath: string, rootPath: string) {
 	if (!configPath || !rootPath) return configPath;
 	if (pathModule.isAbsolute(configPath)) return configPath;
 	return pathModule.resolve(rootPath, configPath);
@@ -148,6 +181,7 @@ async function updateLogSettings() {
 }
 
 class HarperLogger extends Console {
+	[key: string]: any;
 	constructor(streams, level) {
 		streams.stdout.removeListener = () => {};
 		streams.stderr.removeListener = () => {};
@@ -258,54 +292,22 @@ module.exports = {
 	startOnMainThread: updateLogSettings,
 	errorToString,
 	disableStdio,
+	externalLogger,
 };
 
 /**
  * We call this if stdio is not functional
  */
-function disableStdio() {
+export function disableStdio(_unused?: any) {
 	nativeStdWrite = function () {}; // make this a noop
 }
-module.exports.externalLogger = {
-	notify(...args) {
-		externalLogger.notify(...args);
-	},
-	fatal(...args) {
-		externalLogger.fatal(...args);
-	},
-	error(...args) {
-		externalLogger.error(...args);
-	},
-	warn(...args) {
-		externalLogger.warn(...args);
-	},
-	info(...args) {
-		externalLogger.info(...args);
-	},
-	debug(...args) {
-		externalLogger.debug(...args);
-	},
-	trace(...args) {
-		externalLogger.trace(...args);
-	},
-	withTag(tag) {
-		return externalLogger.withTag(tag);
-	},
-	loggerWithTag(tag) {
-		return externalLogger.withTag(tag);
-	},
-	forComponent(name) {
-		return externalLogger.forComponent(name);
-	},
-};
-_assignPackageExport('logger', module.exports.externalLogger);
 
 /**
  * Check if the current log level is at or below the given level.
  * @param level
  * @return {boolean}
  */
-function logsAtLevel(level) {
+export function logsAtLevel(level: any) {
 	return LOG_LEVEL_HIERARCHY[logLevel] <= LOG_LEVEL_HIERARCHY[level];
 }
 
@@ -314,7 +316,7 @@ function logsAtLevel(level) {
  * If the settings file doesn't exist (during install) check for command or env vars, if there aren't
  * any, use default values.
  */
-function initLogSettings(forceInit = false) {
+export function initLogSettings(forceInit = false) {
 	try {
 		if (hdbProperties === undefined || forceInit) {
 			closeLogFile();
@@ -363,7 +365,8 @@ function initLogSettings(forceInit = false) {
 			// setup the external logger
 			externalLogger = mainLogger.forComponent('external');
 			externalLogger.tag = null; // don't tag by default
-			if (isMainThread) {
+			if (isMainThread && typeof globalThis.Bun === 'undefined') {
+				// Bun will crash with the segfault handler, ironically
 				try {
 					const SegfaultHandler = require('segfault-handler');
 					SegfaultHandler.registerHandler(join(logRoot, 'crash.log'));
@@ -405,8 +408,12 @@ function initLogSettings(forceInit = false) {
 			return;
 		}
 
-		error('Error initializing log settings');
-		error(err);
+		console.error(err);
+
+		if (mainLogger) error('Error initializing log settings');
+		else console.error('Error initializing log settings');
+		if (mainLogger) error(err);
+
 		throw err;
 	}
 	if (process.env.DEV_MODE) logToStdstreams = true;
@@ -441,7 +448,7 @@ function stdioLogging() {
 	}
 }
 
-function loggerWithTag(tag, conditional, logger = mainLogger) {
+export function loggerWithTag(tag: string, conditional?: boolean, logger: any = mainLogger) {
 	tag = tag.replace(/ /g, '-'); // tag can't have spaces
 	return {
 		notify: logWithTag(logger.notify, 'notify'),
@@ -466,7 +473,7 @@ function loggerWithTag(tag, conditional, logger = mainLogger) {
 	}
 }
 
-function suppressLogging(callback) {
+export function suppressLogging(callback) {
 	try {
 		loggingEnabled = false;
 		callback();
@@ -481,15 +488,16 @@ const SERVICE_NAME = workerData?.name?.replace(/ /g, '-') || 'main';
 let currentLevel = 'info'; // default is info
 let currentServiceName;
 let currentTag;
-function createLogger({
-	path: logFilePath,
-	level: logLevel,
-	stdStreams: logToStdstreams,
-	rotation,
-	isExternalInstance,
-	writeToLog,
-	component,
-}) {
+export function createLogger(options: any = {} as any) {
+	let {
+		path: logFilePath,
+		level: logLevel,
+		stdStreams: logToStdstreams,
+		rotation,
+		isExternalInstance,
+		writeToLog,
+		component,
+	}: any = options;
 	if (!logLevel) logLevel = 'info';
 	let level = typeof logLevel === 'number' ? logLevel : LOG_LEVEL_HIERARCHY[logLevel];
 	let logger;
@@ -622,14 +630,14 @@ function getFileLogger(path, rotation, isExternalInstance) {
 		setTimeout(() => {
 			logger.rotator?.end();
 			if (!rotation) return;
-			const logRotator = require('./logRotator.js');
+			const { logRotator } = require('./logRotator');
 			try {
 				logger.rotator = logRotator({
 					logger,
 					...rotation,
 				});
 			} catch (error) {
-				logger('Error initializing log rotator', error);
+				logger(`Error initializing log rotator (log rotation disabled): ${error.message}`);
 			}
 		}, 100);
 	}
@@ -645,7 +653,7 @@ function getFileLogger(path, rotation, isExternalInstance) {
 			}
 			if (logImmediately) {
 				clearTimeout(logTimer);
-				logQueuedData();
+				logQueuedData(undefined);
 			}
 		} else {
 			if (logImmediately || logTimeUsage < performance.now() + LOG_TIME_USAGE_THRESHOLD) {
@@ -659,8 +667,8 @@ function getFileLogger(path, rotation, isExternalInstance) {
 		}
 	}
 	// this is called on a timer, and will write the log buffer to the file
-	function logQueuedData(entry) {
-		openLogFile();
+	function logQueuedData(entry?: any) {
+		openLogFile(undefined);
 		if (logFD) {
 			let startTime = performance.now();
 			fs.appendFileSync(logFD, logBuffer ? logBuffer.join('') : entry);
@@ -672,7 +680,7 @@ function getFileLogger(path, rotation, isExternalInstance) {
 		if (logBuffer) logBuffer = null;
 	}
 
-	function closeLogFile() {
+	function closeLogFile(_unused?: any) {
 		try {
 			fs.closeSync(logFD);
 		} catch {}
@@ -680,7 +688,7 @@ function getFileLogger(path, rotation, isExternalInstance) {
 		if (isExternalInstance) mainLogFd = null;
 	}
 
-	function openLogFile(isRetry) {
+	function openLogFile(isRetry?: any) {
 		if (!logFD) {
 			try {
 				logFD = fs.openSync(path, 'a');
@@ -707,7 +715,7 @@ function getFileLogger(path, rotation, isExternalInstance) {
  * @param args - rest parameter syntax (...args), allows function to accept indefinite number of args as an array of log messages(strings/objects).
  * Provide args separated by commas. No need to stringify objects. Console will do that
  */
-function info(...args) {
+export function info(...args) {
 	mainLogger.info(...args);
 }
 
@@ -716,7 +724,7 @@ function info(...args) {
  * @param args - rest parameter syntax (...args), allows function to accept indefinite number of args as an array of log messages(strings/objects).
  * Provide args separated by commas. No need to stringify objects. Console will do that
  */
-function trace(...args) {
+export function trace(...args) {
 	mainLogger.trace(...args);
 }
 
@@ -725,7 +733,7 @@ function trace(...args) {
  * @param args - rest parameter syntax (...args), allows function to accept indefinite number of args as an array of log messages(strings/objects).
  * Provide args separated by commas. No need to stringify objects. Console will do that
  */
-function error(...args) {
+export function error(...args) {
 	mainLogger.error(...args);
 }
 
@@ -734,7 +742,7 @@ function error(...args) {
  * @param args - rest parameter syntax (...args), allows function to accept indefinite number of args as an array of log messages(strings/objects).
  * Provide args separated by commas. No need to stringify objects. Console will do that
  */
-function debug(...args) {
+export function debug(...args) {
 	mainLogger.debug(...args);
 }
 
@@ -743,7 +751,7 @@ function debug(...args) {
  * @param args - rest parameter syntax (...args), allows function to accept indefinite number of args as an array of log messages(strings/objects).
  * Provide args separated by commas. No need to stringify objects. Console will do that
  */
-function notify(...args) {
+export function notify(...args) {
 	mainLogger.notify(...args);
 }
 
@@ -752,7 +760,7 @@ function notify(...args) {
  * @param args - rest parameter syntax (...args), allows function to accept indefinite number of args as an array of log messages(strings/objects).
  * Provide args separated by commas. No need to stringify objects. Console will do that
  */
-function fatal(...args) {
+export function fatal(...args) {
 	mainLogger.fatal(...args);
 }
 
@@ -761,11 +769,11 @@ function fatal(...args) {
  * @param args - rest parameter syntax (...args), allows function to accept indefinite number of args as an array of log messages(strings/objects).
  * Provide args separated by commas. No need to stringify objects. Console will do that
  */
-function warn(...args) {
+export function warn(...args) {
 	mainLogger.warn(...args);
 }
 
-function logCustomLevel(level, output, options, ...args) {
+export function logCustomLevel(level: any, output: any, options: any, ...args: any[]) {
 	currentServiceName = options.service_name;
 	try {
 		mainLogger[level](...args);
@@ -779,7 +787,7 @@ function logCustomLevel(level, output, options, ...args) {
  * that happens when commonUtils is imported.
  * @returns {*}
  */
-function getPropsFilePath() {
+export function getPropsFilePath() {
 	let homeDir = undefined;
 	try {
 		homeDir = os.homedir();
@@ -823,15 +831,15 @@ function getLogConfig(hdbConfigPath) {
 		const configDoc = YAML.parseDocument(fs.readFileSync(hdbConfigPath, 'utf8'));
 		const rootPath = configDoc.getIn(['rootPath']);
 		const level = configDoc.getIn(['logging', 'level']);
-		const configLogPath = resolveLogPath(configDoc.getIn(['logging', 'root']), rootPath);
+		const configLogPath = resolveLogPath(configDoc.getIn(['logging', 'root']) as any, rootPath as any);
 		const toFile = configDoc.getIn(['logging', 'file']);
 		const toStream = configDoc.getIn(['logging', 'stdStreams']);
 		const logConsole = configDoc.getIn(['logging', 'console']);
 		const colorMode = configDoc.getIn(['logging', 'colors']) ?? true; // default to true
-		const rotation = configDoc.getIn(['logging', 'rotation'])?.toJSON();
+		const rotation = (configDoc.getIn(['logging', 'rotation']) as any)?.toJSON();
 		// Resolve rotation path if relative
 		if (rotation?.path) {
-			rotation.path = resolveLogPath(rotation.path, rootPath);
+			rotation.path = resolveLogPath(rotation.path, rootPath as any);
 		}
 
 		return {
@@ -883,11 +891,11 @@ function getDefaultConfig() {
  * @param error
  * @return {string|string}
  */
-function errorToString(error) {
+export function errorToString(error: any) {
 	return typeof error.message === 'string' ? `${error.constructor.name}: ${error.message}` : error.toString();
 }
 
-function setMainLogger(logger) {
+export function setMainLogger(logger: any) {
 	mainLogger = logger;
 }
 function closeLogFile() {
@@ -897,7 +905,15 @@ function closeLogFile() {
 	mainLogFd = null;
 }
 
-function AuthAuditLog(username, status, type, originatingIp, requestMethod, path) {
+export function AuthAuditLog(
+	this: any,
+	username: any,
+	status: any,
+	type: any,
+	originatingIp: any,
+	requestMethod: any,
+	path: any
+) {
 	this.username = username;
 	this.status = status;
 	this.type = type;
@@ -906,4 +922,35 @@ function AuthAuditLog(username, status, type, originatingIp, requestMethod, path
 	this.path = path;
 }
 // we have to load this at the end to avoid circular dependencies problems
-const { RootConfigWatcher } = require('../../config/RootConfigWatcher.ts');
+import { RootConfigWatcher } from '../../config/RootConfigWatcher.ts';
+
+export const getLogFilePath = () => logFilePath;
+export const forComponent = (name: string, isExternal?: boolean) => mainLogger.forComponent(name, isExternal);
+export default {
+	notify,
+	fatal,
+	error,
+	warn,
+	info,
+	debug,
+	trace,
+	get logLevel() {
+		return logLevel;
+	},
+	loggerWithTag,
+	suppressLogging,
+	initLogSettings,
+	logCustomLevel,
+	closeLogFile,
+	createLogger,
+	logsAtLevel,
+	getLogFilePath,
+	forComponent,
+	setMainLogger,
+	setLogLevel,
+	OUTPUTS,
+	disableStdio,
+	externalLogger,
+	AuthAuditLog,
+	errorToString,
+};

package/utility/logging/{logRotator.js → logRotator.ts}

@@ -1,27 +1,24 @@
 'use strict';
 
-const { promises: fsProm, createReadStream, createWriteStream, mkdirSync } = require('fs');
-const { createGzip } = require('zlib');
-const { promisify } = require('util');
-const { pipeline } = require('stream');
+import { promises as fsProm, createReadStream, createWriteStream, mkdirSync } from 'fs';
+import { createGzip } from 'zlib';
+import { promisify } from 'util';
+import { pipeline } from 'stream';
 const pipe = promisify(pipeline);
-const path = require('path');
-const envMgr = require('../environment/environmentManager.js');
+import * as path from 'path';
+import * as envMgr from '../environment/environmentManager.ts';
 envMgr.initSync();
-const hdbLogger = require('./harper_logger.js');
-const { CONFIG_PARAMS } = require('../hdbTerms.ts');
-const { convertToMS } = require('../common_utils.js');
-const { onStorageReclamation } = require('../../server/storageReclamation.ts');
+import hdbLogger from './harper_logger.ts';
+import { CONFIG_PARAMS } from '../hdbTerms.ts';
+import { convertToMS } from '../common_utils.ts';
+import { onStorageReclamation } from '../../server/storageReclamation.ts';
 
 // Interval in ms to check log file and decide if it should be rotated.
 const LOG_AUDIT_INTERVAL = 60000;
 const INT_SIZE_UNDEFINED_MSG =
 	"'interval' and 'maxSize' are both undefined, to enable logging rotation at least one of these values must be defined in harperdb-config.yaml";
 
-let lastRotationTime;
-let setIntervalId;
-
-module.exports = logRotator;
+export { logRotator };
 
 /**
  * Rotates hdb.log using an interval and/or maxSize param to determine if log should be rotated.
@@ -29,7 +26,7 @@ module.exports = logRotator;
  * If log file is within the values set in config, log file will be renamed/moved and a new empty hdb.log created.
  * @returns LogRotator
  */
-function logRotator({ logger, maxSize, interval, retention, enabled, path: rotatedLogDir, auditInterval }) {
+function logRotator({ logger, maxSize, interval, retention, enabled, path: rotatedLogDir, auditInterval }: any) {
 	if (enabled === false) return;
 	let reclamationPriority = 0;
 	onStorageReclamation(
@@ -67,9 +64,9 @@ function logRotator({ logger, maxSize, interval, retention, enabled, path: rotat
 
 	let lastRotatedLogPath;
 	// convert date.now to minutes
-	lastRotationTime = Date.now();
+	let lastRotationTime = Date.now();
 	hdbLogger.trace('Log rotate enabled, maxSize:', maxSize, 'interval:', interval);
-	setIntervalId = setInterval(async () => {
+	const setIntervalId = setInterval(async () => {
 		if (maxBytes) {
 			let fileStats;
 			try {
@@ -132,7 +129,7 @@ function logRotator({ logger, maxSize, interval, retention, enabled, path: rotat
 	};
 }
 
-async function moveLogFile(logPath, rotatedLogPath) {
+async function moveLogFile(logPath: string, rotatedLogPath: string) {
 	const compress = envMgr.get(CONFIG_PARAMS.LOGGING_ROTATION_COMPRESS);
 	let fullRotateLogPath = path.join(
 		rotatedLogPath,

package/utility/logging/logger.ts

@@ -1,5 +1,5 @@
 /** Like harperLogger, but conditionally exports functions based on the log level. */
-import harperLogger from './harper_logger.js';
+import harperLogger from './harper_logger.ts';
 
 export const logger: Logger = {};
 

package/utility/logging/{readLog.js → readLog.ts}

@@ -1,19 +1,19 @@
 'use strict';
 
-const hdbTerms = require('../hdbTerms.ts');
-const hdbLogger = require('./harper_logger.js');
-const validator = require('../../validation/readLogValidator.js');
-const path = require('path');
-const fs = require('fs-extra');
-const { once } = require('events');
-const { getConfigPath } = require('../../config/configUtils.js');
-const { handleHDBError, hdbErrors } = require('../errors/hdbError.js');
-const { server } = require('../../server/Server.ts');
+import * as hdbTerms from '../hdbTerms.ts';
+import hdbLogger from './harper_logger.ts';
+import validator from '../../validation/readLogValidator.ts';
+import * as path from 'path';
+import * as fs from 'fs-extra';
+import { once } from 'events';
+import { getConfigPath } from '../../config/configUtils.js';
+import { handleHDBError, hdbErrors } from '../errors/hdbError.ts';
+import { server } from '../../server/Server.ts';
 
 const DEFAULT_READ_LOG_LIMIT = 1000;
 const ESTIMATED_AVERAGE_ENTRY_SIZE = 200;
 
-module.exports = readLog;
+export default readLog;
 
 /**
  * Reads a log via a read stream and filters lines if filter params are passed.
@@ -21,7 +21,7 @@ module.exports = readLog;
  * @param request
  * @returns {Promise<*[]>}
  */
-async function readLog(request) {
+async function readLog(request: any) {
 	const validation = validator(request);
 	if (validation) {
 		throw handleHDBError(
@@ -106,7 +106,7 @@ async function readLog(request) {
 		}
 	});
 	readLogInputStream.resume();
-	function onLogMessage(line) {
+	function onLogMessage(line: any) {
 		if (filter !== undefined) {
 			let found = false;
 			if (
@@ -271,9 +271,9 @@ async function readLog(request) {
 			line.node = server.hostname;
 		}
 		// and then add the lines from the other nodes
-		for (let nodeResult of replicatedResponse.replicated) {
-			let node = nodeResult.node;
-			if (nodeResult.status === 'failed') {
+		for (let nodeResult of (replicatedResponse as any).replicated) {
+			let node = (nodeResult as any).node;
+			if ((nodeResult as any).status === 'failed') {
 				// if the node failed to replicate, add an error line
 				pushLineToResult(
 					{
@@ -286,7 +286,7 @@ async function readLog(request) {
 					result
 				);
 			} else {
-				for (let line of nodeResult.results) {
+				for (let line of (nodeResult as any).results) {
 					line.node = node;
 					pushLineToResult(line, order, result);
 				}
@@ -303,7 +303,7 @@ async function readLog(request) {
  * @param order
  * @param result
  */
-function pushLineToResult(line, order, result) {
+function pushLineToResult(line: any, order: string | undefined, result: any[]) {
 	if (order === 'desc') {
 		insertDescending(line, result);
 	} else if (order === 'asc') {
@@ -318,7 +318,7 @@ function pushLineToResult(line, order, result) {
  * @param value
  * @param result
  */
-function insertDescending(value, result) {
+function insertDescending(value: any, result: any[]) {
 	const dateVal = new Date(value.timestamp);
 	let low = 0;
 	let high = result.length;
@@ -336,7 +336,7 @@ function insertDescending(value, result) {
  * @param value
  * @param result
  */
-function insertAscending(value, result) {
+function insertAscending(value: any, result: any[]) {
 	const dateVal = new Date(value.timestamp);
 	let low = 0;
 	let high = result.length;

package/utility/logging/{transactionLog.js → transactionLog.ts}

@@ -1,21 +1,17 @@
 'use strict';
 
-const hdbUtils = require('../common_utils.js');
-const log = require('./harper_logger.js');
-const { handleHDBError, hdbErrors } = require('../errors/hdbError.js');
-const { HTTP_STATUS_CODES } = hdbErrors;
-const {
+import * as hdbUtils from '../common_utils.ts';
+import log from './harper_logger.ts';
+import { handleHDBError } from '../errors/hdbError.ts';
+import { HTTP_STATUS_CODES } from '../errors/commonErrors.ts';
+
+import {
 	readTransactionLogValidator,
 	deleteTransactionLogsBeforeValidator,
-} = require('../../validation/transactionLogValidator.js');
-const harperBridge = require('../../dataLayer/harperBridge/harperBridge.js');
-
-module.exports = {
-	readTransactionLog,
-	deleteTransactionLogsBefore,
-};
+} from '../../validation/transactionLogValidator.ts';
+const harperBridge = require('../../dataLayer/harperBridge/harperBridge').default;
 
-async function readTransactionLog(req) {
+export async function readTransactionLog(req: any) {
 	const validation = readTransactionLogValidator(req);
 	if (validation) {
 		throw handleHDBError(validation, validation.message, HTTP_STATUS_CODES.BAD_REQUEST, undefined, undefined, true);
@@ -44,7 +40,7 @@ async function readTransactionLog(req) {
  * @param req - {schema, table, timestamp}
  * @returns {Promise<string>}
  */
-async function deleteTransactionLogsBefore(req) {
+export async function deleteTransactionLogsBefore(req: any) {
 	const validation = deleteTransactionLogsBeforeValidator(req);
 	if (validation.error) {
 		const err = new Error(validation.error.message);