rsmp 0.20.3 → 0.20.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6bfc3fc8bfbd9542d526cf49c4a5590672722ad628e12482458631d373f2a01
-  data.tar.gz: 147774083ce7575ceab9bf4e5727b5a6838700b4daf6aa60b793921c193d2ebc
+  metadata.gz: 83d3f61fbf037ff67cf6cdec5eb9d043d75336f376ad5a9e2cf343631f962bd8
+  data.tar.gz: d185368c970e5174f66af74f95be3116793a19d7ce4a7a5496dd9c852c9a36fa
 SHA512:
-  metadata.gz: dd734f66d888a71b8add0446d48dbbff7e10370eea8e852ed93a5aaa3e02de56bbdf0bbb92de2657b07c97e4b86bfa032af47848a6e163a6ddf09d05fd348249
-  data.tar.gz: 5de9e95d0348ad2adff26d3d3b27f7b601cf7780442143142cc22fa2a6f658fff7bf1c5bf03af0c37b772012eb90f1e2cbb2c74282fe0f56b8db253165da443b
+  metadata.gz: '094efccdc73a1da1b397e8b9c1b6fdea341d8499c27d2f4507334156bc89801474ef5d1646549ca79958b52787759317dcdcd4a742617c4ac957913d4cd7a36c'
+  data.tar.gz: 86fb74137d721a9dd74aeb3c9b8fd16418655e8dedfa1f3f19425abb1af045c59463a989639d17255777aa781f74c009639537a43bcd3c4f7f953baaaba084b1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.20.3)
+    rsmp (0.20.6)
       async (~> 2.6.2)
       async-io (~> 1.35.0)
       colorize (~> 0.8.1)
@@ -76,7 +76,7 @@ GEM
     multi_test (1.1.0)
     rake (13.0.6)
     regexp_parser (2.8.1)
-    rsmp_schema (0.4.0)
+    rsmp_schema (0.4.5)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
     rspec (3.12.0)

data/lib/rsmp/components.rb

@@ -39,22 +39,21 @@ module RSMP
     end
 
     def infer_component_type component_id
-      Component
+      raise UnknownComponent.new("Component #{component_id} mising and cannot infer type")
     end
 
     def find_component component_id, build: true
       component = @components[component_id]
       return component if component
       if build
-        inferred = infer_component_type component_id
-        component = inferred.new node: self, id: component_id
+        inferred_type = infer_component_type component_id
+        component = inferred_type.new node: self, id: component_id
         @components[ component_id] = component
         class_name = component.class.name.split('::').last
         class_name << " component" unless (class_name == 'Component' || class_name == 'ComponentProxy')
-        log "Adding component #{component_id} with the inferred type #{class_name}", level: :debug
+        log "Added component #{component_id} with the inferred type #{class_name}", level: :debug
         component
       else
-        raise UnknownComponent.new("Component #{component_id} not found") unless component
       end
     end
 

data/lib/rsmp/proxy.rb

@@ -403,8 +403,7 @@ module RSMP
       nil
     rescue SchemaError, RSMP::Schema::Error => e
       reason = "schema errors: #{e.message}"
-      str = "Received invalid #{message.type}, #{reason}"
-      log str, message: message, level: :warning
+      str = "Received invalid #{message.type}"
       notify_error e.exception(str), message: message
       dont_acknowledge message, str, reason
       message

data/lib/rsmp/supervisor_proxy.rb

@@ -67,8 +67,9 @@ module RSMP
     def connect_tcp
       @endpoint = Async::IO::Endpoint.tcp(@ip, @port)
 
+      error = nil
       # Async::IO::Endpoint#connect renames the current task. run in a subtask to avoid this see issue #22
-      @task.async do |task|
+      result = @task.async do |task|
         task.annotate 'socket task'
         # this timeout is a workaround for connect hanging on windows if the other side is not present yet
         timeout = @site_settings.dig('timeouts','connect') || 1.1
@@ -77,7 +78,11 @@ module RSMP
         end
         delay = @site_settings.dig('intervals','after_connect')
         task.sleep delay if delay
+      rescue Errno::ECONNREFUSED => e   # rescue to avoid log output
+        log "Connection refused", level: :warning
+        error = e
       end.wait
+      raise error if error  # reraise any error outside task
 
       @stream = Async::IO::Stream.new(@socket)
       @protocol = Async::IO::Protocol::Line.new(@stream,WRAPPING_DELIMITER) # rsmp messages are json terminated with a form-feed
@@ -261,19 +266,31 @@ module RSMP
     end
 
     def process_command_request message
-      log "Received #{message.type}", message: message, level: :log
       component_id = message.attributes["cId"]
-      component = @site.find_component component_id
-      commands = simplify_command_requests message.attributes["arg"]
-      commands.each_pair do |command_code,arg|
-        component.handle_command command_code,arg
-      end
 
       rvs = message.attributes["arg"].map do |item|
         item = item.dup.merge('age'=>'recent')
         item.delete 'cO'
         item
       end
+
+      begin
+        component = @site.find_component component_id
+        commands = simplify_command_requests message.attributes["arg"]
+        commands.each_pair do |command_code,arg|
+          component.handle_command command_code,arg
+        end
+        log "Received #{message.type}", message: message, level: :log
+      rescue UnknownComponent
+        log "Received #{message.type} with unknown component id '#{component_id}' and cannot infer type", message: message, level: :warning
+        # If the component is unknown, we must set age=undefined for all items,
+        # while still acknowledge the message.
+        # See https://github.com/rsmp-nordic/rsmp_validator/issues/271
+        rvs.map do |item|
+          item['age'] = 'undefined'
+        end
+      end
+
       response = CommandResponse.new({
         "cId"=>component_id,
         "cTS"=>clock.to_s,
@@ -290,19 +307,32 @@ module RSMP
     end
 
     def process_status_request message, options={}
-      component_id = message.attributes["cId"]
-      component = @site.find_component component_id
-      log "Received #{message.type}", message: message, level: :log
-      sS = message.attributes["sS"].map do |arg|
-        value, quality =  component.get_status arg['sCI'], arg['n'], {sxl_version: sxl_version}
-        { "s" => rsmpify_value(value), "q" => quality.to_s }.merge arg
+      sS = []
+      begin
+        component_id = message.attributes["cId"]
+        component = @site.find_component component_id
+        sS = message.attributes["sS"].map do |arg|
+          value, quality =  component.get_status arg['sCI'], arg['n'], {sxl_version: sxl_version}
+          { "s" => rsmpify_value(value), "q" => quality.to_s }.merge arg
+        end
+        log "Received #{message.type}", message: message, level: :log
+
+      rescue UnknownComponent
+        log "Received #{message.type} with unknown component id '#{component_id}' and cannot infer type", message: message, level: :warning
+        # If the component is unknown, we must set q=undefined and s=nil for all items,
+        # while still acknowledge the message.
+        sS = message.attributes["sS"].map do |arg|
+          arg.dup.merge('q'=>'undefined','s'=>nil)
+        end
       end
+
       response = StatusResponse.new({
         "cId"=>component_id,
         "sTs"=>clock.to_s,
         "sS"=>sS,
         "mId" => options[:m_id]
       })
+
       set_nts_message_attributes response
       acknowledge message
       send_message response

data/lib/rsmp/tlc/traffic_controller.rb

@@ -538,7 +538,7 @@ module RSMP
 
       def switch_functional_position mode, timeout: nil, reverting: false, source:
         unless ['NormalControl','YellowFlash','Dark'].include? mode
-          raise RSMP::MessageRejected.new "Invalid functional position '#{mode}', must be NormalControl, YellowFlash or Dark'"
+          raise RSMP::MessageRejected.new "Invalid functional position #{mode.inspect}, must be NormalControl, YellowFlash or Dark"
         end
         if reverting
           log "Reverting to functional position #{mode} after timeout", level: :info

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.20.3"
+  VERSION = "0.20.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.20.6
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async