iobroker.zigbee 3.0.3 → 3.1.2

package/lib/commands.js

@@ -196,7 +196,7 @@ class Commands {
         }
         catch (error) {
             const msg = `Unable to read nvBackup ${error && error.message ? error.message : 'no message given'}`;
-            this.error(msg);
+            //this.error(msg);
             this.adapter.sendTo(from, command, {error:msg}, callback)
         }
     }
@@ -240,12 +240,20 @@ class Commands {
     }
 
     async letsPairing(from, command, message, callback) {
-        if (this.zbController) {
+        if (this.zbController && this.zbController.herdsmanStarted) {
             let devId = '';
             if (message) {
                 if (message.id && message.id != undefined) {
                     devId = getZbId(message.id);
                 }
+                if (typeof devId == 'number') {
+                    this.adapter.sendTo(
+                        from, command,
+                        {error: 'Pairing on a group is not supported'},
+                        callback
+                    );
+                    return;
+                }
                 if (message.code && message.code != undefined) {
                     try {
                         this.debug(`letsPairing called with code ${message.code}`);
@@ -273,23 +281,28 @@ class Commands {
             }
             // allow devices to join the network within 60 secs
             // this.adapter.logToPairing('Pairing started ' + devId, true);
-
             let cTimer = Number(this.adapter.config.countDown);
             if (!this.adapter.config.countDown || !cTimer) {
                 cTimer = 60;
             }
+            if (message.stop) cTimer = 0;
 
-            this.zbController.permitJoin(cTimer, devId, err => {
-                if (!err) {
-                    // set pairing mode on
-                    this.adapter.setState('info.pairingMode', true);
-                }
-            });
-            this.adapter.sendTo(from, command, 'Start pairing!', callback);
-        } else {
+            if (await this.zbController.permitJoin(cTimer, devId)) {
+                this.adapter.setState('info.pairingMode', cTimer > 0, true);
+                this.adapter.sendTo(from, command, cTimer ? 'Start pairing!':'Stop pairing!', callback);
+            }
+            else {
+                this.adapter.sendTo(
+                    from, command,
+                    {error: 'Error opening the network'},
+                    callback
+                );
+            }
+        }
+        else {
             this.adapter.sendTo(
                 from, command,
-                {error: 'You need to setup serial port and start the adapter before pairing!'},
+                {error: 'No connection to zigbee Hardware!'},
                 callback
             );
         }
@@ -389,23 +402,25 @@ class Commands {
                                 if (groupmembers && groupmembers.length > 0) {
                                     const memberinfo = [];
                                     for (const member of groupmembers) {
-                                        if (groups) {
-                                            const grouparray = groups[member.ieee];
-                                            if (grouparray) {
-                                                if (!grouparray.includes(groupID)) {
-                                                    groups[member.ieee].push(groupID);
+                                        if (member && typeof member.ieee === 'string') {
+                                            if (groups) {
+                                                const grouparray = groups[member.ieee];
+                                                if (grouparray) {
+                                                    if (!grouparray.includes(groupID)) {
+                                                        groups[member.ieee].push(groupID);
+                                                    }
+                                                } else {
+                                                    groups[member.ieee] = [groupID];
                                                 }
+                                            }
+                                            const device = await this.adapter.getObjectAsync(`${this.adapter.namespace}.${member.ieee.substr(2)}`);
+                                            if (device) {
+                                                member.device = device.common.name;
                                             } else {
-                                                groups[member.ieee] = [groupID];
+                                                member.device = 'unknown';
                                             }
+                                            memberinfo.push(member);
                                         }
-                                        const device = await this.adapter.getObjectAsync(`${this.adapter.namespace}.${member.ieee.substr(2)}`);
-                                        if (device) {
-                                            member.device = device.common.name;
-                                        } else {
-                                            member.device = 'unknown';
-                                        }
-                                        memberinfo.push(member);
                                     }
                                     devInfo.memberinfo = memberinfo;
                                     this.debug(`memberinfo for ${match[1]}: ${JSON.stringify(devInfo.memberinfo)}`);
@@ -464,7 +479,7 @@ class Commands {
                     if (!id) {
                         for (const d of pairedDevices) {
                             const device = await this.zbController.resolveEntity(d.ieeeAddr);
-                            if (!device) {
+                            if (!device || !device.device) {
                                 continue;
                             }
                             const exists = devices.find((dev) => (dev._id && device.device.ieeeAddr === getZbId(dev._id)));
@@ -506,76 +521,84 @@ class Commands {
 
 
     async getCoordinatorInfo(from, command, callback) {
-        if (this.zbController && this.zbController.herdsmanStarted) {
-            const coordinatorinfo = {
-                installSource: 'IADefault_1',
-                channel: '-1',
-                port: 'Default_1',
-                installedVersion: 'Default_1',
-                type: 'Default_1',
-                revision: 'Default_1',
-                version: '9-9.9.9.9'
-            };
-
-            const coordinatorVersion = await this.adapter.zbController.herdsman.getCoordinatorVersion();
-
-            await this.adapter.getForeignObject(`system.adapter.${this.adapter.namespace}`, (err, obj) => {
-                if (!err && obj) {
-                    if (obj.common.installedFrom && obj.common.installedFrom.includes('://')) {
-                        const instFrom = obj.common.installedFrom;
-                        coordinatorinfo.installSource = instFrom.replace('tarball', 'commit');
-                    } else {
-                        coordinatorinfo.installSource = obj.common.installedFrom;
-                    }
+        const coordinatorinfo = {
+            installSource: 'IADefault_1',
+            channel: '-1',
+            port: 'Default_1',
+            installedVersion: 'Default_1',
+            type: 'Default_1',
+            revision: 'unknown',
+            version: 'unknown',
+            herdsman: this.adapter.zhversion,
+            converters: this.adapter.zhcversion,
+        };
+
+        const coordinatorVersion =  this.zbController && this.zbController.herdsmanStarted ? await this.adapter.zbController.herdsman.getCoordinatorVersion() : {};
+
+        await this.adapter.getForeignObject(`system.adapter.${this.adapter.namespace}`, (err, obj) => {
+            if (!err && obj) {
+                if (obj.common.installedFrom && obj.common.installedFrom.includes('://')) {
+                    const instFrom = obj.common.installedFrom;
+                    coordinatorinfo.installSource = instFrom.replace('tarball', 'commit');
+                } else {
+                    coordinatorinfo.installSource = obj.common.installedFrom;
                 }
-                try {
-                    coordinatorinfo.port = obj.native.port;
-                    coordinatorinfo.channel = obj.native.channel;
-                    coordinatorinfo.installedVersion = obj.native.version;
-                    if (coordinatorVersion && coordinatorVersion.type && coordinatorVersion.meta) {
-                        coordinatorinfo.type = coordinatorVersion.type;
-                        const meta = coordinatorVersion.meta;
-                        if (meta) {
-                            if (meta.hasOwnProperty('revision')) {
-                                coordinatorinfo.revision = meta.revision;
-                            }
-                            let vt = 'x-';
-                            if (meta.hasOwnProperty('transportrev')) {
-                                vt = meta.transportrev + '-';
-                            }
-                            if (meta.hasOwnProperty('product')) {
-                                vt = vt + meta.product + '.';
-                            } else {
-                                vt = vt + 'x.';
-                            }
-                            if (meta.hasOwnProperty('majorrel')) {
-                                vt = vt + meta.majorrel + '.';
-                            } else {
-                                vt = vt + 'x.';
-                            }
-                            if (meta.hasOwnProperty('minorrel')) {
-                                vt = vt + meta.minorrel + '.';
-                            } else {
-                                vt = vt + 'x.';
-                            }
-                            if (meta.hasOwnProperty('maintrel')) {
-                                vt = vt + meta.maintrel + '.';
-                            } else {
-                                vt = vt + 'x.';
-                            }
-                            coordinatorinfo.version = vt;
+            }
+            try {
+                coordinatorinfo.port = obj.native.port;
+                coordinatorinfo.type = obj.native.adapterType;
+                coordinatorinfo.channel = obj.native.channel;
+                coordinatorinfo.installedVersion = obj.common.version;
+                if (coordinatorVersion && coordinatorVersion.type && coordinatorVersion.meta) {
+                    coordinatorinfo.type = coordinatorVersion.type;
+                    const meta = coordinatorVersion.meta;
+                    if (typeof meta == 'object') {
+                        if (meta.hasOwnProperty('revision')) {
+                            coordinatorinfo.revision = meta.revision;
+                        }
+                        let vt = 'x-';
+                        if (meta.hasOwnProperty('transportrev')) {
+                            vt = meta.transportrev + '-';
+                        }
+                        if (meta.hasOwnProperty('product')) {
+                            vt = vt + meta.product + '.';
+                        } else {
+                            vt = vt + 'x.';
+                        }
+                        if (meta.hasOwnProperty('majorrel')) {
+                            vt = vt + meta.majorrel + '.';
+                        } else {
+                            vt = vt + 'x.';
+                        }
+                        if (meta.hasOwnProperty('minorrel')) {
+                            vt = vt + meta.minorrel + '.';
+                        } else {
+                            vt = vt + 'x.';
                         }
+                        if (meta.hasOwnProperty('maintrel')) {
+                            vt = vt + meta.maintrel + '.';
+                        } else {
+                            vt = vt + 'x.';
+                        }
+                        coordinatorinfo.version = vt;
+                    }
+                    else {
+                        coordinatorinfo.version = 'illegal data';
+                        coordinatorinfo.revision = 'illegal data';
                     }
-                } catch {
-                    this.warn('exception raised in getCoordinatorInfo');
                 }
+                else {
+                    coordinatorinfo.version = 'not connected';
+                    coordinatorinfo.revision = 'not connected';
 
-                this.debug(`getCoordinatorInfo result: ${JSON.stringify(coordinatorinfo)}`);
-                this.adapter.sendTo(from, command, coordinatorinfo, callback);
-            });
-        } else {
-            this.adapter.sendTo(from, command, {error: 'No active connection to Zigbee Hardware!'}, callback);
-        }
+                }
+            } catch {
+                this.warn('exception raised in getCoordinatorInfo');
+            }
+
+            this.debug(`getCoordinatorInfo result: ${JSON.stringify(coordinatorinfo)}`);
+            this.adapter.sendTo(from, command, coordinatorinfo, callback);
+        });
     }
 
 
@@ -598,18 +621,19 @@ class Commands {
             this.debug(`deleteDevice sysid: ${sysid}`);
             const dev = this.zbController.getDevice(sysid);
             if (!dev) {
-                this.debug('Not found!');
-                this.debug(`Try delete dev ${devId} from iobroker.`);
+                this.info(`Attempted to delete device ${devId} - the device is not known to the zigbee controller.`);
                 this.stController.deleteObj(devId, () =>
                     this.adapter.sendTo(from, command, {}, callback));
                 return;
             }
+            this.info(`${force ? 'Force removing' : 'Gracefully removing '} device ${devId} from the network.`);
             this.zbController.remove(sysid, force, err => {
                 if (!err) {
-                    this.stController.deleteObj(devId, () =>
-                        this.adapter.sendTo(from, command, {}, callback));
+                    this.info('Device removed from the network, deleting objects.')
+                    this.stController.deleteObj(devId, () => {
+                        this.adapter.sendTo(from, command, {}, callback);
+                    });
                 } else {
-                    this.debug(`Error on remove! ${err}`);
                     this.adapter.sendTo(from, command, {error: err}, callback);
                 }
             });
@@ -710,7 +734,7 @@ class Commands {
     async updateLocalConfigItems(from, command, msg, callback) {
         if (this.stController) {
             this.debug(`updateLocalConfigItems : ${JSON.stringify(msg)}`);
-            const target = msg.global ? msg.target : msg.target.replace(`${this.adapter.namespace}.`, '');
+            const target = msg.target.replace(`${this.adapter.namespace}.`, '');
             const entity = await this.zbController.resolveEntity(target);
             //this.warn('entity for ' + target + ' is '+ JSON.stringify(entity))
             if (entity && !entity.mapped) {
@@ -794,6 +818,13 @@ class Commands {
     }
 
     async testConnection(from, command, msg, callback) {
+        const result = await this.adapter.testConnection(msg.address, true);
+        if (result.error) {
+            this.error(result.error);
+            this.adapter.logToPairing(`Error: ${result.error}`)
+        }
+        this.adapter.sendTo(from, command, result, callback);
+        /*
         this.debug(`TestConnection with ${JSON.stringify(msg)}`);
         if (msg && msg.address) {
             const netAddress = getNetAddress(msg.address);
@@ -851,6 +882,7 @@ class Commands {
                 }
             }
         }
+        */
     }
 }
 

package/lib/developer.js

@@ -112,7 +112,7 @@ class Developer {
                 return;
             }
         } catch (error) {
-            this.error(`SendToZigbee failed from publishTarget ${devId} (${error})`);
+            this.error(`SendToZigbee failed from publishTarget ${devId} (${error && error.message ? error.message : 'no details given'})`);
         }
 
         if (!cid || !cmd) {

package/lib/devices.js

@@ -119,11 +119,12 @@ const sync = {
     },
 };
 
-const lightStatesWithColortemp = [states.state, states.brightness, states.colortemp, states.brightness_move, states.colortemp_move, states.transition_time];
-const lightStatesWithColor = [states.state, states.brightness, states.colortemp, states.color, states.brightness_move, states.colortemp_move, states.transition_time];
-const lightStatesWithColor_hue = [states.state, states.brightness, states.colortemp, states.color, states.brightness_move, states.colortemp_move, states.hue_move, states.transition_time, states.effect_type_hue];
-const lightStatesWithColorNoTemp = [states.state, states.brightness, states.color, states.brightness_move, states.transition_time];
-const lightStates = [states.state, states.brightness, states.brightness_move, states.transition_time];
+const lightStates = [states.state, states.brightness, states.brightness_move, states.transition_time, states.brightness_step];
+const lightStatesWithColortemp = [...lightStates, states.colortemp, states.colortemp_move];
+const lightStatesWithColor = [...lightStatesWithColortemp, states.color];
+const lightStatesWithColor_hue = [...lightStatesWithColor, states.hue_move, states.transition_time, states.effect_type_hue];
+const lightStatesWithColorNoTemp = [...lightStates, states.color];
+const onOffStates = [states.state];
 
 const gl_lightStatesWithColor = [states.gl_state, states.gl_brightness, states.gl_colortemp, states.gl_color, states.transition_time];
 const gl_white_channel = [states.white_brightness, states.white_state, states.white_colortemp];
@@ -3072,7 +3073,7 @@ const commonStates = [
 const DevicesByModel = new Map();
 const LegacyDevicesByModel = new Map();
 
-const groupStates = [states.brightness_step].concat(lightStatesWithColor);
+const groupStates = [states.groupstateupdate, states.groupmemberupdate, states.brightness_step].concat(lightStatesWithColor);
 
 function getByModel() {
     DevicesByModel.clear();
@@ -3171,8 +3172,11 @@ module.exports = {
     devices,
     legacy_devices,
     commonStates,
+    commonGroupStates: [...commonStates, states.groupmemberupdate, states.groupstateupdate],
     groupStates,
-    groupsState: states.groups,
+    lightStatesWithColor,
+    onOffStates,
+    lightStates,
     fillStatesWithExposes,
     addExposeToDevices,
     getByModel,

package/lib/exposes.js

@@ -412,14 +412,25 @@ function createFromExposes(model, def, device, log) {
                             return {...options, transition: transitionTime};
                         },
                         getter: payload => {
-                            if (typeof payload.color == 'object') {
-                                // Requires testing!
+                            // Requires testing!
+
+                            try {
+                                // JSON
+                                const colorJSON = JSON.parse(payload.replaceAll("'",'"'));
+                                const numProp = Object.keys(colorJSON).length;
                                 if (hasMultipleProperties(colorJSON, ['r', 'g', 'b'], numProp)) {
                                     const hexstring = (colorJSON.r*65536 + colorJSON.g * 256 + colorJSON.b).toString(16).padStart(6);
                                     return `#${hexstring.substring(2)}`;
                                 }
+                                return undefined;
+                            }
+                            catch {
+                                // intentionally empty;
                             }
-                            if (typeof payload.color === 'string' && payload.color.startsWith('#')) return payload.color;
+                            if (payload.color.startsWith('#')) return payload.color;
+                            const p = payload.replace('0x', '');
+                            const m = p.match(/[0123456789abcdefABCDEF]+/);
+                            if (p.length < 7 && m && m[0].length == p.length) return '#000000'.substring(0, 7-p.length) + p;
                             return undefined;
                         },
                         epname: expose.endpoint,