iobroker.zigbee 1.6.16 → 1.6.17

package/main.js

@@ -197,6 +197,7 @@ class Zigbee extends utils.Adapter {
         this.zbController.on('event', this.onZigbeeEvent.bind(this));
         this.zbController.on('msg', this.onZigbeeEvent.bind(this));
         this.zbController.on('publish', this.publishToState.bind(this));
+        this.zbController.on('deviceStatusUpdate', this.onDeviceStatusUpdate.bind(this));
         this.zbController.configure(zigbeeOptions);
         await this.callPluginMethod('configure', [zigbeeOptions]);
 
@@ -507,6 +508,21 @@ class Zigbee extends utils.Adapter {
             const stateDesc = changedState.stateDesc;
             const value = changedState.value;
 
+            if (stateDesc.id == 'send_payload') {
+                try {
+                    const json_value = JSON.parse(value);
+                    const payload = { device:deviceId.replace('0x', ''), payload:json_value };
+                    const result = await(this.SendPayload(payload));
+                    if (result.hasOwnProperty('success') && result.success) {
+                        this.acknowledgeState(deviceId, model, stateDesc, value);
+                    }
+                } catch (error) {
+                    this.log.warn(`send_payload: ${value} does not parse as JSON Object : ${error.message}`);
+                    return;
+                }
+                return;
+            }
+
             if (stateDesc.isOption) {
                 // acknowledge state with given value
                 this.acknowledgeState(deviceId, model, stateDesc, value);
@@ -530,6 +546,7 @@ class Zigbee extends utils.Adapter {
                                         await converter.convertGet(entity.device.endpoints[0], ckey, {});
                                     } catch (error) {
                                         this.log.warn(`Failed to read state '${JSON.stringify(ckey)}'of '${entity.device.ieeeAddr}' after query with '${JSON.stringify(error)}'`);
+
                                     }
                                 }
                             }
@@ -615,8 +632,6 @@ class Zigbee extends utils.Adapter {
     // not exposed as states. It serves as a wrapper function for "publishFromState" with
     // extended parameter checking
     //
-    // This function is NEVER called from within the adapter itself. The entire structure
-    // is built for end user use.
     // The payload can either be a JSON object or the string representation of a JSON object
     // The following keys are supported in the object:
     // device: name of the device. For a device zigbee.0.0011223344556677 this would be 0011223344556677
@@ -643,7 +658,6 @@ class Zigbee extends utils.Adapter {
                 const isDevice =  payload.device.indexOf('group_') == -1;
                 const stateList = [];
                 const devID = (isDevice ? `0x${payload.device}`:parseInt(payload.device.replace('group_', '')));
-                this.log.warn(`A ${payload.device} ${devID}`);
 
                 const entity = await this.zbController.resolveEntity(devID);
                 if (!entity) {
@@ -741,6 +755,31 @@ class Zigbee extends utils.Adapter {
             }
         }
     }
+    async onDeviceStatusUpdate(deviceId, status) {
+        if (!deviceId) return;
+
+        this.log.debug(`onDeviceStatusUpdate: ${deviceId}: ${status}`);
+
+        try {
+            let colorIeee = '#46a100ff';
+
+            if (!status) {
+                colorIeee = '#ff0400ff'; // dev is offline
+            }
+
+            if (!this.config.colorize) {
+                colorIeee = null;
+            }
+
+            await this.extendObjectAsync(deviceId, {
+                common: {
+                    color: colorIeee
+                }
+            });
+        } catch (e) {
+            this.log.error(e.toString());
+        }
+    }
 
     /**
      * @param {() => void} callback

package/package.json

@@ -1,77 +1,77 @@
-{
-  "name": "iobroker.zigbee",
-  "version": "1.6.16",
-  "author": {
-    "name": "Kirov Ilya",
-    "email": "kirovilya@gmail.com"
-  },
-  "bugs": {
-    "url": "https://github.com/ioBroker/ioBroker.zigbee/issues"
-  },
-  "contributors": [
-    {
-      "name": "Kirov Ilya",
-      "email": "kirovilya@gmail.com"
-    }
-  ],
-  "engines": {
-    "node": ">=10"
-  },
-  "dependencies": {
-    "zigbee-herdsman": "0.14.16",
-    "zigbee-herdsman-converters": "14.0.422",
-    "@iobroker/adapter-core": "^2.4.0",
-    "tar": "^6.0.5",
-    "typescript": "^4.0.5"
-  },
-  "description": "Zigbee devices",
-  "devDependencies": {
-    "@alcalzone/release-script": "~3.4.2",
-    "@iobroker/testing": "^2.5.4",
-    "axios": "^0.21.1",
-    "mixin-deep": "^1.3.2",
-    "eslint": "^7.18.0",
-    "eslint-config-google": "*",
-    "lint-diff": "*",
-    "chai": "^4.3.4",
-    "chai-as-promised": "^7.1.1",
-    "gulp": "^4.0.2",
-    "gulp-jsdoc3": "^3.0.0",
-    "gulp-replace": "^1.1.3",
-    "mocha": "^9.1.3"
-  },
-  "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
-  "keywords": [
-    "ioBroker",
-    "zigbee",
-    "cc2531",
-    "cc2530",
-    "cc2538",
-    "cc2652",
-    "deconz",
-    "conbee",
-    "raspbee",
-    "ezsp",
-    "efr32"
-  ],
-  "license": "MIT",
-  "main": "main.js",
-  "optionalDependencies": {},
-  "readmeFilename": "README.md",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ioBroker/ioBroker.zigbee.git"
-  },
-  "scripts": {
-    "test": "npm run test:package && npm run test:unit",
-    "docgen": "node support/docgen.js",
-    "test:package": "mocha test/package --exit",
-    "test:unit": "mocha test/unit --exit",
-    "test:integration": "mocha test/integration --exit",
-    "watch:parcel": "parcel admin/src/index.tsx -d admin/build --hmr-port 1235",
-    "test:js": "mocha --opts test/mocha.custom.opts",
-    "lint": "npm run lint:js",
-    "lint:js": "eslint",
-    "release": "release-script"
-  }
-}
+{
+  "name": "iobroker.zigbee",
+  "version": "1.6.17",
+  "author": {
+    "name": "Kirov Ilya",
+    "email": "kirovilya@gmail.com"
+  },
+  "bugs": {
+    "url": "https://github.com/ioBroker/ioBroker.zigbee/issues"
+  },
+  "contributors": [
+    {
+      "name": "Kirov Ilya",
+      "email": "kirovilya@gmail.com"
+    }
+  ],
+  "engines": {
+    "node": ">=10"
+  },
+  "dependencies": {
+    "zigbee-herdsman": "0.14.26",
+    "zigbee-herdsman-converters": "14.0.491",
+    "@iobroker/adapter-core": "^2.4.0",
+    "tar": "^6.0.5",
+    "typescript": "^4.0.5"
+  },
+  "description": "Zigbee devices",
+  "devDependencies": {
+    "@alcalzone/release-script": "~3.4.2",
+    "@iobroker/testing": "^2.5.4",
+    "axios": "^0.21.1",
+    "mixin-deep": "^1.3.2",
+    "eslint": "^7.18.0",
+    "eslint-config-google": "*",
+    "lint-diff": "*",
+    "chai": "^4.3.4",
+    "chai-as-promised": "^7.1.1",
+    "gulp": "^4.0.2",
+    "gulp-jsdoc3": "^3.0.0",
+    "gulp-replace": "^1.1.3",
+    "mocha": "^9.1.3"
+  },
+  "homepage": "https://github.com/ioBroker/ioBroker.zigbee",
+  "keywords": [
+    "ioBroker",
+    "zigbee",
+    "cc2531",
+    "cc2530",
+    "cc2538",
+    "cc2652",
+    "deconz",
+    "conbee",
+    "raspbee",
+    "ezsp",
+    "efr32"
+  ],
+  "license": "MIT",
+  "main": "main.js",
+  "optionalDependencies": {},
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ioBroker/ioBroker.zigbee.git"
+  },
+  "scripts": {
+    "test": "npm run test:package && npm run test:unit",
+    "docgen": "node support/docgen.js",
+    "test:package": "mocha test/package --exit",
+    "test:unit": "mocha test/unit --exit",
+    "test:integration": "mocha test/integration --exit",
+    "watch:parcel": "parcel admin/src/index.tsx -d admin/build --hmr-port 1235",
+    "test:js": "mocha --opts test/mocha.custom.opts",
+    "lint": "npm run lint:js",
+    "lint:js": "eslint",
+    "release": "release-script"
+  }
+}

package/support/docgen.js

@@ -1,93 +1,93 @@
-/**
- * This script generates the supported devices page.
- * 
- */
-
-let devices = [...require('zigbee-herdsman-converters').devices];
-
-for (const device of devices) {
-    if (device.whiteLabel) {
-        for (const whiteLabel of device.whiteLabel) {
-            const whiteLabelDevice = {
-                ...device,
-                model: whiteLabel.model,
-                vendor: whiteLabel.vendor,
-                description: whiteLabel.description,
-                whiteLabelOf: device,
-            };
-
-            delete whiteLabelDevice.whiteLabel;
-
-            devices.push(whiteLabelDevice);
-        }
-    }
-}
-
-devices = new Map(devices.map((d) => [d.model, d]));
-
-const Devices = require('../lib/devices');
-let iobDevices = Devices.devices;
-Devices.fillStatesWithExposes('');
-
-const iobCount = iobDevices.filter((d) => (!d.exposed)).length;
-iobDevices = new Map(iobDevices.map((d) => d.models.map((m) => [m, d])).flat());
-
-const fs = require('fs');
-const outputdir = process.argv[2];
-
-if (!outputdir) {
-    console.error('Please specify an output directory');
-}
-
-const file = 'Supported-devices.md';
-let text = `*NOTE: Automatically generated by 'npm run docgen'* \n\n` +
-    `Currently **${iobDevices.size}**(${iobCount} described in adapter) devices are supported.\n\n` +
-    `(⭐EXP) - means that the device is presented automatically, based on the 'exposes' from the zigbee-herdsman-converters.\n\n`;
-
-const logDevices = (devmodels) => {
-    let result = '';
-
-    devmodels.forEach((devmodel) => {
-        const iobDevice = iobDevices.get(devmodel);
-        const device = devices.get(devmodel);
-        const pathImg = (iobDevice.icon.startsWith('http')) ? devmodel : iobDevice.icon.replace(new RegExp('img/', 'g'), '').replace(new RegExp('.png', 'g'), '');
-        const icon = (iobDevice.icon.startsWith('http')) ? iobDevice.icon : `https://github.com/ioBroker/ioBroker.zigbee/raw/master/admin/${iobDevice.icon}`;
-        let brand;
-        const models = [];
-        let zmodels;
-        if (device.zigbeeModel) {
-            zmodels = device.zigbeeModel;
-        } else {
-            zmodels = [devmodel];
-        }
-        zmodels.forEach((modelId) => {
-            const re = /[^\x20-\x7E]+/g;
-            const model = modelId.replace(re, ' ');
-            const desc = `${device.description} (${device.supports})`;
-            const name = `**${device.model}${(iobDevice.exposed) ? ' (⭐EXP)': ''}**<br>`;
-            if (brand == undefined) {
-                brand= {
-                    name: name,
-                    desc: desc,
-                    pathImg: pathImg,
-                };
-            }
-            models.push(model);
-        });
-        const modelsStr = models.join(', ');
-        result += `| ${brand.name} (${modelsStr}) | ${brand.desc} |  ![${brand.pathImg}](${icon}) |\n`;
-    });
-
-    return result;
-};
-
-const vendors = Array.from(new Set([...iobDevices.keys()].map((m) => (devices.get(m)) ? devices.get(m).vendor : null)));
-vendors.sort();
-text += '|  Model | Description | Picture |\n';
-text += '| ------------- | ------------- | -------------------------- |\n';
-vendors.forEach((vendor) => {
-    text += `|  | **${vendor}**  |   |\n`;   
-    text += logDevices([...iobDevices.keys()].map((m) => devices.get(m)).filter((d) => d && d.vendor === vendor).map((d) => d.model));
-});
-
-fs.writeFileSync(outputdir + '/' + file, text);
+/**
+ * This script generates the supported devices page.
+ * 
+ */
+
+let devices = [...require('zigbee-herdsman-converters').devices];
+
+for (const device of devices) {
+    if (device.whiteLabel) {
+        for (const whiteLabel of device.whiteLabel) {
+            const whiteLabelDevice = {
+                ...device,
+                model: whiteLabel.model,
+                vendor: whiteLabel.vendor,
+                description: whiteLabel.description,
+                whiteLabelOf: device,
+            };
+
+            delete whiteLabelDevice.whiteLabel;
+
+            devices.push(whiteLabelDevice);
+        }
+    }
+}
+
+devices = new Map(devices.map((d) => [d.model, d]));
+
+const Devices = require('../lib/devices');
+let iobDevices = Devices.devices;
+Devices.fillStatesWithExposes('');
+
+const iobCount = iobDevices.filter((d) => (!d.exposed)).length;
+iobDevices = new Map(iobDevices.map((d) => d.models.map((m) => [m, d])).flat());
+
+const fs = require('fs');
+const outputdir = process.argv[2];
+
+if (!outputdir) {
+    console.error('Please specify an output directory');
+}
+
+const file = 'Supported-devices.md';
+let text = `*NOTE: Automatically generated by 'npm run docgen'* \n\n` +
+    `Currently **${iobDevices.size}**(${iobCount} described in adapter) devices are supported.\n\n` +
+    `(⭐EXP) - means that the device is presented automatically, based on the 'exposes' from the zigbee-herdsman-converters.\n\n`;
+
+const logDevices = (devmodels) => {
+    let result = '';
+
+    devmodels.forEach((devmodel) => {
+        const iobDevice = iobDevices.get(devmodel);
+        const device = devices.get(devmodel);
+        const pathImg = (iobDevice.icon.startsWith('http')) ? devmodel : iobDevice.icon.replace(new RegExp('img/', 'g'), '').replace(new RegExp('.png', 'g'), '');
+        const icon = (iobDevice.icon.startsWith('http')) ? iobDevice.icon : `https://github.com/ioBroker/ioBroker.zigbee/raw/master/admin/${iobDevice.icon}`;
+        let brand;
+        const models = [];
+        let zmodels;
+        if (device.zigbeeModel) {
+            zmodels = device.zigbeeModel;
+        } else {
+            zmodels = [devmodel];
+        }
+        zmodels.forEach((modelId) => {
+            const re = /[^\x20-\x7E]+/g;
+            const model = modelId.replace(re, ' ');
+            const desc = `${device.description} (${device.supports})`;
+            const name = `**${device.model}${(iobDevice.exposed) ? ' (⭐EXP)': ''}**<br>`;
+            if (brand == undefined) {
+                brand= {
+                    name: name,
+                    desc: desc,
+                    pathImg: pathImg,
+                };
+            }
+            models.push(model);
+        });
+        const modelsStr = models.join(', ');
+        result += `| ${brand.name} (${modelsStr}) | ${brand.desc} |  ![${brand.pathImg}](${icon}) |\n`;
+    });
+
+    return result;
+};
+
+const vendors = Array.from(new Set([...iobDevices.keys()].map((m) => (devices.get(m)) ? devices.get(m).vendor : null)));
+vendors.sort();
+text += '|  Model | Description | Picture |\n';
+text += '| ------------- | ------------- | -------------------------- |\n';
+vendors.forEach((vendor) => {
+    text += `|  | **${vendor}**  |   |\n`;   
+    text += logDevices([...iobDevices.keys()].map((m) => devices.get(m)).filter((d) => d && d.vendor === vendor).map((d) => d.model));
+});
+
+fs.writeFileSync(outputdir + '/' + file, text);