iobroker.zigbee 2.0.4 → 3.0.0

package/lib/DeviceDebug.js

@@ -6,6 +6,7 @@ class DeviceDebug extends EventEmitter {
         this.adapter = adapter;
         this.dataByID = { };
         this.dataByDevice = { };
+        this.logStatus = true;
 
     }
 
@@ -65,14 +66,16 @@ class DeviceDebug extends EventEmitter {
                     target.push(item);
                     this.dataByDevice[item.deviceID] = DevData;
                 }
-                if (message.hasOwnProperty('message')) {
+                if (message.hasOwnProperty('message') && this.logStatus) {
                     this.warn(`ELEVATED:${flag} (${dataId.toString(16).slice(-4)}) ${message.message}`)
                 }
             }
         }
     }
 
-    collectDebugData() {
+    collectDebugData(logStatus) {
+        if (logStatus != undefined)
+            this.logStatus = logStatus;
         return this.dataByDevice;
     }
 }

package/lib/commands.js

@@ -1,12 +1,15 @@
 'use strict';
 
 const getZbId = require('./utils').getZbId;
+const getNetAddress = require('./utils').getNetAddress;
+const reverseByteString = require('./utils').reverseByteString;
 const fs = require('fs');
-const pathLib = require('path');
 const statesMapping = require('./devices');
 const utils = require('@iobroker/adapter-core'); // Get common adapter utils
 const colors = require('./colors.js');
-const { exec } = require('child_process');
+const dns = require('dns');
+const net = require('net');
+const { access, constants } =require('fs');
 
 const disallowedDashStates = [
     'link_quality', 'available', 'battery', 'groups', 'device_query',
@@ -50,13 +53,14 @@ class Commands {
      * @param {ioBroker.Message} obj
      */
     onMessage(obj) {
-        if (obj) {
-            if (typeof obj === 'object' && obj.command) {
+        if (typeof obj === 'object' && obj.command) {
+            if (obj) {
                 switch (obj.command) {
-                    case 'reset':
-                        if (obj.message && obj.message.mode == 'delNvbackup') {
-                            this.delNvBackup(obj.from, obj.command, obj.message, obj.callback);
-                        }
+                    case 'testConnect':
+                        this.adapter.testConnect(obj.from, obj.command, obj.message, obj.callback);
+                        break;
+                    case 'deleteNVBackup':
+                        this.delNvBackup(obj.from, obj.command, {}, obj.callback);
                         break;
                     case 'letsPairing':
                         if (obj.message && typeof obj.message === 'object') {
@@ -89,7 +93,7 @@ class Commands {
                         }
                         break;
                     case 'getCoordinatorInfo':
-                        if (obj && obj.message && typeof obj.message === 'object') {
+                        if (obj.message && typeof obj.message === 'object') {
                             this.getCoordinatorInfo(obj.from, obj.command, obj.callback);
                         }
                         break;
@@ -151,21 +155,81 @@ class Commands {
                         }
                         break;
                     case 'getDeviceCleanupRequired':
-                        if (obj) {
-                            this.adapter.sendTo(obj.from, obj.command, {clean:this.stController.CleanupRequired(), errors:this.stController.getStashedErrors()}, obj.callback);
-                        }
+                        if (this.stController) this.adapter.sendTo(obj.from, obj.command, {clean:this.stController.CleanupRequired(), errors:this.stController.getStashedErrors()}, obj.callback);
+                        // NO Break - returning the debug-data as well is intentional
+                    case 'getDebugMessages':
+                        this.adapter.sendTo(obj.from, obj.command, {byId:this.adapter.deviceDebug.collectDebugData( obj.message.inlog)},obj.callback);
+                        break;
+                    case 'testConnection':
+                        this.testConnection(obj.from, obj.command, obj.message, obj.callback);
+                        break;
+                    case 'readNVRam':
+                        this.readNvBackup(obj.from, obj.command, obj.message, obj.callback);
+                    default:
+                        //this.warn(`Commands: Command ${obj.command} is unknown`);
+                        //this.adapter.sendTo(obj.from, obj.command, obj.message, obj.callback);
+                        break;
                 }
             }
         }
     }
 
-    delNvBackup(from, command, msg, callback) {
+    async readNvBackup(from, command, msg, callback) {
+        this.warn('readNvBackup called')
+        try {
+            const zo = this.adapter.getZigbeeOptions();
+            const name = require('path').join(zo.dbDir, zo.backupPath);
+            const nvbackup = fs.readFileSync(name, {encoding: 'utf8'}).toString();
+            const nvBackupJson = JSON.parse(nvbackup);
+            const rv = {};
+            rv.channel = nvBackupJson.channel;
+            rv.precfgkey = (nvBackupJson.network_key ? nvBackupJson.network_key.key : undefined);
+            rv.extPanID = nvBackupJson.extended_pan_id ? reverseByteString(nvBackupJson.extended_pan_id) : undefined;
+            rv.panID = parseInt('0x'+nvBackupJson.pan_id);
+            this.warn('readNvBackup returns ' + JSON.stringify(rv))
+            this.adapter.sendTo(from, command, rv, callback)
+        }
+        catch (error) {
+            const msg = `Unable to read nvBackup ${error && error.message ? error.message : 'no message given'}`;
+            this.error(msg);
+            this.adapter.sendTo(from, command, {error:msg}, callback)
+        }
+    }
+
+    async delNvBackup(from, command, msg, callback) {
         try {
-            if (this.zbController) {
+            if (this.zbController)
+            {
+                // stop the herdsman if needed
+                const wasRunning = this.zbController.herdsmanStarted;
+                if (wasRunning) await this.zbController.stop();
                 const name = this.zbController.herdsman.adapter.backupPath;
-                require('fs').unlinkSync(name);
+                fs.unlink(name, async (err) => {
+                    const rv={};
+                    if (err) {
+                        this.error(`Unable to remove ${name}: ${err}`);
+                        rv.error = `Unable to remove ${name}: ${err}`;
+                    }
+                    // start the herdsman again if it  was stopped before
+                    if (wasRunning) await this.zbController.start();
+                    this.adapter.sendTo(from, command, rv, callback)
+                });
+            }
+            else {
+                const zo = this.adapter.getZigbeeOptions();
+                const name = require('path').join(zo.dbDir, zo.backupPath);
+                fs.unlink(name, async (err) => {
+                    const rv={};
+                    if (err) {
+                        this.error(`Unable to remove ${name}: ${err}`);
+                        rv.error = `Unable to remove ${name}: ${err}`;
+                    }
+                    // start the herdsman again if it  was stopped before
+                    this.adapter.sendTo(from, command, rv, callback)
+                });
             }
         } catch (error) {
+            this.adapter.sendTo(from, command, {error: error.message}, callback)
             this.error(error);
         }
     }
@@ -227,7 +291,7 @@ class Commands {
     }
 
     touchlinkReset(from, command, message, callback) {
-        if (this.zbController) {
+        if (this.zbController && this.zbController.herdsmanStarted) {
             // allow devices to join the network within 60 secs
             this.adapter.logToPairing('Touchlink reset started ', true);
 
@@ -241,14 +305,14 @@ class Commands {
         } else {
             this.adapter.sendTo(
                 from, command,
-                {error: 'You need to setup serial port and start the adapter before pairing!'},
+                {error: 'No active connection to Zigbee Hardware!'},
                 callback
             );
         }
     }
 
     async getDevices(from, command, id, callback) {
-        if (this.zbController) {
+        if (this.zbController && this.zbController.herdsmanStarted) {
             this.debug(`getDevices called from  ${from} with command ${JSON.stringify(command)} and id ${JSON.stringify(id)}`);
             const pairedDevices = await this.zbController.getClients(true);
             const groups = {};
@@ -352,6 +416,18 @@ class Commands {
 
                         const id = getZbId(devInfo._id);
                         devInfo.info = await this.zbController.resolveEntity(id);
+                        // check configuration
+                        try {
+                            if (devInfo.info) {
+                                const result = await this.zbController.callExtensionMethod(
+                                    'shouldConfigure',
+                                    [devInfo.info.device, devInfo.info.mapped],
+                                );
+                                if (result.length > 0) devInfo.isConfigured = !result[0];
+                            }
+                        } catch (error) {
+                            this.warn('error calling shouldConfigure: ' + error && error.message ? error.message : 'no error message');
+                        }
 
                         devInfo.rooms = [];
                         for (const room in rooms) {
@@ -405,18 +481,27 @@ class Commands {
                     return devices;
                 })
                 .then(devices => {
-                    this.debug(`getDevices result: ${JSON.stringify(devices)}`);
-                    this.adapter.sendTo(from, command, devices, callback);
+                    this.debug(`getDevices contains ${devices.length} Devices`);
+                    const rv = { devices:devices, inLog:this.adapter.deviceDebug.logStatus, byId:this.adapter.deviceDebug.collectDebugData() }
+                    if (this.stController) {
+                        rv.clean = this.stController.CleanupRequired();
+                        rv.errors = this.stController.getStashedErrors();
+                        rv.debugDevices = this.stController.debugDevices;
+                    }
+                    this.adapter.sendTo(from, command, rv, callback);
                 })
-                .catch(err => this.error(`getDevices error: ${err.stack}`));
+                .catch(err => {
+                    this.error(`getDevices error: ${err.stack}`);
+                    this.adapter.sendTo(from, command, {error: `Error enumerating devices : ${err && err.message ? err.message : ''}`}, callback);
+                });
         } else {
-            this.adapter.sendTo(from, command, {error: 'You need save and run adapter before pairing!'}, callback);
+            this.adapter.sendTo(from, command, {error: 'No active connection to Zigbee Hardware!'}, callback);
         }
     }
 
 
     async getCoordinatorInfo(from, command, callback) {
-        if (this.zbController) {
+        if (this.zbController && this.zbController.herdsmanStarted) {
             const coordinatorinfo = {
                 installSource: 'IADefault_1',
                 channel: '-1',
@@ -484,7 +569,7 @@ class Commands {
                 this.adapter.sendTo(from, command, coordinatorinfo, callback);
             });
         } else {
-            this.adapter.sendTo(from, command, {error: 'You need save and run adapter before pairing!'}, callback);
+            this.adapter.sendTo(from, command, {error: 'No active connection to Zigbee Hardware!'}, callback);
         }
     }
 
@@ -499,7 +584,7 @@ class Commands {
     }
 
     deleteDevice(from, command, msg, callback) {
-        if (this.zbController && this.stController) {
+        if (this.zbController && this.zbController.herdsmanStarted && this.stController) {
             this.debug(`deleteDevice message: ${JSON.stringify(msg)}`);
             const id = msg.id;
             const force = msg.force;
@@ -524,7 +609,7 @@ class Commands {
                 }
             });
         } else {
-            this.adapter.sendTo(from, command, {error: 'You need to save and start the adapter!'}, callback);
+            this.adapter.sendTo(from, command, {error: 'No active connection to Zigbee Hardware!'}, callback);
         }
     }
 
@@ -548,14 +633,14 @@ class Commands {
     }
 
     async getChannels(from, command, message, callback) {
-        if (this.zbController) {
+        if (this.zbController && this.zbController.herdsmanStarted) {
             const result = await this.zbController.getChannelsEnergy();
             this.debug(`getChannels result: ${JSON.stringify(result)}`);
             this.adapter.sendTo(from, command, result, callback);
         } else {
             this.adapter.sendTo(
                 from, command,
-                {error: 'You need to setup serial port and start the adapter before pairing!'},
+                {error: 'No active connection to Zigbee Hardware!'},
                 callback
             );
         }
@@ -588,7 +673,7 @@ class Commands {
     async getLocalImages(from, command, msg, callback) {
         if (this.stController) {
             const id = msg.id;
-            const result = await this.stController.localConfig.enumerateImages(utils.getAbsoluteInstanceDataDir(this.adapter).replace('.','_'));
+            const result = await this.stController.localConfig.enumerateImages(this.adapter.getDataFolder());
             this.adapter.sendTo(from, command, {imageData:result}, callback)
         }
     }
@@ -623,6 +708,10 @@ class Commands {
             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) {
+                this.warn('unable to set local Override for device whithout mapped model');
+                return;
+            }
             if (msg.data)
             {
                 for (const prop in msg.data) {
@@ -643,7 +732,7 @@ class Commands {
 
 
     async reconfigure(from, command, msg, callback) {
-        if (this.zbController) {
+        if (this.zbController && this.zbController.herdsmanStarted) {
             const devid = getZbId(msg.id);
             this.debug(`Reconfigure ${devid}`);
             const entity = await this.zbController.resolveEntity(devid);
@@ -653,7 +742,6 @@ class Commands {
                         'doConfigure',
                         [entity.device, entity.mapped],
                     );
-                    this.warn('do configure result is ' + JSON.stringify(result));
                     const msg = result.join(',');
                     if (msg.length > 5)
                         this.adapter.sendTo(from, command, {error: msg}, callback);
@@ -669,6 +757,69 @@ class Commands {
                 this.adapter.sendTo(from, command, {error: 'No device'}, callback);
             }
         }
+        else {
+            this.adapter.sendTo(from, command, {error: 'No active connection to Zigbee Hardware!'}, callback);
+        }
+    }
+
+    async testConnection(from, command, msg, callback) {
+        this.debug(`TestConnection with ${JSON.stringify(msg)}`);
+        if (msg && msg.address) {
+            const netAddress = getNetAddress(msg.address);
+            if (netAddress && netAddress.host) {
+                this.adapter.logToPairing(`attempting dns lookup for ${netAddress.host}`);
+                this.debug(`attempting dns lookup for ${netAddress.host}`);
+                dns.lookup(netAddress.host, (err, ip, _) => {
+                    if (err) {
+                        const msg = `Unable to resolve name: ${err && err.message ? err.message : 'no message'}`;
+                        this.error(msg);
+                        this.adapter.logToPairing(`Error: ${msg}`);
+                        this.adapter.sendTo(from, command, {error:msg}, callback);
+                        return;
+                    }
+                    this.debug(`dns lookup for ${msg.address} produced ${ip}`);
+                    this.adapter.logToPairing(`dns lookup for ${msg.address} produced ${ip}`);
+                    const client = new net.Socket();
+                    this.debug(`attempting to connect to ${ip} port ${netAddress.port ? netAddress.port : 80}`);
+                    client.connect(netAddress.port, ip, () => {
+                        client.destroy()
+                        this.adapter.logToPairing(`connected successfully to connect to ${ip} port ${netAddress.port ? netAddress.port : 80}`);
+                        this.debug(`connected successfully to connect to ${ip} port ${netAddress.port ? netAddress.port : 80}`);
+                        this.adapter.sendTo(from, command, {}, callback)
+                    })
+                    client.on('error', (error) => {
+                        const msg = `unable to connect to ${ip} port ${netAddress.port ? netAddress.port : 80} : ${error && error.message ? error.message : 'no message given'}`
+                        this.error(msg);
+                        this.adapter.logToPairing(`Error: ${msg}`);
+                        this.adapter.sendTo(from, command, {error:msg}, callback);
+                    });
+                })
+            }
+            else
+            {
+                try {
+                    const port = msg.address.trim();
+                    this.adapter.logToPairing(`reading access rights for ${port}`);
+                    access(port, constants.R_OK | constants.W_OK, (error) => {
+                        if (error) {
+                            const msg = `unable to access ${port} : ${error && error.message ? error.message : 'no message given'}`;
+                            this.error(msg);
+                            this.adapter.logToPairing(`Error: ${msg}`);
+                            this.adapter.sendTo(from, command, {error:msg}, callback);
+                            return;
+                        }
+                        this.adapter.logToPairing(`read and write access available for ${port}`);
+                        this.adapter.sendTo(from, command, {}, callback);
+                    });
+                }
+                catch (error) {
+                    const msg = `File access error: ${error && error.message ? error.message : 'no message given'}`;
+                    this.error(msg);
+                    this.adapter.logToPairing(`Error: ${msg}`);
+                    this.adapter.sendTo(from, command, {error:msg}, callback);
+                }
+            }
+        }
     }
 }
 

package/lib/devices.js

@@ -3104,9 +3104,9 @@ function fillStatesWithExposes(logger) {
 async function addExposeToDevices(device, logger, model) {
     const s = DevicesByModel.size;
     if (s < 1) getByModel();
-    await applyExposeForDevice(devices, DevicesByModel, device, logger, model);
+    const rv = await applyExposeForDevice(devices, DevicesByModel, device, logger, model);
     removeEmptyStates(devices);
-    return (DevicesByModel.size != s);
+    return rv;
 }
 
 // remove empty states

package/lib/exposes.js

@@ -251,8 +251,6 @@ function createFromExposes(model, def, device, log) {
         }
     }
 
-    const icon = utils.getDeviceIcon(def);
-
     if (typeof def.exposes == 'object') {
         for (const expose of def.exposes) {
             genStateFromExpose(expose);
@@ -266,11 +264,12 @@ function createFromExposes(model, def, device, log) {
             genStateFromExpose(expose);
         }
     }
+    const icon = utils.getDeviceIcon(def);
 
     const newDev = {
         models: [model],
-        icon,
         states,
+        icon,
         exposed: true,
     };
 
@@ -594,7 +593,7 @@ function createFromExposes(model, def, device, log) {
                             break;
 
                         case 'voltage':
-                            state = statesDefs.plug_voltage;
+                            state = genState(expose);
                             break;
 
                         case 'temperature':
@@ -867,29 +866,12 @@ function createFromExposes(model, def, device, log) {
 
 }
 
-function applyExposes(mappedDevices, byModel) {
-    // create or device from exposes
-    for (const deviceDef of zigbeeHerdsmanConverters.definitions) {
-        applyDeviceDef(mappedDevices, byModel, deviceDef);
-
-        if (deviceDef.hasOwnProperty('whiteLabel')) {
-            for (const deviceWhiteLabel of deviceDef.whiteLabel) {
-                applyDeviceDef(mappedDevices, byModel, {
-                    ...deviceDef,
-                    model: deviceWhiteLabel.model,
-                    vendor: deviceWhiteLabel.vendor,
-                    description: deviceWhiteLabel.description || deviceDef.description,
-                });
-            }
-        }
-    }
-}
-
 async function applyExposeForDevice(mappedDevices, byModel, device) {
     const deviceDef = await zigbeeHerdsmanConverters.findByDevice(device);
-    if (!deviceDef) return false;
-    applyDeviceDef(mappedDevices, byModel, deviceDef, device);
-    return true;
+    if (!deviceDef)  {
+        return undefined;
+    }
+    return applyDeviceDef(mappedDevices, byModel, deviceDef, device);
 }
 
 function applyDeviceDef(mappedDevices, byModel, deviceDef, device) {
@@ -900,14 +882,15 @@ function applyDeviceDef(mappedDevices, byModel, deviceDef, device) {
             const newDevice = createFromExposes(stripModel, deviceDef, device);
             mappedDevices.push(newDevice);
             byModel.set(stripModel, newDevice);
+            return newDevice;
 
         } catch (e) {
-            //this.debug('empty catch in exposes');
+            return undefined;
         }
     }
+    return existsMap;
 }
 
 module.exports = {
-    applyExposes: applyExposes,
     applyExposeForDevice: applyExposeForDevice,
 };

package/lib/groups.js

@@ -2,7 +2,6 @@
 
 const json = require('iobroker.zigbee/lib/json');
 const statesMapping = require('./devices');
-const { numberWithinRange } = require('zigbee-herdsman-converters/lib/utils');
 const idRegExp = new RegExp(/group_(\d+)/);
 
 
@@ -168,7 +167,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);
@@ -176,7 +175,7 @@ class Groups {
                         }
                         const icon = this.stController.getDefaultGroupIcon(-gpidn)
                     } 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);
@@ -233,7 +232,7 @@ class Groups {
             throw error;
         }
         if (result.unread.length > 0) {
-            this.warn(`unread ${stateDesc.id} change for group members ${JSON.stringify(result.unread)}`);
+            this.debug(`unread ${stateDesc.id} change for group members ${JSON.stringify(result.unread)}`);
         }
     }
 
@@ -254,11 +253,10 @@ class Groups {
             if (message.remove) {
                 for (const member of message.remove) {
                     const response = await this.zbController.removeDevFromGroup(member.id, id, member.ep);
-                    this.warn('trying to remove ' + member.id + (member.ep ? '.'+member.ep : '') + ' ' + ' from group ' + message.id + ' response is '+JSON.stringify(response));
+                    this.debug('trying to remove ' + member.id + (member.ep ? '.'+member.ep : '') + ' ' + ' from group ' + message.id + ' response is '+JSON.stringify(response));
                 }
             }
             if (icon.match(/img\/group_\d+\.png/g)) {
-                this.warn('.');
                 icon = await this.zbController.rebuildGroupIcon(group);
             }
         } catch (e) {
@@ -270,7 +268,7 @@ class Groups {
         this.warn(`rename group name ${name}, id ${id}, icon ${icon} remove ${JSON.stringify(message.removeMembers)}`);
         const group = await this.adapter.getObjectAsync(id);
         if (!group) {
-            this.warn('group object doesnt exist ')
+            this.debug('group object doesnt exist ')
             // assume we have to create the group
             this.adapter.setObjectNotExists(id, {
                 type: 'device',
@@ -301,7 +299,7 @@ class Groups {
             });
         }
         else {
-            this.warn('group object exists');
+            this.debug('group object exists');
             this.adapter.extendObject(id, {common: {name, type: 'group', icon: icon}});
         }
     }

package/lib/localConfig.js

@@ -138,7 +138,7 @@ class localConfig extends EventEmitter {
         try {
             this.adapter.fileExists(namespace, rv, (err, result) => {
                 if (result) return;
-                const src = this.adapter.expandFileName(iconPath).replace('.','_');
+                const src = this.adapter.expandFileName(iconPath);
                 fs.readFile(src, (err, data) => {
                     if (err) {
                         this.error('unable to read ' + src + ' : '+ (err && err.message? err.message:' no message given'))
@@ -220,8 +220,7 @@ class localConfig extends EventEmitter {
     }
 
     async updateFromDeviceNames() {
-        this.warn('updateFromDeviceNames');
-        const fn = this.adapter.expandFileName('dev_names').replace('.', '_').concat('.json');
+        const fn = this.adapter.expandFileName('dev_names.json');
         fs.readFile(fn, (err, content) => {
             if (!err) {
                 let data_js = {};
@@ -250,7 +249,7 @@ class localConfig extends EventEmitter {
 
     async init() {
         this.info('init localConfig');
-        const fn = this.adapter.expandFileName('LocalOverrides').replace('.','_').concat('.json');
+        const fn = this.adapter.expandFileName('LocalOverrides').replace('zigbee.','zigbee_').concat('.json');
         this.filename = fn;
         this.basefolder = path.dirname(fn);
 
@@ -286,7 +285,7 @@ class localConfig extends EventEmitter {
             const files= fs.readdirSync(_path, {withFileTypes: true, recursive: true}).filter(item => (!item.isDirectory() && item.name.endsWith('.png')));
             files.forEach((item) => {
                 const fn = path.join(item.parentPath, item.name);
-                rv.push({file: fn, name: item.name, data: fs.readFileSync(path.join(item.parentPath, item.name), 'base64')})
+                rv.push({file: fn, name: item.name, data: fs.readFileSync(path.join(item.parentPath, item.name), 'base64'), isBase64:true});
             });
             //this.warn('enumerateImages for  ' + _path + ' is ' + JSON.stringify(rv));
         }

package/lib/ota.js

@@ -55,7 +55,7 @@ class Ota {
     async checkOtaAvail(obj) {
         const device = await this.getDeviceForMessage(obj);
         if (!device) {
-            this.debug(`Device ${obj.message.devId} is unavailable`);
+            this.info(`Device ${obj.message.devId} is unavailable`);
             this.adapter.sendTo(obj.from, obj.command, {
                 status: 'fail',
                 device: getZbId(obj.message.devId),
@@ -64,13 +64,13 @@ class Ota {
             return;
         }
         if (this.inProgress.has(device.device.ieeeAddr)) {
-            this.warn(`Update or check already in progress for '${device.name}', skipping...`);
+            this.info(`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.info(`Device ${obj.message.devId} is deactivated, skipping...`);
             this.adapter.sendTo(obj.from, obj.command, {
                 status: 'fail',
                 device: getZbId(obj.message.devId),
@@ -81,7 +81,7 @@ class Ota {
         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.info(`Device ${obj.message.devId} is marked unavailable, skipping...`);
             this.adapter.sendTo(obj.from, obj.command, {
                 status: 'fail',
                 device: getZbId(obj.message.devId),
@@ -133,13 +133,13 @@ class Ota {
         // 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.info(`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...`);
+            this.info(`Device ${obj.message.devId} is marked unavailable, skipping...`);
             return;
         }
         this.inProgress.add(device.device.ieeeAddr);

package/lib/seriallist.js

@@ -22,10 +22,17 @@ class SerialList {
                             SerialPort.list()
                                 .then(ports => {
                                     this.adapter.log.info(`List of port: ${JSON.stringify(ports)}`);
-                                    this.adapter.sendTo(obj.from, obj.command, ports.map(item => ({
+                                    const candidates = ports.map(item => ({
                                         label: item.friendlyName || item.pnpId || item.manufacturer,
                                         comName: item.path
-                                    })), obj.callback);
+                                    }));
+                                    require('fs').readdir('/dev/serial/by-id', (err, files) => {
+                                        if (!err) {
+                                            for (const item of files)
+                                                candidates.push({comName: `/dev/serial/by-id/${item}`});
+                                        }
+                                        this.adapter.sendTo(obj.from, obj.command, candidates.reverse(), obj.callback);
+                                    })
                                 })
                                 .catch(e => {
                                     this.adapter.sendTo(obj.from, obj.command, [], obj.callback);