@open-charging-cloud/chargy-core 0.9.0 → 0.9.1

package/dist/browser/index.js

@@ -9841,11 +9841,16 @@ function CreateWarning(message, level = "low" /* low */) {
     message
   };
 }
-function CreateError(message, level = "high" /* high */) {
-  return {
+function CreateError(message, level = "high" /* high */, code, details) {
+  const error = {
     level,
     message
   };
+  if (code !== void 0)
+    error.code = code;
+  if (details !== void 0)
+    error.details = details;
+  return error;
 }
 function isISessionCryptoResult1(obj) {
   return isObject(obj) && obj["status"] !== void 0;
@@ -10831,6 +10836,20 @@ var ACrypt = class {
       newText.classList.remove("overEntry");
     };
   }
+  // Records why a verification step failed as structured data: a stable reason
+  // key (localized via i18n.json and machine-switchable by the GUI) plus an
+  // optional, language-neutral technical detail. Presentation is left to the GUI.
+  AddVerificationError(cryptoResult, reasonKey, detail) {
+    const details = detail instanceof Error ? detail.message : typeof detail === "string" ? detail : void 0;
+    (cryptoResult.errors ??= []).push(
+      CreateError(
+        this.chargy.GetMultilanguageText(reasonKey),
+        "high" /* high */,
+        reasonKey,
+        details
+      )
+    );
+  }
 };
 var Alfen = class {
   chargy;
@@ -11245,9 +11264,15 @@ var AlfenCrypt01 = class extends ACrypt {
               cryptoResult.publicKey = meter.publicKeys[0]?.value;
               cryptoResult.publicKeyFormat = meter.publicKeys[0]?.format;
               cryptoResult.publicKeySignatures = meter.publicKeys[0]?.signatures;
+              let publicKey;
+              try {
+                publicKey = buf2hex(this.chargy.base32Decode(cryptoResult.publicKey ?? "", "RFC4648"));
+              } catch (exception) {
+                this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed", exception);
+                return setResult("InvalidPublicKey" /* InvalidPublicKey */);
+              }
+              let result = false;
               try {
-                const publicKey = buf2hex(this.chargy.base32Decode(cryptoResult.publicKey ?? "", "RFC4648"));
-                let result = false;
                 switch (meter.publicKeys[0]?.algorithm ?? "") {
                   case "secp192r1":
                     cryptoResult.hashValue = await sha256(cryptoBuffer);
@@ -11292,25 +11317,29 @@ var AlfenCrypt01 = class extends ACrypt {
                     );
                     break;
                 }
-                if (result) {
-                  return setResult("ValidSignature" /* ValidSignature */);
-                }
-                return setResult("InvalidSignature" /* InvalidSignature */);
-              } catch {
+              } catch (exception) {
+                this.AddVerificationError(cryptoResult, "Verification_SignatureMalformed", exception);
                 return setResult("InvalidSignature" /* InvalidSignature */);
               }
-            } catch {
+              if (result)
+                return setResult("ValidSignature" /* ValidSignature */);
+              this.AddVerificationError(cryptoResult, "Verification_SignatureMismatch");
+              return setResult("InvalidSignature" /* InvalidSignature */);
+            } catch (exception) {
+              this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed", exception);
               return setResult("InvalidPublicKey" /* InvalidPublicKey */);
             }
           } else
             return setResult("PublicKeyNotFound" /* PublicKeyNotFound */);
         } else
           return setResult("EnergyMeterNotFound" /* EnergyMeterNotFound */);
-      } catch {
+      } catch (exception) {
+        this.AddVerificationError(cryptoResult, "Verification_UnexpectedError", exception);
         return setResult("InvalidSignature" /* InvalidSignature */);
       }
     }
-    return {};
+    this.AddVerificationError(cryptoResult, "Verification_SignatureMissing");
+    return setResult("InvalidSignature" /* InvalidSignature */);
   }
   async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
     const result = measurementValue.result;
@@ -12149,33 +12178,46 @@ var BSMCrypt01 = class extends ACrypt {
                 const publicKeyDER = ASN1_PublicKey.decode(Buffer.from(meter.publicKeys[0]?.value ?? "", "hex"), "der");
                 publicKey = buf2hex(publicKeyDER.publicKey.data).toLowerCase();
               }
+              let keyPair;
               try {
-                if (this.curve.keyFromPublic(publicKey, "hex").verify(
-                  cryptoResult.sha256value,
-                  cryptoResult.signature
-                )) {
-                  if (measurementValue.errors && measurementValue.errors.length > 0)
-                    return setResult("ValidationError" /* ValidationError */);
-                  return setResult("ValidSignature" /* ValidSignature */);
-                }
-                if (measurementValue.errors && measurementValue.errors.length > 0)
-                  return setResult("ValidationError" /* ValidationError */);
-                return setResult("InvalidSignature" /* InvalidSignature */);
-              } catch {
+                keyPair = this.curve.keyFromPublic(publicKey, "hex");
+              } catch (exception) {
+                this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed", exception);
+                return setResult("InvalidPublicKey" /* InvalidPublicKey */);
+              }
+              const keyValidation = keyPair.validate();
+              if (!keyValidation.result) {
+                this.AddVerificationError(cryptoResult, "Verification_PublicKeyNotOnCurve", keyValidation.reason ?? void 0);
+                return setResult("InvalidPublicKey" /* InvalidPublicKey */);
+              }
+              let signatureValid;
+              try {
+                signatureValid = keyPair.verify(cryptoResult.sha256value, cryptoResult.signature);
+              } catch (exception) {
+                this.AddVerificationError(cryptoResult, "Verification_SignatureMalformed", exception);
                 return setResult("InvalidSignature" /* InvalidSignature */);
               }
-            } catch {
+              if (measurementValue.errors && measurementValue.errors.length > 0)
+                return setResult("ValidationError" /* ValidationError */);
+              if (signatureValid)
+                return setResult("ValidSignature" /* ValidSignature */);
+              this.AddVerificationError(cryptoResult, "Verification_SignatureMismatch");
+              return setResult("InvalidSignature" /* InvalidSignature */);
+            } catch (exception) {
+              this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed", exception);
               return setResult("InvalidPublicKey" /* InvalidPublicKey */);
             }
           } else
             return setResult("PublicKeyNotFound" /* PublicKeyNotFound */);
         } else
           return setResult("EnergyMeterNotFound" /* EnergyMeterNotFound */);
-      } catch {
+      } catch (exception) {
+        this.AddVerificationError(cryptoResult, "Verification_UnexpectedError", exception);
         return setResult("InvalidSignature" /* InvalidSignature */);
       }
     }
-    return {};
+    this.AddVerificationError(cryptoResult, "Verification_SignatureMissing");
+    return setResult("InvalidSignature" /* InvalidSignature */);
   }
   async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
     if (measurementValue.measurement === void 0)
@@ -12354,35 +12396,7 @@ var BSMCrypt01 = class extends ACrypt {
     if ((value & 1 << 29) != 0) events.push("OEM 15");
     return events;
   }
-  // private DecodeStatus(statusValue: string) : Array<string>
-  // {
-  //     const statusArray:string[] = [];
-  //     try
-  //     {
-  //         const status = parseInt(statusValue);
-  //         if ((status &  1) ==  1)
-  //             statusArray.push("Fehler erkannt");
-  //         if ((status &  2) ==  2)
-  //             statusArray.push("Synchrone Messwertübermittlung");
-  //         // Bit 3 is reserved!
-  //         if ((status &  8) ==  8)
-  //             statusArray.push("System-Uhr ist synchron");
-  //         else
-  //             statusArray.push("System-Uhr ist nicht synchron");
-  //         if ((status & 16) == 16)
-  //             statusArray.push("Rücklaufsperre aktiv");
-  //         if ((status & 32) == 32)
-  //             statusArray.push("Energierichtung -A");
-  //         if ((status & 64) == 64)
-  //             statusArray.push("Magnetfeld erkannt");
-  //     }
-  //     catch
-  //     {
-  //         statusArray.push("Invalid status!");
-  //     }
-  //     return statusArray;
-  // }
-  // //#endregion
+  //#endregion
 };
 
 // src/interfaces/IPublicKeyInfo.ts
@@ -13841,29 +13855,44 @@ var EMHCrypt01 = class extends ACrypt {
               cryptoResult.publicKey = publicKey?.value.toLowerCase();
               cryptoResult.publicKeyFormat = publicKey?.format;
               cryptoResult.publicKeySignatures = publicKey?.signatures;
+              let keyPair;
               try {
-                if (this.curve.keyFromPublic(cryptoResult.publicKey ?? "", "hex").verify(
-                  cryptoResult.sha256value,
-                  cryptoResult.signature
-                )) {
-                  return setResult("ValidSignature" /* ValidSignature */);
-                }
-                return setResult("InvalidSignature" /* InvalidSignature */);
-              } catch {
+                keyPair = this.curve.keyFromPublic(cryptoResult.publicKey ?? "", "hex");
+              } catch (exception) {
+                this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed", exception);
+                return setResult("InvalidPublicKey" /* InvalidPublicKey */);
+              }
+              const keyValidation = keyPair.validate();
+              if (!keyValidation.result) {
+                this.AddVerificationError(cryptoResult, "Verification_PublicKeyNotOnCurve", keyValidation.reason ?? void 0);
+                return setResult("InvalidPublicKey" /* InvalidPublicKey */);
+              }
+              let signatureValid;
+              try {
+                signatureValid = keyPair.verify(cryptoResult.sha256value, cryptoResult.signature);
+              } catch (exception) {
+                this.AddVerificationError(cryptoResult, "Verification_SignatureMalformed", exception);
                 return setResult("InvalidSignature" /* InvalidSignature */);
               }
-            } catch {
+              if (signatureValid)
+                return setResult("ValidSignature" /* ValidSignature */);
+              this.AddVerificationError(cryptoResult, "Verification_SignatureMismatch");
+              return setResult("InvalidSignature" /* InvalidSignature */);
+            } catch (exception) {
+              this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed", exception);
               return setResult("InvalidPublicKey" /* InvalidPublicKey */);
             }
           } else
             return setResult("PublicKeyNotFound" /* PublicKeyNotFound */);
         } else
           return setResult("EnergyMeterNotFound" /* EnergyMeterNotFound */);
-      } catch {
+      } catch (exception) {
+        this.AddVerificationError(cryptoResult, "Verification_UnexpectedError", exception);
         return setResult("InvalidSignature" /* InvalidSignature */);
       }
     }
-    return {};
+    this.AddVerificationError(cryptoResult, "Verification_SignatureMissing");
+    return setResult("InvalidSignature" /* InvalidSignature */);
   }
   async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
     if (measurementValue.measurement?.chargingSession?.authorizationStart?.timestamp === void 0) {
@@ -13971,7 +14000,7 @@ var EMHCrypt01 = class extends ACrypt {
   DecodeStatus(statusValue) {
     const statusArray = [];
     try {
-      const status = parseInt(statusValue);
+      const status = parseInt(statusValue, 16);
       if ((status & 1) == 1)
         statusArray.push("Fehler erkannt");
       if ((status & 2) == 2)
@@ -14073,29 +14102,44 @@ var GDFCrypt01 = class extends ACrypt {
               cryptoResult.publicKey = publicKey?.value.toLowerCase();
               cryptoResult.publicKeyFormat = publicKey?.format;
               cryptoResult.publicKeySignatures = publicKey?.signatures;
+              let keyPair;
               try {
-                if (this.curve.keyFromPublic(cryptoResult.publicKey ?? "", "hex").verify(
-                  cryptoResult.sha256value,
-                  cryptoResult.signature
-                )) {
-                  return setResult("ValidSignature" /* ValidSignature */);
-                }
-                return setResult("InvalidSignature" /* InvalidSignature */);
-              } catch {
+                keyPair = this.curve.keyFromPublic(cryptoResult.publicKey ?? "", "hex");
+              } catch (exception) {
+                this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed", exception);
+                return setResult("InvalidPublicKey" /* InvalidPublicKey */);
+              }
+              const keyValidation = keyPair.validate();
+              if (!keyValidation.result) {
+                this.AddVerificationError(cryptoResult, "Verification_PublicKeyNotOnCurve", keyValidation.reason ?? void 0);
+                return setResult("InvalidPublicKey" /* InvalidPublicKey */);
+              }
+              let signatureValid;
+              try {
+                signatureValid = keyPair.verify(cryptoResult.sha256value, cryptoResult.signature);
+              } catch (exception) {
+                this.AddVerificationError(cryptoResult, "Verification_SignatureMalformed", exception);
                 return setResult("InvalidSignature" /* InvalidSignature */);
               }
-            } catch {
+              if (signatureValid)
+                return setResult("ValidSignature" /* ValidSignature */);
+              this.AddVerificationError(cryptoResult, "Verification_SignatureMismatch");
+              return setResult("InvalidSignature" /* InvalidSignature */);
+            } catch (exception) {
+              this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed", exception);
               return setResult("InvalidPublicKey" /* InvalidPublicKey */);
             }
           } else
             return setResult("PublicKeyNotFound" /* PublicKeyNotFound */);
         } else
           return setResult("EnergyMeterNotFound" /* EnergyMeterNotFound */);
-      } catch {
+      } catch (exception) {
+        this.AddVerificationError(cryptoResult, "Verification_UnexpectedError", exception);
         return setResult("InvalidSignature" /* InvalidSignature */);
       }
     }
-    return {};
+    this.AddVerificationError(cryptoResult, "Verification_SignatureMissing");
+    return setResult("InvalidSignature" /* InvalidSignature */);
   }
   async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
     if (measurementValue.measurement?.chargingSession?.authorizationStart?.timestamp === void 0) {
@@ -14434,19 +14478,38 @@ var MennekesCrypt01 = class extends ACrypt {
       );
       cryptoResult.hashValue = (await sha256(new DataView(signedDataBuffer))).substring(0, 48);
       const publicKey = cleanHex(meter.publicKeys.at(0)?.value ?? measurement.publicKey);
-      if (publicKey.length !== 96)
+      if (publicKey.length !== 96) {
+        this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed");
         return setResult("InvalidPublicKey" /* InvalidPublicKey */);
-      const result = this.curve192r1.keyFromPublic("04" + publicKey, "hex").verify(
-        cryptoResult.hashValue.toUpperCase(),
-        {
+      }
+      let keyPair;
+      try {
+        keyPair = this.curve192r1.keyFromPublic("04" + publicKey, "hex");
+      } catch (exception) {
+        this.AddVerificationError(cryptoResult, "Verification_PublicKeyDecodingFailed", exception);
+        return setResult("InvalidPublicKey" /* InvalidPublicKey */);
+      }
+      const keyValidation = keyPair.validate();
+      if (!keyValidation.result) {
+        this.AddVerificationError(cryptoResult, "Verification_PublicKeyNotOnCurve", keyValidation.reason ?? void 0);
+        return setResult("InvalidPublicKey" /* InvalidPublicKey */);
+      }
+      let signatureValid;
+      try {
+        signatureValid = keyPair.verify(cryptoResult.hashValue.toUpperCase(), {
           r: signatureExpected.r,
           s: signatureExpected.s
-        }
-      );
-      return setResult(
-        result ? "ValidSignature" /* ValidSignature */ : "InvalidSignature" /* InvalidSignature */
-      );
-    } catch {
+        });
+      } catch (exception) {
+        this.AddVerificationError(cryptoResult, "Verification_SignatureMalformed", exception);
+        return setResult("InvalidSignature" /* InvalidSignature */);
+      }
+      if (signatureValid)
+        return setResult("ValidSignature" /* ValidSignature */);
+      this.AddVerificationError(cryptoResult, "Verification_SignatureMismatch");
+      return setResult("InvalidSignature" /* InvalidSignature */);
+    } catch (exception) {
+      this.AddVerificationError(cryptoResult, "Verification_UnexpectedError", exception);
       return setResult("InvalidSignature" /* InvalidSignature */);
     }
   }
@@ -15424,7 +15487,9 @@ var OCMF = class {
                 //                            "value":  ocmfJSONDocument.signature["SD"]
                 //                        }],
                 "result": {
-                  "status": ocmfJSONDocument.validationStatus ?? "Unvalidated" /* Unvalidated */
+                  "status": ocmfJSONDocument.validationStatus ?? "Unvalidated" /* Unvalidated */,
+                  // Surface the per-document verification diagnostics on the measurement value.
+                  ...ocmfJSONDocument.validationErrors && ocmfJSONDocument.validationErrors.length > 0 ? { errors: ocmfJSONDocument.validationErrors } : {}
                 },
                 "ocmfDocument": ocmfJSONDocument
               });
@@ -15569,6 +15634,20 @@ var OCMF = class {
   //     return mergedCTR;
   // }
   // //#endregion
+  // Records why a verification step failed as structured data: a stable reason
+  // key (localized via i18n.json and machine-switchable by the GUI) plus an
+  // optional, language-neutral technical detail. Presentation is left to the GUI.
+  AddValidationError(OCMFJSONDocument, reasonKey, detail) {
+    const details = detail instanceof Error ? detail.message : typeof detail === "string" ? detail : void 0;
+    (OCMFJSONDocument.validationErrors ??= []).push(
+      CreateError(
+        this.chargy.GetMultilanguageText(reasonKey),
+        "high" /* high */,
+        reasonKey,
+        details
+      )
+    );
+  }
   //#region (private) validateOCMFSignature(OCMFJSONDocument, PublicKey, PublicKeyEncoding?)
   async validateOCMFSignature(OCMFJSONDocument, PublicKey, PublicKeyEncoding) {
     try {
@@ -15608,7 +15687,8 @@ var OCMF = class {
             curve = new this.chargy.elliptic.ec("p256");
             break;
         }
-      } catch {
+      } catch (exception) {
+        this.AddValidationError(OCMFJSONDocument, "Verification_UnknownSignatureFormat", exception);
         OCMFJSONDocument.validationStatus = "UnknownSignatureFormat" /* UnknownSignatureFormat */;
         return OCMFJSONDocument.validationStatus;
       }
@@ -15685,20 +15765,26 @@ var OCMF = class {
             y: OCMFJSONDocument.publicKey.y
           }, "hex");
         }
-      } catch {
+      } catch (exception) {
+        this.AddValidationError(OCMFJSONDocument, "Verification_PublicKeyDecodingFailed", exception);
         OCMFJSONDocument.validationStatus = "InvalidPublicKey" /* InvalidPublicKey */;
         return OCMFJSONDocument.validationStatus;
       }
       try {
         if (publicKey === null)
           throw new Error("Missing public key!");
-        OCMFJSONDocument.validationStatus = publicKey.verify(OCMFJSONDocument.hashValue, OCMFJSONDocument.signatureRS) ? "ValidSignature" /* ValidSignature */ : "InvalidSignature" /* InvalidSignature */;
+        const signatureValid = publicKey.verify(OCMFJSONDocument.hashValue, OCMFJSONDocument.signatureRS);
+        if (!signatureValid)
+          this.AddValidationError(OCMFJSONDocument, "Verification_SignatureMismatch");
+        OCMFJSONDocument.validationStatus = signatureValid ? "ValidSignature" /* ValidSignature */ : "InvalidSignature" /* InvalidSignature */;
         return await Promise.resolve(OCMFJSONDocument.validationStatus);
-      } catch {
+      } catch (exception) {
+        this.AddValidationError(OCMFJSONDocument, "Verification_SignatureMalformed", exception);
         OCMFJSONDocument.validationStatus = "InvalidSignature" /* InvalidSignature */;
         return OCMFJSONDocument.validationStatus;
       }
-    } catch {
+    } catch (exception) {
+      this.AddValidationError(OCMFJSONDocument, "Verification_UnexpectedError", exception);
       OCMFJSONDocument.validationStatus = "InvalidSignature" /* InvalidSignature */;
       return OCMFJSONDocument.validationStatus;
     }
@@ -19647,6 +19733,26 @@ var Chargy = class {
       return textContent.replace(/\s+/g, "");
     return void 0;
   }
+  TryToCreatePublicKeyLookup(processedFiles) {
+    if (processedFiles.length === 0)
+      return void 0;
+    const publicKeys = new Array();
+    for (const processedFile of processedFiles) {
+      if (IsAChargeTransparencyRecord(processedFile.result) || IsAChargeTransparencyLiveLink(processedFile.result)) {
+        return void 0;
+      }
+      if (IsAPublicKey(processedFile.result))
+        publicKeys.push(processedFile.result);
+      else if (IsAPublicKeyLookup(processedFile.result))
+        publicKeys.push(...processedFile.result.publicKeys);
+      else
+        return void 0;
+    }
+    if (processedFiles.length === 1 && IsAPublicKeyLookup(processedFiles[0]?.result)) {
+      return processedFiles[0].result;
+    }
+    return { publicKeys };
+  }
   //#endregion
   //#region QR code image files...
   normalizeMIMEType(mimeType) {
@@ -20405,18 +20511,15 @@ var Chargy = class {
       }
       processedFiles.push(processedFile);
     }
+    const publicKeyLookup = this.TryToCreatePublicKeyLookup(processedFiles);
+    if (publicKeyLookup != null)
+      return publicKeyLookup;
     if (processedFiles.length == 1) {
       const processedFile = getFirstArrayElement(processedFiles, "Missing processed file");
       if (IsAChargeTransparencyRecord(processedFile.result))
         return this.processChargeTransparencyRecord(processedFile.result);
       if (IsAChargeTransparencyLiveLink(processedFile.result))
         return processedFile.result;
-      if (IsAPublicKeyLookup(processedFile.result))
-        return {
-          status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-          message: this.GetMultilanguageText("UnknownOrInvalidChargeTransparencyRecord"),
-          certainty: 0
-        };
       return processedFile.result;
     } else if (processedFiles.length > 1) {
       const mergedCTR = {