iobroker.toyota 0.2.6 → 0.4.0

package/io-package.json

@@ -1,8 +1,16 @@
 {
   "common": {
     "name": "toyota",
-    "version": "0.2.6",
+    "version": "0.4.0",
     "news": {
+      "0.4.0": {
+        "en": "Align with MyToyota APK 2.25.2: fix climate command (start/stop), update electric status endpoint, update headers",
+        "de": "Angleichung an MyToyota APK 2.25.2: Klimasteuerung (start/stop) korrigiert, Electric-Status-Endpunkt und Header aktualisiert"
+      },
+      "0.2.7": {
+        "en": "Align with MyToyota APK 2.25.2: fix climate command (start/stop), update electric status endpoint, update headers",
+        "de": "Angleichung an MyToyota APK 2.25.2: Klimasteuerung (start/stop) korrigiert, Electric-Status-Endpunkt und Header aktualisiert"
+      },
       "0.2.6": {
         "en": "Skip endpoints that are not available",
         "de": "Überspringen von Endpunkten, die nicht verfügbar sind"

package/lib/tools.js

@@ -64,7 +64,7 @@ async function translateYandex(text, targetLang, apiKey) {
     }
     throw new Error('Invalid response for translate request');
   } catch (e) {
-    throw new Error(`Could not translate to "${targetLang}": ${e}`);
+    throw new Error(`Could not translate to "${targetLang}": ${e}`, { cause: e });
   }
 }
 
@@ -87,9 +87,9 @@ async function translateGoogle(text, targetLang) {
     throw new Error('Invalid response for translate request');
   } catch (e) {
     if (e.response && e.response.status === 429) {
-      throw new Error(`Could not translate to "${targetLang}": Rate-limited by Google Translate`);
+      throw new Error(`Could not translate to "${targetLang}": Rate-limited by Google Translate`, { cause: e });
     } else {
-      throw new Error(`Could not translate to "${targetLang}": ${e}`);
+      throw new Error(`Could not translate to "${targetLang}": ${e}`, { cause: e });
     }
   }
 }

package/main.js

@@ -13,6 +13,9 @@ const qs = require('qs');
 const tough = require('tough-cookie');
 const { HttpsCookieAgent } = require('http-cookie-agent/http');
 const jwt = require('jsonwebtoken');
+const { v4: uuidv4 } = require('uuid');
+const crypto = require('crypto');
+
 class Toyota extends utils.Adapter {
   /**
    * @param {Partial<utils.AdapterOptions>} [options={}]
@@ -43,8 +46,10 @@ class Toyota extends utils.Adapter {
     this.updateInterval = null;
     this.reLoginTimeout = null;
     this.refreshTokenTimeout = null;
-    this.hostName = 'myt-agg.toyota-europe.com';
     this.brand = 'T';
+    // Aligned with MyToyota APK 2.25.2
+    this.CLIENT_VERSION = '2.25.2';
+    this.API_VERSION = 'resource=2.1, protocol=1.0';
   }
 
   /**
@@ -65,7 +70,6 @@ class Toyota extends utils.Adapter {
     if (this.config.type === 'lexus') {
       this.log.info('Login to Lexus');
       this.brand = 'L';
-      this.hostName = 'lexuslink-agg.toyota-europe.com';
     }
     if (!this.config.username || !this.config.password) {
       this.log.error('No username or password set');
@@ -92,6 +96,7 @@ class Toyota extends utils.Adapter {
       }, 3500 * 1000);
     }
   }
+
   async login() {
     this.log.info('Login to Toyota');
     const firstResponse = await this.requestClient({
@@ -99,20 +104,7 @@ class Toyota extends utils.Adapter {
       maxBodyLength: Infinity,
       url: 'https://b2c-login.toyota-europe.com/json/realms/root/realms/tme/authenticate?authIndexType=service&authIndexValue=oneapp',
       headers: {
-        'x-osname': 'iOS',
-        'x-brand': this.brand,
-        accept: '*/*',
-        'x-channel': 'ONEAPP',
-        brand: this.brand,
-        'x-region': 'EU',
-        'x-appbrand': this.brand,
-        'x-correlationid': 'B10AD742-22D0-4211-8B25-B213BE9A8A00',
-        'x-osversion': '16.7.2',
-        'accept-language': 'de-DE,de;q=0.9',
-        region: 'EU',
-        'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-        'accept-api-version': 'resource=2.0, protocol=1.0',
-        'x-appversion': '2.4.2',
+        ...this.buildLoginHeaders('B10AD742-22D0-4211-8B25-B213BE9A8A00'),
         Cookie: 'route=e8e8b55de08efd3c4b34265c0069d319',
       },
     })
@@ -127,26 +119,14 @@ class Toyota extends utils.Adapter {
           this.log.error(JSON.stringify(error.response.data));
         }
       });
+
     const secondResponse = await this.requestClient({
       method: 'post',
       maxBodyLength: Infinity,
       url: 'https://b2c-login.toyota-europe.com/json/realms/root/realms/tme/authenticate?authIndexType=service&authIndexValue=oneapp',
       headers: {
-        'x-appbrand': this.brand,
-        'x-osname': 'iOS',
-        'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-        'x-region': 'EU',
-        region: 'EU',
-        brand: this.brand,
-        'x-channel': 'ONEAPP',
-        'x-osversion': '16.7.2',
-        'x-brand': this.brand,
-        'accept-language': 'de-DE,de;q=0.9',
-        'x-correlationid': 'BDD02A22-CD76-4877-90A9-196EDA5DC695',
-        'x-appversion': '2.4.2',
-        accept: '*/*',
+        ...this.buildLoginHeaders('BDD02A22-CD76-4877-90A9-196EDA5DC695'),
         'content-type': 'application/json',
-        'accept-api-version': 'resource=2.0, protocol=1.0',
       },
       data: firstResponse,
     })
@@ -161,30 +141,20 @@ class Toyota extends utils.Adapter {
           this.log.error(JSON.stringify(error.response.data));
         }
       });
+
     if (!secondResponse || !secondResponse.callbacks) {
       this.log.error('No Second Response');
+      return;
     }
     secondResponse.callbacks[0].input[0].value = this.config.username;
+
     const thirdResponse = await this.requestClient({
       method: 'post',
       maxBodyLength: Infinity,
       url: 'https://b2c-login.toyota-europe.com/json/realms/root/realms/tme/authenticate?authIndexType=service&authIndexValue=oneapp',
       headers: {
-        'x-appbrand': this.brand,
-        'x-osname': 'iOS',
-        'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-        'x-region': 'EU',
-        region: 'EU',
-        brand: this.brand,
-        'x-channel': 'ONEAPP',
-        'x-osversion': '16.7.2',
-        'x-brand': this.brand,
-        'accept-language': 'de-DE,de;q=0.9',
-        'x-correlationid': 'BDD02A22-CD76-4877-90A9-196EDA5DC695',
-        'x-appversion': '2.4.2',
-        accept: '*/*',
+        ...this.buildLoginHeaders('BDD02A22-CD76-4877-90A9-196EDA5DC695'),
         'content-type': 'application/json',
-        'accept-api-version': 'resource=2.0, protocol=1.0',
       },
       data: secondResponse,
     })
@@ -199,31 +169,21 @@ class Toyota extends utils.Adapter {
           this.log.error(JSON.stringify(error.response.data));
         }
       });
+
     if (!thirdResponse || !thirdResponse.callbacks) {
       this.log.error('No Third Response');
+      return;
     }
 
     thirdResponse.callbacks[0].input[0].value = this.config.password;
-    const idToken = await this.requestClient({
+
+    await this.requestClient({
       method: 'post',
       maxBodyLength: Infinity,
       url: 'https://b2c-login.toyota-europe.com/json/realms/root/realms/tme/authenticate?authIndexType=service&authIndexValue=oneapp',
       headers: {
-        'x-appbrand': this.brand,
-        'x-osname': 'iOS',
-        'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-        'x-region': 'EU',
-        region: 'EU',
-        brand: this.brand,
-        'x-channel': 'ONEAPP',
-        'x-osversion': '16.7.2',
-        'x-brand': this.brand,
-        'accept-language': 'de-DE,de;q=0.9',
-        'x-correlationid': 'BDD02A22-CD76-4877-90A9-196EDA5DC695',
-        'x-appversion': '2.4.2',
-        accept: '*/*',
+        ...this.buildLoginHeaders('BDD02A22-CD76-4877-90A9-196EDA5DC695'),
         'content-type': 'application/json',
-        'accept-api-version': 'resource=2.0, protocol=1.0',
       },
       data: thirdResponse,
     })
@@ -239,25 +199,24 @@ class Toyota extends utils.Adapter {
         }
       });
 
+    // PKCE S256: random 64-byte verifier, base64url(SHA-256(verifier)) as challenge
+    // Keep verifier local so concurrent login() calls do not overwrite each other.
+    const codeVerifier = crypto.randomBytes(64).toString('base64url');
+    const codeChallenge = crypto.createHash('sha256').update(codeVerifier).digest('base64url');
+    const authorizeUrl =
+      'https://b2c-login.toyota-europe.com/oauth2/realms/root/realms/tme/authorize' +
+      '?response_type=code&realm=tme&redirect_uri=com.toyota.oneapp:/oauth2Callback' +
+      '&client_id=oneapp&scope=' +
+      encodeURIComponent('openid profile write') +
+      '&code_challenge_method=S256&code_challenge=' +
+      codeChallenge;
     const tokenResponse = await this.requestClient({
       method: 'get',
       maxBodyLength: Infinity,
-      url: 'https://b2c-login.toyota-europe.com/oauth2/realms/root/realms/tme/authorize?response_type=code&realm=tme&redirect_uri=com.toyota.oneapp:/oauth2Callback&client_id=oneapp&scope=openid%20profile%20write&code_challenge_method=S256&code_challenge=Bx88SxgIEnvxrsobwijnUlzg3rrb-zNV4wzDlndWFVc',
+      url: authorizeUrl,
       headers: {
-        'x-osname': 'iOS',
-        'x-brand': this.brand,
+        ...this.buildLoginHeaders('0F34C246-11F3-4584-AB13-0EA5DA96CB41'),
         accept: '*/*',
-        'x-channel': 'ONEAPP',
-        brand: this.brand,
-        'x-correlationid': '0F34C246-11F3-4584-AB13-0EA5DA96CB41',
-        'x-region': 'EU',
-        'x-appbrand': this.brand,
-        'x-osversion': '16.7.2',
-        'accept-language': 'de-DE,de;q=0.9',
-        region: 'EU',
-        'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-        'accept-api-version': 'resource=2.0, protocol=1.0',
-        'x-appversion': '2.4.2',
       },
     })
       .then((res) => {
@@ -272,38 +231,28 @@ class Toyota extends utils.Adapter {
         this.log.error(error);
         error.response && this.log.error(JSON.stringify(error.response.data));
       });
+
     if (!tokenResponse || !tokenResponse.code) {
       this.log.error('No Token Response');
       return;
     }
+
     this.log.info('Start token exchange');
     await this.requestClient({
       method: 'post',
       maxBodyLength: Infinity,
       url: 'https://b2c-login.toyota-europe.com/oauth2/realms/root/realms/tme/access_token',
       headers: {
-        'x-appbrand': this.brand,
-        'x-osname': 'iOS',
-        'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-        'x-region': 'EU',
-        region: 'EU',
-        brand: this.brand,
-        'x-channel': 'ONEAPP',
-        'x-osversion': '16.7.2',
-        'x-brand': this.brand,
-        authorization: 'Basic b25lYXBwOm9uZWFwcA==',
-        'accept-language': 'de-DE,de;q=0.9',
-        'x-correlationid': 'E422A08C-1A04-415E-BB08-2386EE06CF90',
-        'x-appversion': '2.4.2',
+        ...this.buildLoginHeaders('E422A08C-1A04-415E-BB08-2386EE06CF90'),
         accept: '*/*',
         'content-type': 'application/x-www-form-urlencoded',
-        'accept-api-version': 'resource=2.0, protocol=1.0',
+        authorization: 'Basic b25lYXBwOm9uZWFwcA==',
       },
       data: {
         grant_type: 'authorization_code',
         redirect_uri: 'com.toyota.oneapp:/oauth2Callback',
         code: tokenResponse.code,
-        code_verifier: 'tsY5-j-ZLYxNVnmz6wmJ9PTm2Ly7QpfXcQnhyU09Pog',
+        code_verifier: codeVerifier,
         client_id: 'oneapp',
       },
     })
@@ -326,34 +275,22 @@ class Toyota extends utils.Adapter {
         }
       });
   }
+
   async refreshToken() {
     await this.requestClient({
       method: 'post',
       maxBodyLength: Infinity,
       url: 'https://b2c-login.toyota-europe.com/oauth2/realms/root/realms/tme/access_token',
       headers: {
-        'x-appbrand': this.brand,
-        'x-osname': 'iOS',
-        'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-        'x-region': 'EU',
-        region: 'EU',
-        brand: this.brand,
-        'x-channel': 'ONEAPP',
-        'x-osversion': '16.7.2',
-        'x-brand': this.brand,
-        authorization: 'Basic b25lYXBwOm9uZWFwcA==',
-        'accept-language': 'de-DE,de;q=0.9',
-        'x-correlationid': 'E422A08C-1A04-415E-BB08-2386EE06CF90',
-        'x-appversion': '2.4.2',
+        ...this.buildLoginHeaders('E422A08C-1A04-415E-BB08-2386EE06CF90'),
         accept: '*/*',
         'content-type': 'application/x-www-form-urlencoded',
-        'accept-api-version': 'resource=2.0, protocol=1.0',
+        authorization: 'Basic b25lYXBwOm9uZWFwcA==',
       },
       data: {
         grant_type: 'refresh_token',
         redirect_uri: 'com.toyota.oneapp:/oauth2Callback',
         client_id: 'oneapp',
-        code_verifier: 'plain',
         refresh_token: this.session.refresh_token,
       },
     })
@@ -369,33 +306,137 @@ class Toyota extends utils.Adapter {
         }
       });
   }
+
+  generate_hmac_sha256(key, message) {
+    return crypto.createHmac('sha256', key).update(message).digest('hex');
+  }
+
+  /**
+   * Headers for the ForgeRock authentication flow (login / token exchange).
+   * Mirrors the Android APK interceptors (b.smali + auth flow).
+   * @param {string} [correlationId] optional fixed correlation ID for login steps
+   */
+  buildLoginHeaders(correlationId) {
+    return {
+      'x-osname': 'Android',
+      'x-osversion': '14',
+      'x-brand': this.brand,
+      'x-appbrand': this.brand,
+      brand: this.brand,
+      'x-channel': 'ONEAPP',
+      'x-region': 'EU',
+      region: 'EU',
+      'x-appversion': this.CLIENT_VERSION,
+      'x-correlationid': correlationId || uuidv4(),
+      'accept-language': 'de-DE,de;q=0.9',
+      accept: 'application/json',
+      'user-agent': 'okhttp/4.10.0',
+      'accept-api-version': this.API_VERSION,
+    };
+  }
+
+  /**
+   * Returns true if an axios error response signals that the requested endpoint
+   * is not applicable for the current VIN (e.g. /electric/status on a non-EV car).
+   * Toyota answers with HTTP 4xx and responseCode ONE-GLOBAL-RC-10004.
+   * @param {{status: number, data?: any} | undefined} response
+   */
+  isCapabilityNotPresent(response) {
+    if (!response || typeof response.status !== 'number' || response.status < 400 || response.status >= 500) {
+      return false;
+    }
+    const messages = response.data && response.data.status && response.data.status.messages;
+    if (!Array.isArray(messages)) {
+      return false;
+    }
+    return messages.some((m) => m && m.responseCode === 'ONE-GLOBAL-RC-10004');
+  }
+
+  /**
+   * Build the standard set of headers used for all ctpa-oneapi calls.
+   * Aligned with pytoyoda controller._prepare_headers.
+   * @param {string} [vin] optional vin header for vehicle-scoped endpoints
+   */
+  buildApiHeaders(vin) {
+    const headers = {
+      'x-api-key': 'tTZipv6liF74PwMfk9Ed68AQ0bISswwf3iHQdqcF',
+      API_KEY: 'tTZipv6liF74PwMfk9Ed68AQ0bISswwf3iHQdqcF',
+      'x-guid': this.uuid,
+      guid: this.uuid,
+      'x-client-ref': this.generate_hmac_sha256(this.CLIENT_VERSION, this.uuid),
+      'x-correlationid': uuidv4(),
+      'x-appversion': this.CLIENT_VERSION,
+      'x-channel': 'ONEAPP',
+      'x-brand': this.brand,
+      'x-region': 'EU',
+      'x-user-region': 'EU',
+      authorization: 'Bearer ' + this.session.access_token,
+      'user-agent': 'okhttp/4.10.0',
+    };
+    // x-appbrand and brand are only set for Lexus (L); Toyota (T) omits them
+    if (this.brand !== 'T') {
+      headers['x-appbrand'] = this.brand;
+      headers.brand = this.brand;
+    }
+    if (vin) {
+      headers.vin = vin;
+    }
+    return headers;
+  }
+
+  /**
+   * Wake the car and trigger a fresh vehicle/climate/EV status pull.
+   * After ~20s the regular updateDevices() loop reads the now-current data.
+   * @param {string} vin
+   */
+  async forceRefresh(vin) {
+    const refreshEndpoints = [
+      { name: 'status', url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/remote/status' },
+      {
+        name: 'climate',
+        url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/remote/refresh-climate-status',
+      },
+      {
+        name: 'electric',
+        url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v2/remote/electric/realtime-status',
+      },
+    ];
+    for (const ep of refreshEndpoints) {
+      await this.requestClient({
+        method: 'post',
+        url: ep.url,
+        headers: this.buildApiHeaders(vin),
+      })
+        .then((res) => {
+          this.log.debug(`force-refresh ${ep.name}: ${JSON.stringify(res.data)}`);
+        })
+        .catch((error) => {
+          // Non-EV cars typically answer the electric realtime-status request with 404 or 422 - log quietly.
+          // 401/403 must NOT be swallowed: they signal an auth problem and have to surface like for any other endpoint.
+          if (
+            ep.name === 'electric' &&
+            error.response &&
+            (error.response.status === 404 || error.response.status === 422)
+          ) {
+            this.log.debug(`force-refresh electric not supported (${error.response.status})`);
+            return;
+          }
+          this.log.warn(`force-refresh ${ep.name} failed: ${error.message}`);
+          error.response && this.log.debug(JSON.stringify(error.response.data));
+        });
+    }
+    this.refreshTimeout && clearTimeout(this.refreshTimeout);
+    this.refreshTimeout = setTimeout(async () => {
+      await this.updateDevices();
+    }, 20 * 1000);
+  }
+
   async getDeviceList() {
     await this.requestClient({
       method: 'get',
       maxBodyLength: Infinity,
       url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v2/vehicle/guid',
-      headers: {
-        'x-appbrand': this.brand,
-        'x-device-timezone': 'CEST',
-        'x-osname': 'iOS',
-        guid: this.uuid,
-        'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-        'x-guid': this.uuid,
-        'x-region': 'EU',
-        region: 'EU',
-        brand: this.brand,
-        'x-channel': 'ONEAPP',
-        'x-osversion': '16.7.2',
-        'x-locale': 'de-DE',
-        'x-brand': this.brand,
-        authorization: 'Bearer ' + this.session.access_token,
-        'accept-language': 'de-DE,de;q=0.9',
-        'x-correlationid': '7683DC30-D4DA-4FEC-850E-F3557A7DCEF4',
-        'x-appversion': '2.4.2',
-        accept: '*/*',
-        'x-user-region': 'DE',
-        'x-api-key': 'tTZipv6liF74PwMfk9Ed68AQ0bISswwf3iHQdqcF',
-      },
+      headers: this.buildApiHeaders(),
     })
       .then(async (res) => {
         this.log.debug(JSON.stringify(res.data));
@@ -437,7 +478,8 @@ class Toyota extends utils.Adapter {
 
           const remoteArray = [
             { command: 'climate-control', name: 'True = Start, False = Stop' },
-            { command: 'refresh', name: 'Refresh Status' },
+            { command: 'refresh', name: 'Re-poll cached status from cloud' },
+            { command: 'force-refresh', name: 'Wake car and request fresh status, climate and EV data' },
             { command: 'door', name: 'True = Lock, False = Unlock' },
           ];
           for (const remote of remoteArray) {
@@ -463,6 +505,8 @@ class Toyota extends utils.Adapter {
         error.response && this.log.error(JSON.stringify(error.response.data));
       });
   }
+
+  // ...existing code...
   async cleanOldObjects(vin) {
     const remoteState = await this.getObjectAsync(vin + '.addtionalInfo');
     if (remoteState) {
@@ -470,11 +514,12 @@ class Toyota extends utils.Adapter {
       await this.delObjectAsync(vin, { recursive: true });
     }
   }
+
   async updateDevices() {
     const statusArray = [
       {
         path: 'status',
-        url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/global/remote/status',
+        url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/vehicle/status',
         desc: 'Status of the car',
       },
       {
@@ -484,45 +529,37 @@ class Toyota extends utils.Adapter {
       },
       {
         path: 'climate',
-        url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/global/remote/climate-status',
+        url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/vehicle/climate-status',
         desc: 'Climate of the car',
       },
+      {
+        path: 'electric',
+        url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/vehicle/electric/status',
+        desc: 'Electric/PHEV status (battery, charging, range)',
+      },
+      {
+        path: 'location',
+        url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/location',
+        desc: 'Current vehicle location',
+      },
+      {
+        path: 'health',
+        url: 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/vehiclehealth/status',
+        desc: 'Vehicle health and service warnings',
+      },
     ];
 
-    const headers = {
-      'x-appbrand': this.brand,
-      'x-device-timezone': 'CEST',
-      'x-osname': 'iOS',
-      guid: this.uuid,
-      'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-      'x-guid': this.uuid,
-      'x-region': 'EU',
-      region: 'EU',
-      brand: this.brand,
-      'x-channel': 'ONEAPP',
-      'x-osversion': '16.7.2',
-      'x-locale': 'de-DE',
-      'x-brand': this.brand,
-      authorization: 'Bearer ' + this.session.access_token,
-      'accept-language': 'de-DE,de;q=0.9',
-      'x-correlationid': '7683DC30-D4DA-4FEC-850E-F3557A7DCEF4',
-      'x-appversion': '2.4.2',
-      accept: '*/*',
-      'x-user-region': 'DE',
-      'x-api-key': 'tTZipv6liF74PwMfk9Ed68AQ0bISswwf3iHQdqcF',
-    };
     for (const vin of this.deviceArray) {
       for (const element of statusArray) {
         if (this.blockedEndpoints[vin] && this.blockedEndpoints[vin].includes(element.path)) {
           continue;
         }
         const url = element.url.replace('$vin', vin);
-        headers.vin = vin;
 
         await this.requestClient({
           method: 'get',
           url: url,
-          headers: headers,
+          headers: this.buildApiHeaders(vin),
         })
           .then((res) => {
             this.log.debug(JSON.stringify(res.data));
@@ -559,6 +596,14 @@ class Toyota extends utils.Adapter {
                 this.blockedEndpoints[vin].push(element.path);
                 return;
               }
+              // Endpoint not applicable for this VIN (e.g. /electric/status on a non-EV/PHEV car):
+              // Toyota answers HTTP 4xx with responseCode ONE-GLOBAL-RC-10004 every poll. Block it once.
+              if (this.isCapabilityNotPresent(error.response)) {
+                this.log.info(`${element.path} not available for ${vin}. Skip until restart`);
+                this.blockedEndpoints[vin] = this.blockedEndpoints[vin] || [];
+                this.blockedEndpoints[vin].push(element.path);
+                return;
+              }
             }
             this.log.error(url);
             this.log.error(error);
@@ -579,38 +624,14 @@ class Toyota extends utils.Adapter {
       },
     ];
 
-    const headers = {
-      'x-appbrand': this.brand,
-      'x-device-timezone': 'CEST',
-      'x-osname': 'iOS',
-
-      guid: this.uuid,
-      'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-      'x-guid': this.uuid,
-      'x-region': 'EU',
-      region: 'EU',
-      brand: this.brand,
-      'x-channel': 'ONEAPP',
-      'x-osversion': '16.7.2',
-      'x-locale': 'de-DE',
-      'x-brand': this.brand,
-      authorization: 'Bearer ' + this.session.access_token,
-      'accept-language': 'de-DE,de;q=0.9',
-      'x-correlationid': '7683DC30-D4DA-4FEC-850E-F3557A7DCEF4',
-      'x-appversion': '2.4.2',
-      accept: '*/*',
-      'x-user-region': 'DE',
-      'x-api-key': 'tTZipv6liF74PwMfk9Ed68AQ0bISswwf3iHQdqcF',
-    };
     for (const vin of this.deviceArray) {
       statusArray.forEach(async (element) => {
         const url = element.url.replace('$vin', vin);
-        headers.vin = vin;
 
         await this.requestClient({
           method: 'get',
           url: url,
-          headers: headers,
+          headers: this.buildApiHeaders(vin),
         })
           .then((res) => {
             this.log.debug(JSON.stringify(res.data));
@@ -618,6 +639,12 @@ class Toyota extends utils.Adapter {
               return;
             }
             const data = res.data.payload;
+            for (const trip of data.trips) {
+              delete trip.route;
+            }
+            for (const summary of data.summary) {
+              delete summary.histograms;
+            }
             this.json2iob.parse(vin + '.' + element.path, data, {
               forceIndex: true,
               channelName: element.desc,
@@ -643,6 +670,7 @@ class Toyota extends utils.Adapter {
       });
     }
   }
+
   /**
    * Is called when adapter shuts down - callback has to be called under any circumstances!
    * @param {() => void} callback
@@ -656,7 +684,7 @@ class Toyota extends utils.Adapter {
       this.updateInterval && clearInterval(this.updateInterval);
       this.refreshTokenInterval && clearInterval(this.refreshTokenInterval);
       callback();
-    } catch (e) {
+    } catch {
       callback();
     }
   }
@@ -678,11 +706,16 @@ class Toyota extends utils.Adapter {
           this.updateDevices();
           return;
         }
+        if (path === 'force-refresh') {
+          await this.forceRefresh(deviceId);
+          return;
+        }
         const data = {};
         let url = 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/global/remote/command';
         if (path === 'climate-control') {
-          url = 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v1/global/remote/climate-control';
-          data.command = state.val ? 'engine-start' : 'engine-stop';
+          url = 'https://ctpa-oneapi.tceu-ctp-prd.toyotaconnectedeurope.io/v2/remote/climate-control';
+          // V2 climate-control expects command "start"/"stop" (not the old v1 engine-start/engine-stop)
+          data.command = state.val ? 'start' : 'stop';
         }
         if (path === 'door') {
           data.command = state.val ? 'door-lock' : 'door-unlock';
@@ -693,34 +726,14 @@ class Toyota extends utils.Adapter {
         await this.requestClient({
           method: 'post',
           url: url,
-          headers: {
-            'x-appbrand': this.brand,
-            'x-device-timezone': 'CEST',
-            'x-osname': 'iOS',
-            guid: '091a3196-0d1d-4ba6-92c4-d44967cd6567',
-            'user-agent': 'Toyota/134 CFNetwork/1410.0.3 Darwin/22.6.0',
-            'x-guid': '091a3196-0d1d-4ba6-92c4-d44967cd6567',
-            'x-region': 'EU',
-            region: 'EU',
-            brand: this.brand,
-            'x-channel': 'ONEAPP',
-            vin: 'JTMGBRFV90D151864',
-            'x-osversion': '16.7.2',
-            'x-locale': 'de-DE',
-            'x-brand': this.brand,
-            authorization: 'Bearer ' + this.session.access_token,
-            'accept-language': 'de-DE,de;q=0.9',
-            'x-correlationid': 'D7F048C1-F0A1-4920-AA37-264C8A1FB4A3',
-            'x-appversion': '2.4.2',
-            accept: '*/*',
-            'content-type': 'application/json',
-            'x-api-key': 'tTZipv6liF74PwMfk9Ed68AQ0bISswwf3iHQdqcF',
-            'x-user-region': 'DE',
-          },
+          headers: this.buildApiHeaders(deviceId),
           data: data,
         })
           .then((res) => {
             this.log.debug(JSON.stringify(res.data));
+            if (path === 'climate-control' && res.data?.payload?.returnCode !== '000000') {
+              this.log.error('climate-control command rejected: ' + JSON.stringify(res.data));
+            }
             return res.data;
           })
           .catch((error) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.toyota",
-  "version": "0.2.6",
+  "version": "0.4.0",
   "description": "Adapter for myT Toyota/Lexus App",
   "author": {
     "name": "TA2k",
@@ -23,21 +23,27 @@
     "url": "https://github.com/TA2k/ioBroker.toyota"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.4",
-    "axios": "^1.6.5",
-    "http-cookie-agent": "^5.0.4",
-    "json2iob": "^2.6.6",
-    "jsonwebtoken": "^9.0.2",
-    "qs": "^6.11.2",
-    "tough-cookie": "^4.1.3"
+    "@iobroker/adapter-core": "^3.4.3",
+    "axios": "^1.20.0",
+    "http-cookie-agent": "^8.0.0",
+    "json2iob": "^2.6.28",
+    "jsonwebtoken": "^9.0.3",
+    "qs": "^6.16.0",
+    "tough-cookie": "^6.0.2",
+    "uuid": "^14.0.2"
   },
   "devDependencies": {
-    "@iobroker/testing": "^4.1.0",
-    "@types/node": "^20.11.4",
-    "eslint": "^8.56.0",
-    "typescript": "~5.3.3"
+    "@eslint/js": "^10.0.1",
+    "@iobroker/testing": "^5.3.0",
+    "@types/node": "^26.6.4",
+    "eslint": "^10.12.0",
+    "globals": "^17.13.0",
+    "typescript": "~6.0.3"
   },
   "main": "main.js",
+  "engines": {
+    "node": ">=22.13.0"
+  },
   "files": [
     "admin{,/!(src)/**}/!(tsconfig|tsconfig.*).json",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",