fix: adds valid urns for ocpp rpc schemas

connected-hil · Sep 23, 2024 · e5925ed · e5925ed
1 parent 2aee3ee
commit e5925ed
Show file tree

Hide file tree

Showing 13 changed files with 252 additions and 237 deletions.
diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "typescript-eslint": "^7.4.0"
   },
   "dependencies": {
-    "ajv": "^8.12.0",
+    "ajv": "^8.17.1",
     "ajv-formats": "^2.1.1"
   },
   "directories": {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/schemas/v16/index.ts b/src/schemas/v16/index.ts
@@ -83,87 +83,87 @@ import updateFirmwareResponseV16 from "./update-firmware-response.json";
 import updateFirmwareRequestV16 from "./update-firmware.json";
 
 export const schemas = {
-  v16: {
-    authorizeResponseV16,
-    authorizeRequestV16,
-    bootNotificationResponseV16,
-    bootNotificationRequestV16,
-    cancelReservationResponseV16,
-    cancelReservationRequestV16,
-    certificateSignedResponseV16,
-    certificateSignedRequestV16,
-    changeAvailabilityResponseV16,
-    changeAvailabilityRequestV16,
-    changeConfigurationResponseV16,
-    changeConfigurationRequestV16,
-    clearCacheResponseV16,
-    clearCacheRequestV16,
-    clearChargingProfileResponseV16,
-    clearChargingProfileRequestV16,
-    dataTransferResponseV16,
-    dataTransferRequestV16,
-    deleteCertificateResponseV16,
-    deleteCertificateRequestV16,
-    diagnosticsStatusNotificationResponseV16,
-    diagnosticsStatusNotificationRequestV16,
-    extendedTriggerMessageResponseV16,
-    extendedTriggerMessageRequestV16,
-    firmwareStatusNotificationResponseV16,
-    firmwareStatusNotificationRequestV16,
-    getCompositeScheduleResponseV16,
-    getCompositeScheduleRequestV16,
-    getConfigurationResponseV16,
-    getConfigurationRequestV16,
-    getDiagnosticsResponseV16,
-    getDiagnosticsRequestV16,
-    getInstalledCertificateIdsResponseV16,
-    getInstalledCertificateIdsRequestV16,
-    getLocalListVersionResponseV16,
-    getLocalListVersionRequestV16,
-    getLogResponseV16,
-    getLogRequestV16,
-    heartbeatResponseV16,
-    heartbeatRequestV16,
-    installCertificateResponseV16,
-    installCertificateRequestV16,
-    logStatusNotificationResponseV16,
-    logStatusNotificationRequestV16,
-    meterValuesResponseV16,
-    meterValuesRequestV16,
-    remoteStartTransactionResponseV16,
-    remoteStartTransactionRequestV16,
-    remoteStopTransactionResponseV16,
-    remoteStopTransactionRequestV16,
-    reserveNowResponseV16,
-    reserveNowRequestV16,
-    resetResponseV16,
-    resetRequestV16,
-    rpcCallErrorV16,
-    rpcCallResultV16,
-    rpcCallV16,
-    securityEventNotificationResponseV16,
-    securityEventNotificationRequestV16,
-    sendLocalListResponseV16,
-    sendLocalListRequestV16,
-    setChargingProfileResponseV16,
-    setChargingProfileRequestV16,
-    signCertificateResponseV16,
-    signCertificateRequestV16,
-    signedFirmwareStatusNotificationResponseV16,
-    signedFirmwareStatusNotificationRequestV16,
-    signedUpdateFirmwareResponseV16,
-    signedUpdateFirmwareRequestV16,
-    startTransactionResponseV16,
-    startTransactionRequestV16,
-    statusNotificationResponseV16,
-    statusNotificationRequestV16,
-    stopTransactionResponseV16,
-    stopTransactionRequestV16,
-    triggerMessageResponseV16,
-    triggerMessageRequestV16,
-    unlockConnectorResponseV16,
-    unlockConnectorRequestV16,
-    updateFirmwareResponseV16,
-    updateFirmwareRequestV16
-  }
-};
+    v16: {
+        authorizeResponseV16,
+        authorizeRequestV16,
+        bootNotificationResponseV16,
+        bootNotificationRequestV16,
+        cancelReservationResponseV16,
+        cancelReservationRequestV16,
+        certificateSignedResponseV16,
+        certificateSignedRequestV16,
+        changeAvailabilityResponseV16,
+        changeAvailabilityRequestV16,
+        changeConfigurationResponseV16,
+        changeConfigurationRequestV16,
+        clearCacheResponseV16,
+        clearCacheRequestV16,
+        clearChargingProfileResponseV16,
+        clearChargingProfileRequestV16,
+        dataTransferResponseV16,
+        dataTransferRequestV16,
+        deleteCertificateResponseV16,
+        deleteCertificateRequestV16,
+        diagnosticsStatusNotificationResponseV16,
+        diagnosticsStatusNotificationRequestV16,
+        extendedTriggerMessageResponseV16,
+        extendedTriggerMessageRequestV16,
+        firmwareStatusNotificationResponseV16,
+        firmwareStatusNotificationRequestV16,
+        getCompositeScheduleResponseV16,
+        getCompositeScheduleRequestV16,
+        getConfigurationResponseV16,
+        getConfigurationRequestV16,
+        getDiagnosticsResponseV16,
+        getDiagnosticsRequestV16,
+        getInstalledCertificateIdsResponseV16,
+        getInstalledCertificateIdsRequestV16,
+        getLocalListVersionResponseV16,
+        getLocalListVersionRequestV16,
+        getLogResponseV16,
+        getLogRequestV16,
+        heartbeatResponseV16,
+        heartbeatRequestV16,
+        installCertificateResponseV16,
+        installCertificateRequestV16,
+        logStatusNotificationResponseV16,
+        logStatusNotificationRequestV16,
+        meterValuesResponseV16,
+        meterValuesRequestV16,
+        remoteStartTransactionResponseV16,
+        remoteStartTransactionRequestV16,
+        remoteStopTransactionResponseV16,
+        remoteStopTransactionRequestV16,
+        reserveNowResponseV16,
+        reserveNowRequestV16,
+        resetResponseV16,
+        resetRequestV16,
+        rpcCallErrorV16,
+        rpcCallResultV16,
+        rpcCallV16,
+        securityEventNotificationResponseV16,
+        securityEventNotificationRequestV16,
+        sendLocalListResponseV16,
+        sendLocalListRequestV16,
+        setChargingProfileResponseV16,
+        setChargingProfileRequestV16,
+        signCertificateResponseV16,
+        signCertificateRequestV16,
+        signedFirmwareStatusNotificationResponseV16,
+        signedFirmwareStatusNotificationRequestV16,
+        signedUpdateFirmwareResponseV16,
+        signedUpdateFirmwareRequestV16,
+        startTransactionResponseV16,
+        startTransactionRequestV16,
+        statusNotificationResponseV16,
+        statusNotificationRequestV16,
+        stopTransactionResponseV16,
+        stopTransactionRequestV16,
+        triggerMessageResponseV16,
+        triggerMessageRequestV16,
+        unlockConnectorResponseV16,
+        unlockConnectorRequestV16,
+        updateFirmwareResponseV16,
+        updateFirmwareRequestV16
+    }
+};
diff --git a/src/schemas/v16/rpc-call-error.json b/src/schemas/v16/rpc-call-error.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "urn:RpcCallErrorV16",
+  "$id": "urn:OCPP:1.6:2019:12:RpcCallErrorV16",
   "title": "RpcCallError",
   "type": "array",
   "minItems": 5,

diff --git a/src/schemas/v16/rpc-call-result.json b/src/schemas/v16/rpc-call-result.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "urn:RpcCallResultV16",
+  "$id": "urn:OCPP:1.6:2019:12:RpcCallResultV16",
   "title": "RpcCallResult",
   "type": "array",
   "minItems": 3,

diff --git a/src/schemas/v16/rpc-call.json b/src/schemas/v16/rpc-call.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "urn:RpcCallV16",
+  "$id": "urn:OCPP:1.6:2019:12:RpcCallV16",
   "title": "RpcCall",
   "type": "array",
   "minItems": 4,