iobroker.zigbee 3.2.1 → 3.2.2

package/README.md

@@ -154,6 +154,12 @@ You can thank the authors by these links:
 
 -----------------------------------------------------------------------------------------------------
 ## Changelog
+### 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

@@ -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('_');
@@ -1835,7 +1837,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) {

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "3.2.1",
+    "version": "3.2.2",
     "news": {
+      "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",
@@ -80,19 +93,6 @@
         "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": {

package/lib/commands.js

@@ -445,6 +445,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 +471,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 +762,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/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')
@@ -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;
             }
@@ -1517,18 +1517,25 @@ 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});
+                                if (elevated) {
+                                    const message = `read for state${converter.key.length ? '' : 's'} '${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: k, 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) {
+                                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 });
+                                }
+                                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`);
-                        }
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"