@harperfast/harper-pro 5.0.0-alpha.7 → 5.0.0-alpha.9

package/core/components/Application.ts

@@ -1,3 +1,4 @@
+import { type Logger } from '../utility/logging/logger.ts';
 import { getConfigObj, getConfigValue } from '../config/configUtils.js';
 import { CONFIG_PARAMS } from '../utility/hdbTerms.js';
 import logger from '../utility/logging/harper_logger.js';
@@ -392,7 +393,7 @@ export class Application {
 	packageIdentifier?: string;
 	install?: { command?: string; timeout?: number };
 	dirPath: string;
-	logger: any;
+	logger: Logger;
 	packageManagerPrefix: string; // can be used to configure a package manager prefix, specifically "sfw".
 
 	constructor({ name, payload, packageIdentifier, install }: ApplicationOptions) {
@@ -503,7 +504,7 @@ export async function installApplications() {
 				harperApplicationLock.applications[name] &&
 				JSON.stringify(harperApplicationLock.applications[name]) === JSON.stringify(applicationConfig)
 			) {
-				logger.info(`Application ${name} is already installed with matching configuration; skipping installation`);
+				logger.info?.(`Application ${name} is already installed with matching configuration; skipping installation`);
 				continue;
 			}
 
@@ -511,13 +512,13 @@ export async function installApplications() {
 
 			harperApplicationLock.applications[name] = applicationConfig;
 		} catch (error) {
-			logger.error(`Skipping installation of application ${name} due to invalid configuration: ${error.message}`);
+			logger.error?.(`Skipping installation of application ${name} due to invalid configuration: ${error.message}`);
 		}
 	}
 
 	const applicationInstallationStatuses = await Promise.allSettled(applicationInstallationPromises);
-	logger.debug(applicationInstallationStatuses);
-	logger.info('All root applications loaded');
+	logger.debug?.(applicationInstallationStatuses);
+	logger.info?.('All root applications loaded');
 
 	// Finally, write the lock file
 	await writeFile(harperApplicationLockPath, JSON.stringify(harperApplicationLock, null, 2), 'utf8');
@@ -558,7 +559,7 @@ export function nonInteractiveSpawn(
 	return new Promise((resolve, reject) => {
 		logger
 			.loggerWithTag(`${applicationName}:spawn:${command}`)
-			.debug(`Executing \`${command} ${args.join(' ')}\` in ${cwd}`);
+			.debug?.(`Executing \`${command} ${args.join(' ')}\` in ${cwd}`);
 
 		const env = { ...process.env };
 
@@ -586,7 +587,7 @@ export function nonInteractiveSpawn(
 			// log stdout lines immediately
 			// TODO: Technically nothing guarantees that a chunk will be a complete line so need to implement
 			// something here to buffer until a newline character, then log the complete line
-			logger.loggerWithTag(`${applicationName}:spawn:${command}:stdout`).debug(chunk.toString());
+			logger.loggerWithTag(`${applicationName}:spawn:${command}:stdout`).debug?.(chunk.toString());
 		});
 
 		// buffer stderr
@@ -609,7 +610,7 @@ export function nonInteractiveSpawn(
 			if (stderr) {
 				printStd(applicationName, command, stderr, 'stderr');
 			}
-			logger.loggerWithTag(`${applicationName}:spawn:${command}`).debug(`Process exited with code ${code}`);
+			logger.loggerWithTag(`${applicationName}:spawn:${command}`).debug?.(`Process exited with code ${code}`);
 			resolve({
 				stdout,
 				stderr,
@@ -640,6 +641,6 @@ function printStd(
 ) {
 	const stdLogger = logger.loggerWithTag(`${applicationName}:spawn:${command}:${stdStreamLabel}`);
 	for (const line of stdString.split('\n')) {
-		stdLogger[level](line);
+		stdLogger[level]?.(line);
 	}
 }

package/core/components/ApplicationScope.ts

@@ -0,0 +1,49 @@
+import type { Resources } from '../resources/Resources.ts';
+import { type Server } from '../server/Server.ts';
+import { loggerWithTag } from '../utility/logging/harper_logger.js';
+import { scopedImport } from '../security/jsLoader.ts';
+import * as env from '../utility/environment/environmentManager.js';
+import { CONFIG_PARAMS } from '../utility/hdbTerms.ts';
+
+export class MissingDefaultFilesOptionError extends Error {
+	constructor() {
+		super('No default files option exists. Ensure `files` is specified in config.yaml');
+		this.name = 'MissingDefaultFilesOptionError';
+	}
+}
+
+/**
+ * This class is used to represent the application scope for the VM context used for loading modules within an application
+ */
+export class ApplicationScope {
+	logger: any;
+	resources: Resources;
+	server: Server;
+	mode?: 'none' | 'vm' | 'compartment'; // option to set this from the scope
+	dependencyContainment?: boolean; // option to set this from the scope
+	verifyPath?: string;
+	config: any;
+	constructor(name: string, resources: Resources, server: Server, verifyPath?: string) {
+		this.logger = loggerWithTag(name);
+
+		this.resources = resources;
+		this.server = server;
+
+		this.mode = env.get(CONFIG_PARAMS.APPLICATIONS_CONTAINMENT) ?? 'vm';
+		this.dependencyContainment = Boolean(env.get(CONFIG_PARAMS.APPLICATIONS_DEPENDENCYCONTAINMENT));
+		this.verifyPath = verifyPath;
+	}
+
+	/**
+	 * The compartment that is used for this scope and any imports that it makes
+	 */
+	compartment?: Promise<any>;
+	/**
+	 * Import a file into the scope's sandbox.
+	 * @param filePath - The path of the file to import.
+	 * @returns A promise that resolves with the imported module or value.
+	 */
+	async import(filePath: string): Promise<unknown> {
+		return scopedImport(filePath, this);
+	}
+}

package/core/components/EntryHandler.ts

@@ -1,7 +1,8 @@
+import { type Logger } from '../utility/logging/logger.ts';
+import { loggerWithTag } from '../utility/logging/harper_logger.js';
 import type { Stats } from 'node:fs';
 import { EventEmitter, once } from 'node:events';
 import { Component, FileAndURLPathConfig } from './Component.js';
-import harperLogger from '../utility/logging/harper_logger.js';
 import chokidar, { FSWatcher, FSWatcherEventMap } from 'chokidar';
 import { join } from 'node:path';
 import { readFile } from 'node:fs/promises';
@@ -71,16 +72,16 @@ export type EntryHandlerEventMap = {
 export class EntryHandler extends EventEmitter<EntryHandlerEventMap> {
 	#component: Component;
 	#watcher?: FSWatcher;
-	#logger: any;
+	#logger: Logger;
 	#pendingFileReads: Set<Promise<void>>;
 	#isInitialScanComplete: boolean;
 	ready: Promise<any[]>;
 
-	constructor(name: string, directory: string, config: FilesOption | FileAndURLPathConfig, logger?: any) {
+	constructor(name: string, directory: string, config: FilesOption | FileAndURLPathConfig, logger?: Logger) {
 		super();
 
 		this.#component = new Component(name, directory, castConfig(config));
-		this.#logger = logger || harperLogger.loggerWithTag(name);
+		this.#logger = logger || loggerWithTag(name);
 		this.#pendingFileReads = new Set();
 		this.#isInitialScanComplete = false;
 		this.ready = once(this, 'ready');

package/core/components/OptionsWatcher.ts

@@ -1,9 +1,10 @@
+import { type Logger } from '../utility/logging/logger.ts';
+import { loggerWithTag } from '../utility/logging/harper_logger.js';
 import { EventEmitter, once } from 'events';
 import yaml from 'yaml';
 import chokidar, { type FSWatcher } from 'chokidar';
 import { readFile } from 'node:fs/promises';
 import { isDeepStrictEqual } from 'util';
-import harperLogger from '../utility/logging/harper_logger.js';
 import { DEFAULT_CONFIG } from './DEFAULT_CONFIG.js';
 import { cloneDeep } from 'lodash';
 
@@ -85,14 +86,14 @@ export class OptionsWatcher extends EventEmitter<OptionsWatcherEventMap> {
 	#scopedConfig?: ConfigValue;
 	#rootConfig?: Config;
 	#name: string;
-	#logger: any;
+	#logger: Logger;
 	ready: Promise<any[]>;
 
-	constructor(name: string, filePath: string, logger?: any) {
+	constructor(name: string, filePath: string, logger?: Logger) {
 		super();
 		this.#name = name;
 		this.#filePath = filePath;
-		this.#logger = logger || harperLogger.loggerWithTag(name);
+		this.#logger = logger || loggerWithTag(name);
 		this.ready = once(this, 'ready');
 		this.#watcher = chokidar
 			.watch(filePath, { persistent: false })
@@ -153,7 +154,7 @@ export class OptionsWatcher extends EventEmitter<OptionsWatcherEventMap> {
 	}
 
 	#handleUnlink(path: string) {
-		this.#logger.warn(
+		this.#logger.warn?.(
 			`Configuration file ${path} was deleted. Reverting to default configuration. Recreate it to restore the options watcher.`
 		);
 		this.#resetConfig();

package/core/components/Scope.ts

@@ -1,15 +1,14 @@
+import { type Logger } from '../utility/logging/logger.ts';
+import { loggerWithTag } from '../utility/logging/harper_logger.js';
 import { EventEmitter, once } from 'node:events';
-import { type Server } from '../server/Server.ts';
+import { server, type Server } from '../server/Server.ts';
 import { EntryHandler, type EntryHandlerEventMap, type onEntryEventHandler } from './EntryHandler.ts';
 import { OptionsWatcher, OptionsWatcherEventMap } from './OptionsWatcher.ts';
-import { loggerWithTag } from '../utility/logging/harper_logger.js';
-import type { Resources } from '../resources/Resources.ts';
+import { resources, type Resources } from '../resources/Resources.ts';
 import type { FileAndURLPathConfig } from './Component.ts';
 import { FilesOption } from './deriveGlobOptions.ts';
 import { requestRestart } from './requestRestart.ts';
-import { scopedImport } from '../security/jsLoader.ts';
-import * as env from '../utility/environment/environmentManager.js';
-import { CONFIG_PARAMS } from '../utility/hdbTerms';
+import { ApplicationScope } from './ApplicationScope.ts';
 
 export class MissingDefaultFilesOptionError extends Error {
 	constructor() {
@@ -18,12 +17,6 @@ export class MissingDefaultFilesOptionError extends Error {
 	}
 }
 
-export interface ApplicationContainment {
-	mode?: 'none' | 'vm' | 'compartment'; // option to set this from the scope
-	dependencyContainment?: boolean; // option to set this from the scope
-	verifyPath?: string;
-}
-
 /**
  * This class is what is passed to the `handleApplication` function of an extension.
  *
@@ -37,15 +30,15 @@ export class Scope extends EventEmitter {
 	#name: string;
 	#entryHandler?: EntryHandler;
 	#entryHandlers: EntryHandler[];
-	#logger: any;
+	#logger: Logger;
 	#pendingInitialLoads: Set<Promise<void>>;
+	applicationScope?: ApplicationScope;
 
 	options: OptionsWatcher;
-	resources: Resources;
-	server: Server;
+	resources?: Resources;
+	server?: Server;
 	ready: Promise<any[]>;
-	applicationContainment?: ApplicationContainment;
-	constructor(name: string, directory: string, configFilePath: string, resources: Resources, server: Server) {
+	constructor(name: string, directory: string, configFilePath: string, applicationScope: ApplicationScope) {
 		super();
 
 		this.#name = name;
@@ -53,8 +46,9 @@ export class Scope extends EventEmitter {
 		this.#configFilePath = configFilePath;
 		this.#logger = loggerWithTag(this.#name);
 
-		this.resources = resources;
-		this.server = server;
+		this.applicationScope = applicationScope;
+		this.resources = applicationScope?.resources ?? resources;
+		this.server = applicationScope?.server ?? server;
 
 		this.#entryHandlers = [];
 		this.#pendingInitialLoads = new Set();
@@ -66,15 +60,9 @@ export class Scope extends EventEmitter {
 			.on('error', this.#handleError.bind(this))
 			.on('change', this.#optionsWatcherChangeListener.bind(this)())
 			.on('ready', this.#handleOptionsWatcherReady.bind(this));
-
-		this.applicationContainment = {
-			mode: env.get(CONFIG_PARAMS.APPLICATIONS_CONTAINMENT) ?? 'vm',
-			dependencyContainment: Boolean(env.get(CONFIG_PARAMS.APPLICATIONS_DEPENDENCYCONTAINMENT)),
-			verifyPath: directory,
-		};
 	}
 
-	get logger(): any {
+	get logger(): Logger {
 		return this.#logger;
 	}
 
@@ -174,7 +162,7 @@ export class Scope extends EventEmitter {
 				return;
 			}
 
-			scope.#logger.debug(`Options changed: ${key.join('.')}, requesting restart`);
+			scope.#logger.debug?.(`Options changed: ${key.join('.')}, requesting restart`);
 			scope.requestRestart();
 		};
 	}
@@ -291,7 +279,7 @@ export class Scope extends EventEmitter {
 	}
 
 	requestRestart() {
-		this.#logger.debug(`Restart requested from ${this.name} scope for ${this.directory}`);
+		this.#logger.debug?.(`Restart requested from ${this.name} scope for ${this.directory}`);
 		requestRestart();
 	}
 
@@ -306,16 +294,12 @@ export class Scope extends EventEmitter {
 		}
 	}
 
-	/**
-	 * The compartment that is used for this scope and any imports that it makes
-	 */
-	compartment?: Promise<any>;
 	/**
 	 * Import a file into the scope's sandbox.
 	 * @param filePath - The path of the file to import.
 	 * @returns A promise that resolves with the imported module or value.
 	 */
 	async import(filePath: string): Promise<unknown> {
-		return scopedImport(filePath, this);
+		return this.applicationScope ? this.applicationScope.import(filePath) : import(filePath);
 	}
 }

package/core/components/componentLoader.ts

@@ -29,7 +29,8 @@ import * as mqtt from '../server/mqtt.ts';
 import { getConfigObj, resolvePath } from '../config/configUtils.js';
 import { createReuseportFd } from '../server/serverHelpers/Request.ts';
 import { ErrorResource } from '../resources/ErrorResource.ts';
-import { Scope, type ApplicationContainment } from './Scope.ts';
+import { Scope } from './Scope.ts';
+import { ApplicationScope } from './ApplicationScope.ts';
 import { ComponentV1, processResourceExtensionComponent } from './ComponentV1.ts';
 import * as httpComponent from '../server/http.ts';
 import { Status } from '../server/status/index.ts';
@@ -219,6 +220,7 @@ function sequentiallyHandleApplication(scope: Scope, plugin: PluginModule) {
 
 export interface LoadComponentOptions {
 	isRoot?: boolean;
+	applicationScope?: ApplicationScope;
 	autoReload?: boolean;
 	applicationContainment?: ApplicationContainment;
 	providedLoadedComponents?: Map<any, any>;
@@ -241,7 +243,14 @@ export async function loadComponent(
 	const resolvedFolder = realpathSync(componentDirectory);
 	if (loadedPaths.has(resolvedFolder)) return loadedPaths.get(resolvedFolder);
 	loadedPaths.set(resolvedFolder, true);
-	const { providedLoadedComponents, isRoot, autoReload } = options;
+
+	const {
+		providedLoadedComponents,
+		applicationScope = new ApplicationScope(basename(componentDirectory), resources, server),
+		isRoot,
+		autoReload,
+	} = options;
+	applicationScope.verifyPath ??= componentDirectory;
 	if (providedLoadedComponents) loadedComponents = providedLoadedComponents;
 	try {
 		let config;
@@ -257,6 +266,7 @@ export async function loadComponent(
 		} else {
 			config = DEFAULT_CONFIG;
 		}
+		applicationScope.config ??= config;
 
 		if (!isRoot) {
 			try {
@@ -286,6 +296,8 @@ export async function loadComponent(
 			// Initialize loading status for all components (applications and extensions)
 			componentLifecycle.loading(componentStatusName);
 
+			const subApplicationScope = isRoot ? new ApplicationScope(componentName, resources, server) : applicationScope;
+
 			let extensionModule: any;
 			const pkg = componentConfig.package;
 			try {
@@ -306,8 +318,11 @@ export async function loadComponent(
 						}
 					}
 					if (componentPath) {
+						subApplicationScope.verifyPath = componentPath;
 						if (!process.env.HARPER_SAFE_MODE) {
-							extensionModule = await loadComponent(componentPath, resources, origin);
+							extensionModule = await loadComponent(componentPath, resources, origin, {
+								applicationScope: subApplicationScope,
+							});
 							componentFunctionality[componentName] = true;
 						}
 					} else {
@@ -317,7 +332,7 @@ export async function loadComponent(
 					const plugin = TRUSTED_RESOURCE_PLUGINS[componentName];
 					extensionModule =
 						typeof plugin === 'string'
-							? await scopedImport(plugin.startsWith('@/') ? join(PACKAGE_ROOT, plugin.slice(1)) : plugin)
+							? await import(plugin.startsWith('@/') ? join(PACKAGE_ROOT, plugin.slice(1)) : plugin)
 							: plugin;
 				}
 
@@ -358,8 +373,7 @@ export async function loadComponent(
 
 				// New Plugin API (`handleApplication`)
 				if (resources.isWorker && extensionModule.handleApplication) {
-					const scope = new Scope(componentName, componentDirectory, configPath, resources, server);
-					if (options.applicationContainment) scope.applicationContainment = options.applicationContainment;
+					const scope = new Scope(componentName, componentDirectory, configPath, applicationScope);
 
 					await sequentiallyHandleApplication(scope, extensionModule);
 
@@ -464,7 +478,10 @@ export async function loadComponent(
 			});
 		}
 		if (config.extensionModule || config.pluginModule) {
-			const extensionModule = await import(join(componentDirectory, config.extensionModule || config.pluginModule));
+			const extensionModule = await scopedImport(
+				join(componentDirectory, config.extensionModule || config.pluginModule),
+				applicationScope
+			);
 			loadedPaths.set(resolvedFolder, extensionModule);
 			return extensionModule;
 		}

package/core/components/status/crossThread.ts

@@ -8,7 +8,7 @@
 import { sendItcEvent } from '../../server/threads/itc.js';
 import { getWorkerIndex, onMessageByType, getWorkerCount } from '../../server/threads/manageThreads.js';
 import { ITC_EVENT_TYPES } from '../../utility/hdbTerms.ts';
-import { loggerWithTag } from '../../utility/logging/logger.js';
+import { loggerWithTag } from '../../utility/logging/logger.ts';
 import { ComponentStatusRegistry } from './ComponentStatusRegistry.ts';
 import {
 	type ComponentStatusSummary,

package/core/config/harperConfigEnvVars.ts

@@ -11,6 +11,7 @@
  * - Snapshot-based deletion (remove values when omitted from env var)
  */
 
+import type { Logger } from '../utility/logging/logger.ts';
 import * as fs from 'fs-extra';
 import * as path from 'node:path';
 import * as crypto from 'node:crypto';
@@ -22,8 +23,8 @@ const STATE_FILE_NAME = '.harper-config-state.json';
  * Get logger instance with tag - lazy loaded to avoid circular dependencies
  * and ensure logger is initialized before use
  */
-function getLogger() {
-	const { loggerWithTag } = require('../utility/logging/logger.js');
+function getLogger(): Logger {
+	const { loggerWithTag } = require('../utility/logging/harper_logger.js');
 	return loggerWithTag('env-config');
 }
 

package/core/index.d.ts

@@ -17,6 +17,7 @@ import { server as serverImport } from './server/Server.ts';
 export { tables, databases } from './resources/databases.ts';
 import { tables as dbTables, databases as dbDatabases } from './resources/databases.ts';
 import { BlobCreationOptions } from './resources/blob.ts';
+import { Logger } from './utility/logging/logger.ts';
 export { Scope } from './components/Scope.ts';
 export type { FilesOption, FilesOptionObject } from './components/deriveGlobOptions.ts';
 export type { FileAndURLPathConfig } from './components/Component.ts';
@@ -34,6 +35,10 @@ export {
 	type UnlinkDirectoryEvent,
 	type DirectoryEntryEvent,
 } from './components/EntryHandler.ts';
+
+declare const logger: Logger;
+export { type Logger, logger };
+
 declare global {
 	const tables: typeof dbTables;
 	const databases: typeof dbDatabases;

package/core/index.js

@@ -14,6 +14,7 @@ exports.FileAndURLPathConfig = undefined;
 exports.FilesOption = undefined;
 exports.FilesOptionObject = undefined;
 exports.IterableEventQueue = undefined;
+exports.Logger = undefined;
 exports.Query = undefined;
 exports.RecordObject = undefined;
 exports.RequestTarget = undefined;

package/core/integrationTests/utils/harperLifecycle.ts

@@ -153,11 +153,6 @@ function runHarperCommand({ args, env, completionMessage, logDir }: RunHarperCom
 			stderr += data.toString();
 		});
 
-		proc.on('exit', () => {
-			stdoutStream?.end();
-			stderrStream?.end();
-		});
-
 		proc.on('error', (error) => {
 			reject(error);
 		});
@@ -167,11 +162,14 @@ function runHarperCommand({ args, env, completionMessage, logDir }: RunHarperCom
 				resolve(proc);
 			} else {
 				let errorMessage = `Harper process failed with exit code ${statusCode}`;
+				stderrStream?.write(errorMessage);
 				if (stderr) {
 					errorMessage += `\n\nstderr:\n${stderr}`;
 				}
 				reject(errorMessage);
 			}
+			stdoutStream?.end();
+			stderrStream?.end();
 		});
 	});
 }
@@ -236,7 +234,7 @@ export async function startHarper(ctx: ContextWithHarper, options?: SetupHarperO
 	}
 
 	// Point Harper's log directory to the suite log dir so hdb.log is preserved for upload
-	const config = { ...(options?.config || {}) };
+	const config = { ...options?.config };
 	if (logDir) {
 		config.logging = { ...config.logging, root: logDir };
 
@@ -262,6 +260,7 @@ export async function startHarper(ctx: ContextWithHarper, options?: SetupHarperO
 			`--HTTP_PORT=${loopbackAddress}:${HTTP_PORT}`,
 			`--OPERATIONSAPI_NETWORK_PORT=${loopbackAddress}:${OPERATIONS_API_PORT}`,
 			'--LOGGING_LEVEL=debug',
+			'--LOGGING_STDSTREAMS=false',
 			'--HARPER_SET_CONFIG=' + JSON.stringify(config),
 		],
 		env: options?.env || {},

package/core/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "harper",
 	"description": "Harper is an open-source Node.js performance platform that unifies database, cache, application, and messaging layers into one in-memory process.",
-	"version": "5.0.0-unreleased",
+	"version": "5.0.0-alpha.8",
 	"private": true,
 	"license": "Apache-2.0",
 	"homepage": "https://harper.fast",
@@ -99,7 +99,9 @@
 	},
 	"devDependencies": {
 		"@harperdb/code-guidelines": "^0.0.6",
+		"@types/fs-extra": "^11.0.4",
 		"@types/gunzip-maybe": "^1.4.3",
+		"@types/jsonwebtoken": "^9.0.10",
 		"@types/lodash": "^4.17.23",
 		"@types/micromatch": "^4.0.9",
 		"@types/mocha": "^10.0.10",

package/core/resources/RecordEncoder.ts

@@ -75,6 +75,7 @@ export let lastMetadata: Entry | null = null;
 export class RecordEncoder extends Encoder {
 	structureUpdate?: any;
 	isRocksDB: boolean;
+	name: string;
 	constructor(options) {
 		options.useBigIntExtension = true;
 		/**
@@ -116,14 +117,23 @@ export class RecordEncoder extends Encoder {
 					if (expiresAt >= 0) {
 						valueStart += 8; // make room for expiration timestamp
 						expiresAtNextEncoding = -1; // reset indicator to mean no expiration
+						if (!(metadata & HAS_EXPIRATION)) {
+							throw new Error('Expiration included, but not in metadata flags');
+						}
 					}
 					if (residencyId) {
 						valueStart += 4; // make room for residency id
 						residencyIdAtNextEncoding = 0; // reset indicator to mean no residency id
+						if (!(metadata & HAS_RESIDENCY_ID)) {
+							throw new Error('Residency id included, but not in metadata flags');
+						}
 					}
 					if (nodeId >= 0) {
 						valueStart += 4; // make room for node id
 						nodeIdAtNextEncoding = -1; // reset indicator to mean no node id
+						if (!(metadata & HAS_NODE_ID)) {
+							throw new Error('Node id included, but not in metadata flags');
+						}
 					}
 					if (additionalAuditRefs && additionalAuditRefs.length > 0) {
 						valueStart += 1 + additionalAuditRefs.length * 12; // 1 byte for count + 8 bytes version + 4 bytes nodeId per ref
@@ -553,17 +563,17 @@ export function recordUpdater(store, tableId, auditStore) {
 				residencyIdAtNextEncoding = residencyId;
 				metadataInNextEncoding |= HAS_RESIDENCY_ID;
 				extendedType |= HAS_CURRENT_RESIDENCY_ID;
-			} // else residencyIdAtNextEncoding = 0;
+			} else residencyIdAtNextEncoding = 0;
 			const nodeId = options?.nodeId;
 			if (nodeId >= 0) {
 				nodeIdAtNextEncoding = nodeId;
 				metadataInNextEncoding |= HAS_NODE_ID;
-			} // else nodeIdAtNextEncoding = -1;
+			} else nodeIdAtNextEncoding = -1;
 			const additionalAuditRefs = options?.additionalAuditRefs;
 			if (additionalAuditRefs && additionalAuditRefs.length > 0) {
 				additionalAuditRefsNextEncoding = additionalAuditRefs;
 				metadataInNextEncoding |= HAS_ADDITIONAL_AUDIT_REFS;
-			} // else additionalAuditRefsNextEncoding = undefined;
+			} else additionalAuditRefsNextEncoding = undefined;
 			const previousAdditionalAuditRefs = existingEntry?.additionalAuditRefs;
 			if (previousAdditionalAuditRefs && previousAdditionalAuditRefs.length > 0) {
 				extendedType |= HAS_ADDITIONAL_AUDIT_REFS_AUDIT;
@@ -606,7 +616,6 @@ export function recordUpdater(store, tableId, auditStore) {
 				const structureVersion = store.encoder.structures.length + (store.encoder.typedStructs?.length ?? 0);
 				const nodeId = options?.nodeId ?? server.replication?.getThisNodeId(auditStore) ?? 0;
 				const viaNodeId = options?.viaNodeId ?? nodeId;
-				logger.debug('recording audit entry', { id, newVersion, previousVersion: existingEntry?.version, nodeId });
 				if (resolveRecord && existingEntry?.localTime) {
 					const replacingId = existingEntry?.localTime;
 					const replacingEntry = auditStore.get(replacingId, tableId, id);

package/core/resources/RocksTransactionLogStore.ts

@@ -317,6 +317,7 @@ export class RocksTransactionLogStore extends EventEmitter {
 		let totalSize = 0;
 		const logs = [];
 		for (const log of this.loadLogs()) {
+			if (!log) continue;
 			const size = log.getLogFileSize();
 			totalSize += size;
 			logs.push({ name: log.name, size });

package/core/resources/Table.ts

@@ -38,7 +38,7 @@ import {
 	COERCIBLE_OPERATORS,
 	executeConditions,
 } from './search.ts';
-import logger from '../utility/logging/logger.js';
+import { logger } from '../utility/logging/logger.ts';
 import { Addition, assignTrackedAccessors, updateAndFreeze, hasChanges, GenericTrackedObject } from './tracked.ts';
 import { transaction, contextStorage } from './transaction.ts';
 import { MAXIMUM_KEY, writeKey, compareKeys } from 'ordered-binary';
@@ -2693,7 +2693,7 @@ export function makeTable(options) {
 									if (--count <= 0) break;
 								}
 							} catch (error) {
-								logger.error('Error getting history entry', auditRecord.localTime, error);
+								logger.error?.('Error getting history entry', auditRecord.localTime, error);
 							}
 							// TODO: Would like to do this asynchronously, but would need to catch up on anything published during iteration
 							//await rest(); // yield for fairness
@@ -3305,7 +3305,7 @@ export function makeTable(options) {
 						const userResolver = this.userResolvers[attribute.name];
 						if (userResolver) return userResolver(value, context, entry);
 						else {
-							logger.warn(
+							logger.warn?.(
 								`Computed attribute "${attribute.name}" does not have a function assigned to it. Please use setComputedAttribute('${attribute.name}', resolver) to assign a resolver function.`
 							);
 							// silence future warnings but just returning undefined

package/core/resources/blob.ts

@@ -37,7 +37,7 @@ import { ensureDirSync } from 'fs-extra';
 import { get as envGet, getHdbBasePath } from '../utility/environment/environmentManager.js';
 import { CONFIG_PARAMS } from '../utility/hdbTerms.ts';
 import { join, dirname } from 'path';
-import logger from '../utility/logging/logger.js';
+import { logger } from '../utility/logging/logger.ts';
 import type { LMDBStore } from 'lmdb';
 import { asyncSerialization, hasAsyncSerialization } from '../server/serverHelpers/contentTypes.ts';
 import { HAS_BLOBS } from './auditStore.ts';