1
- import { OCPPWebSocket } from "./OCPPWebSocket" ;
1
+ import { OcppMessageRequestPayload , OcppMessageResponsePayload , OCPPWebSocket } from "./OCPPWebSocket" ;
2
2
import { ChargePoint } from "./ChargePoint" ;
3
3
import { Transaction } from "./Transaction" ;
4
4
import { Logger } from "./Logger" ;
5
- import { OCPPMessageType , OCPPAction , OCPPStatus , BootNotification } from "./OcppTypes" ;
5
+ import { OCPPMessageType , OCPPAction , OCPPStatus , BootNotification , OCPPErrorCode } from "./OcppTypes" ;
6
6
7
7
import * as request from "@voltbras/ts-ocpp/dist/messages/json/request" ;
8
8
import * as response from "@voltbras/ts-ocpp/dist/messages/json/response" ;
@@ -126,11 +126,22 @@ export class OCPPMessageHandler {
126
126
127
127
public sendBootNotification ( bootPayload : BootNotification ) : void {
128
128
const messageId = this . generateMessageId ( ) ;
129
+ const payload : request . BootNotificationRequest = {
130
+ chargePointVendor : bootPayload . ChargePointVendor ,
131
+ chargePointModel : bootPayload . ChargePointModel ,
132
+ chargePointSerialNumber : bootPayload . ChargePointSerialNumber ,
133
+ chargeBoxSerialNumber : bootPayload . ChargeBoxSerialNumber ,
134
+ firmwareVersion : bootPayload . FirmwareVersion ,
135
+ iccid : bootPayload . Iccid ,
136
+ imsi : bootPayload . Imsi ,
137
+ meterType : bootPayload . MeterType ,
138
+ meterSerialNumber : bootPayload . MeterSerialNumber ,
139
+ } ;
129
140
this . sendRequest (
130
141
OCPPMessageType . CALL ,
131
142
OCPPAction . BootNotification ,
132
143
messageId ,
133
- bootPayload
144
+ payload ,
134
145
) ;
135
146
}
136
147
@@ -145,17 +156,6 @@ export class OCPPMessageHandler {
145
156
) ;
146
157
}
147
158
148
- public sendReset ( ) : void {
149
- const messageId = this . generateMessageId ( ) ;
150
- const payload : request . ResetRequest = { type : "Hard" } ;
151
- this . sendRequest (
152
- OCPPMessageType . CALL ,
153
- OCPPAction . Reset ,
154
- messageId ,
155
- payload
156
- ) ;
157
- }
158
-
159
159
public sendMeterValue ( transactionId :number | undefined , connectorId : number , meterValue : number ) : void {
160
160
const messageId = this . generateMessageId ( ) ;
161
161
const payload : request . MeterValuesRequest = {
@@ -195,7 +195,7 @@ export class OCPPMessageHandler {
195
195
type : OCPPMessageType ,
196
196
action : OCPPAction ,
197
197
id : string ,
198
- payload : OcppMessagePayload ,
198
+ payload : OcppMessageRequestPayload ,
199
199
connectorId ?: number
200
200
) : void {
201
201
this . _requests . add ( { type, action, id, payload, connectorId} ) ;
@@ -231,7 +231,7 @@ export class OCPPMessageHandler {
231
231
action : OCPPAction ,
232
232
payload : OcppMessagePayloadCall
233
233
) : void {
234
- let response ;
234
+ let response : OcppMessageResponsePayload ;
235
235
switch ( action ) {
236
236
case OCPPAction . RemoteStartTransaction :
237
237
response = this . handleRemoteStartTransaction (
@@ -361,7 +361,6 @@ export class OCPPMessageHandler {
361
361
362
362
private handleReset ( payload : request . ResetRequest ) : response . ResetResponse {
363
363
this . _logger . log ( `Reset request received: ${ payload . type } ` ) ;
364
- this . _chargePoint . sendReset ( ) ;
365
364
return { status : "Accepted" } ;
366
365
}
367
366
@@ -454,7 +453,7 @@ export class OCPPMessageHandler {
454
453
this . _logger . log ( `Status notification sent successfully: ${ JSON . stringify ( payload ) } ` ) ;
455
454
}
456
455
457
- private sendCallResult ( messageId : string , payload : OcppMessagePayload ) : void {
456
+ private sendCallResult ( messageId : string , payload : OcppMessageResponsePayload ) : void {
458
457
this . _webSocket . send (
459
458
OCPPMessageType . CALL_RESULT ,
460
459
messageId ,
@@ -465,7 +464,7 @@ export class OCPPMessageHandler {
465
464
466
465
private sendCallError (
467
466
messageId : string ,
468
- errorCode : string ,
467
+ errorCode : OCPPErrorCode ,
469
468
errorDescription : string
470
469
) : void {
471
470
const errorDetails = {
0 commit comments