feat: Rediscover node button to update node discovered values after c…

…hanging node name/location #153
zwave-js · Mar 2, 2020 · be5e356 · be5e356
1 parent d33f0a1
commit be5e356
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 0 deletions.
diff --git a/app.js b/app.js
@@ -84,6 +84,9 @@ app.startSocket = function (server) {
         case 'discover':
           gw.publishDiscovery(data.device, data.node_id, false, true)
           break;
+        case 'rediscoverNode':
+          gw.rediscoverNode(data.node_id)
+          break;
         case 'update':
           gw.zwave.updateDevice(data.device, data.node_id)
           break;

diff --git a/lib/Gateway.js b/lib/Gateway.js
@@ -651,6 +651,26 @@ Gateway.prototype.valueTopic = function (node, valueId, returnObject) {
   }
 }
 
+Gateway.prototype.rediscoverNode = function (nodeID) {
+  var node = this.zwave.nodes[nodeID]
+  if (node) {
+    // delete all discovered values
+    onNodeRemoved.call(this, node)
+    node.hassDevices = {}
+
+    // rediscover all values
+    const nodeDevices = allDevices[node.device_id] || []
+    nodeDevices.forEach(device => this.discoverDevice(node, device))
+
+    // discover node values (that are not part of a device)
+    for (let id in node.values) {
+      this.discoverValue(node, node.values[id])
+    }
+
+    this.emitEvent('NODE_UPDATED', node)
+  }
+}
+
 Gateway.prototype.publishDiscovery = function (hassDevice, nodeId, deleteDevice, update) {
   try {
     // set values as discovered

diff --git a/src/components/ControlPanel.vue b/src/components/ControlPanel.vue
@@ -224,6 +224,7 @@
                   <v-flex xs12 md6 pa-1>
                     <v-btn color="blue darken-1" flat @click.native="storeDevices(false)">Store</v-btn>
                     <v-btn color="red darken-1" flat @click.native="storeDevices(true)">Remove Store</v-btn>
+                    <v-btn color="green darken-1" flat @click.native="rediscoverNode">Rediscover Node</v-btn>
 
                     <v-data-table :headers="headers_hass" :items="hassDevices" class="elevation-1">
                       <template slot="items" slot-scope="props">
@@ -862,6 +863,18 @@ export default {
         })
       }
     },
+    rediscoverNode () {
+      var node = this.selectedNode
+      if (
+        node &&
+        confirm('Are you sure you want to re-discover all node values?')
+      ) {
+        this.socket.emit(this.socketActions.hass, {
+          apiName: 'rediscoverNode',
+          node_id: this.selectedNode.node_id
+        })
+      }
+    },
     rediscoverDevice () {
       var device = this.selectedDevice
       if (