iobroker.zigbee 1.9.1 → 1.9.4

package/README.md

@@ -134,6 +134,17 @@ You can thank the authors by these links:
 -----------------------------------------------------------------------------------------------------
 
 ## Changelog
+### 1.9.4 (2023-12-29)
+* (arteck) type
+
+### 1.9.3 (2023-12-26)
+* (arteck) last zhc Version 16.x
+* (arteck) corr reboot in statecontroller
+
+### 1.9.2 (2023-12-25)
+* (arteck) gen states from exposes as function
+* (arteck) rebuild dev_names.json with state cleanup button
+
 ### 1.9.1 (2023-12-23)
 * (arteck) corr TypeError: Cannot read properties of undefined (reading 'state')
 

package/io-package.json

@@ -1,8 +1,47 @@
 {
   "common": {
     "name": "zigbee",
-    "version": "1.9.1",
+    "version": "1.9.4",
     "news": {
+      "1.9.4": {
+        "en": "type",
+        "de": "typ",
+        "ru": "тип",
+        "pt": "tipo",
+        "nl": "type type type type type type type type type type type type type type type type type type type type type type type type type type type type type typety type type type type type type type type type type type type type type type typety type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type typety type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type type",
+        "fr": "type",
+        "it": "tipo",
+        "es": "tipo",
+        "pl": "typ",
+        "uk": "тип",
+        "zh-cn": "类型"
+      },
+      "1.9.3": {
+        "en": "last zhc Version 16.x\ncorr reboot in statecontroller",
+        "de": "letzte Version 16.x\nkorr reboot in statecontroller",
+        "ru": "последняя версия zhc 16.x\nкорр перезагрузка в государственный контролер",
+        "pt": "última versão zhc 16.x\nreboot de corr no controlador de estado",
+        "nl": "laatste Zhc Version 16\ncorr reboot in staatscontroller",
+        "fr": "dernière version zhc 16.x\ncorr reboot in statecontroller",
+        "it": "ultima versione zhc 16.x\nreboot corr in statocontroller",
+        "es": "última versión 16.x\nreboot de corr en statecontroller",
+        "pl": "ostatnia wersja 16.x\nkor reboot w systemie kontroli państwa",
+        "uk": "остання версія jc 16.x\nперезавантаження коренів в держконтролері",
+        "zh-cn": "上一次zhc Version 16x\n州控制容忍的报复"
+      },
+      "1.9.2": {
+        "en": "gen states from exposes as function\nrebuild dev_names.json with state cleanup button",
+        "de": "gen-staaten von exponiert als funktion\ndev_names neu aufbauen. json with state cleanup taste",
+        "ru": "гены из экспозиций как функция\nперестроить dev_names. json с государственной кнопкой очистки",
+        "pt": "gen estados de exposições como função\nreconstruir dev_names. json com botão de limpeza do estado",
+        "nl": "gen staten van blootstelling als functioneren\nherbouwde dev namen. json met staatsopruimknop",
+        "fr": "gen states from exposes as function\nreconstruire dev_names. json avec bouton de nettoyage de l'état",
+        "it": "gen stati da espone come funzione\nricostruire dev_names. json con il pulsante di pulizia dello stato",
+        "es": "gen estados de expone como función\nreconstruir dev_names. json con botón de limpieza del estado",
+        "pl": "państwa genowe zjawiają się jako funkcje\nodbudowa nazw. json z przyciskiem czystego przycisku",
+        "uk": "генні стани від вибухів як функції\nrebuild dev_names. json з державною кнопкою очищення",
+        "zh-cn": "根塔里斯·奥古尔(签名)\n页:1 j. 有国家清洁,但顿"
+      },
       "1.9.1": {
         "en": "corr TypeError: Cannot read properties of undefined (reading 'state')",
         "de": "korpustyp Fehler: Kann Eigenschaften von undefinierten (Lesezustand) nicht lesen",
@@ -54,45 +93,6 @@
         "pl": "kor toZigbee message\ndodać manager",
         "uk": "corr toZigbee повідомлення\nдодати пристрій Менеджер",
         "zh-cn": "信\n增加装置 管理人员"
-      },
-      "1.8.25": {
-        "en": "zhc 16.x \ncorr group from exclude dialog",
-        "de": "zhc 16.x\nkorr gruppe aus ausschluss dialog",
-        "ru": "жк 16.x\nгруппа корр от исключает диалог",
-        "pt": "zhc 16.x\ncorr grupo de excluir diálogo",
-        "nl": "zhc 16\ncorr groep uitgesloten dialog",
-        "fr": "zhc 16.x\ngroupe corr de l'exclusion du dialogue",
-        "it": "zhc 16.x\ngruppo corr da escludere finestra di dialogo",
-        "es": "zhc 16.x\ngrupo de corr de excluir diálogo",
-        "pl": "żc 16.x\ngrupa kor z wyłączeniem dialogu",
-        "uk": "жк 16.x\nгрупа з виключення діалогу",
-        "zh-cn": "页: 1\n集团排除了口号"
-      },
-      "1.8.24": {
-        "en": "switch to exposes tab for some Aqara Devices",
-        "de": "schalter, um die Registerkarte für einige Aqara-Geräte freizusetzen",
-        "ru": "перейти на вкладку exposes для некоторых устройств Aqara",
-        "pt": "mudar para expor guia para alguns dispositivos Aqara",
-        "nl": "vertaling:",
-        "fr": "commutation pour exposer l'onglet pour certains appareils Aqara",
-        "it": "interruttore per esporre la scheda per alcuni dispositivi Aqara",
-        "es": "interruptor para exponer ficha para algunos dispositivos Aqara",
-        "pl": "zamienił tablicę dla niektórych Aqara Devices",
-        "uk": "перемикач для установки для деяких пристроїв Aqara",
-        "zh-cn": "对某些Aqara Devic的表格的转换"
-      },
-      "1.8.23": {
-        "en": "query from xiaomi is now better",
-        "de": "anfrage von xiaomi ist jetzt besser",
-        "ru": "запрос от xiaomi теперь лучше",
-        "pt": "consulta de xiaomi é agora melhor",
-        "nl": "quee van xiaomi is nu beter",
-        "fr": "la question de xiaomi est maintenant mieux",
-        "it": "query da xiaomi è ora meglio",
-        "es": "la consulta de xiaomi ahora es mejor",
-        "pl": "wykorzystywanie z xiaomi jest obecnie lepsze",
-        "uk": "запиту від xiaomi тепер краще",
-        "zh-cn": "来自米亚米的询问现在更好。"
       }
     },
     "titleLang": {

package/lib/commands.js

@@ -88,7 +88,6 @@ class Commands {
                     break;
                 case 'setState':
                     if (obj && obj.message && typeof obj.message === 'object' && obj.message.id) {
-                        //                        this.adapter.setState(obj.message.id, obj.message.val, false, obj.callback);
                         this.stController.setState_typed(obj.message.id, obj.message.val, false, undefined, obj.callback);
                     }
                     break;
@@ -107,7 +106,6 @@ class Commands {
                         this.setDeviceActivated(obj.from, obj.command, obj.message, obj.callback);
                     }
                     break;
-
             }
         }
     }
@@ -474,13 +472,17 @@ class Commands {
     async cleanDeviceStates(from, command, msg, callback) {
         this.info(`State cleanup with ${JSON.stringify(msg)}`);
         const devicesFromDB = await this.zbController.getClients(false);
+
         for (const device of devicesFromDB) {
             const entity = await this.zbController.resolveEntity(device);
+
             if (entity) {
                 const model = (entity.mapped) ? entity.mapped.model : entity.device.modelID;
                 await this.stController.deleteOrphanedDeviceStates(device.ieeeAddr, model, msg.force);
             }
         }
+        // rebuild retainDeviceNamesDB
+        this.stController.rebuildRetainDeviceNames();
         this.adapter.sendTo(from, command, {}, callback);
     }
 

package/lib/devicemgmt.js

@@ -1,4 +1,4 @@
-const dmUtils = require('@jey-cee/dm-utils');
+const dmUtils = require('@iobroker/dm-utils');
 const humanizeDuration = require('humanize-duration');
 
 class dmZigbee extends dmUtils.DeviceManagement {
@@ -8,25 +8,6 @@ class dmZigbee extends dmUtils.DeviceManagement {
             ...super.getInstanceInfo(),
             apiVersion: 'v1',
             actions: [
-                {
-                    id: 'refresh',
-                    icon: 'fas fa-redo-alt',
-                    title: '',
-                    description: {
-                        en: 'Refresh device list',
-                        de: 'Geräteliste aktualisieren',
-                        ru: 'Обновить список устройств',
-                        pt: 'Atualizar lista de dispositivos',
-                        nl: 'Vernieuw apparaatlijst',
-                        fr: 'Actualiser la liste des appareils',
-                        it: 'Aggiorna elenco dispositivi',
-                        es: 'Actualizar lista de dispositivos',
-                        pl: 'Odśwież listę urządzeń',
-
-                        uk: 'Оновити список пристроїв'
-                    },
-                    handler: this.handleRefresh.bind(this)
-                },
                 {
                     id: 'newDevice',
                     icon: 'fas fa-plus',

package/lib/exposes.js

@@ -248,9 +248,37 @@ function createFromExposes(model, def) {
     }
 
     const icon = utils.getDeviceIcon(def);
-    for (const expose of def.exposes) {
-        let state;
 
+    if (typeof def.exposes == 'object') {
+        for (const expose of def.exposes) {
+            genStateFromExpose(expose);
+
+
+        }
+    }
+
+    // maybee here check manufacturerName for tuya devices
+    if (typeof def.exposes == 'function') {
+        const expFunction = def.exposes(def, {});   // maybee here check manufacturerName for tuya devices
+
+        for (const expose of expFunction) {
+            genStateFromExpose(expose);
+        }
+    }
+
+    const newDev = {
+        models: [model],
+        icon,
+        states,
+        exposed: true,
+    };
+
+    return newDev;
+
+
+
+    function genStateFromExpose(expose) {
+        let state;
         switch (expose.type) {
             case 'light':
                 for (const prop of expose.features) {
@@ -362,7 +390,7 @@ function createFromExposes(model, def) {
                                         x: xy[0],
                                         y: xy[1]
                                     };
-*/
+        */
                                     let xy = [0, 0];
                                     const rgbcolor = colors.ParseColor(value);
 
@@ -851,22 +879,20 @@ function createFromExposes(model, def) {
                     }
                 }
                 break;
+            case 'list':
+                // is not mapped
+                //     for (const prop of expose) {
+                //        let nam = prop.name;
+
+                //    }
+                break;
             default:
                 console.log(`Unhandled expose type ${expose.type} for device ${model}`);
+
         }
     }
-    const newDev = {
-        models: [model],
-        icon,
-        states,
-        exposed: true,
-    };
-    // make the function code printable in log
-    //console.log(`Created mapping for device ${model}: ${JSON.stringify(newDev, function(key, value) {
-    //  if (typeof value === 'function') {return value.toString() } else { return value } }, ' ')}`);
-    return newDev;
-}
 
+}
 function applyExposes(mappedDevices, byModel, allExcludesObj) {
     // for exclude search
     const allExcludesStr = JSON.stringify(allExcludesObj);
@@ -890,6 +916,7 @@ function applyExposes(mappedDevices, byModel, allExcludesObj) {
 function applyDeviceDef(mappedDevices, byModel, allExcludesStr, deviceDef) {
     const stripModel = utils.getModelRegEx(deviceDef.model);
     // check if device is mapped
+
     const existsMap = byModel.get(stripModel);
 
     if ((deviceDef.hasOwnProperty('exposes') && (!existsMap || !existsMap.hasOwnProperty('states'))) || allExcludesStr.indexOf(stripModel) > 0) {

package/lib/statescontroller.js

@@ -7,7 +7,7 @@ const getZbId = require('./utils').getZbId;
 const fs = require('fs');
 const request = require('request');
 
-let savedDeviceNames = {};
+let savedDeviceNamesDB = {};
 const knownUndefinedDevices = {};
 
 class StatesController extends EventEmitter {
@@ -23,9 +23,9 @@ class StatesController extends EventEmitter {
         fs.readFile(this.dev_names_fn, (err, data) => {
             if (!err) {
                 try {
-                    savedDeviceNames = JSON.parse(data);
+                    savedDeviceNamesDB = JSON.parse(data);
                 } catch {
-                    savedDeviceNames = {};
+                    savedDeviceNamesDB = {};
                 }
             }
         });
@@ -54,7 +54,7 @@ class StatesController extends EventEmitter {
     retainDeviceNames() {
         clearTimeout(this.retTimeoutHandle);
         this.retTimeoutHanlde = setTimeout(() => {
-            fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNames, null, 2), err => {
+            fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNamesDB, null, 2), err => {
                 if (err) {
                     this.error(`error saving device names: ${JSON.stringify(err)}`);
                 } else {
@@ -272,18 +272,30 @@ class StatesController extends EventEmitter {
         this.adapter.extendObject(id, {common: {deactivated: active}});
     }
 
+    async rebuildRetainDeviceNames() {
+        savedDeviceNamesDB = {};
+        const devList = await this.adapter.getAdapterObjectsAsync();
+
+        for (const key in devList) {
+            if (devList[key].type == 'device') {
+                savedDeviceNamesDB[devList[key]._id.replace(`${this.adapter.namespace}.`, '')] = devList[key].common.name;
+            }
+        }
+        this.retainDeviceNames();
+    }
+
     storeDeviceName(id, name) {
-        savedDeviceNames[id.replace(`${this.adapter.namespace}.`, '')] = name;
+        savedDeviceNamesDB[id.replace(`${this.adapter.namespace}.`, '')] = name;
         this.retainDeviceNames();
     }
 
     verifyDeviceName(id, name) {
         const savedId = id.replace(`${this.adapter.namespace}.`, '');
-        if (!savedDeviceNames.hasOwnProperty(savedId)) {
-            savedDeviceNames[savedId] = name;
+        if (!savedDeviceNamesDB.hasOwnProperty(savedId)) {
+            savedDeviceNamesDB[savedId] = name;
             this.retainDeviceNames();
         }
-        return savedDeviceNames[savedId];
+        return savedDeviceNamesDB[savedId];
     }
 
     deleteDeviceStates(devId, callback) {
@@ -597,8 +609,11 @@ class StatesController extends EventEmitter {
         let has_debug = false;
         if (this.debugDevices === undefined) this.getDebugDevices();
         for (const addressPart of this.debugDevices) {
-            if (typeof devId === 'string' && devId.includes(addressPart)) {
-                if (payload.hasOwnProperty('msg_from_zigbee')) break;
+            if (typeof(devId) == 'string' && devId.indexOf(addressPart) > -1) {
+                if (payload.hasOwnProperty('msg_from_zigbee')) {
+                    break;
+                }
+
                 this.warn(`ELEVATED publishToState: message received '${JSON.stringify(payload)}' from device ${devId} type '${model}'`);
                 has_debug = true;
                 break;

package/lib/zbDeviceConfigure.js

@@ -99,40 +99,39 @@ class DeviceConfigure extends BaseExtension {
 
     async configure(device, mappedDevice) {
         try {
-            if (this.configuring.has(device.ieeeAddr) || this.attempts[device.ieeeAddr] >= 5) {
-                return false;
-            }
+            if (mappedDevice !== undefined && device !== undefined) {
+                if (this.configuring.has(device.ieeeAddr) || this.attempts[device.ieeeAddr] >= 5) {
+                    return false;
+                }
 
-            this.configuring.add(device.ieeeAddr);
+                this.configuring.add(device.ieeeAddr);
 
-            if (!this.attempts.hasOwnProperty(device.ieeeAddr)) {
-                this.attempts[device.ieeeAddr] = 0;
-            }
-            try {
-                if (mappedDevice && device) {
+                if (!this.attempts.hasOwnProperty(device.ieeeAddr)) {
+                    this.attempts[device.ieeeAddr] = 0;
+                }
+
+                try {
                     await this.doConfigure(device, mappedDevice);
+                    this.configuring.delete(device.ieeeAddr);
+                } catch (error) {
+                    this.sendError(error);
+                    this.warn(
+                        `DeviceConfigure failed ${device.ieeeAddr} ${device.modelID}, ` +
+                        `attempt ${this.attempts[device.ieeeAddr] + 1} (${error.stack})`,
+                    );
+                    this.attempts[device.ieeeAddr]++;
                 }
-            } catch (error) {
-                this.sendError(error);
-                this.warn(
-                    `DeviceConfigure failed ${device.ieeeAddr} ${device.modelID}, ` +
-                    `attempt ${this.attempts[device.ieeeAddr] + 1} (${error.stack})`,
-                );
-                this.attempts[device.ieeeAddr]++;
             }
-            this.configuring.delete(device.ieeeAddr);
         } catch (error) {
             this.sendError(error);
-            this.error(
-                `Failed to DeviceConfigure.configure ${device.ieeeAddr} ${device.modelID} (${error.stack})`,
-            );
+            this.error(`Failed to DeviceConfigure.configure ${device.ieeeAddr} ${device.modelID} stack: (${error.stack})`);
         }
     }
 
     async doConfigure(device, mappedDevice) {
         const coordinatorEndpoint = await this.zigbee.getDevicesByType('Coordinator')[0].endpoints[0];
         try {
-            if (mappedDevice !== undefined) {
+            if (mappedDevice) {
                 this.info(`Configuring ${device.ieeeAddr} ${device.modelID}`);
                 await mappedDevice.configure(device, coordinatorEndpoint, this);
                 device.meta.configured = zigbeeHerdsmanConverters.getConfigureKey(mappedDevice);
@@ -141,9 +140,7 @@ class DeviceConfigure extends BaseExtension {
             }
         } catch (error) {
             this.sendError(error);
-            this.error(
-                `Failed to DeviceConfigure.configure ${device.ieeeAddr} ${device.modelID} (${error.stack})`,
-            );
+            this.error(`Failed to DeviceConfigure.configure ${device.ieeeAddr} ${device.modelID} (${error.stack})`);
         }
     }
 }

package/main.js

@@ -283,7 +283,7 @@ class Zigbee extends utils.Adapter {
             try {
                 zigbeeHerdsmanConverters.addDeviceDefinition(toAdd);
             } catch {
-                this.log.error(`unable to apply external converter ${JSON.stringfy(toAdd)}`);
+                this.log.error(`unable to apply external converter ${JSON.stringify(toAdd)}`);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.9.1",
+  "version": "1.9.4",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -22,12 +22,12 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.0.4",
-    "@jey-cee/dm-utils": "^0.0.5",
+    "@iobroker/dm-utils": "^0.1.8",
     "humanize-duration": "^3.31.0",
     "tar": "^6.2.0",
     "typescript": "^5.3.3",
-    "zigbee-herdsman": "0.27.1",
-    "zigbee-herdsman-converters": "16.17.0"
+    "zigbee-herdsman": "0.28.0",
+    "zigbee-herdsman-converters": "16.18.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {