iobroker.zigbee 3.2.1 → 3.2.3

package/README.md

@@ -154,6 +154,22 @@ You can thank the authors by these links:
 
 -----------------------------------------------------------------------------------------------------
 ## Changelog
+### 3.2.3 (2025-10-31)
+* (asgothian) Improvements on debug UI
+* (asgothian) Option 'resend_states' to publish state values to device on reconnect
+* (asgothian) Improved group card
+* (asgothian) Improved group info
+* (asgothian) Modified coordinator card (2 sides)
+* (asgothian) retry on error 25
+* (asgothian) clear stashed error messages
+* (asgothian) ZHC 25.50.0 or newer
+
+### 3.2.2 (2025-10-27)
+* (asgothian) Bugfix on delete object.
+* (asgothian) improved device query.
+* (asgothain) fixed delete device with local overrides.
+*
+
 ### 3.2.1 (2025-10-26)
 * (asgothian) fix bug #2640
 *

package/admin/admin.js

@@ -36,7 +36,7 @@ let devices = [],
     },
     cidList,
     shuffleInstance,
-    errorData = [],
+    errorData = { errors:{}, unknownModels: {}},
     debugMessages = {},
     debugInLog = true,
     nvRamBackup = {},
@@ -64,7 +64,7 @@ const networkOptions = {
 const savedSettings = [
     'port', 'panID', 'channel', 'disableLed', 'countDown', 'groups', 'extPanID', 'precfgkey', 'transmitPower','useNewCompositeStates',
     'adapterType', 'debugHerdsman', 'disableBackup', 'external', 'startWithInconsistent','pingTimeout','listDevicesAtStart',
-    'warnOnDeviceAnnouncement', 'baudRate', 'flowCTRL', 'autostart', 'readAtAnnounce', 'startReadDelay', 'readAllAtStart','pingCluster'
+    'warnOnDeviceAnnouncement', 'baudRate', 'flowCTRL', 'autostart', 'readAtAnnounce', 'startReadDelay', 'readAllAtStart','pingCluster','availableUpdateTime'
 ];
 const lockout = {
     timeoutid:undefined,
@@ -466,7 +466,8 @@ function showLocalData() {
                 const keys = item.replace('d_delall_', '').split('-');
                 const model = models[keys[0]];
                 const device = model.devices.find( (d) => d.native.id === keys[1]);
-                deleteConfirmation(keys[1], device.common.name, keys[1], models[keys[0]].devices.count <=1 ? models[keys[0]]?.model.model : undefined);
+                console.warn(`setting delete confirmation with ${keys[1]} ${models[keys[0]].devices?.length} ${models[keys[0]]?.model.model} `);
+                deleteConfirmation(keys[1], device.common.name, keys[1], models[keys[0]]?.devices?.length <=1 ? models[keys[0]]?.model?.model : undefined);
             });
         }
     }
@@ -497,6 +498,7 @@ function getCard(dev) {
             rooms.push(dev.rooms[r]);
         }
     }
+
     const NoInterviewIcon = dev.info?.device?.interviewstate != 'SUCCESSFUL' ? `<div class="col tool"><i class="material-icons icon-red">perm_device_information</i></div>` : ``;
     const paired = (dev.paired) ? '' : '<i class="material-icons right">leak_remove</i>';
     const rid = id.split('.').join('_');
@@ -586,32 +588,59 @@ function getCoordinatorCard(dev) {
         lq = (dev && dev.link_quality) ? `<div class="col tool"><i id="${rid}_link_quality_icon" class="material-icons ${lqi_cls}">network_check</i><div id="${rid}_link_quality" class="center" style="font-size:0.7em">${dev.link_quality}</div></div>` : '',
         info = `<div style="min-height:88px; font-size: 0.8em" class="truncate">
                     <ul>
-                        <li><span class="label">type:</span><span>${coordinatorinfo.type}</span></li>
-                        <li><span class="label">version:</span><span>${coordinatorinfo.version}</span></li>
-                        <li><span class="label">revision:</span><span>${coordinatorinfo.revision}</span></li>
-                        <li><span class="label">port:</span><span>${coordinatorinfo.port}</span></li>
-                        <li><span class="label">channel:</span><span>${coordinatorinfo.channel}</span></li>
-                        <li><span class="label">------------</span><span>Software versions </span></li>
-                        <li><span class="label">adapter:</span><span>${coordinatorinfo.installedVersion}</span></li>
-                        <li><span class="label">installed from:</span><span>${coordinatorinfo.installSource}</span></li>
-                        <li><span class="label">ZHC / ZH:</span><span>${coordinatorinfo.converters} / ${coordinatorinfo.herdsman}</span></li>
+                        <li><span class="label coordinator">type:</span><span>${coordinatorinfo.type}</span></li>
+                        <li><span class="label coordinator">version:</span><span>${coordinatorinfo.version}</span></li>
+                        <li><span class="label coordinator">revision:</span><span>${coordinatorinfo.revision}</span></li>
+                        <li><span class="label coordinator">port:</span><span>${coordinatorinfo.port}</span></li>
+                        <li><span class="label coordinator">channel:</span><span>${coordinatorinfo.channel}</span></li>
                     </ul>
                 </div>`,
         permitJoinBtn = '<div class="col tool"><button name="joinCard" class="waves-effect btn-small btn-flat right hoverable green tooltipped" title="open network"><i class="material-icons icon-green">leak_add</i></button></div>',
         //permitJoinBtn = `<div class="col tool"><button name="join" class="btn-floating-sml waves-effect waves-light right hoverable green><i class="material-icons">leak_add</i></button></div>`,
         card = `<div id="${id}" class="device">
-                  <div class="card hoverable">
-                    <div class="card-content zcard">
-                        <span class="top right small" style="border-radius: 50%">
-                            ${lq}
-                            ${status}
-                            ${permitJoinBtn}
-                        </span>
-                        <!--/a--!>
-                        <span id="dName" class="card-title truncate">${title}</span><!--${paired}--!>
-                        <i class="left">${image}</i>
-                        ${info}
-                        <div class="footer right-align"></div>
+                  <div class="card hoverable flipable">
+                    <div class="front face">
+                        <div class="card-content zcard">
+                          <div class="flip" style="cursor: pointer">
+                            <span class="top right small" style="border-radius: 50%">
+                                ${lq}
+                                ${status}
+                                ${permitJoinBtn}
+                            </span>
+                            <!--/a--!>
+                            <span id="dName" class="card-title truncate">${title}</span><!--${paired}--!>
+                          </div>
+                          <i class="left">${image}</i>
+                          ${info}
+                          <div class="footer right-align">
+                            <div class="flip" style="cursor: pointer"><i class="material-icons">rotate_left</i></div>
+                          </div>
+                        </div>
+                    </div>
+                    <div class="back face">
+                        <div class="card-content zcard">
+                          <div class="flip" style="cursor: pointer">
+                            <span class="top right small" style="border-radius: 50%">
+                                ${lq}
+                                ${status}
+                                ${permitJoinBtn}
+                            </span>
+                            <!--/a--!>
+                            <span id="dName" class="card-title truncate">${title}</span><!--${paired}--!>
+                          </div>
+                          <i class="left">${image}</i>
+                          <div style="min-height:88px; font-size: 0.8em" class="truncate">
+                            <ul>
+                                <li><span class="label coordinator">Adapter:</span><span>${coordinatorinfo.installedVersion}</span></li>
+                                <li><span class="label coordinator">Installed:</span><span>${coordinatorinfo.installSource}</span></li>
+                                <li><span class="label coordinator">Herdsman:</span><span>${coordinatorinfo.herdsman}</span></li>
+                                <li><span class="label coordinator">Converters:</span><span>${coordinatorinfo.converters}</span></li>
+                            </ul>
+                          </div>
+                          <div class="footer right-align">
+                            <div class="flip" style="cursor: pointer"><i class="material-icons">rotate_left</i></div>
+                          </div>
+                        </div>
                     </div>
                   </div>
                 </div>`;
@@ -636,19 +665,18 @@ function getGroupCard(dev) {
     const roomInfo = rooms.length ? `<li><span class="labelinfo">rooms:</span><span>${rooms.join(',') || ''}</span></li>` : '';
     const room = rooms.join(',') || '&nbsp';
     let memberCount = 0;
-    let info = `<div style="min-height:88px; font-size: 0.8em; overflow-y: auto" class="truncate">
-                <ul>`;
-    info = info.concat(`<li><span class="labelinfo">Group ${numid}</span></li>`);
+    const info = [`<div style="min-height:88px; font-size: 0.8em; height: 90px; width: 220px; overflow-y: auto" class="truncate"><ul>`];
+    info.push(`<li><span class="labelinfo">Group ${numid}</span></li>`);
     if (dev.memberinfo === undefined) {
-        info = info.concat(`<li><span class="labelinfo">No devices in group</span></li>`);
+        info.push(`<li><span class="labelinfo">No devices in group</span></li>`);
     } else {
         for (let m = 0; m < dev.memberinfo.length; m++) {
-            info = info.concat(`<li><span align:"left">${dev.memberinfo[m].device}.${dev.memberinfo[m].epid}</span><span align:"right"> ...${dev.memberinfo[m].ieee.slice(-4)}</span></li>`);
+            info.push(`<li><span align:"left">${dev.memberinfo[m].device}.${dev.memberinfo[m].epid}</span><span align:"right"> ...${dev.memberinfo[m].ieee.slice(-4)}</span></li>`);
         }
         memberCount = (dev.memberinfo.length < 8 ? dev.memberinfo.length : 7);
     }
     ;
-    info = info.concat(`              ${roomInfo}</ul>
+    info.push(`              ${roomInfo}</ul>
                 </div>`);
     const infoBtn = `<button name="info" class="left btn-flat btn-small"><i class="material-icons icon-blue">info</i></button>`;
     const image = `<img src="${dev.common.icon}" width="64px" onerror="this.onerror=null;this.src='img/unavailable.png';">`;
@@ -666,7 +694,7 @@ function getGroupCard(dev) {
                             <span id="dName" class="card-title truncate">${title}</span><!----!>
                             </div>
                             <i class="left">${image}</i>
-                            ${info}
+                            ${info.join('')}
 
                             <div class="footer right-align"></div>
                         </div>
@@ -1389,7 +1417,7 @@ function getCoordinatorInfo() {
     sendToWrapper(namespace, 'getCoordinatorInfo', {}, function (msg) {
         if (msg) {
             if (msg.error) {
-                errorData.push(msg.error);
+                //errorData.push(msg.error);
                 delete msg.error;
                 isHerdsmanRunning = false;
             } else {
@@ -1568,13 +1596,7 @@ async function editDeviceOptions(id, isModel) {
             }
             else
             {
-                const val = $(`#option_value_${k}`).val();
-                try {
-                    _do[k].value = JSON.parse(val);
-                }
-                catch {
-                    _do[k].value = val;
-                }
+                _do[k].value = $(`#option_value_${k}`).val();
             }
             if (_do[k].key.length > 0) {
                 console.warn(`dok: ${_do[k].key} : ${_do[k].value}`);
@@ -1617,11 +1639,14 @@ async function editDeviceOptions(id, isModel) {
 
     const dialogData = {};
 
+    const adapterDefinedOptions = ['resend_states']
+
     if (isModel) {
         const model = id.model;
         dialogData.model = model;
         dialogData.availableOptions = model.options.slice() || [];
         dialogData.availableOptions.push('custom');
+        dialogData.availableOptions.push(...adapterDefinedOptions)
         if (model.hasLegacyDef) dialogData.availableOptions.push('legacy');
         dialogData.setOptions = {};
         for (const k in Object.keys(id.setOptions))
@@ -1636,6 +1661,7 @@ async function editDeviceOptions(id, isModel) {
         const dev = devices.find((d) => d._id == id);
         dialogData.model = dev.info.mapped;
         dialogData.availableOptions = (dev.info.mapped ? dev.info.mapped.options.slice() || []:[]);
+        dialogData.availableOptions.push(...adapterDefinedOptions)
         dialogData.name = dev.common.name;
         dialogData.icon = dev.common.icon || dev.icon;
         dialogData.default_icon = (dev.common.type === 'group' ? dev.common.modelIcon : `img/${dev.common.type.replace(/\//g, '-')}.png`);
@@ -1731,6 +1757,7 @@ function HtmlFromInDebugMessages(messages, devID, filter) {
     const filterSet = new Set();
     let isodd = true;
     const buttonList = [];
+    const idRed = ' id="dbgred"'
     if (dbgMsghide.has('i_'+devID)) {
         console.warn('in all filtered out')
         Html.push('&nbsp;')
@@ -1742,7 +1769,7 @@ function HtmlFromInDebugMessages(messages, devID, filter) {
             let fs = '';
             for (const state of item.states) {
                 fs = fs+state.id+'.'+fne(item);
-                const redText = (item.errors && item.errors.length > 0 ? ' id="dbgred"' : '');
+                const redText = (item.errors && item.errors.length > 0 ? idRed : '');
                 idx--;
                 const LHtml = [(`<tr id="${isodd ? 'dbgrowodd' : 'dbgroweven'}">`)];
                 if (idx==0) {
@@ -1750,7 +1777,7 @@ function HtmlFromInDebugMessages(messages, devID, filter) {
                     buttonList.push(item.dataID)
                     LHtml.push(`<td${rowspan}>${msgbutton}</td><td${rowspan}>${safestring(item.payload)}</td>`);
                 }
-                LHtml.push(`<td></td><td${redText}>${safestring(state.payload)}</td><td${redText}>${state.id}</td><td${redText}>${state.value}</td><td${redText}>${fne(item)}</td></tr>`);
+                LHtml.push(`<td></td><td${redText}>${safestring(state.payload)}</td><td${state.inError ? idRed: redText}>${state.id}</td><td${state.inError ? idRed : redText}>${state.value}</td><td${redText}>${fne(item)}</td></tr>`);
                 IHtml.unshift(...LHtml)
             }
             if (filter)
@@ -1835,7 +1862,7 @@ function displayDebugMessages(msg) {
                 const modelUrl = (type_url === 'unknown') ? 'unknown' : `<a href="https://www.zigbee2mqtt.io/devices/${type_url}.html" target="_blank" rel="noopener noreferrer">${image}</a>`;
                 const devName = (dev && dev.common && dev.common.name) ? dev.common.name : 'unnamed';
                 const button = `<a id="e_${devID}" class="btn-floating waves-effect waves-light green tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons large">sync_problem</i></a>`
-                const dbutton = `<a id="d_${devID}" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT" title="Update debug messages"><i class="material-icons icon-yellow large">delete_forever</i></a>`;
+                const dbutton = `<a id="d_${devID}" class="btn-floating waves-effect waves-light red tooltipped center-align hoverable translateT" title="Delete debug messages"><i class="material-icons icon-yellow large">delete_forever</i></a>`;
                 buttonNames.push(devID);
                 Html.push(`<li><table><thead id="dbgtable"><tr><td colspan="4">${devName} (ID: ${devID} Model: ${dev && dev.common ? dev.common.name : 'unknown'})</td><td>${modelUrl}</td><td>${button}</td><td>${dbutton}</td></tr></thead><tbody>`);
                 if (dbgData[devID].IN.length > 0) {
@@ -1988,7 +2015,7 @@ function getDevices() {
         sendToWrapper(namespace, 'getCoordinatorInfo', {}, function (msg) {
             if (msg) {
                 if (msg.error) {
-                    errorData.push(msg.error);
+                    //errorData.push(msg.error);
                     delete msg.error;
                     isHerdsmanRunning = false;
                 } else {
@@ -2006,7 +2033,7 @@ function getDevices() {
             if (msg) {
                 extractDevicesData(msg);
                 if (msg.error) {
-                    errorData.push(msg.error);
+                    //errorData.push(msg.error);
                     isHerdsmanRunning = false;
                 } else {
                     isHerdsmanRunning = true;
@@ -2043,7 +2070,7 @@ function extractDevicesData(msg) {
         $('#state_cleanup_btn').removeClass('hide');
     else
         $('#state_cleanup_btn').addClass('hide');
-    if (msg.errors && msg.errors.length > 0) {
+    if (msg.errors?.hasData) {
         $('#show_errors_btn').removeClass('hide');
         errorData = msg.errors;
     }
@@ -2084,14 +2111,14 @@ function getMap(rebuild) {
             $('#refresh').removeClass('disabled');
             if (msg) {
                 if (msg.error) {
-                    errorData.push(msg.error);
+                    //errorData.push(msg.error);
                     isHerdsmanRunning = false;
                     updateStartButton();
                 } else {
                     isHerdsmanRunning = true;
                     updateStartButton();
                     if (msg.errors.length > 0 && $('#errorCollectionOn').is(':checked')) {
-                        showMessage(msg.errors.join('<p>'), 'Map generation messages');
+                        showMessage(msg.errors.join('<br>'), 'Map generation messages');
                     }
                     map = msg;
                     showNetworkMap(devices, map);
@@ -2229,7 +2256,34 @@ function load(settings, onChange) {
         cleanConfirmation();
     });
     $('#show_errors_btn').click(function () {
-        showMessage(errorData.join('<br>'), 'Stashed error messages');
+        const errMsgTable = [];
+        console.warn(JSON.stringify(errorData));
+        if (Object.keys(errorData.errors).length > 0) {
+            errMsgTable.push(`<table><tr><th>Message</th><th>#</th><th>last seen</th></tr>`)
+            for (const err of Object.values(errorData.errors))
+                if (err) errMsgTable.push(`<tr><td>${err.message}</td><td>${err.ts.length}</td><td>${new Date(err.ts[err.ts.length-1]).toLocaleTimeString()}</td></tr>`)
+            errMsgTable.push('</table>');
+        }
+        if (Object.keys(errorData.unknownModels).length > 0) {
+            errMsgTable.push(`<table><tr><th>Unknown Models</th><th>#</th><th>last seen</th></tr>`)
+            for (const err of Object.values(errorData.unknownModels))
+                errMsgTable.push(`<tr><td>${err.message}</td><td>${err.ts.length}</td><td>${new Date(err.ts[err.ts.length-1]).toLocaleTimeString()}</td></tr>`)
+            errMsgTable.push('</table>');
+        }
+        console.warn(JSON.stringify(errMsgTable));
+        showMessage(errMsgTable.join(''), 'Stashed error messages', '<a id="delete_errors_btn" class="btn-floating waves-effect waves-light tooltipped center-align hoverable translateT" title="delete Errors"></i class="material-icons icon-black">delete_sweep</i></a>');
+        $('#delete_errors_btn').unbind('click')
+        $('#delete_errors_btn').click(function () {
+            sendToWrapper(namespace, 'clearErrors', {}, function(msg) {
+                if (msg) {
+                    console.warn('msg is ' + JSON.stringify(msg));
+                    errorData = msg;
+                    $('#show_errors_btn').addClass('hide');
+                }
+                $('#dialog-message').modal('close');
+
+            })
+        })
     });
     $('#download_icons_btn').click(function () {
         showMessage(downloadIcons());
@@ -2617,6 +2671,26 @@ socket.on('stateChange', function (id, state) {
                     getDevices();
                 }
             }
+        } else if (id.match(/\.info\.lasterror$/)) {
+            try {
+                console.warn(`lasterror is ${JSON.stringify(state)}`)
+                const errobj = JSON.parse(state.val);
+                let changed = false;
+                if (errobj.error) {
+                    errorData.errors[errobj.error] = errobj.data;
+                    changed = true;
+                }
+                if (errobj.model) {
+                    errorData.unknownModels[errobj.model] = errobj.data;
+                    changed = true;
+                }
+                errorData.hasData |= changed;
+                if (changed) {
+                    $('#show_errors_btn').removeClass('hide');
+                }
+            }
+            catch { console.error('JSON didnt parse') }
+
         } else {
             const devId = getDevId(id);
             putEventToNode(devId);
@@ -4020,7 +4094,7 @@ function genDevInfo(device) {
             `<div style="font-size: 0.9em">
                 <ul>`);
         for (const item in mapped) {
-            if (item == 'model')
+            if (item == 'model' && mapped.model != 'group')
                 mappedInfo.push(genRow(item,modelUrl));
             else
                 if (typeof mapped[item] != 'object') mappedInfo.push(genRow(item,mapped[item]));
@@ -4042,7 +4116,7 @@ function genDevInfo(device) {
                 </ul>
             </div>`;
     }
-    const imgSrc = device.icon || device.common.icon;
+    const imgSrc = mapped?.model == 'group' ? mapped.icon : device.icon || device.common.icon;
     const imgInfo = (imgSrc) ? `<img src=${imgSrc} width='150px' onerror="this.onerror=null;this.src='img/unavailable.png';"><div class="divider"></div>` : '';
     const info =[
         `<div class="col ${device.memberinfo != undefined ? 's12 m12 l12 xl12':'s12 m6 l6 xl6'}">

package/admin/index_m.html

@@ -858,6 +858,10 @@
                     <input id="useNewCompositeStates" type="checkbox" class="value"/>
                     <label class="translate" for="useNewCompositeStates">use channel for complex exposes</label>
                 </div>
+                <div class="input-field col s12 m6 l4">
+                    <input id="availableUpdateTime" type="number" min="0" max="120" class="value"/>
+                    <label class="translate" for="availableUpdateTime">Min. Available update timeout.</label>
+                </div>
                 <div class="input-field col s12 m12 l12 col-startWithInconsistent">
                     <input id="startWithInconsistent" type="checkbox" class="value"/>
                     <label class="translate" for="startWithInconsistent">SettingsExclude</label>

package/admin/tab_m.html

@@ -286,9 +286,14 @@
         width: 100px;
         font-weight: bold;
     }
+    .m span.label.coordinator {
+        display: inline-block;
+        width: 75px;
+        font-weight: bold;
+    }
     .m span.label.dash {
         display: inline-block;
-        width: 140px;
+        width: 135px;
         font-weight: bold;
     }
     .m span.labelinfo {

package/io-package.json

@@ -1,8 +1,34 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "3.2.1",
+    "version": "3.2.3",
     "news": {
+      "3.2.3": {
+        "en": "Improvements on debug UI\nOption 'resend_states' to publish state values to device on reconnect\nImproved group card\nImproved group info\nModified coordinator card (2 sides)\nretry on error 25\nclear stashed error messages\nZHC 25.50.0 or newer",
+        "de": "Verbesserungen bei debug UI\nOption 'resend_states' zum Veröffentlichen von Zustandswerten auf das Gerät auf dem Reconnect\nVerbesserte Gruppenkarte\nVerbesserte Gruppeninformationen\nModifizierte Koordinatorkarte (2 Seiten)\nretry auf fehler 25\nklare stashed fehlermeldungen\nZHC 25.50.0 oder neuer",
+        "ru": "Улучшения в Debug UI\nВариант «resend_states» для публикации значений состояния на устройстве при повторном подключении\nУлучшенная групповая карта\nУлучшенная групповая информация\nИзмененная карта координатора (2 стороны)\nвозвращение к ошибке 25\nскрытые сообщения об ошибках\nZHC 25.50.0 или новее",
+        "pt": "Melhorias na interface de depuração\nOpção 'resend_states' para publicar valores de estado para o dispositivo ao religar\nCartão de grupo melhorado\nInformação melhorada do grupo\nCartão coordenador modificado (2 lados)\ntentar novamente no erro 25\nlimpar mensagens de erro escondidas\nZHC 25.50.0 ou mais recente",
+        "nl": "Verbeteringen op debug UI\nOptie 'resend_states' om statuswaarden naar apparaat te publiceren bij opnieuw verbinden\nVerbeterde groepskaart\nVerbeterde groepsinfo\nGewijzigde coördinatiekaart (2 zijden)\nopnieuw proberen bij fout 25\nfoutmeldingen wissen\nZHC 25.50.0 of nieuwer",
+        "fr": "Amélioration de l'assurance-chômage de débogage\nOption 'resend_states' pour publier les valeurs d'état sur le périphérique sur la connexion\nCarte de groupe améliorée\nInformations de groupe améliorées\nCarte de coordonnateur modifiée (2 côtés)\nréessayer sur l'erreur 25\nmessages d'erreur clairs et cachés\nZHC 25.50.0 ou plus récent",
+        "it": "Miglioramenti sul debug UI\nOpzione 'resend_states' per pubblicare i valori di stato sul dispositivo sulla riconnessione\nScheda di gruppo migliorata\nInformazioni di gruppo migliorate\nCarta coordinatrice modificata (2 lati)\nriprovare sull'errore 25\nchiari messaggi di errore stanti\nZHC 25.50.0 o più recente",
+        "es": "Mejoras en el depuro UI\nOpción 'resend_states' para publicar valores estatales al dispositivo en la reconexión\nTarjeta de grupo mejorada\nInformación de grupo mejorada\nTarjeta de coordinación modificada (2 lados)\nretry on error 25\nmensajes de error claros\nZHC 25.50.0 o más",
+        "pl": "Ulepszenia dotyczące debugowania interfejsu użytkownika\nOpcja \"resend _ states\" do publikowania wartości stanu dla urządzenia przy ponownym połączeniu\nUlepszona karta grupowa\nUlepszone informacje grupowe\nZmodyfikowana karta koordynatora (2 strony)\nponowna próba błędu 25\njasne komunikaty błędów ukryte\nZHC 25.50.0 lub nowsze",
+        "uk": "Удосконалення на дебурзі UI\nВаріант 'resend_states' для публікації державних значень для пристрою на відключенні\nПокращена групова карта\nПокращена інформація групи\nЗмінена карта координатора (2 сторони)\nптиця по помилки 25\nчіткі повідомлення про помилку\nZHC 25.50.0 або новачок",
+        "zh-cn": "调试 UI 的改进\n选项“ resend_ states ” 以在重新连接时发布状态值以设备\n改进组卡\n改进组信息\n修改的协调员卡(2面)\n重试错误 25\n清除隐藏的错误消息\nZHC 25.50.0或更新"
+      },
+      "3.2.2": {
+        "en": "Bugfix on delete object.\nimproved device query.\nfixed delete device with local overrides.\n",
+        "de": "Bugfix auf Löschobjekt.\nverbesserte geräteabfrage.\nfeste löschvorrichtung mit lokalen overrides.\n",
+        "ru": "Bugfix для удаления объекта.\nулучшенный запрос устройства.\nфиксированное устройство удаления с локальными переопределениями.\n",
+        "pt": "Correcção de erros ao apagar o objecto.\npesquisa de dispositivos melhorada.\ndispositivo de exclusão fixo com substituições locais.\n",
+        "nl": "Bugfix bij verwijderen van object.\nverbeterde apparaatquery.\nvast delete apparaat met lokale overrides.\n",
+        "fr": "Correction sur objet de suppression.\nrequête de périphérique améliorée.\ndispositif de suppression fixe avec redéfinitions locales.\n",
+        "it": "Bugfix su delete object.\nmigliore query del dispositivo.\ndispositivo di cancellazione fisso con override locali.\n",
+        "es": "Bugfix en el objeto borrado.\nmejorada consulta de dispositivos.\ndispositivo de eliminación fijo con anulas locales.\n",
+        "pl": "Bugfix na usunąć obiekt.\nulepszone zapytanie urządzenia.\nnaprawione urządzenie usuwające z lokalnymi przekroczeniami.\n",
+        "uk": "Виправлення помилок при видаленні об'єкта.\nпокращений пристрій запиту.\nфіксований пристрій видалення з локальними перенаряддями.\n",
+        "zh-cn": "删除对象上的错误修正 .\n改进设备查询 .\n有本地覆盖的固定删除设备 .\n"
+      },
       "3.2.1": {
         "en": "fix bug #2640\n",
         "de": "fehler beheben #2640\n",
@@ -67,32 +93,6 @@
         "pl": "Usuń dodatkowe logowanie\nDodaj dodatkowe konfiguracje\nNie czytaj stanów z wyłączonych urządzeń\nIgnoruj dezaktywowane urządzenia dla aktualizacji stanu grupy\nZmień wyświetlacz dla dezaktywowanych urządzeń w drzewie obiektu (szary, bez połączonej ikony)\nbardziej szczegółowe debugowanie urządzenia\ndebug urządzenia UI ulepszenia\nParowanie i urządzenie Przyciski zapytania na kartach routera\nZHC 25.31.0, ZH 6.1.2 lub nowsze\nOpcje oparte na opcjach zdefiniowanych przez ZHC",
         "uk": "Видалення додаткового входу\nДодати додаткові конфігурації\nНе читати стани від деактивованих пристроїв\nІгноровані пристрої для оновлення групового стану\nЗміна відображення для деактивованих пристроїв в дереві об'єкта (сірий, не підключений значок)\nдокладніше пристрій debug\nпристрій Debug UI удосконалення\nПірсинг і пристрій Query гудзики на маршрутизаторних картках\nZHC 25.31.0, ZH 6.1.2 або новачок\nВаріанти, засновані на визначених параметрах ZHC",
         "zh-cn": "删除额外的日志\n添加额外的配置\n不读取已关闭设备的状态\n忽略组状态更新的已关闭设备\n更改对象树上已关闭设备的显示( gray, 无连接图标)\n更详细的设备调试\n设备调试 UI 改进\n路由器卡上的对齐和设备查询按钮\nZHC 25.31.0,ZH 6.1.2或更新\n基于 ZHC 定义选项的选项"
-      },
-      "3.1.2": {
-        "en": "ZHC 25.x\nZH 6.x\nFix pairing bug\nadd ping messages to device debug to verify ping failure reasons\n",
-        "de": "ZHC 25.x\nZH 6.x\nBehebung des Kopplungsfehlers\nFügen Sie Ping-Nachrichten zum Geräte-Debugging hinzu, um die Gründe für Ping-Ausfälle zu überprüfen.\n",
-        "ru": "ZHC 25.x\nZH 6.x\nИсправлена ошибка сопряжения.\nдобавьте сообщения ping в отладке устройства для проверки причин отказа ping\n",
-        "pt": "ZHC 25.x\nZH 6.x\nCorrigir bug de emparelhamento\nAdicionar mensagens de ping ao debug do dispositivo para verificar os motivos da falha no ping\n",
-        "nl": "ZHC 25.x\nZH 6.x\nRepareer koppelingsfout\nVoeg pingberichten toe aan apparaatdebug om pingfoutredenen te controleren\n",
-        "fr": "ZHC 25.x\nZH 6.x\nCorriger le bogue de couplage\najouter des messages de ping au débogage des appareils pour vérifier les raisons des échecs de ping\n",
-        "it": "ZHC 25.x\nZH 6.x\nRisoluzione bug di accoppiamento\nAggiungi messaggi ping al debug del dispositivo per verificare le cause del fallimento del ping\n",
-        "es": "ZHC 25.x\nZH 6.x\nCorregir error de emparejamiento\nañadir mensajes de ping al depurador del dispositivo para verificar las razones de fallo del ping\n",
-        "pl": "ZHC 25.x\nZH 6.x\nNapraw błąd parowania\nDodaj wiadomości ping do debugowania urządzenia, aby zweryfikować przyczyny niepowodzenia pingu\n",
-        "uk": "ЗХК 25.x\nЗХ 6.х\nВиправлено помилку з'єднання\nдодано повідомлення ping до відлагодження пристрою для перевірки причин невдачі ping\n",
-        "zh-cn": "ZHC 25.x\nZH 6.x (英语)\n修复配对问题\n将ping消息添加到设备调试中，以验证ping失败的原因\n"
-      },
-      "3.0.5": {
-        "en": "fix random error where devices are not shown due to illegal groups\ndrop support for node 18\nRequired node Versions Node 20.19.0 or 22.11.0 or newer (courtesy of ZH 4.4.1 / ZHC 24.8.0)",
-        "de": "fehler beheben, bei denen geräte wegen illegaler gruppen nicht angezeigt werden\ndrop-unterstützung für knoten 183\nErforderliche Knotenversionen Nr. 20.19.0 oder 22.11.0 oder neuer (courtesy of ZH 4.4.1 / ZHC 24.8.0)",
-        "ru": "исправить случайную ошибку, когда устройства не отображаются из-за незаконных групп\nподдержка drop для node 18\nТребуемый узел Версии Узел 20.19.0 или 22.11.0 или новее (документ ZH 4.4.1 / ZHC 24.8.0)",
-        "pt": "corrigir erro aleatório onde os dispositivos não são mostrados devido a grupos ilegais\nsuporte de gota para o nó 18\nNó necessário Versões Node 20.19.0 ou 22.11.0 ou mais recente (cortesia de ZH 4.4.1 / ZHC 24.8.0)",
-        "nl": "fix willekeurige fout wanneer apparaten niet worden getoond als gevolg van illegale groepen\ndrop ondersteuning voor knooppunt 18\nVereiste node Versies Node 20.19.0 of 22.11.0 of nieuwer (met dank aan ZH 4.4.1 / ZHC 24.8.0)",
-        "fr": "corriger une erreur aléatoire lorsque les appareils ne sont pas montrés en raison de groupes illégaux\nsupport de chute pour noeud 18\nVersion requise Node 20.19.0 ou 22.11.0 ou plus récent (avec la permission de ZH 4.4.1 / ZHC 248.0)",
-        "it": "correggere errore casuale in cui i dispositivi non vengono visualizzati a causa di gruppi illegali\nsupporto a goccia per nodo 18\nNodo richiesto Versioni Nodo 20.19.0 o 22.11.0 o più recente (cortesia di ZH 4.4.1 / ZHC 24.8.0)",
-        "es": "corregir errores aleatorios donde no se muestran dispositivos debido a grupos ilegales\napoyo a los nodos 18\nNodo requerido Versiones Nodo 20.19.0 o 22.11.0 o nuevo (cortesía de ZH 4.4.1 / ZHC 24.8.0)",
-        "pl": "naprawić błąd losowy w przypadku gdy urządzenia nie są wyświetlane z powodu nielegalnych grup\nobsługa zrzutu dla węzła 18\nWymagany węzeł Wersje Węzeł 20.19.0 lub 22.11.0 lub nowszy (uprzejmość ZH 4.4.1 / ZHC 24.8.0)",
-        "uk": "виправити випадкові помилки, де пристрої не відображаються через незаконні групи\nпідтримка крапель для вузла 18 років\nПотрібні версії вузла Node 20.19.0 або 22.11.0 або новачка (кількість ЗЗ 4.4.1 / ЗЖК 24.8.0)",
-        "zh-cn": "在设备因非法组而未显示时修复随机错误\n放弃节点支持 第 18 条\n要求的节点版本为20.19.0或22.11.0或更新(礼仪为ZH 4.4.1 / ZHC 24.8.0)"
       }
     },
     "titleLang": {
@@ -327,7 +327,8 @@
     "pingTimeout": 300,
     "pingCluster": "",
     "listDevicesAtStart": true,
-    "useNewCompositeStates": false
+    "useNewCompositeStates": false,
+    "availableUpdateTime": 30
   },
   "instanceObjects": [
     {

package/lib/DeviceDebug.js

@@ -72,7 +72,7 @@ class DeviceDebug extends EventEmitter {
                     this.dataByDevice[item.deviceID] = DevData;
                 }
                 if (message.hasOwnProperty('message') && this.logStatus) {
-                    this.warn(`ELEVATED:${flag} (${dataId.toString(16).slice(-4)}) ${message.message}`)
+                    this.warn(`ELEVATED:${flag} (${dataId?.toString(16).slice(-4)}) ${message.message}`)
                 }
             }
         }

package/lib/commands.js

@@ -177,6 +177,9 @@ class Commands {
                     case 'aliveCheck':
                         this.adapter.sendTo(obj.from, obj.command, {msg:'success'}, obj.callback);
                         break;
+                    case 'clearErrors':
+                        this.adapter.sendTo(obj.from, obj.command, this.stController.clearStashedErrors(), obj.callback);
+                        break;
                     default:
                         this.debug(`Commands: Command ${obj.command} is unknown`);
                         //this.adapter.sendTo(obj.from, obj.command, obj.message, obj.callback);
@@ -445,6 +448,14 @@ class Commands {
             return undefined;
 
         }
+
+        function haveBindableClusters(clusters) {
+            const nonBindableClusters = [25,33, 4096]
+            if (Array.isArray(clusters)) {
+                return (clusters.filter((candidate) => !nonBindableClusters.includes(candidate)).length > 0);
+            }
+            return false;
+        }
         const rv = {};
         try {
             rv.device = {
@@ -463,19 +474,28 @@ class Commands {
                 date_code:device.device.dateCode,
                 build:device.device.softwareBuildID,
                 interviewstate:device.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];
+                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,
                     profile:ep.profileID,
                     input_clusters:ep.inputClusters,
                     output_clusters:ep.outputClusters,
+                    BindSource: Boolean(bindable),
                 })
-                if (ep.inputClusters.includes(4)) rv.device.isGroupable = true;
+                disGroupable |= ep.inputClusters.includes(4);
             }
+            rv.device.isGroupable = Boolean(disGroupable);
+            rv.device.BindSource = Boolean(dBindSource);
             if (device.mapped) {
                 rv.mapped = {
                     model:device.mapped.model,
@@ -745,7 +765,7 @@ class Commands {
                         else this.adapter.sendTo(from, command, {error:err}, callback);
                     }
                     this.adapter.sendTo(from, command, {}, callback);
-                    this.adapter.stController.localConfig.removeLocalData()
+                    if (msg.dev) this.adapter.stController.localConfig.removeLocalData(devId, msg.model);
                 } else {
                     this.adapter.sendTo(from, command, {error: err}, callback);
                 }

package/lib/localConfig.js

@@ -142,6 +142,12 @@ class localConfig extends EventEmitter {
         return defaultName;
     }
 
+    removeLocalData(dev, model) {
+        delete this.localData.by_id[dev];
+        if (model) delete this.localData.by_model[model];
+        this.retainData();
+    }
+
     IconForId(id, model, defaultIcon) {
         let modeloverride = {};
         this.debug('Icon for id with ' + id + ', ' + model + ' and ' + defaultIcon);
@@ -303,7 +309,6 @@ class localConfig extends EventEmitter {
     }
 
     writeData() {
-        this.info('retaining local config: ' + JSON.stringify(this.localData));
         try {
             fs.writeFileSync(this.filename, JSON.stringify(this.localData, null, 2))
             this.info('Saved local configuration data');

package/lib/statescontroller.js

@@ -3,7 +3,7 @@
 const safeJsonStringify = require('./json');
 const { EventEmitter } = require('events');
 const statesMapping = require('./devices');
-const { getAdId, getZbId } = require('./utils');
+const { getAdId, getZbId, zbIdorIeeetoAdId } = require('./utils');
 const fs = require('fs');
 const localConfig = require('./localConfig');
 const path = require('path');
@@ -24,11 +24,10 @@ class StatesController extends EventEmitter {
         this.cleanupRequired = false;
         this.timeoutHandleUpload = null;
         this.ImagesToDownload = [];
-        this.stashedErrors = {};
-        this.stashedUnknownModels = {};
         this.debugMessages = { nodevice:{ in:[], out: []} };
         this.debugActive = true;
         this.deviceQueryBlock = [];
+        this.clearStashedErrors();
     }
 
     info(message, data) {
@@ -52,22 +51,16 @@ class StatesController extends EventEmitter {
     }
 
     getStashedErrors() {
-        const rv = [];
-        try {
-            if (Object.keys(this.stashedErrors).length > 0)
-            {
-                rv.push('<p><b>Stashed Messages</b></p>')
-                rv.push(Object.values(this.stashedErrors).join('<br>'));
-            }
-            if (Object.keys(this.stashedUnknownModels).length > 0) {
-                rv.push('<p><b>Devices whithout Model definition</b></p>')
-                rv.push(Object.values(this.stashedUnknownModels).join('<br>'));
-            }
-        }
-        catch (error) {
-            if (this.debugActive) this.debug(`Error collecting stashed errors: ${error && error.message ? error.message : 'no message available'}`);
-        }
-        return rv;
+        return this.stashedErrors;
+    }
+
+    clearStashedErrors() {
+        this.stashedErrors = {
+            errors:{},
+            unknownModels: {},
+            hasData:false
+        };
+        return this.stashedErrors;
     }
 
     debugMessagesById() {
@@ -382,18 +375,30 @@ class StatesController extends EventEmitter {
     }
 
     stashErrors(key, msg, error) {
-        if (!this.stashedErrors.hasOwnProperty(key))
-        {
-            if (error) this.error(msg); else this.warn(msg);
-            this.stashedErrors[key] = msg;
+        try {
+            if (!this.stashedErrors.errors.hasOwnProperty(key))
+            {
+                if (error) this.error(msg); else this.warn(msg);
+                this.stashedErrors.errors[key] = { message:msg, ts:[Date.now()], error:error };
+            }
+            else this.stashedErrors.errors[key].ts.push(Date.now());
+            this.stashedErrors.hasData = true;
+            this.adapter.setState('info.lasterror', JSON.stringify({ error: key, data:this.stashedErrors.errors[key]}))
         }
+        catch { /* */ }
     }
 
     stashUnknownModel(model, msg) {
-        if (!this.stashedUnknownModels.hasOwnProperty(model)) {
-            this.stashedUnknownModels[model] = msg;
-            this.error(`Unknown ${model}: ${msg}`)
+        try {
+            if (!this.stashedErrors.unknownModels.hasOwnProperty(model)) {
+                this.stashedErrors.unknownModels[model] = { message:msg, ts:[Date.now()], error:true };
+                this.error(`Unknown ${model}: ${msg}`)
+            }
+            else this.stashedErrors.unknownModels[model].ts.push(Date.now());
+            this.stashedErrors.hasData = true;
+            this.adapter.setState('info.lasterror', JSON.stringify({ model: model, data:this.stashedErrors.unknownModels[model]}))
         }
+        catch { /* */ }
     }
 
     async triggerComposite(_deviceId, stateDesc, interactive) {
@@ -430,6 +435,50 @@ class StatesController extends EventEmitter {
         lfArr.push(state);
     }
 
+    parseOption(val) {
+        if (val === undefined || val === null) return {};
+        if (!Array.isArray(val)) {
+            try {
+                const valObj = JSON.parse(val);
+                return valObj;
+            }
+            catch { /* */ }
+            if (typeof val =='object') return val;
+        }
+        if (typeof val === 'string')
+        {
+            const keys = val.split(/[,;]/);
+            const rv = {};
+            for (const k of keys) {
+                rv[k] = null;
+            }
+            return rv;
+        }
+        this.warn(`illegal option ${JSON.stringify(val)}`)
+        return {};
+    }
+
+    async handleStateReset(entity, end_with_device_query) {
+        const debugID = Date.now();
+        const deviceId = entity.device.ieeeAddr;
+        const model = entity.mapped?.model || '';
+        const states = this.parseOption(entity.options.resend_states);
+        if (end_with_device_query) states.end_with_device_query = true;
+        await this.publishFromStates(deviceId, model, states, entity.options, debugID);
+    }
+
+    async publishFromStates(deviceId, model, stateIDs, options, debugID) {
+        const adId = zbIdorIeeetoAdId(this.adapter, deviceId, true);
+        for (const stateID of Object.keys(stateIDs).sort((a,b) => {if (a=='device_query' || a=='state') return (b=='device_query' ? -1 : 1); else return a.localeCompare(b)})) {
+            const state = await this.adapter.getStateAsync(`${adId}.${stateID}`);
+            if (stateIDs[stateID]!= null) state.val = stateIDs[stateID];
+            if (state && state.hasOwnProperty('val')) {
+                await this.publishFromState(deviceId, model, stateID, state, options, debugID)
+            }
+        }
+
+    }
+
     async publishFromState(deviceId, model, stateKey, state, options, debugID) {
         if (this.debugActive) this.debug(`Change state '${stateKey}' at device ${deviceId} type '${model}'`);
         const has_elevated_debug = this.checkDebugDevice(typeof deviceId == 'number' ? `group_${deviceId}` : deviceId);
@@ -460,7 +509,7 @@ class StatesController extends EventEmitter {
         if (value === undefined || value === '') {
             if (has_elevated_debug) {
                 const message = (`no value for device ${deviceId} type '${model}'`);
-                this.emit('device_debug', { ID:debugID, data: { states:[{id:state.ID, value:'--', payload:'error', ep:stateDesc.epname}],error: 'NOVAL' , IO:false }, message:message});
+                this.emit('device_debug', { ID:debugID, data: { states:[{id:state.ID, value:'--', payload:'error', ep:stateDesc.epname}],error: 'NOVAL1' , IO:false }, message:message});
             }
             return;
         }
@@ -1128,17 +1177,18 @@ class StatesController extends EventEmitter {
                         } else {
                             value = payload[statedesc.prop || statedesc.id];
                         }
+
                         // checking value
                         if (value === undefined || value === null) {
                             continue;
                         }
 
                         let stateID = statedesc.id;
-
                         const message = `value generated '${JSON.stringify(value)}' from device ${devId} for '${statedesc.name}'`;
                         if (has_elevated_debug) this.emit('device_debug', { ID:debugId, data: { states:[{id:stateID, value:value, payload:payload }],flag:'04', IO:true }, message});
                         else if (this.debugActive) this.debug(message);
 
+
                         const common = {
                             name: statedesc.name,
                             type: statedesc.type,
@@ -1187,7 +1237,7 @@ class StatesController extends EventEmitter {
                 }
                 const message = `No value published for device ${devId}`;
                 if (!has_published) {
-                    if (has_elevated_debug) this.emit('device_debug', { ID:debugId, data:{ error:'NOVAL', IO:true }, message:message});
+                    if (has_elevated_debug) this.emit('device_debug', { ID:debugId, data:{ states:[{id:'no state', value:'no value', inError:true, payload:payload }], flag:'04', IO:true }, message:message});
                     else if (this.debugActive) this.debug(message);
                 }
             }
@@ -1226,11 +1276,11 @@ class StatesController extends EventEmitter {
     async processConverters(converters, devId, model, mappedModel, message, meta, debugId, has_elevated_debug) {
         let cnt = 0;
         const publish = (payload, dID) => {
-            if (typeof payload === 'object' && Object.keys(payload).length > 0) {
+            if (typeof payload === 'object') {// && Object.keys(payload).length > 0) {
                 this.publishToState(devId, model, payload,dID);
             }
             else if (has_elevated_debug)
-                this.emit('device_debug', {ID:debugId,data: { error:`NOVAL`, IO:true }, message:` payload ${JSON.stringify(payload)} is empty`})
+                this.emit('device_debug', {ID:debugId,data: { error:`EPAYLD`, IO:true }, message:` payload ${JSON.stringify(payload)} is empty`})
         };
         const options = await new Promise((resolve, reject) => {
             this.collectOptions(devId, model, false, (options) => {

package/lib/zbDeviceAvailability.js

@@ -56,6 +56,7 @@ class DeviceAvailability extends BaseExtension {
         this.startReadDelay = config.readAllAtStart ? Math.max(500, Math.min(10000, config.startReadDelay * 1000)) : 0;
         this.debugDevices = [];
         this.pingCluster = pingClusters[config.pingCluster] ? pingClusters[config.pingCluster] : {};
+        this.availableTime = config.availableUpdateTime ? config.availableUpdateTime : Number.MAX_SAFE_INTEGER;
     }
 
     checkDebugDevice(dev) {
@@ -191,7 +192,7 @@ class DeviceAvailability extends BaseExtension {
             return;
         }
         if (this.isPingable(device)) {
-            const pt = Date.now();
+            const debugID = Date.now();
             let pingCount = this.ping_counters[device.ieeeAddr];
             if (pingCount === undefined) {
                 this.ping_counters[device.ieeeAddr] = {failed: 0, reported: 0};
@@ -199,43 +200,60 @@ class DeviceAvailability extends BaseExtension {
             }
             try {
                 if (!this.pingCluster || !this.pingCluster.hasOwnProperty('id')) {
-                    this.debug(`Pinging '${ieeeAddr}' (${device.modelID}) via ZH Ping`)
+                    const message = `Pinging '${ieeeAddr}' (${device.modelID}) via ZH Ping`
+                    if (has_elevated_debug) {
+                        this.zigbee.emit('device_debug', { ID:debugID, data: { ID: device.ieeeAddr, flag:'PI', IO:false, states:[{ id:'ping', value: 'zh_default', payload: { method:'default'}}]}, message:message});
+                    }
+                    else this.debug(message)
                     await device.ping();
                 }
                 else {
                     const zclData = {};
                     zclData[this.pingCluster.attribute] = {};
-                    this.debug(`Pinging '${ieeeAddr}' (${device.modelID}) via ZCL Read with ${this.pingCluster.id}:${this.pingCluster.attribute}`)
+                    const message = `Pinging '${ieeeAddr}' (${device.modelID}) via ZCL Read with ${this.pingCluster.id}:${this.pingCluster.attribute}`
+                    if (has_elevated_debug) {
+                        this.zigbee.emit('device_debug', { ID:debugID, data: { ID: device.ieeeAddr, flag:'PI', states:[{id:'ping', value:'cluster/id', payload: { method: 'custom', cluster:this.pingCluster.id, command:'read', zcl:zclData}}], IO:false}, message:message});
+                    }
+                    else this.debug(message)
                     await this.zigbee.publish(device, this.pingCluster.id, 'read', zclData, null, undefined, 'foundation');
                 }
-                this.publishAvailability(device, true);
-                if (has_elevated_debug) this.warn(`ELEVATED : Successfully pinged ${ieeeAddr} (${device.modelID}) in ${Date.now()-pt} ms`);
+                this.publishAvailability(device, true, false, has_elevated_debug ? debugID : undefined);
+                if (has_elevated_debug) {
+                    const message = `Successfully pinged ${ieeeAddr} (${device.modelID}) in ${Date.now()-debugID} ms`
+                    this.zigbee.emit('device_debug', { ID:debugID, data: {ID: device.ieeeAddr, flag:'SUCCESS', IO:false}, message:message});
+                }
                 this.setTimerPingable(device, 1);
                 this.ping_counters[device.ieeeAddr].failed = 0;
             } catch (error) {
                 if (error && error.message && error.message.includes('UNSUPPORTED_ATTRIBUTE')) {
                     // this error is acceptable, as it is raised off an answer of the device.
                     this.publishAvailability(device, true);
-                    if (has_elevated_debug) this.warn(`ELEVATED : Successfully pinged ${ieeeAddr} (${device.modelID}) in ${Date.now()-pt} ms`);
+                    if (has_elevated_debug)
+                        this.zigbee.emit('device_debug', {  ID:debugID, data: {ID: device.ieeeAddr, flag:'SUCCESS', IO:false}, message:`Successfully pinged ${ieeeAddr} (${device.modelID}) in ${Date.now()-debugID} ms`});
                     this.setTimerPingable(device, 1);
                     this.ping_counters[device.ieeeAddr].failed = 0;
                     return;
                 }
-                if (has_elevated_debug) this.warn(`ELEVATED : Failed to ping ${ieeeAddr} (${device.modelID}) after ${Date.now()-pt} ms${error && error.message ? ' - '+error.message : ''}`);
-                this.publishAvailability(device, false);
+                if (has_elevated_debug)
+                    this.zigbee.emit('device_debug',{ ID:debugID, data: {ID: device.ieeeAddr, error:'PIFAIL', IO:false}, message:`Failed to ping ${ieeeAddr} (${device.modelID}) after ${Date.now()-debugID} ms${error && error.message ? ' - '+error.message : ''}`});
+                this.publishAvailability(device, false, false, has_elevated_debug ? debugID : undefined);
                 if (pingCount.failed++ <= this.max_ping) {
-                    const msg = `Failed to ping ${ieeeAddr} ${device.modelID} for ${JSON.stringify(pingCount)} attempts`
+                    const message = `Failed to ping ${ieeeAddr} ${device.modelID} for ${JSON.stringify(pingCount)} attempts`
                     if (pingCount.failed < 2 && pingCount.reported < this.max_ping) {
-                        if (has_elevated_debug) this.warn(`ELEVATED: ${msg}`); else this.info(msg);
+                        if (!has_elevated_debug)
+                            this.info(message);
                         pingCount.reported++;
                     } else {
-                        this.debug(msg);
+                        this.debug(message);
                     }
                     this.setTimerPingable(device, pingCount.failed);
                     this.ping_counters[device.ieeeAddr] = pingCount;
                 } else {
                     const msg = `Stopping to ping ${ieeeAddr} ${device.modelID} after ${pingCount.failed} ping attempts`;
-                    if (has_elevated_debug) this.warn(`ELEVATED ${msg}`); else this.info(msg);
+                    if (has_elevated_debug)
+                        this.zigbee.emit('device_debug',{ ID:debugID, data: {ID: device.ieeeAddr, error:'PISTOP', IO:false}, message:msg});
+                    else
+                        this.info(msg);
                 }
             }
         }
@@ -301,6 +319,9 @@ class DeviceAvailability extends BaseExtension {
     }
 
     async publishAvailability(device, available, force) {
+        // no device availability until the interview is done.
+        if (device?.interviewState == 'IN_PROGRESS')
+            return;
         const entity = await this.zigbee.resolveEntity(device);
         if (entity && entity.mapped) {
             const ieeeAddr = device.ieeeAddr;
@@ -308,13 +329,21 @@ class DeviceAvailability extends BaseExtension {
                 this.onReconnect(device);
             }
 
-            if (this.state[ieeeAddr] !== available || force) {
-                this.state[ieeeAddr] = available;
+            const astate = this.state[ieeeAddr] || { available, ts:0 };
+            const now = Math.round(Date.now()/1000);
+
+            if (force || (astate.available !== available) || (now - astate.ts > this.availableTime)) {
+                this.state[ieeeAddr] = {
+                    ts: now,
+                    available
+                }
                 const payload = {available: available};
                 this.debug(`Publish available for ${ieeeAddr} = ${available}`);
                 this.zigbee.emit('publish', utils.zbIdorIeeetoAdId(this.adapter, ieeeAddr, false), entity.mapped.model, payload);
-                this.debug(`Publish LQ for ${ieeeAddr} = ${(available ? 10 : 0)}`);
-                this.zigbee.emit('publish', utils.zbIdorIeeetoAdId(this.adapter, ieeeAddr, false), entity.mapped.model, {linkquality: (available ? 10 : 0)});
+                if (force || (astate.available !== available)) {
+                    this.debug(`Publish LQ for ${ieeeAddr} = ${(available ? 10 : 0)}`);
+                    this.zigbee.emit('publish', utils.zbIdorIeeetoAdId(this.adapter, ieeeAddr, false), entity.mapped.model, {linkquality: (available ? 10 : 0)});
+                }
             }
         }
     }

package/lib/zbDeviceEvent.js

@@ -34,6 +34,10 @@ class DeviceEvent extends BaseExtension {
         }
     }
 
+    async deviceExposeChanged(device, mapped) {
+        this.warn(`deviceExposeChanged called with ${JSON.stringify(device.ieeeAddr)} / ${JSON.stringify(mapped.model)}`);
+    }
+
     async callOnEvent(device, type, data, mappedDevice) {
         if (!mappedDevice) {
             mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
@@ -52,6 +56,7 @@ class DeviceEvent extends BaseExtension {
             case `deviceJoined`:
             {
                 eventData.data = baseData;
+                eventData.deviceExposeChanged = function() { this.deviceExposeChanged(device, mappedDevice) } ;
                 break;
             }
             case 'stop':

package/lib/zigbeecontroller.js

@@ -657,7 +657,7 @@ class ZigbeeController extends EventEmitter {
                     mapped = await zigbeeHerdsmanConverters.findByDevice(device, false);
                 }
                 catch (error) {
-
+                    // intentionally empty
                 }
                 if (!mapped) {
                     if (device.type === 'Coordinator')
@@ -668,7 +668,7 @@ class ZigbeeController extends EventEmitter {
                             endpoint: device.getEndpoint(1),
                             name: 'Coordinator',
                         };
-                    this.emit('stash_unknown_model', `resoveEntity${device.ieeeAddr}`,`Resolve Entity did not manage to find a mapped device for ${device.ieeeAddr} of type ${device.modelID}`);
+                    if (device.interviewState != 'IN_PROGRESS') this.emit('stash_unknown_model', `resoveEntity${device.ieeeAddr}`,`Resolve Entity did not manage to find a mapped device for ${device.ieeeAddr} of type ${device.modelID}`);
                 }
                 const endpoints = mapped && mapped.endpoint ? mapped.endpoint(device) : null;
                 let endpoint;
@@ -812,7 +812,7 @@ class ZigbeeController extends EventEmitter {
             else if (this._permitJoinInterval) {
                 const timestr = this._permitJoinTime > 0 ? ` with ${this._permitJoinTime} second${this._permitJoinTime > 1 ? 's':''} remaining.`: '.';
                 this.info(`Closed Zigbee network${timestr}`)
-                this.emit('pairing', `Closed network${timestr}`);
+                this.emit('pairing', `Closed network${timestr}`, 0);
                 clearInterval(this._permitJoinInterval);
                 this._permitJoinInterval = null;
             }
@@ -906,11 +906,6 @@ class ZigbeeController extends EventEmitter {
         if (this.adapter.stController.checkDebugDevice(friendlyName)) {
             this.emit('device_debug', {ID: Date.now(), data: {flag:'da', states:[{id: '--', value:'--', payload:message}] , IO:true} ,message:`Device '${friendlyName}' announced itself`});
         }
-        if (this.warnOnDeviceAnnouncement) {
-            this.warn(`Device '${friendlyName}' announced itself${this.readAtAnnounce ? ', trying to read its status' : ''}`);
-        } else {
-            this.info(`Device '${friendlyName}' announced itself${this.readAtAnnounce ? ', trying to read its status' : ''}`);
-        }
 
         if (entity.device && entity.device.modelID && entity.device.interviewState != 'SUCCESSFUL') {
             this.info(`ignoring device announcement for ${entity.device.modelID} due to interview state ${entity.device.interviewState}`);
@@ -918,6 +913,12 @@ class ZigbeeController extends EventEmitter {
             return;
         }
 
+        if (this.warnOnDeviceAnnouncement) {
+            this.warn(`Device '${friendlyName}' announced itself${this.readAtAnnounce ? ', trying to read its status' : ''}`);
+        } else {
+            this.info(`Device '${friendlyName}' announced itself${this.readAtAnnounce ? ', trying to read its status' : ''}`);
+        }
+
         const networkOpen = this.herdsman.getPermitJoin();
         /*
         if (networkOpen && entity.device && entity.device.modelID && entity.device.interviewState != 'IN_PROGRESS')
@@ -929,11 +930,16 @@ class ZigbeeController extends EventEmitter {
         */
         try {
             if (entity && entity.mapped) {
+                if (entity.options?.hasOwnProperty('resend_states')) {
+                    // trigger setting the states
+                    this.emit('resend_states',entity, this.readAtAnnounce );
+                }
+                else
+                    if (this.readAtAnnounce) await this.doDeviceQuery(message.device || message.ieeeAddr, Date.now(), false);
                 this.callExtensionMethod(
                     'onZigbeeEvent',
                     [{'device': message.device, 'type': 'deviceAnnounce', options: entity.options || {}}, entity ? entity.mapped : null]);
                 this.callExtensionMethod('registerDevicePing', [message.device, entity]);
-                if (this.readAtAnnounce) await this.doDeviceQuery(message.device || message.ieeeAddr, Date.now(), false);
             }
         } catch (error) {
             this.sendError(error);
@@ -1346,38 +1352,49 @@ class ZigbeeController extends EventEmitter {
                         meta.state = preparedOptions.state;
                     }
                 }
-
-                try {
-                    const result = await converter.convertSet(target, key, preparedValue, meta);
-                    const message = `convert result ${safeJsonStringify(result)} for device ${deviceId}`;
-                    if (isGroup)
-                        this.emit('published', deviceId, model, stateModel, stateList, options, debugID, has_elevated_debug );
-                    if (has_elevated_debug) {
-                        this.emit('device_debug', { ID:debugID, data: { flag: 'SUCCESS' , IO:false }, message:message});
-                    }
-                    else
-                        if (this.debugActive) this.debug(message);
-                    if (result !== undefined) {
-                        if (stateModel && !isGroup && !stateDesc.noack) {
-                            this.emit('acknowledge_state', deviceId, model, stateDesc, value );
+                let retry = 2;
+                do
+                {
+                    try {
+                        const result = await converter.convertSet(target, key, preparedValue, meta);
+                        const message = `convert result ${safeJsonStringify(result)} for device ${deviceId}`;
+                        if (isGroup)
+                            this.emit('published', deviceId, model, stateModel, stateList, options, debugID, has_elevated_debug );
+                        if (has_elevated_debug) {
+                            this.emit('device_debug', { ID:debugID, data: { flag: 'SUCCESS' , IO:false }, message:message});
                         }
-                        // process sync state list
-                        this.processSyncStatesList(deviceId, model, syncStateList);
-                    }
-                    else {
+                        else
+                            if (this.debugActive) this.debug(message);
+                        if (result !== undefined) {
+                            if (stateModel && !isGroup && !stateDesc.noack) {
+                                this.emit('acknowledge_state', deviceId, model, stateDesc, value );
+                            }
+                            // process sync state list
+                            this.processSyncStatesList(deviceId, model, syncStateList);
+                        }
+                        else {
+                            if (has_elevated_debug) {
+                                const message = `Convert does not return a result result for ${key} with ${safeJsonStringify(preparedValue)} on device ${deviceId}.`;
+                                this.emit('device_debug', { ID:debugID, data: { flag: '06' , IO:false }, message:message});
+                            }
+                        }
+                        retry = 0;
+                    } catch (error) {
                         if (has_elevated_debug) {
-                            const message = `Convert does not return a result result for ${key} with ${safeJsonStringify(preparedValue)} on device ${deviceId}.`;
-                            this.emit('device_debug', { ID:debugID, data: { flag: '06' , IO:false }, message:message});
+                            const message = `caught error ${error?.message? error.message : 'no reason given'} when setting value for device ${deviceId}.`;
+                            this.emit('device_debug', { ID:debugID, data: { error: `EXSET${error.code == 25 ? retry : ''}` , IO:false },message:message});
+                        }
+                        if (error.code === 25 && retry > 0) {
+                            this.warn(`Error ${error.code} on send command to ${deviceId}. (${retry} tries left.), Error: ${error.message}`);
+                            retry--;
+                        }
+                        else {
+                            retry = 0;
+                            this.adapter.filterError(`Error ${error.code} on send command to ${deviceId}.` +
+                            ` Error: ${error.message}`, `Send command to ${deviceId} failed with`, error);
                         }
                     }
-                } catch (error) {
-                    if (has_elevated_debug) {
-                        const message = `caught error ${error && error.message ? error.message : 'no reason given'} when setting value for device ${deviceId}.`;
-                        this.emit('device_debug', { ID:debugID, data: { error: 'EXSET' , IO:false },message:message});
-                    }
-                    this.adapter.filterError(`Error ${error.code} on send command to ${deviceId}.` +
-                        ` Error: ${error.stack}`, `Send command to ${deviceId} failed with`, error);
-                }
+                } while (retry > 0)
             });
         } catch (err) {
             const message = `No entity for ${deviceId} : ${err && err.message ? err.message : 'no error message'}`;
@@ -1506,8 +1523,11 @@ class ZigbeeController extends EventEmitter {
                 if (this.debugActive) this.debug(`Device query for '${entity.device.ieeeAddr}' started`);
                 else this.info(`Device query for '${entity.device.ieeeAddr}' started`);
 
+            const payload = { key:'device_query', read_states:[], unread_states:[] };
+            let cCount = 0;
             for (const converter of mappedModel.toZigbee) {
                 if (converter.hasOwnProperty('convertGet')) {
+                    cCount++;
                     const sources = [];
                     if (converter.endpoints && epmap) {
                         for (const epname of converter.endpoints) {
@@ -1517,24 +1537,33 @@ class ZigbeeController extends EventEmitter {
                     }
                     if (sources.length == 0) sources.push(entity.device.endpoints[0]);
                     for (const source of sources) {
-                        try {
-                            await converter.convertGet(source, '', {device:entity.device});
-                            this.debug(`read for state${converter.key.length ? '' : 's'} '${converter.key.join(',')}' of '${entity.device.ieeeAddr}/${source.ID}' after device query`);
-                        } catch (error) {
-                            if (elevated) {
-                                const message = `Failed to read for state${converter.key.length ? '' : 's'} '${converter.key.join(',')}' of '${source.ID}' from query with '${error && error.message ? error.message : 'no error message'}`;
-                                this.warn(`ELEVATED OE02.1 ${message}`);
-                                this.emit('device_debug', { ID:debugID, data: { error: 'NOTREAD' , IO:false }, message:message });
+                        for (const k of converter.key)
+                            try {
+                                await converter.convertGet(source, k, {device:entity.device});
+                                payload.read_states.push(`${cCount}.${k}`);
+                                if (elevated) {
+                                    const message = `read for state ${k} of '${converter.key.join(',')}' of '${entity.device.ieeeAddr}/${source.ID}' after device query`;
+                                    this.warn(`ELEVATED O02.1 ${message}`);
+                                    this.emit('device_debug', { ID:debugID, data: { flag: '03', IO:false }, message:message });
+                                }
+                                else
+                                    this.debug(`read for state${converter.key.length ? '' : 's'} '${converter.key.join(',')}' of '${entity.device.ieeeAddr}/${source.ID}' after device query`);
+                            } catch (error) {
+                                payload.unread_states.push(`${cCount}.${k}`);
+                                if (elevated) {
+                                    const message = `Failed to read for state ${k} of '${converter.key.join(',')}' of '${source.ID}' from query with '${error && error.message ? error.message : 'no error message'}`;
+                                    this.warn(`ELEVATED OE02.1 ${message}`);
+                                    this.emit('device_debug', { ID:debugID, data: { error: 'NOTREAD' , IO:false }, message:message });
+                                }
+                                else
+                                    this.debug(`failed to read for state${converter.key.length ? '' : 's'} '${converter.key.join(',')}' of '${source.ID}'after device query`);
                             }
-                            else
-                                this.debug(`failed to read for state${converter.key.length ? '' : 's'} '${converter.key.join(',')}' of '${source.ID}'after device query`);
-                        }
                     }
                 }
             }
             if (elevated) {
                 const message = `ELEVATED O07: Device query for '${entity.device.ieeeAddr}}' complete`;
-                this.emit('device_debug', { ID:debugID, data: { flag: 'qe' , IO:false }, message:message});
+                this.emit('device_debug', { ID:debugID, data: { flag: 'qe' , IO:false , payload }, message:message});
             }
             else
                 this.info(`Device query for '${entity.device.ieeeAddr}' complete`);

package/main.js

@@ -216,8 +216,6 @@ class Zigbee extends utils.Adapter {
         const zigbeeOptions = this.getZigbeeOptions();
         this.zbController = new ZigbeeController(this);
 
-
-
         this.zbController.on('log', this.onLog.bind(this));
         this.zbController.on('ready', this.onZigbeeAdapterReady.bind(this));
         this.zbController.on('disconnect', this.onZigbeeAdapterDisconnected.bind(this));
@@ -229,6 +227,7 @@ class Zigbee extends utils.Adapter {
         this.zbController.on('publish', this.stController.publishToState.bind(this.stController));
         this.stController.on('send_payload', this.zbController.publishPayload.bind(this.zbController));
         this.stController.on('changed', this.zbController.publishFromState.bind(this.zbController));
+        this.zbController.on('resend_states', this.stController.handleStateReset.bind(this.stController));
         this.stController.on('device_query', this.zbController.deviceQuery.bind(this.zbController));
         this.zbController.on('acknowledge_state', this.acknowledgeState.bind(this));
         this.zbController.on('stash_error', this.stController.stashErrors.bind(this.stController));
@@ -247,7 +246,7 @@ class Zigbee extends utils.Adapter {
             this.log.info('Autostart Zigbee subsystem');
             this.doConnect();
         }
-        else this.log.warn('Zigbee autostart option not set - omitting start of zigbee substystem!');
+        else this.log.warn('Zigbee autostart option not set - omitting start of zigbee subsystem!');
     }
     updateDebugLevel(state) {
         const dbActive = state === 'debug';
@@ -833,6 +832,7 @@ class Zigbee extends utils.Adapter {
             disableBackup: this.config.disableBackup,
             extPanIdFix: extPanIdFix,
             startWithInconsistent: override.startWithInconsistent ? override.startWithInconsistent: this.config.startWithInconsistent || false,
+            availableUpdateTime:this.config.availableUpdateTime,
         };
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.2.1",
+  "version": "3.2.3",
   "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.37.0"
+    "zigbee-herdsman-converters": "^25.50.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {