AuthorizationStatus,
StartTransactionRequest,
StartTransactionResponse,
- StopTransactionReason,
StopTransactionRequest,
StopTransactionResponse,
} from '../types/ocpp/Transaction';
if (this.isResponse(messageEvent.data)) {
return;
}
- this.validateMessageEvent(messageEvent);
+ const [uuid, command, requestPayload] = this.validateMessageEvent(messageEvent)
+ .data as BroadcastChannelRequest;
- const [uuid, command, requestPayload] = messageEvent.data as BroadcastChannelRequest;
-
- if (
- requestPayload?.hashId === undefined &&
- (requestPayload?.hashIds as string[])?.includes(this.chargingStation.hashId) === false
- ) {
- return;
- }
- if (
- requestPayload?.hashIds === undefined &&
- requestPayload?.hashId !== this.chargingStation.hashId
- ) {
- return;
- }
- if (requestPayload?.hashId !== undefined) {
- logger.warn(
- `${this.chargingStation.logPrefix()} ${moduleName}.requestHandler: 'hashId' field usage in PDU is deprecated, use 'hashIds' instead`
- );
+ if (requestPayload?.hashIds !== undefined || requestPayload?.hashId !== undefined) {
+ if (
+ requestPayload?.hashId === undefined &&
+ requestPayload?.hashIds?.includes(this.chargingStation.stationInfo.hashId) === false
+ ) {
+ return;
+ }
+ if (
+ requestPayload?.hashIds === undefined &&
+ requestPayload?.hashId !== this.chargingStation.stationInfo.hashId
+ ) {
+ return;
+ }
+ if (requestPayload?.hashId !== undefined) {
+ logger.warn(
+ `${this.chargingStation.logPrefix()} ${moduleName}.requestHandler: 'hashId' field usage in PDU is deprecated, use 'hashIds' instead`
+ );
+ }
}
let responsePayload: BroadcastChannelResponsePayload;
commandResponse = await this.commandHandler(command, requestPayload);
if (commandResponse === undefined) {
responsePayload = {
- hashId: this.chargingStation.hashId,
+ hashId: this.chargingStation.stationInfo.hashId,
status: ResponseStatus.SUCCESS,
};
} else {
responsePayload = {
- hashId: this.chargingStation.hashId,
+ hashId: this.chargingStation.stationInfo.hashId,
status: this.commandResponseToResponseStatus(commandResponse),
};
}
error
);
responsePayload = {
- hashId: this.chargingStation.hashId,
+ hashId: this.chargingStation.stationInfo.hashId,
status: ResponseStatus.FAILURE,
command,
requestPayload,
private messageErrorHandler(messageEvent: MessageEvent): void {
logger.error(
`${this.chargingStation.logPrefix()} ${moduleName}.messageErrorHandler: Error at handling message:`,
- { messageEvent, messageEventData: messageEvent.data }
+ { messageEvent }
);
}
>(this.chargingStation, RequestCommand.STOP_TRANSACTION, {
transactionId: requestPayload.transactionId,
meterStop: this.chargingStation.getEnergyActiveImportRegisterByTransactionId(
- requestPayload.transactionId
+ requestPayload.transactionId,
+ true
),
idTag: this.chargingStation.getTransactionIdTag(requestPayload.transactionId),
- reason: StopTransactionReason.NONE,
+ ...(requestPayload.reason && { reason: requestPayload.reason }),
});
case BroadcastChannelProcedureName.START_AUTOMATIC_TRANSACTION_GENERATOR:
- this.chargingStation.startAutomaticTransactionGenerator();
+ this.chargingStation.startAutomaticTransactionGenerator(requestPayload.connectorIds);
break;
case BroadcastChannelProcedureName.STOP_AUTOMATIC_TRANSACTION_GENERATOR:
- this.chargingStation.stopAutomaticTransactionGenerator();
+ this.chargingStation.stopAutomaticTransactionGenerator(requestPayload.connectorIds);
break;
default:
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions