From: Jérôme Benoit Date: Sun, 9 Nov 2025 13:50:02 +0000 (+0100) Subject: chore: harmonize string casting X-Git-Tag: ocpp-server@v2.2.0~52^2~17 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=d9ad5c7d0017626a97016f3dfca08b28c742e783;p=e-mobility-charging-stations-simulator.git chore: harmonize string casting Signed-off-by: Jérôme Benoit --- diff --git a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts index 2e2cdf67..0cdfae66 100644 --- a/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts +++ b/src/charging-station/ocpp/2.0/OCPP20IncomingRequestService.ts @@ -287,7 +287,7 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService { ) as typeof getVariablesResponse.getVariableResult logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetVariables: Processed ${String(commandPayload.getVariableData.length)} variable requests, returning ${String(results.length)} results` + `${chargingStation.logPrefix()} ${moduleName}.handleRequestGetVariables: Processed ${commandPayload.getVariableData.length.toString()} variable requests, returning ${results.length.toString()} results` ) return getVariablesResponse @@ -376,7 +376,7 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService { ) as typeof setVariablesResponse.setVariableResult logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.handleRequestSetVariables: Processed ${String(commandPayload.setVariableData.length)} variable requests, returning ${String(results.length)} results` + `${chargingStation.logPrefix()} ${moduleName}.handleRequestSetVariables: Processed ${commandPayload.setVariableData.length.toString()} variable requests, returning ${results.length.toString()} results` ) return setVariablesResponse @@ -917,7 +917,7 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService { // Get the first connector for this EVSE const evse = chargingStation.evses.get(evseId) if (evse == null) { - const errorMsg = `EVSE ${String(evseId)} not found on charging station` + const errorMsg = `EVSE ${evseId.toString()} does not exist on charging station` logger.error( `${chargingStation.logPrefix()} ${moduleName}.handleRequestRequestStartTransaction: ${errorMsg}` ) @@ -1107,7 +1107,7 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService { const connectorId = chargingStation.getConnectorIdByTransactionId(transactionId) if (connectorId == null) { logger.warn( - `${chargingStation.logPrefix()} ${moduleName}.handleRequestRequestStopTransaction: Transaction ID ${transactionId} not found on any connector` + `${chargingStation.logPrefix()} ${moduleName}.handleRequestRequestStopTransaction: Transaction ID ${transactionId} does not exist on any connector` ) return { status: RequestStartStopStatusEnumType.Rejected, @@ -1180,7 +1180,7 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService { return { status: ResetStatusEnumType.Rejected, statusInfo: { - additionalInfo: `EVSE ${evseId.toString()} does not exist on this charging station`, + additionalInfo: `EVSE ${evseId.toString()} does not exist on charging station`, reasonCode: ReasonCodeEnumType.UnknownEvse, }, } @@ -1523,7 +1523,7 @@ export class OCPP20IncomingRequestService extends OCPPIncomingRequestService { // 4. Time constraints and validity logger.debug( - `${chargingStation.logPrefix()} ${moduleName}.validateChargingProfile: Validating charging profile ${String(chargingProfile.id)} for EVSE ${String(evseId)}` + `${chargingStation.logPrefix()} ${moduleName}.validateChargingProfile: Validating charging profile ${chargingProfile.id.toString()} for EVSE ${evseId.toString()}` ) // For now, return true to allow development/testing diff --git a/src/charging-station/ocpp/2.0/OCPP20VariableManager.ts b/src/charging-station/ocpp/2.0/OCPP20VariableManager.ts index 8fc9eac0..eccd3e82 100644 --- a/src/charging-station/ocpp/2.0/OCPP20VariableManager.ts +++ b/src/charging-station/ocpp/2.0/OCPP20VariableManager.ts @@ -285,7 +285,7 @@ export class OCPP20VariableManager { } const minValue = this.minSetOverrides.get(variableKey) ?? - (variableMetadata.min !== undefined ? String(variableMetadata.min) : '') + (variableMetadata.min !== undefined ? variableMetadata.min.toString() : '') return { attributeStatus: GetVariableStatusEnumType.Accepted, attributeType: resolvedAttributeType, @@ -307,7 +307,7 @@ export class OCPP20VariableManager { } const maxValue = this.maxSetOverrides.get(variableKey) ?? - (variableMetadata.max !== undefined ? String(variableMetadata.max) : '') + (variableMetadata.max !== undefined ? variableMetadata.max.toString() : '') return { attributeStatus: GetVariableStatusEnumType.Accepted, attributeType: resolvedAttributeType, @@ -675,7 +675,7 @@ export class OCPP20VariableManager { if (resolvedAttributeType === AttributeEnumType.MinSet) { const currentMax = this.maxSetOverrides.get(variableKey) ?? - (variableMetadata.max !== undefined ? String(variableMetadata.max) : undefined) + (variableMetadata.max !== undefined ? variableMetadata.max.toString() : undefined) if (currentMax != null && intValue > convertToIntOrNaN(currentMax)) { return this.rejectSet( variable, @@ -690,7 +690,7 @@ export class OCPP20VariableManager { } else { const currentMin = this.minSetOverrides.get(variableKey) ?? - (variableMetadata.min !== undefined ? String(variableMetadata.min) : undefined) + (variableMetadata.min !== undefined ? variableMetadata.min.toString() : undefined) if (currentMin != null && intValue < convertToIntOrNaN(currentMin)) { return this.rejectSet( variable, diff --git a/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts b/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts index c536e621..c4eaa2aa 100644 --- a/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts +++ b/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts @@ -2434,7 +2434,7 @@ export function validateValue ( ): { info?: string; ok: boolean; reason?: ReasonCodeEnumType } { if (variableMetadata.maxLength != null && rawValue.length > variableMetadata.maxLength) { return { - info: 'Value exceeds maximum length (' + String(variableMetadata.maxLength) + ')', + info: 'Value exceeds maximum length (' + variableMetadata.maxLength.toString() + ')', ok: false, reason: ReasonCodeEnumType.InvalidValue, } @@ -2485,14 +2485,14 @@ export function validateValue ( } if (variableMetadata.min != null && num < variableMetadata.min) { return { - info: 'Decimal value below minimum (' + String(variableMetadata.min) + ')', + info: 'Decimal value below minimum (' + variableMetadata.min.toString() + ')', ok: false, reason: ReasonCodeEnumType.ValueTooLow, } } if (variableMetadata.max != null && num > variableMetadata.max) { return { - info: 'Decimal value above maximum (' + String(variableMetadata.max) + ')', + info: 'Decimal value above maximum (' + variableMetadata.max.toString() + ')', ok: false, reason: ReasonCodeEnumType.ValueTooHigh, } @@ -2545,14 +2545,14 @@ export function validateValue ( } if (variableMetadata.min != null && num < variableMetadata.min) { return { - info: 'Integer value below minimum (' + String(variableMetadata.min) + ')', + info: 'Integer value below minimum (' + variableMetadata.min.toString() + ')', ok: false, reason: ReasonCodeEnumType.ValueTooLow, } } if (variableMetadata.max != null && num > variableMetadata.max) { return { - info: 'Integer value above maximum (' + String(variableMetadata.max) + ')', + info: 'Integer value above maximum (' + variableMetadata.max.toString() + ')', ok: false, reason: ReasonCodeEnumType.ValueTooHigh, }