iobroker.zigbee 1.8.24 → 1.8.25

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.8.24",
+    "version": "1.8.25",
     "news": {
+      "1.8.25": {
+        "en": "zhc 16.x \ncorr group from exclude dialog",
+        "de": "zhc 16.x\nkorr gruppe aus ausschluss dialog",
+        "ru": "жк 16.x\nгруппа корр от исключает диалог",
+        "pt": "zhc 16.x\ncorr grupo de excluir diálogo",
+        "nl": "zhc 16\ncorr groep uitgesloten dialog",
+        "fr": "zhc 16.x\ngroupe corr de l'exclusion du dialogue",
+        "it": "zhc 16.x\ngruppo corr da escludere finestra di dialogo",
+        "es": "zhc 16.x\ngrupo de corr de excluir diálogo",
+        "pl": "żc 16.x\ngrupa kor z wyłączeniem dialogu",
+        "uk": "жк 16.x\nгрупа з виключення діалогу",
+        "zh-cn": "页: 1\n集团排除了口号"
+      },
       "1.8.24": {
         "en": "switch to exposes tab for some Aqara Devices",
         "de": "schalter, um die Registerkarte für einige Aqara-Geräte freizusetzen",
@@ -80,19 +93,6 @@
         "pl": "naprawa occupancy_time\nodsetek baterii i napięcia",
         "uk": "фіксувати occupancy_timeout\nфіксувати відсоток акумулятора і напруга",
         "zh-cn": "fix 占用:时间假\nfix 电池百分比和火山"
-      },
-      "1.8.18": {
-        "en": "little fix sentry and error log\n",
-        "de": "kleines fix-sende- und fehlerprotokoll\n",
-        "ru": "мало исправлена отправка и ошибка журнала\n",
-        "pt": "pequena correção sentinela e log de erro\n",
-        "nl": "kleine herstellende sentimentele logboek\n",
-        "fr": "petit journal de réparation et d'erreur\n",
-        "it": "piccolo fix registro di errore\n",
-        "es": "pequeño solucion centry y error log\n",
-        "pl": "wadliwość i błąd\n",
-        "uk": "маленька фіксація відправлень і журнал помилок\n",
-        "zh-cn": "很少发送过材料和错误逻辑\n"
       }
     },
     "titleLang": {

package/lib/developer.js

@@ -100,17 +100,23 @@ class Developer {
             return;
         }
         const cfg = obj.message.hasOwnProperty('cfg') ? obj.message.cfg : null;
-
-        const publishTarget = this.zbController.getDevice(devId) ? devId : this.zbController.getGroup(parseInt(devId));
-        if (!publishTarget) {
-            this.adapter.sendTo(obj.from, obj.command, {localErr: `Device or group ${devId} not found!`}, obj.callback);
-            return;
+        let publishTarget;
+        try {
+            publishTarget = this.zbController.getDevice(devId) ? devId : this.zbController.getGroup(parseInt(devId));
+            if (!publishTarget) {
+                this.adapter.sendTo(obj.from, obj.command, {localErr: `Device or group ${devId} not found!`}, obj.callback);
+                return;
+            }
+        } catch (error) {
+            this.error(`SendToZigbee failed from publishTarget ${devId} (${error})`);
         }
+
         if (!cid || !cmd) {
             this.adapter.sendTo(obj.from, obj.command, {localErr: 'Incomplete data (cid or cmd)'}, obj.callback);
             return;
         }
         this.debug(`Ready to send (ep: ${ep}, cid: ${cid}, cmd ${cmd.name}, zcl: ${JSON.stringify(zclData)})`);
+
         try {
             await this.zbController.publish(publishTarget, cid, cmd.name, zclData, cfg, ep, cmdType, (err, msg) => {
                 // map err and msg in one object for sendTo

package/lib/devices.js

@@ -3041,6 +3041,10 @@ const devices = [
     },
 
     /* ------------ images only for admin ------------------- */
+    {
+        models: ['LED1923R5/LED1925G6'],
+        icon: 'img/LED1923R5.png',
+    },
     {
         models: ['E1812'],
         icon: 'img/ikea_E1812.png',

package/lib/exposes.js

@@ -5,7 +5,7 @@ const statesDefs = require('./states.js').states;
 const rgb = require('./rgb.js');
 const utils = require('./utils.js');
 const colors = require('./colors.js');
-const ea = zigbeeHerdsmanConverters.exposes.access;
+const ea = require('zigbee-herdsman-converters/lib/exposes.js').access;
 
 function genState(expose, role, name, desc) {
     let state;

package/lib/statescontroller.js

@@ -8,7 +8,7 @@ const fs = require('fs');
 const request = require('request');
 
 let savedDeviceNames = {};
-let knownUndefinedDevices = {};
+const knownUndefinedDevices = {};
 
 class StatesController extends EventEmitter {
     constructor(adapter) {
@@ -138,7 +138,7 @@ class StatesController extends EventEmitter {
         const result = {};
         // find model states for options and get it values
         const devStates = await this.getDevStates('0x' + devId, model);
-        if (devStates == null || devStates == undefined) {
+        if (devStates == null || devStates == undefined || devStates.states == null || devStates.states == undefined) {
             callback(result);
             return;
         }

package/lib/utils.js

@@ -108,7 +108,7 @@ function flatten(arr) {
 
 const forceEndDevice = flatten(
     ['QBKG03LM', 'QBKG04LM', 'ZNMS13LM', 'ZNMS12LM']
-        .map(model => zigbeeHerdsmanConverters.devices.find((d) => d.model === model))
+        .map(model => zigbeeHerdsmanConverters.findByModel(model))
         .map(mappedModel => mappedModel.zigbeeModel));
 
 // Xiaomi uses 4151 and 4447 (lumi.plug) as manufacturer ID.

package/lib/zbDeviceAvailability.js

@@ -7,11 +7,11 @@ const utils = require('./utils');
 // Some EndDevices should be pinged
 // e.g. E11-G13 https://github.com/Koenkk/zigbee2mqtt/issues/775#issuecomment-453683846
 const forcedPingable = [
-    zigbeeHerdsmanConverters.devices.find((d) => d.model === 'E11-G13'),
-    zigbeeHerdsmanConverters.devices.find((d) => d.model === '53170161'),
-    zigbeeHerdsmanConverters.devices.find((d) => d.model === 'V3-BTZB'),
-    zigbeeHerdsmanConverters.devices.find((d) => d.model === 'SPZB0001'),
-    zigbeeHerdsmanConverters.devices.find((d) => d.model === '014G2461')
+    zigbeeHerdsmanConverters.findByModel('E11-G13'),
+    zigbeeHerdsmanConverters.findByModel('53170161'),
+    zigbeeHerdsmanConverters.findByModel('V3-BTZB'),
+    zigbeeHerdsmanConverters.findByModel('SPZB0001'),
+    zigbeeHerdsmanConverters.findByModel('014G2461')
 ];
 
 // asgothian: 29.12.2020: Removed color and color_temp from readable

package/lib/zbDeviceConfigure.js

@@ -4,10 +4,10 @@ const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 const BaseExtension = require('./zbBaseExtension');
 
 const forcedConfigureOnEachStart = [
-    zigbeeHerdsmanConverters.devices.find((d) => d.model === 'V3-BTZB'),
-    zigbeeHerdsmanConverters.devices.find((d) => d.model === '014G2461'),
-    zigbeeHerdsmanConverters.devices.find((d) => d.model === 'SPZB0001'),
-    zigbeeHerdsmanConverters.devices.find((d) => d.model === 'ZK03840')
+    zigbeeHerdsmanConverters.findByModel('V3-BTZB'),
+    zigbeeHerdsmanConverters.findByModel('014G2461'),
+    zigbeeHerdsmanConverters.findByModel('SPZB0001'),
+    zigbeeHerdsmanConverters.findByModel('ZK03840')
 ];
 
 class DeviceConfigure extends BaseExtension {
@@ -130,13 +130,15 @@ class DeviceConfigure extends BaseExtension {
     }
 
     async doConfigure(device, mappedDevice) {
-        this.info(`Configuring ${device.ieeeAddr} ${device.modelID}`);
         const coordinatorEndpoint = await this.zigbee.getDevicesByType('Coordinator')[0].endpoints[0];
         try {
-            await mappedDevice.configure(device, coordinatorEndpoint, this);
-            device.meta.configured = zigbeeHerdsmanConverters.getConfigureKey(mappedDevice);
-            device.save();
-            this.info(`DeviceConfigure successful ${device.ieeeAddr} ${device.modelID}`);
+            if (mappedDevice !== undefined) {
+                this.info(`Configuring ${device.ieeeAddr} ${device.modelID}`);
+                await mappedDevice.configure(device, coordinatorEndpoint, this);
+                device.meta.configured = zigbeeHerdsmanConverters.getConfigureKey(mappedDevice);
+                device.save();
+                this.info(`DeviceConfigure successful ${device.ieeeAddr} ${device.modelID}`);
+            }
         } catch (error) {
             this.sendError(error);
             this.error(

package/lib/zigbeecontroller.js

@@ -3,6 +3,7 @@
 const pathLib = require('path');
 const ZigbeeHerdsman = require('zigbee-herdsman');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
+const zigbeeHerdsmanConvertersPhilips = require('zigbee-herdsman-converters/lib/philips');
 const EventEmitter = require('events').EventEmitter;
 const safeJsonStringify = require('./json');
 const DeviceAvailabilityExt = require('./zbDeviceAvailability');
@@ -11,7 +12,22 @@ const DeviceEventExt = require('./zbDeviceEvent');
 const DelayedActionExt = require('./zbDelayedAction');
 const utils = require('./utils');
 const groupConverters = [
-    zigbeeHerdsmanConverters.toZigbeeConverters.light_onoff_brightness,
+    zigbeeHerdsmanConverters.toZigbee.light_onoff_brightness,
+    zigbeeHerdsmanConverters.toZigbee.light_color_colortemp,
+    zigbeeHerdsmanConvertersPhilips.tz.effect, // Support Hue effects for groups
+    zigbeeHerdsmanConverters.toZigbee.ignore_transition,
+    zigbeeHerdsmanConverters.toZigbee.cover_position_tilt,
+    zigbeeHerdsmanConverters.toZigbee.thermostat_occupied_heating_setpoint,
+    zigbeeHerdsmanConverters.toZigbee.tint_scene,
+    zigbeeHerdsmanConverters.toZigbee.light_brightness_move,
+    zigbeeHerdsmanConverters.toZigbee.light_brightness_step,
+    zigbeeHerdsmanConverters.toZigbee.light_colortemp_step,
+    zigbeeHerdsmanConverters.toZigbee.light_colortemp_move,
+    zigbeeHerdsmanConverters.toZigbee.light_hue_saturation_move,
+    zigbeeHerdsmanConverters.toZigbee.light_hue_saturation_step
+
+
+    /*   zigbeeHerdsmanConverters.toZigbeeConverters.light_onoff_brightness,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_color,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_alert,
@@ -20,7 +36,8 @@ const groupConverters = [
     zigbeeHerdsmanConverters.toZigbeeConverters.light_brightness_step,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_move,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_step,
-    zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_startup
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_startup*/
+
 ];
 
 function isFunction(functionToCheck) {
@@ -70,6 +87,8 @@ class ZigbeeController extends EventEmitter {
             adapter: {
                 forceStartWithInconsistentAdapterConfiguration: options.startWithInconsistent
             },
+            legacy : false,
+
         };
         // https://github.com/ioBroker/ioBroker.zigbee/issues/668
         if (!options.extPanIdFix) {
@@ -646,7 +665,8 @@ class ZigbeeController extends EventEmitter {
                     `Device '${friendlyName}' with Zigbee model '${message.device.modelID}' is NOT supported, ` +
                     `please follow https://www.zigbee2mqtt.io/how_tos/how_to_support_new_devices.html`
                 );
-                this.emit('pairing', 'Interview successful', {friendly_name: friendlyName, supported: false});
+                const frName = {friendly_name: friendlyName, supported: false};
+                this.emit('pairing', 'Interview successful', JSON.stringify(frName));
                 entity.device.modelID = entity.device._modelID;
                 this.emit('new', entity);
             }
@@ -817,7 +837,7 @@ class ZigbeeController extends EventEmitter {
             this.debug(`addDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
             // generate group debug info and display it
             const members = await this.getGroupMembersFromController(groupId);
-            let memberIDs = [];
+            const memberIDs = [];
             for (const member of members) {
                 memberIDs.push(member.ieee);
             }
@@ -867,7 +887,7 @@ class ZigbeeController extends EventEmitter {
             const group = await this.resolveEntity(groupId);
 
             const members = await this.getGroupMembersFromController(groupId);
-            let memberIDs = [];
+            const memberIDs = [];
             for (const member of members) {
                 memberIDs.push(member.ieee);
             }

package/main.js

@@ -607,7 +607,7 @@ class Zigbee extends utils.Adapter {
     async publishFromState(deviceId, model, stateModel, stateList, options) {
         let isGroup = false;
 
-        this.log.debug(`publishFromState : ${deviceId} ${model}`);
+        this.log.debug(`publishFromState : ${deviceId} ${model} ${safeJsonStringify(stateList)}`);
         if (model === 'group') {
             isGroup = true;
             deviceId = parseInt(deviceId);
@@ -704,7 +704,7 @@ class Zigbee extends utils.Adapter {
                 }
 
                 const epName = stateDesc.epname !== undefined ? stateDesc.epname : (stateDesc.prop || stateDesc.id);
-                const key = stateDesc.setattr || stateDesc.prop || stateDesc.id;
+                const key = stateDesc.prop || stateDesc.id || stateDesc.setattr;
                 this.log.debug(`convert ${key}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)}`);
 
                 let target;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.8.24",
+  "version": "1.8.25",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -18,26 +18,26 @@
     "node": ">=16"
   },
   "optionalDependencies": {
-    "serialport": "^11.0.1"
+    "serialport": "^12.0.0"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.3",
-    "tar": "^6.1.15",
-    "typescript": "^5.2.2",
-    "zigbee-herdsman": "0.18.7",
-    "zigbee-herdsman-converters": "15.70.0"
+    "@iobroker/adapter-core": "^3.0.4",
+    "tar": "^6.2.0",
+    "typescript": "^5.3.2",
+    "zigbee-herdsman": "0.26.1",
+    "zigbee-herdsman-converters": "16.11.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
     "@alcalzone/release-script": "^3.6.0",
     "@alcalzone/release-script-plugin-iobroker": "^3.6.0",
-    "@alcalzone/release-script-plugin-license": "^3.5.9",
-    "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
+    "@alcalzone/release-script-plugin-license": "^3.7.0",
+    "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@iobroker/testing": "^4.1.0",
-    "axios": "^1.5.0",
-    "chai": "^4.3.8",
+    "axios": "^1.6.0",
+    "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.46.0",
+    "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "gulp": "^4.0.2",