iobroker.zigbee 1.10.14 → 2.0.0

package/README.md

@@ -137,6 +137,9 @@ You can thank the authors by these links:
 
 -----------------------------------------------------------------------------------------------------
 ## Changelog
+### 2.0.0 (2025-02-22)
+* (asgothian) new herdsman adaption
+
 ### 1.10.14 (2025-01-01)
 * (arteck) Herdsman 2.1.9, Converters 20.58.0
 * (asgothian) Fix: Aqara T1M (CL-L02D) 
@@ -208,4 +211,28 @@ You can thank the authors by these links:
 * Some design update
 * Binding
 
+
 ------------------------------------------------------------------------------
+
+## License
+The MIT License (MIT)
+
+Copyright (c) 2018-2025 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
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

package/admin/index_m.html

@@ -654,7 +654,7 @@
                         <a id="state_cleanup_btn"
                            class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT"
                            title="State Cleanup">
-                            <i class="material-icons large icon-blue">sync</i></a>
+                            <i class="material-icons large icon-blue">delete_sweep</i></a>
                     </li>
                     <li>
                         <a id="fw_check_btn"

package/admin/tab_m.html

@@ -660,7 +660,7 @@
                     <ul id="nav-mobile" class="right">
                         <li>
                             <a id="state_cleanup_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT" title="State Cleanup">
-                            <i class="material-icons large icon-blue">sync</i></a>
+                            <i class="material-icons large icon-blue">delete_sweep</i></a>
                         </li>
                         <li>
                             <a id="fw_check_btn" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT" title="Check firmware updates">

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.10.14",
+    "version": "2.0.0",
     "news": {
+      "2.0.0": {
+        "en": "new herdsman adaption",
+        "de": "neue herdsman adaption",
+        "ru": "адаптация нового пастуха",
+        "pt": "nova adaptação herdsman",
+        "nl": "nieuwe aanpassing van herders",
+        "fr": "nouvelle adaptation des éleveurs",
+        "it": "nuovo adattamento mandriano",
+        "es": "nueva adaptación del pastor",
+        "pl": "nowa adaptacja zioła",
+        "uk": "новий гердман адаптація",
+        "zh-cn": "新牧民适应"
+      },
+      "1.10.15": {
+        "en": "Work in progress",
+        "de": "Work in progress",
+        "ru": "Work in progress",
+        "pt": "Work in progress",
+        "nl": "Work in progress",
+        "fr": "Work in progress",
+        "it": "Work in progress",
+        "es": "Work in progress",
+        "pl": "Work in progress",
+        "uk": "Work in progress",
+        "zh-cn": "Work in progress"
+      },
       "1.10.14": {
         "en": "Herdsman 2.1.9, Converters 20.58.0\nFix: Aqara T1M (CL-L02D) \ndeleteDeviceStates change to deleteObj",
         "de": "Herdsman 2.1.9, Konverter 20.58.0\nFix: Aqara T1M (CL-L02D)\nlöschen DeviceState Änderung zum Löschen Ob",
@@ -54,45 +80,6 @@
         "pl": "ZMIANA ZBIORCZA\n\nbłędy: ChannelScan jest obecnie niedostępny\n\n\nnaprawić błędy lintera\nwyłączyć wyświetlacz mapy dla wyłączonych urządzeń\nnowa opcja na mapie: wyłączenie interakcji fizyki\nnowe konwertery zigbee- herdsman- 20.28.0\nnowy zigbee-herdsman 2.1.1\nZezwalaj na stosowanie konwerterów bezklawiszowych (używanych dla TuYa i kompatybilnych urządzeń w konwerterach zigbee- herdsman-\nzamiana z wniosku na aksjos\nusuń grupy działa ponownie",
         "uk": "БРЕАКІНГ ЗМІН\n\nпомилки : CanalScan наразі немає\n\n\nвиправлено помилки linter\nвідключення відображення карти для деактивованих пристроїв\nновий варіант на карті: відключена фізика взаємодія\nнові zigbee-herdsman-converters 20.28.0\nновий zigbee-herdsman 2.1.1\nДозволити використання без ключів конвертерів (використовується для TuYa та сумісних пристроїв в zigbee-herdsman-converters\nковтання від запиту в осях\nвидалити групи знову",
         "zh-cn": "破坏变化\n\n错误 : 频道扫描目前不可用\n\n\n修正线性错误\n禁用已停用设备的地图显示\n地图上的新选项: 禁用物理交互\n新齐格比-牧民-转换器 20.28.0\n新齐格比牧民 2.1.1\n允许使用无密钥转换器( 用于 TuYa 和 Zigbee- herdsman- 转换器中的兼容设备)\n从请求转换为轴\n再次删除组工作"
-      },
-      "1.10.10": {
-        "en": "core update\ndependency update",
-        "de": "kern-update\naktualisierung der abhängigkeit",
-        "ru": "обновление\nобновление",
-        "pt": "atualização do núcleo\natualização de dependência",
-        "nl": "kernupdate\nafhankelijkheidsupdate",
-        "fr": "mise à jour de base\nmise à jour de la dépendance",
-        "it": "aggiornamento del core\naggiornamento della dipendenza",
-        "es": "actualización básica\nactualización de la dependencia",
-        "pl": "podstawowa aktualizacja\naktualizacja zależności",
-        "uk": "оновлення ядра\nоновлення залежності",
-        "zh-cn": "核心更新\n依赖性更新"
-      },
-      "1.10.9": {
-        "en": "typo admin settings\neslint config",
-        "de": "typo admin einstellungen\neslint config",
-        "ru": "настройки admin\neslint config",
-        "pt": "configurações de administração do tipo\neslint config",
-        "nl": "typo admin instellingen\neslint config",
-        "fr": "paramètres d'administration typo\nconfig eslint",
-        "it": "impostazioni dell'amministratore\neslint config",
-        "es": "configuración de administración de tipo\neslint config",
-        "pl": "ustawienia admin typo\neslint config",
-        "uk": "параметри адміністратора\neslint config",
-        "zh-cn": "类型管理员设置\n埃斯林特配置"
-      },
-      "1.10.8": {
-        "en": "corr admin settings\nadd new eslint version\n",
-        "de": "korr admin einstellungen\nneue eslint-version hinzufügen\n",
-        "ru": "настройки администрирования\nдобавить новую версию eslint\n",
-        "pt": "configurações de administração de corrimento\nadicionar nova versão eslint\n",
-        "nl": "corr admin instellingen\nnieuwe eslint versie toevoegen\n",
-        "fr": "paramètres d'administration corr\najouter une nouvelle version eslint\n",
-        "it": "impostazioni dell'amministratore\naggiungere nuova versione eslint\n",
-        "es": "configuración de administración de corr\nañadir nueva versión eslint\n",
-        "pl": "ustawienia admin corr\ndodaj nową wersję eslint\n",
-        "uk": "корр налаштування адміністратора\nдодати нову версію eslint\n",
-        "zh-cn": "corr 管理员设置\n添加新的 eslint 版本\n"
       }
     },
     "titleLang": {
@@ -192,7 +179,7 @@
     ],
     "dependencies": [
       {
-        "js-controller": ">=3.3.0"
+        "js-controller": ">=5.0.19"
       }
     ],
     "messages": [

package/lib/binding.js

@@ -238,7 +238,7 @@ class Binding {
                     await this.doBindUnbind(type, bind_source, bind_source_ep, 'coordinator', '1');
                     this.debug('Successfully ' + (type === 'bind' ? 'bound' : 'unbound') + ' Coordinator from ' + bind_source);
                 } catch (e) {
-                    this.error(`Could not ${type} Coordinator from ${bind_source}: ${JSON.stringify(e)}`);
+                    this.error(`Could not ${type} Coordinator from ${bind_source}: ${(e && e.message ? e.message : 'no error message')} ${(e && e.stack ? e.stack : 'no call stack')}`);
                 }
             }
         } catch (error) {

package/lib/commands.js

@@ -150,8 +150,8 @@ class Commands {
                             return;
                         }
                     }
-                    catch (e) {
-                        this.error(JSON.stringify(e));
+                    catch (error) {
+                        this.error(`Pairing with code failed with: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
                         this.adapter.sendTo(
                             from, command,
                             {error: 'Exception when trying to add QR code'},

package/lib/exposes.js

@@ -681,12 +681,15 @@ function createFromExposes(model, def) {
                         if (!Array.isArray(expose.values)) break;
                         const hasHold = expose.values.find((actionName) => actionName.includes('hold'));
                         const hasRelease = expose.values.find((actionName) => actionName.includes('release'));
+                        const hasPress = expose.values.find((actionName) => actionName.includes('press'));
+                        const hasPressRelease = expose.values.find((actionName) => actionName.includes('press_release'));
                         for (const actionName of expose.values) {
                             // is release state ? - skip
                             if (hasHold && hasRelease && actionName.includes('release')) continue;
                             // is hold state ?
                             if (hasHold && hasRelease && actionName.includes('hold')) {
                                 const releaseActionName = actionName.replace('hold', 'release');
+                                const releaseActionName2 = actionName.concat('_release');
                                 state = {
                                     id: actionName.replace(/\*/g, ''),
                                     prop: 'action',
@@ -696,9 +699,11 @@ function createFromExposes(model, def) {
                                     write: false,
                                     read: true,
                                     type: 'boolean',
-                                    getter: payload => payload.action === actionName ? true : (payload.action === releaseActionName ? false : undefined),
+                                    getter: payload => payload.action === actionName ? true : (payload.action === releaseActionName || payload.action === releaseActionName2 ? false : undefined),
                                 };
-                            } else {
+                            } else if (hasPress && hasPressRelease && actionName.includes('press')) {
+                                let getterKey = actionName.concat('_release');
+                                if (expose.values.indexOf(getterKey) < 0) getterKey = actionName;
                                 state = {
                                     id: actionName.replace(/\*/g, ''),
                                     prop: 'action',
@@ -708,10 +713,23 @@ function createFromExposes(model, def) {
                                     write: false,
                                     read: true,
                                     type: 'boolean',
+                                    getter: payload => payload.action === getterKey ? true : undefined,
+                                    isEvent: true,
+                                };
+                            } else {
+			        			state = {
+                                    id: actionName.replace(/\*/g, ''),
+                                    prop: 'action',
+                                    name: actionName,
+                                    icon: undefined,
+                                    role: 'button',
+                                    write: false,
+                                    read: true,
+                                    type: 'boolean',
                                     getter: payload => payload.action === actionName ? true : undefined,
                                     isEvent: true,
                                 };
-                            }
+                            };
                             pushToStates(state, expose.access);
                         }
                         state = null;

package/lib/groups.js

@@ -85,7 +85,7 @@ class Groups {
             }
 
         } catch (error) {
-            if (error) this.error(`getGroupMembersFromController: error is  ${JSON.stringify(error)} ${JSON.stringify(new Error().stack)}`);
+            if (error) this.error(`getGroupMembersFromController: error is  ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
             else this.error('unidentifed error in getGroupMembersFromController');
         }
         return members;
@@ -138,7 +138,7 @@ class Groups {
                 for (const gpid of groups[epid]) {
                     const gpidn = parseInt(gpid);
                     if (gpidn < 0) {
-                        this.warn(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` );
+                        this.debug(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` );
                         const response = await this.zbController.removeDevFromGroup(sysid, (-gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -146,7 +146,7 @@ class Groups {
                         }
 
                     } else if (gpidn > 0) {
-                        this.warn(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` );
+                        this.debug(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` );
                         const response = await this.zbController.addDevToGroup(sysid, (gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -158,7 +158,7 @@ class Groups {
                 }
             }
         } catch (e) {
-            this.warn('caught error ' + JSON.stringify(e) + ' in updateGroupMembership');
+            this.warn('caught error ' + (e && e.message ? e.message : 'no error message') + ' in updateGroupMembership');
             this.adapter.sendTo(from, command, {error: e}, callback);
             return;
         }

package/lib/statescontroller.js

@@ -54,9 +54,9 @@ class StatesController extends EventEmitter {
     retainDeviceNames() {
         clearTimeout(this.retTimeoutHandle);
         this.retTimeoutHanlde = setTimeout(() => {
-            fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNamesDB, null, 2), err => {
-                if (err) {
-                    this.error(`error saving device names: ${JSON.stringify(err)}`);
+            fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNamesDB, null, 2), error => {
+                if (error) {
+                    this.error(`error saving device names: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
                 } else {
                     this.debug('saved device names');
                 }
@@ -109,7 +109,7 @@ class StatesController extends EventEmitter {
             }
 
             if (this.checkDebugDevice(id))
-                this.warn(`ELEVATED O1: User state change of state ${id} with value ${state.val} (ack: ${state.ack}) from ${state.from}`);
+                this.warn(`ELEVATED O01: User state change of state ${id} with value ${state.val} (ack: ${state.ack}) from ${state.from}`);
 
             this.debug(`User stateChange ${id} ${JSON.stringify(state)}`);
             const devId = getAdId(this.adapter, id); // iobroker device id
@@ -211,7 +211,7 @@ class StatesController extends EventEmitter {
         this.debug(`Change state '${stateKey}' at device ${deviceId} type '${model}'`);
         const elevated = this.checkDebugDevice(deviceId);
 
-        if (elevated) this.warn(`ELEVATED O2: Change state '${stateKey}' at device ${deviceId} type '${model}'`);
+        if (elevated) this.warn(`ELEVATED O02: Change state '${stateKey}' at device ${deviceId} type '${model}'`);
 
         const devStates = await this.getDevStates(deviceId, model);
         if (!devStates) {

package/lib/zbDeviceAvailability.js

@@ -181,7 +181,7 @@ class DeviceAvailability extends BaseExtension {
                 }
             } catch (error) {
                 this.sendError(error);
-                this.debug(`Exception in readState of '${device.ieeeAddr}' - error : '${error}'`);
+                this.debug(`Exception in readState of '${device.ieeeAddr}' - error : '${(error && error.message ? error.message : 'no error message')}'`);
                 // intentionally empty: Just present to ensure we cause no harm
                 // when reading the state fails. => fall back on standard Ping function
             }

package/lib/zbDeviceEvent.js

@@ -36,11 +36,22 @@ class DeviceEvent extends BaseExtension {
 
     async callOnEvent(device, type, data, mappedDevice) {
         if (!mappedDevice) {
-            mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
+            try {
+                mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
+            }
+            catch (error) {
+                this.log.error(`onEvent: unable to find mapped device for ${JSON.stringify(device)} `);
+                return;
+            }
         }
 
         if (mappedDevice && mappedDevice.onEvent) {
-            mappedDevice.onEvent(type, data, device,mappedDevice.options,'{}');
+            try {
+                mappedDevice.onEvent(type, data, device,mappedDevice.options,'{}');
+            }
+            catch (error) {
+                this.log.error(`onEvent for ${JSON.stringify(device)} failed with error ${error.message}`);
+            }
         }
     }
 }

package/lib/zigbeecontroller.js

@@ -148,9 +148,9 @@ class ZigbeeController extends EventEmitter {
             }
 
             this.debug(`Zigbee network parameters: panID=${debNetworkParam.panID} channel=${debNetworkParam.channel} extendedPanID=${extPanIDDebug}`);
-        } catch (e) {
-            this.sendError(e);
-            this.error(`Starting zigbee-herdsman problem : ${JSON.stringify(e.message)}`);
+        } catch (error) {
+            this.sendError(error);
+            this.error(`Starting zigbee-herdsman problem : ${(error && error.message ? error.message : 'no error message')}`);
             throw 'Error herdsman start';
         }
         // Check if we have to turn off the LED
@@ -297,7 +297,7 @@ class ZigbeeController extends EventEmitter {
             }
         } catch (error) {
             this.sendError(error);
-            this.error(JSON.stringify(error));
+            this.error(`error in getGroups: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
             return undefined;
         }
     }
@@ -308,7 +308,7 @@ class ZigbeeController extends EventEmitter {
             group && group.removeFromNetwork();
         } catch (error) {
             this.sendError(error);
-            this.error(`error in removeGroupById: ${error}`);
+            this.error(`error in removeGroupById: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
         }
     }
 
@@ -322,24 +322,34 @@ class ZigbeeController extends EventEmitter {
     }
 
     async verifyGroupExists(id) {
-        const nid = typeof id === 'number' ? id : parseInt(id);
-        let group = await this.herdsman.getGroupByID(nid);
-        if (!group) {
-            group = await this.herdsman.createGroup(nid);
-            group.toZigbee = groupConverters;
-            group.model = 'group';
-            this.debug(`verifyGroupExists: created group ${nid}`);
-        } else {
-            this.debug(`verifyGroupExists: group ${nid} exists`);
+        try {
+            const nid = typeof id === 'number' ? id : parseInt(id);
+            let group = await this.herdsman.getGroupByID(nid);
+            if (!group) {
+                group = await this.herdsman.createGroup(nid);
+                group.toZigbee = groupConverters;
+                group.model = 'group';
+                this.debug(`verifyGroupExists: created group ${nid}`);
+            } else {
+                this.debug(`verifyGroupExists: group ${nid} exists`);
+            }
+        }
+        catch (error) {
+            this.error(`verifyGroupExists: ${error && error.message ? error.message : 'unspecified error'}`);
         }
     }
 
     async addPairingCode(code) {
         this.debug(`calling addPairingCode with ${code}`);
         if (code) {
-            await this.herdsman.addInstallCode(code);
-            this.info(`added code ${code} for pairing`);
-            return true;
+            try {
+                await this.herdsman.addInstallCode(code);
+                this.info(`added code ${code} for pairing`);
+                return true;
+            }
+            catch (error) {
+                this.error(`addPairingCode: ${error && error.message ? error.message : 'unspecified error'}`);
+            }
         }
         return false;
     }
@@ -369,7 +379,7 @@ class ZigbeeController extends EventEmitter {
         } catch (error) {
             this.sendError(error);
             if (error) {
-                this.error(`getGroupMembersFromController: error is  ${JSON.stringify(error)} ${JSON.stringify(new Error().stack)}`);
+                this.error(`getGroupMembersFromController: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
             } else {
                 this.error('unidentified error in getGroupMembersFromController');
             }
@@ -378,100 +388,125 @@ class ZigbeeController extends EventEmitter {
     }
 
     getDevice(key) {
-        return this.herdsman.getDeviceByIeeeAddr(key);
+        try {
+            return this.herdsman.getDeviceByIeeeAddr(key);
+        }
+        catch {
+            return undefined;
+        }
     }
 
     getDevicesByType(type) {
-        return this.herdsman.getDevicesByType(type);
+        try {
+            return this.herdsman.getDevicesByType(type);
+        }
+        catch {
+            return undefined;
+        }
     }
 
     getDeviceByNetworkAddress(networkAddress) {
-        return this.herdsman.getDeviceByNetworkAddress(networkAddress);
+        try {
+            return this.herdsman.getDeviceByNetworkAddress(networkAddress);
+        }
+        catch {
+            return undefined;
+        }
     }
 
     async resolveEntity(key, ep) {
         // assert(typeof key === 'string' || key.constructor.name === 'Device', `Wrong type '${typeof key}'`);
-
-        if (typeof key === 'string') {
-            if (key === 'coordinator') {
-                const coordinator = this.herdsman.getDevicesByType('Coordinator')[0];
-                return {
-                    type: 'device',
-                    device: coordinator,
-                    endpoint: coordinator.getEndpoint(1),
-                    name: 'Coordinator',
-                };
-            } else {
-                const device = await this.herdsman.getDeviceByIeeeAddr(key);
-                if (device) {
-                    const mapped = await zigbeeHerdsmanConverters.findByDevice(device);
-                    const endpoints = mapped && mapped.endpoint ? mapped.endpoint(device) : null;
-                    let endpoint;
-                    if (endpoints && ep != undefined && endpoints[ep]) {
-                        endpoint = device.getEndpoint(endpoints[ep]);
-                    } else if (endpoints && endpoints['default']) {
-                        endpoint = device.getEndpoint(endpoints['default']);
-                    } else {
-                        const epNum = parseInt(ep);
-                        if (!isNaN(epNum)) {
-                            endpoint = device.getEndpoint(epNum);
-                        } else {
-                            endpoint = device.endpoints[0];
-                        }
-                    }
+        try {
+            if (typeof key === 'string') {
+                if (key === 'coordinator') {
+                    const coordinator = this.herdsman.getDevicesByType('Coordinator')[0];
                     return {
                         type: 'device',
-                        device,
-                        mapped,
-                        endpoint,
-                        endpoints: device.endpoints,
-                        name: key,
+                        device: coordinator,
+                        endpoint: coordinator.getEndpoint(1),
+                        name: 'Coordinator',
                     };
+                } else {
+                    const device = await this.herdsman.getDeviceByIeeeAddr(key);
+                    if (device) {
+                        const mapped = await zigbeeHerdsmanConverters.findByDevice(device);
+                        const endpoints = mapped && mapped.endpoint ? mapped.endpoint(device) : null;
+                        let endpoint;
+                        if (endpoints && ep != undefined && endpoints[ep]) {
+                            endpoint = device.getEndpoint(endpoints[ep]);
+                        } else if (endpoints && endpoints['default']) {
+                            endpoint = device.getEndpoint(endpoints['default']);
+                        } else {
+                            const epNum = parseInt(ep);
+                            if (!isNaN(epNum)) {
+                                endpoint = device.getEndpoint(epNum);
+                            } else {
+                                endpoint = device.endpoints[0];
+                            }
+                        }
+                        return {
+                            type: 'device',
+                            device,
+                            mapped,
+                            endpoint,
+                            endpoints: device.endpoints,
+                            name: key,
+                        };
+                    }
+                }
+            } else if (typeof key === 'number') {
+                let group = await this.herdsman.getGroupByID(key);
+                if (!group) group = await this.herdsman.createGroup(key);
+                group.toZigbee = groupConverters;
+                group.model = 'group';
+                return {
+                    type: 'group',
+                    mapped: group,
+                    group,
+                    name: `Group ${key}`,
+                };
+            } else {
+                let mapped;
+                try {
+                    mapped = await zigbeeHerdsmanConverters.findByDevice(key);
+                } catch (err) {
+                    this.error(`zigbeeHerdsmanConverters findByDevice ${key.ieeeAddr}`);
                 }
-            }
-        } else if (typeof key === 'number') {
-            let group = await this.herdsman.getGroupByID(key);
-            if (!group) group = await this.herdsman.createGroup(key);
-            group.toZigbee = groupConverters;
-            group.model = 'group';
-            return {
-                type: 'group',
-                mapped: group,
-                group,
-                name: `Group ${key}`,
-            };
-        } else {
-            let mapped;
-            try {
-                mapped = await zigbeeHerdsmanConverters.findByDevice(key);
-            } catch (err) {
-                this.error(`zigbeeHerdsmanConverters findByDevice ${key.ieeeAddr}`);
-            }
 
-            return {
-                type: 'device',
-                device: key,
-                mapped: mapped,
-                name: key.type === 'Coordinator' ? 'Coordinator' : key.ieeeAddr,
-            };
+                return {
+                    type: 'device',
+                    device: key,
+                    mapped: mapped,
+                    name: key.type === 'Coordinator' ? 'Coordinator' : key.ieeeAddr,
+                };
+            }
         }
+        catch {
+            return undefined;
+        }
+
     }
 
     async incMsgHandler(message) {
-        this.debug('incoming msg', message);
-        const device = await this.herdsman.getDeviceByIeeeAddr(message.srcaddr);
-        if (!device) {
-            this.debug('Message without device!');
-            return;
+        try {
+            this.debug('incoming msg', message);
+            const device = await this.herdsman.getDeviceByIeeeAddr(message.srcaddr);
+            if (!device) {
+                this.debug('Message without device!');
+                return;
+            }
+            // We can't handle devices without modelId.
+            if (!device.modelId) {
+                this.debug('Message without modelId!');
+                return;
+            }
+            this.event('msg', device.ieeeAddr, message, {
+                modelId: device.modelId
+            });
         }
-        // We can't handle devices without modelId.
-        if (!device.modelId) {
-            this.debug('Message without modelId!');
+        catch {
             return;
         }
-        this.event('msg', device.ieeeAddr, message, {
-            modelId: device.modelId
-        });
     }
 
     // Stop controller
@@ -814,39 +849,45 @@ class ZigbeeController extends EventEmitter {
         if (cfg == null) {
             cfg = {};
         }
-
-        if (type === 'foundation') {
-            cfg.disableDefaultResponse = true;
-
-            if (cmd === 'read' && !Array.isArray(zclData)) {
-                /*                // needs to be iterable (string[] | number [])
-                zclData[Symbol.iterator] = function* () {
-                    let k;
-                    for (k in this) {
-                        yield k;
-                    }
-                };
-*/
-            }
-            let result;
-            if (cmd === 'configReport') {
-                result = await endpoint.configureReporting(cid, zclData, cfg);
+        try {
+            if (type === 'foundation') {
+                cfg.disableDefaultResponse = true;
+                /*
+                if (cmd === 'read' && !Array.isArray(zclData)) {
+                    // needs to be iterable (string[] | number [])
+                    zclData[Symbol.iterator] = function* () {
+                        let k;
+                        for (k in this) {
+                            yield k;
+                        }
+                    };
+                }
+                */
+                let result;
+                if (cmd === 'configReport') {
+                    result = await endpoint.configureReporting(cid, zclData, cfg);
+                } else {
+                    if (cmd === 'read' && !Array.isArray(zclData))
+                        result = await endpoint[cmd](cid, Object.keys(zclData), cfg);
+                    else
+                        result = await endpoint[cmd](cid, zclData, cfg);
+                }
+                callback && callback(undefined, result);
+            } else if (type === 'functionalResp') {
+                cfg.disableDefaultResponse = false;
+                const result = await endpoint.commandResponse(cid, cmd, zclData, cfg, zclSeqNum);
+                callback && callback(undefined, result);
             } else {
-                if (cmd === 'read' && !Array.isArray(zclData))
-                    result = await endpoint[cmd](cid, Object.keys(zclData), cfg);
-                else
-                    result = await endpoint[cmd](cid, zclData, cfg);
+                cfg.disableDefaultResponse = false;
+                const result = await endpoint.command(cid, cmd, zclData, cfg);
+                callback && callback(undefined, result);
             }
-            callback && callback(undefined, result);
-        } else if (type === 'functionalResp') {
-            cfg.disableDefaultResponse = false;
-            const result = await endpoint.commandResponse(cid, cmd, zclData, cfg, zclSeqNum);
-            callback && callback(undefined, result);
-        } else {
-            cfg.disableDefaultResponse = false;
-            const result = await endpoint.command(cid, cmd, zclData, cfg);
-            callback && callback(undefined, result);
         }
+        catch (error)
+        {
+            this.log.error(`error sending ${type} ${cmd} to endpoint: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`)
+        }
+
     }
 
     async addDevToGroup(devId, groupId, epid) {
@@ -894,7 +935,7 @@ class ZigbeeController extends EventEmitter {
         } catch (error) {
             this.sendError(error);
             this.error(`Exception when trying to Add ${devId}  to group ${groupId}`, error);
-            return {error: `Failed to add ${devId}  to group ${groupId}: ${JSON.stringify(error)}`};
+            return {error: `Failed to add ${devId}  to group ${groupId}: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`};
         }
         return {};
     }
@@ -957,16 +998,21 @@ class ZigbeeController extends EventEmitter {
         target = !target ? this.getCoordinator() : target;
 
         this.debug(`Binding ${log}`);
-        ep.bind(cluster, target, error => {
-            if (error) {
-                this.sendError(error);
-                this.error(`Failed to bind ${log} - (${error})`);
-            } else {
-                this.debug(`Successfully bound ${log}`);
-            }
+        try {
+            ep.bind(cluster, target, error => {
+                if (error) {
+                    this.sendError(error);
+                    this.error(`Failed to bind ${log} - (${error})`);
+                } else {
+                    this.debug(`Successfully bound ${log}`);
+                }
 
+                callback(error);
+            });
+        }
+        catch (error) {
             callback(error);
-        });
+        }
     }
 
     unbind(ep, cluster, target, callback) {
@@ -974,15 +1020,21 @@ class ZigbeeController extends EventEmitter {
         target = !target ? this.getCoordinator() : target;
 
         this.debug(`Unbinding ${log}`);
-        ep.unbind(cluster, target, (error) => {
-            if (error) {
-                this.error(`Failed to unbind ${log} - (${error})`);
-            } else {
-                this.debug(`Successfully unbound ${log}`);
-            }
+        try {
+            ep.unbind(cluster, target, (error) => {
+                if (error) {
+                    this.error(`Failed to unbind ${log} - (${error})`);
+                } else {
+                    this.debug(`Successfully unbound ${log}`);
+                }
 
+                callback(error);
+            });
+        }
+        catch (error)
+        {
             callback(error);
-        });
+        }
     }
 
     reset(mode, callback) {

package/main.js

@@ -629,7 +629,14 @@ class Zigbee extends utils.Adapter {
         let isGroup = false;
         const has_elevated_debug = this.stController.checkDebugDevice(deviceId)
 
-        this.log.debug(`publishFromState : ${deviceId} ${model} ${safeJsonStringify(stateList)}`);
+        if (has_elevated_debug)
+        {
+            const stateNames = [];
+            stateList.forEach( state => stateNames.push(state.id));
+            this.log.warn(`ELEVATED O03: Publishing to ${deviceId} of model ${model} ${stateNames.join(', ')}`);
+        }
+        else
+            this.log.debug(`publishFromState : ${deviceId} ${model} ${safeJsonStringify(stateList)}`);
         if (model === 'group') {
             isGroup = true;
             deviceId = parseInt(deviceId);
@@ -637,13 +644,11 @@ class Zigbee extends utils.Adapter {
         try {
             const entity = await this.zbController.resolveEntity(deviceId);
 
-            this.log.debug(`entity: ${deviceId} ${model} ${safeJsonStringify(entity)}`);
-
-            const mappedModel = entity.mapped;
+            const mappedModel = (entity ? entity.mapped : undefined);
 
             if (!mappedModel) {
-                this.log.debug(`No mapped model for ${model}`);
-                if (has_elevated_debug) this.log.warn(`ELEVATED O2: No mapped model for ${model}`)
+                this.log.debug(`No mapped model for ${deviceId} (model ${model})`);
+                if (has_elevated_debug) this.log.error(`ELEVATED OE01: No mapped model ${deviceId} (model ${model})`)
                 return;
             }
 
@@ -682,25 +687,34 @@ class Zigbee extends utils.Adapter {
                     // on activation of the 'device_query' state trigger hardware query where possible
                     if (stateDesc.id === 'device_query') {
                         if (this.query_device_block.indexOf(deviceId) > -1) {
-                            this.log.warn(`Device query for '${entity.device.ieeeAddr}' blocked`);
+                            this.log.info(`Device query for '${entity.device.ieeeAddr}' blocked`);
                             return;
                         }
                         if (mappedModel) {
                             this.query_device_block.push(deviceId);
-                            this.log.debug(`Device query for '${entity.device.ieeeAddr}' started`);
+                            if (has_elevated_debug)
+                                this.log.warn(`ELEVATED O06: Device query for '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' triggered`);
+                            let t;
                             for (const converter of mappedModel.toZigbee) {
                                 if (converter.hasOwnProperty('convertGet')) {
                                     for (const ckey of converter.key) {
                                         try {
-                                            await converter.convertGet(entity.device.endpoints[0], ckey, {});
+                                            await converter.convertGet(entity.device.endpoints[0], ckey, {endpoint_name:entity.device.endpoints[0].ID.toString()});
                                         } catch (error) {
-                                            this.log.warn(`Failed to read state '${JSON.stringify(ckey)}'of '${entity.device.ieeeAddr}' after query with '${JSON.stringify(error)}'`);
-
+                                            if (has_elevated_debug) {
+                                                this.log.warn(`ELEVATED OE02.1 Failed to read state '${JSON.stringify(ckey)}'of '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' from query with '${error && error.message ? error.message : 'no error message'}`);
+                                            }
+                                            else
+                                                this.log.info(`failed to read state ${JSON.stringify(ckey)} of ${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID} after device query`);
                                         }
                                     }
                                 }
                             }
-                            this.log.debug(`Device query for '${entity.device.ieeeAddr}' done`);
+                            if (has_elevated_debug)
+                                this.log.warn(`ELEVATED O07: Device query for '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' complete`);
+                            else
+                                this.log.info(`Device query for '${entity.device.ieeeAddr}/${entity.device.endpoints[0].ID}' complete`);
+
                             const idToRemove = deviceId;
                             setTimeout(() => {
                                 const idx = this.query_device_block.indexOf(idToRemove);
@@ -715,6 +729,7 @@ class Zigbee extends utils.Adapter {
                 }
 
                 let converter = undefined;
+                let msgCnt = 1;
                 for (const c of mappedModel.toZigbee) {
 
                     if (!c.hasOwnProperty('convertSet')) continue;
@@ -724,13 +739,14 @@ class Zigbee extends utils.Adapter {
                         if (c.hasOwnProperty('convertSet') && converter === undefined)
                         {
                             converter = c;
-                            if (has_elevated_debug)
-                                this.log.warn(`ELEVATED O3A: Setting converter to keyless converter for ${deviceId} of type ${model}`)
+                            if (has_elevated_debug) {
+                                this.log.warn(`ELEVATED O4.${msgCnt++}: Setting converter to keyless converter for ${deviceId} of type ${model}`)
+                            }
                             this.log.debug('setting converter to keyless converter')
                         }
                         else
                         {
-                            if (has_elevated_debug) this.log.warn(`ELEVATED O3B: ignoring keyless converter for ${deviceId} of type ${model}`)
+                            if (has_elevated_debug) this.log.warn(`ELEVATED O4.${msgCnt++}: ignoring keyless converter for ${deviceId} of type ${model}`)
                             this.log.debug('ignoring keyless converter')
                         }
                         continue;
@@ -738,7 +754,7 @@ class Zigbee extends utils.Adapter {
                     if (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id))
                     {
                         this.log.debug(`${(converter===undefined?'Setting':'Overriding')}' converter to converter with key(s)'${JSON.stringify(c.key)}}`)
-                        if (has_elevated_debug) this.log.warn(`ELEVATED O3C: ${(converter===undefined?'Setting':'Overriding')}' converter to converter with key(s)'${JSON.stringify(c.key)}}`)
+                        if (has_elevated_debug) this.log.warn(`ELEVATED O4.${msgCnt++}: ${(converter===undefined?'Setting':'Overriding')}' converter to converter with key(s)'${JSON.stringify(c.key)}}`)
                         converter = c;
                     }
                 }
@@ -804,7 +820,7 @@ class Zigbee extends utils.Adapter {
                 try {
                     const result = await converter.convertSet(target, key, preparedValue, meta);
                     this.log.debug(`convert result ${safeJsonStringify(result)}`);
-                    if (has_elevated_debug) this.log.warn(`ELEVATED O5: convert result ${safeJsonStringify(result)} for device ${deviceId}`);
+                    if (has_elevated_debug) this.log.warn(`ELEVATED O05: convert result ${safeJsonStringify(result)} sent to device ${deviceId}`);
                     if (result !== undefined) {
                         if (stateModel && !isGroup) {
                             this.acknowledgeState(deviceId, model, stateDesc, value);
@@ -824,7 +840,7 @@ class Zigbee extends utils.Adapter {
                 }
             });
         } catch (err) {
-            this.log.error(`No entity for ${deviceId}`);
+            this.log.error(`No entity for ${deviceId} : ${err && err.message ? err.message : ''}`);
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.10.14",
+  "version": "2.0.0",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -22,12 +22,12 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.2.2",
-    "@iobroker/dm-utils": "^0.5.0",
+    "@iobroker/dm-utils": "^1.0.9",
     "humanize-duration": "^3.32.1",
     "tar": "^7.4.3",
     "ajv": "^8.17.1",
     "uri-js": "^4.4.1",
-    "typescript": "^5.6.3",
+    "typescript": "^5.7.3",
     "zigbee-herdsman": "2.1.9",
     "zigbee-herdsman-converters": "20.58.0"
   },
@@ -40,14 +40,14 @@
     "@iobroker/testing": "^5.0.0",
     "chai": "^5.1.2",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^9.17.0",
+    "eslint": "^9.19.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-replace": "^1.1.4",
     "mixin-deep": "^2.0.1",
-    "mocha": "^10.8.2"
+    "mocha": "^11.1.0"
   },
   "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
   "keywords": [