rsmp 0.5.6 → 0.6.3

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -0,0 +1,136 @@
+module RSMP
+  module TLC
+    # Simulates a Traffic Light Controller Site
+    class TrafficControllerSite < Site
+      attr_accessor :main, :signal_plans
+
+      def initialize options={}
+        @sxl = 'traffic_light_controller'
+        @security_codes = options[:site_settings]['security_codes']
+        @interval = options[:site_settings].dig('intervals','timer') || 1
+        build_plans options[:site_settings].dig('signal_plans')
+        super options
+        unless @main
+          raise ConfigurationError.new "TLC must have a main component"
+        end
+      end
+
+      def build_plans signal_plans
+        @signal_plans = {}
+        return unless signal_plans
+        signal_plans.each_pair do |id,settings|
+          @signal_plans[id.to_i] = SignalPlan.new(nr: id.to_i, states:settings['states'],dynamic_bands:settings['dynamic_bands'])
+        end
+      end
+
+      def get_plan group_id, plan_nr
+        'NN1BB1'
+      end
+
+      def build_component id:, type:, settings:{}
+        component = case type
+        when 'main'
+          @main = TrafficController.new node: self, id: id,
+            cycle_time: settings['cycle_time'],
+            signal_plans: @signal_plans
+        when 'signal_group'
+          group = SignalGroup.new node: self, id: id
+          @main.add_signal_group group
+          group
+        when 'detector_logic'
+          logic = DetectorLogic.new node: self, id: id
+          @main.add_detector_logic logic
+          logic
+        end
+      end
+
+      def start_action
+        super
+        start_timer
+      end
+
+      def start_timer
+        task_name = "tlc timer"
+        log "Starting #{task_name} with interval #{@interval} seconds", level: :debug
+
+        @timer = @task.async do |task|
+          task.annotate task_name
+          next_time = Time.now.to_f
+          loop do
+            begin
+              timer(@clock.now)
+            rescue EOFError => e
+              log "Connection closed: #{e}", level: :warning
+            rescue IOError => e
+              log "IOError", level: :warning
+            rescue Errno::ECONNRESET
+              log "Connection reset by peer", level: :warning
+            rescue Errno::EPIPE => e
+              log "Broken pipe", level: :warning
+            rescue StandardError => e
+              notify_error e, level: :internal
+            ensure
+              # adjust sleep duration to avoid drift. so wake up always happens on the
+              # same fractional second.
+              # note that Time.now is not monotonic. If the clock is changed,
+              # either manaully or via NTP, the sleep interval might jump.
+              # an alternative is to use ::Process.clock_gettime(::Process::CLOCK_MONOTONIC),
+              # to get the current time. this ensures a constant interval, but
+              # if the clock is changed, the wake up would then happen on a different
+              # fractional second
+              next_time += @interval
+              duration = next_time - Time.now.to_f
+              task.sleep duration
+            end
+          end
+        end
+      end
+
+      def timer now
+        return unless @main
+        @main.timer now
+      end
+
+      def verify_security_code level, code
+        raise ArgumentError.new("Level must be 1-2, got #{level}") unless (1..2).include?(level)
+        if @security_codes[level] != code
+          raise MessageRejected.new("Wrong security code for level #{level}")
+        end
+      end
+
+      def change_security_code level, old_code, new_code
+        verify_security_code level, old_code
+        @security_codes[level] = new_code
+      end
+
+      def self.to_rmsp_bool bool
+        if bool
+          'True'
+        else
+          'False'
+        end
+      end
+
+      def self.from_rsmp_bool str
+        str == 'True'
+      end
+
+      def self.make_status value, q='recent'
+        case value
+        when true, false
+          return to_rmsp_bool(value), q
+        else
+          return value, q
+        end
+      end
+
+      def do_deferred item
+        case item
+        when :restart
+          log "Restarting TLC", level: :info
+          restart
+        end
+      end
+    end
+  end
+end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.5.6"
+  VERSION = "0.6.3"
 end

data/lib/rsmp.rb

@@ -33,7 +33,11 @@ require 'rsmp/error'
 require 'rsmp/message'
 require 'rsmp/logger'
 require 'rsmp/archive'
-require 'rsmp/tlc'
+require 'rsmp/tlc/traffic_controller_site'
+require 'rsmp/tlc/traffic_controller'
+require 'rsmp/tlc/detector_logic'
+require 'rsmp/tlc/signal_group'
+require 'rsmp/tlc/signal_plan'
 
 require 'rsmp/convert/import/yaml'
 require 'rsmp/convert/export/json_schema'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.3
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -230,7 +230,11 @@ files:
 - lib/rsmp/site_proxy_wait.rb
 - lib/rsmp/supervisor.rb
 - lib/rsmp/supervisor_proxy.rb
-- lib/rsmp/tlc.rb
+- lib/rsmp/tlc/detector_logic.rb
+- lib/rsmp/tlc/signal_group.rb
+- lib/rsmp/tlc/signal_plan.rb
+- lib/rsmp/tlc/traffic_controller.rb
+- lib/rsmp/tlc/traffic_controller_site.rb
 - lib/rsmp/version.rb
 - lib/rsmp/wait.rb
 - rsmp.gemspec
@@ -258,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.