iobroker.renault 0.0.21 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.renault",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "Adapter for Renault and Renault",
   "author": {
     "name": "TA2k",
@@ -14,6 +14,7 @@
   "homepage": "https://github.com/TA2k/ioBroker.renault",
   "license": "MIT",
   "keywords": [
+    "ioBroker",
     "renault",
     "Renault",
     "dacia",
@@ -24,31 +25,33 @@
     "url": "https://github.com/TA2k/ioBroker.renault"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^2.6.8",
-    "axios": "^1.4.0",
+    "@iobroker/adapter-core": "^3.3.2",
+    "axios": "^1.16.1",
     "json-bigint": "^1.0.0",
-    "json2iob": "^2.4.5",
-    "qs": "^6.11.2"
+    "json2iob": "^2.6.22",
+    "qs": "^6.15.2"
   },
   "devDependencies": {
-    "@iobroker/testing": "^4.1.0",
-    "@types/chai": "^4.3.5",
-    "@types/chai-as-promised": "^7.1.5",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^18.16.19",
-    "@types/proxyquire": "^1.3.28",
-    "@types/sinon": "^10.0.15",
-    "@types/sinon-chai": "^3.2.9",
-    "chai": "^4.3.7",
-    "chai-as-promised": "^7.1.1",
-    "eslint": "^8.44.0",
-    "mocha": "^10.2.0",
-    "proxyquire": "^2.1.3",
-    "sinon": "^15.2.0",
-    "sinon-chai": "^3.7.0",
-    "typescript": "^5.1.6"
+    "@alcalzone/release-script": "^5.2.0",
+    "@alcalzone/release-script-plugin-iobroker": "^5.2.0",
+    "@alcalzone/release-script-plugin-license": "^5.2.0",
+    "@alcalzone/release-script-plugin-manual-review": "^5.2.0",
+    "@eslint/eslintrc": "^3.3.5",
+    "@eslint/js": "^10.0.1",
+    "@iobroker/testing": "^5.2.2",
+    "@tsconfig/node18": "^18.2.6",
+    "@types/node": "^25.9.1",
+    "eslint": "^10.4.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.5",
+    "globals": "^17.6.0",
+    "prettier": "^3.8.3",
+    "typescript": "~6.0.3"
   },
   "main": "main.js",
+  "engines": {
+    "node": ">=20"
+  },
   "files": [
     "admin{,/!(src)/**}/!(tsconfig|tsconfig.*).json",
     "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}",
@@ -61,11 +64,13 @@
   "scripts": {
     "test:js": "mocha --config test/mocharc.custom.json \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"",
     "test:package": "mocha test/package --exit",
-    "test:unit": "mocha test/unit --exit",
     "test:integration": "mocha test/integration --exit",
+    "test:unit": "mocha test/unit --exit",
     "test": "npm run test:js && npm run test:package",
     "check": "tsc --noEmit -p tsconfig.check.json",
-    "lint": "eslint"
+    "lint": "eslint .",
+    "translate": "translate-adapter",
+    "release": "release-script --all"
   },
   "bugs": {
     "url": "https://github.com/TA2k/ioBroker.renault/issues"

package/admin/index_m.html

@@ -1,105 +0,0 @@
-<html>
-    <head>
-        <!-- Load ioBroker scripts and styles-->
-        <link rel="stylesheet" type="text/css" href="../../css/adapter.css" />
-        <link rel="stylesheet" type="text/css" href="../../lib/css/materialize.css" />
-
-        <script type="text/javascript" src="../../lib/js/jquery-3.2.1.min.js"></script>
-        <script type="text/javascript" src="../../socket.io/socket.io.js"></script>
-
-        <script type="text/javascript" src="../../js/translate.js"></script>
-        <script type="text/javascript" src="../../lib/js/materialize.js"></script>
-        <script type="text/javascript" src="../../js/adapter-settings.js"></script>
-
-        <!-- Load our own files -->
-        <link rel="stylesheet" type="text/css" href="style.css" />
-        <script type="text/javascript" src="words.js"></script>
-
-        <script type="text/javascript">
-            // This will be called by the admin adapter when the settings page loads
-            function load(settings, onChange) {
-                // example: select elements with id=key and class=value and insert value
-                if (!settings) return;
-                $(".value").each(function () {
-                    var $key = $(this);
-                    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());
-                    } else {
-                        // do not call onChange direct, because onChange could expect some arguments
-                        $key.val(settings[id])
-                            .on("change", () => onChange())
-                            .on("keyup", () => onChange());
-                    }
-                });
-                onChange(false);
-                // reinitialize all the Materialize labels on the page if you are dynamically adding inputs:
-                if (M) M.updateTextFields();
-            }
-
-            // This will be called by the admin adapter when the user presses the save button
-            function save(callback) {
-                // example: select elements with class=value and build settings object
-                var obj = {};
-                $(".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());
-                    } else {
-                        obj[$this.attr("id")] = $this.val();
-                    }
-                });
-                callback(obj);
-            }
-        </script>
-    </head>
-
-    <body>
-        <div class="m adapter-container">
-            <div class="row">
-                <div class="col s12 m4 l2">
-                    <img src="renault.png" class="logo" />
-                </div>
-            </div>
-
-            <!-- Put your content here -->
-
-            <!-- For example columns with settings: -->
-            <div class="row">
-                <div class="col s6 input-field">
-                    <input type="text" class="value" id="username" />
-                    <label for="username" class="translate">App Email</label>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col s6 input-field">
-                    <input type="password" class="value" id="password" />
-                    <label for="password" class="translate">App Password</label>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col s2 input-field">
-                    <input type="number" class="value" id="interval" />
-                    <label for="interval" class="translate">Update interval in minutes</label>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col s6 input-field">
-                    <input type="text" class="value" id="country" />
-                    <label for="country" class="translate">Country</label>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col s6 input-field">
-                    <input type="text" class="value" id="apiKeyUpdate" />
-                    <label for="apiKeyUpdate" class="translate">API Key. Wenn leer wird es automatisch gesetzt.</label>
-                </div>
-                <a href="https://github.com/db-EV/ZoePHP/blob/main/src/api-keys.php" target="_blank" class="translate">Click here for Current API Key</a>
-            </div>
-        </div>
-    </body>
-</html>

package/admin/style.css

@@ -1,32 +0,0 @@
-/* You can delete those if you want. I just found them very helpful */
-* {
-    box-sizing: border-box
-}
-.m {
-    /* Don't cut off dropdowns! */
-    overflow: initial;
-}
-.m.adapter-container,
-.m.adapter-container > div.App {
-    /* Fix layout/scrolling issues with tabs */
-    height: 100%;
-    width: 100%;
-    position: relative;
-}
-.m .select-wrapper + label {
-    /* The positioning for dropdown labels is messed up */
-    transform: none !important;
-}
-
-label > i[title] {
-    /* Display the help cursor for the tooltip icons and fix their positioning */
-    cursor: help;
-    margin-left: 0.25em;
-}
-
-.dropdown-content {
-    /* Don't wrap text in dropdowns */
-    white-space: nowrap;
-}
-
-/* Add your styles here */

package/admin/words.js

@@ -1,65 +0,0 @@
-/*global systemDictionary:true */
-"use strict";
-
-systemDictionary = {
-    "renault adapter settings": {
-        en: "Adapter settings for renault",
-        de: "Adaptereinstellungen für renault",
-        ru: "Настройки адаптера для renault",
-        pt: "Configurações do adaptador para renault",
-        nl: "Adapterinstellingen voor renault",
-        fr: "Paramètres d'adaptateur pour renault",
-        it: "Impostazioni dell'adattatore per renault",
-        es: "Ajustes del adaptador para renault",
-        pl: "Ustawienia adaptera dla renault",
-        "zh-cn": "renault的适配器设置",
-    },
-    "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": "更新间隔（分钟）",
-    },
-    Country: {
-        en: "Country",
-        de: "Land",
-        ru: "Страна",
-        pt: "País",
-        nl: "Land",
-        fr: "Pays",
-        it: "Nazione",
-        es: "País",
-        pl: "Kraj",
-        "zh-cn": "国家",
-    },
-};

package/lib/json2iob.js

@@ -1,254 +0,0 @@
-//v1.1 custom renault
-/*
-options:
-write
-forceIndex
-channelName
-preferedArrayName
-noAutoCast (true false)
-descriptions: Object of names for states
-*/
-const JSONbig = require("json-bigint")({ storeAsString: true });
-module.exports = class Json2iob {
-    constructor(adapter) {
-        this.adapter = adapter;
-        this.alreadyCreatedObjects = {};
-    }
-
-    async parse(path, element, options) {
-        try {
-            if (element === null || element === undefined) {
-                this.adapter.log.debug("Cannot extract empty: " + path);
-                return;
-            }
-
-            const objectKeys = Object.keys(element);
-
-            if (!options || !options.write) {
-                if (!options) {
-                    options = { write: false };
-                } else {
-                    options["write"] = false;
-                }
-            }
-
-            if (typeof element === "string" || typeof element === "number") {
-                let name = element;
-                if (typeof element === "number") {
-                    name = element.toString();
-                }
-                if (!this.alreadyCreatedObjects[path]) {
-                    await this.adapter
-                        .setObjectNotExistsAsync(path, {
-                            type: "state",
-                            common: {
-                                name: name,
-                                role: this.getRole(element, options.write),
-                                type: element !== null ? typeof element : "mixed",
-                                write: options.write,
-                                read: true,
-                            },
-                            native: {},
-                        })
-                        .then(() => {
-                            this.alreadyCreatedObjects[path] = true;
-                        })
-                        .catch((error) => {
-                            this.adapter.log.error(error);
-                        });
-                }
-
-                this.adapter.setState(path, element, true);
-
-                return;
-            }
-            if (!this.alreadyCreatedObjects[path]) {
-                await this.adapter
-                    .setObjectNotExistsAsync(path, {
-                        type: "channel",
-                        common: {
-                            name: options.channelName || "",
-                            write: false,
-                            read: true,
-                        },
-                        native: {},
-                    })
-                    .then(() => {
-                        this.alreadyCreatedObjects[path] = true;
-                    })
-                    .catch((error) => {
-                        this.adapter.log.error(error);
-                    });
-            }
-            if (Array.isArray(element)) {
-                this.extractArray(element, "", path, options);
-                return;
-            }
-            objectKeys.forEach(async (key) => {
-                // if (this.isJsonString(element[key]) && !options.noAutoCast) {
-                //     element[key] = JSONbig.parse(element[key]);
-                // }
-
-                if (Array.isArray(element[key])) {
-                    this.extractArray(element, key, path, options);
-                } else if (element[key] !== null && typeof element[key] === "object") {
-                    this.parse(path + "." + key, element[key], options);
-                } else {
-                    if (!this.alreadyCreatedObjects[path + "." + key]) {
-                        let objectName = key;
-                        if (options.descriptions && options.descriptions[key]) {
-                            objectName = options.descriptions[key];
-                        }
-                        let type = element[key] !== null ? typeof element[key] : "mixed";
-                        if (key === "gpsLatitude" || key === "gpsLongitude") {
-                            type = "mixed";
-                        }
-                        await this.adapter
-                            .setObjectNotExistsAsync(path + "." + key, {
-                                type: "state",
-                                common: {
-                                    name: objectName,
-                                    role: this.getRole(element[key], options.write),
-                                    type: type,
-                                    write: options.write,
-                                    read: true,
-                                },
-                                native: {},
-                            })
-                            .then(() => {
-                                this.alreadyCreatedObjects[path + "." + key] = true;
-                            })
-                            .catch((error) => {
-                                this.adapter.log.error(error);
-                            });
-                    }
-                    this.adapter.setState(path + "." + key, element[key], true);
-                }
-            });
-        } catch (error) {
-            this.adapter.log.error("Error extract keys: " + path + " " + JSON.stringify(element));
-            this.adapter.log.error(error);
-        }
-    }
-    extractArray(element, key, path, options) {
-        try {
-            if (key) {
-                element = element[key];
-            }
-            element.forEach(async (arrayElement, index) => {
-                index = index + 1;
-                if (index < 10) {
-                    index = "0" + index;
-                }
-                let arrayPath = key + index;
-                if (typeof arrayElement === "string") {
-                    this.parse(path + "." + key + "." + arrayElement, arrayElement, options);
-                    return;
-                }
-                if (typeof arrayElement[Object.keys(arrayElement)[0]] === "string") {
-                    arrayPath = arrayElement[Object.keys(arrayElement)[0]];
-                }
-                Object.keys(arrayElement).forEach((keyName) => {
-                    if (keyName.endsWith("Id") && arrayElement[keyName] !== null) {
-                        if (arrayElement[keyName] && arrayElement[keyName].replace) {
-                            arrayPath = arrayElement[keyName].replace(/\./g, "");
-                        } else {
-                            arrayPath = arrayElement[keyName];
-                        }
-                    }
-                });
-                Object.keys(arrayElement).forEach((keyName) => {
-                    if (keyName.endsWith("Name")) {
-                        arrayPath = arrayElement[keyName];
-                    }
-                });
-
-                if (arrayElement.id) {
-                    if (arrayElement.id.replace) {
-                        arrayPath = arrayElement.id.replace(/\./g, "");
-                    } else {
-                        arrayPath = arrayElement.id;
-                    }
-                }
-                if (arrayElement.name) {
-                    arrayPath = arrayElement.name.replace(/\./g, "");
-                }
-                if (arrayElement.start_date_time) {
-                    arrayPath = arrayElement.start_date_time.replace(/\./g, "");
-                }
-                if (options.preferedArrayName && arrayElement[options.preferedArrayName]) {
-                    arrayPath = arrayElement[options.preferedArrayName].replace(/\./g, "");
-                }
-
-                if (options.forceIndex) {
-                    arrayPath = key + index;
-                }
-                //special case array with 2 string objects
-                if (
-                    Object.keys(arrayElement).length === 2 &&
-                    typeof Object.keys(arrayElement)[0] === "string" &&
-                    typeof Object.keys(arrayElement)[1] === "string" &&
-                    typeof arrayElement[Object.keys(arrayElement)[0]] !== "object" &&
-                    typeof arrayElement[Object.keys(arrayElement)[1]] !== "object" &&
-                    arrayElement[Object.keys(arrayElement)[0]] !== "null"
-                ) {
-                    let subKey = arrayElement[Object.keys(arrayElement)[0]];
-                    const subValue = arrayElement[Object.keys(arrayElement)[1]];
-                    const subName = Object.keys(arrayElement)[0] + " " + Object.keys(arrayElement)[1];
-                    if (key) {
-                        subKey = key + "." + subKey;
-                    }
-                    if (!this.alreadyCreatedObjects[path + "." + subKey]) {
-                        await this.adapter
-                            .setObjectNotExistsAsync(path + "." + subKey, {
-                                type: "state",
-                                common: {
-                                    name: subName,
-                                    role: this.getRole(subValue, options.write),
-                                    type: subValue !== null ? typeof subValue : "mixed",
-                                    write: options.write,
-                                    read: true,
-                                },
-                                native: {},
-                            })
-                            .then(() => {
-                                this.alreadyCreatedObjects[path + "." + subKey] = true;
-                            });
-                    }
-                    this.adapter.setState(path + "." + subKey, subValue, true);
-                    return;
-                }
-                this.parse(path + "." + arrayPath, arrayElement, options);
-            });
-        } catch (error) {
-            this.adapter.log.error("Cannot extract array " + path);
-            this.adapter.log.error(error);
-        }
-    }
-    isJsonString(str) {
-        try {
-            JSON.parse(str);
-        } catch (e) {
-            return false;
-        }
-        return true;
-    }
-    getRole(element, write) {
-        if (typeof element === "boolean" && !write) {
-            return "indicator";
-        }
-        if (typeof element === "boolean" && write) {
-            return "switch";
-        }
-        if (typeof element === "number" && !write) {
-            return "value";
-        }
-        if (typeof element === "number" && write) {
-            return "level";
-        }
-        if (typeof element === "string") {
-            return "text";
-        }
-        return "state";
-    }
-};

package/lib/tools.js

@@ -1,99 +0,0 @@
-const axios = require("axios").default;
-
-/**
- * Tests whether the given variable is a real object and not an Array
- * @param {any} it The variable to test
- * @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]";
-}
-
-/**
- * Tests whether the given variable is really an Array
- * @param {any} it The variable to test
- * @returns {it is any[]}
- */
-function isArray(it) {
-    if (typeof Array.isArray === "function") return Array.isArray(it);
-    return Object.prototype.toString.call(it) === "[object Array]";
-}
-
-/**
- * Translates text to the target language. Automatically chooses the right translation API.
- * @param {string} text The text to translate
- * @param {string} targetLang The target languate
- * @param {string} [yandexApiKey] The yandex API key. You can create one for free at https://translate.yandex.com/developers
- * @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);
-    }
-}
-
-/**
- * Translates text with Yandex API
- * @param {string} text The text to translate
- * @param {string} targetLang The target languate
- * @param {string} apiKey The yandex API key. You can create one for free at https://translate.yandex.com/developers
- * @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}`);
-    }
-}
-
-/**
- * Translates text with Google API
- * @param {string} text The text to translate
- * @param {string} targetLang The target languate
- * @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}`);
-        }
-    }
-}
-
-module.exports = {
-    isArray,
-    isObject,
-    translateText
-};