iobroker.toyota 0.2.0 → 0.2.5

package/admin/index_m.html

@@ -20,18 +20,18 @@
       function load(settings, onChange) {
         // example: select elements with id=key and class=value and insert value
         if (!settings) return;
-        $(".value").each(function () {
+        $('.value').each(function () {
           var $key = $(this);
-          var id = $key.attr("id");
-          if ($key.attr("type") === "checkbox") {
+          var id = $key.attr('id');
+          if ($key.attr('type') === 'checkbox') {
             // do not call onChange direct, because onChange could expect some arguments
-            $key.prop("checked", settings[id]).on("change", () => onChange());
+            $key.prop('checked', settings[id]).on('change', () => onChange());
           } else {
             // do not call onChange direct, because onChange could expect some arguments
             $key
               .val(settings[id])
-              .on("change", () => onChange())
-              .on("keyup", () => onChange());
+              .on('change', () => onChange())
+              .on('keyup', () => onChange());
           }
         });
         onChange(false);
@@ -43,14 +43,14 @@
       function save(callback) {
         // example: select elements with class=value and build settings object
         var obj = {};
-        $(".value").each(function () {
+        $('.value').each(function () {
           var $this = $(this);
-          if ($this.attr("type") === "checkbox") {
-            obj[$this.attr("id")] = $this.prop("checked");
-          } else if ($this.attr("type") === "number") {
-            obj[$this.attr("id")] = parseFloat($this.val());
+          if ($this.attr('type') === 'checkbox') {
+            obj[$this.attr('id')] = $this.prop('checked');
+          } else if ($this.attr('type') === 'number') {
+            obj[$this.attr('id')] = parseFloat($this.val());
           } else {
-            obj[$this.attr("id")] = $this.val();
+            obj[$this.attr('id')] = $this.val();
           }
         });
         callback(obj);
@@ -95,6 +95,12 @@
           <label for="interval" class="translate">Update interval in minutes</label>
         </div>
       </div>
+      <div class="row">
+        <div class="col s6 input-field">
+          <input type="checkbox" class="value" id="fetchTrips" />
+          <label for="fetchTrips" class="translate">Fetch Trip Data</label>
+        </div>
+      </div>
     </div>
   </body>
 </html>

package/admin/words.js

@@ -1,53 +1,66 @@
 /*global systemDictionary:true */
-"use strict";
+'use strict';
 
 systemDictionary = {
-    "toyota adapter settings": {
-        "en": "Adapter settings for toyota",
-        "de": "Adaptereinstellungen für toyota",
-        "ru": "Настройки адаптера для toyota",
-        "pt": "Configurações do adaptador para toyota",
-        "nl": "Adapterinstellingen voor toyota",
-        "fr": "Paramètres d'adaptateur pour toyota",
-        "it": "Impostazioni dell'adattatore per toyota",
-        "es": "Ajustes del adaptador para toyota",
-        "pl": "Ustawienia adaptera dla toyota",
-        "zh-cn": "toyota的适配器设置"
-    },
-    "App Email": {
-        en: "App Email",
-        de: "App-E-Mail",
-        ru: "Электронная почта приложения",
-        pt: "Email do aplicativo",
-        nl: "App-e-mail",
-        fr: "Courriel de l'application",
-        it: "E-mail dell'app",
-        es: "Correo electrónico de la aplicación",
-        pl: "E-mail aplikacji",
-        "zh-cn": "应用电子邮件",
-    },
-    "App Password": {
-        en: "App Password",
-        de: "App-Passwort",
-        ru: "Пароль приложения",
-        pt: "Senha de app",
-        nl: "App-wachtwoord",
-        fr: "Mot de passe de l'application",
-        it: "Password dell'app",
-        es: "Contraseña de la aplicación",
-        pl: "Hasło do aplikacji",
-        "zh-cn": "应用密码",
-    },
-    "Update interval (in minutes)": {
-        en: "Update interval (in minutes)",
-        de: "Aktualisierungsintervall (in Minuten)",
-        ru: "Интервал обновления (в минутах)",
-        pt: "Intervalo de atualização (em minutos)",
-        nl: "Update-interval (in minuten)",
-        fr: "Intervalle de mise à jour (en minutes)",
-        it: "Intervallo di aggiornamento (in minuti)",
-        es: "Intervalo de actualización (en minutos)",
-        pl: "Interwał aktualizacji (w minutach)",
-        "zh-cn": "更新间隔（分钟）",
-    },
-};
+  'toyota adapter settings': {
+    en: 'Adapter settings for toyota',
+    de: 'Adaptereinstellungen für toyota',
+    ru: 'Настройки адаптера для toyota',
+    pt: 'Configurações do adaptador para toyota',
+    nl: 'Adapterinstellingen voor toyota',
+    fr: "Paramètres d'adaptateur pour toyota",
+    it: "Impostazioni dell'adattatore per toyota",
+    es: 'Ajustes del adaptador para toyota',
+    pl: 'Ustawienia adaptera dla toyota',
+    'zh-cn': 'toyota的适配器设置',
+  },
+  'App Email': {
+    en: 'App Email',
+    de: 'App-E-Mail',
+    ru: 'Электронная почта приложения',
+    pt: 'Email do aplicativo',
+    nl: 'App-e-mail',
+    fr: "Courriel de l'application",
+    it: "E-mail dell'app",
+    es: 'Correo electrónico de la aplicación',
+    pl: 'E-mail aplikacji',
+    'zh-cn': '应用电子邮件',
+  },
+  'App Password': {
+    en: 'App Password',
+    de: 'App-Passwort',
+    ru: 'Пароль приложения',
+    pt: 'Senha de app',
+    nl: 'App-wachtwoord',
+    fr: "Mot de passe de l'application",
+    it: "Password dell'app",
+    es: 'Contraseña de la aplicación',
+    pl: 'Hasło do aplikacji',
+    'zh-cn': '应用密码',
+  },
+  'Update interval (in minutes)': {
+    en: 'Update interval (in minutes)',
+    de: 'Aktualisierungsintervall (in Minuten)',
+    ru: 'Интервал обновления (в минутах)',
+    pt: 'Intervalo de atualização (em minutos)',
+    nl: 'Update-interval (in minuten)',
+    fr: 'Intervalle de mise à jour (en minutes)',
+    it: 'Intervallo di aggiornamento (in minuti)',
+    es: 'Intervalo de actualización (en minutos)',
+    pl: 'Interwał aktualizacji (w minutach)',
+    'zh-cn': '更新间隔（分钟）',
+  },
+  'Fetch Trips': {
+    en: 'Fetch Trip Data',
+    de: 'Trip Daten abrufen',
+    ru: 'Получить данные Trip',
+    pt: 'Dados de viagem',
+    nl: 'Reisgegevens ophalen',
+    fr: 'Récupération des données de voyage',
+    it: 'Dati di viaggio a pagamento',
+    es: 'Datos de viaje',
+    pl: 'Pobierz dane dotyczące podróży',
+    uk: 'Fetch Trip Дані',
+    'zh-cn': '获取 Trip 数据',
+  },
+};

package/io-package.json

@@ -1,8 +1,16 @@
 {
   "common": {
     "name": "toyota",
-    "version": "0.2.0",
+    "version": "0.2.5",
     "news": {
+      "0.2.5": {
+        "en": "Add option to disable trip fetching",
+        "de": "Option zum Deaktivieren des Abrufs von Trips hinzugefügt"
+      },
+      "0.2.1": {
+        "en": "Fix toyota endpoint",
+        "de": "Fix toyota Endpunkt"
+      },
       "0.2.0": {
         "en": "added Lexus support",
         "de": "Lexus Unterstützung hinzugefügt"
@@ -71,7 +79,7 @@
     "materialize": true,
     "plugins": {
       "sentry": {
-        "dsn": "https://c9bd6c851b1246da95e6e982aa9b88f3@sentry.iobroker.net/152"
+        "dsn": "https://3b9187d0bc8b4eb7974c1558bf68acdd@sentry.iobroker.net/167"
       }
     },
     "dependencies": [
@@ -91,7 +99,8 @@
     "username": "",
     "password": "",
     "type": "toyota",
-    "interval": 10
+    "interval": 10,
+    "fetchTrips": false
   },
   "objects": [],
   "instanceObjects": [

package/lib/adapter-config.d.ts

@@ -2,18 +2,18 @@
 // using the actual properties present in io-package.json
 // in order to provide typings for adapter.config properties
 
-import { native } from "../io-package.json";
+import { native } from '../io-package.json';
 
 type _AdapterConfig = typeof native;
 
 // Augment the globally declared type ioBroker.AdapterConfig
 declare global {
-    namespace ioBroker {
-        interface AdapterConfig extends _AdapterConfig {
-            // Do not enter anything here!
-        }
+  namespace ioBroker {
+    interface AdapterConfig extends _AdapterConfig {
+      // Do not enter anything here!
     }
+  }
 }
 
 // this is required so the above AdapterConfig is found by TypeScript / type checking
-export {};
+export {};

package/lib/tools.js

@@ -1,4 +1,4 @@
-const axios = require("axios").default;
+const axios = require('axios').default;
 
 /**
  * Tests whether the given variable is a real object and not an Array
@@ -6,11 +6,11 @@ const axios = require("axios").default;
  * @returns {it is Record<string, any>}
  */
 function isObject(it) {
-    // This is necessary because:
-    // typeof null === 'object'
-    // typeof [] === 'object'
-    // [] instanceof Object === true
-    return Object.prototype.toString.call(it) === "[object Object]";
+  // This is necessary because:
+  // typeof null === 'object'
+  // typeof [] === 'object'
+  // [] instanceof Object === true
+  return Object.prototype.toString.call(it) === '[object Object]';
 }
 
 /**
@@ -19,8 +19,8 @@ function isObject(it) {
  * @returns {it is any[]}
  */
 function isArray(it) {
-    if (typeof Array.isArray === "function") return Array.isArray(it);
-    return Object.prototype.toString.call(it) === "[object Array]";
+  if (typeof Array.isArray === 'function') return Array.isArray(it);
+  return Object.prototype.toString.call(it) === '[object Array]';
 }
 
 /**
@@ -31,16 +31,16 @@ function isArray(it) {
  * @returns {Promise<string>}
  */
 async function translateText(text, targetLang, yandexApiKey) {
-    if (targetLang === "en") {
-        return text;
-    } else if (!text) {
-        return "";
-    }
-    if (yandexApiKey) {
-        return translateYandex(text, targetLang, yandexApiKey);
-    } else {
-        return translateGoogle(text, targetLang);
-    }
+  if (targetLang === 'en') {
+    return text;
+  } else if (!text) {
+    return '';
+  }
+  if (yandexApiKey) {
+    return translateYandex(text, targetLang, yandexApiKey);
+  } else {
+    return translateGoogle(text, targetLang);
+  }
 }
 
 /**
@@ -51,19 +51,21 @@ async function translateText(text, targetLang, yandexApiKey) {
  * @returns {Promise<string>}
  */
 async function translateYandex(text, targetLang, apiKey) {
-    if (targetLang === "zh-cn") {
-        targetLang = "zh";
-    }
-    try {
-        const url = `https://translate.yandex.net/api/v1.5/tr.json/translate?key=${apiKey}&text=${encodeURIComponent(text)}&lang=en-${targetLang}`;
-        const response = await axios({url, timeout: 15000});
-        if (response.data && response.data.text && isArray(response.data.text)) {
-            return response.data.text[0];
-        }
-        throw new Error("Invalid response for translate request");
-    } catch (e) {
-        throw new Error(`Could not translate to "${targetLang}": ${e}`);
+  if (targetLang === 'zh-cn') {
+    targetLang = 'zh';
+  }
+  try {
+    const url = `https://translate.yandex.net/api/v1.5/tr.json/translate?key=${apiKey}&text=${encodeURIComponent(
+      text,
+    )}&lang=en-${targetLang}`;
+    const response = await axios({ url, timeout: 15000 });
+    if (response.data && response.data.text && isArray(response.data.text)) {
+      return response.data.text[0];
     }
+    throw new Error('Invalid response for translate request');
+  } catch (e) {
+    throw new Error(`Could not translate to "${targetLang}": ${e}`);
+  }
 }
 
 /**
@@ -73,27 +75,27 @@ async function translateYandex(text, targetLang, apiKey) {
  * @returns {Promise<string>}
  */
 async function translateGoogle(text, targetLang) {
-    try {
-        const url = `http://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=${targetLang}&dt=t&q=${encodeURIComponent(text)}&ie=UTF-8&oe=UTF-8`;
-        const response = await axios({url, timeout: 15000});
-        if (isArray(response.data)) {
-            // we got a valid response
-            return response.data[0][0][0];
-        }
-        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`
-            );
-        } else {
-            throw new Error(`Could not translate to "${targetLang}": ${e}`);
-        }
+  try {
+    const url = `http://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=${targetLang}&dt=t&q=${encodeURIComponent(
+      text,
+    )}&ie=UTF-8&oe=UTF-8`;
+    const response = await axios({ url, timeout: 15000 });
+    if (isArray(response.data)) {
+      // we got a valid response
+      return response.data[0][0][0];
+    }
+    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`);
+    } else {
+      throw new Error(`Could not translate to "${targetLang}": ${e}`);
     }
+  }
 }
 
 module.exports = {
-    isArray,
-    isObject,
-    translateText
+  isArray,
+  isObject,
+  translateText,
 };