Extended charging profile support

[e-mobility-charging-stations-simulator.git] / src / charging-station / ocpp / OCPPRequestService.ts

diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts
index 704838e960c0638eeef967f3480a303bca78f9c3..e906daf8a45169f485cebfe69532a8365160c7b4 100644 (file)
--- a/src/charging-station/ocpp/OCPPRequestService.ts
+++ b/src/charging-station/ocpp/OCPPRequestService.ts
@@ -36,7 +36,7 @@ export default abstract class OCPPRequestService {
     this.chargingStation = chargingStation;
     this.ocppResponseService = ocppResponseService;
     this.requestHandler.bind(this);
-    this.sendResult.bind(this);
+    this.sendResponse.bind(this);
     this.sendError.bind(this);
   }
 
@@ -54,13 +54,13 @@ export default abstract class OCPPRequestService {
     return OCPPRequestService.instances.get(chargingStation.hashId) as T;
   }
 
-  public async sendResult(
+  public async sendResponse(
     messageId: string,
     messagePayload: JsonType,
     commandName: IncomingRequestCommand
   ): Promise<ResponseType> {
     try {
-      // Send result message
+      // Send response message
       return await this.internalSendMessage(
         messageId,
         messagePayload,
@@ -142,7 +142,7 @@ export default abstract class OCPPRequestService {
             messageType,
             commandName,
             responseCallback,
-            rejectCallback
+            errorCallback
           );
           if (this.chargingStation.getEnableStatistics()) {
             this.chargingStation.performanceStatistics.addRequestStatistic(
@@ -175,10 +175,10 @@ export default abstract class OCPPRequestService {
               // Reject it but keep the request in the cache
               return reject(ocppError);
             }
-            return rejectCallback(ocppError, false);
+            return errorCallback(ocppError, false);
           } else {
             // Reject it
-            return rejectCallback(
+            return errorCallback(
               new OCPPError(
                 ErrorType.GENERIC_ERROR,
                 `WebSocket closed for non buffered message id '${messageId}' with content '${messageToSend}'`,
@@ -231,7 +231,7 @@ export default abstract class OCPPRequestService {
            * @param error
            * @param requestStatistic
            */
-          function rejectCallback(error: OCPPError, requestStatistic = true): void {
+          function errorCallback(error: OCPPError, requestStatistic = true): void {
             if (requestStatistic && self.chargingStation.getEnableStatistics()) {
               self.chargingStation.performanceStatistics.addRequestStatistic(
                 commandName,
@@ -274,7 +274,7 @@ export default abstract class OCPPRequestService {
     messageType: MessageType,
     commandName?: RequestCommand | IncomingRequestCommand,
     responseCallback?: (payload: JsonType, requestPayload: JsonType) => Promise<void>,
-    rejectCallback?: (error: OCPPError, requestStatistic?: boolean) => void
+    errorCallback?: (error: OCPPError, requestStatistic?: boolean) => void
   ): string {
     let messageToSend: string;
     // Type of message
@@ -284,7 +284,7 @@ export default abstract class OCPPRequestService {
         // Build request
         this.chargingStation.requests.set(messageId, [
           responseCallback,
-          rejectCallback,
+          errorCallback,
           commandName,
           messagePayload as JsonType,
         ]);