fix: Add null check for new_state in TriggerStateController and ZoneC…

…ontroller
zachowj · Aug 29, 2024 · 5258e4a · 5258e4a
1 parent db07957
commit 5258e4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/nodes/trigger-state/TriggerStateController.ts b/src/nodes/trigger-state/TriggerStateController.ts
@@ -395,9 +395,11 @@ export default class TriggerStateController extends ExposeAsController {
             );
         }
 
-        eventMessage.event.new_state.timeSinceChangedMs =
-            Date.now() -
-            new Date(eventMessage.event.new_state.last_changed).getTime();
+        if (eventMessage.event.new_state) {
+            eventMessage.event.new_state.timeSinceChangedMs =
+                Date.now() -
+                new Date(eventMessage.event.new_state.last_changed).getTime();
+        }
 
         const constraintComparatorResults =
             await this.#getConstraintComparatorResults(

diff --git a/src/nodes/zone/ZoneController.ts b/src/nodes/zone/ZoneController.ts
@@ -68,8 +68,10 @@ export default class Zone extends ExposeAsController {
 
         if (!zones.length) return;
 
-        event.new_state.timeSinceChangedMs =
-            Date.now() - new Date(event.new_state.last_changed).getTime();
+        if (event.new_state) {
+            event.new_state.timeSinceChangedMs =
+                Date.now() - new Date(event.new_state.last_changed).getTime();
+        }
 
         const msg = {
             topic: entityId,