@open-charging-cloud/chargy-core 0.11.2 → 0.12.0

package/dist/node/index.js

@@ -5,6 +5,7 @@ import { ed448ph, ed448 } from '@noble/curves/ed448.js';
 import { p521, p384, p256 } from '@noble/curves/nist.js';
 import { secp256k1 } from '@noble/curves/secp256k1.js';
 import { ml_dsa87, ml_dsa65, ml_dsa44 } from '@noble/post-quantum/ml-dsa.js';
+import { sha256 as sha256$1 } from '@noble/hashes/sha2.js';
 import { Buffer as Buffer$1 } from 'buffer';
 import { fileTypeFromBuffer } from 'file-type';
 import isURL from 'is-url-superb';
@@ -54,7 +55,7 @@ var IECCurves = /* @__PURE__ */ ((IECCurves2) => {
   IECCurves2["secp256k1"] = "secp256k1";
   IECCurves2["secp256r1"] = "secp256r1";
   IECCurves2["secp384r1"] = "secp384r1";
-  IECCurves2["secp512r1"] = "secp512r1";
+  IECCurves2["secp521r1"] = "secp521r1";
   return IECCurves2;
 })(IECCurves || {});
 var IEncoding = /* @__PURE__ */ ((IEncoding2) => {
@@ -515,12 +516,45 @@ function SetHex(dv, hex, offset, reverse) {
   }
   return buf2hex(buffer);
 }
+var meterTimeZone = "Europe/Berlin";
+var statesItsOwnUTCOffset = /[+-]\d{2}:?\d{2}$/;
+function timeZoneOffsetMinutes(instant, timeZone = meterTimeZone) {
+  const parts = new Intl.DateTimeFormat("en-US", {
+    timeZone,
+    hour12: false,
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit"
+  }).formatToParts(instant);
+  const field = (type) => Number(parts.find((part) => part.type === type)?.value ?? "0");
+  const asUTC = Date.UTC(
+    field("year"),
+    field("month") - 1,
+    field("day"),
+    field("hour") % 24,
+    // Intl may report midnight as hour 24
+    field("minute"),
+    field("second")
+  );
+  return (asUTC - Math.floor(instant.getTime() / 1e3) * 1e3) / 6e4;
+}
+function meterLocalTime(timestamp) {
+  if (typeof timestamp !== "string")
+    return { moment: timestamp, offsetMinutes: timestamp.utcOffset() };
+  const parsed = moment.parseZone(timestamp);
+  return {
+    moment: parsed,
+    offsetMinutes: statesItsOwnUTCOffset.test(timestamp.trim()) ? parsed.utcOffset() : timeZoneOffsetMinutes(new Date(parsed.valueOf()))
+  };
+}
 function SetTimestamp(dv, timestamp, offset, addLocalOffset = true) {
   if (timestamp == void 0)
     throw new Error("Timestamp is missing!");
-  if (typeof timestamp === "string")
-    timestamp = parseUTC(timestamp);
-  const unixtime = timestamp.unix() + (addLocalOffset ? 60 * timestamp.utcOffset() : 0);
+  const meterTime = meterLocalTime(timestamp);
+  const unixtime = meterTime.moment.unix() + (addLocalOffset ? 60 * meterTime.offsetMinutes : 0);
   const bytes = getInt64Bytes(unixtime);
   const buffer = new ArrayBuffer(8);
   const tv = new DataView(buffer);
@@ -533,9 +567,8 @@ function SetTimestamp(dv, timestamp, offset, addLocalOffset = true) {
 function SetTimestamp32(dv, timestamp, offset, addLocalOffset = true) {
   if (timestamp == void 0)
     throw new Error("Timestamp is missing!");
-  if (typeof timestamp === "string")
-    timestamp = parseUTC(timestamp);
-  const unixtime = timestamp.unix() + (addLocalOffset ? 60 * timestamp.utcOffset() : 0);
+  const meterTime = meterLocalTime(timestamp);
+  const unixtime = meterTime.moment.unix() + (addLocalOffset ? 60 * meterTime.offsetMinutes : 0);
   const bytes = getInt64Bytes(unixtime);
   const buffer = new ArrayBuffer(4);
   const tv = new DataView(buffer);
@@ -945,7 +978,10 @@ var secp224k1 = class {
   N = BigInt("0x010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7");
   // Number of points in the field
   Acurve = BigInt(0);
-  // Defined on the elliptic curve. y^2 = x^3 + Acurve * x + 5
+  // Defined on the elliptic curve. y^2 = x^3 + Acurve * x + Bcurve
+  Bcurve = BigInt(5);
+  // secp224k1 has a = 0 and b = 5, and a cofactor of 1, so every
+  // point on the curve except infinity has order N.
   Gx = BigInt("0xA1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C");
   Gy = BigInt("0x7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5");
   GPoint = [this.Gx, this.Gy];
@@ -959,16 +995,42 @@ var secp224k1 = class {
     }
     return null;
   }
+  // Returns true only for a signature that verifies against a public key which
+  // is a valid point on the curve. Every other outcome is false, including a
+  // point off the curve and any failure while computing, so that a caller
+  // trying several candidate keys is never interrupted by an exception.
   validate(hash, signatureR, signatureS, PublicKey) {
-    if (signatureR == this.Zero || signatureR >= this.N)
+    if (signatureR <= this.Zero || signatureR >= this.N)
       throw new Error("Invalid R");
-    if (signatureS == this.Zero || signatureS >= this.N)
+    if (signatureS <= this.Zero || signatureS >= this.N)
       throw new Error("Invalid S");
-    const w = this.modInv(signatureS, this.N);
-    const u1 = this.ECmultiply(this.GPoint, this.modulo(w * hash, this.N));
-    const u2 = this.ECmultiply(PublicKey, this.modulo(w * signatureR, this.N));
-    const validation = this.ECadd(u1, u2);
-    return validation[0] == signatureR;
+    if (!this.isOnCurve(PublicKey))
+      return false;
+    try {
+      const w = this.modInv(signatureS, this.N);
+      const u1 = this.ECmultiply(this.GPoint, this.modulo(w * hash, this.N));
+      const u2 = this.ECmultiply(PublicKey, this.modulo(w * signatureR, this.N));
+      const validation = this.ECadd(u1, u2);
+      const x = validation[0];
+      if (x === void 0)
+        return false;
+      return this.modulo(x, this.N) === signatureR;
+    } catch {
+      return false;
+    }
+  }
+  // y^2 == x^3 + Acurve * x + Bcurve (mod Pcurve), with both coordinates
+  // reduced. The point at infinity has no [x, y] representation here and is
+  // therefore rejected along with everything else that is malformed.
+  isOnCurve(point) {
+    const x = point[0];
+    const y = point[1];
+    if (x === void 0 || y === void 0)
+      return false;
+    if (x < this.Zero || x >= this.Pcurve || y < this.Zero || y >= this.Pcurve) {
+      return false;
+    }
+    return this.modulo(y * y, this.Pcurve) === this.modulo(x * x * x + this.Acurve * x + this.Bcurve, this.Pcurve);
   }
   modulo(n, m) {
     return (n % m + m) % m;
@@ -981,6 +1043,8 @@ var secp224k1 = class {
   }
   modInv(a, n = this.Pcurve) {
     let lm = BigInt(1), hm = BigInt(0), high = n, low = this.modulo(a, n);
+    if (low === this.Zero)
+      throw new Error("Value is not invertible!");
     while (low > 1) {
       const ratio = high / low, nm = hm - ratio * lm, newm = high - ratio * low;
       hm = lm;
@@ -992,6 +1056,12 @@ var secp224k1 = class {
   }
   ECadd(a, b) {
     if (a[0] != void 0 && b[0] != void 0 && a[1] != void 0 && b[1] != void 0) {
+      if (this.modulo(a[0] - b[0], this.Pcurve) === this.Zero) {
+        if (this.modulo(a[1] - b[1], this.Pcurve) === this.Zero && this.modulo(a[1], this.Pcurve) !== this.Zero) {
+          return this.ECdouble(a);
+        }
+        throw new Error("EC point addition results in the point at infinity!");
+      }
       const LamAdd = this.modulo((b[1] - a[1]) * this.modInv(b[0] - a[0]), this.Pcurve);
       const x = this.modulo(LamAdd * LamAdd - a[0] - b[0], this.Pcurve);
       const y = this.modulo(LamAdd * (a[0] - x) - a[1], this.Pcurve);
@@ -4032,6 +4102,7 @@ async function signJSONMessage(JSONMessage, KeyPairs, options) {
     return false;
   if (JSONMessage.signatures != null && !Array.isArray(JSONMessage.signatures))
     return false;
+  let signaturesCreated = 0;
   for (const KeyPair of KeyPairs) {
     if (KeyPair == null || !isNobleSignatureKeyPair(KeyPair))
       continue;
@@ -4063,8 +4134,6 @@ async function signJSONMessage(JSONMessage, KeyPairs, options) {
       signatureJSON.context = bytesToBase64(options.context);
       signatureJSON.contextHEX = bytesToHex(options.context);
     }
-    JSONMessage.signatures ??= [];
-    JSONMessage.signatures.push(signatureJSON);
     const signatureIsValid = suite.verify(
       plainText,
       signatureBytes,
@@ -4073,8 +4142,11 @@ async function signJSONMessage(JSONMessage, KeyPairs, options) {
     );
     if (!signatureIsValid)
       return false;
+    JSONMessage.signatures ??= [];
+    JSONMessage.signatures.push(signatureJSON);
+    signaturesCreated++;
   }
-  return true;
+  return signaturesCreated > 0;
 }
 async function verifyJSONSignature(JSONMessage, signature, options) {
   return isVerificationTrue(await verifyJSONSignatureResult(JSONMessage, signature, options));
@@ -5497,6 +5569,33 @@ function decodeRawOCMFBytes(value, encoding) {
     return new Uint8Array(Buffer.from(value, "base64"));
   throw new TypeError(`Unsupported raw key encoding '${encoding ?? ""}'.`);
 }
+function getOCMFSignatureDisplay(signature, signatureBytes, signatureRS) {
+  const encodedSignature = signatureBytes !== void 0 && signatureBytes.length > 0 ? signatureBytes : decodeRawOCMFBytes(signature.SD, signature.SE);
+  const rawHex = buf2hex(encodedSignature).toUpperCase();
+  if (signature.SA === "EdDSA-Ed25519" || signature.SA === "EdDSA-Ed448") {
+    const componentHexLength = signature.SA === "EdDSA-Ed25519" ? 64 : 114;
+    if (rawHex.length !== componentHexLength * 2)
+      return { format: "RS, hex", valueLabel: "raw", value: rawHex };
+    return {
+      format: "RS, hex",
+      valueLabel: "raw",
+      value: rawHex,
+      r: rawHex.substring(0, componentHexLength),
+      s: rawHex.substring(componentHexLength)
+    };
+  }
+  if (signature.SA === "ML-DSA-44" || signature.SA === "ML-DSA-65" || signature.SA === "ML-DSA-87")
+    return { format: "raw, hex", valueLabel: "raw", value: rawHex };
+  return {
+    format: "rs, hex",
+    valueLabel: "der",
+    value: rawHex,
+    ...signatureRS === void 0 ? {} : {
+      r: signatureRS.r.toLowerCase().padStart(56, "0"),
+      s: signatureRS.s.toLowerCase().padStart(56, "0")
+    }
+  };
+}
 var OCMFv1_x = class extends ACrypt {
   curve;
   constructor(chargy) {
@@ -5728,10 +5827,15 @@ var OCMFv1_x = class extends ACrypt {
       }
     }
     if (measurementValue.ocmfDocument.signature.SD) {
+      const signatureDisplay = getOCMFSignatureDisplay(
+        measurementValue.ocmfDocument.signature,
+        measurementValue.ocmfDocument.signatureBytes,
+        measurementValue.ocmfDocument.signatureRS
+      );
       if (SignatureExpectedDiv.parentElement) {
-        getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = this.chargy.GetLocalizedMessage("Expected signature") + " (rs, hex)";
+        getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = this.chargy.GetLocalizedMessage("Expected signature") + " (" + signatureDisplay.format + ")";
       }
-      SignatureExpectedDiv.innerHTML = "der: " + (measurementValue.ocmfDocument.signature.SD.match(/.{1,8}/g)?.join(" ") ?? "-") + "<br /><br />r:&nbsp;&nbsp; " + (measurementValue.ocmfDocument.signatureRS?.r.toLowerCase().padStart(56, "0").match(/.{1,8}/g)?.join(" ") ?? "-") + "<br />s:&nbsp;&nbsp; " + (measurementValue.ocmfDocument.signatureRS?.s.toLowerCase().padStart(56, "0").match(/.{1,8}/g)?.join(" ") ?? "-");
+      SignatureExpectedDiv.innerHTML = signatureDisplay.valueLabel + ": " + (signatureDisplay.value.match(/.{1,8}/g)?.join(" ") ?? "-") + (signatureDisplay.r === void 0 || signatureDisplay.s === void 0 ? "" : "<br /><br />R:&nbsp;&nbsp; " + (signatureDisplay.r.match(/.{1,8}/g)?.join(" ") ?? "-") + "<br />S:&nbsp;&nbsp; " + (signatureDisplay.s.match(/.{1,8}/g)?.join(" ") ?? "-"));
     }
     if (measurementValue.measurement.chargingSession.verificationResult) {
       switch (measurementValue.measurement.chargingSession.verificationResult.status) {
@@ -5860,8 +5964,20 @@ var OCMF = class {
           message: this.chargy.GetMultilanguageText("Each OCMF data set must have at least one meter reading!"),
           certainty: 0
         };
+        const sessionId = "OCMF-" + bytesToHex(
+          sha256$1(
+            new TextEncoder().encode(
+              OCMFJSONDocuments.map(
+                (ocmfJSONDocument) => canonicalJSONStringify({
+                  payload: ocmfJSONDocument.payload,
+                  signature: ocmfJSONDocument.signature
+                })
+              ).join("\n")
+            )
+          )
+        );
         const CTR = {
-          "@id": "?",
+          "@id": sessionId,
           "@context": "https://open.charging.cloud/contexts/CTR+json",
           //"@context":  [ "https://open.charging.cloud/contexts/CTR+json", "https://open.charging.cloud/contexts/CTR_OCMF+json" ],
           "begin": "?",
@@ -5951,7 +6067,7 @@ var OCMF = class {
           //     }]
           // }],
           "chargingSessions": [{
-            "@id": "1554181214441:-1965658344385548683:2",
+            "@id": sessionId,
             "@context": "https://open.charging.cloud/contexts/SessionSignatureFormats/OCMFv1.0+json",
             "begin": "?",
             "end": "?",
@@ -5997,8 +6113,26 @@ var OCMF = class {
         if (containerEVSE !== void 0 && CTR.chargingSessions?.[0] !== void 0) {
           const chargingSession = CTR.chargingSessions[0];
           chargingSession.EVSEId ??= containerEVSE["@id"];
-          if (chargingSession.EVSEId === containerEVSE["@id"])
-            chargingSession.EVSE = containerEVSE;
+          if (chargingSession.EVSEId === containerEVSE["@id"]) {
+            const containerEnergyMeter = containerEVSE.energyMeters?.[0];
+            const resolvedEnergyMeter = containerEnergyMeter !== void 0 || meterSerial !== void 0 ? {
+              ...containerEnergyMeter,
+              "@id": meterSerial ?? containerEnergyMeter?.["@id"] ?? "",
+              manufacturer: {
+                ...containerEnergyMeter?.manufacturer,
+                name: meterVendor ?? containerEnergyMeter?.manufacturer?.name
+              },
+              model: {
+                ...containerEnergyMeter?.model,
+                name: meterModel ?? containerEnergyMeter?.model?.name
+              },
+              firmware: {
+                ...containerEnergyMeter?.firmware,
+                version: meterFirmware ?? containerEnergyMeter?.firmware?.version
+              }
+            } : void 0;
+            chargingSession.EVSE = resolvedEnergyMeter !== void 0 ? { ...containerEVSE, energyMeters: [resolvedEnergyMeter] } : containerEVSE;
+          }
         }
         const resolvedConnectorId = signedConnectorId ?? containerConnector?.["@id"];
         if ((resolvedConnectorId !== void 0 || signedCable !== void 0) && CTR.chargingSessions?.[0] !== void 0) {
@@ -6157,8 +6291,16 @@ var OCMF = class {
           CTR.warnings = (CTR.warnings ?? []).concat(ContainerInfos.warnings);
         CTR.status = OCMFJSONDocuments.every((ocmfJSONDocument) => ocmfJSONDocument.validationStatus === "ValidSignature" /* ValidSignature */) ? "ValidSignature" /* ValidSignature */ : "InvalidSignature" /* InvalidSignature */;
         if (CTR.chargingSessions != null && CTR.chargingSessions.length > 0 && CTR.chargingSessions[0]) {
-          CTR.begin = CTR.chargingSessions[0].begin;
-          CTR.end = CTR.chargingSessions[0].end;
+          const firstChargingSession = CTR.chargingSessions[0];
+          const measurementTimestamps = firstChargingSession.measurements.flatMap((measurement) => measurement.values).map((value) => value.timestamp).filter((timestamp) => isMandatoryString(timestamp) && !Number.isNaN(Date.parse(timestamp))).sort((left, right) => Date.parse(left) - Date.parse(right));
+          const firstTimestamp = measurementTimestamps[0];
+          const lastTimestamp = measurementTimestamps[measurementTimestamps.length - 1];
+          if (firstTimestamp !== void 0 && lastTimestamp !== void 0) {
+            firstChargingSession.begin = firstTimestamp;
+            firstChargingSession.end = lastTimestamp;
+          }
+          CTR.begin = firstChargingSession.begin;
+          CTR.end = firstChargingSession.end;
           return CTR;
         }
       }
@@ -6822,8 +6964,29 @@ var OCPI = class {
           const address = asJSONObject(placeInfo?.["address"]);
           const geoLat = asNumber(geoLocation?.["lat"]);
           const geoLon = asNumber(geoLocation?.["lon"]);
+          const meterInfo = asJSONObject(SomeJSON["meterInfo"]);
+          const containerEnergyMeter = meterInfo !== void 0 ? {
+            "@id": asString(meterInfo["meterId"]) ?? "",
+            manufacturer: {
+              name: asString(meterInfo["manufacturer"]),
+              url: asString(meterInfo["manufacturerURL"])
+            },
+            model: {
+              name: asString(meterInfo["model"]),
+              url: asString(meterInfo["modelURL"])
+            },
+            hardware: {
+              revision: asString(meterInfo["hardwareVersion"])
+            },
+            firmware: {
+              version: asString(meterInfo["firmwareVersion"])
+            }
+          } : void 0;
           const containerInfos = {
-            EVSEIds: [evseId],
+            EVSEs: evseId !== void 0 ? [{
+              "@id": evseId,
+              energyMeters: containerEnergyMeter !== void 0 ? [containerEnergyMeter] : void 0
+            }] : void 0,
             chargingStations: [{
               "@id": evseIdStr.substring(0, evseIdStr.lastIndexOf("*")),
               geoLocation: geoLat !== void 0 && geoLon !== void 0 ? { lat: geoLat, lng: geoLon } : void 0,
@@ -6834,7 +6997,6 @@ var OCPI = class {
                 country: asString(address["country"]) ?? ""
               } : void 0
             }]
-            //energyMeter:      chargyLib.asJSONObject(SomeJSON["meterInfo"])
           };
           return new OCMF(this.chargy).TryToParseOCMFDocument(
             firstSignedData,
@@ -9778,7 +9940,7 @@ var ChargePointCrypt01 = class extends ACrypt {
       if (plainText !== "" && chargingSession.signature != null && chargingSession.signature !== "") {
         let sha225Value = null;
         let sha256Value = null;
-        let sha385Value = null;
+        let sha384Value = null;
         let sha512Value = null;
         for (const publicKey of publicKeys) {
           const algorithm = typeof publicKey.algorithm === "object" ? publicKey.algorithm.name : publicKey.algorithm;
@@ -9803,9 +9965,9 @@ var ChargePointCrypt01 = class extends ACrypt {
               ) ? "ValidSignature" /* ValidSignature */ : "InvalidSignature" /* InvalidSignature */;
               break;
             case "secp384r1":
-              sha385Value = sha385Value ?? await sha384(plainText);
+              sha384Value = sha384Value ?? await sha384(plainText);
               sessionResult = this.curve384r1.keyFromPublic(publicKey.value, "hex").verify(
-                sha385Value,
+                sha384Value,
                 chargingSession.signature
               ) ? "ValidSignature" /* ValidSignature */ : "InvalidSignature" /* InvalidSignature */;
               break;
@@ -9827,12 +9989,13 @@ var ChargePointCrypt01 = class extends ACrypt {
                 chargingSession.hashValue = sha256Value ?? "";
                 break;
               case "secp384r1":
-                chargingSession.hashValue = sha385Value ?? "";
+                chargingSession.hashValue = sha384Value ?? "";
                 break;
               case "secp521r1":
                 chargingSession.hashValue = sha512Value ?? "";
                 break;
             }
+            break;
           }
         }
       }
@@ -9954,7 +10117,7 @@ var ChargePointCrypt01 = class extends ACrypt {
       case "secp384r1":
         hashInfo = "(SHA384, 384 Bits, hex)";
         break;
-      case "secp512r1":
+      case "secp521r1":
         hashInfo = "(SHA512, 512 Bits, hex)";
         break;
     }
@@ -10344,8 +10507,14 @@ var validationRules_default = {
 function isPdfAttachment(value) {
   if (!isMandatoryJSONObject(value))
     return false;
-  return typeof value["filename"] === "string" && (value["content"] instanceof ArrayBuffer || ArrayBuffer.isView(value["content"]));
+  return typeof value["filename"] === "string";
 }
+var pdfAttachmentTypes = [
+  { extension: ".chargy", type: "application/chargy", info: "A CHARGY file extracted from a PDF/A-3 or newer attachment" },
+  { extension: ".xml", type: "application/xml", info: "A XML file extracted from a PDF/A-3 or newer attachment" },
+  { extension: ".json", type: "application/json", info: "A JSON file extracted from a PDF/A-3 or newer attachment" },
+  { extension: ".csv", type: "text/csv", info: "A CSV file extracted from a PDF/A-3 or newer attachment" }
+];
 var Chargy = class {
   //#region Data
   i18n;
@@ -10444,7 +10613,9 @@ var Chargy = class {
       case "1.3.101.113":
         KeyType = "EdDSA";
         break;
+      case "2.16.840.1.101.3.4.3.17":
       case "2.16.840.1.101.3.4.3.18":
+      case "2.16.840.1.101.3.4.3.19":
         KeyType = "ML-DSA";
         break;
     }
@@ -10457,9 +10628,15 @@ var Chargy = class {
       case "1.3.101.113":
         Algorithm = "Ed448";
         break;
+      case "2.16.840.1.101.3.4.3.17":
+        Algorithm = "ML-DSA-44";
+        break;
       case "2.16.840.1.101.3.4.3.18":
         Algorithm = "ML-DSA-65";
         break;
+      case "2.16.840.1.101.3.4.3.19":
+        Algorithm = "ML-DSA-87";
+        break;
       // Koblitz 224-bit curve
       case "1.3.132.0.32":
         Algorithm = "secp224k1";
@@ -10478,7 +10655,7 @@ var Chargy = class {
         break;
     }
     const publicKeyData = new Uint8Array(publicKeyDER.publicKey.data);
-    const expectedLength = Algorithm === "Ed25519" ? 32 : Algorithm === "Ed448" ? 57 : Algorithm === "ML-DSA-65" ? 1952 : void 0;
+    const expectedLength = Algorithm === "Ed25519" ? 32 : Algorithm === "Ed448" ? 57 : Algorithm === "ML-DSA-44" ? 1312 : Algorithm === "ML-DSA-65" ? 1952 : Algorithm === "ML-DSA-87" ? 2592 : void 0;
     if (publicKeyDER.publicKey.unused !== void 0 && publicKeyDER.publicKey.unused !== 0)
       throw new Error("The SubjectPublicKeyInfo public key has unused bits!");
     if (expectedLength !== void 0 && publicKeyData.length !== expectedLength)
@@ -10525,7 +10702,7 @@ var Chargy = class {
           publicKeyDER
         ).publicKeys[0];
         const algorithm = typeof publicKey?.algorithm === "string" ? publicKey.algorithm : publicKey?.algorithm.name;
-        return algorithm === "Ed25519" || algorithm === "Ed448" || algorithm === "ML-DSA-65" ? publicKey?.value : buf2hex(publicKeyDER);
+        return algorithm === "Ed25519" || algorithm === "Ed448" || algorithm?.startsWith("ML-DSA-") === true ? publicKey?.value : buf2hex(publicKeyDER);
       } catch {
         return void 0;
       }
@@ -10538,7 +10715,7 @@ var Chargy = class {
           publicKeyDER
         ).publicKeys[0];
         const algorithm = typeof publicKey?.algorithm === "string" ? publicKey.algorithm : publicKey?.algorithm.name;
-        return algorithm === "Ed25519" || algorithm === "Ed448" || algorithm === "ML-DSA-65" ? publicKey?.value : buf2hex(publicKeyDER);
+        return algorithm === "Ed25519" || algorithm === "Ed448" || algorithm?.startsWith("ML-DSA-") === true ? publicKey?.value : buf2hex(publicKeyDER);
       } catch {
         return void 0;
       }
@@ -11114,45 +11291,27 @@ var Chargy = class {
           const pdfDocument = fileInfo.data ? await pdfjsLib.getDocument({ data: fileInfo.data }).promise : fileInfo.path != null && fileInfo.path.length > 0 ? await pdfjsLib.getDocument({ url: fileInfo.path }).promise : null;
           if (pdfDocument !== null) {
             try {
-              const attachmentsUnknown = await pdfDocument.getAttachments();
-              if (isMandatoryJSONObject(attachmentsUnknown))
-                Object.values(attachmentsUnknown).forEach((attachmentUnknown) => {
-                  if (!isPdfAttachment(attachmentUnknown))
-                    return;
-                  const attachment = attachmentUnknown;
-                  if (attachment.filename.endsWith(".chargy"))
-                    expandedFiles.push({
-                      name: attachment.filename,
-                      path: FileInfos[0]?.path,
-                      type: "application/chargy",
-                      data: attachment.content,
-                      info: "A CHARGY file extracted from a PDF/A-3 or newer attachment"
-                    });
-                  else if (attachment.filename.endsWith(".xml"))
-                    expandedFiles.push({
-                      name: attachment.filename,
-                      path: FileInfos[0]?.path,
-                      type: "application/xml",
-                      data: attachment.content,
-                      info: "A XML file extracted from a PDF/A-3 or newer attachment"
-                    });
-                  else if (attachment.filename.endsWith(".json"))
-                    expandedFiles.push({
-                      name: attachment.filename,
-                      path: FileInfos[0]?.path,
-                      type: "application/json",
-                      data: attachment.content,
-                      info: "A JSON file extracted from a PDF/A-3 or newer attachment"
-                    });
-                  else if (attachment.filename.endsWith(".csv"))
-                    expandedFiles.push({
-                      name: attachment.filename,
-                      path: FileInfos[0]?.path,
-                      type: "text/csv",
-                      data: attachment.content,
-                      info: "A CSV file extracted from a PDF/A-3 or newer attachment"
-                    });
+              const attachments = await pdfDocument.getAttachments();
+              for (const [attachmentId, attachmentUnknown] of attachments ?? []) {
+                if (!isPdfAttachment(attachmentUnknown))
+                  continue;
+                const attachment = attachmentUnknown;
+                const attachmentType = pdfAttachmentTypes.find(
+                  (candidate) => attachment.filename.endsWith(candidate.extension)
+                );
+                if (attachmentType === void 0)
+                  continue;
+                const content = attachment.content ?? await pdfDocument.getAttachmentContent(attachmentId);
+                if (content == null)
+                  continue;
+                expandedFiles.push({
+                  name: attachment.filename,
+                  path: FileInfos[0]?.path,
+                  type: attachmentType.type,
+                  data: content,
+                  info: attachmentType.info
                 });
+              }
             } catch (error) {
               console.error(`Error extracting PDF/A-3 attachments: ${String(error)}`);
             }
@@ -11750,6 +11909,6 @@ var Chargy = class {
   }
 };
 
-export { ACrypt, Alfen, AlfenCrypt01, BSMCrypt01, CanonicalJSONError, ChargeIT, ChargePoint, ChargePointCrypt01, IChargeTransparencyLiveLink_exports as ChargeTransparencyLiveLink, ChargeTransparencyLiveLinkContext, IChargeTransparencyRecord_exports as ChargeTransparencyRecord, Chargy, chargyInterfaces_exports as ChargyInterfaces, Clone, CloneCTR, ConcatenateBuffers, CreateDiv, CreateDiv2, CreateError, CreateWarning, CryptoAlgorithms, CryptoHashAlgorithms, DayOfWeek, DisplayPrefixes, EDL40, EDL40Crypt01, EDL40ValidationError, EDL40_OBIS, EDL40_SESSION_CONTEXT, EDL40_SIGNATURE_CONTEXT, EMHCrypt01, ErrorLevel, GDFCrypt01, IECCurves, IEncoding, InformationRelevance, InformationRelevanceToString, IsAChargeTransparencyLiveLink, IsAChargeTransparencyRecord, IsAPublicKey, IsAPublicKeyLookup, IsAPublicKeySignature, IsAPublicKeyXY, IsASessionCryptoResult, IsAURL, IsNullOrEmpty, IsValidURL, JSONSignatureVerificationStatus, MENNEKES_EDL40_OBIS, MENNEKES_EDL40_XMLNS, Mennekes, MennekesCrypt01, OBIS2Hex, OBIS2MeasurementName, OBIS_RegExpr, OCMF, OCMFBonnTariffParseError, OCMFTransactionTypes, OCMF_SIGNATURE_ALGORITHMS, OCMFv1_x, OCPI, OIDInfo, PCDF, PCDFCrypt01, PCDFParseError, PCDFValidationError, PCDF_FIELD_ORDER, PCDF_PREFIX, PTB, ParseJSON_LD, PublicKeyFormats, IPublicKeyInfo_exports as PublicKeyInfo, SAFEXML, SessionVerificationResult, SetHex, SetInt8, SetText, SetText_withLength, SetTimestamp, SetTimestamp32, SetUInt32, SetUInt32_withCode, SetUInt64, SetUInt64D, SignMessage, SignatureFormats, IURL_exports as SimpleURL, TimeStatusTypes, URLContext, UTC2human, VerificationResult, VerifyJSONMessageSignatures, WarningLevel, WhenNullOrEmpty, XMLContainer, asJSONArray, asJSONObject, asNumber, asString, base64ToBytes, buf2hex, buildEDL40Signature, buildIsaSignature, buildMennekesSignatureData, bytesToBase64, bytesToHex, canParseEDL40, canonicalJSONBytes, canonicalJSONStringify, cleanHex, closeFullscreen, createCompatibleCurve, createHexString, createLegacyP192Curve, dateToMennekesLocalEpochSeconds, decodeSmlMessages, extractMennekesChargingProcesses, findEntryByObis, findGetListRes, firstKey, firstValue, generateSignatureKeyPair, getArrayElement, getArrayLikeElement, getDirectChildByLocalName, getDirectChildrenByLocalName, getElementsByLocalName, getFirstArrayElement, getInt16Bytes, getInt32Bytes, getInt64Bytes, getInt8Bytes, getLastArrayElement, getSignatureSuite, getTrimmedTextContent, hashFile, hex2bin, hex32, hexToArrayBuffer, hexToBytes, intFromBytes, isEncodedValue, isGeoLocation, isI18NString, isICryptoResult, isIFileInfo, isISessionCryptoResult1, isISessionCryptoResult2, isJSONLDObject, isMandatoryArrayOfStrings, isMandatoryBoolean, isMandatoryDecimal, isMandatoryJSONArray, isMandatoryJSONObject, isMandatoryNumber, isMandatoryString, isMandatoryURL, isOIDInfo, isObject, isOptionalArrayOfStrings, isOptionalDecimal, isOptionalJSONArray, isOptionalJSONArrayError, isOptionalJSONArrayOk, isOptionalJSONObject, isOptionalNumber, isOptionalString, isOptionalStringArray, isOptionalStringOrOIDInfo, isOptionalURL, isPCDFText, isPublicKeySubject, isString, isStringArray, isStringOrOIDInfo, isStringOrStringArray, isaListNameContext, jsonPrettyPrinter, measurementName2human, normalizePCDFPublicKeyHex, normalizeXMLText, ocmfBonnTariffToChargingTariff, openFullscreen, pad, parseAndVerifyJSONSignatures, parseDescription, parseEDL40, parseHexString, parseMennekesXMLDocument, parseNumber, parseOBIS, parseOCMFBonnTariffText, parsePCDFDocument, parsePCDFPublicKey, parsePCDFSignature, parseSmlTime, parseUTC, readQRCodeTextFromImage, readQRCodeTextFromImageData, readTLV, secp224k1, setUILocale, sha256, sha256____, sha384, sha384____, sha512, sha512____, signJSONMessage, signMessage, stripPCDFControlCharacters, stripTransport, time2human, toArrayBuffer, toSessionVerificationResults, toUint8Array, transformEDL40Status, tryParseOCMFBonnTariffText, unquotePCDFText, validatePCDFFields, verifyEDL40Document, verifyJSONMessageSignatureResults, verifyJSONMessageSignatures, verifyJSONSignature, verifyJSONSignatureResult, verifyPCDFDocument };
+export { ACrypt, Alfen, AlfenCrypt01, BSMCrypt01, CanonicalJSONError, ChargeIT, ChargePoint, ChargePointCrypt01, IChargeTransparencyLiveLink_exports as ChargeTransparencyLiveLink, ChargeTransparencyLiveLinkContext, IChargeTransparencyRecord_exports as ChargeTransparencyRecord, Chargy, chargyInterfaces_exports as ChargyInterfaces, Clone, CloneCTR, ConcatenateBuffers, CreateDiv, CreateDiv2, CreateError, CreateWarning, CryptoAlgorithms, CryptoHashAlgorithms, DayOfWeek, DisplayPrefixes, EDL40, EDL40Crypt01, EDL40ValidationError, EDL40_OBIS, EDL40_SESSION_CONTEXT, EDL40_SIGNATURE_CONTEXT, EMHCrypt01, ErrorLevel, GDFCrypt01, IECCurves, IEncoding, InformationRelevance, InformationRelevanceToString, IsAChargeTransparencyLiveLink, IsAChargeTransparencyRecord, IsAPublicKey, IsAPublicKeyLookup, IsAPublicKeySignature, IsAPublicKeyXY, IsASessionCryptoResult, IsAURL, IsNullOrEmpty, IsValidURL, JSONSignatureVerificationStatus, MENNEKES_EDL40_OBIS, MENNEKES_EDL40_XMLNS, Mennekes, MennekesCrypt01, OBIS2Hex, OBIS2MeasurementName, OBIS_RegExpr, OCMF, OCMFBonnTariffParseError, OCMFTransactionTypes, OCMF_SIGNATURE_ALGORITHMS, OCMFv1_x, OCPI, OIDInfo, PCDF, PCDFCrypt01, PCDFParseError, PCDFValidationError, PCDF_FIELD_ORDER, PCDF_PREFIX, PTB, ParseJSON_LD, PublicKeyFormats, IPublicKeyInfo_exports as PublicKeyInfo, SAFEXML, SessionVerificationResult, SetHex, SetInt8, SetText, SetText_withLength, SetTimestamp, SetTimestamp32, SetUInt32, SetUInt32_withCode, SetUInt64, SetUInt64D, SignMessage, SignatureFormats, IURL_exports as SimpleURL, TimeStatusTypes, URLContext, UTC2human, VerificationResult, VerifyJSONMessageSignatures, WarningLevel, WhenNullOrEmpty, XMLContainer, asJSONArray, asJSONObject, asNumber, asString, base64ToBytes, buf2hex, buildEDL40Signature, buildIsaSignature, buildMennekesSignatureData, bytesToBase64, bytesToHex, canParseEDL40, canonicalJSONBytes, canonicalJSONStringify, cleanHex, closeFullscreen, createCompatibleCurve, createHexString, createLegacyP192Curve, dateToMennekesLocalEpochSeconds, decodeSmlMessages, extractMennekesChargingProcesses, findEntryByObis, findGetListRes, firstKey, firstValue, generateSignatureKeyPair, getArrayElement, getArrayLikeElement, getDirectChildByLocalName, getDirectChildrenByLocalName, getElementsByLocalName, getFirstArrayElement, getInt16Bytes, getInt32Bytes, getInt64Bytes, getInt8Bytes, getLastArrayElement, getOCMFSignatureDisplay, getSignatureSuite, getTrimmedTextContent, hashFile, hex2bin, hex32, hexToArrayBuffer, hexToBytes, intFromBytes, isEncodedValue, isGeoLocation, isI18NString, isICryptoResult, isIFileInfo, isISessionCryptoResult1, isISessionCryptoResult2, isJSONLDObject, isMandatoryArrayOfStrings, isMandatoryBoolean, isMandatoryDecimal, isMandatoryJSONArray, isMandatoryJSONObject, isMandatoryNumber, isMandatoryString, isMandatoryURL, isOIDInfo, isObject, isOptionalArrayOfStrings, isOptionalDecimal, isOptionalJSONArray, isOptionalJSONArrayError, isOptionalJSONArrayOk, isOptionalJSONObject, isOptionalNumber, isOptionalString, isOptionalStringArray, isOptionalStringOrOIDInfo, isOptionalURL, isPCDFText, isPublicKeySubject, isString, isStringArray, isStringOrOIDInfo, isStringOrStringArray, isaListNameContext, jsonPrettyPrinter, measurementName2human, meterTimeZone, normalizePCDFPublicKeyHex, normalizeXMLText, ocmfBonnTariffToChargingTariff, openFullscreen, pad, parseAndVerifyJSONSignatures, parseDescription, parseEDL40, parseHexString, parseMennekesXMLDocument, parseNumber, parseOBIS, parseOCMFBonnTariffText, parsePCDFDocument, parsePCDFPublicKey, parsePCDFSignature, parseSmlTime, parseUTC, readQRCodeTextFromImage, readQRCodeTextFromImageData, readTLV, secp224k1, setUILocale, sha256, sha256____, sha384, sha384____, sha512, sha512____, signJSONMessage, signMessage, stripPCDFControlCharacters, stripTransport, time2human, timeZoneOffsetMinutes, toArrayBuffer, toSessionVerificationResults, toUint8Array, transformEDL40Status, tryParseOCMFBonnTariffText, unquotePCDFText, validatePCDFFields, verifyEDL40Document, verifyJSONMessageSignatureResults, verifyJSONMessageSignatures, verifyJSONSignature, verifyJSONSignatureResult, verifyPCDFDocument };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map