X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Futils%2FConfiguration.ts;h=06c2a5a361ad1c7e56e068485c3b0b3fac26b510;hb=2665ed1ef62a9fc9b6eec417f3ec7c33305789cf;hp=8b0b1c8fa532c3afdd879dd6f6418576e5531139;hpb=300418e9ba42d252a1a7079dab7904f40561a7ef;p=e-mobility-charging-stations-simulator.git diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts index 8b0b1c8f..06c2a5a3 100644 --- a/src/utils/Configuration.ts +++ b/src/utils/Configuration.ts @@ -45,7 +45,7 @@ type ConfigurationSectionType = // eslint-disable-next-line @typescript-eslint/no-extraneous-class export class Configuration { - public static configurationChangeCallback: () => Promise + public static configurationChangeCallback?: () => Promise private static readonly configurationFile = join( dirname(fileURLToPath(import.meta.url)), @@ -177,17 +177,31 @@ export class Configuration { } private static buildPerformanceStorageSection (): StorageConfiguration { - let storageConfiguration: StorageConfiguration = { - enabled: false, - type: StorageType.JSON_FILE, - uri: getDefaultPerformanceStorageUri(StorageType.JSON_FILE) + let storageConfiguration: StorageConfiguration + switch (Configuration.getConfigurationData()?.performanceStorage?.type) { + case StorageType.SQLITE: + storageConfiguration = { + enabled: false, + type: StorageType.SQLITE, + uri: getDefaultPerformanceStorageUri(StorageType.SQLITE) + } + break + case StorageType.JSON_FILE: + default: + storageConfiguration = { + enabled: false, + type: StorageType.JSON_FILE, + uri: getDefaultPerformanceStorageUri(StorageType.JSON_FILE) + } + break } if (hasOwnProp(Configuration.getConfigurationData(), ConfigurationSection.performanceStorage)) { storageConfiguration = { ...storageConfiguration, ...Configuration.getConfigurationData()?.performanceStorage, - ...(Configuration.getConfigurationData()?.performanceStorage?.type === - StorageType.JSON_FILE && + ...((Configuration.getConfigurationData()?.performanceStorage?.type === + StorageType.JSON_FILE || + Configuration.getConfigurationData()?.performanceStorage?.type === StorageType.SQLITE) && Configuration.getConfigurationData()?.performanceStorage?.uri != null && { uri: buildPerformanceUriFilePath( // eslint-disable-next-line @typescript-eslint/no-non-null-assertion @@ -327,7 +341,8 @@ export class Configuration { ] as StationTemplateUrl[]) Configuration.getConfigurationData()?.stationTemplateUrls.forEach( (stationTemplateUrl: StationTemplateUrl) => { - if (stationTemplateUrl?.['numberOfStation' as keyof StationTemplateUrl] !== undefined) { + // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition + if (stationTemplateUrl['numberOfStation' as keyof StationTemplateUrl] !== undefined) { console.error( `${chalk.green(logPrefix())} ${chalk.red( `Deprecated configuration key 'numberOfStation' usage for template file '${stationTemplateUrl.file}' in 'stationTemplateUrls'. Use 'numberOfStations' instead` @@ -495,7 +510,7 @@ export class Configuration { string, unknown > - )?.[key] !== undefined + )[key] !== undefined ) { console.error( `${chalk.green(logPrefix())} ${chalk.red( @@ -544,7 +559,7 @@ export class Configuration { if ( !Configuration.configurationFileReloading && // eslint-disable-next-line @typescript-eslint/no-non-null-assertion - filename!.trim()!.length > 0 && + filename!.trim().length > 0 && event === 'change' ) { Configuration.configurationFileReloading = true @@ -558,7 +573,7 @@ export class Configuration { Configuration.configurationSectionCache.clear() if (Configuration.configurationChangeCallback !== undefined) { Configuration.configurationChangeCallback() - .catch((error) => { + .catch(error => { throw typeof error === 'string' ? new Error(error) : error }) .finally(() => {