iobroker.zigbee 2.0.0 → 2.0.2

package/lib/devices.js

@@ -3,7 +3,7 @@
 const states = require('./states.js').states;
 const utils = require('./utils.js');
 const rgb = require('./rgb.js');
-const applyExposes = require('./exposes.js').applyExposes;
+const {applyExposes, applyExposeForDevice} = require('./exposes.js');
 
 
 // return list of changing states when incoming state is changed
@@ -599,17 +599,7 @@ function states_with_epname(entity, states) {
     return devstates;
 }
 
-const devices = [
-    /*   {
-        models: ['WXKG01LM'],
-        icon: 'img/xiaomi_wireless_switch.png',
-        states: [
-            states.click, states.double_click, states.triple_click, states.quad_click,
-            states.many_click, states.long_click, states.voltage, states.battery,
-            states.long_press,
-        ],
-    },
-    */
+const legacy_devices = [
     {
         models: ['WXKG11LM'],
         icon: 'img/aqara_switch.png',
@@ -655,9 +645,9 @@ const devices = [
         models: ['WXKG02LM', 'WXKG02LM_rev2'],
         icon: 'img/86sw2.png',
         states: [
-            states.left_click, states.right_click, states.both_click,
-            states.left_click_long, states.left_click_double, states.right_click_long, states.right_click_double,
-            states.both_click_long, states.both_click_double, states.voltage, states.battery
+            states.lumi_left_click, states.lumi_right_click, states.lumi_both_click,
+            states.lumi_left_click_long, states.lumi_right_click_long, states.lumi_left_click_double, states.lumi_right_click_double,
+            states.lumi_both_click_long, states.lumi_both_click_double, states.voltage, states.battery
         ],
     },
     {
@@ -3061,56 +3051,14 @@ const devices = [
         icon: 'img/ICZB-RM11S.png',
         states: generator.icasa_remote,
     },
-
-    /* ------------ images only for admin ------------------- */
-    {
-        models: ['LED1923R5/LED1925G6'],
-        icon: 'img/LED1923R5.png',
-    },
-    {
-        models: ['E1812'],
-        icon: 'img/ikea_E1812.png',
-    },
-    {
-        models: ['WHD02'],
-        icon: 'img/WHD02.png',
-    },
-    {
-        models: ['R7060'],
-        icon: 'img/R7060.png',
-    },
-    {
-        models: ['929001821618'],
-        icon: 'img/philips_hue_ambiance.png',
-    },
-    {
-        models: ['14153905L'],
-        icon: 'img/14153905L.png',
-    },
-    {
-        models: ['HG06338'],
-        icon: 'img/HG06338.png',
-    },
-    {
-        models: ['81855'],
-        icon: 'img/81855.png',
-    },
-    {
-        models: ['TI0001-cover'],
-        icon: 'img/TI0001-cover.png',
-    },
-    {
-        models: ['E1603/E1702/E1708'],
-        icon: 'img/ikea_control_outlet.png',
-    },
-    {
-        models: ['E2204'],
-        icon: 'img/E2204.png',
-    },
+];
+const devices = [
     {
-        models: ['L1(ZW)'],
-        icon: 'img/TS0502B.png',
-    },
+        models: ['group'],
+        icon: 'img/group_0.png',
+        states: states.groupStates,
+        linkedStates: [comb.brightnessAndState],
+    }
 ];
 
 const commonStates = [
@@ -3121,27 +3069,44 @@ const commonStates = [
     states.send_payload,
 ];
 
+const DevicesByModel = new Map();
+const LegacyDevicesByModel = new Map();
+
 const groupStates = [states.brightness_step].concat(lightStatesWithColor);
 
 function getByModel() {
-    const byModel = new Map();
+    DevicesByModel.clear();
     for (const device of devices) {
         for (const model of device.models) {
             const stripModel = model.replace(/\0.*$/g, '').trim();
-            byModel.set(stripModel, device);
+            DevicesByModel.set(stripModel, device);
+        }
+    }
+    LegacyDevicesByModel.clear();
+    for (const device of legacy_devices) {
+        for (const model of device.models) {
+            const stripModel = model.replace(/\0.*$/g, '').trim();
+            LegacyDevicesByModel.set(stripModel, device);
         }
     }
-    return byModel;
+    return DevicesByModel;
 }
 
 removeEmptyStates(devices);
 
-function fillStatesWithExposes(allExcludesObj) {
-    const byModel = getByModel();
-
-    applyExposes(devices, byModel, allExcludesObj);
+function fillStatesWithExposes(logger) {
+    if (DevicesByModel.size <1) getByModel();
+    return;
+    // applyExposes(devices, DevicesByModel, logger);
+    //removeEmptyStates(devices);
+}
 
+async function addExposeToDevices(device, logger, model) {
+    const s = DevicesByModel.size;
+    if (s < 1) getByModel();
+    await applyExposeForDevice(devices, DevicesByModel, device, logger, model);
     removeEmptyStates(devices);
+    return (DevicesByModel.size != s);
 }
 
 // remove empty states
@@ -3153,17 +3118,66 @@ function removeEmptyStates(devices) {
     }
 }
 
-function findModel(model) {
-    const byModel = getByModel();
+function findModel(model, legacy) {
+    const src = (legacy ? LegacyDevicesByModel : DevicesByModel)
+    if (src.size <1) getByModel();
     const stripModel = (model) ? model.replace(/\0.*$/g, '').trim() : '';
-    return byModel.get(stripModel);
+    return src.get(stripModel);
+}
+
+
+
+function fillDevicesForLegacy(paired) {
+    devices.clear();
+    for (const candidate in legacy_devices) {
+        for (const model in candidate.models) {
+            if (paired.indexOf(model) >= 0) devices.push(candidate);
+            break;
+        }
+    }
+}
+
+function pairedLegacyDevices(candidates) {
+    const rv = [];
+    for (const candidate in legacy_devices) {
+        for (const model in candidates.models) {
+            if (candidate.models.contains(model)) rv.push(model);
+            break;
+        }
+    }
+    return rv;
+}
+
+function setLegacyDevices(legacyModels) {
+    const legacyByModel = new Map();
+    for (const device of legacy_devices) {
+        for (const model of device.models) {
+            const stripModel = model.replace(/\0.*$/g, '').trim();
+            legacyByModel.set(stripModel, device);
+        }
+    }
+    legacyModels.forEach((model) => {
+        const stripModel = model.replace(/\0.*$/g, '').trim();
+        const dev = legacyByModel.get(stripModel);
+        if (dev) devices.push(dev);
+    })
+}
+
+function getIconforLegacyModel(model) {
+
 }
 
 module.exports = {
     devices,
+    legacy_devices,
     commonStates,
     groupStates,
     groupsState: states.groups,
     fillStatesWithExposes,
+    addExposeToDevices,
+    getByModel,
     findModel,
+    fillDevicesForLegacy,
+    pairedLegacyDevices,
+    setLegacyDevices
 };

package/lib/exclude.js

@@ -1,4 +1,5 @@
 'use strict';
+const devicedefinitions = require('./devices');
 
 class Exclude {
     constructor(adapter) {
@@ -9,6 +10,7 @@ class Exclude {
     start(zbController, stController) {
         this.zbController = zbController;
         this.stController = stController;
+        this.localConfig = stController.localConfig;
     }
 
     stop() {
@@ -52,6 +54,12 @@ class Exclude {
                             this.adapter.sendTo(obj.from, obj.command, exclude, obj.callback));
                     }
                     break;
+                case 'getExcludable':
+                    if (obj && obj.message && typeof obj.message === 'object') {
+                        this.getExcludable(exclude =>
+                            this.adapter.sendTo(obj.from, obj.command, exclude, obj.callback));
+                    }
+                    break;
                 case 'delExclude':
                     if (obj && obj.message) {
                         this.delExclude(obj.from, obj.command, obj.message, err =>
@@ -74,7 +82,7 @@ class Exclude {
     }
 
     extractExcludeId(stateId) {
-        return stateId.replace(`${this.adapter.namespace}.exclude.`, '');
+        return stateId.replace(`${this.adapter.namespace}.info.legacy.`, '');
     }
 
     getExcludeName(devName, stateId) {
@@ -83,18 +91,10 @@ class Exclude {
 
     async addExclude(from, command, params, callback) {
         try {
-            this.debug('addExclude message: ' + JSON.stringify(params));
+            //this.warn('addExclude message: ' + JSON.stringify(params));
             const exclude_mod = params.exclude_model.common.type;
-            const stateId = `exclude.${exclude_mod}`;
-
-            this.adapter.setObjectNotExists(stateId,
-                {
-                    type: 'state',
-                    common: {name: exclude_mod},
-                },
-                () => this.adapter.setState(stateId, exclude_mod, true, () =>
-                    callback()),
-            );
+            this.localConfig.updateLocalOverride(exclude_mod, exclude_mod, 'legacy', exclude_mod, true);
+            callback({});
         } catch (error) {
             this.error(`Failed to addExclude ${error.stack}`);
             throw new Error(`Failed to addExclude ${error.stack}`);
@@ -104,58 +104,34 @@ class Exclude {
     async delExclude(from, command, exclude_id, callback) {
         try {
             this.debug(`delExclude message: ${JSON.stringify(exclude_id)}`);
-            const stateId = `exclude.${exclude_id}`;
-            this.adapter.getStateAsync(stateId)
-                .then(async (stateV) => {
-                    this.debug(`found state: ${JSON.stringify(stateV)}`);
-                    this.adapter.deleteState(null, 'exclude', exclude_id, async () =>
-                        callback());
-                });
+            this.localConfig.updateLocalOverride(exclude_id, exclude_id, 'legacy', '', true);
+            callback({});
         } catch (error) {
             this.error(`Failed to delExclude ${error.stack}`);
             throw new Error(`Failed to delExclude ${error.stack}`);
         }
     }
 
-    getExclude(callback) {
+    async getExclude(callback) {
         try {
-            const exclude = [];
-            this.adapter.getStatesOf('exclude', (err, states) => {
-                if (!err && states) {
-                    const exc = [];
-                    states.forEach(state => {
-                        if (state._id.startsWith(`${this.adapter.namespace}.exclude`)) {
-                            exc.push(new Promise(resolve =>
-                                this.adapter.getStateAsync(state._id)
-                                    .then(stateVa => {
-                                        if (stateVa !== null) {
-                                            const val = {
-                                                id: this.extractExcludeId(state._id),
-                                                name: stateVa.val
-                                            };
-                                            if (this.extractExcludeId(state._id) !== 'all') {
-                                                exclude.push(val);
-                                            }
-                                        }
-                                        resolve();
-                                    })));
-                        }
-                    });
-                    return Promise.all(exc)
-                        .then(() => {
-                            const arrExclude = JSON.stringify(exclude);
-                            this.debug(`getExclude result: ${arrExclude}`);
-                            this.adapter.setState('exclude.all', arrExclude, true, () =>
-                                callback(exclude));
-                        });
-                } else {
-                    this.debug(`getExclude result: ${JSON.stringify(exclude)}`);
-                    callback(exclude);
-                }
-            });
+            const exclude = this.localConfig.getOverridesWithKey('legacy', true)
+            callback({legacy: exclude});
         } catch (error) {
             this.error(`Failed to getExclude ${error.stack}`);
+            callback({error: 'unable to get excludes' });
+        }
+    }
+
+    async getExcludable(callback) {
+        const devices = this.zbController.getClients();
+        const excludables = [];
+        for (const device of devices) {
+            const obj = await this.adapter.getObjectAsync(device.ieeeAddr.substr(2));
+            if (obj && obj.common && obj.common.type) {
+                excludables.push(obj.common.tyoe);
+            }
         }
+        callback(devices.pairedLegacyDevices(excludables));
     }
 }