rsmp 0.43.2 → 0.45.1

data/lib/rsmp/component/components.rb

@@ -19,7 +19,12 @@ module RSMP
 
         components_by_type.each_pair do |id, component_settings|
           component_settings ||= {}
-          @components[id] = build_component(id: id, type: type, settings: component_settings)
+          component = build_component(id: id, type: type, settings: component_settings)
+          component.update_metadata(
+            type: component_settings['type'] || type,
+            name: component_settings['name'] || id
+          )
+          @components[id] = component
           @main = @components[id] if type == 'main'
         end
       end
@@ -36,6 +41,22 @@ module RSMP
       @components[component.c_id] = component
     end
 
+    def natural_sort_key(value)
+      value.to_s.split(/(\d+)/).map do |part|
+        part.match?(/\A\d+\z/) ? part.to_i : part
+      end
+    end
+
+    def component_list
+      @components.values.sort_by { |component| natural_sort_key(component.c_id) }.map do |component|
+        {
+          'id' => component.c_id,
+          'type' => component.component_type || 'component',
+          'name' => component.name || component.c_id
+        }
+      end
+    end
+
     def infer_component_type(component_id)
       raise UnknownComponent, "Component #{component_id} mising and cannot infer type"
     end

data/lib/rsmp/convert/export/json_schema/outputs.rb

@@ -103,6 +103,23 @@ module RSMP
           out["commands/#{key}.json"] = output_json json
         end
 
+        def self.output_sxl_index(out, sxl)
+          out['sxl_index.json'] = output_json({
+                                                'meta' => sxl[:meta],
+                                                'statuses' => index_items(sxl[:statuses]),
+                                                'commands' => index_items(sxl[:commands]),
+                                                'alarms' => index_items(sxl[:alarms])
+                                              })
+        end
+
+        def self.index_items(items)
+          items.keys.sort.to_h do |key|
+            [key, {
+              'arguments' => (items[key]['arguments'] || {}).keys.sort
+            }]
+          end
+        end
+
         # output the json schema root
         def self.output_root(out, meta)
           json = {
@@ -112,6 +129,8 @@ module RSMP
             'version' => meta['version'],
             'allOf' => root_type_rules
           }
+          json['prefix'] = meta['prefix'] if meta['prefix']
+          json['minimum_core_version'] = meta['minimum_core_version'] if meta['minimum_core_version']
           out['rsmp.json'] = output_json json
         end
 

data/lib/rsmp/convert/export/json_schema/values.rb

@@ -7,7 +7,7 @@ module RSMP
         def self.build_value(item)
           out = {}
           out['description'] = item['description'] if item['description']
-          if item['type'] =~ /_list$/
+          if item['type'] =~ /_list(_as_string)?$/
             handle_string_list item, out
           else
             handle_types item, out
@@ -59,11 +59,13 @@ module RSMP
         # convert a yaml item with list: true to json schema
         def self.handle_string_list(item, out)
           case item['type']
-          when 'boolean_list'
+          when 'boolean_list', 'boolean_list_as_string'
             out['$ref'] = '../defs/definitions.json#/boolean_list'
-          when 'integer_list'
+          when 'integer_list', 'integer_list_as_string'
             out['$ref'] = '../defs/definitions.json#/integer_list'
-          when 'string_list'
+          when 'number_list', 'number_list_as_string'
+            out['$ref'] = '../defs/definitions.json#/number_list'
+          when 'string_list', 'string_list_as_string'
             out['$ref'] = '../defs/definitions.json#/string_list'
           else
             raise "Error: List of #{item['type']} is not supported: #{item.inspect}"
@@ -74,7 +76,7 @@ module RSMP
             out['pattern'] = /(?-mix:^(#{value_list})(?:,(#{value_list}))*$)/
           end
 
-          puts "Warning: Pattern not support for lists: #{item.inspect}" if item['pattern']
+          handle_pattern item, out
         end
 
         # convert yaml values to json schema enum

data/lib/rsmp/convert/export/json_schema.rb

@@ -26,8 +26,18 @@ module RSMP
           JSON.generate(item, JSON_OPTIONS)
         end
 
-        # Default path to definitions.json bundled with the gem's core schemas
-        DEFINITIONS_SOURCE = File.expand_path('../../../../schemas/core/3.1.2/definitions.json', __dir__)
+        def self.minimum_core_version(sxl)
+          sxl.dig(:meta, 'minimum_core_version') || RSMP::Schema.latest_core_version
+        end
+
+        # Path to definitions.json for the fallback bundled core schema version
+        def self.definitions_source(sxl)
+          version = minimum_core_version(sxl)
+          path = File.expand_path("../../../../schemas/core/#{version}/definitions.json", __dir__)
+          raise "Missing core definitions for RSMP #{version}" unless File.exist?(path)
+
+          path
+        end
 
         # generate the json schema from a string containing yaml
         def self.generate(sxl)
@@ -36,6 +46,7 @@ module RSMP
           output_alarms out, sxl[:alarms]
           output_statuses out, sxl[:statuses]
           output_commands out, sxl[:commands]
+          output_sxl_index out, sxl
           out
         end
 
@@ -50,7 +61,8 @@ module RSMP
           # Copy definitions.json so each version folder is self-contained
           defs_dest = File.join(folder, 'defs', 'definitions.json')
           FileUtils.mkdir_p File.dirname(defs_dest)
-          FileUtils.cp DEFINITIONS_SOURCE, defs_dest if File.exist?(DEFINITIONS_SOURCE)
+          source = definitions_source(sxl)
+          FileUtils.cp source, defs_dest
         end
       end
     end

data/lib/rsmp/helpers/deep_merge.rb

@@ -3,8 +3,8 @@ class Hash
   def deep_merge(other_hash)
     return self unless other_hash
 
-    merge(other_hash) do |_key, old, fresh|
-      if old.is_a?(Hash) && fresh.is_a?(Hash)
+    merge(other_hash) do |key, old, fresh|
+      if key != 'sxls' && old.is_a?(Hash) && fresh.is_a?(Hash)
         old.deep_merge(fresh)
       else
         fresh

data/lib/rsmp/message.rb

@@ -30,6 +30,7 @@ module RSMP
         'MessageAck' => MessageAck,
         'MessageNotAck' => MessageNotAck,
         'Version' => Version,
+        'ComponentList' => ComponentList,
         'AggregatedStatus' => AggregatedStatus,
         'AggregatedStatusRequest' => AggregatedStatusRequest,
         'Watchdog' => Watchdog,
@@ -216,6 +217,37 @@ module RSMP
     def versions
       attribute('RSMP').map { |item| item['vers'] }
     end
+
+    def step
+      @attributes['step']
+    end
+
+    def request?
+      step == 'Request'
+    end
+
+    def response?
+      step == 'Response'
+    end
+
+    def sxls
+      (@attributes['SXLS'] || []).map do |item|
+        item.transform_keys(&:to_s)
+      end
+    end
+
+    def site_ids
+      attribute('siteId').map { |item| item['sId'] }
+    end
+  end
+
+  # ComponentList message, lists site components and their component types.
+  class ComponentList < Message
+    def initialize(attributes = {})
+      super({
+        'type' => 'ComponentList'
+      }.merge attributes)
+    end
   end
 
   # Unknown message type wrapper.

data/lib/rsmp/node/site/site.rb

@@ -19,8 +19,16 @@ module RSMP
       build_proxies
     end
 
+    def sxls
+      @site_settings['sxls']
+    end
+
+    def primary_sxl
+      sxls.first
+    end
+
     def sxl_version
-      @site_settings['sxl_version']
+      primary_sxl && primary_sxl['version']
     end
 
     def site_id
@@ -30,18 +38,34 @@ module RSMP
     def handle_site_settings(options = {})
       options_class = self.class.options_class
       settings = options[:site_settings] || {}
+      settings = denormalize_sxls(settings)
       @site_options = options_class.new(settings)
       @site_settings = @site_options.to_h
 
-      check_sxl_version
+      check_sxls
       check_core_versions
       setup_components @site_settings['components']
     end
 
-    def check_sxl_version
-      sxl = @site_settings['sxl']
-      version = @site_settings['sxl_version'].to_s
-      RSMP::Schema.find_schema! sxl, version, lenient: true
+    def denormalize_sxls(settings)
+      sxls = settings['sxls']
+      return settings unless sxls.is_a?(Array)
+
+      settings.merge(
+        'sxls' => sxls.to_h { |sxl| [sxl['name'], sxl['version']] }
+      )
+    end
+
+    def check_sxls
+      raise RSMP::ConfigurationError, 'No SXLs specified' unless sxls
+
+      sxls.each do |sxl|
+        name = sxl['name']
+        version = sxl['version'].to_s
+        raise RSMP::ConfigurationError, 'SXL name cannot be core' if name.to_s == 'core'
+
+        RSMP::Schema.find_schema! name, version, lenient: true
+      end
     end
 
     def check_core_versions
@@ -60,7 +84,7 @@ module RSMP
 
     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']}"
+      sxl = "Using SXLs #{sxls.map { |item| "#{item['name']} #{item['version']}" }.join(', ')}"
       version = @site_settings['core_version']
       core = if version
                "accepting only core version #{version}"
@@ -113,7 +137,7 @@ module RSMP
 
     def send_alarm(alarm)
       @proxies.each do |proxy|
-        proxy.send_message alarm if proxy.ready?
+        proxy.send_message alarm if proxy.ready? && proxy.receive_alarms?
       end
     end
 
@@ -158,10 +182,10 @@ module RSMP
     def build_component(id:, type:, settings:)
       settings ||= {}
       if type == 'main'
-        Component.new id: id, node: self, grouped: true,
+        Component.new id: id, node: self, type: type, name: settings['name'], grouped: true,
                       ntsoid: settings['ntsOId'], xnid: settings['xNId']
       else
-        Component.new id: id, node: self, grouped: false
+        Component.new id: id, node: self, type: type, name: settings['name'], grouped: false
       end
     end
   end

data/lib/rsmp/node/supervisor/modules/configuration.rb

@@ -4,22 +4,49 @@ module RSMP
       # Handles supervisor configuration and site settings
       module Configuration
         def handle_supervisor_settings(supervisor_settings)
+          supervisor_settings = denormalize_supervisor_sxls(supervisor_settings || {})
           options = RSMP::Supervisor::Options.new(supervisor_settings || {})
           @supervisor_settings = options.to_h
           @core_version = @supervisor_settings.dig('default', 'core_version')
-          check_site_sxl_types
+          check_site_sxls
         end
 
-        def check_site_sxl_types
+        def denormalize_supervisor_sxls(settings)
+          settings = settings.merge('default' => denormalize_site_sxls(settings['default'])) if settings['default']
+          return settings unless settings['sites']
+
+          settings.merge(
+            'sites' => settings['sites'].transform_values { |site_settings| denormalize_site_sxls(site_settings) }
+          )
+        end
+
+        def denormalize_site_sxls(settings)
+          sxls = settings['sxls']
+          return settings unless sxls.is_a?(Array)
+
+          settings.merge(
+            'sxls' => sxls.to_h { |sxl| [sxl['name'], sxl['version']] }
+          )
+        end
+
+        def check_site_sxls
           sites = @supervisor_settings['sites'].clone || {}
           sites['default'] = @supervisor_settings['default']
           sites.each do |site_id, settings|
             raise RSMP::ConfigurationError, "Configuration for site '#{site_id}' is empty" unless settings
 
-            sxl = settings['sxl']
-            raise RSMP::ConfigurationError, "Configuration error for site '#{site_id}': No SXL specified" unless sxl
+            sxls = settings['sxls']
+            raise RSMP::ConfigurationError, "Configuration error for site '#{site_id}': No SXLs specified" unless sxls
+
+            sxls.each do |sxl|
+              name = sxl['name']
+              if name.to_s == 'core'
+                raise RSMP::ConfigurationError,
+                      "Configuration error for site '#{site_id}': SXL name cannot be core"
+              end
 
-            RSMP::Schema.find_schemas! sxl if sxl
+              RSMP::Schema.find_schema! name, sxl['version'], lenient: true
+            end
           rescue RSMP::Schema::UnknownSchemaError => e
             raise RSMP::ConfigurationError, "Configuration error for site '#{site_id}': #{e}"
           end

data/lib/rsmp/node/supervisor/modules/connection.rb

@@ -128,8 +128,6 @@ module RSMP
           stop if @supervisor_settings['one_shot']
         end
 
-        # Proxy type is now derived from `site_settings['sxl']` in Supervisor#build_proxy.
-
         def reject_connection(_socket, info)
           log 'Site rejected', ip: info[:ip], level: :info
         end

data/lib/rsmp/node/supervisor/supervisor.rb

@@ -59,13 +59,6 @@ module RSMP
     end
 
     def build_proxy(settings)
-      # Determine proxy type from site settings (SXL). Fall back to supervisor
-      # default settings when site-specific settings are not present.
-      site_settings = settings[:site_settings] || @supervisor_settings['default']
-      sxl_type = site_settings && site_settings['sxl']
-
-      return RSMP::TLC::TrafficControllerProxy.new(settings) if sxl_type == 'tlc'
-
       SiteProxy.new settings
     end
 

data/lib/rsmp/options/options.rb

@@ -25,9 +25,9 @@ module RSMP
       options = extra if options.nil? && extra.any?
       @source = source
       @log_settings = normalize(log_settings || {})
-      normalized = normalize(options || {})
-      @data = apply_defaults(normalized)
-      validate! if validate
+      config = normalize_config(options || {})
+      validate!(config) if validate
+      @data = normalize(apply_defaults(config))
     end
 
     def defaults
@@ -44,11 +44,11 @@ module RSMP
       File.join(SCHEMAS_PATH, schema_file)
     end
 
-    def validate!
+    def validate!(data = @data)
       return unless schema_path && File.exist?(schema_path)
 
       schemer = JSONSchemer.schema(Pathname.new(schema_path))
-      errors = schemer.validate(@data).to_a
+      errors = schemer.validate(data).to_a
       return if errors.empty?
 
       message = errors.map { |error| format_error(error) }.join("\n")
@@ -82,7 +82,8 @@ module RSMP
       case value
       when Hash
         value.each_with_object({}) do |(key, val), memo|
-          memo[key.to_s] = normalize(val)
+          normalized_key = key.to_s
+          memo[normalized_key] = normalized_key == 'sxls' ? normalize_sxls(val) : normalize(val)
         end
       when Array
         value.map { |item| normalize(item) }
@@ -91,6 +92,54 @@ module RSMP
       end
     end
 
+    def normalize_sxls(value)
+      case value
+      when Hash
+        value.map do |name, details|
+          normalize_sxl_item(name.to_s, details)
+        end
+      when Array
+        value.map { |item| normalize(item) }
+      else
+        value
+      end
+    end
+
+    def normalize_config(value)
+      case value
+      when Hash
+        value.each_with_object({}) do |(key, val), memo|
+          normalized_key = key.to_s
+          memo[normalized_key] = normalized_key == 'sxls' ? normalize_config_sxls(val) : normalize_config(val)
+        end
+      when Array
+        value.map { |item| normalize_config(item) }
+      else
+        value
+      end
+    end
+
+    def normalize_config_sxls(value)
+      raise RSMP::ConfigurationError, 'sxls must be a hash of SXL names to versions' unless value.is_a?(Hash)
+
+      value.each_with_object({}) do |(name, details), memo|
+        raise RSMP::ConfigurationError, "sxls/#{name} must be a version string" if details.is_a?(Hash)
+
+        memo[name.to_s] = details.to_s
+      end
+    end
+
+    def normalize_sxl_item(name, details)
+      case details
+      when Hash
+        raise RSMP::ConfigurationError, "sxls/#{name} must be a version string"
+      when nil
+        { 'name' => name }
+      else
+        { 'name' => name, 'version' => details.to_s }
+      end
+    end
+
     def format_error(error)
       pointer = error_pointer(error)
       details = error_details(error)

data/lib/rsmp/options/schemas/site.json

@@ -17,8 +17,11 @@
         "additionalProperties": true
       }
     },
-    "sxl": { "type": "string" },
-    "sxl_version": { "type": "string" },
+    "sxls": {
+      "type": "object",
+      "propertyNames": { "not": { "const": "core" } },
+      "additionalProperties": { "type": "string" }
+    },
     "core_version": { "type": "string" },
     "intervals": {
       "type": "object",
@@ -46,4 +49,4 @@
     "live_output": { "type": ["string", "null"] }
   },
   "additionalProperties": true
-}
+}

data/lib/rsmp/options/schemas/supervisor.json

@@ -15,8 +15,11 @@
     "default": {
       "type": "object",
       "properties": {
-        "sxl": { "type": "string" },
-        "sxl_version": { "type": "string" },
+        "sxls": {
+          "type": "object",
+          "propertyNames": { "not": { "const": "core" } },
+          "additionalProperties": { "type": "string" }
+        },
         "core_version": { "type": "string" },
         "intervals": {
           "type": "object",

data/lib/rsmp/options/schemas/supervisor_site.json

@@ -3,8 +3,11 @@
   "$id": "supervisor_site.json",
   "type": "object",
   "properties": {
-    "sxl": { "type": "string" },
-    "sxl_version": { "type": "string" },
+    "sxls": {
+      "type": "object",
+      "propertyNames": { "not": { "const": "core" } },
+      "additionalProperties": { "type": "string" }
+    },
     "type": { "type": "string" },
     "components": { "type": "object" },
     "supervisors": {

data/lib/rsmp/options/site_options.rb

@@ -8,8 +8,9 @@ module RSMP
           'supervisors' => [
             { 'ip' => '127.0.0.1', 'port' => 12_111 }
           ],
-          'sxl' => 'tlc',
-          'sxl_version' => RSMP::Schema.latest_version(:tlc),
+          'sxls' => {
+            'tlc' => RSMP::Schema.latest_version(:tlc)
+          },
           'intervals' => {
             'timer' => 0.1,
             'watchdog' => 1,

data/lib/rsmp/options/supervisor_options.rb

@@ -7,7 +7,9 @@ module RSMP
           'port' => 12_111,
           'ips' => 'all',
           'default' => {
-            'sxl' => 'tlc',
+            'sxls' => {
+              'tlc' => RSMP::Schema.latest_version(:tlc)
+            },
             'intervals' => {
               'timer' => 1,
               'watchdog' => 1

data/lib/rsmp/proxy/modules/acknowledgements.rb

@@ -86,6 +86,8 @@ module RSMP
             case original.type
             when 'Version'
               version_acknowledged
+            when 'ComponentList'
+              component_list_acknowledged
             when 'StatusSubscribe'
               status_subscribe_acknowledged original
             end

data/lib/rsmp/proxy/modules/receive.rb

@@ -5,6 +5,8 @@ module RSMP
       # Handles receiving and processing incoming messages
       module Receive
         def should_validate_ingoing_message?(message)
+          return false if message.is_a?(Version) && !@version_determined
+
           return true unless @site_settings
 
           skip = @site_settings['skip_validation']
@@ -37,7 +39,8 @@ module RSMP
         end
 
         def handle_schema_error(message, error)
-          schemas_string = error.schemas.map { |schema| "#{schema.first}: #{schema.last}" }.join(', ')
+          failed_schemas = error.respond_to?(:schemas) && error.schemas ? error.schemas : schemas
+          schemas_string = failed_schemas.map { |schema| "#{schema.first}: #{schema.last}" }.join(', ')
           reason = "schema errors (#{schemas_string}): #{error.message}"
           str = "Received invalid #{message.type}"
           distribute_error error.exception(str), message: message
@@ -79,7 +82,7 @@ module RSMP
           handle_malformed_message(attributes, e)
         rescue SchemaError, RSMP::Schema::Error => e
           handle_schema_error(message, e)
-        rescue InvalidMessage => e
+        rescue InvalidMessage, MessageRejected => e
           handle_invalid_message(message, e)
         rescue FatalError => e
           handle_fatal_error(message, e)

data/lib/rsmp/proxy/modules/state.rb

@@ -17,6 +17,7 @@ module RSMP
         end
 
         def handshake_complete
+          build_sxl_interfaces
           self.state = :ready
         end
       end