refactor: make nodes a map instead of an array

app.js

@@ -330,7 +330,7 @@ function setupSocket (server) {
   socketManager.on(inboundEvents.init, function (socket) {
     if (gw.zwave) {
       socket.emit(socketEvents.init, {
-        nodes: gw.zwave.nodes,
+        nodes: gw.zwave.getNodes(),
         info: gw.zwave.getInfo(),
         error: gw.zwave.error,
         cntStatus: gw.zwave.cntStatus
@@ -347,7 +347,7 @@ function setupSocket (server) {
   })
 
   socketManager.on(inboundEvents.mqtt, async function (socket, data) {
-    logger.info(`Mqtt api call: ${data.apiName}`)
+    logger.info(`Mqtt api call: ${data.api}`)
 
     let res, err
 
@@ -669,27 +669,38 @@ app.post('/api/importConfig', apisLimiter, isAuthenticated, async function (
   req,
   res
 ) {
-  const config = req.body.data
+  let config = req.body.data
   try {
     if (!gw.zwave) throw Error('Zwave client not inited')
 
-    if (!Array.isArray(config)) throw Error('Configuration not valid')
-    else {
+    // try convert to node object
+    if (Array.isArray(config)) {
+      const parsed = {}
+
       for (let i = 0; i < config.length; i++) {
-        const e = config[i]
-        if (
-          e &&
-          (!utils.hasProperty(e, 'name') || !utils.hasProperty(e, 'loc'))
-        ) {
-          continue
-        } else if (e) {
-          await gw.zwave.callApi('_setNodeName', i, e.name || '')
-          await gw.zwave.callApi('_setNodeLocation', i, e.loc || '')
-          if (e.hassDevices) {
-            await gw.zwave.storeDevices(e.hassDevices, i, false)
-          }
+        if (config[i]) {
+          parsed[i] = config[i]
         }
       }
+
+      config = parsed
+    }
+
+    for (const nodeId in config) {
+      const node = config[nodeId]
+      if (!node || typeof node !== 'object') continue
+
+      if (utils.hasProperty(node, 'name')) {
+        await gw.zwave.callApi('setNodeName', nodeId, node.name || '')
+      }
+
+      if (utils.hasProperty(node, 'loc')) {
+        await gw.zwave.callApi('setNodeLocation', nodeId, node.loc || '')
+      }
+
+      if (node.hassDevices) {
+        await gw.zwave.storeDevices(node.hassDevices, nodeId, false)
+      }
     }
 
     res.json({ success: true, message: 'Configuration imported successfully' })

docs/guide/mqtt.md

@@ -47,7 +47,7 @@ This are the available apis:
   - `_addSceneValue(sceneId, valueId, value, timeout)`: Add a value to a specific scene
   - `_removeSceneValue(sceneId, valueId)`: remove a valueId from a scene
   - `_activateScene(sceneId)`: activate a scene
-- `_setNodeName(name)` and `_setNodeLocation(location)` will use internal nodes store to save nodes names/locations in a json file
+- `setNodeName(name)` and `setNodeLocation(location)` will use internal nodes store to save nodes names/locations in a json file and will also try to store this info on the controller
 - `refreshNeighborns()`: Returns an Array where the Array index is the `nodeId`, array value is an Array with all the ids of the node neighborns
 - `getNodes()`: Returns an array with all nodes in the network (and their info/valueids)
 - `getInfo()`: Returns an object with:

lib/Gateway.js

@@ -925,7 +925,7 @@ Gateway.prototype.parsePayload = function (payload, valueId, valueConf) {
       }
 
       if (valueConf.parseReceive) {
-        const node = this.zwave.nodes[valueId.nodeId]
+        const node = this.zwave.nodes.get(valueId.nodeId)
         const parsedVal = evalFunction(
           valueConf.receiveFunction,
           valueId,
@@ -1091,7 +1091,7 @@ Gateway.prototype.valueTopic = function (node, valueId, returnObject = false) {
  * @param {number} nodeID
  */
 Gateway.prototype.rediscoverNode = function (nodeID) {
-  const node = this.zwave.nodes[nodeID]
+  const node = this.zwave.nodes.get(nodeID)
   if (node) {
     // delete all discovered values
     onNodeRemoved.call(this, node)
@@ -1117,7 +1117,7 @@ Gateway.prototype.rediscoverNode = function (nodeID) {
  * @param {number} nodeID
  */
 Gateway.prototype.disableDiscovery = function (nodeID) {
-  const node = this.zwave.nodes[nodeID]
+  const node = this.zwave.nodes.get(nodeID)
   if (node && node.hassDevices) {
     for (const id in node.hassDevices) {
       node.hassDevices[id].ignoreDiscovery = true
@@ -1219,15 +1219,15 @@ Gateway.prototype.rediscoverAll = function () {
   if (!this.config.hassDiscovery) return
 
   const nodes = this.zwave ? this.zwave.nodes : []
-  for (let i = 0; i < nodes.length; i++) {
-    const devices = nodes[i] && nodes[i].hassDevices ? nodes[i].hassDevices : {}
+  for (const [nodeId, node] of nodes) {
+    const devices = node.hassDevices || {}
     for (const id in devices) {
       const d = devices[id]
       if (d && d.discoveryTopic && d.discovery_payload) {
-        this.publishDiscovery(d, i)
+        this.publishDiscovery(d, nodeId)
       }
     } // end foreach hassdevice
-  } // end foreach node
+  }
 }
 
 /**
@@ -2126,7 +2126,7 @@ Gateway.prototype.discoverValue = function (node, vId) {
  * @param {number} nodeId
  */
 Gateway.prototype.updateNodeTopics = function (nodeId) {
-  const node = this.zwave.nodes[nodeId]
+  const node = this.zwave.nodes.get(nodeId)
   if (node) {
     const topics = Object.keys(this.topicValues).filter(
       k => this.topicValues[k].nodeId === node.id
@@ -2147,7 +2147,7 @@ Gateway.prototype.updateNodeTopics = function (nodeId) {
  * @param {number} nodeId
  */
 Gateway.prototype.removeNodeRetained = function (nodeId) {
-  const node = this.zwave.nodes[nodeId]
+  const node = this.zwave.nodes.get(nodeId)
   if (node) {
     const topics = Object.keys(node.values).map(v =>
       this.valueTopic(node, node.values[v])