rsmp 0.29.0 → 0.32.0

data/lib/rsmp/tlc/traffic_controller.rb

@@ -15,7 +15,7 @@ module RSMP
         @signal_groups = []
         @detector_logics = []
         @plans = signal_plans
-        @cycle_time = cycle_time
+        @cycle_time = cycle_time || 10
         @num_traffic_situations = 1
 
         if inputs
@@ -107,10 +107,7 @@ module RSMP
 
       def timer now
         # TODO use monotone timer, to avoid jumps in case the user sets the system time
-        time = Time.now.to_i
-        return if time == @time_int
-        @time_int = time
-        move_cycle_counter
+        return unless move_cycle_counter
         check_functional_position_timeout
         move_startup_sequence if @startup_sequence_active
 
@@ -118,17 +115,20 @@ module RSMP
         @signal_priorities.each {|priority| priority.timer }
 
         output_states
-        prune_priorities
       end
 
       def signal_priority_changed priority, state
-        #puts "priority #{priority.id} -> #{state}"
       end
 
+      # remove all stale priority requests
       def prune_priorities
-        # TODO spec states that update must be send one time when it reaches the state 'completed',
-        # and then be removed. so we need to know when it has been sent
-        @signal_priorities.delete_if {|priority| priority.state=='completed' && priority.age >= 1.5 }
+        @signal_priorities.delete_if {|priority| priority.prune? }
+      end
+      
+      # this method is called by the supervisor proxy each time status updates have been send
+      # we can then prune our priority request list    
+      def status_updates_sent
+        prune_priorities
       end
 
       def get_priority_list
@@ -143,7 +143,9 @@ module RSMP
 
       def move_cycle_counter
         counter = Time.now.to_i % @cycle_time
+        changed = counter != @cycle_counter
         @cycle_counter = counter
+        changed
       end
 
       def check_functional_position_timeout
@@ -251,10 +253,20 @@ module RSMP
 
       def handle_m0001 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
+
+        # timeout is specified in minutes, but we take 1 to mean 1s
+        # this is not according to the curent rsmp spec, but is done
+        # to speed up testing
+        timeout = arg['timeout'].to_i
+        if timeout == 1
+          timeout = 1
+        else
+          timeout *= 60
+        end
+
         switch_functional_position arg['status'],
-          timeout: arg['timeout'].to_i*60,
+          timeout: timeout,
           source: 'forced'
-
       end
 
       def handle_m0002 arg, options={}
@@ -510,17 +522,19 @@ module RSMP
             eta = arg['eta']
             vehicleType = arg['vehicleType']
             @signal_priorities << SignalPriority.new(node:self, id:id, level:level, eta:eta, vehicleType:vehicleType)
-            log "Priority request for signal group #{signal_group.c_id} received with id #{id}", level: :info
+            log "Priority request #{id} for signal group #{signal_group.c_id} received.", level: :info
           end          
         when 'update'
           if priority
-            log "Priority Request #{id} updated", level: :info
+            log "Updating Priority Request #{id}", level: :info
+
           else
             raise MessageRejected.new("Cannot update priority request #{id}, not found")
           end
         when 'cancel'
           if priority
-            @signal_priorities.delete priority
+            priority.cancel
+            log "Priority request with id #{id} cancelled.", level: :info
           else
             raise MessageRejected.new("Cannot cancel priority request #{id}, not found")
           end    

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -18,7 +18,10 @@ module RSMP
         unless main
           raise ConfigurationError.new "TLC must have a main component"
         end
+      end
 
+      def site_type_name
+        "TLC"
       end
 
       def start
@@ -88,7 +91,7 @@ module RSMP
           begin
             timer(@clock.now)
           rescue StandardError => e
-            notify_error e, level: :internal
+            distribute_error e, level: :internal
           ensure
             # adjust sleep duration to avoid drift. so wake up always happens on the
             # same fractional second.

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.29.0"
+  VERSION = "0.32.0"
 end

data/lib/rsmp.rb

@@ -17,15 +17,16 @@ require 'rsmp/logging'
 require 'rsmp/node'
 require 'rsmp/supervisor'
 require 'rsmp/components'
-require 'rsmp/collect/notifier'
-require 'rsmp/collect/listener'
+require 'rsmp/collect/distributor'
+require 'rsmp/collect/receiver'
+require 'rsmp/collect/queue'
 require 'rsmp/collect/collector'
 require 'rsmp/collect/state_collector'
 require 'rsmp/collect/filter'
-require 'rsmp/collect/query'
-require 'rsmp/collect/status_query'
-require 'rsmp/collect/command_query'
-require 'rsmp/collect/alarm_query'
+require 'rsmp/collect/matcher'
+require 'rsmp/collect/status_matcher'
+require 'rsmp/collect/command_matcher'
+require 'rsmp/collect/alarm_matcher'
 require 'rsmp/collect/status_collector'
 require 'rsmp/collect/command_response_collector'
 require 'rsmp/collect/aggregated_status_collector'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-19 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -200,18 +200,19 @@ files:
 - lib/rsmp/collect/ack_collector.rb
 - lib/rsmp/collect/aggregated_status_collector.rb
 - lib/rsmp/collect/alarm_collector.rb
-- lib/rsmp/collect/alarm_query.rb
+- lib/rsmp/collect/alarm_matcher.rb
 - lib/rsmp/collect/collector.rb
-- lib/rsmp/collect/command_query.rb
+- lib/rsmp/collect/command_matcher.rb
 - lib/rsmp/collect/command_response_collector.rb
+- lib/rsmp/collect/distributor.rb
 - lib/rsmp/collect/filter.rb
-- lib/rsmp/collect/listener.rb
+- lib/rsmp/collect/matcher.rb
 - lib/rsmp/collect/message_matchers.rb
-- lib/rsmp/collect/notifier.rb
-- lib/rsmp/collect/query.rb
+- lib/rsmp/collect/queue.rb
+- lib/rsmp/collect/receiver.rb
 - lib/rsmp/collect/state_collector.rb
 - lib/rsmp/collect/status_collector.rb
-- lib/rsmp/collect/status_query.rb
+- lib/rsmp/collect/status_matcher.rb
 - lib/rsmp/component.rb
 - lib/rsmp/component_base.rb
 - lib/rsmp/component_proxy.rb

data/lib/rsmp/collect/listener.rb

@@ -1,23 +0,0 @@
-# Receives items from a Notifier, as long as it's
-# installed as a listener.
-
-module RSMP
-  class Listener
-    include Inspect
-
-    def initialize notifier, options={}
-      @notifier = notifier
-    end
-
-    def change_notifier notifier
-      @notifier.remove_listener self if @notifier
-      @notifier = notifier
-    end
-
-    def notify message
-    end
-
-    def notify_error error, options={}
-    end
-  end
-end

data/lib/rsmp/collect/notifier.rb

@@ -1,65 +0,0 @@
-# Distributes messages to listeners
-
-module RSMP
-  module Notifier
-    attr_reader :listeners
-
-    include Inspect
-
-    def inspect
-      "#<#{self.class.name}:#{self.object_id}, #{inspector(:@listeners)}>"
-    end
-
-    def initialize_distributor
-      @listeners = []
-      @defer_notify = false
-      @notify_queue = []
-    end
-
-    def clear_deferred_notify &block
-      @notify_queue = []
-    end
-
-    def deferred_notify &block
-      was, @defer_notify = @defer_notify, true
-      yield
-      dequeue_notify
-    ensure
-      @defer_notify = was
-      @notify_queue = []
-    end
-
-    def dequeue_notify
-      @notify_queue.each { |message| notify_without_defer message }
-    ensure
-      @notify_queue = []
-    end
-
-    def add_listener listener
-      raise ArgumentError unless listener
-      @listeners << listener unless @listeners.include? listener
-    end
-
-    def remove_listener listener
-      raise ArgumentError unless listener
-      @listeners.delete listener
-    end
-
-    def notify message
-      raise ArgumentError unless message
-      if @defer_notify
-        @notify_queue << message
-      else
-        notify_without_defer message
-      end
-    end
-
-    def notify_without_defer message
-      @listeners.each { |listener| listener.notify message }
-    end
-
-    def distribute_error error, options={}
-      @listeners.each { |listener| listener.notify_error error, options }
-    end
-  end
-end