repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor: cleanup loops over object keys
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
IdTagsCache.ts
diff --git
a/src/charging-station/IdTagsCache.ts
b/src/charging-station/IdTagsCache.ts
index fd35fa8baaecca49d58924ef6d970a2da0672558..bf0838e91890614f9e0fdbf48af0b541aba8dcdd 100644
(file)
--- a/
src/charging-station/IdTagsCache.ts
+++ b/
src/charging-station/IdTagsCache.ts
@@
-1,13
+1,20
@@
-import
fs
from 'node:fs';
+import
{ type FSWatcher, readFileSync }
from 'node:fs';
import type { ChargingStation } from './ChargingStation';
import type { ChargingStation } from './ChargingStation';
-import {
ChargingStationUtils
} from './ChargingStationUtils';
+import {
getIdTagsFile
} from './ChargingStationUtils';
import { FileType, IdTagDistribution } from '../types';
import { FileType, IdTagDistribution } from '../types';
-import { ErrorUtils, FileUtils, Utils, logger } from '../utils';
+import {
+ handleFileException,
+ isNotEmptyString,
+ logPrefix,
+ logger,
+ secureRandom,
+ watchJsonFile,
+} from '../utils';
type IdTagsCacheValueType = {
idTags: string[];
type IdTagsCacheValueType = {
idTags: string[];
- idTagsFileWatcher:
fs.
FSWatcher | undefined;
+ idTagsFileWatcher: FSWatcher | undefined;
};
export class IdTagsCache {
};
export class IdTagsCache {
@@
-28,7
+35,7
@@
export class IdTagsCache {
}
/**
}
/**
- * Get one idtag from the cache given the distribution
+ * Get
s
one idtag from the cache given the distribution
* Must be called after checking the cache is not an empty array
*
* @param distribution -
* Must be called after checking the cache is not an empty array
*
* @param distribution -
@@
-42,7
+49,7
@@
export class IdTagsCache {
connectorId: number
): string {
const hashId = chargingStation.stationInfo.hashId;
connectorId: number
): string {
const hashId = chargingStation.stationInfo.hashId;
- const idTagsFile =
ChargingStationUtils.
getIdTagsFile(chargingStation.stationInfo);
+ const idTagsFile = getIdTagsFile(chargingStation.stationInfo);
switch (distribution) {
case IdTagDistribution.RANDOM:
return this.getRandomIdTag(hashId, idTagsFile);
switch (distribution) {
case IdTagDistribution.RANDOM:
return this.getRandomIdTag(hashId, idTagsFile);
@@
-56,7
+63,7
@@
export class IdTagsCache {
}
/**
}
/**
- * Get all idtags from the cache
+ * Get
s
all idtags from the cache
* Must be called after checking the cache is not an empty array
*
* @param file -
* Must be called after checking the cache is not an empty array
*
* @param file -
@@
-70,7
+77,7
@@
export class IdTagsCache {
}
public deleteIdTags(file: string): boolean {
}
public deleteIdTags(file: string): boolean {
- return this.deleteIdTagsCache(file);
+ return this.deleteIdTagsCache(file)
&& this.deleteIdTagsCacheIndexes(file)
;
}
private getRandomIdTag(hashId: string, file: string): string {
}
private getRandomIdTag(hashId: string, file: string): string {
@@
-78,7
+85,7
@@
export class IdTagsCache {
const addressableKey = this.getIdTagsCacheIndexesAddressableKey(file, hashId);
this.idTagsCachesAddressableIndexes.set(
addressableKey,
const addressableKey = this.getIdTagsCacheIndexesAddressableKey(file, hashId);
this.idTagsCachesAddressableIndexes.set(
addressableKey,
- Math.floor(
Utils.
secureRandom() * idTags.length)
+ Math.floor(secureRandom() * idTags.length)
);
return idTags[this.idTagsCachesAddressableIndexes.get(addressableKey)];
}
);
return idTags[this.idTagsCachesAddressableIndexes.get(addressableKey)];
}
@@
-96,7
+103,7
@@
export class IdTagsCache {
}
private getConnectorAffinityIdTag(chargingStation: ChargingStation, connectorId: number): string {
}
private getConnectorAffinityIdTag(chargingStation: ChargingStation, connectorId: number): string {
- const file =
ChargingStationUtils.
getIdTagsFile(chargingStation.stationInfo);
+ const file = getIdTagsFile(chargingStation.stationInfo);
const idTags = this.getIdTags(file);
const addressableKey = this.getIdTagsCacheIndexesAddressableKey(
file,
const idTags = this.getIdTags(file);
const addressableKey = this.getIdTagsCacheIndexesAddressableKey(
file,
@@
-116,13
+123,13
@@
export class IdTagsCache {
private setIdTagsCache(file: string, idTags: string[]) {
return this.idTagsCaches.set(file, {
idTags,
private setIdTagsCache(file: string, idTags: string[]) {
return this.idTagsCaches.set(file, {
idTags,
- idTagsFileWatcher:
FileUtils.
watchJsonFile(
+ idTagsFileWatcher: watchJsonFile(
file,
FileType.Authorization,
this.logPrefix(file),
undefined,
(event, filename) => {
file,
FileType.Authorization,
this.logPrefix(file),
undefined,
(event, filename) => {
- if (
Utils.
isNotEmptyString(filename) && event === 'change') {
+ if (isNotEmptyString(filename) && event === 'change') {
try {
logger.debug(
`${this.logPrefix(file)} ${FileType.Authorization} file have changed, reload`
try {
logger.debug(
`${this.logPrefix(file)} ${FileType.Authorization} file have changed, reload`
@@
-130,7
+137,7
@@
export class IdTagsCache {
this.deleteIdTagsCache(file);
this.deleteIdTagsCacheIndexes(file);
} catch (error) {
this.deleteIdTagsCache(file);
this.deleteIdTagsCacheIndexes(file);
} catch (error) {
-
ErrorUtils.
handleFileException(
+ handleFileException(
file,
FileType.Authorization,
error as NodeJS.ErrnoException,
file,
FileType.Authorization,
error as NodeJS.ErrnoException,
@@
-155,12
+162,14
@@
export class IdTagsCache {
return this.idTagsCaches.delete(file);
}
return this.idTagsCaches.delete(file);
}
- private deleteIdTagsCacheIndexes(file: string): void {
+ private deleteIdTagsCacheIndexes(file: string): boolean {
+ let deleted: boolean[];
for (const [key] of this.idTagsCachesAddressableIndexes) {
if (key.startsWith(file)) {
for (const [key] of this.idTagsCachesAddressableIndexes) {
if (key.startsWith(file)) {
-
this.idTagsCachesAddressableIndexes.delete(key
);
+
deleted.push(this.idTagsCachesAddressableIndexes.delete(key)
);
}
}
}
}
+ return !deleted.some((value) => value === false);
}
private getIdTagsCacheIndexesAddressableKey(prefix: string, uid: string): string {
}
private getIdTagsCacheIndexesAddressableKey(prefix: string, uid: string): string {
@@
-168,11
+177,11
@@
export class IdTagsCache {
}
private getIdTagsFromFile(file: string): string[] {
}
private getIdTagsFromFile(file: string): string[] {
- if (
Utils.
isNotEmptyString(file)) {
+ if (isNotEmptyString(file)) {
try {
try {
- return JSON.parse(
fs.
readFileSync(file, 'utf8')) as string[];
+ return JSON.parse(readFileSync(file, 'utf8')) as string[];
} catch (error) {
} catch (error) {
-
ErrorUtils.
handleFileException(
+ handleFileException(
file,
FileType.Authorization,
error as NodeJS.ErrnoException,
file,
FileType.Authorization,
error as NodeJS.ErrnoException,
@@
-184,6
+193,6
@@
export class IdTagsCache {
}
private logPrefix = (file: string): string => {
}
private logPrefix = (file: string): string => {
- return
Utils.
logPrefix(` Id tags cache for id tags file '${file}' |`);
+ return logPrefix(` Id tags cache for id tags file '${file}' |`);
};
}
};
}