rsmp 0.5.6 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22ab99646f7155eb2bd6cd2f39923f499f7fa5b019f63a5124886bc1ef4cbb15
-  data.tar.gz: db75cb477bfe945f799f37108a33550b4251d05b3d1a4f225e962dad16a4c827
+  metadata.gz: 4072d3e93ef2223bfc9ac2cb1a1e34b3668456e52a622a2b6f059087dd442c2e
+  data.tar.gz: 37603275646789fec0db5ec4c85baf731bebe6786693e6ad57eae7be3b3c29ed
 SHA512:
-  metadata.gz: c311032b06dab4f4d0aeb3a1ce61c961b87125546116eba2429bce01f3cdb5bcd0a9bf0bbe037dedb6c0cea2e269926cc180be51823bcddddebe89bde55c273f
-  data.tar.gz: 3121265aa3f49f49131a4afe7fe2479bcad25b2be74bcfaabb89ef8cf485cbae20298a33df456913c5818f160d0fa1e5ce7adf8142cbdac962cd109e8b13fd66
+  metadata.gz: 84a5e06ed20c8cb3331cf13ebd9bfc8d2baaf6c81ec14d67e83900d198153d86b89aeb09485f87afa9ef5c2aa7ca4469caa190a745dc9936caedc31bbb14d5a5
+  data.tar.gz: 9aa602447f391353632bf59fccd2ca48ab2eea492913cab875614c50279c362f04ebbf89559d1ea6a72878ef22e632a29160379b682356e8411568710a9d8525

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.5.6)
+    rsmp (0.6.3)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)
@@ -96,7 +96,7 @@ GEM
       thread_safe
     rake (13.0.3)
     regexp_parser (2.1.1)
-    rsmp_schemer (0.3.1)
+    rsmp_schemer (0.3.2)
       json_schemer (~> 0.2.18)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)

data/config/supervisor.yaml

@@ -8,16 +8,9 @@ guest:
     watchdog: 0.2
     acknowledgement: 0.2
 log:
-  active: true
-  color: true
-  timestamp: true
-  id: true
-  component: true
-  ip: false
   port: true
   site_id: 9
-  component_id: 3
-  text: true
+  component: 2
   direction: false
   level: false
   debug: true

data/config/tlc.yaml

@@ -10,15 +10,27 @@ components:
       cycle_time: 6
   signal_group:
     A1:
-      plan: '11NBBB'
     A2:
-      plan: '1NBBBB'
     B1:
-      plan: 'BBB11N'
     B2:
-      plan: 'BBB1NB'
   detector_logic:
     DL1:
+signal_plans:
+  1:
+    dynamic_bands:
+      1: 0
+      2: 5
+    states:
+      A1: '11NBBB'
+      A2: '1NBBBB'
+      B1: 'BBB11N'
+      B2: 'BBB1NB'
+  2:
+    states:
+      A1: '111NBB'
+      A2: '11NBBB'
+      B1: 'BBB11N'
+      B2: 'BBB1NB'
 intervals:
   timer: 0.1
   watchdog: 0.1
@@ -30,18 +42,11 @@ security_codes:
   1: '1111'
   2: '2222'
 log:
-  active: true
-  color: true
-  timestamp: true
-  id: true
-  component_id: true
   ip: false
   site_id: 9
-  component_id: 3
+  component: 2
   level: false
   debug: true
-  text: true
-  direction: false
   json: true
   acknowledgements: false
   watchdogs: false

data/lib/rsmp/archive.rb

@@ -21,11 +21,11 @@ module RSMP
     def self.prepare_item item
       raise ArgumentError unless item.is_a? Hash
     
-      cleaned = item.select { |k,v| [:author,:level,:ip,:port,:site_id,:component_id,:str,:message,:exception].include? k }
+      cleaned = item.select { |k,v| [:author,:level,:ip,:port,:site_id,:component,:text,:message,:exception].include? k }
       cleaned[:timestamp] = Clock.now
       if item[:message]
         cleaned[:direction] = item[:message].direction 
-        cleaned[:component_id] = item[:message].attributes['cId'] 
+        cleaned[:component] = item[:message].attributes['cId']
       end
 
       cleaned

data/lib/rsmp/cli.rb

@@ -51,7 +51,7 @@ module RSMP
       if options[:type]
         case options[:type]
           when 'tlc'
-            site_class = RSMP::Tlc
+            site_class = RSMP::TLC::TrafficControllerSite
           else
             site_class = RSMP::Site
         end

data/lib/rsmp/component.rb

@@ -65,7 +65,8 @@ module RSMP
     end
 
     def log str, options
-      @node.log str, options
+      default = { component: c_id}
+      @node.log str, default.merge(options)
     end
 
     def handle_command command_code, arg
@@ -118,7 +119,6 @@ module RSMP
         @statuses[sCI][n] ||= {}
         @statuses[sCI][n][:initial] = true
       end
-      #pp @subscribes
     end
 
     # Our proxy unsubscribed to status updates.

data/lib/rsmp/components.rb

@@ -15,8 +15,10 @@ module RSMP
       return unless settings
       check_main_component settings
       settings.each_pair do |type,components_by_type|
-        components_by_type.each_pair do |id,settings|
-          @components[id] = build_component(id:id, type:type, settings:settings)
+        if components_by_type
+          components_by_type.each_pair do |id,settings|
+            @components[id] = build_component(id:id, type:type, settings:settings)
+          end
         end
       end
     end
@@ -50,7 +52,8 @@ module RSMP
         component = inferred.new node: self, id: component_id
         @components[ component_id] = component
         class_name = component.class.name.split('::').last
-        log "Inferred #{class_name} component #{component_id}", level: :info
+        class_name << " compoent" unless class_name == 'Component'
+        log "Inferred #{class_name} #{component_id}", level: :debug
         component
       else
         raise UnknownComponent.new("Component #{component_id} not found") unless component

data/lib/rsmp/error.rb

@@ -41,6 +41,9 @@ module RSMP
 	class TimeoutError < Error
 	end
 
+	class DisonnectError < Error
+	end
+
 	class ConnectionError < Error
 	end
 

data/lib/rsmp/logger.rb

@@ -5,7 +5,7 @@ module RSMP
     
     def initialize settings={}
       defaults = {
-        'active'=>false,
+        'active'=>true,
         'path'=>nil,
         'stream'=>nil,
         'color'=>true,
@@ -13,6 +13,7 @@ module RSMP
         'statistics'=>false,
         'hide_ip_and_port' => false,
         'acknowledgements' => false,
+        'watchdogs' => false,
         'json'=>false,
         'tabs'=>'-',
 
@@ -23,11 +24,10 @@ module RSMP
         'ip'=>false,
         'port'=>false,
         'site_id'=>true,
-        'component_id'=>true,
         'direction'=>false,
         'level'=>false,
-        'id'=>false,
-        'str'=>true,
+        'id'=>true,
+        'text'=>true,
       }
 
       default_lengths = {
@@ -37,8 +37,8 @@ module RSMP
         'ip'=>22,
         'port'=>5,
         'site_id'=>19,
-        'component_id'=>19,
-        'direction'=>4,
+        'component'=>19,
+        'direction'=>3,
         'level'=>7,
         'id'=>4,
       }
@@ -189,15 +189,15 @@ module RSMP
       build_part( parts, item, :ip )
       build_part( parts, item, :port )
       build_part( parts, item, :site_id )
-      build_part( parts, item, :component_id )
-      build_part( parts, item, :direction ) { |part| {in:"-->",out:"<--"}[part] }
+      build_part( parts, item, :component )
+      build_part( parts, item, :direction ) { |part| {in:"In",out:"Out"}[part] }
       build_part( parts, item, :level ) { |part| part.capitalize }
       build_part( parts, item, :id ) { Logger.shorten_message_id(item[:message].m_id,4) if item[:message] }
-      build_part( parts, item, :str )
+      build_part( parts, item, :text )
       build_part( parts, item, :json ) { item[:message].json if item[:message] }
       build_part( parts, item, :exception ) { |e| [e.class,e.backtrace].flatten.join("\n") }
 
-      parts.join('  ').chomp(@settings['tabs']).rstrip
+      parts.join('  ').chomp(@settings['tabs'].to_s).rstrip
     end
   end
 end

data/lib/rsmp/logging.rb

@@ -15,7 +15,7 @@ module RSMP
     end
 
     def log str, options={}
-      default = { str:str, level: :log, author: author, ip: @ip, port: @port }
+      default = { text:str, level: :log, author: author, ip: @ip, port: @port }
       prepared = RSMP::Archive.prepare_item default.merge(options)
       @archive.add prepared
       @logger.log prepared

data/lib/rsmp/node.rb

@@ -14,9 +14,18 @@ module RSMP
       @deferred = []
       @clock = Clock.new
       @error_queue = Async::Queue.new
+      @ignore_errors = []
+    end
+
+    def ignore_errors classes, &block
+      was, @ignore_errors = @ignore_errors, [classes].flatten
+      yield
+    ensure
+      @ignore_errors = was
     end
 
     def notify_error e, options={}
+      return if @ignore_errors.find { |klass| e.is_a? klass }
       if options[:level] == :internal
         log ["#{e.to_s} in task: #{Async::Task.current.to_s}",e.backtrace].flatten.join("\n"), level: :error
       end

data/lib/rsmp/proxy.rb

@@ -86,7 +86,7 @@ module RSMP
       return if @state == :stopped
       set_state :stopping
       stop_tasks
-      notify_error ConnectionError.new("Connection was closed")
+      notify_error DisonnectError.new("Connection was closed")
     ensure
       close_socket
       clear
@@ -348,20 +348,23 @@ module RSMP
       # cannot send NotAcknowledged for a malformed message since we can't read it, just ignore it
       nil
     rescue SchemaError, RSMP::Schemer::Error => e
-      str = "Received invalid #{message.type}, schema errors: #{e.message}"
+      reason = "schema errors: #{e.message}"
+      str = "Received invalid #{message.type}, #{reason}"
       log str, message: message, level: :warning
       notify_error e.exception(str), message: message
-      dont_acknowledge message, str
+      dont_acknowledge message, str, reason
       message
     rescue InvalidMessage => e
-      str = "Received", "invalid #{message.type}, #{e.message}"
+      reason = "#{e.message}"
+      str = "Received invalid #{message.type},"
       notify_error e.exception("#{str} #{message.json}"), message: message
-      dont_acknowledge message, str
+      dont_acknowledge message, str, reason
       message
     rescue FatalError => e
+      reason = e.message
       str = "Rejected #{message.type},"
       notify_error e.exception(str), message: message
-      dont_acknowledge message, str, "#{e.message}"
+      dont_acknowledge message, str, reason
       stop
       message
     ensure

data/lib/rsmp/supervisor.rb

@@ -7,6 +7,7 @@ module RSMP
     attr_reader :rsmp_versions, :site_id, :supervisor_settings, :proxies, :logger
 
     def initialize options={}
+
       handle_supervisor_settings( options[:supervisor_settings] || {} )
       super options
       @proxies = []

data/lib/rsmp/tlc/detector_logic.rb

@@ -0,0 +1,101 @@
+module RSMP
+  module TLC
+    class DetectorLogic < Component
+      attr_reader :forced, :value
+
+      def initialize node:, id:
+        super node: node, id: id, grouped: false
+        @forced = 0
+        @value = 0
+      end
+
+      def get_status code, name=nil
+        case code
+        when 'S0201', 'S0202', 'S0203', 'S0204'
+          return send("handle_#{code.downcase}", code, name)
+        else
+          raise InvalidMessage.new "unknown status code #{code}"
+        end
+      end
+
+      def handle_s0201 status_code, status_name=nil
+        case status_name
+        when 'starttime'
+          TrafficControllerSite.make_status @node.clock.to_s
+        when 'vehicles'
+          TrafficControllerSite.make_status 0
+        end
+      end
+
+      def handle_s0202 status_code, status_name=nil
+        case status_name
+        when 'starttime'
+          TrafficControllerSite.make_status @node.clock.to_s
+        when 'speed'
+          TrafficControllerSite.make_status 0
+        end
+      end
+
+      def handle_s0203 status_code, status_name=nil
+        case status_name
+        when 'starttime'
+          TrafficControllerSite.make_status @node.clock.to_s
+        when 'occupancy'
+          TrafficControllerSite.make_status 0
+        end
+      end
+
+      def handle_s0204 status_code, status_name=nil
+        case status_name
+        when 'starttime'
+          TrafficControllerSite.make_status @node.clock.to_s
+        when 'P'
+          TrafficControllerSite.make_status 0
+        when 'PS'
+          TrafficControllerSite.make_status 0
+        when 'L'
+          TrafficControllerSite.make_status 0
+        when 'LS'
+          TrafficControllerSite.make_status 0
+        when 'B'
+          TrafficControllerSite.make_status 0
+        when 'SP'
+          TrafficControllerSite.make_status 0
+        when 'MC'
+          TrafficControllerSite.make_status 0
+        when 'C'
+          TrafficControllerSite.make_status 0
+        when 'F'
+          TrafficControllerSite.make_status 0
+        end
+      end
+
+      def handle_command command_code, arg
+        case command_code
+        when 'M0008'
+          handle_m0008 arg
+        else
+          raise UnknownCommand.new "Unknown command #{command_code}"
+        end
+      end
+
+      def handle_m0008 arg
+        @node.verify_security_code 2, arg['securityCode']
+        status = arg['status']=='True'
+        mode = arg['mode']=='True'
+        force_detector_logic status, mode
+        arg
+      end
+
+      def force_detector_logic forced, value
+        @forced = forced
+        @value = value
+        if @forced
+          log "Forcing to #{value}", level: :info
+        else
+          log "Releasing", level: :info
+        end
+      end
+    end
+  end
+end

data/lib/rsmp/tlc/signal_group.rb

@@ -0,0 +1,85 @@
+module RSMP
+  module TLC
+    class SignalGroup < Component
+      attr_reader :plan, :state
+
+      # 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
+        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]
+        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'
+          return send("handle_#{command_code.downcase}", arg)
+        else
+          raise UnknownCommand.new "Unknown command #{command_code}"
+        end
+      end
+
+      # Start of signal group. Orders a signal group to green
+      def handle_m0010 arg
+        @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
+        end
+      end
+
+      # Stop of signal group. Orders a signal group to red
+      def handle_m0011 arg
+        @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
+        case code
+        when 'S0025'
+          return send("handle_#{code.downcase}", code, name)
+        else
+          raise InvalidMessage.new "unknown status code #{code}"
+        end
+      end
+
+      def handle_s0025 status_code, status_name=nil
+        now = @node.clock.to_s
+        case status_name
+        when 'minToGEstimate'
+          TrafficControllerSite.make_status now
+        when 'maxToGEstimate'
+          TrafficControllerSite.make_status now
+        when 'likelyToGEstimate'
+          TrafficControllerSite.make_status now
+        when 'ToGConfidence'
+          TrafficControllerSite.make_status 0
+        when 'minToREstimate'
+          TrafficControllerSite.make_status now
+        when 'maxToREstimate'
+          TrafficControllerSite.make_status now
+        when 'likelyToREstimate'
+          TrafficControllerSite.make_status now
+        when 'ToRConfidence'
+          TrafficControllerSite.make_status 0
+        end
+      end
+    end
+  end
+end

data/lib/rsmp/tlc/signal_plan.rb

@@ -0,0 +1,29 @@
+module RSMP
+  module TLC
+    # A Traffic Light Controller Signal Plan.
+    # A signal plan is a description of how all signal groups should change 
+    # state over time. 
+    class SignalPlan
+      attr_reader :nr, :states, :dynamic_bands
+      def initialize nr:, states:, dynamic_bands:
+        @nr = nr
+        @states = states
+        @dynamic_bands = dynamic_bands || {}
+      end
+
+      def dynamic_bands_string
+        str = @dynamic_bands.map { |band,value| "#{nr}-#{band}-#{value}" }.join(',')
+        return nil if str == ''
+        str
+      end
+
+      def set_band band, value
+        @dynamic_bands[ band.to_i ] = value.to_i
+      end
+
+      def get_band band
+        @dynamic_bands[ band.to_i ]
+      end
+    end
+  end
+end