Add stationInfo to persistent configuration
authorJérôme Benoit <jerome.benoit@sap.com>
Mon, 14 Mar 2022 19:30:47 +0000 (20:30 +0100)
committerJérôme Benoit <jerome.benoit@sap.com>
Mon, 14 Mar 2022 19:30:47 +0000 (20:30 +0100)
Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
src/charging-station/ChargingStation.ts
src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
src/types/ChargingStationConfiguration.ts
src/types/ChargingStationInfo.ts
src/types/ChargingStationOcppConfiguration.ts [new file with mode: 0644]
src/types/ChargingStationTemplate.ts
src/utils/Configuration.ts

index bd3e9c9cf998b26acbf0fef91b9e2cdd6f751ea9..48c56e4d31280dfef348a9a7dd77ad54e0d1e6a5 100644 (file)
@@ -15,13 +15,15 @@ import {
   RegistrationStatus,
   StatusNotificationResponse,
 } from '../types/ocpp/Responses';
-import ChargingStationConfiguration, {
+import ChargingStationConfiguration, { Section } from '../types/ChargingStationConfiguration';
+import ChargingStationOcppConfiguration, {
   ConfigurationKey,
-} from '../types/ChargingStationConfiguration';
+} from '../types/ChargingStationOcppConfiguration';
 import ChargingStationTemplate, {
   CurrentType,
   PowerUnits,
   Voltage,
+  WsOptions,
 } from '../types/ChargingStationTemplate';
 import {
   ConnectorPhaseRotation,
@@ -32,7 +34,7 @@ import {
 import { MeterValue, MeterValueMeasurand, MeterValuePhase } from '../types/ocpp/MeterValues';
 import { StopTransactionReason, StopTransactionResponse } from '../types/ocpp/Transaction';
 import { WSError, WebSocketCloseEventStatusCode } from '../types/WebSocket';
-import WebSocket, { ClientOptions, Data, OPEN, RawData } from 'ws';
+import WebSocket, { Data, OPEN, RawData } from 'ws';
 
 import AutomaticTransactionGenerator from './AutomaticTransactionGenerator';
 import { ChargePointErrorCode } from '../types/ocpp/ChargePointErrorCode';
@@ -40,7 +42,6 @@ import { ChargePointStatus } from '../types/ocpp/ChargePointStatus';
 import { ChargingProfile } from '../types/ocpp/ChargingProfile';
 import ChargingStationInfo from '../types/ChargingStationInfo';
 import { ChargingStationWorkerMessageEvents } from '../types/ChargingStationWorker';
-import { ClientRequestArgs } from 'http';
 import Configuration from '../utils/Configuration';
 import { ConnectorStatus } from '../types/ConnectorStatus';
 import Constants from '../utils/Constants';
@@ -70,11 +71,11 @@ import path from 'path';
 
 export default class ChargingStation {
   public hashId!: string;
-  public readonly stationTemplateFile: string;
+  public readonly templateFile: string;
   public authorizedTags: string[];
   public stationInfo!: ChargingStationInfo;
   public readonly connectors: Map<number, ConnectorStatus>;
-  public configuration!: ChargingStationConfiguration;
+  public ocppConfiguration!: ChargingStationOcppConfiguration;
   public wsConnection!: WebSocket;
   public readonly requests: Map<string, CachedRequest>;
   public performanceStatistics!: PerformanceStatistics;
@@ -94,9 +95,9 @@ export default class ChargingStation {
   private automaticTransactionGenerator!: AutomaticTransactionGenerator;
   private webSocketPingSetInterval!: NodeJS.Timeout;
 
-  constructor(index: number, stationTemplateFile: string) {
+  constructor(index: number, templateFile: string) {
     this.index = index;
-    this.stationTemplateFile = stationTemplateFile;
+    this.templateFile = templateFile;
     this.stopped = false;
     this.wsConnectionRestarted = false;
     this.autoReconnectRetryCount = 0;
@@ -209,7 +210,7 @@ export default class ChargingStation {
 
   public getVoltageOut(): number | undefined {
     const errMsg = `${this.logPrefix()} Unknown ${this.getCurrentOutType()} currentOutType in template file ${
-      this.stationTemplateFile
+      this.templateFile
     }, cannot define default voltage out`;
     let defaultVoltageOut: number;
     switch (this.getCurrentOutType()) {
@@ -511,14 +512,14 @@ export default class ChargingStation {
     FileUtils.watchJsonFile(
       this.logPrefix(),
       FileType.ChargingStationTemplate,
-      this.stationTemplateFile,
+      this.templateFile,
       null,
       (event, filename): void => {
         if (filename && event === 'change') {
           try {
             logger.debug(
               `${this.logPrefix()} ${FileType.ChargingStationTemplate} ${
-                this.stationTemplateFile
+                this.templateFile
               } file have changed, reload`
             );
             // Initialize
@@ -607,7 +608,7 @@ export default class ChargingStation {
     key: string | StandardParametersKey,
     caseInsensitive = false
   ): ConfigurationKey | undefined {
-    return this.configuration.configurationKey.find((configElement) => {
+    return this.ocppConfiguration.configurationKey.find((configElement) => {
       if (caseInsensitive) {
         return configElement.key.toLowerCase() === key.toLowerCase();
       }
@@ -635,14 +636,14 @@ export default class ChargingStation {
       keyFound = undefined;
     }
     if (!keyFound) {
-      this.configuration.configurationKey.push({
+      this.ocppConfiguration.configurationKey.push({
         key,
         readonly: options.readonly,
         value,
         visible: options.visible,
         reboot: options.reboot,
       });
-      params?.save && this.saveConfiguration();
+      params?.save && this.saveOcppConfiguration();
     } else {
       logger.error(
         `${this.logPrefix()} Trying to add an already existing configuration key: %j`,
@@ -658,9 +659,9 @@ export default class ChargingStation {
   ): void {
     const keyFound = this.getConfigurationKey(key, caseInsensitive);
     if (keyFound) {
-      const keyIndex = this.configuration.configurationKey.indexOf(keyFound);
-      this.configuration.configurationKey[keyIndex].value = value;
-      this.saveConfiguration();
+      const keyIndex = this.ocppConfiguration.configurationKey.indexOf(keyFound);
+      this.ocppConfiguration.configurationKey[keyIndex].value = value;
+      this.saveOcppConfiguration();
     } else {
       logger.error(
         `${this.logPrefix()} Trying to set a value on a non existing configuration key: %j`,
@@ -675,11 +676,11 @@ export default class ChargingStation {
   ): ConfigurationKey[] {
     const keyFound = this.getConfigurationKey(key, params?.caseInsensitive);
     if (keyFound) {
-      const deletedConfigurationKey = this.configuration.configurationKey.splice(
-        this.configuration.configurationKey.indexOf(keyFound),
+      const deletedConfigurationKey = this.ocppConfiguration.configurationKey.splice(
+        this.ocppConfiguration.configurationKey.indexOf(keyFound),
         1
       );
-      params?.save && this.saveConfiguration();
+      params?.save && this.saveOcppConfiguration();
       return deletedConfigurationKey;
     }
   }
@@ -766,65 +767,110 @@ export default class ChargingStation {
     return randomSerialNumberSuffix;
   }
 
-  private buildStationInfo(): ChargingStationInfo {
-    let stationTemplateFromFile: ChargingStationTemplate;
+  private getTemplateFromFile(): ChargingStationTemplate {
+    let template: ChargingStationTemplate = null;
     try {
-      // Load template file
-      stationTemplateFromFile = JSON.parse(
-        fs.readFileSync(this.stationTemplateFile, 'utf8')
-      ) as ChargingStationTemplate;
+      template = JSON.parse(fs.readFileSync(this.templateFile, 'utf8')) as ChargingStationTemplate;
     } catch (error) {
       FileUtils.handleFileException(
         this.logPrefix(),
         FileType.ChargingStationTemplate,
-        this.stationTemplateFile,
+        this.templateFile,
         error as NodeJS.ErrnoException
       );
     }
-    const chargingStationId = this.getChargingStationId(stationTemplateFromFile);
+    return template;
+  }
+
+  private createSerialNumber(
+    stationInfo: ChargingStationInfo,
+    params: { randomSerialNumber: boolean } = { randomSerialNumber: false }
+  ): void {
+    const serialNumberSuffix = params.randomSerialNumber
+      ? this.getRandomSerialNumberSuffix({ upperCase: true })
+      : '';
+    stationInfo.chargePointSerialNumber =
+      stationInfo?.chargePointSerialNumberPrefix &&
+      stationInfo.chargePointSerialNumberPrefix + serialNumberSuffix;
+    delete stationInfo.chargePointSerialNumberPrefix;
+    stationInfo.chargeBoxSerialNumber =
+      stationInfo?.chargeBoxSerialNumberPrefix &&
+      stationInfo.chargeBoxSerialNumberPrefix + serialNumberSuffix;
+    delete stationInfo.chargeBoxSerialNumberPrefix;
+  }
+
+  private getStationInfoFromTemplate(
+    params: { randomSerialNumber: boolean } = { randomSerialNumber: false }
+  ): ChargingStationInfo {
+    const templateFromFile: ChargingStationTemplate = this.getTemplateFromFile();
+    const stationInfo: ChargingStationInfo = templateFromFile ?? ({} as ChargingStationInfo);
+    stationInfo.hash = crypto
+      .createHash(Constants.DEFAULT_HASH_ALGORITHM)
+      .update(JSON.stringify(templateFromFile))
+      .digest('hex');
+    const chargingStationId = this.getChargingStationId(templateFromFile);
     // Deprecation template keys section
     this.warnDeprecatedTemplateKey(
-      stationTemplateFromFile,
+      templateFromFile,
       'supervisionUrl',
       chargingStationId,
       "Use 'supervisionUrls' instead"
     );
-    this.convertDeprecatedTemplateKey(stationTemplateFromFile, 'supervisionUrl', 'supervisionUrls');
-    const stationInfo: ChargingStationInfo = stationTemplateFromFile ?? ({} as ChargingStationInfo);
-    stationInfo.chargePointSerialNumber =
-      stationTemplateFromFile?.chargePointSerialNumberPrefix &&
-      stationTemplateFromFile.chargePointSerialNumberPrefix;
-    delete stationInfo.chargePointSerialNumberPrefix;
-    stationInfo.chargeBoxSerialNumber =
-      stationTemplateFromFile?.chargeBoxSerialNumberPrefix &&
-      stationTemplateFromFile.chargeBoxSerialNumberPrefix;
-    delete stationInfo.chargeBoxSerialNumberPrefix;
-    stationInfo.wsOptions = stationTemplateFromFile?.wsOptions ?? {};
-    if (!Utils.isEmptyArray(stationTemplateFromFile.power)) {
-      stationTemplateFromFile.power = stationTemplateFromFile.power as number[];
+    this.convertDeprecatedTemplateKey(templateFromFile, 'supervisionUrl', 'supervisionUrls');
+    this.createSerialNumber(stationInfo, params);
+    stationInfo.wsOptions = templateFromFile?.wsOptions ?? {};
+    if (!Utils.isEmptyArray(templateFromFile.power)) {
+      templateFromFile.power = templateFromFile.power as number[];
       const powerArrayRandomIndex = Math.floor(
-        Utils.secureRandom() * stationTemplateFromFile.power.length
+        Utils.secureRandom() * templateFromFile.power.length
       );
       stationInfo.maxPower =
-        stationTemplateFromFile.powerUnit === PowerUnits.KILO_WATT
-          ? stationTemplateFromFile.power[powerArrayRandomIndex] * 1000
-          : stationTemplateFromFile.power[powerArrayRandomIndex];
+        templateFromFile.powerUnit === PowerUnits.KILO_WATT
+          ? templateFromFile.power[powerArrayRandomIndex] * 1000
+          : templateFromFile.power[powerArrayRandomIndex];
     } else {
-      stationTemplateFromFile.power = stationTemplateFromFile.power as number;
+      templateFromFile.power = templateFromFile.power as number;
       stationInfo.maxPower =
-        stationTemplateFromFile.powerUnit === PowerUnits.KILO_WATT
-          ? stationTemplateFromFile.power * 1000
-          : stationTemplateFromFile.power;
+        templateFromFile.powerUnit === PowerUnits.KILO_WATT
+          ? templateFromFile.power * 1000
+          : templateFromFile.power;
     }
     delete stationInfo.power;
     delete stationInfo.powerUnit;
     stationInfo.chargingStationId = chargingStationId;
-    stationInfo.resetTime = stationTemplateFromFile.resetTime
-      ? stationTemplateFromFile.resetTime * 1000
+    stationInfo.resetTime = templateFromFile.resetTime
+      ? templateFromFile.resetTime * 1000
       : Constants.CHARGING_STATION_DEFAULT_RESET_TIME;
     return stationInfo;
   }
 
+  private getStationInfoFromFile(): ChargingStationInfo | null {
+    return this.getConfigurationFromFile()?.stationInfo ?? null;
+  }
+
+  private getStationInfo(): ChargingStationInfo {
+    const stationInfoFromTemplate: ChargingStationInfo = this.getStationInfoFromTemplate();
+    this.hashId = this.getHashId(
+      this.createBootNotificationRequest(stationInfoFromTemplate),
+      stationInfoFromTemplate.chargingStationId
+    );
+    this.configurationFile = path.join(
+      path.resolve(__dirname, '../'),
+      'assets',
+      'configurations',
+      this.hashId + '.json'
+    );
+    const stationInfoFromFile: ChargingStationInfo = this.getStationInfoFromFile();
+    if (stationInfoFromFile?.hash === stationInfoFromTemplate.hash) {
+      return stationInfoFromFile;
+    }
+    return stationInfoFromTemplate;
+  }
+
+  private saveStationInfo(): void {
+    this.saveConfiguration(Section.stationInfo);
+  }
+
   private getOcppVersion(): OCPPVersion {
     return this.stationInfo.ocppVersion ? this.stationInfo.ocppVersion : OCPPVersion.VERSION_16;
   }
@@ -835,54 +881,59 @@ export default class ChargingStation {
 
   private handleUnsupportedVersion(version: OCPPVersion) {
     const errMsg = `${this.logPrefix()} Unsupported protocol version '${version}' configured in template file ${
-      this.stationTemplateFile
+      this.templateFile
     }`;
     logger.error(errMsg);
     throw new Error(errMsg);
   }
 
-  private initialize(): void {
-    this.stationInfo = this.buildStationInfo();
-    this.bootNotificationRequest = {
-      chargePointModel: this.stationInfo.chargePointModel,
-      chargePointVendor: this.stationInfo.chargePointVendor,
-      ...(!Utils.isUndefined(this.stationInfo.chargeBoxSerialNumber) && {
-        chargeBoxSerialNumber: this.stationInfo.chargeBoxSerialNumber,
+  private createBootNotificationRequest(stationInfo: ChargingStationInfo): BootNotificationRequest {
+    return {
+      chargePointModel: stationInfo.chargePointModel,
+      chargePointVendor: stationInfo.chargePointVendor,
+      ...(!Utils.isUndefined(stationInfo.chargeBoxSerialNumber) && {
+        chargeBoxSerialNumber: stationInfo.chargeBoxSerialNumber,
       }),
-      ...(!Utils.isUndefined(this.stationInfo.chargePointSerialNumber) && {
-        chargePointSerialNumber: this.stationInfo.chargePointSerialNumber,
+      ...(!Utils.isUndefined(stationInfo.chargePointSerialNumber) && {
+        chargePointSerialNumber: stationInfo.chargePointSerialNumber,
       }),
-      ...(!Utils.isUndefined(this.stationInfo.firmwareVersion) && {
-        firmwareVersion: this.stationInfo.firmwareVersion,
+      ...(!Utils.isUndefined(stationInfo.firmwareVersion) && {
+        firmwareVersion: stationInfo.firmwareVersion,
       }),
-      ...(!Utils.isUndefined(this.stationInfo.iccid) && { iccid: this.stationInfo.iccid }),
-      ...(!Utils.isUndefined(this.stationInfo.imsi) && { imsi: this.stationInfo.imsi }),
-      ...(!Utils.isUndefined(this.stationInfo.meterSerialNumber) && {
-        meterSerialNumber: this.stationInfo.meterSerialNumber,
+      ...(!Utils.isUndefined(stationInfo.iccid) && { iccid: stationInfo.iccid }),
+      ...(!Utils.isUndefined(stationInfo.imsi) && { imsi: stationInfo.imsi }),
+      ...(!Utils.isUndefined(stationInfo.meterSerialNumber) && {
+        meterSerialNumber: stationInfo.meterSerialNumber,
       }),
-      ...(!Utils.isUndefined(this.stationInfo.meterType) && {
-        meterType: this.stationInfo.meterType,
+      ...(!Utils.isUndefined(stationInfo.meterType) && {
+        meterType: stationInfo.meterType,
       }),
     };
-    this.hashId = crypto
+  }
+
+  private getHashId(
+    bootNotificationRequest: BootNotificationRequest,
+    chargingStationId: string
+  ): string {
+    return crypto
       .createHash(Constants.DEFAULT_HASH_ALGORITHM)
-      .update(JSON.stringify(this.bootNotificationRequest) + this.stationInfo.chargingStationId)
+      .update(JSON.stringify(bootNotificationRequest) + chargingStationId)
       .digest('hex');
+  }
+
+  private initialize(): void {
+    this.stationInfo = this.getStationInfo();
     logger.info(`${this.logPrefix()} Charging station hashId '${this.hashId}'`);
-    this.configurationFile = path.join(
-      path.resolve(__dirname, '../'),
-      'assets',
-      'configurations',
-      this.hashId + '.json'
-    );
-    this.configuration = this.getConfiguration();
+    this.bootNotificationRequest = this.createBootNotificationRequest(this.stationInfo);
+    this.ocppConfiguration = this.getOcppConfiguration();
     delete this.stationInfo.Configuration;
+    this.saveStationInfo();
     // Build connectors if needed
     const maxConnectors = this.getMaxNumberOfConnectors();
     if (maxConnectors <= 0) {
       logger.warn(
         `${this.logPrefix()} Charging station template ${
-          this.stationTemplateFile
+          this.templateFile
         } with ${maxConnectors} connectors`
       );
     }
@@ -890,14 +941,14 @@ export default class ChargingStation {
     if (templateMaxConnectors <= 0) {
       logger.warn(
         `${this.logPrefix()} Charging station template ${
-          this.stationTemplateFile
+          this.templateFile
         } with no connector configuration`
       );
     }
     if (!this.stationInfo.Connectors[0]) {
       logger.warn(
         `${this.logPrefix()} Charging station template ${
-          this.stationTemplateFile
+          this.templateFile
         } with no connector Id 0 configuration`
       );
     }
@@ -909,7 +960,7 @@ export default class ChargingStation {
     ) {
       logger.warn(
         `${this.logPrefix()} Number of connectors exceeds the number of connector configurations in template ${
-          this.stationTemplateFile
+          this.templateFile
         }, forcing random connector configurations affectation`
       );
       this.stationInfo.randomConnectors = true;
@@ -972,8 +1023,8 @@ export default class ChargingStation {
     this.wsConfiguredConnectionUrl = new URL(
       this.getConfiguredSupervisionUrl().href + '/' + this.stationInfo.chargingStationId
     );
-    // OCPP parameters
-    this.initOcppParameters();
+    // OCPP configuration
+    this.initializeOcppConfiguration();
     switch (this.getOcppVersion()) {
       case OCPPVersion.VERSION_16:
         this.ocppIncomingRequestService =
@@ -1004,7 +1055,7 @@ export default class ChargingStation {
     }
   }
 
-  private initOcppParameters(): void {
+  private initializeOcppConfiguration(): void {
     if (
       this.getSupervisionUrlOcppConfiguration() &&
       !this.getConfigurationKey(this.getSupervisionUrlOcppKey())
@@ -1075,20 +1126,12 @@ export default class ChargingStation {
         Constants.DEFAULT_CONNECTION_TIMEOUT.toString()
       );
     }
-    this.saveConfiguration();
+    this.saveOcppConfiguration();
   }
 
-  private getConfigurationFromTemplate(): ChargingStationConfiguration {
-    return this.stationInfo.Configuration ?? ({} as ChargingStationConfiguration);
-  }
-
-  private getConfigurationFromFile(): ChargingStationConfiguration | null {
+  private getConfigurationFromFile(): ChargingStationConfiguration {
     let configuration: ChargingStationConfiguration = null;
-    if (
-      this.getOcppPersistentConfiguration() &&
-      this.configurationFile &&
-      fs.existsSync(this.configurationFile)
-    ) {
+    if (this.configurationFile && fs.existsSync(this.configurationFile)) {
       try {
         configuration = JSON.parse(
           fs.readFileSync(this.configurationFile, 'utf8')
@@ -1105,40 +1148,72 @@ export default class ChargingStation {
     return configuration;
   }
 
-  private saveConfiguration(): void {
-    if (this.getOcppPersistentConfiguration()) {
-      if (this.configurationFile) {
-        try {
-          if (!fs.existsSync(path.dirname(this.configurationFile))) {
-            fs.mkdirSync(path.dirname(this.configurationFile), { recursive: true });
-          }
-          const fileDescriptor = fs.openSync(this.configurationFile, 'w');
-          fs.writeFileSync(fileDescriptor, JSON.stringify(this.configuration, null, 2));
-          fs.closeSync(fileDescriptor);
-        } catch (error) {
-          FileUtils.handleFileException(
-            this.logPrefix(),
-            FileType.ChargingStationConfiguration,
-            this.configurationFile,
-            error as NodeJS.ErrnoException
-          );
+  private saveConfiguration(section?: Section): void {
+    if (this.configurationFile) {
+      try {
+        const configurationData: ChargingStationConfiguration =
+          this.getConfigurationFromFile() ?? {};
+        if (!fs.existsSync(path.dirname(this.configurationFile))) {
+          fs.mkdirSync(path.dirname(this.configurationFile), { recursive: true });
         }
-      } else {
-        logger.error(
-          `${this.logPrefix()} Trying to save charging station configuration to undefined file`
+        switch (section) {
+          case Section.ocppConfiguration:
+            configurationData.configurationKey = this.ocppConfiguration.configurationKey;
+            break;
+          case Section.stationInfo:
+            configurationData.stationInfo = this.stationInfo;
+            break;
+          default:
+            configurationData.configurationKey = this.ocppConfiguration.configurationKey;
+            configurationData.stationInfo = this.stationInfo;
+            break;
+        }
+        const fileDescriptor = fs.openSync(this.configurationFile, 'w');
+        fs.writeFileSync(fileDescriptor, JSON.stringify(configurationData, null, 2), 'utf8');
+        fs.closeSync(fileDescriptor);
+      } catch (error) {
+        FileUtils.handleFileException(
+          this.logPrefix(),
+          FileType.ChargingStationConfiguration,
+          this.configurationFile,
+          error as NodeJS.ErrnoException
         );
       }
+    } else {
+      logger.error(
+        `${this.logPrefix()} Trying to save charging station configuration to undefined file`
+      );
     }
   }
 
-  private getConfiguration(): ChargingStationConfiguration {
-    let configuration: ChargingStationConfiguration = this.getConfigurationFromFile();
-    if (!configuration) {
-      configuration = this.getConfigurationFromTemplate();
+  private getOcppConfigurationFromTemplate(): ChargingStationOcppConfiguration {
+    return this.getTemplateFromFile().Configuration ?? ({} as ChargingStationOcppConfiguration);
+  }
+
+  private getOcppConfigurationFromFile(): ChargingStationOcppConfiguration | null {
+    let configuration: ChargingStationConfiguration = null;
+    if (this.getOcppPersistentConfiguration()) {
+      configuration =
+        this.getConfigurationFromFile()?.configurationKey && this.getConfigurationFromFile();
     }
+    configuration && delete configuration.stationInfo;
     return configuration;
   }
 
+  private getOcppConfiguration(): ChargingStationOcppConfiguration {
+    let ocppConfiguration: ChargingStationOcppConfiguration = this.getOcppConfigurationFromFile();
+    if (!ocppConfiguration) {
+      ocppConfiguration = this.getOcppConfigurationFromTemplate();
+    }
+    return ocppConfiguration;
+  }
+
+  private saveOcppConfiguration(): void {
+    if (this.getOcppPersistentConfiguration()) {
+      this.saveConfiguration(Section.ocppConfiguration);
+    }
+  }
+
   private async onOpen(): Promise<void> {
     logger.info(
       `${this.logPrefix()} Connected to OCPP server through ${this.wsConnectionUrl.toString()}`
@@ -1367,9 +1442,7 @@ export default class ChargingStation {
       }
     } else {
       logger.info(
-        this.logPrefix() +
-          ' No authorization file given in template file ' +
-          this.stationTemplateFile
+        this.logPrefix() + ' No authorization file given in template file ' + this.templateFile
       );
     }
     return authorizedTags;
@@ -1651,7 +1724,7 @@ export default class ChargingStation {
       const logPrefixStr = ` ${chargingStationId} |`;
       logger.warn(
         `${Utils.logPrefix(logPrefixStr)} Deprecated template key '${key}' usage in file '${
-          this.stationTemplateFile
+          this.templateFile
         }'${logMsgToAppend && '. ' + logMsgToAppend}`
       );
     }
@@ -1730,7 +1803,7 @@ export default class ChargingStation {
   }
 
   private openWSConnection(
-    options: ClientOptions & ClientRequestArgs = this.stationInfo.wsOptions,
+    options: WsOptions = this.stationInfo.wsOptions,
     forceCloseOpened = false
   ): void {
     options.handshakeTimeout = options?.handshakeTimeout ?? this.getConnectionTimeout() * 1000;
index 38907105c4884f7d81b6d4657a562fa41f6eef44..b4fb12cf138b2bd1cb533b033c3b85b2f21dee96 100644 (file)
@@ -265,17 +265,17 @@ export default class OCPP16IncomingRequestService extends OCPPIncomingRequestSer
     const configurationKey: OCPPConfigurationKey[] = [];
     const unknownKey: string[] = [];
     if (Utils.isEmptyArray(commandPayload.key)) {
-      for (const configuration of this.chargingStation.configuration.configurationKey) {
-        if (Utils.isUndefined(configuration.visible)) {
-          configuration.visible = true;
+      for (const key of this.chargingStation.ocppConfiguration.configurationKey) {
+        if (Utils.isUndefined(key.visible)) {
+          key.visible = true;
         }
-        if (!configuration.visible) {
+        if (!key.visible) {
           continue;
         }
         configurationKey.push({
-          key: configuration.key,
-          readonly: configuration.readonly,
-          value: configuration.value,
+          key: key.key,
+          readonly: key.readonly,
+          value: key.value,
         });
       }
     } else {
index 659fc85a1063175d29aafa738268b96da69baeba..1fb8e750530d248aaa71b95317c047f52531f4dc 100644 (file)
@@ -272,7 +272,7 @@ export class OCPP16ServiceUtils {
         powerSampledValueTemplate.measurand ??
         OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
       }: Unknown ${chargingStation.getCurrentOutType()} currentOutType in template file ${
-        chargingStation.stationTemplateFile
+        chargingStation.templateFile
       }, cannot calculate ${
         powerSampledValueTemplate.measurand ??
         OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
@@ -449,7 +449,7 @@ export class OCPP16ServiceUtils {
         currentSampledValueTemplate.measurand ??
         OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
       }: Unknown ${chargingStation.getCurrentOutType()} currentOutType in template file ${
-        chargingStation.stationTemplateFile
+        chargingStation.templateFile
       }, cannot calculate ${
         currentSampledValueTemplate.measurand ??
         OCPP16MeterValueMeasurand.ENERGY_ACTIVE_IMPORT_REGISTER
index 2e255f25f1d119bef9724bce77706aec3f38f08e..ab4b45df2904292bed3a58f7c3a5695121c35f60 100644 (file)
@@ -1,11 +1,11 @@
-import { JsonType } from './JsonType';
-import { OCPPConfigurationKey } from './ocpp/Configuration';
+import { ChargingStationInfoConfiguration } from './ChargingStationInfo';
+import ChargingStationOcppConfiguration from './ChargingStationOcppConfiguration';
 
-export interface ConfigurationKey extends OCPPConfigurationKey {
-  visible?: boolean;
-  reboot?: boolean;
+export enum Section {
+  ocppConfiguration,
+  stationInfo,
 }
 
-export default interface ChargingStationConfiguration extends JsonType {
-  configurationKey: ConfigurationKey[];
-}
+export default interface ChargingStationConfiguration
+  extends ChargingStationInfoConfiguration,
+    ChargingStationOcppConfiguration {}
index 28895067edf6adb954291fc097d90b872098b3aa..cc7d1e3bac9197e2332ddc302b9eef3584772142 100644 (file)
@@ -7,3 +7,7 @@ export default interface ChargingStationInfo extends ChargingStationTemplate {
   maxPower?: number; // Always in Watt
   powerDivider?: number;
 }
+
+export interface ChargingStationInfoConfiguration {
+  stationInfo?: ChargingStationInfo;
+}
diff --git a/src/types/ChargingStationOcppConfiguration.ts b/src/types/ChargingStationOcppConfiguration.ts
new file mode 100644 (file)
index 0000000..a1da931
--- /dev/null
@@ -0,0 +1,10 @@
+import { OCPPConfigurationKey } from './ocpp/Configuration';
+
+export interface ConfigurationKey extends OCPPConfigurationKey {
+  visible?: boolean;
+  reboot?: boolean;
+}
+
+export default interface ChargingStationOcppConfiguration {
+  configurationKey?: ConfigurationKey[];
+}
index d61ce81f977124325c2d8d46a0174a0a17263a54..65a7ad6fdd1a356c93df055f7abbedcea10ed687 100644 (file)
@@ -1,4 +1,4 @@
-import ChargingStationConfiguration from './ChargingStationConfiguration';
+import ChargingStationOcppConfiguration from './ChargingStationOcppConfiguration';
 import { ClientOptions } from 'ws';
 import { ClientRequestArgs } from 'http';
 import { ConnectorStatus } from './ConnectorStatus';
@@ -34,7 +34,10 @@ export interface AutomaticTransactionGenerator {
   requireAuthorize?: boolean;
 }
 
+export type WsOptions = ClientOptions & ClientRequestArgs;
+
 export default interface ChargingStationTemplate {
+  hash?: string;
   supervisionUrls?: string | string[];
   supervisionUrlOcppConfiguration?: boolean;
   supervisionUrlOcppKey?: string;
@@ -44,7 +47,7 @@ export default interface ChargingStationTemplate {
   ocppProtocol?: OCPPProtocol;
   ocppStrictCompliance?: boolean;
   ocppPersistentConfiguration?: boolean;
-  wsOptions?: ClientOptions & ClientRequestArgs;
+  wsOptions?: WsOptions;
   authorizationFile?: string;
   baseName: string;
   nameSuffix?: string;
@@ -80,7 +83,7 @@ export default interface ChargingStationTemplate {
   transactionDataMeterValues?: boolean;
   mainVoltageMeterValues?: boolean;
   phaseLineToLineVoltageMeterValues?: boolean;
-  Configuration?: ChargingStationConfiguration;
+  Configuration?: ChargingStationOcppConfiguration;
   AutomaticTransactionGenerator: AutomaticTransactionGenerator;
   Connectors: Record<string, ConnectorStatus>;
 }
index 7b29427030e4b73eedb7c75ffccb41c7993fa7ab..9ab2582d140d54ddb068aaac229aeba9577734b1 100644 (file)
@@ -162,7 +162,7 @@ export default class Configuration {
     Configuration.warnDeprecatedConfigurationKey(
       'useWorkerPool',
       null,
-      "Use 'workerProcess' to define the type of worker process to use instead"
+      "Use 'workerProcess' to define the type of worker process model to use instead"
     );
     return Configuration.objectHasOwnProperty(Configuration.getConfig(), 'workerProcess')
       ? Configuration.getConfig().workerProcess