iobroker.zigbee 1.9.1 → 1.9.3

package/lib/commands.js

@@ -88,7 +88,6 @@ class Commands {
                     break;
                 case 'setState':
                     if (obj && obj.message && typeof obj.message === 'object' && obj.message.id) {
-                        //                        this.adapter.setState(obj.message.id, obj.message.val, false, obj.callback);
                         this.stController.setState_typed(obj.message.id, obj.message.val, false, undefined, obj.callback);
                     }
                     break;
@@ -107,7 +106,6 @@ class Commands {
                         this.setDeviceActivated(obj.from, obj.command, obj.message, obj.callback);
                     }
                     break;
-
             }
         }
     }
@@ -474,13 +472,17 @@ class Commands {
     async cleanDeviceStates(from, command, msg, callback) {
         this.info(`State cleanup with ${JSON.stringify(msg)}`);
         const devicesFromDB = await this.zbController.getClients(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;
                 await this.stController.deleteOrphanedDeviceStates(device.ieeeAddr, model, msg.force);
             }
         }
+        // rebuild retainDeviceNamesDB
+        this.stController.rebuildRetainDeviceNames();
         this.adapter.sendTo(from, command, {}, callback);
     }
 

package/lib/developer.js

@@ -1,151 +1,151 @@
-'use strict';
-
-const ZigbeeHerdsman = require('zigbee-herdsman');
-
-
-class Developer {
-    constructor(adapter) {
-        this.adapter = adapter;
-        this.adapter.on('message', this.onMessage.bind(this));
-    }
-
-    start(zbController, stController) {
-        this.zbController = zbController;
-        this.stController = stController;
-    }
-
-    stop() {
-        delete this.zbController;
-        delete this.stController;
-    }
-
-    info(msg) {
-        this.adapter.log.info(msg);
-    }
-
-    error(msg) {
-        this.adapter.log.error(msg);
-    }
-
-    debug(msg) {
-        this.adapter.log.debug(msg);
-    }
-
-    /**
-     * @param {ioBroker.Message} obj
-     */
-    onMessage(obj) {
-        if (typeof obj === 'object' && obj.command) {
-            switch (obj.command) {
-                case 'reset':
-                    this.zbController.reset(obj.message.mode, err =>
-                        this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
-                    break;
-                case 'sendToZigbee':
-                    this.sendToZigbee(obj);
-                    break;
-                case 'getLibData':
-                    // e.g. zcl lists
-                    this.getLibData(obj);
-                    break;
-            }
-        }
-    }
-
-    getLibData(obj) {
-        const key = obj.message.key;
-        const zcl = ZigbeeHerdsman.Zcl;
-        const result = {};
-        if (key === 'cidList') {
-            result.list = zcl.Cluster;
-        } else if (key === 'attrIdList') {
-            const cid = obj.message.cid;
-            result.list = zcl.Utils.getCluster(cid).attributes;
-        } else if (key === 'cmdListFoundation') {
-            result.list = zcl.Foundation;
-        } else if (key === 'cmdListFunctional') {
-            result.list = null;
-            const cluster = zcl.Utils.getCluster(obj.message.cid);
-            if (typeof cluster != 'undefined') {
-                const extraCmd = cluster.commands;
-                result.list = extraCmd;
-            }
-        } else if (key === 'respCodes') {
-            result.list = zcl.Status;
-        } else if (key === 'typeList') {
-            result.list = zcl.DataType;
-        } else {
-            return;
-        }
-        result.key = key;
-        this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
-    }
-
-    async sendToZigbee(obj) {
-        const zcl = ZigbeeHerdsman.Zcl;
-        const devId = '0x' + obj.message.id.replace(this.adapter.namespace + '.', '');
-        const ep = obj.message.ep ? obj.message.ep : null;
-        const cid = obj.message.cid;
-        const cmdType = obj.message.cmdType;
-        let cmd;
-        const zclData = obj.message.zclData;
-        if (cmdType === 'functional') {
-            cmd = zcl.Utils.getCluster(cid).getCommand(obj.message.cmd);
-        } else if (cmdType === 'functionalResp') {
-            cmd = zcl.Utils.getCluster(cid).getCommandResponse(obj.message.cmd);
-        } else if (cmdType === 'foundation') {
-            cmd = zcl.Utils.getGlobalCommand((obj.message.cmd));
-        } else {
-            this.adapter.sendTo(obj.from, obj.command, {localErr: 'Invalid cmdType'}, obj.callback);
-            return;
-        }
-        const cfg = obj.message.hasOwnProperty('cfg') ? obj.message.cfg : null;
-        let publishTarget;
-        try {
-            publishTarget = this.zbController.getDevice(devId) ? devId : this.zbController.getGroup(parseInt(devId));
-            if (!publishTarget) {
-                this.adapter.sendTo(obj.from, obj.command, {localErr: `Device or group ${devId} not found!`}, obj.callback);
-                return;
-            }
-        } catch (error) {
-            this.error(`SendToZigbee failed from publishTarget ${devId} (${error})`);
-        }
-
-        if (!cid || !cmd) {
-            this.adapter.sendTo(obj.from, obj.command, {localErr: 'Incomplete data (cid or cmd)'}, obj.callback);
-            return;
-        }
-        this.debug(`Ready to send (ep: ${ep}, cid: ${cid}, cmd ${cmd.name}, zcl: ${JSON.stringify(zclData)})`);
-
-        try {
-            await this.zbController.publish(publishTarget, cid, cmd.name, zclData, cfg, ep, cmdType, (err, msg) => {
-                // map err and msg in one object for sendTo
-                const result = {};
-                result.msg = msg;
-                if (err) {
-                    // err is an instance of Error class, it cannot be forwarded to sendTo, just get error code
-                    result.error = err.code;
-                }
-                result.statusCode = 0;
-                this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
-            }, obj.message.zclSeqNum);
-        } catch (exception) {
-            // report exceptions
-            // happens for example if user tries to send write command but did not provide value/type
-            // or unsupported attribute was addressed.
-            const ZclStatusError = require('zigbee-herdsman/dist/zcl/zclStatusError').default;
-            if (exception instanceof ZclStatusError) {
-                const result = {};
-                result.msg = `Zigbee error ${exception.code} received!`;
-                result.statusCode = exception.code;
-                this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
-            } else {
-                this.error(`SendToZigbee failed! (${exception})`);
-                // exception (Error class) cannot be sent to adapter, send string message instead!
-                this.adapter.sendTo(obj.from, obj.command, {msg: exception.message}, obj.callback);
-            }
-        }
-    }
-}
-
-module.exports = Developer;
+'use strict';
+
+const ZigbeeHerdsman = require('zigbee-herdsman');
+
+
+class Developer {
+    constructor(adapter) {
+        this.adapter = adapter;
+        this.adapter.on('message', this.onMessage.bind(this));
+    }
+
+    start(zbController, stController) {
+        this.zbController = zbController;
+        this.stController = stController;
+    }
+
+    stop() {
+        delete this.zbController;
+        delete this.stController;
+    }
+
+    info(msg) {
+        this.adapter.log.info(msg);
+    }
+
+    error(msg) {
+        this.adapter.log.error(msg);
+    }
+
+    debug(msg) {
+        this.adapter.log.debug(msg);
+    }
+
+    /**
+     * @param {ioBroker.Message} obj
+     */
+    onMessage(obj) {
+        if (typeof obj === 'object' && obj.command) {
+            switch (obj.command) {
+                case 'reset':
+                    this.zbController.reset(obj.message.mode, err =>
+                        this.adapter.sendTo(obj.from, obj.command, err, obj.callback));
+                    break;
+                case 'sendToZigbee':
+                    this.sendToZigbee(obj);
+                    break;
+                case 'getLibData':
+                    // e.g. zcl lists
+                    this.getLibData(obj);
+                    break;
+            }
+        }
+    }
+
+    getLibData(obj) {
+        const key = obj.message.key;
+        const zcl = ZigbeeHerdsman.Zcl;
+        const result = {};
+        if (key === 'cidList') {
+            result.list = zcl.Cluster;
+        } else if (key === 'attrIdList') {
+            const cid = obj.message.cid;
+            result.list = zcl.Utils.getCluster(cid).attributes;
+        } else if (key === 'cmdListFoundation') {
+            result.list = zcl.Foundation;
+        } else if (key === 'cmdListFunctional') {
+            result.list = null;
+            const cluster = zcl.Utils.getCluster(obj.message.cid);
+            if (typeof cluster != 'undefined') {
+                const extraCmd = cluster.commands;
+                result.list = extraCmd;
+            }
+        } else if (key === 'respCodes') {
+            result.list = zcl.Status;
+        } else if (key === 'typeList') {
+            result.list = zcl.DataType;
+        } else {
+            return;
+        }
+        result.key = key;
+        this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
+    }
+
+    async sendToZigbee(obj) {
+        const zcl = ZigbeeHerdsman.Zcl;
+        const devId = '0x' + obj.message.id.replace(this.adapter.namespace + '.', '');
+        const ep = obj.message.ep ? obj.message.ep : null;
+        const cid = obj.message.cid;
+        const cmdType = obj.message.cmdType;
+        let cmd;
+        const zclData = obj.message.zclData;
+        if (cmdType === 'functional') {
+            cmd = zcl.Utils.getCluster(cid).getCommand(obj.message.cmd);
+        } else if (cmdType === 'functionalResp') {
+            cmd = zcl.Utils.getCluster(cid).getCommandResponse(obj.message.cmd);
+        } else if (cmdType === 'foundation') {
+            cmd = zcl.Utils.getGlobalCommand((obj.message.cmd));
+        } else {
+            this.adapter.sendTo(obj.from, obj.command, {localErr: 'Invalid cmdType'}, obj.callback);
+            return;
+        }
+        const cfg = obj.message.hasOwnProperty('cfg') ? obj.message.cfg : null;
+        let publishTarget;
+        try {
+            publishTarget = this.zbController.getDevice(devId) ? devId : this.zbController.getGroup(parseInt(devId));
+            if (!publishTarget) {
+                this.adapter.sendTo(obj.from, obj.command, {localErr: `Device or group ${devId} not found!`}, obj.callback);
+                return;
+            }
+        } catch (error) {
+            this.error(`SendToZigbee failed from publishTarget ${devId} (${error})`);
+        }
+
+        if (!cid || !cmd) {
+            this.adapter.sendTo(obj.from, obj.command, {localErr: 'Incomplete data (cid or cmd)'}, obj.callback);
+            return;
+        }
+        this.debug(`Ready to send (ep: ${ep}, cid: ${cid}, cmd ${cmd.name}, zcl: ${JSON.stringify(zclData)})`);
+
+        try {
+            await this.zbController.publish(publishTarget, cid, cmd.name, zclData, cfg, ep, cmdType, (err, msg) => {
+                // map err and msg in one object for sendTo
+                const result = {};
+                result.msg = msg;
+                if (err) {
+                    // err is an instance of Error class, it cannot be forwarded to sendTo, just get error code
+                    result.error = err.code;
+                }
+                result.statusCode = 0;
+                this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
+            }, obj.message.zclSeqNum);
+        } catch (exception) {
+            // report exceptions
+            // happens for example if user tries to send write command but did not provide value/type
+            // or unsupported attribute was addressed.
+            const ZclStatusError = require('zigbee-herdsman/dist/zcl/zclStatusError').default;
+            if (exception instanceof ZclStatusError) {
+                const result = {};
+                result.msg = `Zigbee error ${exception.code} received!`;
+                result.statusCode = exception.code;
+                this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
+            } else {
+                this.error(`SendToZigbee failed! (${exception})`);
+                // exception (Error class) cannot be sent to adapter, send string message instead!
+                this.adapter.sendTo(obj.from, obj.command, {msg: exception.message}, obj.callback);
+            }
+        }
+    }
+}
+
+module.exports = Developer;