iobroker.bmw 2.9.0 → 2.9.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021-2024 TA2k <tombox2020@gmail.com>
+Copyright (c) 2021-2030 TA2k <tombox2020@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -25,6 +25,11 @@ bmw.0.VIN.properties
 bmw.0.VIN.remotev2
 
 ## Changelog
+### 2.9.2 (2025-01-29)
+
+- fix Remote Controls
+- add Mitbenutzer Login for remote controls
+
 ### 2.9.0 (2024-11-28)
 
 - added new remotes as switch and updated values
@@ -80,7 +85,7 @@ bmw.0.VIN.remotev2
 
 MIT License
 
-Copyright (c) 2021-2024 TA2k <tombox2020@gmail.com>
+Copyright (c) 2021-2030 TA2k <tombox2020@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/admin/index_m.html

@@ -84,6 +84,15 @@
       <div class="row">
         <div class="col s6 input-field" id="captchaResponse">
           Check Captcha Box and press Submit. Save the form.
+          <p></p>
+          If this is not working use the IP of the ioBroker instance in the browser and try again.
+          <p></p>
+          Or try
+          <a href="https://bimmer-connected.readthedocs.io/en/latest/captcha/rest_of_world.html" target="_blank"
+            >https://bimmer-connected.readthedocs.io/en/latest/captcha/rest_of_world.html</a
+          >
+          and paste the response in Captcha field.
+          <p></p>
           <div>
             <form id="captcha_form" action="#" method="post">
               <!-- hCaptcha widget -->
@@ -147,6 +156,20 @@
           <label for="interval" class="translate">Update interval (in minutes)"</label>
         </div>
       </div>
+      <div class="row">
+        <div class="col s6 input-field">
+          Because of API Quota limits you can use a second account to send remotes to improve the reliability.
+          <p></p>
+          <input type="text" class="value" id="musername" />
+          <label for="musername" class="translate">Mitnutzer App Email</label>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col s6 input-field">
+          <input type="password" class="value" id="mpassword" />
+          <label for="mpassword" class="translate">Mitnutzer App Password</label>
+        </div>
+      </div>
       <div class="row">
         <div class="col s6 input-field">
           <input type="text" class="value" id="ignorelist" />

package/admin/style.css

@@ -2,23 +2,34 @@
 * {
     box-sizing: border-box
 }
+
+body {
+    overflow: hidden;
+}
+
+.adapter-body {
+    overflow: auto;
+}
+
 .m {
     /* Don't cut off dropdowns! */
     overflow: initial;
 }
+
 .m.adapter-container,
-.m.adapter-container > div.App {
+.m.adapter-container>div.App {
     /* Fix layout/scrolling issues with tabs */
     height: 100%;
     width: 100%;
     position: relative;
 }
-.m .select-wrapper + label {
+
+.m .select-wrapper+label {
     /* The positioning for dropdown labels is messed up */
     transform: none !important;
 }
 
-label > i[title] {
+label>i[title] {
     /* Display the help cursor for the tooltip icons and fix their positioning */
     cursor: help;
     margin-left: 0.25em;
@@ -29,4 +40,4 @@ label > i[title] {
     white-space: nowrap;
 }
 
-/* Add your styles here */
+/* Add your styles here */

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "bmw",
-    "version": "2.9.0",
+    "version": "2.9.2",
     "news": {
+      "2.9.2": {
+        "en": "fix Remote Controls\nadd Mitbenutzer Login for remote controls",
+        "de": "remote Controls reparieren\nmitbenutzer Login für Fernbedienungen hinzufügen",
+        "ru": "починить удаленные управления\nдобавить логин Mitbenutzer для дистанционного управления",
+        "pt": "corrigir controles remotos\nadicionar Mitbenutzer Login para controles remotos",
+        "nl": "fix afstandsbedieningen\nmitbenutzer Login toevoegen voor afstandsbedieningen",
+        "fr": "correction des télécommandes\najouter Mitbenutzer Login pour les télécommandes",
+        "it": "correzione di controlli remoti\naggiungere Mitbenutzer Login per i comandi remoti",
+        "es": "controles remotos de fijación\nañadir Mitbenutzer Login para controles remotos",
+        "pl": "naprawić zdalne sterowanie\ndodaj Mitbenutzer Login do zdalnego sterowania",
+        "uk": "виправити дистанційні керування\nдодати Mitbenutzer Увійти для дистанційного керування",
+        "zh-cn": "修复远程控制\n添加远程控制的 Mitbenutzer 登录"
+      },
+      "2.9.1": {
+        "en": "fix Remote Controls\nadd Mitbenutzer Login for remote controls",
+        "de": "remote Controls reparieren\nmitbenutzer Login für Fernbedienungen hinzufügen",
+        "ru": "починить удаленные управления\nдобавить логин Mitbenutzer для дистанционного управления",
+        "pt": "corrigir controles remotos\nadicionar Mitbenutzer Login para controles remotos",
+        "nl": "fix afstandsbedieningen\nmitbenutzer Login toevoegen voor afstandsbedieningen",
+        "fr": "correction des télécommandes\najouter Mitbenutzer Login pour les télécommandes",
+        "it": "correzione di controlli remoti\naggiungere Mitbenutzer Login per i comandi remoti",
+        "es": "controles remotos de fijación\nañadir Mitbenutzer Login para controles remotos",
+        "pl": "naprawić zdalne sterowanie\ndodaj Mitbenutzer Login do zdalnego sterowania",
+        "uk": "виправити дистанційні керування\nдодати Mitbenutzer Увійти для дистанційного керування",
+        "zh-cn": "修复远程控制\n添加远程控制的 Mitbenutzer 登录"
+      },
       "2.9.0": {
         "en": "added new remotes as switch and updated values\nadded retry logic for remotes",
         "de": "neue remotes als switch und mit aktualisierten Werte hinzugefügt\nzusätzliche retry-logik für remotes hinzufgefügt",
@@ -67,14 +93,6 @@
         "pl": "naprawianie zdalnych poleceń",
         "uk": "фіксувати віддалені команди",
         "zh-cn": "修正远程命令"
-      },
-      "2.8.0": {
-        "en": "Add support service demand and trip api",
-        "de": "Support für Service und Trips API hinzugefügt"
-      },
-      "2.7.2": {
-        "en": "Move Rate Limit messages to debug",
-        "de": "Rate Limit Nachrichten in debug verschoben"
       }
     },
     "titleLang": {
@@ -103,8 +121,12 @@
       "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",
@@ -135,11 +157,17 @@
       }
     ]
   },
-  "encryptedNative": ["password"],
-  "protectedNative": ["password"],
+  "encryptedNative": [
+    "password"
+  ],
+  "protectedNative": [
+    "password"
+  ],
   "native": {
     "username": "",
     "password": "",
+    "musername": "",
+    "mpassword": "",
     "interval": 5,
     "brand": "bmw",
     "ignorelist": "",

package/main.js

@@ -28,8 +28,8 @@ class Bmw extends utils.Adapter {
     this.on('stateChange', this.onStateChange.bind(this));
     this.on('unload', this.onUnload.bind(this));
     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.userAgentDart = 'Dart/3.3 (dart:io)';
+    this.xuserAgent = 'android(AP2A.240605.024);brand;4.99.9(96892);row';
     this.updateInterval;
     this.reLoginTimeout;
     this.refreshTokenInterval;
@@ -207,6 +207,20 @@ class Bmw extends utils.Adapter {
 
       await this.login();
     }
+    if (this.config.musername && this.config.mpassword) {
+      const msessionState = await this.getStateAsync('auth.session');
+      if (msessionState && msessionState.val) {
+        this.msession = JSON.parse(msessionState.val);
+        this.log.debug(JSON.stringify(this.msession));
+        await this.refreshToken(true);
+      } else {
+        if (!this.config.captcha) {
+          this.log.error('Please generate a captcha in the instance settings to login the m user');
+          return;
+        }
+        await this.login(true);
+      }
+    }
 
     if (this.session.access_token) {
       this.log.info(`Start getting ${this.config.brand} vehicles`);
@@ -244,12 +258,21 @@ class Bmw extends utils.Adapter {
         async () => {
           await this.refreshToken();
           await this.sleep(5000);
+          if (this.config.musername && this.config.mpassword) {
+            await this.refreshToken(true);
+          }
         },
         (this.session.expires_in - 123) * 1000,
       );
     }
   }
-  async login() {
+  async login(loginSecondUser) {
+    let username = this.config.username;
+    let password = this.config.password;
+    if (loginSecondUser) {
+      username = this.config.musername;
+      password = this.config.mpassword;
+    }
     const headers = {
       Accept: 'application/json, text/plain, */*',
       'User-Agent':
@@ -268,8 +291,8 @@ class Bmw extends utils.Adapter {
       nonce: 'login_nonce',
       code_challenge_method: 'S256',
       code_challenge: codeChallenge,
-      username: this.config.username,
-      password: this.config.password,
+      username: username,
+      password: password,
       grant_type: 'authorization_code',
     };
 
@@ -364,7 +387,7 @@ class Bmw extends utils.Adapter {
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
-        this.session = res.data;
+
         await this.extendObject('auth', {
           type: 'channel',
           common: {
@@ -383,7 +406,23 @@ class Bmw extends utils.Adapter {
           },
           native: {},
         });
-
+        if (loginSecondUser) {
+          this.msession = res.data;
+          await this.extendObject('auth.msession', {
+            type: 'state',
+            common: {
+              name: 'MSession Token',
+              type: 'string',
+              role: 'value',
+              read: true,
+              write: false,
+            },
+            native: {},
+          });
+          await this.setState('auth.msession', JSON.stringify(this.msession), true);
+        } else {
+          this.session = res.data;
+        }
         this.setState('auth.session', JSON.stringify(this.session), true);
         this.setState('info.connection', true, true);
         return res.data;
@@ -483,6 +522,7 @@ class Bmw extends utils.Adapter {
             { command: 'stop-charging', name: 'Stop Charging (Not updated)' },
             { command: 'charging', name: 'Charging True=Start, False=Stop' },
             { command: 'force-refresh', name: 'Force Refresh' },
+            { command: 'fetch-images', name: 'Fetch Images of the car in the image folder' },
             {
               command: 'fetch-charges',
               name: 'Fetch Charge Sessions/Statistics for month',
@@ -556,6 +596,18 @@ class Bmw extends utils.Adapter {
             res.data.state.electricChargingState.remainingChargingMinutes = 0;
           }
           this.json2iob.parse(vin, res.data, { forceIndex: true, descriptions: this.description });
+          await this.extendObject(vin + '.state.rawJSON', {
+            type: 'state',
+            common: {
+              name: 'Raw Data as JSON',
+              type: 'string',
+              role: 'json',
+              write: false,
+              read: true,
+            },
+            native: {},
+          });
+          this.setState(vin + '.state.rawJSON', JSON.stringify(res.data), true);
         })
         .catch(async (error) => {
           if (error.response && error.response.status === 429) {
@@ -908,9 +960,71 @@ class Bmw extends utils.Adapter {
       ':00';
     return date_format_str;
   }
-
-  async refreshToken() {
+  async fetchImages(vin) {
+    const viewsArray = [
+      'FrontView',
+      'RearView',
+      'FrontLeft',
+      'FrontRight',
+      'RearLeft',
+      'RearRight',
+      'SideViewLeft',
+      'Dashboard',
+      'DriverDoor',
+      'RearView',
+    ];
+    const headers = {
+      'user-agent': this.userAgentDart,
+      'x-user-agent': this.xuserAgent.replace(';brand;', `;${this.config.brand};`),
+      authorization: 'Bearer ' + this.session.access_token,
+      'accept-language': 'de-DE',
+      '24-hour-format': 'true',
+      'bmw-vin': vin,
+      accept: 'image/png',
+      'bmw-app-vehicle-type': 'connected',
+    };
+    for (const view of viewsArray) {
+      this.log.info('Fetch image from ' + view + 'to bmw.0.' + vin + '.images.' + view);
+      await this.requestClient({
+        method: 'get',
+        url: 'https://cocoapi.bmwgroup.com/eadrax-ics/v5/presentation/vehicles/images',
+        params: {
+          carView: view,
+          toCrop: true,
+        },
+        headers: headers,
+        responseType: 'arraybuffer',
+      })
+        .then(async (res) => {
+          //save base64 image to state
+          const base64 = Buffer.from(res.data, 'binary').toString('base64');
+          await this.setObjectNotExistsAsync(vin + '.images.' + view, {
+            type: 'state',
+            common: {
+              name: view,
+              type: 'string',
+              role: 'state',
+              read: true,
+              write: false,
+            },
+            native: {},
+          });
+          await this.setState(vin + '.images.' + view, 'data:image/png;base64,' + base64, true);
+        })
+        .catch((error) => {
+          this.log.error('fetch images failed ' + view);
+          this.log.error(error);
+          error.response && this.log.error(JSON.stringify(error.response.data));
+        });
+      await this.sleep(5000);
+    }
+  }
+  async refreshToken(useSecondUser) {
     this.log.debug('refresh token');
+    let refresh_token = this.session.refresh_token;
+    if (useSecondUser) {
+      refresh_token = this.msession.refresh_token;
+    }
     await this.requestClient({
       method: 'post',
       url: 'https://customer.bmwgroup.com/gcdm/oauth/token',
@@ -920,11 +1034,17 @@ class Bmw extends utils.Adapter {
         Accept: '*/*',
         Authorization: 'Basic MzFjMzU3YTAtN2ExZC00NTkwLWFhOTktMzNiOTcyNDRkMDQ4OmMwZTMzOTNkLTcwYTItNGY2Zi05ZDNjLTg1MzBhZjY0ZDU1Mg==',
       },
-      data: 'redirect_uri=com.bmw.connected://oauth&refresh_token=' + this.session.refresh_token + '&grant_type=refresh_token',
+      data: 'redirect_uri=com.bmw.connected://oauth&refresh_token=' + refresh_token + '&grant_type=refresh_token',
     })
       .then((res) => {
         this.log.debug(JSON.stringify(res.data));
-        this.session = res.data;
+        if (useSecondUser) {
+          this.msession = res.data;
+
+          this.setState('auth.msession', JSON.stringify(this.msession), true);
+        } else {
+          this.session = res.data;
+        }
 
         this.setState('auth.session', JSON.stringify(this.session), true);
         this.setState('info.connection', true, true);
@@ -990,6 +1110,11 @@ class Bmw extends utils.Adapter {
           this.updateDevices();
           return;
         }
+        if (command === 'fetch-images') {
+          this.log.info('fetch images');
+          await this.fetchImages(vin);
+          return;
+        }
         if (command === 'fetch-charges') {
           this.log.info('fetch charges');
           await this.updateChargingSessionv2(vin, 200, state.val);
@@ -1015,11 +1140,15 @@ class Bmw extends utils.Adapter {
         }
         const action = command.split('_')[1];
         command = command.split('_')[0];
-
+        let access_token = this.session.access_token;
+        if (this.msession) {
+          this.log.debug('Use second user for remote command');
+          access_token = this.msession.access_token;
+        }
         const headers = {
           'user-agent': this.userAgentDart,
           'x-user-agent': this.xuserAgent.replace(';brand;', `;${this.config.brand};`),
-          authorization: 'Bearer ' + this.session.access_token,
+          authorization: 'Bearer ' + access_token,
           'accept-language': 'de-DE',
           host: 'cocoapi.bmwgroup.com',
           '24-hour-format': 'true',
@@ -1063,11 +1192,13 @@ class Bmw extends utils.Adapter {
                 if (res === 'EXECUTED') {
                   this.log.info('Remote command executed');
                 } else {
-                  this.log.info('Event is not finished it is: ' + res);
+                  this.log.info('Remote Event is not finished it is: ' + res);
                   await this.sleep(10000);
                   this.checkEventStatus(eventId, headers).then((res) => {
                     if (res === 'EXECUTED') {
                       this.log.info('Remote command executed');
+                    } else if (res === 'RUNNING') {
+                      this.log.info('Remote command is still running');
                     } else {
                       this.log.error('Remote command failed ' + res);
                     }
@@ -1137,10 +1268,10 @@ class Bmw extends utils.Adapter {
       this.log.debug(JSON.stringify(res.data));
       return res.data.rsEventStatus;
     } catch (error) {
-      this.log.error('Remote command status failed');
-      this.log.error(error);
+      this.log.warn('Cannot Fetch the status of the sent command. Status is Unknown');
+      this.log.warn(error);
       if (error.response) {
-        this.log.error(JSON.stringify(error.response.data));
+        this.log.warn(JSON.stringify(error.response.data));
         if (error.response.status === 403) {
           return 'Rate Limit exceeded';
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.bmw",
-  "version": "2.9.0",
+  "version": "2.9.2",
   "description": "Adapter for BMW",
   "author": {
     "name": "TA2k",
@@ -16,14 +16,14 @@
     "url": "https://github.com/TA2k/ioBroker.bmw"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.2.2",
-    "axios": "^1.7.7",
+    "@iobroker/adapter-core": "^3.2.3",
+    "axios": "^1.7.9",
     "axios-retry": "^4.5.0",
-    "http-cookie-agent": "^6.0.6",
+    "http-cookie-agent": "^6.0.8",
     "json-bigint": "^1.0.0",
-    "json2iob": "^2.6.12",
-    "qs": "^6.13.1",
-    "tough-cookie": "^5.0.0"
+    "json2iob": "^2.6.14",
+    "qs": "^6.14.0",
+    "tough-cookie": "^5.1.0"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^3.8.0",
@@ -31,16 +31,16 @@
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.15.0",
-    "@iobroker/testing": "^5.0.0",
+    "@eslint/js": "^9.19.0",
+    "@iobroker/testing": "^5.0.3",
     "@tsconfig/node16": "^16.1.3",
-    "@types/node": "^22.9.1",
-    "eslint": "^9.15.0",
+    "@types/node": "^22.12.0",
+    "eslint": "^9.19.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
-    "globals": "^15.12.0",
-    "prettier": "^3.3.3",
-    "typescript": "~5.6.3"
+    "eslint-plugin-prettier": "^5.2.3",
+    "globals": "^15.14.0",
+    "prettier": "^3.4.2",
+    "typescript": "~5.7.3"
   },
   "main": "main.js",
   "scripts": {