From c6343a90fbfe25de075f82e6d32cfbfdb8484e10 Mon Sep 17 00:00:00 2001
From: Jason <jason@kermitdesign.com>
Date: Tue, 12 Feb 2019 11:15:29 -0800
Subject: [PATCH] feat(wait-until): Added ability to check against current
 state

Ability to check against current state and not wait for the state to
change
---
 nodes/wait-until/wait-until.html | 13 ++++++++++++-
 nodes/wait-until/wait-until.js   | 13 +++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/nodes/wait-until/wait-until.html b/nodes/wait-until/wait-until.html
index 00d48b6a74..f3244bd3b3 100644
--- a/nodes/wait-until/wait-until.html
+++ b/nodes/wait-until/wait-until.html
@@ -22,7 +22,8 @@
       timeout: { value: 0 },
       timeoutUnits: { value: "seconds" },
       entityLocation: { value: "data" },
-      entityLocationType: { value: "none" }
+      entityLocationType: { value: "none" },
+      checkCurrentState: { value: true }
     },
     oneditprepare: function() {
       const $entityIdField = $("#node-input-entityId");
@@ -91,6 +92,11 @@
           minLength: 0
         });
       }
+
+      if (node.checkCurrentState === undefined) {
+        $("#node-input-checkCurrentState").prop("checked", false);
+      }
+
       const defaultTypes = ["str", "num", "bool", "re"];
       $("#node-input-value")
         .typedInput({
@@ -192,6 +198,11 @@
     <input type="hidden" id="node-input-entityLocationType" />
     <input type="text" id="node-input-entityLocation" />
   </div>
+
+  <div class="form-row">
+    <input type="checkbox" id="node-input-checkCurrentState" checked style="margin-left:105px;display:inline-block; width:auto; vertical-align:baseline;">&nbsp;
+    <label for="node-input-checkCurrentState" style="width: auto;margin-right: 20px;">Check against current state</label>
+  </div>
 </script>
 
 <script type="text/x-red" data-help-name="ha-wait-until">
diff --git a/nodes/wait-until/wait-until.js b/nodes/wait-until/wait-until.js
index de8b8b4419..abbd3254ca 100644
--- a/nodes/wait-until/wait-until.js
+++ b/nodes/wait-until/wait-until.js
@@ -14,7 +14,8 @@ module.exports = function(RED) {
             timeout: {},
             timeoutUnits: {},
             entityLocation: {},
-            entityLocationType: {}
+            entityLocationType: {},
+            checkCurrentState: {}
         }
     };
 
@@ -90,7 +91,7 @@ module.exports = function(RED) {
             }
         }
 
-        onInput({ parsedMessage, message }) {
+        async onInput({ parsedMessage, message }) {
             const node = this;
             const config = node.nodeConfig;
 
@@ -167,6 +168,14 @@ module.exports = function(RED) {
                 }, node.timeout);
             }
             node.status({ fill: 'blue', text: statusText });
+
+            if (config.checkCurrentState === true) {
+                const currentState = await this.nodeConfig.server.homeAssistant.getStates(
+                    config.entityId
+                );
+
+                node.onEntityChange({ event: { new_state: currentState } });
+            }
         }
 
         timeoutStatus(milliseconds = 0) {