openhab-scripting 4.28.0 → 4.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 738583da2cd48296525b6b6a2999fe1daba82b0cbb1c410beb7e3575fdf6afbb
-  data.tar.gz: e7d4ff645268380636f69bff6eec42d8b8f650784225afe9d456027b44e11d77
+  metadata.gz: a4e5de50bc22188eb5350aa71f00738703afab2e75703c9f5c2f4ffce54c49dc
+  data.tar.gz: e42484957fcea08aaf5d397af1ec5012b5595bd893eacca7bbc2db3149a1707b
 SHA512:
-  metadata.gz: e06a080cedde9ffbb29983f087c93dff1533fe521112c1036015c1f42f93c5a9d164bd0c307d21109c8f3a6abe7cb74e0f63b144cd21d2f7086a1e03d0b9c545
-  data.tar.gz: e23ccc89ee67bc2152efaa91ff33157c74d99d244da3cc11b497b8500b094f40dfc66b61fcb04c18763fe53afaabccba8baa6f2bf05c9f3d5d194915255f8078
+  metadata.gz: af5435c5804d2a58f1e8cf84647ee1813c80c958e9b1c3c6794d6879adeebd71ac6955454ad424522916375d7314719312b561d7b2a718ad43b48e76edd2801c
+  data.tar.gz: 2f3e46d17e305d1169980fdf2aa5ae8f5673e4730d73d2d10dbb445582642086522d3ab43e9bae5a411637ec1e787d465431423fb307a04ed09178be5953c25a

data/lib/openhab/dsl/items/group_item.rb

@@ -32,6 +32,13 @@ module OpenHAB
             group.get_members.to_a
           end
 
+          # Name of the group
+          #
+          # @return [String]
+          def name
+            group.name
+          end
+
           # Send a command to each member of the group
           #
           # @return [GroupMembers] +self+

data/lib/openhab/dsl/items/item_registry.rb

@@ -35,7 +35,7 @@ module OpenHAB
         # Explicit conversion to array
         # @return [Array]
         def to_a
-          $ir.items.grep_v(org.openhab.core.items.GroupItem) # rubocop:disable Style/GlobalVars
+          $ir.items.to_a # rubocop:disable Style/GlobalVars
         end
       end
 

data/lib/openhab/dsl/rules/automation_rule.rb

@@ -45,7 +45,7 @@ module OpenHAB
           between = config.between&.yield_self { between(config.between) }
           @between = between || OpenHAB::DSL::Between::ALL_DAY
           # Convert between to correct range or nil if not set
-          @trigger_delays = config.trigger_delays
+          @trigger_conditions = config.trigger_conditions
           @attachments = config.attachments
         end
         # rubocop:enable Metrics/MethodLength
@@ -57,18 +57,12 @@ module OpenHAB
         # @param [Map] inputs map provided by OpenHAB rules engine containing event and other information
         #
         #
-        def execute(mod = nil, inputs = nil) # rubocop:disable Metrics/MethodLength
+        def execute(mod = nil, inputs = nil)
           thread_local(RULE_NAME: name) do
             logger.trace { "Execute called with mod (#{mod&.to_string}) and inputs (#{inputs&.pretty_inspect})" }
             logger.trace { "Event details #{inputs['event'].pretty_inspect}" } if inputs&.key?('event')
-            if trigger_delay inputs
-              trigger_delay = trigger_delay(inputs)
-              process_trigger_delay(trigger_delay, mod, inputs)
-            else
-              # If guards are satisfied execute the run type blocks
-              # If they are not satisfied, execute the Othewise blocks
-              queue = create_queue(inputs)
-              process_queue(queue, mod, inputs)
+            trigger_conditions(inputs).process(mod: mod, inputs: inputs) do
+              process_queue(create_queue(inputs), mod, inputs)
             end
           end
         end
@@ -124,18 +118,18 @@ module OpenHAB
         end
 
         #
-        # Returns trigger delay from inputs if it exists
+        # Returns trigger conditions from inputs if it exists
         #
         # @param [Map] inputs map from OpenHAB containing UID
         #
-        # @return [Array] Array of trigger delays that match rule UID
+        # @return [Array] Array of trigger conditions that match rule UID
         #
-        def trigger_delay(inputs)
+        def trigger_conditions(inputs)
           # Parse this to get the trigger UID:
           # ["72698819-83cb-498a-8e61-5aab8b812623.event", "oldState", "module", \
           #  "72698819-83cb-498a-8e61-5aab8b812623.oldState", "event", "newState",\
           #  "72698819-83cb-498a-8e61-5aab8b812623.newState"]
-          @trigger_delays[trigger_id(inputs)]
+          @trigger_conditions[trigger_id(inputs)]
         end
 
         # If an attachment exists for the trigger for this event add it to the event object
@@ -151,138 +145,6 @@ module OpenHAB
           event
         end
 
-        #
-        # Check if trigger guards prevent rule execution
-        #
-        # @param [Delay] trigger_delay rules delaying trigger because of
-        # @param [Map] inputs OpenHAB map object describing rule trigger
-        #
-        # @return [Boolean] True if the rule should execute, false if trigger guard prevents execution
-        #
-        def check_trigger_guards(trigger_delay, inputs)
-          new_state, old_state = retrieve_states(inputs)
-          if check_from(trigger_delay, old_state)
-            return true if check_to(trigger_delay, new_state)
-
-            logger.trace("Skipped execution of rule '#{name}' because to state #{new_state}"\
-                         " does not equal specified state(#{trigger_delay.to})")
-          else
-            logger.trace("Skipped execution of rule '#{name}' because old state #{old_state}"\
-                         " does not equal specified state(#{trigger_delay.from})")
-          end
-        end
-
-        #
-        # Rerieve the newState and oldState, alternatively newStatus and oldStatus
-        # from the input map
-        #
-        # @param [Map] inputs OpenHAB map object describing rule trigger
-        #
-        # @return [Array] An array of the values for [newState, oldState] or [newStatus, oldStatus]
-        #
-        def retrieve_states(inputs)
-          old_state = inputs['oldState'] || thing_status_to_sym(inputs['oldStatus'])
-          new_state = inputs['newState'] || thing_status_to_sym(inputs['newStatus'])
-
-          [new_state, old_state]
-        end
-
-        #
-        # Converts a ThingStatus object to a ruby Symbol
-        #
-        # @param [Java::OrgOpenhabCoreThing::ThingStatus] status A ThingStatus instance
-        #
-        # @return [Symbol] A corresponding symbol, in lower case
-        #
-        def thing_status_to_sym(status)
-          status&.to_s&.downcase&.to_sym
-        end
-
-        #
-        # Check the from state against the trigger delay
-        #
-        # @param [TriggerDelay] trigger_delay Information about the trigger delay
-        # @param [Item State] state from state to check
-        #
-        # @return [Boolean] true if no from state is defined or defined state equals supplied state
-        #
-        def check_from(trigger_delay, state)
-          trigger_delay.from.nil? || state == trigger_delay.from
-        end
-
-        #
-        # Check the to state against the trigger delay
-        #
-        # @param [TriggerDelay] trigger_delay Information about the trigger delay
-        # @param [Item State] state to-state to check
-        #
-        # @return [Boolean] true if no to state is defined or defined state equals supplied state
-        #
-        def check_to(trigger_delay, state)
-          trigger_delay.to.nil? || state == trigger_delay.to
-        end
-
-        #
-        # Process any matching trigger delays
-        #
-        # @param [Map] mod OpenHAB map object describing rule trigger
-        # @param [Map] inputs OpenHAB map object describing rule trigger
-        #
-        #
-        def process_trigger_delay(trigger_delay, mod, inputs)
-          if trigger_delay.timer_active?
-            process_active_timer(inputs, mod, trigger_delay)
-          elsif check_trigger_guards(trigger_delay, inputs)
-            logger.trace("Trigger Guards Matched for #{trigger_delay}, delaying rule execution")
-            # Add timer and attach timer to delay object, and also state being tracked to so timer can be cancelled if
-            #   state changes
-            # Also another timer should not be created if changed to same value again but instead rescheduled
-            create_trigger_delay_timer(inputs, mod, trigger_delay)
-          else
-            logger.trace("Trigger Guards did not match for #{trigger_delay}, ignoring trigger.")
-          end
-        end
-
-        #
-        # Creatas a timer for trigger delays
-        #
-        # @param [Hash] inputs rule trigger inputs
-        # @param [Hash] mod rule trigger mods
-        # @param [TriggerDelay] trigger_delay specifications
-        #
-        #
-        def create_trigger_delay_timer(inputs, mod, trigger_delay)
-          logger.trace("Creating timer for rule #{name} and trigger delay #{trigger_delay}")
-          trigger_delay.timer = after(trigger_delay.duration) do
-            logger.trace("Delay Complete for #{trigger_delay}, executing rule")
-            trigger_delay.timer = nil
-            queue = create_queue(inputs)
-            process_queue(queue, mod, inputs)
-          end
-          trigger_delay.tracking_to, = retrieve_states(inputs)
-        end
-
-        #
-        # Process an active trigger timer
-        #
-        # @param [Hash] inputs rule trigger inputs
-        # @param [Hash] mod rule trigger mods
-        # @param [TriggerDelay] trigger_delay specifications
-        #
-        #
-        def process_active_timer(inputs, mod, trigger_delay)
-          state, = retrieve_states(inputs)
-          if state == trigger_delay.tracking_to
-            logger.trace("Item changed to #{state} for #{trigger_delay}, rescheduling timer.")
-            trigger_delay.timer.reschedule(ZonedDateTime.now.plus(trigger_delay.duration))
-          else
-            logger.trace("Item changed to #{state} for #{trigger_delay}, canceling timer.")
-            trigger_delay.timer.cancel
-            # Reprocess trigger delay after canceling to track new state (if guards matched, etc)
-            process_trigger_delay(trigger_delay, mod, inputs)
-          end
-        end
-
         #
         # Check if any guards prevent execution
         #
@@ -304,7 +166,7 @@ module OpenHAB
           end
           false
         rescue StandardError => e
-          print_backtrace(e)
+          logger.log_exception(e, name)
         end
         # rubocop:enable Metrics/MethodLength
 
@@ -328,7 +190,7 @@ module OpenHAB
             end
           end
         rescue StandardError => e
-          print_backtrace(e)
+          logger.log_exception(e, name)
         end
 
         #
@@ -399,16 +261,6 @@ module OpenHAB
           @run_context.instance_exec(event, &task.block)
         end
 
-        #
-        # Print error and stack trace without calls to internal classes
-        #
-        # @param [Exception] error A rescued error
-        #
-        def print_backtrace(error)
-          error = logger.clean_backtrace(error)
-          logger.error { "#{error.message} (#{error.class})\nIn rule: #{name}\n#{error.backtrace&.join("\n")}" }
-        end
-
         #
         # Create a new hash in which all elements are converted to strings
         #

data/lib/openhab/dsl/rules/rule.rb

@@ -5,7 +5,6 @@ require 'openhab/core/services'
 require 'openhab/log/logger'
 require_relative 'rule_config'
 require_relative 'automation_rule'
-require_relative 'cron_trigger_rule'
 require_relative 'guard'
 
 module OpenHAB
@@ -26,7 +25,7 @@ module OpenHAB
       @registry = OpenHAB::Core.rule_registry
       class << self
         attr_reader :script_rules, :automation_manager, :registry
-end
+      end
 
       #
       # Create a new rule
@@ -35,7 +34,7 @@ end
       # @yield [] Block executed in context of a RuleConfig
       #
       #
-      # rubocop: disable Metrics
+      # rubocop: disable Metrics/MethodLength
       def rule(rule_name, &block)
         thread_local(RULE_NAME: rule_name) do
           @rule_name = rule_name
@@ -47,10 +46,9 @@ end
           nil # Must return something other than the rule object. See https://github.com/boc-tothefuture/openhab-jruby/issues/438
         end
       rescue StandardError => e
-        puts "#{e.class}: #{e.message}"
-        re_raise_with_backtrace(e)
+        logger.log_exception(e, @rule_name)
       end
-      # rubocop: enable Metrics
+      # rubocop: enable Metrics/MethodLength
 
       #
       # Cleanup rules in this script file
@@ -62,16 +60,6 @@ end
 
       private
 
-      #
-      # Re-raises a rescued error to OpenHAB with added rule name and stack trace
-      #
-      # @param [Exception] error A rescued error
-      #
-      def re_raise_with_backtrace(error)
-        error = logger.clean_backtrace(error)
-        raise error, "#{error.message}\nIn rule: #{@rule_name}\n#{error.backtrace.join("\n")}"
-      end
-
       #
       # Process a rule based on the supplied configuration
       #
@@ -81,44 +69,14 @@ end
       def process_rule_config(config)
         return unless create_rule?(config)
 
-        cron_attach_triggers, other_triggers = partition_triggers(config)
-        logger.trace("Cron triggers: #{cron_attach_triggers} -  Other triggers: #{other_triggers}")
-        config.triggers = other_triggers
-
         rule = AutomationRule.new(config: config)
         Rules.script_rules << rule
         add_rule(rule)
 
-        process_cron_attach(cron_attach_triggers, config, rule)
-
         rule.execute(nil, { 'event' => Struct.new(:attachment).new(config.start_attachment) }) if config.on_start?
         rule
       end
 
-      #
-      # Add cron triggers with attachments to rules
-      # @param [Array] cron_attach_triggers cron type triggers with attachments
-      #
-      def process_cron_attach(cron_attach_triggers, config, rule)
-        cron_attach_triggers&.map { |trigger| CronTriggerRule.new(rule_config: config, rule: rule, trigger: trigger) }
-                            &.each { |trigger| add_rule(trigger) }
-      end
-
-      #
-      # Partitions triggers in a config, removing cron triggers with a corresponding attachment
-      # so they can be used with CronTriggerRules to support attachments
-      # @return [Array] Two element array the first element is cron triggers with attachments,
-      #   second element is other triggers
-      #
-      def partition_triggers(config)
-        config
-          .triggers
-          .partition do |trigger|
-          trigger.typeUID == OpenHAB::DSL::Rules::Triggers::Trigger::CRON &&
-            config.attachments.key?(trigger.id)
-        end
-      end
-
       #
       # Should a rule be created based on rule configuration
       #

data/lib/openhab/dsl/rules/rule_config.rb

@@ -10,6 +10,7 @@ require_relative 'triggers/command'
 require_relative 'triggers/updated'
 require_relative 'triggers/generic'
 require_relative 'triggers/watch'
+require_relative 'triggers/conditions/proc'
 require_relative 'guard'
 require 'openhab/core/entity_lookup'
 require 'openhab/dsl/between'
@@ -37,7 +38,7 @@ module OpenHAB
         attr_accessor :triggers
 
         # @return [Array] Of trigger delays
-        attr_reader :trigger_delays
+        attr_reader :trigger_conditions
 
         # @return [Hash] Hash of trigger UIDs to attachments
         attr_reader :attachments
@@ -86,7 +87,7 @@ module OpenHAB
         #
         def initialize(rule_name, caller_binding)
           @triggers = []
-          @trigger_delays = {}
+          @trigger_conditions = Hash.new(OpenHAB::DSL::Rules::Triggers::Conditions::Proc::ANY)
           @attachments = {}
           @caller = caller_binding.eval 'self'
           name(rule_name)
@@ -145,7 +146,7 @@ module OpenHAB
             "Triggers: (#{triggers}) " \
             "Run blocks: (#{run}) " \
             "on_start: (#{on_start?}) " \
-            "Trigger Waits: #{trigger_delays} " \
+            "Trigger Conditions: #{trigger_conditions} " \
             "Trigger UIDs: #{triggers.map(&:id).join(', ')}" \
             "Attachments: #{attachments} "
         end

data/lib/openhab/dsl/rules/triggers/changed.rb

@@ -1,25 +1,19 @@
 # frozen_string_literal: true
 
 require 'openhab/log/logger'
+require_relative 'conditions/duration'
+require_relative 'conditions/proc'
 
 module OpenHAB
   module DSL
     module Rules
       #
-      # Module holds rule triggers
+      # Module for changed triggers
       #
+
       module Triggers
         include OpenHAB::Log
 
-        #
-        # Struct capturing data necessary for a conditional trigger
-        #
-        TriggerDelay = Struct.new(:to, :from, :duration, :timer, :tracking_to, keyword_init: true) do
-          def timer_active?
-            timer&.is_active
-          end
-        end
-
         #
         # Creates a trigger item, group and thing changed
         #
@@ -38,7 +32,7 @@ module OpenHAB
             wait_duration = binding.local_variable_get(:for)
 
             each_state(from, to) do |from_state, to_state|
-              changed_or_wait(item, from_state, to_state, wait_duration, attach)
+              changed_trigger(item, from_state, to_state, wait_duration, attach)
             end
           end.flatten
         end
@@ -65,7 +59,7 @@ module OpenHAB
         end
 
         #
-        # Create regular or delayed trigger based on duration
+        # Create the trigger
         #
         # @param [Object] item item to create trigger for
         # @param [Item State] from state to restrict trigger to
@@ -75,9 +69,13 @@ module OpenHAB
         #
         # @return [Trigger] OpenHAB triggers
         #
-        def changed_or_wait(item, from, to, duration, attach)
+        def changed_trigger(item, from, to, duration, attach)
           if duration
             changed_wait(item, from: from, to: to, duration: duration, attach: attach)
+          elsif [to, from].grep(Range).any?
+            create_changed_range_trigger(item, from: from, to: to, attach: attach)
+          elsif [to, from].grep(Proc).any?
+            create_changed_proc_trigger(item, from: from, to: to, attach: attach)
           else
             create_changed_trigger(item, from, to, attach)
           end
@@ -90,13 +88,48 @@ module OpenHAB
         # @param [OpenHAB::Core::Duration] duration to delay trigger for until condition is met
         # @param [Item State] to OpenHAB Item State item or group needs to change to
         # @param [Item State] from OpenHAB Item State item or group needs to be coming from
+        # @param [Object] attach to trigger
         #
         # @return [Trigger] OpenHAB trigger
         #
         def changed_wait(item, duration:, to: nil, from: nil, attach: nil)
-          trigger = create_changed_trigger(item, nil, nil, attach)
-          logger.trace("Creating Changed Wait Change Trigger for #{item}")
-          @trigger_delays[trigger.id] = TriggerDelay.new(to: to, from: from, duration: duration)
+          item_name = item.respond_to?(:name) ? item.name : item.to_s
+          logger.trace("Creating Changed Wait Change Trigger for Item(#{item_name}) Duration(#{duration}) "\
+                       "To(#{to}) From(#{from}) Attach(#{attach})")
+          create_changed_trigger(item, nil, nil, attach).tap do |trigger|
+            @trigger_conditions[trigger.id] = Conditions::Duration.new(to: to, from: from, duration: duration)
+          end
+        end
+
+        #
+        # Creates a trigger with a range condition on either 'from' or 'to' field
+        # @param [Object] item to create changed trigger on
+        # @param [Object] from state to restrict trigger to
+        # @param [Object] to state restrict trigger to
+        # @param [Object] attach to trigger
+        # @return [Trigger] OpenHAB trigger
+        #
+        def create_changed_range_trigger(item, from:, to:, attach:)
+          from, to = Conditions::Proc.range_procs(from, to)
+          create_changed_proc_trigger(item, from: from, to: to, attach: attach)
+        end
+
+        #
+        # Creates a trigger with a proc condition on either 'from' or 'to' field
+        # @param [Object] item to create changed trigger on
+        # @param [Object] from state to restrict trigger to
+        # @param [Object] to state restrict trigger to
+        # @param [Object] attach to trigger
+        # @return [Trigger] OpenHAB trigger
+        #
+        def create_changed_proc_trigger(item, from:, to:, attach:)
+          # swap from/to w/ nil if from/to is a proc
+          # rubocop:disable Style/ParallelAssignment
+          from_proc, from = from, nil if from.is_a? Proc
+          to_proc, to = to, nil if to.is_a? Proc
+          # rubocop:enable Style/ParallelAssignment
+          trigger = create_changed_trigger(item, from, to, attach)
+          @trigger_conditions[trigger.id] = Conditions::Proc.new(to: to_proc, from: from_proc)
           trigger
         end
 
@@ -104,8 +137,8 @@ module OpenHAB
         # Create a changed trigger
         #
         # @param [Object] item to create changed trigger on
-        # @param [String] from state to restrict trigger to
-        # @param [String] to state restrict trigger to
+        # @param [Object] from state to restrict trigger to
+        # @param [Object] to state restrict trigger to
         #
         #
         def create_changed_trigger(item, from, to, attach)

data/lib/openhab/dsl/rules/triggers/conditions/duration.rb

@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+require 'openhab/log/logger'
+
+module OpenHAB
+  module DSL
+    module Rules
+      module Triggers
+        #
+        # Module for conditions for triggers
+        #
+        module Conditions
+          include OpenHAB::Log
+          #
+          # this is a no-op condition which simply executes the provided block
+          #
+
+          #
+          # Struct capturing data necessary for a conditional trigger
+          #
+          # TriggerDelay = Struct.new(:to, :from, :duration, :timer, :tracking_to, keyword_init: true) do
+          #  def timer_active?
+          #    timer&.is_active
+          #  end
+          # end
+          class Duration
+            #
+            # Create a new duration condition
+            # @param [Object] to optional condition on to state
+            # @param [Object] from optional condition on from state
+            # @param [Duration] Duration to state must stay at specific value before triggering
+            #
+            def initialize(to:, from:, duration:)
+              to = Conditions::Proc.from_value(to)
+              from = Conditions::Proc.from_value(from)
+              @conditions = Conditions::Proc.new(to: to, from: from)
+              @duration = duration
+              logger.trace "Created Duration Condition To(#{to}) From(#{from}) "\
+                           "Conditions(#{@conditions}) Duration(#{@duration})"
+            end
+
+            # Process rule
+            # @param [Hash] inputs inputs from trigger
+            #
+            def process(mod:, inputs:, &block)
+              process_trigger_delay(mod, inputs, &block)
+            end
+
+            private
+
+            #
+            # Checks if there is an active timer
+            # @return [true, false] true if the timer exists and is active, false otherwise
+            def timer_active?
+              @timer&.is_active
+            end
+
+            #
+            # Check if trigger guards prevent rule execution
+            #
+            # @param [Map] inputs OpenHAB map object describing rule trigger
+            #
+            # @return [Boolean] True if the rule should execute, false if trigger guard prevents execution
+            #
+            def check_trigger_guards(inputs)
+              new_state, old_state = retrieve_states(inputs)
+              @conditions.check_from(state: old_state) && @conditions.check_to(state: new_state)
+            end
+
+            #
+            # Rerieve the newState and oldState, alternatively newStatus and oldStatus
+            # from the input map
+            #
+            # @param [Map] inputs OpenHAB map object describing rule trigger
+            #
+            # @return [Array] An array of the values for [newState, oldState] or [newStatus, oldStatus]
+            #
+            def retrieve_states(inputs)
+              new_state = inputs['newState'] || thing_status_to_sym(inputs['newStatus'])
+              old_state = inputs['oldState'] || thing_status_to_sym(inputs['oldStatus'])
+
+              [new_state, old_state]
+            end
+
+            #
+            # Converts a ThingStatus object to a ruby Symbol
+            #
+            # @param [Java::OrgOpenhabCoreThing::ThingStatus] status A ThingStatus instance
+            #
+            # @return [Symbol] A corresponding symbol, in lower case
+            #
+            def thing_status_to_sym(status)
+              status&.to_s&.downcase&.to_sym
+            end
+
+            #
+            # Process any matching trigger delays
+            #
+            # @param [Map] mod OpenHAB map object describing rule trigger
+            # @param [Map] inputs OpenHAB map object describing rule trigger
+            #
+            #
+            def process_trigger_delay(mod, inputs, &block)
+              if timer_active?
+                process_active_timer(inputs, mod, &block)
+              elsif check_trigger_guards(inputs)
+                logger.trace("Trigger Guards Matched for #{self}, delaying rule execution")
+                # Add timer and attach timer to delay object, and also state being tracked to so
+                # timer can be cancelled if state changes
+                # Also another timer should not be created if changed to same value again but instead rescheduled
+                create_trigger_delay_timer(inputs, mod, &block)
+              else
+                logger.trace("Trigger Guards did not match for #{self}, ignoring trigger.")
+              end
+            end
+
+            #
+            # Creates a timer for trigger delays
+            #
+            # @param [Hash] inputs rule trigger inputs
+            # @param [Hash] mod rule trigger mods
+            #
+            #
+            def create_trigger_delay_timer(inputs, _mod)
+              logger.trace("Creating timer for trigger delay #{self}")
+              @timer = after(@duration) do
+                logger.trace("Delay Complete for #{self}, executing rule")
+                @timer = nil
+                yield
+              end
+              @tracking_to, = retrieve_states(inputs)
+            end
+
+            #
+            # Process an active trigger timer
+            #
+            # @param [Hash] inputs rule trigger inputs
+            # @param [Hash] mod rule trigger mods
+            #
+            #
+            def process_active_timer(inputs, mod, &block)
+              state, = retrieve_states(inputs)
+              if state == @tracking_to
+                logger.trace("Item changed to #{state} for #{self}, rescheduling timer.")
+                @timer.reschedule(ZonedDateTime.now.plus(@duration))
+              else
+                logger.trace("Item changed to #{state} for #{self}, canceling timer.")
+                @timer.cancel
+                # Reprocess trigger delay after canceling to track new state (if guards matched, etc)
+                process_trigger_delay(mod, inputs, &block)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end