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
Bump vm2 from 3.9.10 to 3.9.11 (#192)
[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 8c9cd984b2e318a8149576a2d848a50d766007da..91b1499676b01f3b1e7583c0c385490c70e78ef8 100644
(file)
--- a/
src/charging-station/ocpp/OCPPResponseService.ts
+++ b/
src/charging-station/ocpp/OCPPResponseService.ts
@@
-1,13
+1,13
@@
-import { JSONSchemaType } from 'ajv';
+import
type
{ JSONSchemaType } from 'ajv';
import Ajv from 'ajv-draft-04';
import ajvFormats from 'ajv-formats';
import OCPPError from '../../exception/OCPPError';
import Ajv from 'ajv-draft-04';
import ajvFormats from 'ajv-formats';
import OCPPError from '../../exception/OCPPError';
-import { JsonType } from '../../types/JsonType';
-import { RequestCommand } from '../../types/ocpp/Requests';
+import
type
{ JsonType } from '../../types/JsonType';
+import
type
{ 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 { OCPP
16ServiceUtils } from './1.6/OCPP16
ServiceUtils';
+import { OCPP
ServiceUtils } from './OCPP
ServiceUtils';
const moduleName = 'OCPPResponseService';
const moduleName = 'OCPPResponseService';
@@
-18,10
+18,12
@@
export default abstract class OCPPResponseService {
protected constructor() {
this.ajv = new Ajv();
ajvFormats(this.ajv);
protected constructor() {
this.ajv = new 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 {
- if (
!OCPPResponseService.instance
) {
+ if (
OCPPResponseService.instance === null
) {
OCPPResponseService.instance = new this();
}
return OCPPResponseService.instance as T;
OCPPResponseService.instance = new this();
}
return OCPPResponseService.instance as T;
@@
-33,7
+35,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);
@@
-45,7
+47,7
@@
export default abstract class OCPPResponseService {
validate.errors
);
throw new OCPPError(
validate.errors
);
throw new OCPPError(
- OCPP
16ServiceUtils.A
jvErrorsToErrorType(validate.errors),
+ OCPP
ServiceUtils.a
jvErrorsToErrorType(validate.errors),
'Response PDU is invalid',
commandName,
JSON.stringify(validate.errors, null, 2)
'Response PDU is invalid',
commandName,
JSON.stringify(validate.errors, null, 2)