import merge from 'just-merge';
import WebSocket, { type RawData } from 'ws';
+import { AutomaticTransactionGenerator } from './AutomaticTransactionGenerator';
+import { ChargingStationWorkerBroadcastChannel } from './broadcast-channel/ChargingStationWorkerBroadcastChannel';
+import { ChargingStationConfigurationUtils } from './ChargingStationConfigurationUtils';
+import { ChargingStationUtils } from './ChargingStationUtils';
+import { IdTagsCache } from './IdTagsCache';
import {
- AutomaticTransactionGenerator,
- ChargingStationConfigurationUtils,
- ChargingStationUtils,
- ChargingStationWorkerBroadcastChannel,
- IdTagsCache,
- MessageChannelUtils,
- SharedLRUCache,
-} from './internal';
-import {
- // OCPP16IncomingRequestService,
+ OCPP16IncomingRequestService,
OCPP16RequestService,
- // OCPP16ResponseService,
+ OCPP16ResponseService,
OCPP16ServiceUtils,
OCPP20IncomingRequestService,
OCPP20RequestService,
- // OCPP20ResponseService,
+ OCPP20ResponseService,
type OCPPIncomingRequestService,
type OCPPRequestService,
- // OCPPServiceUtils,
+ OCPPServiceUtils,
} from './ocpp';
-import { OCPP16IncomingRequestService } from './ocpp/1.6/OCPP16IncomingRequestService';
-import { OCPP16ResponseService } from './ocpp/1.6/OCPP16ResponseService';
-import { OCPP20ResponseService } from './ocpp/2.0/OCPP20ResponseService';
-import { OCPPServiceUtils } from './ocpp/OCPPServiceUtils';
+import { SharedLRUCache } from './SharedLRUCache';
import { BaseError, OCPPError } from '../exception';
import { PerformanceStatistics } from '../performance';
import {
RequestCommand,
type Response,
StandardParametersKey,
+ type Status,
type StatusNotificationRequest,
type StatusNotificationResponse,
StopTransactionReason,
} from '../types';
import {
ACElectricUtils,
+ AsyncLock,
+ AsyncLockType,
Configuration,
Constants,
DCElectricUtils,
+ ErrorUtils,
FileUtils,
+ MessageChannelUtils,
Utils,
+ buildChargingStationAutomaticTransactionGeneratorConfiguration,
+ buildConnectorsStatus,
+ buildEvsesStatus,
logger,
} from '../utils';
private wsConnectionRestarted: boolean;
private autoReconnectRetryCount: number;
private templateFileWatcher!: fs.FSWatcher | undefined;
+ private templateFileHash!: string;
private readonly sharedLRUCache: SharedLRUCache;
private webSocketPingSetInterval!: NodeJS.Timeout;
private readonly chargingStationWorkerBroadcastChannel: ChargingStationWorkerBroadcastChannel;
return new URL(
`${
this.getSupervisionUrlOcppConfiguration() &&
- Utils.isNotEmptyString(this.getSupervisionUrlOcppKey())
+ Utils.isNotEmptyString(this.getSupervisionUrlOcppKey()) &&
+ Utils.isNotEmptyString(
+ ChargingStationConfigurationUtils.getConfigurationKey(
+ this,
+ this.getSupervisionUrlOcppKey()
+ )?.value
+ )
? ChargingStationConfigurationUtils.getConfigurationKey(
this,
this.getSupervisionUrlOcppKey()
- )?.value
+ ).value
: this.configuredSupervisionUrl.href
}/${this.stationInfo.chargingStationId}`
);
};
public hasIdTags(): boolean {
- const idTagsFile = ChargingStationUtils.getIdTagsFile(this.stationInfo);
- return Utils.isNotEmptyArray(this.idTagsCache.getIdTags(idTagsFile));
+ return Utils.isNotEmptyArray(
+ this.idTagsCache.getIdTags(ChargingStationUtils.getIdTagsFile(this.stationInfo))
+ );
}
public getEnableStatistics(): boolean {
return this?.bootNotificationResponse?.status;
}
- public isInUnknownState(): boolean {
+ public inUnknownState(): boolean {
return Utils.isNullOrUndefined(this?.bootNotificationResponse?.status);
}
- public isInPendingState(): boolean {
+ public inPendingState(): boolean {
return this?.bootNotificationResponse?.status === RegistrationStatusEnumType.PENDING;
}
- public isInAcceptedState(): boolean {
+ public inAcceptedState(): boolean {
return this?.bootNotificationResponse?.status === RegistrationStatusEnumType.ACCEPTED;
}
- public isInRejectedState(): boolean {
+ public inRejectedState(): boolean {
return this?.bootNotificationResponse?.status === RegistrationStatusEnumType.REJECTED;
}
public isRegistered(): boolean {
return (
- this.isInUnknownState() === false &&
- (this.isInAcceptedState() === true || this.isInPendingState() === true)
+ this.inUnknownState() === false &&
+ (this.inAcceptedState() === true || this.inPendingState() === true)
);
}
public getNumberOfConnectors(): number {
if (this.hasEvses) {
+ if (this.evses.size === 0) {
+ throw new BaseError('Evses not initialized, cannot get number of connectors');
+ }
let numberOfConnectors = 0;
for (const [evseId, evseStatus] of this.evses) {
if (evseId > 0) {
}
return numberOfConnectors;
}
+ if (this.connectors.size === 0) {
+ throw new BaseError('Connectors not initialized, cannot get number of connectors');
+ }
return this.connectors.has(0) ? this.connectors.size - 1 : this.connectors.size;
}
public getNumberOfEvses(): number {
+ if (this.evses.size === 0) {
+ throw new BaseError('Evses not initialized, cannot get number of evses');
+ }
return this.evses.has(0) ? this.evses.size - 1 : this.evses.size;
}
public getVoltageOut(stationInfo?: ChargingStationInfo): number | undefined {
const defaultVoltageOut = ChargingStationUtils.getDefaultVoltageOut(
this.getCurrentOutType(stationInfo),
- this.templateFile,
- this.logPrefix()
+ this.logPrefix(),
+ this.templateFile
);
- const localStationInfo: ChargingStationInfo = stationInfo ?? this.stationInfo;
- return !Utils.isUndefined(localStationInfo.voltageOut)
- ? localStationInfo.voltageOut
- : defaultVoltageOut;
+ return (stationInfo ?? this.stationInfo).voltageOut ?? defaultVoltageOut;
}
public getMaximumPower(stationInfo?: ChargingStationInfo): number {
this.templateFile
} file have changed, reload`
);
- this.sharedLRUCache.deleteChargingStationTemplate(this.stationInfo?.templateHash);
+ this.sharedLRUCache.deleteChargingStationTemplate(this.templateFileHash);
// Initialize
this.initialize();
// Restart the ATG
this.stopAutomaticTransactionGenerator();
- if (
- this.getAutomaticTransactionGeneratorConfigurationFromTemplate()?.enable === true
- ) {
+ if (this.getAutomaticTransactionGeneratorConfiguration()?.enable === true) {
this.startAutomaticTransactionGenerator();
}
if (this.getEnableStatistics() === true) {
}
this.sharedLRUCache.deleteChargingStationConfiguration(this.configurationFileHash);
this.templateFileWatcher?.close();
- this.sharedLRUCache.deleteChargingStationTemplate(this.stationInfo?.templateHash);
+ this.sharedLRUCache.deleteChargingStationTemplate(this.templateFileHash);
delete this.bootNotificationResponse;
this.started = false;
+ this.saveConfiguration();
parentPort?.postMessage(MessageChannelUtils.buildStoppedMessage(this));
this.stopping = false;
} else {
}
}
- public startAutomaticTransactionGenerator(
- connectorIds?: number[],
- automaticTransactionGeneratorConfiguration?: AutomaticTransactionGeneratorConfiguration
- ): void {
- this.automaticTransactionGenerator = AutomaticTransactionGenerator.getInstance(
- automaticTransactionGeneratorConfiguration ??
- this.getAutomaticTransactionGeneratorConfigurationFromTemplate(),
- this
- );
+ public getAutomaticTransactionGeneratorConfiguration():
+ | AutomaticTransactionGeneratorConfiguration
+ | undefined {
+ let automaticTransactionGeneratorConfiguration:
+ | AutomaticTransactionGeneratorConfiguration
+ | undefined;
+ const automaticTransactionGeneratorConfigurationFromFile =
+ this.getConfigurationFromFile()?.automaticTransactionGenerator;
+ if (
+ this.getAutomaticTransactionGeneratorPersistentConfiguration() &&
+ automaticTransactionGeneratorConfigurationFromFile
+ ) {
+ automaticTransactionGeneratorConfiguration =
+ automaticTransactionGeneratorConfigurationFromFile;
+ } else {
+ automaticTransactionGeneratorConfiguration =
+ this.getTemplateFromFile()?.AutomaticTransactionGenerator;
+ }
+ return {
+ ...Constants.DEFAULT_ATG_CONFIGURATION,
+ ...automaticTransactionGeneratorConfiguration,
+ };
+ }
+
+ public getAutomaticTransactionGeneratorStatuses(): Status[] | undefined {
+ return this.getConfigurationFromFile()?.automaticTransactionGeneratorStatuses;
+ }
+
+ public startAutomaticTransactionGenerator(connectorIds?: number[]): void {
+ this.automaticTransactionGenerator = AutomaticTransactionGenerator.getInstance(this);
if (Utils.isNotEmptyArray(connectorIds)) {
for (const connectorId of connectorIds) {
this.automaticTransactionGenerator?.startConnector(connectorId);
} else {
this.automaticTransactionGenerator?.start();
}
+ this.saveChargingStationAutomaticTransactionGeneratorConfiguration();
parentPort?.postMessage(MessageChannelUtils.buildUpdatedMessage(this));
}
} else {
this.automaticTransactionGenerator?.stop();
}
+ this.saveChargingStationAutomaticTransactionGeneratorConfiguration();
parentPort?.postMessage(MessageChannelUtils.buildUpdatedMessage(this));
}
private getTemplateFromFile(): ChargingStationTemplate | undefined {
let template: ChargingStationTemplate;
try {
- if (this.sharedLRUCache.hasChargingStationTemplate(this.stationInfo?.templateHash)) {
- template = this.sharedLRUCache.getChargingStationTemplate(this.stationInfo.templateHash);
+ if (this.sharedLRUCache.hasChargingStationTemplate(this.templateFileHash)) {
+ template = this.sharedLRUCache.getChargingStationTemplate(this.templateFileHash);
} else {
const measureId = `${FileType.ChargingStationTemplate} read`;
const beginId = PerformanceStatistics.beginMeasure(measureId);
.update(JSON.stringify(template))
.digest('hex');
this.sharedLRUCache.setChargingStationTemplate(template);
+ this.templateFileHash = template.templateHash;
}
} catch (error) {
- FileUtils.handleFileException(
+ ErrorUtils.handleFileException(
this.templateFile,
FileType.ChargingStationTemplate,
error as NodeJS.ErrnoException,
private getStationInfoFromTemplate(): ChargingStationInfo {
const stationTemplate: ChargingStationTemplate | undefined = this.getTemplateFromFile();
- if (Utils.isNullOrUndefined(stationTemplate)) {
- const errorMsg = `Failed to read charging station template file ${this.templateFile}`;
- logger.error(`${this.logPrefix()} ${errorMsg}`);
- throw new BaseError(errorMsg);
- }
- if (Utils.isEmptyObject(stationTemplate)) {
- const errorMsg = `Empty charging station information from template file ${this.templateFile}`;
- logger.error(`${this.logPrefix()} ${errorMsg}`);
- throw new BaseError(errorMsg);
- }
+ ChargingStationUtils.checkTemplate(stationTemplate, this.logPrefix(), this.templateFile);
ChargingStationUtils.warnTemplateKeysDeprecation(
- this.templateFile,
stationTemplate,
- this.logPrefix()
+ this.logPrefix(),
+ this.templateFile
);
+ if (stationTemplate?.Connectors) {
+ ChargingStationUtils.checkConnectorsConfiguration(
+ stationTemplate,
+ this.logPrefix(),
+ this.templateFile
+ );
+ }
const stationInfo: ChargingStationInfo =
ChargingStationUtils.stationTemplateToStationInfo(stationTemplate);
stationInfo.hashId = ChargingStationUtils.getHashId(this.index, stationTemplate);
stationInfo.resetTime = !Utils.isNullOrUndefined(stationTemplate?.resetTime)
? stationTemplate.resetTime * 1000
: Constants.CHARGING_STATION_DEFAULT_RESET_TIME;
- // Initialize evses or connectors if needed (FIXME: should be factored out but connectors and evses configuration are only available in templates)
- this.initializeConnectorsOrEvses(stationInfo);
stationInfo.maximumAmperage = this.getMaximumAmperage(stationInfo);
- delete stationInfo?.Connectors;
- delete stationInfo?.Evses;
return stationInfo;
}
return this.stationInfo?.stationInfoPersistentConfiguration ?? true;
}
+ private getAutomaticTransactionGeneratorPersistentConfiguration(): boolean {
+ return this.stationInfo?.automaticTransactionGeneratorPersistentConfiguration ?? true;
+ }
+
private handleUnsupportedVersion(version: OCPPVersion) {
const errorMsg = `Unsupported protocol version '${version}' configured in template file ${this.templateFile}`;
logger.error(`${this.logPrefix()} ${errorMsg}`);
}
private initialize(): void {
+ const stationTemplate = this.getTemplateFromFile();
+ ChargingStationUtils.checkTemplate(stationTemplate, this.logPrefix(), this.templateFile);
this.configurationFile = path.join(
path.dirname(this.templateFile.replace('station-templates', 'configurations')),
- `${ChargingStationUtils.getHashId(this.index, this.getTemplateFromFile())}.json`
+ `${ChargingStationUtils.getHashId(this.index, stationTemplate)}.json`
);
+ const chargingStationConfiguration = this.getConfigurationFromFile();
+ if (
+ chargingStationConfiguration?.stationInfo?.templateHash === stationTemplate?.templateHash &&
+ (chargingStationConfiguration?.connectorsStatus || chargingStationConfiguration?.evsesStatus)
+ ) {
+ this.initializeConnectorsOrEvsesFromFile(chargingStationConfiguration);
+ } else {
+ this.initializeConnectorsOrEvsesFromTemplate(stationTemplate);
+ }
this.stationInfo = this.getStationInfo();
if (
this.stationInfo.firmwareStatus === FirmwareStatus.Installing &&
this.saveOcppConfiguration();
}
- private initializeConnectorsOrEvses(stationInfo: ChargingStationInfo) {
- if (stationInfo?.Connectors && !stationInfo?.Evses) {
- this.initializeConnectors(stationInfo);
- } else if (stationInfo?.Evses && !stationInfo?.Connectors) {
- this.initializeEvses(stationInfo);
- } else if (stationInfo?.Evses && stationInfo?.Connectors) {
+ private initializeConnectorsOrEvsesFromFile(configuration: ChargingStationConfiguration): void {
+ if (configuration?.connectorsStatus && !configuration?.evsesStatus) {
+ for (const [connectorId, connectorStatus] of configuration.connectorsStatus.entries()) {
+ this.connectors.set(connectorId, Utils.cloneObject<ConnectorStatus>(connectorStatus));
+ }
+ } else if (configuration?.evsesStatus && !configuration?.connectorsStatus) {
+ for (const [evseId, evseStatusConfiguration] of configuration.evsesStatus.entries()) {
+ const evseStatus = Utils.cloneObject<EvseStatusConfiguration>(evseStatusConfiguration);
+ delete evseStatus.connectorsStatus;
+ this.evses.set(evseId, {
+ ...(evseStatus as EvseStatus),
+ connectors: new Map<number, ConnectorStatus>(
+ evseStatusConfiguration.connectorsStatus.map((connectorStatus, connectorId) => [
+ connectorId,
+ connectorStatus,
+ ])
+ ),
+ });
+ }
+ } else if (configuration?.evsesStatus && configuration?.connectorsStatus) {
+ const errorMsg = `Connectors and evses defined at the same time in configuration file ${this.configurationFile}`;
+ logger.error(`${this.logPrefix()} ${errorMsg}`);
+ throw new BaseError(errorMsg);
+ } else {
+ const errorMsg = `No connectors or evses defined in configuration file ${this.configurationFile}`;
+ logger.error(`${this.logPrefix()} ${errorMsg}`);
+ throw new BaseError(errorMsg);
+ }
+ }
+
+ private initializeConnectorsOrEvsesFromTemplate(stationTemplate: ChargingStationTemplate) {
+ if (stationTemplate?.Connectors && !stationTemplate?.Evses) {
+ this.initializeConnectorsFromTemplate(stationTemplate);
+ } else if (stationTemplate?.Evses && !stationTemplate?.Connectors) {
+ this.initializeEvsesFromTemplate(stationTemplate);
+ } else if (stationTemplate?.Evses && stationTemplate?.Connectors) {
const errorMsg = `Connectors and evses defined at the same time in template file ${this.templateFile}`;
logger.error(`${this.logPrefix()} ${errorMsg}`);
throw new BaseError(errorMsg);
}
}
- private initializeConnectors(stationInfo: ChargingStationInfo): void {
- if (!stationInfo?.Connectors && this.connectors.size === 0) {
+ private initializeConnectorsFromTemplate(stationTemplate: ChargingStationTemplate): void {
+ if (!stationTemplate?.Connectors && this.connectors.size === 0) {
const errorMsg = `No already defined connectors and charging station information from template ${this.templateFile} with no connectors configuration defined`;
logger.error(`${this.logPrefix()} ${errorMsg}`);
throw new BaseError(errorMsg);
}
- if (!stationInfo?.Connectors[0]) {
+ if (!stationTemplate?.Connectors[0]) {
logger.warn(
`${this.logPrefix()} Charging station information from template ${
this.templateFile
} with no connector id 0 configuration`
);
}
- if (stationInfo?.Connectors) {
- const configuredMaxConnectors =
- ChargingStationUtils.getConfiguredNumberOfConnectors(stationInfo);
- ChargingStationUtils.checkConfiguredMaxConnectors(
- configuredMaxConnectors,
- this.templateFile,
- this.logPrefix()
- );
+ if (stationTemplate?.Connectors) {
+ const { configuredMaxConnectors, templateMaxConnectors, templateMaxAvailableConnectors } =
+ ChargingStationUtils.checkConnectorsConfiguration(
+ stationTemplate,
+ this.logPrefix(),
+ this.templateFile
+ );
const connectorsConfigHash = crypto
.createHash(Constants.DEFAULT_HASH_ALGORITHM)
- .update(`${JSON.stringify(stationInfo?.Connectors)}${configuredMaxConnectors.toString()}`)
+ .update(
+ `${JSON.stringify(stationTemplate?.Connectors)}${configuredMaxConnectors.toString()}`
+ )
.digest('hex');
const connectorsConfigChanged =
this.connectors?.size !== 0 && this.connectorsConfigurationHash !== connectorsConfigHash;
if (this.connectors?.size === 0 || connectorsConfigChanged) {
connectorsConfigChanged && this.connectors.clear();
this.connectorsConfigurationHash = connectorsConfigHash;
- const templateMaxConnectors = ChargingStationUtils.getMaxNumberOfConnectors(
- stationInfo.Connectors
- );
- ChargingStationUtils.checkTemplateMaxConnectors(
- templateMaxConnectors,
- this.templateFile,
- this.logPrefix()
- );
- const templateMaxAvailableConnectors = stationInfo?.Connectors[0]
- ? templateMaxConnectors - 1
- : templateMaxConnectors;
- if (
- configuredMaxConnectors > templateMaxAvailableConnectors &&
- !stationInfo?.randomConnectors
- ) {
- logger.warn(
- `${this.logPrefix()} Number of connectors exceeds the number of connector configurations in template ${
- this.templateFile
- }, forcing random connector configurations affectation`
- );
- stationInfo.randomConnectors = true;
- }
if (templateMaxConnectors > 0) {
for (let connectorId = 0; connectorId <= configuredMaxConnectors; connectorId++) {
if (
connectorId === 0 &&
- (!stationInfo?.Connectors[connectorId] ||
- this.getUseConnectorId0(stationInfo) === false)
+ (!stationTemplate?.Connectors[connectorId] ||
+ this.getUseConnectorId0(stationTemplate) === false)
) {
continue;
}
const templateConnectorId =
- connectorId > 0 && stationInfo?.randomConnectors
+ connectorId > 0 && stationTemplate?.randomConnectors
? Utils.getRandomInteger(templateMaxAvailableConnectors, 1)
: connectorId;
- const connectorStatus = stationInfo?.Connectors[templateConnectorId];
+ const connectorStatus = stationTemplate?.Connectors[templateConnectorId];
ChargingStationUtils.checkStationInfoConnectorStatus(
templateConnectorId,
connectorStatus,
}
}
- private initializeEvses(stationInfo: ChargingStationInfo): void {
- if (!stationInfo?.Evses && this.evses.size === 0) {
+ private initializeEvsesFromTemplate(stationTemplate: ChargingStationTemplate): void {
+ if (!stationTemplate?.Evses && this.evses.size === 0) {
const errorMsg = `No already defined evses and charging station information from template ${this.templateFile} with no evses configuration defined`;
logger.error(`${this.logPrefix()} ${errorMsg}`);
throw new BaseError(errorMsg);
}
- if (!stationInfo?.Evses[0]) {
+ if (!stationTemplate?.Evses[0]) {
logger.warn(
`${this.logPrefix()} Charging station information from template ${
this.templateFile
} with no evse id 0 configuration`
);
}
- if (!stationInfo?.Evses[0]?.Connectors[0]) {
+ if (!stationTemplate?.Evses[0]?.Connectors[0]) {
logger.warn(
`${this.logPrefix()} Charging station information from template ${
this.templateFile
} with evse id 0 with no connector id 0 configuration`
);
}
- if (stationInfo?.Evses) {
+ if (stationTemplate?.Evses) {
const evsesConfigHash = crypto
.createHash(Constants.DEFAULT_HASH_ALGORITHM)
- .update(`${JSON.stringify(stationInfo?.Evses)}`)
+ .update(JSON.stringify(stationTemplate?.Evses))
.digest('hex');
const evsesConfigChanged =
this.evses?.size !== 0 && this.evsesConfigurationHash !== evsesConfigHash;
if (this.evses?.size === 0 || evsesConfigChanged) {
evsesConfigChanged && this.evses.clear();
this.evsesConfigurationHash = evsesConfigHash;
- const templateMaxEvses = ChargingStationUtils.getMaxNumberOfEvses(stationInfo?.Evses);
+ const templateMaxEvses = ChargingStationUtils.getMaxNumberOfEvses(stationTemplate?.Evses);
if (templateMaxEvses > 0) {
- for (const evse in stationInfo.Evses) {
+ for (const evse in stationTemplate.Evses) {
const evseId = Utils.convertToInt(evse);
this.evses.set(evseId, {
connectors: ChargingStationUtils.buildConnectorsMap(
- stationInfo?.Evses[evse]?.Connectors,
+ stationTemplate?.Evses[evse]?.Connectors,
this.logPrefix(),
this.templateFile
),
private getConfigurationFromFile(): ChargingStationConfiguration | undefined {
let configuration: ChargingStationConfiguration | undefined;
- if (this.configurationFile && fs.existsSync(this.configurationFile)) {
+ if (Utils.isNotEmptyString(this.configurationFile) && fs.existsSync(this.configurationFile)) {
try {
if (this.sharedLRUCache.hasChargingStationConfiguration(this.configurationFileHash)) {
configuration = this.sharedLRUCache.getChargingStationConfiguration(
fs.readFileSync(this.configurationFile, 'utf8')
) as ChargingStationConfiguration;
PerformanceStatistics.endMeasure(measureId, beginId);
- this.configurationFileHash = configuration.configurationHash;
this.sharedLRUCache.setChargingStationConfiguration(configuration);
+ this.configurationFileHash = configuration.configurationHash;
}
} catch (error) {
- FileUtils.handleFileException(
+ ErrorUtils.handleFileException(
this.configurationFile,
FileType.ChargingStationConfiguration,
error as NodeJS.ErrnoException,
return configuration;
}
- private saveConnectorsStatus() {
- if (this.getOcppPersistentConfiguration()) {
+ private saveChargingStationAutomaticTransactionGeneratorConfiguration(): void {
+ if (this.getAutomaticTransactionGeneratorPersistentConfiguration()) {
this.saveConfiguration();
}
}
+ private saveConnectorsStatus() {
+ this.saveConfiguration();
+ }
+
private saveEvsesStatus() {
- if (this.getOcppPersistentConfiguration()) {
- this.saveConfiguration();
- }
+ this.saveConfiguration();
}
private saveConfiguration(): void {
- if (this.configurationFile) {
+ if (Utils.isNotEmptyString(this.configurationFile)) {
try {
if (!fs.existsSync(path.dirname(this.configurationFile))) {
fs.mkdirSync(path.dirname(this.configurationFile), { recursive: true });
}
- const configurationData: ChargingStationConfiguration =
- Utils.cloneObject(this.getConfigurationFromFile()) ?? {};
- if (this.stationInfo) {
+ let configurationData: ChargingStationConfiguration =
+ Utils.cloneObject<ChargingStationConfiguration>(this.getConfigurationFromFile()) ?? {};
+ if (this.getStationInfoPersistentConfiguration() && this.stationInfo) {
configurationData.stationInfo = this.stationInfo;
+ } else {
+ delete configurationData.stationInfo;
}
- if (this.ocppConfiguration?.configurationKey) {
+ if (this.getOcppPersistentConfiguration() && this.ocppConfiguration?.configurationKey) {
configurationData.configurationKey = this.ocppConfiguration.configurationKey;
+ } else {
+ delete configurationData.configurationKey;
+ }
+ configurationData = merge<ChargingStationConfiguration>(
+ configurationData,
+ buildChargingStationAutomaticTransactionGeneratorConfiguration(this)
+ );
+ if (
+ !this.getAutomaticTransactionGeneratorPersistentConfiguration() ||
+ !this.getAutomaticTransactionGeneratorConfiguration()
+ ) {
+ delete configurationData.automaticTransactionGenerator;
}
if (this.connectors.size > 0) {
- configurationData.connectorsStatus = [...this.connectors.values()].map(
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- ({ transactionSetInterval, ...connectorStatusRest }) => connectorStatusRest
- );
+ configurationData.connectorsStatus = buildConnectorsStatus(this);
+ } else {
+ delete configurationData.connectorsStatus;
}
if (this.evses.size > 0) {
- configurationData.evsesStatus = [...this.evses.values()].map((evseStatus) => {
- const status = {
- ...evseStatus,
- connectorsStatus: [...evseStatus.connectors.values()].map(
- // eslint-disable-next-line @typescript-eslint/no-unused-vars
- ({ transactionSetInterval, ...connectorStatusRest }) => connectorStatusRest
- ),
- };
- delete status.connectors;
- return status as EvseStatusConfiguration;
- });
+ configurationData.evsesStatus = buildEvsesStatus(this);
+ } else {
+ delete configurationData.evsesStatus;
}
delete configurationData.configurationHash;
const configurationHash = crypto
.createHash(Constants.DEFAULT_HASH_ALGORITHM)
- .update(JSON.stringify(configurationData))
+ .update(
+ JSON.stringify({
+ stationInfo: configurationData.stationInfo,
+ configurationKey: configurationData.configurationKey,
+ automaticTransactionGenerator: configurationData.automaticTransactionGenerator,
+ } as ChargingStationConfiguration)
+ )
.digest('hex');
if (this.configurationFileHash !== configurationHash) {
- configurationData.configurationHash = configurationHash;
- const measureId = `${FileType.ChargingStationConfiguration} write`;
- const beginId = PerformanceStatistics.beginMeasure(measureId);
- const fileDescriptor = fs.openSync(this.configurationFile, 'w');
- fs.writeFileSync(fileDescriptor, JSON.stringify(configurationData, null, 2), 'utf8');
- fs.closeSync(fileDescriptor);
- PerformanceStatistics.endMeasure(measureId, beginId);
- this.sharedLRUCache.deleteChargingStationConfiguration(this.configurationFileHash);
- this.configurationFileHash = configurationHash;
- this.sharedLRUCache.setChargingStationConfiguration(configurationData);
+ AsyncLock.acquire(AsyncLockType.configuration)
+ .then(() => {
+ configurationData.configurationHash = configurationHash;
+ const measureId = `${FileType.ChargingStationConfiguration} write`;
+ const beginId = PerformanceStatistics.beginMeasure(measureId);
+ const fileDescriptor = fs.openSync(this.configurationFile, 'w');
+ fs.writeFileSync(fileDescriptor, JSON.stringify(configurationData, null, 2), 'utf8');
+ fs.closeSync(fileDescriptor);
+ PerformanceStatistics.endMeasure(measureId, beginId);
+ this.sharedLRUCache.deleteChargingStationConfiguration(this.configurationFileHash);
+ this.sharedLRUCache.setChargingStationConfiguration(configurationData);
+ this.configurationFileHash = configurationHash;
+ })
+ .catch((error) => {
+ ErrorUtils.handleFileException(
+ this.configurationFile,
+ FileType.ChargingStationConfiguration,
+ error as NodeJS.ErrnoException,
+ this.logPrefix()
+ );
+ })
+ .finally(() => {
+ AsyncLock.release(AsyncLockType.configuration).catch(Constants.EMPTY_FUNCTION);
+ });
} else {
logger.debug(
`${this.logPrefix()} Not saving unchanged charging station configuration file ${
);
}
} catch (error) {
- FileUtils.handleFileException(
+ ErrorUtils.handleFileException(
this.configurationFile,
FileType.ChargingStationConfiguration,
error as NodeJS.ErrnoException,
}
private getOcppConfigurationFromFile(): ChargingStationOcppConfiguration | undefined {
- let configuration: ChargingStationConfiguration | undefined;
- if (this.getOcppPersistentConfiguration() === true) {
- const configurationFromFile = this.getConfigurationFromFile();
- configuration = configurationFromFile?.configurationKey && configurationFromFile;
+ const configurationKey = this.getConfigurationFromFile()?.configurationKey;
+ if (this.getOcppPersistentConfiguration() === true && configurationKey) {
+ return { configurationKey };
}
- if (!Utils.isNullOrUndefined(configuration)) {
- delete configuration.stationInfo;
- delete configuration.configurationHash;
- }
- return configuration;
+ return undefined;
}
private getOcppConfiguration(): ChargingStationOcppConfiguration | undefined {
skipBufferingOnError: true,
});
if (this.isRegistered() === false) {
- this.getRegistrationMaxRetries() !== -1 && registrationRetryCount++;
+ this.getRegistrationMaxRetries() !== -1 && ++registrationRetryCount;
await Utils.sleep(
this?.bootNotificationResponse?.interval
? this.bootNotificationResponse.interval * 1000
- : Constants.OCPP_DEFAULT_BOOT_NOTIFICATION_INTERVAL
+ : Constants.DEFAULT_BOOT_NOTIFICATION_INTERVAL
);
}
} while (
);
}
if (this.isRegistered() === true) {
- if (this.isInAcceptedState() === true) {
+ if (this.inAcceptedState() === true) {
await this.startMessageSequence();
}
} else {
);
}
- private getUseConnectorId0(stationInfo?: ChargingStationInfo): boolean {
- return (stationInfo ?? this.stationInfo)?.useConnectorId0 ?? true;
+ private getUseConnectorId0(stationTemplate?: ChargingStationTemplate): boolean {
+ return stationTemplate?.useConnectorId0 ?? true;
}
private async stopRunningTransactions(reason = StopTransactionReason.NONE): Promise<void> {
await OCPPServiceUtils.sendAndSetConnectorStatus(
this,
connectorId,
- connectorBootStatus
+ connectorBootStatus,
+ evseId
);
}
}
}
// Start the ATG
- if (this.getAutomaticTransactionGeneratorConfigurationFromTemplate()?.enable === true) {
+ if (this.getAutomaticTransactionGeneratorConfiguration()?.enable === true) {
this.startAutomaticTransactionGenerator();
}
this.wsConnectionRestarted === true && this.flushMessageBuffer();
OCPPServiceUtils.buildStatusNotificationRequest(
this,
connectorId,
- ConnectorStatusEnum.Unavailable
+ ConnectorStatusEnum.Unavailable,
+ evseId
)
);
delete connectorStatus?.status;
}
private getConfiguredSupervisionUrl(): URL {
+ let configuredSupervisionUrl: string;
const supervisionUrls = this.stationInfo?.supervisionUrls ?? Configuration.getSupervisionUrls();
if (Utils.isNotEmptyArray(supervisionUrls)) {
let configuredSupervisionUrlIndex: number;
configuredSupervisionUrlIndex = (this.index - 1) % supervisionUrls.length;
break;
}
- return new URL(supervisionUrls[configuredSupervisionUrlIndex]);
+ configuredSupervisionUrl = supervisionUrls[configuredSupervisionUrlIndex];
+ } else {
+ configuredSupervisionUrl = supervisionUrls as string;
}
- return new URL(supervisionUrls as string);
+ if (Utils.isNotEmptyString(configuredSupervisionUrl)) {
+ return new URL(configuredSupervisionUrl);
+ }
+ const errorMsg = 'No supervision url(s) configured';
+ logger.error(`${this.logPrefix()} ${errorMsg}`);
+ throw new BaseError(`${errorMsg}`);
}
private stopHeartbeat(): void {
// Stop heartbeat
this.stopHeartbeat();
// Stop the ATG if needed
- if (this.automaticTransactionGenerator?.configuration?.stopOnConnectionFailure === true) {
+ if (this.getAutomaticTransactionGeneratorConfiguration().stopOnConnectionFailure === true) {
this.stopAutomaticTransactionGenerator();
}
if (
this.autoReconnectRetryCount < this.getAutoReconnectMaxRetries() ||
this.getAutoReconnectMaxRetries() === -1
) {
- this.autoReconnectRetryCount++;
+ ++this.autoReconnectRetryCount;
const reconnectDelay = this.getReconnectExponentialDelay()
? Utils.exponentialDelay(this.autoReconnectRetryCount)
: this.getConnectionTimeout() * 1000;
);
}
}
-
- private getAutomaticTransactionGeneratorConfigurationFromTemplate():
- | AutomaticTransactionGeneratorConfiguration
- | undefined {
- return this.getTemplateFromFile()?.AutomaticTransactionGenerator;
- }
}
repositories / e-mobility-charging-stations-simulator.git / blobdiff