-// Partial Copyright Jerome Benoit. 2021. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-2023. All Rights Reserved.
import fs from 'fs';
import path from 'path';
OCPP16StopTransactionRequest,
} from '../../../types/ocpp/1.6/Transaction';
import { ErrorType } from '../../../types/ocpp/ErrorType';
+import { OCPPVersion } from '../../../types/ocpp/OCPPVersion';
import type { RequestParams } from '../../../types/ocpp/Requests';
import Constants from '../../../utils/Constants';
import logger from '../../../utils/Logger';
if (new.target?.name === moduleName) {
throw new TypeError(`Cannot construct ${new.target?.name} instances directly`);
}
- super(ocppResponseService);
+ super(OCPPVersion.VERSION_16, ocppResponseService);
this.jsonSchemas = new Map<OCPP16RequestCommand, JSONSchemaType<JsonObject>>([
[
OCPP16RequestCommand.AUTHORIZE,
],
]);
this.buildRequestPayload.bind(this);
- this.validatePayload.bind(this);
}
public async requestHandler<RequestType extends JsonType, ResponseType extends JsonType>(
commandName,
commandParams
);
- this.validatePayload(chargingStation, commandName, requestPayload);
return (await this.sendMessage(
chargingStation,
Utils.generateUUID(),
);
}
+ protected getRequestPayloadValidationSchema(
+ chargingStation: ChargingStation,
+ commandName: OCPP16RequestCommand
+ ): JSONSchemaType<JsonObject> | false {
+ if (this.jsonSchemas.has(commandName) === true) {
+ return this.jsonSchemas.get(commandName);
+ }
+ logger.warn(
+ `${chargingStation.logPrefix()} ${moduleName}.getPayloadValidationSchema: No JSON schema found for command ${commandName} PDU validation`
+ );
+ return false;
+ }
+
private buildRequestPayload<Request extends JsonType>(
chargingStation: ChargingStation,
commandName: OCPP16RequestCommand,
meterStart: chargingStation.getEnergyActiveImportRegisterByConnectorId(
commandParams?.connectorId as number
),
- timestamp: new Date().toISOString(),
+ timestamp: new Date(),
} as unknown as Request;
case OCPP16RequestCommand.STOP_TRANSACTION:
connectorId = chargingStation.getConnectorIdByTransactionId(
commandParams?.idTag ??
chargingStation.getTransactionIdTag(commandParams?.transactionId as number),
meterStop: commandParams?.meterStop ?? energyActiveImportRegister,
- timestamp: new Date().toISOString(),
+ timestamp: new Date(),
reason: commandParams?.reason,
...(chargingStation.getTransactionDataMeterValues() && {
transactionData: OCPP16ServiceUtils.buildTransactionDataMeterValues(
);
}
}
-
- private validatePayload<Request extends JsonType>(
- chargingStation: ChargingStation,
- commandName: OCPP16RequestCommand,
- requestPayload: Request
- ): boolean {
- if (this.jsonSchemas.has(commandName)) {
- return this.validateRequestPayload(
- chargingStation,
- commandName,
- this.jsonSchemas.get(commandName),
- requestPayload
- );
- }
- logger.warn(
- `${chargingStation.logPrefix()} ${moduleName}.validatePayload: No JSON schema found for command ${commandName} PDU validation`
- );
- return false;
- }
}