iobroker.bmw 2.6.3 → 2.7.0

package/io-package.json

@@ -1,8 +1,12 @@
 {
   "common": {
     "name": "bmw",
-    "version": "2.6.3",
+    "version": "2.7.0",
     "news": {
+      "2.7.0": {
+        "en": "Improve rate limit handling",
+        "de": "Rate Limit Handling verbessert"
+      },
       "2.6.3": {
         "en": "Add start and stop charging remotes",
         "de": "Start und Stop Charging Remotes hinzugefügt"

package/main.js

@@ -37,6 +37,7 @@ class Bmw extends utils.Adapter {
     this.statusBlock = {};
     this.nonChargingHistory = {};
     this.json2iob = new Json2iob(this);
+    this.lastChargingSessionUpdate = 0;
     this.description = {
       allTrips: "alle Fahrten des Autos",
       avgCombinedConsumption: "Durchschnittlicher kombinierter Verbrauch",
@@ -194,11 +195,13 @@ class Bmw extends utils.Adapter {
       await this.cleanObjects();
       await this.updateDevices();
       this.updateInterval = setInterval(async () => {
+        await this.sleep(2000);
         await this.updateDevices();
       }, this.config.interval * 60 * 1000);
-      this.refreshTokenInterval = setInterval(() => {
-        this.refreshToken();
-      }, this.session.expires_in * 1000);
+      this.refreshTokenInterval = setInterval(async () => {
+        await this.refreshToken();
+        await this.sleep(5000);
+      }, (this.session.expires_in - 123) * 1000);
     }
   }
   async login() {
@@ -334,7 +337,7 @@ class Bmw extends utils.Adapter {
       Accept: "*/*",
       Authorization: "Bearer " + this.session.access_token,
     };
-
+    this.log.debug("getVehicles");
     await this.requestClient({
       method: "get",
       url: "https://b2vapi.bmwgroup.com/webapi/v1/user/vehicles",
@@ -386,7 +389,7 @@ class Bmw extends utils.Adapter {
       host: "cocoapi.bmwgroup.com",
       "24-hour-format": "true",
     };
-
+    this.log.debug("getVehiclesv2");
     await this.requestClient({
       method: "get",
       url: "https://cocoapi.bmwgroup.com/eadrax-vcs/v4/vehicles?apptimezone=120&appDateTime=" + Date.now() + "&tireGuardMode=ENABLED",
@@ -455,8 +458,7 @@ class Bmw extends utils.Adapter {
             descriptions: this.description,
           });
 
-          await this.sleep(5000);
-          this.updateChargingSessionv2(vehicle.vin);
+          await this.updateChargingSessionv2(vehicle.vin);
         }
       })
       .catch((error) => {
@@ -489,11 +491,26 @@ class Bmw extends utils.Adapter {
           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");
+        .catch(async (error) => {
+          if (error.response && error.response.status === 429) {
+            this.log.info(error.response.data.message + " Retry in 5 seconds");
+            await this.sleep(5000);
+            await this.updateDevices();
+            return;
+          }
+          if (error.response && error.response.status === 403) {
+            this.log.warn(error.response.data.message);
+            return;
+          }
+          if (error.response && error.response.status >= 500) {
+            this.log.error("BMW Server is not available");
+          }
+          this.log.error("update failed");
           this.log.error(error);
           error.response && this.log.error(JSON.stringify(error.response.data));
         });
+      await this.updateChargingSessionv2(vin);
+      await this.sleep(10000);
     }
   }
   sleep(ms) {
@@ -503,6 +520,12 @@ class Bmw extends utils.Adapter {
     if (this.nonChargingHistory[vin]) {
       return;
     }
+    if (Date.now() - this.lastChargingSessionUpdate < 1000 * 60 * 60 * 6) {
+      this.log.debug("updateChargingSessionv2 to early " + vin);
+      return;
+    }
+    await this.sleep(10000);
+    this.lastChargingSessionUpdate = Date.now();
     const headers = {
       "user-agent": this.userAgentDart,
       "x-user-agent": this.xuserAgent.replace(";brand;", `;${this.config.brand};`),
@@ -536,6 +559,8 @@ class Bmw extends utils.Adapter {
       name: "charging statistics",
     });
     for (const element of urlArray) {
+      await this.sleep(10000);
+      this.log.debug("update " + vin + element.path);
       await this.requestClient({
         method: "get",
         url: element.url,
@@ -582,7 +607,7 @@ class Bmw extends utils.Adapter {
         })
         .catch((error) => {
           if (error.response) {
-            this.log.info("No charging session available. Ignore " + vin + "until restart");
+            this.log.info("No charging session available. Ignore " + vin + " until restart");
             this.nonChargingHistory[vin] = true;
             return;
           }
@@ -634,6 +659,7 @@ class Bmw extends utils.Adapter {
   }
 
   async refreshToken() {
+    this.log.debug("refresh token");
     await this.requestClient({
       method: "post",
       url: "https://customer.bmwgroup.com/gcdm/oauth/token",
@@ -716,7 +742,7 @@ class Bmw extends utils.Adapter {
         if (action) {
           url += "?action=" + action;
         }
-
+        this.log.debug("Send remote command " + command + " to " + vin);
         await this.requestClient({
           method: "post",
           url: url,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.bmw",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "description": "Adapter for BMW",
   "author": {
     "name": "TA2k",
@@ -17,30 +17,30 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.0.4",
-    "axios": "^1.5.1",
+    "axios": "^1.6.2",
     "http-cookie-agent": "^5.0.4",
     "json-bigint": "^1.0.0",
-    "json2iob": "^2.4.8",
+    "json2iob": "^2.4.11",
     "qs": "^6.11.2",
     "tough-cookie": "^4.1.3"
   },
   "devDependencies": {
     "@iobroker/testing": "^4.1.0",
-    "@types/chai": "^4.3.9",
-    "@types/chai-as-promised": "^7.1.7",
-    "@types/mocha": "^10.0.3",
-    "@types/node": "^20.8.7",
-    "@types/proxyquire": "^1.3.30",
-    "@types/sinon": "^10.0.20",
-    "@types/sinon-chai": "^3.2.11",
+    "@types/chai": "^4.3.11",
+    "@types/chai-as-promised": "^7.1.8",
+    "@types/mocha": "^10.0.6",
+    "@types/node": "^20.10.3",
+    "@types/proxyquire": "^1.3.31",
+    "@types/sinon": "^17.0.2",
+    "@types/sinon-chai": "^3.2.12",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.52.0",
+    "eslint": "^8.55.0",
     "mocha": "^10.2.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^17.0.0",
+    "sinon": "^17.0.1",
     "sinon-chai": "^3.7.0",
-    "typescript": "^5.2.2"
+    "typescript": "^5.3.2"
   },
   "main": "main.js",
   "scripts": {