fix: update valueIds on metadata updated

zwave-js · Dec 1, 2020 · a76c096 · a76c096
1 parent 6922fca
commit a76c096
Showing 1 changed file with 30 additions and 22 deletions.
diff --git a/lib/ZwaveClient.js b/lib/ZwaveClient.js
@@ -431,8 +431,8 @@ function onNodeValueRemoved (zwaveNode, args) {
 }
 
 function onNodeMetadataUpdated (zwaveNode, args) {
-  updateValueMetadata.call(this, zwaveNode, args, args.metadata)
-  debug(`Node ${zwaveNode.id}: metadata updated: ${getValueID(args)}`)
+  const valueId = initValue.call(this, zwaveNode, args, args.metadata)
+  debug(`Node ${valueId.nodeId}: metadata updated: ${getValueID(args)}`)
   this.emit(
     'event',
     eventEmitter.node,
@@ -711,33 +711,41 @@ function addValue (zwaveNode, zwaveValue) {
   } else {
     const zwaveValueMeta = zwaveNode.getValueMetadata(zwaveValue)
 
-    const valueId = updateValueMetadata.call(
-      this,
-      zwaveNode,
-      zwaveValue,
-      zwaveValueMeta
-    )
-    valueId.value = zwaveNode.getValue(zwaveValue)
-
-    if (isCurrentValue(valueId)) {
-      valueId.isCurrentValue = true
-      const targetValue = findTargetValue(
-        valueId,
-        zwaveNode.getDefinedValueIDs()
-      )
-      if (targetValue) {
-        valueId.targetValue = getValueID(targetValue, false)
-      }
-    }
+    const valueId = initValue.call(this, zwaveNode, zwaveValue, zwaveValueMeta)
 
     debug(`Node ${zwaveNode.id}: value added ${valueId.id} => ${valueId.value}`)
 
-    node.values[getValueID(valueId)] = valueId
-
     this.emit('valueChanged', valueId, node)
   }
 }
 
+function initValue (zwaveNode, zwaveValue, zwaveValueMeta) {
+  const node = this.nodes[zwaveNode.id]
+
+  const valueId = updateValueMetadata.call(
+    this,
+    zwaveNode,
+    zwaveValue,
+    zwaveValueMeta
+  )
+  valueId.value = zwaveNode.getValue(zwaveValue)
+
+  if (isCurrentValue(valueId)) {
+    valueId.isCurrentValue = true
+    const targetValue = findTargetValue(
+      valueId,
+      zwaveNode.getDefinedValueIDs()
+    )
+    if (targetValue) {
+      valueId.targetValue = getValueID(targetValue, false)
+    }
+  }
+
+  node.values[getValueID(valueId)] = valueId
+
+  return valueId
+}
+
 // Triggered when a node is ready and a value changes
 function updateValue (zwaveNode, args) {
   const node = this.nodes[zwaveNode.id]