iobroker.bmw 2.5.5 → 2.5.7

package/README.md

@@ -26,6 +26,9 @@ bmw.0.VIN.remotev2
 
 ## Changelog
 
+### 2.5.6
+
+- Fix charging message
 ### 2.5.5
 
 - Fix login

package/admin/index_m.html

@@ -71,20 +71,29 @@
             <div class="row">
                 <div class="col s6 input-field">
                     <input type="text" class="value" id="username" />
-                    <label for="username" class="translate">BMW App Email</label>
+                    <label for="username" class="translate">App Email</label>
                 </div>
             </div>
             <div class="row">
                 <div class="col s6 input-field">
                     <input type="password" class="value" id="password" />
-                    <label for="password" class="translate">BMW App Password</label>
+                    <label for="password" class="translate">App Password</label>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col s2 input-field">
+                    <select id="brand" class="value">
+                        <option value="bmw">BMW</option>
+                        <option value="mini">Mini</option>
+                    </select>
+                    <label for="brand" class="translate">Brand</label>
                 </div>
             </div>
 
             <div class="row">
                 <div class="col s2 input-field">
                     <input type="number" class="value" id="interval" />
-                    <label for="interval" class="translate">Update interval in minutes</label>
+                    <label for="interval" class="translate">Update interval (in minutes)"</label>
                 </div>
             </div>
         </div>

package/admin/words.js

@@ -2,40 +2,64 @@
 "use strict";
 
 systemDictionary = {
-    "bmw adapter settings": {
-        en: "Adapter settings for bmw",
-        de: "Adaptereinstellungen für bmw",
-        ru: "Настройки адаптера для bmw",
-        pt: "Configurações do adaptador para bmw",
-        nl: "Adapterinstellingen voor bmw",
-        fr: "Paramètres d'adaptateur pour bmw",
-        it: "Impostazioni dell'adattatore per bmw",
-        es: "Ajustes del adaptador para bmw",
-        pl: "Ustawienia adaptera dla bmw",
-        "zh-cn": "bmw2的适配器设置",
-    },
-    option1: {
-        en: "option1",
-        de: "Option 1",
-        ru: "Опция 1",
-        pt: "Opção 1",
-        nl: "Optie 1",
-        fr: "Option 1",
-        it: "opzione 1",
-        es: "Opción 1",
-        pl: "opcja 1",
-        "zh-cn": "选项1",
-    },
-    option2: {
-        en: "option2",
-        de: "Option 2",
-        ru: "option2",
-        pt: "opção 2",
-        nl: "Optie 2",
-        fr: "Option 2",
-        it: "opzione 2",
-        es: "opcion 2",
-        pl: "Opcja 2",
-        "zh-cn": "选项2",
-    },
+  "bmw adapter settings": {
+    en: "Adapter settings for bmw",
+    de: "Adaptereinstellungen für bmw",
+    ru: "Настройки адаптера для bmw",
+    pt: "Configurações do adaptador para bmw",
+    nl: "Adapterinstellingen voor bmw",
+    fr: "Paramètres d'adaptateur pour bmw",
+    it: "Impostazioni dell'adattatore per bmw",
+    es: "Ajustes del adaptador para bmw",
+    pl: "Ustawienia adaptera dla bmw",
+    "zh-cn": "bmw2的适配器设置",
+  },
+  "App Email": {
+    en: "App Email",
+    de: "App-E-Mail",
+    ru: "Электронная почта приложения",
+    pt: "Email do aplicativo",
+    nl: "App-e-mail",
+    fr: "Courriel de l'application",
+    it: "E-mail dell'app",
+    es: "Correo electrónico de la aplicación",
+    pl: "E-mail aplikacji",
+    "zh-cn": "应用电子邮件",
+  },
+  "App Password": {
+    en: "App Password",
+    de: "App-Passwort",
+    ru: "Пароль приложения",
+    pt: "Senha de app",
+    nl: "App-wachtwoord",
+    fr: "Mot de passe de l'application",
+    it: "Password dell'app",
+    es: "Contraseña de la aplicación",
+    pl: "Hasło do aplikacji",
+    "zh-cn": "应用密码",
+  },
+  "Update interval (in minutes)": {
+    en: "Update interval (in minutes)",
+    de: "Aktualisierungsintervall (in Minuten)",
+    ru: "Интервал обновления (в минутах)",
+    pt: "Intervalo de atualização (em minutos)",
+    nl: "Update-interval (in minuten)",
+    fr: "Intervalle de mise à jour (en minutes)",
+    it: "Intervallo di aggiornamento (in minuti)",
+    es: "Intervalo de actualización (en minutos)",
+    pl: "Interwał aktualizacji (w minutach)",
+    "zh-cn": "更新间隔（分钟）",
+  },
+  Brand: {
+    en: "Brand",
+    de: "Marke",
+    ru: "Марка",
+    pt: "Marca",
+    nl: "Brand",
+    fr: "Marque",
+    it: "Marca",
+    es: "Marca",
+    pl: "Brandy",
+    "zh-cn": "陪审团",
+  },
 };

package/io-package.json

@@ -1,8 +1,15 @@
 {
   "common": {
     "name": "bmw",
-    "version": "2.5.5",
+    "version": "2.5.7",
     "news": {
+      "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."
+      },
+      "2.5.6": {
+        "en": "Fix charging message"
+      },
       "2.5.5": {
         "en": "Fix login"
       },
@@ -109,7 +116,8 @@
   "native": {
     "username": "",
     "password": "",
-    "interval": 5
+    "interval": 5,
+    "brand": "bmw"
   },
   "objects": [],
   "instanceObjects": [

package/main.js

@@ -7,9 +7,9 @@
 // The adapter-core module gives you access to the core ioBroker functions
 // you need to create an adapter
 const utils = require("@iobroker/adapter-core");
-const axios = require("axios");
+const axios = require("axios").default;
 
-const { HttpsCookieAgent } = require("http-cookie-agent");
+const { HttpsCookieAgent } = require("http-cookie-agent/http");
 const crypto = require("crypto");
 const qs = require("qs");
 const { extractKeys } = require("./lib/extractKeys");
@@ -29,6 +29,20 @@ class Bmw extends utils.Adapter {
     this.userAgent = "My%20BMW/8932 CFNetwork/978.0.7 Darwin/18.7.0";
     this.userAgentDart = "Dart/2.14 (dart:io)";
     this.xuserAgent = "android(SP1A.210812.016.C1);brand;99.0.0(99999);row";
+    this.updateInterval;
+    this.reLoginTimeout;
+    this.refreshTokenInterval;
+    this.extractKeys = extractKeys;
+    this.vinArray = [];
+    this.session = {};
+    this.statusBlock = {};
+    this.nonChargingHistory = {};
+    this.cookieJar = new tough.CookieJar(null, { ignoreError: true });
+
+    this.requestClient = axios.create({
+      withCredentials: true,
+      httpsAgent: new HttpsCookieAgent({ cookies: { jar: this.cookieJar } }),
+    });
   }
 
   /**
@@ -41,23 +55,7 @@ class Bmw extends utils.Adapter {
       this.log.info("Set interval to minimum 0.5");
       this.config.interval = 0.5;
     }
-    this.cookieJar = new tough.CookieJar(null, { ignoreError: true });
 
-    this.requestClient = axios.create({
-      jar: this.cookieJar,
-      withCredentials: true,
-      httpsAgent: new HttpsCookieAgent({
-        jar: this.cookieJar,
-      }),
-    });
-    this.updateInterval = null;
-    this.reLoginTimeout = null;
-    this.refreshTokenTimeout = null;
-    this.extractKeys = extractKeys;
-    this.vinArray = [];
-    this.session = {};
-    this.statusBlock = {};
-    this.nonChargingHistory = {};
     this.subscribeStates("*");
     if (!this.config.username || !this.config.password) {
       this.log.error("Please set username and password");
@@ -67,6 +65,8 @@ class Bmw extends utils.Adapter {
     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();
       this.updateInterval = setInterval(async () => {
         await this.getVehiclesv2();
@@ -104,7 +104,6 @@ class Bmw extends utils.Adapter {
       url: "https://customer.bmwgroup.com/gcdm/oauth/authenticate",
       headers: headers,
       data: qs.stringify(data),
-      jar: this.cookieJar,
       withCredentials: true,
     })
       .then((res) => {
@@ -144,7 +143,6 @@ class Bmw extends utils.Adapter {
       url: "https://customer.bmwgroup.com/gcdm/oauth/authenticate",
       headers: headers,
       data: qs.stringify(data),
-      jar: this.cookieJar,
       withCredentials: true,
       maxRedirects: 0,
     })
@@ -170,8 +168,6 @@ class Bmw extends utils.Adapter {
     await this.requestClient({
       method: "post",
       url: "https://customer.bmwgroup.com/gcdm/oauth/token",
-
-      jar: this.cookieJar,
       withCredentials: true,
       headers: {
         "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
@@ -255,85 +251,86 @@ class Bmw extends utils.Adapter {
       });
   }
   async getVehiclesv2() {
-    const brands = ["bmw", "mini"];
-    for (const brand of brands) {
-      this.log.debug(`Start getting ${brand} vehicles`);
-      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",
-      };
+    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",
+    };
 
-      await this.requestClient({
-        method: "get",
-        url: "https://cocoapi.bmwgroup.com/eadrax-vcs/v1/vehicles?apptimezone=120&appDateTime=" + Date.now() + "&tireGuardMode=ENABLED",
-        headers: headers,
-      })
-        .then(async (res) => {
-          this.log.debug(JSON.stringify(res.data));
+    await this.requestClient({
+      method: "get",
+      url: "https://cocoapi.bmwgroup.com/eadrax-vcs/v1/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 (res.data.length === 0) {
+          this.log.info(`No ${brand} vehicles found please check brand in instance settings`);
+          return;
+        }
+        for (const vehicle of res.data) {
+          await this.setObjectNotExistsAsync(vehicle.vin, {
+            type: "device",
+            common: {
+              name: vehicle.model,
+            },
+            native: {},
+          });
 
-          for (const vehicle of res.data) {
-            await this.setObjectNotExistsAsync(vehicle.vin, {
-              type: "device",
-              common: {
-                name: vehicle.model,
-              },
-              native: {},
-            });
+          await this.setObjectNotExistsAsync(vehicle.vin + ".properties", {
+            type: "channel",
+            common: {
+              name: "Current status of the car v2",
+            },
+            native: {},
+          });
+          await this.setObjectNotExistsAsync(vehicle.vin + ".remotev2", {
+            type: "channel",
+            common: {
+              name: "Remote Controls",
+            },
+            native: {},
+          });
 
-            await this.setObjectNotExistsAsync(vehicle.vin + ".properties", {
-              type: "channel",
+          const remoteArray = [
+            { command: "door-lock" },
+            { command: "door-unlock" },
+            { command: "horn-blow" },
+            { command: "light-flash" },
+            { command: "vehicle-finder" },
+            { command: "climate-now_START" },
+            { command: "climate-now_STOP" },
+            { command: "force-refresh", name: "Force Refresh" },
+          ];
+          remoteArray.forEach((remote) => {
+            this.setObjectNotExists(vehicle.vin + ".remotev2." + remote.command, {
+              type: "state",
               common: {
-                name: "Current status of the car v2",
+                name: remote.name || "",
+                type: remote.type || "boolean",
+                role: remote.role || "boolean",
+                write: true,
+                read: true,
               },
               native: {},
             });
-            await this.setObjectNotExistsAsync(vehicle.vin + ".remotev2", {
-              type: "channel",
-              common: {
-                name: "Remote Controls",
-              },
-              native: {},
-            });
-
-            const remoteArray = [
-              { command: "door-lock" },
-              { command: "door-unlock" },
-              { command: "horn-blow" },
-              { command: "light-flash" },
-              { command: "vehicle-finder" },
-              { command: "climate-now_START" },
-              { command: "climate-now_STOP" },
-              { command: "force-refresh", name: "Force Refresh" },
-            ];
-            remoteArray.forEach((remote) => {
-              this.setObjectNotExists(vehicle.vin + ".remotev2." + remote.command, {
-                type: "state",
-                common: {
-                  name: remote.name || "",
-                  type: remote.type || "boolean",
-                  role: remote.role || "boolean",
-                  write: true,
-                  read: true,
-                },
-                native: {},
-              });
-            });
-            this.extractKeys(this, vehicle.vin, vehicle, null, true);
-            await this.sleep(5000);
-            this.updateChargingSessionv2(vehicle.vin);
-          }
-        })
-        .catch((error) => {
-          this.log.error("getvehicles v2 failed");
-          this.log.error(error);
-          error.response && this.log.error(JSON.stringify(error.response.data));
-        });
-      await this.sleep(5000);
-    }
+          });
+          this.extractKeys(this, vehicle.vin, vehicle, null, true);
+          await this.sleep(5000);
+          this.updateChargingSessionv2(vehicle.vin);
+        }
+      })
+      .catch((error) => {
+        this.log.error("getvehicles v2 failed");
+        this.log.error(error);
+        error.response && this.log.error(JSON.stringify(error.response.data));
+      });
+    await this.sleep(5000);
   }
   sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
@@ -344,7 +341,7 @@ class Bmw extends utils.Adapter {
     }
     const headers = {
       "user-agent": this.userAgentDart,
-      "x-user-agent": this.xuserAgent.replace(";brand;", `;bmw;`),
+      "x-user-agent": this.xuserAgent.replace(";brand;", `;${this.config.brand};`),
       authorization: "Bearer " + this.session.access_token,
       "accept-language": "de-DE",
       "24-hour-format": "true",
@@ -397,8 +394,8 @@ class Bmw extends utils.Adapter {
           this.extractKeys(this, vin + element.path + dateFormatted, data);
         })
         .catch((error) => {
-          if (error.response && (error.response.status === 422 || error.response.status === 403)) {
-            this.log.info("No charging session available. Ignore " + vin);
+          if (error.response) {
+            this.log.info("No charging session available. Ignore " + vin + "until restart");
             this.nonChargingHistory[vin] = true;
             return;
           }
@@ -451,7 +448,6 @@ class Bmw extends utils.Adapter {
     await this.requestClient({
       method: "post",
       url: "https://customer.bmwgroup.com/gcdm/oauth/token",
-      jar: this.cookieJar,
       withCredentials: true,
       headers: {
         "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
@@ -486,7 +482,6 @@ class Bmw extends utils.Adapter {
     try {
       clearTimeout(this.refreshTimeout);
       clearTimeout(this.reLoginTimeout);
-      clearTimeout(this.refreshTokenTimeout);
       clearInterval(this.updateInterval);
       clearInterval(this.refreshTokenInterval);
       callback();
@@ -521,7 +516,7 @@ class Bmw extends utils.Adapter {
 
         const headers = {
           "user-agent": this.userAgentDart,
-          "x-user-agent": this.xuserAgent.replace(";brand;", `;bmw;`),
+          "x-user-agent": this.xuserAgent.replace(";brand;", `;${this.config.brand};`),
           authorization: "Bearer " + this.session.access_token,
           "accept-language": "de-DE",
           host: "cocoapi.bmwgroup.com",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.bmw",
-  "version": "2.5.5",
+  "version": "2.5.7",
   "description": "Adapter for BMW",
   "author": {
     "name": "TA2k",
@@ -16,30 +16,30 @@
     "url": "https://github.com/TA2k/ioBroker.bmw"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.0",
-    "axios": "^0.26.1",
-    "http-cookie-agent": "^1.0.5",
+    "@iobroker/adapter-core": "^2.6.6",
+    "axios": "^0.27.2",
+    "http-cookie-agent": "^4.0.2",
     "json-bigint": "^1.0.0",
-    "qs": "^6.10.3",
-    "tough-cookie": "^4.0.0"
+    "qs": "^6.11.0",
+    "tough-cookie": "^4.1.2"
   },
   "devDependencies": {
-    "@iobroker/testing": "^2.5.6",
-    "@types/chai": "^4.3.0",
+    "@iobroker/testing": "^4.1.0",
+    "@types/chai": "^4.3.3",
     "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^9.1.0",
-    "@types/node": "^14.18.12",
+    "@types/mocha": "^9.1.1",
+    "@types/node": "^18.7.18",
     "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^10.0.11",
+    "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.8",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.13.0",
-    "mocha": "^9.2.2",
+    "eslint": "^8.23.1",
+    "mocha": "^10.0.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^13.0.1",
+    "sinon": "^14.0.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "^4.6.3"
+    "typescript": "^4.8.3"
   },
   "main": "main.js",
   "scripts": {