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
Linter fixes
[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 624659aeec5e18cb78a6c5dd31d498ce2648489d..80d5a68687b0ef1011feb4637cd3862acba608a3 100644
(file)
--- a/
src/charging-station/ocpp/OCPPResponseService.ts
+++ b/
src/charging-station/ocpp/OCPPResponseService.ts
@@
-1,23
+1,34
@@
-import { JSONSchemaType } from 'ajv';
-import Ajv from 'ajv-draft-04';
+import Ajv, { type JSONSchemaType } from 'ajv';
import ajvFormats from 'ajv-formats';
import ajvFormats from 'ajv-formats';
+import { OCPPServiceUtils } from './OCPPServiceUtils';
import OCPPError from '../../exception/OCPPError';
import OCPPError from '../../exception/OCPPError';
-import { JsonType } from '../../types/JsonType';
-import { RequestCommand } from '../../types/ocpp/Requests';
+import type { JsonObject, JsonType } from '../../types/JsonType';
+import type { OCPPVersion } from '../../types/ocpp/OCPPVersion';
+import type { IncomingRequestCommand, RequestCommand } from '../../types/ocpp/Requests';
import logger from '../../utils/Logger';
import type ChargingStation from '../ChargingStation';
import logger from '../../utils/Logger';
import type ChargingStation from '../ChargingStation';
-import { OCPPServiceUtils } from './OCPPServiceUtils';
const moduleName = 'OCPPResponseService';
export default abstract class OCPPResponseService {
private static instance: OCPPResponseService | null = null;
const moduleName = 'OCPPResponseService';
export default abstract class OCPPResponseService {
private static instance: OCPPResponseService | null = null;
- private ajv: Ajv;
+ private readonly version: OCPPVersion;
+ private readonly ajv: Ajv;
+ public abstract jsonIncomingRequestResponseSchemas: Map<
+ IncomingRequestCommand,
+ JSONSchemaType<JsonObject>
+ >;
- protected constructor() {
- this.ajv = new Ajv();
+ protected constructor(version: OCPPVersion) {
+ this.version = version;
+ this.ajv = new Ajv({
+ keywords: ['javaType'],
+ multipleOfPrecision: 2,
+ });
ajvFormats(this.ajv);
ajvFormats(this.ajv);
+ this.responseHandler.bind(this);
+ this.validateResponsePayload.bind(this);
}
public static getInstance<T extends OCPPResponseService>(this: new () => T): T {
}
public static getInstance<T extends OCPPResponseService>(this: new () => T): T {
@@
-33,7
+44,7
@@
export default abstract class OCPPResponseService {
schema: JSONSchemaType<T>,
payload: T
): boolean {
schema: JSONSchemaType<T>,
payload: T
): boolean {
- if (
!chargingStation.getPayloadSchemaValidation()
) {
+ if (
chargingStation.getPayloadSchemaValidation() === false
) {
return true;
}
const validate = this.ajv.compile(schema);
return true;
}
const validate = this.ajv.compile(schema);
@@
-41,7
+52,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(
@@
-52,8
+63,9
@@
export default abstract class OCPPResponseService {
);
}
);
}
- // eslint-disable-next-line @typescript-eslint/no-empty-function
- protected emptyResponseHandler() {}
+ protected emptyResponseHandler() {
+ /* This is intentional */
+ }
public abstract responseHandler(
chargingStation: ChargingStation,
public abstract responseHandler(
chargingStation: ChargingStation,