refactor: project-wide audit of helper/util usage in src/ + OCPP 2.0.1 §F01.FR.13...

author Jérôme Benoit <jerome.benoit@piment-noir.org>

Mon, 29 Jun 2026 22:34:53 +0000 (00:34 +0200)

committer GitHub <noreply@github.com>

Mon, 29 Jun 2026 22:34:53 +0000 (00:34 +0200)
author Jérôme Benoit <jerome.benoit@piment-noir.org>
Mon, 29 Jun 2026 22:34:53 +0000 (00:34 +0200)
committer GitHub <noreply@github.com>
Mon, 29 Jun 2026 22:34:53 +0000 (00:34 +0200)
diff --git a/README.md b/README.md

index 03b2830fba49bc584596dcdf8f7c211fe654a4ba..57d694f03a19f849d27801f94542d6502e0e9bc8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -183,7 +183,7 @@ But the modifications to test have to be done to the files in the build target d
  | uiServer                   |                                              | {<br />"enabled": false,<br />"type": "ws",<br />"version": "1.1",<br />"accessPolicy": {<br />"requireTlsForNonLoopback": true,<br />"trustedProxies": [],<br />"allowLoopbackProxy": false,<br />"allowedHosts": [],<br />"allowedOrigins": []<br />},<br />"options": {<br />"host": "localhost",<br />"port": 8080<br />}<br />} | {<br />enabled?: boolean;<br />type?: ApplicationProtocol;<br />version?: ApplicationProtocolVersion;<br />accessPolicy?: {<br />requireTlsForNonLoopback?: boolean;<br />trustedProxies?: string[];<br />allowLoopbackProxy?: boolean;<br />allowedHosts?: string[];<br />allowedOrigins?: string[];<br />};<br />options?: ServerOptions;<br />authentication?: {<br />enabled: boolean;<br />type: AuthenticationType;<br />username?: string;<br />password?: string;<br />};<br />metrics?: {<br />enabled?: boolean;<br />softSampleCap?: number;<br />};<br />} | UI server configuration section:<br />- _enabled_: enable UI server<br />- _type_: 'ws', 'mcp' or 'http' (deprecated)<br />- _version_: HTTP version '1.1' or '2.0' (ws and mcp transports only support '1.1')<br />- _accessPolicy_: gateway access policy. Loopback request sources are allowed in plaintext; non-loopback sources require TLS termination by a reverse proxy:<br />&nbsp;&nbsp;- _requireTlsForNonLoopback_: reject non-loopback plaintext requests; the check honors `X-Forwarded-Proto` or `Forwarded: proto=` from a trusted proxy, non-loopback requests without forwarded protocol headers are denied as `tls-required`<br />&nbsp;&nbsp;- _trustedProxies_: IPv4 or IPv6 literals of the immediate reverse proxies whose forwarded headers are honored (hostnames and CIDR ranges are not accepted; only single-hop forwarded chains are honored); a compromised entry can bypass per-client rate limiting by varying `X-Forwarded-For`<br />&nbsp;&nbsp;- _allowLoopbackProxy_: accept forwarded headers when the immediate peer is loopback AND listed in _trustedProxies_ (e.g. `['127.0.0.1', '::1']`)<br />&nbsp;&nbsp;- _allowedHosts_: explicit Host header allowlist; mitigates DNS rebinding when the UI server is exposed through a browser-facing host<br />&nbsp;&nbsp;- _allowedOrigins_: explicit Origin header allowlist; when empty, the request Origin's URL hostname falls back to matching against _allowedHosts_<br />- _options_: node.js net module [listen options](https://nodejs.org/api/net.html#serverlistenoptions-callback)<br />- _authentication_: authentication type configuration section<br />- _metrics_: opt-in Prometheus `/metrics` endpoint (served on the configured `uiServer.type` listener — `http`, `ws` or `mcp`):<br />&nbsp;&nbsp;- _enabled_: enable the `/metrics` endpoint<br />&nbsp;&nbsp;- _softSampleCap_: soft cardinality cap above which a single warn is logged per scrape (default 5000) |
  | performanceStorage         |                                              | {<br />"enabled": true,<br />"type": "none",<br />}                                                                                                                                                                                                                                                                                  | {<br />enabled?: boolean;<br />type?: string;<br />uri?: string;<br />}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | Performance storage configuration section:<br />- _enabled_: enable performance storage<br />- _type_: 'jsonfile', 'mongodb' or 'none'<br />- _uri_: storage URI                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
  | stationTemplateUrls        |                                              | {}[]                                                                                                                                                                                                                                                                                                                                 | {<br />file: string;<br />numberOfStations: number;<br />provisionedNumberOfStations?: number;<br />}[]                                                                                                                                                                                                                                                                                                                                                                                                                                                                | array of charging station templates URIs configuration section:<br />- _file_: charging station configuration template file relative path<br />- _numberOfStations_: template number of stations at startup<br />- _provisionedNumberOfStations_: template provisioned number of stations after startup                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| persistState               | true/false                                   | true                                                                                                                                                                                                                                                                                                                                 | boolean                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | persist the simulator stopped state to `dist/assets/configurations/.simulator-state.json`. On the next process startup, if the simulator was stopped via the UI procedure `stopSimulator`, charging stations are not auto-spawned and the user can recover via the `startSimulator` procedure. Signal-driven shutdowns (SIGINT/SIGTERM/SIGQUIT) and configuration-reload restarts do not modify the persisted state. The feature requires `uiServer.enabled` to be `true`; otherwise it is silently ignored (no recovery channel without UI). Set the environment variable `SIMULATOR_COLD_START=true` for one run to ignore the persisted state and force a cold start. UI-added charging stations beyond `numberOfStations` are not auto-respawned                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
+| persistState               | true/false                                   | true                                                                                                                                                                                                                                                                                                                                 | boolean                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                | persist the simulator stopped state to `dist/assets/configurations/.simulator-state.json`. On the next process startup, if the simulator was stopped via the UI procedure `stopSimulator`, charging stations are not auto-spawned and the user can recover via the `startSimulator` procedure. Signal-driven shutdowns (SIGINT/SIGTERM/SIGQUIT) and configuration-reload restarts do not modify the persisted state. The feature requires `uiServer.enabled` to be `true`; otherwise it is silently ignored (no recovery channel without UI). Set the environment variable `SIMULATOR_COLD_START` to a truthy value (case-insensitive `true` or `1`, optionally surrounded by whitespace) for one run to ignore the persisted state and force a cold start. UI-added charging stations beyond `numberOfStations` are not auto-respawned                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
  
  #### Worker process model
  
diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts

index 76141b9842026dd73502c03434b43d59794e2354..ea25f0e17e63fa61b9f4c47eb8c8e2a8e68fca85 100644 (file)
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -13,7 +13,7 @@ import type { IBootstrap } from './IBootstrap.js'
  import type { AbstractUIServer } from './ui-server/AbstractUIServer.js'
  
  import packageJson from '../../package.json' with { type: 'json' }
-import { BaseError } from '../exception/index.js'
+import { BaseError, TimeoutError } from '../exception/index.js'
  import { type Storage, StorageFactory } from '../performance/index.js'
  import {
    type ChargingStationData,
@@ -24,6 +24,7 @@ import {
    type ChargingStationWorkerMessageData,
    ChargingStationWorkerMessageEvents,
    ConfigurationSection,
+  MapStringifyFormat,
    ProcedureName,
    type SimulatorState,
    type Statistics,
@@ -35,15 +36,18 @@ import {
  import {
    Configuration,
    Constants,
+  convertToBoolean,
    formatDurationMilliSeconds,
    generateUUID,
    handleUncaughtException,
    handleUnhandledRejection,
    isAsyncFunction,
    isNotEmptyArray,
+  JSONStringify,
    logger,
    logPrefix,
    once,
+  promiseWithTimeout,
  } from '../utils/index.js'
  import {
    DEFAULT_ELEMENTS_PER_WORKER,
@@ -133,7 +137,7 @@ export class Bootstrap extends EventEmitter implements IBootstrap {
    }
  
    private get persistStateEnabled (): boolean {
-    if (env[Constants.ENV_SIMULATOR_COLD_START] === 'true') {
+    if (convertToBoolean(env[Constants.ENV_SIMULATOR_COLD_START])) {
        return false
      }
      if (!Configuration.getPersistState()) {
@@ -643,11 +647,7 @@ export class Bootstrap extends EventEmitter implements IBootstrap {
            break
          default:
            throw new BaseError(
-            `Unknown charging station worker message event: '${event as string}' received with data: ${JSON.stringify(
-              data,
-              undefined,
-              2
-            )}`
+            `Unknown charging station worker message event: '${event as string}' received with data: ${JSONStringify(data, 2, MapStringifyFormat.object)}`
            )
        }
      } catch (error) {
@@ -699,30 +699,29 @@ export class Bootstrap extends EventEmitter implements IBootstrap {
    }
  
    private async waitChargingStationsStopped (): Promise<string> {
-    return await new Promise<string>((resolve, reject: (reason?: unknown) => void) => {
-      const waitTimeout = setTimeout(() => {
-        const timeoutMessage = `Timeout ${formatDurationMilliSeconds(
-          Constants.STOP_CHARGING_STATIONS_TIMEOUT_MS
-        )} reached at stopping charging stations`
+    const timeoutError = new TimeoutError(
+      `Timeout ${formatDurationMilliSeconds(Constants.STOP_CHARGING_STATIONS_TIMEOUT_MS)} reached at stopping charging stations`
+    )
+    try {
+      await promiseWithTimeout(
+        waitChargingStationEvents(
+          this,
+          ChargingStationWorkerMessageEvents.stopped,
+          this.numberOfStartedChargingStations
+        ),
+        Constants.STOP_CHARGING_STATIONS_TIMEOUT_MS,
+        timeoutError
+      )
+      return 'Charging stations stopped'
+    } catch (error) {
+      if (error instanceof TimeoutError) {
          logger.warn(
-          `${this.logPrefix()} ${moduleName}.waitChargingStationsStopped: ${timeoutMessage}`
+          `${this.logPrefix()} ${moduleName}.waitChargingStationsStopped: ${error.message}`
          )
-        reject(new BaseError(timeoutMessage))
-      }, Constants.STOP_CHARGING_STATIONS_TIMEOUT_MS)
-      waitChargingStationEvents(
-        this,
-        ChargingStationWorkerMessageEvents.stopped,
-        this.numberOfStartedChargingStations
-      )
-        .then(events => {
-          resolve('Charging stations stopped')
-          return events
-        })
-        .finally(() => {
-          clearTimeout(waitTimeout)
-        })
-        .catch(reject)
-    })
+      }
+      // Non-TimeoutError errors propagate without logging (handled by the caller).
+      throw error
+    }
    }
  
    private readonly workerEventAdded = (data: ChargingStationData): void => {
diff --git a/src/charging-station/BootstrapStateUtils.ts b/src/charging-station/BootstrapStateUtils.ts

index e33b7686b88b4d4af852c14e1422d5eb80b6e76c..958448400a27f120ff188fcd570f6e3e27446a7f 100644 (file)
--- a/src/charging-station/BootstrapStateUtils.ts
+++ b/src/charging-station/BootstrapStateUtils.ts
@@ -13,6 +13,7 @@ import {
    ensureError,
    formatLogPrefix,
    handleFileException,
+  JSONStringify,
    logger,
  } from '../utils/index.js'
  
@@ -147,7 +148,7 @@ export const writeStateFile = async (
      }
      atomicWriteFileSync(
        stateFilePath,
-      JSON.stringify(stateData, undefined, 2),
+      JSONStringify(stateData, 2),
        FileType.SimulatorState,
        logPrefixFn?.() ?? '',
        { errorParams: { throwError: false } }
diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts

index 7c7090e0eb886c00b6ba64155f74b511105e8114..e4e4af982572e7226e2ff57a4c4f408bbed011ae 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -41,6 +41,7 @@ import {
    type HeartbeatResponse,
    type IncomingRequest,
    type IncomingRequestCommand,
+  MapStringifyFormat,
    MessageType,
    MeterValueMeasurand,
    OCPPVersion,
@@ -97,6 +98,7 @@ import {
    isEmpty,
    isNotEmptyArray,
    isNotEmptyString,
+  JSONStringify,
    logger,
    logPrefix,
    mergeDeepRight,
@@ -2592,7 +2594,7 @@ export class ChargingStation extends EventEmitter {
              const beginId = PerformanceStatistics.beginMeasure(measureId)
              atomicWriteFileSync(
                this.configurationFile,
-              JSON.stringify(configurationData, undefined, 2),
+              JSONStringify(configurationData, 2, MapStringifyFormat.object),
                FileType.ChargingStationConfiguration,
                this.logPrefix()
              )
diff --git a/src/charging-station/TemplateSchema.ts b/src/charging-station/TemplateSchema.ts

index 094336b6465c10145cda488a00f052a82d172272..749f7b7e6c42189958ace3393efd10b815d4279f 100644 (file)
--- a/src/charging-station/TemplateSchema.ts
+++ b/src/charging-station/TemplateSchema.ts
@@ -1,5 +1,7 @@
  import { z } from 'zod'
  
+// Direct path: the `utils/index.js` barrel re-exports ConfigurationSchema.ts which uses Zod enums, causing a TDZ cycle.
+import { convertToIntOrNaN } from '../utils/Utils.js'
  import { CURRENT_SCHEMA_VERSION } from './TemplateMigrations.js'
  
  // ---------------------------------------------------------------
@@ -262,17 +264,25 @@ export const TemplateSchema = BaseTemplateSchema.superRefine((template, ctx) =>
        path: ['Connectors'],
      })
    }
-  // Validate Evses topology (OCPP 2.0.1 §7.2 constraints)
+  // Validate Evses topology (OCPP 2.0.1 part 1 §7.1 EVSE numbering)
    if (hasEvses && template.Evses != null) {
      for (const [evseKey, evse] of Object.entries(template.Evses)) {
-      const evseId = Number(evseKey)
+      const evseId = convertToIntOrNaN(evseKey)
+      if (!Number.isInteger(evseId) || evseId < 0) {
+        ctx.addIssue({
+          code: 'custom',
+          message: `EVSE key '${evseKey}' is not a valid non-negative integer (OCPP 2.0.1 part 1 §7.1)`,
+          path: ['Evses', evseKey],
+        })
+        continue
+      }
        const connectorIds = Object.keys(evse.Connectors).map(Number)
        if (evseId === 0) {
          for (const connectorId of connectorIds) {
            if (connectorId !== 0) {
              ctx.addIssue({
                code: 'custom',
-              message: `EVSE 0 has invalid connector id ${connectorId.toString()}, only connector id 0 is allowed (OCPP 2.0.1 §7.2)`,
+              message: `EVSE 0 has invalid connector id ${connectorId.toString()}, only connector id 0 is allowed (OCPP 2.0.1 part 1 §7.2)`,
                path: ['Evses', evseKey, 'Connectors', connectorId.toString()],
              })
            }
@@ -282,7 +292,7 @@ export const TemplateSchema = BaseTemplateSchema.superRefine((template, ctx) =>
            if (connectorId < 1) {
              ctx.addIssue({
                code: 'custom',
-              message: `EVSE ${evseId.toString()} has invalid connector id ${connectorId.toString()}, connector ids must start at 1 (OCPP 2.0.1 §7.2)`,
+              message: `EVSE ${evseId.toString()} has invalid connector id ${connectorId.toString()}, connector ids must start at 1 (OCPP 2.0.1 part 1 §7.2)`,
                path: ['Evses', evseKey, 'Connectors', connectorId.toString()],
              })
            }
diff --git a/src/charging-station/TemplateValidation.ts b/src/charging-station/TemplateValidation.ts

index 1dc2d1729ca33cb16aaf9740e7ebb96a4925dc26..15ac7dbb6f1f9c314a2234ce9a3c26341b3dcde8 100644 (file)
--- a/src/charging-station/TemplateValidation.ts
+++ b/src/charging-station/TemplateValidation.ts
@@ -3,7 +3,7 @@ import type { ZodError } from 'zod'
  import type { ChargingStationTemplate } from '../types/index.js'
  
  import { BaseError } from '../exception/index.js'
-import { isEmpty, isNotEmptyString, logger } from '../utils/index.js'
+import { assertIsJsonObject, clone, isEmpty, isNotEmptyString, logger } from '../utils/index.js'
  import { getMaxConfiguredNumberOfConnectors } from './Helpers.js'
  import { applyMigration, coerceVersion, CURRENT_SCHEMA_VERSION } from './TemplateMigrations.js'
  import { TemplateSchema } from './TemplateSchema.js'
@@ -18,6 +18,7 @@ export class TemplateValidationError extends BaseError {
    public readonly fieldErrors: { message: string; path: string }[]
    public readonly filePath: string
    public readonly migratedFrom?: number
+  public override readonly name = 'TemplateValidationError' as const
  
    public constructor (zodError: ZodError, context: { filePath: string; migratedFrom?: number }) {
      const fieldErrors = zodError.issues.map(issue => ({
@@ -47,11 +48,12 @@ export class TemplateValidationError extends BaseError {
   * @returns Validated and transformed ChargingStationTemplate
   */
  export const validateTemplate = (parsed: unknown, filePath: string): ChargingStationTemplate => {
-  if (parsed == null || typeof parsed !== 'object' || Array.isArray(parsed)) {
-    throw new BaseError(
+  assertIsJsonObject(
+    parsed,
+    new BaseError(
        `${moduleName}.validateTemplate: Invalid charging station template payload (not a JSON object) in template file ${filePath}`
      )
-  }
+  )
    if (isEmpty(parsed)) {
      throw new BaseError(
        `${moduleName}.validateTemplate: Empty charging station information from template file ${filePath}`
@@ -59,7 +61,7 @@ export const validateTemplate = (parsed: unknown, filePath: string): ChargingSta
    }
    // Clone before mutating $schemaVersion below and inside applyMigration,
    // so the caller's parsed JSON stays untouched.
-  const parsedRecord = structuredClone(parsed) as Record<string, unknown>
+  const parsedRecord = clone(parsed) as Record<string, unknown>
  
    const version = coerceVersion(parsedRecord.$schemaVersion)
    parsedRecord.$schemaVersion = version
diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts

index f65bc5acbd6e75a8d88bb1f77d20e2b84a605e33..d903904c5c26f9c831ab74e2b9d6102a7302ff50 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -698,15 +698,15 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
        )
        return OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_ACCEPTED
      } catch (error) {
+      const errorResponse: GenericResponse =
+        OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED
        return (
          handleIncomingRequestError<GenericResponse>(
            chargingStation,
            OCPP16IncomingRequestCommand.CANCEL_RESERVATION,
            ensureError(error),
-          {
-            errorResponse: OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED,
-          }
-        ) ?? OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED
+          { errorResponse }
+        ) ?? errorResponse
        )
      }
    }
@@ -782,6 +782,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
          OCPP16StandardParametersKey.WebSocketPingInterval,
        ])
        if (integerKeys.has(keyToChange.key as OCPP16StandardParametersKey)) {
+        // Number() preserved: rejection check relies on NaN-on-invalid; convertToInt would silently accept (returns 0 for null/undefined, truncates '1.5' → 1) or throw uncaught (for '', 'abc').
          const numValue = Number(value)
          if (!Number.isInteger(numValue) || numValue < 0) {
            return OCPP16Constants.OCPP_CONFIGURATION_RESPONSE_REJECTED
@@ -941,13 +942,15 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
        }
        return OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_ACCEPTED
      } catch (error) {
+      const errorResponse: OCPP16DataTransferResponse =
+        OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED
        return (
          handleIncomingRequestError<OCPP16DataTransferResponse>(
            chargingStation,
            OCPP16IncomingRequestCommand.DATA_TRANSFER,
            ensureError(error),
-          { errorResponse: OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED }
-        ) ?? OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED
+          { errorResponse }
+        ) ?? errorResponse
        )
      }
    }
@@ -1192,13 +1195,14 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
            chargingStation.stationInfo.diagnosticsStatus = OCPP16DiagnosticsStatus.UploadFailed
          }
          ftpClient?.close()
+        const errorResponse: GetDiagnosticsResponse = OCPP16Constants.OCPP_RESPONSE_EMPTY
          return (
            handleIncomingRequestError<GetDiagnosticsResponse>(
              chargingStation,
              OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
              ensureError(error),
-            { errorResponse: OCPP16Constants.OCPP_RESPONSE_EMPTY }
-          ) ?? OCPP16Constants.OCPP_RESPONSE_EMPTY
+            { errorResponse }
+          ) ?? errorResponse
          )
        }
      } else {
@@ -1450,13 +1454,15 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
        if (errorConnectorStatus != null) {
          errorConnectorStatus.status = OCPP16ChargePointStatus.Available
        }
+      const errorResponse: OCPP16ReserveNowResponse =
+        OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED
        return (
          handleIncomingRequestError<OCPP16ReserveNowResponse>(
            chargingStation,
            OCPP16IncomingRequestCommand.RESERVE_NOW,
            ensureError(error),
-          { errorResponse: OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED }
-        ) ?? OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED
+          { errorResponse }
+        ) ?? errorResponse
        )
      }
    }
diff --git a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts

index 5f3cd21bd9e5b10205abb832c5ba48d74a9d1471..2b68a6e8d2df5709739787e415cd74c85c5bee7f 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts
@@ -52,6 +52,7 @@ import {
  } from '../../../types/index.js'
  import {
    clampToSafeTimerValue,
+  convertToBoolean,
    convertToDate,
    convertToInt,
    isNotEmptyArray,
@@ -163,8 +164,7 @@ export class OCPP16ServiceUtils {
      }
      if (
        OCPP16ServiceUtils.isSigningEnabled(chargingStation) &&
-      getConfigurationKey(chargingStation, OCPP16VendorParametersKey.SampledDataSignStartedReadings)
-        ?.value === 'true'
+      OCPP16ServiceUtils.isSigningStartedReadingsEnabled(chargingStation)
      ) {
        const connectorStatus = chargingStation.getConnectorStatus(connectorId)
        const transactionId = connectorStatus?.transactionId ?? 0
@@ -673,9 +673,32 @@ export class OCPP16ServiceUtils {
     * @returns Whether signed meter value generation is enabled (SampledDataSignReadings=true)
     */
    public static isSigningEnabled (chargingStation: ChargingStation): boolean {
-    return (
-      getConfigurationKey(chargingStation, OCPP16VendorParametersKey.SampledDataSignReadings)
-        ?.value === 'true'
+    return convertToBoolean(
+      getConfigurationKey(chargingStation, OCPP16VendorParametersKey.SampledDataSignReadings)?.value
+    )
+  }
+
+  /**
+   * @param chargingStation - Target charging station
+   * @returns Whether signing of meter values at transaction start is enabled
+   *   (SampledDataSignStartedReadings=true)
+   */
+  public static isSigningStartedReadingsEnabled (chargingStation: ChargingStation): boolean {
+    return convertToBoolean(
+      getConfigurationKey(chargingStation, OCPP16VendorParametersKey.SampledDataSignStartedReadings)
+        ?.value
+    )
+  }
+
+  /**
+   * @param chargingStation - Target charging station
+   * @returns Whether signing of meter values during transaction updates is enabled
+   *   (SampledDataSignUpdatedReadings=true)
+   */
+  public static isSigningUpdatedReadingsEnabled (chargingStation: ChargingStation): boolean {
+    return convertToBoolean(
+      getConfigurationKey(chargingStation, OCPP16VendorParametersKey.SampledDataSignUpdatedReadings)
+        ?.value
      )
    }
  
@@ -811,10 +834,7 @@ export class OCPP16ServiceUtils {
        const meterValue = buildMeterValue(chargingStation, transactionId, interval)
        if (
          OCPP16ServiceUtils.isSigningEnabled(chargingStation) &&
-        getConfigurationKey(
-          chargingStation,
-          OCPP16VendorParametersKey.SampledDataSignUpdatedReadings
-        )?.value === 'true'
+        OCPP16ServiceUtils.isSigningUpdatedReadingsEnabled(chargingStation)
        ) {
          const energyWh = chargingStation.getEnergyActiveImportRegisterByTransactionId(
            connectorStatus.transactionId
diff --git a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts

index b3052af2884e77795a1cc63a8154d9cfd373d225..e81bb3dfe6c0ac605dccef198ea18f4ec65a49a8 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts
@@ -132,11 +132,14 @@ import {
    UnlockStatusEnumType,
    UpdateFirmwareStatusEnumType,
    UploadLogStatusEnumType,
+  type UUIDv4,
  } from '../../../types/index.js'
  import {
    convertToDate,
    convertToIntOrNaN,
+  ensureError,
    generateUUID,
+  handleIncomingRequestError,
    isEmpty,
    isNotEmptyArray,
    isNotEmptyString,
@@ -226,6 +229,22 @@ const buildStationInfoReportData = (
    return reportData
  }
  
+// OCPP 2.0.1 part 2 §F01.FR.13: when a transaction exists on the Charging Station but is not yet
+// authorized (cable-plugin-first), echo its transactionId in RequestStartTransactionResponse.
+// Otherwise omit — fabricating a UUID misleads CSMS that map remoteStartId → transactionId.
+const buildRejectedResponse = (
+  reasonCode: ReasonCodeEnumType,
+  additionalInfo: string,
+  transactionId?: UUIDv4
+): OCPP20RequestStartTransactionResponse => ({
+  status: RequestStartStopStatusEnumType.Rejected,
+  statusInfo: {
+    additionalInfo,
+    reasonCode,
+  },
+  ...(transactionId != null && { transactionId }),
+})
+
  interface OCPP20StationState {
    activeFirmwareUpdateAbortController?: AbortController
    activeFirmwareUpdateRequestId?: number
@@ -813,11 +832,15 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        )
        return OCPP20Constants.OCPP_RESPONSE_ACCEPTED
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestClearCache: Error clearing cache:`,
-        error
+      const errorResponse: OCPP20ClearCacheResponse = OCPP20Constants.OCPP_RESPONSE_REJECTED
+      return (
+        handleIncomingRequestError<OCPP20ClearCacheResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.CLEAR_CACHE,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
        )
-      return OCPP20Constants.OCPP_RESPONSE_REJECTED
      }
    }
  
@@ -849,11 +872,15 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        )
        return { versionNumber: version }
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetLocalListVersion: Error getting version:`,
-        error
+      const errorResponse: OCPP20GetLocalListVersionResponse = { versionNumber: 0 }
+      return (
+        handleIncomingRequestError<OCPP20GetLocalListVersionResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.GET_LOCAL_LIST_VERSION,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
        )
-      return { versionNumber: 0 }
      }
    }
  
@@ -959,11 +986,16 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        )
        return OCPP20Constants.OCPP_SEND_LOCAL_LIST_RESPONSE_ACCEPTED
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestSendLocalList: Error updating local auth list:`,
-        error
+      const errorResponse: OCPP20SendLocalListResponse =
+        OCPP20Constants.OCPP_SEND_LOCAL_LIST_RESPONSE_FAILED
+      return (
+        handleIncomingRequestError<OCPP20SendLocalListResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.SEND_LOCAL_LIST,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
        )
-      return OCPP20Constants.OCPP_SEND_LOCAL_LIST_RESPONSE_FAILED
      }
    }
  
@@ -1581,17 +1613,21 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
          status: GenericStatus.Accepted,
        }
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestCertificateSigned: Certificate chain storage failed`,
-        error
-      )
-      return {
+      const errorResponse: OCPP20CertificateSignedResponse = {
          status: GenericStatus.Rejected,
          statusInfo: {
            additionalInfo: 'Failed to store certificate chain due to a storage error',
            reasonCode: ReasonCodeEnumType.OutOfStorage,
          },
        }
+      return (
+        handleIncomingRequestError<OCPP20CertificateSignedResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.CERTIFICATE_SIGNED,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
+      )
      }
    }
  
@@ -1847,17 +1883,21 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
          },
        }
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestDeleteCertificate: Certificate deletion failed`,
-        error
-      )
-      return {
+      const errorResponse: OCPP20DeleteCertificateResponse = {
          status: DeleteCertificateStatusEnumType.Failed,
          statusInfo: {
            additionalInfo: 'Certificate deletion failed due to an unexpected error',
            reasonCode: ReasonCodeEnumType.InternalError,
          },
        }
+      return (
+        handleIncomingRequestError<OCPP20DeleteCertificateResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.DELETE_CERTIFICATE,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
+      )
      }
    }
  
@@ -1952,17 +1992,21 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
            : GetInstalledCertificateStatusEnumType.NotFound,
        }
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetInstalledCertificateIds: Failed to retrieve certificates`,
-        error
-      )
-      return {
+      const errorResponse: OCPP20GetInstalledCertificateIdsResponse = {
          status: GetInstalledCertificateStatusEnumType.NotFound,
          statusInfo: {
            additionalInfo: 'Failed to retrieve installed certificates due to an unexpected error',
            reasonCode: ReasonCodeEnumType.InternalError,
          },
        }
+      return (
+        handleIncomingRequestError<OCPP20GetInstalledCertificateIdsResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.GET_INSTALLED_CERTIFICATE_IDS,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
+      )
      }
    }
  
@@ -2107,17 +2151,21 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
          status: InstallCertificateStatusEnumType.Accepted,
        }
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestInstallCertificate: Certificate storage failed for type ${certificateType}`,
-        error
-      )
-      return {
+      const errorResponse: OCPP20InstallCertificateResponse = {
          status: InstallCertificateStatusEnumType.Failed,
          statusInfo: {
            additionalInfo: 'Failed to store certificate due to a storage error',
            reasonCode: ReasonCodeEnumType.OutOfStorage,
          },
        }
+      return (
+        handleIncomingRequestError<OCPP20InstallCertificateResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.INSTALL_CERTIFICATE,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
+      )
      }
    }
  
@@ -2327,18 +2375,21 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
          }
        }
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestReset: Error handling reset request:`,
-        error
-      )
-
-      return {
+      const errorResponse: OCPP20ResetResponse = {
          status: ResetStatusEnumType.Rejected,
          statusInfo: {
            additionalInfo: 'Internal error occurred while processing reset request',
            reasonCode: ReasonCodeEnumType.InternalError,
          },
        }
+      return (
+        handleIncomingRequestError<OCPP20ResetResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.RESET,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
+      )
      }
    }
  
@@ -2462,13 +2513,10 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
          logger.warn(
            `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: No available EVSE for remote start`
          )
-        return {
-          status: RequestStartStopStatusEnumType.Rejected,
-          statusInfo: {
-            additionalInfo: 'No available EVSE found for remote start',
-            reasonCode: ReasonCodeEnumType.NotFound,
-          },
-        }
+        return buildRejectedResponse(
+          ReasonCodeEnumType.NotFound,
+          'No available EVSE found for remote start'
+        )
        }
        logger.info(
          `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: Auto-selected EVSE ${resolvedEvseId.toString()}`
@@ -2505,6 +2553,25 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        )
      }
  
+    // OCPP 2.0.1 part 2 §F01.FR.13: when a transaction was created on the station but not yet
+    // authorized (transactionPending), the existing transactionId SHALL be echoed back. The
+    // appendix distinguishes TxStarted (cable-plugin-first, not yet authorized) from TxInProgress
+    // (authorized and running) — use TxStarted here to match the precondition.
+    if (
+      connectorStatus.transactionPending === true &&
+      typeof connectorStatus.transactionId === 'string'
+    ) {
+      logger.warn(
+        `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: Connector ${connectorId.toString()} has a pending transaction not yet authorized`
+      )
+      return buildRejectedResponse(
+        ReasonCodeEnumType.TxStarted,
+        `Connector ${connectorId.toString()} has a pending transaction not yet authorized`,
+        // safe: OCPP 2.0 paths always store generateUUID() output here (see line ~2740)
+        connectorStatus.transactionId as UUIDv4
+      )
+    }
+
      if (
        connectorStatus.transactionStarted === true ||
        connectorStatus.transactionPending === true ||
@@ -2513,14 +2580,10 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        logger.warn(
          `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: Connector ${connectorId.toString()} already has an active or pending transaction`
        )
-      return {
-        status: RequestStartStopStatusEnumType.Rejected,
-        statusInfo: {
-          additionalInfo: `Connector ${connectorId.toString()} already has an active or pending transaction`,
-          reasonCode: ReasonCodeEnumType.TxInProgress,
-        },
-        transactionId: generateUUID(),
-      }
+      return buildRejectedResponse(
+        ReasonCodeEnumType.TxInProgress,
+        `Connector ${connectorId.toString()} already has an active or pending transaction`
+      )
      }
  
      const shouldAuthorizeRemoteStart = OCPP20ServiceUtils.readVariableAsBoolean(
@@ -2546,14 +2609,10 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
          logger.debug(
            `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: IdToken with MasterPassGroupId group cannot start a transaction`
          )
-        return {
-          status: RequestStartStopStatusEnumType.Rejected,
-          statusInfo: {
-            additionalInfo: 'MasterPassGroupId tokens cannot start transactions',
-            reasonCode: ReasonCodeEnumType.InvalidIdToken,
-          },
-          transactionId: generateUUID(),
-        }
+        return buildRejectedResponse(
+          ReasonCodeEnumType.InvalidIdToken,
+          'MasterPassGroupId tokens cannot start transactions'
+        )
        }
  
        try {
@@ -2567,16 +2626,12 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        } catch (error) {
          logger.error(
            `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: Authorization error for '${truncateId(idToken.idToken)}':`,
-          error
+          ensureError(error)
+        )
+        return buildRejectedResponse(
+          ReasonCodeEnumType.InternalError,
+          'Authorization error occurred'
          )
-        return {
-          status: RequestStartStopStatusEnumType.Rejected,
-          statusInfo: {
-            additionalInfo: 'Authorization error occurred',
-            reasonCode: ReasonCodeEnumType.InternalError,
-          },
-          transactionId: generateUUID(),
-        }
        }
      } else {
        logger.info(
@@ -2585,14 +2640,10 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
      }
  
      if (!isAuthorized) {
-      return {
-        status: RequestStartStopStatusEnumType.Rejected,
-        statusInfo: {
-          additionalInfo: `IdToken '${truncateId(idToken.idToken)}' is not authorized`,
-          reasonCode: ReasonCodeEnumType.InvalidIdToken,
-        },
-        transactionId: generateUUID(),
-      }
+      return buildRejectedResponse(
+        ReasonCodeEnumType.InvalidIdToken,
+        `IdToken '${truncateId(idToken.idToken)}' is not authorized`
+      )
      }
  
      if (groupIdToken != null) {
@@ -2608,26 +2659,18 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        } catch (error) {
          logger.error(
            `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: Group authorization error for '${truncateId(groupIdToken.idToken)}':`,
-          error
+          ensureError(error)
+        )
+        return buildRejectedResponse(
+          ReasonCodeEnumType.InternalError,
+          'Group authorization error occurred'
          )
-        return {
-          status: RequestStartStopStatusEnumType.Rejected,
-          statusInfo: {
-            additionalInfo: 'Group authorization error occurred',
-            reasonCode: ReasonCodeEnumType.InternalError,
-          },
-          transactionId: generateUUID(),
-        }
        }
        if (!isGroupAuthorized) {
-        return {
-          status: RequestStartStopStatusEnumType.Rejected,
-          statusInfo: {
-            additionalInfo: `GroupIdToken '${truncateId(groupIdToken.idToken)}' is not authorized`,
-            reasonCode: ReasonCodeEnumType.InvalidIdToken,
-          },
-          transactionId: generateUUID(),
-        }
+        return buildRejectedResponse(
+          ReasonCodeEnumType.InvalidIdToken,
+          `GroupIdToken '${truncateId(groupIdToken.idToken)}' is not authorized`
+        )
        }
      }
  
@@ -2639,14 +2682,10 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
          logger.warn(
            `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: ChargingProfile must have purpose TxProfile for RequestStartTransaction, got ${chargingProfile.chargingProfilePurpose}`
          )
-        return {
-          status: RequestStartStopStatusEnumType.Rejected,
-          statusInfo: {
-            additionalInfo: 'ChargingProfile must have purpose TxProfile',
-            reasonCode: ReasonCodeEnumType.InvalidProfile,
-          },
-          transactionId: generateUUID(),
-        }
+        return buildRejectedResponse(
+          ReasonCodeEnumType.InvalidProfile,
+          'ChargingProfile must have purpose TxProfile'
+        )
        }
  
        // OCPP 2.0.1 §2.10: transactionId MUST NOT be set in RequestStartTransaction
@@ -2654,14 +2693,10 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
          logger.warn(
            `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: ChargingProfile transactionId must not be set for RequestStartTransaction`
          )
-        return {
-          status: RequestStartStopStatusEnumType.Rejected,
-          statusInfo: {
-            additionalInfo: 'ChargingProfile transactionId must not be set',
-            reasonCode: ReasonCodeEnumType.InvalidValue,
-          },
-          transactionId: generateUUID(),
-        }
+        return buildRejectedResponse(
+          ReasonCodeEnumType.InvalidProfile,
+          'ChargingProfile transactionId must not be set'
+        )
        }
        let isValidProfile = false
        try {
@@ -2673,29 +2708,18 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        } catch (error) {
          logger.error(
            `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: Charging profile validation error:`,
-          error
+          ensureError(error)
+        )
+        return buildRejectedResponse(
+          ReasonCodeEnumType.InternalError,
+          'Charging profile validation error'
          )
-        return {
-          status: RequestStartStopStatusEnumType.Rejected,
-          statusInfo: {
-            additionalInfo: 'Charging profile validation error',
-            reasonCode: ReasonCodeEnumType.InternalError,
-          },
-          transactionId: generateUUID(),
-        }
        }
        if (!isValidProfile) {
          logger.warn(
            `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: Invalid charging profile`
          )
-        return {
-          status: RequestStartStopStatusEnumType.Rejected,
-          statusInfo: {
-            additionalInfo: 'Invalid charging profile',
-            reasonCode: ReasonCodeEnumType.InvalidProfile,
-          },
-          transactionId: generateUUID(),
-        }
+        return buildRejectedResponse(ReasonCodeEnumType.InvalidProfile, 'Invalid charging profile')
        }
      }
  
@@ -2738,16 +2762,9 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        await this.resetConnectorOnStartTransactionError(chargingStation, connectorId, resolvedEvseId)
        logger.error(
          `${chargingStation.logPrefix()} ${moduleName}.handleRequestStartTransaction: Error starting transaction:`,
-        error
+        ensureError(error)
        )
-      return {
-        status: RequestStartStopStatusEnumType.Rejected,
-        statusInfo: {
-          additionalInfo: 'Error starting transaction',
-          reasonCode: ReasonCodeEnumType.InternalError,
-        },
-        transactionId: generateUUID(),
-      }
+      return buildRejectedResponse(ReasonCodeEnumType.InternalError, 'Error starting transaction')
      }
    }
  
@@ -2862,18 +2879,21 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
            }
        }
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestTriggerMessage: Error handling trigger message request:`,
-        error
-      )
-
-      return {
+      const errorResponse: OCPP20TriggerMessageResponse = {
          status: TriggerMessageStatusEnumType.Rejected,
          statusInfo: {
            additionalInfo: 'Internal error occurred while processing trigger message request',
            reasonCode: ReasonCodeEnumType.InternalError,
          },
        }
+      return (
+        handleIncomingRequestError<OCPP20TriggerMessageResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.TRIGGER_MESSAGE,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
+      )
      }
    }
  
@@ -2947,18 +2967,21 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService {
        chargingStation.unlockConnector(connectorId)
        return { status: UnlockStatusEnumType.Unlocked }
      } catch (error) {
-      logger.error(
-        `${chargingStation.logPrefix()} ${moduleName}.handleRequestUnlockConnector: Error handling unlock connector request:`,
-        error
-      )
-
-      return {
+      const errorResponse: OCPP20UnlockConnectorResponse = {
          status: UnlockStatusEnumType.UnlockFailed,
          statusInfo: {
            additionalInfo: 'Internal error occurred while processing unlock connector request',
            reasonCode: ReasonCodeEnumType.InternalError,
          },
        }
+      return (
+        handleIncomingRequestError<OCPP20UnlockConnectorResponse>(
+          chargingStation,
+          OCPP20IncomingRequestCommand.UNLOCK_CONNECTOR,
+          ensureError(error),
+          { errorResponse }
+        ) ?? errorResponse
+      )
      }
    }
  
diff --git a/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts b/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts

index dbc9a93144b5efa26ae59b4d2fe306e8d8456e36..301ecbdf1b4d27598523d01a6e65f82965c8f603 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts
@@ -47,6 +47,7 @@ import {
    convertToIntOrNaN,
    formatDurationMilliSeconds,
    generateUUID,
+  getErrorMessage,
    isNotEmptyArray,
    logger,
    sleep,
@@ -176,7 +177,7 @@ export class OCPP20ServiceUtils {
        return isNotEmptyArray(startedMeterValue.sampledValue) ? [startedMeterValue] : []
      } catch (error) {
        logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.buildTransactionStartedMeterValues: ${(error as Error).message}`
+        `${chargingStation.logPrefix()} ${moduleName}.buildTransactionStartedMeterValues: ${getErrorMessage(error)}`
        )
        return []
      }
@@ -515,7 +516,7 @@ export class OCPP20ServiceUtils {
          return convertToInt(value)
        } catch {
          logger.warn(
-          `${moduleName}.readVariableAsInteger: Cannot convert '${value}' to integer for ${componentName}.${variableName}, using default ${defaultValue.toString()}`
+          `${moduleName}.readVariableAsInteger: Cannot convert '${value}' to integer for ${buildConfigKey(componentName, variableName)}, using default ${defaultValue.toString()}`
          )
          return defaultValue
        }
@@ -1178,7 +1179,7 @@ export class OCPP20ServiceUtils {
        }
      } catch (error) {
        logger.warn(
-        `${chargingStation.logPrefix()} ${moduleName}.buildTransactionEndedMeterValues: ${(error as Error).message}`
+        `${chargingStation.logPrefix()} ${moduleName}.buildTransactionEndedMeterValues: ${getErrorMessage(error)}`
        )
      }
      const meterValues: OCPP20MeterValue[] = [
diff --git a/src/charging-station/ocpp/OCPPIncomingRequestService.ts b/src/charging-station/ocpp/OCPPIncomingRequestService.ts

index 4ed9a0b7134b7d09ba1990ade890c131db422365..93c290873dcaf0a197903966f7a0f621b57ab1b6 100644 (file)
--- a/src/charging-station/ocpp/OCPPIncomingRequestService.ts
+++ b/src/charging-station/ocpp/OCPPIncomingRequestService.ts
@@ -11,7 +11,7 @@ import {
    type JsonType,
    type OCPPVersion,
  } from '../../types/index.js'
-import { isAsyncFunction, logger } from '../../utils/index.js'
+import { isAsyncFunction, JSONStringify, logger } from '../../utils/index.js'
  import { type Ajv, createAjv, validatePayload } from './OCPPServiceUtils.js'
  
  export abstract class OCPPIncomingRequestService extends EventEmitter {
@@ -67,11 +67,7 @@ export abstract class OCPPIncomingRequestService extends EventEmitter {
      ) {
        throw new OCPPError(
          ErrorType.SECURITY_ERROR,
-        `${commandName} cannot be issued to handle request PDU ${JSON.stringify(
-          commandPayload,
-          undefined,
-          2
-        )} while the charging station is in pending state on the ${this.csmsName}`,
+        `${commandName} cannot be issued to handle request PDU ${JSONStringify(commandPayload, 2)} while the charging station is in pending state on the ${this.csmsName}`,
          commandName,
          commandPayload
        )
@@ -114,11 +110,7 @@ export abstract class OCPPIncomingRequestService extends EventEmitter {
          // Throw exception
          throw new OCPPError(
            ErrorType.NOT_IMPLEMENTED,
-          `${commandName} is not implemented to handle request PDU ${JSON.stringify(
-            commandPayload,
-            undefined,
-            2
-          )}`,
+          `${commandName} is not implemented to handle request PDU ${JSONStringify(commandPayload, 2)}`,
            commandName,
            commandPayload
          )
@@ -126,11 +118,7 @@ export abstract class OCPPIncomingRequestService extends EventEmitter {
      } else {
        throw new OCPPError(
          ErrorType.SECURITY_ERROR,
-        `${commandName} cannot be issued to handle request PDU ${JSON.stringify(
-          commandPayload,
-          undefined,
-          2
-        )} while the charging station is not registered on the ${this.csmsName}`,
+        `${commandName} cannot be issued to handle request PDU ${JSONStringify(commandPayload, 2)} while the charging station is not registered on the ${this.csmsName}`,
          commandName,
          commandPayload
        )
diff --git a/src/charging-station/ocpp/OCPPResponseService.ts b/src/charging-station/ocpp/OCPPResponseService.ts

index 21d248cca2d9f1df5f8da1244188a9e3cba24ba7..224226ec516bdb6771053578209628e8c3cf7ca0 100644 (file)
--- a/src/charging-station/ocpp/OCPPResponseService.ts
+++ b/src/charging-station/ocpp/OCPPResponseService.ts
@@ -11,7 +11,7 @@ import {
    type RequestCommand,
    type ResponseHandler,
  } from '../../types/index.js'
-import { Constants, isAsyncFunction, logger } from '../../utils/index.js'
+import { Constants, isAsyncFunction, JSONStringify, logger } from '../../utils/index.js'
  import { type Ajv, createAjv, validatePayload } from './OCPPServiceUtils.js'
  
  export abstract class OCPPResponseService {
@@ -97,11 +97,7 @@ export abstract class OCPPResponseService {
          // Throw exception
          throw new OCPPError(
            ErrorType.NOT_IMPLEMENTED,
-          `${commandName} is not implemented to handle response PDU ${JSON.stringify(
-            payload,
-            undefined,
-            2
-          )}`,
+          `${commandName} is not implemented to handle response PDU ${JSONStringify(payload, 2)}`,
            commandName,
            payload
          )
@@ -109,11 +105,7 @@ export abstract class OCPPResponseService {
      } else {
        throw new OCPPError(
          ErrorType.SECURITY_ERROR,
-        `${commandName} cannot be issued to handle response PDU ${JSON.stringify(
-          payload,
-          undefined,
-          2
-        )} while the charging station is not registered on the ${this.csmsName}`,
+        `${commandName} cannot be issued to handle response PDU ${JSONStringify(payload, 2)} while the charging station is not registered on the ${this.csmsName}`,
          commandName,
          payload
        )
diff --git a/src/charging-station/ocpp/OCPPServiceUtils.ts b/src/charging-station/ocpp/OCPPServiceUtils.ts

index beac5cc1f7e841e5b9c4ac2451e20da77ac7c117..a34daef72134cc33116110a6ec528fc37baa031f 100644 (file)
--- a/src/charging-station/ocpp/OCPPServiceUtils.ts
+++ b/src/charging-station/ocpp/OCPPServiceUtils.ts
@@ -6,7 +6,13 @@ import { readFileSync } from 'node:fs'
  import { dirname, join } from 'node:path'
  import { fileURLToPath } from 'node:url'
  
-import type { BootReasonEnumType, SigningMethodEnumType } from '../../types/index.js'
+import type {
+  BootReasonEnumType,
+  OCPP20OptionalVariableName,
+  OCPP20RequiredVariableName,
+  OCPP20VendorVariableName,
+  SigningMethodEnumType,
+} from '../../types/index.js'
  
  import {
    buildConfigKey,
@@ -46,6 +52,7 @@ import {
    ACElectricUtils,
    clone,
    Constants,
+  convertToBoolean,
    convertToFloat,
    convertToInt,
    DCElectricUtils,
@@ -54,6 +61,7 @@ import {
    handleFileException,
    isNotEmptyArray,
    isNotEmptyString,
+  JSONStringify,
    logger,
    logPrefix,
    max,
@@ -81,6 +89,13 @@ const SOC_MAXIMUM_VALUE = 100
  const UNIT_DIVIDER_KILO = 1000
  const MS_PER_HOUR = 3_600_000
  
+const isOCPP20FlagEnabled = (
+  chargingStation: ChargingStation,
+  component: OCPP20ComponentName,
+  variable: OCPP20OptionalVariableName | OCPP20RequiredVariableName | OCPP20VendorVariableName
+): boolean =>
+  convertToBoolean(getConfigurationKey(chargingStation, buildConfigKey(component, variable))?.value)
+
  export type Ajv = _Ajv.default
  // eslint-disable-next-line @typescript-eslint/no-redeclare
  const Ajv = _Ajv.default
@@ -189,7 +204,7 @@ export const validatePayload = <T extends JsonType>(
      ajvErrorsToErrorType(validate.errors),
      `${context.charAt(0).toUpperCase()}${context.slice(1)} PDU is invalid`,
      commandName,
-    JSON.stringify(validate.errors, undefined, 2)
+    JSONStringify(validate.errors, 2)
    )
  }
  
@@ -933,36 +948,30 @@ export const buildMeterValue = (
          )
        }
        {
-        const signReadings =
-          getConfigurationKey(
-            chargingStation,
-            buildConfigKey(OCPP20ComponentName.SampledDataCtrlr, StandardParametersKey.SignReadings)
-          )?.value === 'true'
+        const signReadings = isOCPP20FlagEnabled(
+          chargingStation,
+          OCPP20ComponentName.SampledDataCtrlr,
+          StandardParametersKey.SignReadings
+        )
  
          if (signReadings) {
            let signingEnabledForContext = true
            if (context === OCPP20ReadingContextEnumType.TRANSACTION_BEGIN) {
-            signingEnabledForContext =
-              getConfigurationKey(
-                chargingStation,
-                buildConfigKey(
-                  OCPP20ComponentName.SampledDataCtrlr,
-                  VendorParametersKey.SignStartedReadings
-                )
-              )?.value === 'true'
+            signingEnabledForContext = isOCPP20FlagEnabled(
+              chargingStation,
+              OCPP20ComponentName.SampledDataCtrlr,
+              VendorParametersKey.SignStartedReadings
+            )
            } else if (
              context == null ||
              context === OCPP20ReadingContextEnumType.SAMPLE_PERIODIC ||
              context === OCPP20ReadingContextEnumType.SAMPLE_CLOCK
            ) {
-            signingEnabledForContext =
-              getConfigurationKey(
-                chargingStation,
-                buildConfigKey(
-                  OCPP20ComponentName.SampledDataCtrlr,
-                  VendorParametersKey.SignUpdatedReadings
-                )
-              )?.value === 'true'
+            signingEnabledForContext = isOCPP20FlagEnabled(
+              chargingStation,
+              OCPP20ComponentName.SampledDataCtrlr,
+              VendorParametersKey.SignUpdatedReadings
+            )
            }
  
            if (signingEnabledForContext) {
diff --git a/src/charging-station/ocpp/OCPPSignedMeterValueUtils.ts b/src/charging-station/ocpp/OCPPSignedMeterValueUtils.ts

index fb2bd6c3fd759070b2222fe641206e844d1a4db0..dc630018334ba358126842c47ea06cfcd8a1cbc5 100644 (file)
--- a/src/charging-station/ocpp/OCPPSignedMeterValueUtils.ts
+++ b/src/charging-station/ocpp/OCPPSignedMeterValueUtils.ts
@@ -6,7 +6,7 @@ import {
    type SampledValue,
    SigningMethodEnumType,
  } from '../../types/index.js'
-import { logger } from '../../utils/index.js'
+import { getErrorMessage, isNotEmptyString, logger } from '../../utils/index.js'
  
  export interface SampledValueSigningConfig extends SigningConfig {
    enabled: boolean
@@ -53,7 +53,7 @@ export const deriveSigningMethodFromPublicKeyHex = (
      return namedCurve != null ? NODE_CURVE_TO_SIGNING_METHOD.get(namedCurve) : undefined
    } catch (error) {
      logger.debug(
-      `deriveSigningMethodFromPublicKeyHex: failed to parse public key: ${(error as Error).message}`
+      `deriveSigningMethodFromPublicKeyHex: failed to parse public key: ${getErrorMessage(error)}`
      )
      return undefined
    }
@@ -73,7 +73,7 @@ export const validateSigningPrerequisites = (
    publicKeyHex: string | undefined,
    configuredSigningMethod: SigningMethodEnumType | undefined
  ): SigningPrerequisiteResult | SigningPrerequisiteSuccess => {
-  if (publicKeyHex == null || publicKeyHex.length === 0) {
+  if (!isNotEmptyString(publicKeyHex)) {
      return { enabled: false, reason: 'Public key is not configured' }
    }
  
diff --git a/src/charging-station/ocpp/auth/types/AuthTypes.ts b/src/charging-station/ocpp/auth/types/AuthTypes.ts

index 3a8f883396c5b5a8b9a24c9aa0faa81eed08aa58..ce0a0488e2408442c118e7b43766f9f635212fb8 100644 (file)
--- a/src/charging-station/ocpp/auth/types/AuthTypes.ts
+++ b/src/charging-station/ocpp/auth/types/AuthTypes.ts
@@ -281,7 +281,7 @@ export class AuthenticationError extends Error {
    public readonly code: AuthErrorCode
    public readonly context?: AuthContext
    public readonly identifier?: string
-  public override name = 'AuthenticationError'
+  public override readonly name = 'AuthenticationError' as const
  
    public readonly ocppVersion?: OCPPVersion
  
diff --git a/src/charging-station/ui-server/AbstractUIServer.ts b/src/charging-station/ui-server/AbstractUIServer.ts

index 327668304d32ece0fdaccd767281628d4b1a2a77..be1a7703cf3a79310a2d45bdcf9af43c3fe5b9d7 100644 (file)
--- a/src/charging-station/ui-server/AbstractUIServer.ts
+++ b/src/charging-station/ui-server/AbstractUIServer.ts
@@ -26,7 +26,7 @@ import {
    type UIServerConfiguration,
    type UUIDv4,
  } from '../../types/index.js'
-import { isEmpty, isNotEmptyString, logger, logPrefix } from '../../utils/index.js'
+import { isEmpty, isNotEmptyArray, isNotEmptyString, logger, logPrefix } from '../../utils/index.js'
  import { UIServiceFactory } from './ui-services/UIServiceFactory.js'
  import {
    createUIServerAccessCache,
@@ -665,7 +665,9 @@ export abstract class AbstractUIServer {
     */
    protected runRequestPrologue (req: IncomingMessage): UIServerRequestPrologueResult {
      const decision = resolveUIServerAccess(req, this.uiServerConfiguration, this.accessCache)
-    const rateLimitKey = decision.clientAddress.length > 0 ? decision.clientAddress : 'unknown'
+    const rateLimitKey = isNotEmptyString(decision.clientAddress)
+      ? decision.clientAddress
+      : 'unknown'
      if (!this.rateLimiter(rateLimitKey)) {
        logger.warn(
          `${this.logPrefix(
@@ -1314,7 +1316,7 @@ export abstract class AbstractUIServer {
      const isWildcard =
        configuredHost === '' || configuredHost === '0.0.0.0' || configuredHost === '::'
  
-    if (isWildcard && allowedHosts.length === 0) {
+    if (isWildcard && isEmpty(allowedHosts)) {
        logger.warn(
          `${this.logPrefix(
            moduleName,
@@ -1323,7 +1325,7 @@ export abstract class AbstractUIServer {
        )
        return
      }
-    if (!isWildcard && !isLoopback(configuredHost) && requireTls && trustedProxies.length === 0) {
+    if (!isWildcard && !isLoopback(configuredHost) && requireTls && isEmpty(trustedProxies)) {
        logger.warn(
          `${this.logPrefix(
            moduleName,
@@ -1435,7 +1437,7 @@ const addPerStationStatusInfo = (
   * @returns Connector count under the active mode.
   */
  const countConnectors = (data: ChargingStationData): number =>
-  data.connectors.length > 0
+  isNotEmptyArray(data.connectors)
      ? data.connectors.length
      : data.evses.reduce((n, evse) => n + evse.evseStatus.connectors.size, 0)
  
@@ -1448,7 +1450,7 @@ const countConnectors = (data: ChargingStationData): number =>
   * @yields {ConnectorEntry} A connector entry under the active mode.
   */
  const iterateConnectors = function * (data: ChargingStationData): Generator<ConnectorEntry> {
-  if (data.connectors.length > 0) {
+  if (isNotEmptyArray(data.connectors)) {
      for (const entry of data.connectors) {
        yield entry
      }
diff --git a/src/charging-station/ui-server/UIServerAccessPolicy.ts b/src/charging-station/ui-server/UIServerAccessPolicy.ts

index 5d14ad884b9d845c523a988cc3574f9b1be565f9..3c3670f15a5bcb9c8029e60e771958e1bae04988 100644 (file)
--- a/src/charging-station/ui-server/UIServerAccessPolicy.ts
+++ b/src/charging-station/ui-server/UIServerAccessPolicy.ts
@@ -3,6 +3,7 @@ import type { IncomingMessage } from 'node:http'
  import type { UIServerConfiguration } from '../../types/index.js'
  
  import { UI_SERVER_ACCESS_POLICY_DEFAULTS } from '../../utils/ConfigurationSchema.js'
+import { has, isEmpty, isNotEmptyArray } from '../../utils/index.js'
  import {
    isLoopback,
    normalizeHost,
@@ -227,7 +228,7 @@ const getForwardedClientAddress = (
      return picked
    }
    const addresses = splitHeaderList(picked.value)
-  if (addresses.length === 0) {
+  if (isEmpty(addresses)) {
      return { kind: 'error', reason: UIServerAccessDenialReason.InvalidForwardedClient }
    }
    // Multi-hop X-Forwarded-For chains are intentionally rejected: ambiguity in
@@ -265,7 +266,7 @@ const getForwardedProtocol = (
    }
    if (xForwardedProtocol != null) {
      const protocols = splitHeaderList(xForwardedProtocol)
-    if (protocols.length === 0) {
+    if (isEmpty(protocols)) {
        return { kind: 'error', reason: UIServerAccessDenialReason.InvalidForwardedProtocol }
      }
      if (protocols.length > 1) {
@@ -294,7 +295,7 @@ const getForwardedHost = (
    }
    if (xForwardedHost != null) {
      const hosts = splitHeaderList(xForwardedHost)
-    if (hosts.length === 0) {
+    if (isEmpty(hosts)) {
        return { kind: 'error', reason: UIServerAccessDenialReason.InvalidForwardedHost }
      }
      if (hosts.length > 1) {
@@ -352,7 +353,7 @@ const parseSingleForwardedHeader = (req: IncomingMessage): ParseOutcome<Forwarde
      if (value == null) {
        continue
      }
-    if (Object.hasOwn(params, key)) {
+    if (has(key, params)) {
        return { kind: 'error', reason: UIServerAccessDenialReason.AmbiguousForwardedParameter }
      }
      params[key] = value
@@ -404,7 +405,7 @@ const isHostAllowed = (
    forwardedHost: ParseOutcome<string>
  ): boolean => {
    const allowedHosts = getAllowedHosts(uiServerConfiguration)
-  if (allowedHosts.length === 0) {
+  if (isEmpty(allowedHosts)) {
      return false
    }
    const host = getSingleHeaderValue(req, 'host')
@@ -435,12 +436,12 @@ const isOriginAllowed = (
      return false
    }
    const allowedOrigins = uiServerConfiguration.accessPolicy?.allowedOrigins ?? []
-  if (allowedOrigins.length > 0) {
+  if (isNotEmptyArray(allowedOrigins)) {
      return allowedOrigins.some(allowedOrigin => isSameOrigin(originUrl, allowedOrigin))
    }
    const allowedHosts = getAllowedHosts(uiServerConfiguration)
    return (
-    allowedHosts.length > 0 &&
+    isNotEmptyArray(allowedHosts) &&
      allowedHosts.some(allowedHost => isSameHost(originUrl.hostname, allowedHost))
    )
  }
@@ -505,7 +506,7 @@ const getTrustedProxies = (
  }
  
  const isTrustedProxy = (remoteAddress: string, trustedProxies: ReadonlySet<string>): boolean => {
-  if (trustedProxies.size === 0) {
+  if (isEmpty(trustedProxies)) {
      return false
    }
    const normalizedRemoteAddress = normalizeIPAddress(remoteAddress)
diff --git a/src/charging-station/ui-server/UIServerNet.ts b/src/charging-station/ui-server/UIServerNet.ts

index 5cd329f19151867b7746b20d0a1c82fa93351f0b..9d4c403c01dfff99da62c6cd82fc1b8be5f393ec 100644 (file)
--- a/src/charging-station/ui-server/UIServerNet.ts
+++ b/src/charging-station/ui-server/UIServerNet.ts
@@ -1,5 +1,8 @@
  import { isIP } from 'node:net'
  
+// Direct path: the `utils/index.js` barrel re-exports ConfigurationSchema.ts which imports from this module, causing a TDZ cycle.
+import { convertToInt } from '../../utils/Utils.js'
+
  export const LOOPBACK_HOSTNAME = 'localhost'
  
  export const isLoopback = (address: string): boolean => {
@@ -94,7 +97,7 @@ const isValidPort = (port: string | undefined): boolean => {
    if (!/^\d+$/.test(port)) {
      return false
    }
-  const parsedPort = Number.parseInt(port, 10)
+  const parsedPort = convertToInt(port)
    return parsedPort >= 1 && parsedPort <= 65535
  }
  
diff --git a/src/charging-station/ui-server/UIServerSecurity.ts b/src/charging-station/ui-server/UIServerSecurity.ts

index c99646ddd31b9bc31c90a05f3b8a0dfb63594138..6cb5cf8359e78dad0b4e459bfee35ef52bb0aa7f 100644 (file)
--- a/src/charging-station/ui-server/UIServerSecurity.ts
+++ b/src/charging-station/ui-server/UIServerSecurity.ts
@@ -17,6 +17,8 @@ export const DEFAULT_MAX_TRACKED_IPS = 10000
  export const DEFAULT_COMPRESSION_THRESHOLD_BYTES = 1024
  
  export class PayloadTooLargeError extends BaseError {
+  public override readonly name = 'PayloadTooLargeError' as const
+
    public constructor (maxBytes: number) {
      super(`Request body exceeds limit of ${maxBytes.toString()} bytes`)
    }
diff --git a/src/charging-station/ui-server/mcp/MCPResources.ts b/src/charging-station/ui-server/mcp/MCPResources.ts

index 516f68ead6b825164ffc613707a40b3ef165f197..55a7a2e3385f8bdb8e2e931dc32044c2c17fa369 100644 (file)
--- a/src/charging-station/ui-server/mcp/MCPResources.ts
+++ b/src/charging-station/ui-server/mcp/MCPResources.ts
@@ -5,7 +5,8 @@ import { fileURLToPath } from 'node:url'
  
  import type { AbstractUIServer } from '../AbstractUIServer.js'
  
-import { OCPPVersion } from '../../../types/index.js'
+import { MapStringifyFormat, OCPPVersion } from '../../../types/index.js'
+import { JSONStringify } from '../../../utils/index.js'
  
  export const registerMCPResources = (server: McpServer, uiServer: AbstractUIServer): void => {
    server.registerResource(
@@ -19,7 +20,7 @@ export const registerMCPResources = (server: McpServer, uiServer: AbstractUIServ
        contents: [
          {
            mimeType: 'application/json',
-          text: JSON.stringify(uiServer.listChargingStationData(), null, 2),
+          text: JSONStringify(uiServer.listChargingStationData(), 2, MapStringifyFormat.object),
            uri: 'station://list',
          },
        ],
@@ -41,7 +42,7 @@ export const registerMCPResources = (server: McpServer, uiServer: AbstractUIServ
              mimeType: 'application/json',
              text:
                data != null
-                ? JSON.stringify(data, null, 2)
+                ? JSONStringify(data, 2, MapStringifyFormat.object)
                  : JSON.stringify({ error: `Station '${hashId as string}' not found` }),
              uri: uri.href,
            },
@@ -61,7 +62,7 @@ export const registerMCPResources = (server: McpServer, uiServer: AbstractUIServ
        contents: [
          {
            mimeType: 'application/json',
-          text: JSON.stringify(uiServer.getChargingStationTemplates(), null, 2),
+          text: JSONStringify(uiServer.getChargingStationTemplates(), 2),
            uri: 'template://list',
          },
        ],
@@ -116,7 +117,7 @@ export const registerMCPSchemaResources = (server: McpServer): void => {
              contents: [
                {
                  mimeType: 'application/json',
-                text: JSON.stringify({ commands, count: commands.length, version }, null, 2),
+                text: JSONStringify({ commands, count: commands.length, version }, 2),
                  uri: `schema://ocpp/${version}`,
                },
              ],
diff --git a/src/charging-station/ui-server/ui-services/AbstractUIService.ts b/src/charging-station/ui-server/ui-services/AbstractUIService.ts

index 5deeade3bbdb1f35ffdf408f2c24cd541583db5d..de1f0b9dbd3832f2a41487162a155fabfa186c9f 100644 (file)
--- a/src/charging-station/ui-server/ui-services/AbstractUIService.ts
+++ b/src/charging-station/ui-server/ui-services/AbstractUIService.ts
@@ -27,6 +27,7 @@ import {
    ensureError,
    getErrorMessage,
    isNotEmptyArray,
+  JSONStringify,
    logger,
  } from '../../../utils/index.js'
  import { UIServiceWorkerBroadcastChannel } from '../../broadcast-channel/UIServiceWorkerBroadcastChannel.js'
@@ -169,11 +170,7 @@ export abstract class AbstractUIService {
  
        if (!this.requestHandlers.has(command)) {
          throw new BaseError(
-          `'${command}' is not implemented to handle message payload ${JSON.stringify(
-            requestPayload,
-            undefined,
-            2
-          )}`
+          `'${command}' is not implemented to handle message payload ${JSONStringify(requestPayload, 2)}`
          )
        }
  
diff --git a/src/exception/OCPPError.ts b/src/exception/OCPPError.ts

index f29f14f20eb80b95ad10356822046f1f61917c86..4f5477aa37ae60f283d3e7a93f9a55cecb9fdc0b 100644 (file)
--- a/src/exception/OCPPError.ts
+++ b/src/exception/OCPPError.ts
@@ -10,6 +10,7 @@ export class OCPPError extends BaseError {
    code: ErrorType
    command: IncomingRequestCommand | RequestCommand
    details?: JsonType
+  public override readonly name = 'OCPPError' as const
  
    constructor (
      code: ErrorType,
diff --git a/src/exception/TimeoutError.ts b/src/exception/TimeoutError.ts

new file mode 100644 (file)

index 0000000..2122328
--- /dev/null
+++ b/src/exception/TimeoutError.ts
@@ -0,0 +1,8 @@
+// Partial Copyright Jerome Benoit. 2021-2025. All Rights Reserved.
+
+import { BaseError } from './BaseError.js'
+
+/** Sentinel error used by `promiseWithTimeout` call sites to discriminate timeout from upstream errors via `instanceof`. */
+export class TimeoutError extends BaseError {
+  public override readonly name = 'TimeoutError' as const
+}
diff --git a/src/exception/index.ts b/src/exception/index.ts

index 0916eecb8990285c55f21bb360ba4b250e0c9233..b9df000df70eb11b9e5bba10ef97328565c6a7b9 100644 (file)
--- a/src/exception/index.ts
+++ b/src/exception/index.ts
@@ -1,2 +1,3 @@
  export { BaseError } from './BaseError.js'
  export { OCPPError } from './OCPPError.js'
+export { TimeoutError } from './TimeoutError.js'
diff --git a/src/utils/Configuration.ts b/src/utils/Configuration.ts

index fb2f65af2443a6278a693856f0aad1ae926f7971..cab09f6caef0ab05aff5a5dfdc1c75dca7d3de32 100644 (file)
--- a/src/utils/Configuration.ts
+++ b/src/utils/Configuration.ts
@@ -289,8 +289,8 @@ export class Configuration {
      }
      if (isCFEnvironment()) {
        delete uiServerConfiguration.options?.host
-      if (uiServerConfiguration.options != null) {
-        uiServerConfiguration.options.port = convertToInt(env.PORT ?? '')
+      if (uiServerConfiguration.options != null && isNotEmptyString(env.PORT)) {
+        uiServerConfiguration.options.port = convertToInt(env.PORT)
        }
      }
      return uiServerConfiguration
@@ -385,9 +385,7 @@ export class Configuration {
     */
    private static async performReload (): Promise<void> {
      const previousData =
-      Configuration.configurationData != null
-        ? structuredClone(Configuration.configurationData)
-        : undefined
+      Configuration.configurationData != null ? clone(Configuration.configurationData) : undefined
      const previousCache = new Map(Configuration.configurationSectionCache)
      let reloadSucceeded = false
      try {
diff --git a/src/utils/ConfigurationMigrations.ts b/src/utils/ConfigurationMigrations.ts

index e4da459844d1e9a37b830b9e53215852a13f0d90..b4ca14a225fbe057434060b2b079f8623b6550e9 100644 (file)
--- a/src/utils/ConfigurationMigrations.ts
+++ b/src/utils/ConfigurationMigrations.ts
@@ -2,6 +2,7 @@ import { isDeepStrictEqual } from 'node:util'
  
  // Direct path: the `exception/index.js` barrel re-exports OCPPError, causing a TDZ cycle.
  import { BaseError } from '../exception/BaseError.js'
+import { clone } from './Utils.js'
  
  const moduleName = 'ConfigurationMigrations'
  
@@ -193,7 +194,7 @@ const setAtPath = (
   * @returns `{ config, fieldErrors, warnings }`
   */
  export const remapDeprecatedKeys = (config: Record<string, unknown>): RemapDeprecatedKeysResult => {
-  const out = structuredClone(config)
+  const out = clone(config)
    const fieldErrors: FieldError[] = []
    const warnings: RemapWarning[] = []
  
@@ -224,7 +225,7 @@ export const remapDeprecatedKeys = (config: Record<string, unknown>): RemapDepre
   * @param _filePath - configuration file path (unused)
   * @returns new configuration object
   */
-const migrateV0ToV1: MigrationFn = (config, _filePath) => structuredClone(config)
+const migrateV0ToV1: MigrationFn = (config, _filePath) => clone(config)
  
  /**
   * Sequential migration chain. Index `i` migrates a v`i` configuration to v`i+1`.
@@ -308,7 +309,7 @@ export const applyConfigurationMigration = (
        `${moduleName}.applyConfigurationMigration: No migration defined for $schemaVersion ${sourceVersion.toString()} → ${CURRENT_CONFIGURATION_SCHEMA_VERSION.toString()}`
      )
    }
-  let migrated = structuredClone(config)
+  let migrated = clone(config)
    for (let v = sourceVersion; v < CURRENT_CONFIGURATION_SCHEMA_VERSION; v++) {
      migrated = migrationChain[v](migrated, filePath)
      migrated.$schemaVersion = v + 1
diff --git a/src/utils/ConfigurationSchema.ts b/src/utils/ConfigurationSchema.ts

index c24625e1bd6e8bd67e8c8dfb5d36cf39c36ebe5a..25d4b09f5cb55e2af44bb3e8304cd9338bae36e7 100644 (file)
--- a/src/utils/ConfigurationSchema.ts
+++ b/src/utils/ConfigurationSchema.ts
@@ -14,6 +14,7 @@ import {
  } from '../types/index.js'
  import { WorkerProcessType } from '../worker/index.js'
  import { CURRENT_CONFIGURATION_SCHEMA_VERSION } from './ConfigurationMigrations.js'
+import { has } from './Utils.js'
  
  // ---------------------------------------------------------------
  // Sub-schemas
@@ -207,7 +208,7 @@ const UIServerListenOptionsSchema = z
      value => value != null && typeof value === 'object' && !Array.isArray(value),
      { message: 'must be a non-array object' }
    )
-  .refine(value => !Object.hasOwn(value as object, 'accessPolicy'), {
+  .refine(value => !has('accessPolicy', value), {
      message: "'accessPolicy' must be configured under 'uiServer', not 'uiServer.options'",
    })
    .pipe(UIServerListenOptionsObjectSchema)
diff --git a/src/utils/ConfigurationValidation.ts b/src/utils/ConfigurationValidation.ts

index 72496bbf438ff96a4ac61b2acb8d28f88d7ca91a..a58ab40c44c189ced05bd64cb109411916d3b14f 100644 (file)
--- a/src/utils/ConfigurationValidation.ts
+++ b/src/utils/ConfigurationValidation.ts
@@ -14,7 +14,7 @@ import {
  } from './ConfigurationMigrations.js'
  import { ConfigurationSchema } from './ConfigurationSchema.js'
  import { configurationLogPrefix } from './ConfigurationUtils.js'
-import { isEmpty } from './Utils.js'
+import { assertIsJsonObject, clone, isEmpty } from './Utils.js'
  
  const moduleName = 'ConfigurationValidation'
  
@@ -37,6 +37,7 @@ export class ConfigurationValidationError extends BaseError {
    public readonly fieldErrors: FieldError[]
    public readonly filePath: string
    public readonly migratedFrom?: number
+  public override readonly name = 'ConfigurationValidationError' as const
    public readonly phase: ValidationPhase
  
    public constructor (
@@ -89,18 +90,19 @@ export class ConfigurationValidationError extends BaseError {
   * @returns Validated and transformed `ConfigurationData`
   */
  export const validateConfiguration = (parsed: unknown, filePath: string): ConfigurationData => {
-  if (parsed == null || typeof parsed !== 'object' || Array.isArray(parsed)) {
-    throw new BaseError(
+  assertIsJsonObject(
+    parsed,
+    new BaseError(
        `${moduleName}.validateConfiguration: Invalid simulator configuration payload (not a JSON object) ${filePath}`
      )
-  }
+  )
    if (isEmpty(parsed)) {
      throw new BaseError(
        `${moduleName}.validateConfiguration: Empty simulator configuration from file ${filePath}`
      )
    }
    // Defensive clone: $schemaVersion is rewritten below.
-  const parsedRecord = structuredClone(parsed) as Record<string, unknown>
+  const parsedRecord = clone(parsed) as Record<string, unknown>
  
    const version = coerceConfigurationVersion(parsedRecord.$schemaVersion)
    parsedRecord.$schemaVersion = version
@@ -147,4 +149,4 @@ export const validateConfiguration = (parsed: unknown, filePath: string): Config
  const transformConfiguration = (
    validated: ConfigurationData,
    _filePath: string
-): ConfigurationData => structuredClone(validated)
+): ConfigurationData => clone(validated)
diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts

index 0cc36082f108044e78a8ea74de6787862a942aa8..b8212e7ab4c21b2d1be19204541cf049d65c527f 100644 (file)
--- a/src/utils/Utils.ts
+++ b/src/utils/Utils.ts
@@ -16,7 +16,6 @@ import { env } from 'node:process'
  
  import {
    type JsonObject,
-  type JsonType,
    MapStringifyFormat,
    MessageType,
    type TimestampedData,
@@ -465,18 +464,11 @@ export const secureRandom = (): number => {
    return getRandomValues(new Uint32Array(1))[0] / 0x100000000
  }
  
-export const JSONStringify = <
-  // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
-  T extends
-    | JsonType
-    | Map<string, Record<string, unknown>>
-    | Record<string, unknown>[]
-    | Set<Record<string, unknown>>
->(
-    object: T,
-    space?: number | string,
-    mapFormat?: MapStringifyFormat
-  ): string => {
+export const JSONStringify = (
+  object: unknown,
+  space?: number | string,
+  mapFormat?: MapStringifyFormat
+): string => {
    return JSON.stringify(
      object,
      (_, value: Record<string, unknown>) => {
diff --git a/tests/charging-station/TemplateSchema.test.ts b/tests/charging-station/TemplateSchema.test.ts

index 0210b9e9c6c16c87f7d4aecd249115af372f0160..ccd59d3e18bf035afd7638669a91df35b80edbbb 100644 (file)
--- a/tests/charging-station/TemplateSchema.test.ts
+++ b/tests/charging-station/TemplateSchema.test.ts
@@ -232,7 +232,7 @@ await describe('TemplateSchema', async () => {
      })
    })
  
-  await describe('Evses validation (OCPP 2.0.1 §7.2)', async () => {
+  await describe('Evses topology validation (OCPP 2.0.1 part 1 §7.1 EVSE numbering, §7.2 connector numbering)', async () => {
      await it('should reject EVSE 0 with non-zero connector id', () => {
        const result = TemplateSchema.safeParse(
          buildMinimalTemplate({ Evses: { 0: { Connectors: { 1: {} } } } })
diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-MasterPass.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-MasterPass.test.ts

index 710ac064b77d4e8d4d84883251373d5f7f4f5201..d6ddeb9cb34e6015f1f3cd1b69521bb5a35f3b75 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-MasterPass.test.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-MasterPass.test.ts
@@ -20,6 +20,7 @@ import {
    OCPP20IdTokenEnumType,
    OCPP20OptionalVariableName,
    OCPPVersion,
+  ReasonCodeEnumType,
    RequestStartStopStatusEnumType,
  } from '../../../../src/types/index.js'
  import { Constants } from '../../../../src/utils/index.js'
@@ -110,6 +111,8 @@ await describe('C12.FR.09 - MasterPassGroupId Check', async () => {
  
      assert.notStrictEqual(response, undefined)
      assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+    assert.strictEqual(response.transactionId, undefined)
+    assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.InvalidIdToken)
    })
  
    await it('C12.FR.09 - should be no-op when MasterPassGroupId not configured', async () => {
diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStartTransaction.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStartTransaction.test.ts

index d82bd18c96f82c0d1e1bd29059635dc4b92d9390..22c3c0c9028c759062b01495bda945769bfcf7bb 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStartTransaction.test.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStartTransaction.test.ts
@@ -38,6 +38,7 @@ import {
    OCPP20TransactionEventEnumType,
    OCPP20TriggerReasonEnumType,
    OCPPVersion,
+  ReasonCodeEnumType,
    RequestStartStopStatusEnumType,
  } from '../../../../src/types/index.js'
  import { Constants } from '../../../../src/utils/index.js'
@@ -137,9 +138,10 @@ await describe('F01 & F02 - Remote Start Transaction', async () => {
      // Assert
      assert.notStrictEqual(response, undefined)
      assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+    assert.strictEqual(response.transactionId, undefined)
+    assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.InvalidIdToken)
    })
  
-  // G03.FR.03 — Reject when auth returns BLOCKED for groupIdToken
    await it('should reject RequestStartTransaction when groupIdToken auth returns BLOCKED', async () => {
      // Arrange: Primary token accepted, group token blocked
      let callCount = 0
@@ -186,9 +188,10 @@ await describe('F01 & F02 - Remote Start Transaction', async () => {
      // Assert
      assert.notStrictEqual(response, undefined)
      assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+    assert.strictEqual(response.transactionId, undefined)
+    assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.InvalidIdToken)
    })
  
-  // FR: F01.FR.17, F02.FR.05 - Verify remoteStartId and idToken are stored for later TransactionEvent
    await it('should store remoteStartId and idToken in connector status for TransactionEvent', async () => {
      const { station: spyChargingStation } = createMockChargingStation({
        baseName: TEST_CHARGING_STATION_BASE_NAME,
@@ -342,6 +345,8 @@ await describe('F01 & F02 - Remote Start Transaction', async () => {
  
      assert.notStrictEqual(response, undefined)
      assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+    assert.strictEqual(response.transactionId, undefined)
+    assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.InvalidProfile)
    })
  
    // OCPP 2.0.1 §2.10: transactionId MUST NOT be present at RequestStartTransaction time
@@ -383,6 +388,8 @@ await describe('F01 & F02 - Remote Start Transaction', async () => {
  
      assert.notStrictEqual(response, undefined)
      assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+    assert.strictEqual(response.transactionId, undefined)
+    assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.InvalidProfile)
    })
  
    // FR: F01.FR.07
@@ -416,6 +423,8 @@ await describe('F01 & F02 - Remote Start Transaction', async () => {
      }
  
      await testableService.handleRequestStartTransaction(mockStation, firstRequest)
+    const connectorStatus = mockStation.getConnectorStatus(1)
+    const pendingTransactionId = connectorStatus?.transactionId
  
      // Now try to start another transaction on the same EVSE
      const secondRequest: OCPP20RequestStartTransactionRequest = {
@@ -431,7 +440,33 @@ await describe('F01 & F02 - Remote Start Transaction', async () => {
  
      assert.notStrictEqual(response, undefined)
      assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
-    assert.notStrictEqual(response.transactionId, undefined)
+    // §F01.FR.13: echo pending transactionId
+    assert.strictEqual(response.transactionId, pendingTransactionId)
+    assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.TxStarted)
+  })
+
+  await it('should reject RequestStartTransaction with TxInProgress (no transactionId echo) when connector is locked without pending transaction', async () => {
+    const connectorStatus = mockStation.getConnectorStatus(1)
+    if (connectorStatus == null) {
+      assert.fail('Connector 1 missing on mock station')
+    }
+    connectorStatus.locked = true
+
+    const request: OCPP20RequestStartTransactionRequest = {
+      evseId: 1,
+      idToken: {
+        idToken: 'LOCKED_CONNECTOR_TOKEN',
+        type: OCPP20IdTokenEnumType.ISO14443,
+      },
+      remoteStartId: 102,
+    }
+
+    const response = await testableService.handleRequestStartTransaction(mockStation, request)
+
+    assert.notStrictEqual(response, undefined)
+    assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+    assert.strictEqual(response.transactionId, undefined)
+    assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.TxInProgress)
    })
  
    await it('should reject RequestStartTransaction when authorization throws an error', async () => {
@@ -457,6 +492,8 @@ await describe('F01 & F02 - Remote Start Transaction', async () => {
      // Assert
      assert.notStrictEqual(response, undefined)
      assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+    assert.strictEqual(response.transactionId, undefined)
+    assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.InternalError)
    })
  
    // FR: F01.FR.02 — TC_F_03_CS
@@ -564,6 +601,8 @@ await describe('F01 & F02 - Remote Start Transaction', async () => {
  
      // Assert
      assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+    assert.strictEqual(response.transactionId, undefined)
+    assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.NotFound)
    })
  
    await describe('REQUEST_START_TRANSACTION event listener', async () => {
diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts

index ab0e90860b42ca9da8c210c30987270d17c54574..61105e01fe91dbb92eb21c496de66a0f75b223b9 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts
@@ -28,6 +28,7 @@ import {
    OCPP20TransactionEventEnumType,
    OCPP20TriggerReasonEnumType,
    OCPPVersion,
+  ReasonCodeEnumType,
    RequestStartStopStatusEnumType,
  } from '../../../../src/types/index.js'
  import { Constants } from '../../../../src/utils/index.js'
@@ -129,13 +130,25 @@ await describe('F03 - Remote Stop Transaction', async () => {
      })
  
      // FR: F03.FR.08
-    await it('should reject stop transaction for non-existent transaction ID', () => {
+    await it('should reject stop transaction for invalid transaction ID format - non-UUID string', () => {
        const response = testableService.handleRequestStopTransaction(mockStation, {
          transactionId: 'non-existent-transaction-id' as UUIDv4,
        })
  
        assert.notStrictEqual(response, undefined)
        assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+      assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.InvalidValue)
+    })
+
+    // FR: F03.FR.08
+    await it('should reject stop transaction for valid UUID with no matching transaction', () => {
+      const response = testableService.handleRequestStopTransaction(mockStation, {
+        transactionId: '00000000-0000-4000-8000-000000000000',
+      })
+
+      assert.notStrictEqual(response, undefined)
+      assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+      assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.TxNotFound)
      })
  
      // FR: F03.FR.08
@@ -146,6 +159,7 @@ await describe('F03 - Remote Stop Transaction', async () => {
  
        assert.notStrictEqual(response, undefined)
        assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+      assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.InvalidValue)
      })
  
      // FR: F03.FR.08
@@ -156,6 +170,7 @@ await describe('F03 - Remote Stop Transaction', async () => {
  
        assert.notStrictEqual(response, undefined)
        assert.strictEqual(response.status, RequestStartStopStatusEnumType.Rejected)
+      assert.strictEqual(response.statusInfo?.reasonCode, ReasonCodeEnumType.InvalidValue)
      })
  
      // FR: F03.FR.02
diff --git a/ui/common/src/errors.ts b/ui/common/src/errors.ts

index 6aebfe90199eb31f64424757321bddf8a6b246e3..9665cb9c8ebeb150d3bb481ea21cfec46358be7e 100644 (file)
--- a/ui/common/src/errors.ts
+++ b/ui/common/src/errors.ts
@@ -1,12 +1,12 @@
  import type { ResponsePayload } from './types/UIProtocol.js'
  
  export class ConnectionError extends Error {
+  public override readonly name = 'ConnectionError' as const
    public readonly url: string
  
    public constructor (url: string, cause?: unknown) {
      const causeMsg = cause instanceof Error && cause.message.length > 0 ? `: ${cause.message}` : ''
      super(`Failed to connect to ${url}${causeMsg}`)
-    this.name = 'ConnectionError'
      this.url = url
      if (cause != null) {
        this.cause = cause
@@ -15,6 +15,7 @@ export class ConnectionError extends Error {
  }
  
  export class ServerFailureError extends Error {
+  public override readonly name = 'ServerFailureError' as const
    public readonly payload: ResponsePayload
  
    public constructor (payload: ResponsePayload) {
@@ -23,7 +24,6 @@ export class ServerFailureError extends Error {
          ? `: ${payload.hashIdsFailed.length.toString()} station(s) failed`
          : ''
      super(`Server returned failure status${details}`)
-    this.name = 'ServerFailureError'
      this.payload = payload
    }
  }
author	Jérôme Benoit <jerome.benoit@piment-noir.org>
	Mon, 29 Jun 2026 22:34:53 +0000 (00:34 +0200)
committer	GitHub <noreply@github.com>
	Mon, 29 Jun 2026 22:34:53 +0000 (00:34 +0200)
README.md		patch \| blob \| blame \| history
src/charging-station/Bootstrap.ts		patch \| blob \| blame \| history
src/charging-station/BootstrapStateUtils.ts		patch \| blob \| blame \| history
src/charging-station/ChargingStation.ts		patch \| blob \| blame \| history
src/charging-station/TemplateSchema.ts		patch \| blob \| blame \| history
src/charging-station/TemplateValidation.ts		patch \| blob \| blame \| history
src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts		patch \| blob \| blame \| history
src/charging-station/ocpp/1.6/OCPP16ServiceUtils.ts		patch \| blob \| blame \| history
src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts		patch \| blob \| blame \| history
src/charging-station/ocpp/2.0/OCPP20ServiceUtils.ts		patch \| blob \| blame \| history
src/charging-station/ocpp/OCPPIncomingRequestService.ts		patch \| blob \| blame \| history
src/charging-station/ocpp/OCPPResponseService.ts		patch \| blob \| blame \| history
src/charging-station/ocpp/OCPPServiceUtils.ts		patch \| blob \| blame \| history
src/charging-station/ocpp/OCPPSignedMeterValueUtils.ts		patch \| blob \| blame \| history
src/charging-station/ocpp/auth/types/AuthTypes.ts		patch \| blob \| blame \| history
src/charging-station/ui-server/AbstractUIServer.ts		patch \| blob \| blame \| history
src/charging-station/ui-server/UIServerAccessPolicy.ts		patch \| blob \| blame \| history
src/charging-station/ui-server/UIServerNet.ts		patch \| blob \| blame \| history
src/charging-station/ui-server/UIServerSecurity.ts		patch \| blob \| blame \| history
src/charging-station/ui-server/mcp/MCPResources.ts		patch \| blob \| blame \| history
src/charging-station/ui-server/ui-services/AbstractUIService.ts		patch \| blob \| blame \| history
src/exception/OCPPError.ts		patch \| blob \| blame \| history
src/exception/TimeoutError.ts	[new file with mode: 0644]	patch \| blob
src/exception/index.ts		patch \| blob \| blame \| history
src/utils/Configuration.ts		patch \| blob \| blame \| history
src/utils/ConfigurationMigrations.ts		patch \| blob \| blame \| history
src/utils/ConfigurationSchema.ts		patch \| blob \| blame \| history
src/utils/ConfigurationValidation.ts		patch \| blob \| blame \| history
src/utils/Utils.ts		patch \| blob \| blame \| history
tests/charging-station/TemplateSchema.test.ts		patch \| blob \| blame \| history
tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-MasterPass.test.ts		patch \| blob \| blame \| history
tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStartTransaction.test.ts		patch \| blob \| blame \| history
tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts		patch \| blob \| blame \| history
ui/common/src/errors.ts		patch \| blob \| blame \| history