iobroker.zigbee 3.3.1-alpha.0 → 3.3.1

package/main.js

@@ -130,15 +130,13 @@ class Zigbee extends utils.Adapter {
                     const Sentry = sentryInstance.getSentryObject();
                     if (Sentry) {
                         if (message) {
-                            Sentry.configureScope(scope =>
-                                scope.addBreadcrumb({
-                                    type: 'error', // predefined types
-                                    category: 'error message',
-                                    level: 'error',
-                                    message
-                                }));
+                            Sentry && Sentry.withScope(scope => scope.addBreadcrumb({
+                                type: 'error', // predefined types
+                                category: 'error message',
+                                level: 'error',
+                                message
+                            }));
                         }
-
                         if (typeof error == 'string') {
                             Sentry.captureException(new Error(error));
                         } else {
@@ -641,13 +639,13 @@ class Zigbee extends utils.Adapter {
         await this.callPluginMethod('start', [this.zbController, this.stController]);
     }
 
-    async syncAllDeviceStates(resetRoles) {
+    async syncAllDeviceStates(rebuildStates) {
         this.stController.CleanupRequired(false);
-        if (resetRoles) this.stController.clearModelDefinitions();
+        if (rebuildStates) 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) {
+            if (rebuildStates) {
                 const hM = await zigbeeHerdsmanConverters.findByDevice(device);
                 await this.stController.AddModelFromHerdsman(device, hM ? hM.model : device.modelID);
             }
@@ -660,7 +658,7 @@ class Zigbee extends utils.Adapter {
             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));
+                    this.stController.syncDevStates(device, model));
             }
             else (this.log.debug('resolveEntity returned no entity'));
         }
@@ -705,15 +703,12 @@ class Zigbee extends utils.Adapter {
         await this.stController.AddModelFromHerdsman(entity.device, model)
         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 ${device.ieeeAddr} ${device.networkAddress} ${model} `);
+                const model = (entity.mapped) ? entity.mapped.model : entity.device.modelID;
+                if (this.debugActive) this.log.debug(`new device ${device.ieeeAddr} ${device.networkAddress} ${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`);
+                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));
             });
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "3.3.1-alpha.0",
+  "version": "3.3.1",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -23,13 +23,13 @@
   "dependencies": {
     "@iobroker/adapter-core": "^3.3.2",
     "@iobroker/dm-utils": "^1.0.13",
-    "humanize-duration": "^3.33.1",
+    "humanize-duration": "^3.33.2",
     "tar": "^7.5.2",
     "ajv": "^8.17.1",
     "uri-js": "^4.4.1",
     "typescript": "^5.9.3",
-    "zigbee-herdsman": "^7.0.0",
-    "zigbee-herdsman-converters": "25.84.0"
+    "zigbee-herdsman": "^8.0.0",
+    "zigbee-herdsman-converters": "^25.85.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
@@ -38,7 +38,7 @@
     "@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": "^9.39.2",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.5.4",
     "mixin-deep": "^2.0.1",