refactor(ocpp16): track diagnosticsStatus and extract composite schedule helper

- Add diagnosticsStatus to ChargingStationInfo, set at each
  DiagnosticsStatusNotification send point (Uploading, Uploaded,
  UploadFailed). TriggerMessage now reports actual diagnostics status
  instead of hardcoded Idle, mirroring the firmwareStatus pattern.

- Extract composeCompositeSchedule() private method, eliminating
  ~120 lines of duplicated profile preparation logic between the
  connectorId=0 and connectorId>0 branches of GetCompositeSchedule.

diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index 39dace1b34feb56bc7157f9fa273ec41a1ef0da8..5d74632c3c5b965ee85d4a90ceb31bed17f42320 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -33,6 +33,7 @@ import {
   type ChangeConfigurationResponse,
   type ClearCacheResponse,
   ConfigurationSection,
+  type ConnectorStatus,
   ErrorType,
   type GenericResponse,
   GenericStatus,
@@ -364,7 +365,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                 chargingStation,
                 OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION,
                 {
-                  status: OCPP16DiagnosticsStatus.Idle,
+                  status:
+                    chargingStation.stationInfo?.diagnosticsStatus ?? OCPP16DiagnosticsStatus.Idle,
                 },
                 {
                   triggerMessage: true,
@@ -620,6 +622,74 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     /* no-op for OCPP 1.6 */
   }
 
+  private composeCompositeSchedule (
+    chargingStation: ChargingStation,
+    chargingProfiles: OCPP16ChargingProfile[],
+    duration: number,
+    connectorStatus: ConnectorStatus | undefined
+  ): OCPP16ChargingSchedule | undefined {
+    const currentDate = new Date()
+    const compositeScheduleInterval: Interval = {
+      end: addSeconds(currentDate, duration),
+      start: currentDate,
+    }
+    let previousCompositeSchedule: OCPP16ChargingSchedule | undefined
+    let compositeSchedule: OCPP16ChargingSchedule | undefined
+    for (const chargingProfile of chargingProfiles) {
+      if (chargingProfile.chargingSchedule.startSchedule == null) {
+        logger.debug(
+          `${chargingStation.logPrefix()} ${moduleName}.composeCompositeSchedule: Charging profile id ${chargingProfile.chargingProfileId.toString()} has no startSchedule defined. Trying to set it to the ${connectorStatus != null ? 'connector current transaction start date' : 'current date'}`
+        )
+        chargingProfile.chargingSchedule.startSchedule =
+          connectorStatus != null ? connectorStatus.transactionStart : currentDate
+      }
+      if (!isDate(chargingProfile.chargingSchedule.startSchedule)) {
+        logger.warn(
+          `${chargingStation.logPrefix()} ${moduleName}.composeCompositeSchedule: Charging profile id ${chargingProfile.chargingProfileId.toString()} startSchedule property is not a Date instance. Trying to convert it to a Date instance`
+        )
+        chargingProfile.chargingSchedule.startSchedule = convertToDate(
+          chargingProfile.chargingSchedule.startSchedule
+        )
+      }
+      if (chargingProfile.chargingSchedule.duration == null) {
+        logger.debug(
+          `${chargingStation.logPrefix()} ${moduleName}.composeCompositeSchedule: Charging profile id ${chargingProfile.chargingProfileId.toString()} has no duration defined and will be set to the maximum time allowed`
+        )
+        chargingProfile.chargingSchedule.duration = differenceInSeconds(
+          maxTime,
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          chargingProfile.chargingSchedule.startSchedule!
+        )
+      }
+      if (
+        !prepareChargingProfileKind(
+          connectorStatus,
+          chargingProfile,
+          compositeScheduleInterval.start,
+          chargingStation.logPrefix()
+        )
+      ) {
+        continue
+      }
+      if (
+        !canProceedChargingProfile(
+          chargingProfile,
+          compositeScheduleInterval.start,
+          chargingStation.logPrefix()
+        )
+      ) {
+        continue
+      }
+      compositeSchedule = OCPP16ServiceUtils.composeChargingSchedules(
+        previousCompositeSchedule,
+        chargingProfile.chargingSchedule,
+        compositeScheduleInterval
+      )
+      previousCompositeSchedule = compositeSchedule
+    }
+    return compositeSchedule
+  }
+
   private async handleRequestCancelReservation (
     chargingStation: ChargingStation,
     commandPayload: OCPP16CancelReservationRequest
@@ -956,64 +1026,12 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       if (allChargingProfiles.length === 0) {
         return OCPP16Constants.OCPP_RESPONSE_REJECTED
       }
-      const currentDate = new Date()
-      const compositeScheduleInterval: Interval = {
-        end: addSeconds(currentDate, duration),
-        start: currentDate,
-      }
-      let previousCompositeSchedule: OCPP16ChargingSchedule | undefined
-      let compositeSchedule: OCPP16ChargingSchedule | undefined
-      for (const chargingProfile of allChargingProfiles) {
-        if (chargingProfile.chargingSchedule.startSchedule == null) {
-          logger.debug(
-            `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${chargingProfile.chargingProfileId.toString()} has no startSchedule defined. Trying to set it to the current date`
-          )
-          chargingProfile.chargingSchedule.startSchedule = currentDate
-        }
-        if (!isDate(chargingProfile.chargingSchedule.startSchedule)) {
-          logger.warn(
-            `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${chargingProfile.chargingProfileId.toString()} startSchedule property is not a Date instance. Trying to convert it to a Date instance`
-          )
-          chargingProfile.chargingSchedule.startSchedule = convertToDate(
-            chargingProfile.chargingSchedule.startSchedule
-          )
-        }
-        if (chargingProfile.chargingSchedule.duration == null) {
-          logger.debug(
-            `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${chargingProfile.chargingProfileId.toString()} has no duration defined and will be set to the maximum time allowed`
-          )
-          chargingProfile.chargingSchedule.duration = differenceInSeconds(
-            maxTime,
-            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            chargingProfile.chargingSchedule.startSchedule!
-          )
-        }
-        if (
-          !prepareChargingProfileKind(
-            undefined,
-            chargingProfile,
-            compositeScheduleInterval.start,
-            chargingStation.logPrefix()
-          )
-        ) {
-          continue
-        }
-        if (
-          !canProceedChargingProfile(
-            chargingProfile,
-            compositeScheduleInterval.start,
-            chargingStation.logPrefix()
-          )
-        ) {
-          continue
-        }
-        compositeSchedule = OCPP16ServiceUtils.composeChargingSchedules(
-          previousCompositeSchedule,
-          chargingProfile.chargingSchedule,
-          compositeScheduleInterval
-        )
-        previousCompositeSchedule = compositeSchedule
-      }
+      const compositeSchedule = this.composeCompositeSchedule(
+        chargingStation,
+        allChargingProfiles,
+        duration,
+        undefined
+      )
       if (compositeSchedule != null) {
         return {
           chargingSchedule: compositeSchedule,
@@ -1036,70 +1054,16 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
     ) {
       return OCPP16Constants.OCPP_RESPONSE_REJECTED
     }
-    const currentDate = new Date()
-    const compositeScheduleInterval: Interval = {
-      end: addSeconds(currentDate, duration),
-      start: currentDate,
-    }
     const chargingProfiles = getConnectorChargingProfiles(
       chargingStation,
       connectorId
     ) as OCPP16ChargingProfile[]
-    let previousCompositeSchedule: OCPP16ChargingSchedule | undefined
-    let compositeSchedule: OCPP16ChargingSchedule | undefined
-    for (const chargingProfile of chargingProfiles) {
-      if (chargingProfile.chargingSchedule.startSchedule == null) {
-        logger.debug(
-          `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${chargingProfile.chargingProfileId.toString()} has no startSchedule defined. Trying to set it to the connector current transaction start date`
-        )
-        // OCPP specifies that if startSchedule is not defined, it should be relative to start of the connector transaction
-        chargingProfile.chargingSchedule.startSchedule = connectorStatus?.transactionStart
-      }
-      if (!isDate(chargingProfile.chargingSchedule.startSchedule)) {
-        logger.warn(
-          `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${chargingProfile.chargingProfileId.toString()} startSchedule property is not a Date instance. Trying to convert it to a Date instance`
-        )
-        chargingProfile.chargingSchedule.startSchedule = convertToDate(
-          chargingProfile.chargingSchedule.startSchedule
-        )
-      }
-      if (chargingProfile.chargingSchedule.duration == null) {
-        logger.debug(
-          `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetCompositeSchedule: Charging profile id ${chargingProfile.chargingProfileId.toString()} has no duration defined and will be set to the maximum time allowed`
-        )
-        // OCPP specifies that if duration is not defined, it should be infinite
-        chargingProfile.chargingSchedule.duration = differenceInSeconds(
-          maxTime,
-          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-          chargingProfile.chargingSchedule.startSchedule!
-        )
-      }
-      if (
-        !prepareChargingProfileKind(
-          connectorStatus,
-          chargingProfile,
-          compositeScheduleInterval.start,
-          chargingStation.logPrefix()
-        )
-      ) {
-        continue
-      }
-      if (
-        !canProceedChargingProfile(
-          chargingProfile,
-          compositeScheduleInterval.start,
-          chargingStation.logPrefix()
-        )
-      ) {
-        continue
-      }
-      compositeSchedule = OCPP16ServiceUtils.composeChargingSchedules(
-        previousCompositeSchedule,
-        chargingProfile.chargingSchedule,
-        compositeScheduleInterval
-      )
-      previousCompositeSchedule = compositeSchedule
-    }
+    const compositeSchedule = this.composeCompositeSchedule(
+      chargingStation,
+      chargingProfiles,
+      duration,
+      connectorStatus
+    )
     if (compositeSchedule != null) {
       return {
         chargingSchedule: compositeSchedule,
@@ -1203,6 +1167,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
                 info.bytes / 1024
               ).toString()} bytes transferred from diagnostics archive ${info.name}`
             )
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            chargingStation.stationInfo!.diagnosticsStatus = OCPP16DiagnosticsStatus.Uploading
             chargingStation.ocppRequestService
               .requestHandler<
                 OCPP16DiagnosticsStatusNotificationRequest,
@@ -1230,6 +1196,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
             >(chargingStation, OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
               status: OCPP16DiagnosticsStatus.Uploaded,
             })
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            chargingStation.stationInfo!.diagnosticsStatus = OCPP16DiagnosticsStatus.Uploaded
             ftpClient.close()
             return { fileName: diagnosticsArchive }
           }
@@ -1252,6 +1220,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         >(chargingStation, OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
           status: OCPP16DiagnosticsStatus.UploadFailed,
         })
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        chargingStation.stationInfo!.diagnosticsStatus = OCPP16DiagnosticsStatus.UploadFailed
         ftpClient?.close()
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return handleIncomingRequestError<GetDiagnosticsResponse>(
@@ -1273,6 +1243,8 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
       >(chargingStation, OCPP16RequestCommand.DIAGNOSTICS_STATUS_NOTIFICATION, {
         status: OCPP16DiagnosticsStatus.UploadFailed,
       })
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      chargingStation.stationInfo!.diagnosticsStatus = OCPP16DiagnosticsStatus.UploadFailed
       return OCPP16Constants.OCPP_RESPONSE_EMPTY
     }
   }

diff --git a/src/types/ChargingStationInfo.ts b/src/types/ChargingStationInfo.ts
index 09550060a38f9fd344f8a799c616ecb6895ae803..f92743b98ef1ea154ddb63c14df364938df077d9 100644 (file)
--- a/src/types/ChargingStationInfo.ts
+++ b/src/types/ChargingStationInfo.ts
@@ -1,5 +1,5 @@
 import type { ChargingStationTemplate } from './ChargingStationTemplate.js'
-import type { FirmwareStatus } from './ocpp/Requests.js'
+import type { DiagnosticsStatus, FirmwareStatus } from './ocpp/Requests.js'
 
 export type ChargingStationInfo = Omit<
   ChargingStationTemplate,
@@ -17,6 +17,7 @@ export type ChargingStationInfo = Omit<
   chargeBoxSerialNumber?: string
   chargePointSerialNumber?: string
   chargingStationId?: string
+  diagnosticsStatus?: DiagnosticsStatus
   firmwareStatus?: FirmwareStatus
   hashId: string
   /** @deprecated Use `hashId` instead. */