@open-charging-cloud/chargy-core 0.6.3 → 0.7.0

package/dist/node/index.js

@@ -7992,120 +7992,6 @@ var require_elliptic = __commonJS({
   }
 });
 
-// src/secp224k1.ts
-var secp224k1 = class {
-  // Pcurve = 2**224 - 2**32 - 2**12 - 2**11 - 2**9 - 2**7 - 2**4 - 2**1 - 1 or
-  //          FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE FFFFE56D
-  Zero = BigInt("0");
-  One = BigInt("1");
-  Two = BigInt("2");
-  Three = BigInt("3");
-  Pcurve = BigInt("26959946667150639794667015087019630673637144422540572481099315275117");
-  // The proven prime
-  N = BigInt("0x010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7");
-  // Number of points in the field
-  Acurve = BigInt(0);
-  // Defined on the elliptic curve. y^2 = x^3 + Acurve * x + 5
-  Gx = BigInt("0xA1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C");
-  Gy = BigInt("0x7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5");
-  GPoint = [this.Gx, this.Gy];
-  // This is our generator point. Trillions of dif ones possible
-  Sign(hash, RandomNumber, privateKey) {
-    const RandSignPoint = this.ECmultiply(this.GPoint, RandomNumber);
-    if (RandSignPoint.length >= 1 && RandSignPoint[0] != null) {
-      const r = this.modulo(RandSignPoint[0], this.N);
-      const s = this.modulo((hash + r * privateKey) * this.modInv(RandomNumber, this.N), this.N);
-      return [r, s];
-    }
-    return null;
-  }
-  validate(hash, signatureR, signatureS, PublicKey) {
-    if (signatureR == this.Zero || signatureR >= this.N)
-      throw new Error("Invalid R");
-    if (signatureS == this.Zero || signatureS >= this.N)
-      throw new Error("Invalid S");
-    const w = this.modInv(signatureS, this.N);
-    const u1 = this.ECmultiply(this.GPoint, this.modulo(w * hash, this.N));
-    const u2 = this.ECmultiply(PublicKey, this.modulo(w * signatureR, this.N));
-    const validation = this.ECadd(u1, u2);
-    return validation[0] == signatureR;
-  }
-  modulo(n, m) {
-    return (n % m + m) % m;
-  }
-  zfill(s) {
-    while (s.length < 56) {
-      s = "0" + s;
-    }
-    return s;
-  }
-  modInv(a, n = this.Pcurve) {
-    let lm = BigInt(1), hm = BigInt(0), high = n, low = this.modulo(a, n);
-    while (low > 1) {
-      const ratio = high / low, nm = hm - ratio * lm, newm = high - ratio * low;
-      hm = lm;
-      lm = nm;
-      high = low;
-      low = newm;
-    }
-    return this.modulo(lm, n);
-  }
-  ECadd(a, b) {
-    if (a[0] != void 0 && b[0] != void 0 && a[1] != void 0 && b[1] != void 0) {
-      const LamAdd = this.modulo((b[1] - a[1]) * this.modInv(b[0] - a[0]), this.Pcurve);
-      const x = this.modulo(LamAdd * LamAdd - a[0] - b[0], this.Pcurve);
-      const y = this.modulo(LamAdd * (a[0] - x) - a[1], this.Pcurve);
-      return [x, y];
-    }
-    throw new Error("Invalid EC Point Addition!");
-  }
-  ECdouble(a) {
-    if (a[0] != void 0 && a[1] != void 0) {
-      const Lam = this.modulo((a[0] * a[0] * this.Three + this.Acurve) * this.modInv(a[1] * this.Two), this.Pcurve);
-      const x = this.modulo(Lam * Lam - a[0] * this.Two, this.Pcurve);
-      const y = this.modulo(Lam * (a[0] - x) - a[1], this.Pcurve);
-      return [x, y];
-    }
-    throw new Error("Invalid EC Point Doubling!");
-  }
-  ECmultiply(GenPoint, ScalarHex) {
-    if (ScalarHex == this.Zero || ScalarHex >= this.N)
-      throw new Error("Invalid Scalar/Private Key");
-    const ScalarBinary = ScalarHex.toString(2);
-    let Q = GenPoint;
-    for (let i = 1; i < ScalarBinary.length; i++) {
-      Q = this.ECdouble(Q);
-      if (ScalarBinary[i] === "1") {
-        Q = this.ECadd(Q, GenPoint);
-      }
-    }
-    return Q;
-  }
-  // uncompressed is the accumulation of both the x and y points
-  // compressed is the public key to share in transactions
-  // address is the public address tho whom someone can send coin
-  PublicKeyGenerate(PrivateKey) {
-    if (typeof PrivateKey === "number")
-      PrivateKey = BigInt(PrivateKey);
-    if (typeof PrivateKey === "string")
-      PrivateKey = BigInt(PrivateKey);
-    const publicKey = this.ECmultiply(this.GPoint, PrivateKey);
-    if (publicKey[0] !== void 0 && publicKey[1] !== void 0) {
-      const Px = this.zfill(publicKey[0].toString(16));
-      const Py = this.zfill(publicKey[1].toString(16));
-      return {
-        x: publicKey[0],
-        y: publicKey[1],
-        xy: [Px, Py],
-        uncompressed: publicKey[0].toString(16) + publicKey[1].toString(16),
-        compressed: "04" + Px + Py,
-        address: this.modulo(publicKey[1], this.Two) == this.One ? "03" + Px : "02" + Px
-      };
-    }
-    return void 0;
-  }
-};
-
 // src/interfaces/chargyInterfaces.ts
 var chargyInterfaces_exports = {};
 __export(chargyInterfaces_exports, {
@@ -8118,7 +8004,7 @@ __export(chargyInterfaces_exports, {
   IECCurves: () => IECCurves,
   IEncoding: () => IEncoding,
   InformationRelevance: () => InformationRelevance,
-  PublicKeyFormats: () => PublicKeyFormats,
+  OIDInfo: () => OIDInfo,
   SessionVerificationResult: () => SessionVerificationResult,
   SignatureFormats: () => SignatureFormats,
   VerificationResult: () => VerificationResult,
@@ -8126,23 +8012,9 @@ __export(chargyInterfaces_exports, {
   isGeoLocation: () => isGeoLocation,
   isICryptoResult: () => isICryptoResult,
   isIFileInfo: () => isIFileInfo,
-  isIPublicKeyXY: () => isIPublicKeyXY,
   isISessionCryptoResult1: () => isISessionCryptoResult1,
-  isISessionCryptoResult2: () => isISessionCryptoResult2,
-  isMultilanguageText: () => isMultilanguageText,
-  isOIDInfo: () => isOIDInfo,
-  isObject: () => isObject,
-  isString: () => isString,
-  isStringArray: () => isStringArray,
-  isStringOrOIDInfo: () => isStringOrOIDInfo,
-  isStringOrStringArray: () => isStringOrStringArray
+  isISessionCryptoResult2: () => isISessionCryptoResult2
 });
-function isObject(data) {
-  return typeof data === "object" && data !== null;
-}
-function isMultilanguageText(data) {
-  return isObject(data) && Object.values(data).every((value) => typeof value === "string");
-}
 function isGeoLocation(data) {
   if (!isObject(data))
     return false;
@@ -8150,26 +8022,6 @@ function isGeoLocation(data) {
   const longitude = data["lng"];
   return (latitude === void 0 || typeof latitude === "number") && (longitude === void 0 || typeof longitude === "number");
 }
-function isString(value) {
-  return typeof value === "string";
-}
-function isStringArray(value) {
-  return Array.isArray(value) && value.every((item) => typeof item === "string");
-}
-function isStringOrStringArray(value) {
-  return typeof value === "string" || isStringArray(value);
-}
-function isOIDInfo(data) {
-  if (!isObject(data))
-    return false;
-  return typeof data["oid"] === "string" && typeof data["name"] === "string";
-}
-function isStringOrOIDInfo(value) {
-  return typeof value === "string" || isOIDInfo(value);
-}
-function isIPublicKeyXY(obj) {
-  return typeof obj === "object" && obj !== null && typeof obj.x === "string" && typeof obj.y === "string";
-}
 var IECCurves = /* @__PURE__ */ ((IECCurves2) => {
   IECCurves2["secp192r1"] = "secp192r1";
   IECCurves2["secp224k1"] = "secp224k1";
@@ -8184,11 +8036,6 @@ var IEncoding = /* @__PURE__ */ ((IEncoding2) => {
   IEncoding2["base64"] = "base64";
   return IEncoding2;
 })(IEncoding || {});
-var PublicKeyFormats = /* @__PURE__ */ ((PublicKeyFormats2) => {
-  PublicKeyFormats2["DER"] = "DER";
-  PublicKeyFormats2["XY"] = "XY";
-  return PublicKeyFormats2;
-})(PublicKeyFormats || {});
 var SignatureFormats = /* @__PURE__ */ ((SignatureFormats2) => {
   SignatureFormats2["DER"] = "DER";
   SignatureFormats2["RS"] = "RS";
@@ -8310,12 +8157,19 @@ var DayOfWeek = /* @__PURE__ */ ((DayOfWeek2) => {
   DayOfWeek2[DayOfWeek2["Saturday"] = 6] = "Saturday";
   return DayOfWeek2;
 })(DayOfWeek || {});
+function OIDInfo(data) {
+  if (typeof data === "string")
+    return data;
+  if (isOIDInfo(data))
+    return data.name;
+  return "";
+}
 function isJSONLDObject(value) {
   if (typeof value !== "object" || value === null) {
     return false;
   }
   const obj = value;
-  return typeof obj["@context"] === "string";
+  return typeof obj["@context"] === "string" || Array.isArray(obj["@context"]);
 }
 function toArrayBuffer(data) {
   if (data instanceof ArrayBuffer)
@@ -8775,36 +8629,6 @@ function pad(text, paddingValue) {
   text ??= "";
   return (text + Array(2 * paddingValue).join("0")).substring(0, 2 * paddingValue);
 }
-async function sha256(message) {
-  let hashBuffer;
-  if (typeof message === "string")
-    hashBuffer = await crypto.subtle.digest("SHA-256", Buffer.from(message, "utf8"));
-  else
-    hashBuffer = await crypto.subtle.digest("SHA-256", message);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hashHex = hashArray.map((b) => ("00" + b.toString(16)).slice(-2)).join("").toLowerCase();
-  return hashHex;
-}
-async function sha384(message) {
-  let hashBuffer;
-  if (typeof message === "string")
-    hashBuffer = await crypto.subtle.digest("SHA-384", Buffer.from(message, "utf8"));
-  else
-    hashBuffer = await crypto.subtle.digest("SHA-384", message);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hashHex = hashArray.map((b) => ("00" + b.toString(16)).slice(-2)).join("").toLowerCase();
-  return hashHex;
-}
-async function sha512(message) {
-  let hashBuffer;
-  if (typeof message === "string")
-    hashBuffer = await crypto.subtle.digest("SHA-512", Buffer.from(message, "utf8"));
-  else
-    hashBuffer = await crypto.subtle.digest("SHA-512", message);
-  const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hashHex = hashArray.map((b) => ("00" + b.toString(16)).slice(-2)).join("").toLowerCase();
-  return hashHex;
-}
 function asJSONObject(value) {
   return isMandatoryJSONObject(value) ? value : void 0;
 }
@@ -8901,6 +8725,48 @@ function parseNumber(value) {
   }
   return null;
 }
+function isObject(data) {
+  return typeof data === "object" && data !== null;
+}
+function isI18NString(data) {
+  return isObject(data) && Object.values(data).every((value) => typeof value === "string");
+}
+function isString(value) {
+  return typeof value === "string";
+}
+function isStringArray(value) {
+  return Array.isArray(value) && value.every((item) => typeof item === "string");
+}
+function isStringOrStringArray(value) {
+  return typeof value === "string" || isStringArray(value);
+}
+function isOIDInfo(data) {
+  if (!isObject(data))
+    return false;
+  return typeof data["oid"] === "string" && typeof data["name"] === "string";
+}
+function isStringOrOIDInfo(value) {
+  return typeof value === "string" || isOIDInfo(value);
+}
+function isOptionalStringArray(data) {
+  return data === void 0 || Array.isArray(data) && data.every(isString);
+}
+function isOptionalStringOrOIDInfo(data) {
+  return data === void 0 || isStringOrOIDInfo(data);
+}
+function isEncodedValue(data) {
+  if (isString(data))
+    return true;
+  if (!isMandatoryJSONObject(data))
+    return false;
+  if (!isString(data["value"]))
+    return false;
+  if (!isOptionalString(data["format"]))
+    return false;
+  if (!isOptionalString(data["encoding"]))
+    return false;
+  return true;
+}
 function InformationRelevanceToString(InfoRelevance) {
   switch (InfoRelevance) {
     case "Ignored" /* Ignored */:
@@ -8961,6 +8827,187 @@ function _jsonPrettyPrinter(value, indentLevel, path, keyLookup) {
     html += String(value);
   return html;
 }
+function base64ToBytes(value) {
+  if (typeof Buffer !== "undefined")
+    return Uint8Array.from(Buffer.from(value, "base64"));
+  const binary = atob(value);
+  const bytes = new Uint8Array(binary.length);
+  for (let i = 0; i < binary.length; i++)
+    bytes[i] = binary.charCodeAt(i);
+  return bytes;
+}
+function bytesToBase64(bytes) {
+  if (typeof Buffer !== "undefined")
+    return Buffer.from(bytes).toString("base64");
+  let binary = "";
+  for (const byte of bytes)
+    binary += String.fromCharCode(byte);
+  return btoa(binary);
+}
+function cleanHex(hex) {
+  return hex.replace(/\s+/g, "");
+}
+function hexToBytes(hex) {
+  const cleanedHex = cleanHex(hex);
+  if (cleanedHex.length % 2 !== 0)
+    throw new Error("Hex strings must have even length!");
+  if (!/^[0-9a-fA-F]*$/.test(cleanedHex))
+    throw new Error("Invalid hexadecimal string!");
+  const bytes = new Uint8Array(cleanedHex.length / 2);
+  for (let index = 0; index < cleanedHex.length; index += 2)
+    bytes[index / 2] = Number.parseInt(cleanedHex.substring(index, index + 2), 16);
+  return bytes;
+}
+function bytesToHex(bytes) {
+  return Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
+}
+async function sha256(message) {
+  return bytesToHex(await sha256____(message));
+}
+async function sha384(message) {
+  return bytesToHex(await sha384____(message));
+}
+async function sha512(message) {
+  return bytesToHex(await sha512____(message));
+}
+async function sha256____(message) {
+  let hashBuffer;
+  if (typeof message === "string")
+    hashBuffer = await crypto.subtle.digest("SHA-256", Buffer.from(message, "utf8"));
+  else
+    hashBuffer = await crypto.subtle.digest("SHA-256", message);
+  return new Uint8Array(hashBuffer);
+}
+async function sha384____(message) {
+  let hashBuffer;
+  if (typeof message === "string")
+    hashBuffer = await crypto.subtle.digest("SHA-384", Buffer.from(message, "utf8"));
+  else
+    hashBuffer = await crypto.subtle.digest("SHA-384", message);
+  return new Uint8Array(hashBuffer);
+}
+async function sha512____(message) {
+  let hashBuffer;
+  if (typeof message === "string")
+    hashBuffer = await crypto.subtle.digest("SHA-512", Buffer.from(message, "utf8"));
+  else
+    hashBuffer = await crypto.subtle.digest("SHA-512", message);
+  return new Uint8Array(hashBuffer);
+}
+
+// src/interfaces/secp224k1.ts
+var secp224k1 = class {
+  // Pcurve = 2**224 - 2**32 - 2**12 - 2**11 - 2**9 - 2**7 - 2**4 - 2**1 - 1 or
+  //          FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFE FFFFE56D
+  Zero = BigInt("0");
+  One = BigInt("1");
+  Two = BigInt("2");
+  Three = BigInt("3");
+  Pcurve = BigInt("26959946667150639794667015087019630673637144422540572481099315275117");
+  // The proven prime
+  N = BigInt("0x010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7");
+  // Number of points in the field
+  Acurve = BigInt(0);
+  // Defined on the elliptic curve. y^2 = x^3 + Acurve * x + 5
+  Gx = BigInt("0xA1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C");
+  Gy = BigInt("0x7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5");
+  GPoint = [this.Gx, this.Gy];
+  // This is our generator point. Trillions of dif ones possible
+  Sign(hash, RandomNumber, privateKey) {
+    const RandSignPoint = this.ECmultiply(this.GPoint, RandomNumber);
+    if (RandSignPoint.length >= 1 && RandSignPoint[0] != null) {
+      const r = this.modulo(RandSignPoint[0], this.N);
+      const s = this.modulo((hash + r * privateKey) * this.modInv(RandomNumber, this.N), this.N);
+      return [r, s];
+    }
+    return null;
+  }
+  validate(hash, signatureR, signatureS, PublicKey) {
+    if (signatureR == this.Zero || signatureR >= this.N)
+      throw new Error("Invalid R");
+    if (signatureS == this.Zero || signatureS >= this.N)
+      throw new Error("Invalid S");
+    const w = this.modInv(signatureS, this.N);
+    const u1 = this.ECmultiply(this.GPoint, this.modulo(w * hash, this.N));
+    const u2 = this.ECmultiply(PublicKey, this.modulo(w * signatureR, this.N));
+    const validation = this.ECadd(u1, u2);
+    return validation[0] == signatureR;
+  }
+  modulo(n, m) {
+    return (n % m + m) % m;
+  }
+  zfill(s) {
+    while (s.length < 56) {
+      s = "0" + s;
+    }
+    return s;
+  }
+  modInv(a, n = this.Pcurve) {
+    let lm = BigInt(1), hm = BigInt(0), high = n, low = this.modulo(a, n);
+    while (low > 1) {
+      const ratio = high / low, nm = hm - ratio * lm, newm = high - ratio * low;
+      hm = lm;
+      lm = nm;
+      high = low;
+      low = newm;
+    }
+    return this.modulo(lm, n);
+  }
+  ECadd(a, b) {
+    if (a[0] != void 0 && b[0] != void 0 && a[1] != void 0 && b[1] != void 0) {
+      const LamAdd = this.modulo((b[1] - a[1]) * this.modInv(b[0] - a[0]), this.Pcurve);
+      const x = this.modulo(LamAdd * LamAdd - a[0] - b[0], this.Pcurve);
+      const y = this.modulo(LamAdd * (a[0] - x) - a[1], this.Pcurve);
+      return [x, y];
+    }
+    throw new Error("Invalid EC Point Addition!");
+  }
+  ECdouble(a) {
+    if (a[0] != void 0 && a[1] != void 0) {
+      const Lam = this.modulo((a[0] * a[0] * this.Three + this.Acurve) * this.modInv(a[1] * this.Two), this.Pcurve);
+      const x = this.modulo(Lam * Lam - a[0] * this.Two, this.Pcurve);
+      const y = this.modulo(Lam * (a[0] - x) - a[1], this.Pcurve);
+      return [x, y];
+    }
+    throw new Error("Invalid EC Point Doubling!");
+  }
+  ECmultiply(GenPoint, ScalarHex) {
+    if (ScalarHex == this.Zero || ScalarHex >= this.N)
+      throw new Error("Invalid Scalar/Private Key");
+    const ScalarBinary = ScalarHex.toString(2);
+    let Q = GenPoint;
+    for (let i = 1; i < ScalarBinary.length; i++) {
+      Q = this.ECdouble(Q);
+      if (ScalarBinary[i] === "1") {
+        Q = this.ECadd(Q, GenPoint);
+      }
+    }
+    return Q;
+  }
+  // uncompressed is the accumulation of both the x and y points
+  // compressed is the public key to share in transactions
+  // address is the public address tho whom someone can send coin
+  PublicKeyGenerate(PrivateKey) {
+    if (typeof PrivateKey === "number")
+      PrivateKey = BigInt(PrivateKey);
+    if (typeof PrivateKey === "string")
+      PrivateKey = BigInt(PrivateKey);
+    const publicKey = this.ECmultiply(this.GPoint, PrivateKey);
+    if (publicKey[0] !== void 0 && publicKey[1] !== void 0) {
+      const Px = this.zfill(publicKey[0].toString(16));
+      const Py = this.zfill(publicKey[1].toString(16));
+      return {
+        x: publicKey[0],
+        y: publicKey[1],
+        xy: [Px, Py],
+        uncompressed: publicKey[0].toString(16) + publicKey[1].toString(16),
+        compressed: "04" + Px + Py,
+        address: this.modulo(publicKey[1], this.Two) == this.One ? "03" + Px : "02" + Px
+      };
+    }
+    return void 0;
+  }
+};
 
 // src/ACrypt.ts
 var ACrypt = class {
@@ -9192,8 +9239,8 @@ var Alfen = class {
           "Signature": this.bufferToHex(Signature)
         });
       }
-      const evseId = asString(containerInfos["EVSEId"]) ?? "DE*GEF*EVSE*CHARGY*1";
-      const chargingStationId = asString(containerInfos["ChargingStationId"]) ?? "DE*GEF*STATION*CHARGY*1";
+      const evseId = ContainerInfos.chargingStations?.[0]?.EVSEs?.[0]?.["@id"] ?? "DE*GEF*EVSE*CHARGY*1";
+      const chargingStationId = ContainerInfos.chargingStations?.[0]?.["@id"] ?? "DE*GEF*STATION*CHARGY*1";
       const chargingSessionId = asString(chargingSession?.["@id"]);
       const firstDataSet = getFirstArrayElement(common.dataSets, "Missing first Alfen data set");
       const lastDataSet = getLastArrayElement(common.dataSets, "Missing last Alfen data set");
@@ -9218,10 +9265,18 @@ var Alfen = class {
                 "@id": chargingStationId,
                 // ToDo: The container infos are not validated yet!
                 "description": asJSONObject(chargingStation?.["description"]),
-                "manufacturer": asString(chargingStation?.["manufacturer"]),
-                "model": asString(chargingStation?.["type"]),
-                "serialNumber": asString(chargingStation?.["serialNumber"]),
-                "firmwareVersion": asString(chargingStation?.["softwareVersion"]),
+                "manufacturer": {
+                  "name": asString(chargingStation?.["manufacturer"])
+                },
+                "model": {
+                  "name": asString(chargingStation?.["type"])
+                },
+                "hardware": {
+                  "serialNumber": asString(chargingStation?.["serialNumber"])
+                },
+                "firmware": {
+                  "version": asString(chargingStation?.["softwareVersion"])
+                },
                 "legalCompliance": asJSONObject(chargingStation?.["legalCompliance"]),
                 "geoLocation": asJSONObject(chargingStation?.["geoLocation"]),
                 "address": asJSONObject(chargingStation?.["address"]),
@@ -9231,18 +9286,29 @@ var Alfen = class {
                     "description": asJSONObject(evse?.["description"]),
                     "connectors": [{
                       "type": asString(connector?.["type"]) ?? "",
-                      "looses": asNumber(connector?.["looses"]) ?? 0
+                      "cable": {
+                        "length": asNumber(connector?.["cableLength"]) ?? 0,
+                        "looses": asNumber(connector?.["cableLooses"]) ?? 0
+                      }
                     }],
-                    "meters": [
+                    "energyMeters": [
                       {
                         "@id": common.MeterId,
-                        "manufacturer": asString(energyMeter?.["manufacturer"]),
-                        "manufacturerURL": asString(energyMeter?.["manufacturerURL"]),
-                        "model": asString(energyMeter?.["model"]),
-                        "modelURL": asString(energyMeter?.["modelURL"]),
-                        "hardwareVersion": asString(energyMeter?.["hardwareVersion"]),
-                        "firmwareVersion": common.AdapterFWVersion,
-                        "firmwareChecksum": common.AdapterFWChecksum,
+                        "manufacturer": {
+                          "name": asString(energyMeter?.["manufacturer"]),
+                          "contact": { "web": asString(energyMeter?.["manufacturerURL"]) }
+                        },
+                        "model": {
+                          "name": asString(energyMeter?.["model"]),
+                          "url": asString(energyMeter?.["modelURL"])
+                        },
+                        "hardware": {
+                          "revision": asString(energyMeter?.["hardwareVersion"])
+                        },
+                        "firmware": {
+                          "version": common.AdapterFWVersion,
+                          "checksum": common.AdapterFWChecksum
+                        },
                         "signatureFormat": "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/AlfenCrypt01",
                         "publicKeys": [
                           {
@@ -9342,23 +9408,21 @@ var AlfenCrypt01 = class extends ACrypt {
   }
   async VerifyChargingSession(chargingSession) {
     let sessionResult = "UnknownSessionFormat" /* UnknownSessionFormat */;
-    {
-      for (const measurement of chargingSession.measurements) {
-        measurement.chargingSession = chargingSession;
-        if (measurement.values.length > 1) {
-          for (const measurementValue of measurement.values) {
-            measurementValue.measurement = measurement;
-            await this.VerifyMeasurement(measurementValue);
-          }
-          sessionResult = "ValidSignature" /* ValidSignature */;
-          for (const measurementValue of measurement.values) {
-            if (sessionResult == "ValidSignature" /* ValidSignature */ && measurementValue.result?.status != "ValidSignature" /* ValidSignature */) {
-              sessionResult = "InvalidSignature" /* InvalidSignature */;
-            }
+    for (const measurement of chargingSession.measurements ?? []) {
+      measurement.chargingSession = chargingSession;
+      if (measurement.values.length > 1) {
+        for (const measurementValue of measurement.values) {
+          measurementValue.measurement = measurement;
+          await this.VerifyMeasurement(measurementValue);
+        }
+        sessionResult = "ValidSignature" /* ValidSignature */;
+        for (const measurementValue of measurement.values) {
+          if (sessionResult == "ValidSignature" /* ValidSignature */ && measurementValue.result?.status != "ValidSignature" /* ValidSignature */) {
+            sessionResult = "InvalidSignature" /* InvalidSignature */;
           }
-        } else
-          sessionResult = "AtLeastTwoMeasurementsRequired" /* AtLeastTwoMeasurementsRequired */;
-      }
+        }
+      } else
+        sessionResult = "AtLeastTwoMeasurementsRequired" /* AtLeastTwoMeasurementsRequired */;
     }
     return {
       status: sessionResult,
@@ -9388,7 +9452,7 @@ var AlfenCrypt01 = class extends ACrypt {
       unitEncoded: SetInt8(cryptoBuffer, measurementValue.measurement.unitEncoded ?? 0, 44),
       scalar: SetInt8(cryptoBuffer, measurementValue.measurement.scale, 45),
       value: SetUInt64D(cryptoBuffer, measurementValue.value, 46, true),
-      uid: SetText(cryptoBuffer, measurementValue.measurement.chargingSession?.authorizationStart["@id"] ?? "", 54),
+      uid: SetText(cryptoBuffer, measurementValue.measurement.chargingSession?.authorizationStart?.["@id"] ?? "", 54),
       sessionId: SetUInt32(cryptoBuffer, parseInt(measurementValue.measurement.chargingSession?.internalSessionId ?? ""), 74, true),
       paging: SetUInt32(cryptoBuffer, measurementValue.paginationId, 78, true)
     };
@@ -9426,8 +9490,8 @@ var AlfenCrypt01 = class extends ACrypt {
                     cryptoResult.hashValue = hashValue224k1;
                     result = this.curve224k1.validate(
                       hashValue224k1,
-                      BigInt(signatureExpected.r !== void 0 ? "0x" + signatureExpected.r : "0x0"),
-                      BigInt(signatureExpected.s !== void 0 ? "0x" + signatureExpected.s : "0x0"),
+                      BigInt("0x" + signatureExpected.r),
+                      BigInt("0x" + signatureExpected.s),
                       [
                         BigInt("0x" + publicKey.substring(2, 58)),
                         BigInt("0x" + publicKey.substring(58))
@@ -9514,7 +9578,7 @@ var AlfenCrypt01 = class extends ACrypt {
       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("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);
     }
@@ -9541,8 +9605,8 @@ var AlfenCrypt01 = class extends ACrypt {
             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?.energyMeters?.[0],
+              measurementValue.measurement.chargingSession?.EVSE?.energyMeters?.[0]?.publicKeys?.[0],
               signature
             );
           } catch {
@@ -9554,7 +9618,7 @@ var AlfenCrypt01 = class extends ACrypt {
       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 != null && result.signature.r.length > 0 && result.signature.s != null && result.signature.s.length > 0) {
+      if (result.signature.r.length > 0 && 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;
@@ -10059,7 +10123,7 @@ var BSMCrypt01 = class extends ACrypt {
         "@context": "https://open.charging.cloud/contexts/SessionSignatureFormats/bsm-ws36a-v0+json",
         "begin": firstDataSet.time,
         "end": lastDataSet.time,
-        "EVSEId": CTR.chargingStationOperators?.[0]?.["chargingStations"]?.[0]?.["EVSEs"][0]?.["@id"],
+        "EVSEId": CTR.chargingStationOperators?.[0]?.["chargingStations"]?.[0]?.["EVSEs"]?.[0]?.["@id"],
         "authorizationStart": {
           "@id": common.contract_id,
           "@context": common.contract_type
@@ -10166,7 +10230,7 @@ var BSMCrypt01 = class extends ACrypt {
       {
         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) {
+        if (firstChargingSession.begin !== void 0 && (CTR.begin == void 0 || CTR.begin === "" || CTR.begin > firstChargingSession.begin)) {
           CTR.begin = firstChargingSession.begin;
         }
         if (lastChargingSession.end !== void 0) {
@@ -10174,21 +10238,22 @@ var BSMCrypt01 = class extends ACrypt {
             CTR.end = lastChargingSession.end;
         }
       }
-      if (CTR.contract == null)
-        CTR.contract = {
-          "@id": common.contract_id,
-          "@context": common.contract_type
-        };
-      else {
-        CTR.contract["@id"] = common.contract_id;
-        CTR.contract["@context"] = common.contract_type;
-      }
-      CTR.chargingStationOperators?.[0]?.chargingStations?.[0]?.EVSEs[0]?.meters?.push({
+      CTR.contracts = [{
+        "@id": common.contract_id,
+        "@context": common.contract_type
+      }];
+      CTR.chargingStationOperators?.[0]?.chargingStations?.[0]?.EVSEs?.[0]?.energyMeters?.push({
         "@id": common.meterInfo_meterId,
-        model: common.meterInfo_type,
-        manufacturer: common.meterInfo_manufacturer,
-        manufacturerURL: "https://www.bzr-bauer.de",
-        firmwareVersion: common.meterInfo_firmwareVersion,
+        model: { name: common.meterInfo_type },
+        manufacturer: {
+          name: common.meterInfo_manufacturer,
+          contact: {
+            web: "https://www.bzr-bauer.de"
+          }
+        },
+        firmware: {
+          version: common.meterInfo_firmwareVersion
+        },
         //hardwareVersion?:    string;
         signatureInfos: {
           hash: "SHA256" /* SHA256 */,
@@ -10223,7 +10288,7 @@ var BSMCrypt01 = class extends ACrypt {
   async VerifyChargingSession(chargingSession) {
     let sessionResult = "UnknownSessionFormat" /* UnknownSessionFormat */;
     {
-      for (const measurement of chargingSession.measurements) {
+      for (const measurement of chargingSession.measurements ?? []) {
         measurement.chargingSession = chargingSession;
         if (measurement.values.length > 1) {
           for (const measurementValue of measurement.values) {
@@ -10390,13 +10455,13 @@ var BSMCrypt01 = class extends ACrypt {
             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) {
+            const energyMeter = evse?.energyMeters?.at(0);
+            const publicKey = energyMeter?.publicKeys?.at(0);
+            if (signatureDiv != null && chargingSession != null && evse != null && energyMeter != null && publicKey != null) {
               signatureDiv.innerHTML = await this.chargy.CheckMeterPublicKeySignature(
                 chargingSession.chargingStation,
                 evse,
-                meter,
+                energyMeter,
                 publicKey,
                 signature
               );
@@ -10411,7 +10476,7 @@ var BSMCrypt01 = class extends ACrypt {
       if (SignatureExpectedDiv.parentElement) {
         getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = "Erwartete Signatur (" + (result.signature.format ?? "") + ", hex)";
       }
-      if (result.signature.r != null && result.signature.r.length > 0 && result.signature.s != null && result.signature.s.length > 0)
+      if (result.signature.r.length > 0 && 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 != null && result.signature.value.length > 0)
         SignatureExpectedDiv.innerHTML = result.signature.value.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
@@ -10549,97 +10614,7 @@ var BSMCrypt01 = class extends ACrypt {
   // //#endregion
 };
 
-// src/CanonicalJSON.ts
-var CanonicalJSONError = class extends TypeError {
-  constructor(message) {
-    super(message);
-    this.name = "CanonicalJSONError";
-  }
-};
-function canonicalJSONStringify(value) {
-  return serializeJSONValue(value, "$", /* @__PURE__ */ new WeakSet());
-}
-function canonicalJSONBytes(value) {
-  return new TextEncoder().encode(canonicalJSONStringify(value));
-}
-function serializeJSONValue(value, path, seen) {
-  switch (typeof value) {
-    case "string":
-      return JSON.stringify(value);
-    case "number":
-      if (!Number.isFinite(value))
-        throw new CanonicalJSONError(`Non-finite number at ${path} is not valid JSON.`);
-      return JSON.stringify(value);
-    case "boolean":
-      return value ? "true" : "false";
-    case "object":
-      if (value === null)
-        return "null";
-      return Array.isArray(value) ? serializeJSONArray(value, path, seen) : serializeJSONObject(value, path, seen);
-    case "bigint":
-      throw new CanonicalJSONError(`BigInt at ${path} is not valid JSON.`);
-    case "undefined":
-      throw new CanonicalJSONError(`Undefined value at ${path} is not valid JSON.`);
-    case "function":
-      throw new CanonicalJSONError(`Function at ${path} is not valid JSON.`);
-    case "symbol":
-      throw new CanonicalJSONError(`Symbol at ${path} is not valid JSON.`);
-  }
-}
-function serializeJSONArray(value, path, seen) {
-  if (seen.has(value))
-    throw new CanonicalJSONError(`Circular reference at ${path} is not valid JSON.`);
-  seen.add(value);
-  const indexedKeys = /* @__PURE__ */ new Set();
-  for (let i = 0; i < value.length; i++) {
-    if (!Object.prototype.hasOwnProperty.call(value, i))
-      throw new CanonicalJSONError(`Sparse array slot at ${path}[${String(i)}] is not valid JSON.`);
-    indexedKeys.add(String(i));
-  }
-  for (const key of Object.keys(value)) {
-    if (!indexedKeys.has(key))
-      throw new CanonicalJSONError(`Non-index array property ${formatPathProperty(key)} at ${path} is not valid JSON.`);
-  }
-  rejectEnumerableSymbolProperties(value, path);
-  const serializedItems = value.map(
-    (item, index) => serializeJSONValue(item, `${path}[${String(index)}]`, seen)
-  );
-  seen.delete(value);
-  return `[${serializedItems.join(",")}]`;
-}
-function serializeJSONObject(value, path, seen) {
-  if (Object.prototype.toString.call(value) !== "[object Object]")
-    throw new CanonicalJSONError(`Unsupported object at ${path} is not valid JSON.`);
-  if (seen.has(value))
-    throw new CanonicalJSONError(`Circular reference at ${path} is not valid JSON.`);
-  seen.add(value);
-  rejectEnumerableSymbolProperties(value, path);
-  const serializedProperties = Object.keys(value).sort(compareOrdinal).map((key) => {
-    const serializedKey = JSON.stringify(key);
-    const serializedValue = serializeJSONValue(
-      value[key],
-      `${path}${formatPathProperty(key)}`,
-      seen
-    );
-    return `${serializedKey}:${serializedValue}`;
-  });
-  seen.delete(value);
-  return `{${serializedProperties.join(",")}}`;
-}
-function rejectEnumerableSymbolProperties(value, path) {
-  for (const symbol of Object.getOwnPropertySymbols(value)) {
-    if (Object.prototype.propertyIsEnumerable.call(value, symbol))
-      throw new CanonicalJSONError(`Symbol property at ${path} is not valid JSON.`);
-  }
-}
-function compareOrdinal(left, right) {
-  return left < right ? -1 : left > right ? 1 : 0;
-}
-function formatPathProperty(propertyName) {
-  return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(propertyName) ? `.${propertyName}` : `[${JSON.stringify(propertyName)}]`;
-}
-
-// src/CryptoUtils.ts
+// src/interfaces/CryptoUtils.ts
 var import_elliptic = __toESM(require_elliptic());
 var JSONSignatureVerificationStatus = /* @__PURE__ */ ((JSONSignatureVerificationStatus2) => {
   JSONSignatureVerificationStatus2["True"] = "True";
@@ -10680,7 +10655,7 @@ async function signJSONMessage(JSONMessage, KeyPairs, options) {
       continue;
     const messageJSON = cloneMessageWithoutSignatures(JSONMessage);
     const plainText = canonicalJSONBytes(messageJSON);
-    const sha256Hash = await sha2562(plainText);
+    const sha256Hash = await sha256____(plainText);
     JSONMessage.signatures ??= [];
     const publicKeyBytes = Uint8Array.from(KeyPair.getPublic(false, "array"));
     const signature = KeyPair.sign(sha256Hash, {
@@ -10727,7 +10702,7 @@ async function verifyJSONSignatureResult(JSONMessage, signature, options) {
   try {
     const messageJSON = cloneMessageWithoutSignatures(JSONMessage);
     const plainText = canonicalJSONBytes(messageJSON);
-    sha256Hash = await sha2562(plainText);
+    sha256Hash = await sha256____(plainText);
   } catch (exception) {
     return verificationResult(
       "InvalidCanonicalJSON" /* InvalidCanonicalJSON */,
@@ -10835,7 +10810,7 @@ function parseSignedJSONMessage(JSONMessage) {
       };
     }
   }
-  if (!isJSONRecord(parsedMessage))
+  if (!isMandatoryJSONObject(parsedMessage))
     return {
       result: verificationResult(
         "InvalidJSON" /* InvalidJSON */,
@@ -10854,7 +10829,7 @@ function parseSignedJSONMessage(JSONMessage) {
   };
 }
 function isJSONSignature(value) {
-  return isJSONRecord(value) && typeof value["publicKey"] === "string" && typeof value["publicKeyHEX"] === "string" && typeof value["signature"] === "string" && typeof value["signatureHEX"] === "string";
+  return isMandatoryJSONObject(value) && typeof value["publicKey"] === "string" && typeof value["publicKeyHEX"] === "string" && typeof value["signature"] === "string" && typeof value["signatureHEX"] === "string";
 }
 function signatureEncodingsMatch(signature) {
   try {
@@ -10878,32 +10853,93 @@ function verificationResult(status, description) {
 function isVerificationTrue(result) {
   return (typeof result === "string" ? result : result.status) === "True" /* True */;
 }
-function isJSONRecord(value) {
-  return value != null && typeof value === "object" && !Array.isArray(value);
+var CanonicalJSONError = class extends TypeError {
+  constructor(message) {
+    super(message);
+    this.name = "CanonicalJSONError";
+  }
+};
+function canonicalJSONStringify(value) {
+  return serializeJSONValue(value, "$", /* @__PURE__ */ new WeakSet());
 }
-async function sha2562(data) {
-  const digest = await crypto.subtle.digest("SHA-256", data);
-  return new Uint8Array(digest);
+function canonicalJSONBytes(value) {
+  return new TextEncoder().encode(canonicalJSONStringify(value));
 }
-function bytesToHex(bytes) {
-  return Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
+function serializeJSONValue(value, path, seen) {
+  switch (typeof value) {
+    case "string":
+      return JSON.stringify(value);
+    case "number":
+      if (!Number.isFinite(value))
+        throw new CanonicalJSONError(`Non-finite number at ${path} is not valid JSON.`);
+      return JSON.stringify(value);
+    case "boolean":
+      return value ? "true" : "false";
+    case "object":
+      if (value === null)
+        return "null";
+      return Array.isArray(value) ? serializeJSONArray(value, path, seen) : serializeJSONObject(value, path, seen);
+    case "bigint":
+      throw new CanonicalJSONError(`BigInt at ${path} is not valid JSON.`);
+    case "undefined":
+      throw new CanonicalJSONError(`Undefined value at ${path} is not valid JSON.`);
+    case "function":
+      throw new CanonicalJSONError(`Function at ${path} is not valid JSON.`);
+    case "symbol":
+      throw new CanonicalJSONError(`Symbol at ${path} is not valid JSON.`);
+  }
 }
-function base64ToBytes(value) {
-  if (typeof Buffer !== "undefined")
-    return Uint8Array.from(Buffer.from(value, "base64"));
-  const binary = atob(value);
-  const bytes = new Uint8Array(binary.length);
-  for (let i = 0; i < binary.length; i++)
-    bytes[i] = binary.charCodeAt(i);
-  return bytes;
+function serializeJSONArray(value, path, seen) {
+  if (seen.has(value))
+    throw new CanonicalJSONError(`Circular reference at ${path} is not valid JSON.`);
+  seen.add(value);
+  const indexedKeys = /* @__PURE__ */ new Set();
+  for (let i = 0; i < value.length; i++) {
+    if (!Object.prototype.hasOwnProperty.call(value, i))
+      throw new CanonicalJSONError(`Sparse array slot at ${path}[${String(i)}] is not valid JSON.`);
+    indexedKeys.add(String(i));
+  }
+  for (const key of Object.keys(value)) {
+    if (!indexedKeys.has(key))
+      throw new CanonicalJSONError(`Non-index array property ${formatPathProperty(key)} at ${path} is not valid JSON.`);
+  }
+  rejectEnumerableSymbolProperties(value, path);
+  const serializedItems = value.map(
+    (item, index) => serializeJSONValue(item, `${path}[${String(index)}]`, seen)
+  );
+  seen.delete(value);
+  return `[${serializedItems.join(",")}]`;
 }
-function bytesToBase64(bytes) {
-  if (typeof Buffer !== "undefined")
-    return Buffer.from(bytes).toString("base64");
-  let binary = "";
-  for (const byte of bytes)
-    binary += String.fromCharCode(byte);
-  return btoa(binary);
+function serializeJSONObject(value, path, seen) {
+  if (Object.prototype.toString.call(value) !== "[object Object]")
+    throw new CanonicalJSONError(`Unsupported object at ${path} is not valid JSON.`);
+  if (seen.has(value))
+    throw new CanonicalJSONError(`Circular reference at ${path} is not valid JSON.`);
+  seen.add(value);
+  rejectEnumerableSymbolProperties(value, path);
+  const serializedProperties = Object.keys(value).sort(compareOrdinal).map((key) => {
+    const serializedKey = JSON.stringify(key);
+    const serializedValue = serializeJSONValue(
+      value[key],
+      `${path}${formatPathProperty(key)}`,
+      seen
+    );
+    return `${serializedKey}:${serializedValue}`;
+  });
+  seen.delete(value);
+  return `{${serializedProperties.join(",")}}`;
+}
+function rejectEnumerableSymbolProperties(value, path) {
+  for (const symbol of Object.getOwnPropertySymbols(value)) {
+    if (Object.prototype.propertyIsEnumerable.call(value, symbol))
+      throw new CanonicalJSONError(`Symbol property at ${path} is not valid JSON.`);
+  }
+}
+function compareOrdinal(left, right) {
+  return left < right ? -1 : left > right ? 1 : 0;
+}
+function formatPathProperty(propertyName) {
+  return /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(propertyName) ? `.${propertyName}` : `[${JSON.stringify(propertyName)}]`;
 }
 
 // src/EMHCrypt01.ts
@@ -10918,7 +10954,7 @@ var EMHCrypt01 = class extends ACrypt {
   async VerifyChargingSession(chargingSession) {
     let sessionResult = "UnknownSessionFormat" /* UnknownSessionFormat */;
     {
-      for (const measurement of chargingSession.measurements) {
+      for (const measurement of chargingSession.measurements ?? []) {
         measurement.chargingSession = chargingSession;
         if (measurement.values.length > 1) {
           for (const measurementValue of measurement.values) {
@@ -10966,8 +11002,8 @@ var EMHCrypt01 = class extends ACrypt {
       scale: SetInt8(cryptoBuffer, measurementValue.measurement.scale, 30),
       value: SetUInt64D(cryptoBuffer, measurementValue.value, 31, true),
       logBookIndex: SetHex(cryptoBuffer, measurementValue.logBookIndex, 39, false),
-      authorizationStart: SetText(cryptoBuffer, measurementValue.measurement.chargingSession.authorizationStart["@id"], 41),
-      authorizationStartTimestamp: SetTimestamp32(cryptoBuffer, measurementValue.measurement.chargingSession.authorizationStart.timestamp, 169)
+      authorizationStart: SetText(cryptoBuffer, measurementValue.measurement.chargingSession.authorizationStart?.["@id"] ?? "", 41),
+      authorizationStartTimestamp: SetTimestamp32(cryptoBuffer, measurementValue.measurement.chargingSession.authorizationStart?.timestamp ?? measurementValue.timestamp, 169)
     };
     const firstSignature = measurementValue.signatures?.[0];
     if (firstSignature != null) {
@@ -10986,7 +11022,7 @@ var EMHCrypt01 = class extends ACrypt {
           if (meter.publicKeys != null && meter.publicKeys.length > 0) {
             try {
               const publicKey = meter.publicKeys.at(0);
-              cryptoResult.publicKey = publicKey?.value?.toLowerCase();
+              cryptoResult.publicKey = publicKey?.value.toLowerCase();
               cryptoResult.publicKeyFormat = publicKey?.format;
               cryptoResult.publicKeySignatures = publicKey?.signatures;
               try {
@@ -11014,7 +11050,7 @@ var EMHCrypt01 = class extends ACrypt {
     return {};
   }
   async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
-    if (measurementValue.measurement?.chargingSession?.authorizationStart.timestamp === void 0) {
+    if (measurementValue.measurement?.chargingSession?.authorizationStart?.timestamp === void 0) {
       return new Error("Invalid measurement!");
     }
     const result = measurementValue.result;
@@ -11065,8 +11101,8 @@ var EMHCrypt01 = class extends ACrypt {
               signatureDiv.innerHTML = await this.chargy.CheckMeterPublicKeySignature(
                 measurementValue.measurement.chargingSession.chargingStation,
                 measurementValue.measurement.chargingSession.EVSE,
-                measurementValue.measurement.chargingSession.EVSE?.meters.at(0),
-                measurementValue.measurement.chargingSession.EVSE?.meters.at(0)?.publicKeys?.at(0),
+                measurementValue.measurement.chargingSession.EVSE?.energyMeters?.at(0),
+                measurementValue.measurement.chargingSession.EVSE?.energyMeters?.at(0)?.publicKeys?.at(0),
                 signature
               );
               signatureDiv.onclick = () => {
@@ -11083,7 +11119,7 @@ var EMHCrypt01 = class extends ACrypt {
       if (SignatureExpectedDiv.parentElement) {
         getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = "Erwartete Signatur (" + (result.signature.format ?? "") + ", hex)";
       }
-      if (result.signature.r != null && result.signature.r.length > 0 && result.signature.s != null && result.signature.s.length > 0)
+      if (result.signature.r.length > 0 && 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 != null && result.signature.value.length > 0)
         SignatureExpectedDiv.innerHTML = result.signature.value.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
@@ -11154,7 +11190,7 @@ var GDFCrypt01 = class extends ACrypt {
   async VerifyChargingSession(chargingSession) {
     let sessionResult = "UnknownSessionFormat" /* UnknownSessionFormat */;
     {
-      for (const measurement of chargingSession.measurements) {
+      for (const measurement of chargingSession.measurements ?? []) {
         measurement.chargingSession = chargingSession;
         if (measurement.values.length > 1) {
           for (const measurementValue of measurement.values) {
@@ -11198,8 +11234,8 @@ var GDFCrypt01 = class extends ACrypt {
       unitEncoded: SetInt8(cryptoBuffer, measurementValue.measurement.unitEncoded ?? 0, 29),
       scale: SetInt8(cryptoBuffer, measurementValue.measurement.scale, 30),
       value: SetUInt64D(cryptoBuffer, measurementValue.value, 31, true),
-      authorizationStart: SetHex(cryptoBuffer, measurementValue.measurement.chargingSession.authorizationStart["@id"], 41),
-      authorizationStartTimestamp: SetTimestamp(cryptoBuffer, measurementValue.measurement.chargingSession.authorizationStart.timestamp, 169)
+      authorizationStart: SetHex(cryptoBuffer, measurementValue.measurement.chargingSession.authorizationStart?.["@id"] ?? "", 41),
+      authorizationStartTimestamp: SetTimestamp(cryptoBuffer, measurementValue.measurement.chargingSession.authorizationStart?.timestamp, 169)
     };
     const firstSignature = measurementValue.signatures?.[0];
     if (firstSignature != null) {
@@ -11218,7 +11254,7 @@ var GDFCrypt01 = class extends ACrypt {
           if (meter.publicKeys != null && meter.publicKeys.length > 0) {
             try {
               const publicKey = meter.publicKeys.at(0);
-              cryptoResult.publicKey = publicKey?.value?.toLowerCase();
+              cryptoResult.publicKey = publicKey?.value.toLowerCase();
               cryptoResult.publicKeyFormat = publicKey?.format;
               cryptoResult.publicKeySignatures = publicKey?.signatures;
               try {
@@ -11246,7 +11282,7 @@ var GDFCrypt01 = class extends ACrypt {
     return {};
   }
   async ViewMeasurement(measurementValue, _errorDiv, introDiv, infoDiv, PlainTextDiv, HashedPlainTextDiv, PublicKeyDiv, SignatureExpectedDiv, SignatureCheckDiv) {
-    if (measurementValue.measurement?.chargingSession?.authorizationStart.timestamp === void 0) {
+    if (measurementValue.measurement?.chargingSession?.authorizationStart?.timestamp === void 0) {
       return new Error("Invalid measurement!");
     }
     const result = measurementValue.result;
@@ -11292,8 +11328,8 @@ var GDFCrypt01 = class extends ACrypt {
               signatureDiv.innerHTML = await this.chargy.CheckMeterPublicKeySignature(
                 measurementValue.measurement.chargingSession.chargingStation,
                 measurementValue.measurement.chargingSession.EVSE,
-                measurementValue.measurement.chargingSession.EVSE?.meters.at(0),
-                measurementValue.measurement.chargingSession.EVSE?.meters.at(0)?.publicKeys?.at(0),
+                measurementValue.measurement.chargingSession.EVSE?.energyMeters?.at(0),
+                measurementValue.measurement.chargingSession.EVSE?.energyMeters?.at(0)?.publicKeys?.at(0),
                 signature
               );
           } catch (exception) {
@@ -11306,7 +11342,7 @@ var GDFCrypt01 = class extends ACrypt {
       if (SignatureExpectedDiv.parentElement) {
         getArrayLikeElement(SignatureExpectedDiv.parentElement.children, 0, "Missing expected signature header").innerHTML = "Erwartete Signatur (" + (result.signature.format ?? "") + ", hex)";
       }
-      if (result.signature.r != null && result.signature.r.length > 0 && result.signature.s != null && result.signature.s.length > 0)
+      if (result.signature.r.length > 0 && 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 != null && result.signature.value.length > 0)
         SignatureExpectedDiv.innerHTML = result.signature.value.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
@@ -11338,7 +11374,118 @@ var GDFCrypt01 = class extends ACrypt {
     }
     return void 0;
   }
-};
+};
+
+// src/interfaces/IPublicKeyInfo.ts
+var IPublicKeyInfo_exports = {};
+__export(IPublicKeyInfo_exports, {
+  IsAPublicKey: () => IsAPublicKey,
+  IsAPublicKeyLookup: () => IsAPublicKeyLookup,
+  IsAPublicKeySignature: () => IsAPublicKeySignature,
+  IsAPublicKeyXY: () => IsAPublicKeyXY,
+  PublicKeyFormats: () => PublicKeyFormats,
+  isPublicKeySubject: () => isPublicKeySubject
+});
+var PublicKeyFormats = /* @__PURE__ */ ((PublicKeyFormats2) => {
+  PublicKeyFormats2["DER"] = "DER";
+  PublicKeyFormats2["XY"] = "XY";
+  return PublicKeyFormats2;
+})(PublicKeyFormats || {});
+function IsAPublicKeyLookup(data) {
+  if (!isMandatoryJSONObject(data))
+    return false;
+  return Array.isArray(data["publicKeys"]);
+}
+function IsAPublicKey(data) {
+  if (!isMandatoryJSONObject(data))
+    return false;
+  if (data["@context"] !== void 0 && !isStringOrStringArray(data["@context"])) {
+    return false;
+  }
+  if (!isPublicKeySubject(data["subject"]))
+    return false;
+  if (data["value"] !== void 0 && !isString(data["value"])) {
+    return false;
+  }
+  if (data["value"] === void 0 && (data["x"] === void 0 || data["y"] === void 0)) {
+    return false;
+  }
+  if (data["value"] !== void 0 && !isStringOrOIDInfo(data["algorithm"])) {
+    return false;
+  }
+  if (data["certainty"] !== void 0 && (typeof data["certainty"] !== "number" || !Number.isFinite(data["certainty"]))) {
+    return false;
+  }
+  if (data["type"] !== void 0 && !isStringOrOIDInfo(data["type"])) {
+    return false;
+  }
+  if (data["encoding"] !== void 0 && typeof data["encoding"] !== "string") {
+    return false;
+  }
+  if (data["signatures"] !== void 0 && (!Array.isArray(data["signatures"]) || !data["signatures"].every(IsAPublicKeySignature))) {
+    return false;
+  }
+  return true;
+}
+function isPublicKeySubject(data) {
+  if (data === void 0)
+    return true;
+  if (isStringOrStringArray(data))
+    return true;
+  if (!isMandatoryJSONObject(data))
+    return false;
+  return Object.values(data).every(
+    (value) => typeof value === "string" || isStringOrStringArray(value)
+  );
+}
+function IsAPublicKeySignature(data) {
+  if (!isMandatoryJSONObject(data))
+    return false;
+  if (!isOptionalString(data["@id"]))
+    return false;
+  if (data["@context"] !== void 0 && !isStringOrStringArray(data["@context"]))
+    return false;
+  if (!isOptionalStringOrOIDInfo(data["algorithm"]))
+    return false;
+  if (!isOptionalString(data["format"]))
+    return false;
+  if (!isOptionalString(data["encoding"]))
+    return false;
+  if (data["value"] !== void 0 && !isString(data["value"]))
+    return false;
+  if (data["publicKey"] !== void 0 && !isEncodedValue(data["publicKey"]))
+    return false;
+  if (data["signature"] !== void 0 && !isEncodedValue(data["signature"]))
+    return false;
+  if (!isOptionalString(data["timestamp"]))
+    return false;
+  if (!isOptionalString(data["issuer"]))
+    return false;
+  if (!isOptionalString(data["signer"]))
+    return false;
+  if (!isOptionalString(data["notBefore"]))
+    return false;
+  if (!isOptionalString(data["notAfter"]))
+    return false;
+  if (!isOptionalStringArray(data["keyUsage"]))
+    return false;
+  if (data["operations"] !== void 0 && !isMandatoryJSONObject(data["operations"]))
+    return false;
+  if (data["comment"] !== void 0 && !isMandatoryJSONObject(data["comment"]))
+    return false;
+  return data["value"] !== void 0 || data["signature"] !== void 0 || data["algorithm"] !== void 0 || data["timestamp"] !== void 0 || data["issuer"] !== void 0 || data["signer"] !== void 0 || data["keyUsage"] !== void 0;
+}
+function IsAPublicKeyXY(data) {
+  if (!IsAPublicKey(data))
+    return false;
+  if (!isString(data["x"])) {
+    return false;
+  }
+  if (!isString(data["y"])) {
+    return false;
+  }
+  return true;
+}
 var MENNEKES_EDL40_XMLNS = "http://www.mennekes.de/Mennekes.EdlVerification.xsd";
 var MENNEKES_EDL40_OBIS = "1-0:1.17.0*255";
 var Mennekes = class {
@@ -11400,15 +11547,15 @@ var Mennekes = class {
     return {
       "@id": chargingStationId,
       "description": { "en": "Mennekes EDL40 charging station" },
-      "manufacturer": "MENNEKES",
+      "manufacturer": { "name": "MENNEKES" },
       "address": chargingProcess.siteAddress,
       "EVSEs": [
         {
           "@id": evseId,
-          "meters": [
+          "energyMeters": [
             {
               "@id": meterId,
-              "manufacturer": "MENNEKES",
+              "manufacturer": { "name": "MENNEKES" },
               "signatureFormat": "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/MennekesCrypt01",
               "publicKeys": [
                 {
@@ -11486,7 +11633,7 @@ var MennekesCrypt01 = class extends ACrypt {
   }
   async VerifyChargingSession(chargingSession) {
     let sessionResult = "UnknownSessionFormat" /* UnknownSessionFormat */;
-    for (const measurement of chargingSession.measurements) {
+    for (const measurement of chargingSession.measurements ?? []) {
       measurement.chargingSession = chargingSession;
       if (measurement.values.length >= 2) {
         sessionResult = "ValidSignature" /* ValidSignature */;
@@ -11553,8 +11700,6 @@ var MennekesCrypt01 = class extends ACrypt {
       if (meter.publicKeys == null || meter.publicKeys.length === 0)
         return setResult("PublicKeyNotFound" /* PublicKeyNotFound */);
       const signatureExpected = measurementValue.signatures?.[0];
-      if (signatureExpected.r == null || signatureExpected.s == null)
-        return setResult("InvalidSignature" /* InvalidSignature */);
       const signedData = buildMennekesSignatureData(
         {
           serverId: measurement.serverId,
@@ -11576,7 +11721,7 @@ var MennekesCrypt01 = class extends ACrypt {
           secondIndex: measurementValue.secondsIndex ?? 0
         }
       );
-      cryptoResult.signedData = bytesToHex2(signedData);
+      cryptoResult.signedData = bytesToHex(signedData);
       cryptoResult.logBytes = cryptoResult.signedData.substring(78, 82);
       const signedDataBuffer = signedData.buffer.slice(
         signedData.byteOffset,
@@ -11614,7 +11759,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 != 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(" ") ?? "") : "";
+    SignatureExpectedDiv.innerHTML = result.signature != null && result.signature.r.length > 0 && 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);
   }
@@ -11676,23 +11821,6 @@ function dateToMennekesLocalEpochSeconds(isoTimestamp) {
   const offsetSeconds = sign * (Number(offsetMatch[2]) * 3600 + Number(offsetMatch[3]) * 60);
   return Math.floor(date.getTime() / 1e3) + offsetSeconds;
 }
-function cleanHex(hex) {
-  return hex.replace(/\s+/g, "");
-}
-function hexToBytes(hex) {
-  const cleanedHex = cleanHex(hex);
-  if (cleanedHex.length % 2 !== 0)
-    throw new Error("Hex strings must have even length!");
-  if (!/^[0-9a-fA-F]*$/.test(cleanedHex))
-    throw new Error("Invalid hexadecimal string!");
-  const bytes = new Uint8Array(cleanedHex.length / 2);
-  for (let index = 0; index < cleanedHex.length; index += 2)
-    bytes[index / 2] = Number.parseInt(cleanedHex.substring(index, index + 2), 16);
-  return bytes;
-}
-function bytesToHex2(bytes) {
-  return Array.from(bytes, (byte) => byte.toString(16).padStart(2, "0")).join("");
-}
 function parseChargingProcessElement(chargingProcessElement) {
   const siteAddressElement = child(chargingProcessElement, "SiteAddress");
   return {
@@ -11830,7 +11958,7 @@ var OCMFv1_x = class extends ACrypt {
   async VerifyChargingSession(chargingSession) {
     let sessionResult = "Unvalidated" /* Unvalidated */;
     {
-      for (const measurement of chargingSession.measurements) {
+      for (const measurement of chargingSession.measurements ?? []) {
         measurement.chargingSession = chargingSession;
         if (measurement.values.length > 1) {
           for (const measurementValue of measurement.values) {
@@ -11978,7 +12106,7 @@ var OCMFv1_x = class extends ACrypt {
       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 != null && 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" ? "(" + OIDInfo(measurementValue.ocmfDocument.publicKey.algorithm) + ") " : "");
     }
     {
       if (PlainTextDiv.parentElement) {
@@ -12021,9 +12149,9 @@ var OCMFv1_x = class extends ACrypt {
     }
     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 + ")";
+        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") + " (" + OIDInfo(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(" ") ?? "-");
+      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(" ") ?? "-");
     }
     const publicKeySignatureContainer = PublicKeyDiv.parentElement?.children[3];
     if (publicKeySignatureContainer !== void 0) {
@@ -12036,8 +12164,8 @@ var OCMFv1_x = class extends ACrypt {
             signatureDiv.innerHTML = await this.chargy.CheckMeterPublicKeySignature(
               measurementValue.measurement.chargingSession.chargingStation,
               measurementValue.measurement.chargingSession.EVSE,
-              measurementValue.measurement.chargingSession.EVSE?.meters.at(0),
-              measurementValue.measurement.chargingSession.EVSE?.meters.at(0)?.publicKeys?.at(0),
+              measurementValue.measurement.chargingSession.EVSE?.energyMeters?.at(0),
+              measurementValue.measurement.chargingSession.EVSE?.energyMeters?.at(0)?.publicKeys?.at(0),
               signature
             );
           } catch {
@@ -12050,7 +12178,7 @@ var OCMFv1_x = class extends ACrypt {
       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(" ") ?? "-");
+      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(" ") ?? "-");
     }
     if (measurementValue.measurement.chargingSession.verificationResult) {
       switch (measurementValue.measurement.chargingSession.verificationResult.status) {
@@ -12095,15 +12223,6 @@ var OCMF = class {
   //#region (private) tryToParseOCMFv1_0(OCMFDataList, ContainerInfos?)
   tryToParseOCMFv1_0(OCMFJSONDocuments, ContainerInfos) {
     try {
-      const containerInfos = asJSONObject(ContainerInfos) ?? {};
-      const chargingStationInfo = asJSONObject(containerInfos["chargingStation"]);
-      const evseInfo = asJSONObject(containerInfos["EVSE"]);
-      const connectorInfo = asJSONObject(containerInfos["connector"]);
-      const energyMeterInfo = asJSONObject(containerInfos["energyMeter"]);
-      const chargingStationId = asString(containerInfos["ChargingStationId"]) ?? asString(chargingStationInfo?.["@id"]) ?? "DE*GEF*STATION*CHARGY*1";
-      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 = getFirstArrayElement(OCMFJSONDocuments, "Missing first OCMF JSON document");
       const formatVersion = firstOCMDJSONDocument.payload.FV;
       const gatewayInformation = firstOCMDJSONDocument.payload.GI ?? firstOCMDJSONDocument.payload.VI;
@@ -12176,49 +12295,71 @@ var OCMF = class {
             "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": "?"
-                  }]
-                }]
-              }]
-            }]
-          }],
+          // "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" },
+          //         // "firmware": {
+          //         //     "version":              chargyLib.asString(chargingStationInfo?.["softwareVersion"])
+          //         //                                 ?? chargyLib.asString(chargingStationInfo?.["firmwareVersion"])
+          //         // },
+          //         "geoLocation":              chargyLib.asJSONObject(chargingStationInfo?.["geoLocation"]) as chargyInterfaces.IGeoLocation | undefined,
+          //         "address":                  chargyLib.asJSONObject(chargingStationInfo?.["address"])     as chargyInterfaces.IAddress     | undefined,
+          //         "EVSEs": [{
+          //             "@id":                      evseId,
+          //             "description":              evseDescription && Object.keys(evseDescription).length > 0
+          //                                             ? evseDescription
+          //                                             : { "en": "GraphDefined CHARGY Virtual EVSE 1" },
+          //             "connectors":               connectorInfo
+          //                                             ? [{
+          //                                                   "type":    chargyLib.asString(connectorInfo["type"])   ?? "",
+          //                                                   "cable": {
+          //                                                       "length":  chargyLib.asNumber(connectorInfo["length"]) ?? 0,
+          //                                                       "looses":  chargyLib.asNumber(connectorInfo["looses"]) ?? 0
+          //                                                   }
+          //                                               }]
+          //                                             : [],
+          //             "energyMeters": [{
+          //                 "@id":                          effectiveMeterSerial,
+          //                 // The signed OCMF payload values always win,
+          //                 // the container infos only fill the gaps!
+          //                 "manufacturer": {
+          //                         "name":   meterVendor   ?? chargyLib.asString(energyMeterInfo?.["manufacturer"]),
+          //                         "contact":  {
+          //                             "web":    chargyLib.asString(energyMeterInfo?.["manufacturerURL"])
+          //                         }
+          //                 },
+          //                 "model": {
+          //                     "name":                     meterModel    ?? chargyLib.asString(energyMeterInfo?.["model"]),
+          //                     "url":                                       chargyLib.asString(energyMeterInfo?.["modelURL"])
+          //                 },
+          //                 "hardware": {
+          //                     "revision":                 chargyLib.asString(energyMeterInfo?.["hardwareVersion"])
+          //                 },
+          //                 "firmware": {
+          //                     "version":                  meterFirmware ?? chargyLib.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,
+            //"EVSEId":               evseId,
             "authorizationStart": {
               "@id": identificationData ?? "?",
               "type": identificationType ?? "?",
@@ -12231,6 +12372,8 @@ var OCMF = class {
           }],
           "certainty": 1
         };
+        if (ContainerInfos?.chargingStations !== void 0)
+          CTR.chargingStations = ContainerInfos.chargingStations;
         const measurementsByKey = /* @__PURE__ */ new Map();
         for (const ocmfJSONDocument of OCMFJSONDocuments) {
           let inheritedReading = {};
@@ -12363,6 +12506,8 @@ var OCMF = class {
             }
           }
         }
+        if (ContainerInfos?.chargingStations !== void 0)
+          CTR.chargingStations = ContainerInfos.chargingStations;
         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;
@@ -12609,7 +12754,7 @@ var OCMF = class {
             x: publicKeyXY.x,
             y: publicKeyXY.y
           };
-        } else if (isIPublicKeyXY(OCMFJSONDocument.publicKey)) {
+        } else if (IsAPublicKeyXY(OCMFJSONDocument.publicKey)) {
           publicKey = curve.keyFromPublic({
             x: OCMFJSONDocument.publicKey.x,
             y: OCMFJSONDocument.publicKey.y
@@ -12719,17 +12864,17 @@ var OCMF = class {
                       // Not an OCMF standard!
                       case "ECDSA-secp384r1-SHA384":
                         hashAlgorithm = "SHA384, 384 Bits, hex";
-                        hashValue = await sha256(plaintext);
+                        hashValue = await sha384(plaintext);
                         break;
                       // Not an OCMF standard!
                       case "ECDSA-brainpool384r1-SHA384":
                         hashAlgorithm = "SHA384, 384 Bits, hex";
-                        hashValue = await sha256(plaintext);
+                        hashValue = await sha384(plaintext);
                         break;
                       // Not an OCMF standard!
                       case "ECDSA-secp521r1-SHA512":
                         hashAlgorithm = "SHA512, 512 Bits, hex";
-                        hashValue = await sha256(plaintext);
+                        hashValue = await sha512(plaintext);
                         break;
                       // ECDSA-secp256r1-SHA256
                       default:
@@ -12811,7 +12956,12 @@ var OCMF = class {
   //#endregion
   //#region TryToParseOCMFDocument (OCMFDocument,  PublicKey?, PublicKeyEncoding?, ContainerInfos?)
   async TryToParseOCMFDocument(OCMFDocument, PublicKey, PublicKeyEncoding, ContainerInfos) {
-    return this.TryToParseOCMFDocuments([OCMFDocument], PublicKey, PublicKeyEncoding, ContainerInfos);
+    return this.TryToParseOCMFDocuments(
+      [OCMFDocument],
+      PublicKey,
+      PublicKeyEncoding,
+      ContainerInfos
+    );
   }
   //#endregion
   //#region TryToParseOCMFDocuments(OCMFDocuments, PublicKey?, PublicKeyEncoding?, ContainerInfos?)
@@ -12932,13 +13082,16 @@ var OCPI = class {
         const firstSignedData = asString(asJSONObject(signed_values[0])?.["signed_data"]);
         if (firstSignedData != null && firstSignedData.length > 0) {
           const placeInfo = asJSONObject(SomeJSON["placeInfo"]);
+          const evseId = asString(placeInfo?.["evseId"]);
+          const evseIdStr = asString(evseId) ?? "";
           const geoLocation = asJSONObject(placeInfo?.["geoLocation"]);
           const address = asJSONObject(placeInfo?.["address"]);
           const geoLat = asNumber(geoLocation?.["lat"]);
           const geoLon = asNumber(geoLocation?.["lon"]);
           const containerInfos = {
-            EVSEId: asString(placeInfo?.["evseId"]),
-            chargingStation: {
+            EVSEIds: [evseId],
+            chargingStations: [{
+              "@id": evseIdStr.substring(0, evseIdStr.lastIndexOf("*")),
               geoLocation: geoLat !== void 0 && geoLon !== void 0 ? { lat: geoLat, lng: geoLon } : void 0,
               address: address ? {
                 street: asString(address["street"]),
@@ -12946,8 +13099,8 @@ var OCPI = class {
                 city: asString(address["town"]),
                 country: asString(address["country"]) ?? ""
               } : void 0
-            },
-            energyMeter: asJSONObject(SomeJSON["meterInfo"])
+            }]
+            //energyMeter:      chargyLib.asJSONObject(SomeJSON["meterInfo"])
           };
           return new OCMF(this.chargy).TryToParseOCMFDocument(
             firstSignedData,
@@ -12962,7 +13115,7 @@ var OCPI = class {
       const numberOfFormatChecks = 81;
       let secondaryErrors = 0;
       try {
-        const chargingSessionId = SomeJSON["@id"];
+        const chargingSessionId = asString(SomeJSON["@id"]);
         const chargePointInfo = asJSONObject(SomeJSON["chargePointInfo"]);
         const evseId = chargePointInfo?.["evseId"];
         const placeInfo = asJSONObject(chargePointInfo?.["placeInfo"]);
@@ -13193,7 +13346,7 @@ var OCPI = class {
                       "value": "042313b9e469612b4ca06981bfdecb226e234632b01d84b6a814f63a114b7762c34ddce2e6853395b7a0f87275f63ffe3c",
                       "signatures": [
                         {
-                          "keyId": "...",
+                          "@id": "...",
                           "algorithm": "secp192r1",
                           "format": "DER",
                           "value": "????"
@@ -13258,7 +13411,7 @@ var OCPI = class {
                         //     "de":                   "GraphDefined EVSE - CI-Tests Pool 3 / Station A / EVSE 1"
                         // },
                         //"connectors":               [  ],
-                        "meters": []
+                        "energyMeters": []
                       }
                     ]
                   }
@@ -13273,29 +13426,29 @@ var OCPI = class {
             return new Alfen(this.chargy).TryToParseALFENFormat(
               signedMeterValues.map((value) => asString(asJSONObject(value)?.["payload"]) ?? ""),
               {
-                chargingSession: {
-                  "@id": chargingSessionId
-                },
-                EVSEId: evseId,
-                chargingStation: {
-                  manufacturer: chargingStation_manufacturer,
-                  type: chargingStation_type,
-                  serialNumber: chargingStation_serialNumber,
-                  firmwareVersion: chargingStation_controllerSoftwareVersion,
-                  legalCompliance: {
-                    conformity: [{
-                      freeText: chargingStation_compliance
-                    }],
-                    calibration: [{
-                      freeText: chargingStation_calibration
-                    }]
-                  },
-                  geoLocation: { "lat": geoLocation_lat, "lng": geoLocation_lon },
-                  address: { "street": address_street, "postalCode": address_zipCode, "city": address_town, "country": address_country }
-                },
-                energyMeter: meterInfo,
-                connector: connectorInfo,
-                chargingCosts: chargingCostsInfo
+                //    chargingSessions: [{
+                //       "@id":            chargingSessionId ?? ""
+                //    }],
+                //  //  EVSEId:              evseId,
+                //    chargingStations: [{
+                //       manufacturer:     chargingStation_manufacturer,
+                //       type:             chargingStation_type,
+                //       serialNumber:     chargingStation_serialNumber,
+                //       firmwareVersion:  chargingStation_controllerSoftwareVersion,
+                //       legalCompliance:  {
+                //           conformity: [{
+                //               freeText:  chargingStation_compliance
+                //           }],
+                //           calibration: [{
+                //               freeText:  chargingStation_calibration
+                //           }]
+                //       },
+                //       geoLocation:      { "lat":    geoLocation_lat, "lng":        geoLocation_lon },
+                //       address:          { "street": address_street,  "postalCode": address_zipCode, "city": address_town, "country": address_country }
+                //   }],
+                //   energyMeter:          meterInfo,
+                //   connector:            connectorInfo,
+                //   chargingCosts:        chargingCostsInfo
               }
             );
         }
@@ -13546,7 +13699,7 @@ var PCDFCrypt01 = class extends ACrypt {
   async VerifyChargingSession(chargingSession) {
     let sessionResult = "ValidSignature" /* ValidSignature */;
     let valueCount = 0;
-    for (const measurement of chargingSession.measurements) {
+    for (const measurement of chargingSession.measurements ?? []) {
       measurement.chargingSession = chargingSession;
       for (const measurementValue of measurement.values) {
         valueCount++;
@@ -13645,10 +13798,10 @@ var PCDF = class {
         "de": "Porsche Charging Data Format Ladevorgang",
         "en": "Porsche Charging Data Format charging session"
       },
-      "contract": {
+      "contracts": [{
         "@id": data.session.idTag,
         "type": data.session.idTagType
-      },
+      }],
       "pcdf": {
         "chargingSessionCounter": data.chargingSessionCounter,
         "timeValid": data.timeValid,
@@ -13667,11 +13820,17 @@ var PCDF = class {
           "EVSEs": [{
             "@id": virtualEVSEId,
             "description": { "en": "GraphDefined CHARGY Virtual EVSE 1" },
-            "meters": [{
+            "energyMeters": [{
               "@id": meterId,
-              "manufacturer": "Porsche",
-              "model": data.dcMeterType === 0 ? "PES DCMeter EU" : "Unknown DC Meter",
-              "firmwareChecksum": data.softwareChecksum,
+              "manufacturer": {
+                "name": "Porsche"
+              },
+              "model": {
+                "name": data.dcMeterType === 0 ? "PES DCMeter EU" : "Unknown DC Meter"
+              },
+              "firmware": {
+                "checksum": data.softwareChecksum
+              },
               "signatureFormat": "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/PCDF+json",
               "publicKeys": [{
                 "algorithm": "secp256r1",
@@ -13870,60 +14029,124 @@ var SAFEXML = class _SAFEXML {
   constructor(chargy) {
     this.chargy = chargy;
   }
-  static ParseChargingStationContext(XMLDocument) {
-    const chargingStationElement = getElementsByLocalName(XMLDocument, "chargingStation").at(0);
-    if (chargingStationElement === void 0)
-      return {};
-    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") !== 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.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.at(0);
-    const connectorId = connectorElement?.getAttribute("id")?.trim();
-    const connectorType = getTrimmedTextContent(getDirectChildByLocalName(connectorElement ?? evseElement ?? chargingStationElement, "type"));
-    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": [],
-      "connector": connector
-    } : void 0;
+  static ParseContainerInfos(XMLDocument, chargy) {
+    const containerInfos = {};
+    const chargingStationElements = getElementsByLocalName(XMLDocument, "chargingStation");
+    if (chargingStationElements.length == 0)
+      return containerInfos;
+    if (chargingStationElements.length > 1) {
+      return {
+        status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+        message: chargy.GetMultilanguageText("Only one chargingStation element is allowed within the given SAFE XML container!"),
+        certainty: 0
+      };
+    }
+    if (chargingStationElements[0] === void 0) {
+      return {
+        status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+        message: chargy.GetMultilanguageText("The chargingStation element within the given SAFE XML container is invalid!"),
+        certainty: 0
+      };
+    }
+    const chargingStationElement = chargingStationElements[0];
+    const chargingStationId = chargingStationElement.getAttribute("id")?.trim();
+    if (chargingStationId === void 0 || chargingStationId.length == 0) {
+      return {
+        status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+        message: chargy.GetMultilanguageText("The chargingStation identifier within the given SAFE XML container is invalid!"),
+        certainty: 0
+      };
+    }
     const chargingStation = {
-      "@id": chargingStationId ?? "",
-      "description": parseDescription(chargingStationElement),
-      "firmwareVersion": softwareVersion,
-      "softwareVersion": softwareVersion,
-      "geoLocation": geoLocation,
-      "EVSE": parsedEVSE
-    };
-    return {
-      "ChargingStationId": chargingStationId,
-      "EVSEId": parsedEVSE?.["@id"],
-      "chargingStation": chargingStation,
-      "EVSE": parsedEVSE,
-      "connector": parsedEVSE?.connector
+      "@id": chargingStationId
     };
+    containerInfos.chargingStations = [chargingStation];
+    const description = parseDescription(chargingStationElement);
+    if (description !== void 0)
+      chargingStation.description = description;
+    const firmware = getDirectChildByLocalName(chargingStationElement, "firmware");
+    if (firmware !== void 0) {
+      chargingStation.firmware = {};
+      const firmwareVersion = getTrimmedTextContent(getDirectChildByLocalName(firmware, "version"));
+      if (firmwareVersion !== void 0)
+        chargingStation.firmware.version = firmwareVersion;
+      const firmwareChecksum = getTrimmedTextContent(getDirectChildByLocalName(firmware, "checksum"));
+      if (firmwareChecksum !== void 0)
+        chargingStation.firmware.checksum = firmwareChecksum;
+      if (Object.keys(chargingStation.firmware).length === 0)
+        delete chargingStation.firmware;
+    }
+    const geoLocationElement = getDirectChildByLocalName(chargingStationElement, "geoLocation");
+    if (geoLocationElement !== void 0) {
+      const latitude = Number.parseFloat(getTrimmedTextContent(getDirectChildByLocalName(geoLocationElement, "latitude")) ?? "");
+      const longitude = Number.parseFloat(getTrimmedTextContent(getDirectChildByLocalName(geoLocationElement, "longitude")) ?? "");
+      const geoLocation = Number.isFinite(latitude) && Number.isFinite(longitude) ? { lat: latitude, lng: longitude } : void 0;
+      if (geoLocation !== void 0)
+        chargingStation.geoLocation = geoLocation;
+    }
+    const evseElements = getElementsByLocalName(chargingStationElement, "EVSE");
+    if (evseElements.length > 1) {
+      return {
+        status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+        message: chargy.GetMultilanguageText("Only one EVSE element is allowed within the given SAFE XML chargingStation element!"),
+        certainty: 0
+      };
+    }
+    if (evseElements[0] === void 0) {
+      return {
+        status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+        message: chargy.GetMultilanguageText("The EVSE element within the given SAFE XML chargingStation element is invalid!"),
+        certainty: 0
+      };
+    }
+    const evseElement = evseElements[0];
+    const evseId = evseElement.getAttribute("id")?.trim();
+    if (evseId !== void 0 && evseId.length > 0) {
+      const evse = {
+        "@id": evseId
+      };
+      chargingStation.EVSEs = [evse];
+      const evseDescription = parseDescription(evseElement);
+      if (evseDescription !== void 0)
+        evse.description = evseDescription;
+      const connectorElements = getElementsByLocalName(evseElement, "connector");
+      if (connectorElements.length > 1) {
+        return {
+          status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+          message: chargy.GetMultilanguageText("Only one connector element is allowed within the given SAFE XML EVSE element!"),
+          certainty: 0
+        };
+      }
+      if (connectorElements[0] === void 0) {
+        return {
+          status: "InvalidSessionFormat" /* InvalidSessionFormat */,
+          message: chargy.GetMultilanguageText("The connector element within the given SAFE XML EVSE element is invalid!"),
+          certainty: 0
+        };
+      }
+      const connectorElement = connectorElements[0];
+      const connector = {};
+      const connectorId = connectorElement.getAttribute("id")?.trim();
+      if (connectorId != null && connectorId.length > 0)
+        connector["@id"] = connectorId;
+      const connectorType = getTrimmedTextContent(getDirectChildByLocalName(connectorElement, "type"));
+      if (connectorType !== void 0 && connectorType.length > 0)
+        connector.type = connectorType;
+      if (Object.keys(connector).length > 0)
+        evse.connectors = [connector];
+    }
+    return containerInfos;
   }
   //#region tryToParseSAFEXML(XMLDocument)
   async tryToParseSAFEXML(XMLDocument) {
     try {
       if (XMLDocument.documentElement.nodeName === "values" || XMLDocument.documentElement.localName === "values") {
-        const safeXMLContext = _SAFEXML.ParseChargingStationContext(XMLDocument);
+        const safeXMLContext = _SAFEXML.ParseContainerInfos(
+          XMLDocument,
+          this.chargy
+        );
+        if (isISessionCryptoResult1(safeXMLContext))
+          return safeXMLContext;
         const signedDataValues = new Array();
         let commonSignedDataFormat = "";
         let commonSignedDataEncoding = "";
@@ -14319,10 +14542,10 @@ var ChargeIT = class {
     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();
-    CTR.contract = {
+    CTR.contracts = [{
       "@id": firstMeterValue["contract"]["id"],
       "@context": firstMeterValue["contract"]["type"]
-    };
+    }];
     CTR.chargingStationOperators = [{
       "@id": "chargeITmobilityCSO",
       "description": { "de": "chargeIT mobility GmbH - Charging Station Operator Services" },
@@ -14380,7 +14603,9 @@ var ChargeIT = class {
           // "description": {
           //     "de":                   "GraphDefined Charging Station - CI-Tests Pool 3 / Station A"
           // },
-          "firmwareVersion": firstMeterValue["chargePoint"]["softwareVersion"],
+          "firmware": {
+            "version": firstMeterValue["chargePoint"]["softwareVersion"]
+          },
           "geoLocation": { "lat": asNumber(geoLocation["lat"]) ?? 0, "lng": asNumber(geoLocation["lon"]) ?? 0 },
           "address": {
             "street": asString(address["street"]),
@@ -14395,22 +14620,32 @@ var ChargeIT = class {
               //     "de":                   "GraphDefined EVSE - CI-Tests Pool 3 / Station A / EVSE 1"
               // },
               // "connectors": [{ }],
-              "meters": [
+              "energyMeters": [
                 {
                   "@id": firstMeterValue["meterInfo"]["meterId"],
-                  "manufacturer": firstMeterValue["meterInfo"]["manufacturer"],
-                  "manufacturerURL": "https://www.emh-metering.de",
-                  "model": firstMeterValue["meterInfo"]["type"],
-                  "hardwareVersion": "1.0",
-                  "firmwareVersion": firstMeterValue["meterInfo"]["firmwareVersion"],
+                  "manufacturer": {
+                    "name": firstMeterValue["meterInfo"]["manufacturer"],
+                    "contact": {
+                      "web": "https://www.emh-metering.de"
+                    }
+                  },
+                  "model": {
+                    "name": firstMeterValue["meterInfo"]["type"]
+                  },
+                  "hardware": {
+                    "revision": "1.0"
+                  },
+                  "firmware": {
+                    "version": firstMeterValue["meterInfo"]["firmwareVersion"]
+                  },
                   "signatureFormat": "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/EMHCrypt01",
                   "publicKeys": [
                     {
                       "algorithm": "secp192r1",
                       "format": "DER",
                       "encoding": "hex",
-                      "value": firstMeterValue["meterInfo"]["publicKey"].startsWith("04") ? firstMeterValue["meterInfo"]["publicKey"] : "04" + firstMeterValue["meterInfo"]["publicKey"],
-                      "signatures": firstMeterValue["meterInfo"]["publicKeySignatures"]
+                      "value": firstMeterValue["meterInfo"]["publicKey"].startsWith("04") ? firstMeterValue["meterInfo"]["publicKey"] : "04" + firstMeterValue["meterInfo"]["publicKey"]
+                      //"signatures":       firstMeterValue["meterInfo"]["publicKeySignatures"]
                     }
                   ]
                 }
@@ -14719,10 +14954,10 @@ var ChargeIT = class {
                         "value": "042313b9e469612b4ca06981bfdecb226e234632b01d84b6a814f63a114b7762c34ddce2e6853395b7a0f87275f63ffe3c",
                         "signatures": [
                           {
-                            "keyId": "...",
+                            "@id": "...",
                             "algorithm": "secp192r1",
                             "format": "DER",
-                            "value": "????"
+                            "value": "..."
                           }
                         ]
                       },
@@ -14781,7 +15016,7 @@ var ChargeIT = class {
                           //     "de":                   "GraphDefined EVSE - CI-Tests Pool 3 / Station A / EVSE 1"
                           // },
                           //"connectors":               [  ],
-                          "meters": []
+                          "energyMeters": []
                         }
                       ]
                     }
@@ -14803,11 +15038,15 @@ var ChargeIT = class {
               return new Alfen(this.chargy).TryToParseALFENFormat(
                 signedMeterValues.map((value) => asString(asJSONObject(value)?.["payload"]) ?? ""),
                 {
-                  EVSEId: evseId,
-                  chargingStation: {
+                  chargingStations: [{
+                    "@id": "?",
                     geoLocation: { "lat": geoLocation_lat, "lng": geoLocation_lon },
-                    address: { "street": address_street, "postalCode": address_zipCode, "city": address_town, "country": address_country }
-                  }
+                    address: { "street": address_street, "postalCode": address_zipCode, "city": address_town, "country": address_country },
+                    EVSEs: [{
+                      "@id": evseId,
+                      energyMeters: []
+                    }]
+                  }]
                 }
               );
             }
@@ -14815,11 +15054,15 @@ var ChargeIT = class {
               return new Alfen(this.chargy).TryToParseALFENFormat(
                 signedMeterValues.map((value) => asString(asJSONObject(value)?.["payload"]) ?? ""),
                 {
-                  EVSEId: evseId,
-                  chargingStation: {
+                  chargingStations: [{
+                    "@id": "?",
                     geoLocation: { "lat": geoLocation_lat, "lng": geoLocation_lon },
-                    address: { "street": address_street, "postalCode": address_zipCode, "city": address_town, "country": address_country }
-                  }
+                    address: { "street": address_street, "postalCode": address_zipCode, "city": address_town, "country": address_country },
+                    EVSEs: [{
+                      "@id": evseId,
+                      energyMeters: []
+                    }]
+                  }]
                 }
               );
             if (signedMeterValueContext === oldChargeITMeterValueFormat)
@@ -14894,7 +15137,6 @@ var ChargeIT = class {
         const connectorInfo_type = connectorInfo?.["type"];
         const connectorInfo_losses = connectorInfo?.["losses"];
         const chargingTariffs = SomeJSON["chargingTariffs"];
-        const chargingPeriods = SomeJSON["chargingPeriods"];
         const totalCosts = asJSONObject(SomeJSON["totalCosts"]);
         const totalCosts_total = totalCosts?.["total"];
         const totalCosts_currency = totalCosts?.["currency"];
@@ -15087,10 +15329,10 @@ var ChargeIT = class {
                       "value": "042313b9e469612b4ca06981bfdecb226e234632b01d84b6a814f63a114b7762c34ddce2e6853395b7a0f87275f63ffe3c",
                       "signatures": [
                         {
-                          "keyId": "...",
+                          "@id": "...",
                           "algorithm": "secp192r1",
                           "format": "DER",
-                          "value": "????"
+                          "value": "..."
                         }
                       ]
                     },
@@ -15152,7 +15394,7 @@ var ChargeIT = class {
                         //     "de":                   "GraphDefined EVSE - CI-Tests Pool 3 / Station A / EVSE 1"
                         // },
                         //"connectors":               [  ],
-                        "meters": []
+                        "energyMeters": []
                       }
                     ]
                   }
@@ -15169,31 +15411,31 @@ var ChargeIT = class {
             return new Alfen(this.chargy).TryToParseALFENFormat(
               signedMeterValues.map((value) => asString(asJSONObject(value)?.["payload"]) ?? ""),
               {
-                chargingSession: {
-                  "@id": chargingSessionId
-                },
-                EVSEId: evseId,
-                chargingStation: {
-                  manufacturer: chargingStation_manufacturer,
-                  type: chargingStation_type,
-                  serialNumber: chargingStation_serialNumber,
-                  firmwareVersion: chargingStation_controllerSoftwareVersion,
-                  legalCompliance: {
-                    conformity: [{
-                      freeText: chargingStation_compliance
-                    }],
-                    calibration: [{
-                      freeText: chargingStation_calibration
-                    }]
-                  },
-                  geoLocation: { "lat": geoLocation_lat, "lng": geoLocation_lon },
-                  address: { "street": address_street, "postalCode": address_zipCode, "city": address_town, "country": address_country }
-                },
-                energyMeter: meterInfo,
-                connector: connectorInfo,
-                chargingTariffs,
-                chargingPeriods,
-                totalCosts
+                //  chargingSession: {
+                //     "@id":            chargingSessionId
+                //  },
+                //  EVSEId:              evseId,
+                //  chargingStation: {
+                //     manufacturer:     chargingStation_manufacturer,
+                //     type:             chargingStation_type,
+                //     serialNumber:     chargingStation_serialNumber,
+                //     firmwareVersion:  chargingStation_controllerSoftwareVersion,
+                //     legalCompliance:  {
+                //         conformity: [{
+                //             freeText:  chargingStation_compliance
+                //         }],
+                //         calibration: [{
+                //             freeText:  chargingStation_calibration
+                //         }]
+                //     },
+                //     geoLocation:      { "lat":    geoLocation_lat, "lng":        geoLocation_lon },
+                //     address:          { "street": address_street,  "postalCode": address_zipCode, "city": address_town, "country": address_country }
+                //  },
+                // energyMeter:          meterInfo,
+                // connector:            connectorInfo,
+                // chargingTariffs:      chargingTariffs,
+                // chargingPeriods:      chargingPeriods,
+                // totalCosts:           totalCosts
               }
             );
         }
@@ -15325,12 +15567,18 @@ var ChargePoint = class {
               "address": asJSONObject(SomeJSON["address"]),
               "EVSEs": [{
                 "@id": evseId,
-                "meters": [{
+                "energyMeters": [{
                   "@id": meterSerial,
-                  "manufacturer": "Carlo Gavazzi",
-                  "manufacturerURL": "https://www.gavazziautomation.com",
-                  "model": "EM340-DIN.AV2.3.X.S1.X",
-                  "modelURL": "https://www.gavazziautomation.com/fileadmin/images/PIM/DATASHEET/ENG/EM340_DS_ENG.pdf"
+                  "manufacturer": {
+                    "name": "Carlo Gavazzi",
+                    "contact": {
+                      "web": "https://www.gavazziautomation.com"
+                    }
+                  },
+                  "model": {
+                    "name": "EM340-DIN.AV2.3.X.S1.X",
+                    "url": "https://www.gavazziautomation.com/fileadmin/images/PIM/DATASHEET/ENG/EM340_DS_ENG.pdf"
+                  }
                   // "signatureFormat":          "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/EMHCrypt01",
                   // "publicKeys": [
                   //     {
@@ -15485,12 +15733,18 @@ var ChargePoint = class {
               "address": asJSONObject(SomeJSON["address"]),
               "EVSEs": [{
                 "@id": evseId,
-                "meters": [{
+                "energyMeters": [{
                   "@id": meterSerial,
-                  "manufacturer": "Carlo Gavazzi",
-                  "manufacturerURL": "https://www.gavazziautomation.com",
-                  "model": "EM340-DIN.AV2.3.X.S1.X",
-                  "modelURL": "https://www.gavazziautomation.com/fileadmin/images/PIM/DATASHEET/ENG/EM340_DS_ENG.pdf",
+                  "manufacturer": {
+                    "name": "Carlo Gavazzi",
+                    "contact": {
+                      "web": "https://www.gavazziautomation.com"
+                    }
+                  },
+                  "model": {
+                    "name": "EM340-DIN.AV2.3.X.S1.X",
+                    "url": "https://www.gavazziautomation.com/fileadmin/images/PIM/DATASHEET/ENG/EM340_DS_ENG.pdf"
+                  },
                   "signatureFormat": "https://open.charging.cloud/contexts/EnergyMeterSignatureFormats/EMHCrypt01",
                   "signatureInfos": {
                     "hash": "SHA256",
@@ -15502,7 +15756,8 @@ var ChargePoint = class {
                   "publicKeys": [{
                     "algorithm": "secp224k1",
                     "format": "DER",
-                    "encoding": "hex"
+                    "encoding": "hex",
+                    "value": "..."
                   }]
                 }]
               }]
@@ -15604,7 +15859,7 @@ var ChargePointCrypt01 = class extends ACrypt {
           s: ASN1Signature.s.toString(16)
         };
       }
-      const publicKeyId = chargingSession.EVSEId.replace(/:/g, "").replace(/-/g, "_");
+      const publicKeyId = chargingSession.EVSEId?.replace(/:/g, "").replace(/-/g, "_");
       const publicKeys = [];
       if (chargingSession.ctr.publicKeys != null) {
         for (const publicKeyInfo of chargingSession.ctr.publicKeys) {
@@ -15635,8 +15890,8 @@ var ChargePointCrypt01 = class extends ACrypt {
               sha225Value = sha225Value ?? (BigInt("0x" + await sha256(plainText)) >> BigInt(31)).toString(16);
               sessionResult = this.curve224k1.validate(
                 BigInt("0x" + sha225Value),
-                BigInt("0x" + (chargingSession.signature.r ?? "00")),
-                BigInt("0x" + (chargingSession.signature.s ?? "00")),
+                BigInt("0x" + chargingSession.signature.r),
+                BigInt("0x" + chargingSession.signature.s),
                 [
                   BigInt("0x" + publicKey.value.slice(2, 58)),
                   BigInt("0x" + publicKey.value.slice(58, 114))
@@ -15684,7 +15939,7 @@ var ChargePointCrypt01 = class extends ACrypt {
           }
         }
       }
-      for (const measurement of chargingSession.measurements) {
+      for (const measurement of chargingSession.measurements ?? []) {
         measurement.chargingSession = chargingSession;
         if (measurement.values.length > 1) {
           for (const measurementValue of measurement.values) {
@@ -15827,8 +16082,8 @@ var ChargePointCrypt01 = class extends ACrypt {
               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?.energyMeters?.[0],
+                measurementValue.measurement.chargingSession.EVSE?.energyMeters?.[0]?.publicKeys?.[0],
                 signature
               );
           } catch {
@@ -15841,7 +16096,7 @@ var ChargePointCrypt01 = class extends ACrypt {
         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(" ") ?? "");
+        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(" ") ?? "");
       else if (chargingSession.signature)
         SignatureExpectedDiv.innerHTML = chargingSession.signature.toLowerCase().match(/.{1,8}/g)?.join(" ") ?? "-";
     }
@@ -15879,7 +16134,8 @@ var IChargeTransparencyRecord_exports = {};
 __export(IChargeTransparencyRecord_exports, {
   CloneCTR: () => CloneCTR,
   IsAChargeTransparencyRecord: () => IsAChargeTransparencyRecord,
-  IsASessionCryptoResult: () => IsASessionCryptoResult
+  IsASessionCryptoResult: () => IsASessionCryptoResult,
+  toSessionVerificationResults: () => toSessionVerificationResults
 });
 function IsAChargeTransparencyRecord(data) {
   if (!isMandatoryJSONObject(data))
@@ -15897,7 +16153,7 @@ function CloneCTR(CTR) {
   const clonedCTR = JSON.parse(JSON.stringify(CTR));
   if (clonedCTR.chargingSessions) {
     for (const session of clonedCTR.chargingSessions) {
-      for (const measurement of session.measurements) {
+      for (const measurement of session.measurements ?? []) {
         for (const value of measurement.values) {
           if (typeof value.value === "string" || typeof value.value === "number")
             value.value = new Decimal(value.value);
@@ -15907,6 +16163,16 @@ function CloneCTR(CTR) {
   }
   return clonedCTR;
 }
+function toSessionVerificationResults(CTR, noRecordsMessage = { "en": "No charge transparency records found!" }) {
+  const verificationResults = (CTR.chargingSessions ?? []).map((session) => session.verificationResult).filter(isISessionCryptoResult1);
+  if (verificationResults.length > 0)
+    return verificationResults;
+  return {
+    status: "Unvalidated" /* Unvalidated */,
+    message: noRecordsMessage,
+    certainty: 0
+  };
+}
 
 // src/interfaces/IChargeTransparencyLiveLink.ts
 var IChargeTransparencyLiveLink_exports = {};
@@ -15937,43 +16203,11 @@ function isTransport(data) {
 function IsAChargeTransparencyLiveLink(data) {
   if (!isMandatoryJSONObject(data))
     return false;
-  return data["@context"] === ChargeTransparencyLiveLinkContext && (data["timestamp"] === void 0 || data["timestamp"] === null || typeof data["timestamp"] === "string") && (data["description"] === void 0 || isMultilanguageText(data["description"])) && (data["imageURLs"] === void 0 || Array.isArray(data["imageURLs"]) && data["imageURLs"].every((value) => typeof value === "string")) && (data["geoLocation"] === void 0 || isGeoLocation(data["geoLocation"])) && (data["connector"] === void 0 || isConnector(data["connector"])) && (data["transports"] === void 0 || Array.isArray(data["transports"]) && data["transports"].every(isTransport)) && (data["signatures"] === void 0 || Array.isArray(data["signatures"]));
+  return data["@context"] === ChargeTransparencyLiveLinkContext && (data["timestamp"] === void 0 || data["timestamp"] === null || typeof data["timestamp"] === "string") && (data["description"] === void 0 || isI18NString(data["description"])) && (data["imageURLs"] === void 0 || Array.isArray(data["imageURLs"]) && data["imageURLs"].every((value) => typeof value === "string")) && (data["geoLocation"] === void 0 || isGeoLocation(data["geoLocation"])) && (data["connector"] === void 0 || isConnector(data["connector"])) && (data["transports"] === void 0 || Array.isArray(data["transports"]) && data["transports"].every(isTransport)) && (data["signatures"] === void 0 || Array.isArray(data["signatures"]));
 }
 function isTOTPConfig(data) {
   return isObject(data) && typeof data["initialSharedSecret"] === "string" && typeof data["timeStep"] === "number";
 }
-
-// src/interfaces/IPublicKeyInfo.ts
-var IPublicKeyInfo_exports = {};
-__export(IPublicKeyInfo_exports, {
-  IsAPublicKeyInfo: () => IsAPublicKeyInfo,
-  IsAPublicKeyLookup: () => IsAPublicKeyLookup
-});
-function IsAPublicKeyLookup(data) {
-  if (!isMandatoryJSONObject(data))
-    return false;
-  return Array.isArray(data["publicKeys"]);
-}
-function IsAPublicKeyInfo(data) {
-  if (!isMandatoryJSONObject(data))
-    return false;
-  if (!isStringOrStringArray(data["@context"])) return false;
-  if (!isString(data["value"])) return false;
-  if (!isStringOrOIDInfo(data["algorithm"])) return false;
-  if (data["certainty"] !== void 0 && (typeof data["certainty"] !== "number" || !Number.isFinite(data["certainty"]))) {
-    return false;
-  }
-  if (data["type"] !== void 0 && !isStringOrOIDInfo(data["type"])) {
-    return false;
-  }
-  if (data["encoding"] !== void 0 && typeof data["encoding"] !== "string") {
-    return false;
-  }
-  if (data["signatures"] !== void 0 && !Array.isArray(data["signatures"])) {
-    return false;
-  }
-  return true;
-}
 function isRecord(value) {
   return typeof value === "object" && value !== null;
 }
@@ -16468,13 +16702,10 @@ var Chargy = class {
     }
     return this.CompleteMultilanguageText(parameterizedText, Text.replace("%p", String(Parameter)));
   }
-  getLocalizedText(data) {
+  GetLocalizedText(data) {
     if (data == null)
       return void 0;
-    const bestLanguage = this.FindBestMultilanguageText(data);
-    if (bestLanguage == null)
-      return void 0;
-    return data[bestLanguage];
+    return this.FindBestMultilanguageText(data);
   }
   //#endregion
   //#region GetDevices...
@@ -16526,11 +16757,13 @@ var Chargy = class {
           "@id": evse["@id"],
           "description": evse.description,
           "sockets": evseView["sockets"],
-          "meter": {
+          "energyMeter": {
             "@id": meter["@id"],
             "vendor": meterView["vendor"],
             "model": meter.model,
-            "firmwareVersion": meter.firmwareVersion,
+            "firmware": {
+              "version": meter.firmware?.version
+            },
             "signatureFormat": meter.signatureFormat,
             "publicKey": {
               "algorithm": publicKey.algorithm,
@@ -16848,11 +17081,12 @@ var Chargy = class {
   //#endregion
   //#region DetectAndConvertContentFormat(FileInfos)
   async DetectAndConvertContentFormat(FileInfos) {
-    if (FileInfos.length == 0) return {
-      status: "NoChargeTransparencyRecordsFound" /* NoChargeTransparencyRecordsFound */,
-      message: this.GetMultilanguageText("No charge transparency records found!"),
-      certainty: 0
-    };
+    if (FileInfos.length == 0)
+      return {
+        status: "NoChargeTransparencyRecordsFound" /* NoChargeTransparencyRecordsFound */,
+        message: this.GetMultilanguageText("No charge transparency records found!"),
+        certainty: 0
+      };
     let expandedFiles = new Array();
     const processedFiles = new Array();
     if (FileInfos.length > 0) {
@@ -17025,42 +17259,40 @@ var Chargy = class {
       } else if (textContent.startsWith("{") && textContent.endsWith("}")) {
         try {
           const JSONContent = JSON.parse(textContent);
-          if (typeof JSONContent !== "object" || JSONContent === null)
-            throw new Error("Parsed JSON content is not an object or array!");
-          if (isMandatoryJSONObject(JSONContent)) {
-            const JSONContext = JSONContent["@context"];
-            if (IsAChargeTransparencyLiveLink(JSONContent)) {
-              JSONContent.timestamp ??= (/* @__PURE__ */ new Date()).toISOString();
+          if (JSONContent === null || typeof JSONContent !== "object" || !isMandatoryJSONObject(JSONContent))
+            throw new Error("Parsed JSON content is not a JSON object!");
+          const JSONContext = JSONContent["@context"];
+          if (IsAChargeTransparencyLiveLink(JSONContent)) {
+            JSONContent.timestamp ??= (/* @__PURE__ */ new Date()).toISOString();
+            processedFile.result = JSONContent;
+          } else if (isMandatoryString(JSONContext)) {
+            if (JSONContext.startsWith("https://open.charging.cloud/contexts/CTR+json"))
               processedFile.result = JSONContent;
-            } else if (isMandatoryString(JSONContext)) {
-              if (JSONContext.startsWith("https://open.charging.cloud/contexts/CTR+json"))
-                processedFile.result = JSONContent;
-              else if (JSONContext.startsWith("https://open.charging.cloud/contexts/publicKey+json"))
-                processedFile.result = JSONContent;
-              else if (JSONContext.startsWith("https://www.lichtblick.de/contexts/charging-station-json") || JSONContext.startsWith("https://www.eneco.com/contexts/charging-station-json") || JSONContext.startsWith("https://www.chargeit-mobility.com/contexts/charging-station-json")) {
-                processedFile.result = new ChargeIT(this).TryToParseChargeITContainerFormat(JSONContent);
-              }
-            } else {
-              const results = [
-                new ChargeIT(this).TryToParseChargeITContainerFormat(JSONContent),
-                new ChargePoint(this).TryToParseChargepointFormat(JSONContent),
-                await new OCPI(this).tryToParseOCPIFormat(JSONContent)
-              ];
-              const filteredResults = results.filter((ctr) => {
-                return isISessionCryptoResult1(ctr);
-              });
-              const sortedResults = filteredResults.sort((ctr1, ctr2) => {
-                if (ctr1.certainty > ctr2.certainty) {
-                  return -1;
-                }
-                if (ctr1.certainty < ctr2.certainty) {
-                  return 1;
-                }
-                return 0;
-              });
-              if (sortedResults.length >= 1 && sortedResults[0])
-                processedFile.result = sortedResults[0];
+            else if (JSONContext.startsWith("https://open.charging.cloud/contexts/publicKey+json"))
+              processedFile.result = JSONContent;
+            else if (JSONContext.startsWith("https://www.lichtblick.de/contexts/charging-station-json") || JSONContext.startsWith("https://www.eneco.com/contexts/charging-station-json") || JSONContext.startsWith("https://www.chargeit-mobility.com/contexts/charging-station-json")) {
+              processedFile.result = new ChargeIT(this).TryToParseChargeITContainerFormat(JSONContent);
             }
+          } else {
+            const results = [
+              new ChargeIT(this).TryToParseChargeITContainerFormat(JSONContent),
+              new ChargePoint(this).TryToParseChargepointFormat(JSONContent),
+              await new OCPI(this).tryToParseOCPIFormat(JSONContent)
+            ];
+            const filteredResults = results.filter((ctr) => {
+              return isISessionCryptoResult1(ctr);
+            });
+            const sortedResults = filteredResults.sort((ctr1, ctr2) => {
+              if (ctr1.certainty > ctr2.certainty) {
+                return -1;
+              }
+              if (ctr1.certainty < ctr2.certainty) {
+                return 1;
+              }
+              return 0;
+            });
+            if (sortedResults.length >= 1 && sortedResults[0])
+              processedFile.result = sortedResults[0];
           }
         } catch (exception) {
           processedFile.result = {
@@ -17104,7 +17336,7 @@ var Chargy = class {
           if (processedFileResult.end != null && processedFileResult.end.length > 0 && (mergedCTR.end == null || mergedCTR.end.length === 0 || mergedCTR.end < processedFileResult.end))
             mergedCTR.end = processedFileResult.end;
           mergedCTR.description ??= processedFileResult.description;
-          mergedCTR.contract ??= processedFileResult.contract;
+          mergedCTR.contracts ??= processedFileResult.contracts;
           if (!mergedCTR.chargingStationOperators)
             mergedCTR.chargingStationOperators = processedFileResult.chargingStationOperators;
           else if (processedFileResult.chargingStationOperators)
@@ -17135,7 +17367,7 @@ var Chargy = class {
           else if (processedFileResult.mediationServices)
             for (const mediationService of processedFileResult.mediationServices)
               mergedCTR.mediationServices.push(mediationService);
-        } else if (IsAPublicKeyInfo(processedFileResult)) {
+        } else if (IsAPublicKey(processedFileResult)) {
           mergedCTR.publicKeys ??= new Array();
           mergedCTR.publicKeys.push(processedFileResult);
         } else if (IsAPublicKeyLookup(processedFileResult)) {
@@ -17183,11 +17415,11 @@ var Chargy = class {
               if (chargingPool.chargingStations) {
                 for (const chargingStation of chargingPool.chargingStations) {
                   this.chargingStations.push(chargingStation);
-                  for (const EVSE of chargingStation.EVSEs) {
+                  for (const EVSE of chargingStation.EVSEs ?? []) {
                     EVSE.chargingStation = chargingStation;
                     EVSE.chargingStationId = chargingStation["@id"];
                     this.EVSEs.push(EVSE);
-                    for (const meter of EVSE.meters) {
+                    for (const meter of EVSE.energyMeters ?? []) {
                       meter.EVSE = EVSE;
                       meter.EVSEId = EVSE["@id"];
                       meter.chargingStation = chargingStation;
@@ -17202,11 +17434,11 @@ var Chargy = class {
           if (chargingStationOperator.chargingStations) {
             for (const chargingStation of chargingStationOperator.chargingStations) {
               this.chargingStations.push(chargingStation);
-              for (const EVSE of chargingStation.EVSEs) {
+              for (const EVSE of chargingStation.EVSEs ?? []) {
                 EVSE.chargingStation = chargingStation;
                 EVSE.chargingStationId = chargingStation["@id"];
                 this.EVSEs.push(EVSE);
-                for (const meter of EVSE.meters) {
+                for (const meter of EVSE.energyMeters ?? []) {
                   meter.EVSE = EVSE;
                   meter.EVSEId = EVSE["@id"];
                   meter.chargingStation = chargingStation;
@@ -17219,7 +17451,7 @@ var Chargy = class {
           if (chargingStationOperator.EVSEs) {
             for (const EVSE of chargingStationOperator.EVSEs) {
               this.EVSEs.push(EVSE);
-              for (const meter of EVSE.meters) {
+              for (const meter of EVSE.energyMeters ?? []) {
                 meter.EVSE = EVSE;
                 meter.EVSEId = EVSE["@id"];
                 this.meters.push(meter);
@@ -17234,11 +17466,11 @@ var Chargy = class {
           if (chargingPool.chargingStations) {
             for (const chargingStation of chargingPool.chargingStations) {
               this.chargingStations.push(chargingStation);
-              for (const EVSE of chargingStation.EVSEs) {
+              for (const EVSE of chargingStation.EVSEs ?? []) {
                 EVSE.chargingStation = chargingStation;
                 EVSE.chargingStationId = chargingStation["@id"];
                 this.EVSEs.push(EVSE);
-                for (const meter of EVSE.meters) {
+                for (const meter of EVSE.energyMeters ?? []) {
                   meter.EVSE = EVSE;
                   meter.EVSEId = EVSE["@id"];
                   meter.chargingStation = chargingStation;
@@ -17253,11 +17485,11 @@ var Chargy = class {
       if (this.internalCTR.chargingStations) {
         for (const chargingStation of this.internalCTR.chargingStations) {
           this.chargingStations.push(chargingStation);
-          for (const EVSE of chargingStation.EVSEs) {
+          for (const EVSE of chargingStation.EVSEs ?? []) {
             EVSE.chargingStation = chargingStation;
             EVSE.chargingStationId = chargingStation["@id"];
             this.EVSEs.push(EVSE);
-            for (const meter of EVSE.meters) {
+            for (const meter of EVSE.energyMeters ?? []) {
               meter.EVSE = EVSE;
               meter.EVSEId = EVSE["@id"];
               meter.chargingStation = chargingStation;
@@ -17265,8 +17497,8 @@ var Chargy = class {
               this.meters.push(meter);
             }
           }
-          if (chargingStation.meters) {
-            for (const meter of chargingStation.meters) {
+          if (chargingStation.energyMeters) {
+            for (const meter of chargingStation.energyMeters ?? []) {
               meter.chargingStation = chargingStation;
               meter.chargingStationId = chargingStation["@id"];
               this.meters.push(meter);
@@ -17293,7 +17525,7 @@ var Chargy = class {
   //#endregion
   //#region (private) hasInplausibleChargingSessionTotalEnergyMeasurement(chargingSession)
   hasInplausibleChargingSessionTotalEnergyMeasurement(chargingSession) {
-    for (const measurement of chargingSession.measurements) {
+    for (const measurement of chargingSession.measurements ?? []) {
       if (measurement.name !== "ENERGY_TOTAL" || measurement.values.length < 2) {
         continue;
       }
@@ -17453,7 +17685,7 @@ var Chargy = class {
       if (ctr.end != null && ctr.end.length > 0 && (mergedCTR.end == null || mergedCTR.end.length === 0 || mergedCTR.end < ctr.end))
         mergedCTR.end = ctr.end;
       mergedCTR.description ??= ctr.description;
-      mergedCTR.contract ??= ctr.contract;
+      mergedCTR.contracts ??= ctr.contracts;
       if (!mergedCTR.chargingStationOperators)
         mergedCTR.chargingStationOperators = ctr.chargingStationOperators;
       else if (ctr.chargingStationOperators)
@@ -17489,18 +17721,6 @@ var Chargy = class {
   }
 };
 
-// src/verificationResults.ts
-function toSessionVerificationResults(CTR, noRecordsMessage = { "en": "No charge transparency records found!" }) {
-  const verificationResults = (CTR.chargingSessions ?? []).map((session) => session.verificationResult).filter(isISessionCryptoResult1);
-  if (verificationResults.length > 0)
-    return verificationResults;
-  return {
-    status: "Unvalidated" /* Unvalidated */,
-    message: noRecordsMessage,
-    certainty: 0
-  };
-}
-
-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 };
+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, IsAPublicKey, IsAPublicKeyLookup, IsAPublicKeySignature, IsAPublicKeyXY, IsASessionCryptoResult, IsNullOrEmpty, JSONSignatureVerificationStatus, MENNEKES_EDL40_OBIS, MENNEKES_EDL40_XMLNS, Mennekes, MennekesCrypt01, OBIS2Hex, OBIS2MeasurementName, OBIS_RegExpr, OCMF, OCMFTransactionTypes, OCMFv1_x, OCPI, OIDInfo, 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, base64ToBytes, buf2hex, buildMennekesSignatureData, bytesToBase64, 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, isEncodedValue, isGeoLocation, isI18NString, isICryptoResult, isIFileInfo, isISessionCryptoResult1, isISessionCryptoResult2, isJSONLDObject, isMandatoryArrayOfStrings, isMandatoryBoolean, isMandatoryDecimal, isMandatoryJSONArray, isMandatoryJSONObject, isMandatoryNumber, isMandatoryString, isMandatoryURL, isOIDInfo, isObject, isOptionalArrayOfStrings, isOptionalDecimal, isOptionalJSONArray, isOptionalJSONArrayError, isOptionalJSONArrayOk, isOptionalJSONObject, isOptionalNumber, isOptionalString, isOptionalStringArray, isOptionalStringOrOIDInfo, isOptionalURL, isPCDFText, isPublicKeySubject, isString, isStringArray, isStringOrOIDInfo, isStringOrStringArray, jsonPrettyPrinter, measurementName2human, normalizePCDFPublicKeyHex, normalizeXMLText, openFullscreen, pad, parseAndVerifyJSONSignatures, parseDescription, parseHexString, parseMennekesXMLDocument, parseNumber, parseOBIS, parsePCDFDocument, parsePCDFPublicKey, parsePCDFSignature, parseUTC, readQRCodeTextFromImage, readQRCodeTextFromImageData, secp224k1, setUILocale, sha256, sha256____, sha384, sha384____, sha512, sha512____, signJSONMessage, signMessage, stripPCDFControlCharacters, time2human, toArrayBuffer, toSessionVerificationResults, toUint8Array, unquotePCDFText, validatePCDFFields, verifyJSONMessageSignatureResults, verifyJSONMessageSignatures, verifyJSONSignature, verifyJSONSignatureResult, verifyPCDFDocument };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map