iobroker.amtronwallbox 0.2.14 → 0.2.16

package/README.md

@@ -54,6 +54,14 @@ Note: Since the boxes have different interfaces, it may be that not all interfac
   Placeholder for the next version (at the beginning of the line):
   ### **WORK IN PROGRESS**
 -->
+### 0.2.16 (2024-08-24)
+* (René) update dependencies
+* (René) bug fixes based on adapter checker recommendation
+
+### 0.2.15 (2024-05-28)
+* (René) change of dependencies
+* (René) show cron job in log after creation
+
 ### 0.2.14 (2024-01-12)
 * (René) dependencies updated
 

package/admin/i18n/de/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "API-Schlüssel",
+    "IPAddress": "IP Adresse",
+    "IsActive": "aktiv",
+    "Main settings": "Haupteinstellungen",
+    "Type": "Typ",
+    "name": "Name",
+    "readInterval": "Leseintervall [min]",
+    "systems": "Systeme"
+}

package/admin/i18n/en/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "Api Key",
+    "IPAddress": "IP-Address",
+    "IsActive": "active",
+    "Main settings": "Main settings",
+    "Type": "type",
+    "name": "name",
+    "readInterval": "read intervall [min]",
+    "systems": "systems"
+}

package/admin/i18n/es/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "Clave API",
+    "IPAddress": "Dirección IP",
+    "IsActive": "activo",
+    "Main settings": "Ajustes principales",
+    "Type": "escribe",
+    "name": "nombre",
+    "readInterval": "intervalo de lectura [min]",
+    "systems": "sistemas"
+}

package/admin/i18n/fr/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "Clé API",
+    "IPAddress": "Adresse IP",
+    "IsActive": "actif",
+    "Main settings": "Réglages principaux",
+    "Type": "taper",
+    "name": "Nom",
+    "readInterval": "intervalle de lecture [min]",
+    "systems": "systèmes"
+}

package/admin/i18n/it/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "Chiave API",
+    "IPAddress": "Indirizzo IP",
+    "IsActive": "attivo",
+    "Main settings": "Impostazioni principali",
+    "Type": "genere",
+    "name": "nome",
+    "readInterval": "intervallo di lettura [min]",
+    "systems": "sistemi"
+}

package/admin/i18n/nl/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "API sleutel",
+    "IPAddress": "IP adres",
+    "IsActive": "actief",
+    "Main settings": "Belangrijkste instellingen",
+    "Type": "type",
+    "name": "naam",
+    "readInterval": "lees interval [min]",
+    "systems": "systemen"
+}

package/admin/i18n/pl/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "Klucz API",
+    "IPAddress": "Adres IP",
+    "IsActive": "aktywny",
+    "Main settings": "Ustawienia główne",
+    "Type": "rodzaj",
+    "name": "Nazwa",
+    "readInterval": "interwał odczytu [min]",
+    "systems": "systemy"
+}

package/admin/i18n/pt/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "Chave API",
+    "IPAddress": "Endereço de IP",
+    "IsActive": "ativo",
+    "Main settings": "Configurações principais",
+    "Type": "modelo",
+    "name": "nome",
+    "readInterval": "intervalo de leitura [min]",
+    "systems": "sistemas"
+}

package/admin/i18n/ru/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "API-ключ",
+    "IPAddress": "Айпи адрес",
+    "IsActive": "активный",
+    "Main settings": "Основные параметры",
+    "Type": "тип",
+    "name": "имя",
+    "readInterval": "интервал чтения [мин]",
+    "systems": "системы"
+}

package/admin/i18n/uk/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "Ключ API",
+    "IPAddress": "IP-адреса",
+    "IsActive": "активний",
+    "Main settings": "Основні налаштування",
+    "Type": "типу",
+    "name": "назва",
+    "readInterval": "інтервал читання [хв]",
+    "systems": "системи"
+}

package/admin/i18n/zh-cn/translations.json

@@ -0,0 +1,10 @@
+{
+    "ApiKey": "API 密钥",
+    "IPAddress": "IP地址",
+    "IsActive": "积极的",
+    "Main settings": "主要设置",
+    "Type": "类型",
+    "name": "姓名",
+    "readInterval": "读取间隔 [分钟]",
+    "systems": "系统"
+}

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "amtronwallbox",
-    "version": "0.2.14",
+    "version": "0.2.16",
     "news": {
+      "0.2.16": {
+        "en": "update dependencies\nbug fixes based on adapter checker recommendation",
+        "de": "aktualisierung der abhängigkeiten\nfehlerbehebungen basierend auf adapter-checker empfehlung",
+        "ru": "обновление зависимостей\nисправления ошибок на основе рекомендации адаптера",
+        "pt": "dependências\ncorreções de bugs com base na recomendação do verificador do adaptador",
+        "nl": "afhankelijkheden bijwerken\nbug fixes op basis van adaptercontrole aanbeveling",
+        "fr": "mettre à jour les dépendances\ncorrection des bugs en fonction de la recommandation du vérificateur d'adaptateur",
+        "it": "aggiornamento dipendenze\ncorrezioni di bug in base alla raccomandazione dell'adattatore checker",
+        "es": "dependencias de actualización\ncorrecciones de errores basado en la recomendación de control de adaptador",
+        "pl": "aktualizacji zależności\npoprawki błędów oparte na rekomendacji sprawdzania adaptera",
+        "uk": "оновлення залежності\nвиправлення помилок на основі рекомендації адаптера",
+        "zh-cn": "更新依赖关系\n根据适配器检查器建议修正错误"
+      },
+      "0.2.15": {
+        "en": "(René) change of dependencies\n(René) show cron job in log after creation",
+        "de": "(René) Veränderung der Abhängigkeiten\n(René) cron job in log nach der Erstellung anzeigen",
+        "ru": "(René) изменение зависимостей\n(René) показать работу корона в журнале после создания",
+        "pt": "(René) mudança de dependências\n(René) mostrar trabalho cron em log após a criação",
+        "nl": "(René) verandering van afhankelijkheden\n(René) cron job tonen in log na aanmaak",
+        "fr": "(René) changement de dépendances\n(René) montrer cron emploi dans log après la création",
+        "it": "(René) cambiamento delle dipendenze\n(René) mostrare il lavoro di cron nel registro dopo la creazione",
+        "es": "(René) cambio de dependencia\n(René) show cron job in log after creation",
+        "pl": "(René) zmiana zależności\n(René) show cron job in log after creation",
+        "uk": "(Рене) зміна залежностей\n(René) покажуть на роботу в журналі після створення",
+        "zh-cn": "(René) 属地变化\n(René) 创建后在日志中显示 cron 工作"
+      },
       "0.2.14": {
         "en": "(René) dependencies updated",
         "de": "(René)",
@@ -67,32 +93,6 @@
         "pl": "(René) rodzaj adaptatora zmieniał się z powrotem do energii",
         "uk": "(René) тип адаптера змінився назад до енергії",
         "zh-cn": "(René) 适应者类型改为能源"
-      },
-      "0.2.9": {
-        "en": "dependencies updated",
-        "de": "Abhängigkeiten aktualisiert",
-        "ru": "зависимости обновлены",
-        "pt": "dependências atualizadas",
-        "nl": "afhankelijkheden bijgewerkt",
-        "fr": "dépendances mises à jour",
-        "it": "dipendenze aggiornate",
-        "es": "dependencias actualizadas",
-        "pl": "zależności zostały zaktualizowane",
-        "uk": "залежності оновлено",
-        "zh-cn": "依赖项已更新"
-      },
-      "0.2.8": {
-        "en": "role of states overworked",
-        "de": "Rolle der Zustände überarbeitet",
-        "ru": "роль государств перегружена работой",
-        "pt": "papel dos estados sobrecarregados",
-        "nl": "rol van staten overbelast",
-        "fr": "rôle des Etats surmenés",
-        "it": "ruolo degli stati oberati di lavoro",
-        "es": "papel de los estados sobrecargado",
-        "pl": "rola państw jest przepracowana",
-        "uk": "роль держ",
-        "zh-cn": "国家角色过度劳累"
       }
     },
     "titleLang": {
@@ -136,11 +136,14 @@
     "loglevel": "info",
     "stopBeforeUpdate": true,
     "type": "energy",
-    "license": "MIT",
-    "materialize": true,
+    "tier": 3,
+    "licenseInformation": {
+      "license": "MIT",
+      "type": "free"
+    },
     "dependencies": [
       {
-        "js-controller": ">=2.0.0"
+        "js-controller": ">=5.0.19"
       }
     ],
     "plugins": {

package/lib/support_tools.js

@@ -0,0 +1,367 @@
+"use strict";
+
+
+/**
+ * @param {string} timeVal
+ * @param {string} timeLimit
+ */
+function IsLater(adapter, timeVal, timeLimit) {
+
+	let ret = false;
+	try {
+		adapter.log.debug("check IsLater : " + timeVal + " " + timeLimit);
+
+		if (typeof timeVal === "string" && typeof timeLimit === "string") {
+			const valIn = timeVal.split(":");
+			const valLimits = timeLimit.split(":");
+
+			if (valIn.length > 1 && valLimits.length > 1) {
+
+				if (parseInt(valIn[0]) > parseInt(valLimits[0])
+                    || (parseInt(valIn[0]) == parseInt(valLimits[0]) && parseInt(valIn[1]) > parseInt(valLimits[1]))) {
+					ret = true;
+					adapter.log.debug("yes, IsLater : " + timeVal + " " + timeLimit);
+				}
+			}
+			else {
+				adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
+			}
+		}
+		else {
+			adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
+		}
+	}
+	catch (e) {
+		adapter.log.error("exception in IsLater [" + e + "]");
+	}
+	return ret;
+}
+
+/**
+ * @param {string } timeVal
+ * @param {string } [timeLimit]
+ */
+function IsEarlier(adapter, timeVal, timeLimit) {
+
+	let ret = false;
+	try {
+		adapter.log.debug("check IsEarlier : " + timeVal + " " + timeLimit);
+
+		if (typeof timeVal === "string" && typeof timeLimit === "string") {
+			const valIn = timeVal.split(":");
+			const valLimits = timeLimit.split(":");
+
+			if (valIn.length > 1 && valLimits.length > 1) {
+
+				if (parseInt(valIn[0]) < parseInt(valLimits[0])
+                    || (parseInt(valIn[0]) == parseInt(valLimits[0]) && parseInt(valIn[1]) < parseInt(valLimits[1]))) {
+					ret = true;
+					adapter.log.debug("yes, IsEarlier : " + timeVal + " " + timeLimit);
+				}
+			}
+			else {
+				adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
+			}
+		}
+		else {
+			adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
+		}
+	}
+	catch (e) {
+		adapter.log.error("exception in IsEarlier [" + e + "]");
+	}
+	return ret;
+}
+
+/**
+ * @param {string} timeVal
+ * @param {string} timeLimit
+ */
+function IsEqual(adapter, timeVal, timeLimit) {
+
+	let ret = false;
+	try {
+		adapter.log.debug("check IsEqual : " + timeVal + " " + timeLimit);
+
+		if (typeof timeVal === "string" && typeof timeLimit === "string") {
+			const valIn = timeVal.split(":");
+			const valLimits = timeLimit.split(":");
+
+			if (valIn.length > 1 && valLimits.length > 1) {
+
+				if (parseInt(valIn[0]) === parseInt(valLimits[0]) && parseInt(valIn[1]) === parseInt(valLimits[1])) {
+					ret = true;
+					adapter.log.debug("yes, IsEqual : " + timeVal + " " + timeLimit);
+				}
+			}
+			else {
+				adapter.log.error("string does not contain : " + timeVal + " " + timeLimit);
+			}
+		}
+		else {
+			adapter.log.error("not a string " + typeof timeVal + " " + typeof timeLimit);
+		}
+	}
+	catch (e) {
+		adapter.log.error("exception in IsEqual [" + e + "]");
+	}
+	return ret;
+}
+
+//*******************************************************************
+//
+// find a object in array by key and value
+// returns the object
+function findObjectByKey(array, key, value) {
+	if (array !== null &&  array !== undefined) {
+		for (let i = 0; i < array.length; i++) {
+			if (array[i][key] === value) {
+				return array[i];
+			}
+		}
+	}
+	return null;
+}
+
+//*******************************************************************
+//
+// find a object in array by key and value
+// returns the object
+function findObjectsByKey(array, key, value) {
+
+	const ret = [];
+
+	if (array !== null &&  array !== undefined) {
+		for (let i = 0; i < array.length; i++) {
+			if (array[i][key] === value) {
+				ret.push(array[i]);
+			}
+		}
+	}
+	return ret;
+}
+
+
+//*******************************************************************
+//
+// find a object in array by key and value
+// returns index number
+function findObjectIdByKey(array, key, value) {
+
+
+	//array.filter(d => d.key == value);
+
+	if (array !== null &&  array !== undefined) {
+
+		for (let i = 0; i < array.length; i++) {
+			if (array[i][key] === value) {
+				return i;
+			}
+		}
+	}
+	return -1;
+}
+
+
+//*******************************************************************
+//
+// find all objects in array by key and value
+// returns index number array
+function findObjectsIdByKey(array, key, value) {
+
+	const ret = [];
+
+	if (array !== null &&  array !== undefined) {
+
+		for (let i = 0; i < array.length; i++) {
+			if (array[i][key] === value) {
+				ret.push(i);
+			}
+		}
+	}
+	return ret;
+}
+
+
+function timeConverter(SystemLanguage,time, timeonly = false) {
+
+	let a;
+
+	if (time != null) {
+		a = new Date(time);
+	}
+	else {
+		a = new Date();
+	}
+	let months;
+
+	if (SystemLanguage === "de") {
+		months = ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"];
+	}
+	else if (SystemLanguage === "en") {
+		months = ["Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"];
+	}
+	else {
+		months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+	}
+
+	const year = a.getFullYear();
+	const month = months[a.getMonth()];
+	const date = a.getDate();
+	const sdate = date < 10 ? " " + date.toString() : date.toString();
+	const hour = a.getHours();
+	const shour = hour < 10 ? "0" + hour.toString() : hour.toString();
+	const min = a.getMinutes();
+	const smin = min < 10 ? "0" + min.toString() : min.toString();
+	const sec = a.getSeconds();
+	const ssec = sec < 10 ? "0" + sec.toString() : sec.toString();
+
+	let sRet = "";
+	if (timeonly) {
+		sRet = shour + ":" + smin + ":" + ssec;
+	}
+	else {
+		sRet = sdate + " " + month + " " + year.toString() + " " + shour + ":" + smin + ":" + ssec;
+	}
+
+	return sRet;
+}
+
+function CheckValidTime(adapter, id, time) {
+
+	let sRet = "00:00";
+	try {
+		if (time === "null" ||  time === undefined) {
+			adapter.log.error("time value not found for " + id);
+
+		}
+		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) {
+			adapter.log.error("time not long enough for " + id);
+
+		}
+		else if (!time.includes(":")) {
+			adapter.log.error("time ':' missing for " + id);
+		}
+		else {
+			const times = time.split(":");
+			sRet = "0" + times[0].slice(-2) + ":" + "0" + times[1].slice(-2);
+		}
+
+	}
+	catch (e) {
+		adapter.log.error("exception in CheckValidTime [" + e + "] for " + id + " " + JSON.stringify(time));
+
+	}
+	return sRet;
+
+}
+
+
+function Check4ValidTemperature(adapter, temperature) {
+
+	try {
+
+		if (temperature == null) {
+			adapter.log.warn("target temperature is 'null' ");
+		}
+
+		if (typeof temperature == "object") {
+			adapter.log.warn("target temperature is an object, value: " + JSON.stringify(temperature));
+		}
+
+		if (isNaN(temperature) || typeof temperature === "string") {
+
+			adapter.log.debug("try to convert " + temperature + " to a number");
+			return Number(temperature);
+		}
+		else {
+			return temperature;
+		}
+
+	}
+	catch (e) {
+		adapter.log.error("exception in Check4ValidTemperature [" + e + "]");
+		return 0;
+	}
+
+}
+
+
+function IsSummerTime(adapter, sStartDate, sEndDate) {
+
+	let ret = false;
+	try {
+
+		adapter.log.debug("check in time " + sStartDate + " " + sEndDate);
+
+		if (sStartDate.length > 0 && sEndDate.length > 0) {
+			const StartPeriod = sStartDate.split(/[.,/ -]/);
+			const EndPeriod = sEndDate.split(/[.,/ -]/);
+
+			if (StartPeriod.length >= 2 && EndPeriod.length >= 2) {
+
+				const StartDate = new Date();
+				StartDate.setDate(parseInt(StartPeriod[0]));
+				StartDate.setMonth(parseInt(StartPeriod[1]) - 1);
+				adapter.log.debug("Start " + StartDate.toDateString());
+
+				const EndDate = new Date();
+				EndDate.setDate(parseInt(EndPeriod[0]));
+				EndDate.setMonth(parseInt(EndPeriod[1]) - 1);
+				adapter.log.debug("End " + EndDate.toDateString());
+
+				const now = new Date();
+
+				//bei Jahreswechsel
+				if (EndDate < StartDate) {
+					if (now > EndDate) {
+						//end already past, increase end year
+						EndDate.setFullYear(EndDate.getFullYear() + 1);
+						adapter.log.debug("corrected End " + EndDate.toDateString());
+					}
+					else {
+						//else decrease Start year
+						StartDate.setFullYear(StartDate.getFullYear() - 1);
+						adapter.log.debug("corrected Start " + StartDate.toDateString());
+					}
+				}
+
+				if (now >= StartDate && now <= EndDate) {
+					adapter.log.debug("we are in period");
+					ret = true;
+				}
+				else {
+					adapter.log.debug("we are not in period, after start " + StartDate.toDateString() + " and before end " + EndDate.toDateString());
+					ret = false;
+				}
+			}
+		}
+	}
+	catch (e) {
+		adapter.log.error("exception catch in IsSummerTime [" + e + "] ");
+	}
+	return ret;
+}
+
+
+
+
+
+
+module.exports = {
+	IsLater,
+	IsEarlier,
+	IsEqual,
+	findObjectsIdByKey,
+	findObjectIdByKey,
+	findObjectsByKey,
+	findObjectByKey,
+	timeConverter,
+	CheckValidTime,
+	Check4ValidTemperature,
+	IsSummerTime
+};

package/main.js

@@ -12,6 +12,8 @@ const axios = require("axios");
 
 const CronJob = require("cron").CronJob;
 
+const timeConverter = require("./lib/support_tools.js").timeConverter;
+
 let cronJobs = [];
 
 /*
@@ -95,6 +97,8 @@ async function main() {
 
 	CronCreate(readInterval, Do);
 
+	CronStatus();
+
 }
 
 async function Do() {
@@ -2538,6 +2542,7 @@ function CronStop() {
 	}
 }
 
+/*
 function deleteCronJob(id) {
 
 	cronJobs[id].stop();
@@ -2552,6 +2557,7 @@ function deleteCronJob(id) {
 
 
 }
+*/
 
 function CronCreate(Minute, callback) {
 
@@ -2600,7 +2606,7 @@ function CronStatus() {
 			//adapter.log.debug("cron jobs");
 			for (n = 0; n < length; n++) {
 				if ( cronJobs[n] !== undefined && cronJobs[n] != null) {
-					adapter.log.debug("cron status = " + cronJobs[n].running + " next event: " + timeConverter("DE", cronJobs[n].nextDates()));
+					adapter.log.debug("cron status = " + cronJobs[n].running + " next event: " + timeConverter("DE", cronJobs[n].nextDate()));
 				}
 			}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.amtronwallbox",
-  "version": "0.2.14",
+  "version": "0.2.16",
   "description": "ioBroker Adapter for AMTRON wallboxes",
   "author": {
     "name": "René G.",
@@ -21,42 +21,45 @@
     "url": "https://github.com/rg-engineering/ioBroker.amtronwallbox"
   },
   "engines": {
-    "node": ">= 16"
+    "node": ">= 18"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "3.0.4",
-    "axios": "1.6.5",
-    "cron": "3.1.6"
+    "@iobroker/adapter-core": "^3.1.6",
+    "axios": "^1.7.5",
+    "cron": "^3.1.7"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "3.7.0",
-    "@alcalzone/release-script-plugin-iobroker": "3.7.0",
-    "@alcalzone/release-script-plugin-license": "3.7.0",
-    "@iobroker/adapter-dev": "1.2.0",
-    "@iobroker/testing": "4.1.0",
-    "@types/chai": "4.3.11",
-    "@types/chai-as-promised": "7.1.8",
-    "@types/gulp": "4.0.17",
-    "@types/mocha": "10.0.6",
-    "@types/node": "20.11.0",
-    "@types/proxyquire": "1.3.31",
-    "@types/request-promise-native": "1.0.21",
-    "@types/sinon": "17.0.3",
-    "@types/sinon-chai": "3.2.12",
-    "axios": "1.6.5",
-    "chai": "4.4.1",
-    "chai-as-promised": "7.1.1",
-    "eslint": "8.56.0",
-    "gulp": "4.0.2",
-    "mocha": "10.2.0",
-    "proxyquire": "2.1.3",
-    "sinon": "17.0.1",
-    "sinon-chai": "3.7.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": "^4.1.3",
+    "chai": "^5.1.1",
+    "mocha": "^10.7.3"
   },
   "main": "main.js",
   "bugs": {
     "url": "https://github.com/rg-engineering/ioBroker.amtronwallbox"
   },
+  "files": [
+    "admin/",
+    "admin{,/!(i18n)/**}/flat.txt",
+    "lib/",
+    "!.vscode",
+    "!.github",
+    "!.git",
+    "!.gitignore",
+    "!.gitattributes",
+    "!node_modules",
+    "!tasks",
+    "!.idea",
+    "!test",
+    "!typings",
+    "io-package.json",
+    "LICENSE",
+    "main.js"
+  ],
   "readmeFilename": "README.md",
   "scripts": {
     "test": "npm run test:package",

package/.releaseconfig.json

@@ -1,3 +0,0 @@
-{
-  "plugins": [ "iobroker", "license" ]
-}