X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Fcharging-station%2FChargingStation.js;h=99532afa59026884efa704bb04ba1612be5a57ca;hb=bfc53a26aa2ad6cb1fe87ef311dea6ad39ab7f34;hp=4ebb52af4b3d21ae2c26b2fb216ba6cfaeaacfc0;hpb=7dde0b73302613be132c41e1f28a42de555dc2b6;p=e-mobility-charging-stations-simulator.git

diff --git a/src/charging-station/ChargingStation.js b/src/charging-station/ChargingStation.js
index 4ebb52af..99532afa 100644
--- a/src/charging-station/ChargingStation.js
+++ b/src/charging-station/ChargingStation.js
@@ -1,14 +1,7 @@
 const Configuration = require('../utils/Configuration');
 const logger = require('../utils/Logger');
 const WebSocket = require('ws');
-const {
-  OCPP_JSON_CALL_MESSAGE,
-  OCPP_JSON_CALL_RESULT_MESSAGE,
-  OCPP_JSON_CALL_ERROR_MESSAGE,
-  OCPP_ERROR_INTERNAL_ERROR,
-  OCPP_SOCKET_TIMEOUT,
-  OCPP_ERROR_NOT_IMPLEMENTED,
-} = require('../utils/Constants');
+const Constants = require('../utils/Constants');
 const Utils = require('../utils/Utils');
 const OCPPError = require('./OcppError');
 const {v4: uuid} = require('uuid');
@@ -147,7 +140,7 @@ class ChargingStation {
     } else {
       // At first start, send Bootnotification
       try {
-        this.sendMessage(uuid(), this._bootNotificationMessage, OCPP_JSON_CALL_MESSAGE, 'BootNotification');
+        this.sendMessage(uuid(), this._bootNotificationMessage, Constants.OCPP_JSON_CALL_MESSAGE, 'BootNotification');
       } catch (error) {
         logger.error(this._basicFormatLog() + ' Send boot notification error: ' + error);
       }
@@ -194,13 +187,13 @@ class ChargingStation {
       // Check the Type of message
       switch (messageType) {
         // Incoming Message
-        case OCPP_JSON_CALL_MESSAGE:
+        case Constants.OCPP_JSON_CALL_MESSAGE:
           // Process the call
           this._statistics.addMessage(commandName);
           await this.handleRequest(messageId, commandName, commandPayload);
           break;
         // Outcome Message
-        case OCPP_JSON_CALL_RESULT_MESSAGE:
+        case Constants.OCPP_JSON_CALL_RESULT_MESSAGE:
           // Respond
           // eslint-disable-next-line no-case-declarations
           let responseCallback; let requestPayload;
@@ -218,7 +211,7 @@ class ChargingStation {
           responseCallback(commandName, requestPayload);
           break;
         // Error Message
-        case OCPP_JSON_CALL_ERROR_MESSAGE:
+        case Constants.OCPP_JSON_CALL_ERROR_MESSAGE:
           if (!this._requests[messageId]) {
             // Error
             throw new Error(`Error for unknown message id ${messageId}`);
@@ -270,19 +263,19 @@ class ChargingStation {
     }
   }
 
-  send(command, messageType = OCPP_JSON_CALL_MESSAGE) {
+  send(command, messageType = Constants.OCPP_JSON_CALL_MESSAGE) {
     // Send Message
     return this.sendMessage(uuid(), command, messageType);
   }
 
   sendError(messageId, err) {
     // Check exception: only OCPP error are accepted
-    const error = (err instanceof OCPPError ? err : new OCPPError(OCPP_ERROR_INTERNAL_ERROR, err.message));
+    const error = (err instanceof OCPPError ? err : new OCPPError(Constants.OCPP_ERROR_INTERNAL_ERROR, err.message));
     // Send error
-    return this.sendMessage(messageId, error, OCPP_JSON_CALL_ERROR_MESSAGE);
+    return this.sendMessage(messageId, error, Constants.OCPP_JSON_CALL_ERROR_MESSAGE);
   }
 
-  sendMessage(messageId, command, messageType = OCPP_JSON_CALL_RESULT_MESSAGE, commandName = '') {
+  sendMessage(messageId, command, messageType = Constants.OCPP_JSON_CALL_RESULT_MESSAGE, commandName = '') {
     // Send a message through wsConnection
     const self = this;
     // Create a promise
@@ -291,19 +284,19 @@ class ChargingStation {
       // Type of message
       switch (messageType) {
         // Request
-        case OCPP_JSON_CALL_MESSAGE:
+        case Constants.OCPP_JSON_CALL_MESSAGE:
           this._statistics.addMessage(commandName);
           // Build request
           this._requests[messageId] = [responseCallback, rejectCallback, command];
           messageToSend = JSON.stringify([messageType, messageId, commandName, command]);
           break;
         // Response
-        case OCPP_JSON_CALL_RESULT_MESSAGE:
+        case Constants.OCPP_JSON_CALL_RESULT_MESSAGE:
           // Build response
           messageToSend = JSON.stringify([messageType, messageId, command]);
           break;
         // Error Message
-        case OCPP_JSON_CALL_ERROR_MESSAGE:
+        case Constants.OCPP_JSON_CALL_ERROR_MESSAGE:
           // Build Message
           // eslint-disable-next-line no-case-declarations
           const {
@@ -324,13 +317,13 @@ class ChargingStation {
         this._messageQueue.push(messageToSend);
       }
       // Request?
-      if (messageType !== OCPP_JSON_CALL_MESSAGE) {
+      if (messageType !== Constants.OCPP_JSON_CALL_MESSAGE) {
         // Yes: send Ok
         resolve();
       } else if (this._wsConnection.readyState === WebSocket.OPEN) {
         // Send timeout in case connection is open otherwise wait for ever
         // FIXME: Handle message on timeout
-        setTimeout(() => rejectCallback(`Timeout for message ${messageId}`), OCPP_SOCKET_TIMEOUT);
+        setTimeout(() => rejectCallback(`Timeout for message ${messageId}`), Constants.OCPP_SOCKET_TIMEOUT);
       }
 
       // Function that will receive the request's response
@@ -450,7 +443,7 @@ class ChargingStation {
         errorCode,
         status,
       };
-      await this.sendMessage(uuid(), payload, OCPP_JSON_CALL_MESSAGE, 'StatusNotification');
+      await this.sendMessage(uuid(), payload, Constants.OCPP_JSON_CALL_MESSAGE, 'StatusNotification');
     } catch (error) {
       logger.error(this._basicFormatLog() + ' Send status error: ' + error);
     }
@@ -465,7 +458,7 @@ class ChargingStation {
           const payload = {
             currentTime: new Date().toISOString(),
           };
-          self.sendMessage(uuid(), payload, OCPP_JSON_CALL_MESSAGE, 'Heartbeat');
+          self.sendMessage(uuid(), payload, Constants.OCPP_JSON_CALL_MESSAGE, 'Heartbeat');
         } catch (error) {
           logger.error(self._basicFormatLog() + ' Send heartbeat error: ' + error);
         }
@@ -491,11 +484,11 @@ class ChargingStation {
       }
     } else {
       // Throw Exception
-      await this.sendError(messageId, new OCPPError(OCPP_ERROR_NOT_IMPLEMENTED, 'Not implemented', {}));
+      await this.sendError(messageId, new OCPPError(Constants.OCPP_ERROR_NOT_IMPLEMENTED, 'Not implemented', {}));
       throw new Error(`${commandName} is not implemented ${JSON.stringify(commandPayload, null, ' ')}`);
     }
     // Send Response
-    await this.sendMessage(messageId, result, OCPP_JSON_CALL_RESULT_MESSAGE);
+    await this.sendMessage(messageId, result, Constants.OCPP_JSON_CALL_RESULT_MESSAGE);
   }
 
   async handleGetConfiguration() {
@@ -506,36 +499,26 @@ class ChargingStation {
     const keyToChange = this._configuration.configurationKey.find((element) => element.key === commandPayload.key);
     if (keyToChange) {
       keyToChange.value = commandPayload.value;
-      return {
-        status: 'Accepted',
-      };
+      return Constants.OCPP_RESPONSE_ACCEPTED;
     }
-    return {
-      status: 'Rejected',
-    };
+    return Constants.OCPP_RESPONSE_REJECTED;
   }
 
   async handleRemoteStartTransaction(commandPayload) {
     const transactionConnectorID = (commandPayload.connectorId ? commandPayload.connectorId : '1');
     if (this.isAuthorizationRequested() && this._authorizeRemoteTxRequests) {
-      // check if authorized
+      // Check if authorized
       if (this._authorizedKeys.find((value) => value === commandPayload.idTag)) {
         // Authorization successful start transaction
         setTimeout(() => this.sendStartTransaction(transactionConnectorID, commandPayload.idTag), 500);
-        return {
-          status: 'Accepted',
-        };
+        return Constants.OCPP_RESPONSE_ACCEPTED;
       }
       // Start authorization checks
-      return {
-        status: 'Rejected',
-      };
+      return Constants.OCPP_RESPONSE_REJECTED;
     }
-    // no local authorization check required => start transaction
+    // No local authorization check required => start transaction
     setTimeout(() => this.sendStartTransaction(transactionConnectorID, commandPayload.idTag), 500);
-    return {
-      status: 'Accepted',
-    };
+    return Constants.OCPP_RESPONSE_ACCEPTED;
   }
 
   async sendStartTransaction(connectorID, idTag) {
@@ -546,7 +529,7 @@ class ChargingStation {
         meterStart: 0,
         timestamp: new Date().toISOString(),
       };
-      return await this.sendMessage(uuid(), payload, OCPP_JSON_CALL_MESSAGE, 'StartTransaction');
+      return await this.sendMessage(uuid(), payload, Constants.OCPP_JSON_CALL_MESSAGE, 'StartTransaction');
     } catch (error) {
       logger.error(this._basicFormatLog() + ' Send start transaction error: ' + error);
       this._resetTransactionOnConnector(connectorID);
@@ -561,7 +544,7 @@ class ChargingStation {
         meterStop: 0,
         timestamp: new Date().toISOString(),
       };
-      await this.sendMessage(uuid(), payload, OCPP_JSON_CALL_MESSAGE, 'StopTransaction');
+      await this.sendMessage(uuid(), payload, Constants.OCPP_JSON_CALL_MESSAGE, 'StopTransaction');
       logger.info(this._basicFormatLog() + ' Transaction ' + this._connectors[connectorID].transactionId + ' STOPPED on ' + this._stationInfo.name + '#' + connectorID);
       this.sendStatusNotification(connectorID, 'Available');
     } catch (error) {
@@ -628,7 +611,7 @@ class ChargingStation {
         transactionId: self._connectors[connectorID].transactionId,
         meterValue: [sampledValueLcl],
       };
-      await self.sendMessage(uuid(), payload, OCPP_JSON_CALL_MESSAGE, 'MeterValues');
+      await self.sendMessage(uuid(), payload, Constants.OCPP_JSON_CALL_MESSAGE, 'MeterValues');
     } catch (error) {
       logger.error(self._basicFormatLog() + ' Send meter values error: ' + error);
     }
@@ -655,9 +638,7 @@ class ChargingStation {
         this.sendStopTransaction(commandPayload.transactionId, connector);
       }
     }
-    return {
-      status: 'Accepted',
-    };
+    return Constants.OCPP_RESPONSE_ACCEPTED;
   }
 
   isAuthorizationRequested() {