From 15ab6c8d9136c70fd413150a2690c6b6d6980f09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Sat, 28 Mar 2026 15:13:11 +0100 Subject: [PATCH] refactor: add SimulateSignatureVerificationFailure to OCPP20VendorVariableName enum Replace string literal with enum reference in OCPP20VariableRegistry and OCPP20IncomingRequestService for type safety and consistency with CertificatePrivateKey and ConnectionUrl vendor variables. --- .../ocpp/2.0/OCPP20IncomingRequestService.ts | 5 ++++- src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts | 7 +++++-- src/types/ocpp/2.0/Variables.ts | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts index d11e88f3..ea2ad85c 100644 --- a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts +++ b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts @@ -106,6 +106,7 @@ import { type OCPP20UnlockConnectorResponse, type OCPP20UpdateFirmwareRequest, type OCPP20UpdateFirmwareResponse, + OCPP20VendorVariableName, OCPPVersion, ReasonCodeEnumType, RegistrationStatusEnumType, @@ -3496,7 +3497,9 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService { { attributeType: AttributeEnumType.Actual, component: { name: OCPP20ComponentName.FirmwareCtrlr as string }, - variable: { name: 'SimulateSignatureVerificationFailure' }, + variable: { + name: OCPP20VendorVariableName.SimulateSignatureVerificationFailure as string, + }, }, ]) const simulateFailure = convertToBoolean(verificationResults[0]?.attributeValue) diff --git a/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts b/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts index e9215789..ee8c06b5 100644 --- a/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts +++ b/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts @@ -984,7 +984,10 @@ export const VARIABLE_REGISTRY: Record = { }, // FirmwareCtrlr Component - [buildRegistryKey(OCPP20ComponentName.FirmwareCtrlr, 'SimulateSignatureVerificationFailure')]: { + [buildRegistryKey( + OCPP20ComponentName.FirmwareCtrlr, + OCPP20VendorVariableName.SimulateSignatureVerificationFailure + )]: { component: OCPP20ComponentName.FirmwareCtrlr, dataType: DataEnumType.boolean, defaultValue: 'false', @@ -993,7 +996,7 @@ export const VARIABLE_REGISTRY: Record = { mutability: MutabilityEnumType.ReadWrite, persistence: PersistenceEnumType.Persistent, supportedAttributes: [AttributeEnumType.Actual], - variable: 'SimulateSignatureVerificationFailure', + variable: OCPP20VendorVariableName.SimulateSignatureVerificationFailure, vendorSpecific: true, }, diff --git a/src/types/ocpp/2.0/Variables.ts b/src/types/ocpp/2.0/Variables.ts index 7a4360e5..b7ab72aa 100644 --- a/src/types/ocpp/2.0/Variables.ts +++ b/src/types/ocpp/2.0/Variables.ts @@ -80,6 +80,7 @@ export enum OCPP20RequiredVariableName { export enum OCPP20VendorVariableName { CertificatePrivateKey = 'CertificatePrivateKey', ConnectionUrl = 'ConnectionUrl', + SimulateSignatureVerificationFailure = 'SimulateSignatureVerificationFailure', } export enum PersistenceEnumType { -- 2.53.0