iobroker.zigbee 1.10.3 → 1.10.11

package/lib/zigbeecontroller.js

@@ -3,6 +3,7 @@
 const pathLib = require('path');
 const ZigbeeHerdsman = require('zigbee-herdsman');
 const zigbeeHerdsmanConverters = require('zigbee-herdsman-converters');
+const ZDO = require('zigbee-herdsman/dist/zspec/zdo');
 const zigbeeHerdsmanConvertersPhilips = require('zigbee-herdsman-converters/lib/philips');
 const EventEmitter = require('events').EventEmitter;
 const safeJsonStringify = require('./json');
@@ -11,6 +12,7 @@ const DeviceConfigureExt = require('./zbDeviceConfigure');
 const DeviceEventExt = require('./zbDeviceEvent');
 const DelayedActionExt = require('./zbDelayedAction');
 const utils = require('./utils');
+const { waitForDebugger } = require('inspector');
 const groupConverters = [
     zigbeeHerdsmanConverters.toZigbee.light_onoff_brightness,
     zigbeeHerdsmanConverters.toZigbee.light_color_colortemp,
@@ -301,9 +303,9 @@ class ZigbeeController extends EventEmitter {
     }
 
     async removeGroupById(id) {
-        const group = await this.getGroupByID(id);
+        const group = await this.getGroupByID(Number(id));
         try {
-            group && group.removeFromDatabase();
+            group && group.removeFromNetwork();
         } catch (error) {
             this.sendError(error);
             this.error(`error in removeGroupById: ${error}`);
@@ -552,7 +554,8 @@ class ZigbeeController extends EventEmitter {
             const device = await this.herdsman.getDeviceByIeeeAddr(deviceID);
             if (device) {
                 try {
-                    await this.herdsman.adapter.removeDevice(device.networkAddress, device.ieeeAddr);
+                    await device.removeFromNetwork();
+                    //this.herdsman.adapter.removeDevice(device.networkAddress, device.ieeeAddr);
                 } catch (error) {
                     this.sendError(error);
                     if (error)
@@ -814,20 +817,25 @@ class ZigbeeController extends EventEmitter {
 
         if (type === 'foundation') {
             cfg.disableDefaultResponse = true;
+
             if (cmd === 'read' && !Array.isArray(zclData)) {
-                // needs to be iterable (string[] | number [])
+                /*                // needs to be iterable (string[] | number [])
                 zclData[Symbol.iterator] = function* () {
                     let k;
                     for (k in this) {
                         yield k;
                     }
                 };
+*/
             }
             let result;
             if (cmd === 'configReport') {
                 result = await endpoint.configureReporting(cid, zclData, cfg);
             } else {
-                result = await endpoint[cmd](cid, zclData, cfg);
+                if (cmd === 'read' && !Array.isArray(zclData))
+                    result = await endpoint[cmd](cid, Object.keys(zclData), cfg);
+                else
+                    result = await endpoint[cmd](cid, zclData, cfg);
             }
             callback && callback(undefined, result);
         } else if (type === 'functionalResp') {
@@ -999,27 +1007,63 @@ class ZigbeeController extends EventEmitter {
     }
 
     async getChannelsEnergy() {
-        const payload = {
-            dstaddr: 0x0,
-            dstaddrmode: 0x02,
-            channelmask: 0x07FFF800,
-            scanduration: 0x5,
-            scancount: 1,
-            nwkmanageraddr: 0x0000
-        };
-        const energyScan = this.herdsman.adapter.znp.waitFor(
-            2, // unpi_1.Constants.Type.AREQ,
-            5, // Subsystem.ZDO,
-            'mgmtNwkUpdateNotify'
-        );
-        await this.herdsman.adapter.znp.request(
-            0x5, // Subsystem.ZDO
-            'mgmtNwkUpdateReq',
-            payload,
-            energyScan.ID
-        );
-        const result = await energyScan.start().promise;
-        return result.payload;
+        /*
+        const BLANK_EUI64 = "0xFFFFFFFFFFFFFFFF";
+        const SLEEPY = 0xffff;
+
+        let clusterId = ZDO.ClusterId.NWK_UPDATE_REQUEST;
+
+        //for (let i=26;i>0;i--)
+        {
+        try
+        {
+            let result = {};
+            let payload = ZDO.Buffalo.buildRequest(false, clusterId, [11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26], 0x05, undefined, 0, undefined);
+            this.warn(`Payload is [${JSON.stringify(payload)}]`);
+            result = await this.herdsman.adapter.sendZdo(0x0, 0x0, clusterId , payload, false);
+            this.warn(`result is  ${JSON.stringify(result)}`)
+            //await this.Wait(5000);
+
+            //let payload1 = ZDO.Buffalo.buildRequest(true, clusterId, [16,17,18,19,20], 0x5, undefined, 0, undefined);
+            //result = await this.herdsman.adapter.sendZdo(0x0, 0x0, clusterId , payload1, false);
+            //this.warn(`result 2 is  ${JSON.stringify(result)}`)
+            //await this.Wait(5000);
+
+
+            //let payload2 = ZDO.Buffalo.buildRequest(true, clusterId, [21,22,23,24,25], 0x5, undefined, 0, undefined);
+            //result = await this.herdsman.adapter.sendZdo(0x0, 0x0, clusterId , payload2, false);
+            //this.warn(`result 3 is  ${JSON.stringify(result)}`)
+    /*        const payload = {
+                dstaddr: 0x0,
+                dstaddrmode: 0x02,
+                channelmask: 0x07FFF800,
+                scanduration: 0x5,
+                scancount: 1,
+                nwkmanageraddr: 0x0000
+            };
+            const energyScan = this.herdsman.adapter.znp.waitFor(
+                2, // unpi_1.Constants.Type.AREQ,
+                5, // Subsystem.ZDO,
+                'mgmtNwkUpdateNotify'
+            );
+            await this.herdsman.adapter.znp.request(
+                0x5, // Subsystem.ZDO
+                'mgmtNwkUpdateReq',
+                payload,
+                energyScan.ID
+            );
+            const result = await energyScan.start().promise;
+
+
+            //return result.payload;
+        }
+        catch (error) {
+            this.sendError(error);
+            this.error(`Failed to touchlinkReset ${error.stack}`);
+
+        }
+    }
+    */
     }
 }
 

package/main.js

@@ -467,6 +467,16 @@ class Zigbee extends utils.Adapter {
         const devId = device.ieeeAddr.substr(2);
         const meta = {device};
 
+        if (this.stController.checkDebugDevice(devId)) {
+            const shortMessage = {};
+            for(const propertyName in message) {
+                shortMessage[propertyName] = message[propertyName];
+            }
+            shortMessage.device = device.ieeeAddr;
+            shortMessage.meta = undefined;
+            shortMessage.endpoint = (message.endpoint.ID ? message.endpoint.ID: -1);
+            this.log.warn(`ELEVATED: Zigbee Event of Type ${type} from device ${safeJsonStringify(device.ieeeAddr)}, incoming event: ${safeJsonStringify(shortMessage)}`);
+        }
         // this assigment give possibility to use iobroker logger in code of the converters, via meta.logger
         meta.logger = this.log;
 
@@ -613,6 +623,7 @@ class Zigbee extends utils.Adapter {
 
     async publishFromState(deviceId, model, stateModel, stateList, options) {
         let isGroup = false;
+        const has_elevated_debug = this.stController.checkDebugDevice(deviceId)
 
         this.log.debug(`publishFromState : ${deviceId} ${model} ${safeJsonStringify(stateList)}`);
         if (model === 'group') {
@@ -628,6 +639,13 @@ class Zigbee extends utils.Adapter {
 
             if (!mappedModel) {
                 this.log.debug(`No mapped model for ${model}`);
+                if (has_elevated_debug) this.log.warn(`ELEVATED: No mapped model for ${model}`)
+                return;
+            }
+
+            if (!mappedModel.toZigbee)
+            {
+                this.log.error(`No toZigbee in mapped model for ${model}`);
                 return;
             }
 
@@ -691,8 +709,33 @@ class Zigbee extends utils.Adapter {
                     }
                     return;
                 }
-                const converter = mappedModel.toZigbee.find(c => c && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
-                if (!converter) {
+
+                let converter = undefined;
+                for (const c of mappedModel.toZigbee) {
+
+                    if (!c.hasOwnProperty('convertSet')) continue;
+                    this.log.debug(`Type of toZigbee is '${typeof c}', Contains key ${(c.hasOwnProperty('key')?JSON.stringify(c.key):'false ')}`)
+                    if (!c.hasOwnProperty('key') && c.hasOwnProperty('convertSet') && converter === undefined)
+                    {
+                        converter = c;
+
+                        if (has_elevated_debug) this.log.warn(`ELEVATED: setting converter to keyless converter for ${deviceId} of type ${model}`)
+                        this.log.debug('setting converter to keyless converter')
+                        continue;
+                    }
+                    if (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id))
+                    {
+                        this.log.debug(`${(converter===undefined?'Setting':'Overriding')}' converter to converter with key(s)'${JSON.stringify(c.key)}}`)
+                        if (has_elevated_debug) this.log.warn(`ELEVATED: ${(converter===undefined?'Setting':'Overriding')}' converter to converter with key(s)'${JSON.stringify(c.key)}}`)
+                        converter = c;
+                    }
+
+                }
+                /*
+                if (!mappedModel.toZigbee[0].hasOwnProperty('key') && mappedModel.toZigbee[0].hasOwnProperty('convertSet')) converter = mappedModel.toZigbee[0];
+                converter = mappedModel.toZigbee.find(c => c && c.hasOwnProperty('key') && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
+*/
+                if (converter === undefined) {
                     this.log.error(`No converter available for '${model}' with key '${stateDesc.id}' `);
                     this.sendError(`No converter available for '${model}' with key '${stateDesc.id}' `);
                     return;
@@ -714,6 +757,7 @@ class Zigbee extends utils.Adapter {
                 const epName = stateDesc.epname !== undefined ? stateDesc.epname : (stateDesc.prop || stateDesc.id);
                 const key = stateDesc.prop || stateDesc.id || stateDesc.setattr;
                 this.log.debug(`convert ${key}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)}`);
+                if (has_elevated_debug) this.log.warn(`ELEVATED: convert ${key}, ${safeJsonStringify(preparedValue)}, ${safeJsonStringify(preparedOptions)} for device ${deviceId}`);
 
                 let target;
                 if (model === 'group') {
@@ -753,6 +797,7 @@ class Zigbee extends utils.Adapter {
                 try {
                     const result = await converter.convertSet(target, key, preparedValue, meta);
                     this.log.debug(`convert result ${safeJsonStringify(result)}`);
+                    if (has_elevated_debug) this.log.warn(`ELEVATED: convert result ${safeJsonStringify(result)} for device ${deviceId}`);
                     if (result !== undefined) {
                         if (stateModel && !isGroup) {
                             this.acknowledgeState(deviceId, model, stateDesc, value);
@@ -760,13 +805,16 @@ class Zigbee extends utils.Adapter {
                         // process sync state list
                         this.processSyncStatesList(deviceId, model, syncStateList);
 
-                        if (isGroup) {
-                            await this.callPluginMethod('queryGroupMemberState', [deviceId, stateDesc]);
-                            this.acknowledgeState(deviceId, model, stateDesc, value);
-                        }
+                        //                        if (isGroup) {
+                        //                            await this.callPluginMethod('queryGroupMemberState', [deviceId, stateDesc]);
+                        //                            this.acknowledgeState(deviceId, model, stateDesc, value);
+                        //                        }
                     }
+                    else
+                        if (has_elevated_debug) this.log.warn(`Error convert result for ${key} with ${safeJsonStringify(preparedValue)} is undefined on device ${deviceId}.`);
 
                 } catch (error) {
+                    if (has_elevated_debug) this.log.warn(`caught error ${safeJsonStringify(error)} is undefined on device ${deviceId}.`);
                     this.filterError(`Error ${error.code} on send command to ${deviceId}.` +
                         ` Error: ${error.stack}`, `Send command to ${deviceId} failed with`, error);
                 }
@@ -961,9 +1009,10 @@ class Zigbee extends utils.Adapter {
         const adapterType = this.config.adapterType || 'zstack';
         // https://github.com/ioBroker/ioBroker.zigbee/issues/668
         const extPanIdFix = this.config.extPanIdFix ? this.config.extPanIdFix : false;
-
         const baudRate = parseInt(this.config.baudRate ? this.config.baudRate : 115200);
 
+        const setRtscts = this.config.flowCTRL ? this.config.flowCTRL : false;
+
         return {
             net: {
                 panId: panID,
@@ -974,7 +1023,7 @@ class Zigbee extends utils.Adapter {
             sp: {
                 port: port,
                 baudRate: baudRate,
-                rtscts: false,
+                rtscts: setRtscts,
                 adapter: adapterType,
             },
             dbDir: dbDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.zigbee",
-  "version": "1.10.3",
+  "version": "1.10.11",
   "author": {
     "name": "Kirov Ilya",
     "email": "kirovilya@gmail.com"
@@ -21,32 +21,33 @@
     "serialport": "^12.0.0"
   },
   "dependencies": {
-    "@iobroker/adapter-core": "^3.0.6",
-    "@iobroker/dm-utils": "^0.1.9",
-    "humanize-duration": "^3.31.0",
-    "tar": "^6.2.0",
-    "typescript": "^5.3.3",
-    "zigbee-herdsman": "0.41.2",
-    "zigbee-herdsman-converters": "19.15.0"
+    "@iobroker/adapter-core": "^3.1.3",
+    "@iobroker/dm-utils": "^0.5.0",
+    "humanize-duration": "^3.32.1",
+    "tar": "^7.4.3",
+    "ajv": "^8.17.1",
+    "uri-js": "^4.4.1",
+    "typescript": "^5.6.3",
+    "zigbee-herdsman": "2.1.4",
+    "zigbee-herdsman-converters": "20.28.0"
   },
   "description": "Zigbee devices",
   "devDependencies": {
-    "@alcalzone/release-script": "^3.7.0",
-    "@alcalzone/release-script-plugin-iobroker": "^3.7.0",
+    "@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": "^4.1.0",
-    "axios": "^1.6.8",
-    "chai": "^4.4.1",
+    "@iobroker/testing": "^5.0.0",
+    "chai": "^5.1.2",
     "chai-as-promised": "^7.1.1",
-    "eslint": "^8.57.0",
+    "eslint": "^9.13.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-prettier": "^5.2.1",
     "gulp": "^4.0.2",
     "gulp-jsdoc3": "^3.0.0",
     "gulp-replace": "^1.1.4",
     "mixin-deep": "^2.0.1",
-    "mocha": "^10.4.0"
+    "mocha": "^10.8.2"
   },
   "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
   "keywords": [

package/support/docgen.js

@@ -1,7 +1,7 @@
 /**
  * This script generates the supported devices page.
  *
- */
+
 
 let devices = [...require('zigbee-herdsman-converters').devices];
 
@@ -91,3 +91,5 @@ vendors.forEach((vendor) => {
 });
 
 fs.writeFileSync(outputdir + '/' + file, text);
+
+ */