X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FConfiguration.ts;h=1b95f341e0ca8f5d05190e30dcdf996a3cc6a467;hb=a6b3c6c313f1c0314a1445ed630cac85edf55b2c;hp=a65e6c995b999d3e62527fc7b5e09d98fd5b6b6b;hpb=6ce0bca57a96ef920df4e0786d8f28b0b89a36ef;p=e-mobility-charging-stations-simulator.git diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts index a65e6c99..1b95f341 100644 --- a/src/utils/Configuration.ts +++ b/src/utils/Configuration.ts @@ -1,8 +1,10 @@ -import ConfigurationData, { StationTemplateURL } from '../types/ConfigurationData'; +import ConfigurationData, { StationTemplateURL, StorageConfiguration } from '../types/ConfigurationData'; import Constants from './Constants'; +import { StorageType } from '../types/Storage'; import type { WorkerChoiceStrategy } from 'poolifier'; import { WorkerProcessType } from '../types/Worker'; +import chalk from 'chalk'; import fs from 'fs'; import path from 'path'; @@ -16,15 +18,41 @@ export default class Configuration { Configuration.configurationChangeCallback = cb; } - static getStatisticsDisplayInterval(): number { + static getLogStatisticsInterval(): number { + Configuration.warnDeprecatedConfigurationKey('statisticsDisplayInterval', null, 'Use \'logStatisticsInterval\' instead'); // Read conf - return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'statisticsDisplayInterval') ? Configuration.getConfig().statisticsDisplayInterval : 60; + return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logStatisticsInterval') ? Configuration.getConfig().logStatisticsInterval : 60; + } + + static getPerformanceStorage(): StorageConfiguration { + const defaultJSONFilePathURI = `file://${path.join(path.resolve(__dirname, '../../'), Constants.DEFAULT_PERFORMANCE_RECORDS_FILENAME)}`; + const SQLiteFileName = `${Constants.DEFAULT_PERFORMANCE_RECORDS_DB_NAME}.db`; + const defaultSQLiteFilePathURI = `file://${path.join(path.resolve(__dirname, '../../'), SQLiteFileName)}`; + let storageConfiguration: StorageConfiguration; + if (Configuration.objectHasOwnProperty(Configuration.getConfig(), 'performanceStorage')) { + storageConfiguration = + { + ...Configuration.objectHasOwnProperty(Configuration.getConfig().performanceStorage, 'enabled') ? { enabled: Configuration.getConfig().performanceStorage.enabled } : { enabled: false }, + ...Configuration.objectHasOwnProperty(Configuration.getConfig().performanceStorage, 'type') ? { type: Configuration.getConfig().performanceStorage.type } : { type: StorageType.JSON_FILE }, + ...Configuration.objectHasOwnProperty(Configuration.getConfig().performanceStorage, 'URI') + ? { URI: Configuration.getConfig().performanceStorage.URI } + : { URI: (Configuration.getConfig().performanceStorage.type === StorageType.JSON_FILE) ? defaultJSONFilePathURI : defaultSQLiteFilePathURI } + }; + } else { + storageConfiguration = + { + enabled: false, + type: StorageType.JSON_FILE, + URI: defaultJSONFilePathURI + }; + } + return storageConfiguration; } static getAutoReconnectMaxRetries(): number { - Configuration.deprecateConfigurationKey('autoReconnectTimeout', 'Use \'ConnectionTimeOut\' OCPP parameter in charging station template instead'); - Configuration.deprecateConfigurationKey('connectionTimeout', 'Use \'ConnectionTimeOut\' OCPP parameter in charging station template instead'); - Configuration.deprecateConfigurationKey('autoReconnectMaxRetries', 'Use it in charging station template instead'); + Configuration.warnDeprecatedConfigurationKey('autoReconnectTimeout', null, 'Use \'ConnectionTimeOut\' OCPP parameter in charging station template instead'); + Configuration.warnDeprecatedConfigurationKey('connectionTimeout', null, 'Use \'ConnectionTimeOut\' OCPP parameter in charging station template instead'); + Configuration.warnDeprecatedConfigurationKey('autoReconnectMaxRetries', null, 'Use it in charging station template instead'); // Read conf if (Configuration.objectHasOwnProperty(Configuration.getConfig(), 'autoReconnectMaxRetries')) { return Configuration.getConfig().autoReconnectMaxRetries; @@ -34,7 +62,7 @@ export default class Configuration { static getStationTemplateURLs(): StationTemplateURL[] { Configuration.getConfig().stationTemplateURLs.forEach((stationURL: StationTemplateURL) => { if (!Configuration.isUndefined(stationURL['numberOfStation'])) { - console.error(`${Configuration.logPrefix()} Deprecated configuration key 'numberOfStation' usage for template file '${stationURL.file}' in 'stationTemplateURLs'. Use 'numberOfStations' instead`); + console.error(chalk`{green ${Configuration.logPrefix()}} {red Deprecated configuration key 'numberOfStation' usage for template file '${stationURL.file}' in 'stationTemplateURLs'. Use 'numberOfStations' instead}`); } }); // Read conf @@ -42,7 +70,7 @@ export default class Configuration { } static getWorkerProcess(): WorkerProcessType { - Configuration.deprecateConfigurationKey('useWorkerPool;', 'Use \'workerProcess\' to define the type of worker process to use instead'); + Configuration.warnDeprecatedConfigurationKey('useWorkerPool;', null, 'Use \'workerProcess\' to define the type of worker process to use instead'); return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'workerProcess') ? Configuration.getConfig().workerProcess : WorkerProcessType.WORKER_SET; } @@ -55,7 +83,7 @@ export default class Configuration { } static getWorkerPoolMaxSize(): number { - Configuration.deprecateConfigurationKey('workerPoolSize;', 'Use \'workerPoolMaxSize\' instead'); + Configuration.warnDeprecatedConfigurationKey('workerPoolSize;', null, 'Use \'workerPoolMaxSize\' instead'); return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'workerPoolMaxSize') ? Configuration.getConfig().workerPoolMaxSize : Constants.DEFAULT_WORKER_POOL_MAX_SIZE; } @@ -68,7 +96,7 @@ export default class Configuration { } static getLogConsole(): boolean { - Configuration.deprecateConfigurationKey('consoleLog', 'Use \'logConsole\' instead'); + Configuration.warnDeprecatedConfigurationKey('consoleLog', null, 'Use \'logConsole\' instead'); return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logConsole') ? Configuration.getConfig().logConsole : false; } @@ -93,7 +121,7 @@ export default class Configuration { } static getLogErrorFile(): string { - Configuration.deprecateConfigurationKey('errorFile', 'Use \'logErrorFile\' instead'); + Configuration.warnDeprecatedConfigurationKey('errorFile', null, 'Use \'logErrorFile\' instead'); return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'logErrorFile') ? Configuration.getConfig().logErrorFile : 'error.log'; } @@ -103,7 +131,7 @@ export default class Configuration { } static getDistributeStationsToTenantsEqually(): boolean { - Configuration.deprecateConfigurationKey('distributeStationToTenantEqually', 'Use \'distributeStationsToTenantsEqually\' instead'); + Configuration.warnDeprecatedConfigurationKey('distributeStationToTenantEqually', null, 'Use \'distributeStationsToTenantsEqually\' instead'); return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'distributeStationsToTenantsEqually') ? Configuration.getConfig().distributeStationsToTenantsEqually : true; } @@ -111,9 +139,12 @@ export default class Configuration { return new Date().toLocaleString() + ' Simulator configuration |'; } - private static deprecateConfigurationKey(key: string, logMsgToAppend = '') { - if (!Configuration.isUndefined(Configuration.getConfig()[key])) { - console.error(`${Configuration.logPrefix()} Deprecated configuration key '${key}' usage${logMsgToAppend && '. ' + logMsgToAppend}`); + private static warnDeprecatedConfigurationKey(key: string, sectionName?: string, logMsgToAppend = '') { + // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access + if (sectionName && !Configuration.isUndefined(Configuration.getConfig()[sectionName]) && !Configuration.isUndefined(Configuration.getConfig()[sectionName][key])) { + console.error(chalk`{green ${Configuration.logPrefix()}} {red Deprecated configuration key '${key}' usage in section '${sectionName}'${logMsgToAppend && '. ' + logMsgToAppend}}`); + } else if (!Configuration.isUndefined(Configuration.getConfig()[key])) { + console.error(chalk`{green ${Configuration.logPrefix()}} {red Deprecated configuration key '${key}' usage${logMsgToAppend && '. ' + logMsgToAppend}}`); } } @@ -158,9 +189,13 @@ export default class Configuration { private static handleFileException(logPrefix: string, fileType: string, filePath: string, error: NodeJS.ErrnoException): void { const prefix = logPrefix.length !== 0 ? logPrefix + ' ' : ''; if (error.code === 'ENOENT') { - console.error(prefix + fileType + ' file ' + filePath + ' not found: ', error); + console.error(chalk.green(prefix) + chalk.red(fileType + ' file ' + filePath + ' not found: '), error); + } else if (error.code === 'EEXIST') { + console.error(chalk.green(prefix) + chalk.red(fileType + ' file ' + filePath + ' already exists: '), error); + } else if (error.code === 'EACCES') { + console.error(chalk.green(prefix) + chalk.red(fileType + ' file ' + filePath + ' access denied: '), error); } else { - console.error(prefix + fileType + ' file ' + filePath + ' opening error: ', error); + console.error(chalk.green(prefix) + chalk.red(fileType + ' file ' + filePath + ' error: '), error); } throw error; }