rsmp 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd4daeeb9fb712ab275d4b0711a6ea69e766124a2fcd55ea955eeb1c46f05ed3
-  data.tar.gz: a47c38c49b46fb2ad412ced388f6e654653292dd439ea31d2bbaf33988f024f0
+  metadata.gz: c4dc16f45d38459c4ab31445f39e74c8e0fe71ce906759a4f842ddcc8ca78471
+  data.tar.gz: 50d8ff8a27a2f16ddba8206236cc17997a582b5b5ec01348a55e9a7b3a8004b7
 SHA512:
-  metadata.gz: ec4a4057b53a27d12e1c81af4623b03bcd7cf93b39bad72f1d228c1a0dfd74495541abae496a3fa783c159a16df2e161eb0f5fbaa13d96daa8d8c99a847a0f9f
-  data.tar.gz: 704c11a6d854a0fb48f9cb6d84514ac40791bb85fe56186b9ff217e876458be6a214fbb69b8c3aaf09db35bd334345f7ca6ee31da8f9fbf717a3ae790e77252a
+  metadata.gz: 735d346b07fb2ad71cead5a0d934bb415125429e2fa628e9c4aa93a73f7e1e40a8db5cce27b6329fbb520f13f9018fb2f221e4cf60051818043e58cbab2f0523
+  data.tar.gz: aad8d0d4b871916080c7c981a00fea551fb0c7b62599149b017b955d46e6c810fd246682206d89f2a6a99b5ec19cc0285fb6c68e2cde8b594cbe40402e542834

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.31.0)
+    rsmp (0.32.0)
       async (~> 2.12.0)
       async-io (~> 1.43.0)
       colorize (~> 1.1)
@@ -96,7 +96,7 @@ GEM
     simpleidn (0.2.3)
     sys-uname (1.3.0)
       ffi (~> 1.1)
-    thor (1.3.1)
+    thor (1.3.2)
     timecop (0.9.10)
 
 PLATFORMS

data/lib/rsmp/cli.rb

@@ -12,9 +12,10 @@ module RSMP
     method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'
     method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
     method_option :supervisors, :type => :string, :aliases => "-s", banner: 'ip:port,... list of supervisor to connect to'
+    method_option :core, :string => :string, banner: "Core version: [#{RSMP::Schema.core_versions.join(' ')}]", enum: RSMP::Schema.core_versions
+    method_option :type, :type => :string, :aliases => "-t", banner: 'Type of site: [tlc]', enum: ['tlc'], default: 'tlc'
     method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
     method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
-    method_option :type, :type => :string, :aliases => "-t", banner: 'Type of site: [tlc]'
     def site
       settings = {}
       log_settings = { 'active' => true }
@@ -43,6 +44,20 @@ module RSMP
         end
       end
 
+      if options[:core]
+        settings['core_versions'] = [options[:core]]
+      end
+
+      site_class = RSMP::Site
+      site_type = options[:type] || settings['type']
+      case site_type
+        when 'tlc'
+          site_class = RSMP::TLC::TrafficControllerSite
+        else
+          puts "Error: Unknown site type #{site_type}"
+          exit
+      end
+
       if options[:log]
         log_settings['path'] = options[:log]
       end
@@ -51,22 +66,25 @@ module RSMP
         log_settings['json'] = options[:json]
       end
 
-      site_class = RSMP::Site
-      if options[:type]
-        case options[:type]
-          when 'tlc'
-            site_class = RSMP::TLC::TrafficControllerSite
-          else
-            site_class = RSMP::Site
-        end
-      end
       Async do |task|
         task.annotate 'cli'
         loop do
           begin
-            site = site_class.new(site_settings:settings, log_settings: log_settings)
+            site = site_class.new(site_settings: settings, log_settings: log_settings)
             site.start
             site.wait
+          rescue Psych::SyntaxError => e
+            puts "Cannot read config file #{e}"
+            break
+          rescue RSMP::Schema::UnknownSchemaTypeError => e
+            puts "Cannot start site: #{e}"
+            break
+          rescue RSMP::Schema::UnknownSchemaVersionError => e
+            puts "Cannot start site: #{e}"
+            break
+          rescue RSMP::ConfigurationError => e
+            puts "Cannot start site: #{e}"
+            break
           rescue RSMP::Restart
             site.stop
           end
@@ -74,12 +92,6 @@ module RSMP
       end
     rescue Interrupt
       # cntr-c
-    rescue RSMP::Schema::UnknownSchemaTypeError => e
-      puts "Cannot start site: #{e}"
-    rescue RSMP::Schema::UnknownSchemaVersionError => e
-      puts "Cannot start site: #{e}"
-    rescue Psych::SyntaxError => e
-      puts "Cannot read config file #{e}"
     rescue Exception => e
       puts "Uncaught error: #{e}"
       puts caller.join("\n")
@@ -90,6 +102,7 @@ module RSMP
     method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
     method_option :ip, :type => :numeric, banner: 'IP address to listen on'
     method_option :port, :type => :string, :aliases => "-p", banner: 'Port to listen on'
+    method_option :core, :string => :string, banner: "Core version: [#{RSMP::Schema.core_versions.join(' ')}]", enum: RSMP::Schema.core_versions
     method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
     method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
     def supervisor
@@ -118,6 +131,11 @@ module RSMP
         settings['port'] = options[:port]
       end
 
+      if options[:core]
+        settings['guest'] = {}
+        settings['guest']['core_versions'] = [options[:core]]
+      end
+
       if options[:log]
         log_settings['path'] = options[:log]
       end
@@ -131,11 +149,17 @@ module RSMP
         supervisor = RSMP::Supervisor.new(supervisor_settings:settings,log_settings:log_settings)
         supervisor.start
         supervisor.wait
+      rescue Psych::SyntaxError => e
+        puts "Cannot read config file #{e}"
+      rescue RSMP::Schema::UnknownSchemaTypeError => e
+        puts "Cannot start supervisor: #{e}"
+      rescue RSMP::Schema::UnknownSchemaVersionError => e
+        puts "Cannot start supervisor: #{e}"
+      rescue RSMP::ConfigurationError => e
+        puts "Cannot start supervisor: #{e}"
       end
     rescue Interrupt
       # ctrl-c
-    rescue RSMP::ConfigurationError => e
-      puts "Cannot start supervisor: #{e}"
     end
 
     desc "convert", "Convert SXL from YAML to JSON Schema"

data/lib/rsmp/proxy.rb

@@ -340,8 +340,8 @@ module RSMP
       schemas
     end
 
-    def send_message message, reason=nil, validate: true
-      raise NotReady unless connected?
+    def send_message message, reason=nil, validate: true, force: false
+      raise NotReady unless connected? unless force
       raise IOError unless @protocol
       message.direction = :out
       message.generate_json
@@ -486,7 +486,9 @@ module RSMP
       if candidates.any?
         @core_version = candidates.sort_by { |v| Gem::Version.new(v) }.last  # pick latest version
       else
-        raise HandshakeError.new "RSMP versions [#{message.versions.join(',')}] requested, but only [#{versions.join(',')}] supported."
+        reason = "RSMP versions [#{message.versions.join(',')}] requested, but only [#{versions.join(',')}] supported."
+        dont_acknowledge message, "Version message rejected", reason, force: true
+        raise HandshakeError.new reason
       end
     end
 
@@ -501,7 +503,7 @@ module RSMP
       check_ingoing_acknowledged original
     end
 
-    def dont_acknowledge original, prefix=nil, reason=nil
+    def dont_acknowledge original, prefix=nil, reason=nil, force: true
       raise InvalidArgument unless original
       str = [prefix,reason].join(' ')
       log str, message: original, level: :warning if reason
@@ -510,7 +512,7 @@ module RSMP
         "rea" => reason || "Unknown reason"
       })
       message.original = original.clone
-      send_message message, "for #{original.type} #{original.m_id_short}"
+      send_message message, "for #{original.type} #{original.m_id_short}", force: force
     end
 
     def wait_for_state state, timeout:

data/lib/rsmp/site.rb

@@ -58,6 +58,7 @@ module RSMP
 
       @site_settings = defaults.deep_merge options[:site_settings]
       check_sxl_version
+      check_core_versions
       setup_components @site_settings['components']
     end
 
@@ -67,10 +68,49 @@ module RSMP
       RSMP::Schema::find_schema! sxl, version, lenient: true
     end
 
+  def check_core_versions
+      return if @site_settings['core_versions'] == 'all'
+      requested = [@site_settings['core_versions']].flatten
+      invalid = requested - RSMP::Schema::core_versions
+      if invalid.any?
+        if invalid.size == 1
+          error_str = "Unknown core version: #{invalid.first}"
+        else
+          error_str = "Unknown core versions: [#{invalid.join(' ')}]"
+        end
+
+        raise RSMP::ConfigurationError.new(error_str)
+      end
+    end
+
+    def site_type_name
+      "site"
+    end
+
+    def log_site_starting
+      log "Starting #{site_type_name} #{@site_settings["site_id"]}", level: :info, timestamp: @clock.now
+
+      sxl = "Using #{@site_settings["sxl"]} sxl #{@site_settings["sxl_version"]}"
+
+      versions = @site_settings["core_versions"]
+      if versions.is_a?(Array) && versions.size == 1
+        versions = versions.first
+      end
+      if versions == 'all'
+        core = "accepting all core versions [#{RSMP::Schema.core_versions.join(', ')}]"
+      else
+        if versions.is_a?(String)
+          core = "accepting only core version #{versions}"
+        else
+          core = "accepting core versions [#{versions.join(', ')}]"
+        end
+      end
+
+      log "#{sxl}, #{core}", level: :info, timestamp: @clock.now
+    end
+
     def run
-      log "Starting site #{@site_settings["site_id"]}",
-          level: :info,
-          timestamp: @clock.now
+      log_site_starting
       @proxies.each { |proxy| proxy.start }
       @proxies.each { |proxy| proxy.wait }
     end

data/lib/rsmp/supervisor.rb

@@ -94,7 +94,7 @@ module RSMP
       else
         reject_connection socket, info
       end
-    rescue ConnectionError => e
+    rescue ConnectionError, HandshakeError => e
       log "Rejected connection from #{remote_ip}:#{remote_port}, #{e.to_s}", level: :warning
       distribute_error e
     rescue StandardError => e

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

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

data/lib/rsmp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async