X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FIdTagsCache.ts;h=ff5c49d9a6a2dba2fc2810b0e6a36fa54fbbb125;hb=3f3ac53e97ea4b79d0750836bd9d8ac33a7bec77;hp=e5d28181b043de2f7faf1f0f9a71d6dbf6ef44df;hpb=728e01f09f2b43946aab50eb2ed9673bf2d2daa3;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/IdTagsCache.ts b/src/charging-station/IdTagsCache.ts index e5d28181..ff5c49d9 100644 --- a/src/charging-station/IdTagsCache.ts +++ b/src/charging-station/IdTagsCache.ts @@ -1,8 +1,9 @@ import fs from 'node:fs'; -import { type ChargingStation, ChargingStationUtils } from './internal'; +import type { ChargingStation } from './ChargingStation'; +import { ChargingStationUtils } from './ChargingStationUtils'; import { FileType, IdTagDistribution } from '../types'; -import { FileUtils, Utils, logger } from '../utils'; +import { ErrorUtils, FileUtils, Utils, logger } from '../utils'; type IdTagsCacheValueType = { idTags: string[]; @@ -26,6 +27,15 @@ export class IdTagsCache { return IdTagsCache.instance; } + /** + * Get one idtag from the cache given the distribution + * Must be called after checking the cache is not an empty array + * + * @param distribution + * @param chargingStation + * @param connectorId + * @returns + */ public getIdTag( distribution: IdTagDistribution, chargingStation: ChargingStation, @@ -45,6 +55,13 @@ export class IdTagsCache { } } + /** + * Get all idtags from the cache + * Must be called after checking the cache is not an empty array + * + * @param file + * @returns + */ public getIdTags(file: string): string[] | undefined { if (this.hasIdTagsCache(file) === false) { this.setIdTagsCache(file, this.getIdTagsFromFile(file)); @@ -113,7 +130,7 @@ export class IdTagsCache { this.deleteIdTagsCache(file); this.deleteIdTagsCacheIndexes(file); } catch (error) { - FileUtils.handleFileException( + ErrorUtils.handleFileException( file, FileType.Authorization, error as NodeJS.ErrnoException, @@ -151,23 +168,19 @@ export class IdTagsCache { } private getIdTagsFromFile(file: string): string[] { - let idTags: string[] = []; - if (file) { + if (Utils.isNotEmptyString(file)) { try { - // Load id tags file - idTags = JSON.parse(fs.readFileSync(file, 'utf8')) as string[]; + return JSON.parse(fs.readFileSync(file, 'utf8')) as string[]; } catch (error) { - FileUtils.handleFileException( + ErrorUtils.handleFileException( file, FileType.Authorization, error as NodeJS.ErrnoException, this.logPrefix(file) ); } - } else { - logger.info(`${this.logPrefix(file)} No id tags file given`); } - return idTags; + return []; } private logPrefix = (file: string): string => {