iobroker.sun2000 2.4.5 → 2.5.1

package/lib/tools.js

@@ -57,6 +57,7 @@ class Logging {
 class StateMap {
 	constructor() {
 		this.stateMap = new Map();
+		this._mapDecimalPlaces = 10; //internal
 	}
 
 	round(num, decimalPlaces = 0) {
@@ -65,7 +66,12 @@ class StateMap {
 		return Math.round(n) / p;
 	}
 
-	get(id) {
+	get(id, decimalPlaces = -1) {
+		const mapItem = this.stateMap.get(id);
+		if (decimalPlaces >= 0 && mapItem?.type === 'number') {
+			return { ...mapItem, value: this.round(mapItem.value, decimalPlaces) };
+		}
+
 		return this.stateMap.get(id);
 	}
 
@@ -78,7 +84,7 @@ class StateMap {
 		if (value !== null) {
 			if (options?.type == 'number') {
 				//value = Math.round((value + Number.EPSILON) * 1000) / 1000; //3rd behind
-				value = this.round(value, 3);
+				value = this.round(Number(value), this._mapDecimalPlaces);
 			}
 
 			const existing = this.get(id); //existing entry
@@ -86,6 +92,7 @@ class StateMap {
 			const mapOptions = {
 				id: id,
 				value: value,
+				type: options?.type ? options.type : existing?.type ? existing.type : typeof value,
 				stored: existing?.stored ? existing.stored : false,
 			};
 			if (options?.renew || existing?.value !== value) {
@@ -166,6 +173,11 @@ class RiemannSum {
 	constructor(autoResetAtMitnight = true) {
 		this._resetAtMitnight = autoResetAtMitnight;
 		this.reset();
+		this._startInitialized = false;
+	}
+
+	get startInitialized() {
+		return this._startInitialized;
 	}
 
 	get lastDate() {
@@ -211,10 +223,17 @@ class RiemannSum {
 		return this._sum;
 	}
 
-	setStart(sum, ts) {
+	setStart(sum, ts, setStartInitialized = true) {
 		if (!isNaN(sum)) {
 			this._sum = sum;
-			this._lastDate = new Date(ts);
+			if (ts === undefined) {
+				this._lastDate = new Date();
+			} else {
+				this._lastDate = new Date(ts);
+			}
+			if (setStartInitialized) {
+				this._startInitialized = true;
+			}
 		} else {
 			this.reset();
 		}
@@ -253,7 +272,7 @@ 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 {unknown} 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.
  */

package/main.js

@@ -486,6 +486,8 @@ class Sun2000 extends utils.Adapter {
 			//further battery register
 			this.settings.ds.batteryUnits = this.config.ds_bu;
 			this.settings.ds.batteryPacks = this.config.ds_bp;
+			//statistics
+			this.settings.statistics = { liveInterval: this.config.stat_liveInterval || 5 }; //min
 
 			if (this.settings.modbusAdjust) {
 				await this.setState('info.JSONhealth', { val: '{message: "Adjust modbus settings"}', ack: true });
@@ -554,9 +556,9 @@ class Sun2000 extends utils.Adapter {
 				this.devices.push({
 					index: 0,
 					duration: 0,
-					//modbusId: 1, --> testMode
 					modbusId: 0,
 					meter: true,
+					//testMode: true,
 					driverClass: driverClasses.emma,
 				});
 			}
@@ -683,6 +685,9 @@ class Sun2000 extends utils.Adapter {
 			this.pollingTimer && this.clearTimeout(this.pollingTimer);
 			this.mitnightTimer && this.clearTimeout(this.mitnightTimer);
 			this.watchDogHandle && this.clearInterval(this.watchDogHandle);
+			if (typeof this.state.destroy === 'function') {
+				this.state.destroy();
+			}
 			this.modbusClient && this.modbusClient.close();
 			this.setState('info.connection', false, true);
 			callback();
@@ -702,19 +707,20 @@ class Sun2000 extends utils.Adapter {
 		if (state) {
 			// The state was changed
 			if (state.ack) {
-				//this.logger.info(`state ${id} was changed but the ack flag was set. Therefore, no processing takes place!`);
+				//this.logger.warn(`state ${id} was changed but the ack flag was set. Therefore, no processing takes place!`);
 				return;
 			}
 			const idArray = id.split('.');
 			// sun2000.0.inverter.0.control
 			if (idArray[2] == 'inverter') {
-				const control = this.devices[Number(idArray[3])].instance.control;
-				if (control) {
+				const inverter = this.devices.find(d => d.driverClass == driverClasses.inverter && d.index == Number(idArray[3]));
+				//const control = this.devices[Number(idArray[3])].instance.control;
+				if (inverter && inverter.instance.control) {
 					let serviceId = idArray[5];
 					for (let i = 6; i < idArray.length; i++) {
 						serviceId += `.${idArray[i]}`;
 					}
-					control.set(serviceId, state);
+					inverter.instance.control.set(serviceId, state);
 				}
 				//this.log.info(`### state ${id} changed: ${state.val} (ack = ${state.ack})`);
 			}
@@ -747,6 +753,13 @@ class Sun2000 extends utils.Adapter {
 					this.state.statistics.handleTemplateChange(chartType, state);
 				}
 			}
+
+			//sun2000.0.statistics.dataDef.consumptionBreakdown
+			if (idArray[2] == 'statistics' && idArray[3] == 'dataDef' && idArray[4] == 'consumptionBreakdown') {
+				if (this.state.statistics && typeof this.state.statistics.handleBreakdownChange === 'function') {
+					this.state.statistics.handleBreakdownChange(state);
+				}
+			}
 		} else {
 			// The state was deleted
 			this.logger.info(`state ${id} deleted`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "2.4.5",
+  "version": "2.5.1",
   "description": "sun2000",
   "author": {
     "name": "bolliy",
@@ -24,27 +24,26 @@
     "url": "https://github.com/bolliy/ioBroker.sun2000.git"
   },
   "engines": {
-    "node": ">= 20"
+    "node": ">= 22"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.3.2",
+    "@iobroker/adapter-core": "^3.4.1",
+    "javascript-stringify": "^2.1.0",
     "modbus-serial": "^8.0.25",
     "suncalc2": "^1.8.1",
-    "tcp-port-used": "^1.0.2",
-    "javascript-stringify": "^2.1.0"
+    "tcp-port-used": "^1.0.3"
   },
   "devDependencies": {
-    "@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",
+    "@alcalzone/release-script": "^5.2.1",
+    "@alcalzone/release-script-plugin-iobroker": "^5.2.0",
+    "@alcalzone/release-script-plugin-license": "^5.2.0",
+    "@alcalzone/release-script-plugin-manual-review": "^5.2.0",
     "@iobroker/adapter-dev": "^1.5.0",
-    "@iobroker/eslint-config": "^2.2.0",
+    "@iobroker/eslint-config": "^2.3.4",
     "@iobroker/testing": "^5.2.2",
     "@tsconfig/node22": "^22.0.5",
-    "@types/node": "^25.6.0",
-    "globals": "^16.5.0",
-    "typescript": "~5.9.3"
+    "@types/node": "^22.19.21",
+    "typescript": "~6.0.3"
   },
   "main": "main.js",
   "files": [