iobroker.zigbee 1.8.24 → 1.9.0

package/lib/zigbeecontroller.js

@@ -3,6 +3,7 @@
 const pathLib = require('path');
 const ZigbeeHerdsman = require('zigbee-herdsman');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
+const zigbeeHerdsmanConvertersPhilips = require('zigbee-herdsman-converters/lib/philips');
 const EventEmitter = require('events').EventEmitter;
 const safeJsonStringify = require('./json');
 const DeviceAvailabilityExt = require('./zbDeviceAvailability');
@@ -11,7 +12,22 @@ const DeviceEventExt = require('./zbDeviceEvent');
 const DelayedActionExt = require('./zbDelayedAction');
 const utils = require('./utils');
 const groupConverters = [
-    zigbeeHerdsmanConverters.toZigbeeConverters.light_onoff_brightness,
+    zigbeeHerdsmanConverters.toZigbee.light_onoff_brightness,
+    zigbeeHerdsmanConverters.toZigbee.light_color_colortemp,
+    zigbeeHerdsmanConvertersPhilips.tz.effect, // Support Hue effects for groups
+    zigbeeHerdsmanConverters.toZigbee.ignore_transition,
+    zigbeeHerdsmanConverters.toZigbee.cover_position_tilt,
+    zigbeeHerdsmanConverters.toZigbee.thermostat_occupied_heating_setpoint,
+    zigbeeHerdsmanConverters.toZigbee.tint_scene,
+    zigbeeHerdsmanConverters.toZigbee.light_brightness_move,
+    zigbeeHerdsmanConverters.toZigbee.light_brightness_step,
+    zigbeeHerdsmanConverters.toZigbee.light_colortemp_step,
+    zigbeeHerdsmanConverters.toZigbee.light_colortemp_move,
+    zigbeeHerdsmanConverters.toZigbee.light_hue_saturation_move,
+    zigbeeHerdsmanConverters.toZigbee.light_hue_saturation_step
+
+
+    /*   zigbeeHerdsmanConverters.toZigbeeConverters.light_onoff_brightness,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_color,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_alert,
@@ -20,7 +36,8 @@ const groupConverters = [
     zigbeeHerdsmanConverters.toZigbeeConverters.light_brightness_step,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_move,
     zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_step,
-    zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_startup
+    zigbeeHerdsmanConverters.toZigbeeConverters.light_colortemp_startup*/
+
 ];
 
 function isFunction(functionToCheck) {
@@ -70,6 +87,8 @@ class ZigbeeController extends EventEmitter {
             adapter: {
                 forceStartWithInconsistentAdapterConfiguration: options.startWithInconsistent
             },
+            legacy : false,
+
         };
         // https://github.com/ioBroker/ioBroker.zigbee/issues/668
         if (!options.extPanIdFix) {
@@ -646,7 +665,8 @@ class ZigbeeController extends EventEmitter {
                     `Device '${friendlyName}' with Zigbee model '${message.device.modelID}' is NOT supported, ` +
                     `please follow https://www.zigbee2mqtt.io/how_tos/how_to_support_new_devices.html`
                 );
-                this.emit('pairing', 'Interview successful', {friendly_name: friendlyName, supported: false});
+                const frName = {friendly_name: friendlyName, supported: false};
+                this.emit('pairing', 'Interview successful', JSON.stringify(frName));
                 entity.device.modelID = entity.device._modelID;
                 this.emit('new', entity);
             }
@@ -817,7 +837,7 @@ class ZigbeeController extends EventEmitter {
             this.debug(`addDevFromGroup - entity: ${utils.getEntityInfo(entity)}`);
             // generate group debug info and display it
             const members = await this.getGroupMembersFromController(groupId);
-            let memberIDs = [];
+            const memberIDs = [];
             for (const member of members) {
                 memberIDs.push(member.ieee);
             }
@@ -867,7 +887,7 @@ class ZigbeeController extends EventEmitter {
             const group = await this.resolveEntity(groupId);
 
             const members = await this.getGroupMembersFromController(groupId);
-            let memberIDs = [];
+            const memberIDs = [];
             for (const member of members) {
                 memberIDs.push(member.ieee);
             }

package/main.js

@@ -33,6 +33,7 @@ const ExcludePlugin = require('./lib/exclude');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
 const vm = require('vm');
 const util = require('util');
+const dmZigbee  = require('./lib/devicemgmt.js');
 
 const createByteArray = function (hexString) {
     const bytes = [];
@@ -73,6 +74,9 @@ class Zigbee extends utils.Adapter {
         this.stController = new StatesController(this);
         this.stController.on('log', this.onLog.bind(this));
         this.stController.on('changed', this.publishFromState.bind(this));
+
+        this.deviceManagement = new dmZigbee(this);
+
         this.plugins = [
             new SerialListPlugin(this),
             new CommandsPlugin(this),
@@ -607,7 +611,7 @@ class Zigbee extends utils.Adapter {
     async publishFromState(deviceId, model, stateModel, stateList, options) {
         let isGroup = false;
 
-        this.log.debug(`publishFromState : ${deviceId} ${model}`);
+        this.log.debug(`publishFromState : ${deviceId} ${model} ${safeJsonStringify(stateList)}`);
         if (model === 'group') {
             isGroup = true;
             deviceId = parseInt(deviceId);
@@ -693,6 +697,7 @@ class Zigbee extends utils.Adapter {
 
                 const preparedValue = (stateDesc.setter) ? stateDesc.setter(value, options) : value;
                 const preparedOptions = (stateDesc.setterOpt) ? stateDesc.setterOpt(value, options) : {};
+
                 let syncStateList = [];
                 if (stateModel && stateModel.syncStates) {
                     stateModel.syncStates.forEach(syncFunct => {
@@ -704,7 +709,7 @@ class Zigbee extends utils.Adapter {
                 }
 
                 const epName = stateDesc.epname !== undefined ? stateDesc.epname : (stateDesc.prop || stateDesc.id);
-                const key = stateDesc.setattr || stateDesc.prop || stateDesc.id;
+                const key = stateDesc.prop || stateDesc.id || stateDesc.setattr;
                 this.log.debug(`convert ${key}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)}`);
 
                 let target;
@@ -727,6 +732,13 @@ class Zigbee extends utils.Adapter {
                     state: {},
                 };
 
+                // new toZigbee
+                if (typeof preparedValue === 'number') {
+                    meta.message.state = preparedValue > 0 ? 'ON' : 'OFF';
+                } else {
+                    meta.message.state = preparedValue;
+                }
+
                 if (preparedOptions.hasOwnProperty('state')) {
                     meta.state = preparedOptions.state;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.8.24",
+  "version": "1.9.0",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -18,26 +18,28 @@
     "node": ">=16"
   },
   "optionalDependencies": {
-    "serialport": "^11.0.1"
+    "serialport": "^12.0.0"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.3",
-    "tar": "^6.1.15",
-    "typescript": "^5.2.2",
-    "zigbee-herdsman": "0.18.7",
-    "zigbee-herdsman-converters": "15.70.0"
+    "@iobroker/adapter-core": "^3.0.4",
+    "@jey-cee/dm-utils": "^0.0.5",
+    "humanize-duration": "^3.31.0",
+    "tar": "^6.2.0",
+    "typescript": "^5.3.3",
+    "zigbee-herdsman": "0.27.1",
+    "zigbee-herdsman-converters": "16.16.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
-    "@alcalzone/release-script": "^3.6.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.6.0",
-    "@alcalzone/release-script-plugin-license": "^3.5.9",
-    "@alcalzone/release-script-plugin-manual-review": "^3.5.9",
+    "@alcalzone/release-script": "^3.7.0",
+    "@alcalzone/release-script-plugin-iobroker": "^3.7.0",
+    "@alcalzone/release-script-plugin-license": "^3.7.0",
+    "@alcalzone/release-script-plugin-manual-review": "^3.7.0",
     "@iobroker/testing": "^4.1.0",
-    "axios": "^1.5.0",
-    "chai": "^4.3.8",
+    "axios": "^1.6.0",
+    "chai": "^4.3.10",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.46.0",
+    "eslint": "^8.52.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "gulp": "^4.0.2",