iobroker.sun2000 0.16.0 → 0.17.0

package/README.md

@@ -28,7 +28,7 @@ Read and write register data from Huawei SUN2000 inverter and LUNA2000 battery u
 Feel free to follow the discussions in the german [iobroker forum](https://forum.iobroker.net/topic/71768/test-adapter-sun2000-v0-1-x-huawei-wechselrichter)
 
 ## Dependencies
-* Node.js 18.x or higher
+* Node.js 18.18.0 or higher
 * ioBroker host (js-controller) 5.0.19 or higher
 * ioBroker admin 5.1.13 or higher
 
@@ -65,6 +65,12 @@ browse in the [wiki](https://github.com/bolliy/ioBroker.sun2000/wiki)
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.17.0 (2024-11-05)
+* adjust for Responsive Design #134
+* migrate to ESLint 9.x
+* node >= v18.18.0
+* modbus-proxy: enabled reading data via input register
+
 ### 0.16.0 (2024-11-01)
 * dependency and configuration updates
 * read additional register data of Huawei Emma

package/admin/jsonConfig.json5

@@ -11,7 +11,12 @@
             "items": {
                 "donateTxt": {
                     "type": "staticText",
-                    "text": "donateTxt"
+                    "text": "donateTxt",
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4,
+                    "xl": 4
                 },
                 "donateImage": {
                     "type": "staticImage",
@@ -19,8 +24,8 @@
                     "href" : "https://www.paypal.com/donate/?hosted_button_id=ZTX3VP9LZBDCG",
                     "src" : "paypal-button.png",
                     "newLine": true,
-                    "xs": 8,
-                    "sm": 10,
+                    "xs": 6,
+                    "sm": 4,
                     "md": 2,
                     "lg": 2,
                     "xl": 2
@@ -114,7 +119,12 @@
                 "chipsTxt": {
                     "type": "staticText",
                     "text": "Provides the collected data from the SDongle",
-                    "newLine": true
+                    "newLine": true,
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4,
+                    "xl": 4
                 },
                 "sd_active": {
                     "type": "checkbox",
@@ -166,7 +176,12 @@
                 "chipsTxt1": {
                     "type": "staticText",
                     "text": "Placeholder for future Settings",
-                    "newLine": true
+                    "newLine": true,
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4,
+                    "xl": 4
                 }
             }
         },
@@ -183,7 +198,12 @@
                 "chipsTxt": {
                     "type": "staticText",
                     "text": "Third party device such as wallbox, energy manager etc. can receive and send data even if the modbus interface of inverter is already in use. In addition you can mirror the sun2000 data to another IoBroker instance.",
-                    "newLine": true
+                    "newLine": true,
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4,
+                    "xl": 4
                 },
                 "ms_active": {
                     "type": "checkbox",
@@ -244,7 +264,12 @@
                 "chipsTxt1": {
                     "type": "staticText",
                     "text": "This control is set in the opject path `sun2000.0.inverter.x.control.battery`",
-                    "newLine": true
+                    "newLine": true,
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4,
+                    "xl": 4
                 },
                 "cb_tou": {
                     "type": "checkbox",
@@ -279,7 +304,12 @@
                 "chipsTxt2": {
                     "type": "staticText",
                     "text": "This control is set in the opject path `sun2000.0.inverter.x.control.battery`",
-                    "newLine": true
+                    "newLine": true,
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4,
+                    "xl": 4
                 },
                 "staticLink2": {
                     "type": "staticLink",
@@ -303,7 +333,12 @@
                 "chipsTxt3": {
                     "type": "staticText",
                     "text": "This control is set in the opject path `sun2000.0.inverter.0.control.grid`",
-                    "newLine": true
+                    "newLine": true,
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4,
+                    "xl": 4
                 },
                 "staticLink3": {
                     "type": "staticLink",
@@ -429,7 +464,12 @@
                 "chipsTxt": {
                     "type": "staticText",
                     "text": "Do you need help? There are multiple ways of getting support. ",
-                    "newLine": true
+                    "newLine": true,
+                    "xs": 12,
+                    "sm": 12,
+                    "md": 6,
+                    "lg": 4,
+                    "xl": 4
                 },
                 "staticLink1": {
                     "type": "staticLink",

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "0.16.0",
+    "version": "0.17.0",
     "news": {
+      "0.17.0": {
+        "en": "adjust for Responsive Design #134\nmigrate to ESLint 9.x\nnode >= v18.18.0\nmodbus-proxy: enabled reading data via input register",
+        "de": "anpassung für Responsive Design #134\nmigration auf ESLint 9.x\nknoten >= v18.18.0\nmodbus-proxy: lesedaten über eingaberegister aktiviert",
+        "ru": "#134\nмигрировать в ESLint 9.x\nnode >= v18.18.0\nmodbus-proxy: включено чтение данных через регистр ввода",
+        "pt": "ajustar para Design responsivo #134\nmigrar para ESLint 9.x\nnode >= v18.18.0\nmodbus-proxy: dados de leitura habilitados via registro de entrada",
+        "nl": "aanpassen voor Responsive Design #134\nmigreren naar ESLint 9.x\nn.v.t\nmodbus-proxy: leesgegevens ingeschakeld via invoerregister",
+        "fr": "ajuster pour Responsive Design #134\nmigrer vers ESLint 9.x\nnoeud >= v18.18.0\nmodbus-proxy: activé la lecture des données via le registre d'entrée",
+        "it": "regolazione per Responsive Design #134\nmigrare a ESLint 9.x\nnodo >= v18.18.0\nmodbus-proxy: dati di lettura abilitati tramite registro input",
+        "es": "ajuste para el diseño responsable #134\nmigrar a ESLint 9.x\nnodo\nmodbus-proxy: datos de lectura habilitados mediante registro de entrada",
+        "pl": "dostosowanie dla Responsive Design # 134\nmigrate do ESLint 9.x\nwęzeł > = v18.18.0\nmodbus- proxy: włączone odczytywanie danych poprzez rejestr wejściowy",
+        "uk": "конфігурація для відповідального дизайну #134\nmigrate до ESLint 9.x\nвершина >= v18.18.0\nmodbus-proxy: ввімкнено дані читання через вхідний реєстр",
+        "zh-cn": "调整响应设计 # 134\n迁移到 ESLint 9.x\n节点 {v18.18.0}\nmodbus- 代理: 启用通过输入寄存器读取数据"
+      },
       "0.16.0": {
         "en": "dependency and configuration updates\nread additional register data of Huawei Emma",
         "de": "abhängigkeits- und konfigurationsupdates\nweitere Registrierungsdaten von Huawei Emma lesen",
@@ -80,19 +93,6 @@
         "pl": "poprawić ponowne połączenie Modbus # 116\naktualizacja konfiguracji\nprosta integracja Huawei Emma (Huawei Energy Management Assistant) # 63",
         "uk": "поліпшення відключення Modbus #116\nоновлення конфігурації\nпроста інтеграція Huawei Emma (Huawei Energy Management Assistant) #63",
         "zh-cn": "改进 Modbus 重联 # 116\n配置更新\n简单整合Huawei Emma(Huawei能源管理助理)#63"
-      },
-      "0.12.1": {
-        "en": "no warning from check the valid number during standby: \"no irradiation\"",
-        "de": "keine warnung vor der prüfung der gültigen nummer im standby: \"keine bestrahlung\"",
-        "ru": "не предупредить проверить действительный номер во время ожидания: «без облучения»",
-        "pt": "sem aviso de verificar o número válido durante o standby: \"nenhuma irradiação\"",
-        "nl": "geen waarschuwing van controle van het geldige nummer tijdens standby: \"geen bestraling\"",
-        "fr": "aucun avertissement de vérifier le nombre valide en attente: \"pas d'irradiation\"",
-        "it": "nessun avviso da controllare il numero valido durante la standby: \"nessuna irradiazione\"",
-        "es": "no hay advertencia de comprobar el número válido durante la espera: \"no irradiación\"",
-        "pl": "brak ostrzeżenia z sprawdzenia poprawnego numeru podczas czuwania: \"brak napromieniowania\"",
-        "uk": "без попередження про перевірку дійсного числа під час очікування: \"не опромінення\"",
-        "zh-cn": "在待命时不检查有效号码的警告 : “ 不辐射 ”"
       }
     },
     "titleLang": {

package/lib/drivers/driver_inverter.js

@@ -971,11 +971,8 @@ class InverterSun2000 extends DriverBase{
 			} else {
 				const state = this.stateCache.get(`${this.deviceInfo.path}.battery.unit.${unit}.batteryPack.${pack}.SN`);
 				return this.adapter.settings.ds.batteryPacks && state && state.value;
-				//return state && state.value;
-				//return (state && 'test');
 			}
 		}
-
 	}
 
 	//overload

package/lib/modbus/modbus_server.js

@@ -13,19 +13,17 @@ class ModbusServer {
 
 		//https://github.com/yaacov/node-modbus-serial/blob/master/ServerTCP.d.ts
 		this.vector = {
-			getInputRegister: (addr, unitId, callback) => {
-				this._addInfoStat('#getInputRegister',addr, 1 , unitId);
-				callback({ modbusErrorCode: 0x01, msg: 'Illegal function (device does not support this read/write function)' });
+			getInputRegister: async (addr, unitId, callback) => {
+				await this._handleGetReg('getInputRegister',addr, 1, unitId, callback);
 			},
 			getHoldingRegister: async (addr, unitId, callback) => {
-				await this._handleGetReg(addr, 1, unitId, callback);
+				await this._handleGetReg('getHoldingRegister',addr, 1, unitId, callback);
 			},
-			getMultipleInputRegisters: (startAddr, length,unitId, callback ) => {
-				this._addInfoStat('#getMultipleInputRegisters',startAddr, length, unitId);
-				callback({ modbusErrorCode: 0x01, msg: 'Illegal function (device does not support this read/write function)' });
+			getMultipleInputRegisters: async (startAddr, length,unitId, callback ) => {
+				await this._handleGetReg('getMultipleInputRegisters',startAddr, length, unitId, callback);
 			},
 			getMultipleHoldingRegisters: async (startAddr, length, unitId, callback) => {
-				await this._handleGetReg(startAddr, length, unitId, callback);
+				await this._handleGetReg('getMultipleHoldingRegisters',startAddr, length, unitId, callback);
 			},
 			getCoil: (addr,unitId, callback) => {
 				this._addInfoStat('#getCoil',addr, 1 , unitId);
@@ -33,10 +31,10 @@ class ModbusServer {
 			},
 			//https://github.com/yaacov/node-modbus-serial/blob/cbd4379bed9672c13ec3a8517d622b728a737a5e/servers/servertcp_handler.js#L925C16-L925C32
 			setRegisterArray: async (addr, values, unitId, callback) => {
-				await this._handleSetReg(addr,values,unitId, callback);
+				await this._handleSetReg('setRegisterArray',addr,values,unitId, callback);
 			},
 			setRegister: async (addr, value,unitId, callback) => {
-				await this._handleSetReg(addr,value,unitId, callback);
+				await this._handleSetReg('setRegister',addr,value,unitId, callback);
 			},
 			setCoil: (addr, value, unitId, callback) => {
 				this._addInfoStat('#setCoil',addr, value, unitId);
@@ -138,7 +136,7 @@ class ModbusServer {
 		}
 	}
 
-	async _handleGetReg (startAddr, length, unitId, callback) {
+	async _handleGetReg (fnName,startAddr, length, unitId, callback) {
 		//this.adapter.log.debug('getMultipleHolgingRegisters '+unitId+' '+startAddr+' len '+length+' '+this._isConnected);
 		try {
 			const device = this.getDeviceInstance(unitId);
@@ -151,27 +149,27 @@ class ModbusServer {
 					callback({ modbusErrorCode: 0x05, msg: 'Acknowledge (requested data will be available later)' });
 				} else {
 					if (values[0] == null) {
-						this._addInfoStat('#getMultipleHoldingRegisters',startAddr, length, unitId);
+						this._addInfoStat('#'+fnName,startAddr, length, unitId);
 						await this.wait(200);
 					} else {
-						this._addInfoStat('getMultipleHoldingRegisters',startAddr, length, unitId);
+						this._addInfoStat(fnName,startAddr, length, unitId);
 						await this.wait(50);
 					}
 					callback(undefined,values);
 				}
 			} else {
-				this._addInfoStat('#getMultipleHoldingRegisters',startAddr, length, unitId);
+				this._addInfoStat('#'+fnName,startAddr, length, unitId);
 				await this.wait(500);
 				callback({ modbusErrorCode: 0x01, msg: 'Illegal function (device does not support this read/write function)' });
 			}
-		} catch (err) {
-			this._addInfoStat('#getMultipleHoldingRegisters',startAddr, length, unitId);
+		} catch  {
+			this._addInfoStat('#'+fnName,startAddr, length, unitId);
 			await this.wait(500);
 			callback({ modbusErrorCode: 0x04, msg: 'Slave device failure (device reports internal error)' });
 		}
 	}
 
-	async _handleSetReg(address, data, unitId, callback) {
+	async _handleSetReg(fnName,address, data, unitId, callback) {
 		try {
 			this.log.debug('Modbus-proxy: Try to write data to id/address ' + unitId + '/' + address +'/'+ data);
 			const device = this.getDeviceInstance(unitId);
@@ -195,20 +193,20 @@ class ModbusServer {
 				await this.adapter.modbusClient.writeRegisters(address,data);
 				//write also to the read cache
 				device.addHoldingRegisters(address,data);
-				this._addInfoStat('setRegisterArray',address,data.length, unitId);
+				this._addInfoStat(fnName,address,data.length, unitId);
 			} else {
 				await this.adapter.modbusClient.writeRegister(address,data);
 				device.addHoldingRegisters(address,[data]);
-				this._addInfoStat('setRegister',address,1, unitId);
+				this._addInfoStat(fnName,address,1, unitId);
 			}
 			callback();
 		} catch (err) {
 			this.log.warn('Modbus-proxy: can not write data to id/address ' + unitId + '/' + address +'/'+ data);
 			this.log.warn('Modbus-proxy: '+err?.message);
 			if (Array.isArray(data)) {
-				this._addInfoStat('#setRegisterArray',address,data.length, unitId);
+				this._addInfoStat('#'+fnName,address,data.length, unitId);
 			} else {
-				this._addInfoStat('#setRegister',address,1, unitId);
+				this._addInfoStat('#'+fnName,address,1, unitId);
 			}
 			await this.wait(500);
 			callback({ modbusErrorCode: err?.modbusCode, msg: err?.message });

package/main.js

@@ -320,7 +320,6 @@ class Sun2000 extends utils.Adapter {
 			this.config.integration = 1;
 			this.updateConfig(this.config);
 		}
-
 		await this.setState('info.ip', {val: this.config.address, ack: true});
 		await this.setState('info.port', {val: this.config.port, ack: true});
 		await this.setState('info.modbusIds', {val: this.config.modbusIds, ack: true});
@@ -339,6 +338,7 @@ class Sun2000 extends utils.Adapter {
 			this.settings.modbusIds = this.config.modbusIds.split(',').map((n) => {return Number(n);});
 			//SmartDongle
 			this.settings.sd.active = this.config.sd_active;
+			// eslint-disable-next-line no-constant-binary-expression
 			this.settings.sd.sDongleId = Number(this.config.sDongleId) ?? 0;
 			if (this.settings.sd.sDongleId < 0 || this.settings.sd.sDongleId >= 255) this.settings.sd.active = false;
 			this.settings.highInterval = this.config.updateInterval*1000; //ms
@@ -527,7 +527,7 @@ class Sun2000 extends utils.Adapter {
 			this.modbusClient && this.modbusClient.close();
 			this.setState('info.connection', false, true);
 			callback();
-		} catch (e) {
+		} catch {
 			callback();
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "description": "sun2000",
   "author": {
     "name": "bolliy",
@@ -24,7 +24,7 @@
     "url": "https://github.com/bolliy/ioBroker.sun2000.git"
   },
   "engines": {
-    "node": ">= 18"
+    "node": ">= 18.18.0"
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.2",
@@ -37,6 +37,8 @@
     "@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",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.14.0",
     "@iobroker/adapter-dev": "^1.3.0",
     "@iobroker/testing": "^5.0.0",
     "@tsconfig/node16": "^16.1.3",
@@ -49,7 +51,8 @@
     "@types/sinon-chai": "^3.2.12",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
-    "eslint": "^8.57.1",
+    "eslint": "^9.14.0",
+    "globals": "^15.11.0",
     "mocha": "^10.8.2",
     "proxyquire": "^2.1.3",
     "sinon": "^19.0.2",