rsmp 0.20.4 → 0.20.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c2f0ad26f341d78dba43980b9f873a75bf06d2233ffa3f27b30b3f7d83e297
-  data.tar.gz: 84187fc4d5c836233397ff20ffff5cdf236435069d3edb436999fe5f8de1436b
+  metadata.gz: 77314f562ebf956079f50f9cabd90be180010d39d55ecc2b96aceeab7b6da553
+  data.tar.gz: 2c67e8fcca60ecdefec7edb539f56b7625046f3ef7e8d7a0801640c05f8f0535
 SHA512:
-  metadata.gz: 1950948c8087db84fbf12069e4fcee10160efa8e4031ba618dcbdf04c130104df5f6e8467f0cfdb647615ab5de3b96fcb7cc9cfeaf5ec458bc0471e9f09676e2
-  data.tar.gz: c9999221cc2b49d5320d2769230e8ba7c9e54bf5a4f4e37c7efdef599b7745f8d85dbb29c2ed7fc01304604e591a5303422e813e9dee978286760e3897705aa2
+  metadata.gz: 68a66a9531bff5c01cd743ae61a2b159bae2ce0dc6cfd393b5fa9deddda3838d771cfd1025a25ec8231a5d099d5e1976bbbc9418738ee0ba528875e3d8e63327
+  data.tar.gz: bac2a033fa66291905fa0ba5a66d79a9bb114900ff7d62f4ec696b7ba5271b8454793c1866f9607f0de0638c9950a09822640935541e9663ee01f74295469834

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.20.4)
+    rsmp (0.20.7)
       async (~> 2.6.2)
       async-io (~> 1.35.0)
       colorize (~> 0.8.1)
@@ -18,7 +18,7 @@ GEM
       cucumber (>= 4.0, < 9.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (2.6.2)
+    async (2.6.3)
       console (~> 1.10)
       fiber-annotation
       io-event (~> 1.1)
@@ -28,7 +28,7 @@ GEM
     builder (3.2.4)
     childprocess (4.1.0)
     colorize (0.8.1)
-    console (1.17.2)
+    console (1.21.0)
       fiber-annotation
       fiber-local
     contracts (0.17)
@@ -63,7 +63,7 @@ GEM
     fiber-annotation (0.2.0)
     fiber-local (1.0.0)
     hana (1.3.7)
-    io-event (1.2.2)
+    io-event (1.2.3)
     json_schemer (0.2.25)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
@@ -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 && !component_id.empty?
-        inferred = infer_component_type component_id
-        component = inferred.new node: self, id: component_id
+      if build
+        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
@@ -276,8 +281,8 @@ module RSMP
           component.handle_command command_code,arg
         end
         log "Received #{message.type}", message: message, level: :log
-      rescue UnknownComponent => e
-        log "Received #{message.type} with unknown component id '#{component_id}'", message: message, level: :warning
+      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
@@ -302,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.4"
+  VERSION = "0.20.7"
 end

metadata

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