rsmp 0.47.0 → 0.48.0

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

@@ -15,7 +15,7 @@ module RSMP
             'cCI' => 'M0006',
             'cO' => 'setInput',
             'n' => 'status',
-            'v' => status.to_s
+            'v' => command_value('M0006', 'status', status)
           }, {
             'cCI' => 'M0006',
             'cO' => 'setInput',
@@ -25,7 +25,7 @@ module RSMP
             'cCI' => 'M0006',
             'cO' => 'setInput',
             'n' => 'input',
-            'v' => input.to_s
+            'v' => command_value('M0006', 'input', input)
           }]
           send_command_and_collect(command_list, within: within).ok!
         end
@@ -41,7 +41,7 @@ module RSMP
             'cCI' => 'M0013',
             'cO' => 'setInput',
             'n' => 'status',
-            'v' => status.to_s
+            'v' => command_value('M0013', 'status', status)
           }, {
             'cCI' => 'M0013',
             'cO' => 'setInput',
@@ -73,7 +73,7 @@ module RSMP
             'cCI' => 'M0020',
             'cO' => 'setOutput',
             'n' => 'status',
-            'v' => status.to_s
+            'v' => command_value('M0020', 'status', status)
           }, {
             'cCI' => 'M0020',
             'cO' => 'setOutput',
@@ -83,12 +83,12 @@ module RSMP
             'cCI' => 'M0020',
             'cO' => 'setOutput',
             'n' => 'output',
-            'v' => output.to_s
+            'v' => command_value('M0020', 'output', output)
           }, {
             'cCI' => 'M0020',
             'cO' => 'setOutput',
             'n' => 'outputValue',
-            'v' => value.to_s
+            'v' => command_value('M0020', 'outputValue', value)
           }]
           send_command_and_collect(command_list, within: within).ok!
         end
@@ -98,10 +98,13 @@ module RSMP
         def force_input_command_list(input, status, value)
           security_code = security_code_for(2)
           [
-            { 'cCI' => 'M0019', 'cO' => 'setInput', 'n' => 'status', 'v' => status.to_s },
+            { 'cCI' => 'M0019', 'cO' => 'setInput', 'n' => 'status',
+              'v' => command_value('M0019', 'status', status) },
             { 'cCI' => 'M0019', 'cO' => 'setInput', 'n' => 'securityCode', 'v' => security_code.to_s },
-            { 'cCI' => 'M0019', 'cO' => 'setInput', 'n' => 'input', 'v' => input.to_s },
-            { 'cCI' => 'M0019', 'cO' => 'setInput', 'n' => 'inputValue', 'v' => value.to_s }
+            { 'cCI' => 'M0019', 'cO' => 'setInput', 'n' => 'input',
+              'v' => command_value('M0019', 'input', input) },
+            { 'cCI' => 'M0019', 'cO' => 'setInput', 'n' => 'inputValue',
+              'v' => command_value('M0019', 'inputValue', value) }
           ]
         end
 
@@ -110,11 +113,11 @@ module RSMP
           # S0029 is used to check the forced status, but is only available from sxl 1.0.13
           if RSMP::Proxy.version_meets_requirement?(sxl_version, '>=1.0.13')
             result << { 'sCI' => 'S0029', 'n' => 'status',
-                        's' => /^.{#{input.to_i - 1}}#{status == 'True' ? '1' : '0'}/ }
+                        's' => /^.{#{input.to_i - 1}}#{boolean_value(status) ? '1' : '0'}/ }
           end
-          if status == 'True'
+          if boolean_value(status)
             result << { 'sCI' => 'S0003', 'n' => 'inputstatus',
-                        's' => /^.{#{input.to_i - 1}}#{value == 'True' ? '1' : '0'}/ }
+                        's' => /^.{#{input.to_i - 1}}#{boolean_value(value) ? '1' : '0'}/ }
           end
           result
         end

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

@@ -15,7 +15,7 @@ module RSMP
             'cCI' => 'M0014',
             'cO' => 'setCommands',
             'n' => 'status',
-            'v' => status.to_s
+            'v' => command_value('M0014', 'status', status)
           }, {
             'cCI' => 'M0014',
             'cO' => 'setCommands',
@@ -25,7 +25,7 @@ module RSMP
             'cCI' => 'M0014',
             'cO' => 'setCommands',
             'n' => 'plan',
-            'v' => plan.to_s
+            'v' => command_value('M0014', 'plan', plan)
           }]
           send_command_and_collect(command_list, within: within).ok!
         end
@@ -41,7 +41,7 @@ module RSMP
             'cCI' => 'M0023',
             'cO' => 'setTimeout',
             'n' => 'status',
-            'v' => status.to_s
+            'v' => command_value('M0023', 'status', status)
           }, {
             'cCI' => 'M0023',
             'cO' => 'setTimeout',
@@ -62,7 +62,7 @@ module RSMP
             'cCI' => 'M0015',
             'cO' => 'setOffset',
             'n' => 'status',
-            'v' => offset.to_s
+            'v' => command_value('M0015', 'status', offset)
           }, {
             'cCI' => 'M0015',
             'cO' => 'setOffset',
@@ -72,7 +72,7 @@ module RSMP
             'cCI' => 'M0015',
             'cO' => 'setOffset',
             'n' => 'plan',
-            'v' => plan.to_s
+            'v' => command_value('M0015', 'plan', plan)
           }]
           send_command_and_collect(command_list, within: within).ok!
         end
@@ -88,7 +88,7 @@ module RSMP
             'cCI' => 'M0002',
             'cO' => 'setPlan',
             'n' => 'status',
-            'v' => 'True'
+            'v' => command_value('M0002', 'status', true)
           }, {
             'cCI' => 'M0002',
             'cO' => 'setPlan',
@@ -98,9 +98,9 @@ module RSMP
             'cCI' => 'M0002',
             'cO' => 'setPlan',
             'n' => 'timeplan',
-            'v' => plan_nr.to_s
+            'v' => command_value('M0002', 'timeplan', plan_nr)
           }]
-          confirm_status = [{ 'sCI' => 'S0014', 'n' => 'status', 's' => plan_nr.to_s }]
+          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)
         end
@@ -116,7 +116,7 @@ module RSMP
             'cCI' => 'M0016',
             'cO' => 'setWeekTable',
             'n' => 'status',
-            'v' => status.to_s
+            'v' => command_value('M0016', 'status', status)
           }, {
             'cCI' => 'M0016',
             'cO' => 'setWeekTable',
@@ -137,7 +137,7 @@ module RSMP
             'cCI' => 'M0017',
             'cO' => 'setTimeTable',
             'n' => 'status',
-            'v' => status.to_s
+            'v' => command_value('M0017', 'status', status)
           }, {
             'cCI' => 'M0017',
             'cO' => 'setTimeTable',
@@ -158,7 +158,7 @@ module RSMP
             'cCI' => 'M0018',
             'cO' => 'setCycleTime',
             'n' => 'status',
-            'v' => cycle_time.to_s
+            'v' => command_value('M0018', 'status', cycle_time)
           }, {
             'cCI' => 'M0018',
             'cO' => 'setCycleTime',
@@ -168,7 +168,7 @@ module RSMP
             'cCI' => 'M0018',
             'cO' => 'setCycleTime',
             'n' => 'plan',
-            'v' => plan.to_s
+            'v' => command_value('M0018', 'plan', plan)
           }]
           send_command_and_collect(command_list, within:).ok!
         end
@@ -183,7 +183,7 @@ module RSMP
             'cCI' => 'M0010',
             'cO' => 'setStart',
             'n' => 'status',
-            'v' => 'True'
+            'v' => command_value('M0010', 'status', true)
           }, {
             'cCI' => 'M0010',
             'cO' => 'setStart',
@@ -203,7 +203,7 @@ module RSMP
             'cCI' => 'M0011',
             'cO' => 'setStop',
             'n' => 'status',
-            'v' => 'True'
+            'v' => command_value('M0011', 'status', true)
           }, {
             'cCI' => 'M0011',
             'cO' => 'setStop',

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

@@ -58,9 +58,9 @@ module RSMP
           wait_for_status(
             'normal control on, yellow flash off, startup mode off',
             [
-              { 'sCI' => 'S0007', 'n' => 'status', 's' => /^True(,True)*$/ },
-              { 'sCI' => 'S0011', 'n' => 'status', 's' => /^False(,False)*$/ },
-              { 'sCI' => 'S0005', 'n' => 'status', 's' => 'False' }
+              { 'sCI' => 'S0007', 'n' => 'status', 's' => [true] },
+              { 'sCI' => 'S0011', 'n' => 'status', 's' => [false] },
+              { 'sCI' => 'S0005', 'n' => 'status', 's' => false }
             ],
             timeout: timeout
           )
@@ -73,7 +73,7 @@ module RSMP
           timeout = options[:timeout] || @timeouts['status_response']
           collector = request_status_and_collect({ S0028: [:status] }, within: timeout)
           collector.ok!
-          collector.messages.first.attributes['sS'].first['s'].split(',').to_h do |item|
+          status_items(collector.messages.first.attributes['sS'].first['s']).to_h do |item|
             item.split('-').map(&:to_i)
           end
         end
@@ -101,12 +101,16 @@ module RSMP
         private
 
         def extract_band_value(collector, plan, band)
-          collector.messages.first.attributes['sS'].first['s'].split(',').each do |item|
+          status_items(collector.messages.first.attributes['sS'].first['s']).each do |item|
             some_plan, some_band, value = item.split('-')
             return value.to_i if some_plan.to_i == plan.to_i && some_band.to_i == band.to_i
           end
           nil
         end
+
+        def status_items(status)
+          status.is_a?(Array) ? status : status.split(',')
+        end
       end
     end
   end

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

@@ -43,12 +43,18 @@ module RSMP
           security_code = security_code_for(1)
           [
             { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'securityCode', 'v' => security_code.to_s },
-            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'year', 'v' => clock.year.to_s },
-            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'month', 'v' => clock.month.to_s },
-            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'day', 'v' => clock.day.to_s },
-            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'hour', 'v' => clock.hour.to_s },
-            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'minute', 'v' => clock.min.to_s },
-            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'second', 'v' => clock.sec.to_s }
+            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'year',
+              'v' => command_value('M0104', 'year', clock.year) },
+            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'month',
+              'v' => command_value('M0104', 'month', clock.month) },
+            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'day',
+              'v' => command_value('M0104', 'day', clock.day) },
+            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'hour',
+              'v' => command_value('M0104', 'hour', clock.hour) },
+            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'minute',
+              'v' => command_value('M0104', 'minute', clock.min) },
+            { 'cCI' => 'M0104', 'cO' => 'setDate', 'n' => 'second',
+              'v' => command_value('M0104', 'second', clock.sec) }
           ]
         end
       end

data/lib/rsmp/tlc/signal_group.rb

@@ -56,7 +56,7 @@ module RSMP
       # Start of signal group. Orders a signal group to green
       def handle_m0010(arg, _options = {})
         @node.verify_security_code 2, arg['securityCode']
-        return unless TrafficControllerSite.from_rsmp_bool? arg['status']
+        return unless arg['status']
 
         log "Start signal group #{c_id}, go to green", level: :info
       end
@@ -64,7 +64,7 @@ module RSMP
       # Stop of signal group. Orders a signal group to red
       def handle_m0011(arg, _options = {})
         @node.verify_security_code 2, arg['securityCode']
-        return unless TrafficControllerSite.from_rsmp_bool? arg['status']
+        return unless arg['status']
 
         log "Stop signal group #{c_id}, go to red", level: :info
       end

data/lib/rsmp/tlc/supervisor_interface.rb

@@ -77,6 +77,48 @@ module RSMP
         code
       end
 
+      def boolean_value(value)
+        case value
+        when true, 'True'
+          true
+        when false, 'False'
+          false
+        else
+          value
+        end
+      end
+
+      def integer_value(value)
+        return value.to_i if value.is_a?(String) && value.match?(/\A[+-]?\d+\z/)
+
+        value
+      end
+
+      def list_value(value)
+        value.is_a?(Array) ? value : value.to_s.split(',')
+      end
+
+      def command_value(command_code, argument_name, value)
+        descriptor = RSMP::Schema.sxl_argument_descriptor(name, sxl_version, :commands, command_code, argument_name)
+        normalize_command_value(value, descriptor)
+      end
+
+      def normalize_command_value(value, descriptor)
+        type = descriptor.is_a?(Hash) ? descriptor['type'] : descriptor.to_s
+        case type
+        when 'boolean', 'boolean_as_string'
+          boolean_value(value)
+        when 'integer', 'integer_as_string', 'long_as_string'
+          integer_value(value)
+        when /_list(_as_string)?\z/
+          list_value(value)
+        when 'string', 'base64', 'timestamp'
+          value.to_s
+        else
+          value
+        end
+      end
+
       def cache_status_item(item)
         case item['sCI']
         when 'S0007' then @functional_position = item['s'] if item['n'] == 'status'

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -147,25 +147,8 @@ module RSMP
         @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, quality = 'recent')
-        case value
-        when true, false
-          [to_rmsp_bool(value), quality]
-        else
-          [value, quality]
-        end
+        [value, quality]
       end
 
       def do_deferred(key, _item = nil)

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = '0.47.0'.freeze
+  VERSION = '0.48.0'.freeze
 end

data/lib/rsmp.rb

@@ -25,6 +25,7 @@ require_relative 'rsmp/log/archive'
 require_relative 'rsmp/log/filtering'
 require_relative 'rsmp/log/colorization'
 require_relative 'rsmp/log/logger'
+require_relative 'rsmp/message/sxl_codec'
 require_relative 'rsmp/message'
 require_relative 'rsmp/component/components'
 require_relative 'rsmp/component/alarm_state'
@@ -52,6 +53,7 @@ require_relative 'rsmp/collect/ack_collector'
 require_relative 'rsmp/node/protocol'
 require_relative 'rsmp/node/task'
 require_relative 'rsmp/node/node'
+require_relative 'rsmp/node/site/connections'
 require_relative 'rsmp/node/site/site'
 require_relative 'rsmp/node/supervisor/modules/configuration'
 require_relative 'rsmp/node/supervisor/modules/connection'
@@ -74,6 +76,7 @@ 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/proxy/supervisor/modules/status_updates'
 require_relative 'rsmp/proxy/supervisor/modules/status'
 require_relative 'rsmp/proxy/supervisor/modules/commands'
 require_relative 'rsmp/proxy/supervisor/modules/alarms'
@@ -84,6 +87,7 @@ require_relative 'rsmp/proxy/site/modules/status'
 require_relative 'rsmp/proxy/site/modules/aggregated_status'
 require_relative 'rsmp/proxy/site/modules/alarms'
 require_relative 'rsmp/proxy/site/modules/commands'
+require_relative 'rsmp/proxy/site/connection'
 require_relative 'rsmp/proxy/site/sxl_selection'
 require_relative 'rsmp/proxy/site/site_proxy'
 require_relative 'rsmp/tlc'

data/schemas/core/3.1.4/command_response.json

@@ -25,6 +25,17 @@
             "enum" : [ "recent", "old", "undefined", "unknown" ]
           }
         },
+        "if": {
+          "required": [ "age" ],
+          "properties": {
+            "age" : { "enum" : [ "unknown", "undefined" ] }
+          }
+        },
+        "then": {
+          "properties": {
+            "v" : { "type" : "null" }
+          }
+        },
         "required" : [ "cCI", "n", "v", "age" ],
         "additionalProperties": false
       }

data/schemas/core/3.1.5/command_response.json

@@ -25,6 +25,17 @@
             "enum" : [ "recent", "old", "undefined", "unknown" ]
           }
         },
+        "if": {
+          "required": [ "age" ],
+          "properties": {
+            "age" : { "enum" : [ "unknown", "undefined" ] }
+          }
+        },
+        "then": {
+          "properties": {
+            "v" : { "type" : "null" }
+          }
+        },
         "required" : [ "cCI", "n", "v", "age" ],
         "additionalProperties": false
       }

data/schemas/core/3.2.0/command_response.json

@@ -25,6 +25,17 @@
             "enum" : [ "recent", "old", "undefined", "unknown" ]
           }
         },
+        "if": {
+          "required": [ "age" ],
+          "properties": {
+            "age" : { "enum" : [ "unknown", "undefined" ] }
+          }
+        },
+        "then": {
+          "properties": {
+            "v" : { "type" : "null" }
+          }
+        },
         "required" : [ "cCI", "n", "v", "age" ],
         "additionalProperties": false
       }

data/schemas/core/3.2.1/command_response.json

@@ -25,6 +25,17 @@
             "enum" : [ "recent", "old", "undefined", "unknown" ]
           }
         },
+        "if": {
+          "required": [ "age" ],
+          "properties": {
+            "age" : { "enum" : [ "unknown", "undefined" ] }
+          }
+        },
+        "then": {
+          "properties": {
+            "v" : { "type" : "null" }
+          }
+        },
         "required" : [ "cCI", "n", "v", "age" ],
         "additionalProperties": false
       }

data/schemas/core/3.2.2/command_response.json

@@ -26,6 +26,17 @@
             "enum" : [ "recent", "old", "undefined", "unknown" ]
           }
         },
+        "if": {
+          "required": [ "age" ],
+          "properties": {
+            "age" : { "enum" : [ "unknown", "undefined" ] }
+          }
+        },
+        "then": {
+          "properties": {
+            "v" : { "type" : "null" }
+          }
+        },
         "required" : [ "cCI", "n", "v", "age" ],
         "additionalProperties": false
       }

data/schemas/core/3.3.0/command_response.json

@@ -26,6 +26,17 @@
             "enum" : [ "recent", "old", "undefined", "unknown" ]
           }
         },
+        "if": {
+          "required": [ "age" ],
+          "properties": {
+            "age" : { "enum" : [ "unknown", "undefined" ] }
+          }
+        },
+        "then": {
+          "properties": {
+            "v" : { "type" : "null" }
+          }
+        },
         "required" : [ "cCI", "n", "v", "age" ],
         "additionalProperties": false
       }

data/schemas/tlc/1.0.10/alarms/A0008.json

@@ -8,23 +8,29 @@
       ]
     }
   },
-  "allOf" : [
-    {
-      "if" : {
-        "properties" : {
-          "n" : {
-            "const" : "timeplan"
+  "if" : {
+    "$ref" : "../defs/guards.json#/$defs/age_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "timeplan"
+            }
           }
-        }
-      },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "description" : "Current time plan",
-            "$ref" : "../defs/definitions.json#/integer"
+        },
+        "then" : {
+          "properties" : {
+            "v" : {
+              "description" : "Current time plan",
+              "$ref" : "../defs/definitions.json#/integer"
+            }
           }
         }
       }
-    }
-  ]
+    ]
+  }
 }

data/schemas/tlc/1.0.10/alarms/A0201.json

@@ -8,28 +8,34 @@
       ]
     }
   },
-  "allOf" : [
-    {
-      "if" : {
-        "properties" : {
-          "n" : {
-            "const" : "color"
+  "if" : {
+    "$ref" : "../defs/guards.json#/$defs/age_unknown_or_undefined"
+  },
+  "then" : {},
+  "else" : {
+    "allOf" : [
+      {
+        "if" : {
+          "properties" : {
+            "n" : {
+              "const" : "color"
+            }
           }
-        }
-      },
-      "then" : {
-        "properties" : {
-          "v" : {
-            "description" : "Color of lamp",
-            "type" : "string",
-            "enum" : [
-              "green",
-              "red",
-              "yellow"
-            ]
+        },
+        "then" : {
+          "properties" : {
+            "v" : {
+              "description" : "Color of lamp",
+              "type" : "string",
+              "enum" : [
+                "green",
+                "red",
+                "yellow"
+              ]
+            }
           }
         }
       }
-    }
-  ]
+    ]
+  }
 }