From 6e49e19ba104895aed7b9a690055ac09a2a6245b Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 28 Jul 2025 15:25:33 -0700 Subject: [PATCH] refactor serviceRegistry --- server/src/config/services.js | 3 ++- server/src/service/system/serviceRegistry.js | 24 ++++++++++++++++++++ server/src/service/system/settingsService.js | 6 ++--- 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/server/src/config/services.js b/server/src/config/services.js index e2b30034d..93327befc 100644 --- a/server/src/config/services.js +++ b/server/src/config/services.js @@ -35,6 +35,7 @@ import crypto from "crypto"; export const initializeServices = async ({ logger, envSettings, settingsService }) => { const serviceRegistry = new ServiceRegistry({ logger }); + ServiceRegistry.instance = serviceRegistry; const translationService = new TranslationService(logger); await translationService.initialize(); @@ -146,7 +147,7 @@ export const initializeServices = async ({ logger, envSettings, settingsService }; Object.values(services).forEach((service) => { - serviceRegistry.register(service.serviceName, service); + ServiceRegistry.register(service.serviceName, service); }); return services; diff --git a/server/src/service/system/serviceRegistry.js b/server/src/service/system/serviceRegistry.js index 03406c57e..4e3e28464 100755 --- a/server/src/service/system/serviceRegistry.js +++ b/server/src/service/system/serviceRegistry.js @@ -1,6 +1,8 @@ const SERVICE_NAME = "ServiceRegistry"; + class ServiceRegistry { static SERVICE_NAME = SERVICE_NAME; + constructor({ logger }) { this.services = {}; this.logger = logger; @@ -10,6 +12,7 @@ class ServiceRegistry { return ServiceRegistry.SERVICE_NAME; } + // Instance methods register(name, service) { this.logger.info({ message: `Registering service ${name}`, @@ -34,6 +37,27 @@ class ServiceRegistry { listServices() { return Object.keys(this.services); } + + static get(name) { + if (!ServiceRegistry.instance) { + throw new Error("ServiceRegistry not initialized"); + } + return ServiceRegistry.instance.get(name); + } + + static register(name, service) { + if (!ServiceRegistry.instance) { + throw new Error("ServiceRegistry not initialized"); + } + return ServiceRegistry.instance.register(name, service); + } + + static listServices() { + if (!ServiceRegistry.instance) { + throw new Error("ServiceRegistry not initialized"); + } + return ServiceRegistry.instance.listServices(); + } } export default ServiceRegistry; diff --git a/server/src/service/system/settingsService.js b/server/src/service/system/settingsService.js index 1c274d944..4ad30c6b1 100755 --- a/server/src/service/system/settingsService.js +++ b/server/src/service/system/settingsService.js @@ -3,9 +3,9 @@ const SERVICE_NAME = "SettingsService"; const envConfig = { nodeEnv: process.env.NODE_ENV, logLevel: process.env.LOG_LEVEL, - clientHost: process.env.CLIENT_HOST, //* - dbConnectionString: process.env.DB_CONNECTION_STRING, //* - port: process.env.PORT, //* + clientHost: process.env.CLIENT_HOST, + dbConnectionString: process.env.DB_CONNECTION_STRING, + port: process.env.PORT, }; /** * SettingsService