rsmp 0.8.1 → 0.8.5

data/lib/rsmp/site_proxy.rb

@@ -101,8 +101,11 @@ module RSMP
           "cId" => component,
           "mId" => m_id
       })
-      send_and_collect_if_needed message, options do |task|
-        collect_aggregated_status task, options[:collect].merge(m_id: m_id, num:1)
+      send_and_optionally_collect message, options do |collect_options|
+        AggregatedStatusCollector.new(
+          self,
+          collect_options.merge(task:@task,m_id: m_id, num:1)
+        )
       end
     end
 
@@ -174,8 +177,12 @@ module RSMP
           "sS" => request_list,
           "mId" => m_id
       })
-      send_and_collect_if_needed message, options do |task|
-        collect_status_responses task, status_list, options[:collect].merge(m_id: m_id)
+      send_and_optionally_collect message, options do |collect_options|
+        StatusCollector.new(
+          self,
+          status_list,
+          collect_options.merge(task:@task,m_id: m_id)
+          )
       end
     end
 
@@ -186,17 +193,6 @@ module RSMP
       acknowledge message
     end
 
-    def send_and_collect_if_needed message, options, &block
-      if options[:collect]
-        task = @task.async { |task| yield task }
-        send_message message, validate: options[:validate]
-        { sent: message, collector: task.wait }
-      else
-        send_message message, validate: options[:validate]
-        return { sent: message }
-      end
-    end
-
     def subscribe_to_status component_id, status_list, options={}
       validate_ready 'subscribe to status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
@@ -215,8 +211,12 @@ module RSMP
           "sS" => subscribe_list,
           'mId' => m_id
       })
-      send_and_collect_if_needed message, options do |task|
-         collect_status_updates task, status_list, options[:collect].merge(m_id: m_id)
+      send_and_optionally_collect message, options do |collect_options|
+        StatusCollector.new(
+          self,
+          status_list,
+          collect_options.merge(task:@task,m_id: m_id)
+        )
       end
     end
 
@@ -261,8 +261,12 @@ module RSMP
           "arg" => command_list,
           "mId" => m_id
       })
-      send_and_collect_if_needed message, options do |task|
-        collect_command_responses task, command_list, options[:collect].merge(m_id: m_id)
+      send_and_optionally_collect message, options do |collect_options|
+        CommandResponseCollector.new(
+          self,
+          command_list,
+          collect_options.merge(task:@task,m_id: m_id)
+          )
       end
     end
 
@@ -339,37 +343,13 @@ module RSMP
       distribute_error e, options
     end
 
-    def collect_alarms parent_task, options={}
-      collect(parent_task,options.merge(type: "Alarm")) do |alarm|
+    def collect_alarms options={}
+      collect(@task,options.merge(type: "Alarm")) do |alarm|
         next if options[:aCId] && options[:aCId] != alarm.attribute("aCId")
         next if options[:aSp] && options[:aSp] != alarm.attribute("aSp")
         next if options[:aS] && options[:aS] != alarm.attribute("aS")
-        true
+        :keep
       end
     end
-
-    def collect_status_updates task, status_list, options
-      collector = StatusUpdateCollector.new(self, status_list, options.merge(task:task))
-      collector.collect
-      collector
-    end
-
-    def collect_status_responses task, status_list, options
-      collector = StatusResponseCollector.new(self, status_list, options.merge(task:task))
-      collector.collect
-      collector
-    end
-
-    def collect_command_responses task, command_list, options
-      collector = CommandResponseCollector.new(self, command_list, options.merge(task:task))
-      collector.collect
-      collector
-    end
-
-    def collect_aggregated_status task, options
-      collector = AggregatedStatusCollector.new(self, options.merge(task:task))
-      collector.collect
-      collector
-    end
   end
 end

data/lib/rsmp/supervisor_proxy.rb

@@ -138,16 +138,8 @@ module RSMP
         "mId" => m_id,
       })
 
-      if options[:collect]
-        result = nil
-        task = @task.async do |task|
-          wait_for_acknowledgement task, options[:collect], m_id
-        end
-        send_message message, validate: options[:validate]
-        return message, task.wait
-      else
-        send_message message, validate: options[:validate]
-        message
+      send_and_optionally_collect message, options do |task|
+        wait_for_acknowledgement task, options[:collect], m_id
       end
     end
 
@@ -282,7 +274,7 @@ module RSMP
     end
 
     def fetch_last_sent_status component, code, name
-      @last_status_sent.dig component, code, name
+      @last_status_sent.dig component, code, name if @last_status_sent
     end
 
     def store_last_sent_status message

data/lib/rsmp/tlc/signal_group.rb

@@ -6,25 +6,33 @@ module RSMP
       # plan is a string, with each character representing a signal phase at a particular second in the cycle
       def initialize node:, id:
         super node: node, id: id, grouped: false
-        move 0
       end
 
-      def get_state pos
+      def timer
+        @state = get_state
+      end
+
+      def get_state
+        return 'a' if node.main.dark_mode
+        return 'c' if node.main.yellow_flash
+
+        cycle_counter = node.main.cycle_counter
+
+        if node.main.startup_sequence_active
+          @state = node.main.startup_state || 'a'
+        end
+
         default = 'a'   # phase a means disabled/dark
         plan = node.main.current_plan
         return default unless plan
         return default unless plan.states
         states = plan.states[c_id]
         return default unless states
-        state = states[pos]
+        state = states[cycle_counter]
         return default unless state =~ /[a-hA-G0-9N-P]/  # valid signal group states
         state
       end
 
-      def move pos
-        @state = get_state pos
-      end
-
       def handle_command command_code, arg
         case command_code
         when 'M0010', 'M0011'

data/lib/rsmp/tlc/traffic_controller.rb

@@ -5,9 +5,12 @@ module RSMP
     # and keeps track of signal plans, detector logics, inputs, etc. which do
     # not have dedicated components.
     class TrafficController < Component
-      attr_reader :pos, :cycle_time, :plan
+      attr_reader :pos, :cycle_time, :plan, :cycle_counter,
+        :yellow_flash, :dark_mode,
+        :startup_sequence_active, :startup_sequence, :startup_sequence_pos
 
-      def initialize node:, id:, cycle_time: 10, signal_plans:
+      def initialize node:, id:, cycle_time: 10, signal_plans:,
+          startup_sequence:, live_output:nil
         super node: node, id: id, grouped: true
         @signal_groups = []
         @detector_logics = []
@@ -15,13 +18,15 @@ module RSMP
         @cycle_time = cycle_time
         @num_traffic_situations = 1
         @num_inputs = 8
+        @startup_sequence = startup_sequence
+        @live_output = live_output
         reset
       end
 
       def reset
-        @pos = 0
-        @plan = 0
-        @dark_mode = false
+        @cycle_counter = 0
+        @plan = 1
+        @dark_mode = true
         @yellow_flash = false
         @booting = false
         @control_mode = 'control'
@@ -40,6 +45,12 @@ module RSMP
         @inputs = '0'*@num_inputs
         @input_activations = '0'*@num_inputs
         @input_results = '0'*@num_inputs
+
+        @day_time_table = {}
+        @startup_sequence_active = false
+        @startup_sequence_initiated_at = nil
+        @startup_sequence_pos = 0
+        @time_int = nil
       end
 
       def clock
@@ -64,46 +75,83 @@ module RSMP
       end
 
       def timer now
-        # TODO
-        # We should use a monotone timer, to avoid jumps
-        # in case the user sets the system time
-        pos = Time.now.to_i % @cycle_time
-        if pos != @pos
-          @pos = pos
-          move pos
-        end
+        # TODO use monotone timer, to avoid jumps in case the user sets the system time
+        @signal_groups.each { |group| group.timer }
+        time = Time.now.to_i
+        return if time == @time_int
+        @time_int = time
+        move_cycle_counter
+        move_startup_sequence if @startup_sequence_active
+        output_states
+      end
+
+      def move_cycle_counter
+        counter = Time.now.to_i % @cycle_time
+        @cycle_counter = counter
+      end
+
+      def startup_state
+        return unless @startup_sequence_active
+        return unless @startup_sequence_pos
+        @startup_sequence[ @startup_sequence_pos ]
       end
 
-      def move pos
-        @signal_groups.each do |group|
-          group.move pos
+      def initiate_startup_sequence
+        log "Initiating startup sequence", level: :info
+        @startup_sequence_active = true
+        @startup_sequence_initiated_at = nil
+        @startup_sequence_pos = nil
+      end
+
+      def end_startup_sequence
+        @startup_sequence_active = false
+        @startup_sequence_initiated_at = nil
+        @startup_sequence_pos = nil
+
+        @yellow_flash = false
+        @dark_mode = false
+      end
+
+      def move_startup_sequence
+        was = @startup_sequence_pos
+        if @startup_sequence_initiated_at == nil
+          @startup_sequence_initiated_at = Time.now.to_i + 1
+          @startup_sequence_pos = 0
+        else
+          @startup_sequence_pos = Time.now.to_i - @startup_sequence_initiated_at
+        end
+        if @startup_sequence_pos >= @startup_sequence.size
+          end_startup_sequence
         end
-        #output_states
       end
 
       def output_states
+        return unless @live_output
         str = @signal_groups.map do |group|
           s = "#{group.c_id}:#{group.state}"
           if group.state =~ /^[1-9]$/
               s.colorize(:green)
           elsif group.state =~ /^[NOP]$/
             s.colorize(:yellow)
-          elsif group.state =~ /^[a]$/
-            s.colorize(color: :black)
+          elsif group.state =~ /^[ae]$/
+            s.colorize(:black)
+          elsif group.state =~ /^[f]$/
+            s.colorize(:yellow)
+          elsif group.state =~ /^[g]$/
+            s.colorize(:red)
           else
             s.colorize(:red)
           end
         end.join ' '
         plan = "P#{@plan}"
-        print "#{plan.rjust(4)} #{pos.to_s.rjust(4)} #{str}\r"
+
+        File.open @live_output, 'w' do |file|
+          file.puts "#{plan.rjust(4)} #{pos.to_s.rjust(4)} #{str}\r"
+        end
       end
 
       def format_signal_group_status
-        if @yellow_flash
-          'c' * @signal_groups.size
-        else
-          @signal_groups.map { |group| group.state }.join
-        end
+        @signal_groups.map { |group| group.state }.join
       end
 
       def handle_command command_code, arg
@@ -214,6 +262,18 @@ module RSMP
 
       def handle_m0017 arg
         @node.verify_security_code 2, arg['securityCode']
+        arg['status'].split(',').each do |item|
+          elems = item.split('-')
+          nr = elems[0].to_i
+          plan = elems[1].to_i
+          hour = elems[2].to_i
+          min = elems[3].to_i
+          if nr<0 || nr>12
+            raise InvalidMessage.new "time table id must be between 0 and 12, got #{nr}"
+          end
+          #p "nr: #{nr}, plan #{plan} at #{hour}:#{min}"
+          @day_time_table[nr] = {plan: plan, hour: hour, min:min}
+        end
       end
 
       def handle_m0018 arg
@@ -276,6 +336,7 @@ module RSMP
         log "Switching to mode #{mode}", level: :info
         case mode
         when 'NormalControl'
+          initiate_startup_sequence if @yellow_flash || @dark_mode
           @yellow_flash = false
           @dark_mode = false
         when 'YellowFlash'
@@ -308,9 +369,9 @@ module RSMP
         when 'signalgroupstatus'
           TrafficControllerSite.make_status format_signal_group_status
         when 'cyclecounter'
-          TrafficControllerSite.make_status @pos.to_s
+          TrafficControllerSite.make_status @cycle_counter.to_s
         when 'basecyclecounter'
-          TrafficControllerSite.make_status @pos.to_s
+          TrafficControllerSite.make_status @cycle_counter.to_s
         when 'stage'
           TrafficControllerSite.make_status 0.to_s
         end
@@ -511,7 +572,10 @@ module RSMP
       def handle_s0027 status_code, status_name=nil
         case status_name
         when 'status'
-          TrafficControllerSite.make_status '00-00-00-00'
+          status = @day_time_table.map do |i,item|
+            "#{i}-#{item[:plan]}-#{item[:hour]}-#{item[:min]}"
+          end.join(',')
+          TrafficControllerSite.make_status status
         end
       end
 

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -5,11 +5,16 @@ module RSMP
       attr_accessor :main, :signal_plans
 
       def initialize options={}
+        # setup options before calling super initializer,
+        # since build of components depend on options
         @sxl = 'traffic_light_controller'
         @security_codes = options[:site_settings]['security_codes']
         @interval = options[:site_settings].dig('intervals','timer') || 1
+        @startup_sequence = options[:site_settings]['startup_sequence'] || 'efg'
         build_plans options[:site_settings].dig('signal_plans')
+
         super options
+
         unless @main
           raise ConfigurationError.new "TLC must have a main component"
         end
@@ -37,7 +42,9 @@ module RSMP
         when 'main'
           @main = TrafficController.new node: self, id: id,
             cycle_time: settings['cycle_time'],
-            signal_plans: @signal_plans
+            startup_sequence: @startup_sequence,
+            signal_plans: @signal_plans,
+            live_output: @site_settings['live_output']
         when 'signal_group'
           group = SignalGroup.new node: self, id: id
           @main.add_signal_group group
@@ -52,6 +59,7 @@ module RSMP
       def start_action
         super
         start_timer
+        @main.initiate_startup_sequence
       end
 
       def start_timer
@@ -134,6 +142,7 @@ module RSMP
         when :restart
           log "Restarting TLC", level: :info
           restart
+          initiate_startup_sequence
         end
       end
     end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.8.1"
+  VERSION = "0.8.5"
 end

data/lib/rsmp.rb

@@ -21,12 +21,11 @@ require 'rsmp/collect/notifier'
 require 'rsmp/collect/listener'
 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/status_update_or_response_collector'
-require 'rsmp/collect/status_response_collector'
-require 'rsmp/collect/status_update_collector'
+require 'rsmp/collect/status_collector'
 require 'rsmp/collect/command_response_collector'
 require 'rsmp/collect/aggregated_status_collector'
 require 'rsmp/component'

data/rsmp.gemspec

@@ -31,16 +31,16 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "async", "~> 1.29.1"
-  spec.add_dependency "async-io", "~> 1.32.1"
+  spec.add_dependency "async-io", "~> 1.32.2"
   spec.add_dependency "colorize", "~> 0.8.1"
-  spec.add_dependency "thor", "~> 1.0.1"
+  spec.add_dependency "thor", "~> 1.2.1"
   spec.add_dependency "rsmp_schemer"
 
-  spec.add_development_dependency "bundler", "~> 2.2.21"
-  spec.add_development_dependency "rake", "~> 13.0.3"
+  spec.add_development_dependency "bundler", "~> 2.3.6"
+  spec.add_development_dependency "rake", "~> 13.0.6"
   spec.add_development_dependency "rspec", "~> 3.10.0"
-  spec.add_development_dependency "rspec-expectations", "~> 3.10.1"
+  spec.add_development_dependency "rspec-expectations", "~> 3.10.2"
   spec.add_development_dependency "timecop", "~> 0.9.4"
-  spec.add_development_dependency "cucumber", "~> 6.1.0"
-  spec.add_development_dependency "aruba" , "~> 1.1.2"
+  spec.add_development_dependency "cucumber", "~> 7.1.0"
+  spec.add_development_dependency "aruba" , "~> 2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2022-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.32.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.1
+        version: 1.32.2
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rsmp_schemer
   requirement: !ruby/object:Gem::Requirement
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.21
+        version: 2.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.21
+        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.10.1
+        version: 3.10.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 2.0.0
 description: Easy RSMP site and supervisor communication.
 email:
 - zf0f@kk.dk
@@ -211,15 +211,14 @@ files:
 - lib/rsmp/collect/collector.rb
 - lib/rsmp/collect/command_query.rb
 - lib/rsmp/collect/command_response_collector.rb
+- lib/rsmp/collect/filter.rb
 - lib/rsmp/collect/listener.rb
 - lib/rsmp/collect/message_matchers.rb
 - lib/rsmp/collect/notifier.rb
 - lib/rsmp/collect/query.rb
 - lib/rsmp/collect/state_collector.rb
+- lib/rsmp/collect/status_collector.rb
 - lib/rsmp/collect/status_query.rb
-- lib/rsmp/collect/status_response_collector.rb
-- lib/rsmp/collect/status_update_collector.rb
-- lib/rsmp/collect/status_update_or_response_collector.rb
 - lib/rsmp/component.rb
 - lib/rsmp/components.rb
 - lib/rsmp/convert/export/json_schema.rb
@@ -270,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.

data/lib/rsmp/collect/status_response_collector.rb

@@ -1,11 +0,0 @@
-module RSMP
-  # Class for waiting for specific status responses
-  class StatusResponseCollector < StatusUpdateOrResponseCollector
-    def initialize proxy, want, options={}
-      super proxy, want, options.merge(
-        type: ['StatusResponse','MessageNotAck'],
-        title: 'status response'
-      )
-    end
-  end
-end

data/lib/rsmp/collect/status_update_collector.rb

@@ -1,11 +0,0 @@
-module RSMP
-  # Class for waiting for specific status responses
-  class StatusUpdateCollector < StatusUpdateOrResponseCollector
-    def initialize proxy, want, options={}
-      super proxy, want, options.merge(
-        type: ['StatusUpdate','MessageNotAck'],
-        title:'status update'
-      )
-    end
-  end
-end

data/lib/rsmp/collect/status_update_or_response_collector.rb

@@ -1,17 +0,0 @@
-module RSMP
-  # Base class for waiting for status updates or responses
-  class StatusUpdateOrResponseCollector < StateCollector
-    def initialize proxy, want, options={}
-      super proxy, want, options.merge
-    end
-
-    def build_query want
-      RSMP::StatusQuery.new want
-    end
-
-    # Get items, in our case status values
-    def get_items message
-      message.attributes['sS']
-    end
-  end
-end