iobroker.zigbee 1.8.0 → 1.8.3

package/lib/groups.js

@@ -2,6 +2,7 @@
 
 const statesMapping = require('./devices');
 
+
 class Groups {
     constructor(adapter) {
         this.adapter = adapter;
@@ -12,12 +13,12 @@ class Groups {
         this.zbController = zbController;
         this.stController = stController;
         this.adapter.getStateAsync('info.groups')
-            .then(groupsState => {
+            .then((groupsState) => {
                 const groups = (groupsState && groupsState.val) ? JSON.parse(groupsState.val) : {};
                 for (const gid in groups) {
                     stController.storeDeviceName(`group_${gid}`, groups[gid]);
                 }
-                // this.Adapter.deleteState('info.groups');
+//                this.Adapter.deleteState('info.groups');
                 this.syncGroups();
             });
     }
@@ -76,16 +77,15 @@ class Groups {
                 for (const member of groupmembers) {
                     const nwk = member.deviceNetworkAddress;
                     const device = this.zbController.getDeviceByNetworkAddress(nwk);
-                    if (device && device.ieeeAddr) {
-                        members.push({device: device.ieeeAddr});
-                    }
+                    if (device && device.ieeeAddr) members.push( { device:device.ieeeAddr } );
                 }
-            } else {
+            }
+            else {
                 return undefined;
             }
 
         } catch (error) {
-            if (error) this.error(`getGroupMembersFromController: error is  ${JSON.stringify(error)} ${JSON.stringify(new Error().stack)}`);
+            if (error) this.error('getGroupMembersFromController: error is  ' + JSON.stringify(error) + ' ' + JSON.stringify(new Error().stack));
             else this.error('unidentifed error in getGroupMembersFromController');
         }
         return members;
@@ -94,10 +94,10 @@ class Groups {
     async getGroups(obj) {
         const response = { groups: {} };
         try {
-            // const groupsState = await this.adapter.getStateAsync('info.groups');
+//            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 = (groupsState && groupsState.val) ? JSON.parse(groupsState.val) : {};
 
             const groups = {};
             if (typeof herdsmanGroups === 'object') {
@@ -108,21 +108,25 @@ class Groups {
                     }
                 }
             }
-            this.debug(`getGroups result: ${JSON.stringify(groups)}`);
+            this.debug('getGroups result: ' + JSON.stringify(groups));
             response.groups = groups;
-        } catch (error) {
+        }
+        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);
+        }
+        finally {
+            if (obj)
+                this.adapter.sendTo(obj.from, obj.command, response, obj.callback);
+
         }
         return response.groups;
     }
 
     async updateGroupMembership(from, command, message, callback) {
         try {
-            const groups = message && message.groups ? message.groups : {};
-            const devId = message && message.id ? message.id : undefined;
+            const groups = (message && message.groups ? message.groups : {});
+            const devId = (message && message.id ? message.id : undefined);
             if (devId === undefined) {
                 this.adapter.sendTo(from, command, {error: 'No device specified'}, callback);
             }
@@ -132,7 +136,7 @@ class Groups {
             // this.adapter.setState(id, JSON.stringify(groups), true);
 
             //const current = await this.zbController.getGroupMembersFromController(sysid);
-            const errors = [];
+            const errors = []
             for (const epid in groups) {
                 for (const gpid of groups[epid]) {
                     const gpidn = parseInt(gpid);
@@ -140,17 +144,18 @@ class Groups {
                         let response = await this.zbController.removeDevFromGroup(sysid,(-gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
-                            this.error(`remove dev from group Error: ${JSON.stringify(response.error)}`);
+                            this.error("remove dev from group Error: "+ JSON.stringify(response.error));
                         }
-                    } else if (gpidn > 0){
+                    }
+                    else if (gpidn > 0){
                         let response = await this.zbController.addDevToGroup(sysid,(gpidn), epid);
                         if (response && response.error) {
                             errors.push(response.error);
-                            this.error(`add dev to group Error: ${JSON.stringify(response.error)}`);
+                            this.error("add dev to group Error: "+ JSON.stringify(response.error));
                         }
-                    } else {
-                        this.warn('illegal group id 0');
+
                     }
+                    else this.warn('illegal group id 0');
                 }
             }
         } catch (e) {
@@ -169,13 +174,11 @@ class Groups {
         };
         for (const member of members) {
             const entity = await this.zbController.resolveEntity(member.device);
-            if (!entity) {
-                return false;
-            }
+            if (!entity) return false;
             this.debug(`entity: ${JSON.stringify(entity)}`);
             const mappedModel = entity.mapped;
-            this.debug(`Mapped Model: ${JSON.stringify(mappedModel)}`);
-            const converter = mappedModel.toZigbee.find(c => c && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
+            this.debug('Mapped Model: ' +  JSON.stringify(mappedModel));
+            const converter = mappedModel.toZigbee.find((c) => c && (c.key.includes(stateDesc.prop) || c.key.includes(stateDesc.setattr) || c.key.includes(stateDesc.id)));
             if (!converter) {
                 result.unsupported.push(member.device);
                 continue;
@@ -196,12 +199,12 @@ class Groups {
             throw error;
         }
         if (result.unread.length>0) {
-            this.warn(`unread ${stateDesc.id} change for group members ${JSON.stringify(result.unread)}`);
+            this.warn('unread ' + stateDesc.id + ' change for group members ' + JSON.stringify(result.unread));
         }
     }
 
     async deleteGroup(from, command, message) {
-    /*
+/*
         const members = await this.getGroupMembersFromController(parseInt(message));
         if (members && members.length) {
             for (const member of members) {
@@ -224,26 +227,27 @@ class Groups {
         const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
         delete objGroups[message.toString()];
         await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
-    */
+*/
         await this.zbController.removeGroupById(message);
         await this.stController.deleteDeviceStatesAsync(`group_${parseInt(message)}`);
     }
 
     async renameGroup(from, command, message) {
-        // const groupsEntry = await this.adapter.getStateAsync('info.groups');
-        // const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
+
+//        const groupsEntry = await this.adapter.getStateAsync('info.groups');
+//        const objGroups = (groupsEntry && groupsEntry.val ? JSON.parse(groupsEntry.val) : {});
         const name = message.name;
         const id = `group_${message.id}`;
         this.stController.storeDeviceName(id, name);
         try {
-            await this.zbController.verifyGroupExists(message.id);
-        } catch (e) {
-            if (e && e.hasOwnProperty('code')) {
-                this.warn(`renameGroup caught error ${JSON.stringify(e.code)}`);
-            }
+          await this.zbController.verifyGroupExists(message.id);
         }
-        // objGroups[message.id.toString()] = message.name;
-        // await this.adapter.setStateAsync('info.groups', JSON.stringify(objGroups), true);
+        catch (e)
+        {
+          if (e && e.hasOwnProperty('code')) 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) {
@@ -251,14 +255,12 @@ class Groups {
             this.adapter.setObjectNotExists(id, {
                 type: 'device',
                 common: {name: name, type: 'group'},
-                native: {id}
+                native: {id: id}
             }, () => {
-                this.adapter.extendObject(id, {common: {name, type: 'group'}});
+                this.adapter.extendObject(id , {common: {name: name, type: 'group'}});
                 // create writable states for groups from their devices
                 for (const stateInd in statesMapping.groupStates) {
-                    if (!statesMapping.groupStates.hasOwnProperty(stateInd)) {
-                        continue;
-                    }
+                    if (!statesMapping.groupStates.hasOwnProperty(stateInd)) continue;
                     const statedesc = statesMapping.groupStates[stateInd];
                     const common = {
                         name: statedesc.name,
@@ -277,15 +279,16 @@ class Groups {
         }
     }
 
+
     async syncGroups() {
         const groups = await this.getGroups();
         const chain = [];
         const usedGroupsIds = [];
         for (const j in groups) {
             if (groups.hasOwnProperty(j)) {
-                const id = `group_${j}`;
-                const name = groups[j];
-                chain.push(new Promise(resolve => {
+                const id = `group_${j}`,
+                    name = groups[j];
+                chain.push(new Promise((resolve) => {
                     this.adapter.setObjectNotExists(id, {
                         type: 'device',
                         common: {name: name, type: 'group'},
@@ -294,9 +297,7 @@ class Groups {
                         this.adapter.extendObject(id, {common: {type: 'group'}});
                         // create writable states for groups from their devices
                         for (const stateInd in statesMapping.groupStates) {
-                            if (!statesMapping.groupStates.hasOwnProperty(stateInd)) {
-                                continue;
-                            }
+                            if (!statesMapping.groupStates.hasOwnProperty(stateInd)) continue;
                             const statedesc = statesMapping.groupStates[stateInd];
                             const common = {
                                 name: statedesc.name,
@@ -317,8 +318,8 @@ class Groups {
                 usedGroupsIds.push(parseInt(j));
             }
         }
-        chain.push(new Promise(resolve => {
-            // remove unused adapter groups
+        chain.push(new Promise((resolve) => {
+            // remove unused adpter groups
             this.adapter.getDevices((err, devices) => {
                 if (!err) {
                     devices.forEach((dev) => {
@@ -333,9 +334,9 @@ class Groups {
                 resolve();
             });
         }));
-
-        await Promise.all(chain);
+        Promise.all(chain);
     }
+
 }
 
 module.exports = Groups;

package/lib/json.js

@@ -3,14 +3,15 @@
 const hasProp = Object.prototype.hasOwnProperty;
 
 function throwsMessage(err) {
-    return `[Throws: ${err ? err.message : '?'}]`;
+    return '[Throws: ' + (err ? err.message : '?') + ']';
 }
 
 function safeGetValueFromPropertyOnObject(obj, property) {
     if (hasProp.call(obj, property)) {
         try {
             return obj[property];
-        } catch (err) {
+        }
+        catch (err) {
             return throwsMessage(err);
         }
     }
@@ -26,7 +27,7 @@ function ensureProperties(obj) {
             return obj;
         }
 
-        if (seen.includes(obj)) {
+        if (seen.indexOf(obj) !== -1) {
             return '[Circular]';
         }
         seen.push(obj);

package/lib/networkmap.js

@@ -46,8 +46,8 @@ class NetworkMap {
 
     getMap(from, command, callback) {
         if (this.zbController) {
-            this.zbController.getMap(networkmap => {
-                this.adapter.log.debug(`getMap result: ${JSON.stringify(networkmap)}`);
+            this.zbController.getMap((networkmap) => {
+                this.adapter.log.debug('getMap result: ' + JSON.stringify(networkmap));
                 this.adapter.sendTo(from, command, networkmap, callback);
             });
         }

package/lib/ota.js

@@ -65,24 +65,16 @@ 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.adapter.sendTo(obj.from, obj.command, {
-                status: 'fail',
-                device: getZbId(obj.message.devId),
-                msg: 'Device is deactivated'
-            }, obj.callback);
-            return;
+          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`);
+        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.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};
@@ -121,14 +113,14 @@ 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...`);
-            return;
+          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`);
+        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.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};
@@ -148,7 +140,7 @@ class Ota {
             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}'` : ``}`;
+            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) {

package/lib/rgb.js

@@ -61,19 +61,23 @@ function cie_to_rgb(x, y, brightness) {
 
     //Convert to RGB using Wide RGB D65 conversion
     let red 	=  X * 1.656492 - Y * 0.354851 - Z * 0.255038;
-    let green   = -X * 0.707196 + Y * 1.655397 + Z * 0.036152;
+    let green = -X * 0.707196 + Y * 1.655397 + Z * 0.036152;
     let blue 	=  X * 0.051713 - Y * 0.121364 + Z * 1.011530;
 
     //If red, green or blue is larger than 1.0 set it back to the maximum of 1.0
     if (red > blue && red > green && red > 1.0) {
+
         green = green / red;
         blue = blue / red;
         red = 1.0;
-    } else if (green > blue && green > red && green > 1.0) {
+    }
+    else if (green > blue && green > red && green > 1.0) {
+
         red = red / green;
         blue = blue / green;
         green = 1.0;
-    } else if (blue > red && blue > green && blue > 1.0) {
+    }
+    else if (blue > red && blue > green && blue > 1.0) {
 
         red = red / blue;
         green = green / blue;
@@ -85,6 +89,7 @@ function cie_to_rgb(x, y, brightness) {
     green 	= green <= 0.0031308 ? 12.92 * green : (1.0 + 0.055) * Math.pow(green, (1.0 / 2.4)) - 0.055;
     blue 	= blue  <= 0.0031308 ? 12.92 * blue  : (1.0 + 0.055) * Math.pow(blue,  (1.0 / 2.4)) - 0.055;
 
+
     //Convert normalized decimal to decimal
     red 	= Math.round(red * 255);
     green 	= Math.round(green * 255);
@@ -115,18 +120,18 @@ function cie_to_rgb(x, y, brightness) {
  */
 function rgb_to_cie(red, green, blue) {
     // Apply a gamma correction to the RGB values, which makes the color more vivid and more the like the color displayed on the screen of your device
-    red   = (red > 0.04045) ? Math.pow((red + 0.055) / (1.0 + 0.055), 2.4) : (red / 12.92);
-    green = (green > 0.04045) ? Math.pow((green + 0.055) / (1.0 + 0.055), 2.4) : (green / 12.92);
-    blue  = (blue > 0.04045) ? Math.pow((blue + 0.055) / (1.0 + 0.055), 2.4) : (blue / 12.92);
+    red 	= (red > 0.04045) ? Math.pow((red + 0.055) / (1.0 + 0.055), 2.4) : (red / 12.92);
+    green 	= (green > 0.04045) ? Math.pow((green + 0.055) / (1.0 + 0.055), 2.4) : (green / 12.92);
+    blue 	= (blue > 0.04045) ? Math.pow((blue + 0.055) / (1.0 + 0.055), 2.4) : (blue / 12.92);
 
     // RGB values to XYZ using the Wide RGB D65 conversion formula
-    const X = red * 0.664511 + green * 0.154324 + blue * 0.162028;
-    const Y = red * 0.283881 + green * 0.668433 + blue * 0.047685;
-    const Z = red * 0.000088 + green * 0.072310 + blue * 0.986039;
+    const X 		= red * 0.664511 + green * 0.154324 + blue * 0.162028;
+    const Y 		= red * 0.283881 + green * 0.668433 + blue * 0.047685;
+    const Z 		= red * 0.000088 + green * 0.072310 + blue * 0.986039;
 
     // Calculate the xy values from the XYZ values
-    let x = (X / (X + Y + Z)).toFixed(4);
-    let y = (Y / (X + Y + Z)).toFixed(4);
+    let x 		= (X / (X + Y + Z)).toFixed(4);
+    let y 		= (Y / (X + Y + Z)).toFixed(4);
 
     if (isNaN(x)) {
         x = 0;
@@ -147,9 +152,7 @@ function hsvToRGB(h, s, v) {
 
     let r; let g; let b;
     if (arguments.length === 1) {
-        s = h.s;
-        v = h.v;
-        h = h.h;
+        s = h.s, v = h.v, h = h.h;
     }
     const i = Math.floor(h * 6);
     const f = h * 6 - i;
@@ -173,9 +176,7 @@ function hsvToRGB(h, s, v) {
 
 function rgbToHSV(r, g, b, numeric) {
     if (arguments.length === 1) {
-        g = r.g;
-        b = r.b;
-        r = r.r;
+        g = r.g, b = r.b, r = r.r;
     }
     const max = Math.max(r, g, b); const min = Math.min(r, g, b);
     const d = max - min;
@@ -189,13 +190,11 @@ function rgbToHSV(r, g, b, numeric) {
         case g: h = (b - r) + d * 2; h /= 6 * d; break;
         case b: h = (r - g) + d * 4; h /= 6 * d; break;
     }
-    if (numeric) {
-        return {
-            h: Math.round(h*360),
-            s: Math.round(s*100),
-            v: Math.round(v*100),
-        };
-    }
+    if (numeric) return {
+        h: Math.round(h*360),
+        s: Math.round(s*100),
+        v: Math.round(v*100),
+    };
     return {
         h: (h * 360).toFixed(3),
         s: (s * 100).toFixed(3),
@@ -205,17 +204,20 @@ function rgbToHSV(r, g, b, numeric) {
 function colorArrayFromString(value) {
     if (typeof(value) === 'string') {
         const rv = [];
-        value.split(',').forEach(element =>
-            rv.push(colors.ParseColor(element)));
+        value.split(',').forEach(element => {
+            rv.push(colors.ParseColor(element));
+        });
         return rv;
     }
-    return [{r: 0, g: 128, b: 255}];
+    return [{r:0,g:128,b:255}];
 }
 
-function colorStringFromRGBArray(payload) {
-    const rv = [];
-    payload.forEach(element =>
-        rv.push(rgb_to_rgbstring(element)));
+function colorStringFromRGBArray(payload)
+{
+    let rv = []
+    payload.forEach(element => {
+        rv.push(rgb_to_rgbstring(element));
+    });
     return rv.toString();
 }
 
@@ -226,26 +228,21 @@ function hsv_to_cie(h,s,v){
 
 function rgb_to_rgbstring(element) {
     let col = '#';
-    if (element && element.hasOwnProperty('r')) {
-        col = col + element.r.toString(16).padStart(2, '0');
-    } else {
-        col = col + '00';
-    }
-    if (element && element.hasOwnProperty('g')) {
-        col = col + element.g.toString(16).padStart(2, '0');
-    } else {
-        col = col + '00';
-    }
-    if (element && element.hasOwnProperty('b')) {
-        col = col + element.b.toString(16).padStart(2, '0');
-    } else {
-        col = col + '00';
-    }
+    if (element && element.hasOwnProperty("r"))
+      col = col + element.r.toString(16).padStart(2, '0');
+    else col = col + '00';
+    if (element && element.hasOwnProperty("g"))
+      col = col + element.g.toString(16).padStart(2, '0');
+    else col = col + '00';
+    if (element && element.hasOwnProperty("b"))
+      col = col + element.b.toString(16).padStart(2, '0');
+    else col = col + '00';
     return col;
 }
 
+
 function hsvToRGBString(h,s,v) {
-    return rgb_to_rgbstring(hsvToRGB(h,s,v));
+    return rgb_to_rgbstring(hsvToRGB(h,s,v))
 }
 
 exports.hsv_to_cie = hsv_to_cie;

package/lib/seriallist.js

@@ -1,12 +1,12 @@
 'use strict';
 
 const serialPortUtils = require('zigbee-herdsman/dist/adapter/serialPortUtils').default;
-let SerialPort = null;
+
 
 class SerialList {
     constructor(adapter) {
         this.adapter = adapter;
-        this.adapter.on('message', obj => this.onMessage(obj));
+        this.adapter.on('message', this.onMessage.bind(this));
     }
     /**
      * @param {ioBroker.Message} obj
@@ -16,22 +16,17 @@ class SerialList {
             switch (obj.command) {
                 case 'listUart':
                     if (obj.callback) {
-                        SerialPort = SerialPort || require('serialport').SerialPort;
-                        if (SerialPort) {
-                            // read all found serial ports
-                            SerialPort.list()
-                                .then(ports => {
-                                    this.adapter.log.info(`List of port: ${JSON.stringify(ports)}`);
-                                    this.adapter.sendTo(obj.from, obj.command, ports.map(item => ({label: item.friendlyName, comName: item.path})), obj.callback);
-                                })
-                                .catch(e => {
-                                    this.adapter.sendTo(obj.from, obj.command, [], obj.callback);
-                                    this.adapter.log.error(e);
-                                });
-                        } else {
-                            this.adapter.log.warn('Module serialport is not available');
-                            this.adapter.sendTo(obj.from, obj.command, [{label: 'Not available', value: ''}], obj.callback);
-                        }
+                        this.listSerial()
+                            .then((ports) => {
+                                this.adapter.log.debug('List of ports: ' + JSON.stringify(ports));
+                                this.adapter.sendTo(obj.from, obj.command, ports.map(item => ({                                 
+                                    label: item.friendlyName || item.pnpId || item.manufacturer,
+                                    comName: item.path
+                                })), obj.callback);
+                            }).catch((err) => {
+                                this.adapter.log.error(`List of ports error: ${err}`);
+                                this.adapter.sendTo(obj.from, obj.command, [], obj.callback);
+                            });
                     }
                     break;
             }
@@ -39,9 +34,9 @@ class SerialList {
     }
 
     listSerial() {
-        return serialPortUtils.find([{}])
-            .then(ports =>
-                ports.map(port => ({comName: port})));
+        return serialPortUtils.find([{}]).then((ports) => {
+            return ports.map((port) => {return {comName: port};});
+        });
     }
 }