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
fix: ensure custom meterValues values are taken
[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 46d12fb048aa7374972316451972a4090aef59a2..0aedbb1eebb5b6a17a2abe94b2b85641c68c07e9 100644
(file)
--- a/
src/charging-station/ocpp/OCPPResponseService.ts
+++ b/
src/charging-station/ocpp/OCPPResponseService.ts
@@
-4,13
+4,7
@@
import ajvFormats from 'ajv-formats';
import { OCPPServiceUtils } from './OCPPServiceUtils';
import type { ChargingStation } from '../../charging-station';
import { OCPPError } from '../../exception';
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';
import { logger } from '../../utils';
const moduleName = 'OCPPResponseService';
@@
-20,16
+14,16
@@
export abstract class OCPPResponseService {
public jsonIncomingRequestResponseValidateFunctions: Map<
IncomingRequestCommand,
public jsonIncomingRequestResponseValidateFunctions: Map<
IncomingRequestCommand,
- ValidateFunction<Json
Object
>
+ ValidateFunction<Json
Type
>
>;
private readonly version: OCPPVersion;
private readonly ajv: Ajv;
>;
private readonly version: OCPPVersion;
private readonly ajv: Ajv;
- private jsonRequestValidateFunctions: Map<RequestCommand, ValidateFunction<Json
Object
>>;
+ private jsonRequestValidateFunctions: Map<RequestCommand, ValidateFunction<Json
Type
>>;
public abstract jsonIncomingRequestResponseSchemas: Map<
IncomingRequestCommand,
public abstract jsonIncomingRequestResponseSchemas: Map<
IncomingRequestCommand,
- JSONSchemaType<Json
Object
>
+ JSONSchemaType<Json
Type
>
>;
protected constructor(version: OCPPVersion) {
>;
protected constructor(version: OCPPVersion) {
@@
-39,10
+33,10
@@
export abstract class OCPPResponseService {
multipleOfPrecision: 2,
});
ajvFormats(this.ajv);
multipleOfPrecision: 2,
});
ajvFormats(this.ajv);
- this.jsonRequestValidateFunctions = new Map<RequestCommand, ValidateFunction<Json
Object
>>();
+ this.jsonRequestValidateFunctions = new Map<RequestCommand, ValidateFunction<Json
Type
>>();
this.jsonIncomingRequestResponseValidateFunctions = new Map<
IncomingRequestCommand,
this.jsonIncomingRequestResponseValidateFunctions = new Map<
IncomingRequestCommand,
- ValidateFunction<Json
Object
>
+ ValidateFunction<Json
Type
>
>();
this.responseHandler = this.responseHandler.bind(this) as <
ReqType extends JsonType,
>();
this.responseHandler = this.responseHandler.bind(this) as <
ReqType extends JsonType,
@@
-74,14
+68,11
@@
export abstract class OCPPResponseService {
schema: JSONSchemaType<T>,
payload: T,
): boolean {
schema: JSONSchemaType<T>,
payload: T,
): boolean {
- if (chargingStation.
getOcppStrictCompliance()
=== false) {
+ if (chargingStation.
stationInfo?.ocppStrictCompliance
=== false) {
return true;
}
if (this.jsonRequestValidateFunctions.has(commandName) === false) {
return true;
}
if (this.jsonRequestValidateFunctions.has(commandName) === false) {
- this.jsonRequestValidateFunctions.set(
- commandName,
- this.ajv.compile<JsonObject>(schema).bind(this),
- );
+ this.jsonRequestValidateFunctions.set(commandName, this.ajv.compile<T>(schema).bind(this));
}
const validate = this.jsonRequestValidateFunctions.get(commandName)!;
if (validate(payload)) {
}
const validate = this.jsonRequestValidateFunctions.get(commandName)!;
if (validate(payload)) {
@@
-92,7
+83,7
@@
export abstract class OCPPResponseService {
validate.errors,
);
throw new OCPPError(
validate.errors,
);
throw new OCPPError(
- OCPPServiceUtils.ajvErrorsToErrorType(validate.errors
!
),
+ OCPPServiceUtils.ajvErrorsToErrorType(validate.errors),
'Response PDU is invalid',
commandName,
JSON.stringify(validate.errors, undefined, 2),
'Response PDU is invalid',
commandName,
JSON.stringify(validate.errors, undefined, 2),