rsmp 0.48.4 → 0.51.1

data/lib/rsmp/tlc/proxy/io.rb

@@ -6,7 +6,9 @@ module RSMP
       module IO
         # M0006 - Set a single input to a given status.
         def set_input(input:, status:, within:)
-          validate_ready 'set input'
+          readiness = validate_ready 'set input'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           security_code = security_code_for(2)
@@ -27,12 +29,18 @@ module RSMP
             'n' => 'input',
             'v' => command_value('M0006', 'input', input)
           }]
-          send_command_and_collect(command_list, within: within).ok!
+          send_command_and_collect(command_list, within: within)
+        end
+
+        def set_input!(...)
+          set_input(...).value!
         end
 
         # M0013 - Set all inputs via a bit-pattern string.
         def set_inputs(status, within:)
-          validate_ready 'set inputs'
+          readiness = validate_ready 'set inputs'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           security_code = security_code_for(2)
@@ -48,53 +56,60 @@ module RSMP
             'n' => 'securityCode',
             'v' => security_code.to_s
           }]
-          send_command_and_collect(command_list, within: within).ok!
+          send_command_and_collect(command_list, within: within)
+        end
+
+        def set_inputs!(...)
+          set_inputs(...).value!
         end
 
         # M0019 - Force an input to a given value.
         def force_input(input:, status:, value:, within:)
-          validate_ready 'force input'
+          readiness = validate_ready 'force input'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           command_list = force_input_command_list(input, status, value)
           confirm_status = force_input_confirm_status(input, status, value)
-          send_command_and_collect(command_list, within: within).ok!
-          wait_for_status "force input #{input}", confirm_status, timeout: within
+          send_command_and_collect(command_list, within: within).and_then do |exchange|
+            wait_for_status("force input #{input}", confirm_status, timeout: within).map { exchange }
+          end
+        end
+
+        def force_input!(...)
+          force_input(...).value!
         end
 
         # M0020 - Force an output to a given value.
         def force_output(output:, status:, value:, within:)
-          validate_ready 'force output'
+          readiness = validate_ready 'force output'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
-          security_code = security_code_for(2)
+          send_command_and_collect(force_output_command_list(output, status, value), within: within)
+        end
 
-          command_list = [{
-            'cCI' => 'M0020',
-            'cO' => 'setOutput',
-            'n' => 'status',
-            'v' => command_value('M0020', 'status', status)
-          }, {
-            'cCI' => 'M0020',
-            'cO' => 'setOutput',
-            'n' => 'securityCode',
-            'v' => security_code.to_s
-          }, {
-            'cCI' => 'M0020',
-            'cO' => 'setOutput',
-            'n' => 'output',
-            'v' => command_value('M0020', 'output', output)
-          }, {
-            'cCI' => 'M0020',
-            'cO' => 'setOutput',
-            'n' => 'outputValue',
-            'v' => command_value('M0020', 'outputValue', value)
-          }]
-          send_command_and_collect(command_list, within: within).ok!
+        def force_output!(...)
+          force_output(...).value!
         end
 
         private
 
+        def force_output_command_list(output, status, value)
+          security_code = security_code_for(2)
+          values = { 'status' => status, 'output' => output, 'outputValue' => value }
+          values.map do |name, item|
+            { 'cCI' => 'M0020', 'cO' => 'setOutput', 'n' => name, 'v' => command_value('M0020', name, item) }
+          end.insert(1, {
+                       'cCI' => 'M0020',
+                       'cO' => 'setOutput',
+                       'n' => 'securityCode',
+                       'v' => security_code.to_s
+                     })
+        end
+
         def force_input_command_list(input, status, value)
           security_code = security_code_for(2)
           [

data/lib/rsmp/tlc/proxy/plans.rb

@@ -6,7 +6,9 @@ module RSMP
       module Plans
         # M0014 - Set dynamic bands for a signal plan.
         def set_dynamic_bands(plan:, status:, within:)
-          validate_ready 'set dynamic bands'
+          readiness = validate_ready 'set dynamic bands'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           security_code = security_code_for(2)
@@ -27,12 +29,14 @@ module RSMP
             'n' => 'plan',
             'v' => command_value('M0014', 'plan', plan)
           }]
-          send_command_and_collect(command_list, within: within).ok!
+          send_command_and_collect(command_list, within: within)
         end
 
         # M0023 - Set timeout for dynamic bands.
         def set_dynamic_bands_timeout(status, within:)
-          validate_ready 'set dynamic bands timeout'
+          readiness = validate_ready 'set dynamic bands timeout'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           security_code = security_code_for(2)
@@ -48,12 +52,14 @@ module RSMP
             'n' => 'securityCode',
             'v' => security_code.to_s
           }]
-          send_command_and_collect(command_list, within: within).ok!
+          send_command_and_collect(command_list, within: within)
         end
 
         # M0015 - Set offset for a signal plan.
         def set_offset(plan:, offset:, within:)
-          validate_ready 'set offset'
+          readiness = validate_ready 'set offset'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           security_code = security_code_for(2)
@@ -74,12 +80,14 @@ module RSMP
             'n' => 'plan',
             'v' => command_value('M0015', 'plan', plan)
           }]
-          send_command_and_collect(command_list, within: within).ok!
+          send_command_and_collect(command_list, within: within)
         end
 
         # Set the timeplan (signal plan) on the remote TLC.
         def set_timeplan(plan_nr, within:)
-          validate_ready 'set timeplan'
+          readiness = validate_ready 'set timeplan'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           security_code = security_code_for(2)
@@ -101,13 +109,16 @@ module RSMP
             'v' => command_value('M0002', 'timeplan', plan_nr)
           }]
           confirm_status = [{ 'sCI' => 'S0014', 'n' => 'status', 's' => integer_value(plan_nr) }]
-          send_command_and_collect(command_list, within: within).ok!
-          wait_for_status("timeplan #{plan_nr}", confirm_status, timeout: within)
+          send_command_and_collect(command_list, within: within).and_then do |exchange|
+            wait_for_status("timeplan #{plan_nr}", confirm_status, timeout: within).map { exchange }
+          end
         end
 
         # M0016 - Set week table (mapping week days to traffic situations).
         def set_week_table(status, within:)
-          validate_ready 'set week table'
+          readiness = validate_ready 'set week table'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           security_code = security_code_for(2)
@@ -123,12 +134,14 @@ module RSMP
             'n' => 'securityCode',
             'v' => security_code.to_s
           }]
-          send_command_and_collect(command_list, within:).ok!
+          send_command_and_collect(command_list, within:)
         end
 
         # M0017 - Set day table (mapping time periods to signal plans).
         def set_day_table(status, within:)
-          validate_ready 'set day table'
+          readiness = validate_ready 'set day table'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           security_code = security_code_for(2)
@@ -144,12 +157,14 @@ module RSMP
             'n' => 'securityCode',
             'v' => security_code.to_s
           }]
-          send_command_and_collect(command_list, within:).ok!
+          send_command_and_collect(command_list, within:)
         end
 
         # M0018 - Set cycle time for a signal plan.
         def set_cycle_time(plan:, cycle_time:, within:)
-          validate_ready 'set cycle time'
+          readiness = validate_ready 'set cycle time'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           security_code = security_code_for(2)
@@ -170,12 +185,13 @@ module RSMP
             'n' => 'plan',
             'v' => command_value('M0018', 'plan', plan)
           }]
-          send_command_and_collect(command_list, within:).ok!
+          send_command_and_collect(command_list, within:)
         end
 
         # M0010 - Order signal start for a signal group component.
         def order_signal_start(component_id, within:)
-          validate_ready 'order signal start'
+          readiness = validate_ready 'order signal start'
+          return readiness if readiness.failure?
 
           security_code = security_code_for(2)
 
@@ -190,12 +206,13 @@ module RSMP
             'n' => 'securityCode',
             'v' => security_code.to_s
           }]
-          send_command_and_collect(command_list, component: component_id, within:).ok!
+          send_command_and_collect(command_list, component: component_id, within:)
         end
 
         # M0011 - Order signal stop for a signal group component.
         def order_signal_stop(component_id, within:)
-          validate_ready 'order signal stop'
+          readiness = validate_ready 'order signal stop'
+          return readiness if readiness.failure?
 
           security_code = security_code_for(2)
 
@@ -210,7 +227,7 @@ module RSMP
             'n' => 'securityCode',
             'v' => security_code.to_s
           }]
-          send_command_and_collect(command_list, component: component_id, within:).ok!
+          send_command_and_collect(command_list, component: component_id, within:)
         end
       end
     end

data/lib/rsmp/tlc/proxy/plans_bang.rb

@@ -0,0 +1,44 @@
+module RSMP
+  module TLC
+    module Proxy
+      # Explicit exception-raising variants of finite plan operations.
+      module PlansBang
+        def set_dynamic_bands!(...)
+          set_dynamic_bands(...).value!
+        end
+
+        def set_dynamic_bands_timeout!(...)
+          set_dynamic_bands_timeout(...).value!
+        end
+
+        def set_offset!(...)
+          set_offset(...).value!
+        end
+
+        def set_timeplan!(...)
+          set_timeplan(...).value!
+        end
+
+        def set_week_table!(...)
+          set_week_table(...).value!
+        end
+
+        def set_day_table!(...)
+          set_day_table(...).value!
+        end
+
+        def set_cycle_time!(...)
+          set_cycle_time(...).value!
+        end
+
+        def order_signal_start!(...)
+          order_signal_start(...).value!
+        end
+
+        def order_signal_stop!(...)
+          order_signal_stop(...).value!
+        end
+      end
+    end
+  end
+end

data/lib/rsmp/tlc/proxy/status.rb

@@ -4,25 +4,28 @@ module RSMP
       # Status reading and waiting methods for a remote TLC.
       # Covers status subscriptions, group waits, and plan/band reading.
       module Status
-        # Fetch the current signal plan from the remote TLC.
+        # Fetch the current signal plan from the remote TLC. Returns Result<Hash>.
         def fetch_signal_plan(options: {})
-          validate_ready 'fetch signal plan'
           timeout = options[:timeout] || @timeouts['status_response']
-          collector = request_status_and_collect({ S0014: %i[status source] }, within: timeout)
-          collector.ok!
-          collector.messages.last.attributes['sS'].to_h do |item|
-            [item['n'], item['s']]
+          request_status_and_collect({ S0014: %i[status source] }, within: timeout).map do |exchange|
+            exchange.collection.messages.last.attributes['sS'].to_h do |item|
+              [item['n'], item['s']]
+            end
           end
         end
 
+        def fetch_signal_plan!(...)
+          fetch_signal_plan(...).value!
+        end
+
         # Subscribe to one or more statuses and wait until they match the expected values.
-        # Raises RSMP::TimeoutError if the values don't match within the timeout.
-        #
         # status_list items: { 'sCI' => ..., 'n' => ..., 's' => <expected value or Regexp> }
         # component_id defaults to the main TLC component.
         # timeout defaults to @timeouts['command'].
         def wait_for_status(description, status_list, update_rate: 0, timeout: nil, component_id: nil)
-          validate_ready 'wait for status'
+          readiness = validate_ready 'wait for status'
+          return readiness if readiness.failure?
+
           component_id ||= main.c_id
           timeout ||= @timeouts['command']
 
@@ -35,13 +38,17 @@ module RSMP
           log "Wait for #{description}", level: :debug
 
           begin
-            subscribe_to_status_and_collect(subscribe_list, component: component_id, within: timeout).ok!
+            subscribe_to_status_and_collect(subscribe_list, component: component_id, within: timeout)
           ensure
             unsubscribe_list = status_list.map { |item| item.slice('sCI', 'n') }
             unsubscribe_to_status unsubscribe_list, component: component_id
           end
         end
 
+        def wait_for_status!(...)
+          wait_for_status(...).value!
+        end
+
         # Wait for all signal groups to match state (as regex string, e.g. 'c' for yellow flash).
         def wait_for_groups(state, timeout:)
           regex = /^#{state}+$/
@@ -52,6 +59,10 @@ module RSMP
           )
         end
 
+        def wait_for_groups!(...)
+          wait_for_groups(...).value!
+        end
+
         # Wait for the TLC to return to normal control mode (functional position NormalControl,
         # yellow flash off, startup mode off).
         def wait_for_normal_control(timeout: nil)
@@ -66,36 +77,49 @@ module RSMP
           )
         end
 
+        def wait_for_normal_control!(...)
+          wait_for_normal_control(...).value!
+        end
+
         # Read cycle times for all plans via S0028.
         # Returns a hash of plan_nr (Integer) => cycle_time (Integer, seconds).
         def read_cycle_times(options: {})
-          validate_ready 'read cycle times'
           timeout = options[:timeout] || @timeouts['status_response']
-          collector = request_status_and_collect({ S0028: [:status] }, within: timeout)
-          collector.ok!
-          status_items(collector.messages.first.attributes['sS'].first['s']).to_h do |item|
-            item.split('-').map(&:to_i)
+          request_status_and_collect({ S0028: [:status] }, within: timeout).map do |exchange|
+            status_items(exchange.collection.messages.first.attributes['sS'].first['s']).to_h do |item|
+              item.split('-').map(&:to_i)
+            end
           end
         end
 
+        def read_cycle_times!(...)
+          read_cycle_times(...).value!
+        end
+
         # Read the current signal plan number via S0014.
         # Returns the plan number as an Integer.
         def read_current_plan(options: {})
-          validate_ready 'read current plan'
           timeout = options[:timeout] || @timeouts['status_response']
-          collector = request_status_and_collect({ S0014: [:status] }, within: timeout)
-          collector.ok!
-          collector.messages.first.attributes['sS'].first['s'].to_i
+          request_status_and_collect({ S0014: [:status] }, within: timeout).map do |exchange|
+            exchange.collection.messages.first.attributes['sS'].first['s'].to_i
+          end
+        end
+
+        def read_current_plan!(...)
+          read_current_plan(...).value!
         end
 
         # Read the value of a single dynamic band for a given plan and band index via S0023.
         # Returns the band value as an Integer, or nil if not found.
         def read_dynamic_band(plan:, band:, options: {})
-          validate_ready 'read dynamic band'
           timeout = options[:timeout] || @timeouts['status_response']
-          collector = request_status_and_collect({ S0023: [:status] }, within: timeout)
-          collector.ok!
-          extract_band_value(collector, plan, band)
+          request_status_and_collect({ S0023: [:status] }, within: timeout).map do |exchange|
+            extract_band_value(exchange.collection, plan, band)
+          end
+        end
+
+        def read_dynamic_band!(...)
+          read_dynamic_band(...).value!
         end
 
         private

data/lib/rsmp/tlc/proxy/system.rb

@@ -7,7 +7,9 @@ module RSMP
         # M0103 - Change security code for a given level.
         # Does not use security_code_for since the codes are passed explicitly.
         def set_security_code(level:, old_code:, new_code:, within:)
-          validate_ready 'set security code'
+          readiness = validate_ready 'set security code'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
           command_list = [{
@@ -26,15 +28,25 @@ module RSMP
             'n' => 'newSecurityCode',
             'v' => new_code.to_s
           }]
-          send_command_and_collect(command_list, within: within).ok!
+          send_command_and_collect(command_list, within: within)
+        end
+
+        def set_security_code!(...)
+          set_security_code(...).value!
         end
 
         # M0104 - Set the clock on the remote TLC. clock must respond to year/month/day/hour/min/sec.
         def set_clock(clock, within:)
-          validate_ready 'set clock'
+          readiness = validate_ready 'set clock'
+          return readiness if readiness.failure?
+
           raise 'TLC main component not found' unless main
 
-          send_command_and_collect(clock_command_list(clock), within: within).ok!
+          send_command_and_collect(clock_command_list(clock), within: within)
+        end
+
+        def set_clock!(...)
+          set_clock(...).value!
         end
 
         private

data/lib/rsmp/tlc/supervisor_interface.rb

@@ -6,6 +6,7 @@ module RSMP
       include Proxy::Control
       include Proxy::IO
       include Proxy::Plans
+      include Proxy::PlansBang
       include Proxy::Status
       include Proxy::Detectors
       include Proxy::System
@@ -32,7 +33,8 @@ module RSMP
       end
 
       def subscribe_to_timeplan
-        validate_ready 'subscribe to timeplan'
+        readiness = validate_ready 'subscribe to timeplan'
+        return readiness if readiness.failure?
 
         status_list = [
           { 'sCI' => 'S0014', 'n' => 'status', 'uRt' => '0' },
@@ -45,6 +47,10 @@ module RSMP
         subscribe_to_status status_list, component: main.c_id
       end
 
+      def subscribe_to_timeplan!(...)
+        subscribe_to_timeplan(...).value!
+      end
+
       def process_status_update(message)
         status_values = message.attribute('sS')
         return unless status_values

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -28,9 +28,9 @@ module RSMP
         'TLC'
       end
 
-      def start
+      def start_auxiliary_tasks(parent)
         super
-        start_tlc_timer
+        start_tlc_timer(parent: parent)
         main.initiate_startup_sequence
       end
 
@@ -82,11 +82,11 @@ module RSMP
         end
       end
 
-      def start_tlc_timer
+      def start_tlc_timer(parent:)
         task_name = 'tlc timer'
         log "Starting #{task_name} with interval #{@interval} seconds", level: :debug
 
-        @timer = @task.async do |task|
+        @timer = parent.async do |task|
           task.annotate task_name
           run_tlc_timer task
         end
@@ -96,9 +96,6 @@ module RSMP
         next_time = Time.now.to_f
         loop do
           timer(@clock.now)
-        rescue StandardError => e
-          distribute_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,
@@ -108,7 +105,7 @@ module RSMP
           # 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
+          duration = [next_time - Time.now.to_f, 0].max
           task.sleep duration
         end
       end
@@ -116,7 +113,7 @@ module RSMP
       def stop_tlc_timer
         return unless @timer
 
-        @timer.stop
+        @timer.cancel if @timer.running?
         @timer = nil
       end
 

data/lib/rsmp/validation.rb

@@ -0,0 +1,22 @@
+module RSMP
+  # The result of validating a message against one or more schemas.
+  Validation = Data.define(:violations) do
+    def initialize(violations: [])
+      raise ArgumentError, 'violations must be an Array' unless violations.is_a?(Array)
+
+      super(violations: violations.map { |violation| Array(violation).dup.freeze }.freeze)
+    end
+
+    def valid?
+      violations.empty?
+    end
+
+    def invalid?
+      !valid?
+    end
+
+    def message
+      violations.map { |item| item.reject { |part| part == '' } }.compact.join(', ').strip
+    end
+  end
+end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.48.4'.freeze
+  VERSION = '0.51.1'.freeze
 end

data/lib/rsmp.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'socket'
 require 'time'
+require 'English'
 require 'async'
 require 'io/endpoint'
 require 'io/endpoint/host_endpoint'
@@ -10,16 +11,28 @@ require 'json'
 require 'securerandom'
 require 'json_schemer'
 require 'async/queue'
+require 'async/barrier'
+require 'async/promise'
 require_relative 'rsmp/schema_error'
+require_relative 'rsmp/helpers/clock'
+require_relative 'rsmp/helpers/deep_merge'
+require_relative 'rsmp/helpers/error'
+require_relative 'rsmp/failure'
+require_relative 'rsmp/result'
+require_relative 'rsmp/validation'
+require_relative 'rsmp/event'
+require_relative 'rsmp/event_source'
+require_relative 'rsmp/completion'
+require_relative 'rsmp/termination'
+require_relative 'rsmp/collection'
+require_relative 'rsmp/exchange'
+require_relative 'rsmp/delivery'
 require_relative 'rsmp/schema'
 require_relative 'rsmp/convert/import/yaml'
 require_relative 'rsmp/convert/export/json_schema'
 
 require_relative 'rsmp/status_list'
 require_relative 'rsmp/command_list'
-require_relative 'rsmp/helpers/clock'
-require_relative 'rsmp/helpers/deep_merge'
-require_relative 'rsmp/helpers/error'
 require_relative 'rsmp/log/logging'
 require_relative 'rsmp/log/archive'
 require_relative 'rsmp/log/filtering'
@@ -35,7 +48,6 @@ require_relative 'rsmp/component/component_proxy'
 require_relative 'rsmp/collect/distributor'
 require_relative 'rsmp/collect/receiver'
 require_relative 'rsmp/collect/queue'
-require_relative 'rsmp/collect/collector/status'
 require_relative 'rsmp/collect/collector/reporting'
 require_relative 'rsmp/collect/collector/logging'
 require_relative 'rsmp/collect/collector'
@@ -71,11 +83,13 @@ require_relative 'rsmp/proxy/modules/send'
 require_relative 'rsmp/proxy/modules/receive'
 require_relative 'rsmp/proxy/modules/versions'
 require_relative 'rsmp/proxy/modules/tasks'
+require_relative 'rsmp/proxy/modules/lifecycle'
 require_relative 'rsmp/proxy/proxy'
 require_relative 'rsmp/sxl/interface'
 require_relative 'rsmp/sxl/supervisor_interface'
 require_relative 'rsmp/sxl/site_interface'
 require_relative 'rsmp/sxl/registry'
+require_relative 'rsmp/sxl/processing'
 require_relative 'rsmp/proxy/supervisor/modules/status_updates'
 require_relative 'rsmp/proxy/supervisor/modules/status'
 require_relative 'rsmp/proxy/supervisor/modules/commands'
@@ -108,6 +122,7 @@ require_relative 'rsmp/tlc/proxy/control'
 require_relative 'rsmp/tlc/proxy/detectors'
 require_relative 'rsmp/tlc/proxy/io'
 require_relative 'rsmp/tlc/proxy/plans'
+require_relative 'rsmp/tlc/proxy/plans_bang'
 require_relative 'rsmp/tlc/proxy/status'
 require_relative 'rsmp/tlc/proxy/system'
 require_relative 'rsmp/tlc/supervisor_interface'