iobroker.bmw 2.8.2 → 2.8.3

package/README.md

@@ -25,6 +25,10 @@ bmw.0.VIN.properties
 bmw.0.VIN.remotev2
 
 ## Changelog
+### 2.8.3 (2024-11-18)
+
+- login fixed
+
 ### 2.8.2 (2024-10-05)
 
 - fix error getvehicles v2 failed

package/admin/index_m.html

@@ -81,11 +81,47 @@
           <label for="password" class="translate">App Password</label>
         </div>
       </div>
+      <div class="row">
+        <div class="col s6 input-field" id="captchaResponse">
+          Check Captcha Box and press Submit. Save the form.
+          <div>
+            <form id="captcha_form" action="#" method="post">
+              <!-- hCaptcha widget -->
+              <div class="h-captcha" data-sitekey="7244955f-8f30-4445-adff-4fefe059f815"></div>
+              <br />
+              <button type="submit" class="btn">Submit</button>
+            </form>
+
+            <!-- hCaptcha script -->
+            <script src="https://hcaptcha.com/1/api.js" async defer></script>
+          </div>
+        </div>
+        <p></p>
+        <script>
+          document.getElementById('captcha_form').addEventListener('submit', function (event) {
+            event.preventDefault(); // Prevent the default form submission
+
+            const hCaptchaResponse = document.querySelector('[name="h-captcha-response"]').value;
+            const responseElement = document.getElementById('captchaResponse');
+
+            if (hCaptchaResponse) {
+              document.getElementById('captcha').value = hCaptchaResponse;
+              //trigger change event
+              var event = new Event('change');
+              document.getElementById('captcha').dispatchEvent(event);
+            }
+          });
+        </script>
+
+        <input type="text" class="value" id="captcha" />
+        <label for="captcha" class="translate">Captcha</label>
+      </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>
+            <option value="toyota">Toyota Supra</option>
           </select>
           <label for="brand" class="translate">Brand</label>
         </div>

package/admin/words.js

@@ -1,65 +1,66 @@
+// eslint-disable-next-line no-unused-vars
 /*global systemDictionary:true */
-"use strict";
+'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",
+  '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的适配器设置",
+    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",
+  '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": "应用电子邮件",
+    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",
+  '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": "应用密码",
+    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": "更新间隔（分钟）",
+  '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": "陪审团",
+    en: 'Brand',
+    de: 'Marke',
+    ru: 'Марка',
+    pt: 'Marca',
+    nl: 'Brand',
+    fr: 'Marque',
+    it: 'Marca',
+    es: 'Marca',
+    pl: 'Brandy',
+    'zh-cn': '陪审团',
   },
 };

package/eslint.config.cjs

@@ -0,0 +1,50 @@
+const globals = require('globals');
+const js = require('@eslint/js');
+
+const {
+  FlatCompat,
+} = require('@eslint/eslintrc');
+
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all
+});
+
+module.exports = [...compat.extends('eslint:recommended'), {
+  plugins: {},
+
+  languageOptions: {
+    globals: {
+      ...globals.node,
+      ...globals.mocha,
+    },
+
+    ecmaVersion: 2020,
+    sourceType: 'commonjs',
+  },
+
+  rules: {
+    indent: ['error', 2, {
+      SwitchCase: 1,
+    }],
+
+    'no-console': 'off',
+
+    'no-unused-vars': ['error', {
+      ignoreRestSiblings: true,
+      argsIgnorePattern: '^_',
+    }],
+
+    'no-var': 'error',
+    'no-trailing-spaces': 'error',
+    'prefer-const': 'error',
+
+    quotes: ['error', 'single', {
+      avoidEscape: true,
+      allowTemplateLiterals: true,
+    }],
+
+    semi: ['error', 'always'],
+  },
+}];

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "bmw",
-    "version": "2.8.2",
+    "version": "2.8.3",
     "news": {
+      "2.8.3": {
+        "en": "login fixed",
+        "de": "Anmeldung gefixt",
+        "ru": "фиксированный",
+        "pt": "login fixo",
+        "nl": "login vast",
+        "fr": "login corrigé",
+        "it": "login fisso",
+        "es": "login fijo",
+        "pl": "login stały",
+        "uk": "логін",
+        "zh-cn": "登录已固定"
+      },
       "2.8.2": {
         "en": "fix error getvehicles v2 failed",
         "de": "fehlerbehebung v2 versagt",
@@ -44,10 +57,6 @@
       "2.6.3": {
         "en": "Add start and stop charging remotes",
         "de": "Start und Stop Charging Remotes hinzugefügt"
-      },
-      "2.6.2": {
-        "en": "Fix Charging response parsing",
-        "de": "Fix Charging Antwort Verarbeitung"
       }
     },
     "titleLang": {
@@ -76,12 +85,8 @@
       "uk": "Adapter for BMW",
       "zh-cn": "宝马适配器"
     },
-    "authors": [
-      "TA2k <tombox2020@gmail.com>"
-    ],
-    "keywords": [
-      "BMW"
-    ],
+    "authors": ["TA2k <tombox2020@gmail.com>"],
+    "keywords": ["BMW"],
     "license": "MIT",
     "platform": "Javascript/Node.js",
     "main": "main.js",
@@ -112,18 +117,15 @@
       }
     ]
   },
-  "encryptedNative": [
-    "password"
-  ],
-  "protectedNative": [
-    "password"
-  ],
+  "encryptedNative": ["password"],
+  "protectedNative": ["password"],
   "native": {
     "username": "",
     "password": "",
     "interval": 5,
     "brand": "bmw",
-    "ignorelist": ""
+    "ignorelist": "",
+    "captcha": ""
   },
   "objects": [],
   "instanceObjects": [

package/lib/extractKeys.js

@@ -215,7 +215,9 @@ function extractArray(adapter, element, key, path, write, preferedArrayName, for
 function isJsonString(str) {
   try {
     JSON.parse(str);
+    // eslint-disable-next-line no-unused-vars
   } catch (e) {
+
     return false;
   }
   return true;

package/main.js

@@ -186,7 +186,20 @@ class Bmw extends utils.Adapter {
       this.log.error('Please set username and password');
       return;
     }
-    await this.login();
+    const sessionState = await this.getStateAsync('auth.session');
+    if (sessionState && sessionState.val) {
+      this.session = JSON.parse(sessionState.val);
+      this.log.info('Session found. If the login fails please delete bmw.0.auth.session and restart the adapter');
+      this.log.debug(JSON.stringify(this.session));
+      await this.refreshToken();
+    } else {
+      if (!this.config.captcha) {
+        this.log.error('Please generate a captcha in the instance settings');
+        return;
+      }
+
+      await this.login();
+    }
 
     if (this.session.access_token) {
       this.log.info(`Start getting ${this.config.brand} vehicles`);
@@ -196,29 +209,20 @@ class Bmw extends utils.Adapter {
       await this.updateDemands();
       await this.sleep(5000);
       await this.updateTrips();
-      this.updateInterval = setInterval(
-        async () => {
-          await this.sleep(2000);
-          await this.updateDevices();
-        },
-        this.config.interval * 60 * 1000,
-      );
-      this.demandInterval = setInterval(
-        async () => {
-          await this.sleep(2000);
-          await this.updateDemands();
-          await this.sleep(5000);
-          await this.updateTrips();
-        },
-        24 * 60 * 60 * 1000,
-      );
-      this.refreshTokenInterval = setInterval(
-        async () => {
-          await this.refreshToken();
-          await this.sleep(5000);
-        },
-        (this.session.expires_in - 123) * 1000,
-      );
+      this.updateInterval = setInterval(async () => {
+        await this.sleep(2000);
+        await this.updateDevices();
+      }, this.config.interval * 60 * 1000);
+      this.demandInterval = setInterval(async () => {
+        await this.sleep(2000);
+        await this.updateDemands();
+        await this.sleep(5000);
+        await this.updateTrips();
+      }, 24 * 60 * 60 * 1000);
+      this.refreshTokenInterval = setInterval(async () => {
+        await this.refreshToken();
+        await this.sleep(5000);
+      }, (this.session.expires_in - 123) * 1000);
     }
   }
   async login() {
@@ -228,6 +232,7 @@ class Bmw extends utils.Adapter {
         'Mozilla/5.0 (iPhone; CPU iPhone OS 12_5_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.1.2 Mobile/15E148 Safari/604.1',
       'Accept-Language': 'de-de',
       'Content-Type': 'application/x-www-form-urlencoded',
+      hcaptchatoken: this.config.captcha,
     };
     const [code_verifier, codeChallenge] = this.getCodeChallenge();
     const data = {
@@ -251,27 +256,28 @@ class Bmw extends utils.Adapter {
       data: qs.stringify(data),
       withCredentials: true,
     })
-      .then((res) => {
+      .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
         return res.data;
       })
-      .catch((error) => {
+      .catch(async (error) => {
         this.log.error('Login failed');
         this.log.error(error);
         if (error.response) {
           this.log.error(JSON.stringify(error.response.data));
         }
         if (error.response && error.response.status === 401) {
-          this.log.error('Please check username and password or too many logins in 5 minutes');
-
+          this.log.error('Please check username and password or generate a new captcha in the instance settings');
+          this.log.error('Please wait 5 minutes before trying again');
           this.log.error('Start relogin in 5min');
+
           this.reLoginTimeout && clearTimeout(this.reLoginTimeout);
-          this.reLoginTimeout = setTimeout(
-            () => {
-              this.login();
-            },
-            5000 * 60 * 1,
-          );
+          this.reLoginTimeout = setTimeout(async () => {
+            //get adapter settings and set captcha to null
+            const adapterSettings = await this.getForeignObjectAsync('system.adapter.' + this.namespace);
+            adapterSettings.native.captcha = null;
+            await this.setForeignObjectAsync('system.adapter.' + this.namespace, adapterSettings);
+          }, 5000 * 60 * 1);
         }
         if (error.response && error.response.status === 400) {
           this.log.error('Please check username and password');
@@ -326,9 +332,29 @@ class Bmw extends utils.Adapter {
       },
       data: 'code=' + code + '&redirect_uri=com.bmw.connected://oauth&grant_type=authorization_code&code_verifier=' + code_verifier,
     })
-      .then((res) => {
+      .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
         this.session = res.data;
+        await this.extendObject('auth', {
+          type: 'channel',
+          common: {
+            name: 'Authentification Information',
+          },
+          native: {},
+        });
+        await this.extendObject('auth.session', {
+          type: 'state',
+          common: {
+            name: 'Session Token',
+            type: 'string',
+            role: 'value',
+            read: true,
+            write: false,
+          },
+          native: {},
+        });
+
+        this.setState('auth.session', JSON.stringify(this.session), true);
         this.setState('info.connection', true, true);
         return res.data;
       })
@@ -451,12 +477,9 @@ class Bmw extends utils.Adapter {
         }
         this.log.info('Adapter will retry in 3 minutes to get vehicles');
         this.reLoginTimeout && clearTimeout(this.reLoginTimeout);
-        this.reLoginTimeout = setTimeout(
-          () => {
-            this.getVehiclesv2();
-          },
-          1000 * 60 * 3,
-        );
+        this.reLoginTimeout = setTimeout(() => {
+          this.getVehiclesv2();
+        }, 1000 * 60 * 3);
       });
     await this.sleep(5000);
   }
@@ -475,8 +498,7 @@ class Bmw extends utils.Adapter {
       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',
+        url: 'https://cocoapi.bmwgroup.com/eadrax-vcs/v4/vehicles/state?apptimezone=120&appDateTime=' + Date.now() + '&tireGuardMode=ENABLED',
         headers: headers,
       })
         .then(async (res) => {
@@ -820,6 +842,8 @@ class Bmw extends utils.Adapter {
       .then((res) => {
         this.log.debug(JSON.stringify(res.data));
         this.session = res.data;
+
+        this.setState('auth.session', JSON.stringify(this.session), true);
         this.setState('info.connection', true, true);
         return res.data;
       })
@@ -829,12 +853,9 @@ class Bmw extends utils.Adapter {
         error.response && this.log.error(JSON.stringify(error.response.data));
         this.log.error('Start relogin in 1min');
         this.reLoginTimeout && clearTimeout(this.reLoginTimeout);
-        this.reLoginTimeout = setTimeout(
-          () => {
-            this.login();
-          },
-          1000 * 60 * 1,
-        );
+        this.reLoginTimeout = setTimeout(() => {
+          this.login();
+        }, 1000 * 60 * 1);
       });
   }
 
@@ -842,15 +863,22 @@ class Bmw extends utils.Adapter {
    * Is called when adapter shuts down - callback has to be called under any circumstances!
    * @param {() => void} callback
    */
-  onUnload(callback) {
+  async onUnload(callback) {
     try {
       clearTimeout(this.refreshTimeout);
       clearTimeout(this.reLoginTimeout);
       clearInterval(this.updateInterval);
       clearInterval(this.refreshTokenInterval);
       this.demandInterval && clearInterval(this.demandInterval);
+      //get adapter settings and set captcha to null
+      if (this.config.captcha) {
+        const adapterSettings = await this.getForeignObjectAsync('system.adapter.' + this.namespace);
+        adapterSettings.native.captcha = null;
+        await this.setForeignObjectAsync('system.adapter.' + this.namespace, adapterSettings);
+      }
       callback();
     } catch (e) {
+      this.log.error(e);
       callback();
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.bmw",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "Adapter for BMW",
   "author": {
     "name": "TA2k",
@@ -16,27 +16,30 @@
     "url": "https://github.com/TA2k/ioBroker.bmw"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.2.1",
+    "@iobroker/adapter-core": "^3.2.2",
     "axios": "^1.7.7",
-    "http-cookie-agent": "^5.0.4",
+    "http-cookie-agent": "^6.0.6",
     "json-bigint": "^1.0.0",
     "json2iob": "^2.6.12",
-    "qs": "^6.13.0",
-    "tough-cookie": "^4.1.4"
+    "qs": "^6.13.1",
+    "tough-cookie": "^5.0.0"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.8.0",
     "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
-    "@iobroker/testing": "^4.1.3",
+    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/js": "^9.15.0",
+    "@iobroker/testing": "^5.0.0",
     "@tsconfig/node16": "^16.1.3",
-    "@types/node": "^20.16.10",
-    "eslint": "^8.57.1",
+    "@types/node": "^22.9.0",
+    "eslint": "^9.15.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
+    "globals": "^15.12.0",
     "prettier": "^3.3.3",
-    "typescript": "~5.6.2"
+    "typescript": "~5.6.3"
   },
   "main": "main.js",
   "scripts": {