repositories
/
e-mobility-charging-stations-simulator.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes to OCPP command payload validation:
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
OCPPResponseService.ts
diff --git
a/src/charging-station/ocpp/OCPPResponseService.ts
b/src/charging-station/ocpp/OCPPResponseService.ts
index e5767be194dc23ab2c4fef567b63577bb9127e34..adcdacaeeef0e0a6d128211dad74514e196215f2 100644
(file)
--- a/
src/charging-station/ocpp/OCPPResponseService.ts
+++ b/
src/charging-station/ocpp/OCPPResponseService.ts
@@
-1,10
+1,9
@@
import Ajv, { type JSONSchemaType } from 'ajv';
import Ajv, { type JSONSchemaType } from 'ajv';
-import AjvDraft04 from 'ajv-draft-04';
import ajvFormats from 'ajv-formats';
import OCPPError from '../../exception/OCPPError';
import type { JsonType } from '../../types/JsonType';
import ajvFormats from 'ajv-formats';
import OCPPError from '../../exception/OCPPError';
import type { JsonType } from '../../types/JsonType';
-import { OCPPVersion } from '../../types/ocpp/OCPPVersion';
+import
type
{ OCPPVersion } from '../../types/ocpp/OCPPVersion';
import type { RequestCommand } from '../../types/ocpp/Requests';
import logger from '../../utils/Logger';
import type ChargingStation from '../ChargingStation';
import type { RequestCommand } from '../../types/ocpp/Requests';
import logger from '../../utils/Logger';
import type ChargingStation from '../ChargingStation';
@@
-19,15
+18,9
@@
export default abstract class OCPPResponseService {
protected constructor(version: OCPPVersion) {
this.version = version;
protected constructor(version: OCPPVersion) {
this.version = version;
- switch (this.version) {
- case OCPPVersion.VERSION_16:
- this.ajv = new AjvDraft04();
- break;
- case OCPPVersion.VERSION_20:
- case OCPPVersion.VERSION_201:
- this.ajv = new Ajv();
- break;
- }
+ this.ajv = new Ajv({
+ multipleOfPrecision: 2,
+ });
ajvFormats(this.ajv);
this.responseHandler.bind(this);
this.validateResponsePayload.bind(this);
ajvFormats(this.ajv);
this.responseHandler.bind(this);
this.validateResponsePayload.bind(this);
@@
-54,7
+47,7
@@
export default abstract class OCPPResponseService {
return true;
}
logger.error(
return true;
}
logger.error(
- `${chargingStation.logPrefix()} ${moduleName}.validateResponsePayload:
R
esponse PDU is invalid: %j`,
+ `${chargingStation.logPrefix()} ${moduleName}.validateResponsePayload:
Command '${commandName}' r
esponse PDU is invalid: %j`,
validate.errors
);
throw new OCPPError(
validate.errors
);
throw new OCPPError(