iobroker.zigbee 1.9.5 → 1.9.6

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2023 Kirov Ilya <kirovilya@gmail.com>
+Copyright (c) 2018-2024 Kirov Ilya <kirovilya@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -134,6 +134,10 @@ You can thank the authors by these links:
 -----------------------------------------------------------------------------------------------------
 
 ## Changelog
+### 1.9.6 (2024-01-01)
+* (arteck) corr ikea bug 
+* (crckmc) trv child lock works
+
 ### 1.9.5 (2023-12-29)
 * (arteck) update dependency
 * (arteck) min node 18.x.
@@ -540,7 +544,7 @@ new Zigbee-herdsman features:
 ## License
 The MIT License (MIT)
 
-Copyright (c) 2018-2023 Kirov Ilya <kirovilya@gmail.com>
+Copyright (c) 2018-2024 Kirov Ilya <kirovilya@gmail.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.9.5",
+    "version": "1.9.6",
     "news": {
+      "1.9.6": {
+        "en": "corr ikea bug \ntrv child lock works",
+        "de": "corr ikea bug\nkinderschlösser funktioniert",
+        "ru": "корр ikea баг\ntrv детские замки работает",
+        "pt": "corr ikea bug\ntrabalhos de bloqueio de crianças",
+        "nl": "_\nhet kinderslot werkt",
+        "fr": "corr ikea bug\nverrouillage enfant trv fonctionne",
+        "it": "corr ikea bug\ntrv bambino serratura lavori",
+        "es": "corr ikea bug\ntrv niño cerradura funciona",
+        "pl": "kor ikea bug\npracuje w trv childlock",
+        "uk": "ikea помилка\ntrv дитячих замків",
+        "zh-cn": "绑架\n童 工"
+      },
       "1.9.5": {
         "en": "update dependency\nmin node 18.x.",
         "de": "aktualisierung abhängigkeit\nmin node 18.x.",
@@ -80,19 +93,6 @@
         "pl": "do nowego żc\nzależności",
         "uk": "до нового жк\nоновлення залежності",
         "zh-cn": "新的忠诚\n更新"
-      },
-      "1.8.27": {
-        "en": "update dependency",
-        "de": "aktualisierung abhängigkeit",
-        "ru": "обновление зависимости",
-        "pt": "dependência de atualização",
-        "nl": "vertaling:",
-        "fr": "mettre à jour la dépendance",
-        "it": "dipendenza da aggiornamento",
-        "es": "actualización de la dependencia",
-        "pl": "zależności",
-        "uk": "оновлення залежності",
-        "zh-cn": "更新"
       }
     },
     "titleLang": {

package/lib/statescontroller.js

@@ -624,61 +624,68 @@ class StatesController extends EventEmitter {
         }
         // find states for payload
         if (devStates.states !== undefined) {
-            const states = statesMapping.commonStates.concat(
-                devStates.states.filter(statedesc => payload.hasOwnProperty(statedesc.prop || statedesc.id)));
-
-            for (const stateInd in states) {
-                const statedesc = states[stateInd];
-                let value;
-                if (statedesc.getter) {
-                    value = statedesc.getter(payload);
-                } else {
-                    value = payload[statedesc.prop || statedesc.id];
-                }
-                // checking value
-                if (value === undefined || value === null) {
-                    continue;
-                }
-                let stateID = statedesc.id;
+            try {
+                const states = statesMapping.commonStates.concat(
+                    devStates.states.filter(statedesc => payload.hasOwnProperty(statedesc.prop || statedesc.id))
+                );
+
+                for (const stateInd in states) {
+                    const statedesc = states[stateInd];
+                    let value;
+                    if (statedesc.getter) {
+                        value = statedesc.getter(payload);
+                    } else {
+                        value = payload[statedesc.prop || statedesc.id];
+                    }
+                    // checking value
+                    if (value === undefined || value === null) {
+                        continue;
+                    }
 
-                if (has_debug && statedesc.id !== 'msg_from_zigbee') {
-                    this.warn(`ELEVATED publishToState: value generated '${JSON.stringify(value)}' from device ${devId} for '${statedesc.name}'`);
-                }
+                    let stateID = statedesc.id;
 
-                const common = {
-                    name: statedesc.name,
-                    type: statedesc.type,
-                    unit: statedesc.unit,
-                    read: statedesc.read,
-                    write: statedesc.write,
-                    icon: statedesc.icon,
-                    role: statedesc.role,
-                    min: statedesc.min,
-                    max: statedesc.max,
-                };
-
-                if (typeof value === 'object' && value.hasOwnProperty('stateid')) {
-                    stateID = `${stateID}.${value.stateid}`;
-                    if (value.hasOwnProperty('unit')) {
-                        common.unit = value.unit;
+                    if (has_debug && statedesc.id !== 'msg_from_zigbee') {
+                        this.warn(`ELEVATED publishToState: value generated '${JSON.stringify(value)}' from device ${devId} for '${statedesc.name}'`);
                     }
-                    common.name = value.name ? value.name : value.stateid;
-                    common.role = value.role ? `value.${value.role}` : 'number';
-                    value = value.value;
-                }
 
-                // if needs to return value to back after timeout
-                if (statedesc.isEvent) {
-                    this.updateStateWithTimeout(devId, statedesc.id, value, common, 300, !value);
-                } else {
-                    if (statedesc.prepublish) {
-                        this.collectOptions(devId, model, options =>
-                            statedesc.prepublish(devId, value, newvalue =>
-                                this.updateState(devId, stateID, newvalue, common), options));
+                    const common = {
+                        name: statedesc.name,
+                        type: statedesc.type,
+                        unit: statedesc.unit,
+                        read: statedesc.read,
+                        write: statedesc.write,
+                        icon: statedesc.icon,
+                        role: statedesc.role,
+                        min: statedesc.min,
+                        max: statedesc.max,
+                    };
+
+                    if (typeof value === 'object' && value.hasOwnProperty('stateid')) {
+                        stateID = `${stateID}.${value.stateid}`;
+                        if (value.hasOwnProperty('unit')) {
+                            common.unit = value.unit;
+                        }
+                        common.name = value.name ? value.name : value.stateid;
+                        common.role = value.role ? `value.${value.role}` : 'number';
+                        value = value.value;
+                    }
+
+                    // if needs to return value to back after timeout
+                    if (statedesc.isEvent) {
+                        this.updateStateWithTimeout(devId, statedesc.id, value, common, 300, !value);
                     } else {
-                        this.updateState(devId, stateID, value, common);
+                        if (statedesc.prepublish) {
+                            this.collectOptions(devId, model, options =>
+                                statedesc.prepublish(devId, value, newvalue =>
+                                    this.updateState(devId, stateID, newvalue, common), options)
+                            );
+                        } else {
+                            this.updateState(devId, stateID, value, common);
+                        }
                     }
                 }
+            } catch (e) {
+                this.debug(`No states in device ${devId} : payload ${JSON.stringify(payload)}`);
             }
         }
     }

package/lib/zbDeviceEvent.js

@@ -40,7 +40,7 @@ class DeviceEvent extends BaseExtension {
         }
 
         if (mappedDevice && mappedDevice.onEvent) {
-            mappedDevice.onEvent(type, data, device);
+            mappedDevice.onEvent(type, data, device,mappedDevice.options,'{}');
         }
     }
 }

package/main.js

@@ -732,7 +732,7 @@ class Zigbee extends utils.Adapter {
                 };
 
                 // new toZigbee
-                if (preparedValue !== undefined) {
+                if (preparedValue !== undefined && Object.keys(meta.message).filter(p => p.startsWith('state')).length > 0) {
                     if (typeof preparedValue === 'number') {
                         meta.message.state = preparedValue > 0 ? 'ON' : 'OFF';
                     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.9.5",
+  "version": "1.9.6",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -36,11 +36,11 @@
     "@alcalzone/release-script-plugin-license": "^3.7.0",
     "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@iobroker/testing": "^4.1.0",
-    "axios": "^1.6.0",
+    "axios": "^1.6.3",
     "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
     "eslint": "^8.52.0",
-    "eslint-config-prettier": "^9.0.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.0.0",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",