rsmp 0.43.2 → 0.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ac8dcc5eb14943b0e14c10eb9e6f4c5a42fde921d9db9d05b0a390b4019ecf6
-  data.tar.gz: 9ef754b98f86317516078a6ce1f263ae82f5f7a697e68ef5fbf50c0976016f47
+  metadata.gz: a71c7f02cc5b94aa0b4d4f4b7ad87fbd0406c3b8cd1ceacfc7fa12aad6ccaba5
+  data.tar.gz: 7de215575f1e79a7494c629ae9211f86b31077586f348c12041590d70f859605
 SHA512:
-  metadata.gz: bd8ca1c5aabffa57015ff7519af57349e40044681dae5765d8e5144e49fef4305ecb688bbb9e271ee14c85b80364ba8111263cab41cf73c82fe4ef4540ad4d49
-  data.tar.gz: 3b44d60f188df7a54087c8baf3ae56592d3187d348aef3a2f01ecd156802078b59727071a6055da77680700373c0dff7364e0f2c0a0aab958c437f747a508f2e
+  metadata.gz: 5580aa1b51574cc1f81feb53040b44c8b540287e15f09a966c5dbb90ce16d54a67be73043a6882ae93075636163f0d7f72e181716fd95d691ade8d8e899b722e
+  data.tar.gz: e7aa473295a9ed35350f5ae4b04e114959f68322d1e19a6ef88ec8743b46af5b448b2e4a9dd2f9b95f531b719c5952af0e1bd73af88ebb63c896492777817eb5

data/.github/workflows/rubocop.yaml

@@ -1,4 +1,4 @@
-# This workflow runs RSpec tests
+# This workflow runs Rubocop
 
 name: Rubocop
 on: [push]

data/.github/workflows/sus.yaml

@@ -1,4 +1,4 @@
-# This workflow runs RSpec tests
+# This workflow runs Sus tests
 
 name: sus
 on: [push]

data/.gitignore

@@ -1,5 +1,4 @@
 /.DS_Store
-/.rspec_status
 /ignore/
 /log/
 /.bundle/

data/CHANGELOG.md

@@ -658,4 +658,15 @@ Initial release.
 - rsmp_schema folded into this gem
 - all schema files vendored into this repo, with rake task to update them
 - moved `rake regenerate` to `rsmp schema generate` CLI
- 
+
+## 0.43.1
+- update gems
+
+## 0.43.2
+- maintenance release
+
+## 0.45.0
+- initial suport for core 3.3.0 and TLC SXL 1.3.0
+- fix issues with config normalization
+- make collector cancellation raise pending errors
+- replace Cucumber/Aruba CLI tests with sus tests that call the Thor CLI directly

data/Gemfile

@@ -5,9 +5,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  gem 'aruba', '~> 2.3'
   gem 'bundler', '~> 4.0'
-  gem 'cucumber', '~> 9.2'
   gem 'rake', '~> 13.2'
   gem 'rubocop'
   gem 'rubocop-rake', require: false

data/Gemfile.lock

@@ -1,26 +1,19 @@
 PATH
   remote: .
   specs:
-    rsmp (0.43.2)
-      async (~> 2.32)
+    rsmp (0.45.1)
+      async (~> 2.39)
       colorize (~> 1.1)
-      io-endpoint (~> 0.15)
-      io-stream (~> 0.10)
+      io-endpoint (~> 0.17)
+      io-stream (~> 0.13)
       json_schemer (~> 2.5)
-      logger (~> 1.6)
+      logger (~> 1.7)
       ostruct (~> 0.6)
       thor (~> 1.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aruba (2.4.1)
-      bundler (>= 1.17)
-      contracts (>= 0.16.0, < 0.18.0)
-      cucumber (>= 8.0, < 12.0)
-      irb (~> 1.16)
-      rspec-expectations (>= 3.4, < 5.0)
-      thor (~> 1.0)
     ast (2.4.3)
     async (2.39.0)
       console (~> 1.29)
@@ -29,60 +22,20 @@ GEM
       metrics (~> 0.12)
       traces (~> 0.18)
     bigdecimal (4.1.2)
-    builder (3.3.0)
     colorize (1.1.0)
-    console (1.35.1)
+    console (1.36.0)
       fiber-annotation
       fiber-local (~> 1.1)
       json
-    contracts (0.17.3)
-    cucumber (9.2.1)
-      builder (~> 3.2)
-      cucumber-ci-environment (> 9, < 11)
-      cucumber-core (> 13, < 14)
-      cucumber-cucumber-expressions (~> 17.0)
-      cucumber-gherkin (> 24, < 28)
-      cucumber-html-formatter (> 20.3, < 22)
-      cucumber-messages (> 19, < 25)
-      diff-lcs (~> 1.5)
-      mini_mime (~> 1.1)
-      multi_test (~> 1.1)
-      sys-uname (~> 1.2)
-    cucumber-ci-environment (10.0.1)
-    cucumber-core (13.0.3)
-      cucumber-gherkin (>= 27, < 28)
-      cucumber-messages (>= 20, < 23)
-      cucumber-tag-expressions (> 5, < 7)
-    cucumber-cucumber-expressions (17.1.0)
-      bigdecimal
-    cucumber-gherkin (27.0.0)
-      cucumber-messages (>= 19.1.4, < 23)
-    cucumber-html-formatter (21.15.1)
-      cucumber-messages (> 19, < 28)
-    cucumber-messages (22.0.0)
-    cucumber-tag-expressions (6.1.2)
-    date (3.5.1)
-    diff-lcs (1.6.2)
-    erb (6.0.4)
-    ffi (1.17.4-arm64-darwin)
-    ffi (1.17.4-x64-mingw-ucrt)
-    ffi (1.17.4-x86_64-darwin)
-    ffi (1.17.4-x86_64-linux-gnu)
     fiber-annotation (0.2.0)
     fiber-local (1.1.0)
       fiber-storage
     fiber-storage (1.0.1)
     hana (1.3.7)
-    io-console (0.8.2)
     io-endpoint (0.17.2)
     io-event (1.16.1)
     io-stream (0.13.0)
-    irb (1.18.0)
-      pp (>= 0.6.0)
-      prism (>= 1.3.0)
-      rdoc (>= 4.0.0)
-      reline (>= 0.4.2)
-    json (2.19.7)
+    json (2.19.8)
     json_schemer (2.5.0)
       bigdecimal
       hana (~> 1.3)
@@ -91,37 +44,18 @@ GEM
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
-    memoist3 (1.0.0)
     metrics (0.15.0)
-    mini_mime (1.1.5)
-    multi_test (1.1.0)
     ostruct (0.6.3)
     parallel (2.1.0)
     parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
-    pp (0.6.3)
-      prettyprint
-    prettyprint (0.2.0)
     prism (1.9.0)
-    psych (5.3.1)
-      date
-      stringio
     racc (1.8.1)
     rainbow (3.1.1)
     rake (13.4.2)
-    rdoc (7.2.0)
-      erb
-      psych (>= 4.0.0)
-      tsort
     regexp_parser (2.12.0)
-    reline (0.6.3)
-      io-console (~> 0.5)
-    rspec-expectations (3.13.5)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.7)
-    rubocop (1.86.2)
+    rubocop (1.87.0)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -140,26 +74,16 @@ GEM
       rubocop (>= 1.72.1)
     ruby-progressbar (1.13.0)
     simpleidn (0.2.3)
-    stringio (3.2.0)
-    sus (0.36.0)
+    sus (0.37.0)
     sus-fixtures-async (0.2.0)
       async
       sus (~> 0.10)
-    sys-uname (1.5.1)
-      ffi (~> 1.1)
-      memoist3 (~> 1.0.0)
-    sys-uname (1.5.1-universal-mingw32)
-      ffi (~> 1.1)
-      memoist3 (~> 1.0.0)
-      win32ole
     thor (1.5.0)
     timecop (0.9.11)
     traces (0.18.2)
-    tsort (0.2.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
-    win32ole (1.9.3)
 
 PLATFORMS
   arm64-darwin-23
@@ -169,9 +93,7 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  aruba (~> 2.3)
   bundler (~> 4.0)
-  cucumber (~> 9.2)
   rake (~> 13.2)
   rsmp!
   rubocop
@@ -181,4 +103,4 @@ DEPENDENCIES
   timecop (~> 0.9)
 
 BUNDLED WITH
-  4.0.3
+  4.0.13

data/README.md

@@ -1,10 +1,11 @@
 # rsmp
 This is a Ruby implementation of the RSMP protocol, including:
  - RSMP classes that can be used to build tests or other RSMP tools
- - Command-line tools for quickly running RSMP supervisors or sites and view messages exchanged
+ - Command-line tools for quickly running RSMP supervisors or sites and viewing exchanged messages
+ - Vendored RSMP Core and SXL JSON Schemas, including Core 3.3.0 and TLC SXL 1.3.0
 
 ## Installation
-You need a recent version of Ruby intalled. 2.6.3 or later is recommended.
+You need Ruby 3.4 or later.
 
 Install required gems:
 
@@ -62,19 +63,19 @@ Async do |task|
   site = RSMP::Site.new(site_settings:settings)
   site.start 					# run concurrently since we're inside an Async block
   loop do
-    task.sleep 1			# use task.sleep() instead of sleep() to avoid blocking
+    sleep 1				# sleep yields to other fibers inside Async
     puts "Latest archive item: #{site.archive.items.last}"
   end
 end
 ```
 
-Use task.show_hierarchy to see what task are created, task.stop() to stop all sites and supervisors running inside it:
+Use task.show_hierarchy to see what task are created and task.stop() to stop all sites and supervisors running inside it:
 
 ```ruby
 require 'rsmp'
 Async do |task|
   RSMP::Site.new.start
-  task.sleep 1
+  sleep 1
   task.print_hierarchy
   task.stop     # stop everything inside this Async block
 end
@@ -103,7 +104,7 @@ archive = RSMP::Archive.new
 Async do |task|
   RSMP::Supervisor.new(archive:archive,logger:logger).start
   RSMP::Site.new(archive:archive,logger:logger).start
-  task.sleep 0.1
+  sleep 0.1
   task.stop
 end
 
@@ -124,7 +125,24 @@ RN+SU0001     RN+SI0001     -->  f8c7  Received Version message for sites [RN+SI
 ```
 
 ### JSON Schema validation
-All messages sent and received will be validated against the core [RSMP JSON Schema](https://github.com/rsmp-nordic/rsmp_schema).
+All messages sent and received are validated against the vendored RSMP JSON Schemas maintained in
+the RSMP Core and SXL source repositories.
+
+Core and SXL schemas are selected with a flat map:
+
+```ruby
+RSMP::Schema.validate(message, {
+  core: '3.3.0',
+  tlc: '1.3.0'
+})
+```
+
+Sites and supervisors configure one or more SXLs with `sxls`:
+
+```yaml
+sxls:
+  tlc: '1.3.0'
+```
 
 ## Command-line tool
 Tools for easily running RSMP supervisors and sites. The binary is called ```rsmp```.
@@ -166,36 +184,13 @@ Use ```--help <command>``` to get a list of available options.
 Use ```--config <path>``` or ```--options <path>``` to point to a .yaml config file, controlling things like IP adresses, ports, and log output. Examples of config files can be found the folder ```config/```.
 
 ## Tests
-### RSpec
-RSpec tests are located in spec/. The tests will start supervisor and sites to test communication, but will do so on port 13111, rather than the usual port 12111, to avoid inferference with other RMSP processes running locally.
+### Sus
+Sus tests are located in test/. Some tests start supervisors and sites to test communication, but will do so on port 13111, rather than the usual port 12111, to avoid interference with other RSMP processes running locally. CLI tests call the Thor CLI class directly, without spawning a separate `rsmp` process.
 
-Note that these tests are NOT intented for testing external equipment or systems. The tests are for validating the code in this repository. To test external equipment or systems use the rsmp_validator tool.
+Note that these tests are NOT intended for testing external equipment or systems. The tests are for validating the code in this repository. To test external equipment or systems use the rsmp_validator tool.
 
 ```console
-$ rspec
-.........................
-
-Finished in 0.12746 seconds (files took 0.6571 seconds to load)
-25 examples, 0 failures
+$ bundle exec sus
+301 passed out of 301 total (830 assertions)
 
 ```
-
-# Cucumber
-Cucumber is used to test the CLI binaries.
-
-```console
-$ cucumber
-Feature: Help
-
-  Scenario: Displaying help              # features/help.feature:3
-    When I run `rsmp help`               # aruba-0.14.11/lib/aruba/cucumber/command.rb:6
-    Then it should pass with "Commands:" # aruba-0.14.11/lib/aruba/cucumber/command.rb:271
-
-Feature: Run site
-...
-
-7 scenarios (7 passed)
-28 steps (28 passed)
-0m7.036s
-```
-

data/Rakefile

@@ -4,8 +4,8 @@ task :test do
   sh 'bundle exec sus'
 end
 
-CORE_VERSIONS = %w[3.1.2 3.1.3 3.1.4 3.1.5 3.2.0 3.2.1 3.2.2].freeze
-TLC_VERSIONS  = %w[1.0.7 1.0.8 1.0.9 1.0.10 1.0.13 1.0.14 1.0.15 1.1.0 1.2.0 1.2.1].freeze
+CORE_VERSIONS = %w[3.1.2 3.1.3 3.1.4 3.1.5 3.2.0 3.2.1 3.2.2 3.3.0].freeze
+TLC_VERSIONS  = %w[1.0.7 1.0.8 1.0.9 1.0.10 1.0.13 1.0.14 1.0.15 1.1.0 1.2.0 1.2.1 1.3.0].freeze
 
 # Update vendored schemas from source repos.
 # Usage: rake schemas:update[/path/to/rsmp_core,/path/to/rsmp_sxl_traffic_lights]

data/config/supervisor.yaml

@@ -1,6 +1,7 @@
 port: 12111
 default:
-  sxl: tlc
+  sxls:
+    tlc: '1.2.1'
   intervals:
     timer: 0.1
     watchdog: 0.1

data/config/tlc.yaml

@@ -2,8 +2,8 @@ site_id: RN+SI0001
 supervisors:
   - ip: 127.0.0.1
     port: 12111
-sxl: tlc
-sxl_version: '1.2.1'
+sxls:
+  tlc: '1.2.1'
 components:
   main:
     TC:

data/documentation/configuration.md

@@ -41,8 +41,8 @@ site_id: RN+SI0001
 supervisors:
   - ip: 127.0.0.1
     port: 12111
-sxl: tlc
-sxl_version: "1.2.1"
+sxls:
+  tlc: "1.3.0"
 components:
   main:
     TC:
@@ -55,7 +55,8 @@ log:
 ```yaml
 port: 12111
 default:
-  sxl: tlc
+  sxls:
+    tlc: "1.3.0"
   intervals:
     timer: 0.1
     watchdog: 0.1
@@ -63,8 +64,8 @@ log:
   json: true
 sites:
   TLC001:
-    sxl: tlc
-    sxl_version: "1.2.1"
+    sxls:
+      tlc: "1.3.0"
     intervals:
       timer: 0.1
       watchdog: 0.1
@@ -76,7 +77,7 @@ sites:
         TC:
 ```
 
-Per-site configuration follows the supervisor-side site schema (`lib/rsmp/options/schemas/supervisor_site.json`). Each site entry must include an `sxl` value; if `sxl` is missing the supervisor will raise a `RSMP::ConfigurationError` on startup.
+Per-site configuration follows the supervisor-side site schema (`lib/rsmp/options/schemas/supervisor_site.json`). Each site entry can define an `sxls` map, or inherit it from `default`. The SXL name `core` is reserved for the RSMP core schema and cannot be used as an SXL key.
 
 ## Supervisor settings
 
@@ -90,8 +91,8 @@ Top-level supervisor settings
 - `site_id`: string — optional site identifier for the supervisor itself.
 - `max_sites`: integer — limit concurrent connected sites.
 - `default`: object — default settings applied to sites that don't have a specific `sites` entry. Contains keys:
-  - `sxl`: string — default SXL type for default sites (e.g. `tlc`).
-  - `sxl_version`, `core_version`: strings for version hints.
+  - `sxls`: object — default SXL versions for default sites, for example `{ "tlc": "1.3.0" }`.
+  - `core_version`: string for the accepted RSMP Core version.
   - `intervals`: object with `timer`, `watchdog` (numbers, seconds).
   - `timeouts`: object with `watchdog`, `acknowledgement` (numbers, seconds).
 - `log`: object — log settings (see `log_settings` elsewhere in docs).
@@ -101,13 +102,13 @@ Top-level supervisor settings
 
 Each key under `sites` is a site id (for example `TLC001`) and the value is the supervisor-side configuration for that site. These settings tell the supervisor how to handle incoming connections from that specific site (which SXL/schema to use, per-site timeouts, component layout, etc.). Per-site configuration follows the supervisor-side schema at `lib/rsmp/options/schemas/supervisor_site.json`.
 
-If a connecting site's id is not present under `sites`, the supervisor will fall back to the `default` settings. The runtime configuration check will raise `RSMP::ConfigurationError` if a site entry is present but missing the required `sxl` key.
+If a connecting site's id is not present under `sites`, the supervisor will fall back to the `default` settings. The runtime configuration check will raise `RSMP::ConfigurationError` if neither the site entry nor the default settings provide usable SXL information.
 
 
 Common per-site keys
 
-- `sxl` (string, required): the SXL type to use for this site (for example `tlc`). The supervisor will attempt to load the corresponding schemas for this SXL.
-- `sxl_version` (string): preferred SXL version (informational; runtime version comes from the site's Version message).
+- `sxls` (object): SXL versions to use for this site, keyed by SXL name, for example `tlc: "1.3.0"`. The supervisor will attempt to load the corresponding schemas for these SXLs.
+- `core_version` (string): accepted RSMP Core version for this site.
 - `type` (string): optional human-readable type identifier.
 - `site_id` (string): explicit site identifier (if different from the mapping key).
 - `supervisors` (array): list of supervisor endpoints (objects with `ip` and `port`). Useful for reverse mappings or local-site configs.

data/documentation/message_distribution.md

@@ -4,7 +4,7 @@ Proxy - - Distributor --> Receivers
 
 A proxy distributes messages to receivers, when they are installed.
 
-Collectors are special receiverws that waits for specific message, and are used to implement methods for waiting for RMSP responses, statuses, alarms, etc.
+Collectors are special receivers that wait for specific messages, and are used to implement methods for waiting for RSMP responses, statuses, alarms, etc.
 
 Note that Archive is not a receiver, and does not receive messages via the Distributor. Instead the Archive gets and stores messages via the log() interface in the Logging module. The reason is that the items that the Archive and the Logger contain other data as well as the message, like error messages, warnings, text descriptions, colors codes, etc. The Distributor and Receiver handles only Message objects.
 
@@ -20,4 +20,3 @@ the client receives the collection.
 
 ## Proxy
 A proxy includes the Distributor module and distributes each message to receivers after processing it.
-

data/documentation/tasks.md

@@ -145,5 +145,4 @@ If you mark an Async task with `transient: true` when you created it, that task
 
 Transient tasks can be used to cleanup, but using an `ensure` block in the transient task. When you call `stop` on a task, an Async::Stop exception is raised, which will run the code in the `ensure` block.
 
-Some of the RSpec tests runs tests in in transient task. As soon as the main test code is complete, any subtasks like Sites or Supervisors that might otherwise prevent the test from completing, will be stopped automatically.
-
+Some sus tests run in transient tasks. As soon as the main test code is complete, any subtasks like Sites or Supervisors that might otherwise prevent the test from completing will be stopped automatically.

data/exe/rsmp

@@ -1,4 +1,3 @@
 #!/usr/bin/env ruby
-require 'bundler/setup'
-require 'rsmp/cli'
+require_relative '../lib/rsmp/cli'
 RSMP::CLI.start

data/lib/rsmp/cli.rb

@@ -44,6 +44,9 @@ module RSMP
       run_site(site_class, settings, log_settings)
     rescue Interrupt
       # ctrl-c
+    rescue RSMP::ConfigurationError => e
+      puts "Error: #{e}"
+      exit 1
     rescue StandardError => e
       puts "Uncaught error: #{e}"
       puts caller.join("\n")
@@ -75,7 +78,7 @@ module RSMP
         return [settings, log_settings] unless options[:config]
 
         begin
-          options_object = RSMP::Site::Options.load_file(options[:config])
+          options_object = site_options_class.load_file(options[:config])
           settings = options_object.to_h
           log_settings = log_settings.deep_merge(options_object.log_settings)
         rescue RSMP::ConfigurationError => e
@@ -89,6 +92,15 @@ module RSMP
 
     private
 
+    def site_options_class
+      case site_type
+      when 'tlc'
+        RSMP::TLC::TrafficControllerSite::Options
+      else
+        RSMP::Site::Options
+      end
+    end
+
     def apply_site_options(settings, log_settings)
       apply_basic_site_options(settings)
       parse_supervisors(settings) if options[:supervisors]
@@ -98,30 +110,72 @@ module RSMP
     def apply_basic_site_options(settings)
       settings['site_id'] = options[:id] if options[:id]
       settings['core_version'] = options[:core] || ENV['CORE_VERSION'] if options[:core] || ENV['CORE_VERSION']
-      settings['sxl_version'] = ENV['SXL_VERSION'] if ENV['SXL_VERSION']
+      settings['sxls'] = parse_sxls(ENV['SXLS']) if ENV['SXLS']
+    end
+
+    def parse_sxls(value)
+      value.split(',').each_with_object({}) do |item, memo|
+        parts = item.split(':')
+        unless parts.length == 2
+          raise RSMP::ConfigurationError, "Invalid SXLS item #{item.inspect}, expected name:version"
+        end
+
+        name, version = parts
+        memo[name] = version
+      end
     end
 
     def parse_supervisors(settings)
+      default_port = default_supervisor_port(settings)
       settings['supervisors'] = []
       options[:supervisors].split(',').each do |supervisor|
-        ip, port = supervisor.split ':'
-        ip = '127.0.0.1' if ip.empty?
-        port = '12111' if port.empty?
+        ip, port = parse_supervisor(supervisor, default_port)
         settings['supervisors'] << { 'ip' => ip, 'port' => port }
       end
     end
 
+    def parse_supervisor(supervisor, default_port)
+      parts = supervisor.split(':', -1)
+
+      case parts.size
+      when 1
+        ip = parts.first
+        port = default_port
+      when 2
+        ip, port = parts
+      else
+        raise RSMP::ConfigurationError,
+              "Invalid supervisor #{supervisor.inspect}, expected ip[:port]"
+      end
+
+      if port.nil? || port.to_s.empty?
+        raise RSMP::ConfigurationError,
+              "Invalid supervisor #{supervisor.inspect}, expected ip[:port] with a non-empty port"
+      end
+
+      ip = '127.0.0.1' if ip.empty?
+      [ip, port]
+    end
+
+    def default_supervisor_port(settings)
+      settings.dig('supervisors', 0, 'port') ||
+        site_options_class.new.to_h.dig('supervisors', 0, 'port')
+    end
+
     def determine_site_class(settings)
-      site_type = options[:type] || settings['type']
-      case site_type
+      case site_type(settings)
       when 'tlc'
         RSMP::TLC::TrafficControllerSite
       else
-        puts "Error: Unknown site type #{site_type}"
+        puts "Error: Unknown site type #{site_type(settings)}"
         exit
       end
     end
 
+    def site_type(settings = nil)
+      options[:type] || settings&.fetch('type', nil)
+    end
+
     def run_site(site_class, settings, log_settings)
       Async do |task|
         task.annotate 'cli'

data/lib/rsmp/component/component.rb

@@ -1,10 +1,6 @@
 module RSMP
   # RSMP component
   class Component < ComponentBase
-    def initialize(node:, id:, ntsoid: nil, xnid: nil, grouped: false)
-      super
-    end
-
     def handle_command(command_code, _arg)
       raise UnknownCommand, "Command #{command_code} not implemented by #{self.class}"
     end

data/lib/rsmp/component/component_base.rb

@@ -1,7 +1,7 @@
 module RSMP
   # RSMP component base class.
   class ComponentBase
-    attr_reader :c_id, :ntsoid, :xnid, :node, :alarms, :statuses,
+    attr_reader :c_id, :component_type, :name, :ntsoid, :xnid, :node, :alarms, :statuses,
                 :aggregated_status, :aggregated_status_bools, :grouped
 
     AGGREGATED_STATUS_KEYS = %i[local_control
@@ -13,13 +13,21 @@ module RSMP
                                 rest
                                 not_connected].freeze
 
-    def initialize(node:, id:, ntsoid: nil, xnid: nil, grouped: false)
+    def initialize(node:, id:, **attributes)
+      type = attributes[:type]
+      name = attributes[:name]
+      ntsoid = attributes[:ntsoid]
+      xnid = attributes[:xnid]
+      grouped = attributes.fetch(:grouped, false)
+
       if grouped == false && (ntsoid || xnid)
         raise RSMP::ConfigurationError,
               'ntsoid and xnid are only allowed for grouped objects'
       end
 
       @c_id = id
+      @component_type = type
+      @name = name || id
       @ntsoid = ntsoid
       @xnid = xnid
       @node = node
@@ -32,6 +40,11 @@ module RSMP
       "#<#{self.class.name}:#{object_id}:#{object_id} c_id:#{@c_id}>"
     end
 
+    def update_metadata(type: nil, name: nil)
+      @component_type = type if type
+      @name = name if name
+    end
+
     def now
       node.now
     end

data/lib/rsmp/component/component_proxy.rb

@@ -1,7 +1,7 @@
 module RSMP
   # A proxy to a remote RSMP component.
   class ComponentProxy < ComponentBase
-    def initialize(node:, id:, ntsoid: nil, xnid: nil, grouped: false)
+    def initialize(node:, id:, **attributes)
       super
       @alarms = {}
       @statuses = {}