iobroker.renault 0.0.23 → 0.0.24

package/README.md

@@ -9,17 +9,18 @@
 
 **Tests:** ![Test and Release](https://github.com/TA2k/ioBroker.renault/workflows/Test%20and%20Release/badge.svg)
 
-## Renault / Dacia adapter for ioBroker
+## Renault / Dacia / Alpine adapter for ioBroker
 
-This adapter connects ioBroker to the My Renault / My Dacia cloud and exposes vehicle status data (battery, charging, HVAC, mileage, ...) as well as remote commands (HVAC start, charging start/stop, force refresh) for compatible Renault and Dacia models such as the Renault Zoe, Megane E-Tech, Kangoo E-Tech and the Dacia Spring.
+This adapter connects ioBroker to the My Renault / My Dacia / My Alpine cloud and exposes vehicle status data (battery, charging, HVAC, mileage, ...) as well as remote commands (HVAC start, charging start/stop, force refresh) for compatible Renault, Dacia and Alpine models such as the Renault Zoe, Megane E-Tech, Kangoo E-Tech, the Dacia Spring and the Alpine A290.
 
 ## Installation / Login
 
 1. Install the adapter via the ioBroker admin UI.
-2. Open the adapter configuration and enter the credentials of your **My Renault** (or **My Dacia**) account: app email and app password.
-3. Set the **country** to the two-letter country code matching your account (e.g. `de`, `fr`, `it`, `es`).
-4. Optionally set the polling **interval** in minutes and the **API key** (leave empty for auto-detect).
-5. Save and the instance will start polling.
+2. Open the adapter configuration and enter the credentials of your **My Renault** (or **My Dacia** / **My Alpine**) account: app email and app password.
+3. Select the **brand** matching your app: `Renault / Dacia` or `Alpine` (they use separate accounts and API keys).
+4. Set the **country** to the two-letter country code matching your account (e.g. `de`, `fr`, `it`, `es`).
+5. Optionally set the polling **interval** in minutes and the **API key** (leave empty for auto-detect).
+6. Save and the instance will start polling.
 
 ## Remote control
 
@@ -47,6 +48,10 @@ ioBroker forum: <https://forum.iobroker.net/topic/48074/test-adapter-renault-v0-
   ### **WORK IN PROGRESS**
 -->
 
+### 0.0.24
+
+- (TA2k) add Alpine support: brand selection (Alpine accounts use the same Renault Gigya/Kamereon tenant, only product/account type MYALPINE differs)
+
 ### 0.0.23
 
 - (TA2k) align API headers with My Renault Android app, drop EOL Node 18/20, migrate admin UI to jsonConfig

package/admin/i18n/de/translations.json

@@ -3,6 +3,8 @@
   "App Email": "App E-Mail",
   "App Password": "App Passwort",
   "Country": "Land",
+  "Brand": "Marke",
+  "Renault/Dacia and Alpine use different accounts and API keys": "Renault/Dacia und Alpine nutzen unterschiedliche Konten und API-Schlüssel",
   "Two-letter country code, e.g. de, fr, it, es": "Zweistelliger Ländercode, z.B. de, fr, it, es",
   "Polling": "Abfrage",
   "Update interval in minutes": "Aktualisierungsintervall in Minuten",

package/admin/i18n/en/translations.json

@@ -3,6 +3,8 @@
   "App Email": "App Email",
   "App Password": "App Password",
   "Country": "Country",
+  "Brand": "Brand",
+  "Renault/Dacia and Alpine use different accounts and API keys": "Renault/Dacia and Alpine use different accounts and API keys",
   "Two-letter country code, e.g. de, fr, it, es": "Two-letter country code, e.g. de, fr, it, es",
   "Polling": "Polling",
   "Update interval in minutes": "Update interval in minutes",

package/admin/jsonConfig.json

@@ -28,6 +28,22 @@
       "lg": 4,
       "xl": 4
     },
+    "brand": {
+      "type": "select",
+      "label": "Brand",
+      "help": "Renault/Dacia and Alpine use different accounts and API keys",
+      "default": "renault",
+      "options": [
+        { "label": "Renault / Dacia", "value": "renault" },
+        { "label": "Alpine", "value": "alpine" }
+      ],
+      "newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 4,
+      "lg": 2,
+      "xl": 2
+    },
     "country": {
       "type": "text",
       "label": "Country",
@@ -67,6 +83,21 @@
       "lg": 4,
       "xl": 4
     },
+    "chargeHistoryLimit": {
+      "type": "number",
+      "label": "Charge history entries to keep",
+      "help": "Number of most recent entries kept per charge-history endpoint (0 = unlimited)",
+      "min": 0,
+      "max": 1000,
+      "default": 100,
+      "hidden": "data.disableChargeFetching === true",
+      "newLine": true,
+      "xs": 12,
+      "sm": 12,
+      "md": 4,
+      "lg": 2,
+      "xl": 2
+    },
     "_apiHeader": {
       "type": "header",
       "text": "API Key",

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "renault",
-    "version": "0.0.23",
+    "version": "0.0.24",
     "news": {
+      "0.0.24": {
+        "en": "add Alpine support (select brand Alpine in the settings)",
+        "de": "Alpine-Unterstützung hinzugefügt (Marke Alpine in den Einstellungen wählen)",
+        "ru": "Добавлена поддержка Alpine (выберите марку Alpine в настройках)",
+        "pt": "Suporte para Alpine adicionado (selecione a marca Alpine nas definições)",
+        "nl": "Alpine-ondersteuning toegevoegd (selecteer merk Alpine in de instellingen)",
+        "fr": "Prise en charge d'Alpine ajoutée (sélectionnez la marque Alpine dans les paramètres)",
+        "it": "Aggiunto supporto Alpine (seleziona il marchio Alpine nelle impostazioni)",
+        "es": "Añadido soporte para Alpine (seleccione la marca Alpine en los ajustes)",
+        "pl": "Dodano obsługę Alpine (wybierz markę Alpine w ustawieniach)",
+        "uk": "Додано підтримку Alpine (виберіть марку Alpine в налаштуваннях)",
+        "zh-cn": "新增 Alpine 支持（在设置中选择品牌 Alpine）"
+      },
       "0.0.23": {
         "en": "align API headers with My Renault Android app (User-Agent okhttp/5.3.0, X-Amzn-Trace-Id)",
         "de": "API-Header an My-Renault-Android-App angeglichen (User-Agent okhttp/5.3.0, X-Amzn-Trace-Id)",
@@ -163,10 +176,12 @@
   "native": {
     "username": "",
     "country": "de",
+    "brand": "renault",
     "password": "",
     "apiKeyUpdate": "",
     "interval": 10,
-    "disableChargeFetching": false
+    "disableChargeFetching": false,
+    "chargeHistoryLimit": 100
   },
   "objects": [],
   "instanceObjects": [
@@ -190,6 +205,19 @@
         "def": false
       },
       "native": {}
+    },
+    {
+      "_id": "info.migrationV1",
+      "type": "state",
+      "common": {
+        "role": "indicator",
+        "name": "Migration V1 (charge history forceIndex) executed",
+        "type": "boolean",
+        "read": true,
+        "write": false,
+        "def": false
+      },
+      "native": {}
     }
   ]
 }

package/main.js

@@ -38,7 +38,9 @@ class Renault extends utils.Adapter {
       const v = c === 'x' ? r : (r & 0x3) | 0x8;
       return v.toString(16);
     });
-    return 'build=renault-android-6.11.2;trId=' + uuid;
+    const brand = this.brand || 'renault';
+    const version = brand === 'alpine' ? '6.10.1' : '6.11.2';
+    return 'build=' + brand + '-android-' + version + ';trId=' + uuid;
   }
 
   /**
@@ -55,10 +57,18 @@ class Renault extends utils.Adapter {
     this.reLoginTimeout = null;
     this.refreshTokenTimeout = null;
     this.country = this.config.country || 'de';
+    this.brand = this.config.brand || 'renault';
     this.session = {};
-    //DE API Key
+    //DE API Key (shared by Renault, Dacia and Alpine - same Gigya/Kamereon tenant)
     this.apiKey = '3_VgdkgtIRH3AdHvJm-cjV2ug2EFE0lxt0IJzMC4MFqZjFpn_GYFXVdNZ19L7wZX0N';
     this.apiKeyUpdate = 'YjkKtHmGfaceeuExUDKGxrLZGGvtVS0J';
+    if (this.brand === 'alpine') {
+      this.product = 'MYALPINE';
+      this.accountTypes = ['MYALPINE'];
+    } else {
+      this.product = 'MYRENAULT';
+      this.accountTypes = ['MYRENAULT', 'MYDACIA'];
+    }
     try {
       await this.requestClient({
         method: 'get',
@@ -88,6 +98,7 @@ class Renault extends utils.Adapter {
 
     if (this.session.id_token && this.session_data && this.account) {
       await this.getDeviceList();
+      await this.migrateChargeHistoryV1();
       await this.updateDevices();
       this.updateInterval = setInterval(
         async () => {
@@ -169,7 +180,11 @@ class Renault extends utils.Adapter {
       });
     await this.requestClient({
       method: 'post',
-      url: 'https://apis.renault.com/myr/api/v1/connection?&country=DE&product=MYRENAULT&locale=de-DE&displayAccounts=MYRENAULT',
+      url:
+        'https://apis.renault.com/myr/api/v1/connection?&country=DE&product=' +
+        this.product +
+        '&locale=de-DE&displayAccounts=' +
+        this.product,
       headers: {
         'Content-Type': 'application/json',
         Accept: '*/*',
@@ -182,8 +197,9 @@ class Renault extends utils.Adapter {
       .then((res) => {
         this.log.debug(JSON.stringify(res.data));
 
+        const accountTypes = this.accountTypes;
         const filteredAccounts = res.data.currentUser.accounts.filter(function (el) {
-          return (el.accountType === 'MYRENAULT' || el.accountType === 'MYDACIA') && el.accountStatus === 'ACTIVE';
+          return accountTypes.includes(el.accountType) && el.accountStatus === 'ACTIVE';
         });
         if (filteredAccounts.length === 0) {
           this.log.error('No Account found');
@@ -259,7 +275,12 @@ class Renault extends utils.Adapter {
 
           const remoteArray = [
             { command: 'actions/hvac-start', name: 'True = Start, False = Stop' },
-            { command: 'hvac-temperature', name: 'HVAC Temperature', type: 'number', role: 'value' },
+            {
+              command: 'hvac-temperature',
+              name: 'HVAC Temperature',
+              type: /** @type {ioBroker.CommonType} */ ('number'),
+              role: 'value',
+            },
             { command: 'actions/charging-start', name: 'True = Start, False = Stop' },
             { command: 'charge/pause-resume', name: 'True = Start, False = Stop' },
             { command: 'charge/start', name: 'True = Start, False = Stop' },
@@ -270,7 +291,7 @@ class Renault extends utils.Adapter {
               type: 'state',
               common: {
                 name: remote.name || '',
-                type: remote.type || 'boolean',
+                type: /** @type {ioBroker.CommonType} */ (remote.type || 'boolean'),
                 role: remote.role || 'button',
                 write: true,
                 read: true,
@@ -289,12 +310,40 @@ class Renault extends utils.Adapter {
       });
   }
 
+  /**
+   * One-shot migration: with v0.0.24 the charge-history and charges endpoints switched from
+   * date-named channels (e.g. `20220802`, `2022-04-22T11:46:38Z`) to numeric forceIndex slots.
+   * Without cleanup the old objects would linger forever next to the new ones. The marker state
+   * `info.migrationV1` ensures this only runs once per instance.
+   */
+  async migrateChargeHistoryV1() {
+    try {
+      const marker = await this.getStateAsync('info.migrationV1');
+      if (marker && marker.val === true) {
+        return;
+      }
+      this.log.info('Running charge history migration V1: cleaning up legacy date-named channels');
+      for (const vin of this.deviceArray) {
+        for (const path of ['charge-history', 'charges']) {
+          await this.delObjectAsync(vin + '.' + path, { recursive: true }).catch(() => {});
+        }
+      }
+      await this.setState('info.migrationV1', { val: true, ack: true });
+      this.log.info('Charge history migration V1 done');
+    } catch (e) {
+      this.log.warn('Charge history migration V1 failed: ' + e);
+    }
+  }
+
   async updateDevices() {
     if (!this.account.accountId) {
       this.log.error('No accountId found');
       return;
     }
     const curDate = new Date().toISOString().split('T')[0];
+    // Charge history: limit start date to ~1 year back (My Renault app paginates yearly).
+    // Keeping the range bounded prevents the API from returning years of data on every poll.
+    const historyStart = new Date(Date.now() - 365 * 24 * 60 * 60 * 1000).toISOString().split('T')[0];
 
     const statusArray = [
       {
@@ -405,22 +454,28 @@ class Renault extends utils.Adapter {
         url:
           'https://api-wired-prod-1-euw1.wrd-aws.com/commerce/v1/accounts/' +
           this.account.accountId +
-          '/kamereon/kca/car-adapter/v1/cars/$vin/charge-history?type=day&start=1970-01-01&end=' +
+          '/kamereon/kca/car-adapter/v1/cars/$vin/charge-history?type=day&start=' +
+          historyStart +
+          '&end=' +
           curDate +
           '&country=' +
           this.country,
         desc: 'Charging history of the car',
+        isHistory: true,
       });
       statusArray.push({
         path: 'charges',
         url:
           'https://api-wired-prod-1-euw1.wrd-aws.com/commerce/v1/accounts/' +
           this.account.accountId +
-          '/kamereon/kca/car-adapter/v1/cars/$vin/charges?start=1970-01-01&end=' +
+          '/kamereon/kca/car-adapter/v1/cars/$vin/charges?start=' +
+          historyStart +
+          '&end=' +
           curDate +
           '&country=' +
           this.country,
         desc: 'Charges of the car',
+        isHistory: true,
       });
     }
 
@@ -444,7 +499,7 @@ class Renault extends utils.Adapter {
           url: url,
           headers: { ...headers, 'X-Amzn-Trace-Id': this.buildTraceId() },
         })
-          .then((res) => {
+          .then(async (res) => {
             this.log.debug(JSON.stringify(res.data));
             if (!res.data) {
               return;
@@ -454,9 +509,24 @@ class Renault extends utils.Adapter {
               data = res.data.data.attributes;
             }
 
-            const forceIndex = undefined;
+            let forceIndex = undefined;
             const preferedArrayName = undefined;
 
+            // Charge history endpoints return arrays keyed by date — without forceIndex
+            // json2iob creates a new channel per date and never cleans them up. Cap to the
+            // configured limit (default 100, matches the My Renault app pagination) and use
+            // numeric indices so old entries are overwritten on each poll. The one-shot
+            // migrateChargeHistoryV1() removes the legacy date-named channels on first start.
+            if (element.isHistory) {
+              forceIndex = true;
+              const arrayKey = element.path === 'charge-history' ? 'chargeSummaries' : 'charges';
+              const limit = Number(this.config.chargeHistoryLimit);
+              const cap = Number.isFinite(limit) && limit > 0 ? limit : 0;
+              if (cap > 0 && data && Array.isArray(data[arrayKey]) && data[arrayKey].length > cap) {
+                data = { ...data, [arrayKey]: data[arrayKey].slice(-cap) };
+              }
+            }
+
             this.json2iob.parse(vin + '.' + element.path, data, {
               forceIndex: forceIndex,
               preferedArrayName: preferedArrayName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.renault",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "description": "Adapter for Renault and Renault",
   "author": {
     "name": "TA2k",
@@ -25,27 +25,28 @@
     "url": "https://github.com/TA2k/ioBroker.renault"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.3.2",
-    "axios": "^1.16.1",
+    "@iobroker/adapter-core": "^3.4.3",
+    "axios": "^1.20.0",
     "json-bigint": "^1.0.0",
-    "json2iob": "^2.6.22",
-    "qs": "^6.15.2"
+    "json2iob": "^2.6.26",
+    "qs": "^6.16.0"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^5.2.0",
+    "@alcalzone/release-script": "^5.2.1",
     "@alcalzone/release-script-plugin-iobroker": "^5.2.0",
-    "@alcalzone/release-script-plugin-license": "^5.2.0",
+    "@alcalzone/release-script-plugin-license": "^5.2.2",
     "@alcalzone/release-script-plugin-manual-review": "^5.2.0",
-    "@eslint/eslintrc": "^3.3.5",
+    "@eslint/eslintrc": "^3.3.7",
     "@eslint/js": "^10.0.1",
-    "@iobroker/testing": "^5.2.2",
-    "@tsconfig/node18": "^18.2.6",
-    "@types/node": "^25.9.1",
-    "eslint": "^10.4.0",
+    "@iobroker/testing": "^5.3.0",
+    "@tsconfig/node18": "^18.2.7",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^25.9.6",
+    "eslint": "^10.10.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.5",
-    "globals": "^17.6.0",
-    "prettier": "^3.8.3",
+    "eslint-plugin-prettier": "^5.5.6",
+    "globals": "^17.12.0",
+    "prettier": "^3.9.6",
     "typescript": "~6.0.3"
   },
   "main": "main.js",