iobroker.smartm 0.0.3 → 0.0.4

package/README.md

@@ -21,6 +21,10 @@ This Adapter reads Data of [Photovoltaik SLEnergy Plats](https://www.slenergy.co
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 0.0.4 (2025-12-22)
+
+- incorporated reviews
+
 ### 0.0.3 (2025-11-19)
 
 - claried readme

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "smartm",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "news": {
+      "0.0.4": {
+        "en": "incorporated reviews",
+        "de": "in den warenkorb",
+        "ru": "включенные обзоры",
+        "pt": "revisões incorporadas",
+        "nl": "opgenomen onderzoeken",
+        "fr": "examens intégrés",
+        "it": "recensioni incorporate",
+        "es": "revisiones incorporadas",
+        "pl": "włączone przeglądy",
+        "uk": "відгуки",
+        "zh-cn": "综合审查"
+      },
       "0.0.3": {
         "en": "claried readme\nadded some sizes to controls in admin page",
         "de": "klares lesezeichen\neinige größen zu den kontrollen in admin-seite hinzugefügt",

package/main.js

@@ -19,6 +19,7 @@ class Smartm extends utils.Adapter {
 			name: "smartm",
 		});
 
+		axios.defaults.timeout = 120000;
 		this.accessToken = null;
 		this.powerStationIds = [];
 
@@ -114,7 +115,7 @@ class Smartm extends utils.Adapter {
 				this.setState("info.connection", false, true);
 				this.log.error(`Login failed: ${JSON.stringify(response.data, null, 2)}`);
 				//retry login in 1 minute
-				this.reLoginTimeout = setTimeout(() => {
+				this.reLoginTimeout = this.setTimeout(() => {
 					this.login();
 				}, 1000 * 60);
 			}
@@ -122,7 +123,7 @@ class Smartm extends utils.Adapter {
 			this.setState("info.connection", false, true);
 			this.log.error(`Error obtaining access token: ${error}`);
 			//retry login in 1 minute
-			this.reLoginTimeout = setTimeout(() => {
+			this.reLoginTimeout = this.setTimeout(() => {
 				this.login();
 			}, 1000 * 60);
 		}
@@ -132,11 +133,11 @@ class Smartm extends utils.Adapter {
 	 * parse UserInfo from login response
 	 * @param {object} userInfo - user info object from login response
 	 */
-	parseUserInfo(userInfo) {
+	async parseUserInfo(userInfo) {
 		this.log.debug("Parsing user info");
 
 		//create subtree for userInfo
-		this.setObjectNotExists("userInfo", {
+		await this.setObjectNotExists("userInfo", {
 			type: "channel",
 			common: {
 				name: "Benutzerinformationen",
@@ -151,11 +152,11 @@ class Smartm extends utils.Adapter {
 	 * parse PowerStationList from login response
 	 * @param {array} powerStationList - array of power station objects from login response
 	 */
-	parsePowerStationList(powerStationList) {
+	async parsePowerStationList(powerStationList) {
 		this.log.debug("Parsing power station list");
 
 		//create subtree for powerStationList
-		this.setObjectNotExists("powerStationList", {
+		await this.setObjectNotExists("powerStationList", {
 			type: "channel",
 			common: {
 				name: "Anlageninformationen",
@@ -167,8 +168,8 @@ class Smartm extends utils.Adapter {
 		this.powerStationIds = [];
 		for (const powerStation of powerStationList) {
 			this.powerStationIds.push(powerStation.id);
-			this.setObjectNotExists(`powerStationList.${powerStation.id}`, {
-				type: "channel",
+			await this.setObjectNotExists(`powerStationList.${powerStation.id}`, {
+				type: "device",
 				common: {
 					name: powerStation.powerStationName,
 				},
@@ -207,19 +208,20 @@ class Smartm extends utils.Adapter {
 				if (response.data.success) {
 					this.log.debug(`flow data request successful${JSON.stringify(response.data, null, 2)}`);
 
-					this.setObjectNotExists(`powerStationList.${powerStationId}.flow`, {
+					const flowId = this.name2id(`powerStationList.${powerStationId}.flow`);
+					await this.setObjectNotExists(flowId, {
 						type: "channel",
 						common: {
-							name: `powerStationList.${powerStationId}.flow`,
+							name: flowId,
 						},
 						native: {},
 					});
 
-					this.parseData(`powerStationList.${powerStationId}.flow`, response.data.result);
+					this.parseData(flowId, response.data.result);
 				} else {
 					this.log.error(`reading flow data failed: ${JSON.stringify(response.data, null, 2)}`);
 					//retry login in 1 minute
-					this.reLoginTimeout = setTimeout(() => {
+					this.reLoginTimeout = this.setTimeout(() => {
 						this.login();
 					}, 1000 * 60);
 					return;
@@ -227,7 +229,7 @@ class Smartm extends utils.Adapter {
 			} catch (error) {
 				this.log.error(`reading flow data failed: ${error}`);
 				//retry login in 1 minute
-				this.reLoginTimeout = setTimeout(() => {
+				this.reLoginTimeout = this.setTimeout(() => {
 					this.login();
 				}, 1000 * 60);
 				return;
@@ -257,19 +259,20 @@ class Smartm extends utils.Adapter {
 				if (response.data.success) {
 					this.log.debug(`statistic data request successful${JSON.stringify(response.data, null, 2)}`);
 
-					this.setObjectNotExists(`powerStationList.${powerStationId}.statistics`, {
+					const powerstationStatisticsId = this.name2id(`powerStationList.${powerStationId}.statistics`);
+					await this.setObjectNotExists(powerstationStatisticsId, {
 						type: "channel",
 						common: {
-							name: `powerStationList.${powerStationId}.statistics`,
+							name: powerstationStatisticsId,
 						},
 						native: {},
 					});
 
-					this.parseData(`powerStationList.${powerStationId}.statistics`, response.data.result);
+					this.parseData(powerstationStatisticsId, response.data.result);
 				} else {
 					this.log.error(`reading statistics failed: ${JSON.stringify(response.data, null, 2)}`);
 					//retry login in 1 minute
-					this.reLoginTimeout = setTimeout(() => {
+					this.reLoginTimeout = this.setTimeout(() => {
 						this.login();
 					}, 1000 * 60);
 					return;
@@ -277,7 +280,7 @@ class Smartm extends utils.Adapter {
 			} catch (error) {
 				this.log.error(`reading statistics data failed: ${error}`);
 				//retry login in 1 minute
-				this.reLoginTimeout = setTimeout(() => {
+				this.reLoginTimeout = this.setTimeout(() => {
 					this.login();
 				}, 1000 * 60);
 				return;
@@ -285,15 +288,15 @@ class Smartm extends utils.Adapter {
 		}
 	}
 
-	parseData(parentIoBrokerId, jsonObject) {
+	async parseData(parentIoBrokerId, jsonObject) {
 		const objectKeys = Object.keys(jsonObject);
 		for (const key of objectKeys) {
 			const jsType = typeof jsonObject[key];
-			const iobId = `${parentIoBrokerId}.${key}`;
+			const iobId = this.name2id(`${parentIoBrokerId}.${key}`);
 
 			if (jsType === "object") {
 				if (jsonObject[key] !== null) {
-					this.setObjectNotExists(iobId, {
+					await this.setObjectNotExists(iobId, {
 						type: "channel",
 						common: {
 							name: iobId,
@@ -304,37 +307,56 @@ class Smartm extends utils.Adapter {
 				}
 			} else {
 				//create state
-				let iobType;
 				switch (jsType) {
 					case "number":
-						iobType = "number";
-						break;
-					case "string":
-						iobType = "string";
+						await this.setObjectNotExists(iobId, {
+							type: "state",
+							common: {
+								name: iobId,
+								type: "number",
+								role: "value",
+								read: true,
+								write: false,
+							},
+							native: {},
+						});
 						break;
 					case "boolean":
-						iobType = "boolean";
+						await this.setObjectNotExists(iobId, {
+							type: "state",
+							common: {
+								name: iobId,
+								type: "boolean",
+								role: "indicator",
+								read: true,
+								write: false,
+							},
+							native: {},
+						});
 						break;
+					case "string":
 					default:
-						iobType = "string";
+						await this.setObjectNotExists(iobId, {
+							type: "state",
+							common: {
+								name: iobId,
+								type: "string",
+								role: "text",
+								read: true,
+								write: false,
+							},
+							native: {},
+						});
 				}
 
-				this.setObjectNotExists(iobId, {
-					type: "state",
-					common: {
-						name: iobId,
-						type: iobType,
-						role: "state",
-						read: true,
-						write: false,
-					},
-					native: {},
-				});
-
 				this.setStateChanged(iobId, jsonObject[key], true);
 			}
 		}
 	}
+
+	name2id(pName) {
+		return (pName || "").replace(this.FORBIDDEN_CHARS, "_");
+	}
 }
 
 if (require.main !== module) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.smartm",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "This Adapter reads Data of Slenergy-Photovoltaic-Plants over SmartM",
   "author": {
     "name": "Christian Müller",
@@ -23,7 +23,8 @@
     "node": ">= 22"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.3.2"
+    "@iobroker/adapter-core": "^3.3.2",
+    "axios": "^1.13.2"
   },
   "devDependencies": {
     "@alcalzone/release-script": "^5.0.0",