iobroker.zigbee 3.2.5 → 3.3.1-alpha.0

package/main.js

@@ -206,8 +206,6 @@ class Zigbee extends utils.Adapter {
         }
         // external converters
         this.applyExternalConverters();
-        // get devices from exposes
-        this.stController.getExposes();
 
         this.subscribeStates('*');
         this.subscribeForeignStates(`system.adapter.${this.namespace}.logLevel`)
@@ -629,48 +627,46 @@ class Zigbee extends utils.Adapter {
         }
 
         await this.setState('info.connection', true, true);
-        this.stController.CleanupRequired(false);
-        const devicesFromObjects = (await this.getDevicesAsync()).filter(item => item.native.id.length ==16).map((item) => `0x${item.native.id}`);
-        const devicesFromDB = this.zbController.getClientIterator(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;
-                const idx = devicesFromObjects.indexOf(device.ieeeAddr);
-                if (idx > -1) devicesFromObjects.splice(idx, 1);
-                this.stController.updateDev(zbIdorIeeetoAdId(this.adapter, device.ieeeAddr, false), model, model, () =>
-                    this.stController.syncDevStates(device, model));
-            }
-            else (this.log.warn('resolveEntity returned no entity'));
-        }
-        for (const id of devicesFromObjects) {
+
+        for (const id of await this.syncAllDeviceStates(false)) {
             try {
-                this.log.warn(`removing object for device ${id} - it is no longer in the zigbee database`);
+                this.log.info(`removing object for device ${id} - it is no longer in the zigbee database`);
                 await this.delObjectAsync(id.substring(2), { recursive:true })
             }
             catch {
                 this.log.warn(`error removing ${id}`)
             }
         }
+
         await this.callPluginMethod('start', [this.zbController, this.stController]);
     }
 
+    async syncAllDeviceStates(resetRoles) {
+        this.stController.CleanupRequired(false);
+        if (resetRoles) this.stController.clearModelDefinitions();
+        const devicesFromObjects = (await this.getDevicesAsync()).filter(item => item.native.id.length ==16).map((item) => `0x${item.native.id}`);
+        const devicesFromDB = this.zbController.getClientIterator(false);
+        for (const device of devicesFromDB) {
+            if (resetRoles) {
+                const hM = await zigbeeHerdsmanConverters.findByDevice(device);
+                await this.stController.AddModelFromHerdsman(device, hM ? hM.model : device.modelID);
+            }
+            // remove from the Adapter device list
+            const idx = devicesFromObjects.indexOf(device.ieeeAddr);
+            if (idx > -1) devicesFromObjects.splice(idx, 1);
 
-    /*
-    async checkIfModelUpdate(entity) {
-        const model = entity.mapped ? entity.mapped.model : entity.device.modelID;
-        const device = entity.device;
-        const devId = zbIdorIeeetoAdId(this.adapter, device.ieeeAddr, false);//device.ieeeAddr.substr(2);
-
-        const obj = await this.getObjectAsync(devId);
-        if (obj && obj.common.type !== model) {
-            // await this.stController.deleteObj(devId);
-            await this.stController.updateDev(devId, model, model);
-            await this.stController.syncDevStates(device, model);
-            await this.stController.deleteOrphanedDeviceStates();
+            // if it has a mapped model - update its states
+            const entity = await this.zbController.resolveEntity(device);
+            if (entity) {
+                const model = entity.mapped ? entity.mapped.model : entity.device.modelID;
+                this.stController.updateDev(zbIdorIeeetoAdId(this, device.ieeeAddr, false), model, model, () =>
+                    this.stController.syncDevStates(device, model, resetRoles));
+            }
+            else (this.log.debug('resolveEntity returned no entity'));
         }
+        // return the devices in the adapter namespace which do not link to an active zigbee device.
+        return devicesFromObjects;
     }
-    */
 
     acknowledgeState(deviceId, model, stateDesc, value) {
         const stateId = `${zbIdorIeeetoAdId(this, deviceId, true)}.${stateDesc.id}`;
@@ -698,24 +694,24 @@ class Zigbee extends utils.Adapter {
 
         if (this.debugActive) this.log.debug(`New device event: ${safeJsonStringify(entity)}`);
 
-        const dev = entity.device;
-        const model = (entity.mapped) ? entity.mapped.model : dev.modelID;
+        const device = entity.device;
+        const model = (entity.mapped) ? entity.mapped.model : device.modelID;
         this.log.debug(`New device event: ${safeJsonStringify(entity)}`);
         if (!entity.mapped && !entity.device.interviewing) {
-            const msg = `New device: '${dev.ieeeAddr}' does not have a known model. please provide an external converter for '${dev.modelID}'.`;
+            const msg = `New device: '${device.ieeeAddr}' does not have a known model. please provide an external converter for '${device.modelID}'.`;
             this.log.warn(msg);
             this.logToPairing(msg, true);
         }
         await this.stController.AddModelFromHerdsman(entity.device, model)
-        if (dev) {
-            this.getObject(zbIdorIeeetoAdId(this.adapter, dev.ieeeAddr, false), (err, obj) => {
+        if (device) {
+            this.getObject(zbIdorIeeetoAdId(this, device.ieeeAddr, false), (err, obj) => {
                 if (!obj) {
                     const model = (entity.mapped) ? entity.mapped.model : entity.device.modelID;
-                    if (this.debugActive) this.log.debug(`new device ${dev.ieeeAddr} ${dev.networkAddress} ${model} `);
+                    if (this.debugActive) this.log.debug(`new device ${device.ieeeAddr} ${device.networkAddress} ${model} `);
 
-                    this.logToPairing(`New device joined '${dev.ieeeAddr}' model ${model}`, true);
-                    this.stController.updateDev(zbIdorIeeetoAdId(this.adapter, dev.ieeeAddr, false), model, model, () =>
-                        this.stController.syncDevStates(dev, model));
+                    this.logToPairing(`New device joined '${device.ieeeAddr}' model ${model}`, true);
+                    this.stController.updateDev(zbIdorIeeetoAdId(this, device.ieeeAddr, false), model, model, () =>
+                        this.stController.syncDevStates(device, model, false));
                 }
                 else if (this.debugActive) this.log.debug(`Device ${safeJsonStringify(entity)} rejoined, no new device`);
             });
@@ -725,7 +721,7 @@ class Zigbee extends utils.Adapter {
     leaveDevice(ieeeAddr) {
         if (this.debugActive) this.log.debug(`Leave device event: ${ieeeAddr}`);
         if (ieeeAddr) {
-            const devId = zbIdorIeeetoAdId(this.adapter, ieeeAddr, false);
+            const devId = zbIdorIeeetoAdId(this, ieeeAddr, false);
             if (this.debugActive) this.log.debug(`Delete device ${devId} from iobroker.`);
             this.stController.deleteObj(devId);
         }
@@ -845,7 +841,7 @@ class Zigbee extends utils.Adapter {
             this.setState('info.pairingMode', false, true);
         }
         if (data) {
-            this.logToPairing(`${message}: ${data.toString()}`);
+            this.logToPairing(`${message}: ${typeof data === 'string' ? data: data.toString()}`);
         } else {
             this.logToPairing(`${message}`);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.2.5",
+  "version": "3.3.1-alpha.0",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -22,28 +22,27 @@
   },
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
-    "@iobroker/dm-utils": "^1.0.10",
-    "humanize-duration": "^3.33.0",
-    "tar": "^7.4.3",
+    "@iobroker/dm-utils": "^1.0.13",
+    "humanize-duration": "^3.33.1",
+    "tar": "^7.5.2",
     "ajv": "^8.17.1",
     "uri-js": "^4.4.1",
-    "typescript": "^5.9.2",
-    "zigbee-herdsman": "^6.0.0",
-    "zigbee-herdsman-converters": "^25.50.0"
+    "typescript": "^5.9.3",
+    "zigbee-herdsman": "^7.0.0",
+    "zigbee-herdsman-converters": "25.84.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
-    "@alcalzone/release-script": "^3.8.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.7.2",
-    "@alcalzone/release-script-plugin-license": "^3.7.0",
-    "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
-    "@iobroker/testing": "^5.1.1",
-    "chai": "^5.2.1",
-    "eslint": "^9.36.0",
+    "@alcalzone/release-script": "^5.0.0",
+    "@alcalzone/release-script-plugin-iobroker": "^4.0.0",
+    "@alcalzone/release-script-plugin-license": "^4.0.0",
+    "@alcalzone/release-script-plugin-manual-review": "^4.0.0",
+    "@iobroker/testing": "^5.2.2",
+    "eslint": "^9.39.1",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.5.4",
     "mixin-deep": "^2.0.1",
-    "@iobroker/dev-server": "^0.7.8"
+    "@iobroker/dev-server": "^0.8.0"
   },
   "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
   "keywords": [