iobroker.renault 0.0.14 → 0.0.16

package/io-package.json

@@ -1,8 +1,14 @@
 {
   "common": {
     "name": "renault",
-    "version": "0.0.14",
+    "version": "0.0.16",
     "news": {
+      "0.0.16": {
+        "en": "update apikey"
+      },
+      "0.0.15": {
+        "en": "fix charge start and reduce error logs"
+      },
       "0.0.14": {
         "en": "add charging stop"
       },

package/main.js

@@ -7,10 +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 qs = require("qs");
 const Json2iob = require("./lib/json2iob");
-const descriptions = require("./lib/descriptions");
 
 class Renault extends utils.Adapter {
   /**
@@ -28,6 +27,7 @@ class Renault extends utils.Adapter {
     this.json2iob = new Json2iob(this);
     this.ignoreState = {};
     this.firstUpdate = true;
+    this.requestClient = axios.create();
   }
 
   /**
@@ -40,7 +40,6 @@ class Renault extends utils.Adapter {
       this.log.info("Set interval to minimum 0.5");
       this.config.interval = 0.5;
     }
-    this.requestClient = axios.create();
     this.updateInterval = null;
     this.reLoginTimeout = null;
     this.refreshTokenTimeout = null;
@@ -48,7 +47,25 @@ class Renault extends utils.Adapter {
     this.session = {};
     //DE API Key
     this.apiKey = "3_7PLksOyBRkHv126x5WhHb-5pqC1qFR8pQjxSeLB6nhAnPERTUlwnYoznHSxwX668";
-    this.apiKeyUpdate = "VAX7XYKGfa92yMvXculCkEFyfZbuM7Ss";
+    this.apiKeyUpdate = "YjkKtHmGfaceeuExUDKGxrLZGGvtVS0J";
+    await this.requestClient({
+      method: "get",
+      url: "https://raw.githubusercontent.com/db-EV/ZoePHP/main/src/api-keys.php",
+    })
+
+      .then((res) => {
+        this.log.debug(JSON.stringify(res.data));
+        const data = res.data;
+        //find kamereon_api via regex
+        const regex = /\$kamereon_api\s*=\s*['"]([^'"]+)['"]/;
+        const match = data.match(regex);
+        if (match && match[1]) {
+          this.apiKeyUpdate = match[1];
+        }
+      })
+      .catch((error) => {
+        this.log.debug(error);
+      });
     if (this.config.apiKeyUpdate) {
       this.apiKeyUpdate = this.config.apiKeyUpdate;
     }
@@ -157,6 +174,7 @@ class Renault extends utils.Adapter {
           this.log.error("Filtered accounts: " + filteredAccounts);
           return;
         }
+
         this.account = filteredAccounts[0];
       })
       .catch((error) => {
@@ -235,7 +253,7 @@ class Renault extends utils.Adapter {
               common: {
                 name: remote.name || "",
                 type: remote.type || "boolean",
-                role: remote.role || "boolean",
+                role: remote.role || "button",
                 write: true,
                 read: true,
               },
@@ -253,6 +271,10 @@ class Renault extends utils.Adapter {
   }
 
   async updateDevices() {
+    if (!this.account.accountId) {
+      this.log.error("No accountId found");
+      return;
+    }
     const curDate = new Date().toISOString().split("T")[0];
 
     const statusArray = [
@@ -423,7 +445,7 @@ class Renault extends utils.Adapter {
               if (error.response.status === 401) {
                 error.response && this.log.debug(JSON.stringify(error.response.data));
                 this.log.info(element.path + " receive 401 error. Refresh Token in 60 seconds");
-                clearTimeout(this.refreshTokenTimeout);
+                this.refreshTokenTimeout && clearTimeout(this.refreshTokenTimeout);
                 this.refreshTokenTimeout = setTimeout(() => {
                   this.refreshToken();
                 }, 1000 * 60);
@@ -439,6 +461,9 @@ class Renault extends utils.Adapter {
                   error.response.status === 502 ||
                   error.response.status === 400
                 ) {
+                  if (!this.ignoreState[vin]) {
+                    this.ignoreState[vin] = [];
+                  }
                   this.ignoreState[vin].push(element.path);
                   this.log.info("Feature not found for " + vin + ". Ignore " + element.path + " for updates.");
                   this.log.debug(error);
@@ -447,6 +472,10 @@ class Renault extends utils.Adapter {
                 }
               }
             }
+            if (error.response && error.response.status >= 500) {
+              this.log.warn(`Renault Server error: ${error.response.status} `);
+              return;
+            }
             this.log.error(url);
             this.log.error(error);
             error.response && this.log.error(JSON.stringify(error.response.data));
@@ -502,6 +531,8 @@ class Renault extends utils.Adapter {
     if (!string) {
       return;
     }
+    string = string.replace("actions/", "");
+    string = string.replace("/", "-");
     const camelC = string.replace(/-([a-z])/g, function (g) {
       return g[1].toUpperCase();
     });
@@ -515,9 +546,9 @@ class Renault extends utils.Adapter {
     try {
       this.setState("info.connection", false, true);
       clearTimeout(this.refreshTimeout);
-      clearTimeout(this.reLoginTimeout);
-      clearTimeout(this.refreshTokenTimeout);
-      clearInterval(this.updateInterval);
+      this.reLoginTimeout && clearTimeout(this.reLoginTimeout);
+      this.refreshTokenTimeout && clearTimeout(this.refreshTokenTimeout);
+      this.updateInterval && clearInterval(this.updateInterval);
       clearInterval(this.refreshTokenInterval);
       callback();
     } catch (e) {
@@ -549,10 +580,12 @@ class Renault extends utils.Adapter {
         }
         const command = path.split("/")[1];
         let action = state.val ? "start" : "cancel";
-        if (path === "charging-start") {
-          action = state.val ? "start" : "stop";
+        let midPart = "kca/car-adapter/v1/cars/";
+        if (path === "charge/pause-resume") {
+          action = state.val ? "resume" : "pause";
+          midPart = "kcm/v1/vehicles/";
         }
-        const data = { data: { type: this.toCamelCase(command), attributes: { action: action } } };
+        const data = { data: { type: this.toCamelCase(path), attributes: { action: action } } };
         if (command === "hvac-start") {
           const temperatureState = await this.getStateAsync(deviceId + ".remote.hvac-temperature");
           if (temperatureState) {
@@ -564,7 +597,8 @@ class Renault extends utils.Adapter {
         const url =
           "https://api-wired-prod-1-euw1.wrd-aws.com/commerce/v1/accounts/" +
           this.account.accountId +
-          "/kamereon/kca/car-adapter/v1/cars/" +
+          "/kamereon/" +
+          midPart +
           deviceId +
           "/" +
           path +
@@ -586,7 +620,7 @@ class Renault extends utils.Adapter {
           data: data,
         })
           .then((res) => {
-            this.log.debug(JSON.stringify(res.data));
+            this.log.info(JSON.stringify(res.data));
             return res.data;
           })
           .catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.renault",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "Adapter for Renault and Renault",
   "author": {
     "name": "TA2k",
@@ -24,29 +24,28 @@
     "url": "https://github.com/TA2k/ioBroker.renault"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.2",
-    "axios": "^0.27.2",
+    "@iobroker/adapter-core": "^2.6.8",
+    "axios": "^1.3.6",
     "json-bigint": "^1.0.0",
-    "qs": "^6.11.0"
+    "qs": "^6.11.1"
   },
   "devDependencies": {
     "@iobroker/testing": "^4.1.0",
-    "@types/chai": "^4.3.3",
+    "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
-    "@types/gulp": "^4.0.9",
-    "@types/mocha": "^9.1.1",
-    "@types/node": "^18.7.16",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.15.12",
     "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^10.0.13",
-    "@types/sinon-chai": "^3.2.8",
-    "chai": "^4.3.6",
+    "@types/sinon": "^10.0.14",
+    "@types/sinon-chai": "^3.2.9",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.23.0",
-    "mocha": "^10.0.0",
+    "eslint": "^8.38.0",
+    "mocha": "^10.2.0",
     "proxyquire": "^2.1.3",
-    "sinon": "^14.0.0",
+    "sinon": "^15.0.3",
     "sinon-chai": "^3.7.0",
-    "typescript": "^4.8.3"
+    "typescript": "^5.0.4"
   },
   "main": "main.js",
   "files": [