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
refactor(simulator): cleanup JSON type usage in OCPP 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 9daa991c952c30ff184748099dfbe158544ed8c1..90f92169cd4c76f8a49f37fc3635a4778689cd86 100644
(file)
--- a/
src/charging-station/ocpp/OCPPResponseService.ts
+++ b/
src/charging-station/ocpp/OCPPResponseService.ts
@@
-1,27
+1,29
@@
-import Ajv, { type JSONSchemaType } from 'ajv';
+import Ajv, { type JSONSchemaType
, type ValidateFunction
} from 'ajv';
import ajvFormats from 'ajv-formats';
import { OCPPServiceUtils } from './OCPPServiceUtils';
import type { ChargingStation } from '../../charging-station';
import { OCPPError } from '../../exception';
import ajvFormats from 'ajv-formats';
import { OCPPServiceUtils } from './OCPPServiceUtils';
import type { ChargingStation } from '../../charging-station';
import { OCPPError } from '../../exception';
-import type {
- IncomingRequestCommand,
- JsonObject,
- JsonType,
- OCPPVersion,
- RequestCommand,
-} from '../../types';
+import type { IncomingRequestCommand, JsonType, OCPPVersion, RequestCommand } from '../../types';
import { logger } from '../../utils';
const moduleName = 'OCPPResponseService';
export abstract class OCPPResponseService {
private static instance: OCPPResponseService | null = null;
import { logger } from '../../utils';
const moduleName = 'OCPPResponseService';
export abstract class OCPPResponseService {
private static instance: OCPPResponseService | null = null;
+
+ public jsonIncomingRequestResponseValidateFunctions: Map<
+ IncomingRequestCommand,
+ ValidateFunction<JsonType>
+ >;
+
private readonly version: OCPPVersion;
private readonly ajv: Ajv;
private readonly version: OCPPVersion;
private readonly ajv: Ajv;
+ private jsonRequestValidateFunctions: Map<RequestCommand, ValidateFunction<JsonType>>;
+
public abstract jsonIncomingRequestResponseSchemas: Map<
IncomingRequestCommand,
public abstract jsonIncomingRequestResponseSchemas: Map<
IncomingRequestCommand,
- JSONSchemaType<Json
Object
>
+ JSONSchemaType<Json
Type
>
>;
protected constructor(version: OCPPVersion) {
>;
protected constructor(version: OCPPVersion) {
@@
-31,6
+33,11
@@
export abstract class OCPPResponseService {
multipleOfPrecision: 2,
});
ajvFormats(this.ajv);
multipleOfPrecision: 2,
});
ajvFormats(this.ajv);
+ this.jsonRequestValidateFunctions = new Map<RequestCommand, ValidateFunction<JsonType>>();
+ this.jsonIncomingRequestResponseValidateFunctions = new Map<
+ IncomingRequestCommand,
+ ValidateFunction<JsonType>
+ >();
this.responseHandler = this.responseHandler.bind(this) as <
ReqType extends JsonType,
ResType extends JsonType,
this.responseHandler = this.responseHandler.bind(this) as <
ReqType extends JsonType,
ResType extends JsonType,
@@
-64,7
+71,13
@@
export abstract class OCPPResponseService {
if (chargingStation.getOcppStrictCompliance() === false) {
return true;
}
if (chargingStation.getOcppStrictCompliance() === false) {
return true;
}
- const validate = this.ajv.compile(schema);
+ if (this.jsonRequestValidateFunctions.has(commandName) === false) {
+ this.jsonRequestValidateFunctions.set(
+ commandName,
+ this.ajv.compile<JsonType>(schema).bind(this),
+ );
+ }
+ const validate = this.jsonRequestValidateFunctions.get(commandName)!;
if (validate(payload)) {
return true;
}
if (validate(payload)) {
return true;
}