iobroker.amtronwallbox 0.2.13 → 0.2.15

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2023 rg-engineering info@rg-engineering.eu
+Copyright (c) 2022-2024 René G. <info@rg-engineering.eu>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -54,6 +54,13 @@ 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.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
+
 ### 0.2.13 (2023-12-23)
 * (René) just a sentry test
 
@@ -104,7 +111,7 @@ Note: Since the boxes have different interfaces, it may be that not all interfac
 ## License
 MIT License
 
-Copyright (c) 2022-2023 rg-engineering info@rg-engineering.eu
+Copyright (c) 2022-2024 René G. <info@rg-engineering.eu>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "amtronwallbox",
-    "version": "0.2.13",
+    "version": "0.2.15",
     "news": {
+      "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é)",
+        "ru": "(René)",
+        "pt": "(René) dependências atualizadas",
+        "nl": "(René) bijgewerkte afhankelijkheden",
+        "fr": "(René) dépendances mises à jour",
+        "it": "(René) dipendenze aggiornate",
+        "es": "(René) dependencies updated",
+        "pl": "Aktualizacja zależności (René)",
+        "uk": "(René) залежностей оновлено",
+        "zh-cn": "(René) 更新的依赖关系"
+      },
       "0.2.13": {
         "en": "(René) just a sentry test",
         "de": "(René) nur einen Test",
@@ -67,32 +93,6 @@
         "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": "国家角色过度劳累"
-      },
-      "0.2.7": {
-        "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": "依赖项已更新"
       }
     },
     "titleLang": {
@@ -136,11 +136,15 @@
     "loglevel": "info",
     "stopBeforeUpdate": true,
     "type": "energy",
-    "license": "MIT",
+    "tier": 3,
+    "licenseInformation": {
+      "license": "MIT",
+      "type": "free"
+    },
     "materialize": true,
     "dependencies": [
       {
-        "js-controller": ">=2.0.0"
+        "js-controller": ">=5.0.0"
       }
     ],
     "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.13",
+  "version": "0.2.15",
   "description": "ioBroker Adapter for AMTRON wallboxes",
   "author": {
     "name": "René G.",
@@ -21,37 +21,37 @@
     "url": "https://github.com/rg-engineering/ioBroker.amtronwallbox"
   },
   "engines": {
-    "node": ">= 16"
+    "node": ">= 18"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "3.0.4",
-    "axios": "1.6.2",
-    "cron": "3.1.6"
+    "@iobroker/adapter-core": "^3.1.4",
+    "axios": "^1.7.2",
+    "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.4",
-    "@types/node": "20.10.5",
-    "@types/proxyquire": "1.3.31",
-    "@types/request-promise-native": "1.0.21",
-    "@types/sinon": "17.0.1",
-    "@types/sinon-chai": "3.2.12",
-    "axios": "1.6.2",
-    "chai": "4.3.10",
-    "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.7.0",
+    "@alcalzone/release-script-plugin-iobroker": "^3.7.0",
+    "@alcalzone/release-script-plugin-license": "^3.7.0",
+    "@iobroker/adapter-dev": "^1.3.0",
+    "@iobroker/testing": "^4.1.3",
+    "@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.12.12",
+    "@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.7.2",
+    "chai": "^4.4.1",
+    "chai-as-promised": "^7.1.2",
+    "eslint": "^9.3.0",
+    "gulp": "^5.0.0",
+    "mocha": "^10.4.0",
+    "proxyquire": "^2.1.3",
+    "sinon": "^18.0.0",
+    "sinon-chai": "^3.7.0"
   },
   "main": "main.js",
   "bugs": {