iobroker.bmw 2.5.5 → 2.5.6

package/README.md

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

package/io-package.json

@@ -1,8 +1,11 @@
 {
   "common": {
     "name": "bmw",
-    "version": "2.5.5",
+    "version": "2.5.6",
     "news": {
+      "2.5.6": {
+        "en": "Fix charging message"
+      },
       "2.5.5": {
         "en": "Fix login"
       },

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");
@@ -104,7 +102,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 +141,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 +166,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",
@@ -397,8 +391,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 +445,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 +479,6 @@ class Bmw extends utils.Adapter {
     try {
       clearTimeout(this.refreshTimeout);
       clearTimeout(this.reLoginTimeout);
-      clearTimeout(this.refreshTokenTimeout);
       clearInterval(this.updateInterval);
       clearInterval(this.refreshTokenInterval);
       callback();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.bmw",
-  "version": "2.5.5",
+  "version": "2.5.6",
   "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": {