iobroker.zigbee2mqtt 2.7.2 → 2.7.3

package/README.md

@@ -32,6 +32,10 @@ This adapter allows to control the data points of the devices of a Zigbee2MQTT i
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 2.7.3 (2023-02-18)
+
+-   (o0shojo0o) hotfix for Aqara presence detector FP1
+
 ### 2.7.2 (2023-02-01)
 
 -   (o0shojo0o) rework of the detection of removed devices

package/admin/i18n/en/translations.json

@@ -25,5 +25,6 @@
 	"Proxy Zigbee2MQTT logs to ioBroker logs": "Proxy Zigbee2MQTT logs to ioBroker logs",
 	"Brightness move should also turn the light on or off": "Brightness move should also turn the light on or off",
 	"Brightness step should also turn the light on or off": "Brightness step should also turn the light on or off",
-	"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name."
+	"The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.": "The events such as 'Device removed' or 'Disabled' are displayed in the description instead of in the name.",
+	"Scheme": "Scheme"
 }

package/admin/jsonConfig.json

@@ -108,6 +108,7 @@
 		},
 		"webUIScheme": {
 			"type": "select",
+			"label": "Scheme",
 			"options": [
 				{
 					"label": "HTTP",

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee2mqtt",
-    "version": "2.7.2",
+    "version": "2.7.3",
     "news": {
+      "2.7.3": {
+        "en": "hotfix for Aqara presence detector FP1",
+        "de": "hotfix für Aqara Präsenzmelder FP1",
+        "ru": "hotfix для детектора присутствия Aqara FP1",
+        "pt": "hotfix para detector de presença Aqara FP1",
+        "nl": "quality over Quanteur FP1",
+        "fr": "hotfix pour détecteur de présence Aqara FP1",
+        "it": "hotfix per rilevatore di presenza Aqara FP1",
+        "es": "hotfix para detector de presencia Aqara FP1",
+        "pl": "hotfix",
+        "uk": "hotfix для датчика присутності Aqara FP1",
+        "zh-cn": "aqara存在侦查员FP1"
+      },
       "2.7.2": {
         "en": "rework of the detection of removed devices",
         "de": "nacharbeiten der erkennung von entfernten geräten",
@@ -80,19 +93,6 @@
         "pl": "tekst do akcji #84 (https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/84)",
         "uk": "javaScript licenses API Веб-сайт Go1.13.8",
         "zh-cn": "行动案文[84](http://github.com/oshojo0o/ioBroker.zigbee2mqt/issues/84)"
-      },
-      "2.4.4": {
-        "en": "better state identification ([#79](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/79))",
-        "de": "bessere Zustandserkennung #[79](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/79)",
-        "ru": "лучшая государственная идентификация #[79](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/79)",
-        "pt": "melhor identificação do estado #[79](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/79)",
-        "nl": "identificatie van de staat is beter",
-        "fr": "meilleure identification de l ' État #[79](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/79)",
-        "it": "migliore identificazione dello stato #[79](https://github.com/o0shojo0o/ioBroker.zigbee2mqt/issues/79)",
-        "es": "mejor identificación estatal #[79](https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/79)",
-        "pl": "zobacz też: #79 (https:/github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/79)",
-        "uk": "[79] (https://github.com/o0shojo0o/ioBroker.zigbee2mqtt/issues/79)",
-        "zh-cn": "更好的国家辨认(http://github.com/oshojo0o/ioBroker.zigbee2mqt/issues/79)"
       }
     },
     "titleLang": {

package/lib/deviceController.js

@@ -3,7 +3,6 @@ const createDeviceFromExposes = require('./exposes').createDeviceFromExposes;
 const utils = require('./utils');
 const colors = require('./colors.js');
 const rgb = require('./rgb.js');
-//const createCache = {};
 
 class DeviceController {
     constructor(adapter, deviceCache, groupCache, config, logCustomizations, createCache) {
@@ -15,7 +14,7 @@ class DeviceController {
         this.createCache = createCache;
     }
 
-    async createDeviceDefinitions(devicesMessage) {
+    createDeviceDefinitions(devicesMessage) {
         utils.clearArray(this.deviceCache);
         for (const devicesMessag of devicesMessage) {
             if (this.logCustomizations.debugDevices.includes(devicesMessag.ieee_address)) {
@@ -27,8 +26,15 @@ class DeviceController {
                 this.removeDeviceByIeee(this.deviceCache, devicesMessag.ieee_address);
 
                 if (devicesMessag.definition.exposes) {
-                    const newDevice = createDeviceFromExposes(devicesMessag, this.config);
-                    this.deviceCache.push(newDevice);
+                    try {
+                        const newDevice = createDeviceFromExposes(devicesMessag, this.config);
+                        this.deviceCache.push(newDevice);
+                    } catch (err) {
+                        this.adapter.log.warn(`Cannot ${devicesMessag.friendly_name} create Device from Exposes!`);
+                        this.adapter.log.debug(JSON.stringify(devicesMessag));
+                        this.adapter.log.debug(err);
+                    }
+
                 }
             }
         }

package/lib/exposes.js

@@ -966,11 +966,24 @@ function createDeviceFromExposes(devicesMessag, config) {
 
             case 'composite':
                 for (const prop of expose.features) {
-                    const st = genState(prop);
-                    st.prop = expose.property;
-                    st.inOptions = true;
+                    // let state;
+                    // if (prop.type == 'list' && prop.features) {
+                    //     const listName = prop.name;
+
+                    //     for (const feature of prop.features) {
+                    //         genState(feature, 'state', `${listName}_${feature.name}`, prop.description);
+                    //     }
+                    // }
+
+                    const state = genState(prop);
+                    // Workaround for FP1 new state (region_upsert)
+                    if (!state) {
+                        break;
+                    }
+                    state.prop = expose.property;
+                    state.inOptions = true;
                     // I'm not fully sure, as it really needed, but
-                    st.setterOpt = (value, options) => {
+                    state.setterOpt = (value, options) => {
                         const result = {};
                         options[prop.property] = value;
                         result[expose.property] = options;
@@ -978,17 +991,17 @@ function createDeviceFromExposes(devicesMessag, config) {
                     };
                     // if we have a composite expose, the value have to be an object {expose.property : {prop.property: value}}
                     if (prop.access & z2mAccess.SET) {
-                        st.setter = (value, options) => {
+                        state.setter = (value, options) => {
                             const result = {};
                             options[prop.property] = value;
                             result[expose.property] = options;
                             return result;
                         };
-                        st.setattr = expose.property;
+                        state.setattr = expose.property;
                     }
                     // if we have a composite expose, the payload will be an object {expose.property : {prop.property: value}}
                     if (prop.access & z2mAccess.STATE) {
-                        st.getter = payload => {
+                        state.getter = payload => {
                             if ((payload.hasOwnProperty(expose.property)) && (payload[expose.property] !== null) && payload[expose.property].hasOwnProperty(prop.property)) {
                                 return !isNaN(payload[expose.property][prop.property]) ? payload[expose.property][prop.property] : undefined;
                             } else {
@@ -996,9 +1009,9 @@ function createDeviceFromExposes(devicesMessag, config) {
                             }
                         };
                     } else {
-                        st.getter = _payload => { return undefined; };
+                        state.getter = _payload => { return undefined; };
                     }
-                    pushToStates(st, prop.access);
+                    pushToStates(state, prop.access);
                 }
                 break;
             default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee2mqtt",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "description": "Zigbee2MQTT adapter for ioBroker",
   "author": {
     "name": "Dennis Rathjen",
@@ -36,21 +36,21 @@
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.11.18",
+    "@types/node": "^18.13.0",
     "@types/proxyquire": "^1.3.28",
     "@types/sinon": "^10.0.13",
     "@types/sinon-chai": "^3.2.9",
     "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.33.0",
+    "eslint": "^8.34.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-prettier": "^4.2.1",
     "mocha": "^10.2.0",
-    "prettier": "^2.8.3",
+    "prettier": "^2.8.4",
     "proxyquire": "^2.1.3",
     "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
-    "typescript": "~4.9.4"
+    "typescript": "~4.9.5"
   },
   "main": "main.js",
   "files": [