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: convert remote stop transaction to two stages request
[e-mobility-charging-stations-simulator.git]
/
src
/
charging-station
/
ocpp
/
2.0
/
OCPP20RequestService.ts
diff --git
a/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
b/src/charging-station/ocpp/2.0/OCPP20RequestService.ts
index a9a7302847cc0932cdf6cba057858959c9f0e9e1..a61fc2aee090d4d7dfa836e3a7c5d90a1f96aeee 100644
(file)
--- a/
src/charging-station/ocpp/2.0/OCPP20RequestService.ts
+++ b/
src/charging-station/ocpp/2.0/OCPP20RequestService.ts
@@
-1,6
+1,6
@@
-// Partial Copyright Jerome Benoit. 2021-202
3
. All Rights Reserved.
+// Partial Copyright Jerome Benoit. 2021-202
4
. All Rights Reserved.
-import type {
JSONSchemaType
} from 'ajv'
+import type {
ValidateFunction
} from 'ajv'
import { OCPP20Constants } from './OCPP20Constants.js'
import { OCPP20ServiceUtils } from './OCPP20ServiceUtils.js'
import { OCPP20Constants } from './OCPP20Constants.js'
import { OCPP20ServiceUtils } from './OCPP20ServiceUtils.js'
@@
-24,44
+24,52
@@
import type { OCPPResponseService } from '../OCPPResponseService.js'
const moduleName = 'OCPP20RequestService'
export class OCPP20RequestService extends OCPPRequestService {
const moduleName = 'OCPP20RequestService'
export class OCPP20RequestService extends OCPPRequestService {
- protected
jsonSchemas: Map<OCPP20RequestCommand, JSONSchemaType
<JsonType>>
+ protected
payloadValidateFunctions: Map<OCPP20RequestCommand, ValidateFunction
<JsonType>>
public constructor (ocppResponseService: OCPPResponseService) {
public constructor (ocppResponseService: OCPPResponseService) {
- // if (new.target
?
.name === moduleName) {
- // throw new TypeError(`Cannot construct ${new.target
?
.name} instances directly`)
+ // if (new.target.name === moduleName) {
+ // throw new TypeError(`Cannot construct ${new.target.name} instances directly`)
// }
super(OCPPVersion.VERSION_20, ocppResponseService)
// }
super(OCPPVersion.VERSION_20, ocppResponseService)
- this.
jsonSchemas = new Map<OCPP20RequestCommand, JSONSchemaType
<JsonType>>([
+ this.
payloadValidateFunctions = new Map<OCPP20RequestCommand, ValidateFunction
<JsonType>>([
[
OCPP20RequestCommand.BOOT_NOTIFICATION,
[
OCPP20RequestCommand.BOOT_NOTIFICATION,
- OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20BootNotificationRequest>(
- 'assets/json-schemas/ocpp/2.0/BootNotificationRequest.json',
- moduleName,
- 'constructor'
- )
+ this.ajv
+ .compile(
+ OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20BootNotificationRequest>(
+ 'assets/json-schemas/ocpp/2.0/BootNotificationRequest.json',
+ moduleName,
+ 'constructor'
+ )
+ )
+ .bind(this)
],
[
OCPP20RequestCommand.HEARTBEAT,
],
[
OCPP20RequestCommand.HEARTBEAT,
- OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20HeartbeatRequest>(
- 'assets/json-schemas/ocpp/2.0/HeartbeatRequest.json',
- moduleName,
- 'constructor'
- )
+ this.ajv
+ .compile(
+ OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20HeartbeatRequest>(
+ 'assets/json-schemas/ocpp/2.0/HeartbeatRequest.json',
+ moduleName,
+ 'constructor'
+ )
+ )
+ .bind(this)
],
[
OCPP20RequestCommand.STATUS_NOTIFICATION,
],
[
OCPP20RequestCommand.STATUS_NOTIFICATION,
- OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20StatusNotificationRequest>(
- 'assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json',
- moduleName,
- 'constructor'
- )
+ this.ajv
+ .compile(
+ OCPP20ServiceUtils.parseJsonSchemaFile<OCPP20StatusNotificationRequest>(
+ 'assets/json-schemas/ocpp/2.0/StatusNotificationRequest.json',
+ moduleName,
+ 'constructor'
+ )
+ )
+ .bind(this)
]
])
]
])
- this.buildRequestPayload = this.buildRequestPayload.bind(this) as <Request extends JsonType>(
- chargingStation: ChargingStation,
- commandName: OCPP20RequestCommand,
- commandParams?: JsonType
- ) => Request
+ this.buildRequestPayload = this.buildRequestPayload.bind(this)
}
public async requestHandler<RequestType extends JsonType, ResponseType extends JsonType>(
}
public async requestHandler<RequestType extends JsonType, ResponseType extends JsonType>(