iobroker.ebus 3.6.2 → 3.6.3

package/README.md

@@ -76,6 +76,11 @@ in /opt/iobroker/node_modules/iobroker.ebus/lib/scripts you can find a scripts t
   Placeholder for the next version (at the beginning of the line):
   ### **WORK IN PROGRESS**
 -->
+### 3.6.3 (2025-06-27)
+* (René) get version info for ebusd from github if locally not available
+* (René) update dependencies
+* (René) new testing
+
 ### 3.6.2 (2025-06-09)
 * (René) (Galileo53) #419 avoid Warning and error when history list is empty
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "ebus",
-    "version": "3.6.2",
+    "version": "3.6.3",
     "news": {
+      "3.6.3": {
+        "en": "get version info for ebusd from github if locally not available\nupdate dependencies\nnew testing",
+        "de": "versionsinformationen für ebusd von github erhalten, wenn lokal nicht verfügbar\naktualisierung der abhängigkeiten\nneue tests",
+        "ru": "получить информацию о версии для вытеснения из github, если локально недоступно\nобновление зависимостей\nновые испытания",
+        "pt": "obter informações de versão para o ebusd do github se não estiver disponível localmente\natualizar dependências\nnovos testes",
+        "nl": "krijgen versie-informatie voor ebusd van github als lokaal niet beschikbaar\nafhankelijkheden bijwerken\nnieuwe tests",
+        "fr": "obtenir des informations de version pour ebusd de github si localement pas disponible\nmettre à jour les dépendances\nnouveaux essais",
+        "it": "ottenere informazioni sulla versione per ebusd da github se localmente non disponibile\naggiornamento dipendenze\nnuovi test",
+        "es": "obtener información de la versión para ebusd de github si localmente no disponible\ndependencias de actualización\nnuevas pruebas",
+        "pl": "uzyskać informacje o wersji dla ebusd z github, jeśli lokalnie nie jest dostępny\naktualizacji zależności\nnowe badania",
+        "uk": "отримати інформацію про версію для ebusd від github, якщо локально не доступний\nоновлення залежності\nновий тест",
+        "zh-cn": "如果本地不可用, 从 github 获取 ebusd 的版本信息\n更新依赖关系\n新测试"
+      },
       "3.6.2": {
         "en": "(Galileo53) #419 avoid Warning and error when history list is empty",
         "de": "(Galileo53) #419 vermeiden Warnung und Fehler bei leerer Geschichtsliste",
@@ -80,19 +93,6 @@
         "pl": "połowów wyjątków reportet przez wartownik\nopcja wyłączenia sprawdzania czasu ostatniej aktualizacji (patrz numer # 391)",
         "uk": "виняток винятку по відправці\nможливість відключити перевірку останнього часу оновлення (див. проблему #391)",
         "zh-cn": "按哨兵分列的渔获量例外报告\n选项以禁用上次更新时间的检查(见第391期)"
-      },
-      "3.4.0": {
-        "en": "migration to jsonConfig\nsee issue #383: add optionally parameters to HTTP call",
-        "de": "Migration nach jsonConfig\nsiehe Ausgabe #383: optionale Parameter zum HTTP-Aufruf hinzufügen",
-        "ru": "миграции в jsonConfig\n#383: добавить дополнительные параметры к HTTP-звонку",
-        "pt": "migração para jsonConfig\nveja o problema #383: adicione parâmetros opcionalmente à chamada HTTP",
-        "nl": "migratie naar jsonConfig\nzie probleem #383: voeg optioneel parameters toe aan HTTP-aanroep",
-        "fr": "migration vers jsonConfig\nvoir le numéro #383: ajouter optionnellement des paramètres à l'appel HTTP",
-        "it": "migrazione a jsonConfig\nvedi numero #383: aggiungi parametri opzionalmente alla chiamata HTTP",
-        "es": "migración a jsonConfig\nver número #383: añadir parámetros opcionalmente a la llamada HTTP",
-        "pl": "migracja do jsonConfig\nzobacz numer # 383: dodać opcjonalne parametry do wywołania HTTP",
-        "uk": "міграції в jsonConfig\nпереглянути номер #383: додавати додаткові параметри до HTTP виклику",
-        "zh-cn": "迁移到 jsonConfig\n参见第383期: 在 HTTP 调用中添加可选参数"
       }
     },
     "titleLang": {
@@ -286,6 +286,26 @@
           "agree",
           "cancel"
         ]
+      },
+      {
+        "condition": {
+          "operand": "and",
+          "rules": [
+            "oldVersion<=3.6.2",
+            "newVersion>3.6.2"
+          ]
+        },
+        "title": {
+          "en": "data structure might be changed"
+        },
+        "text": {
+          "en": "Due to new used parser data structure might be changed. Please verify your settings."
+        },
+        "level": "warn",
+        "buttons": [
+          "agree",
+          "cancel"
+        ]
       }
     ]
   },
@@ -301,6 +321,7 @@
     "maxretries": 5,
     "readInterval": 5,
     "History4Vis2": false,
+    "DisableTimeUpdateCheck": false,
     "HTTPparameter": [
       {
         "active": false,

package/lib/support_tools.js

@@ -1,8 +1,10 @@
+/* eslint-disable prefer-template */
 "use strict";
 
 const heatingcontrolDictionary = require("./vis_words.js").heatingcontrolDictionary;
 
 /**
+ * @param {object} adapter
  * @param {string} timeVal
  * @param {string} timeLimit
  */
@@ -23,22 +25,20 @@ function IsLater(adapter, timeVal, timeLimit) {
                     ret = true;
                     adapter.log.debug("yes, IsLater : " + timeVal + " " + timeLimit);
                 }
-            }
-            else {
+            } else {
                 adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
             }
-        }
-        else {
+        } else {
             adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
         }
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in IsLater [" + e + "]");
     }
     return ret;
 }
 
 /**
+ * @param {object} adapter
  * @param {string } timeVal
  * @param {string } [timeLimit]
  */
@@ -59,22 +59,20 @@ function IsEarlier(adapter, timeVal, timeLimit) {
                     ret = true;
                     adapter.log.debug("yes, IsEarlier : " + timeVal + " " + timeLimit);
                 }
-            }
-            else {
+            } else {
                 adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
             }
-        }
-        else {
+        } else {
             adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
         }
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in IsEarlier [" + e + "]");
     }
     return ret;
 }
 
 /**
+ * @param {object} adapter
  * @param {string} timeVal
  * @param {string} timeLimit
  */
@@ -94,16 +92,13 @@ function IsEqual(adapter, timeVal, timeLimit) {
                     ret = true;
                     adapter.log.debug("yes, IsEqual : " + timeVal + " " + timeLimit);
                 }
-            }
-            else {
+            } else {
                 adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
             }
-        }
-        else {
+        } else {
             adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
         }
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in IsEqual [" + e + "]");
     }
     return ret;
@@ -190,16 +185,14 @@ function timeConverter(SystemLanguage,time, timeonly = false) {
 
     if (time != null) {
         a = new Date(time);
-    }
-    else {
+    } else {
         a = new Date();
     }
     let months;
 
     if (SystemLanguage === "de") {
         months = ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"];
-    }
-    else {
+    } else {
         months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
     }
     const year = a.getFullYear();
@@ -216,8 +209,7 @@ function timeConverter(SystemLanguage,time, timeonly = false) {
     let sRet = "";
     if (timeonly) {
         sRet = hour + ":" + min + ":" + sec;
-    }
-    else {
+    } else {
         sRet = date + " " + month + " " + year + " " + hour + ":" + min + ":" + sec;
     }
 
@@ -231,25 +223,20 @@ function CheckValidTime(adapter, id, time) {
         if (time === "null" || typeof time === undefined) {
             adapter.log.error("time value not found for " + id);
 
-        }
-        else if (typeof time !== "string") {
+        } else if (typeof time !== "string") {
             adapter.log.error("time should be a string but is " + typeof time.val + " for " + id);
 
-        }
-        else if (time.length < 3) {
+        } else if (time.length < 3) {
             adapter.log.error("time not long enough for " + id);
 
-        }
-        else if (!time.includes(":")) {
+        } else if (!time.includes(":")) {
             adapter.log.error("time ':' missing for " + id);
-        }
-        else {
+        } else {
             const times = time.split(":");
             sRet = "0" + times[0].slice(-2) + ":" + "0" + times[1].slice(-2);
         }
 
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in CheckValidTime [" + e + "] for " + id + " " + JSON.stringify(time));
 
     }
@@ -270,13 +257,11 @@ function Check4ValidTemperature(adapter, temperature) {
 
             adapter.log.debug("try to convert " + temperature + " to a number");
             return Number(temperature);
-        }
-        else {
+        } else {
             return temperature;
         }
 
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception in Check4ValidTemperature [" + e + "]");
         return 0;
     }
@@ -315,8 +300,7 @@ function IsSummerTime(adapter, sStartDate, sEndDate) {
                         //end already past, increase end year
                         EndDate.setFullYear(EndDate.getFullYear() + 1);
                         adapter.log.debug("corrected End " + EndDate.toDateString());
-                    }
-                    else {
+                    } else {
                         //else decrease Start year
                         StartDate.setFullYear(StartDate.getFullYear() - 1);
                         adapter.log.debug("corrected Start " + StartDate.toDateString());
@@ -326,15 +310,13 @@ function IsSummerTime(adapter, sStartDate, sEndDate) {
                 if (now >= StartDate && now <= EndDate) {
                     adapter.log.debug("we are in period");
                     ret = true;
-                }
-                else {
+                } else {
                     adapter.log.debug("we are not in period, after start " + StartDate.toDateString() + " and before end " + EndDate.toDateString());
                     ret = false;
                 }
             }
         }
-    }
-    catch (e) {
+    } catch (e) {
         adapter.log.error("exception catch in IsSummerTime [" + e + "] ");
     }
     return ret;

package/lib/tools.js

@@ -1,7 +1,7 @@
 const axios = require('axios').default;
 
+//Tests whether the given variable is a real object and not an Array
 /**
- * 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>}
  */
@@ -13,18 +13,20 @@ function isObject(it) {
     return Object.prototype.toString.call(it) === '[object Object]';
 }
 
+//Tests whether the given variable is really an Array
 /**
- * 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);
+    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.
 /**
- * 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
@@ -43,8 +45,8 @@ async function translateText(text, targetLang, yandexApiKey) {
     }
 }
 
+//Translates text with Yandex API
 /**
- * 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
@@ -66,8 +68,8 @@ async function translateYandex(text, targetLang, apiKey) {
     }
 }
 
+//Translates text with Google API
 /**
- * Translates text with Google API
  * @param {string} text The text to translate
  * @param {string} targetLang The target languate
  * @returns {Promise<string>}