@open-charging-cloud/chargy-core 0.6.1 → 0.6.2

package/dist/browser/index.js

@@ -9768,9 +9768,7 @@ var secp224k1 = class {
   N = BigInt("0x010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7");
   // Number of points in the field
   Acurve = BigInt(0);
-  // These two are defined on the elliptic curve. y^2 = x^3 + Acurve * x + Bcurve
-  Bcurve = BigInt(5);
-  // These two are defined on the elliptic curve. y^2 = x^3 + Acurve * x + Bcurve
+  // Defined on the elliptic curve. y^2 = x^3 + Acurve * x + 5
   Gx = BigInt("0xA1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C");
   Gy = BigInt("0x7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5");
   GPoint = [this.Gx, this.Gy];
@@ -9867,6 +9865,7 @@ var secp224k1 = class {
         address: this.modulo(publicKey[1], this.Two) == this.One ? "03" + Px : "02" + Px
       };
     }
+    return void 0;
   }
 };
 
@@ -9995,13 +9994,13 @@ function CreateError(message, level = "high" /* high */) {
   };
 }
 function isISessionCryptoResult1(obj) {
-  return typeof obj === "object" && obj !== null && obj.status !== void 0;
+  return isObject(obj) && obj["status"] !== void 0;
 }
 function isISessionCryptoResult2(obj) {
-  return typeof obj === "object" && obj !== null && obj.status !== void 0 && obj.status !== "InvalidSessionFormat" /* InvalidSessionFormat */;
+  return isObject(obj) && obj["status"] !== void 0 && obj["status"] !== "InvalidSessionFormat" /* InvalidSessionFormat */;
 }
 function isICryptoResult(obj) {
-  return typeof obj === "object" && obj !== null && obj.status !== void 0;
+  return isObject(obj) && obj["status"] !== void 0;
 }
 var InformationRelevance = /* @__PURE__ */ ((InformationRelevance2) => {
   InformationRelevance2["Unknown"] = "Unknown";
@@ -10089,6 +10088,26 @@ function toArrayBuffer(data) {
 function toUint8Array(data) {
   return data instanceof Uint8Array ? data : new Uint8Array(data);
 }
+function getArrayElement(values, index, message = "Missing array element") {
+  const value = values[index];
+  if (value === void 0)
+    throw new Error(message + " at index " + index.toString());
+  return value;
+}
+function getFirstArrayElement(values, message = "Missing first array element") {
+  return getArrayElement(values, 0, message);
+}
+function getLastArrayElement(values, message = "Missing last array element") {
+  return getArrayElement(values, values.length - 1, message);
+}
+function getArrayLikeElement(values, index, message = "Missing array-like element") {
+  if (index < 0 || index >= values.length)
+    throw new Error(message + " at index " + index.toString());
+  const value = values[index];
+  if (value === void 0)
+    throw new Error(message + " at index " + index.toString());
+  return value;
+}
 function normalizeXMLText(xmlText) {
   return (xmlText ?? "").replace(/^\uFEFF/, "").replace(/\r\n?/g, "\n").replace(/>\s+</g, "><").trim();
 }
@@ -10100,15 +10119,16 @@ function getDirectChildByLocalName(parent, localName) {
 }
 function getTrimmedTextContent(element) {
   const text = element?.textContent.trim();
-  return text && text.length > 0 ? text : void 0;
+  return text != null && text.length > 0 ? text : void 0;
 }
 function parseDescription(parent) {
   const descriptions = getDirectChildrenByLocalName(parent, "description");
   const textMap = {};
   for (const description of descriptions) {
-    const language = description.getAttribute("language")?.trim() || "und";
+    const languageAttribute = description.getAttribute("language")?.trim();
+    const language = languageAttribute != null && languageAttribute.length > 0 ? languageAttribute : "und";
     const text = description.textContent.trim();
-    if (text)
+    if (text.length > 0)
       textMap[language] = text;
   }
   return Object.keys(textMap).length > 0 ? textMap : void 0;
@@ -10144,12 +10164,14 @@ function ParseJSON_LD(Text, _Context = "") {
 function firstKey(obj) {
   for (const a in obj)
     return a;
+  return void 0;
 }
 function firstValue(obj) {
   if (obj == void 0)
     return void 0;
   for (const a in obj)
     return obj[a];
+  return void 0;
 }
 var uiLocale = typeof window !== "undefined" ? window.navigator.language : "de";
 function setUILocale(locale) {
@@ -10182,14 +10204,17 @@ function parseOBIS(OBIS) {
   return `${String(media)}-${String(channel)}:${String(indicator)}.${String(mode)}.${String(quantities)}*${String(storage)}`;
 }
 var OBIS_RegExpr = new RegExp("((\\d+)\\-)?((\\d+):)?((\\d+)\\.)(\\d+)(\\.(\\d+))?(\\*(\\d+))?");
+function optionalOBISMatchValue(value) {
+  return value ?? "0";
+}
 function OBIS2Hex(OBIS) {
   const OBISElements = OBIS.match(OBIS_RegExpr);
-  return OBISElements == null ? "000000000000" : parseInt(OBISElements[2]).toString(16).padStart(2, "0") + // optional  A
-  parseInt(OBISElements[4]).toString(16).padStart(2, "0") + // optional  B
-  parseInt(OBISElements[6]).toString(16).padStart(2, "0") + // mandatory C
-  parseInt(OBISElements[7]).toString(16).padStart(2, "0") + // mandatory D
-  parseInt(OBISElements[9]).toString(16).padStart(2, "0") + // optional  E
-  parseInt(OBISElements[11]).toString(16).padStart(2, "0");
+  return OBISElements == null ? "000000000000" : parseInt(optionalOBISMatchValue(OBISElements[2])).toString(16).padStart(2, "0") + // optional  A
+  parseInt(optionalOBISMatchValue(OBISElements[4])).toString(16).padStart(2, "0") + // optional  B
+  parseInt(optionalOBISMatchValue(OBISElements[6])).toString(16).padStart(2, "0") + // mandatory C
+  parseInt(optionalOBISMatchValue(OBISElements[7])).toString(16).padStart(2, "0") + // mandatory D
+  parseInt(optionalOBISMatchValue(OBISElements[9])).toString(16).padStart(2, "0") + // optional  E
+  parseInt(optionalOBISMatchValue(OBISElements[11])).toString(16).padStart(2, "0");
 }
 function OBIS2MeasurementName(OBISString) {
   switch (OBISString) {
@@ -10232,15 +10257,15 @@ function measurementName2human(In) {
   }
 }
 function IsNullOrEmpty(value) {
-  return !value;
+  return value == null || value.length === 0;
 }
 function WhenNullOrEmpty(value, replacement) {
-  if (!value)
+  if (value == null || value.length === 0)
     return replacement;
   return value;
 }
 function hex2bin(hex, Reverse) {
-  if (Reverse) {
+  if (Reverse === true) {
     const reversed = [];
     for (let i = 0; i < hex.length; i += 2)
       reversed.push(hex.substring(i, i + 2));
@@ -10354,7 +10379,7 @@ function SetHex(dv, hex, offset, reverse) {
   const bytes = parseHexString(hex);
   const buffer = new ArrayBuffer(bytes.length);
   const tv = new DataView(buffer);
-  if (reverse)
+  if (reverse === true)
     bytes.reverse();
   for (let i = 0; i < bytes.length; i++) {
     dv.setUint8(offset + i, bytes[i] ?? 0);
@@ -10403,7 +10428,7 @@ function SetUInt32(dv, value, offset, reverse) {
   const bytes = getInt32Bytes(value);
   const buffer = new ArrayBuffer(bytes.length);
   const tv = new DataView(buffer);
-  if (reverse)
+  if (reverse === true)
     bytes.reverse();
   for (let i = 0; i < bytes.length; i++) {
     dv.setUint8(offset + i, bytes[i] ?? 0);
@@ -10415,7 +10440,7 @@ function SetUInt64(dv, value, offset, reverse) {
   const bytes = getInt64Bytes(value);
   const buffer = new ArrayBuffer(bytes.length);
   const tv = new DataView(buffer);
-  if (reverse)
+  if (reverse === true)
     bytes.reverse();
   for (let i = 0; i < bytes.length; i++) {
     dv.setUint8(offset + i, bytes[i] ?? 0);
@@ -10447,7 +10472,7 @@ function SetUInt32_withCode(dv, value, scale, obis, offset, reverse) {
   const obisBytes = getInt8Bytes(obis);
   const buffer = new ArrayBuffer(valueBytes.length + 2);
   const tv = new DataView(buffer);
-  if (reverse)
+  if (reverse === true)
     valueBytes.reverse();
   for (let i = 0; i < valueBytes.length; i++) {
     dv.setUint8(offset + i, valueBytes[i] ?? 0);
@@ -10510,8 +10535,7 @@ function CreateDiv2(ParentDiv, ChildClassName, ChildAInnerHTML, ChildBInnerHTML)
   return childDiv;
 }
 function pad(text, paddingValue) {
-  if (text == void 0)
-    text = "";
+  text ??= "";
   return (text + Array(2 * paddingValue).join("0")).substring(0, 2 * paddingValue);
 }
 async function sha256(message) {
@@ -10657,7 +10681,7 @@ function jsonPrettyPrinter(value, KeyLookup) {
     value,
     0,
     "",
-    KeyLookup ?? ((path, key) => key)
+    KeyLookup ?? ((_path, key) => key)
   );
 }
 function _jsonPrettyPrinter(value, indentLevel, path, keyLookup) {
@@ -10736,13 +10760,15 @@ var ACrypt = class {
   }
   AddToVisualBuffer(valueHEX, bufferDiv, lineDiv) {
     const newText = CreateDiv(bufferDiv, "entry", valueHEX);
+    const lineId = getArrayLikeElement(lineDiv.children, 0, "Missing visual buffer line id");
+    const lineHex = getArrayLikeElement(lineDiv.children, 1, "Missing visual buffer line hex");
     newText.onmouseenter = function() {
-      lineDiv.children[0]?.classList.add("overEntry");
-      lineDiv.children[1]?.classList.add("overEntry");
+      lineId.classList.add("overEntry");
+      lineHex.classList.add("overEntry");
     };
     newText.onmouseleave = function() {
-      lineDiv.children[0]?.classList.remove("overEntry");
-      lineDiv.children[1]?.classList.remove("overEntry");
+      lineId.classList.remove("overEntry");
+      lineHex.classList.remove("overEntry");
     };
     lineDiv.onmouseenter = function() {
       newText.classList.add("overEntry");
@@ -10758,7 +10784,7 @@ var Alfen = class {
     this.chargy = chargy;
   }
   bufferToHex(buffer, Reverse) {
-    return (Reverse ? Array.from(new Uint8Array(buffer)).reverse() : Array.from(new Uint8Array(buffer))).map((b) => b.toString(16).padStart(2, "0")).join("");
+    return (Reverse === true ? Array.from(new Uint8Array(buffer)).reverse() : Array.from(new Uint8Array(buffer))).map((b) => b.toString(16).padStart(2, "0")).join("");
   }
   bufferToNumber(buffer) {
     return parseInt(Array.from(new Uint8Array(buffer)).map((b) => b.toString(16).padStart(2, "0")).join(""), 16);
@@ -10793,28 +10819,29 @@ var Alfen = class {
         signedValues = Content;
       let previousTimestamp = "";
       for (let i = 0; i < signedValues.length; i++) {
-        const elements = signedValues[i]?.split(";");
-        if (elements?.length != 6 && elements?.length != 7)
+        const elements = getArrayElement(signedValues, i, "Missing Alfen signed value").split(";");
+        if (elements.length != 6 && elements.length != 7)
           return {
             status: "InvalidSessionFormat" /* InvalidSessionFormat */,
             message: this.chargy.GetMultilanguageText("Invalid number of signed meter values!"),
             certainty: 0
           };
-        const FormatId = elements[0];
-        const Type = elements[1];
-        const BlobVersion = elements[2];
-        const PublicKey = this.chargy.base32Decode(elements[3] ?? "", "RFC4648");
-        const DataSet = this.chargy.base32Decode(elements[4] ?? "", "RFC4648");
-        const Signature = this.chargy.base32Decode(elements[5] ?? "", "RFC4648");
+        const FormatId = getArrayElement(elements, 0, "Missing Alfen format id");
+        const Type = getArrayElement(elements, 1, "Missing Alfen type");
+        const BlobVersion = getArrayElement(elements, 2, "Missing Alfen blob version");
+        const publicKeyValue = getArrayElement(elements, 3, "Missing Alfen public key");
+        const PublicKey = this.chargy.base32Decode(publicKeyValue, "RFC4648");
+        const DataSet = this.chargy.base32Decode(getArrayElement(elements, 4, "Missing Alfen data set"), "RFC4648");
+        const Signature = this.chargy.base32Decode(getArrayElement(elements, 5, "Missing Alfen signature"), "RFC4648");
         if (common.PublicKey === "")
-          common.PublicKey = elements[3] ?? "";
-        else if (elements[3] !== common.PublicKey)
+          common.PublicKey = publicKeyValue;
+        else if (publicKeyValue !== common.PublicKey)
           return {
             status: "InvalidSessionFormat" /* InvalidSessionFormat */,
             message: this.chargy.GetMultilanguageText("Inconsistent public keys!"),
             certainty: 0
           };
-        if (FormatId !== "AP" || Type?.length !== 1 || BlobVersion?.length !== 1 || BlobVersion !== "3" || PublicKey.byteLength !== 25 || DataSet.byteLength !== 82 || Signature.byteLength !== 48) {
+        if (FormatId !== "AP" || Type.length !== 1 || BlobVersion.length !== 1 || BlobVersion !== "3" || PublicKey.byteLength !== 25 || DataSet.byteLength !== 82 || Signature.byteLength !== 48) {
           return {
             status: "InvalidSessionFormat" /* InvalidSessionFormat */,
             message: this.chargy.GetMultilanguageText("Invalid charging session format!"),
@@ -10931,14 +10958,8 @@ var Alfen = class {
       const evseId = asString(containerInfos["EVSEId"]) ?? "DE*GEF*EVSE*CHARGY*1";
       const chargingStationId = asString(containerInfos["ChargingStationId"]) ?? "DE*GEF*STATION*CHARGY*1";
       const chargingSessionId = asString(chargingSession?.["@id"]);
-      const firstDataSet = common.dataSets[0];
-      const lastDataSet = common.dataSets[common.dataSets.length - 1];
-      if (firstDataSet === void 0 || lastDataSet === void 0)
-        return {
-          status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-          message: this.chargy.GetMultilanguageText("Invalid number of signed meter values!"),
-          certainty: 0
-        };
+      const firstDataSet = getFirstArrayElement(common.dataSets, "Missing first Alfen data set");
+      const lastDataSet = getLastArrayElement(common.dataSets, "Missing last Alfen data set");
       const _CTR = {
         "@id": chargingSessionId ?? common.InternalSessionId.toString(),
         "@context": "https://open.charging.cloud/contexts/CTR+json",
@@ -11219,62 +11240,62 @@ var AlfenCrypt01 = class extends ACrypt {
     }
     return {};
   }
-  async ViewMeasurement(measurementValue, errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
+  async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
     const result = measurementValue.result;
     {
       introDiv.innerHTML = this.chargy.GetLocalizedMessage("The following data of the charging session is relevant for metrological and legal metrological purposes and therefore part of the digital signature").replace("{methodName}", "AlfenCrypt01").replace("{cryptoAlgorithm}", this.description);
     }
     {
-      if (PlainTextDiv.parentElement && PlainTextDiv.parentElement.children[0]) {
-        PlainTextDiv.parentElement.children[0].innerHTML = this.chargy.GetLocalizedMessage("Plain text") + " (320 Bytes, hex)";
+      if (PlainTextDiv.parentElement) {
+        getArrayLikeElement(PlainTextDiv.parentElement.children, 0, "Missing plain text header").innerHTML = this.chargy.GetLocalizedMessage("Plain text") + " (320 Bytes, hex)";
       }
       PlainTextDiv.style.fontFamily = "";
       PlainTextDiv.style.whiteSpace = "";
       PlainTextDiv.style.maxHeight = "";
       PlainTextDiv.style.overflowY = "";
-      this.CreateLocalizedLine("Adapter Id", measurementValue.measurement.adapterId, result.adapterId || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("Adapter Firmware Version", measurementValue.measurement.adapterFWVersion, result.adapterFWVersion || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("Adapter Firmware Checksum", measurementValue.measurement.adapterFWChecksum, result.adapterFWChecksum || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("Meter number", measurementValue.measurement.energyMeterId, result.meterId || "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Adapter Id", measurementValue.measurement.adapterId, result.adapterId ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Adapter Firmware Version", measurementValue.measurement.adapterFWVersion, result.adapterFWVersion ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Adapter Firmware Checksum", measurementValue.measurement.adapterFWChecksum, result.adapterFWChecksum ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Meter number", measurementValue.measurement.energyMeterId, result.meterId ?? "", infoDiv, PlainTextDiv);
       this.CreateLocalizedLine(
         "Meter status",
         hex2bin(measurementValue.statusMeter, true) + " (" + measurementValue.statusMeter + ' hex)<br /><span class="statusInfos">' + this.DecodeMeterStatus(measurementValue.statusMeter).join("<br />") + "</span>",
-        result.statusMeter || "",
+        result.statusMeter ?? "",
         infoDiv,
         PlainTextDiv
       );
       this.CreateLocalizedLine(
         "Adapter status",
         hex2bin(measurementValue.statusAdapter, true) + " (" + measurementValue.statusAdapter + ' hex)<br /><span class="statusInfos">' + this.DecodeAdapterStatus(measurementValue.statusAdapter).join("<br />") + "</span>",
-        result.statusAdapter || "",
+        result.statusAdapter ?? "",
         infoDiv,
         PlainTextDiv
       );
-      this.CreateLocalizedLine("Seconds index", measurementValue.secondsIndex, result.secondsIndex || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("Timestamp", UTC2human(measurementValue.timestamp), result.timestamp || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("OBIS code", measurementValue.measurement.obis, result.obisId || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("Unit (encoded)", measurementValue.measurement.unitEncoded ?? 0, result.unitEncoded || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("Scaling", measurementValue.measurement.scale, result.scalar || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("Measurement Value", measurementValue.value.toString() + " Wh", result.value || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("Authorization", (measurementValue.measurement.chargingSession?.authorizationStart["@id"] ?? "") + " hex", pad(result.uid, 20) || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("SessionId", measurementValue.measurement.chargingSession?.["@id"] ?? "", result.sessionId || "", infoDiv, PlainTextDiv);
-      this.CreateLocalizedLine("Pagination counter", measurementValue.paginationId, result.paging || "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Seconds index", measurementValue.secondsIndex, result.secondsIndex ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Timestamp", UTC2human(measurementValue.timestamp), result.timestamp ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("OBIS code", measurementValue.measurement.obis, result.obisId ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Unit (encoded)", measurementValue.measurement.unitEncoded ?? 0, result.unitEncoded ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Scaling", measurementValue.measurement.scale, result.scalar ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Measurement Value", measurementValue.value.toString() + " Wh", result.value ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Authorization", (measurementValue.measurement.chargingSession?.authorizationStart["@id"] ?? "") + " hex", pad(result.uid, 20), infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("SessionId", measurementValue.measurement.chargingSession?.["@id"] ?? "", result.sessionId ?? "", infoDiv, PlainTextDiv);
+      this.CreateLocalizedLine("Pagination counter", measurementValue.paginationId, result.paging ?? "", infoDiv, PlainTextDiv);
     }
     {
-      if (HashedPlainTextDiv.parentElement && HashedPlainTextDiv.parentElement.children[0]) {
-        HashedPlainTextDiv.parentElement.children[0].innerHTML = this.chargy.GetLocalizedMessage("Hashed plain text") + " (SHA256, hex)";
+      if (HashedPlainTextDiv.parentElement) {
+        getArrayLikeElement(HashedPlainTextDiv.parentElement.children, 0, "Missing hashed plain text header").innerHTML = this.chargy.GetLocalizedMessage("Hashed plain text") + " (SHA256, hex)";
       }
       const hashValueText = typeof result.hashValue === "string" ? result.hashValue : result.hashValue?.toString(16) ?? "";
       HashedPlainTextDiv.innerHTML = hashValueText.match(/.{1,8}/g)?.join(" ") ?? "";
     }
-    if (result.publicKey && result.publicKey != "") {
-      if (PublicKeyDiv.parentElement && PublicKeyDiv.parentElement.children[0]) {
-        PublicKeyDiv.parentElement.children[0].innerHTML = this.chargy.GetLocalizedMessage("Public Key") + " (" + (result.publicKeyFormat ? result.publicKeyFormat + ", " : "") + "base32)";
+    if (result.publicKey != null && result.publicKey.length > 0) {
+      if (PublicKeyDiv.parentElement) {
+        getArrayLikeElement(PublicKeyDiv.parentElement.children, 0, "Missing public key header").innerHTML = this.chargy.GetLocalizedMessage("Public Key") + " (" + (result.publicKeyFormat != null && result.publicKeyFormat.length > 0 ? result.publicKeyFormat + ", " : "") + "base32)";
       }
       if (!IsNullOrEmpty(result.publicKey))
         PublicKeyDiv.innerHTML = result.publicKey.match(/.{1,4}/g)?.join(" ") ?? "";
     }
-    if (PublicKeyDiv.parentElement && PublicKeyDiv.parentElement.children[3]) {
+    if (PublicKeyDiv.parentElement?.children[3]) {
       PublicKeyDiv.parentElement.children[3].innerHTML = "";
       if (result.publicKeySignatures) {
         for (const signature of result.publicKeySignatures) {
@@ -11293,14 +11314,14 @@ var AlfenCrypt01 = class extends ACrypt {
       }
     }
     if (result.signature != null) {
-      if (SignatureExpectedDiv.parentElement && SignatureExpectedDiv.parentElement.children[0]) {
-        SignatureExpectedDiv.parentElement.children[0].innerHTML = this.chargy.GetLocalizedMessage("Expected signature") + " (" + (result.signature.format ?? "") + ", hex)";
+      if (SignatureExpectedDiv.parentElement) {
+        getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = this.chargy.GetLocalizedMessage("Expected signature") + " (" + (result.signature.format ?? "") + ", hex)";
       }
-      if (result.signature.r && result.signature.s) {
+      if (result.signature.r != null && result.signature.r.length > 0 && result.signature.s != null && result.signature.s.length > 0) {
         const signatureR = result.signature.r.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
         const signatureS = result.signature.s.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
         SignatureExpectedDiv.innerHTML = "r: " + signatureR + "<br />s: " + signatureS;
-      } else if (result.signature.value)
+      } else if (result.signature.value != null && result.signature.value.length > 0)
         SignatureExpectedDiv.innerHTML = result.signature.value.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
     }
     {
@@ -11542,10 +11563,14 @@ var BSMCrypt01 = class extends ACrypt {
             throw new Error(`Invalid identification of signed meter value #${String(measurementCounter - 1)}!`);
           const previousParts = previousId.split("-");
           const currentParts = currentId.split("-");
-          if (previousParts.length !== 2 || currentParts.length !== 2 || previousParts[0] !== currentParts[0] || previousParts[1] === void 0 || currentParts[1] === void 0 || // parseInt returns NaN in case parsing fails which in turn does not match
+          const previousPrefix = previousParts.at(0);
+          const previousCounter = previousParts.at(1);
+          const currentPrefix = currentParts.at(0);
+          const currentCounter = currentParts.at(1);
+          if (previousParts.length !== 2 || currentParts.length !== 2 || previousPrefix !== currentPrefix || previousCounter === void 0 || currentCounter === void 0 || // parseInt returns NaN in case parsing fails which in turn does not match
           // anything (not even NaN). This way we are checking that both counter values
           // are numeric too.
-          parseInt(previousParts[1], 10) >= parseInt(currentParts[1], 10)) {
+          parseInt(previousCounter, 10) >= parseInt(currentCounter, 10)) {
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_MeasurementIdP", measurementCounter)));
           }
         }
@@ -11583,7 +11608,7 @@ var BSMCrypt01 = class extends ACrypt {
             precision: asNumber(displayedFormat?.["precision"])
           };
         });
-        if (currentMeasurement["meterInfo"]) {
+        if (currentMeasurement["meterInfo"] != null) {
           const meterInfoObj2 = asJSONObject(currentMeasurement["meterInfo"]);
           if (meterInfoObj2?.["firmwareVersion"] !== common.meterInfo_firmwareVersion)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_MeterInfo_FirmwareVersionP", measurementCounter)));
@@ -11591,42 +11616,42 @@ var BSMCrypt01 = class extends ACrypt {
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_MeterInfo_PublicKeyP", measurementCounter)));
           if (meterInfoObj2?.["meterId"] !== common.meterInfo_meterId)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_MeterInfo_MeterIdP", measurementCounter)));
-          if (meterInfoObj2?.["meterId"] !== additionalValues.filter((element) => element.measurandName === "MA1")[0]?.value)
+          if (meterInfoObj2?.["meterId"] !== additionalValues.find((element) => element.measurandName === "MA1")?.value)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_MeterInfo_MeterIdP", measurementCounter)));
           if (meterInfoObj2?.["manufacturer"] !== common.meterInfo_manufacturer)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_MeterInfo_ManufacturerP", measurementCounter)));
           if (meterInfoObj2?.["type"] !== common.meterInfo_type)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_MeterInfo_TypeP", measurementCounter)));
         }
-        if (currentMeasurement["contract"]) {
+        if (currentMeasurement["contract"] != null) {
           const contractObj2 = asJSONObject(currentMeasurement["contract"]);
-          if (additionalValues.filter((element) => element.measurandName?.startsWith("Meta") && asString(element.value)?.startsWith("contract-id:")).length == 0)
+          if (additionalValues.filter((element) => element.measurandName?.startsWith("Meta") === true && asString(element.value)?.startsWith("contract-id:") === true).length == 0)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_Contract_IdP", measurementCounter)));
           if (contractObj2?.["id"] !== common.contract_id)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_Contract_IdP", measurementCounter)));
           if (contractObj2?.["type"] !== common.contract_type)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_Contract_TypeP", measurementCounter)));
-          const contractInfo = additionalValues.filter((element) => element.measurandName?.startsWith("Meta") && asString(element.value)?.startsWith("contract-id:"))[0]?.value;
+          const contractInfo = additionalValues.find((element) => element.measurandName?.startsWith("Meta") === true && asString(element.value)?.startsWith("contract-id:") === true)?.value;
           if (contractInfo != null) {
-            if (contractObj2?.["type"] && contractInfo !== "contract-id: " + (common.contract_type ?? "-") + ":" + common.contract_id)
+            if (contractObj2?.["type"] != null && contractInfo !== "contract-id: " + (common.contract_type ?? "-") + ":" + common.contract_id)
               currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_Contract_IdP", measurementCounter)));
-            if (!contractObj2?.["type"] && contractInfo !== "contract-id: " + common.contract_id)
+            if (contractObj2?.["type"] == null && contractInfo !== "contract-id: " + common.contract_id)
               currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_Contract_IdP", measurementCounter)));
           }
         }
         const rcrInAdditional = additionalValues.find((element) => element.measurandName == "RCR");
         if (currentMeasurement["value"] == null)
           throw new Error(`Missing value within signed meter value #${String(measurementCounter)}!`);
-        if ((valueObj2?.["measurand"] || valueObj2?.["measuredValue"]) && rcrInAdditional === void 0)
+        if ((valueObj2?.["measurand"] != null || valueObj2?.["measuredValue"] != null) && rcrInAdditional === void 0)
           throw new Error(`Missing 'RCR' within the additional values of signed meter value #${String(measurementCounter)}!`);
-        if (valueObj2?.["measurand"]) {
+        if (valueObj2?.["measurand"] != null) {
           const measurandObj2 = asJSONObject(valueObj2["measurand"]);
           if (measurandObj2?.["id"] !== common.value_measurand_id || measurandObj2["id"] !== rcrInAdditional?.measurandId)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_Measurand_IdentificationP", measurementCounter)));
           if (measurandObj2?.["name"] !== common.value_measurand_name || measurandObj2["name"] !== rcrInAdditional?.measurandName)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_Measurand_NameP", measurementCounter)));
         }
-        if (valueObj2?.["measuredValue"]) {
+        if (valueObj2?.["measuredValue"] != null) {
           if (measuredValueObj2?.["value"] !== rcrInAdditional?.value)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValueP", measurementCounter)));
           if (measuredValueObj2?.["scale"] !== common.value_measuredValue_scale || measuredValueObj2?.["scale"] !== rcrInAdditional?.scale)
@@ -11638,15 +11663,15 @@ var BSMCrypt01 = class extends ACrypt {
           if (measuredValueObj2?.["valueType"] !== common.value_measuredValue_valueType || measuredValueObj2?.["valueType"] !== rcrInAdditional?.valueType)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_SignedMeterValue_TypeP", measurementCounter)));
         }
-        if (currentMeasurement["chargePoint"] && asJSONObject(currentMeasurement["chargePoint"])?.["softwareVersion"] !== common.chargePoint_softwareVersion)
+        if (currentMeasurement["chargePoint"] != null && asJSONObject(currentMeasurement["chargePoint"])?.["softwareVersion"] !== common.chargePoint_softwareVersion)
           currentErrors.push(CreateError(this.chargy.GetMultilanguageText("Inconsistent_ChargingStation_FirmwareVersion")));
-        const signedEVSEId = additionalValues.filter((element) => element.measurandName?.startsWith("Meta") && asString(element.value)?.startsWith("evse-id:"));
+        const signedEVSEId = additionalValues.filter((element) => element.measurandName?.startsWith("Meta") === true && asString(element.value)?.startsWith("evse-id:") === true);
         if (signedEVSEId.length == 1) {
           const evse__id = (asString(signedEVSEId[0]?.value) ?? "").replace("evse-id:", "").trim();
           if (evse__id !== "unknown" && ExpectedEVSEId !== evse__id)
             currentErrors.push(CreateError(this.chargy.GetMultilanguageText("Inconsistent_EVSE_Identification")));
         }
-        const signedCSCSWVersion = additionalValues.filter((element) => element.measurandName?.startsWith("Meta") && asString(element.value)?.startsWith("csc-sw-version:"));
+        const signedCSCSWVersion = additionalValues.filter((element) => element.measurandName?.startsWith("Meta") === true && asString(element.value)?.startsWith("csc-sw-version:") === true);
         if (signedCSCSWVersion.length == 1) {
           const csc_sw_version = asString(signedCSCSWVersion[0]?.value)?.replace("csc-sw-version:", "").trim() ?? null;
           if (previousCscSwVersion !== null && previousCscSwVersion !== csc_sw_version)
@@ -11711,6 +11736,8 @@ var BSMCrypt01 = class extends ACrypt {
             case "Evt":
               Evt = asNumber(additionalValue.value) ?? NaN;
               break;
+            default:
+              break;
           }
         }
         const currentRCRValue = asNumber(RCR?.value) ?? NaN;
@@ -11773,18 +11800,17 @@ var BSMCrypt01 = class extends ACrypt {
         });
       }
       const n = common.dataSets.length - 1;
-      const firstDataSet = common.dataSets[0];
-      const lastDataSet = common.dataSets[n];
-      if (firstDataSet === void 0 || firstDataSet.TypParsed !== "START" && firstDataSet.TypParsed !== "TURN ON")
+      const firstDataSet = getFirstArrayElement(common.dataSets, "Missing first BSM data set");
+      const lastDataSet = getArrayElement(common.dataSets, n, "Missing last BSM data set");
+      if (firstDataSet.TypParsed !== "START" && firstDataSet.TypParsed !== "TURN ON")
         throw new Error(this.chargy.GetLocalizedMessageWithParameter("Inconsistent_EnergyMeterValueP", 1));
       for (let i = 1; i < common.dataSets.length - 1; i++) {
         if (common.dataSets[i]?.TypParsed !== "CURRENT")
           errors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("Inconsistent_EnergyMeterValueP", measurementCounter + 1)));
       }
-      if (lastDataSet === void 0 || lastDataSet.TypParsed !== "END" && lastDataSet.TypParsed !== "TURN OFF")
+      if (lastDataSet.TypParsed !== "END" && lastDataSet.TypParsed !== "TURN OFF")
         throw new Error(this.chargy.GetLocalizedMessageWithParameter("Inconsistent_EnergyMeterValueP", n + 1));
-      if (CTR.chargingSessions == null)
-        CTR.chargingSessions = [];
+      CTR.chargingSessions ??= [];
       const ASN1_SignatureSchema = this.chargy.asn1.define("Signature", function() {
         this.seq().obj(
           this.key("r").int(),
@@ -11901,12 +11927,12 @@ var BSMCrypt01 = class extends ACrypt {
       CTR.chargingSessions.push(session);
       CTR["@id"] = common.meterInfo_meterId + "-" + String(firstDataSet.Epoch);
       {
-        const firstChargingSession = CTR.chargingSessions[0];
-        const lastChargingSession = CTR.chargingSessions[CTR.chargingSessions.length - 1];
-        if (firstChargingSession !== void 0 && (CTR.begin == void 0 || CTR.begin === "" || CTR.begin > firstChargingSession.begin)) {
+        const firstChargingSession = getFirstArrayElement(CTR.chargingSessions, "Missing first BSM charging session");
+        const lastChargingSession = getLastArrayElement(CTR.chargingSessions, "Missing last BSM charging session");
+        if (CTR.begin == void 0 || CTR.begin === "" || CTR.begin > firstChargingSession.begin) {
           CTR.begin = firstChargingSession.begin;
         }
-        if (lastChargingSession?.end !== void 0) {
+        if (lastChargingSession.end !== void 0) {
           if (CTR.end == void 0 || CTR.end === "" || CTR.end < lastChargingSession.end)
             CTR.end = lastChargingSession.end;
         }
@@ -12078,58 +12104,63 @@ var BSMCrypt01 = class extends ACrypt {
     }
     return {};
   }
-  async ViewMeasurement(measurementValue, errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
+  async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
     if (measurementValue.measurement === void 0)
       return new Error("Invalid measurement!");
     const result = measurementValue.result;
     introDiv.innerHTML = this.chargy.GetLocalizedMessage("The following data of the charging session is relevant for metrological and legal metrological purposes and therefore part of the digital signature").replace("{methodName}", "BSMCrypt01").replace("{cryptoAlgorithm}", this.description);
-    if (PlainTextDiv.parentElement != void 0 && PlainTextDiv.parentElement.children[0] != void 0) {
-      PlainTextDiv.parentElement.children[0].innerHTML = "Plain text (" + measurementValue.result.ArraySize.toString() + " Bytes, hex)";
+    if (PlainTextDiv.parentElement) {
+      getArrayLikeElement(PlainTextDiv.parentElement.children, 0, "Missing plain text header").innerHTML = "Plain text (" + measurementValue.result.ArraySize.toString() + " Bytes, hex)";
     }
     PlainTextDiv.style.fontFamily = "";
     PlainTextDiv.style.whiteSpace = "";
     PlainTextDiv.style.maxHeight = "";
     PlainTextDiv.style.overflowY = "";
-    this.CreateLine("Snapshot-Typ", this.ParseTyp(measurementValue.Typ), result.Typ || "", infoDiv, PlainTextDiv);
-    this.CreateLine("RCR", (measurementValue.RCR * 10 ** measurementValue.RCR_SF).toString() + " " + measurementValue.RCR_Unit, result.RCR || "", infoDiv, PlainTextDiv);
-    this.CreateLine("TotWhImp", (measurementValue.TotWhImp * 10 ** measurementValue.TotWhImp_SF).toString() + " " + measurementValue.TotWhImp_Unit, result.TotWhImp || "", infoDiv, PlainTextDiv);
-    this.CreateLine("W", (measurementValue.W * 10 ** measurementValue.W_SF).toString() + " " + measurementValue.W_Unit, result.W || "", infoDiv, PlainTextDiv);
-    this.CreateLine("MA1", measurementValue.MA1, result.MA1 || "", infoDiv, PlainTextDiv);
-    this.CreateLine("RCnt", measurementValue.RCnt, result.RCnt || "", infoDiv, PlainTextDiv);
-    this.CreateLine("OS", measurementValue.OS, result.OS || "", infoDiv, PlainTextDiv);
-    this.CreateLine("Zeitstempel", UTC2human(measurementValue.Epoch), result.Epoch || "", infoDiv, PlainTextDiv);
-    this.CreateLine("TZO", measurementValue.TZO.toString() + " Minuten", result.TZO || "", infoDiv, PlainTextDiv);
-    this.CreateLine("EpochSetCnt", measurementValue.EpochSetCnt, result.EpochSetCnt || "", infoDiv, PlainTextDiv);
-    this.CreateLine("EpochSetOS", measurementValue.EpochSetOS, result.EpochSetOS || "", infoDiv, PlainTextDiv);
-    this.CreateLine("DI", measurementValue.DI, result.DI || "", infoDiv, PlainTextDiv);
-    this.CreateLine("DO", measurementValue.DO, result.DO || "", infoDiv, PlainTextDiv);
-    this.CreateLine("Meta1", measurementValue.Meta1, result.Meta1 || "", infoDiv, PlainTextDiv);
-    this.CreateLine("Meta2", measurementValue.Meta2, result.Meta2 || "", infoDiv, PlainTextDiv);
-    this.CreateLine("Meta3", measurementValue.Meta3, result.Meta3 || "", infoDiv, PlainTextDiv);
-    this.CreateLine("Evt", this.ParseEvents(measurementValue.Evt).join("<br>"), result.Evt || "", infoDiv, PlainTextDiv);
-    if (HashedPlainTextDiv.parentElement != void 0 && HashedPlainTextDiv.parentElement.children[0] != void 0) {
-      HashedPlainTextDiv.parentElement.children[0].innerHTML = "Hashed plain text (SHA256, hex)";
+    this.CreateLine("Snapshot-Typ", this.ParseTyp(measurementValue.Typ), result.Typ, infoDiv, PlainTextDiv);
+    this.CreateLine("RCR", (measurementValue.RCR * 10 ** measurementValue.RCR_SF).toString() + " " + measurementValue.RCR_Unit, result.RCR, infoDiv, PlainTextDiv);
+    this.CreateLine("TotWhImp", (measurementValue.TotWhImp * 10 ** measurementValue.TotWhImp_SF).toString() + " " + measurementValue.TotWhImp_Unit, result.TotWhImp, infoDiv, PlainTextDiv);
+    this.CreateLine("W", (measurementValue.W * 10 ** measurementValue.W_SF).toString() + " " + measurementValue.W_Unit, result.W, infoDiv, PlainTextDiv);
+    this.CreateLine("MA1", measurementValue.MA1, result.MA1, infoDiv, PlainTextDiv);
+    this.CreateLine("RCnt", measurementValue.RCnt, result.RCnt, infoDiv, PlainTextDiv);
+    this.CreateLine("OS", measurementValue.OS, result.OS, infoDiv, PlainTextDiv);
+    this.CreateLine("Zeitstempel", UTC2human(measurementValue.Epoch), result.Epoch, infoDiv, PlainTextDiv);
+    this.CreateLine("TZO", measurementValue.TZO.toString() + " Minuten", result.TZO, infoDiv, PlainTextDiv);
+    this.CreateLine("EpochSetCnt", measurementValue.EpochSetCnt, result.EpochSetCnt, infoDiv, PlainTextDiv);
+    this.CreateLine("EpochSetOS", measurementValue.EpochSetOS, result.EpochSetOS, infoDiv, PlainTextDiv);
+    this.CreateLine("DI", measurementValue.DI, result.DI, infoDiv, PlainTextDiv);
+    this.CreateLine("DO", measurementValue.DO, result.DO, infoDiv, PlainTextDiv);
+    this.CreateLine("Meta1", measurementValue.Meta1, result.Meta1, infoDiv, PlainTextDiv);
+    this.CreateLine("Meta2", measurementValue.Meta2, result.Meta2, infoDiv, PlainTextDiv);
+    this.CreateLine("Meta3", measurementValue.Meta3, result.Meta3, infoDiv, PlainTextDiv);
+    this.CreateLine("Evt", this.ParseEvents(measurementValue.Evt).join("<br>"), result.Evt, infoDiv, PlainTextDiv);
+    if (HashedPlainTextDiv.parentElement) {
+      getArrayLikeElement(HashedPlainTextDiv.parentElement.children, 0, "Missing hashed plain text header").innerHTML = "Hashed plain text (SHA256, hex)";
     }
     HashedPlainTextDiv.innerHTML = result.sha256value?.match(/.{1,8}/g)?.join(" ") ?? "";
     if (result.publicKey != null && result.publicKey != "") {
-      if (PublicKeyDiv.parentElement != void 0 && PublicKeyDiv.parentElement.children[0] != void 0) {
-        PublicKeyDiv.parentElement.children[0].innerHTML = "Public Key (" + (result.publicKeyFormat ? result.publicKeyFormat + ", " : "") + "hex)";
+      if (PublicKeyDiv.parentElement) {
+        getArrayLikeElement(PublicKeyDiv.parentElement.children, 0, "Missing public key header").innerHTML = "Public Key (" + (result.publicKeyFormat != null && result.publicKeyFormat.length > 0 ? result.publicKeyFormat + ", " : "") + "hex)";
       }
       if (!IsNullOrEmpty(result.publicKey))
         PublicKeyDiv.innerHTML = result.publicKey.startsWith("04") ? '<span class="leadingFour">04</span> ' + (result.publicKey.substring(2).match(/.{1,8}/g)?.join(" ") ?? "-") : result.publicKey.match(/.{1,8}/g)?.join(" ") ?? "-";
-      if (PublicKeyDiv.parentElement != void 0 && PublicKeyDiv.parentElement.children[3] != void 0) {
-        PublicKeyDiv.parentElement.children[3].innerHTML = "";
+      const publicKeySignatureContainer = PublicKeyDiv.parentElement?.children[3];
+      if (publicKeySignatureContainer !== void 0) {
+        publicKeySignatureContainer.innerHTML = "";
       }
       if (result.publicKeySignatures) {
         for (const signature of result.publicKeySignatures) {
           try {
-            const signatureDiv = PublicKeyDiv.parentElement?.children[3]?.appendChild(document.createElement("div"));
-            if (signatureDiv != null && measurementValue.measurement.chargingSession != null && measurementValue.measurement.chargingSession.EVSE != null && measurementValue.measurement.chargingSession.EVSE.meters.length > 0 && measurementValue.measurement.chargingSession.EVSE.meters[0] != null && measurementValue.measurement.chargingSession.EVSE.meters[0].publicKeys != null && measurementValue.measurement.chargingSession.EVSE.meters[0].publicKeys.length > 0) {
+            const signatureDiv = publicKeySignatureContainer?.appendChild(document.createElement("div"));
+            const chargingSession = measurementValue.measurement.chargingSession;
+            const evse = chargingSession?.EVSE;
+            const meter = evse?.meters.at(0);
+            const publicKey = meter?.publicKeys?.at(0);
+            if (signatureDiv != null && chargingSession != null && evse != null && meter != null && publicKey != null) {
               signatureDiv.innerHTML = await this.chargy.CheckMeterPublicKeySignature(
-                measurementValue.measurement.chargingSession.chargingStation,
-                measurementValue.measurement.chargingSession.EVSE,
-                measurementValue.measurement.chargingSession.EVSE.meters[0],
-                measurementValue.measurement.chargingSession.EVSE.meters[0].publicKeys[0],
+                chargingSession.chargingStation,
+                evse,
+                meter,
+                publicKey,
                 signature
               );
             }
@@ -12140,12 +12171,12 @@ var BSMCrypt01 = class extends ACrypt {
       }
     }
     if (result.signature != null) {
-      if (SignatureExpectedDiv.parentElement != void 0 && SignatureExpectedDiv.parentElement.children[0] != void 0) {
-        SignatureExpectedDiv.parentElement.children[0].innerHTML = "Erwartete Signatur (" + (result.signature.format || "") + ", hex)";
+      if (SignatureExpectedDiv.parentElement) {
+        getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = "Erwartete Signatur (" + (result.signature.format ?? "") + ", hex)";
       }
-      if (result.signature.r && result.signature.s)
+      if (result.signature.r != null && result.signature.r.length > 0 && result.signature.s != null && result.signature.s.length > 0)
         SignatureExpectedDiv.innerHTML = "r: " + (result.signature.r.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-") + "<br />s: " + (result.signature.s.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-");
-      else if (result.signature.value)
+      else if (result.signature.value != null && result.signature.value.length > 0)
         SignatureExpectedDiv.innerHTML = result.signature.value.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
     }
     switch (result.status) {
@@ -12171,6 +12202,7 @@ var BSMCrypt01 = class extends ACrypt {
         SignatureCheckDiv.innerHTML = '<i class="fas fa-times-circle"></i><div id="description">Ung\xFCltige Signatur</div>';
         break;
     }
+    return void 0;
   }
   //#region Helper methods
   PrefixConverter(input) {
@@ -12249,30 +12281,35 @@ var BSMCrypt01 = class extends ACrypt {
     if ((value & 1 << 29) != 0) events.push("OEM 15");
     return events;
   }
-  DecodeStatus(statusValue) {
-    const statusArray = [];
-    try {
-      const status = parseInt(statusValue);
-      if ((status & 1) == 1)
-        statusArray.push("Fehler erkannt");
-      if ((status & 2) == 2)
-        statusArray.push("Synchrone Messwert\xFCbermittlung");
-      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\xFCcklaufsperre 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
+  // 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
 };
 
 // src/CanonicalJSON.ts
@@ -12672,7 +12709,7 @@ var EMHCrypt01 = class extends ACrypt {
       measurementValue.result = cryptoResult;
       return cryptoResult;
     }
-    if (measurementValue.measurement === void 0 || measurementValue.measurement.chargingSession === void 0) {
+    if (measurementValue.measurement?.chargingSession === void 0) {
       return {
         status: "InvalidMeasurement" /* InvalidMeasurement */
       };
@@ -12711,9 +12748,10 @@ var EMHCrypt01 = class extends ACrypt {
           cryptoResult.meter = meter;
           if (meter.publicKeys != null && meter.publicKeys.length > 0) {
             try {
-              cryptoResult.publicKey = meter.publicKeys[0]?.value?.toLowerCase();
-              cryptoResult.publicKeyFormat = meter.publicKeys[0]?.format;
-              cryptoResult.publicKeySignatures = meter.publicKeys[0]?.signatures;
+              const publicKey = meter.publicKeys.at(0);
+              cryptoResult.publicKey = publicKey?.value?.toLowerCase();
+              cryptoResult.publicKeyFormat = publicKey?.format;
+              cryptoResult.publicKeySignatures = publicKey?.signatures;
               try {
                 if (this.curve.keyFromPublic(cryptoResult.publicKey ?? "", "hex").verify(
                   cryptoResult.sha256value,
@@ -12738,59 +12776,60 @@ var EMHCrypt01 = class extends ACrypt {
     }
     return {};
   }
-  async ViewMeasurement(measurementValue, errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
-    if (measurementValue.measurement === void 0 || measurementValue.measurement.chargingSession === void 0 || measurementValue.measurement.chargingSession.authorizationStart.timestamp === void 0) {
+  async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
+    if (measurementValue.measurement?.chargingSession?.authorizationStart.timestamp === void 0) {
       return new Error("Invalid measurement!");
     }
     const result = measurementValue.result;
     introDiv.innerHTML = this.chargy.GetLocalizedMessage("The following data of the charging session is relevant for metrological and legal metrological purposes and therefore part of the digital signature").replace("{methodName}", "EMHCrypt01").replace("{cryptoAlgorithm}", this.description);
     {
-      if (PlainTextDiv.parentElement != void 0 && PlainTextDiv.parentElement.children[0] != void 0) {
-        PlainTextDiv.parentElement.children[0].innerHTML = "Plain text (320 Bytes, hex)";
+      if (PlainTextDiv.parentElement) {
+        getArrayLikeElement(PlainTextDiv.parentElement.children, 0, "Missing plain text header").innerHTML = "Plain text (320 Bytes, hex)";
       }
       PlainTextDiv.style.fontFamily = "";
       PlainTextDiv.style.whiteSpace = "";
       PlainTextDiv.style.maxHeight = "";
       PlainTextDiv.style.overflowY = "";
-      this.CreateLine("Z\xE4hlernummer", measurementValue.measurement.energyMeterId, result.meterId || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Zeitstempel", UTC2human(measurementValue.timestamp), result.timestamp || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Status", hex2bin(measurementValue.infoStatus) + " (" + measurementValue.infoStatus + ' hex)<br /><span class="statusInfos">' + this.DecodeStatus(measurementValue.infoStatus).join("<br />") + "</span>", result.infoStatus || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Sekundenindex", measurementValue.secondsIndex, result.secondsIndex || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Paginierungsz\xE4hler", parseInt(measurementValue.paginationId, 16), result.paginationId || "", infoDiv, PlainTextDiv);
-      this.CreateLine("OBIS-Kennzahl", measurementValue.measurement.obis, result.obis || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Einheit (codiert)", measurementValue.measurement.unitEncoded ?? 0, result.unitEncoded || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Skalierung", measurementValue.measurement.scale, result.scale || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Messwert", measurementValue.value.toString() + " Wh", result.value || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Logbuchindex", measurementValue.logBookIndex + " hex", result.logBookIndex || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Autorisierung", measurementValue.measurement.chargingSession.authorizationStart["@id"] + " hex", pad(result.authorizationStart, 128) || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Autorisierungszeitpunkt", UTC2human(measurementValue.measurement.chargingSession.authorizationStart.timestamp), pad(result.authorizationStartTimestamp, 151) || "", infoDiv, PlainTextDiv);
+      this.CreateLine("Z\xE4hlernummer", measurementValue.measurement.energyMeterId, result.meterId ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Zeitstempel", UTC2human(measurementValue.timestamp), result.timestamp ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Status", hex2bin(measurementValue.infoStatus) + " (" + measurementValue.infoStatus + ' hex)<br /><span class="statusInfos">' + this.DecodeStatus(measurementValue.infoStatus).join("<br />") + "</span>", result.infoStatus ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Sekundenindex", measurementValue.secondsIndex, result.secondsIndex ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Paginierungsz\xE4hler", parseInt(measurementValue.paginationId, 16), result.paginationId ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("OBIS-Kennzahl", measurementValue.measurement.obis, result.obis ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Einheit (codiert)", measurementValue.measurement.unitEncoded ?? 0, result.unitEncoded ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Skalierung", measurementValue.measurement.scale, result.scale ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Messwert", measurementValue.value.toString() + " Wh", result.value ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Logbuchindex", measurementValue.logBookIndex + " hex", result.logBookIndex ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Autorisierung", measurementValue.measurement.chargingSession.authorizationStart["@id"] + " hex", pad(result.authorizationStart, 128), infoDiv, PlainTextDiv);
+      this.CreateLine("Autorisierungszeitpunkt", UTC2human(measurementValue.measurement.chargingSession.authorizationStart.timestamp), pad(result.authorizationStartTimestamp, 151), infoDiv, PlainTextDiv);
     }
     {
-      if (HashedPlainTextDiv.parentElement != void 0 && HashedPlainTextDiv.parentElement.children[0] != void 0) {
-        HashedPlainTextDiv.parentElement.children[0].innerHTML = "Hashed plain text (SHA256, 24 bytes, hex)";
+      if (HashedPlainTextDiv.parentElement) {
+        getArrayLikeElement(HashedPlainTextDiv.parentElement.children, 0, "Missing hashed plain text header").innerHTML = "Hashed plain text (SHA256, 24 bytes, hex)";
       }
       HashedPlainTextDiv.innerHTML = result.sha256value?.match(/.{1,8}/g)?.join(" ") ?? "";
     }
     if (result.publicKey != null && result.publicKey != "") {
-      if (PublicKeyDiv.parentElement != void 0 && PublicKeyDiv.parentElement.children[0] != void 0) {
-        PublicKeyDiv.parentElement.children[0].innerHTML = "Public Key (" + (result.publicKeyFormat ? result.publicKeyFormat + ", " : "") + "hex)";
+      if (PublicKeyDiv.parentElement) {
+        getArrayLikeElement(PublicKeyDiv.parentElement.children, 0, "Missing public key header").innerHTML = "Public Key (" + (result.publicKeyFormat != null && result.publicKeyFormat.length > 0 ? result.publicKeyFormat + ", " : "") + "hex)";
       }
       if (!IsNullOrEmpty(result.publicKey))
         PublicKeyDiv.innerHTML = result.publicKey.startsWith("04") ? '<span class="leadingFour">04</span> ' + (result.publicKey.substring(2).match(/.{1,8}/g)?.join(" ") ?? "") : result.publicKey.match(/.{1,8}/g)?.join(" ") ?? "";
-      if (PublicKeyDiv.parentElement != void 0 && PublicKeyDiv.parentElement.children[3] != void 0) {
-        PublicKeyDiv.parentElement.children[3].innerHTML = "";
+      const publicKeySignatureContainer = PublicKeyDiv.parentElement?.children[3];
+      if (publicKeySignatureContainer !== void 0) {
+        publicKeySignatureContainer.innerHTML = "";
       }
       if (result.publicKeySignatures) {
         for (const signature of result.publicKeySignatures) {
           try {
-            const signatureDiv = PublicKeyDiv.parentElement?.children[3]?.appendChild(document.createElement("div"));
+            const signatureDiv = publicKeySignatureContainer?.appendChild(document.createElement("div"));
             if (signatureDiv) {
               signatureDiv.classList.add("signature");
               signatureDiv.innerHTML = await this.chargy.CheckMeterPublicKeySignature(
                 measurementValue.measurement.chargingSession.chargingStation,
                 measurementValue.measurement.chargingSession.EVSE,
-                measurementValue.measurement.chargingSession.EVSE?.meters[0],
-                measurementValue.measurement.chargingSession.EVSE?.meters[0]?.publicKeys?.[0],
+                measurementValue.measurement.chargingSession.EVSE?.meters.at(0),
+                measurementValue.measurement.chargingSession.EVSE?.meters.at(0)?.publicKeys?.at(0),
                 signature
               );
               signatureDiv.onclick = () => {
@@ -12804,12 +12843,12 @@ var EMHCrypt01 = class extends ACrypt {
       }
     }
     if (result.signature != null) {
-      if (SignatureExpectedDiv.parentElement != void 0 && SignatureExpectedDiv.parentElement.children[0] != void 0) {
-        SignatureExpectedDiv.parentElement.children[0].innerHTML = "Erwartete Signatur (" + (result.signature.format || "") + ", hex)";
+      if (SignatureExpectedDiv.parentElement) {
+        getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = "Erwartete Signatur (" + (result.signature.format ?? "") + ", hex)";
       }
-      if (result.signature.r && result.signature.s)
+      if (result.signature.r != null && result.signature.r.length > 0 && result.signature.s != null && result.signature.s.length > 0)
         SignatureExpectedDiv.innerHTML = "r: " + (result.signature.r.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "") + "<br />s: " + (result.signature.s.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "");
-      else if (result.signature.value)
+      else if (result.signature.value != null && result.signature.value.length > 0)
         SignatureExpectedDiv.innerHTML = result.signature.value.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
     }
     {
@@ -12837,6 +12876,7 @@ var EMHCrypt01 = class extends ACrypt {
           break;
       }
     }
+    return void 0;
   }
   //#region Helper methods
   DecodeStatus(statusValue) {
@@ -12905,7 +12945,7 @@ var GDFCrypt01 = class extends ACrypt {
       measurementValue.result = cryptoResult;
       return cryptoResult;
     }
-    if (measurementValue.measurement === void 0 || measurementValue.measurement.chargingSession === void 0) {
+    if (measurementValue.measurement?.chargingSession === void 0) {
       return {
         status: "InvalidMeasurement" /* InvalidMeasurement */
       };
@@ -12940,9 +12980,10 @@ var GDFCrypt01 = class extends ACrypt {
           cryptoResult.meter = meter;
           if (meter.publicKeys != null && meter.publicKeys.length > 0) {
             try {
-              cryptoResult.publicKey = meter.publicKeys[0]?.value?.toLowerCase();
-              cryptoResult.publicKeyFormat = meter.publicKeys[0]?.format;
-              cryptoResult.publicKeySignatures = meter.publicKeys[0]?.signatures;
+              const publicKey = meter.publicKeys.at(0);
+              cryptoResult.publicKey = publicKey?.value?.toLowerCase();
+              cryptoResult.publicKeyFormat = publicKey?.format;
+              cryptoResult.publicKeySignatures = publicKey?.signatures;
               try {
                 if (this.curve.keyFromPublic(cryptoResult.publicKey ?? "", "hex").verify(
                   cryptoResult.sha256value,
@@ -12967,54 +13008,55 @@ var GDFCrypt01 = class extends ACrypt {
     }
     return {};
   }
-  async ViewMeasurement(measurementValue, errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
-    if (measurementValue.measurement === void 0 || measurementValue.measurement.chargingSession === void 0 || measurementValue.measurement.chargingSession.authorizationStart.timestamp === void 0) {
+  async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
+    if (measurementValue.measurement?.chargingSession?.authorizationStart.timestamp === void 0) {
       return new Error("Invalid measurement!");
     }
     const result = measurementValue.result;
     introDiv.innerHTML = this.chargy.GetLocalizedMessage("The following data of the charging session is relevant for metrological and legal metrological purposes and therefore part of the digital signature").replace("{methodName}", "GDFCrypt01").replace("{cryptoAlgorithm}", this.description);
     {
-      if (PlainTextDiv.parentElement != void 0 && PlainTextDiv.parentElement.children[0] != void 0) {
-        PlainTextDiv.parentElement.children[0].innerHTML = "Plain text (320 Bytes, hex)";
+      if (PlainTextDiv.parentElement) {
+        getArrayLikeElement(PlainTextDiv.parentElement.children, 0, "Missing plain text header").innerHTML = "Plain text (320 Bytes, hex)";
       }
       PlainTextDiv.style.fontFamily = "";
       PlainTextDiv.style.whiteSpace = "";
       PlainTextDiv.style.maxHeight = "";
       PlainTextDiv.style.overflowY = "";
-      this.CreateLine("Z\xE4hlernummer", measurementValue.measurement.energyMeterId, result.meterId || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Zeitstempel", UTC2human(measurementValue.timestamp), result.timestamp || "", infoDiv, PlainTextDiv);
-      this.CreateLine("OBIS-Kennzahl", measurementValue.measurement.obis, result.obis || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Einheit (codiert)", measurementValue.measurement.unitEncoded ?? 0, result.unitEncoded || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Skalierung", measurementValue.measurement.scale, result.scale || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Messwert", measurementValue.value.toString() + " Wh", result.value || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Autorisierung", measurementValue.measurement.chargingSession.authorizationStart["@id"] + " hex", pad(result.authorizationStart, 128) || "", infoDiv, PlainTextDiv);
-      this.CreateLine("Autorisierungszeitpunkt", UTC2human(measurementValue.measurement.chargingSession.authorizationStart.timestamp), pad(result.authorizationStartTimestamp, 151) || "", infoDiv, PlainTextDiv);
+      this.CreateLine("Z\xE4hlernummer", measurementValue.measurement.energyMeterId, result.meterId ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Zeitstempel", UTC2human(measurementValue.timestamp), result.timestamp ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("OBIS-Kennzahl", measurementValue.measurement.obis, result.obis ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Einheit (codiert)", measurementValue.measurement.unitEncoded ?? 0, result.unitEncoded ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Skalierung", measurementValue.measurement.scale, result.scale ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Messwert", measurementValue.value.toString() + " Wh", result.value ?? "", infoDiv, PlainTextDiv);
+      this.CreateLine("Autorisierung", measurementValue.measurement.chargingSession.authorizationStart["@id"] + " hex", pad(result.authorizationStart, 128), infoDiv, PlainTextDiv);
+      this.CreateLine("Autorisierungszeitpunkt", UTC2human(measurementValue.measurement.chargingSession.authorizationStart.timestamp), pad(result.authorizationStartTimestamp, 151), infoDiv, PlainTextDiv);
     }
     {
-      if (HashedPlainTextDiv.parentElement != void 0 && HashedPlainTextDiv.parentElement.children[0] != void 0) {
-        HashedPlainTextDiv.parentElement.children[0].innerHTML = "Hashed plain text (SHA256, 24 bytes, hex)";
+      if (HashedPlainTextDiv.parentElement) {
+        getArrayLikeElement(HashedPlainTextDiv.parentElement.children, 0, "Missing hashed plain text header").innerHTML = "Hashed plain text (SHA256, 24 bytes, hex)";
       }
       HashedPlainTextDiv.innerHTML = result.sha256value?.match(/.{1,8}/g)?.join(" ") ?? "";
     }
     if (result.publicKey != null && result.publicKey != "") {
-      if (PublicKeyDiv.parentElement != void 0 && PublicKeyDiv.parentElement.children[0] != void 0) {
-        PublicKeyDiv.parentElement.children[0].innerHTML = "Public Key (" + (result.publicKeyFormat ? result.publicKeyFormat + ", " : "") + "hex)";
+      if (PublicKeyDiv.parentElement) {
+        getArrayLikeElement(PublicKeyDiv.parentElement.children, 0, "Missing public key header").innerHTML = "Public Key (" + (result.publicKeyFormat != null && result.publicKeyFormat.length > 0 ? result.publicKeyFormat + ", " : "") + "hex)";
       }
       if (!IsNullOrEmpty(result.publicKey))
         PublicKeyDiv.innerHTML = result.publicKey.startsWith("04") ? '<span class="leadingFour">04</span> ' + (result.publicKey.substring(2).match(/.{1,8}/g)?.join(" ") ?? "") : result.publicKey.match(/.{1,8}/g)?.join(" ") ?? "";
-      if (PublicKeyDiv.parentElement != void 0 && PublicKeyDiv.parentElement.children[3] != void 0) {
-        PublicKeyDiv.parentElement.children[3].innerHTML = "";
+      const publicKeySignatureContainer = PublicKeyDiv.parentElement?.children[3];
+      if (publicKeySignatureContainer !== void 0) {
+        publicKeySignatureContainer.innerHTML = "";
       }
       if (result.publicKeySignatures) {
         for (const signature of result.publicKeySignatures) {
           try {
-            const signatureDiv = PublicKeyDiv.parentElement?.children[3]?.appendChild(document.createElement("div"));
+            const signatureDiv = publicKeySignatureContainer?.appendChild(document.createElement("div"));
             if (signatureDiv != null)
               signatureDiv.innerHTML = await this.chargy.CheckMeterPublicKeySignature(
                 measurementValue.measurement.chargingSession.chargingStation,
                 measurementValue.measurement.chargingSession.EVSE,
-                measurementValue.measurement.chargingSession.EVSE?.meters[0],
-                measurementValue.measurement.chargingSession.EVSE?.meters[0]?.publicKeys?.[0],
+                measurementValue.measurement.chargingSession.EVSE?.meters.at(0),
+                measurementValue.measurement.chargingSession.EVSE?.meters.at(0)?.publicKeys?.at(0),
                 signature
               );
           } catch (exception) {
@@ -13024,12 +13066,12 @@ var GDFCrypt01 = class extends ACrypt {
       }
     }
     if (result.signature != null) {
-      if (SignatureExpectedDiv.parentElement != void 0 && SignatureExpectedDiv.parentElement.children[0] != void 0) {
-        SignatureExpectedDiv.parentElement.children[0].innerHTML = "Erwartete Signatur (" + (result.signature.format || "") + ", hex)";
+      if (SignatureExpectedDiv.parentElement) {
+        getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = "Erwartete Signatur (" + (result.signature.format ?? "") + ", hex)";
       }
-      if (result.signature.r && result.signature.s)
+      if (result.signature.r != null && result.signature.r.length > 0 && result.signature.s != null && result.signature.s.length > 0)
         SignatureExpectedDiv.innerHTML = "r: " + (result.signature.r.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "") + "<br />s: " + (result.signature.s.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "");
-      else if (result.signature.value)
+      else if (result.signature.value != null && result.signature.value.length > 0)
         SignatureExpectedDiv.innerHTML = result.signature.value.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
     }
     {
@@ -13057,6 +13099,7 @@ var GDFCrypt01 = class extends ACrypt {
           break;
       }
     }
+    return void 0;
   }
 };
 var MENNEKES_EDL40_XMLNS = "http://www.mennekes.de/Mennekes.EdlVerification.xsd";
@@ -13303,7 +13346,7 @@ var MennekesCrypt01 = class extends ACrypt {
         signedData.byteOffset + signedData.byteLength
       );
       cryptoResult.hashValue = (await sha256(new DataView(signedDataBuffer))).substring(0, 48);
-      const publicKey = cleanHex(meter.publicKeys[0]?.value ?? measurement.publicKey);
+      const publicKey = cleanHex(meter.publicKeys.at(0)?.value ?? measurement.publicKey);
       if (publicKey.length !== 96)
         return setResult("InvalidPublicKey" /* InvalidPublicKey */);
       const result = this.curve192r1.keyFromPublic("04" + publicKey, "hex").verify(
@@ -13334,7 +13377,7 @@ var MennekesCrypt01 = class extends ACrypt {
     PublicKeyDiv.innerHTML = result.publicKey?.match(/.{1,8}/g)?.join(" ") ?? "";
     if (SignatureExpectedDiv.parentElement?.children[0])
       SignatureExpectedDiv.parentElement.children[0].innerHTML = this.chargy.GetLocalizedMessage("Expected signature") + " (rs, hex)";
-    SignatureExpectedDiv.innerHTML = result.signature?.r && result.signature.s ? "r: " + (result.signature.r.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "") + "<br />s: " + (result.signature.s.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "") : "";
+    SignatureExpectedDiv.innerHTML = result.signature?.r != null && result.signature.r.length > 0 && result.signature.s != null && result.signature.s.length > 0 ? "r: " + (result.signature.r.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "") + "<br />s: " + (result.signature.s.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "") : "";
     SignatureCheckDiv.innerHTML = result.status === "ValidSignature" /* ValidSignature */ ? '<i class="fas fa-check-circle"></i><div id="description">' + this.chargy.GetLocalizedMessage("Valid signature") + "</div>" : '<i class="fas fa-times-circle"></i><div id="description">' + this.chargy.GetLocalizedMessage("Invalid signature") + "</div>";
     return Promise.resolve(void 0);
   }
@@ -13353,10 +13396,7 @@ function parseMennekesXMLDocument(XMLDocument) {
     throw new Error("No Mennekes ChargingProcess element found!");
   if (isLocalName(XMLDocument.documentElement, "ChargingProcess")) {
     if (chargingProcesses.length > 1) {
-      const chargingProcess = chargingProcesses[0];
-      if (chargingProcess != void 0)
-        return chargingProcess;
-      throw new Error("No Mennekes ChargingProcess found!");
+      return getFirstArrayElement(chargingProcesses, "No Mennekes ChargingProcess found!");
     }
   }
   return {
@@ -13479,8 +13519,8 @@ function toMennekesMeasurementValue(measurement) {
 }
 function validateMennekesLawConformity(measurementValues, chargy) {
   const errors = new Array();
-  const start = measurementValues[0];
-  const end = measurementValues[measurementValues.length - 1];
+  const start = measurementValues.at(0);
+  const end = measurementValues.at(-1);
   if (start == null || end == null)
     return [
       CreateError(chargy.GetMultilanguageText("Mennekes EDL40 requires at least two measurement values."))
@@ -13610,9 +13650,9 @@ var OCMFv1_x = class extends ACrypt {
   }
   async VerifyMeasurement(measurementValue) {
     measurementValue.method = this;
-    return {
+    return Promise.resolve({
       status: measurementValue.result?.status ?? "Unvalidated" /* Unvalidated */
-    };
+    });
   }
   PayloadDictionary(Path, Key) {
     if (Path === "RD") {
@@ -13682,7 +13722,7 @@ var OCMFv1_x = class extends ACrypt {
         return Key;
     }
   }
-  SignatureDictionary(Path, Key) {
+  SignatureDictionary(_Path, Key) {
     switch (Key) {
       case "SA":
         return "Signature Algorithm";
@@ -13696,16 +13736,16 @@ var OCMFv1_x = class extends ACrypt {
         return Key;
     }
   }
-  async ViewMeasurement(measurementValue, errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
+  async ViewMeasurement(measurementValue, _errorDiv, introDiv, _infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
     if (!measurementValue.measurement || !measurementValue.ocmfDocument || !measurementValue.measurement.chargingSession) {
       return new Error("Invalid measurement!");
     }
     {
-      introDiv.innerHTML = this.chargy.GetLocalizedMessage("The following data of the charging session is relevant for metrological and legal metrological purposes and therefore part of the digital signature").replace("{methodName}", "OCMFCrypt01").replace("{cryptoAlgorithm}", measurementValue.ocmfDocument.publicKey && typeof measurementValue.ocmfDocument.publicKey !== "string" ? "(" + measurementValue.ocmfDocument.publicKey.algorithm + ") " : "");
+      introDiv.innerHTML = this.chargy.GetLocalizedMessage("The following data of the charging session is relevant for metrological and legal metrological purposes and therefore part of the digital signature").replace("{methodName}", "OCMFCrypt01").replace("{cryptoAlgorithm}", measurementValue.ocmfDocument.publicKey != null && typeof measurementValue.ocmfDocument.publicKey !== "string" ? "(" + measurementValue.ocmfDocument.publicKey.algorithm + ") " : "");
     }
     {
-      if (PlainTextDiv.parentElement && PlainTextDiv.parentElement.children[0]) {
-        PlainTextDiv.parentElement.children[0].innerHTML = this.chargy.GetLocalizedMessage("Plain text") + " (OCMF|&lt;" + this.chargy.GetLocalizedMessage("payload") + "&gt;|&lt;" + this.chargy.GetLocalizedMessage("signature") + "&gt;)";
+      if (PlainTextDiv.parentElement) {
+        getArrayLikeElement(PlainTextDiv.parentElement.children, 0, "Missing plain text header").innerHTML = this.chargy.GetLocalizedMessage("Plain text") + " (OCMF|&lt;" + this.chargy.GetLocalizedMessage("payload") + "&gt;|&lt;" + this.chargy.GetLocalizedMessage("signature") + "&gt;)";
       }
       PlainTextDiv.innerText = "";
       const compactValueDiv = document.createElement("div");
@@ -13737,29 +13777,30 @@ var OCMFv1_x = class extends ACrypt {
       };
     }
     {
-      if (HashedPlainTextDiv.parentElement && HashedPlainTextDiv.parentElement.children[0]) {
-        HashedPlainTextDiv.parentElement.children[0].innerHTML = this.chargy.GetLocalizedMessage("Hashed payload") + " (" + measurementValue.ocmfDocument.hashAlgorithm + ")";
+      if (HashedPlainTextDiv.parentElement) {
+        getArrayLikeElement(HashedPlainTextDiv.parentElement.children, 0, "Missing hashed payload header").innerHTML = this.chargy.GetLocalizedMessage("Hashed payload") + " (" + measurementValue.ocmfDocument.hashAlgorithm + ")";
       }
       HashedPlainTextDiv.innerHTML = measurementValue.ocmfDocument.hashValue.match(/.{1,8}/g)?.join(" ") ?? "0x00000000000000000000000000000000000";
     }
-    if (measurementValue.ocmfDocument.publicKey) {
-      if (PublicKeyDiv.parentElement && PublicKeyDiv.parentElement.children[0]) {
-        PublicKeyDiv.parentElement.children[0].innerHTML = typeof measurementValue.ocmfDocument.publicKey === "string" ? this.chargy.GetLocalizedMessage("Public Key") : this.chargy.GetLocalizedMessage("Public Key") + " (" + measurementValue.ocmfDocument.publicKey.algorithm + ", " + measurementValue.ocmfDocument.publicKey.encoding + ")";
+    if (measurementValue.ocmfDocument.publicKey != null) {
+      if (PublicKeyDiv.parentElement) {
+        getArrayLikeElement(PublicKeyDiv.parentElement.children, 0, "Missing public key header").innerHTML = typeof measurementValue.ocmfDocument.publicKey === "string" ? this.chargy.GetLocalizedMessage("Public Key") : this.chargy.GetLocalizedMessage("Public Key") + " (" + measurementValue.ocmfDocument.publicKey.algorithm + ", " + measurementValue.ocmfDocument.publicKey.encoding + ")";
       }
       PublicKeyDiv.innerHTML = typeof measurementValue.ocmfDocument.publicKey === "string" ? measurementValue.ocmfDocument.publicKey : "der: " + (measurementValue.ocmfDocument.publicKey.value?.match(/.{1,8}/g)?.join(" ") ?? "-") + "<br /><br />x:&nbsp;&nbsp; " + (measurementValue.ocmfDocument.publicKey.x.match(/.{1,8}/g)?.join(" ") ?? "-") + "<br />y:&nbsp;&nbsp; " + (measurementValue.ocmfDocument.publicKey.y.match(/.{1,8}/g)?.join(" ") ?? "-");
     }
-    if (PublicKeyDiv.parentElement && PublicKeyDiv.parentElement.children[3]) {
-      PublicKeyDiv.parentElement.children[3].innerHTML = "";
+    const publicKeySignatureContainer = PublicKeyDiv.parentElement?.children[3];
+    if (publicKeySignatureContainer !== void 0) {
+      publicKeySignatureContainer.innerHTML = "";
       const result = measurementValue.result;
       if (result.publicKeySignatures) {
         for (const signature of result.publicKeySignatures) {
           try {
-            const signatureDiv = PublicKeyDiv.parentElement.children[3].appendChild(document.createElement("div"));
+            const signatureDiv = publicKeySignatureContainer.appendChild(document.createElement("div"));
             signatureDiv.innerHTML = await this.chargy.CheckMeterPublicKeySignature(
               measurementValue.measurement.chargingSession.chargingStation,
               measurementValue.measurement.chargingSession.EVSE,
-              measurementValue.measurement.chargingSession.EVSE?.meters[0],
-              measurementValue.measurement.chargingSession.EVSE?.meters[0]?.publicKeys?.[0],
+              measurementValue.measurement.chargingSession.EVSE?.meters.at(0),
+              measurementValue.measurement.chargingSession.EVSE?.meters.at(0)?.publicKeys?.at(0),
               signature
             );
           } catch {
@@ -13769,8 +13810,8 @@ var OCMFv1_x = class extends ACrypt {
       }
     }
     if (measurementValue.ocmfDocument.signature.SD) {
-      if (SignatureExpectedDiv.parentElement && SignatureExpectedDiv.parentElement.children[0]) {
-        SignatureExpectedDiv.parentElement.children[0].innerHTML = this.chargy.GetLocalizedMessage("Expected signature") + " (rs, hex)";
+      if (SignatureExpectedDiv.parentElement) {
+        getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = this.chargy.GetLocalizedMessage("Expected signature") + " (rs, hex)";
       }
       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(" ") ?? "-");
     }
@@ -13793,6 +13834,7 @@ var OCMFv1_x = class extends ACrypt {
           break;
       }
     }
+    return void 0;
   }
 };
 var OCMFTransactionTypes = /* @__PURE__ */ ((OCMFTransactionTypes2) => {
@@ -13825,268 +13867,270 @@ var OCMF = class {
       const evseId = asString(containerInfos["EVSEId"]) ?? asString(evseInfo?.["@id"]) ?? "DE*GEF*EVSE*CHARGY*1";
       const stationDescription = asJSONObject(chargingStationInfo?.["description"]);
       const evseDescription = asJSONObject(evseInfo?.["description"]);
-      const firstOCMDJSONDocument = OCMFJSONDocuments[0];
-      if (firstOCMDJSONDocument != void 0) {
-        const formatVersion = firstOCMDJSONDocument.payload.FV;
-        const gatewayInformation = firstOCMDJSONDocument.payload.GI ?? firstOCMDJSONDocument.payload.VI;
-        const gatewaySerial = firstOCMDJSONDocument.payload.GS;
-        const gatewayVersion = firstOCMDJSONDocument.payload.GV ?? firstOCMDJSONDocument.payload.VV;
-        const paging = firstOCMDJSONDocument.payload.PG;
-        const meterVendor = firstOCMDJSONDocument.payload.MV;
-        const meterModel = firstOCMDJSONDocument.payload.MM;
-        const meterSerial = firstOCMDJSONDocument.payload.MS;
-        const effectiveMeterSerial = meterSerial ?? gatewaySerial;
-        const meterFirmware = firstOCMDJSONDocument.payload.MF;
-        const identificationStatus = firstOCMDJSONDocument.payload.IS;
-        const identificationLevel = firstOCMDJSONDocument.payload.IL;
-        const identificationFlags = firstOCMDJSONDocument.payload.IF;
-        const identificationType = firstOCMDJSONDocument.payload.IT;
-        const identificationData = firstOCMDJSONDocument.payload.ID;
-        const tariffText = firstOCMDJSONDocument.payload.TT;
-        const controlerFirmwareVersion = firstOCMDJSONDocument.payload.CF;
-        const lossCompensation = firstOCMDJSONDocument.payload.LC;
-        const chargePointIdType = firstOCMDJSONDocument.payload.CT;
-        const chargePointId = firstOCMDJSONDocument.payload.CI;
-        if (isOptionalString(formatVersion) && isOptionalString(gatewayInformation) && isOptionalString(gatewaySerial) && isOptionalString(gatewayVersion) && isMandatoryString(paging) && isOptionalString(meterVendor) && isOptionalString(meterModel) && // OCMF 1.0 table 3 lists MS as 1..1, but the later "Relation of Serial Numbers,
-        // Charge Point and Public Key" section makes the serial-number fields conditionally
-        // mandatory. KEBA KCP30 records identify the signing gateway via GS and omit MS.
-        // Therefore we keep meterSerial and gatewaySerial separate, but require at least one
-        // usable serial number for the CTR meter identity.
-        isMandatoryString(effectiveMeterSerial) && isOptionalString(meterFirmware) && // OCMF 1.x uses boolean IS values. OCMF 0.1 SAFE reference data used status strings
-        // such as "VERIFIED", so accept both forms and preserve the original value in the CTR.
-        (isMandatoryBoolean(identificationStatus) || isMandatoryString(identificationStatus)) && isOptionalString(identificationLevel) && //chargyLib.isMandatoryArrayOfStrings (identificationFlags)      &&
-        isOptionalArrayOfStrings(identificationFlags) && // Note: Some vendors do not use this MANDATORY field!
-        // IT is 1..1 in the user-assignment table for transaction records. Some OCMF 1.0
-        // implementations omit it when no user is assigned (IS=false, ID empty). We tolerate
-        // this vendor compatibility case instead of rejecting otherwise valid signatures.
-        isOptionalString(identificationType) && isOptionalString(identificationData) && isOptionalString(tariffText) && isOptionalString(controlerFirmwareVersion) && isOptionalJSONObject(lossCompensation) && isOptionalString(chargePointIdType) && isOptionalString(chargePointId)) {
-          const paginationPrefix = paging.length > 0 ? paging[0]?.toLowerCase() : null;
-          const transactionType = paginationPrefix === "t" ? "transaction" /* transaction */ : paginationPrefix === "f" ? "fiscal" /* fiscal */ : "undefined" /* undefined */;
-          const pagination = paging.length > 1 ? parseNumber(paging.substring(1)) : null;
-          if (transactionType === "undefined" /* undefined */) return {
-            status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-            message: this.chargy.GetMultilanguageText("The given OCMF data does not have a valid transaction type!"),
-            certainty: 0
-          };
-          if (!isMandatoryNumber(pagination)) return {
-            status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-            message: this.chargy.GetMultilanguageText("The given OCMF data does not have a valid pagination counter!"),
-            certainty: 0
-          };
-          if (firstOCMDJSONDocument.payload.RD.length == 0) return {
-            status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-            message: this.chargy.GetMultilanguageText("Each OCMF data set must have at least one meter reading!"),
-            certainty: 0
-          };
-          const CTR = {
-            "@id": "?",
-            "@context": "https://open.charging.cloud/contexts/CTR+json",
-            //"@context":  [ "https://open.charging.cloud/contexts/CTR+json", "https://open.charging.cloud/contexts/CTR_OCMF+json" ],
+      const firstOCMDJSONDocument = getFirstArrayElement(OCMFJSONDocuments, "Missing first OCMF JSON document");
+      const formatVersion = firstOCMDJSONDocument.payload.FV;
+      const gatewayInformation = firstOCMDJSONDocument.payload.GI ?? firstOCMDJSONDocument.payload.VI;
+      const gatewaySerial = firstOCMDJSONDocument.payload.GS;
+      const gatewayVersion = firstOCMDJSONDocument.payload.GV ?? firstOCMDJSONDocument.payload.VV;
+      const paging = firstOCMDJSONDocument.payload.PG;
+      const meterVendor = firstOCMDJSONDocument.payload.MV;
+      const meterModel = firstOCMDJSONDocument.payload.MM;
+      const meterSerial = firstOCMDJSONDocument.payload.MS;
+      const effectiveMeterSerial = meterSerial ?? gatewaySerial;
+      const meterFirmware = firstOCMDJSONDocument.payload.MF;
+      const identificationStatus = firstOCMDJSONDocument.payload.IS;
+      const identificationLevel = firstOCMDJSONDocument.payload.IL;
+      const identificationFlags = firstOCMDJSONDocument.payload.IF;
+      const identificationType = firstOCMDJSONDocument.payload.IT;
+      const identificationData = firstOCMDJSONDocument.payload.ID;
+      const tariffText = firstOCMDJSONDocument.payload.TT;
+      const controlerFirmwareVersion = firstOCMDJSONDocument.payload.CF;
+      const lossCompensation = firstOCMDJSONDocument.payload.LC;
+      const chargePointIdType = firstOCMDJSONDocument.payload.CT;
+      const chargePointId = firstOCMDJSONDocument.payload.CI;
+      if (isOptionalString(formatVersion) && isOptionalString(gatewayInformation) && isOptionalString(gatewaySerial) && isOptionalString(gatewayVersion) && isMandatoryString(paging) && isOptionalString(meterVendor) && isOptionalString(meterModel) && // OCMF 1.0 table 3 lists MS as 1..1, but the later "Relation of Serial Numbers,
+      // Charge Point and Public Key" section makes the serial-number fields conditionally
+      // mandatory. KEBA KCP30 records identify the signing gateway via GS and omit MS.
+      // Therefore we keep meterSerial and gatewaySerial separate, but require at least one
+      // usable serial number for the CTR meter identity.
+      isMandatoryString(effectiveMeterSerial) && isOptionalString(meterFirmware) && // OCMF 1.x uses boolean IS values. OCMF 0.1 SAFE reference data used status strings
+      // such as "VERIFIED", so accept both forms and preserve the original value in the CTR.
+      (isMandatoryBoolean(identificationStatus) || isMandatoryString(identificationStatus)) && isOptionalString(identificationLevel) && //chargyLib.isMandatoryArrayOfStrings (identificationFlags)      &&
+      isOptionalArrayOfStrings(identificationFlags) && // Note: Some vendors do not use this MANDATORY field!
+      // IT is 1..1 in the user-assignment table for transaction records. Some OCMF 1.0
+      // implementations omit it when no user is assigned (IS=false, ID empty). We tolerate
+      // this vendor compatibility case instead of rejecting otherwise valid signatures.
+      isOptionalString(identificationType) && isOptionalString(identificationData) && isOptionalString(tariffText) && isOptionalString(controlerFirmwareVersion) && isOptionalJSONObject(lossCompensation) && isOptionalString(chargePointIdType) && isOptionalString(chargePointId)) {
+        const paginationPrefix = paging.length > 0 ? paging.charAt(0).toLowerCase() : null;
+        const transactionType = paginationPrefix === "t" ? "transaction" /* transaction */ : paginationPrefix === "f" ? "fiscal" /* fiscal */ : "undefined" /* undefined */;
+        const pagination = paging.length > 1 ? parseNumber(paging.substring(1)) : null;
+        if (transactionType === "undefined" /* undefined */) return {
+          status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+          message: this.chargy.GetMultilanguageText("The given OCMF data does not have a valid transaction type!"),
+          certainty: 0
+        };
+        if (!isMandatoryNumber(pagination)) return {
+          status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+          message: this.chargy.GetMultilanguageText("The given OCMF data does not have a valid pagination counter!"),
+          certainty: 0
+        };
+        if (firstOCMDJSONDocument.payload.RD.length == 0) return {
+          status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+          message: this.chargy.GetMultilanguageText("Each OCMF data set must have at least one meter reading!"),
+          certainty: 0
+        };
+        const CTR = {
+          "@id": "?",
+          "@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": "?",
+          "end": "?",
+          "description": {
+            "de": "Alle OCMF-Ladevorg\xE4nge"
+          },
+          "contract": {
+            "@id": identificationData ?? "?",
+            "type": identificationType ?? "?"
+          },
+          "ocmf": {
+            "formatVersion": formatVersion,
+            "gatewayInformation": gatewayInformation,
+            "gatewaySerial": gatewaySerial,
+            "gatewayVersion": gatewayVersion
+          },
+          //    "chargingStationOperators": [{
+          "chargingPools": [{
+            "@id": "DE*GEF*POOL*CHARGY*1",
+            "description": { "en": "GraphDefined CHARGY Virtual Charging Pool 1" },
+            "chargingStations": [{
+              "@id": chargingStationId,
+              "description": stationDescription && Object.keys(stationDescription).length > 0 ? stationDescription : { "en": "GraphDefined CHARGY Virtual Charging Station 1" },
+              "firmwareVersion": asString(chargingStationInfo?.["softwareVersion"]) ?? asString(chargingStationInfo?.["firmwareVersion"]),
+              "geoLocation": asJSONObject(chargingStationInfo?.["geoLocation"]),
+              "address": asJSONObject(chargingStationInfo?.["address"]),
+              "EVSEs": [{
+                "@id": evseId,
+                "description": evseDescription && Object.keys(evseDescription).length > 0 ? evseDescription : { "en": "GraphDefined CHARGY Virtual EVSE 1" },
+                "connectors": connectorInfo ? [{
+                  "type": asString(connectorInfo["type"]) ?? "",
+                  "looses": asNumber(connectorInfo["looses"]) ?? 0
+                }] : void 0,
+                "meters": [{
+                  "@id": effectiveMeterSerial,
+                  // The signed OCMF payload values always win,
+                  // the container infos only fill the gaps!
+                  "manufacturer": meterVendor ?? asString(energyMeterInfo?.["manufacturer"]),
+                  "manufacturerURL": asString(energyMeterInfo?.["manufacturerURL"]),
+                  "model": meterModel ?? asString(energyMeterInfo?.["model"]),
+                  "modelURL": asString(energyMeterInfo?.["modelURL"]),
+                  "hardwareVersion": asString(energyMeterInfo?.["hardwareVersion"]),
+                  "firmwareVersion": meterFirmware ?? asString(energyMeterInfo?.["firmwareVersion"]),
+                  "signatureFormat": "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/OCMFv1.0+json",
+                  "publicKeys": [{
+                    "algorithm": "?",
+                    "encoding": "?",
+                    "format": "?",
+                    "value": "?"
+                  }]
+                }]
+              }]
+            }]
+          }],
+          "chargingSessions": [{
+            "@id": "1554181214441:-1965658344385548683:2",
+            "@context": "https://open.charging.cloud/contexts/SessionSignatureFormats/OCMFv1.0+json",
             "begin": "?",
             "end": "?",
-            "description": {
-              "de": "Alle OCMF-Ladevorg\xE4nge"
-            },
-            "contract": {
+            "EVSEId": evseId,
+            "authorizationStart": {
               "@id": identificationData ?? "?",
-              "type": identificationType ?? "?"
-            },
-            "ocmf": {
-              "formatVersion": formatVersion,
-              "gatewayInformation": gatewayInformation,
-              "gatewaySerial": gatewaySerial,
-              "gatewayVersion": gatewayVersion
+              "type": identificationType ?? "?",
+              "identificationStatus": identificationStatus,
+              "identificationLevel": identificationLevel,
+              "identificationFlags": identificationFlags ?? []
+              // Note: The OCMF documentation expects an empty array!
             },
-            //    "chargingStationOperators": [{
-            "chargingPools": [{
-              "@id": "DE*GEF*POOL*CHARGY*1",
-              "description": { "en": "GraphDefined CHARGY Virtual Charging Pool 1" },
-              "chargingStations": [{
-                "@id": chargingStationId,
-                "description": stationDescription && Object.keys(stationDescription).length > 0 ? stationDescription : { "en": "GraphDefined CHARGY Virtual Charging Station 1" },
-                "firmwareVersion": asString(chargingStationInfo?.["softwareVersion"]) ?? asString(chargingStationInfo?.["firmwareVersion"]),
-                "geoLocation": asJSONObject(chargingStationInfo?.["geoLocation"]),
-                "address": asJSONObject(chargingStationInfo?.["address"]),
-                "EVSEs": [{
-                  "@id": evseId,
-                  "description": evseDescription && Object.keys(evseDescription).length > 0 ? evseDescription : { "en": "GraphDefined CHARGY Virtual EVSE 1" },
-                  "connectors": connectorInfo ? [{
-                    "type": asString(connectorInfo["type"]) ?? "",
-                    "looses": asNumber(connectorInfo["looses"]) ?? 0
-                  }] : void 0,
-                  "meters": [{
-                    "@id": effectiveMeterSerial,
-                    // The signed OCMF payload values always win,
-                    // the container infos only fill the gaps!
-                    "manufacturer": meterVendor ?? asString(energyMeterInfo?.["manufacturer"]),
-                    "manufacturerURL": asString(energyMeterInfo?.["manufacturerURL"]),
-                    "model": meterModel ?? asString(energyMeterInfo?.["model"]),
-                    "modelURL": asString(energyMeterInfo?.["modelURL"]),
-                    "hardwareVersion": asString(energyMeterInfo?.["hardwareVersion"]),
-                    "firmwareVersion": meterFirmware ?? asString(energyMeterInfo?.["firmwareVersion"]),
-                    "signatureFormat": "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/OCMFv1.0+json",
-                    "publicKeys": [{
-                      "algorithm": "?",
-                      "encoding": "?",
-                      "format": "?",
-                      "value": "?"
-                    }]
-                  }]
-                }]
-              }]
-            }],
-            "chargingSessions": [{
-              "@id": "1554181214441:-1965658344385548683:2",
-              "@context": "https://open.charging.cloud/contexts/SessionSignatureFormats/OCMFv1.0+json",
-              "begin": "?",
-              "end": "?",
-              "EVSEId": evseId,
-              "authorizationStart": {
-                "@id": identificationData ?? "?",
-                "type": identificationType ?? "?",
-                "identificationStatus": identificationStatus,
-                "identificationLevel": identificationLevel,
-                "identificationFlags": identificationFlags ?? []
-                // Note: The OCMF documentation expects an empty array!
-              },
-              "measurements": []
-            }],
-            "certainty": 1
-          };
-          const measurementsByKey = /* @__PURE__ */ new Map();
-          for (const ocmfJSONDocument of OCMFJSONDocuments) {
-            let inheritedReading = {};
-            for (const reading of ocmfJSONDocument.payload.RD) {
-              const effectiveReading = { ...inheritedReading, ...reading };
-              const time = effectiveReading.TM;
-              const transaction = effectiveReading.TX;
-              const readingValue = effectiveReading.RV;
-              const readingIdentification = effectiveReading.RI;
-              const readingUnit = effectiveReading.RU;
-              const readingCurrentType = effectiveReading.RT;
-              const cumulatedLoss = effectiveReading.CL;
-              const errorFlags = effectiveReading.EF;
-              const status = effectiveReading.ST;
-              inheritedReading = effectiveReading;
-              if (isMandatoryString(time) && isOptionalString(transaction) && isMandatoryDecimal(readingValue) && // Note: Some vendors use a JSON string here!
-              isOptionalString(readingIdentification) && isMandatoryString(readingUnit) && isOptionalString(readingCurrentType) && isOptionalDecimal(cumulatedLoss) && isOptionalString(errorFlags) && isMandatoryString(status)) {
-                const timeSplit = time.split(" ");
-                if (timeSplit.length != 2) return {
-                  status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-                  message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid time format!"),
-                  certainty: 0
-                };
-                const timeRegEx = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2},\d{3}[+-]\d{4}$/;
-                const timeStamp = timeSplit[0];
-                if (!isMandatoryString(timeStamp) || !timeRegEx.test(timeStamp)) return {
-                  status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-                  message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid time sync format!"),
-                  certainty: 0
-                };
-                const timeStampISO8601 = this.convertToISO8601(timeStamp);
-                const timeSyncText = timeSplit[1];
-                let timeSync = "unknown" /* unknown */;
-                if (!isMandatoryString(timeSyncText) || !["U", "I", "S", "R"].includes(timeSyncText)) return {
-                  status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-                  message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid time sync format!"),
-                  certainty: 0
-                };
-                switch (timeSyncText) {
-                  case "U":
-                    timeSync = "unknown" /* unknown */;
-                    break;
-                  case "I":
-                    timeSync = "informative" /* informative */;
-                    break;
-                  case "S":
-                    timeSync = "syncronized" /* syncronized */;
-                    break;
-                  case "R":
-                    timeSync = "relative" /* relative */;
-                    break;
-                  default:
-                    return {
-                      status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-                      message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid time sync format!"),
-                      certainty: 0
-                    };
-                }
-                if (transaction && !["B", "C", "X", "E", "L", "R", "A", "P", "S", "T"].includes(transaction)) return {
-                  status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-                  message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid transaction type!"),
-                  certainty: 0
-                };
-                if (!["kWh", "Wh", "mOhm", "uOhm"].includes(readingUnit)) return {
-                  status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-                  message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid current type!"),
-                  certainty: 0
-                };
-                if (readingCurrentType && !["AC", "DC"].includes(readingCurrentType)) return {
-                  status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-                  message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid current type!"),
-                  certainty: 0
-                };
-                if (CTR.chargingSessions?.[0]?.begin === "?")
-                  CTR.chargingSessions[0].begin = timeStampISO8601;
-                CTR.chargingSessions[0].end = timeStampISO8601;
-                const measurementKey = [
-                  readingIdentification ?? "?",
-                  readingUnit,
-                  readingCurrentType ?? ""
-                ].join("|");
-                let measurement = measurementsByKey.get(measurementKey);
-                if (measurement == null) {
-                  measurement = {
-                    "name": OBIS2MeasurementName(readingIdentification ?? ""),
-                    "scale": 0,
-                    "energyMeterId": effectiveMeterSerial,
-                    "@context": "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/OCMFv1.0+json",
-                    "obis": readingIdentification ?? "?",
-                    // OBIS: "1-b:1.8.0"
-                    "unit": readingUnit,
-                    // "kWh"
-                    "currentType": readingCurrentType,
-                    // "AC"
-                    "values": []
+            "measurements": []
+          }],
+          "certainty": 1
+        };
+        const measurementsByKey = /* @__PURE__ */ new Map();
+        for (const ocmfJSONDocument of OCMFJSONDocuments) {
+          let inheritedReading = {};
+          for (const reading of ocmfJSONDocument.payload.RD) {
+            const effectiveReading = { ...inheritedReading, ...reading };
+            const time = effectiveReading.TM;
+            const transaction = effectiveReading.TX;
+            const readingValue = effectiveReading.RV;
+            const readingIdentification = effectiveReading.RI;
+            const readingUnit = effectiveReading.RU;
+            const readingCurrentType = effectiveReading.RT;
+            const cumulatedLoss = effectiveReading.CL;
+            const errorFlags = effectiveReading.EF;
+            const status = effectiveReading.ST;
+            inheritedReading = effectiveReading;
+            if (isMandatoryString(time) && isOptionalString(transaction) && isMandatoryDecimal(readingValue) && // Note: Some vendors use a JSON string here!
+            isOptionalString(readingIdentification) && isMandatoryString(readingUnit) && isOptionalString(readingCurrentType) && //   chargyLib.isOptionalDecimal  (cumulatedLoss)         &&
+            isOptionalString(errorFlags) && isMandatoryString(status)) {
+              const timeSplit = time.split(" ");
+              if (timeSplit.length != 2) return {
+                status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+                message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid time format!"),
+                certainty: 0
+              };
+              const timeRegEx = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2},\d{3}[+-]\d{4}$/;
+              const timeStamp = timeSplit[0];
+              if (!isMandatoryString(timeStamp) || !timeRegEx.test(timeStamp)) return {
+                status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+                message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid time sync format!"),
+                certainty: 0
+              };
+              const timeStampISO8601 = this.convertToISO8601(timeStamp);
+              const timeSyncText = timeSplit[1];
+              let timeSync = "unknown" /* unknown */;
+              if (!isMandatoryString(timeSyncText) || !["U", "I", "S", "R"].includes(timeSyncText)) return {
+                status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+                message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid time sync format!"),
+                certainty: 0
+              };
+              switch (timeSyncText) {
+                case "U":
+                  timeSync = "unknown" /* unknown */;
+                  break;
+                case "I":
+                  timeSync = "informative" /* informative */;
+                  break;
+                case "S":
+                  timeSync = "syncronized" /* syncronized */;
+                  break;
+                case "R":
+                  timeSync = "relative" /* relative */;
+                  break;
+                default:
+                  return {
+                    status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+                    message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid time sync format!"),
+                    certainty: 0
                   };
-                  measurementsByKey.set(measurementKey, measurement);
-                  CTR.chargingSessions[0].measurements.push(measurement);
-                }
-                measurement.values.push({
-                  "timestamp": timeStampISO8601,
-                  // "2019-06-26T08:57:44,337+0000"
-                  "timeSync": timeSync,
-                  // "U"|"I"|"S"|"R"
-                  "transaction": transaction,
-                  // "B"|"C"|"X"|"E"|"L"|"R"|"A"|"P"|"S"|"T"|null
-                  "value": new Decimal(readingValue),
-                  // 2935.6
-                  "transactionType": transactionType,
-                  // "T"     ToDo: Serialize this to a string!
-                  "pagination": pagination,
-                  // "9289"
-                  "errorFlags": errorFlags,
-                  // ""
-                  "cumulatedLoss": cumulatedLoss ? new Decimal(cumulatedLoss) : void 0,
-                  "status": status,
-                  // "G"
-                  // "signatures":          [{
-                  //                            "value":  ocmfJSONDocument.signature["SD"]
-                  //                        }],
-                  "result": {
-                    "status": ocmfJSONDocument.validationStatus ?? "Unvalidated" /* Unvalidated */
-                  },
-                  "ocmfDocument": ocmfJSONDocument
-                });
               }
+              if (transaction != null && transaction.length > 0 && !["B", "C", "X", "E", "L", "R", "A", "P", "S", "T"].includes(transaction)) return {
+                status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+                message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid transaction type!"),
+                certainty: 0
+              };
+              if (!["kWh", "Wh", "mOhm", "uOhm"].includes(readingUnit)) return {
+                status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+                message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid current type!"),
+                certainty: 0
+              };
+              if (readingCurrentType != null && readingCurrentType.length > 0 && !["AC", "DC"].includes(readingCurrentType)) return {
+                status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+                message: this.chargy.GetMultilanguageText("The given OCMF meter value does not have a valid current type!"),
+                certainty: 0
+              };
+              if (CTR.chargingSessions?.[0]?.begin === "?")
+                CTR.chargingSessions[0].begin = timeStampISO8601;
+              if (CTR.chargingSessions?.[0] !== void 0)
+                CTR.chargingSessions[0].end = timeStampISO8601;
+              const measurementKey = [
+                readingIdentification ?? "?",
+                readingUnit,
+                readingCurrentType ?? ""
+              ].join("|");
+              let measurement = measurementsByKey.get(measurementKey);
+              if (measurement == null) {
+                measurement = {
+                  "name": OBIS2MeasurementName(readingIdentification ?? ""),
+                  "scale": 0,
+                  "energyMeterId": effectiveMeterSerial,
+                  "@context": "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/OCMFv1.0+json",
+                  "obis": readingIdentification ?? "?",
+                  // OBIS: "1-b:1.8.0"
+                  "unit": readingUnit,
+                  // "kWh"
+                  "currentType": readingCurrentType,
+                  // "AC"
+                  "values": []
+                };
+                measurementsByKey.set(measurementKey, measurement);
+                const firstChargingSession = CTR.chargingSessions?.[0];
+                if (firstChargingSession !== void 0)
+                  firstChargingSession.measurements.push(measurement);
+              }
+              measurement.values.push({
+                "timestamp": timeStampISO8601,
+                // "2019-06-26T08:57:44,337+0000"
+                "timeSync": timeSync,
+                // "U"|"I"|"S"|"R"
+                "transaction": transaction,
+                // "B"|"C"|"X"|"E"|"L"|"R"|"A"|"P"|"S"|"T"|null
+                "value": new Decimal(readingValue),
+                // 2935.6
+                "transactionType": transactionType,
+                // "T"     ToDo: Serialize this to a string!
+                "pagination": pagination,
+                // "9289"
+                "errorFlags": errorFlags,
+                // ""
+                "cumulatedLoss": cumulatedLoss != null && cumulatedLoss !== 0 ? new Decimal(cumulatedLoss) : void 0,
+                "status": status,
+                // "G"
+                // "signatures":          [{
+                //                            "value":  ocmfJSONDocument.signature["SD"]
+                //                        }],
+                "result": {
+                  "status": ocmfJSONDocument.validationStatus ?? "Unvalidated" /* Unvalidated */
+                },
+                "ocmfDocument": ocmfJSONDocument
+              });
             }
           }
-          CTR.status = OCMFJSONDocuments.every((ocmfJSONDocument) => ocmfJSONDocument.validationStatus === "ValidSignature" /* ValidSignature */) ? "ValidSignature" /* ValidSignature */ : "InvalidSignature" /* InvalidSignature */;
-          if (CTR.chargingSessions != null && CTR.chargingSessions.length > 0 && CTR.chargingSessions[0] != null) {
-            CTR.begin = CTR.chargingSessions[0].begin;
-            CTR.end = CTR.chargingSessions[0].end;
-            return CTR;
-          }
+        }
+        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;
+          return CTR;
         }
       }
     } catch (exception) {
@@ -14103,113 +14147,121 @@ var OCMF = class {
   }
   //#endregion
   //#region (private) mergeOCMFSessions(CTRs)
-  mergeOCMFSessions(CTRs) {
-    const mergedCTR = {
-      "@id": "",
-      "@context": "",
-      certainty: 1
-    };
-    for (const ctr of CTRs) {
-      if (mergedCTR["@id"] === "")
-        mergedCTR["@id"] = ctr["@id"];
-      if (mergedCTR["@context"] === "")
-        mergedCTR["@context"] = ctr["@context"];
-      if (!mergedCTR.begin || mergedCTR.begin && ctr.begin && mergedCTR.begin > ctr.begin)
-        mergedCTR.begin = ctr.begin;
-      if (!mergedCTR.end || mergedCTR.end && ctr.end && mergedCTR.end < ctr.end)
-        mergedCTR.end = ctr.end;
-      if (!mergedCTR.description)
-        mergedCTR.description = ctr.description;
-      if (!mergedCTR.contract)
-        mergedCTR.contract = ctr.contract;
-      if (!mergedCTR.chargingStationOperators)
-        mergedCTR.chargingStationOperators = ctr.chargingStationOperators;
-      else if (ctr.chargingStationOperators)
-        for (const chargingStationOperator of ctr.chargingStationOperators)
-          mergedCTR.chargingStationOperators.push(chargingStationOperator);
-      if (!mergedCTR.chargingPools)
-        mergedCTR.chargingPools = ctr.chargingPools;
-      else if (ctr.chargingPools)
-        for (const chargingPool of ctr.chargingPools)
-          mergedCTR.chargingPools.push(chargingPool);
-      if (!mergedCTR.chargingStations)
-        mergedCTR.chargingStations = ctr.chargingStations;
-      else if (ctr.chargingStations)
-        for (const chargingStation of ctr.chargingStations)
-          mergedCTR.chargingStations.push(chargingStation);
-      if (!mergedCTR.chargingSessions)
-        mergedCTR.chargingSessions = ctr.chargingSessions;
-      else if (ctr.chargingSessions)
-        for (const chargingSession of ctr.chargingSessions)
-          mergedCTR.chargingSessions.push(chargingSession);
-      if (!mergedCTR.eMobilityProviders)
-        mergedCTR.eMobilityProviders = ctr.eMobilityProviders;
-      else if (ctr.eMobilityProviders)
-        for (const eMobilityProvider of ctr.eMobilityProviders)
-          mergedCTR.eMobilityProviders.push(eMobilityProvider);
-      if (!mergedCTR.mediationServices)
-        mergedCTR.mediationServices = ctr.mediationServices;
-      else if (ctr.mediationServices)
-        for (const mediationService of ctr.mediationServices)
-          mergedCTR.mediationServices.push(mediationService);
-    }
-    return mergedCTR;
-  }
+  // private mergeOCMFSessions(CTRs: Array<IOCMFChargeTransparencyRecord>): IOCMFChargeTransparencyRecord
+  // {
+  //     const mergedCTR:IOCMFChargeTransparencyRecord = {
+  //         "@id":       "",
+  //         "@context":  "",
+  //         certainty:    1
+  //     };
+  //     for (const ctr of CTRs)
+  //     {
+  //         if (mergedCTR["@id"] === "")
+  //             mergedCTR["@id"] = ctr["@id"];
+  //         if (mergedCTR["@context"] === "")
+  //             mergedCTR["@context"] = ctr["@context"];
+  //         if (!mergedCTR.begin || (mergedCTR.begin && ctr.begin && mergedCTR.begin > ctr.begin))
+  //             mergedCTR.begin = ctr.begin;
+  //         if (!mergedCTR.end || (mergedCTR.end && ctr.end && mergedCTR.end < ctr.end))
+  //             mergedCTR.end = ctr.end;
+  //         if (!mergedCTR.description)
+  //             mergedCTR.description = ctr.description;
+  //         //ToDo: Is this a really good idea? Or should we fail, whenever this information is different?
+  //         if (!mergedCTR.contract)
+  //             mergedCTR.contract = ctr.contract;
+  //         if (!mergedCTR.chargingStationOperators)
+  //             mergedCTR.chargingStationOperators = ctr.chargingStationOperators;
+  //         else if (ctr.chargingStationOperators)
+  //             for (const chargingStationOperator of ctr.chargingStationOperators)
+  //                 mergedCTR.chargingStationOperators.push(chargingStationOperator);
+  //         if (!mergedCTR.chargingPools)
+  //             mergedCTR.chargingPools = ctr.chargingPools;
+  //         else if (ctr.chargingPools)
+  //             for (const chargingPool of ctr.chargingPools)
+  //                 mergedCTR.chargingPools.push(chargingPool);
+  //         if (!mergedCTR.chargingStations)
+  //             mergedCTR.chargingStations = ctr.chargingStations;
+  //         else if (ctr.chargingStations)
+  //             for (const chargingStation of ctr.chargingStations)
+  //                 mergedCTR.chargingStations.push(chargingStation);
+  //         // publicKeys
+  //         if (!mergedCTR.chargingSessions)
+  //             mergedCTR.chargingSessions = ctr.chargingSessions;
+  //         else if (ctr.chargingSessions)
+  //             for (const chargingSession of ctr.chargingSessions)
+  //                 mergedCTR.chargingSessions.push(chargingSession);
+  //         if (!mergedCTR.eMobilityProviders)
+  //             mergedCTR.eMobilityProviders = ctr.eMobilityProviders;
+  //         else if (ctr.eMobilityProviders)
+  //             for (const eMobilityProvider of ctr.eMobilityProviders)
+  //                 mergedCTR.eMobilityProviders.push(eMobilityProvider);
+  //         if (!mergedCTR.mediationServices)
+  //             mergedCTR.mediationServices = ctr.mediationServices;
+  //         else if (ctr.mediationServices)
+  //             for (const mediationService of ctr.mediationServices)
+  //                 mergedCTR.mediationServices.push(mediationService);
+  //     }
+  //     return mergedCTR;
+  // }
   //#endregion
   //#region (private) mergeChargeTransparencyRecords(CTRs)
-  mergeChargeTransparencyRecords(CTRs) {
-    const mergedCTR = {
-      "@id": "",
-      "@context": "",
-      certainty: 1
-    };
-    for (const ctr of CTRs) {
-      if (mergedCTR["@id"] === "")
-        mergedCTR["@id"] = ctr["@id"];
-      if (mergedCTR["@context"] === "")
-        mergedCTR["@context"] = ctr["@context"];
-      if (!mergedCTR.begin || mergedCTR.begin && ctr.begin && mergedCTR.begin > ctr.begin)
-        mergedCTR.begin = ctr.begin;
-      if (!mergedCTR.end || mergedCTR.end && ctr.end && mergedCTR.end < ctr.end)
-        mergedCTR.end = ctr.end;
-      if (!mergedCTR.description)
-        mergedCTR.description = ctr.description;
-      if (!mergedCTR.contract)
-        mergedCTR.contract = ctr.contract;
-      if (!mergedCTR.chargingStationOperators)
-        mergedCTR.chargingStationOperators = ctr.chargingStationOperators;
-      else if (ctr.chargingStationOperators)
-        for (const chargingStationOperator of ctr.chargingStationOperators)
-          mergedCTR.chargingStationOperators.push(chargingStationOperator);
-      if (!mergedCTR.chargingPools)
-        mergedCTR.chargingPools = ctr.chargingPools;
-      else if (ctr.chargingPools)
-        for (const chargingPool of ctr.chargingPools)
-          mergedCTR.chargingPools.push(chargingPool);
-      if (!mergedCTR.chargingStations)
-        mergedCTR.chargingStations = ctr.chargingStations;
-      else if (ctr.chargingStations)
-        for (const chargingStation of ctr.chargingStations)
-          mergedCTR.chargingStations.push(chargingStation);
-      if (!mergedCTR.chargingSessions)
-        mergedCTR.chargingSessions = ctr.chargingSessions;
-      else if (ctr.chargingSessions)
-        for (const chargingSession of ctr.chargingSessions)
-          mergedCTR.chargingSessions.push(chargingSession);
-      if (!mergedCTR.eMobilityProviders)
-        mergedCTR.eMobilityProviders = ctr.eMobilityProviders;
-      else if (ctr.eMobilityProviders)
-        for (const eMobilityProvider of ctr.eMobilityProviders)
-          mergedCTR.eMobilityProviders.push(eMobilityProvider);
-      if (!mergedCTR.mediationServices)
-        mergedCTR.mediationServices = ctr.mediationServices;
-      else if (ctr.mediationServices)
-        for (const mediationService of ctr.mediationServices)
-          mergedCTR.mediationServices.push(mediationService);
-    }
-    return mergedCTR;
-  }
-  //#endregion
+  // private mergeChargeTransparencyRecords(CTRs: Array<IOCMFChargeTransparencyRecord>): IOCMFChargeTransparencyRecord
+  // {
+  //     const mergedCTR:IOCMFChargeTransparencyRecord = {
+  //         "@id":       "",
+  //         "@context":  "",
+  //         certainty:    1
+  //     };
+  //     for (const ctr of CTRs)
+  //     {
+  //         if (mergedCTR["@id"] === "")
+  //             mergedCTR["@id"] = ctr["@id"];
+  //         if (mergedCTR["@context"] === "")
+  //             mergedCTR["@context"] = ctr["@context"];
+  //         if (!mergedCTR.begin || (mergedCTR.begin && ctr.begin && mergedCTR.begin > ctr.begin))
+  //             mergedCTR.begin = ctr.begin;
+  //         if (!mergedCTR.end || (mergedCTR.end && ctr.end && mergedCTR.end < ctr.end))
+  //             mergedCTR.end = ctr.end;
+  //         if (!mergedCTR.description)
+  //             mergedCTR.description = ctr.description;
+  //         //ToDo: Is this a really good idea? Or should we fail, whenever this information is different?
+  //         if (!mergedCTR.contract)
+  //             mergedCTR.contract = ctr.contract;
+  //         if (!mergedCTR.chargingStationOperators)
+  //             mergedCTR.chargingStationOperators = ctr.chargingStationOperators;
+  //         else if (ctr.chargingStationOperators)
+  //             for (const chargingStationOperator of ctr.chargingStationOperators)
+  //                 mergedCTR.chargingStationOperators.push(chargingStationOperator);
+  //         if (!mergedCTR.chargingPools)
+  //             mergedCTR.chargingPools = ctr.chargingPools;
+  //         else if (ctr.chargingPools)
+  //             for (const chargingPool of ctr.chargingPools)
+  //                 mergedCTR.chargingPools.push(chargingPool);
+  //         if (!mergedCTR.chargingStations)
+  //             mergedCTR.chargingStations = ctr.chargingStations;
+  //         else if (ctr.chargingStations)
+  //             for (const chargingStation of ctr.chargingStations)
+  //                 mergedCTR.chargingStations.push(chargingStation);
+  //         // publicKeys
+  //         if (!mergedCTR.chargingSessions)
+  //             mergedCTR.chargingSessions = ctr.chargingSessions;
+  //         else if (ctr.chargingSessions)
+  //             for (const chargingSession of ctr.chargingSessions)
+  //                 mergedCTR.chargingSessions.push(chargingSession);
+  //         if (!mergedCTR.eMobilityProviders)
+  //             mergedCTR.eMobilityProviders = ctr.eMobilityProviders;
+  //         else if (ctr.eMobilityProviders)
+  //             for (const eMobilityProvider of ctr.eMobilityProviders)
+  //                 mergedCTR.eMobilityProviders.push(eMobilityProvider);
+  //         if (!mergedCTR.mediationServices)
+  //             mergedCTR.mediationServices = ctr.mediationServices;
+  //         else if (ctr.mediationServices)
+  //             for (const mediationService of ctr.mediationServices)
+  //                 mergedCTR.mediationServices.push(mediationService);
+  //     }
+  //     return mergedCTR;
+  // }
+  // //#endregion
   //#region (private) validateOCMFSignature(OCMFJSONDocument, PublicKey, PublicKeyEncoding?)
   async validateOCMFSignature(OCMFJSONDocument, PublicKey, PublicKeyEncoding) {
     try {
@@ -14268,7 +14320,7 @@ var OCMF = class {
               this.key("pubKey").bitstr()
             );
           });
-          if (PublicKeyEncoding) {
+          if (PublicKeyEncoding != null && PublicKeyEncoding.length > 0) {
             switch (PublicKeyEncoding.toLowerCase()) {
               case "hex":
                 publicKeyBytes = Buffer.from(OCMFJSONDocument.publicKey, "hex");
@@ -14296,11 +14348,12 @@ var OCMF = class {
               publicKeyBytes = Buffer.from(OCMFJSONDocument.publicKey, "base64");
             }
           }
-          if (!publicKeyBytes) {
+          if (publicKeyBytes == null) {
             OCMFJSONDocument.validationStatus = "UnknownPublicKeyFormat" /* UnknownPublicKeyFormat */;
             return OCMFJSONDocument.validationStatus;
           }
-          const publicKeyASN1 = ECPoint.decode(publicKeyBytes, "der");
+          const decodedPublicKeyASN1 = ECPoint.decode(publicKeyBytes, "der");
+          const publicKeyASN1 = decodedPublicKeyASN1;
           const coordinates = publicKeyASN1.pubKey.data.subarray(1);
           const halfLength = coordinates.length / 2;
           const publicKeyXY = {
@@ -14309,7 +14362,7 @@ var OCMF = class {
           };
           publicKey = curve.keyFromPublic(publicKeyXY, "hex");
           OCMFJSONDocument.publicKey = {
-            algorithm: OCMFJSONDocument.signature.SA ? OCMFJSONDocument.signature.SA.substring(
+            algorithm: OCMFJSONDocument.signature.SA != null && OCMFJSONDocument.signature.SA.length > 0 ? OCMFJSONDocument.signature.SA.substring(
               OCMFJSONDocument.signature.SA.indexOf("-") + 1,
               OCMFJSONDocument.signature.SA.lastIndexOf("-")
             ) : "secp256r1",
@@ -14460,7 +14513,7 @@ var OCMF = class {
                     hashValue,
                     publicKey: PublicKey,
                     publicKeyEncoding: PublicKeyEncoding,
-                    validationStatus: validationStatus ? validationStatus : PublicKey ? "Unvalidated" /* Unvalidated */ : "PublicKeyNotFound" /* PublicKeyNotFound */
+                    validationStatus: validationStatus ?? (PublicKey != null ? "Unvalidated" /* Unvalidated */ : "PublicKeyNotFound" /* PublicKeyNotFound */)
                   };
                   try {
                     const ECDSASignature = this.chargy.asn1.define("ECDSASignature", function() {
@@ -14482,7 +14535,8 @@ var OCMF = class {
                       default:
                         ocmfJSONDocument.validationStatus = "UnknownSignatureFormat" /* UnknownSignatureFormat */;
                     }
-                    const signatureObj = ECDSASignature.decode(Buffer.from(ocmfJSONDocument.signature.SD, bufferEncoding), "der");
+                    const decodedSignatureObj = ECDSASignature.decode(Buffer.from(ocmfJSONDocument.signature.SD, bufferEncoding), "der");
+                    const signatureObj = decodedSignatureObj;
                     ocmfJSONDocument.signatureRS = {
                       value: ocmfJSONDocument.signature.SD,
                       r: signatureObj.r.toString(16),
@@ -14491,7 +14545,7 @@ var OCMF = class {
                   } catch {
                     ocmfJSONDocument.validationStatus = "InvalidSignature" /* InvalidSignature */;
                   }
-                  if (PublicKey && ocmfJSONDocument.validationStatus === "Unvalidated" /* Unvalidated */)
+                  if (PublicKey != null && ocmfJSONDocument.validationStatus === "Unvalidated" /* Unvalidated */)
                     await this.validateOCMFSignature(
                       ocmfJSONDocument,
                       PublicKey,
@@ -14520,7 +14574,7 @@ var OCMF = class {
   //#endregion
   //#region TryToParseOCMFDocument (OCMFDocument,  PublicKey?, PublicKeyEncoding?, ContainerInfos?)
   async TryToParseOCMFDocument(OCMFDocument, PublicKey, PublicKeyEncoding, ContainerInfos) {
-    return await this.TryToParseOCMFDocuments([OCMFDocument], PublicKey, PublicKeyEncoding, ContainerInfos);
+    return this.TryToParseOCMFDocuments([OCMFDocument], PublicKey, PublicKeyEncoding, ContainerInfos);
   }
   //#endregion
   //#region TryToParseOCMFDocuments(OCMFDocuments, PublicKey?, PublicKeyEncoding?, ContainerInfos?)
@@ -14540,7 +14594,8 @@ var OCMF = class {
     if (typeof ocmfJSONDocuments !== "string") {
       for (const ocmfJSONDocument of ocmfJSONDocuments) {
         try {
-          const groupingKey = (ocmfJSONDocument.payload.FV ?? "") + "|" + (ocmfJSONDocument.payload.GI ?? "") + "|" + (ocmfJSONDocument.payload.GS ?? "") + "|" + (ocmfJSONDocument.payload.GV ?? "") + "|" + (ocmfJSONDocument.payload.MV ?? "") + "|" + (ocmfJSONDocument.payload.MM ?? "") + "|" + (ocmfJSONDocument.payload.MS ?? "") + "|" + (ocmfJSONDocument.payload.MF ?? "") + "|" + (ocmfJSONDocument.payload.IS ? "1|" : "0|") + (ocmfJSONDocument.payload.IL ?? "") + "|" + (ocmfJSONDocument.payload.IF ?? "") + "|" + (ocmfJSONDocument.payload.IT ?? "") + "|" + (ocmfJSONDocument.payload.ID ?? "") + "|" + (ocmfJSONDocument.payload.TT ?? "") + "|" + (ocmfJSONDocument.payload.CF ?? "") + "|" + (ocmfJSONDocument.payload.CT ?? "") + "|" + (ocmfJSONDocument.payload.CI ?? "");
+          const groupingKey = (ocmfJSONDocument.payload.FV ?? "") + "|" + (ocmfJSONDocument.payload.GI ?? "") + "|" + (ocmfJSONDocument.payload.GS ?? "") + "|" + (ocmfJSONDocument.payload.GV ?? "") + "|" + (ocmfJSONDocument.payload.MV ?? "") + "|" + (ocmfJSONDocument.payload.MM ?? "") + "|" + (ocmfJSONDocument.payload.MS ?? "") + "|" + (ocmfJSONDocument.payload.MF ?? "") + "|" + (ocmfJSONDocument.payload.IS === true ? "1|" : "0|") + (ocmfJSONDocument.payload.IL ?? "") + "|" + //(ocmfJSONDocument.payload.IF ?? "") + "|" +
+          (ocmfJSONDocument.payload.IT ?? "") + "|" + (ocmfJSONDocument.payload.ID ?? "") + "|" + (ocmfJSONDocument.payload.TT ?? "") + "|" + (ocmfJSONDocument.payload.CF ?? "") + "|" + (ocmfJSONDocument.payload.CT ?? "") + "|" + (ocmfJSONDocument.payload.CI ?? "");
           if (!ocmfJSONDocumentGroups.has(groupingKey))
             ocmfJSONDocumentGroups.set(groupingKey, new Array());
           ocmfJSONDocumentGroups.get(groupingKey)?.push(ocmfJSONDocument);
@@ -14553,7 +14608,7 @@ var OCMF = class {
         }
       }
       for (const ocmfJSONDocumentGroup of ocmfJSONDocumentGroups.values()) {
-        if (PublicKey) {
+        if (PublicKey != null) {
           for (const ocmfJSONDocument of ocmfJSONDocumentGroup)
             if (ocmfJSONDocument.validationStatus === "Unvalidated" /* Unvalidated */)
               await this.validateOCMFSignature(ocmfJSONDocument, PublicKey);
@@ -14605,12 +14660,6 @@ var OCPI = class {
   constructor(chargy) {
     this.chargy = chargy;
   }
-  bufferToHex(buffer, Reverse) {
-    return (Reverse ? Array.from(new Uint8Array(buffer)).reverse() : Array.from(new Uint8Array(buffer))).map((b) => b.toString(16).padStart(2, "0")).join("");
-  }
-  bufferToNumber(buffer) {
-    return parseInt(Array.from(new Uint8Array(buffer)).map((b) => b.toString(16).padStart(2, "0")).join(""), 16);
-  }
   //#region tryToParseChargeITContainerFormat(SomeJSON)
   // The chargeIT mobility data format does not always provide context information or format identifiers!
   async tryToParseOCPIFormat(SomeJSON) {
@@ -14644,7 +14693,7 @@ var OCPI = class {
         };
       if (encoding_method === "OCMF" && isMandatoryJSONArray(signed_values) && signed_values.length > 0) {
         const firstSignedData = asString(asJSONObject(signed_values[0])?.["signed_data"]);
-        if (firstSignedData) {
+        if (firstSignedData != null && firstSignedData.length > 0) {
           const placeInfo = asJSONObject(SomeJSON["placeInfo"]);
           const geoLocation = asJSONObject(placeInfo?.["geoLocation"]);
           const address = asJSONObject(placeInfo?.["address"]);
@@ -14663,7 +14712,7 @@ var OCPI = class {
             },
             energyMeter: asJSONObject(SomeJSON["meterInfo"])
           };
-          return await new OCMF(this.chargy).TryToParseOCMFDocument(
+          return new OCMF(this.chargy).TryToParseOCMFDocument(
             firstSignedData,
             asString(public_key),
             encoding_method,
@@ -14981,9 +15030,9 @@ var OCPI = class {
             ],
             certainty: 0
           };
-          if (smvContext?.startsWith("https://www.chargeit-mobility.com/contexts/bsm-ws36a-json"))
+          if (smvContext?.startsWith("https://www.chargeit-mobility.com/contexts/bsm-ws36a-json") === true)
             return new BSMCrypt01(this.chargy).tryToParseBSM_WS36aMeasurements(CTR, evseIdStr, asString(chargingStation_controllerSoftwareVersion) ?? null, signedMeterValues);
-          if (smvContext?.startsWith("ALFEN"))
+          if (smvContext?.startsWith("ALFEN") === true)
             return new Alfen(this.chargy).TryToParseALFENFormat(
               signedMeterValues.map((value) => asString(asJSONObject(value)?.["payload"]) ?? ""),
               {
@@ -15130,9 +15179,9 @@ function parsePCDFDocument(input) {
   }
   const fields = {};
   for (let i = 0; i < PCDF_FIELD_ORDER.length; i++) {
-    const value = match[i + 1];
-    const field = PCDF_FIELD_ORDER[i];
-    if (field == null || value == null)
+    const value = getArrayElement(match, i + 1, "Missing PCDF field value");
+    const field = getArrayElement(PCDF_FIELD_ORDER, i, "Missing PCDF field name");
+    if (value.length === 0)
       throw new PCDFParseError("MISSING_FIELDS", "Missing fields in the data tuple", field);
     fields[field] = value;
   }
@@ -15504,8 +15553,10 @@ function parsePCDFReadingValue(value, errors) {
     errors.push("Session information is invalid");
     return void 0;
   }
+  const integralPart = getArrayElement(match, 1, "Missing PCDF reading integral part");
+  const fractionalPart = getArrayElement(match, 2, "Missing PCDF reading fractional part");
   return {
-    value: new Decimal(String(match[1]) + "." + String(match[2])),
+    value: new Decimal(integralPart + "." + fractionalPart),
     unit: "kWh"
   };
 }
@@ -15540,9 +15591,9 @@ function hexToBytes2(hex, errorMessage) {
 }
 function readDERLength(bytes, getOffset, setOffset) {
   let offset = getOffset();
-  const b = bytes[offset++];
-  if (b == null)
+  if (offset >= bytes.length)
     throw new Error("Invalid signature");
+  const b = getArrayElement(bytes, offset++, "Invalid signature");
   if ((b & 128) === 0) {
     setOffset(offset);
     return b;
@@ -15552,9 +15603,9 @@ function readDERLength(bytes, getOffset, setOffset) {
     throw new Error("Invalid signature");
   let length = 0;
   for (let i = 0; i < octets; i++) {
-    const value = bytes[offset++];
-    if (value == null)
+    if (offset >= bytes.length)
       throw new Error("Invalid signature");
+    const value = getArrayElement(bytes, offset++, "Invalid signature");
     length = (length << 8) + value;
   }
   setOffset(offset);
@@ -15583,30 +15634,33 @@ var SAFEXML = class _SAFEXML {
     this.chargy = chargy;
   }
   static ParseChargingStationContext(XMLDocument) {
-    const chargingStationElement = getElementsByLocalName(XMLDocument, "chargingStation")[0];
-    if (!chargingStationElement)
+    const chargingStationElement = getElementsByLocalName(XMLDocument, "chargingStation").at(0);
+    if (chargingStationElement === void 0)
       return {};
-    const chargingStationId = chargingStationElement.getAttribute("id")?.trim() || getTrimmedTextContent(getDirectChildByLocalName(chargingStationElement, "id"));
+    const chargingStationAttributeId = chargingStationElement.getAttribute("id")?.trim();
+    const chargingStationId = chargingStationAttributeId != null && chargingStationAttributeId.length > 0 ? chargingStationAttributeId : getTrimmedTextContent(getDirectChildByLocalName(chargingStationElement, "id"));
     const softwareVersion = getTrimmedTextContent(getDirectChildByLocalName(chargingStationElement, "softwareVersion"));
     const geoLocationElement = getDirectChildByLocalName(chargingStationElement, "geoLocation");
     const latitude = Number.parseFloat(getTrimmedTextContent(getDirectChildByLocalName(geoLocationElement ?? chargingStationElement, "latitude")) ?? "");
     const longitude = Number.parseFloat(getTrimmedTextContent(getDirectChildByLocalName(geoLocationElement ?? chargingStationElement, "longitude")) ?? "");
     const geoLocation = Number.isFinite(latitude) && Number.isFinite(longitude) ? { lat: latitude, lng: longitude } : void 0;
-    if (getDirectChildByLocalName(chargingStationElement, "EVSEs"))
+    if (getDirectChildByLocalName(chargingStationElement, "EVSEs") !== void 0)
       throw new Error("The SAFE chargingStation XML element must contain EVSE directly and no EVSEs container element!");
     const evseElements = getDirectChildrenByLocalName(chargingStationElement, "EVSE");
     if (evseElements.length > 1)
       throw new Error("The SAFE chargingStation XML element must not contain more than one EVSE element!");
-    const evseElement = evseElements[0];
-    const evseId = evseElement?.getAttribute("id")?.trim() || getTrimmedTextContent(getDirectChildByLocalName(evseElement ?? chargingStationElement, "id")) || "";
-    const connectorElements = evseElement ? getDirectChildrenByLocalName(evseElement, "connector") : [];
+    const evseElement = evseElements.at(0);
+    const evseAttributeId = evseElement?.getAttribute("id")?.trim();
+    const evseTextId = getTrimmedTextContent(getDirectChildByLocalName(evseElement ?? chargingStationElement, "id"));
+    const evseId = evseAttributeId != null && evseAttributeId.length > 0 ? evseAttributeId : evseTextId ?? "";
+    const connectorElements = evseElement !== void 0 ? getDirectChildrenByLocalName(evseElement, "connector") : [];
     if (connectorElements.length > 1)
       throw new Error("The SAFE EVSE XML element must not contain more than one connector element!");
-    const connectorElement = connectorElements[0];
+    const connectorElement = connectorElements.at(0);
     const connectorId = connectorElement?.getAttribute("id")?.trim();
     const connectorType = getTrimmedTextContent(getDirectChildByLocalName(connectorElement ?? evseElement ?? chargingStationElement, "type"));
-    const connector = connectorType ? { "@id": connectorId, type: connectorType, looses: 0 } : void 0;
-    const parsedEVSE = evseElement ? {
+    const connector = connectorType != null && connectorType.length > 0 ? { "@id": connectorId, type: connectorType, looses: 0 } : void 0;
+    const parsedEVSE = evseElement !== void 0 ? {
       "@id": evseId,
       "description": parseDescription(evseElement),
       "meters": [],
@@ -15771,8 +15825,8 @@ var XMLContainer = class {
       if (values.length == 1) {
         const valueList = values[0]?.querySelectorAll("signedMeterValue");
         if (valueList != null && valueList.length >= 1) {
-          for (let i = 0; i < valueList.length; i++) {
-            const publicKey = valueList[i]?.querySelector("publicKey");
+          for (const valueElement of valueList) {
+            const publicKey = valueElement.querySelector("publicKey");
             if (publicKey != null) {
               const publicKeyEncoding = publicKey.attributes.getNamedItem("encoding")?.value.trim().toLowerCase() ?? "";
               let publicKeyValue = publicKey.textContent.trim();
@@ -15812,7 +15866,7 @@ var XMLContainer = class {
                   certainty: 0
                 };
             }
-            const meterValueSignature = valueList[i]?.querySelector("meterValueSignature");
+            const meterValueSignature = valueElement.querySelector("meterValueSignature");
             if (meterValueSignature != null) {
               const meterValueSignatureEncoding = meterValueSignature.attributes.getNamedItem("encoding")?.value.trim().toLowerCase() ?? "";
               let meterValueSignatureValue = meterValueSignature.textContent.trim();
@@ -15845,7 +15899,7 @@ var XMLContainer = class {
                 };
               common.meterValueSignatures.push(meterValueSignatureValue);
             }
-            const signatureMethod = valueList[i]?.querySelector("signatureMethod")?.textContent.trim().toLowerCase() ?? "";
+            const signatureMethod = valueElement.querySelector("signatureMethod")?.textContent.trim().toLowerCase() ?? "";
             if (common.signatureMethod == "")
               common.signatureMethod = signatureMethod;
             else if (common.signatureMethod != signatureMethod)
@@ -15854,7 +15908,7 @@ var XMLContainer = class {
                 message: this.chargy.GetMultilanguageText("Invalid mixture of different signature methods within the given XML container!"),
                 certainty: 0
               };
-            const encodingMethod = valueList[i]?.querySelector("encodingMethod")?.textContent.trim().toLowerCase() ?? "";
+            const encodingMethod = valueElement.querySelector("encodingMethod")?.textContent.trim().toLowerCase() ?? "";
             if (common.encodingMethod == "")
               common.encodingMethod = encodingMethod;
             else if (common.encodingMethod != encodingMethod)
@@ -15863,7 +15917,7 @@ var XMLContainer = class {
                 message: this.chargy.GetMultilanguageText("Invalid mixture of different signed data formats within the given XML container!"),
                 certainty: 0
               };
-            const encodedMeterValue = valueList[i]?.querySelector("encodedMeterValue");
+            const encodedMeterValue = valueElement.querySelector("encodedMeterValue");
             if (encodedMeterValue != null) {
               const signedDataEncoding = encodedMeterValue.attributes.getNamedItem("encoding")?.value.trim() ?? "";
               let signedDataValue = encodedMeterValue.textContent.trim();
@@ -15924,12 +15978,6 @@ var ChargeIT = class {
   constructor(chargy) {
     this.chargy = chargy;
   }
-  bufferToHex(buffer, Reverse) {
-    return (Reverse ? Array.from(new Uint8Array(buffer)).reverse() : Array.from(new Uint8Array(buffer))).map((b) => b.toString(16).padStart(2, "0")).join("");
-  }
-  bufferToNumber(buffer) {
-    return parseInt(Array.from(new Uint8Array(buffer)).map((b) => b.toString(16).padStart(2, "0")).join(""), 16);
-  }
   //#region TryToParseOldChargeITMeterValuesFormat(CTR, evseId, address, geoLocation, signedMeterValues)
   TryToParseOldChargeITMeterValuesFormat(CTR, evseId, address, geoLocation, signedMeterValues) {
     const CTRArray = new Array();
@@ -16029,14 +16077,8 @@ var ChargeIT = class {
         });
       }
     }
-    const firstMeterValue = CTRArray[0];
-    const lastMeterValue = CTRArray[CTRArray.length - 1];
-    if (firstMeterValue === void 0 || lastMeterValue === void 0)
-      return {
-        status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-        message: this.chargy.GetMultilanguageText("UnknownOrInvalidChargingSessionFormat"),
-        certainty: 0
-      };
+    const firstMeterValue = getFirstArrayElement(CTRArray, "Missing first chargeIT meter value");
+    const lastMeterValue = getLastArrayElement(CTRArray, "Missing last chargeIT meter value");
     CTR["@id"] = lastMeterValue["transactionId"];
     CTR.begin = this.chargy.moment.unix(firstMeterValue["measuredValue"]["timestampLocal"]["timestamp"]).utc().format();
     CTR.end = this.chargy.moment.unix(lastMeterValue["measuredValue"]["timestampLocal"]["timestamp"]).utc().format();
@@ -16266,7 +16308,6 @@ var ChargeIT = class {
             if (consistent) {
               if (signedMeterValueContext === "https://www.lichtblick.de/contexts/bsm-ws36a-json-v0" || signedMeterValueContext === "https://www.lichtblick.de/contexts/bsm-ws36a-json-v1" || signedMeterValueContext === "https://www.eneco.com/contexts/bsm-ws36a-json-v0" || signedMeterValueContext === "https://www.eneco.com/contexts/bsm-ws36a-json-v1" || signedMeterValueContext === "https://www.chargeit-mobility.com/contexts/bsm-ws36a-json-v0" || signedMeterValueContext === "https://www.chargeit-mobility.com/contexts/bsm-ws36a-json-v1") {
               } else if (signedMeterValueContext.startsWith("ALFEN")) {
-              } else if (containerFormat === oldChargeITContainerFormat) {
               } else if (signedMeterValueContext === oldChargeITMeterValueFormat) {
                 let measurementCounter = 0;
                 for (const signedMeterValue of signedMeterValues) {
@@ -16382,10 +16423,10 @@ var ChargeIT = class {
                       }
                     }
                     const chargePoint = signedMeterValue["chargePoint"];
-                    if (!isMandatoryJSONObject(chargePoint)) {
+                    if (chargePoint !== void 0 && !isMandatoryJSONObject(chargePoint)) {
                       errors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("MissingOrInvalid_SignedMeterValue_ChargePointInformationP", measurementCounter)));
                       secondaryErrors += 1;
-                    } else {
+                    } else if (isMandatoryJSONObject(chargePoint)) {
                       if (!isMandatoryString(chargePoint["softwareVersion"]))
                         errors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("MissingOrInvalid_SignedMeterValue_ChargePointInformation_SoftwareVersionP", measurementCounter)));
                     }
@@ -16533,19 +16574,17 @@ var ChargeIT = class {
                 }
               );
             }
-            if (containerFormat === oldChargeITContainerFormat) {
-              if (asJSONObject(signedMeterValues[0])?.["format"] == "ALFEN")
-                return new Alfen(this.chargy).TryToParseALFENFormat(
-                  signedMeterValues.map((value) => asString(asJSONObject(value)?.["payload"]) ?? ""),
-                  {
-                    EVSEId: evseId,
-                    chargingStation: {
-                      geoLocation: { "lat": geoLocation_lat, "lng": geoLocation_lon },
-                      address: { "street": address_street, "postalCode": address_zipCode, "city": address_town, "country": address_country }
-                    }
+            if (asJSONObject(signedMeterValues[0])?.["format"] == "ALFEN")
+              return new Alfen(this.chargy).TryToParseALFENFormat(
+                signedMeterValues.map((value) => asString(asJSONObject(value)?.["payload"]) ?? ""),
+                {
+                  EVSEId: evseId,
+                  chargingStation: {
+                    geoLocation: { "lat": geoLocation_lat, "lng": geoLocation_lon },
+                    address: { "street": address_street, "postalCode": address_zipCode, "city": address_town, "country": address_country }
                   }
-                );
-            }
+                }
+              );
             if (signedMeterValueContext === oldChargeITMeterValueFormat)
               return this.TryToParseOldChargeITMeterValuesFormat(
                 CTR,
@@ -16735,8 +16774,6 @@ var ChargeIT = class {
             errors.push(CreateError(this.chargy.GetMultilanguageTextWithParameter("MissingOrInvalid_SignedMeterValue_MeterInfo_MeterIdP", 1)));
         }
         if (isMandatoryJSONArray(chargingTariffs)) {
-          for (let i = 0; i < chargingTariffs.length; i++) {
-          }
         }
         if (totalCosts) {
           if (!isMandatoryNumber(totalCosts_total))
@@ -16889,9 +16926,9 @@ var ChargeIT = class {
             ],
             certainty: 0
           };
-          if (smvContext?.startsWith("https://www.chargeit-mobility.com/contexts/bsm-ws36a-json"))
+          if (smvContext?.startsWith("https://www.chargeit-mobility.com/contexts/bsm-ws36a-json") === true)
             return new BSMCrypt01(this.chargy).tryToParseBSM_WS36aMeasurements(CTR, evseIdStr, asString(chargingStation_controllerSoftwareVersion) ?? null, signedMeterValues);
-          if (smvContext?.startsWith("ALFEN"))
+          if (smvContext?.startsWith("ALFEN") === true)
             return new Alfen(this.chargy).TryToParseALFENFormat(
               signedMeterValues.map((value) => asString(asJSONObject(value)?.["payload"]) ?? ""),
               {
@@ -16994,10 +17031,8 @@ var ChargePoint = class {
           if (startTimeUTC !== void 0 && (parkingEnd === void 0 || startTimeUTC > parkingEnd))
             parkingEnd = endTimeUTC;
         }
-        if (chargingStart === void 0)
-          chargingStart = parkingStart;
-        if (chargingEnd === void 0)
-          chargingEnd = parkingEnd;
+        chargingStart ??= parkingStart;
+        chargingEnd ??= parkingEnd;
         let sessionStart = parkingStart !== void 0 && (chargingStart === void 0 || parkingStart < chargingStart) ? parkingStart : chargingStart;
         if (sessionStart === void 0 && parkingStart !== void 0)
           sessionStart = parkingStart;
@@ -17146,7 +17181,7 @@ var ChargePoint = class {
           "status": "Unvalidated" /* Unvalidated */
         };
         if (parking && parking.length > 0 && CTR.chargingSessions && CTR.chargingSessions.length > 0) {
-          const chargingSession = CTR.chargingSessions[0];
+          const chargingSession = getFirstArrayElement(CTR.chargingSessions, "Missing ChargePoint charging session");
           chargingSession.parking = [];
           for (const parkingItem of parking) {
             const parkingObj = asJSONObject(parkingItem);
@@ -17442,6 +17477,8 @@ var ChargePointCrypt01 = class extends ACrypt {
                   case "InvalidSignature" /* InvalidSignature */:
                     currentResult.status = "InvalidStartValue" /* InvalidStartValue */;
                     break;
+                  default:
+                    break;
                 }
               } else if (i == measurement.values.length - 1) {
                 switch (currentResult.status) {
@@ -17454,6 +17491,8 @@ var ChargePointCrypt01 = class extends ACrypt {
                   case "InvalidSignature" /* InvalidSignature */:
                     currentResult.status = "InvalidStopValue" /* InvalidStopValue */;
                     break;
+                  default:
+                    break;
                 }
               } else {
                 switch (currentResult.status) {
@@ -17466,6 +17505,8 @@ var ChargePointCrypt01 = class extends ACrypt {
                   case "InvalidSignature" /* InvalidSignature */:
                     currentResult.status = "InvalidStopValue" /* InvalidStopValue */;
                     break;
+                  default:
+                    break;
                 }
               }
             }
@@ -17495,9 +17536,9 @@ var ChargePointCrypt01 = class extends ACrypt {
     const cryptoResult = {
       status: "NoOperation" /* NoOperation */
     };
-    return await Promise.resolve(setResult("NoOperation" /* NoOperation */));
+    return Promise.resolve(setResult("NoOperation" /* NoOperation */));
   }
-  async ViewMeasurement(measurementValue, errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
+  async ViewMeasurement(measurementValue, _errorDiv, introDiv, _infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
     if (measurementValue.measurement?.chargingSession === void 0)
       return new Error("Invalid measurement!");
     const chargingSession = measurementValue.measurement.chargingSession;
@@ -17505,8 +17546,8 @@ var ChargePointCrypt01 = class extends ACrypt {
     const algorithmName = typeof chargingSession.publicKey?.algorithm === "object" ? chargingSession.publicKey.algorithm.name : chargingSession.publicKey?.algorithm ?? "";
     const algorithmType = typeof chargingSession.publicKey?.type === "object" ? chargingSession.publicKey.type.name : chargingSession.publicKey?.type;
     introDiv.innerHTML = this.chargy.GetLocalizedMessage("The following data of the charging session is relevant for metrological and legal metrological purposes and therefore part of the digital signature").replace("{methodName}", "ChargePointCrypt01").replace("{cryptoAlgorithm}", algorithmName);
-    if (PlainTextDiv.parentElement != void 0 && PlainTextDiv.parentElement.children[0] != void 0) {
-      PlainTextDiv.parentElement.children[0].innerHTML = "Plain text (secrrct)";
+    if (PlainTextDiv.parentElement) {
+      getArrayLikeElement(PlainTextDiv.parentElement.children, 0, "Missing plain text header").innerHTML = "Plain text (secrrct)";
     }
     PlainTextDiv.innerText = atob(chargingSession.original ?? "");
     PlainTextDiv.style.fontFamily = "monospace";
@@ -17528,22 +17569,23 @@ var ChargePointCrypt01 = class extends ACrypt {
         hashInfo = "(SHA512, 512 Bits, hex)";
         break;
     }
-    if (HashedPlainTextDiv.parentElement != void 0 && HashedPlainTextDiv.parentElement.children[0] != void 0) {
-      HashedPlainTextDiv.parentElement.children[0].innerHTML = "Hashed plain text " + hashInfo;
+    if (HashedPlainTextDiv.parentElement) {
+      getArrayLikeElement(HashedPlainTextDiv.parentElement.children, 0, "Missing hashed plain text header").innerHTML = "Hashed plain text " + hashInfo;
     }
     HashedPlainTextDiv.innerHTML = chargingSession.hashValue?.match(/.{1,8}/g)?.join(" ") ?? "0x00000000000000000000000000000000000";
     if (chargingSession.publicKey != null) {
-      if (PublicKeyDiv.parentElement != void 0 && PublicKeyDiv.parentElement.children[0] != void 0) {
-        PublicKeyDiv.parentElement.children[0].innerHTML = "Public Key (" + (algorithmType ? algorithmType + ", " : "") + (algorithmName ? algorithmName + ", " : "") + "hex)";
+      if (PublicKeyDiv.parentElement) {
+        getArrayLikeElement(PublicKeyDiv.parentElement.children, 0, "Missing public key header").innerHTML = "Public Key (" + (algorithmType != null && algorithmType.length > 0 ? algorithmType + ", " : "") + (algorithmName.length > 0 ? algorithmName + ", " : "") + "hex)";
       }
       PublicKeyDiv.innerHTML = chargingSession.publicKey.value.startsWith("04") ? '<span class="leadingFour">04</span> ' + (chargingSession.publicKey.value.substring(2).match(/.{1,8}/g)?.join(" ") ?? "") : chargingSession.publicKey.value.match(/.{1,8}/g)?.join(" ") ?? "";
-      if (PublicKeyDiv.parentElement != void 0 && PublicKeyDiv.parentElement.children[3] != void 0) {
-        PublicKeyDiv.parentElement.children[3].innerHTML = "";
+      const publicKeySignatureContainer = PublicKeyDiv.parentElement?.children[3];
+      if (publicKeySignatureContainer !== void 0) {
+        publicKeySignatureContainer.innerHTML = "";
       }
       if (result.publicKeySignatures) {
         for (const signature of result.publicKeySignatures) {
           try {
-            const signatureDiv = PublicKeyDiv.parentElement?.children[3]?.appendChild(document.createElement("div"));
+            const signatureDiv = publicKeySignatureContainer?.appendChild(document.createElement("div"));
             if (signatureDiv != null)
               signatureDiv.innerHTML = await this.chargy.CheckMeterPublicKeySignature(
                 measurementValue.measurement.chargingSession.chargingStation,
@@ -17558,8 +17600,8 @@ var ChargePointCrypt01 = class extends ACrypt {
       }
     }
     if (chargingSession.signature != null) {
-      if (SignatureExpectedDiv.parentElement != void 0 && SignatureExpectedDiv.parentElement.children[0] != void 0) {
-        SignatureExpectedDiv.parentElement.children[0].innerHTML = "Erwartete Signatur (secrrct.sign, rs, hex)";
+      if (SignatureExpectedDiv.parentElement) {
+        getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = "Erwartete Signatur (secrrct.sign, rs, hex)";
       }
       if (typeof chargingSession.signature != "string")
         SignatureExpectedDiv.innerHTML = "r: " + (chargingSession.signature.r?.toLowerCase().padStart(56, "0").match(/.{1,8}/g)?.join(" ") ?? "") + "<br />s: " + (chargingSession.signature.s?.toLowerCase().padStart(56, "0").match(/.{1,8}/g)?.join(" ") ?? "");
@@ -17591,6 +17633,7 @@ var ChargePointCrypt01 = class extends ACrypt {
           break;
       }
     }
+    return void 0;
   }
 };
 
@@ -17614,8 +17657,7 @@ function IsAChargeTransparencyRecord(data) {
 function IsASessionCryptoResult(data) {
   if (!isMandatoryJSONObject(data))
     return false;
-  const sessionCryptoResult = data;
-  return sessionCryptoResult.status !== void 0;
+  return true;
 }
 function CloneCTR(CTR) {
   const clonedCTR = JSON.parse(JSON.stringify(CTR));
@@ -17794,8 +17836,10 @@ async function imageDataFromNodeCanvas(data) {
     if (!isCanvasModule(canvasLib))
       return void 0;
     const image = await canvasLib.loadImage(import_buffer.Buffer.from(toUint8Array(data)));
-    const width = image.naturalWidth || image.width;
-    const height = image.naturalHeight || image.height;
+    const naturalWidth = image.naturalWidth ?? 0;
+    const naturalHeight = image.naturalHeight ?? 0;
+    const width = naturalWidth > 0 ? naturalWidth : image.width;
+    const height = naturalHeight > 0 ? naturalHeight : image.height;
     if (width <= 0 || height <= 0)
       return void 0;
     const canvas = canvasLib.createCanvas(width, height);
@@ -17866,22 +17910,22 @@ async function importOptionalNodeModule(moduleName) {
 }
 async function readQRCodeTextFromImage(data, mimeType) {
   const imageDataSources = typeof document === "undefined" ? [
-    () => imageDataFromNodeCanvas(data),
-    () => imageDataFromPNGOrJPEG(data, mimeType),
-    () => imageDataFromBrowserCanvas(data, mimeType),
-    () => imageDataFromBrowserImageElement(data, mimeType)
+    async () => imageDataFromNodeCanvas(data),
+    async () => imageDataFromPNGOrJPEG(data, mimeType),
+    async () => imageDataFromBrowserCanvas(data, mimeType),
+    async () => imageDataFromBrowserImageElement(data, mimeType)
   ] : [
-    () => imageDataFromBrowserCanvas(data, mimeType),
-    () => imageDataFromBrowserImageElement(data, mimeType),
-    () => imageDataFromNodeCanvas(data),
-    () => imageDataFromPNGOrJPEG(data, mimeType)
+    async () => imageDataFromBrowserCanvas(data, mimeType),
+    async () => imageDataFromBrowserImageElement(data, mimeType),
+    async () => imageDataFromNodeCanvas(data),
+    async () => imageDataFromPNGOrJPEG(data, mimeType)
   ];
   for (const imageDataSource of imageDataSources) {
     const imageData = await imageDataSource();
     if (imageData == null)
       continue;
     const qrText = readQRCodeTextFromImageData(imageData);
-    if (qrText && qrText.length > 0)
+    if (qrText != null && qrText.length > 0)
       return qrText;
   }
   return void 0;
@@ -17894,7 +17938,7 @@ function readQRCodeTextFromImageData(imageData) {
     { inversionAttempts: "attemptBoth" }
   );
   const qrText = qrCode?.data.trim();
-  return qrText && qrText.length > 0 ? qrText : void 0;
+  return qrText != null && qrText.length > 0 ? qrText : void 0;
 }
 
 // src/pdfjs/browser.ts
@@ -17915,6 +17959,11 @@ var validationRules_default = {
     }
   }
 };
+function isPdfAttachment(value) {
+  if (!isMandatoryJSONObject(value))
+    return false;
+  return typeof value["filename"] === "string" && (value["content"] instanceof ArrayBuffer || ArrayBuffer.isView(value["content"]));
+}
 var Chargy = class {
   //#region Data
   i18n;
@@ -17931,8 +17980,6 @@ var Chargy = class {
   EVSEs = new Array();
   meters = new Array();
   chargingSessions = new Array();
-  eMobilityProviders = new Array();
-  mediationServices = new Array();
   currentCTR = {};
   internalCTR = {};
   //#endregion
@@ -17980,7 +18027,7 @@ var Chargy = class {
     return result;
   }
   PublicKeyIdFromFileName(fileName) {
-    return (fileName.indexOf(".") > -1 ? fileName.substring(0, fileName.indexOf(".")) : fileName).replace(/[-_]?public[-_]?key/i, "");
+    return (fileName.includes(".") ? fileName.substring(0, fileName.indexOf(".")) : fileName).replace(/[-_]?public[-_]?key/i, "");
   }
   TryToParseDERPublicKey(keyId, publicKeyBuffer) {
     const ASN1_OIDs = this.asn1.define("OIDs", function() {
@@ -18336,7 +18383,7 @@ var Chargy = class {
                 if (compressedFiles.length == 0)
                   continue;
                 archiveFound = true;
-                if (compressedFiles.length == 1 && compressedFiles[0]?.path == null) {
+                if (compressedFiles.length == 1) {
                   expandedFileInfos.push({
                     name: FileInfo.name.substring(0, FileInfo.name.lastIndexOf(".")),
                     data: compressedFiles[0]?.data
@@ -18373,9 +18420,12 @@ var Chargy = class {
                   }
                   if (dataFile.length > 0 && signatureFile.length > 0) {
                     try {
-                      CTRfile = JSON.parse(dataFile);
-                      CTRfile.original = btoa(dataFile);
-                      CTRfile.signature = signatureFile;
+                      const parsedCTRFile = JSON.parse(dataFile);
+                      if (!isMandatoryJSONObject(parsedCTRFile))
+                        throw new Error("Invalid chargepoint 'secrrct' JSON file!");
+                      CTRfile = parsedCTRFile;
+                      CTRfile["original"] = btoa(dataFile);
+                      CTRfile["signature"] = signatureFile;
                       expandedFileInfos.push({
                         name: FileInfo.name,
                         data: new TextEncoder().encode(JSON.stringify(CTRfile))
@@ -18418,7 +18468,7 @@ var Chargy = class {
   async extractArchive(fileName, data, mimeType) {
     const archiveData = this.toUint8Array(data);
     if (mimeType === "application/zip")
-      return await this.extractZipArchive(archiveData);
+      return this.extractZipArchive(archiveData);
     if (mimeType === "application/x-tar")
       return this.extractTarArchive(archiveData);
     if (mimeType === "application/gzip") {
@@ -18457,7 +18507,7 @@ var Chargy = class {
         break;
       const prefix = this.readTarString(header, 345, 155);
       const path = prefix.length > 0 ? prefix + "/" + name : name;
-      const typeFlag = String.fromCharCode(header[156] ?? 0);
+      const typeFlag = String.fromCharCode(getArrayElement(header, 156, "Missing tar header type flag"));
       const dataStart = offset + 512;
       const dataEnd = dataStart + size;
       if (dataEnd > data.byteLength)
@@ -18566,45 +18616,48 @@ var Chargy = class {
       for (const fileInfo of FileInfos) {
         if (fileInfo.type === "application/pdf" || fileInfo.name.endsWith(".pdf")) {
           const pdfjsLib = await importPdfJs();
-          const pdfDocument = fileInfo.data ? await pdfjsLib.getDocument({ data: fileInfo.data }).promise : fileInfo.path ? await pdfjsLib.getDocument({ url: fileInfo.path }).promise : null;
-          if (pdfDocument) {
+          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 attachments = await pdfDocument.getAttachments();
-              Object.keys(attachments).forEach((fileName) => {
-                const attachment = attachments[fileName];
-                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 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"
+                    });
+                });
             } catch (error) {
               console.error(`Error extracting PDF/A-3 attachments: ${String(error)}`);
             }
@@ -18650,7 +18703,7 @@ var Chargy = class {
                   break;
                 }
                 processedFile.result = await new SAFEXML(this).tryToParseSAFEXML(XMLDocument);
-                if (processedFile.result.status && processedFile.result.status !== "Unvalidated" /* Unvalidated */ && getElementsByLocalName(XMLDocument, "chargingStation").length === 0) {
+                if (processedFile.result.status != null && processedFile.result.status !== "Unvalidated" /* Unvalidated */ && getElementsByLocalName(XMLDocument, "chargingStation").length === 0) {
                   processedFile.result = new XMLContainer(this).tryToParseXMLContainer(XMLDocument);
                 }
                 break;
@@ -18734,8 +18787,7 @@ var Chargy = class {
           if (isMandatoryJSONObject(JSONContent)) {
             const JSONContext = JSONContent["@context"];
             if (IsAChargeTransparencyLiveLink(JSONContent)) {
-              if (JSONContent.timestamp == null)
-                JSONContent.timestamp = (/* @__PURE__ */ new Date()).toISOString();
+              JSONContent.timestamp ??= (/* @__PURE__ */ new Date()).toISOString();
               processedFile.result = JSONContent;
             } else if (isMandatoryString(JSONContext)) {
               if (JSONContext.startsWith("https://open.charging.cloud/contexts/CTR+json"))
@@ -18779,25 +18831,18 @@ var Chargy = class {
       processedFiles.push(processedFile);
     }
     if (processedFiles.length == 1) {
-      const processedFile = processedFiles[0];
-      if (processedFile) {
-        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
-          };
+      const processedFile = getFirstArrayElement(processedFiles, "Missing processed file");
+      if (IsAChargeTransparencyRecord(processedFile.result))
+        return this.processChargeTransparencyRecord(processedFile.result);
+      if (IsAChargeTransparencyLiveLink(processedFile.result))
         return processedFile.result;
-      }
-      return {
-        status: "InvalidSessionFormat" /* InvalidSessionFormat */,
-        message: this.GetMultilanguageText("UnknownOrInvalidChargeTransparencyRecord"),
-        certainty: 0
-      };
+      if (IsAPublicKeyLookup(processedFile.result))
+        return {
+          status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+          message: this.GetMultilanguageText("UnknownOrInvalidChargeTransparencyRecord"),
+          certainty: 0
+        };
+      return processedFile.result;
     } else if (processedFiles.length > 1) {
       const mergedCTR = {
         "@id": "",
@@ -18811,14 +18856,12 @@ var Chargy = class {
             mergedCTR["@id"] = processedFileResult["@id"];
           if (mergedCTR["@context"] === "")
             mergedCTR["@context"] = processedFileResult["@context"];
-          if (!mergedCTR.begin || mergedCTR.begin && processedFileResult.begin && mergedCTR.begin > processedFileResult.begin)
+          if (processedFileResult.begin != null && processedFileResult.begin.length > 0 && (mergedCTR.begin == null || mergedCTR.begin.length === 0 || mergedCTR.begin > processedFileResult.begin))
             mergedCTR.begin = processedFileResult.begin;
-          if (!mergedCTR.end || mergedCTR.end && processedFileResult.end && mergedCTR.end < processedFileResult.end)
+          if (processedFileResult.end != null && processedFileResult.end.length > 0 && (mergedCTR.end == null || mergedCTR.end.length === 0 || mergedCTR.end < processedFileResult.end))
             mergedCTR.end = processedFileResult.end;
-          if (!mergedCTR.description)
-            mergedCTR.description = processedFileResult.description;
-          if (!mergedCTR.contract)
-            mergedCTR.contract = processedFileResult.contract;
+          mergedCTR.description ??= processedFileResult.description;
+          mergedCTR.contract ??= processedFileResult.contract;
           if (!mergedCTR.chargingStationOperators)
             mergedCTR.chargingStationOperators = processedFileResult.chargingStationOperators;
           else if (processedFileResult.chargingStationOperators)
@@ -18850,17 +18893,14 @@ var Chargy = class {
             for (const mediationService of processedFileResult.mediationServices)
               mergedCTR.mediationServices.push(mediationService);
         } else if (IsAPublicKeyInfo(processedFileResult)) {
-          if (!mergedCTR.publicKeys)
-            mergedCTR.publicKeys = new Array();
+          mergedCTR.publicKeys ??= new Array();
           mergedCTR.publicKeys.push(processedFileResult);
         } else if (IsAPublicKeyLookup(processedFileResult)) {
-          if (!mergedCTR.publicKeys)
-            mergedCTR.publicKeys = new Array();
+          mergedCTR.publicKeys ??= new Array();
           for (const publicKey of processedFileResult.publicKeys)
             mergedCTR.publicKeys.push(publicKey);
         } else {
-          if (mergedCTR.invalidDataSets === void 0)
-            mergedCTR.invalidDataSets = new Array();
+          mergedCTR.invalidDataSets ??= new Array();
           mergedCTR.invalidDataSets.push(processedFile);
         }
       }
@@ -18888,8 +18928,6 @@ var Chargy = class {
     this.EVSEs = [];
     this.meters = [];
     this.chargingSessions = [];
-    this.eMobilityProviders = [];
-    this.mediationServices = [];
     try {
       this.internalCTR = CloneCTR(CTR);
       this.currentCTR = CTR;
@@ -19016,9 +19054,9 @@ var Chargy = class {
       if (measurement.name !== "ENERGY_TOTAL" || measurement.values.length < 2) {
         continue;
       }
-      const firstValue2 = measurement.values[0];
-      const lastValue = measurement.values[measurement.values.length - 1];
-      if (firstValue2 == null || lastValue == null) {
+      const firstValue2 = measurement.values.at(0);
+      const lastValue = measurement.values.at(-1);
+      if (firstValue2 === void 0 || lastValue === void 0) {
         continue;
       }
       const firstValueKWh = this.measurementValueInKWh(measurement, firstValue2);
@@ -19167,14 +19205,12 @@ var Chargy = class {
         mergedCTR["@id"] = ctr["@id"];
       if (mergedCTR["@context"] === "")
         mergedCTR["@context"] = ctr["@context"];
-      if (!mergedCTR.begin || mergedCTR.begin && ctr.begin && mergedCTR.begin > ctr.begin)
+      if (ctr.begin != null && ctr.begin.length > 0 && (mergedCTR.begin == null || mergedCTR.begin.length === 0 || mergedCTR.begin > ctr.begin))
         mergedCTR.begin = ctr.begin;
-      if (!mergedCTR.end || mergedCTR.end && ctr.end && mergedCTR.end < ctr.end)
+      if (ctr.end != null && ctr.end.length > 0 && (mergedCTR.end == null || mergedCTR.end.length === 0 || mergedCTR.end < ctr.end))
         mergedCTR.end = ctr.end;
-      if (!mergedCTR.description)
-        mergedCTR.description = ctr.description;
-      if (!mergedCTR.contract)
-        mergedCTR.contract = ctr.contract;
+      mergedCTR.description ??= ctr.description;
+      mergedCTR.contract ??= ctr.contract;
       if (!mergedCTR.chargingStationOperators)
         mergedCTR.chargingStationOperators = ctr.chargingStationOperators;
       else if (ctr.chargingStationOperators)
@@ -19235,6 +19271,6 @@ buffer/index.js:
    *)
 */
 
-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, CryptoAlgorithms, CryptoHashAlgorithms, DayOfWeek, DisplayPrefixes, EMHCrypt01, ErrorLevel, GDFCrypt01, IECCurves, IEncoding, InformationRelevance, InformationRelevanceToString, IsAChargeTransparencyLiveLink, IsAChargeTransparencyRecord, IsAPublicKeyInfo, IsAPublicKeyLookup, IsASessionCryptoResult, IsNullOrEmpty, JSONSignatureVerificationStatus, MENNEKES_EDL40_OBIS, MENNEKES_EDL40_XMLNS, Mennekes, MennekesCrypt01, OBIS2Hex, OBIS2MeasurementName, OBIS_RegExpr, OCMF, OCMFTransactionTypes, OCMFv1_x, OCPI, PCDF, PCDFCrypt01, PCDFParseError, PCDFValidationError, PCDF_FIELD_ORDER, PCDF_PREFIX, ParseJSON_LD, PublicKeyFormats, IPublicKeyInfo_exports as PublicKeyInfo, SAFEXML, SessionVerificationResult, SetHex, SetInt8, SetText, SetText_withLength, SetTimestamp, SetTimestamp32, SetUInt32, SetUInt32_withCode, SetUInt64, SetUInt64D, SignMessage, SignatureFormats, TimeStatusTypes, UTC2human, VerificationResult, VerifyJSONMessageSignatures, WarningLevel, WhenNullOrEmpty, XMLContainer, asJSONArray, asJSONObject, asNumber, asString, buf2hex, buildMennekesSignatureData, bytesToHex2 as bytesToHex, canonicalJSONBytes, canonicalJSONStringify, cleanHex, closeFullscreen, createHexString, dateToMennekesLocalEpochSeconds, extractMennekesChargingProcesses, firstKey, firstValue, getDirectChildByLocalName, getDirectChildrenByLocalName, getElementsByLocalName, getInt16Bytes, getInt32Bytes, getInt64Bytes, getInt8Bytes, getTrimmedTextContent, hashFile, hex2bin, hex32, hexToArrayBuffer, hexToBytes, intFromBytes, isGeoLocation, isICryptoResult, isIFileInfo, isIPublicKeyXY, isISessionCryptoResult1, isISessionCryptoResult2, isJSONLDObject, isMandatoryArrayOfStrings, isMandatoryBoolean, isMandatoryDecimal, isMandatoryJSONArray, isMandatoryJSONObject, isMandatoryNumber, isMandatoryString, isMandatoryURL, isMultilanguageText, isOIDInfo, isObject, isOptionalArrayOfStrings, isOptionalDecimal, isOptionalJSONArray, isOptionalJSONArrayError, isOptionalJSONArrayOk, isOptionalJSONObject, isOptionalNumber, isOptionalString, isOptionalURL, isPCDFText, isString, isStringArray, isStringOrOIDInfo, isStringOrStringArray, jsonPrettyPrinter, measurementName2human, normalizePCDFPublicKeyHex, normalizeXMLText, openFullscreen, pad, parseAndVerifyJSONSignatures, parseDescription, parseHexString, parseMennekesXMLDocument, parseNumber, parseOBIS, parsePCDFDocument, parsePCDFPublicKey, parsePCDFSignature, parseUTC, readQRCodeTextFromImage, readQRCodeTextFromImageData, secp224k1, setUILocale, sha256, sha384, sha512, signJSONMessage, signMessage, stripPCDFControlCharacters, time2human, toArrayBuffer, toSessionVerificationResults, toUint8Array, unquotePCDFText, validatePCDFFields, 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, CryptoAlgorithms, CryptoHashAlgorithms, DayOfWeek, DisplayPrefixes, EMHCrypt01, ErrorLevel, GDFCrypt01, IECCurves, IEncoding, InformationRelevance, InformationRelevanceToString, IsAChargeTransparencyLiveLink, IsAChargeTransparencyRecord, IsAPublicKeyInfo, IsAPublicKeyLookup, IsASessionCryptoResult, IsNullOrEmpty, JSONSignatureVerificationStatus, MENNEKES_EDL40_OBIS, MENNEKES_EDL40_XMLNS, Mennekes, MennekesCrypt01, OBIS2Hex, OBIS2MeasurementName, OBIS_RegExpr, OCMF, OCMFTransactionTypes, OCMFv1_x, OCPI, PCDF, PCDFCrypt01, PCDFParseError, PCDFValidationError, PCDF_FIELD_ORDER, PCDF_PREFIX, ParseJSON_LD, PublicKeyFormats, IPublicKeyInfo_exports as PublicKeyInfo, SAFEXML, SessionVerificationResult, SetHex, SetInt8, SetText, SetText_withLength, SetTimestamp, SetTimestamp32, SetUInt32, SetUInt32_withCode, SetUInt64, SetUInt64D, SignMessage, SignatureFormats, TimeStatusTypes, UTC2human, VerificationResult, VerifyJSONMessageSignatures, WarningLevel, WhenNullOrEmpty, XMLContainer, asJSONArray, asJSONObject, asNumber, asString, buf2hex, buildMennekesSignatureData, bytesToHex2 as bytesToHex, canonicalJSONBytes, canonicalJSONStringify, cleanHex, closeFullscreen, createHexString, dateToMennekesLocalEpochSeconds, extractMennekesChargingProcesses, firstKey, firstValue, getArrayElement, getArrayLikeElement, getDirectChildByLocalName, getDirectChildrenByLocalName, getElementsByLocalName, getFirstArrayElement, getInt16Bytes, getInt32Bytes, getInt64Bytes, getInt8Bytes, getLastArrayElement, getTrimmedTextContent, hashFile, hex2bin, hex32, hexToArrayBuffer, hexToBytes, intFromBytes, isGeoLocation, isICryptoResult, isIFileInfo, isIPublicKeyXY, isISessionCryptoResult1, isISessionCryptoResult2, isJSONLDObject, isMandatoryArrayOfStrings, isMandatoryBoolean, isMandatoryDecimal, isMandatoryJSONArray, isMandatoryJSONObject, isMandatoryNumber, isMandatoryString, isMandatoryURL, isMultilanguageText, isOIDInfo, isObject, isOptionalArrayOfStrings, isOptionalDecimal, isOptionalJSONArray, isOptionalJSONArrayError, isOptionalJSONArrayOk, isOptionalJSONObject, isOptionalNumber, isOptionalString, isOptionalURL, isPCDFText, isString, isStringArray, isStringOrOIDInfo, isStringOrStringArray, jsonPrettyPrinter, measurementName2human, normalizePCDFPublicKeyHex, normalizeXMLText, openFullscreen, pad, parseAndVerifyJSONSignatures, parseDescription, parseHexString, parseMennekesXMLDocument, parseNumber, parseOBIS, parsePCDFDocument, parsePCDFPublicKey, parsePCDFSignature, parseUTC, readQRCodeTextFromImage, readQRCodeTextFromImageData, secp224k1, setUILocale, sha256, sha384, sha512, signJSONMessage, signMessage, stripPCDFControlCharacters, time2human, toArrayBuffer, toSessionVerificationResults, toUint8Array, unquotePCDFText, validatePCDFFields, verifyJSONMessageSignatureResults, verifyJSONMessageSignatures, verifyJSONSignature, verifyJSONSignatureResult, verifyPCDFDocument };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map