X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2Focpp%2F1.6%2FOCPP16ResponseService.ts;h=9e8a2d5f7636a33aba59c198a8a7e337cea8f0bf;hb=d58b442097da31f8b974d51aef63c64470d9ab48;hp=2b40ad4165556f510ec83d09628ea526ea29b8fa;hpb=72092cfcf8a31c06e4592b25e060e2d74d2ed99c;p=e-mobility-charging-stations-simulator.git diff --git a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts index 2b40ad41..9e8a2d5f 100644 --- a/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts +++ b/src/charging-station/ocpp/1.6/OCPP16ResponseService.ts @@ -1,70 +1,62 @@ // Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved. -import fs from 'fs'; -import path from 'path'; -import { fileURLToPath } from 'url'; +import { parentPort } from 'node:worker_threads'; import type { JSONSchemaType } from 'ajv'; import { OCPP16ServiceUtils } from './OCPP16ServiceUtils'; -import OCPPError from '../../../exception/OCPPError'; -import type { JsonObject, JsonType } from '../../../types/JsonType'; -import { OCPP16ChargePointErrorCode } from '../../../types/ocpp/1.6/ChargePointErrorCode'; -import { OCPP16ChargePointStatus } from '../../../types/ocpp/1.6/ChargePointStatus'; -import { OCPP16StandardParametersKey } from '../../../types/ocpp/1.6/Configuration'; -import type { - OCPP16MeterValuesRequest, - OCPP16MeterValuesResponse, -} from '../../../types/ocpp/1.6/MeterValues'; import { - type OCPP16BootNotificationRequest, - OCPP16IncomingRequestCommand, - OCPP16RequestCommand, - type OCPP16StatusNotificationRequest, -} from '../../../types/ocpp/1.6/Requests'; -import type { - ChangeAvailabilityResponse, - ChangeConfigurationResponse, - ClearChargingProfileResponse, - GetConfigurationResponse, - GetDiagnosticsResponse, - OCPP16BootNotificationResponse, - OCPP16DataTransferResponse, - OCPP16DiagnosticsStatusNotificationResponse, - OCPP16FirmwareStatusNotificationResponse, - OCPP16HeartbeatResponse, - OCPP16StatusNotificationResponse, - OCPP16TriggerMessageResponse, - OCPP16UpdateFirmwareResponse, - SetChargingProfileResponse, - UnlockConnectorResponse, -} from '../../../types/ocpp/1.6/Responses'; + type ChargingStation, + ChargingStationConfigurationUtils, + ChargingStationUtils, +} from '../../../charging-station'; +import { OCPPError } from '../../../exception'; import { + type ChangeAvailabilityResponse, + type ChangeConfigurationResponse, + type ClearChargingProfileResponse, + ErrorType, + type GenericResponse, + type GetConfigurationResponse, + type GetDiagnosticsResponse, + type JsonObject, + type JsonType, OCPP16AuthorizationStatus, type OCPP16AuthorizeRequest, type OCPP16AuthorizeResponse, + type OCPP16BootNotificationResponse, + type OCPP16CancelReservationResponse, + OCPP16ChargePointStatus, + type OCPP16DataTransferResponse, + type OCPP16DiagnosticsStatusNotificationResponse, + type OCPP16FirmwareStatusNotificationResponse, + type OCPP16GetCompositeScheduleResponse, + type OCPP16HeartbeatResponse, + OCPP16IncomingRequestCommand, + type OCPP16MeterValuesRequest, + type OCPP16MeterValuesResponse, + OCPP16RequestCommand, + type OCPP16ReserveNowResponse, + OCPP16StandardParametersKey, type OCPP16StartTransactionRequest, type OCPP16StartTransactionResponse, + type OCPP16StatusNotificationResponse, type OCPP16StopTransactionRequest, type OCPP16StopTransactionResponse, -} from '../../../types/ocpp/1.6/Transaction'; -import { ErrorType } from '../../../types/ocpp/ErrorType'; -import { OCPPVersion } from '../../../types/ocpp/OCPPVersion'; -import { - type GenericResponse, + type OCPP16TriggerMessageResponse, + type OCPP16UpdateFirmwareResponse, + OCPPVersion, RegistrationStatusEnumType, type ResponseHandler, -} from '../../../types/ocpp/Responses'; -import Constants from '../../../utils/Constants'; -import logger from '../../../utils/Logger'; -import Utils from '../../../utils/Utils'; -import type ChargingStation from '../../ChargingStation'; -import { ChargingStationConfigurationUtils } from '../../ChargingStationConfigurationUtils'; -import OCPPResponseService from '../OCPPResponseService'; + type SetChargingProfileResponse, + type UnlockConnectorResponse, +} from '../../../types'; +import { Constants, Utils, buildUpdatedMessage, logger } from '../../../utils'; +import { OCPPResponseService } from '../OCPPResponseService'; const moduleName = 'OCPP16ResponseService'; -export default class OCPP16ResponseService extends OCPPResponseService { +export class OCPP16ResponseService extends OCPPResponseService { public jsonIncomingRequestResponseSchemas: Map< OCPP16IncomingRequestCommand, JSONSchemaType @@ -74,9 +66,9 @@ export default class OCPP16ResponseService extends OCPPResponseService { private jsonSchemas: Map>; public constructor() { - if (new.target?.name === moduleName) { - throw new TypeError(`Cannot construct ${new.target?.name} instances directly`); - } + // if (new.target?.name === moduleName) { + // throw new TypeError(`Cannot construct ${new.target?.name} instances directly`); + // } super(OCPPVersion.VERSION_16); this.responseHandlers = new Map([ [OCPP16RequestCommand.BOOT_NOTIFICATION, this.handleResponseBootNotification.bind(this)], @@ -93,152 +85,228 @@ export default class OCPP16ResponseService extends OCPPResponseService { this.jsonSchemas = new Map>([ [ OCPP16RequestCommand.BOOT_NOTIFICATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/BootNotificationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/BootNotificationResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16RequestCommand.HEARTBEAT, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/HeartbeatResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/HeartbeatResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16RequestCommand.AUTHORIZE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/AuthorizeResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/AuthorizeResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16RequestCommand.START_TRANSACTION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/StartTransactionResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/StartTransactionResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16RequestCommand.STOP_TRANSACTION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/StopTransactionResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/StopTransactionResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16RequestCommand.STATUS_NOTIFICATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/StatusNotificationResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16RequestCommand.METER_VALUES, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/MeterValuesResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/MeterValuesResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/DiagnosticsStatusNotificationResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16RequestCommand.DATA_TRANSFER, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/DataTransferResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/DataTransferResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16RequestCommand.FIRMWARE_STATUS_NOTIFICATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/FirmwareStatusNotificationResponse.json', + moduleName, + 'constructor' + ), + ], + [ + OCPP16RequestCommand.RESERVE_NOW, + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ReserveNowResponse.json', + moduleName, + 'constructor' + ), + ], + [ + OCPP16RequestCommand.CANCEL_RESERVATION, + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/CancelReservationResponse.json', + moduleName, + 'constructor' ), ], ]); this.jsonIncomingRequestResponseSchemas = new Map([ [ OCPP16IncomingRequestCommand.RESET, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ResetResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ResetResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.CLEAR_CACHE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ClearCacheResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ClearCacheResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.CHANGE_AVAILABILITY, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ChangeAvailabilityResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.UNLOCK_CONNECTOR, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/UnlockConnectorResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.GET_CONFIGURATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/GetConfigurationResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.CHANGE_CONFIGURATION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ChangeConfigurationResponse.json', + moduleName, + 'constructor' + ), + ], + [ + OCPP16IncomingRequestCommand.GET_COMPOSITE_SCHEDULE, + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/GetCompositeScheduleResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.SET_CHARGING_PROFILE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/SetChargingProfileResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.CLEAR_CHARGING_PROFILE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/ClearChargingProfileResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.REMOTE_START_TRANSACTION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/RemoteStartTransactionResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.REMOTE_STOP_TRANSACTION, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/RemoteStopTransactionResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.GET_DIAGNOSTICS, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/GetDiagnosticsResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.TRIGGER_MESSAGE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/TriggerMessageResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.DATA_TRANSFER, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/DataTransferResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/DataTransferResponse.json', + moduleName, + 'constructor' ), ], [ OCPP16IncomingRequestCommand.UPDATE_FIRMWARE, - this.parseJsonSchemaFile( - '../../../assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json' + OCPP16ServiceUtils.parseJsonSchemaFile( + 'assets/json-schemas/ocpp/1.6/UpdateFirmwareResponse.json', + moduleName, + 'constructor' ), ], ]); - this.validatePayload.bind(this); + this.validatePayload = this.validatePayload.bind(this) as ( + chargingStation: ChargingStation, + commandName: OCPP16RequestCommand, + payload: JsonType + ) => boolean; } public async responseHandler( @@ -330,9 +398,7 @@ export default class OCPP16ResponseService extends OCPPResponseService { { visible: false }, { overwrite: true, save: true } ); - chargingStation.heartbeatSetInterval - ? chargingStation.restartHeartbeat() - : chargingStation.startHeartbeat(); + OCPP16ServiceUtils.startHeartbeatInterval(chargingStation, payload.interval); } if (Object.values(RegistrationStatusEnumType).includes(payload.status)) { const logMsg = `${chargingStation.logPrefix()} Charging station in '${ @@ -355,33 +421,46 @@ export default class OCPP16ResponseService extends OCPPResponseService { requestPayload: OCPP16AuthorizeRequest ): void { let authorizeConnectorId: number; - for (const connectorId of chargingStation.connectors.keys()) { - if ( - connectorId > 0 && - chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag === requestPayload.idTag - ) { - authorizeConnectorId = connectorId; - break; + if (chargingStation.hasEvses) { + for (const [evseId, evseStatus] of chargingStation.evses) { + if (evseId > 0) { + for (const [connectorId, connectorStatus] of evseStatus.connectors) { + if (connectorStatus?.authorizeIdTag === requestPayload.idTag) { + authorizeConnectorId = connectorId; + break; + } + } + } + } + } else { + for (const connectorId of chargingStation.connectors.keys()) { + if ( + connectorId > 0 && + chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag === requestPayload.idTag + ) { + authorizeConnectorId = connectorId; + break; + } } } - const authorizeConnectorIdDefined = authorizeConnectorId !== undefined; + const authorizeConnectorIdDefined = !Utils.isNullOrUndefined(authorizeConnectorId); if (payload.idTagInfo.status === OCPP16AuthorizationStatus.ACCEPTED) { authorizeConnectorIdDefined && (chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = true); logger.debug( - `${chargingStation.logPrefix()} IdTag '${requestPayload.idTag}' accepted${ - authorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : '' + `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' accepted${ + authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : '' }` ); } else { if (authorizeConnectorIdDefined) { chargingStation.getConnectorStatus(authorizeConnectorId).idTagAuthorized = false; - delete chargingStation.getConnectorStatus(authorizeConnectorId).authorizeIdTag; + delete chargingStation.getConnectorStatus(authorizeConnectorId)?.authorizeIdTag; } logger.debug( - `${chargingStation.logPrefix()} IdTag '${requestPayload.idTag}' rejected with status '${ + `${chargingStation.logPrefix()} idTag '${requestPayload.idTag}' rejected with status '${ payload.idTagInfo.status - }'${authorizeConnectorIdDefined ? ` on connector ${authorizeConnectorId}` : ''}` + }'${authorizeConnectorIdDefined ? ` on connector id ${authorizeConnectorId}` : ''}` ); } } @@ -391,118 +470,142 @@ export default class OCPP16ResponseService extends OCPPResponseService { payload: OCPP16StartTransactionResponse, requestPayload: OCPP16StartTransactionRequest ): Promise { - const connectorId = requestPayload.connectorId; - - let transactionConnectorId: number; - for (const id of chargingStation.connectors.keys()) { - if (id > 0 && id === connectorId) { - transactionConnectorId = id; - break; - } - } - if (Utils.isNullOrUndefined(transactionConnectorId)) { + const transactionConnectorId = requestPayload.connectorId; + if ( + transactionConnectorId === 0 || + chargingStation.hasConnector(transactionConnectorId) === false + ) { logger.error( - `${chargingStation.logPrefix()} Trying to start a transaction on a non existing connector Id ${connectorId.toString()}` + `${chargingStation.logPrefix()} Trying to start a transaction on a non existing connector id ${transactionConnectorId.toString()}` ); return; } if ( - chargingStation.getConnectorStatus(connectorId)?.transactionRemoteStarted === true && + chargingStation.getConnectorStatus(transactionConnectorId)?.transactionRemoteStarted === + true && chargingStation.getAuthorizeRemoteTxRequests() === true && chargingStation.getLocalAuthListEnabled() === true && - chargingStation.hasAuthorizedTags() && - chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized === false + chargingStation.hasIdTags() && + chargingStation.getConnectorStatus(transactionConnectorId)?.idTagLocalAuthorized === false ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with a not local authorized idTag ${ - chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag - } on connector Id ${connectorId.toString()}` + chargingStation.getConnectorStatus(transactionConnectorId)?.localAuthorizeIdTag + } on connector id ${transactionConnectorId.toString()}` ); - await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId); return; } if ( - chargingStation.getConnectorStatus(connectorId)?.transactionRemoteStarted === true && + chargingStation.getConnectorStatus(transactionConnectorId)?.transactionRemoteStarted === + true && chargingStation.getAuthorizeRemoteTxRequests() === true && chargingStation.getMustAuthorizeAtRemoteStart() === true && - chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized === false && - chargingStation.getConnectorStatus(connectorId)?.idTagAuthorized === false + chargingStation.getConnectorStatus(transactionConnectorId)?.idTagLocalAuthorized === false && + chargingStation.getConnectorStatus(transactionConnectorId)?.idTagAuthorized === false ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with a not authorized idTag ${ - chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag - } on connector Id ${connectorId.toString()}` + chargingStation.getConnectorStatus(transactionConnectorId)?.authorizeIdTag + } on connector id ${transactionConnectorId.toString()}` ); - await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId); return; } if ( - chargingStation.getConnectorStatus(connectorId)?.idTagAuthorized && - chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag !== requestPayload.idTag + chargingStation.getConnectorStatus(transactionConnectorId)?.idTagAuthorized && + chargingStation.getConnectorStatus(transactionConnectorId)?.authorizeIdTag !== + requestPayload.idTag ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${ requestPayload.idTag } different from the authorize request one ${ - chargingStation.getConnectorStatus(connectorId)?.authorizeIdTag - } on connector Id ${connectorId.toString()}` + chargingStation.getConnectorStatus(transactionConnectorId)?.authorizeIdTag + } on connector id ${transactionConnectorId.toString()}` ); - await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId); return; } if ( - chargingStation.getConnectorStatus(connectorId)?.idTagLocalAuthorized && - chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag !== requestPayload.idTag + chargingStation.getConnectorStatus(transactionConnectorId)?.idTagLocalAuthorized && + chargingStation.getConnectorStatus(transactionConnectorId)?.localAuthorizeIdTag !== + requestPayload.idTag ) { logger.error( `${chargingStation.logPrefix()} Trying to start a transaction with an idTag ${ requestPayload.idTag } different from the local authorized one ${ - chargingStation.getConnectorStatus(connectorId)?.localAuthorizeIdTag - } on connector Id ${connectorId.toString()}` + chargingStation.getConnectorStatus(transactionConnectorId)?.localAuthorizeIdTag + } on connector id ${transactionConnectorId.toString()}` ); - await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId); return; } - if (chargingStation.getConnectorStatus(connectorId)?.transactionStarted === true) { - logger.debug( - `${chargingStation.logPrefix()} Trying to start a transaction on an already used connector ${connectorId.toString()}: %j`, - chargingStation.getConnectorStatus(connectorId) + if (chargingStation.getConnectorStatus(transactionConnectorId)?.transactionStarted === true) { + logger.error( + `${chargingStation.logPrefix()} Trying to start a transaction on an already used connector id ${transactionConnectorId.toString()}:`, + chargingStation.getConnectorStatus(transactionConnectorId) ); return; } + if (chargingStation.hasEvses) { + for (const [evseId, evseStatus] of chargingStation.evses) { + if (evseStatus.connectors.size > 1) { + for (const [connectorId, connectorStatus] of evseStatus.connectors) { + if ( + transactionConnectorId !== connectorId && + connectorStatus?.transactionStarted === true + ) { + logger.error( + `${chargingStation.logPrefix()} Trying to start a transaction on an already used evse id ${evseId.toString()}:`, + evseStatus + ); + await this.resetConnectorOnStartTransactionError( + chargingStation, + transactionConnectorId + ); + return; + } + } + } + } + } if ( - chargingStation.getConnectorStatus(connectorId)?.status !== - OCPP16ChargePointStatus.AVAILABLE && - chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.PREPARING + chargingStation.getConnectorStatus(transactionConnectorId)?.status !== + OCPP16ChargePointStatus.Available && + chargingStation.getConnectorStatus(transactionConnectorId)?.status !== + OCPP16ChargePointStatus.Preparing ) { logger.error( - `${chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with status ${ - chargingStation.getConnectorStatus(connectorId)?.status + `${chargingStation.logPrefix()} Trying to start a transaction on connector id ${transactionConnectorId.toString()} with status ${ + chargingStation.getConnectorStatus(transactionConnectorId)?.status }` ); return; } - // if (!Number.isInteger(payload.transactionId)) { - // logger.warn( - // `${chargingStation.logPrefix()} Trying to start a transaction on connector ${connectorId.toString()} with a non integer transaction Id ${ - // payload.transactionId - // }, converting to integer` - // ); - // payload.transactionId = Utils.convertToInt(payload.transactionId); - // } + if (!Number.isInteger(payload.transactionId)) { + logger.warn( + `${chargingStation.logPrefix()} Trying to start a transaction on connector id ${transactionConnectorId.toString()} with a non integer transaction id ${ + payload.transactionId + }, converting to integer` + ); + payload.transactionId = Utils.convertToInt(payload.transactionId); + } if (payload.idTagInfo?.status === OCPP16AuthorizationStatus.ACCEPTED) { - chargingStation.getConnectorStatus(connectorId).transactionStarted = true; - chargingStation.getConnectorStatus(connectorId).transactionId = payload.transactionId; - chargingStation.getConnectorStatus(connectorId).transactionIdTag = requestPayload.idTag; + chargingStation.getConnectorStatus(transactionConnectorId).transactionStarted = true; + chargingStation.getConnectorStatus(transactionConnectorId).transactionId = + payload.transactionId; + chargingStation.getConnectorStatus(transactionConnectorId).transactionIdTag = + requestPayload.idTag; chargingStation.getConnectorStatus( - connectorId + transactionConnectorId ).transactionEnergyActiveImportRegisterValue = 0; - chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue = + chargingStation.getConnectorStatus(transactionConnectorId).transactionBeginMeterValue = OCPP16ServiceUtils.buildTransactionBeginMeterValue( chargingStation, - connectorId, + transactionConnectorId, requestPayload.meterStart ); chargingStation.getBeginEndMeterValues() && @@ -510,26 +613,24 @@ export default class OCPP16ResponseService extends OCPPResponseService { OCPP16MeterValuesRequest, OCPP16MeterValuesResponse >(chargingStation, OCPP16RequestCommand.METER_VALUES, { - connectorId, + connectorId: transactionConnectorId, transactionId: payload.transactionId, - meterValue: [chargingStation.getConnectorStatus(connectorId).transactionBeginMeterValue], + meterValue: [ + chargingStation.getConnectorStatus(transactionConnectorId).transactionBeginMeterValue, + ], })); - await chargingStation.ocppRequestService.requestHandler< - OCPP16StatusNotificationRequest, - OCPP16StatusNotificationResponse - >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { - connectorId, - status: OCPP16ChargePointStatus.CHARGING, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - }); - chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.CHARGING; + await OCPP16ServiceUtils.sendAndSetConnectorStatus( + chargingStation, + transactionConnectorId, + OCPP16ChargePointStatus.Charging + ); logger.info( - `${chargingStation.logPrefix()} Transaction ${payload.transactionId.toString()} STARTED on ${ + `${chargingStation.logPrefix()} Transaction with id ${payload.transactionId.toString()} STARTED on ${ chargingStation.stationInfo.chargingStationId - }#${connectorId.toString()} for idTag '${requestPayload.idTag}'` + }#${transactionConnectorId.toString()} for idTag '${requestPayload.idTag}'` ); if (chargingStation.stationInfo.powerSharedByConnectors) { - chargingStation.powerDivider++; + ++chargingStation.powerDivider; } const configuredMeterValueSampleInterval = ChargingStationConfigurationUtils.getConfigurationKey( @@ -537,18 +638,18 @@ export default class OCPP16ResponseService extends OCPPResponseService { OCPP16StandardParametersKey.MeterValueSampleInterval ); chargingStation.startMeterValues( - connectorId, + transactionConnectorId, configuredMeterValueSampleInterval ? Utils.convertToInt(configuredMeterValueSampleInterval.value) * 1000 : Constants.DEFAULT_METER_VALUES_INTERVAL ); } else { logger.warn( - `${chargingStation.logPrefix()} Starting transaction id ${payload.transactionId.toString()} REJECTED with status '${ + `${chargingStation.logPrefix()} Starting transaction with id ${payload.transactionId.toString()} REJECTED with status '${ payload.idTagInfo?.status }', idTag '${requestPayload.idTag}'` ); - await this.resetConnectorOnStartTransactionError(chargingStation, connectorId); + await this.resetConnectorOnStartTransactionError(chargingStation, transactionConnectorId); } } @@ -556,19 +657,17 @@ export default class OCPP16ResponseService extends OCPPResponseService { chargingStation: ChargingStation, connectorId: number ): Promise { - chargingStation.resetConnectorStatus(connectorId); + ChargingStationUtils.resetConnectorStatus(chargingStation.getConnectorStatus(connectorId)); + chargingStation.stopMeterValues(connectorId); + parentPort?.postMessage(buildUpdatedMessage(chargingStation)); if ( - chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.AVAILABLE + chargingStation.getConnectorStatus(connectorId)?.status !== OCPP16ChargePointStatus.Available ) { - await chargingStation.ocppRequestService.requestHandler< - OCPP16StatusNotificationRequest, - OCPP16StatusNotificationResponse - >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { + await OCPP16ServiceUtils.sendAndSetConnectorStatus( + chargingStation, connectorId, - status: OCPP16ChargePointStatus.AVAILABLE, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - }); - chargingStation.getConnectorStatus(connectorId).status = OCPP16ChargePointStatus.AVAILABLE; + OCPP16ChargePointStatus.Available + ); } } @@ -580,9 +679,9 @@ export default class OCPP16ResponseService extends OCPPResponseService { const transactionConnectorId = chargingStation.getConnectorIdByTransactionId( requestPayload.transactionId ); - if (!transactionConnectorId) { + if (Utils.isNullOrUndefined(transactionConnectorId)) { logger.error( - `${chargingStation.logPrefix()} Trying to stop a non existing transaction ${requestPayload.transactionId.toString()}` + `${chargingStation.logPrefix()} Trying to stop a non existing transaction with id ${requestPayload.transactionId.toString()}` ); return; } @@ -607,35 +706,29 @@ export default class OCPP16ResponseService extends OCPPResponseService { chargingStation.isChargingStationAvailable() === false || chargingStation.isConnectorAvailable(transactionConnectorId) === false ) { - await chargingStation.ocppRequestService.requestHandler< - OCPP16StatusNotificationRequest, - OCPP16StatusNotificationResponse - >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { - connectorId: transactionConnectorId, - status: OCPP16ChargePointStatus.UNAVAILABLE, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - }); - chargingStation.getConnectorStatus(transactionConnectorId).status = - OCPP16ChargePointStatus.UNAVAILABLE; + await OCPP16ServiceUtils.sendAndSetConnectorStatus( + chargingStation, + transactionConnectorId, + OCPP16ChargePointStatus.Unavailable + ); } else { - await chargingStation.ocppRequestService.requestHandler< - OCPP16BootNotificationRequest, - OCPP16BootNotificationResponse - >(chargingStation, OCPP16RequestCommand.STATUS_NOTIFICATION, { - connectorId: transactionConnectorId, - status: OCPP16ChargePointStatus.AVAILABLE, - errorCode: OCPP16ChargePointErrorCode.NO_ERROR, - }); - chargingStation.getConnectorStatus(transactionConnectorId).status = - OCPP16ChargePointStatus.AVAILABLE; + await OCPP16ServiceUtils.sendAndSetConnectorStatus( + chargingStation, + transactionConnectorId, + OCPP16ChargePointStatus.Available + ); } if (chargingStation.stationInfo.powerSharedByConnectors) { chargingStation.powerDivider--; } - chargingStation.resetConnectorStatus(transactionConnectorId); - const logMsg = `${chargingStation.logPrefix()} Transaction ${requestPayload.transactionId.toString()} STOPPED on ${ + ChargingStationUtils.resetConnectorStatus( + chargingStation.getConnectorStatus(transactionConnectorId) + ); + chargingStation.stopMeterValues(transactionConnectorId); + parentPort?.postMessage(buildUpdatedMessage(chargingStation)); + const logMsg = `${chargingStation.logPrefix()} Transaction with id ${requestPayload.transactionId.toString()} STOPPED on ${ chargingStation.stationInfo.chargingStationId - }#${transactionConnectorId.toString()} with status '${ + }#${transactionConnectorId?.toString()} with status '${ payload.idTagInfo?.status ?? 'undefined' }'`; if ( @@ -647,13 +740,4 @@ export default class OCPP16ResponseService extends OCPPResponseService { logger.warn(logMsg); } } - - private parseJsonSchemaFile(relativePath: string): JSONSchemaType { - return JSON.parse( - fs.readFileSync( - path.resolve(path.dirname(fileURLToPath(import.meta.url)), relativePath), - 'utf8' - ) - ) as JSONSchemaType; - } }