iobroker.zigbee 3.1.5 → 3.1.6

package/README.md

@@ -152,6 +152,10 @@ You can thank the authors by these links:
 
 -----------------------------------------------------------------------------------------------------
 ## Changelog
+### 3.1.6 (2025-10-21)
+* (asgothian) Bugfixes
+*
+
 ### 3.1.5 (2025-10-04)
 * (asgothian) Bugfixes
 * (asgothian) ZHC25.36.0

package/admin/admin.js

@@ -9,6 +9,7 @@ const Materialize = (typeof M !== 'undefined') ? M : Materialize,
     namespace = 'zigbee.' + instance,
     namespaceLen = namespace.length;
 let devices = [],
+    models = [],
     debugDevices = [],
     messages = [],
     map = {},
@@ -17,6 +18,7 @@ let devices = [],
     network,
     networkEvents,
     responseCodes = false,
+    localConfigData = {},
     groups = {},
     devGroups = {}, // eslint-disable-line prefer-const
     binding = [],
@@ -180,7 +182,11 @@ function getLQICls(value) {
 
 function sanitizeModelParameter(parameter) {
     const replaceByUnderscore = /[\s/]/g;
-    return parameter.replace(replaceByUnderscore, '_');
+    try {
+        return parameter.replace(replaceByUnderscore, '_');
+    }
+    catch {}
+    return parameter;
 }
 
 /////
@@ -189,88 +195,156 @@ function sanitizeModelParameter(parameter) {
 //
 ////
 
+const LocalDataDisplayValues = {
+    unfoldedModels : {}, // { plug01: {devices: true/false, options: true/false}}
+    unfoldedDevices : {}, // { 0xdeadbeefdeadbeef: true/false}
+    buttonSet: new Set(),
+    showModels: true,
+}
 
-function getModelData(data) {
-    console.warn(JSON.stringify(data));
-    const devicesByModel = {};
-    for (const dev of data) {
-        const modelID = dev.info?.mapped?.model || dev.info.device.modelZigbee || dev.info.device.name || 'unknown';
-        if (devicesByModel[modelID])
-            devicesByModel[modelID].devices.push(dev);
-        else devicesByModel[modelID] = {devices:[dev], icon:dev.common.icon};
-    }
-    console.warn(JSON.stringify(devicesByModel));
+
+function getModelData(data, models) {
     const Html = [];
     // Html.push(`<ul class="collapsible">`);
-    Html.push(`<ul class="collection">`)
-    for (const key of Object.keys(devicesByModel)) {
-        const model = devicesByModel[key];
-        Html.push(`<li class="collection-item avatar>`);
-        //Html.push(`<li>`)
-        //Html.push(`<div class="collapsible-header"><img src=${model.iccon} alt="" class="circle" width="40" height="auto">&nbsp;Paired Models</div>`);
-        //Html.push(`<div class="collapsile-body"<span>${getDeviceData(model.devices)}</span></div>`);
-        Html.push(`<img src = ${model.iccon} alt="" class="circle" width="40" height="auto">`);
-        Html.push(`<span class=title></p>`);
-        Html.push(getDeviceData(model.devices).join('<br>'))
-        Html.push(`</p><a href="#!" class="secondary-content"><i class="material-icons">grade</i></a></li>`)
-    }
-    Html.push('</ul>');
+    const s = new Set();
+    for (const k of Object.keys(models)) {
+        const model = models[k];
+        const key = model.model.model;
+        console.warn(`getmodeldata: model is ${key}, sO: ${JSON.stringify(model.setOptions)}`);
+        const numOptions = Object.keys(model.setOptions).length;
+        const foldData = LocalDataDisplayValues.unfoldedModels[k] || { devices:false, options:false};
+        let numrows = 1;
+        if (foldData.devices) numrows +=  model.devices.length;
+        if (numOptions > 0) numrows += 1;
+        if (foldData.options) numrows += numOptions;
+        //const numrows = (foldData.devices ? model.devices.length : 0) + (foldData.options ? numOptions : 0) + numOptions > 0 ? 2 : 1;
+        console.warn(`numrows is ${numrows} with ${model.devices.length} ${foldData.devices ? 'shown' : 'hidden'} devices and ${numOptions} options ${foldData.options ? 'shown' : 'hidden'}`);
+        const d_btn_name = `d_toggle_${k}`;
+        const e_btn_name = `m_edit_${k}`;
+        const d_btn_tip = `fold / unfold devices of ${key}`;
+        const e_btn_tip = `edit model ${key}`;
+        const d_btn = btnParam(d_btn_name, d_btn_tip, foldData.devices ? 'expand_less' : 'expand_more', false);
+        const e_btn = btnParam(e_btn_name, e_btn_tip, 'edit', 'green', false)
+        LocalDataDisplayValues.buttonSet.add(d_btn_name);
+        LocalDataDisplayValues.buttonSet.add(e_btn_name);
+        Html.push(`<tr id="datarowodd"><td rowspan="${numrows}"><img src = ${model.icon} alt="" width="80" height="auto"></td><td colspan="2">Devices of Model ${key}</td><td>${d_btn}&nbsp;${e_btn}</td></tr>`)
+        let cnt = 0;
+        if (foldData.devices) {
+            for (const dev of model.devices) {
+                let devieee = dev._id.replace(`${namespace}.`, '');
+
+                if (devieee == undefined) devieee = 'unknown' + cnt++;
+                const bn = `d_edit_${devieee}`
+                Html.push(`<tr id="datarowopt"><td>${devieee}</td><td>${dev.common.name}</td><td>${btnParam(bn, 'edit '+ devieee, 'edit', 'lime', true)}</td></tr>`)
+            }
+        }
+        if (numOptions > 0) {
+            const o_btn_name = `o_toggle_${k}`;
+            const o_btn_tip = `fold / unfold options for Model ${key}`;
+            LocalDataDisplayValues.buttonSet.add(o_btn_name);
+            Html.push(`<tr id="dataroweven"></td><td colspan="2">Options for ${key}</td><td>${btnParam(o_btn_name, o_btn_tip, foldData.options ? 'expand_less' : 'expand_more')}</td></tr>`)
+            if (foldData.options) {
+                for (const key of Object.keys(model.setOptions)) {
+                    Html.push(`<tr id="dataroweven"><td>${key}</td><td ${model.setOptions[key] === undefined ? 'id="datared">"not set on model"' : '>'+model.setOptions[key]}</td><td>&nbsp;</td></tr>`)
+                }
+            }
+        }
+
+    }
     return Html;
 }
+
+function btnParam(id, tooltip, icon, color, disabled) {
+    return `<a id="${id}" class="btn-floating waves-effect waves-light right ${color ? color : 'blue'} ${disabled ? 'disabled ' : ''}tooltipped center-align hoverable translateT" title="${tooltip}"><i class="material-icons large">${icon}</i></a>`;
+}
+
+
 function getDeviceData(deviceList, withIcon) {
-    const Html = [`<div class="container">`];
+    const Html = [];
     for (const dev of deviceList) {
-        const iconLink = `<img src=${dev.common.icon} class="circle" width="40" height="auto">`;
-        Html.push(`<div="row"><div class="col s4">${withIcon ? iconLink : ''}<br>${dev.info.device.ieee}<br>connectedInfo</div>`)
-        Html.push(`<div class=col s4>Device Name:${dev.common.name}</div><div class=col s4>Connected: true</div></div>`);
-        if (dev.options) {
-            Html.push(`<div="row"><div class="col s3">Options</div>`)
+        const rowspan = dev.options ? Object.keys(dev.options).length + 2 : 2;
+        const iconLink = `<img src=${dev.common.icon} class="dev_list">`;
+        const devieee = dev._id.replace(`${namespace}.`, '');
+        const o_btn_name = `do_toggle_${devieee}`;
+        const o_btn_tip = `fold / unfold options for ${devieee}`;
+        LocalDataDisplayValues.buttonSet.add(o_btn_name);
+        const bn = `f_edit_${devieee}`
+        LocalDataDisplayValues.buttonSet.add(bn);
+
+        Html.push(`<tr id="datarowodd"><td rowspan="${rowspan}">${iconLink}</td><td colspan="2">${dev.common.name} (${devieee})</td><td>${btnParam(o_btn_name, o_btn_tip, LocalDataDisplayValues.unfoldedDevices ? 'do_not_disturb' : 'add_circle')}</td></tr>`);
+        Html.push(`<tr id="dataroweven"><td colspan="2">Device flags</td><td>${btnParam(bn, 'edit flags','edit')}</td></tr>`);
+        //console.warn(`dev is ${JSON.stringify(dev)}`);
+        if (dev.options && LocalDataDisplayValues.unfoldedDevices[devieee]) {
             for (const o of dev.options) {
-                Html.push(`<div class=col s4>${o.key}</div><div class=col s4>${o.value}</div><div>`);
+                const bn = `o_edit_${devieee}.${o.key}`
+                LocalDataDisplayValues.buttonSet.add(bn);
+                Html.push(`<tr id="datarowopt"><td>${o.key}></td><td>${o.value}</td><td>${btnParam(bn, 'edit flags','edit')}</td></tr>`);
             }
-            Html.push(`</div>`);
         }
-        Html.push(`</div>`)
     }
-    Html.push(`</div>`)
     return Html;
 }
-function getGlobalOptionData() {
-    return ['No Data Yet'];
-}
 
 function showLocalData() {
-    return;
-    /*
-    const Html = [];
+    LocalDataDisplayValues.buttonSet.clear();
+    const ModelHtml = getModelData(devices, models);
+    const DeviceHtml = getDeviceData(devices);
+    const sm = LocalDataDisplayValues.showModels;
+    const dmtoggle = btnParam('t_all_models', sm ? 'fold Models / show Devices' : 'fold Devices / show Models', !sm ? 'developer_board' : 'devices_other')
 
-    Html.push(`<ul class="collapsible">`);
-    Html.push('<li>')
-    Html.push (`<li class="active"><div class="collapsible-header">
-                    Paired Models
-                </div>`);
-    Html.push (`<div class="collapsible-body">
-                    <span>${getModelData(devices).join('')}</span>
-                </div>`);
-    Html.push ('</li><li>')
-    Html.push (`<div class="collapsible-header">
-                    Paired Devices
-                </div>`);
-    Html.push (`<div class="collapsible-body">
-                    <span>${getDeviceData(devices, true).join('')}</span>
-                </div>`);
-    Html.push ('</li><li>')
-    Html.push (`<div class="collapsible-header">
-                   Global Options
-                </div>`);
-    Html.push (`<div class="collapsible-body">
-                    <span>${getGlobalOptionData(devices).join('')}</span>
-                </div>`);
-    Html.push ('</li>')
-    Html.push (`</ul>`);
+    const RowSpan = sm ? ModelHtml.length +2 : DeviceHtml.length + 2;
+    const Html = [];
+    if (sm) {
+        Html.push(`<table style="width:100%"><tr id="datatable"><th rowspan="${RowSpan}">&nbsp;</th><th colspan=3>Model Data</th><th>${dmtoggle}</th><th rowspan="${RowSpan}">&nbsp;</th></tr>`)
+        Html.push(ModelHtml.join(''));
+    }
+    else {
+        Html.push(`<table style="width:100%"><tr id="datatable"><th rowspan="${RowSpan}">&nbsp;</th><th colspan=3>Device Data</th><th>${dmtoggle}</th><th rowspan="${RowSpan}">&nbsp;</th></tr>`)
+        Html.push(DeviceHtml.join(''));
+    }
+    Html.push(`<tr id="datatable"><td colspan="4">Statistics</td></tr>`)
+    Html.push('</table>');
     $('#tab-overrides').html(Html.join(''));
-    $('.collapsible').collapsible();
-    */
+
+    $('#t_all_models').click(function () {
+        LocalDataDisplayValues.showModels = !LocalDataDisplayValues.showModels;
+        showLocalData();
+    });
+
+    console.warn(`lddv is ${JSON.stringify(LocalDataDisplayValues)}`)
+    for (const item of LocalDataDisplayValues.buttonSet) {
+        console.warn(`adding click to ${item}`)
+        if (item.startsWith('d_toggle_')) $(`#${item}`).click(function () {
+            const key = item.substring(9);
+            console.warn(`clicked ${item}`);
+            if (LocalDataDisplayValues.unfoldedModels.hasOwnProperty(key))
+                LocalDataDisplayValues.unfoldedModels[key].devices =! LocalDataDisplayValues.unfoldedModels[key].devices;
+            else
+                LocalDataDisplayValues.unfoldedModels[key] = { devices:true, options: false };
+            showLocalData();
+        });
+        if (item.startsWith('o_toggle_')) $(`#${item}`).click(function () {
+            console.warn(`clicked ${item}`);
+            const key = item.substring(9);
+            if (LocalDataDisplayValues.unfoldedModels.hasOwnProperty(key))
+                LocalDataDisplayValues.unfoldedModels[key].options = !LocalDataDisplayValues.unfoldedModels[key].options;
+            else
+                LocalDataDisplayValues.unfoldedModels[key] = { devices:false, options: true };
+            showLocalData();
+        })
+        if (item.startsWith('do_toggle_')) $(`#${item}`).click(function () {
+            console.warn(`clicked ${item}`);
+            const key = item.substring(10);
+            if (LocalDataDisplayValues.unfoldedDevices.hasOwnProperty(key))
+                LocalDataDisplayValues.unfoldedDevices[key] =! LocalDataDisplayValues.unfoldedDevices[key];
+            else
+                LocalDataDisplayValues.unfoldedDevices[key] = true;
+            showLocalData();
+        })
+
+    }
+
+
 }
 
 /////
@@ -966,6 +1040,7 @@ function showDevices() {
             return room;
         }
     }).filter((item) => item != undefined));
+    console.warn(`rooms is ${JSON.stringify(allRooms)}`);
     const roomSelector = $('#room-filter');
     roomSelector.empty();
     roomSelector.append(`<li class="device-order-item" data-type="All" tabindex="0"><a class="translate" data-lang="All">All</a></li>`);
@@ -988,12 +1063,14 @@ function showDevices() {
 
     const element = $('#devices');
 
-    if (element) {
+    if ($('tab-main')) try {
         shuffleInstance = devices && devices.length ? new Shuffle(element, {
             itemSelector: '.device',
             sizer: '.js-shuffle-sizer',
         }) : undefined;
         doFilter();
+    } catch {
+        // empty.
     }
 
     const getDevName = function (dev_block) {
@@ -1692,55 +1769,31 @@ function getDevices() {
                 coordinatorinfo = msg;
                 updateStartButton()
             }
-            sendToWrapper(namespace, 'getDevices', {}, function (msg) {
-                if (msg) {
-                    devices = msg.devices ? msg.devices : [];
-                    // check if stashed error messages are sent alongside
-                    if (msg.clean)
-                        $('#state_cleanup_btn').removeClass('hide');
-                    else
-                        $('#state_cleanup_btn').addClass('hide');
-                    if (msg.errors && msg.errors.length > 0) {
-                        $('#show_errors_btn').removeClass('hide');
-                        errorData = msg.errors;
-                    }
-                    else {
-                        $('#show_errors_btn').addClass('hide');
-                    }
-                    let newDebugMessages = false;
-
-                    //check if debug messages are sent alongside
-                    if (msg && typeof (msg.debugDevices == 'array')) {
-                        debugDevices = msg.debugDevices;
-                    }
-                    else
-                        debugDevices = [];
-                    if (debugMessages.byId) {
-                        newDebugMessages = true;
-                        debugMessages.byId = msg;
-                        if (msg) displayDebugMessages(debugMessages)
-                    }
-                    lockout.isActive = false;
-                    if (msg.error) {
-                        errorData.push(msg.error);
-                        isHerdsmanRunning = false;
-                    } else {
-                        isHerdsmanRunning = true;
-                        if (!newDebugMessages) {
-                            getDebugMessages();
-                        }
-                        //getExclude();
-                        getBinding();
-                    }
-                    updateStartButton();
-                    showDevices();
-                    showLocalData();
-                    UpdateAdapterAlive(true)
+        });
+        sendToWrapper(namespace, 'getLocalConfigItems', {getAllData:true}, function(msg) {
+            if (msg.hasOwnProperty('by_id') && msg.hasOwnProperty('by_model'))
+                localConfigData = msg;
+        })
+        sendToWrapper(namespace, 'getDevices', {}, function (msg) {
+            if (msg) {
+                extractDevicesData(msg);
+                if (msg.error) {
+                    errorData.push(msg.error);
+                    isHerdsmanRunning = false;
+                } else {
+                    isHerdsmanRunning = true;
+                    getBinding();
                 }
-            });
+                updateStartButton();
+                showDevices();
+                showLocalData();
+                UpdateAdapterAlive(true)
+            }
         });
     }
 
+
+
     if (lockout.timeoutid) {
         clearTimeout(lockout.timeoutid);
     }
@@ -1753,6 +1806,37 @@ function getDevices() {
 
 }
 
+function extractDevicesData(msg) {
+    devices = msg.devices ? msg.devices : [];
+    // check if stashed error messages are sent alongside
+    if (msg.clean)
+        $('#state_cleanup_btn').removeClass('hide');
+    else
+        $('#state_cleanup_btn').addClass('hide');
+    if (msg.errors && msg.errors.length > 0) {
+        $('#show_errors_btn').removeClass('hide');
+        errorData = msg.errors;
+    }
+    else {
+        $('#show_errors_btn').addClass('hide');
+    }
+    //check if debug messages are sent alongside
+    if (msg && typeof (msg.debugDevices == 'array')) {
+        debugDevices = msg.debugDevices;
+    }
+    else
+        debugDevices = [];
+    if (debugMessages.byId) {
+        debugMessages.byId = msg;
+        if (msg) displayDebugMessages(debugMessages);
+    }
+    if (msg.models) models = msg.models;
+    lockout.isActive = false;
+
+}
+
+
+
 function getNamedColors() {
     sendToWrapper(namespace, 'getNamedColors', {}, function(msg) {
         if (msg && typeof msg.colors) {
@@ -3951,20 +4035,22 @@ function sortByTitle(element) {
 
 
 function updateDevice(id) {
-    sendToWrapper(namespace, 'getDevice', {id: id}, function (msg) {
-        if (msg) {
-            const devs = msg.devices;
-            if (devs) {
-                if (devs.error) {
-                    showMessage(devs.error, _('Error'));
-                } else {
-                    removeDevice(id);
-                    devs.forEach(dev => devices.push(dev));
-                    showDevices();
+    if (devices.length > 0)
+        sendToWrapper(namespace, 'getDevice', {id: id}, function (msg) {
+            if (msg) {
+                const devs = msg.devices;
+                if (devs) {
+                    if (devs.error) {
+                        showMessage(devs.error, _('Error'));
+                    } else {
+                        removeDevice(id);
+                        devs.forEach(dev => devices.push(dev));
+                        showDevices();
+                    }
                 }
             }
-        }
-    });
+        });
+    else sendToWrapper(namespace, 'getDevices', {}, extractDevicesData)
 }
 
 function removeDevice(id) {

package/admin/index_m.html

@@ -326,6 +326,19 @@
         #map {
             margin: 0px;
         }
+        .dev_list {
+            display: block;
+            margin-left: auto;
+            margin-right: auto;
+            width: 80px;
+        }
+
+        #dataroweven { background-color: #909090; color: #c0c0c0 !important; }
+        #datarowodd  { background-color: #c0c0c0; color: #202020 !important; }
+        #datarowopt  { background-color: #707070; color: #c0c0c0 !important; }
+        #datatable   { background-color: #3090c0; color: #202020 !important; }
+        #datared     { color: #C00000 !important;}
+        #datalime     { background-color: #cddc31; color: #c00000 !important;}
 
         #tab-main .main-toolbar-table .filter-input {
             display: inline-table;
@@ -633,6 +646,7 @@
 
             }
 
+
             .move-label-up {
                 position: absolute !important;
                 top: -60px !important;

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "3.1.5",
+    "version": "3.1.6",
     "news": {
+      "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"
+      },
       "3.1.5": {
         "en": "Bugfixes\nZHC25.36.0\nreduced stopTimeout to 5s",
         "de": "Bugfixes\nZHC25.36.0\nreduzierter StopTimeout auf 5s",
@@ -80,19 +93,6 @@
         "pl": "poprawianie obrazów",
         "uk": "фіксувати зображення",
         "zh-cn": "修正图像"
-      },
-      "3.0.1": {
-        "en": "Fix for Ikea SOMRIG configuration raising 'definition.endpoint is not a function' error.\nAccess to 'zigbee2mqtt options as settings in zigbee adapter (ALPHA Stage !)\nFix for 'error: zigbee.0 (1118300) zigbee.0 already running' at adapter start (Alpha Stage)\nUpdated hardware configuration panel - exchanged text buttons for buttons with icons.\nLimited states on device tiles to states which are read only or which can be modified sensibly via the device tile.\n",
-        "de": "Fix für Ikea SOMRIG Konfiguration erhöhen 'Definition. Endpoint ist kein Funktionsfehler.\nZugriff auf 'zigbee2mqtt Optionen als Einstellungen im Zickbee Adapter (ALPHA Stage!)\nFix für 'error: zigbee.0 (1118300) zigbee.0 bereits läuft' bei Adapterstart (Alpha Stage)\nAktualisiertes Hardware-Konfigurationsfeld - ausgetauschte Texttasten für Tasten mit Symbolen.\nBegrenzte Zustände auf Gerätefliesen zu Zuständen, die nur gelesen werden oder über die Gerätefliese sensibel modifiziert werden können.\n",
-        "ru": "Исправьте конфигурацию IKEA SOMRIG, повысив «определение». Конечная точка не является ошибкой функции.\nДоступ к опциям Zigbee2mqtt в качестве настроек в адаптере Zigbee (стадия ALPHA!)\nИсправьте ошибку: zigbee.0 (1118300) zigbee.0 уже работает на старте адаптера\nОбновленная аппаратная панель конфигурации - обмен текстовыми кнопками на кнопки с иконками.\nОграниченные состояния на плитках устройства к состояниям, которые читаются только или которые могут быть изменены чувственно через плитку устройства.\n",
-        "pt": "Corrigir para configuração Ikea SOMRIG elevando 'definição. endpoint não é um erro de função.\nAcesso às opções \"zigbee2mqttt como configurações no adaptador zigbee (Estação LAPHA!)\nFix for 'error: zigbee.0 (1118300) zigbee.0 já em execução' no início do adaptador (Alpha Stage)\nPainel de configuração de hardware atualizado - botões de texto trocados para botões com ícones.\nEstados limitados em telhas de dispositivo para estados que são lidos apenas ou que podem ser modificados sensivelmente através da telha do dispositivo.\n",
-        "nl": "Fix voor Ikea SOMRIG configuratie verhogen 'definitie. eindpunt is geen functiefout.\nToegang tot 'zigbee2mqtt opties als instellingen in zigbee adapter (ALPHA Stage !)\nFix voor 'fout: zigbee.0 (1118300) zigbee.0 al actief' bij adapterstart (Alpha Stage)\nBijgewerkt hardware configuratiepaneel - uitgewisselde tekstknoppen voor knoppen met pictogrammen.\nBeperkte toestanden op apparaattegels naar toestanden die alleen worden gelezen of die verstandig kunnen worden gewijzigd via de apparaattegel.\n",
-        "fr": "Correction pour la configuration Ikea SOMRIG augmentant la définition. le paramètre n'est pas une erreur de fonction.\nAccès aux options 'zigbee2mqtt comme réglages dans l'adaptateur zigbee (ALPHA Stage !)\nCorrection pour 'erreur: zigbee.0 (1118300) zigbee.0 déjà en cours d'exécution' au démarrage de l'adaptateur (Alpha Stage)\nPanneau de configuration du matériel mis à jour - boutons texte échangés pour les boutons avec des icônes.\nLes états limités sur les tuiles de l'appareil aux états qui sont lus seulement ou qui peuvent être modifiés de façon sensible via la tuile de l'appareil.\n",
-        "it": "Fissare per Ikea SOMRIG configurazione aumentando 'definizione. endpoint non è un errore di funzione.\nAccesso alle opzioni 'zigbee2mqtt come impostazioni nell'adattatore zigbee (ALPHA Stage !)\nCorrezione per 'error: zigbee.0 (1118300) zigbee.0 già in esecuzione' all'inizio dell'adattatore (Alpha Stage)\nPannello di configurazione hardware aggiornato - pulsanti di testo scambiati per pulsanti con icone.\nStati limitati su piastrelle di dispositivo a stati che sono letti solo o che possono essere modificati sensibilmente tramite la piastrella del dispositivo.\n",
-        "es": "Arregla para la configuración de Ikea SOMRIG criando 'definición. endpoint no es un error de función.\nAcceso a las opciones 'zigbee2mqtt como configuración en el adaptador de zigbee (ALPHA Stage !)\nFijación para 'error: zigbee.0 (1118300) zigbee.0 ya funcionando en el inicio del adaptador (Alpha Stage)\nPanel de configuración de hardware actualizado - botones de texto intercambiados para botones con iconos.\nEstados limitados en fichas de dispositivo a estados que se leen solamente o que pueden ser modificados de forma sensata a través de la ficha del dispositivo.\n",
-        "pl": "Napraw dla definicji podnoszenie konfiguracji Ikea SOMRIG. Punkt końcowy nie jest błędem funkcji.\nDostęp do opcji 'zigbee2mqtt jako ustawień w adapterze zigbee (ALPHA Stage!)\nFix for 'error: zigbee.0 (1118300) zigbee.0 already running' at adapter start (Alpha Stage)\nAktualizacja panelu konfiguracji sprzętowej - wymieniono przyciski tekstowe na przyciski z ikonami.\nOgraniczone stany na płytkach urządzenia do stanów, które są tylko odczytywane lub które mogą być modyfikowane w sposób rozsądny za pomocą płytki urządzenia.\n",
-        "uk": "Виправлення для налаштування Ikea SOMRIG 'Визначення. кінцева точка не є помилкою функції.\nДоступ до опцій Zigbee2mqtt як налаштування адаптера Zigbee (ALPHA Stage !)\nВиправлення для 'error: zigbee.0 (1118300) zigbee.0 вже запущений' при запуску адаптера (Alpha Stage)\nОновлена панель конфігурації обладнання - обмінні текстові кнопки для гудзиків з іконками.\nОбмежені стани на плитці пристрою для станів, які читаються тільки або які можуть бути змінені, швидко через плитку пристрою.\n",
-        "zh-cn": "修复Ikea SOMRIG 配置提升定义 。 结束点不是一个函数'错误.\n访问 'zigbee2mqtt 选项作为 Zigbee 适配器的设置( ALPHA stage !) \n在适配器启动( Alpha Stage)时为 'error: zigbee. 0 (1118300) zigbee. 0 已经运行' 进行修复\n更新的硬件配置面板 - 用图标交换文本按钮作为按钮.\n将设备瓦片的状态限制在只读或通过设备瓦片可敏感修改的状态.\n"
       }
     },
     "titleLang": {

package/lib/commands.js

@@ -339,10 +339,6 @@ class Commands {
         }
     }
 
-
-    async handleDeviceforInfo(device, states) {
-    }
-
     async handleGroupforInfo(group, groups) {
         group.icon = 'img/group.png';
         group.vendor = 'ioBroker';
@@ -379,7 +375,7 @@ class Commands {
         }
     }
 
-    async fillInfo(device, device_stateDefs, all_states) {
+    async fillInfo(device, device_stateDefs, all_states, models) {
         device.statesDef = (device_stateDefs || []).filter(stateDef => {
             const sid = stateDef._id.replace(this.adapter.namespace + '.', '');
             const names = sid.split('.');
@@ -403,7 +399,23 @@ class Commands {
         });
 
         const id = getZbId(device._id);
-        device.info = this.buildDeviceInfo(await this.zbController.resolveEntity(id));
+        const entity = await this.zbController.resolveEntity(id)
+
+        device.info = this.buildDeviceInfo(entity);
+
+        const UID = models.UIDbyModel[device.info?.mapped?.model || 'unknown'] || `m_${Object.keys(models.UIDbyModel).length}`;
+        if (models.byUID.hasOwnProperty(UID)) {
+            models.byUID[UID].devices.push(device);
+        }
+        else {
+            models.byUID[UID] = {
+                model:device.info.mapped,
+                availableOptions : [...device.info?.mapped?.options || [], ...['use_legacy_model']],
+                setOptions: this.adapter.stController.localConfig.getByModel(device.info?.mapped?.model || 'unknown') || [],
+                devices: [device],
+            }
+            models.UIDbyModel[device.info?.mapped?.model || 'unknown'] = UID;
+        }
         // check configuration
         try {
             if (device.info) {
@@ -412,13 +424,11 @@ class Commands {
                     [device.info.device, device.info.mapped],
                 );
                 if (result.length > 0) device.isConfigured = !result[0];
-            }
+                device.paired = true;
+            } else device.paired = false;
         } catch (error) {
             this.warn('error calling shouldConfigure: ' + error && error.message ? error.message : 'no error message');
         }
-        device.paired = !!device.info;
-
-
     }
 
     buildDeviceInfo(device) {
@@ -427,11 +437,11 @@ class Commands {
             rv.device = {
                 modelZigbee:device.device.modelID,
                 type:device.device.type,
-                ieee:device.device.ieeeAddr,
-                nwk:device.device.networkAddress,
+                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 ? device.mapped.vendor : '',
+                manufacturer:device.mapped?.vendor,
                 power:device.device.powerSource,
                 app_version:device.device.applicationVersion,
                 hard_version:device.device.hardwareVersion,
@@ -462,10 +472,10 @@ class Commands {
                     options:[],
                 }
                 if (device.mapped.options && typeof (device.mapped.options == 'object')) {
-                    const optionDesc = [];
                     for (const option of device.mapped.options) {
-                        if (option.name)
+                        if (option.name) {
                             rv.mapped.options.push(option.name);
+                        }
                     }
                 }
             }
@@ -501,7 +511,7 @@ class Commands {
                 paired: true,
                 info: this.buildDeviceInfo(device),
                 native: { id: device.device.ieeeAddr.substring(2) },
-                mapped : {},
+                mapped : { model:'Coordinator' },
                 statesDev: [],
             }
             if (device.device.name === 'Coordinator') {
@@ -513,7 +523,6 @@ class Commands {
             }
             devices.push(coordinatorData);
         }
-
     }
 
     async getDevices(from, command, id, callback) {
@@ -522,13 +531,14 @@ class Commands {
             this.adapter.sendTo(from, command, {error: 'No active connection to Zigbee Hardware!'}, callback);
             return;
         }
-        const rooms = await this.adapter.getEnumsAsync('enum.rooms') || {};
+        const roomsEnum = await this.adapter.getEnumsAsync('enum.rooms') || {};
         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));
@@ -544,22 +554,23 @@ class Commands {
                 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;
-                devInfo.rooms = [];
-                for (const room in rooms) {
-                    if (!rooms.hasOwnProperty(room) ||
-                        !rooms[room] ||
-                        !rooms[room].common ||
-                        !rooms[room].common.members
-                    ) {
-                        continue;
-                    }
-                    if (rooms[room].common.members.includes(devInfo._id)) {
-                        devInfo.rooms.push(rooms[room].common.name);
-                    }
-                }
 
             }
-            PromiseChain.push(this.fillInfo(devInfo, all_stateDefs.filter(item => item._id.startsWith(devInfo._id)),all_states));
+            devInfo.rooms = [];
+            const rooms = roomsEnum['enum.rooms'] || {};
+            for (const room of Object.keys(rooms)) {
+                if (!rooms.hasOwnProperty(room) ||
+                    !rooms[room] ||
+                    !rooms[room].common ||
+                    !rooms[room].common.members
+                ) {
+                    continue;
+                }
+                if (rooms[room].common.members.includes(devInfo._id)) {
+                    devInfo.rooms.push(rooms[room].common.name);
+                }
+            }
+            PromiseChain.push(this.fillInfo(devInfo, all_stateDefs.filter(item => item._id.startsWith(devInfo._id)),all_states, models));
         }
         if (!id) {
             for (const client of this.zbController.getClientIterator(true)) {
@@ -580,7 +591,12 @@ class Commands {
 
         this.debug(`getDevices contains ${deviceObjects.length} Devices`);
         const rv = { devices:deviceObjects, inLog:this.adapter.deviceDebug.logStatus, }
-        if (!id) rv.byId = this.adapter.deviceDebug.collectDebugData();
+        if (!id) {
+            rv.deviceDebugData = this.adapter.deviceDebug.collectDebugData();
+            rv.localOverrides = this.adapter.stController.localConfig.localData;
+            rv.models = models.byUID;
+        }
+
         if (this.stController) {
             rv.clean = this.stController.CleanupRequired();
             rv.errors = this.stController.getStashedErrors();
@@ -875,6 +891,9 @@ class Commands {
                 //const targetModel = msg.model ? msg.model : '';
             }
             else {
+                if (msg.getAllData) {
+                    this.adapter.sendTo(from, command, this.stController.localConfig.localData, callback);
+                }
                 rv.error = `missing data in message ${JSON.stringify(msg)}`;
             }
         }

package/lib/exposes.js

@@ -801,7 +801,7 @@ function createFromExposes(model, def, device, log) {
 
             case 'climate':
                 for (const prop of expose.features) {
-                    switch (prop.name) {
+                    /* switch (prop.name) {
                         case 'away_mode':
                             pushToStates(statesDefs.climate_away_mode, prop.access);
                             break;
@@ -814,7 +814,8 @@ function createFromExposes(model, def, device, log) {
                         default:
                             pushToStates(genState(prop), prop.access);
                             break;
-                    }
+                    }*/
+                    pushToStates(genState(prop), prop.access);
                 }
                 break;
 

package/lib/localConfig.js

@@ -329,6 +329,14 @@ class localConfig extends EventEmitter {
         return rv;
     }
 
+    getByModel(id) {
+        return this.localData.by_model[id] || {};
+    }
+
+    getByDevice(id) {
+        return this.localData.by_id[id] || {};
+    }
+
 }
 
 module.exports = localConfig;

package/lib/zigbeecontroller.js

@@ -618,6 +618,7 @@ class ZigbeeController extends EventEmitter {
                     device: coordinator,
                     endpoint: coordinator.getEndpoint(1),
                     name: 'Coordinator',
+                    mapped: { model: 'Coordinator'},
                     options:{}
                 };
             }
@@ -657,6 +658,7 @@ class ZigbeeController extends EventEmitter {
                         return {
                             type: 'device',
                             device: device,
+                            mapped: { model: 'Coordinator'},
                             endpoint: device.getEndpoint(1),
                             name: 'Coordinator',
                         };
@@ -736,6 +738,7 @@ class ZigbeeController extends EventEmitter {
                 await this.herdsman.stop();
                 this.herdsmanStarted = false;
                 this.info('zigbecontroller stopped successfully');
+                return;
             }
             else this.info('zigbecontroller stopped successfully - ZH was not running');
         } catch (error) {
@@ -759,6 +762,7 @@ class ZigbeeController extends EventEmitter {
 
     // Permit join
     async permitJoin(permitTime, devid) {
+        if (!this.herdsmanStarted) return false;
         try {
             this._permitJoinTime = permitTime;
             await this.herdsman.permitJoin(permitTime);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -29,7 +29,7 @@
     "uri-js": "^4.4.1",
     "typescript": "^5.9.2",
     "zigbee-herdsman": "^6.0.0",
-    "zigbee-herdsman-converters": "25.31.0"
+    "zigbee-herdsman-converters": "^25.37.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {