iobroker.zigbee 3.2.5 → 3.3.1-alpha.0

package/admin/index_m.html

@@ -733,11 +733,17 @@
                         <i class="material-icons large icon-blue">feedback</i></a>
                     </li>
                     <li>
-                    <a id="download_icons_btn"
+                        <a id="download_icons_btn"
                         class="btn-floating disabled waves-effect waves-light blue tooltipped center-align hoverable translateT"
                         title="Download missing icons">
                         <i class="material-icons large">cloud_download</i></a>
                     </li>
+                    <li>
+                        <a id="rebuild_states_btn"
+                        class="btn-floating disabled waves-effect waves-light blue tooltipped center-align hoverable translateT"
+                        title="Rebuild states">
+                        <i class="material-icons large">low_priority</i></a>
+                    </li>
                     <li>
                         <a id="pairing"
                            class="btn-floating disabled waves-effect waves-light green tooltipped center-align hoverable translateT"
@@ -1286,37 +1292,6 @@
             </nav>
         </div>
         <div class="row">
-            <!--
-            <div class="col s1 l1 m1"><a id="modelnamefilter" class="btn-large blue left" ><i class="material-icons icon-blue">filter_list</i></a></div>
-            <div class="col s5 l5 m5 input-field" style="line-height: 24px;"><input id="Filter" type="text" /><label class="translate">Search</div>
-            <div class="col s1 l1 m1"><a id="modelsetfilter" class="btn-large blue left" ><i class="material-icons icon-blue">reorder</i></a></div>
-            <div class="input-field suffix col s2 m2 l2">
-                <select id="channel" class="value">
-                    <option value="function(a) { return true }" selected>All</option>
-                    <option value="function(a) { return LocalDisplayDataValues[a].type == 'group' }">Groups</option>
-                    <option value="function(a) { return LocalDisplayDataValues[a].type == 'Router' }">Routers</option>
-                    <option value="function(a) { return LocalDisplayDataValues[a].type == 'Router' }">EndDevices</option>
-                    <option value="function(a) { return LocalDisplayDataValues[a].setOptions?.length > 0 }">with Options</option>
-                    <option value="function(a) { return !(LocalDisplayDataValues[a].setOptions?.length > 0) }">without Options</option>
-                    <label class="translate">Filter</label>
-                </select>
-            </div>
-            <div class="col s1 l1 m1"><a id="modelnamefilter" class="btn-large blue left" ><i class="material-icons icon-blue">sort</i></a></div>
-            <div class="input-field suffix col s2 m2 l2">
-                <select id="channel" class="value">
-                    <option value="function(a,b) { return 0 }" selected>noSort</option>
-                    <option value="function(a,b) { return LocalDisplayDataValues[a].type > LocalDisplayDataValues[b].type }">by type</option>
-                    <option value="function(a,b) { return LocalDisplayDataValues[a].devices?.length > LocalDisplayDataValues[b].devices?.length }">by device counttype</option>
-                    <option value="function(a,b) { return LocalDisplayDataValues[a].setOptions?.length > LocalDisplayDataValues[b].setOptions?.length }">by option count</option>
-                    <label class="translate">Sort</label>
-                </select>
-            </div></div>
-            <div class="fixed-action-btn" style="margin-bottom: 100px">
-                <a id="updateData"
-                    class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT"
-                    title="update Data"><i class="material-icons large">replay</i></a>
-            </div>
-            -->
             <div id="tab-overrides-content" row>
                 Nothing to see yet.
             </div>
@@ -1490,6 +1465,20 @@
             <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
         </div>
     </div>
+    <div id="modalrebuild" class="modal">
+        <div class="modal-content">
+            <h3 class="translate">State rebuild confirmation</h3>
+            <p>A bunch of text</p>
+        </div>
+        <div class="modal-footer">
+            <div id="cforcediv" class="forcedelete">
+                <input id="cforce_rebuild" type="checkbox" class="value"/>
+                <label class="translate" for="cforce_rebuild">Force update all roles to adapter defined roles</label>
+            </div>
+            <a name="yes" href="#!" class="modal-action modal-close waves-effect waves-green btn green translate">Yes</a>
+            <a href="#!" class="modal-action modal-close waves-effect waves-red btn-flat translate">Cancel</a>
+        </div>
+    </div>
     <div id="modalreconfigure" class="modal">
         <div class="modal-content">
             <h3 class="translate">Reconfigure device</h3>

package/admin/tab_m.html

@@ -680,7 +680,7 @@
                         </p></div>
                         <ul id="nav-mobile" class="right">
                         <li>
-                            <a id="adapterStopped_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="Adapter not running">
+                            <a id="adapterStopped_btn" class="btn-floating waves-effect waves-light red icon-black tooltipped center-align hoverable translateT hide" title="Adapter not running">
                             <i class="material-icons large">grid_off</i></a>
                             </li>
                         <li>
@@ -697,6 +697,16 @@
                             <a id="show_errors_btn" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT hide" title="Show Errors">
                             <i class="material-icons large">feedback</i></a>
                         </li>
+                        <li>
+                            <a id="map_errors_btn" class="btn-floating waves-effect waves-light orange tooltipped center-align hoverable translateT hide" title="Show errors from map generation">
+                            <i class="material-icons large">filter_none</i></a>
+                            </li>
+                        <li>
+                        <li>
+                            <a id="map_generating_btn" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT hide" title="Map generation in progress">
+                            <i class="material-icons large">filter_none</i></a>
+                            </li>
+                        <li>
                         <li>
                             <a id="fw_check_btn" class="btn-floating waves-effect waves-light blue tooltipped center-align hoverable translateT hide" title="Check firmware updates">
                             <i class="material-icons large">system_update</i></a>
@@ -761,6 +771,8 @@
                                         <!--<li class="device-order-item" data-type="kind" tabindex="0"><a class="translate" data-lang="Kind">Kind</a></li>-->
                                         <!--<li class="device-order-item" data-type="status" tabindex="0"><a class="translate" data-lang="Status">Status</a></li>-->
                                         <li class="device-order-item" data-type="default" tabindex="0"><a class="translate" data-lang="Default">Default</a></li>
+                                        <li class="device-order-item" data-type="range" tabindex="0"><a class="translate" data-lang="Range">Range</a></li>
+										<li class="device-order-item" data-type="load" tabindex="0"><a class="translate" data-lang="Load">Load</a></li>
                                     </ul>
                                 </div>
                             </li>
@@ -1218,7 +1230,7 @@
                             </label>
                         </div>
                         <div class="input-field col s12 admin-tooltip-icon translateT" title="Regenerate Map">
-                        <br><button id="regenerate" class="waves-effect center hoverable blue"><i class="material-icons medium border:0 icon-Black">map</i></button>
+                        <br><button id="regenerate" class="waves-effect center hoverable blue"><i class="material-icons medium border:0 icon-black">map</i></button>
                         </div>
                     </div>
                     <div class="input-field input-group col s12 m6 l6">

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "3.2.5",
+    "version": "3.3.1-alpha.0",
     "news": {
+      "3.3.1-alpha.0": {
+        "en": "\n",
+        "de": "\n",
+        "ru": "\n",
+        "pt": "\n",
+        "nl": "\n",
+        "fr": "\n",
+        "it": "\n",
+        "es": "\n",
+        "pl": "\n",
+        "uk": "\n",
+        "zh-cn": "\n"
+      },
+      "3.3.0": {
+        "en": "Fix: dynamic model assignment when exposes is function (PTVO, BuschJaeger)\nFix: Roles\nRefactor: Legacy code moved\nRefactor: Expose creation changed.\nRefactor: Exposes no longer use states from legacy code\nFeature: Offer state rebuild function in Settings\n: Additional filters for device display\nFix: Orphaned group states detected, marked and deletable\nUpdate: ZH 7.x\nUpdate: ZHC 25.84.0",
+        "de": "Fix: Dynamische Modellzuweisung bei Belichtungen ist Funktion (PTVO, BuschJaeger)\nFix: Roles\nRefactor: Legacy-Code bewegt\nHersteller: Expose Kreation geändert.\nRefactor: Exposes verwendet nicht mehr Staaten von Legacy-Code\nFeature: Offer state rebuild Funktion in Einstellungen\n: Zusätzliche Filter für Geräteanzeige\nFix: Verwaiste Gruppenzustände erkannt, markiert und verblendet\nAktualisierung: ZH 7.x\nAktualisierung: ZHC 25.84.0",
+        "ru": "Исправление: назначение динамической модели при раскрытии функции (PTVO, BuschJaeger)\nИсполнитель: Roles\nРефактор: код Legacy перемещен\nРефактор: Создание экспозиции изменилось.\nRefactor: EXPOES больше не используют устаревший код\nФункция: Предложите функцию восстановления состояния в настройках\nДополнительные фильтры для отображения устройства\nИсправление: обнаруженные, помеченные и удаляемые состояния орфанной группы\nОбновление: ZH 7.x\nОбновление: ZHC 25.84.0",
+        "pt": "Corrigir: atribuição dinâmica do modelo quando expõe é função (PTVO, BuschJaeger)\nCorrigir: Funções\nRefactor: Código de legado movido\nRefactor: Expor a criação mudou.\nRefator: Expos não usam mais estados do código legado\nCaracterística: Ofereça a função de reconstrução do estado em Configurações\n: Filtros adicionais para exibição do dispositivo\nCorrigir: estados de grupo órfão detectados, marcados e deletáveis\nActualização: ZH 7.x\nAtualização: ZHC 25.84.0",
+        "nl": "Fix: dynamische modeltoewijzing wanneer blootgesteld is functie (PTVO, BuschJaeger)\nFix: rollen\nRefactor: Legacy code verplaatst\nRefactor: Aanmaak gewijzigd tonen.\nRefactor: Exposes gebruikt geen staten meer van legacy code\nFunctie: Aanbieden status wederopbouw functie in Instellingen\n: Extra filters voor apparaatweergave\nFix: weesgroep staten gedetecteerd, gemarkeerd en deletable\nUpdate: ZH 7.x\nUpdate: ZHC 25.84.0",
+        "fr": "Correction : attribution de modèle dynamique lorsque l'exposition est fonction (PTVO, BuschJaeger)\nCorrection : Rôles\nRefactor: Legacy code déplacé\nRefacteur: La création d'exposition a changé.\nRefactor: Les expositions n'utilisent plus les états à partir du code ancien\nCaractéristique: Offre la fonction de reconstruction de l'état dans les paramètres\n: Filtres supplémentaires pour l'affichage des appareils\nCorrection : États de groupe orphelins détectés, marqués et délaissables\nMise à jour : ZH 7.x\nMise à jour: ZHC 25.84.0",
+        "it": "Fisso: l'assegnazione dinamica del modello quando espone è funzione (PTVO, BuschJaeger)\nFisso: Roles\nRefactor: Legacy code move\nRefactor: La creazione dell'esposizione è cambiata.\nRefactor: Exposes not use stati from legacy code\nCaratteristica: Offrire la funzione di ricostruzione dello stato in Impostazioni\n: Filtri aggiuntivi per display del dispositivo\nFisso: Stati del gruppo orfano rilevati, contrassegnati e cancellabili\nAggiornamento: ZH 7.x\nAggiornamento: ZHC 25.84.0",
+        "es": "Fijación: asignación de modelos dinámicos cuando se expone es función (PTVO, BuschJaeger)\nCorrección: Papeles\nRefactor: Se movió el código de Legacy\nRefactor: La creación de la exposición cambió.\nRefactor: Los Exposes ya no utilizan estados del código hereditario\nCaracterística: Oferta función de reconstrucción estatal en Ajustes\n: Filtros adicionales para la pantalla del dispositivo\nFijación: Estados del grupo huérfano detectados, marcados y eliminables\nActualización: ZH 7.x\nActualización: ZHC 25.84.0",
+        "pl": "Fix: przypisanie modelu dynamicznego, gdy funkcja eksponuje (PTVO, BuschJaeger)\nFix: Roles\nWspółczynnik: Przesunięty kod legacy\nWspółczynnik: Odkryj, że kreacja się zmieniła.\nRefaktor: Ekspozycje nie wykorzystują już stanów z dotychczasowego kodu\nCecha: Oferta funkcji odbudowy państwa w ustawieniach\n: Dodatkowe filtry do wyświetlania urządzeń\nFix: Osierocone państwa grupowe wykryte, oznaczone i usunięte\nAktualizacja: ZH 7.x\nAktualizacja: ZHC 25.84.0",
+        "uk": "Виправлення: динамічне завдання моделі при налаштуванні функції (PTVO, BuschJaeger)\nФіксація: Ролі\nРефактор: код Legacy переїхав\nРефактор: Змінено виставку.\nРефактор: Виставки більше не використовують стани з коду спадкування\nХарактеристика: Пропозиція функції державного відновлення в налаштуваннях\n: Додаткові фільтри для відображення пристрою\nВиправлення: Виявлені орфагенти групи, позначені та видалені\nОновлення: ZH 7.x\nОновлення: ZHC 25.84.0",
+        "zh-cn": "Fix: 曝光时的动态模型任务为函数( PTVO, Busch Jaeger)\n修补:角色\n内容: 遗留代码已移动\n重构 : 展览的创作改变了.\n内容: 展览不再使用遗留代码中的状态\n特性: 在设置中提供状态重建功能\n: 设备显示的额外过滤器\n修复:发现、标记和删除孤儿群体状态\n最新情况:ZH 7.x\n最新情况:ZHC 25.84.0"
+      },
       "3.2.5": {
         "en": "changed setState for lasterror",
         "de": "geändert setState für lasterror",
@@ -67,32 +93,6 @@
         "pl": "fix bug # 2640\n",
         "uk": "виправлення помилки #2640\n",
         "zh-cn": "修复错误 # 2640\n"
-      },
-      "3.2.0": {
-        "en": "remove local overrides tab from config\nestablish local data tab in config to edit global and device level settings and options\nremove the local overrides tab\nremove the ability to set model level overrides from device tab.\nfix errors for 'polling' devices with changed poll times.\nwarning icon for devices which are not completely interviewed.\nimproved router detection for opening the network\nbugfix: open network on router\nZHC 25.x latest, ZH 6.1.3,\nrestore from in-adapter backup",
-        "de": "entfernen sie lokale overrides tab von config\nlokale daten tab erstellen, um globale und geräteebene einstellungen und optionen zu bearbeiten\nentfernen der lokalen overrides tab\nentfernen sie die fähigkeit, modellebene überschrieben von der geräte-tab.\nfehler für \"polling\"-geräte mit veränderten abfragezeiten beheben.\nwarnsymbol für geräte, die nicht vollständig interviewt werden.\nverbesserte routererkennung zum öffnen des netzwerks\nbugfix: offenes netzwerk auf router\nZHC 25.x neueste, ZH 6.1.3,\nwiederherstellung von in-adapter-backup",
-        "ru": "удалить локальную вкладку overrided из конфигураций\nустановить локальную вкладку данных в конфигурацию для редактирования глобальных настроек и параметров уровня устройства\nудалить вкладку local overrides\nудалить возможность установки переопределений уровня модели из вкладки устройства.\nисправление ошибок для «опросных» устройств с измененным временем опроса.\nиконка предупреждения для устройств, которые не были полностью опрошены.\nулучшенное обнаружение маршрутизатора для открытия сети\nbugfix: открытая сеть на маршрутизаторе\nZHC 25.x, ZH 6.1.3,\nвосстановление из in-adapter backup",
-        "pt": "remover a página de substituições locais da configuração\nestabelecer a página de dados locais na configuração para editar as configurações e opções globais e de nível do dispositivo\nremover a página de sobreposições locais\nremover a capacidade de definir os comandos de nível do modelo da aba do dispositivo.\ncorrigir erros para dispositivos de 'polling' com tempos de votação alterados.\nícone de aviso para dispositivos que não são completamente entrevistados.\ndetecção de roteador melhorada para abrir a rede\ncorreção de erros: abrir rede no roteador\nZHC 25.x mais recente, ZH 6.1.3,\nrestaurar a partir de backup no adaptador",
-        "nl": "tabblad overrides verwijderen uit config\nlokale datatabblad instellen in config om instellingen en opties voor het niveau van het apparaat en de globale instellingen te bewerken\nhet tabblad lokale overrides verwijderen\nverwijder de mogelijkheid om modelniveau overrides van apparaat tab.\nfouten te herstellen voor 'polling' apparaten met veranderde polltijden.\nwaarschuwingspictogram voor apparaten die niet volledig zijn geïnterviewd.\nverbeterde routerdetectie voor het openen van het netwerk\nbugfix: open netwerk op router\nZHC 25.x laatste, ZH 6.1.3,\nherstellen van in-adapter back-up",
-        "fr": "supprimer l'onglet local de la configuration\ncréer un onglet local de données dans la configuration pour modifier les paramètres et les options de niveau global et périphérique\nsupprimer l'onglet local de remplacement\nsupprimer la possibilité de définir les dépassements de niveau du modèle de l'onglet périphérique.\ncorriger les erreurs pour les dispositifs 'polling' avec des temps de sondage modifiés.\nicône d'avertissement pour les appareils qui ne sont pas complètement interviewés.\namélioration de la détection du routeur pour l'ouverture du réseau\nbugfix: ouvrir le réseau sur le routeur\nZHC 25.x dernier, ZH 6.1.3,\nrestaurer à partir de la sauvegarde dans l'adaptateur",
-        "it": "rimuovere la scheda override locale da config\nstabilire la scheda dati locale in configurazione per modificare le impostazioni e le opzioni del livello globale e del dispositivo\nrimuovere la scheda override locale\nrimuovere la capacità di impostare override di livello del modello dalla scheda del dispositivo.\ncorreggere gli errori per i dispositivi 'polling' con tempi di sondaggio modificati.\nicona di avviso per dispositivi che non sono completamente intervistati.\nmiglioramento del rilevamento del router per l'apertura della rete\nbugfix: aprire la rete sul router\nZHC 25.x ultimo, ZH 6.1.3,\nripristino da backup in-adapter",
-        "es": "eliminar la pestaña de anulaciones locales de config\nestablecer la ficha de datos local en config para editar ajustes y opciones a nivel global y de dispositivos\neliminar la ficha de anulación local\neliminar la capacidad de establecer el nivel de modelo anula de la pestaña dispositivo.\ncorrige errores para dispositivos 'polling' con tiempos de votación cambiados.\nicono de advertencia para dispositivos que no son entrevistados por completo.\nmejor detección de router para abrir la red\nbugfix: red abierta en router\nZHC 25.x más reciente, ZH 6.1.3,\nrestaurar de la copia de seguridad en el equipo",
-        "pl": "usuń lokalne nadjazdy z zakładki config\ntworzy lokalną kartę danych w konfigu, aby edytować globalne i na poziomie urządzenia ustawienia i opcje\nusuń kartę lokalnych nadwozi\nusuń możliwość ustawiania nadwyżek poziomu modelu z zakładki urządzenia.\nnaprawić błędy urządzeń 'sondażowych' ze zmienionymi okresami ankiety.\nikona ostrzegawcza dla urządzeń, które nie są w pełni przesłuchane.\nulepszone wykrywanie routerów w celu otwarcia sieci\nbugfix: otwarta sieć na routerze\nZHC 25.x najnowszy, ZH 6.1.3,\nprzywracanie z kopii zapasowej in- adaptera",
-        "uk": "видалити локальну вкладку overrides з налаштування\nвстановити локальну вкладку даних в конфігурацію для редагування параметрів рівня глобального та пристрою та параметрів\nвидалити локальну вкладку\nприбрати можливість встановити рівень моделі перенаряддя з вкладки пристрою.\nфіксувати помилки для пристроїв «запилення» з змінними термінами опитування.\nзначок попередження для пристроїв, які не повністю опитуються.\nполіпшення виявлення маршрутизатора для відкриття мережі\nвиправлення помилок: відкрита мережа на маршрутизаторі\nZHC 25.x останнє, ZH 6.1.3,\nвідновлення з резервної копії",
-        "zh-cn": "从配置中删除本地覆盖标签\n在配置中建立本地数据标签以编辑全局和设备级别设置和选项\n删除本地覆盖标签\n从设备标签中删除设置模型级别覆盖的能力 .\n修正“ 投票” 设备的错误, 并更改投票时间 .\n警告未完全访问设备的图标.\n为打开网络改进路由器检测\n错误修正: 在路由器上打开网络\nZHC 25.x最新版,ZH 6.1.3,\n从适应中备份恢复"
-      },
-      "3.1.6": {
-        "en": "Bugfixes\n",
-        "de": "Bugfixes\n",
-        "ru": "Багфиксы\n",
-        "pt": "Correcções de Erros\n",
-        "nl": "Bugfixes\n",
-        "fr": "Fixes de bogue\n",
-        "it": "Bugfix\n",
-        "es": "Bugfixes\n",
-        "pl": "Korekty błędów\n",
-        "uk": "Помилки\n",
-        "zh-cn": "错误修正\n"
       }
     },
     "titleLang": {
@@ -159,7 +159,7 @@
       "tab": "materialize"
     },
     "messagebox": true,
-    "stopTimeout": 5000,
+    "stopTimeout": 30000,
     "stopBeforeUpdate": true,
     "dataFolder": "zigbee_%INSTANCE%",
     "compact": true,
@@ -369,7 +369,7 @@
       "_id": "info.lasterror",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "state",
         "name": "Last stashed error",
         "type": "string",
         "read": true,
@@ -382,7 +382,7 @@
       "_id": "info.pairingCountdown",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "value",
         "name": "Pairing countdown",
         "type": "number",
         "read": true,
@@ -395,7 +395,7 @@
       "_id": "info.pairingMessage",
       "type": "state",
       "common": {
-        "role": "indicator",
+        "role": "state",
         "name": "Pairing message",
         "type": "string",
         "read": true,

package/lib/commands.js

@@ -2,7 +2,7 @@
 
 const { getZbId, getNetAddress, reverseByteString, zbIdorIeeetoAdId, adIdtoZbIdorIeee } = require('./utils');
 const fs = require('fs');
-const statesMapping = require('./devices');
+const modelDefinitions = require('./models.js');
 const colors = require('./colors.js');
 /* currently not needed, kept for referencce
 const utils = require('@iobroker/adapter-core'); // Get common adapter utils
@@ -21,6 +21,7 @@ class Commands {
     constructor(adapter) {
         this.adapter = adapter;
         this.adapter.on('message', obj => this.onMessage(obj));
+        this.devicesDeleting = new Set();
     }
 
     start(zbController, stController) {
@@ -97,9 +98,12 @@ class Commands {
                             this.getCoordinatorInfo(obj.from, obj.command, obj.callback);
                         }
                         break;
-                    case 'cleanDeviceStates':
+                    case 'modifyDeviceStates':
                         if (obj.message && typeof obj.message === 'object') {
-                            this.cleanDeviceStates(obj.from, obj.command, obj.message, obj.callback);
+                            if (obj.message.action == 'clean')
+                                return this.cleanDeviceStates(obj.from, obj.command, obj.message.force, obj.callback);
+                            if (obj.message.action == 'rebuild')
+                                return this.rebuildDeviceStates(obj.from, obj.command, obj.message.force, obj.callback);
                         }
                         break;
                     case 'setState':
@@ -299,6 +303,9 @@ class Commands {
 
             if (await this.zbController.permitJoin(cTimer, devId)) {
                 this.adapter.setState('info.pairingMode', cTimer > 0, true);
+                if (cTimer != 0 && this.stController) {
+                    this.stController.resetKnownUnknownModels();
+                }
                 //this.adapter.sendTo(from, command, cTimer ? 'Start pairing!':'Stop pairing!', callback);
             }
             else {
@@ -375,7 +382,7 @@ class Commands {
         }
     }
 
-    async fillInfo(device, device_stateDefs, all_states, models) {
+    async fillInfo(device, entity, device_stateDefs, all_states, models) {
         device.statesDef = (device_stateDefs || []).filter(stateDef => {
             const sid = stateDef._id.replace(this.adapter.namespace + '.', '');
             const names = sid.split('.');
@@ -398,8 +405,6 @@ class Commands {
             };
         });
 
-        const id = getZbId(device._id);
-        const entity = await this.zbController.resolveEntity(id)
 
         device.info = this.buildDeviceInfo(entity);
 
@@ -413,7 +418,7 @@ class Commands {
                 availableOptions : [...device.info?.mapped?.options || [], ...['use_legacy_model']],
                 setOptions: this.adapter.stController.localConfig.getByModel(device.info?.mapped?.model || 'unknown') || [],
                 devices: [device],
-            }
+            };
             if (!models.byUID[UID].model.type)
                 models.byUID[UID].model.type = 'Group';
             models.UIDbyModel[device.info?.mapped?.model || 'unknown'] = UID;
@@ -433,7 +438,7 @@ class Commands {
         }
     }
 
-    buildDeviceInfo(device) {
+    buildDeviceInfo(entity) {
         function getKey(object, value) {
             try {
                 for (const key of Object.keys(object)) {
@@ -459,34 +464,34 @@ class Commands {
         const rv = {};
         try {
             rv.device = {
-                modelZigbee:device.device.modelID,
-                type:device.device.type,
-                ieee:device.device.ieeeAddr || device.device.groupID,
-                nwk:device.device.networkAddress || 0,
-                manuf_id:device.device.maufacturerID,
-                manuf_name:device.device.manufacturerName,
-                manufacturer:device.mapped?.vendor,
-                power:device.device.powerSource,
-                app_version:device.device.applicationVersion,
-                hard_version:device.device.hardwareVersion,
-                zcl_version:device.device.zclVersion,
-                stack_version:device.device.stack_version,
-                date_code:device.device.dateCode,
-                build:device.device.softwareBuildID,
-                interviewstate:device.device.interviewState || 'UNKNOWN',
+                modelZigbee:entity.device.modelID,
+                type:entity.device.type,
+                ieee:entity.device.ieeeAddr || entity.device.groupID,
+                nwk:entity.device.networkAddress || 0,
+                manuf_id:entity.device.maufacturerID,
+                manuf_name:entity.device.manufacturerName,
+                manufacturer:entity.mapped?.vendor,
+                power:entity.device.powerSource,
+                app_version:entity.device.applicationVersion,
+                hard_version:entity.device.hardwareVersion,
+                zcl_version:entity.device.zclVersion,
+                stack_version:entity.device.stack_version,
+                date_code:entity.device.dateCode,
+                build:entity.device.softwareBuildID,
+                interviewstate:entity.device.interviewState || 'UNKNOWN',
                 BindSource: false,
                 isGroupable: false,
             }
             rv.endpoints = [];
             let dBindSource = false;
             let disGroupable = false;
-            for (const ep_idx in device.endpoints) {
-                const ep = device.endpoints[ep_idx];
+            for (const ep_idx in entity.endpoints) {
+                const ep = entity.endpoints[ep_idx];
                 const bindable = haveBindableClusters(ep.outputClusters);
                 dBindSource |= bindable;
                 rv.endpoints.push({
                     ID:ep.ID,
-                    epName: device.mapped?.endpoint ? getKey(device.mapped?.endpoint(device), ep.ID) : ep.ID,
+                    epName: entity.mapped?.endpoint ? getKey(entity.mapped?.endpoint(entity.device), ep.ID) : ep.ID,
                     profile:ep.profileID,
                     input_clusters:ep.inputClusters,
                     output_clusters:ep.outputClusters,
@@ -496,23 +501,23 @@ class Commands {
             }
             rv.device.isGroupable = Boolean(disGroupable);
             rv.device.BindSource = Boolean(dBindSource);
-            if (device.mapped) {
+            if (entity.mapped) {
                 rv.mapped = {
-                    model:device.mapped.model,
-                    type:device.device.type,
-                    description:device.mapped.description,
-                    hasLegacyDef:statesMapping.hasLegacyDevice(device.mapped.model),
+                    model:entity.mapped.model,
+                    type:entity.device.type,
+                    description:entity.mapped.description,
+                    hasLegacyDef:modelDefinitions.hasLegacyDevice(entity.mapped.model),
                     //fingerprint:JSON.stringify(device.mapped.fingerprint),
-                    vendor:device.mapped.vendor,
-                    hasOnEvent:device.mapped.onEvent != undefined,
-                    hasConfigure:device.mapped.configure != undefined,
-                    icon:`img/${device.mapped.model.replace(/\//g, '-')}.png`,
-                    legacyIcon: statesMapping.getIconforLegacyModel(device.mapped.model),
+                    vendor:entity.mapped.vendor,
+                    hasOnEvent:entity.mapped.onEvent != undefined,
+                    hasConfigure:entity.mapped.configure != undefined,
+                    icon:`img/${entity.mapped.model.replace(/\//g, '-')}.png`,
+                    legacyIcon: modelDefinitions.getIconforLegacyModel(entity.mapped.model),
                     options:[],
                 }
-                if (device.mapped.options && typeof (device.mapped.options == 'object')) {
-                    rv.mapped.optionExposes = device.mapped.options;
-                    for (const option of device.mapped.options) {
+                if (entity.mapped.options && typeof (entity.mapped.options == 'object')) {
+                    rv.mapped.optionExposes = entity.mapped.options;
+                    for (const option of entity.mapped.options) {
                         if (option.name) {
                             rv.mapped.options.push(option.name);
                         }
@@ -521,9 +526,9 @@ class Commands {
             }
             else {
                 rv.mapped = {
-                    model:device.name,
-                    type: device.device.type,
-                    description:device.name,
+                    model:entity.name,
+                    type: entity.device.type,
+                    description:entity.name,
                     vendor:'not set',
                     hasOnEvent: false,
                     hasConfigure: false,
@@ -532,34 +537,34 @@ class Commands {
             }
         }
         catch (error) {
-            if (device && device.name === 'Coordinator') return rv;
-            const dev = device ? device.device || {} : {}
-            const msg = device ? `device ${device.name} (${dev.ieeeAddr}, NWK ${dev.networkAddres}, ID: ${dev.ID})` : 'undefined device';
+            if (entity && entity.name === 'Coordinator') return rv;
+            const dev = entity ? entity.device || {} : {}
+            const msg = entity ? `device ${entity.name} (${dev.ieeeAddr}, NWK ${dev.networkAddres}, ID: ${dev.ID})` : 'undefined device';
             this.warn(`Error ${error && error.message ? error.message + ' ' : ''}building device info for ${msg}`);
         }
         return rv;
     }
 
     async appendDevicesWithoutObjects(devices, client) {
-        const device = await this.zbController.resolveEntity(client.ieeeAddr);
-        if (!device || !device.device) {
+        const entity = await this.zbController.resolveEntity(client.ieeeAddr);
+        if (!entity || !entity.device) {
             return;
         }
-        const exists = devices.find((dev) => (dev._id && device.device.ieeeAddr === getZbId(dev._id)));
+        const exists = devices.find((dev) => (dev._id && entity.device.ieeeAddr === getZbId(dev._id)));
         if (!exists) {
             const coordinatorData = {
-                _id : `${this.adapter.namespace}.${device.device.ieeeAddr.substring(2)}`,
+                _id : `${this.adapter.namespace}.${entity.device.ieeeAddr.substring(2)}`,
                 paired: true,
-                info: this.buildDeviceInfo(device),
-                native: { id: device.device.ieeeAddr.substring(2) },
+                info: this.buildDeviceInfo(entity),
+                native: { id: entity.device.ieeeAddr.substring(2) },
                 mapped : { model: client.modelID || client.type || 'NotSet' },
                 statesDev: [],
             }
-            if (device.name === 'Coordinator') {
+            if (entity.name === 'Coordinator') {
                 coordinatorData.icon = 'zigbee.png';
                 coordinatorData.common = { name: 'Coordinator', type: 'Coordinator'  };
             } else {
-                coordinatorData.common = { name: device.mapped?.model || 'unknown', type: device.type  };
+                coordinatorData.common = { name: entity.mapped?.model || 'unknown', type: entity.type  };
                 coordinatorData.icon= 'img/unknown.png';
             }
             devices.push(coordinatorData);
@@ -576,27 +581,30 @@ class Commands {
         const deviceObjects = (id ? [await this.adapter.getObjectAsync(id)] : await this.adapter.getDevicesAsync());
         const all_states = id ? await this.adapter.getStatesAsync(id + '.*') : await this.adapter.getStatesAsync('*');
         const all_stateDefs = id ? await this.adapter.getStatesOfAsync(id) : await this.adapter.getStatesOfAsync();
+
         const illegalDevices = [];
         const groups = {};
         const PromiseChain = [];
         const models = { byUID : {}, UIDbyModel: {} };
-        for (const devInfo of deviceObjects) {
-            if (devInfo._id.indexOf('group') > -1) {
-                PromiseChain.push(this.handleGroupforInfo(devInfo, groups));
+        for (const deviceObject of deviceObjects) {
+            const id = getZbId(deviceObject._id);
+            const entity = await this.zbController.resolveEntity(id);
+            if (deviceObject._id.indexOf('group') > -1) {
+                PromiseChain.push(this.handleGroupforInfo(deviceObject, groups));
             }
             else {
-                const modelDesc = statesMapping.findModel(devInfo.common.type);
-                devInfo.icon = (modelDesc && modelDesc.icon) ? modelDesc.icon : 'img/unknown.png';
-                devInfo.vendor = modelDesc ? modelDesc.vendor : '';
-                devInfo.legacyIcon = statesMapping.getIconforLegacyModel(devInfo.common.type);
-                const lq_state = all_states[`${devInfo._id}.link_quality`];
-                devInfo.link_quality = lq_state ? lq_state.val : -1;
-                devInfo.link_quality_lc = lq_state ? lq_state.lc : undefined;
-                const battery_state = all_states[`${devInfo._id}.battery`];
-                devInfo.battery = battery_state ? battery_state.val : undefined;
+                const modelDesc = await modelDefinitions.findModel(deviceObject.common.type, entity?.device, deviceObject.common.UUID, entity?.mapped?.legacy);
+                deviceObject.icon = (modelDesc?.icon) ? modelDesc.icon : 'img/unknown.png';
+                if (modelDesc?.vendor) deviceObject.vendor = modelDesc.vendor;
+                deviceObject.legacyIcon = modelDefinitions.getIconforLegacyModel(deviceObject.common.type);
+                const lq_state = all_states[`${deviceObject._id}.link_quality`];
+                deviceObject.link_quality = lq_state ? lq_state.val : -1;
+                deviceObject.link_quality_lc = lq_state ? lq_state.lc : undefined;
+                const battery_state = all_states[`${deviceObject._id}.battery`];
+                deviceObject.battery = battery_state ? battery_state.val : undefined;
 
             }
-            devInfo.rooms = [];
+            deviceObject.rooms = [];
             const rooms = roomsEnum['enum.rooms'] || {};
             for (const room of Object.keys(rooms)) {
                 if (!rooms.hasOwnProperty(room) ||
@@ -606,11 +614,11 @@ class Commands {
                 ) {
                     continue;
                 }
-                if (rooms[room].common.members.includes(devInfo._id)) {
-                    devInfo.rooms.push(rooms[room].common.name);
+                if (rooms[room].common.members.includes(deviceObject._id)) {
+                    deviceObject.rooms.push(rooms[room].common.name);
                 }
             }
-            PromiseChain.push(this.fillInfo(devInfo, all_stateDefs.filter(item => item._id.startsWith(devInfo._id)),all_states, models));
+            PromiseChain.push(this.fillInfo(deviceObject, entity, all_stateDefs.filter(item => item._id.startsWith(deviceObject._id)),all_states, models));
         }
         if (!id) {
             for (const client of this.zbController.getClientIterator(true)) {
@@ -756,6 +764,28 @@ class Commands {
                 return;
             }
             this.info(`${force ? 'Force removing' : 'Gracefully removing '} device ${devId} from the network.`);
+            /*
+
+            // if with force, remove device and object in parallel;
+            const PromiseArr = [ this.zbController.remove(sysid, force) ]
+            if (force) PromiseArr.push( this.stController.deleteObj(devId));
+
+            const results = await Promise.all(PromiseArr);
+            const msgs = [];
+            for (const result of results) {
+                if (!result.status) msgs.push(result.message ? result.message : 'failed without message');
+            }
+            if (msgs.length == 0 && !force) {
+                const result = await this.stController.deleteObj(devId);
+                if (!result.status) msgs.push(result.message ? result.message : 'failed without message');
+            }
+
+            const removeResult = this.zbController.remove(sysid, force);
+            if (removeResult.status || force) {
+                this.info('Device removed from the network, deleting objects.')
+
+            }
+            */
             this.zbController.remove(sysid, force, async (err) => {
                 if (!err) {
                     this.info('Device removed from the network, deleting objects.')
@@ -780,9 +810,10 @@ class Commands {
         }
     }
 
-    async cleanDeviceStates(from, command, msg, callback) {
-        this.info(`State cleanup with ${JSON.stringify(msg)}`);
-        const devicesFromDB = await this.zbController.getClients(false);
+    async cleanDeviceStates(from, command, force, callback) {
+        this.info(`State cleanup ${force ? 'including' : 'omitting'} states with custom configuration`);
+        const devicesFromDB = await this.zbController.getClientIterator(false);
+        const groupsFromDb = await this.zbController.getGroups();
         const messages = [];
         this.stController.CleanupRequired(false);
 
@@ -791,14 +822,26 @@ class Commands {
 
             if (entity) {
                 const model = (entity.mapped) ? entity.mapped.model : entity.device.modelID;
-                this.stController.deleteOrphanedDeviceStates(device.ieeeAddr, model, msg.force, (msg)=> { messages.push(msg)});
+                this.stController.deleteOrphanedDeviceStates(device.ieeeAddr, model, force, (msg)=> { messages.push(msg)});
+            }
+        }
+        try {
+            for (const group of groupsFromDb) {
+                this.stController.deleteOrphanedDeviceStates(group.id, 'group', force, (msg)=> { messages.push(msg)});
             }
         }
-        // rebuild retainDeviceNamesDB
-        //this.stController.rebuildRetainDeviceNames();
+        catch (error) {
+            this.error(`error checking groups for deletable states: ${error?.message}`);
+        }
         this.adapter.sendTo(from, command, {stateList: messages}, callback);
     }
 
+    async rebuildDeviceStates(from, command, force, callback) {
+        this.info(`State cleanup ${force ? 'with' : 'without'} overriding changed roles`);
+        await this.adapter.syncAllDeviceStates(force);
+        this.adapter.sendTo(from, command, {}, callback);
+    }
+
     async getChannels(from, command, message, callback) {
         if (this.zbController && this.zbController.herdsmanStarted) {
             const result = await this.zbController.getChannelsEnergy();
@@ -818,6 +861,7 @@ class Commands {
             const id = msg.id;
             const targetstate = msg.deactivated;
             this.stController.setDeviceActivated(id, targetstate);
+            this.zbController.setDeviceEnable(id, targetstate);
             this.adapter.sendTo(from, command, {}, callback);
         }
     }
@@ -901,7 +945,7 @@ class Commands {
                                 [{'device': entity.device, 'type': 'deviceOptionsChanged', from: entity.options, to:newOptions  || {}, }, entity.mapped]);
                         }
                     }
-                    this.warn(`enumerating data: ${JSON.stringify(prop)}`);
+                    this.debug(`enumerating data: ${JSON.stringify(prop)}`);
                     let val = msg.data[prop];
                     if (typeof val === 'string') {
                         val = val.trim();

package/lib/exclude.js

@@ -1,5 +1,5 @@
 'use strict';
-const devicedefinitions = require('./devices');
+//const modelDefinitions = require('./models');
 const utils = require('./utils');
 
 class Exclude {