iobroker.bmw 2.5.7 → 2.6.0

package/io-package.json

@@ -1,8 +1,12 @@
 {
   "common": {
     "name": "bmw",
-    "version": "2.5.7",
+    "version": "2.6.0",
     "news": {
+      "2.6.0": {
+        "en": "Fix Status Updat. New status under bmw.0.VIN.state",
+        "de": "Status Update gefixt. Neuer Status unter bmw.0.VIN.state"
+      },
       "2.5.7": {
         "en": "Fix Quota problem",
         "de": "Quota Problem es muss jetzt explizit die Marke BMW oder Mini in den Optionen gewählt werden."

package/main.js

@@ -12,6 +12,7 @@ const axios = require("axios").default;
 const { HttpsCookieAgent } = require("http-cookie-agent/http");
 const crypto = require("crypto");
 const qs = require("qs");
+const Json2iob = require("json2iob");
 const { extractKeys } = require("./lib/extractKeys");
 const tough = require("tough-cookie");
 class Bmw extends utils.Adapter {
@@ -37,6 +38,131 @@ class Bmw extends utils.Adapter {
     this.session = {};
     this.statusBlock = {};
     this.nonChargingHistory = {};
+    this.json2iob = new Json2iob(this);
+    this.description = {
+      allTrips: "alle Fahrten des Autos",
+      avgCombinedConsumption: "Durchschnittlicher kombinierter Verbrauch",
+      communityAverage: "Gesamt Durchschnitt",
+      communityHigh: "Gesamt max.",
+      communityLow: "Gesamt min.",
+      userAverage: "Fahrer Durchschnitt",
+      avgElectricConsumption: "Durchschnittlicher elektrischer Verbrauch",
+      avgRecuperation: "Durchschnittliche Rekuperation",
+      chargecycleRange: "Ladezyklus Reichweite",
+      userCurrentChargeCycle: "aktueller Ladezyklus",
+      userHigh: "Fahrer max.",
+      totalElectricDistance: "gesamte elektrische Distanz",
+      batterySizeMax: "max. Batterie Ladeleistung in Wh",
+      resetDate: "Werte zur+ckgesetz am",
+      savedCO2: "Eingespartes CO2",
+      savedCO2greenEnergy: "Eingespartes CO2 grüne Energie",
+      totalSavedFuel: "Gesamt gesparter Kraftstoff",
+      apiV2: "limitierte v2 Api des Autos",
+      basicType: "Grundtyp",
+      bodyType: "Fahrzeugtyp",
+      brand: "Marke",
+      modelName: "Model Name",
+      series: "Serie",
+      vin: "Fahrzeugidentifikationsnummer",
+      chargingprofile: "Ladeprofil",
+      overrideTimer: "Einmalige Abfahrtszeit",
+      weekdays: "Wochentag",
+      departureTime: "Abfahrtszeit",
+      timerEnabled: "Timer Aktiviert",
+      preferredChargingWindow: "Tägliches Ladefenster",
+      endTime: "Ende Uhrzeit",
+      startTime: "Start Uhrzeit",
+      MONDAY: "Montag",
+      TUESDAY: "Dienstag",
+      WEDNESDAY: "Mittwoch",
+      THURSDAY: "Donnerstag",
+      FRIDAY: "Freitag",
+      SATURDAY: "Samstag",
+      SUNDAY: "Sonntag",
+      chargingMode: "Lademodus",
+      chargingPreferences: "Ladeeinstellungen",
+      climatizationEnabled: "Klimatisierung Aktiviert",
+      general: "Allgemeine Fahrzeuginformationen",
+      dealer: "Händler",
+      city: "Stadt",
+      country: "Land",
+      phone: "Telefon",
+      postalCode: "Postleitzahl",
+      street: "Straße",
+      supportedChargingModes: "unterstützte Lademodi",
+      accelerationValue: "Beschleunigungs Wert",
+      anticipationValue: "Erwartungswert",
+      auxiliaryConsumptionValue: "Hilfsverbrauchswert",
+      date: "Datum",
+      drivingModeValue: "Fahrmodus",
+      duration: "Dauer",
+      efficiencyValue: "Effizienz Wert",
+      electricDistance: "elektrische Distanz",
+      electricDistanceRatio: "elektrisches Distanzverhältnis in %",
+      savedFuel: "Eingesparter Kraftstoff",
+      totalConsumptionValue: "Gesamtverbrauchswert",
+      totalDistance: "Gesamtstrecke",
+      rangemap: "Reichweitenkarte",
+      center: "Mitte",
+      remote: "Fernbedienung",
+      CHARGE_NOW: "jetzt Aufladen",
+      CLIMATE_NOW: "Klimatisierung starten",
+      DOOR_LOCK: "Autotüren zusperren",
+      DOOR_UNLOCK: "Autotüren aufsperren",
+      GET_VEHICLES: "Fahrzeuginformationen abrufen",
+      GET_VEHICLE_STATUS: "Fahrzeug Status abrufen",
+      HORN_BLOW: "Hupe einschalten",
+      LIGHT_FLASH: "Lichthupe einschalten",
+      START_CHARGING: "Laden starten",
+      START_PRECONDITIONING: "Startvoraussetzung",
+      STOP_CHARGING: "Laden stoppen",
+      VEHICLE_FINDER: "Positionsdaten Fahrzeug abrufen",
+      serviceExecutionHistory: "Verlauf der Remote-Ausführung",
+      status: "Aktueller Status",
+      BRAKE_FLUID: "Bremsflüssigkeit",
+      cbsDescription: "Service Beschreibung",
+      cbsDueDate: "Service Fälligkeitsdatum",
+      cbsState: "Service Status",
+      cbsType: "Service Art",
+      VEHICLE_CHECK: "Fahrzeug Überprüfung",
+      position: "Position",
+      heading: "Richtung",
+      lat: "Latitude",
+      lon: "Longitude",
+      DCS_CCH_Activation: "DCS CCH Aktivierung",
+      DCS_CCH_Ongoing: "DCS CHH Laufend",
+      chargingConnectionType: "Ladeverbindungstyp",
+      chargingInductivePositioning: "Aufladen Induktive Positionierung",
+      chargingLevelHv: "Batterie SoC in %",
+      chargingStatus: "Ladestatus",
+      chargingTimeRemaining: "Verbleibende Ladezeit",
+      connectionStatus: "Verbindungsstatus Ladestecker",
+      doorDriverFront: "Fahrertüren",
+      driverFront: "Fahrertüren",
+      doorDriverRear: "Hintere Türe Fahrerseite",
+      doorLockState: "Fahrzeug Verriegelungszustand Türen und Fenster",
+      doorPassengerFront: "Beifahrertüre",
+      doorPassengerRear: "Hintere Türe Beifahrerseite",
+      hood: "Motorhaube",
+      internalDataTimeUTC: "Fahrzeugzeit UTC",
+      lastChargingEndReason: "letzter Grund für das Ende des Ladevorgangs",
+      lastChargingEndResult: "letztes Ladeendergebnis",
+      maxRangeElectric: "max. elektrische Reichweite in km",
+      maxRangeElectricMls: "max. elektrische Reichweite in mi",
+      mileage: "Kilometerstand",
+      remainingFuel: "Tankinhalt",
+      remainingRangeElectric: "restliche Reichweite Elektrisch in km",
+      remainingRangeElectricMls: "restliche Reichweite Elektrisch in mi",
+      remainingRangeFuel: "restliche Reichweite Kraftstoff in km",
+      remainingRangeFuelMls: "restliche Reichweite Kraftstoff in mi",
+      singleImmediateCharging: "einmalige Sofortaufladung",
+      trunk: "Kofferraum",
+      updateReason: "Aktualisierungsgrund",
+      updateTime: "Aktualisierungszeit",
+      vehicleCountry: "Fahrzeug Land",
+      windowDriverFront: "Fenster Fahrerseite",
+      windowPassengerFront: "Fenster Beifahrerseite",
+    };
     this.cookieJar = new tough.CookieJar(null, { ignoreError: true });
 
     this.requestClient = axios.create({
@@ -64,12 +190,13 @@ class Bmw extends utils.Adapter {
     await this.login();
     if (this.session.access_token) {
       // await this.getVehicles(); //old depracted api
-      await this.cleanObjects();
 
       this.log.info(`Start getting ${this.config.brand} vehicles`);
-      await this.getVehiclesv2();
+      await this.getVehiclesv2(true);
+      await this.cleanObjects();
+      await this.updateDevices();
       this.updateInterval = setInterval(async () => {
-        await this.getVehiclesv2();
+        await this.updateDevices();
       }, this.config.interval * 60 * 1000);
       this.refreshTokenInterval = setInterval(() => {
         this.refreshToken();
@@ -233,6 +360,7 @@ class Bmw extends utils.Adapter {
           //     },
           //     native: {},
           // });
+
           await this.setObjectNotExistsAsync(vehicle.vin + ".general", {
             type: "channel",
             common: {
@@ -250,7 +378,7 @@ class Bmw extends utils.Adapter {
         error.response && this.log.error(JSON.stringify(error.response.data));
       });
   }
-  async getVehiclesv2() {
+  async getVehiclesv2(firstStart) {
     const brand = this.config.brand;
     const headers = {
       "user-agent": this.userAgentDart,
@@ -263,17 +391,20 @@ class Bmw extends utils.Adapter {
 
     await this.requestClient({
       method: "get",
-      url: "https://cocoapi.bmwgroup.com/eadrax-vcs/v1/vehicles?apptimezone=120&appDateTime=" + Date.now() + "&tireGuardMode=ENABLED",
+      url: "https://cocoapi.bmwgroup.com/eadrax-vcs/v4/vehicles?apptimezone=120&appDateTime=" + Date.now() + "&tireGuardMode=ENABLED",
       headers: headers,
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
-        this.log.info(`Found ${res.data.length} ${brand} vehicles`);
+        if (firstStart) {
+          this.log.info(`Found ${res.data.length} ${brand} vehicles`);
+        }
         if (res.data.length === 0) {
           this.log.info(`No ${brand} vehicles found please check brand in instance settings`);
           return;
         }
         for (const vehicle of res.data) {
+          this.vinArray.push(vehicle.vin);
           await this.setObjectNotExistsAsync(vehicle.vin, {
             type: "device",
             common: {
@@ -281,11 +412,10 @@ class Bmw extends utils.Adapter {
             },
             native: {},
           });
-
-          await this.setObjectNotExistsAsync(vehicle.vin + ".properties", {
+          await this.setObjectNotExistsAsync(vehicle.vin + ".state", {
             type: "channel",
             common: {
-              name: "Current status of the car v2",
+              name: "Current status of the car v4",
             },
             native: {},
           });
@@ -320,7 +450,12 @@ class Bmw extends utils.Adapter {
               native: {},
             });
           });
-          this.extractKeys(this, vehicle.vin, vehicle, null, true);
+          // this.extractKeys(this, vehicle.vin, vehicle, null, true);
+          this.json2iob.parse(vehicle.vin, vehicle, {
+            forceIndex: true,
+            descriptions: this.description,
+          });
+
           await this.sleep(5000);
           this.updateChargingSessionv2(vehicle.vin);
         }
@@ -332,6 +467,36 @@ class Bmw extends utils.Adapter {
       });
     await this.sleep(5000);
   }
+  async updateDevices() {
+    const brand = this.config.brand;
+    const headers = {
+      "user-agent": this.userAgentDart,
+      "x-user-agent": this.xuserAgent.replace(";brand;", `;${brand};`),
+      authorization: "Bearer " + this.session.access_token,
+      "accept-language": "de-DE",
+      host: "cocoapi.bmwgroup.com",
+      "24-hour-format": "true",
+    };
+    for (const vin of this.vinArray) {
+      this.log.debug("update " + vin);
+      headers["bmw-vin"] = vin;
+      await this.requestClient({
+        method: "get",
+        url:
+          "https://cocoapi.bmwgroup.com/eadrax-vcs/v4/vehicles/state?apptimezone=120&appDateTime=" + Date.now() + "&tireGuardMode=ENABLED",
+        headers: headers,
+      })
+        .then(async (res) => {
+          this.log.debug(JSON.stringify(res.data));
+          this.json2iob.parse(vin, res.data, { forceIndex: true, descriptions: this.description });
+        })
+        .catch((error) => {
+          this.log.error("update  failed");
+          this.log.error(error);
+          error.response && this.log.error(JSON.stringify(error.response.data));
+        });
+    }
+  }
   sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
   }
@@ -369,7 +534,7 @@ class Bmw extends utils.Adapter {
     urlArray.push({
       url: "https://cocoapi.bmwgroup.com/eadrax-chs/v1/charging-statistics?vin=" + vin + "&currentDate=" + fullDate,
       path: ".charging-statistics.",
-      name: "Charging statistics",
+      name: "charging statistics",
     });
     for (const element of urlArray) {
       await this.requestClient({
@@ -390,8 +555,31 @@ class Bmw extends utils.Adapter {
             },
             native: {},
           });
+          await this.extractKeys(this, vin + element.path + dateFormatted, data);
 
-          this.extractKeys(this, vin + element.path + dateFormatted, data);
+          if (element.name === "chargingSessions" && data.sessions && data.sessions.length > 0) {
+            try {
+              const datal = data.sessions[0];
+              datal._date = datal.id.split("_")[0];
+              datal._id = datal.id.split("_")[1];
+              datal.timestamp = new Date(datal._date).valueOf();
+              if (datal.energyCharged.replace) {
+                datal.energy = datal.energyCharged.replace("~", "").trim().split(" ")[0];
+                datal.unit = datal.energyCharged.replace("~", "").trim().split(" ")[1];
+              }
+              datal.id = "latest";
+              await this.setObjectNotExistsAsync(vin + element.path + "latest", {
+                type: "channel",
+                common: {
+                  name: element.name + "latest of the car v2",
+                },
+                native: {},
+              });
+              await this.extractKeys(this, vin + element.path + "latest", datal);
+            } catch (error) {
+              this.log.debug(error);
+            }
+          }
         })
         .catch((error) => {
           if (error.response) {
@@ -409,7 +597,7 @@ class Bmw extends utils.Adapter {
 
   async cleanObjects() {
     for (const vin of this.vinArray) {
-      const remoteState = await this.getObjectAsync(vin + ".apiV2");
+      const remoteState = await this.getObjectAsync(vin + ".properties");
 
       if (remoteState) {
         this.log.debug("clean old states" + vin);
@@ -417,6 +605,8 @@ class Bmw extends utils.Adapter {
         await this.delObjectAsync(vin + ".lastTrip", { recursive: true });
         await this.delObjectAsync(vin + ".allTrips", { recursive: true });
         await this.delObjectAsync(vin + ".status", { recursive: true });
+        await this.delObjectAsync(vin + ".properties", { recursive: true });
+        await this.delObjectAsync(vin + ".capabilities", { recursive: true });
         await this.delObjectAsync(vin + ".chargingprofile", { recursive: true });
         await this.delObjectAsync(vin + ".serviceExecutionHistory", { recursive: true });
         await this.delObjectAsync(vin + ".apiV2", { recursive: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.bmw",
-  "version": "2.5.7",
+  "version": "2.6.0",
   "description": "Adapter for BMW",
   "author": {
     "name": "TA2k",
@@ -16,30 +16,31 @@
     "url": "https://github.com/TA2k/ioBroker.bmw"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.6",
-    "axios": "^0.27.2",
-    "http-cookie-agent": "^4.0.2",
+    "@iobroker/adapter-core": "^2.6.8",
+    "axios": "^1.4.0",
+    "http-cookie-agent": "^5.0.4",
     "json-bigint": "^1.0.0",
-    "qs": "^6.11.0",
-    "tough-cookie": "^4.1.2"
+    "json2iob": "^2.4.4",
+    "qs": "^6.11.2",
+    "tough-cookie": "^4.1.3"
   },
   "devDependencies": {
     "@iobroker/testing": "^4.1.0",
-    "@types/chai": "^4.3.3",
+    "@types/chai": "^4.3.5",
     "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.7.18",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.16.18",
     "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^10.0.13",
-    "@types/sinon-chai": "^3.2.8",
-    "chai": "^4.3.6",
+    "@types/sinon": "^10.0.15",
+    "@types/sinon-chai": "^3.2.9",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.23.1",
-    "mocha": "^10.0.0",
+    "eslint": "^8.43.0",
+    "mocha": "^10.2.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^14.0.0",
+    "sinon": "^15.2.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "^4.8.3"
+    "typescript": "^5.1.6"
   },
   "main": "main.js",
   "scripts": {