rsmp 0.14.6 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a6dc2bc424c24c351ee90fd41bdcbd7210992474e93cb2e80bec07840520d84
-  data.tar.gz: 1b3a3de219e8ea71f7c4584c1453cdd6affcedd278754964a4208f426588e4e5
+  metadata.gz: 0cd9ae260f3226f42fd5d0e2aafbd2daefaebebe7a13863ac9a809609cf78935
+  data.tar.gz: 772ad76e47e4470b15d1245634e9dc6c477b20e41d746f258855a48230340f10
 SHA512:
-  metadata.gz: 9993016c7c539af8ca717a63819376dbcae83acc5831197f4f133d7b0be9e1919c64773161317b963df01c69ded980bfc7feaec545fdbd547d1b21d7b1a1eda9
-  data.tar.gz: f0d4dfae8f8ac17bc079caac97086274853929a05b5b5d9b631feac11aef8058511b90650deb02802840e19ff324388bb4a16235fcc9b6e4455d6db92eae34ea
+  metadata.gz: 0f9c480ba0ba82548ca0aa639281f7a44a7489ed096087505a1887f328bf818e83e4549b7fbe0099e83a731cc316d736d64b63b925ad993ac428ad3346990fab
+  data.tar.gz: 892f11941e75f9517b975e1d16202a48046c902febbc89d1c4463c98abe1dccb0416d2425b11af2fa771d967ce173933b476410430da22d405abd35af96031fb

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.14.6)
+    rsmp (0.15.2)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)
-      rsmp_schema (~> 0.2.2)
+      rsmp_schema (~> 0.3.1)
       thor (~> 1.2.1)
 
 GEM
@@ -80,7 +80,7 @@ GEM
     nio4r (2.5.8)
     rake (13.0.6)
     regexp_parser (2.5.0)
-    rsmp_schema (0.2.2)
+    rsmp_schema (0.3.1)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
     rspec (3.10.0)
@@ -100,7 +100,7 @@ GEM
       ffi (~> 1.1)
     thor (1.2.1)
     timecop (0.9.5)
-    timers (4.3.3)
+    timers (4.3.4)
     uri_template (0.7.0)
 
 PLATFORMS

data/config/tlc.yaml

@@ -3,7 +3,7 @@ supervisors:
   - ip: 127.0.0.1
     port: 12111
 sxl: tlc
-sxl_version: 1.0.15
+sxl_version: '1.1'
 components:
   main:
     TC:

data/lib/rsmp/collect/ack_collector.rb

@@ -0,0 +1,16 @@
+module RSMP
+  # Class for waiting for a message acknowledgement
+  class AckCollector < Collector
+    def initialize proxy, options={}
+      raise ArgumentError.new("m_id must be provided") unless options[:m_id]
+      required = { type: 'MessageAck', num: 1, title: 'message acknowledgement' }
+      super proxy, options.merge(required)
+    end
+
+    # Check if we the MessageAck related to initiating request, identified by @m_id.
+    def type_match? message
+      return false if super(message) == false
+      return message.attribute('oMId') == @options[:m_id]
+    end
+  end
+end

data/lib/rsmp/component.rb

@@ -9,7 +9,7 @@ module RSMP
       raise UnknownCommand.new "Command #{command_code} not implemented by #{self.class}"
     end
 
-    def get_status status_code, status_name=nil
+    def get_status status_code, status_name=nil, options={}
       raise UnknownStatus.new "Status #{status_code}/#{status_name} not implemented by #{self.class}"
     end
 

data/lib/rsmp/components.rb

@@ -17,8 +17,8 @@ module RSMP
       check_main_component settings
       settings.each_pair do |type,components_by_type|
         if components_by_type
-          components_by_type.each_pair do |id,settings|
-            @components[id] = build_component(id:id, type:type, settings:settings)
+          components_by_type.each_pair do |id,component_settings|
+            @components[id] = build_component(id:id, type:type, settings:component_settings)
             @main = @components[id] if type=='main'
           end
         end

data/lib/rsmp/proxy.rb

@@ -560,8 +560,11 @@ module RSMP
         message.original = original
         log_acknowledgement_for_original message, original
 
-        if original.type == "Version"
+        case original.type
+        when "Version"
           version_acknowledged
+        when "StatusSubscribe"
+          status_subscribe_acknowledged original
         end
 
         check_outgoing_acknowledged original
@@ -647,5 +650,20 @@ module RSMP
       message.attributes['ntsOId'] = (main && main.ntsOId) ? main.ntsOId : ''
       message.attributes['xNId'] = (main && main.xNId) ? main.xNId : ''
     end
+
+    # use Gem class to check version requirement
+    def self.version_requirement_met? requirement, version
+      Gem::Requirement.new(requirement).satisfied_by?(Gem::Version.new(version))
+    end
+
+    def status_subscribe_acknowledged original
+      component = find_component original.attribute('cId')
+      return unless component
+      short = Message.shorten_m_id original.m_id
+      subscribe_list = original.attributes['sS']
+      log "StatusSubscribe #{short} acknowledged, allowing repeated status values for #{subscribe_list}", level: :info
+      component.allow_repeat_updates subscribe_list
+    end
+
   end
 end

data/lib/rsmp/site.rb

@@ -145,7 +145,8 @@ module RSMP
       nil
     end
 
-    def build_component id:, type:, settings:{}
+    def build_component id:, type:, settings:
+      settings ||= {}
       if type == 'main'
         Component.new id:id, node: self, grouped: true,
           ntsOId: settings['ntsOId'], xNId: settings['xNId']

data/lib/rsmp/site_proxy.rb

@@ -228,7 +228,6 @@ module RSMP
       end
 
       component = find_component component_id
-      component.allow_repeat_updates subscribe_list
 
       message = RSMP::StatusSubscribe.new({
           "cId" => component_id,
@@ -236,6 +235,7 @@ module RSMP
           'mId' => m_id
       })
       set_nts_message_attributes message
+
       send_and_optionally_collect message, options do |collect_options|
         StatusCollector.new(
           self,

data/lib/rsmp/supervisor_proxy.rb

@@ -270,13 +270,18 @@ module RSMP
       send_message response
     end
 
+    def rsmpify_value v
+      return v if v.is_a? Array
+      v.to_s
+    end
+
     def process_status_request message, options={}
       component_id = message.attributes["cId"]
       component = @site.find_component component_id
       log "Received #{message.type}", message: message, level: :log
       sS = message.attributes["sS"].map do |arg|
-        value, quality =  component.get_status arg['sCI'], arg['n']
-        { "s" => value.to_s, "q" => quality.to_s }.merge arg
+        value, quality =  component.get_status arg['sCI'], arg['n'], {sxl_version: sxl_version}
+        { "s" => rsmpify_value(value), "q" => quality.to_s }.merge arg
       end
       response = StatusResponse.new({
         "cId"=>component_id,
@@ -375,7 +380,7 @@ module RSMP
               # send as soon as the data changes
               if component_object
                 current, age = *(component_object.get_status code, name)
-                current = current.to_s
+                current = rsmpify_value(current)
               end
               last_sent = fetch_last_sent_status component, code, name
               if current != last_sent
@@ -413,7 +418,7 @@ module RSMP
             end
             sS << { "sCI" => code,
                      "n" => status_name,
-                     "s" => value.to_s,
+                     "s" => rsmpify_value(value),
                      "q" => quality }
           end
         end

data/lib/rsmp/tlc/detector_logic.rb

@@ -9,7 +9,7 @@ module RSMP
         @value = 0
       end
 
-      def get_status code, name=nil
+      def get_status code, name=nil, options={}
         case code
         when 'S0201', 'S0202', 'S0203', 'S0204'
           return send("handle_#{code.downcase}", code, name)
@@ -18,7 +18,7 @@ module RSMP
         end
       end
 
-      def handle_s0201 status_code, status_name=nil
+      def handle_s0201 status_code, status_name=nil, options={}
         case status_name
         when 'starttime'
           TrafficControllerSite.make_status @node.clock.to_s
@@ -27,7 +27,7 @@ module RSMP
         end
       end
 
-      def handle_s0202 status_code, status_name=nil
+      def handle_s0202 status_code, status_name=nil, options={}
         case status_name
         when 'starttime'
           TrafficControllerSite.make_status @node.clock.to_s
@@ -36,7 +36,7 @@ module RSMP
         end
       end
 
-      def handle_s0203 status_code, status_name=nil
+      def handle_s0203 status_code, status_name=nil, options={}
         case status_name
         when 'starttime'
           TrafficControllerSite.make_status @node.clock.to_s
@@ -45,7 +45,7 @@ module RSMP
         end
       end
 
-      def handle_s0204 status_code, status_name=nil
+      def handle_s0204 status_code, status_name=nil, options={}
         case status_name
         when 'starttime'
           TrafficControllerSite.make_status @node.clock.to_s
@@ -70,7 +70,7 @@ module RSMP
         end
       end
 
-      def handle_command command_code, arg
+      def handle_command command_code, arg, options={}
         case command_code
         when 'M0008'
           handle_m0008 arg
@@ -79,7 +79,7 @@ module RSMP
         end
       end
 
-      def handle_m0008 arg
+      def handle_m0008 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         status = arg['status']=='True'
         mode = arg['mode']=='True'

data/lib/rsmp/tlc/signal_group.rb

@@ -35,17 +35,17 @@ module RSMP
         state
       end
 
-      def handle_command command_code, arg
+      def handle_command command_code, arg, options={}
         case command_code
         when 'M0010', 'M0011'
-          return send("handle_#{command_code.downcase}", arg)
+          return send("handle_#{command_code.downcase}", arg, options)
         else
           raise UnknownCommand.new "Unknown command #{command_code}"
         end
       end
 
       # Start of signal group. Orders a signal group to green
-      def handle_m0010 arg
+      def handle_m0010 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         if TrafficControllerSite.from_rsmp_bool arg['status']
           log "Start signal group #{c_id}, go to green", level: :info
@@ -53,14 +53,14 @@ module RSMP
       end
 
       # Stop of signal group. Orders a signal group to red
-      def handle_m0011 arg
+      def handle_m0011 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         if TrafficControllerSite.from_rsmp_bool arg['status']
           log "Stop signal group #{c_id}, go to red", level: :info
         end
       end
 
-      def get_status code, name=nil
+      def get_status code, name=nil, options={}
         case code
         when 'S0025'
           return send("handle_#{code.downcase}", code, name)
@@ -69,7 +69,7 @@ module RSMP
         end
       end
 
-      def handle_s0025 status_code, status_name=nil
+      def handle_s0025 status_code, status_name=nil, options={}
         now = @node.clock.to_s
         case status_name
         when 'minToGEstimate'

data/lib/rsmp/tlc/signal_priority.rb

@@ -0,0 +1,28 @@
+class RSMP::TLC::SignalPriority
+  attr_reader :state, :node, :id, :level, :eta, :vehicleType, :age, :updated
+
+  def initialize node:, id:, level:, eta:, vehicleType:
+    @node = node
+    @id = id
+    @level = level
+    @eta = eta
+    @vehicleType = vehicleType
+    set_state 'received'
+  end
+
+  def set_state state
+    @state = state
+    @updated = node.clock.now
+    node.signal_priority_changed self, @state
+  end
+
+  def timer
+    @age = @node.clock.now - @updated
+    case @state
+    when 'received'
+      set_state 'activated' if @age >= 0.5
+    when 'activated'
+      set_state 'completed' if @age >= 0.5
+    end
+  end
+end

data/lib/rsmp/tlc/traffic_controller.rb

@@ -60,6 +60,7 @@ module RSMP
         @startup_sequence_pos = 0
         @time_int = nil
         @inputs.reset
+        @signal_priorities = []
       end
 
       def dark?
@@ -105,8 +106,30 @@ module RSMP
         move_startup_sequence if @startup_sequence_active
 
         @signal_groups.each { |group| group.timer }
+        @signal_priorities.each {|priority| priority.timer }
 
         output_states
+        prune_priorities
+      end
+
+      def signal_priority_changed priority, state
+        #puts "priority #{priority.id} -> #{state}"
+      end
+
+      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 }
+      end
+
+      def get_priority_list
+        @signal_priorities.map do |priority|
+          {
+            "r" => priority.id,
+            "t" => RSMP::Clock.to_s(priority.updated),
+            "s" => priority.state
+          }
+        end
       end
 
       def move_cycle_counter
@@ -204,25 +227,25 @@ module RSMP
         @signal_groups.map { |group| group.state }.join
       end
 
-      def handle_command command_code, arg
+      def handle_command command_code, arg, options={}
         case command_code
         when 'M0001', 'M0002', 'M0003', 'M0004', 'M0005', 'M0006', 'M0007',
              'M0012', 'M0013', 'M0014', 'M0015', 'M0016', 'M0017', 'M0018',
              'M0019', 'M0020', 'M0021', 'M0022',
              'M0103', 'M0104'
 
-          return send("handle_#{command_code.downcase}", arg)
+          return send("handle_#{command_code.downcase}", arg, options)
         else
           raise UnknownCommand.new "Unknown command #{command_code}"
         end
       end
 
-      def handle_m0001 arg
+      def handle_m0001 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         switch_functional_position arg['status'], timeout: arg['timeout'].to_i*60
       end
 
-      def handle_m0002 arg
+      def handle_m0002 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         if TrafficControllerSite.from_rsmp_bool(arg['status'])
           switch_plan arg['timeplan']
@@ -231,12 +254,12 @@ module RSMP
         end
       end
 
-      def handle_m0003 arg
+      def handle_m0003 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         @traffic_situation = arg['traficsituation'].to_i
       end
 
-      def handle_m0004 arg
+      def handle_m0004 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         # don't restart immeediately, since we need to first send command response
         # instead, defer an action, which will be handled by the TLC site
@@ -244,7 +267,7 @@ module RSMP
         @node.defer :restart
       end
 
-      def handle_m0005 arg
+      def handle_m0005 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         @emergency_route = (arg['status'] == 'True')
         @emergency_route_number = arg['emergencyroute'].to_i
@@ -272,7 +295,7 @@ module RSMP
         end
       end
 
-      def handle_m0006 arg
+      def handle_m0006 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         input = arg['input'].to_i
         status = string_to_bool arg['status']
@@ -288,16 +311,16 @@ module RSMP
         input_logic input, change if change != nil
       end
 
-      def handle_m0007 arg
+      def handle_m0007 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         set_fixed_time_control arg['status']
       end
 
-      def handle_m0012 arg
+      def handle_m0012 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
       end
 
-      def handle_m0013 arg
+      def handle_m0013 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
       end
 
@@ -307,7 +330,7 @@ module RSMP
         plan
       end
 
-      def handle_m0014 arg
+      def handle_m0014 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         plan = find_plan arg['plan']
         arg['status'].split(',').each do |item|
@@ -319,15 +342,15 @@ module RSMP
         end
       end
 
-      def handle_m0015 arg
+      def handle_m0015 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
       end
 
-      def handle_m0016 arg
+      def handle_m0016 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
       end
 
-      def handle_m0017 arg
+      def handle_m0017 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         arg['status'].split(',').each do |item|
           elems = item.split('-')
@@ -343,7 +366,7 @@ module RSMP
         end
       end
 
-      def handle_m0018 arg
+      def handle_m0018 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
       end
 
@@ -373,7 +396,7 @@ module RSMP
         bool ?  '1' : '0'
       end
 
-      def handle_m0019 arg
+      def handle_m0019 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
         input = arg['input'].to_i
         force = string_to_bool arg['status']
@@ -390,20 +413,57 @@ module RSMP
         input_logic input, change if change != nil
       end
 
-      def handle_m0020 arg
+      def handle_m0020 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
       end
 
-      def handle_m0021 arg
+      def handle_m0021 arg, options={}
         @node.verify_security_code 2, arg['securityCode']
       end
 
-      def handle_m0103 arg
+      def handle_m0022 arg, options={}
+        id = arg['requestId']
+        type = arg['type']
+        priority = @signal_priorities.find { |priority| priority.id == id }
+        case type
+        when 'new'
+          if priority
+            raise MessageRejected.new("Priority Request #{id} already exists")
+          else
+            #ref = arg.slice('signalGroupId','inputId','connectionId','approachId','laneInId','laneOutId')
+            if arg['signalGroupId']
+              signal_group = node.find_component arg['signalGroupId']
+            end
+
+            level = arg['level']
+            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
+          end          
+        when 'update'
+          if priority
+            log "Priority Request #{id} updated", level: :info
+          else
+            raise MessageRejected.new("Cannot update priority request #{id}, not found")
+          end
+        when 'cancel'
+          if priority
+            @signal_priorities.delete priority
+          else
+            raise MessageRejected.new("Cannot cancel priority request #{id}, not found")
+          end    
+        else
+          raise MessageRejected.new("Unknown type #{type}")
+        end
+      end
+
+      def handle_m0103 arg, options={}
         level = {'Level1'=>1,'Level2'=>2}[arg['status']]
         @node.change_security_code level, arg['oldSecurityCode'], arg['newSecurityCode']
       end
 
-      def handle_m0104 arg
+      def handle_m0104 arg, options={}
         @node.verify_security_code 1, arg['securityCode']
         time = Time.new(
           arg['year'],
@@ -459,22 +519,22 @@ module RSMP
         mode
       end
 
-      def get_status code, name=nil
+      def get_status code, name=nil, options={}
         case code
         when 'S0001', 'S0002', 'S0003', 'S0004', 'S0005', 'S0006', 'S0007',
              'S0008', 'S0009', 'S0010', 'S0011', 'S0012', 'S0013', 'S0014',
              'S0015', 'S0016', 'S0017', 'S0018', 'S0019', 'S0020', 'S0021',
              'S0022', 'S0023', 'S0024', 'S0026', 'S0027', 'S0028',
-             'S0029', 'S0030', 'S0031',
+             'S0029', 'S0030', 'S0031', 'S0032', 'S0033',
              'S0091', 'S0092', 'S0095', 'S0096', 'S0097',
              'S0205', 'S0206', 'S0207', 'S0208'
-          return send("handle_#{code.downcase}", code, name)
+          return send("handle_#{code.downcase}", code, name, options)
         else
           raise InvalidMessage.new "unknown status code #{code}"
         end
       end
 
-      def handle_s0001 status_code, status_name=nil
+      def handle_s0001 status_code, status_name=nil, options={}
         case status_name
         when 'signalgroupstatus'
           TrafficControllerSite.make_status format_signal_group_status
@@ -487,14 +547,14 @@ module RSMP
         end
       end
 
-      def handle_s0002 status_code, status_name=nil
+      def handle_s0002 status_code, status_name=nil, options={}
         case status_name
         when 'detectorlogicstatus'
           TrafficControllerSite.make_status @detector_logics.map { |dl| bool_to_digit(dl.value) }.join
         end
       end
 
-      def handle_s0003 status_code, status_name=nil
+      def handle_s0003 status_code, status_name=nil, options={}
         case status_name
         when 'inputstatus'
           TrafficControllerSite.make_status @inputs.actual_string
@@ -503,7 +563,7 @@ module RSMP
         end
       end
 
-      def handle_s0004 status_code, status_name=nil
+      def handle_s0004 status_code, status_name=nil, options={}
         case status_name
         when 'outputstatus'
           TrafficControllerSite.make_status 0
@@ -512,14 +572,14 @@ module RSMP
         end
       end
 
-      def handle_s0005 status_code, status_name=nil
+      def handle_s0005 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status @is_starting
         end
       end
 
-      def handle_s0006 status_code, status_name=nil
+      def handle_s0006 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status @emergency_route
@@ -528,7 +588,7 @@ module RSMP
         end
       end
 
-      def handle_s0007 status_code, status_name=nil
+      def handle_s0007 status_code, status_name=nil, options={}
         case status_name
         when 'intersection'
           TrafficControllerSite.make_status @intersection
@@ -537,7 +597,7 @@ module RSMP
         end
       end
 
-      def handle_s0008 status_code, status_name=nil
+      def handle_s0008 status_code, status_name=nil, options={}
         case status_name
         when 'intersection'
           TrafficControllerSite.make_status @intersection
@@ -546,7 +606,7 @@ module RSMP
         end
       end
 
-      def handle_s0009 status_code, status_name=nil
+      def handle_s0009 status_code, status_name=nil, options={}
         case status_name
         when 'intersection'
           TrafficControllerSite.make_status @intersection
@@ -555,7 +615,7 @@ module RSMP
         end
       end
 
-      def handle_s0010 status_code, status_name=nil
+      def handle_s0010 status_code, status_name=nil, options={}
         case status_name
         when 'intersection'
           TrafficControllerSite.make_status @intersection
@@ -564,7 +624,7 @@ module RSMP
         end
       end
 
-      def handle_s0011 status_code, status_name=nil
+      def handle_s0011 status_code, status_name=nil, options={}
         case status_name
         when 'intersection'
           TrafficControllerSite.make_status @intersection
@@ -573,7 +633,7 @@ module RSMP
         end
       end
 
-      def handle_s0012 status_code, status_name=nil
+      def handle_s0012 status_code, status_name=nil, options={}
         case status_name
         when 'intersection'
           TrafficControllerSite.make_status @intersection
@@ -582,7 +642,7 @@ module RSMP
         end
       end
 
-      def handle_s0013 status_code, status_name=nil
+      def handle_s0013 status_code, status_name=nil, options={}
         case status_name
         when 'intersection'
           TrafficControllerSite.make_status @intersection
@@ -591,49 +651,49 @@ module RSMP
         end
       end
 
-      def handle_s0014 status_code, status_name=nil
+      def handle_s0014 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status @plan
         end
       end
 
-      def handle_s0015 status_code, status_name=nil
+      def handle_s0015 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status @traffic_situation
         end
       end
 
-      def handle_s0016 status_code, status_name=nil
+      def handle_s0016 status_code, status_name=nil, options={}
         case status_name
         when 'number'
           TrafficControllerSite.make_status @detector_logics.size
         end
       end
 
-      def handle_s0017 status_code, status_name=nil
+      def handle_s0017 status_code, status_name=nil, options={}
         case status_name
         when 'number'
           TrafficControllerSite.make_status @signal_groups.size
         end
       end
 
-      def handle_s0018 status_code, status_name=nil
+      def handle_s0018 status_code, status_name=nil, options={}
         case status_name
         when 'number'
           TrafficControllerSite.make_status @plans.size
         end
       end
 
-      def handle_s0019 status_code, status_name=nil
+      def handle_s0019 status_code, status_name=nil, options={}
         case status_name
         when 'number'
           TrafficControllerSite.make_status @num_traffic_situations
         end
       end
 
-      def handle_s0020 status_code, status_name=nil
+      def handle_s0020 status_code, status_name=nil, options={}
         case status_name
         when 'intersection'
           TrafficControllerSite.make_status @intersection
@@ -642,21 +702,21 @@ module RSMP
         end
       end
 
-      def handle_s0021 status_code, status_name=nil
+      def handle_s0021 status_code, status_name=nil, options={}
         case status_name
         when 'detectorlogics'
           TrafficControllerSite.make_status @detector_logics.map { |logic| bool_to_digit(logic.forced)}.join
         end
       end
 
-      def handle_s0022 status_code, status_name=nil
+      def handle_s0022 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status @plans.keys.join(',')
         end
       end
 
-      def handle_s0023 status_code, status_name=nil
+      def handle_s0023 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           dynamic_bands = @plans.map { |nr,plan| plan.dynamic_bands_string }
@@ -665,21 +725,21 @@ module RSMP
         end
       end
 
-      def handle_s0024 status_code, status_name=nil
+      def handle_s0024 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status '1-0'
         end
       end
 
-      def handle_s0026 status_code, status_name=nil
+      def handle_s0026 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status '0-00'
         end
       end
 
-      def handle_s0027 status_code, status_name=nil
+      def handle_s0027 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           status = @day_time_table.map do |i,item|
@@ -689,60 +749,92 @@ module RSMP
         end
       end
 
-      def handle_s0028 status_code, status_name=nil
+      def handle_s0028 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status '00-00'
         end
       end
 
-      def handle_s0029 status_code, status_name=nil
+      def handle_s0029 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status @inputs.forced_string
         end
       end
 
-      def handle_s0030 status_code, status_name=nil
+      def handle_s0030 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status ''
         end
       end
 
-      def handle_s0031 status_code, status_name=nil
+      def handle_s0031 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status ''
         end
       end
 
-      def handle_s0091 status_code, status_name=nil
+      def handle_s0032 status_code, status_name=nil, options={}
         case status_name
-        when 'user'
-          TrafficControllerSite.make_status 'nobody'
+        when 'intersection'
+          TrafficControllerSite.make_status @intersection
         when 'status'
-          TrafficControllerSite.make_status 'logout'
+          TrafficControllerSite.make_status 'local'
+        when 'source'
+          TrafficControllerSite.make_status 'startup'
         end
       end
 
-      def handle_s0092 status_code, status_name=nil
+      def handle_s0033 status_code, status_name=nil, options={}
         case status_name
-        when 'user'
-          TrafficControllerSite.make_status 'nobody'
         when 'status'
-          TrafficControllerSite.make_status 'logout'
+          TrafficControllerSite.make_status get_priority_list
+        end
+      end
+
+      def handle_s0091 status_code, status_name=nil, options={}
+        if Proxy.version_requirement_met? '>=1.1',options[:sxl_version]
+          case status_name
+          when 'user'
+            TrafficControllerSite.make_status 0
+          end
+        else
+          case status_name
+          when 'user'
+            TrafficControllerSite.make_status 'nobody'
+          when 'status'
+            TrafficControllerSite.make_status 'logout'
+          end
+        end
+      end
+
+      def handle_s0092 status_code, status_name=nil, options={}
+        if Proxy.version_requirement_met? '>=1.1',options[:sxl_version]
+          case status_name
+          when 'user'
+            TrafficControllerSite.make_status 0
+          end
+        else
+          case status_name
+          when 'user'
+            TrafficControllerSite.make_status 'nobody'
+          when 'status'
+            TrafficControllerSite.make_status 'logout'
+          end
         end
       end
 
-      def handle_s0095 status_code, status_name=nil
+      def handle_s0095 status_code, status_name=nil, options={}
         case status_name
         when 'status'
           TrafficControllerSite.make_status RSMP::VERSION
         end
       end
 
-      def handle_s0096 status_code, status_name=nil
+      def handle_s0096 status_code, status_name=nil, options={}
         now = clock.now
         case status_name
         when 'year'
@@ -760,7 +852,7 @@ module RSMP
         end
       end
 
-      def handle_s0097 status_code, status_name=nil
+      def handle_s0097 status_code, status_name=nil, options={}
         case status_name
         when 'checksum'
           TrafficControllerSite.make_status '1'
@@ -770,7 +862,7 @@ module RSMP
         end
       end
 
-      def handle_s0205 status_code, status_name=nil
+      def handle_s0205 status_code, status_name=nil, options={}
         case status_name
         when 'start'
           TrafficControllerSite.make_status clock.to_s
@@ -779,7 +871,7 @@ module RSMP
         end
       end
 
-      def handle_s0206 status_code, status_name=nil
+      def handle_s0206 status_code, status_name=nil, options={}
         case status_name
         when 'start'
           TrafficControllerSite.make_status clock.to_s
@@ -788,7 +880,7 @@ module RSMP
         end
       end
 
-      def handle_s0207 status_code, status_name=nil
+      def handle_s0207 status_code, status_name=nil, options={}
         case status_name
         when 'start'
           TrafficControllerSite.make_status clock.to_s
@@ -797,7 +889,7 @@ module RSMP
         end
       end
 
-      def handle_s0208 status_code, status_name=nil
+      def handle_s0208 status_code, status_name=nil, options={}
         case status_name
         when 'start'
           TrafficControllerSite.make_status clock.to_s

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.14.6"
+  VERSION = "0.15.2"
 end

data/lib/rsmp.rb

@@ -30,6 +30,7 @@ require 'rsmp/collect/status_collector'
 require 'rsmp/collect/command_response_collector'
 require 'rsmp/collect/aggregated_status_collector'
 require 'rsmp/collect/alarm_collector'
+require 'rsmp/collect/ack_collector'
 require 'rsmp/alarm_state'
 require 'rsmp/component_base'
 require 'rsmp/component'
@@ -48,6 +49,7 @@ require 'rsmp/tlc/detector_logic'
 require 'rsmp/tlc/signal_group'
 require 'rsmp/tlc/signal_plan'
 require 'rsmp/tlc/inputs'
+require 'rsmp/tlc/signal_priority'
 
 require 'rsmp/convert/import/yaml'
 require 'rsmp/convert/export/json_schema'

data/rsmp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-io", "~> 1.33.0"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.2.1"
-  spec.add_dependency "rsmp_schema", "~> 0.2.2"
+  spec.add_dependency "rsmp_schema", "~> 0.3.1"
 
   spec.add_development_dependency "bundler", "~> 2.3.7"
   spec.add_development_dependency "rake", "~> 13.0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.14.6
+  version: 0.15.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-25 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -211,6 +211,7 @@ files:
 - lib/rsmp/alarm_state.rb
 - lib/rsmp/archive.rb
 - lib/rsmp/cli.rb
+- 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
@@ -249,6 +250,7 @@ files:
 - lib/rsmp/tlc/inputs.rb
 - lib/rsmp/tlc/signal_group.rb
 - lib/rsmp/tlc/signal_plan.rb
+- lib/rsmp/tlc/signal_priority.rb
 - lib/rsmp/tlc/traffic_controller.rb
 - lib/rsmp/tlc/traffic_controller_site.rb
 - lib/rsmp/version.rb