iobroker.zigbee 1.6.8 → 1.6.16

package/lib/json.js

@@ -1,61 +1,61 @@
-'use strict';
-
-const hasProp = Object.prototype.hasOwnProperty;
-
-function throwsMessage(err) {
-    return '[Throws: ' + (err ? err.message : '?') + ']';
-}
-
-function safeGetValueFromPropertyOnObject(obj, property) {
-    if (hasProp.call(obj, property)) {
-        try {
-            return obj[property];
-        }
-        catch (err) {
-            return throwsMessage(err);
-        }
-    }
-
-    return obj[property];
-}
-
-function ensureProperties(obj) {
-    const seen = [ ]; // store references to objects we have seen before
-
-    function visit(obj) {
-        if (obj === null || typeof obj !== 'object') {
-            return obj;
-        }
-
-        if (seen.indexOf(obj) !== -1) {
-            return '[Circular]';
-        }
-        seen.push(obj);
-
-        if (typeof obj.toJSON === 'function') {
-            try {
-                return visit(obj.toJSON());
-            } catch(err) {
-                return throwsMessage(err);
-            }
-        }
-
-        if (Array.isArray(obj)) {
-            return obj.map(visit);
-        }
-
-        return Object.keys(obj).reduce((result, prop) => {
-            // prevent faulty defined getter properties
-            result[prop] = visit(safeGetValueFromPropertyOnObject(obj, prop));
-            return result;
-        }, {});
-    }
-
-    return visit(obj);
-}
-
-module.exports = function (data, replacer, space) {
-    return JSON.stringify(ensureProperties(data), replacer, space);
-};
-
+'use strict';
+
+const hasProp = Object.prototype.hasOwnProperty;
+
+function throwsMessage(err) {
+    return '[Throws: ' + (err ? err.message : '?') + ']';
+}
+
+function safeGetValueFromPropertyOnObject(obj, property) {
+    if (hasProp.call(obj, property)) {
+        try {
+            return obj[property];
+        }
+        catch (err) {
+            return throwsMessage(err);
+        }
+    }
+
+    return obj[property];
+}
+
+function ensureProperties(obj) {
+    const seen = [ ]; // store references to objects we have seen before
+
+    function visit(obj) {
+        if (obj === null || typeof obj !== 'object') {
+            return obj;
+        }
+
+        if (seen.indexOf(obj) !== -1) {
+            return '[Circular]';
+        }
+        seen.push(obj);
+
+        if (typeof obj.toJSON === 'function') {
+            try {
+                return visit(obj.toJSON());
+            } catch(err) {
+                return throwsMessage(err);
+            }
+        }
+
+        if (Array.isArray(obj)) {
+            return obj.map(visit);
+        }
+
+        return Object.keys(obj).reduce((result, prop) => {
+            // prevent faulty defined getter properties
+            result[prop] = visit(safeGetValueFromPropertyOnObject(obj, prop));
+            return result;
+        }, {});
+    }
+
+    return visit(obj);
+}
+
+module.exports = function (data, replacer, space) {
+    return JSON.stringify(ensureProperties(data), replacer, space);
+};
+
 module.exports.ensureProperties = ensureProperties;

package/lib/networkmap.js

@@ -1,57 +1,57 @@
-'use strict';
-
-
-class NetworkMap {
-    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 'getMap':
-                    if (obj && obj.message && typeof obj.message === 'object') {
-                        this.getMap(obj.from, obj.command, obj.callback);
-                    }
-                    break;
-            }
-        }
-    }
-
-    getMap(from, command, callback) {
-        if (this.zbController) {
-            this.zbController.getMap((networkmap) => {
-                this.adapter.log.debug('getMap result: ' + JSON.stringify(networkmap));
-                this.adapter.sendTo(from, command, networkmap, callback);
-            });
-        }
-    }
-}
-
+'use strict';
+
+
+class NetworkMap {
+    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 'getMap':
+                    if (obj && obj.message && typeof obj.message === 'object') {
+                        this.getMap(obj.from, obj.command, obj.callback);
+                    }
+                    break;
+            }
+        }
+    }
+
+    getMap(from, command, callback) {
+        if (this.zbController) {
+            this.zbController.getMap((networkmap) => {
+                this.adapter.log.debug('getMap result: ' + JSON.stringify(networkmap));
+                this.adapter.sendTo(from, command, networkmap, callback);
+            });
+        }
+    }
+}
+
 module.exports = NetworkMap;

package/lib/ota.js

@@ -1,153 +1,179 @@
-'use strict';
-
-const getZbId = require('./utils').getZbId;
-
-class Ota {
-    constructor(adapter) {
-        this.adapter = adapter;
-        this.adapter.on('message', this.onMessage.bind(this));
-        this.inProgress = new Set();
-    }
-
-    start(zbController, stController) {
-        this.zbController = zbController;
-        this.stController = stController;
-    }
-
-    stop() {
-        delete this.zbController;
-        delete this.stController;
-    }
-
-    info(msg) {
-        this.adapter.log.info(msg);
-    }
-
-    warn(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 'checkOtaAvail':
-                    this.checkOtaAvail(obj);
-                    break;
-                case 'startOta':
-                    this.startOta(obj);
-                    break;
-            }
-        }
-    }
-
-    async checkOtaAvail(obj) {
-        const device = await this.getDeviceForMessage(obj);
-        if (!device) {
-            this.debug(`Device ${obj.message.devId} is unavailable`);
-            this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is unavailable'}, obj.callback);
-            return;
-        }
-        if (this.inProgress.has(device.device.ieeeAddr)) {
-            this.warn(`Update or check already in progress for '${device.name}', skipping...`);
-            return;
-        }
-        this.inProgress.add(device.device.ieeeAddr);
-        const result = {status: 'unknown', device: device ? device.name : null};
-        try {
-            this.debug(`Checking if firmware update is available for ${device.name}`);
-
-            if (device && device.mapped.ota) {
-                const available = await device.mapped.ota.isUpdateAvailable(device.device, this);
-                result.status = available ? 'available' : 'not_available';
-            } else {
-                result.status = 'not_supported';
-            }
-            this.debug(`Firmware update for ${device.name} is ${result.status}`);
-            this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
-        } catch (error) {
-            const message = `Failed to check if update available for '${device.name}' (${error.message})`;
-            result.status = 'fail';
-            result.msg = message;
-            this.warn(message);
-            this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
-        }
-        this.inProgress.delete(device.device.ieeeAddr);
-    }
-
-    async startOta(obj) {
-        const device = await this.getDeviceForMessage(obj);
-        if (!device) {
-            this.debug(`Device ${obj.message.devId} is unavailable`);
-            this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is unavailable'}, obj.callback);
-            return;
-        }
-        if (this.inProgress.has(device.device.ieeeAddr)) {
-            this.error(`Update or check already in progress for '${device.name}', skipping...`);
-            return;
-        }
-        this.inProgress.add(device.device.ieeeAddr);
-        const result = {status: 'unknown', device: device ? device.name : null};
-        try {
-            this.info('Start firmware update for '+device.name);
-
-            const onProgress = (progress, remaining) => {
-                let message = `Update of '${device.name}' at ${progress}%`;
-                if (remaining) {
-                    message += `, +- ${Math.round(remaining / 60)} minutes remaining`;
-                }
-                this.info(message);
-            };
-
-            const from_ = await this.readSoftwareBuildIDAndDateCode(device.device, false);
-            await device.mapped.ota.updateToLatest(device.device, this, onProgress);
-            const to = await this.readSoftwareBuildIDAndDateCode(device.device, true);
-            const [fromS, toS] = [JSON.stringify(from_), JSON.stringify(to)];
-            result.status = 'success';
-            result.msg = `Finished update of '${device.name}'` + (to ? `, from '${fromS}' to '${toS}'` : ``);
-            this.info(result.msg);
-            this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
-        } catch (error) {
-            const message = `Update of '${device.name}' failed (${error.message})`;
-            result.status = 'fail';
-            result.msg = message;
-            this.error(message);
-            this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
-        }
-        this.inProgress.delete(device.device.ieeeAddr);
-    }
-
-    async readSoftwareBuildIDAndDateCode(device, update) {
-        try {
-            const endpoint = device.endpoints.find((e) => e.supportsInputCluster('genBasic'));
-            const result = await endpoint.read('genBasic', ['dateCode', 'swBuildId']);
-
-            if (update) {
-                device.softwareBuildID = result.swBuildId;
-                device.dateCode = result.dateCode;
-                device.save();
-            }
-
-            return {softwareBuildID: result.swBuildId, dateCode: result.dateCode};
-        } catch (e) {
-            return null;
-        }
-    }
-
-    async getDeviceForMessage(obj) {
-        const devId = getZbId(obj.message.devId);
-        return this.zbController.resolveEntity(devId);
-    }
-}
-
-module.exports = Ota;
+'use strict';
+
+const getZbId = require('./utils').getZbId;
+
+class Ota {
+    constructor(adapter) {
+        this.adapter = adapter;
+        this.adapter.on('message', this.onMessage.bind(this));
+        this.inProgress = new Set();
+    }
+
+    start(zbController, stController) {
+        this.zbController = zbController;
+        this.stController = stController;
+    }
+
+    stop() {
+        delete this.zbController;
+        delete this.stController;
+    }
+
+    info(msg) {
+        this.adapter.log.info(msg);
+    }
+
+    warn(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 'checkOtaAvail':
+                    this.checkOtaAvail(obj);
+                    break;
+                case 'startOta':
+                    this.startOta(obj);
+                    break;
+            }
+        }
+    }
+
+    async checkOtaAvail(obj) {
+        const device = await this.getDeviceForMessage(obj);
+        if (!device) {
+            this.debug(`Device ${obj.message.devId} is unavailable`);
+            this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is unavailable'}, obj.callback);
+            return;
+        }
+        if (this.inProgress.has(device.device.ieeeAddr)) {
+            this.warn(`Update or check already in progress for '${device.name}', skipping...`);
+            return;
+        }
+        // do not attempt update for a device which has been deactivated or is unavailable
+        const stateObj = await this.adapter.getObjectAsync(obj.message.devId);
+        if (stateObj && stateObj.common && stateObj.common.deactivated) {
+          this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
+          this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is deactivated'}, obj.callback);
+          return;
+        }
+        const availablestate = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.available');
+        const lqi = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.link_quality');
+        if ((availablestate && (!availablestate.val)) || (lqi && lqi.val < 1)) {
+          this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
+          this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is marked unavailable'}, obj.callback);
+          return;
+        }
+        this.inProgress.add(device.device.ieeeAddr);
+        const result = {status: 'unknown', device: device ? device.name : null};
+        try {
+            this.debug(`Checking if firmware update is available for ${device.name}`);
+
+            if (device && device.mapped.ota) {
+                const available = await device.mapped.ota.isUpdateAvailable(device.device, this);
+                result.status = available ? 'available' : 'not_available';
+            } else {
+                result.status = 'not_supported';
+            }
+            this.debug(`Firmware update for ${device.name} is ${result.status}`);
+            this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
+        } catch (error) {
+            const message = `Failed to check if update available for '${device.name}' (${error.message})`;
+            result.status = 'fail';
+            result.msg = message;
+            this.warn(message);
+            this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
+        }
+        this.inProgress.delete(device.device.ieeeAddr);
+    }
+
+    async startOta(obj) {
+        const device = await this.getDeviceForMessage(obj);
+        if (!device) {
+            this.debug(`Device ${obj.message.devId} is unavailable`);
+            this.adapter.sendTo(obj.from, obj.command, {status: 'fail', device: getZbId(obj.message.devId), msg: 'Device is unavailable'}, obj.callback);
+            return;
+        }
+        if (this.inProgress.has(device.device.ieeeAddr)) {
+            this.error(`Update or check already in progress for '${device.name}', skipping...`);
+            return;
+        }
+        // do not attempt update for a device which has been deactivated or is unavailable
+        const stateObj = await this.adapter.getObjectAsync(obj.message.devId);
+        if (stateObj && stateObj.common && stateObj.common.deactivated) {
+          this.warn(`Device ${obj.message.devId} is deactivated, skipping...`);
+          return;
+        }
+        const availablestate = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.available');
+        const lqi = await this.adapter.getStateAsync(obj.message.devId.replace(this.namespace + '.', '') + '.link_quality');
+        if ((availablestate && (!availablestate.val)) || (lqi && lqi.val < 1)) {
+          this.warn(`Device ${obj.message.devId} is marked unavailable, skipping...`);
+          return;
+        }
+        this.inProgress.add(device.device.ieeeAddr);
+        const result = {status: 'unknown', device: device ? device.name : null};
+        try {
+            this.info('Start firmware update for '+device.name);
+
+            const onProgress = (progress, remaining) => {
+                let message = `Update of '${device.name}' at ${progress}%`;
+                if (remaining) {
+                    message += `, +- ${Math.round(remaining / 60)} minutes remaining`;
+                }
+                this.info(message);
+            };
+
+            const from_ = await this.readSoftwareBuildIDAndDateCode(device.device, false);
+            await device.mapped.ota.updateToLatest(device.device, this, onProgress);
+            const to = await this.readSoftwareBuildIDAndDateCode(device.device, true);
+            const [fromS, toS] = [JSON.stringify(from_), JSON.stringify(to)];
+            result.status = 'success';
+            result.msg = `Finished update of '${device.name}'` + (to ? `, from '${fromS}' to '${toS}'` : ``);
+            this.info(result.msg);
+            this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
+        } catch (error) {
+            const message = `Update of '${device.name}' failed (${error.message})`;
+            result.status = 'fail';
+            result.msg = message;
+            this.error(message);
+            this.adapter.sendTo(obj.from, obj.command, result, obj.callback);
+        }
+        this.inProgress.delete(device.device.ieeeAddr);
+    }
+
+    async readSoftwareBuildIDAndDateCode(device, update) {
+        try {
+            const endpoint = device.endpoints.find((e) => e.supportsInputCluster('genBasic'));
+            const result = await endpoint.read('genBasic', ['dateCode', 'swBuildId']);
+
+            if (update) {
+                device.softwareBuildID = result.swBuildId;
+                device.dateCode = result.dateCode;
+                device.save();
+            }
+
+            return {softwareBuildID: result.swBuildId, dateCode: result.dateCode};
+        } catch (e) {
+            return null;
+        }
+    }
+
+    async getDeviceForMessage(obj) {
+        const devId = getZbId(obj.message.devId);
+        return this.zbController.resolveEntity(devId);
+    }
+}
+
+module.exports = Ota;