iobroker.bydhvs 1.5.0 → 1.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.bydhvs",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "BYD HVS Battery poll data",
   "author": {
     "name": "Christian",
@@ -9,44 +9,50 @@
   "homepage": "https://github.com/christianh17/ioBroker.bydhvs",
   "license": "MIT",
   "keywords": [
-    "byd hvs battery pv"
+    "byd hvs battery pv",
+    "ioBroker"
   ],
   "repository": {
     "type": "git",
     "url": "git@github.com:christianh17/ioBroker.bydhvs.git"
   },
   "engines": {
-    "node": ">= 16"
+    "node": ">= 20"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.4",
+    "@iobroker/adapter-core": "^3.2.3",
     "crc": "4.3.2"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^3.6.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.6.0",
-    "@alcalzone/release-script-plugin-license": "^3.5.9",
-    "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
-    "@iobroker/adapter-dev": "^1.2.0",
-    "@iobroker/testing": "^4.1.0",
-    "@types/chai": "^4.3.9",
-    "@types/chai-as-promised": "^7.1.7",
-    "@types/gulp": "^4.0.16",
-    "@types/mocha": "^10.0.3",
-    "@types/node": "^20.8.10",
-    "@types/proxyquire": "^1.3.30",
-    "@types/sinon": "^10.0.20",
-    "@types/sinon-chai": "^3.2.11",
-    "axios": "^1.6.0",
-    "chai": "^4.3.10",
-    "chai-as-promised": "^7.1.1",
-    "eslint": "^8.52.0",
-    "gulp": "^4.0.2",
-    "mocha": "^10.2.0",
+    "@alcalzone/release-script": "^3.8.0",
+    "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
+    "@alcalzone/release-script-plugin-license": "^3.7.0",
+    "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
+    "@iobroker/adapter-dev": "^1.3.0",
+    "@iobroker/testing": "^5.0.0",
+    "@tsconfig/node14": "^14.1.2",
+    "@iobroker/eslint-config": "^1.0.0",
+    "@types/chai": "^4.3.5",
+    "@types/chai-as-promised": "^8.0.1",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^24.1.0",
+    "@types/node-schedule": "^2.1.7",
+    "@types/proxyquire": "^1.3.31",
+    "@types/sinon": "^17.0.3",
+    "@types/sinon-chai": "^3.2.12",
+    "chai": "^4.4.1",
+    "chai-as-promised": "^8.0.1",
+    "eslint": "^9.32.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.5.3",
+    "mocha": "^11.0.1",
     "proxyquire": "^2.1.3",
-    "sinon": "^17.0.0",
+    "rimraf": "^3.0.2",
+    "sinon": "^21.0.0",
     "sinon-chai": "^3.7.0",
-    "typescript": "^5.2.2"
+    "source-map-support": "^0.5.21",
+    "ts-node": "^10.9.1",
+    "typescript": "~5.7.2"
   },
   "main": "main.js",
   "scripts": {
@@ -56,7 +62,7 @@
     "test:integration": "mocha test/integration --exit",
     "test": "npm run test:js && npm run test:package",
     "check": "tsc --noEmit -p tsconfig.check.json",
-    "lint": "eslint",
+    "lint": "eslint -c eslint.config.mjs .",
     "translate": "translate-adapter",
     "release": "release-script"
   },

package/prettier.config.mjs

@@ -0,0 +1,8 @@
+// iobroker prettier configuration file
+import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs';
+
+export default {
+    ...prettierConfig,
+    // uncomment next line if you prefer double quotes
+    // singleQuote: false,
+}

package/admin/admin.d.ts

@@ -1,93 +0,0 @@
-declare let systemDictionary: Record<string, Record<string, string>>;
-
-declare let load: (settings: Record<string, unknown>, onChange: (hasChanges: boolean) => void) => void;
-declare let save: (callback: (settings: Record<string, unknown>) => void) => void;
-
-// make load and save exist on the window object
-interface Window {
-    load: typeof load;
-    save: typeof save;
-}
-
-declare const instance: number;
-declare const adapter: string;
-/** Translates text */
-declare function _(text: string): string;
-declare const socket: ioBrokerSocket;
-declare function sendTo(
-    instance: any | null,
-    command: string,
-    message: any,
-    callback: (result: SendToResult) => void | Promise<void>,
-): void;
-
-interface SendToResult {
-    error?: string | Error;
-    result?: any;
-}
-
-// tslint:disable-next-line:class-name
-interface ioBrokerSocket {
-    emit(
-        command: "subscribeObjects",
-        pattern: string,
-        callback?: (err?: string) => void | Promise<void>,
-    ): void;
-    emit(
-        command: "subscribeStates",
-        pattern: string,
-        callback?: (err?: string) => void | Promise<void>,
-    ): void;
-    emit(
-        command: "unsubscribeObjects",
-        pattern: string,
-        callback?: (err?: string) => void | Promise<void>,
-    ): void;
-    emit(
-        command: "unsubscribeStates",
-        pattern: string,
-        callback?: (err?: string) => void | Promise<void>,
-    ): void;
-
-    emit(
-        event: "getObjectView",
-        view: "system",
-        type: "device",
-        options: ioBroker.GetObjectViewParams,
-        callback: (
-            err: string | undefined,
-            result?: any,
-        ) => void | Promise<void>,
-    ): void;
-    emit(
-        event: "getStates",
-        callback: (
-            err: string | undefined,
-            result?: Record<string, any>,
-        ) => void,
-    ): void;
-    emit(
-        event: "getState",
-        id: string,
-        callback: (err: string | undefined, result?: ioBroker.State) => void,
-    ): void;
-    emit(
-        event: "setState",
-        id: string,
-        state: unknown,
-        callback: (err: string | undefined, result?: any) => void,
-    ): void;
-
-    on(event: "objectChange", handler: ioBroker.ObjectChangeHandler): void;
-    on(event: "stateChange", handler: ioBroker.StateChangeHandler): void;
-    removeEventHandler(
-        event: "objectChange",
-        handler: ioBroker.ObjectChangeHandler,
-    ): void;
-    removeEventHandler(
-        event: "stateChange",
-        handler: ioBroker.StateChangeHandler,
-    ): void;
-
-    // TODO: other events
-}

package/admin/index_m.html

@@ -1,113 +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="bydhvs.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="ConfPollInterval" />
-                <label for="PollInterval" class="translate">Interval (s)</label>
-            </div>
-
-            <div class="col s6 input-field">
-                <input type="text" class="value" id="ConfIPAdress" />
-                <label for="IP Adress" class="translate">IP Adress</label>
-            </div>
-            <div class="row">
-				<div class="col s6 input-field">
-					<input type="checkbox" class="value" id="ConfBatDetails" />
-					<label for="ConfBatDetails" class="translate">Diagnosis Data from Battery (only tested with two and four modules)</label>
-				</div>
-			</div>
-            <div class="row">
-				<div class="col s6 input-field">
-					<input type="checkbox" class="value" id="ConfTestMode" />
-					<label for="ConfTestMode" class="translate">Test Mode - show data in error log</label>
-				</div>
-			</div>            
-            <div class="row">
-				<div class="col s6 input-field">
-					<input type="text" class="value" id="ConfDetailshowoften" />
-					<label for="ConfDetailshowoften" class="translate">Battery-details - every ... cycles</label>
-				</div>
-			</div>
-        </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,81 +0,0 @@
-/*global systemDictionary:true */
-"use strict";
-
-systemDictionary = {
-    "bydhvs adapter settings": {
-        "en": "Adapter settings for bydhvs",
-        "de": "Adaptereinstellungen für bydhvs",
-        "ru": "Настройки адаптера для bydhvs",
-        "pt": "Configurações do adaptador para bydhvs",
-        "nl": "Adapterinstellingen voor bydhvs",
-        "fr": "Paramètres d'adaptateur pour bydhvs",
-        "it": "Impostazioni dell'adattatore per bydhvs",
-        "es": "Ajustes del adaptador para bydhvs",
-        "pl": "Ustawienia adaptera dla bydhvs",
-        "zh-cn": "bydhvs的适配器设置"
-    },
-    "Interval (s)": {
-        "en": "Interval (s)",
-        "de": "Intervall (s)",
-        "ru": "Интервал (с)",
-        "pt": "Intervalo (s)",
-        "nl": "Interval (en)",
-        "fr": "Intervalle (s)",
-        "it": "Intervallo (i)",
-        "es": "Intervalo (s)",
-        "pl": "Odstęp (y)",
-        "zh-cn": "间隔"
-    },
-
-    "IP Address": {
-        "en": "IP Address",
-        "de": "IP Adresse",
-        "ru": "Айпи адрес",
-        "pt": "Endereço de IP",
-        "nl": "IP adres",
-        "fr": "Adresse IP",
-        "it": "Indirizzo IP",
-        "es": "Dirección IP",
-        "pl": "Adres IP",
-        "zh-cn": "IP地址"
-    },
-    "Diagnosis Data from Battery (only tested with two and four modules)": {
-        "en": "Diagnosis Data from Battery (only tested with two and four modules)",
-        "de": "Diagnosedaten von der Batterie (nur mit zwei und vier Modulen getestet)",
-        "ru": "Данные диагностики от аккумулятора (проверено только с двумя и четырьмя модулями)",
-        "pt": "Dados de diagnóstico da bateria (testado apenas com dois e quatro módulos)",
-        "nl": "Diagnosegegevens van batterij (alleen getest met twee en vier modules)",
-        "fr": "Données de diagnostic de la batterie (testées uniquement avec deux et quatre modules)",
-        "it": "Dati di diagnosi dalla batteria (testato solo con due e quattro moduli)",
-        "es": "Datos de diagnóstico de la batería (solo probado con dos y cuatro módulos)",
-        "pl": "Dane diagnostyczne z akumulatora (testowane tylko z dwoma i czterema modułami)",
-        "zh-cn": "来自电池的诊断数据（仅使用两个和四个模块进行了测试）"
-    },
-
-
-    "Battery-details - every ... cycles": {
-        "en": "Battery-details - every ... cycles",
-        "de": "Batteriedetails - alle ... Zyklen",
-        "ru": "Детали батареи - каждые ... циклы",
-        "pt": "Detalhes da bateria - a cada ... ciclos",
-        "nl": "Batterij-details - elke ... cycli",
-        "fr": "Détails de la batterie - tous les ... cycles",
-        "it": "Dettagli della batteria - ogni ... cicli",
-        "es": "Detalles de la batería - cada ... ciclos",
-        "pl": "Szczegóły baterii - co ... cykle",
-        "zh-cn": "电池详细信息-每...个周期"
-    },
-
-    "Test Mode - show data in error log": {
-        "en": "Test Mode - show data in error log",
-        "de": "Testmodus - Daten im Fehlerprotokoll anzeigen",
-        "ru": "Тестовый режим - показывать данные в журнале ошибок",
-        "pt": "Modo de teste - mostra os dados no registro de erros",
-        "nl": "Testmodus - toon gegevens in foutenlogboek",
-        "fr": "Mode test - afficher les données dans le journal des erreurs",
-        "it": "Modalità test: mostra i dati nel registro degli errori",
-        "es": "Modo de prueba: muestra datos en el registro de errores",
-        "pl": "Tryb testowy - pokaż dane w dzienniku błędów",
-        "zh-cn": "测试模式-在错误日志中显示数据"
-    }
-};

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
-};