iobroker.zigbee 1.10.13 → 2.0.0

package/lib/devices.js

@@ -306,7 +306,8 @@ const generator = {
                     setattr: 'state',
                 });
             }
-            if (endpoint.supportsOutputCluster('genMultistateInput')) {
+            if (endpoint.supportsOutputCluster('genMultistateInput') || endpoint.clusters.hasOwnProperty('genMultistateInput'))
+            {
                 devstates.push({
                     id: `channel_${epID}.click`,
                     prop: 'action',
@@ -343,6 +344,18 @@ const generator = {
                     isEvent: true,
                     getter: payload => payload.action === `tripple_${epName}` ? true : undefined,
                 });
+                devstates.push({
+                    id: `channel_${epID}.hold`,
+                    prop: 'action',
+                    name: `long click event`,
+                    icon: undefined,
+                    role: 'button',
+                    write: false,
+                    read: true,
+                    type: 'boolean',
+                    isEvent: true,
+                    getter: payload => payload.action === `hold_${epName}` ? true : undefined,
+                });
             }
             if (endpoint.supportsOutputCluster('genLevelCtrl')) {
                 devstates.push({
@@ -487,7 +500,7 @@ const generator = {
         });
         return icasa_states;
     },
-    ptvo_switch: (entity) => {
+    /*ptvo_switch: (entity) => {
         const devstates = [];
         for (const endpoint of entity.device.endpoints) {
             const epID = endpoint.ID;
@@ -566,7 +579,7 @@ const generator = {
             }
         }
         return devstates;
-    },
+    },*/
 };
 
 function states_with_epname(entity, states) {
@@ -3094,6 +3107,10 @@ const devices = [
         models: ['E2204'],
         icon: 'img/E2204.png',
     },
+    {
+        models: ['L1(ZW)'],
+        icon: 'img/TS0502B.png',
+    },
 ];
 
 const commonStates = [

package/lib/exposes.js

@@ -681,12 +681,15 @@ function createFromExposes(model, def) {
                         if (!Array.isArray(expose.values)) break;
                         const hasHold = expose.values.find((actionName) => actionName.includes('hold'));
                         const hasRelease = expose.values.find((actionName) => actionName.includes('release'));
+                        const hasPress = expose.values.find((actionName) => actionName.includes('press'));
+                        const hasPressRelease = expose.values.find((actionName) => actionName.includes('press_release'));
                         for (const actionName of expose.values) {
                             // is release state ? - skip
                             if (hasHold && hasRelease && actionName.includes('release')) continue;
                             // is hold state ?
                             if (hasHold && hasRelease && actionName.includes('hold')) {
                                 const releaseActionName = actionName.replace('hold', 'release');
+                                const releaseActionName2 = actionName.concat('_release');
                                 state = {
                                     id: actionName.replace(/\*/g, ''),
                                     prop: 'action',
@@ -696,9 +699,11 @@ function createFromExposes(model, def) {
                                     write: false,
                                     read: true,
                                     type: 'boolean',
-                                    getter: payload => payload.action === actionName ? true : (payload.action === releaseActionName ? false : undefined),
+                                    getter: payload => payload.action === actionName ? true : (payload.action === releaseActionName || payload.action === releaseActionName2 ? false : undefined),
                                 };
-                            } else {
+                            } else if (hasPress && hasPressRelease && actionName.includes('press')) {
+                                let getterKey = actionName.concat('_release');
+                                if (expose.values.indexOf(getterKey) < 0) getterKey = actionName;
                                 state = {
                                     id: actionName.replace(/\*/g, ''),
                                     prop: 'action',
@@ -708,10 +713,23 @@ function createFromExposes(model, def) {
                                     write: false,
                                     read: true,
                                     type: 'boolean',
+                                    getter: payload => payload.action === getterKey ? true : undefined,
+                                    isEvent: true,
+                                };
+                            } else {
+			        			state = {
+                                    id: actionName.replace(/\*/g, ''),
+                                    prop: 'action',
+                                    name: actionName,
+                                    icon: undefined,
+                                    role: 'button',
+                                    write: false,
+                                    read: true,
+                                    type: 'boolean',
                                     getter: payload => payload.action === actionName ? true : undefined,
                                     isEvent: true,
                                 };
-                            }
+                            };
                             pushToStates(state, expose.access);
                         }
                         state = null;

package/lib/groups.js

@@ -85,7 +85,7 @@ class Groups {
             }
 
         } catch (error) {
-            if (error) this.error(`getGroupMembersFromController: error is  ${JSON.stringify(error)} ${JSON.stringify(new Error().stack)}`);
+            if (error) this.error(`getGroupMembersFromController: error is  ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
             else this.error('unidentifed error in getGroupMembersFromController');
         }
         return members;
@@ -93,28 +93,28 @@ class Groups {
 
     async getGroups(obj) {
         const response = {groups: {}};
-        try {
-            // const groupsState = await this.adapter.getStateAsync('info.groups');
-            const herdsmanGroups = await this.zbController.getGroups();
-
-            // const groups = (groupsState && groupsState.val) ? JSON.parse(groupsState.val) : {};
 
-            const groups = {};
-            if (typeof herdsmanGroups === 'object') {
-                for (const group of herdsmanGroups) {
-                    const gid = group.groupID;
-                    if (gid) {
-                        groups[gid] = this.stController.verifyDeviceName(`group_${gid}`, `Group ${gid}`);
+        const isEnable = await this.adapter.getStateAsync('info.connection');
+        if (isEnable.val) {
+            try {
+                const herdsmanGroups = await this.zbController.getGroups();
+                const groups = {};
+                if (typeof herdsmanGroups === 'object') {
+                    for (const group of herdsmanGroups) {
+                        const gid = group.groupID;
+                        if (gid) {
+                            groups[gid] = this.stController.verifyDeviceName(`group_${gid}`, `Group ${gid}`);
+                        }
                     }
                 }
+                this.debug(`getGroups result: ${JSON.stringify(groups)}`);
+                response.groups = groups;
+            } catch (error) {
+                response.error = `res getGroups: caught error: ${error}`;
+                this.error(`getGroups: caught error: ${error}`);
+            } finally {
+                obj && this.adapter.sendTo(obj.from, obj.command, response, obj.callback);
             }
-            this.debug(`getGroups result: ${JSON.stringify(groups)}`);
-            response.groups = groups;
-        } catch (error) {
-            response.error = `getGroups: caught error: ${error}`;
-            this.error(`getGroups: caught error: ${error}`);
-        } finally {
-            obj && this.adapter.sendTo(obj.from, obj.command, response, obj.callback);
         }
         return response.groups;
     }
@@ -138,7 +138,7 @@ class Groups {
                 for (const gpid of groups[epid]) {
                     const gpidn = parseInt(gpid);
                     if (gpidn < 0) {
-                        this.warn(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` );
+                        this.debug(`calling removeDevFromGroup with ${sysid}, ${-gpidn}, ${epid}` );
                         const response = await this.zbController.removeDevFromGroup(sysid, (-gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -146,7 +146,7 @@ class Groups {
                         }
 
                     } else if (gpidn > 0) {
-                        this.warn(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` );
+                        this.debug(`calling addDevToGroup with ${sysid}, ${gpidn}, ${epid}` );
                         const response = await this.zbController.addDevToGroup(sysid, (gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
@@ -158,7 +158,7 @@ class Groups {
                 }
             }
         } catch (e) {
-            this.warn('caught error ' + JSON.stringify(e) + ' in updateGroupMembership');
+            this.warn('caught error ' + (e && e.message ? e.message : 'no error message') + ' in updateGroupMembership');
             this.adapter.sendTo(from, command, {error: e}, callback);
             return;
         }
@@ -207,7 +207,7 @@ class Groups {
 
     async deleteGroup(from, command, message) {
         await this.zbController.removeGroupById(message);
-        await this.stController.deleteGroupById(`group_${parseInt(message)}`);
+        await this.stController.deleteObj(`group_${parseInt(message)}`);
     }
 
     async renameGroup(from, command, message) {
@@ -223,8 +223,6 @@ class Groups {
                 this.warn(`renameGroup caught error ${JSON.stringify(e.code)}`);
             }
         }
-        // objGroups[message.id.toString()] = message.name;
-        // await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
 
         const group = await this.adapter.getStateAsync(id);
         if (!group) {
@@ -306,7 +304,7 @@ class Groups {
                         if (dev.common.type === 'group') {
                             const groupid = parseInt(dev.native.id);
                             if (!usedGroupsIds.includes(groupid)) {
-                                this.stController.deleteDeviceStates(`group_${groupid}`);
+                                this.stController.deleteObj(`group_${groupid}`);
                             }
                         }
                     });

package/lib/statescontroller.js

@@ -8,7 +8,7 @@ const fs = require('fs');
 const axios = require('axios');
 
 let savedDeviceNamesDB = {};
-const knownUndefinedDevices = {};
+
 
 class StatesController extends EventEmitter {
     constructor(adapter) {
@@ -54,9 +54,9 @@ class StatesController extends EventEmitter {
     retainDeviceNames() {
         clearTimeout(this.retTimeoutHandle);
         this.retTimeoutHanlde = setTimeout(() => {
-            fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNamesDB, null, 2), err => {
-                if (err) {
-                    this.error(`error saving device names: ${JSON.stringify(err)}`);
+            fs.writeFile(this.dev_names_fn, JSON.stringify(savedDeviceNamesDB, null, 2), error => {
+                if (error) {
+                    this.error(`error saving device names: ${(error && error.message ? error.message : 'no error message')} ${(error && error.stack ? error.stack : 'no call stack')}`);
                 } else {
                     this.debug('saved device names');
                 }
@@ -75,7 +75,6 @@ class StatesController extends EventEmitter {
             }
         });
 
-        this.adapter.setStateAsync(`info.undefinedDevices`, JSON.stringify(knownUndefinedDevices), true);
     }
 
     checkDebugDevice(dev) {
@@ -95,9 +94,6 @@ class StatesController extends EventEmitter {
         if (!this.adapter.zbController || !this.adapter.zbController.connected()) {
             return;
         }
-        if (this.debugDevices === undefined) {
-            this.getDebugDevices();
-        }
         if (state && !state.ack) {
             if (id.endsWith('pairingCountdown') || id.endsWith('pairingMessage') || id.endsWith('connection')) {
                 return;
@@ -112,7 +108,8 @@ class StatesController extends EventEmitter {
                 return;
             }
 
-            if (this.checkDebugDevice(id)) this.warn(`ELEVATED: User stateChange ${id} ${JSON.stringify(state)}`);
+            if (this.checkDebugDevice(id))
+                this.warn(`ELEVATED O01: User state change of state ${id} with value ${state.val} (ack: ${state.ack}) from ${state.from}`);
 
             this.debug(`User stateChange ${id} ${JSON.stringify(state)}`);
             const devId = getAdId(this.adapter, id); // iobroker device id
@@ -191,13 +188,7 @@ class StatesController extends EventEmitter {
             } else {
                 stateModel = statesMapping.findModel(model);
                 if (!stateModel) {
-                    if (knownUndefinedDevices[deviceId]) {
-                        knownUndefinedDevices[deviceId]++;
-                    } else {
-                        knownUndefinedDevices[deviceId] = 1;
-                        this.info(`Device ${deviceId} "${model}" not present in statesMapping - relying on exposes for device definition.`);
-                    }
-                    this.adapter.setStateAsync(`info.undefinedDevices`, JSON.stringify(knownUndefinedDevices), true);
+                    this.info(`Device ${deviceId} "${model}" not present in statesMapping - relying on exposes for device definition.`);
                     states = statesMapping.commonStates;
                 } else {
                     states = stateModel.states;
@@ -217,15 +208,14 @@ class StatesController extends EventEmitter {
     }
 
     async publishFromState(deviceId, model, stateKey, state, options) {
-        if (this.debugDevices === undefined) this.getDebugDevices();
         this.debug(`Change state '${stateKey}' at device ${deviceId} type '${model}'`);
         const elevated = this.checkDebugDevice(deviceId);
 
-        if (elevated) this.warn(`ELEVATED Change state '${stateKey}' at device ${deviceId} type '${model}'`);
+        if (elevated) this.warn(`ELEVATED O02: Change state '${stateKey}' at device ${deviceId} type '${model}'`);
 
         const devStates = await this.getDevStates(deviceId, model);
         if (!devStates) {
-            if (elevated) this.error(`ELEVATED no device states for device ${deviceId} type '${model}'`);
+            if (elevated) this.error(`ELEVATED OE1: no device states for device ${deviceId} type '${model}'`);
             return;
         }
         const commonStates = statesMapping.commonStates.find(statedesc => stateKey === statedesc.id);
@@ -238,7 +228,8 @@ class StatesController extends EventEmitter {
 
         const value = state.val;
         if (value === undefined || value === '') {
-            if (elevated) this.error(`ELEVATED no value for device ${deviceId} type '${model}'`);
+            if (elevated)
+                this.error(`ELEVATED OE2: no value for device ${deviceId} type '${model}'`);
             return;
         }
         let stateList = [{stateDesc: stateDesc, value: value, index: 0, timeout: 0}];
@@ -308,18 +299,7 @@ class StatesController extends EventEmitter {
         return savedDeviceNamesDB[savedId];
     }
 
-    deleteDeviceStates(devId, callback) {
-        this.adapter.getStatesOf(devId, (err, states) => {
-            if (!err && states) {
-                states.forEach(state =>
-                    this.adapter.deleteState(devId, null, state._id));
-            }
-            this.adapter.delObject(devId, () =>
-                callback && callback());
-        });
-    }
-
-    async deleteGroupById(devId) {
+    async deleteObj(devId) {
         const options = { recursive:true };
         try {
             this.adapter.delObject(devId,options), (err) => { }
@@ -329,7 +309,6 @@ class StatesController extends EventEmitter {
         }
     }
 
-
     async deleteOrphanedDeviceStates(ieeeAddr, model, force, callback) {
         const devStates = await this.getDevStates(ieeeAddr, model);
         const commonStates = statesMapping.commonStates;
@@ -620,19 +599,20 @@ class StatesController extends EventEmitter {
     async publishToState(devId, model, payload) {
         const devStates = await this.getDevStates(`0x${devId}`, model);
         let has_debug = false;
-        if (this.debugDevices === undefined) this.getDebugDevices();
         if (this.checkDebugDevice(devId))
         {
             if (!payload.hasOwnProperty('msg_from_zigbee')) {
-                this.warn(`ELEVATED publishToState: message received '${JSON.stringify(payload)}' from device ${devId} type '${model}'`);
+                this.warn(`ELEVATED I1: message received '${JSON.stringify(payload)}' from device ${devId} type '${model}'`);
                 has_debug = true;
             }
         }
         if (!devStates) {
-            if (has_debug) this.error(`ELEVATED publishToState: no device states for device ${devId} type '${model}'`)
+            if (has_debug) this.error(`ELEVATED IE2: no device states for device ${devId} type '${model}'`)
             return;
         }
         // find states for payload
+        let has_published = false;
+
         if (devStates.states !== undefined) {
             try {
                 const states = statesMapping.commonStates.concat(
@@ -655,7 +635,7 @@ class StatesController extends EventEmitter {
                     let stateID = statedesc.id;
 
                     if (has_debug && statedesc.id !== 'msg_from_zigbee') {
-                        this.warn(`ELEVATED publishToState: value generated '${JSON.stringify(value)}' from device ${devId} for '${statedesc.name}'`);
+                        this.warn(`ELEVATED I2: value generated '${JSON.stringify(value)}' from device ${devId} for '${statedesc.name}'`);
                     }
 
                     const common = {
@@ -693,11 +673,22 @@ class StatesController extends EventEmitter {
                             this.updateState(devId, stateID, value, common);
                         }
                     }
+                    has_published = true;
                 }
             } catch (e) {
                 this.debug(`No states in device ${devId} : payload ${JSON.stringify(payload)}`);
+                if (has_debug)
+                    this.error(`ELEVATED IE3: error when enumerating states of ${devId} for payload ${JSON.stringify(payload)}, ${(e ? e.name : 'undefined')} (${(e ? e.message : '')}).`);
+            }
+            if (!has_published && has_debug) {
+                this.error(`ELEVATED IE4: No value published for device ${devId}`);
+
             }
         }
+        else {
+            if (has_debug)
+                this.error(`ELEVATED IE5: No states matching the payload ${JSON.stringify(payload)} for device ${devId}`);
+        }
     }
 }
 

package/lib/zbDeviceAvailability.js

@@ -181,7 +181,7 @@ class DeviceAvailability extends BaseExtension {
                 }
             } catch (error) {
                 this.sendError(error);
-                this.debug(`Exception in readState of '${device.ieeeAddr}' - error : '${error}'`);
+                this.debug(`Exception in readState of '${device.ieeeAddr}' - error : '${(error && error.message ? error.message : 'no error message')}'`);
                 // intentionally empty: Just present to ensure we cause no harm
                 // when reading the state fails. => fall back on standard Ping function
             }

package/lib/zbDeviceEvent.js

@@ -36,11 +36,22 @@ class DeviceEvent extends BaseExtension {
 
     async callOnEvent(device, type, data, mappedDevice) {
         if (!mappedDevice) {
-            mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
+            try {
+                mappedDevice = await zigbeeHerdsmanConverters.findByDevice(device);
+            }
+            catch (error) {
+                this.log.error(`onEvent: unable to find mapped device for ${JSON.stringify(device)} `);
+                return;
+            }
         }
 
         if (mappedDevice && mappedDevice.onEvent) {
-            mappedDevice.onEvent(type, data, device,mappedDevice.options,'{}');
+            try {
+                mappedDevice.onEvent(type, data, device,mappedDevice.options,'{}');
+            }
+            catch (error) {
+                this.log.error(`onEvent for ${JSON.stringify(device)} failed with error ${error.message}`);
+            }
         }
     }
 }