From: Jérôme Benoit Date: Sat, 23 Jan 2021 06:51:56 +0000 (+0100) Subject: Rename private attributes and methods. X-Git-Tag: v1.0.1-0~124 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=ad2f27c30a5a29e0ce3a6e2be5a3385061ada313;p=e-mobility-charging-stations-simulator.git Rename private attributes and methods. Signed-off-by: Jérôme Benoit --- diff --git a/src/charging-station/AutomaticTransactionGenerator.ts b/src/charging-station/AutomaticTransactionGenerator.ts index b38e2143..76758c14 100644 --- a/src/charging-station/AutomaticTransactionGenerator.ts +++ b/src/charging-station/AutomaticTransactionGenerator.ts @@ -7,92 +7,88 @@ import Utils from '../utils/Utils'; import logger from '../utils/Logger'; export default class AutomaticTransactionGenerator { - private _chargingStation: ChargingStation; - private _timeToStop: boolean; - private _performanceObserver: PerformanceObserver; + public timeToStop: boolean; + private chargingStation: ChargingStation; + private performanceObserver: PerformanceObserver; constructor(chargingStation: ChargingStation) { - this._chargingStation = chargingStation; - this._timeToStop = true; - if (this._chargingStation.getEnableStatistics()) { - this._performanceObserver = new PerformanceObserver((list) => { + this.chargingStation = chargingStation; + this.timeToStop = true; + if (this.chargingStation.getEnableStatistics()) { + this.performanceObserver = new PerformanceObserver((list) => { const entry = list.getEntries()[0]; - this._chargingStation.statistics.logPerformance(entry, Constants.ENTITY_AUTOMATIC_TRANSACTION_GENERATOR); - this._performanceObserver.disconnect(); + this.chargingStation.statistics.logPerformance(entry, Constants.ENTITY_AUTOMATIC_TRANSACTION_GENERATOR); + this.performanceObserver.disconnect(); }); } } - get timeToStop(): boolean { - return this._timeToStop; - } - _logPrefix(connectorId: number = null): string { if (connectorId) { - return Utils.logPrefix(' ' + this._chargingStation.stationInfo.chargingStationId + ' ATG on connector #' + connectorId.toString() + ':'); + return Utils.logPrefix(' ' + this.chargingStation.stationInfo.chargingStationId + ' ATG on connector #' + connectorId.toString() + ':'); } - return Utils.logPrefix(' ' + this._chargingStation.stationInfo.chargingStationId + ' ATG:'); + return Utils.logPrefix(' ' + this.chargingStation.stationInfo.chargingStationId + ' ATG:'); } start(): void { - this._timeToStop = false; - if (this._chargingStation.stationInfo.AutomaticTransactionGenerator.stopAfterHours && - this._chargingStation.stationInfo.AutomaticTransactionGenerator.stopAfterHours > 0) { + this.timeToStop = false; + if (this.chargingStation.stationInfo.AutomaticTransactionGenerator.stopAfterHours && + this.chargingStation.stationInfo.AutomaticTransactionGenerator.stopAfterHours > 0) { setTimeout(() => { void this.stop(); - }, this._chargingStation.stationInfo.AutomaticTransactionGenerator.stopAfterHours * 3600 * 1000); + }, this.chargingStation.stationInfo.AutomaticTransactionGenerator.stopAfterHours * 3600 * 1000); } - for (const connector in this._chargingStation.connectors) { + for (const connector in this.chargingStation.connectors) { if (Utils.convertToInt(connector) > 0) { void this.startConnector(Utils.convertToInt(connector)); } } - logger.info(this._logPrefix() + ' ATG started and will stop in ' + Utils.secondsToHHMMSS(this._chargingStation.stationInfo.AutomaticTransactionGenerator.stopAfterHours * 3600)); + logger.info(this._logPrefix() + ' ATG started and will stop in ' + Utils.secondsToHHMMSS(this.chargingStation.stationInfo.AutomaticTransactionGenerator.stopAfterHours * 3600)); } async stop(reason: StopTransactionReason = StopTransactionReason.NONE): Promise { logger.info(this._logPrefix() + ' ATG OVER => STOPPING ALL TRANSACTIONS'); - for (const connector in this._chargingStation.connectors) { - if (this._chargingStation.getConnector(Utils.convertToInt(connector)).transactionStarted) { - logger.info(this._logPrefix(Utils.convertToInt(connector)) + ' ATG OVER. Stop transaction ' + this._chargingStation.getConnector(Utils.convertToInt(connector)).transactionId.toString()); - await this._chargingStation.sendStopTransaction(this._chargingStation.getConnector(Utils.convertToInt(connector)).transactionId, reason); + for (const connector in this.chargingStation.connectors) { + if (this.chargingStation.getConnector(Utils.convertToInt(connector)).transactionStarted) { + logger.info(this._logPrefix(Utils.convertToInt(connector)) + ' ATG OVER. Stop transaction ' + this.chargingStation.getConnector(Utils.convertToInt(connector)).transactionId.toString()); + await this.chargingStation.sendStopTransaction(this.chargingStation.getConnector(Utils.convertToInt(connector)).transactionId, reason); } } - this._timeToStop = true; + this.timeToStop = true; } async startConnector(connectorId: number): Promise { do { - if (this._timeToStop) { + if (this.timeToStop) { logger.error(this._logPrefix(connectorId) + ' Entered in transaction loop while a request to stop it was made'); break; } - if (!this._chargingStation._isRegistered()) { + if (!this.chargingStation._isRegistered()) { logger.error(this._logPrefix(connectorId) + ' Entered in transaction loop while the charging station is not registered'); break; } - if (!this._chargingStation._isChargingStationAvailable()) { + if (!this.chargingStation._isChargingStationAvailable()) { logger.info(this._logPrefix(connectorId) + ' Entered in transaction loop while the charging station is unavailable'); await this.stop(); break; } - if (!this._chargingStation._isConnectorAvailable(connectorId)) { + if (!this.chargingStation._isConnectorAvailable(connectorId)) { logger.info(`${this._logPrefix(connectorId)} Entered in transaction loop while the connector ${connectorId} is unavailable, stop it`); break; } - const wait = Utils.getRandomInt(this._chargingStation.stationInfo.AutomaticTransactionGenerator.maxDelayBetweenTwoTransactions, - this._chargingStation.stationInfo.AutomaticTransactionGenerator.minDelayBetweenTwoTransactions) * 1000; + const wait = Utils.getRandomInt(this.chargingStation.stationInfo.AutomaticTransactionGenerator.maxDelayBetweenTwoTransactions, + this.chargingStation.stationInfo.AutomaticTransactionGenerator.minDelayBetweenTwoTransactions) * 1000; logger.info(this._logPrefix(connectorId) + ' wait for ' + Utils.milliSecondsToHHMMSS(wait)); await Utils.sleep(wait); const start = Math.random(); let skip = 0; - if (start < this._chargingStation.stationInfo.AutomaticTransactionGenerator.probabilityOfStart) { + if (start < this.chargingStation.stationInfo.AutomaticTransactionGenerator.probabilityOfStart) { skip = 0; // Start transaction let startResponse: StartTransactionResponse | AuthorizeResponse; - if (this._chargingStation.getEnableStatistics()) { + if (this.chargingStation.getEnableStatistics()) { const startTransaction = performance.timerify(this.startTransaction); - this._performanceObserver.observe({ entryTypes: ['function'] }); + this.performanceObserver.observe({ entryTypes: ['function'] }); startResponse = await startTransaction(connectorId, this); } else { startResponse = await this.startTransaction(connectorId, this); @@ -102,16 +98,16 @@ export default class AutomaticTransactionGenerator { await Utils.sleep(Constants.CHARGING_STATION_ATG_WAIT_TIME); } else { // Wait until end of transaction - const waitTrxEnd = Utils.getRandomInt(this._chargingStation.stationInfo.AutomaticTransactionGenerator.maxDuration, - this._chargingStation.stationInfo.AutomaticTransactionGenerator.minDuration) * 1000; - logger.info(this._logPrefix(connectorId) + ' transaction ' + this._chargingStation.getConnector(connectorId).transactionId.toString() + ' will stop in ' + Utils.milliSecondsToHHMMSS(waitTrxEnd)); + const waitTrxEnd = Utils.getRandomInt(this.chargingStation.stationInfo.AutomaticTransactionGenerator.maxDuration, + this.chargingStation.stationInfo.AutomaticTransactionGenerator.minDuration) * 1000; + logger.info(this._logPrefix(connectorId) + ' transaction ' + this.chargingStation.getConnector(connectorId).transactionId.toString() + ' will stop in ' + Utils.milliSecondsToHHMMSS(waitTrxEnd)); await Utils.sleep(waitTrxEnd); // Stop transaction - if (this._chargingStation.getConnector(connectorId)?.transactionStarted) { - logger.info(this._logPrefix(connectorId) + ' stop transaction ' + this._chargingStation.getConnector(connectorId).transactionId.toString()); - if (this._chargingStation.getEnableStatistics()) { + if (this.chargingStation.getConnector(connectorId)?.transactionStarted) { + logger.info(this._logPrefix(connectorId) + ' stop transaction ' + this.chargingStation.getConnector(connectorId).transactionId.toString()); + if (this.chargingStation.getEnableStatistics()) { const stopTransaction = performance.timerify(this.stopTransaction); - this._performanceObserver.observe({ entryTypes: ['function'] }); + this.performanceObserver.observe({ entryTypes: ['function'] }); await stopTransaction(connectorId, this); } else { await this.stopTransaction(connectorId, this); @@ -122,34 +118,34 @@ export default class AutomaticTransactionGenerator { skip++; logger.info(this._logPrefix(connectorId) + ' transaction skipped ' + skip.toString()); } - } while (!this._timeToStop); + } while (!this.timeToStop); logger.info(this._logPrefix(connectorId) + ' ATG STOPPED on the connector'); } // eslint-disable-next-line consistent-this private async startTransaction(connectorId: number, self: AutomaticTransactionGenerator): Promise { - if (self._chargingStation.hasAuthorizedTags()) { - const tagId = self._chargingStation.getRandomTagId(); - if (self._chargingStation.stationInfo.AutomaticTransactionGenerator.requireAuthorize) { + if (self.chargingStation.hasAuthorizedTags()) { + const tagId = self.chargingStation.getRandomTagId(); + if (self.chargingStation.stationInfo.AutomaticTransactionGenerator.requireAuthorize) { // Authorize tagId - const authorizeResponse = await self._chargingStation.sendAuthorize(tagId); + const authorizeResponse = await self.chargingStation.sendAuthorize(tagId); if (authorizeResponse?.idTagInfo?.status === AuthorizationStatus.ACCEPTED) { logger.info(self._logPrefix(connectorId) + ' start transaction for tagID ' + tagId); // Start transaction - return await self._chargingStation.sendStartTransaction(connectorId, tagId); + return await self.chargingStation.sendStartTransaction(connectorId, tagId); } return authorizeResponse; } logger.info(self._logPrefix(connectorId) + ' start transaction for tagID ' + tagId); // Start transaction - return await self._chargingStation.sendStartTransaction(connectorId, tagId); + return await self.chargingStation.sendStartTransaction(connectorId, tagId); } logger.info(self._logPrefix(connectorId) + ' start transaction without a tagID'); - return await self._chargingStation.sendStartTransaction(connectorId); + return await self.chargingStation.sendStartTransaction(connectorId); } // eslint-disable-next-line consistent-this private async stopTransaction(connectorId: number, self: AutomaticTransactionGenerator): Promise { - return await self._chargingStation.sendStopTransaction(self._chargingStation.getConnector(connectorId).transactionId); + return await self.chargingStation.sendStopTransaction(self.chargingStation.getConnector(connectorId).transactionId); } } diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts index f94efde3..b3a2e622 100644 --- a/src/charging-station/ChargingStation.ts +++ b/src/charging-station/ChargingStation.ts @@ -31,43 +31,43 @@ import fs from 'fs'; import logger from '../utils/Logger'; export default class ChargingStation { - private _index: number; - private _stationTemplateFile: string; - private _stationInfo: ChargingStationInfo; - private _bootNotificationRequest: BootNotificationRequest; - private _bootNotificationResponse: BootNotificationResponse; - private _connectors: Connectors; - private _configuration: ChargingStationConfiguration; - private _connectorsConfigurationHash: string; - private _supervisionUrl: string; - private _wsConnectionUrl: string; - private _wsConnection: WebSocket; - private _hasStopped: boolean; - private _hasSocketRestarted: boolean; - private _autoReconnectRetryCount: number; - private _requests: Requests; - private _messageQueue: string[]; - private _automaticTransactionGeneration: AutomaticTransactionGenerator; - private _authorizedTags: string[]; - private _heartbeatSetInterval: NodeJS.Timeout; - private _webSocketPingSetInterval: NodeJS.Timeout; - private _statistics: Statistics; - private _performanceObserver: PerformanceObserver; + public stationInfo: ChargingStationInfo; + public connectors: Connectors; + public statistics: Statistics; + private index: number; + private stationTemplateFile: string; + private bootNotificationRequest: BootNotificationRequest; + private bootNotificationResponse: BootNotificationResponse; + private configuration: ChargingStationConfiguration; + private connectorsConfigurationHash: string; + private supervisionUrl: string; + private wsConnectionUrl: string; + private wsConnection: WebSocket; + private hasStopped: boolean; + private hasSocketRestarted: boolean; + private autoReconnectRetryCount: number; + private requests: Requests; + private messageQueue: string[]; + private automaticTransactionGeneration: AutomaticTransactionGenerator; + private authorizedTags: string[]; + private heartbeatSetInterval: NodeJS.Timeout; + private webSocketPingSetInterval: NodeJS.Timeout; + private performanceObserver: PerformanceObserver; constructor(index: number, stationTemplateFile: string) { - this._index = index; - this._stationTemplateFile = stationTemplateFile; - this._connectors = {} as Connectors; + this.index = index; + this.stationTemplateFile = stationTemplateFile; + this.connectors = {} as Connectors; this._initialize(); - this._hasStopped = false; - this._hasSocketRestarted = false; - this._autoReconnectRetryCount = 0; + this.hasStopped = false; + this.hasSocketRestarted = false; + this.autoReconnectRetryCount = 0; - this._requests = {} as Requests; - this._messageQueue = [] as string[]; + this.requests = {} as Requests; + this.messageQueue = [] as string[]; - this._authorizedTags = this._loadAndGetAuthorizedTags(); + this.authorizedTags = this._loadAndGetAuthorizedTags(); } _getChargingStationId(stationTemplate: ChargingStationTemplate): string { @@ -77,18 +77,18 @@ export default class ChargingStation { const idSuffix = stationTemplate.nameSuffix ? stationTemplate.nameSuffix : ''; - return stationTemplate.fixedName ? stationTemplate.baseName : stationTemplate.baseName + '-' + instanceIndex.toString() + ('000000000' + this._index.toString()).substr(('000000000' + this._index.toString()).length - 4) + idSuffix; + return stationTemplate.fixedName ? stationTemplate.baseName : stationTemplate.baseName + '-' + instanceIndex.toString() + ('000000000' + this.index.toString()).substr(('000000000' + this.index.toString()).length - 4) + idSuffix; } _buildStationInfo(): ChargingStationInfo { let stationTemplateFromFile: ChargingStationTemplate; try { // Load template file - const fileDescriptor = fs.openSync(this._stationTemplateFile, 'r'); + const fileDescriptor = fs.openSync(this.stationTemplateFile, 'r'); stationTemplateFromFile = JSON.parse(fs.readFileSync(fileDescriptor, 'utf8')) as ChargingStationTemplate; fs.closeSync(fileDescriptor); } catch (error) { - logger.error('Template file ' + this._stationTemplateFile + ' loading error: %j', error); + logger.error('Template file ' + this.stationTemplateFile + ' loading error: %j', error); throw error; } const stationInfo: ChargingStationInfo = stationTemplateFromFile || {} as ChargingStationInfo; @@ -103,63 +103,59 @@ export default class ChargingStation { return stationInfo; } - get stationInfo(): ChargingStationInfo { - return this._stationInfo; - } - _initialize(): void { - this._stationInfo = this._buildStationInfo(); - this._bootNotificationRequest = { - chargePointModel: this._stationInfo.chargePointModel, - chargePointVendor: this._stationInfo.chargePointVendor, - ...!Utils.isUndefined(this._stationInfo.chargeBoxSerialNumberPrefix) && { chargeBoxSerialNumber: this._stationInfo.chargeBoxSerialNumberPrefix }, - ...!Utils.isUndefined(this._stationInfo.firmwareVersion) && { firmwareVersion: this._stationInfo.firmwareVersion }, + this.stationInfo = this._buildStationInfo(); + this.bootNotificationRequest = { + chargePointModel: this.stationInfo.chargePointModel, + chargePointVendor: this.stationInfo.chargePointVendor, + ...!Utils.isUndefined(this.stationInfo.chargeBoxSerialNumberPrefix) && { chargeBoxSerialNumber: this.stationInfo.chargeBoxSerialNumberPrefix }, + ...!Utils.isUndefined(this.stationInfo.firmwareVersion) && { firmwareVersion: this.stationInfo.firmwareVersion }, }; - this._configuration = this._getTemplateChargingStationConfiguration(); - this._supervisionUrl = this._getSupervisionURL(); - this._wsConnectionUrl = this._supervisionUrl + '/' + this._stationInfo.chargingStationId; + this.configuration = this._getTemplateChargingStationConfiguration(); + this.supervisionUrl = this._getSupervisionURL(); + this.wsConnectionUrl = this.supervisionUrl + '/' + this.stationInfo.chargingStationId; // Build connectors if needed const maxConnectors = this._getMaxNumberOfConnectors(); if (maxConnectors <= 0) { - logger.warn(`${this._logPrefix()} Charging station template ${this._stationTemplateFile} with ${maxConnectors} connectors`); + logger.warn(`${this._logPrefix()} Charging station template ${this.stationTemplateFile} with ${maxConnectors} connectors`); } const templateMaxConnectors = this._getTemplateMaxNumberOfConnectors(); if (templateMaxConnectors <= 0) { - logger.warn(`${this._logPrefix()} Charging station template ${this._stationTemplateFile} with no connector configuration`); + logger.warn(`${this._logPrefix()} Charging station template ${this.stationTemplateFile} with no connector configuration`); } - if (!this._stationInfo.Connectors[0]) { - logger.warn(`${this._logPrefix()} Charging station template ${this._stationTemplateFile} with no connector Id 0 configuration`); + if (!this.stationInfo.Connectors[0]) { + logger.warn(`${this._logPrefix()} Charging station template ${this.stationTemplateFile} with no connector Id 0 configuration`); } // Sanity check - if (maxConnectors > (this._stationInfo.Connectors[0] ? templateMaxConnectors - 1 : templateMaxConnectors) && !this._stationInfo.randomConnectors) { - logger.warn(`${this._logPrefix()} Number of connectors exceeds the number of connector configurations in template ${this._stationTemplateFile}, forcing random connector configurations affectation`); - this._stationInfo.randomConnectors = true; + if (maxConnectors > (this.stationInfo.Connectors[0] ? templateMaxConnectors - 1 : templateMaxConnectors) && !this.stationInfo.randomConnectors) { + logger.warn(`${this._logPrefix()} Number of connectors exceeds the number of connector configurations in template ${this.stationTemplateFile}, forcing random connector configurations affectation`); + this.stationInfo.randomConnectors = true; } - const connectorsConfigHash = crypto.createHash('sha256').update(JSON.stringify(this._stationInfo.Connectors) + maxConnectors.toString()).digest('hex'); + const connectorsConfigHash = crypto.createHash('sha256').update(JSON.stringify(this.stationInfo.Connectors) + maxConnectors.toString()).digest('hex'); // FIXME: Handle shrinking the number of connectors - if (!this._connectors || (this._connectors && this._connectorsConfigurationHash !== connectorsConfigHash)) { - this._connectorsConfigurationHash = connectorsConfigHash; + if (!this.connectors || (this.connectors && this.connectorsConfigurationHash !== connectorsConfigHash)) { + this.connectorsConfigurationHash = connectorsConfigHash; // Add connector Id 0 let lastConnector = '0'; - for (lastConnector in this._stationInfo.Connectors) { - if (Utils.convertToInt(lastConnector) === 0 && this._getUseConnectorId0() && this._stationInfo.Connectors[lastConnector]) { - this._connectors[lastConnector] = Utils.cloneObject(this._stationInfo.Connectors[lastConnector]); - this._connectors[lastConnector].availability = AvailabilityType.OPERATIVE; + for (lastConnector in this.stationInfo.Connectors) { + if (Utils.convertToInt(lastConnector) === 0 && this._getUseConnectorId0() && this.stationInfo.Connectors[lastConnector]) { + this.connectors[lastConnector] = Utils.cloneObject(this.stationInfo.Connectors[lastConnector]); + this.connectors[lastConnector].availability = AvailabilityType.OPERATIVE; } } // Generate all connectors - if ((this._stationInfo.Connectors[0] ? templateMaxConnectors - 1 : templateMaxConnectors) > 0) { + if ((this.stationInfo.Connectors[0] ? templateMaxConnectors - 1 : templateMaxConnectors) > 0) { for (let index = 1; index <= maxConnectors; index++) { - const randConnectorID = this._stationInfo.randomConnectors ? Utils.getRandomInt(Utils.convertToInt(lastConnector), 1) : index; - this._connectors[index] = Utils.cloneObject(this._stationInfo.Connectors[randConnectorID]); - this._connectors[index].availability = AvailabilityType.OPERATIVE; + const randConnectorID = this.stationInfo.randomConnectors ? Utils.getRandomInt(Utils.convertToInt(lastConnector), 1) : index; + this.connectors[index] = Utils.cloneObject(this.stationInfo.Connectors[randConnectorID]); + this.connectors[index].availability = AvailabilityType.OPERATIVE; } } } // Avoid duplication of connectors related information - delete this._stationInfo.Connectors; + delete this.stationInfo.Connectors; // Initialize transaction attributes on connectors - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) > 0 && !this.getConnector(Utils.convertToInt(connector)).transactionStarted) { this._initTransactionOnConnector(Utils.convertToInt(connector)); } @@ -169,48 +165,40 @@ export default class ChargingStation { if (!this._getConfigurationKey(StandardParametersKey.MeterValuesSampledData)) { this._addConfigurationKey(StandardParametersKey.MeterValuesSampledData, MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER); } - this._stationInfo.powerDivider = this._getPowerDivider(); + this.stationInfo.powerDivider = this._getPowerDivider(); if (this.getEnableStatistics()) { - this._statistics = Statistics.getInstance(); - this._statistics.objName = this._stationInfo.chargingStationId; - this._performanceObserver = new PerformanceObserver((list) => { + this.statistics = Statistics.getInstance(); + this.statistics.objName = this.stationInfo.chargingStationId; + this.performanceObserver = new PerformanceObserver((list) => { const entry = list.getEntries()[0]; - this._statistics.logPerformance(entry, Constants.ENTITY_CHARGING_STATION); - this._performanceObserver.disconnect(); + this.statistics.logPerformance(entry, Constants.ENTITY_CHARGING_STATION); + this.performanceObserver.disconnect(); }); } } - get connectors(): Connectors { - return this._connectors; - } - - get statistics(): Statistics { - return this._statistics; - } - _logPrefix(): string { - return Utils.logPrefix(` ${this._stationInfo.chargingStationId}:`); + return Utils.logPrefix(` ${this.stationInfo.chargingStationId}:`); } _isWebSocketOpen(): boolean { - return this._wsConnection?.readyState === WebSocket.OPEN; + return this.wsConnection?.readyState === WebSocket.OPEN; } _isRegistered(): boolean { - return this._bootNotificationResponse?.status === RegistrationStatus.ACCEPTED; + return this.bootNotificationResponse?.status === RegistrationStatus.ACCEPTED; } _getTemplateChargingStationConfiguration(): ChargingStationConfiguration { - return this._stationInfo.Configuration ? this._stationInfo.Configuration : {} as ChargingStationConfiguration; + return this.stationInfo.Configuration ? this.stationInfo.Configuration : {} as ChargingStationConfiguration; } _getAuthorizationFile(): string { - return this._stationInfo.authorizationFile && this._stationInfo.authorizationFile; + return this.stationInfo.authorizationFile && this.stationInfo.authorizationFile; } _getUseConnectorId0(): boolean { - return !Utils.isUndefined(this._stationInfo.useConnectorId0) ? this._stationInfo.useConnectorId0 : true; + return !Utils.isUndefined(this.stationInfo.useConnectorId0) ? this.stationInfo.useConnectorId0 : true; } _loadAndGetAuthorizedTags(): string[] { @@ -227,28 +215,28 @@ export default class ChargingStation { throw error; } } else { - logger.info(this._logPrefix() + ' No authorization file given in template file ' + this._stationTemplateFile); + logger.info(this._logPrefix() + ' No authorization file given in template file ' + this.stationTemplateFile); } return authorizedTags; } getRandomTagId(): string { - const index = Math.floor(Math.random() * this._authorizedTags.length); - return this._authorizedTags[index]; + const index = Math.floor(Math.random() * this.authorizedTags.length); + return this.authorizedTags[index]; } hasAuthorizedTags(): boolean { - return !Utils.isEmptyArray(this._authorizedTags); + return !Utils.isEmptyArray(this.authorizedTags); } getEnableStatistics(): boolean { - return !Utils.isUndefined(this._stationInfo.enableStatistics) ? this._stationInfo.enableStatistics : true; + return !Utils.isUndefined(this.stationInfo.enableStatistics) ? this.stationInfo.enableStatistics : true; } _getNumberOfPhases(): number { switch (this._getPowerOutType()) { case PowerOutType.AC: - return !Utils.isUndefined(this._stationInfo.numberOfPhases) ? this._stationInfo.numberOfPhases : 3; + return !Utils.isUndefined(this.stationInfo.numberOfPhases) ? this.stationInfo.numberOfPhases : 3; case PowerOutType.DC: return 0; } @@ -256,7 +244,7 @@ export default class ChargingStation { _getNumberOfRunningTransactions(): number { let trxCount = 0; - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) > 0 && this.getConnector(Utils.convertToInt(connector)).transactionStarted) { trxCount++; } @@ -266,8 +254,8 @@ export default class ChargingStation { // 0 for disabling _getConnectionTimeout(): number { - if (!Utils.isUndefined(this._stationInfo.connectionTimeout)) { - return this._stationInfo.connectionTimeout; + if (!Utils.isUndefined(this.stationInfo.connectionTimeout)) { + return this.stationInfo.connectionTimeout; } if (!Utils.isUndefined(Configuration.getConnectionTimeout())) { return Configuration.getConnectionTimeout(); @@ -277,8 +265,8 @@ export default class ChargingStation { // -1 for unlimited, 0 for disabling _getAutoReconnectMaxRetries(): number { - if (!Utils.isUndefined(this._stationInfo.autoReconnectMaxRetries)) { - return this._stationInfo.autoReconnectMaxRetries; + if (!Utils.isUndefined(this.stationInfo.autoReconnectMaxRetries)) { + return this.stationInfo.autoReconnectMaxRetries; } if (!Utils.isUndefined(Configuration.getAutoReconnectMaxRetries())) { return Configuration.getAutoReconnectMaxRetries(); @@ -288,22 +276,22 @@ export default class ChargingStation { // 0 for disabling _getRegistrationMaxRetries(): number { - if (!Utils.isUndefined(this._stationInfo.registrationMaxRetries)) { - return this._stationInfo.registrationMaxRetries; + if (!Utils.isUndefined(this.stationInfo.registrationMaxRetries)) { + return this.stationInfo.registrationMaxRetries; } return -1; } _getPowerDivider(): number { let powerDivider = this._getNumberOfConnectors(); - if (this._stationInfo.powerSharedByConnectors) { + if (this.stationInfo.powerSharedByConnectors) { powerDivider = this._getNumberOfRunningTransactions(); } return powerDivider; } getConnector(id: number): Connector { - return this._connectors[id]; + return this.connectors[id]; } _isConnectorAvailable(id: number): boolean { @@ -315,29 +303,29 @@ export default class ChargingStation { } _getTemplateMaxNumberOfConnectors(): number { - return Object.keys(this._stationInfo.Connectors).length; + return Object.keys(this.stationInfo.Connectors).length; } _getMaxNumberOfConnectors(): number { let maxConnectors = 0; - if (!Utils.isEmptyArray(this._stationInfo.numberOfConnectors)) { - const numberOfConnectors = this._stationInfo.numberOfConnectors as number[]; + if (!Utils.isEmptyArray(this.stationInfo.numberOfConnectors)) { + const numberOfConnectors = this.stationInfo.numberOfConnectors as number[]; // Distribute evenly the number of connectors - maxConnectors = numberOfConnectors[(this._index - 1) % numberOfConnectors.length]; - } else if (!Utils.isUndefined(this._stationInfo.numberOfConnectors)) { - maxConnectors = this._stationInfo.numberOfConnectors as number; + maxConnectors = numberOfConnectors[(this.index - 1) % numberOfConnectors.length]; + } else if (!Utils.isUndefined(this.stationInfo.numberOfConnectors)) { + maxConnectors = this.stationInfo.numberOfConnectors as number; } else { - maxConnectors = this._stationInfo.Connectors[0] ? this._getTemplateMaxNumberOfConnectors() - 1 : this._getTemplateMaxNumberOfConnectors(); + maxConnectors = this.stationInfo.Connectors[0] ? this._getTemplateMaxNumberOfConnectors() - 1 : this._getTemplateMaxNumberOfConnectors(); } return maxConnectors; } _getNumberOfConnectors(): number { - return this._connectors[0] ? Object.keys(this._connectors).length - 1 : Object.keys(this._connectors).length; + return this.connectors[0] ? Object.keys(this.connectors).length - 1 : Object.keys(this.connectors).length; } _getVoltageOut(): number { - const errMsg = `${this._logPrefix()} Unknown ${this._getPowerOutType()} powerOutType in template file ${this._stationTemplateFile}, cannot define default voltage out`; + const errMsg = `${this._logPrefix()} Unknown ${this._getPowerOutType()} powerOutType in template file ${this.stationTemplateFile}, cannot define default voltage out`; let defaultVoltageOut: number; switch (this._getPowerOutType()) { case PowerOutType.AC: @@ -350,11 +338,11 @@ export default class ChargingStation { logger.error(errMsg); throw Error(errMsg); } - return !Utils.isUndefined(this._stationInfo.voltageOut) ? this._stationInfo.voltageOut : defaultVoltageOut; + return !Utils.isUndefined(this.stationInfo.voltageOut) ? this.stationInfo.voltageOut : defaultVoltageOut; } _getTransactionIdTag(transactionId: number): string { - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) > 0 && this.getConnector(Utils.convertToInt(connector)).transactionId === transactionId) { return this.getConnector(Utils.convertToInt(connector)).idTag; } @@ -362,7 +350,7 @@ export default class ChargingStation { } _getTransactionMeterStop(transactionId: number): number { - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) > 0 && this.getConnector(Utils.convertToInt(connector)).transactionId === transactionId) { return this.getConnector(Utils.convertToInt(connector)).lastEnergyActiveImportRegisterValue; } @@ -370,15 +358,15 @@ export default class ChargingStation { } _getPowerOutType(): PowerOutType { - return !Utils.isUndefined(this._stationInfo.powerOutType) ? this._stationInfo.powerOutType : PowerOutType.AC; + return !Utils.isUndefined(this.stationInfo.powerOutType) ? this.stationInfo.powerOutType : PowerOutType.AC; } _getSupervisionURL(): string { - const supervisionUrls = Utils.cloneObject(this._stationInfo.supervisionURL ? this._stationInfo.supervisionURL : Configuration.getSupervisionURLs()); + const supervisionUrls = Utils.cloneObject(this.stationInfo.supervisionURL ? this.stationInfo.supervisionURL : Configuration.getSupervisionURLs()); let indexUrl = 0; if (!Utils.isEmptyArray(supervisionUrls)) { if (Configuration.getDistributeStationsToTenantsEqually()) { - indexUrl = this._index % supervisionUrls.length; + indexUrl = this.index % supervisionUrls.length; } else { // Get a random url indexUrl = Math.floor(Math.random() * supervisionUrls.length); @@ -389,7 +377,7 @@ export default class ChargingStation { } _getReconnectExponentialDelay(): boolean { - return !Utils.isUndefined(this._stationInfo.reconnectExponentialDelay) ? this._stationInfo.reconnectExponentialDelay : false; + return !Utils.isUndefined(this.stationInfo.reconnectExponentialDelay) ? this.stationInfo.reconnectExponentialDelay : false; } _getHeartbeatInterval(): number { @@ -419,16 +407,16 @@ export default class ChargingStation { // Start heartbeat this._startHeartbeat(); // Initialize connectors status - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) === 0) { continue; - } else if (!this._hasStopped && !this.getConnector(Utils.convertToInt(connector))?.status && this.getConnector(Utils.convertToInt(connector))?.bootStatus) { + } else if (!this.hasStopped && !this.getConnector(Utils.convertToInt(connector))?.status && this.getConnector(Utils.convertToInt(connector))?.bootStatus) { // Send status in template at startup await this.sendStatusNotification(Utils.convertToInt(connector), this.getConnector(Utils.convertToInt(connector)).bootStatus); - } else if (this._hasStopped && this.getConnector(Utils.convertToInt(connector))?.bootStatus) { + } else if (this.hasStopped && this.getConnector(Utils.convertToInt(connector))?.bootStatus) { // Send status in template after reset await this.sendStatusNotification(Utils.convertToInt(connector), this.getConnector(Utils.convertToInt(connector)).bootStatus); - } else if (!this._hasStopped && this.getConnector(Utils.convertToInt(connector))?.status) { + } else if (!this.hasStopped && this.getConnector(Utils.convertToInt(connector))?.status) { // Send previous status at template reload await this.sendStatusNotification(Utils.convertToInt(connector), this.getConnector(Utils.convertToInt(connector)).status); } else { @@ -437,16 +425,16 @@ export default class ChargingStation { } } // Start the ATG - if (this._stationInfo.AutomaticTransactionGenerator.enable) { - if (!this._automaticTransactionGeneration) { - this._automaticTransactionGeneration = new AutomaticTransactionGenerator(this); + if (this.stationInfo.AutomaticTransactionGenerator.enable) { + if (!this.automaticTransactionGeneration) { + this.automaticTransactionGeneration = new AutomaticTransactionGenerator(this); } - if (this._automaticTransactionGeneration.timeToStop) { - this._automaticTransactionGeneration.start(); + if (this.automaticTransactionGeneration.timeToStop) { + this.automaticTransactionGeneration.start(); } } if (this.getEnableStatistics()) { - this._statistics.start(); + this.statistics.start(); } } @@ -456,12 +444,12 @@ export default class ChargingStation { // Stop heartbeat this._stopHeartbeat(); // Stop the ATG - if (this._stationInfo.AutomaticTransactionGenerator.enable && - this._automaticTransactionGeneration && - !this._automaticTransactionGeneration.timeToStop) { - await this._automaticTransactionGeneration.stop(reason); + if (this.stationInfo.AutomaticTransactionGenerator.enable && + this.automaticTransactionGeneration && + !this.automaticTransactionGeneration.timeToStop) { + await this.automaticTransactionGeneration.stop(reason); } else { - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) > 0 && this.getConnector(Utils.convertToInt(connector)).transactionStarted) { await this.sendStopTransaction(this.getConnector(Utils.convertToInt(connector)).transactionId, reason); } @@ -471,14 +459,14 @@ export default class ChargingStation { _startWebSocketPing(): void { const webSocketPingInterval: number = this._getConfigurationKey(StandardParametersKey.WebSocketPingInterval) ? Utils.convertToInt(this._getConfigurationKey(StandardParametersKey.WebSocketPingInterval).value) : 0; - if (webSocketPingInterval > 0 && !this._webSocketPingSetInterval) { - this._webSocketPingSetInterval = setInterval(() => { + if (webSocketPingInterval > 0 && !this.webSocketPingSetInterval) { + this.webSocketPingSetInterval = setInterval(() => { if (this._isWebSocketOpen()) { - this._wsConnection.ping((): void => { }); + this.wsConnection.ping((): void => { }); } }, webSocketPingInterval * 1000); logger.info(this._logPrefix() + ' WebSocket ping started every ' + Utils.secondsToHHMMSS(webSocketPingInterval)); - } else if (this._webSocketPingSetInterval) { + } else if (this.webSocketPingSetInterval) { logger.info(this._logPrefix() + ' WebSocket ping every ' + Utils.secondsToHHMMSS(webSocketPingInterval) + ' already started'); } else { logger.error(`${this._logPrefix()} WebSocket ping interval set to ${webSocketPingInterval ? Utils.secondsToHHMMSS(webSocketPingInterval) : webSocketPingInterval}, not starting the WebSocket ping`); @@ -486,9 +474,9 @@ export default class ChargingStation { } _stopWebSocketPing(): void { - if (this._webSocketPingSetInterval) { - clearInterval(this._webSocketPingSetInterval); - this._webSocketPingSetInterval = null; + if (this.webSocketPingSetInterval) { + clearInterval(this.webSocketPingSetInterval); + this.webSocketPingSetInterval = null; } } @@ -500,12 +488,12 @@ export default class ChargingStation { } _startHeartbeat(): void { - if (this._getHeartbeatInterval() && this._getHeartbeatInterval() > 0 && !this._heartbeatSetInterval) { - this._heartbeatSetInterval = setInterval(async () => { + if (this._getHeartbeatInterval() && this._getHeartbeatInterval() > 0 && !this.heartbeatSetInterval) { + this.heartbeatSetInterval = setInterval(async () => { await this.sendHeartbeat(); }, this._getHeartbeatInterval()); logger.info(this._logPrefix() + ' Heartbeat started every ' + Utils.milliSecondsToHHMMSS(this._getHeartbeatInterval())); - } else if (this._heartbeatSetInterval) { + } else if (this.heartbeatSetInterval) { logger.info(this._logPrefix() + ' Heartbeat every ' + Utils.milliSecondsToHHMMSS(this._getHeartbeatInterval()) + ' already started'); } else { logger.error(`${this._logPrefix()} Heartbeat interval set to ${this._getHeartbeatInterval() ? Utils.milliSecondsToHHMMSS(this._getHeartbeatInterval()) : this._getHeartbeatInterval()}, not starting the heartbeat`); @@ -513,9 +501,9 @@ export default class ChargingStation { } _stopHeartbeat(): void { - if (this._heartbeatSetInterval) { - clearInterval(this._heartbeatSetInterval); - this._heartbeatSetInterval = null; + if (this.heartbeatSetInterval) { + clearInterval(this.heartbeatSetInterval); + this.heartbeatSetInterval = null; } } @@ -531,7 +519,7 @@ export default class ChargingStation { try { logger.debug(this._logPrefix() + ' Authorization file ' + this._getAuthorizationFile() + ' have changed, reload'); // Initialize _authorizedTags - this._authorizedTags = this._loadAndGetAuthorizedTags(); + this.authorizedTags = this._loadAndGetAuthorizedTags(); } catch (error) { logger.error(this._logPrefix() + ' Authorization file monitoring error: %j', error); } @@ -539,23 +527,23 @@ export default class ChargingStation { } _startStationTemplateFileMonitoring(): void { - fs.watch(this._stationTemplateFile).on('change', (e) => { + fs.watch(this.stationTemplateFile).on('change', (e) => { try { - logger.debug(this._logPrefix() + ' Template file ' + this._stationTemplateFile + ' have changed, reload'); + logger.debug(this._logPrefix() + ' Template file ' + this.stationTemplateFile + ' have changed, reload'); // Initialize this._initialize(); // Stop the ATG - if (!this._stationInfo.AutomaticTransactionGenerator.enable && - this._automaticTransactionGeneration) { - this._automaticTransactionGeneration.stop().catch(() => { }); + if (!this.stationInfo.AutomaticTransactionGenerator.enable && + this.automaticTransactionGeneration) { + this.automaticTransactionGeneration.stop().catch(() => { }); } // Start the ATG - if (this._stationInfo.AutomaticTransactionGenerator.enable) { - if (!this._automaticTransactionGeneration) { - this._automaticTransactionGeneration = new AutomaticTransactionGenerator(this); + if (this.stationInfo.AutomaticTransactionGenerator.enable) { + if (!this.automaticTransactionGeneration) { + this.automaticTransactionGeneration = new AutomaticTransactionGenerator(this); } - if (this._automaticTransactionGeneration.timeToStop) { - this._automaticTransactionGeneration.start(); + if (this.automaticTransactionGeneration.timeToStop) { + this.automaticTransactionGeneration.start(); } } // FIXME?: restart heartbeat and WebSocket ping when their interval values have changed @@ -585,7 +573,7 @@ export default class ChargingStation { this.getConnector(connectorId).transactionSetInterval = setInterval(async () => { if (this.getEnableStatistics()) { const sendMeterValues = performance.timerify(this.sendMeterValues); - this._performanceObserver.observe({ + this.performanceObserver.observe({ entryTypes: ['function'], }); await sendMeterValues(connectorId, interval, this); @@ -606,10 +594,10 @@ export default class ChargingStation { options.handshakeTimeout = this._getConnectionTimeout() * 1000; } if (this._isWebSocketOpen() && forceCloseOpened) { - this._wsConnection.close(); + this.wsConnection.close(); } - this._wsConnection = new WebSocket(this._wsConnectionUrl, 'ocpp' + Constants.OCPP_VERSION_16, options); - logger.info(this._logPrefix() + ' Will communicate through URL ' + this._supervisionUrl); + this.wsConnection = new WebSocket(this.wsConnectionUrl, 'ocpp' + Constants.OCPP_VERSION_16, options); + logger.info(this._logPrefix() + ' Will communicate through URL ' + this.supervisionUrl); } start(): void { @@ -619,85 +607,85 @@ export default class ChargingStation { // Monitor station template file this._startStationTemplateFileMonitoring(); // Handle Socket incoming messages - this._wsConnection.on('message', this.onMessage.bind(this)); + this.wsConnection.on('message', this.onMessage.bind(this)); // Handle Socket error - this._wsConnection.on('error', this.onError.bind(this)); + this.wsConnection.on('error', this.onError.bind(this)); // Handle Socket close - this._wsConnection.on('close', this.onClose.bind(this)); + this.wsConnection.on('close', this.onClose.bind(this)); // Handle Socket opening connection - this._wsConnection.on('open', this.onOpen.bind(this)); + this.wsConnection.on('open', this.onOpen.bind(this)); // Handle Socket ping - this._wsConnection.on('ping', this.onPing.bind(this)); + this.wsConnection.on('ping', this.onPing.bind(this)); // Handle Socket pong - this._wsConnection.on('pong', this.onPong.bind(this)); + this.wsConnection.on('pong', this.onPong.bind(this)); } async stop(reason: StopTransactionReason = StopTransactionReason.NONE): Promise { // Stop message sequence await this._stopMessageSequence(reason); - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) > 0) { await this.sendStatusNotification(Utils.convertToInt(connector), ChargePointStatus.UNAVAILABLE); } } if (this._isWebSocketOpen()) { - this._wsConnection.close(); + this.wsConnection.close(); } - this._bootNotificationResponse = null; - this._hasStopped = true; + this.bootNotificationResponse = null; + this.hasStopped = true; } async _reconnect(error): Promise { // Stop heartbeat this._stopHeartbeat(); // Stop the ATG if needed - if (this._stationInfo.AutomaticTransactionGenerator.enable && - this._stationInfo.AutomaticTransactionGenerator.stopOnConnectionFailure && - this._automaticTransactionGeneration && - !this._automaticTransactionGeneration.timeToStop) { - this._automaticTransactionGeneration.stop().catch(() => { }); - } - if (this._autoReconnectRetryCount < this._getAutoReconnectMaxRetries() || this._getAutoReconnectMaxRetries() === -1) { - this._autoReconnectRetryCount++; - const reconnectDelay = (this._getReconnectExponentialDelay() ? Utils.exponentialDelay(this._autoReconnectRetryCount) : this._getConnectionTimeout() * 1000); + if (this.stationInfo.AutomaticTransactionGenerator.enable && + this.stationInfo.AutomaticTransactionGenerator.stopOnConnectionFailure && + this.automaticTransactionGeneration && + !this.automaticTransactionGeneration.timeToStop) { + this.automaticTransactionGeneration.stop().catch(() => { }); + } + if (this.autoReconnectRetryCount < this._getAutoReconnectMaxRetries() || this._getAutoReconnectMaxRetries() === -1) { + this.autoReconnectRetryCount++; + const reconnectDelay = (this._getReconnectExponentialDelay() ? Utils.exponentialDelay(this.autoReconnectRetryCount) : this._getConnectionTimeout() * 1000); logger.error(`${this._logPrefix()} Socket: connection retry in ${Utils.roundTo(reconnectDelay, 2)}ms, timeout ${reconnectDelay - 100}ms`); await Utils.sleep(reconnectDelay); - logger.error(this._logPrefix() + ' Socket: reconnecting try #' + this._autoReconnectRetryCount.toString()); + logger.error(this._logPrefix() + ' Socket: reconnecting try #' + this.autoReconnectRetryCount.toString()); this._openWSConnection({ handshakeTimeout: reconnectDelay - 100 }); - this._hasSocketRestarted = true; + this.hasSocketRestarted = true; } else if (this._getAutoReconnectMaxRetries() !== -1) { - logger.error(`${this._logPrefix()} Socket reconnect failure: max retries reached (${this._autoReconnectRetryCount}) or retry disabled (${this._getAutoReconnectMaxRetries()})`); + logger.error(`${this._logPrefix()} Socket reconnect failure: max retries reached (${this.autoReconnectRetryCount}) or retry disabled (${this._getAutoReconnectMaxRetries()})`); } } async onOpen(): Promise { - logger.info(`${this._logPrefix()} Is connected to server through ${this._wsConnectionUrl}`); + logger.info(`${this._logPrefix()} Is connected to server through ${this.wsConnectionUrl}`); if (!this._isRegistered()) { // Send BootNotification let registrationRetryCount = 0; do { - this._bootNotificationResponse = await this.sendBootNotification(); + this.bootNotificationResponse = await this.sendBootNotification(); if (!this._isRegistered()) { registrationRetryCount++; - await Utils.sleep(this._bootNotificationResponse?.interval ? this._bootNotificationResponse.interval * 1000 : Constants.OCPP_DEFAULT_BOOT_NOTIFICATION_INTERVAL); + await Utils.sleep(this.bootNotificationResponse?.interval ? this.bootNotificationResponse.interval * 1000 : Constants.OCPP_DEFAULT_BOOT_NOTIFICATION_INTERVAL); } } while (!this._isRegistered() && (registrationRetryCount <= this._getRegistrationMaxRetries() || this._getRegistrationMaxRetries() === -1)); } if (this._isRegistered()) { await this._startMessageSequence(); - if (this._hasSocketRestarted && this._isWebSocketOpen()) { - if (!Utils.isEmptyArray(this._messageQueue)) { - this._messageQueue.forEach((message, index) => { - this._messageQueue.splice(index, 1); - this._wsConnection.send(message); + if (this.hasSocketRestarted && this._isWebSocketOpen()) { + if (!Utils.isEmptyArray(this.messageQueue)) { + this.messageQueue.forEach((message, index) => { + this.messageQueue.splice(index, 1); + this.wsConnection.send(message); }); } } } else { logger.error(`${this._logPrefix()} Registration failure: max retries reached (${this._getRegistrationMaxRetries()}) or retry disabled (${this._getRegistrationMaxRetries()})`); } - this._autoReconnectRetryCount = 0; - this._hasSocketRestarted = false; + this.autoReconnectRetryCount = 0; + this.hasSocketRestarted = false; } async onError(errorEvent): Promise { @@ -714,7 +702,7 @@ export default class ChargingStation { case WebSocketCloseEventStatusCode.CLOSE_NORMAL: // Normal close case WebSocketCloseEventStatusCode.CLOSE_NO_STATUS: logger.info(`${this._logPrefix()} Socket normally closed with status '${Utils.getWebSocketCloseEventStatusString(closeEvent)}'`); - this._autoReconnectRetryCount = 0; + this.autoReconnectRetryCount = 0; break; default: // Abnormal close logger.error(`${this._logPrefix()} Socket abnormally closed with status '${Utils.getWebSocketCloseEventStatusString(closeEvent)}'`); @@ -746,7 +734,7 @@ export default class ChargingStation { // Incoming Message case MessageType.CALL_MESSAGE: if (this.getEnableStatistics()) { - this._statistics.addMessage(commandName, messageType); + this.statistics.addMessage(commandName, messageType); } // Process the call await this.handleRequest(messageId, commandName, commandPayload); @@ -754,8 +742,8 @@ export default class ChargingStation { // Outcome Message case MessageType.CALL_RESULT_MESSAGE: // Respond - if (Utils.isIterable(this._requests[messageId])) { - [responseCallback, , requestPayload] = this._requests[messageId]; + if (Utils.isIterable(this.requests[messageId])) { + [responseCallback, , requestPayload] = this.requests[messageId]; } else { throw new Error(`Response request for message id ${messageId} is not iterable`); } @@ -763,21 +751,21 @@ export default class ChargingStation { // Error throw new Error(`Response request for unknown message id ${messageId}`); } - delete this._requests[messageId]; + delete this.requests[messageId]; responseCallback(commandName, requestPayload); break; // Error Message case MessageType.CALL_ERROR_MESSAGE: - if (!this._requests[messageId]) { + if (!this.requests[messageId]) { // Error throw new Error(`Error request for unknown message id ${messageId}`); } - if (Utils.isIterable(this._requests[messageId])) { - [, rejectCallback] = this._requests[messageId]; + if (Utils.isIterable(this.requests[messageId])) { + [, rejectCallback] = this.requests[messageId]; } else { throw new Error(`Error request for message id ${messageId} is not iterable`); } - delete this._requests[messageId]; + delete this.requests[messageId]; rejectCallback(new OCPPError(commandName, commandPayload.toString(), errorDetails)); break; // Error @@ -788,7 +776,7 @@ export default class ChargingStation { } } catch (error) { // Log - logger.error('%s Incoming message %j processing error %j on request content type %j', this._logPrefix(), messageEvent, error, this._requests[messageId]); + logger.error('%s Incoming message %j processing error %j on request content type %j', this._logPrefix(), messageEvent, error, this.requests[messageId]); // Send error messageType !== MessageType.CALL_ERROR_MESSAGE && await this.sendError(messageId, error, commandName); } @@ -805,7 +793,7 @@ export default class ChargingStation { async sendBootNotification(): Promise { try { - return await this.sendMessage(Utils.generateUUID(), this._bootNotificationRequest, MessageType.CALL_MESSAGE, RequestCommand.BOOT_NOTIFICATION) as BootNotificationResponse; + return await this.sendMessage(Utils.generateUUID(), this.bootNotificationRequest, MessageType.CALL_MESSAGE, RequestCommand.BOOT_NOTIFICATION) as BootNotificationResponse; } catch (error) { this.handleRequestError(RequestCommand.BOOT_NOTIFICATION, error); } @@ -882,7 +870,7 @@ export default class ChargingStation { // Request case MessageType.CALL_MESSAGE: // Build request - this._requests[messageId] = [responseCallback, rejectCallback, commandParams] as Request; + this.requests[messageId] = [responseCallback, rejectCallback, commandParams] as Request; messageToSend = JSON.stringify([messageType, messageId, commandName, commandParams]); break; // Response @@ -899,14 +887,14 @@ export default class ChargingStation { // Check if wsConnection opened and charging station registered if (this._isWebSocketOpen() && (this._isRegistered() || commandName === RequestCommand.BOOT_NOTIFICATION)) { if (this.getEnableStatistics()) { - this._statistics.addMessage(commandName, messageType); + this.statistics.addMessage(commandName, messageType); } // Yes: Send Message - this._wsConnection.send(messageToSend); + this.wsConnection.send(messageToSend); } else if (commandName !== RequestCommand.BOOT_NOTIFICATION) { let dups = false; // Handle dups in buffer - for (const message of this._messageQueue) { + for (const message of this.messageQueue) { // Same message if (messageToSend === message) { dups = true; @@ -915,7 +903,7 @@ export default class ChargingStation { } if (!dups) { // Buffer message - this._messageQueue.push(messageToSend); + this.messageQueue.push(messageToSend); } // Reject it return rejectCallback(new OCPPError(commandParams.code ? commandParams.code : ErrorType.GENERIC_ERROR, commandParams.message ? commandParams.message : `WebSocket closed for message id '${messageId}' with content '${messageToSend}', message buffered`, commandParams.details ? commandParams.details : {})); @@ -932,7 +920,7 @@ export default class ChargingStation { // Function that will receive the request's response async function responseCallback(payload: Record | string, requestPayload: Record): Promise { if (self.getEnableStatistics()) { - self._statistics.addMessage(commandName, messageType); + self.statistics.addMessage(commandName, messageType); } // Send the response await self.handleResponse(commandName as RequestCommand, payload, requestPayload); @@ -942,12 +930,12 @@ export default class ChargingStation { // Function that will receive the request's rejection function rejectCallback(error: OCPPError): void { if (self.getEnableStatistics()) { - self._statistics.addMessage(commandName, messageType); + self.statistics.addMessage(commandName, messageType); } logger.debug(`${self._logPrefix()} Error: %j occurred when calling command %s with parameters: %j`, error, commandName, commandParams); // Build Exception // eslint-disable-next-line no-empty-function - self._requests[messageId] = [() => { }, () => { }, {}]; // Properly format the request + self.requests[messageId] = [() => { }, () => { }, {}]; // Properly format the request // Send error reject(error); } @@ -965,10 +953,10 @@ export default class ChargingStation { handleResponseBootNotification(payload: BootNotificationResponse, requestPayload: BootNotificationRequest): void { if (payload.status === RegistrationStatus.ACCEPTED) { - this._heartbeatSetInterval ? this._restartHeartbeat() : this._startHeartbeat(); + this.heartbeatSetInterval ? this._restartHeartbeat() : this._startHeartbeat(); this._addConfigurationKey(StandardParametersKey.HeartBeatInterval, payload.interval.toString()); this._addConfigurationKey(StandardParametersKey.HeartbeatInterval, payload.interval.toString(), false, false); - this._hasStopped && (this._hasStopped = false); + this.hasStopped && (this.hasStopped = false); } else if (payload.status === RegistrationStatus.PENDING) { logger.info(this._logPrefix() + ' Charging station in pending state on the central server'); } else { @@ -994,7 +982,7 @@ export default class ChargingStation { const connectorId = requestPayload.connectorId; let transactionConnectorId: number; - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) > 0 && Utils.convertToInt(connector) === connectorId) { transactionConnectorId = Utils.convertToInt(connector); break; @@ -1015,9 +1003,9 @@ export default class ChargingStation { this.getConnector(connectorId).idTag = requestPayload.idTag; this.getConnector(connectorId).lastEnergyActiveImportRegisterValue = 0; await this.sendStatusNotification(connectorId, ChargePointStatus.CHARGING); - logger.info(this._logPrefix() + ' Transaction ' + payload.transactionId.toString() + ' STARTED on ' + this._stationInfo.chargingStationId + '#' + connectorId.toString() + ' for idTag ' + requestPayload.idTag); - if (this._stationInfo.powerSharedByConnectors) { - this._stationInfo.powerDivider++; + logger.info(this._logPrefix() + ' Transaction ' + payload.transactionId.toString() + ' STARTED on ' + this.stationInfo.chargingStationId + '#' + connectorId.toString() + ' for idTag ' + requestPayload.idTag); + if (this.stationInfo.powerSharedByConnectors) { + this.stationInfo.powerDivider++; } const configuredMeterValueSampleInterval = this._getConfigurationKey(StandardParametersKey.MeterValueSampleInterval); this._startMeterValues(connectorId, @@ -1031,7 +1019,7 @@ export default class ChargingStation { async handleResponseStopTransaction(payload: StopTransactionResponse, requestPayload: StopTransactionRequest): Promise { let transactionConnectorId: number; - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) > 0 && this.getConnector(Utils.convertToInt(connector))?.transactionId === requestPayload.transactionId) { transactionConnectorId = Utils.convertToInt(connector); break; @@ -1047,10 +1035,10 @@ export default class ChargingStation { } else { await this.sendStatusNotification(transactionConnectorId, ChargePointStatus.AVAILABLE); } - if (this._stationInfo.powerSharedByConnectors) { - this._stationInfo.powerDivider--; + if (this.stationInfo.powerSharedByConnectors) { + this.stationInfo.powerDivider--; } - logger.info(this._logPrefix() + ' Transaction ' + requestPayload.transactionId.toString() + ' STOPPED on ' + this._stationInfo.chargingStationId + '#' + transactionConnectorId.toString()); + logger.info(this._logPrefix() + ' Transaction ' + requestPayload.transactionId.toString() + ' STOPPED on ' + this.stationInfo.chargingStationId + '#' + transactionConnectorId.toString()); this._resetTransactionOnConnector(transactionConnectorId); } else { logger.error(this._logPrefix() + ' Stopping transaction id ' + requestPayload.transactionId.toString() + ' REJECTED with status ' + payload.idTagInfo?.status); @@ -1096,10 +1084,10 @@ export default class ChargingStation { handleRequestReset(commandPayload: ResetRequest): DefaultResponse { setImmediate(async () => { await this.stop(commandPayload.type + 'Reset' as StopTransactionReason); - await Utils.sleep(this._stationInfo.resetTime); + await Utils.sleep(this.stationInfo.resetTime); await this.start(); }); - logger.info(`${this._logPrefix()} ${commandPayload.type} reset command received, simulating it. The station will be back online in ${Utils.milliSecondsToHHMMSS(this._stationInfo.resetTime)}`); + logger.info(`${this._logPrefix()} ${commandPayload.type} reset command received, simulating it. The station will be back online in ${Utils.milliSecondsToHHMMSS(this.stationInfo.resetTime)}`); return Constants.OCPP_RESPONSE_ACCEPTED; } @@ -1125,7 +1113,7 @@ export default class ChargingStation { } _getConfigurationKey(key: string | StandardParametersKey, caseInsensitive = false): ConfigurationKey { - const configurationKey: ConfigurationKey = this._configuration.configurationKey.find((configElement) => { + const configurationKey: ConfigurationKey = this.configuration.configurationKey.find((configElement) => { if (caseInsensitive) { return configElement.key.toLowerCase() === key.toLowerCase(); } @@ -1137,7 +1125,7 @@ export default class ChargingStation { _addConfigurationKey(key: string | StandardParametersKey, value: string, readonly = false, visible = true, reboot = false): void { const keyFound = this._getConfigurationKey(key); if (!keyFound) { - this._configuration.configurationKey.push({ + this.configuration.configurationKey.push({ key, readonly, value, @@ -1152,8 +1140,8 @@ export default class ChargingStation { _setConfigurationKeyValue(key: string | StandardParametersKey, value: string): void { const keyFound = this._getConfigurationKey(key); if (keyFound) { - const keyIndex = this._configuration.configurationKey.indexOf(keyFound); - this._configuration.configurationKey[keyIndex].value = value; + const keyIndex = this.configuration.configurationKey.indexOf(keyFound); + this.configuration.configurationKey[keyIndex].value = value; } else { logger.error(`${this._logPrefix()} Trying to set a value on a non existing configuration key: %j`, { key, value }); } @@ -1163,7 +1151,7 @@ export default class ChargingStation { const configurationKey: OCPPConfigurationKey[] = []; const unknownKey: string[] = []; if (Utils.isEmptyArray(commandPayload.key)) { - for (const configuration of this._configuration.configurationKey) { + for (const configuration of this.configuration.configurationKey) { if (Utils.isUndefined(configuration.visible)) { configuration.visible = true; } @@ -1216,10 +1204,10 @@ export default class ChargingStation { } else if (keyToChange && keyToChange.readonly) { return Constants.OCPP_CONFIGURATION_RESPONSE_REJECTED; } else if (keyToChange && !keyToChange.readonly) { - const keyIndex = this._configuration.configurationKey.indexOf(keyToChange); + const keyIndex = this.configuration.configurationKey.indexOf(keyToChange); let valueChanged = false; - if (this._configuration.configurationKey[keyIndex].value !== commandPayload.value) { - this._configuration.configurationKey[keyIndex].value = commandPayload.value; + if (this.configuration.configurationKey[keyIndex].value !== commandPayload.value) { + this.configuration.configurationKey[keyIndex].value = commandPayload.value; valueChanged = true; } let triggerHeartbeatRestart = false; @@ -1272,7 +1260,7 @@ export default class ChargingStation { const chargePointStatus: ChargePointStatus = commandPayload.type === AvailabilityType.OPERATIVE ? ChargePointStatus.AVAILABLE : ChargePointStatus.UNAVAILABLE; if (connectorId === 0) { let response: ChangeAvailabilityResponse = Constants.OCPP_AVAILABILITY_RESPONSE_ACCEPTED; - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (this.getConnector(Utils.convertToInt(connector)).transactionStarted) { response = Constants.OCPP_AVAILABILITY_RESPONSE_SCHEDULED; } @@ -1297,11 +1285,11 @@ export default class ChargingStation { if (this._isChargingStationAvailable() && this._isConnectorAvailable(transactionConnectorID)) { if (this._getAuthorizeRemoteTxRequests() && this._getLocalAuthListEnabled() && this.hasAuthorizedTags()) { // Check if authorized - if (this._authorizedTags.find((value) => value === commandPayload.idTag)) { + if (this.authorizedTags.find((value) => value === commandPayload.idTag)) { await this.sendStatusNotification(transactionConnectorID, ChargePointStatus.PREPARING); // Authorization successful start transaction await this.sendStartTransaction(transactionConnectorID, commandPayload.idTag); - logger.debug(this._logPrefix() + ' Transaction remotely STARTED on ' + this._stationInfo.chargingStationId + '#' + transactionConnectorID.toString() + ' for idTag ' + commandPayload.idTag); + logger.debug(this._logPrefix() + ' Transaction remotely STARTED on ' + this.stationInfo.chargingStationId + '#' + transactionConnectorID.toString() + ' for idTag ' + commandPayload.idTag); return Constants.OCPP_RESPONSE_ACCEPTED; } logger.error(this._logPrefix() + ' Remote starting transaction REJECTED on connector Id ' + transactionConnectorID.toString() + ', idTag ' + commandPayload.idTag); @@ -1310,7 +1298,7 @@ export default class ChargingStation { await this.sendStatusNotification(transactionConnectorID, ChargePointStatus.PREPARING); // No local authorization check required => start transaction await this.sendStartTransaction(transactionConnectorID, commandPayload.idTag); - logger.debug(this._logPrefix() + ' Transaction remotely STARTED on ' + this._stationInfo.chargingStationId + '#' + transactionConnectorID.toString() + ' for idTag ' + commandPayload.idTag); + logger.debug(this._logPrefix() + ' Transaction remotely STARTED on ' + this.stationInfo.chargingStationId + '#' + transactionConnectorID.toString() + ' for idTag ' + commandPayload.idTag); return Constants.OCPP_RESPONSE_ACCEPTED; } logger.error(this._logPrefix() + ' Remote starting transaction REJECTED on unavailable connector Id ' + transactionConnectorID.toString() + ', idTag ' + commandPayload.idTag); @@ -1319,7 +1307,7 @@ export default class ChargingStation { async handleRequestRemoteStopTransaction(commandPayload: RemoteStopTransactionRequest): Promise { const transactionId = commandPayload.transactionId; - for (const connector in this._connectors) { + for (const connector in this.connectors) { if (Utils.convertToInt(connector) > 0 && this.getConnector(Utils.convertToInt(connector))?.transactionId === transactionId) { await this.sendStatusNotification(Utils.convertToInt(connector), ChargePointStatus.FINISHING); await this.sendStopTransaction(transactionId); @@ -1382,19 +1370,19 @@ export default class ChargingStation { // Power.Active.Import measurand } else if (meterValuesTemplate[index].measurand && meterValuesTemplate[index].measurand === MeterValueMeasurand.POWER_ACTIVE_IMPORT && self._getConfigurationKey(StandardParametersKey.MeterValuesSampledData).value.includes(MeterValueMeasurand.POWER_ACTIVE_IMPORT)) { // FIXME: factor out powerDivider checks - if (Utils.isUndefined(self._stationInfo.powerDivider)) { + if (Utils.isUndefined(self.stationInfo.powerDivider)) { const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: powerDivider is undefined`; logger.error(errMsg); throw Error(errMsg); - } else if (self._stationInfo.powerDivider && self._stationInfo.powerDivider <= 0) { - const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: powerDivider have zero or below value ${self._stationInfo.powerDivider}`; + } else if (self.stationInfo.powerDivider && self.stationInfo.powerDivider <= 0) { + const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: powerDivider have zero or below value ${self.stationInfo.powerDivider}`; logger.error(errMsg); throw Error(errMsg); } - const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: Unknown ${self._getPowerOutType()} powerOutType in template file ${self._stationTemplateFile}, cannot calculate ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER} measurand value`; + const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: Unknown ${self._getPowerOutType()} powerOutType in template file ${self.stationTemplateFile}, cannot calculate ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER} measurand value`; const powerMeasurandValues = {} as MeasurandValues; - const maxPower = Math.round(self._stationInfo.maxPower / self._stationInfo.powerDivider); - const maxPowerPerPhase = Math.round((self._stationInfo.maxPower / self._stationInfo.powerDivider) / self._getNumberOfPhases()); + const maxPower = Math.round(self.stationInfo.maxPower / self.stationInfo.powerDivider); + const maxPowerPerPhase = Math.round((self.stationInfo.maxPower / self.stationInfo.powerDivider) / self._getNumberOfPhases()); switch (self._getPowerOutType()) { case PowerOutType.AC: if (Utils.isUndefined(meterValuesTemplate[index].value)) { @@ -1442,21 +1430,21 @@ export default class ChargingStation { // Current.Import measurand } else if (meterValuesTemplate[index].measurand && meterValuesTemplate[index].measurand === MeterValueMeasurand.CURRENT_IMPORT && self._getConfigurationKey(StandardParametersKey.MeterValuesSampledData).value.includes(MeterValueMeasurand.CURRENT_IMPORT)) { // FIXME: factor out powerDivider checks - if (Utils.isUndefined(self._stationInfo.powerDivider)) { + if (Utils.isUndefined(self.stationInfo.powerDivider)) { const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: powerDivider is undefined`; logger.error(errMsg); throw Error(errMsg); - } else if (self._stationInfo.powerDivider && self._stationInfo.powerDivider <= 0) { - const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: powerDivider have zero or below value ${self._stationInfo.powerDivider}`; + } else if (self.stationInfo.powerDivider && self.stationInfo.powerDivider <= 0) { + const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: powerDivider have zero or below value ${self.stationInfo.powerDivider}`; logger.error(errMsg); throw Error(errMsg); } - const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: Unknown ${self._getPowerOutType()} powerOutType in template file ${self._stationTemplateFile}, cannot calculate ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER} measurand value`; + const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: Unknown ${self._getPowerOutType()} powerOutType in template file ${self.stationTemplateFile}, cannot calculate ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER} measurand value`; const currentMeasurandValues: MeasurandValues = {} as MeasurandValues; let maxAmperage: number; switch (self._getPowerOutType()) { case PowerOutType.AC: - maxAmperage = ElectricUtils.ampPerPhaseFromPower(self._getNumberOfPhases(), self._stationInfo.maxPower / self._stationInfo.powerDivider, self._getVoltageOut()); + maxAmperage = ElectricUtils.ampPerPhaseFromPower(self._getNumberOfPhases(), self.stationInfo.maxPower / self.stationInfo.powerDivider, self._getVoltageOut()); if (Utils.isUndefined(meterValuesTemplate[index].value)) { currentMeasurandValues.L1 = Utils.getRandomFloatRounded(maxAmperage); currentMeasurandValues.L2 = 0; @@ -1469,7 +1457,7 @@ export default class ChargingStation { } break; case PowerOutType.DC: - maxAmperage = ElectricUtils.ampTotalFromPower(self._stationInfo.maxPower / self._stationInfo.powerDivider, self._getVoltageOut()); + maxAmperage = ElectricUtils.ampTotalFromPower(self.stationInfo.maxPower / self.stationInfo.powerDivider, self._getVoltageOut()); if (Utils.isUndefined(meterValuesTemplate[index].value)) { currentMeasurandValues.allPhases = Utils.getRandomFloatRounded(maxAmperage); } @@ -1503,17 +1491,17 @@ export default class ChargingStation { // Energy.Active.Import.Register measurand (default) } else if (!meterValuesTemplate[index].measurand || meterValuesTemplate[index].measurand === MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER) { // FIXME: factor out powerDivider checks - if (Utils.isUndefined(self._stationInfo.powerDivider)) { + if (Utils.isUndefined(self.stationInfo.powerDivider)) { const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: powerDivider is undefined`; logger.error(errMsg); throw Error(errMsg); - } else if (self._stationInfo.powerDivider && self._stationInfo.powerDivider <= 0) { - const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: powerDivider have zero or below value ${self._stationInfo.powerDivider}`; + } else if (self.stationInfo.powerDivider && self.stationInfo.powerDivider <= 0) { + const errMsg = `${self._logPrefix()} MeterValues measurand ${meterValuesTemplate[index].measurand ? meterValuesTemplate[index].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: powerDivider have zero or below value ${self.stationInfo.powerDivider}`; logger.error(errMsg); throw Error(errMsg); } if (Utils.isUndefined(meterValuesTemplate[index].value)) { - const measurandValue = Utils.getRandomInt(self._stationInfo.maxPower / (self._stationInfo.powerDivider * 3600000) * interval); + const measurandValue = Utils.getRandomInt(self.stationInfo.maxPower / (self.stationInfo.powerDivider * 3600000) * interval); // Persist previous value in connector if (connector && !Utils.isNullOrUndefined(connector.lastEnergyActiveImportRegisterValue) && connector.lastEnergyActiveImportRegisterValue >= 0) { connector.lastEnergyActiveImportRegisterValue += measurandValue; @@ -1530,7 +1518,7 @@ export default class ChargingStation { { value: connector.lastEnergyActiveImportRegisterValue.toString() }, }); const sampledValuesIndex = meterValue.sampledValue.length - 1; - const maxConsumption = Math.round(self._stationInfo.maxPower * 3600 / (self._stationInfo.powerDivider * interval)); + const maxConsumption = Math.round(self.stationInfo.maxPower * 3600 / (self.stationInfo.powerDivider * interval)); if (Utils.convertToFloat(meterValue.sampledValue[sampledValuesIndex].value) > maxConsumption || debug) { logger.error(`${self._logPrefix()} MeterValues measurand ${meterValue.sampledValue[sampledValuesIndex].measurand ? meterValue.sampledValue[sampledValuesIndex].measurand : MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER}: connectorId ${connectorId}, transaction ${connector.transactionId}, value: ${meterValue.sampledValue[sampledValuesIndex].value}/${maxConsumption}`); } diff --git a/src/charging-station/Worker.ts b/src/charging-station/Worker.ts index 370ec7a3..824a304b 100644 --- a/src/charging-station/Worker.ts +++ b/src/charging-station/Worker.ts @@ -1,16 +1,16 @@ -import { Worker, WorkerOptions } from 'worker_threads'; - import Configuration from '../utils/Configuration'; import Constants from '../utils/Constants'; -import Pool from 'worker-threads-pool'; +import { Worker } from 'worker_threads'; import WorkerData from '../types/WorkerData'; +import WorkerPool from './WorkerPool'; export default class Wrk { - private _workerScript: string; - private _workerData: WorkerData; - private _worker: Worker; - private _maxWorkerElements: number; - private _numWorkerElements: number; + private static wrkInstances: Wrk[]; + private workerScript: string; + private workerData: WorkerData; + private worker: Worker; + private maxWorkerElements: number; + private numWorkerElements: number; /** * Create a new `Wrk`. @@ -20,10 +20,10 @@ export default class Wrk { * @param {number} maxWorkerElements */ constructor(workerScript: string, workerData: WorkerData, maxWorkerElements = 1) { - this._workerData = workerData; - this._workerScript = workerScript; - this._maxWorkerElements = maxWorkerElements; - this._numWorkerElements = 0; + this.workerData = workerData; + this.workerScript = workerScript; + this.maxWorkerElements = maxWorkerElements; + this.numWorkerElements = 0; if (Configuration.useWorkerPool()) { WorkerPool.maxConcurrentWorkers = Configuration.getWorkerPoolMaxSize(); } @@ -36,11 +36,11 @@ export default class Wrk { */ async start(): Promise { if (Configuration.useWorkerPool()) { - await this._startWorkerWithPool(); + await this.startWorkerPool(); } else { - await this._startWorker(); + await this.startWorker(); } - return this._worker; + return this.worker; } /** @@ -52,12 +52,12 @@ export default class Wrk { if (Configuration.useWorkerPool()) { throw Error('Cannot add Wrk element if the worker pool is enabled'); } - if (this._numWorkerElements >= this._maxWorkerElements) { + if (this.numWorkerElements >= this.maxWorkerElements) { throw Error('Cannot add Wrk element: max number of elements per worker reached'); } - this._workerData = workerData; - this._worker.postMessage({ id: Constants.START_WORKER_ELEMENT, workerData: workerData }); - this._numWorkerElements++; + this.workerData = workerData; + this.worker.postMessage({ id: Constants.START_WORKER_ELEMENT, workerData: workerData }); + this.numWorkerElements++; } /** @@ -76,15 +76,15 @@ export default class Wrk { * @return {Promise} * @private */ - private async _startWorkerWithPool() { + private async startWorkerPool() { return new Promise((resolve, reject) => { - WorkerPool.acquire(this._workerScript, { workerData: this._workerData }, (err, worker) => { + WorkerPool.acquire(this.workerScript, { workerData: this.workerData }, (err, worker) => { if (err) { return reject(err); } worker.once('message', resolve); worker.once('error', reject); - this._worker = worker; + this.worker = worker; }); }); } @@ -94,9 +94,9 @@ export default class Wrk { * @return {Promise} * @private */ - private async _startWorker() { + private async startWorker() { return new Promise((resolve, reject) => { - const worker = new Worker(this._workerScript, { workerData: this._workerData }); + const worker = new Worker(this.workerScript, { workerData: this.workerData }); worker.on('message', resolve); worker.on('error', reject); worker.on('exit', (code) => { @@ -104,31 +104,8 @@ export default class Wrk { reject(new Error(`Worker stopped with exit code ${code}`)); } }); - this._numWorkerElements++; - this._worker = worker; + this.numWorkerElements++; + this.worker = worker; }); } } - - -class WorkerPool { - public static maxConcurrentWorkers: number; - private static _instance: Pool; - - private constructor() { } - - public static getInstance(): Pool { - if (!WorkerPool._instance) { - WorkerPool._instance = new Pool({ max: WorkerPool.maxConcurrentWorkers }); - } - return WorkerPool._instance; - } - - public static acquire(filename: string, options: WorkerOptions, callback: (error: Error | null, worker: Worker) => void): void { - WorkerPool.getInstance().acquire(filename, options, callback); - } - - public static getPoolSize(): number { - return WorkerPool.getInstance().size; - } -} diff --git a/src/utils/Statistics.ts b/src/utils/Statistics.ts index d6174d96..de8951d0 100644 --- a/src/utils/Statistics.ts +++ b/src/utils/Statistics.ts @@ -10,15 +10,11 @@ import logger from './Logger'; export default class Statistics { private static instance: Statistics; - private _objName: string; - private _commandsStatistics: CommandStatistics; + public objName: string; + private commandsStatistics: CommandStatistics; private constructor() { - this._commandsStatistics = {} as CommandStatistics; - } - - set objName(objName: string) { - this._objName = objName; + this.commandsStatistics = {} as CommandStatistics; } static getInstance(): Statistics { @@ -31,35 +27,35 @@ export default class Statistics { addMessage(command: RequestCommand | IncomingRequestCommand, messageType: MessageType): void { switch (messageType) { case MessageType.CALL_MESSAGE: - if (this._commandsStatistics[command] && this._commandsStatistics[command].countRequest) { - this._commandsStatistics[command].countRequest++; + if (this.commandsStatistics[command] && this.commandsStatistics[command].countRequest) { + this.commandsStatistics[command].countRequest++; } else { - this._commandsStatistics[command] = {} as CommandStatisticsData; - this._commandsStatistics[command].countRequest = 1; + this.commandsStatistics[command] = {} as CommandStatisticsData; + this.commandsStatistics[command].countRequest = 1; } break; case MessageType.CALL_RESULT_MESSAGE: - if (this._commandsStatistics[command]) { - if (this._commandsStatistics[command].countResponse) { - this._commandsStatistics[command].countResponse++; + if (this.commandsStatistics[command]) { + if (this.commandsStatistics[command].countResponse) { + this.commandsStatistics[command].countResponse++; } else { - this._commandsStatistics[command].countResponse = 1; + this.commandsStatistics[command].countResponse = 1; } } else { - this._commandsStatistics[command] = {} as CommandStatisticsData; - this._commandsStatistics[command].countResponse = 1; + this.commandsStatistics[command] = {} as CommandStatisticsData; + this.commandsStatistics[command].countResponse = 1; } break; case MessageType.CALL_ERROR_MESSAGE: - if (this._commandsStatistics[command]) { - if (this._commandsStatistics[command].countError) { - this._commandsStatistics[command].countError++; + if (this.commandsStatistics[command]) { + if (this.commandsStatistics[command].countError) { + this.commandsStatistics[command].countError++; } else { - this._commandsStatistics[command].countError = 1; + this.commandsStatistics[command].countError = 1; } } else { - this._commandsStatistics[command] = {} as CommandStatisticsData; - this._commandsStatistics[command].countError = 1; + this.commandsStatistics[command] = {} as CommandStatisticsData; + this.commandsStatistics[command].countError = 1; } break; default: @@ -83,7 +79,7 @@ export default class Statistics { } private _display(): void { - logger.info(this._logPrefix() + ' %j', this._commandsStatistics); + logger.info(this._logPrefix() + ' %j', this.commandsStatistics); } private _displayInterval(): void { @@ -118,21 +114,21 @@ export default class Statistics { command = MAPCOMMAND[command] as RequestCommand | IncomingRequestCommand; } // Initialize command statistics - if (!this._commandsStatistics[command]) { - this._commandsStatistics[command] = {} as CommandStatisticsData; + if (!this.commandsStatistics[command]) { + this.commandsStatistics[command] = {} as CommandStatisticsData; } // Update current statistics timers - this._commandsStatistics[command].countTimeMeasurement = this._commandsStatistics[command].countTimeMeasurement ? this._commandsStatistics[command].countTimeMeasurement + 1 : 1; - this._commandsStatistics[command].currentTimeMeasurement = duration; - this._commandsStatistics[command].minTimeMeasurement = this._commandsStatistics[command].minTimeMeasurement ? (this._commandsStatistics[command].minTimeMeasurement > duration ? duration : this._commandsStatistics[command].minTimeMeasurement) : duration; - this._commandsStatistics[command].maxTimeMeasurement = this._commandsStatistics[command].maxTimeMeasurement ? (this._commandsStatistics[command].maxTimeMeasurement < duration ? duration : this._commandsStatistics[command].maxTimeMeasurement) : duration; - this._commandsStatistics[command].totalTimeMeasurement = this._commandsStatistics[command].totalTimeMeasurement ? this._commandsStatistics[command].totalTimeMeasurement + duration : duration; - this._commandsStatistics[command].avgTimeMeasurement = this._commandsStatistics[command].totalTimeMeasurement / this._commandsStatistics[command].countTimeMeasurement; - Array.isArray(this._commandsStatistics[command].timeMeasurementSeries) ? this._commandsStatistics[command].timeMeasurementSeries.push(duration) : this._commandsStatistics[command].timeMeasurementSeries = [duration] as CircularArray; - this._commandsStatistics[command].medTimeMeasurement = this.median(this._commandsStatistics[command].timeMeasurementSeries); + this.commandsStatistics[command].countTimeMeasurement = this.commandsStatistics[command].countTimeMeasurement ? this.commandsStatistics[command].countTimeMeasurement + 1 : 1; + this.commandsStatistics[command].currentTimeMeasurement = duration; + this.commandsStatistics[command].minTimeMeasurement = this.commandsStatistics[command].minTimeMeasurement ? (this.commandsStatistics[command].minTimeMeasurement > duration ? duration : this.commandsStatistics[command].minTimeMeasurement) : duration; + this.commandsStatistics[command].maxTimeMeasurement = this.commandsStatistics[command].maxTimeMeasurement ? (this.commandsStatistics[command].maxTimeMeasurement < duration ? duration : this.commandsStatistics[command].maxTimeMeasurement) : duration; + this.commandsStatistics[command].totalTimeMeasurement = this.commandsStatistics[command].totalTimeMeasurement ? this.commandsStatistics[command].totalTimeMeasurement + duration : duration; + this.commandsStatistics[command].avgTimeMeasurement = this.commandsStatistics[command].totalTimeMeasurement / this.commandsStatistics[command].countTimeMeasurement; + Array.isArray(this.commandsStatistics[command].timeMeasurementSeries) ? this.commandsStatistics[command].timeMeasurementSeries.push(duration) : this.commandsStatistics[command].timeMeasurementSeries = [duration] as CircularArray; + this.commandsStatistics[command].medTimeMeasurement = this.median(this.commandsStatistics[command].timeMeasurementSeries); } private _logPrefix(): string { - return Utils.logPrefix(` ${this._objName} Statistics:`); + return Utils.logPrefix(` ${this.objName} Statistics:`); } }