iobroker.sun2000 2.3.7 → 2.4.2

package/lib/tools.js

@@ -70,8 +70,10 @@ class StateMap {
 	}
 
 	set(id, value, options) {
-		if (options?.type == 'number' && isNaN(value)) {
-			return;
+		if (options?.type == 'number') {
+			if (typeof value !== 'number' || isNaN(value)) {
+				return;
+			}
 		}
 		if (value !== null) {
 			if (options?.type == 'number') {
@@ -170,6 +172,14 @@ class RiemannSum {
 		return this._lastDate ? this._lastDate : new Date();
 	}
 
+	/**
+	 * Adds the new value to calculate the Riemann sum.
+	 *
+	 * This function calculates the Riemann sum by adding the new value multiplied by the time elapsed since the last value,
+	 * updating the total sum. If the auto reset at midnight is enabled, it resets the sum at midnight.
+	 *
+	 * @param {number} newValue - The new value to be added for Riemann sum calculation.
+	 */
 	add(newValue) {
 		//Obersumme bilden
 		const now = new Date();
@@ -182,12 +192,12 @@ class RiemannSum {
 				0,
 				0, // ...at 00:00:00 hours
 			);
-			if (this.lastDate?.getTime() <= lastnight.getTime()) {
+			if (this.lastDate?.getTime() < lastnight.getTime()) {
 				this.reset();
 			}
 		}
 		if (!isNaN(newValue)) {
-			this._sum += (newValue * (now.getTime() - this.lastDate.getTime())) / 3600 / 1000; //Hour/Sekunden
+			this._sum += (newValue * (now.getTime() - this.lastDate.getTime())) / 3600000; //Hour/Sekunden
 			this._lastDate = now;
 		}
 	}
@@ -240,6 +250,30 @@ const createAsyncLock = () => {
 	};
 };
 
+/**
+ * Warten auf einen Wert, der von einer Funktion zurückgegeben wird.
+ * Der Wert wird alle 100ms geprüft. Wenn der Wert innerhalb der angegebenen Zeit nicht gesetzt wurde, wird ein Timeout-Fehler zurückgegeben.
+ * @param {Function} func - Die Funktion, die den Wert zurückgibt.
+ * @param {number} [timeout] - Die maximale Wartezeit in ms.
+ * @returns {Promise} - Ein Promise, das den Wert zurückgibt oder einen Timeout-Fehler wirft.
+ */
+const waitForValue = (func, timeout = 5000) => {
+	return new Promise((resolve, reject) => {
+		const timer = setInterval(() => {
+			const variable = func();
+			if (variable !== undefined && variable !== null) {
+				clearInterval(timer);
+				resolve(variable);
+			}
+			timeout -= 200;
+			if (timeout <= 0) {
+				clearInterval(timer);
+				reject('Timeout: Wert wurde nicht rechtzeitig gesetzt.');
+			}
+		}, 200); // alle 200ms prüfen
+	});
+};
+
 // Get longitude an latidude from system config
 async function getSystemData(adapter) {
 	const state = await adapter.getForeignObjectAsync('system.config');
@@ -343,6 +377,7 @@ module.exports = {
 	RegisterMap,
 	RiemannSum,
 	createAsyncLock,
+	waitForValue,
 	getSystemData,
 	getAstroDate,
 	isSunshine,

package/lib/types.js

@@ -258,6 +258,12 @@ const dataType = {
 	},
 };
 
+const statisticsType = {
+	deltaReset: 'deltaReset',
+	delta: 'delta',
+	level: 'level',
+};
+
 module.exports = {
 	modbusErrorMessages,
 	getDeviceStatusInfo,
@@ -267,4 +273,5 @@ module.exports = {
 	driverClasses,
 	storeType,
 	dataType,
+	statisticsType,
 };

package/main.js

@@ -70,7 +70,8 @@ class Sun2000 extends utils.Adapter {
 		this.on('ready', this.onReady.bind(this));
 		this.on('stateChange', this.onStateChange.bind(this));
 		// this.on('objectChange', this.onObjectChange.bind(this));
-		// this.on('message', this.onMessage.bind(this));
+		// enable message handling for statistics/flexcharts requests
+		this.on('message', this.onMessage.bind(this));
 		this.on('unload', this.onUnload.bind(this));
 	}
 
@@ -356,9 +357,9 @@ class Sun2000 extends utils.Adapter {
 			this.config.timeout = this.config.timeout * 1000;
 			this.updateConfig(this.config);
 		}
-		if (this.config.sl_active) {
+		if (this.config['sl_active']) {
 			//old Smartlogger
-			this.config.sl_active = false;
+			this.config['sl_active'] = false;
 			this.config.integration = 1;
 			this.updateConfig(this.config);
 		}
@@ -658,6 +659,14 @@ class Sun2000 extends utils.Adapter {
 					emma.instance.control.set(serviceId, state);
 				}
 			}
+
+			//sun2000.0.statistics.flexCharts.template
+			if (idArray[2] == 'statistics' && idArray[3] == 'flexCharts' && idArray[4] == 'template') {
+				const chartType = idArray[5];
+				if (this.state.statistics && typeof this.state.statistics.handleTemplateChange === 'function') {
+					this.state.statistics.handleTemplateChange(chartType, state);
+				}
+			}
 		} else {
 			// The state was deleted
 			this.logger.info(`state ${id} deleted`);
@@ -670,17 +679,22 @@ class Sun2000 extends utils.Adapter {
 	//  * Using this method requires "common.messagebox" property to be set to true in io-package.json
 	//  * @param {ioBroker.Message} obj
 	//  */
-	// onMessage(obj) {
-	// 	if (typeof obj === 'object' && obj.message) {
-	// 		if (obj.command === 'send') {
-	// 			// e.g. send email or pushover or whatever
-	// 			this.log.info('send command');
-
-	// 			// Send response in callback if required
-	// 			if (obj.callback) this.sendTo(obj.from, obj.command, 'Message received', obj.callback);
-	// 		}
-	// 	}
-	// }
+
+	// handle incoming messages (used by flexcharts script source)
+	onMessage(obj) {
+		if (typeof obj === 'object' && obj.message) {
+			// support a dedicated command 'statistics' to generate chart data
+			if (obj.command === 'statistics') {
+				if (this.state.statistics && typeof this.state.statistics.handleFlexMessage === 'function') {
+					this.state.statistics.handleFlexMessage(obj.message, result => {
+						if (obj.callback) this.sendTo(obj.from, obj.command, result, obj.callback);
+					});
+				} else {
+					if (obj.callback) this.sendTo(obj.from, obj.command, { error: 'statistics unavailable' }, obj.callback);
+				}
+			}
+		}
+	}
 }
 
 if (require.main !== module) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "2.3.7",
+  "version": "2.4.2",
   "description": "sun2000",
   "author": {
     "name": "bolliy",
@@ -28,20 +28,21 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
-    "modbus-serial": "^8.0.23",
+    "modbus-serial": "^8.0.25",
     "suncalc2": "^1.8.1",
-    "tcp-port-used": "^1.0.2"
+    "tcp-port-used": "^1.0.2",
+    "javascript-stringify": "^2.1.0"
   },
   "devDependencies": {
-    "@alcalzone/release-script": "^5.0.0",
-    "@alcalzone/release-script-plugin-iobroker": "^4.0.0",
-    "@alcalzone/release-script-plugin-license": "^4.0.0",
-    "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
+    "@alcalzone/release-script": "^5.1.1",
+    "@alcalzone/release-script-plugin-iobroker": "^5.1.2",
+    "@alcalzone/release-script-plugin-license": "^5.1.1",
+    "@alcalzone/release-script-plugin-manual-review": "^5.1.1",
     "@iobroker/adapter-dev": "^1.5.0",
     "@iobroker/eslint-config": "^2.2.0",
     "@iobroker/testing": "^5.2.2",
-    "@tsconfig/node20": "^20.1.8",
-    "@types/node": "^25.0.10",
+    "@tsconfig/node22": "^22.0.5",
+    "@types/node": "^25.5.0",
     "globals": "^16.5.0",
     "typescript": "~5.9.3"
   },