rsmp 0.20.2 → 0.20.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edab8c5a4e106585dd62c4c2596a6df4cda363da8d96174bba51639e5ccad54c
-  data.tar.gz: 95bc098d37c13ff5c66c6a8da7d3f43ec5dfc1e0a4360b5b29cea7f1d41a7a69
+  metadata.gz: d4c2f0ad26f341d78dba43980b9f873a75bf06d2233ffa3f27b30b3f7d83e297
+  data.tar.gz: 84187fc4d5c836233397ff20ffff5cdf236435069d3edb436999fe5f8de1436b
 SHA512:
-  metadata.gz: 7a39eda6d493a3f182c91851fc0c2c6f233efb1fe095f8a6d4fe0cc7c5865afad0f12e4144184e30444a1f042766c5653ead38593c506049d6e3080b088fa553
-  data.tar.gz: 286591ea4f8bac4d8a61b98e989286dfec24340c2dbc28fdd3db82d2a9b2a644428ed21410318320c6a321900461a4d45ec475e347908b9c173e71ee51c2a357
+  metadata.gz: 1950948c8087db84fbf12069e4fcee10160efa8e4031ba618dcbdf04c130104df5f6e8467f0cfdb647615ab5de3b96fcb7cc9cfeaf5ec458bc0471e9f09676e2
+  data.tar.gz: c9999221cc2b49d5320d2769230e8ba7c9e54bf5a4f4e37c7efdef599b7745f8d85dbb29c2ed7fc01304604e591a5303422e813e9dee978286760e3897705aa2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.20.2)
+    rsmp (0.20.4)
       async (~> 2.6.2)
       async-io (~> 1.35.0)
       colorize (~> 0.8.1)

data/lib/rsmp/components.rb

@@ -45,7 +45,7 @@ module RSMP
     def find_component component_id, build: true
       component = @components[component_id]
       return component if component
-      if build
+      if build && !component_id.empty?
         inferred = infer_component_type component_id
         component = inferred.new node: self, id: component_id
         @components[ component_id] = component

data/lib/rsmp/message.rb

@@ -66,7 +66,11 @@ module RSMP
       when /^Request$/i
         AlarmRequest.new attributes
       when /^Acknowledge$/i
+        if attributes['ack'] =~ /^acknowledged$/i
         AlarmAcknowledged.new attributes
+        else
+          AlarmAcknowledge.new attributes
+        end
       when /^Suspend$/i
         if attributes['sS'] =~ /^suspended$/i
           AlarmSuspended.new attributes

data/lib/rsmp/site_proxy.rb

@@ -63,7 +63,7 @@ module RSMP
           process_aggregated_status message
         when AggregatedStatusRequest
           will_not_handle message
-        when AlarmIssue, AlarmSuspended, AlarmResumed
+        when AlarmIssue, AlarmSuspended, AlarmResumed, AlarmAcknowledged
           process_alarm message
         when CommandResponse
           process_command_response message

data/lib/rsmp/supervisor_proxy.rb

@@ -197,7 +197,7 @@ module RSMP
 
     def process_alarm message
       case message
-      when AlarmAcknowledged
+      when AlarmAcknowledge
         handle_alarm_acknowledge message
       when AlarmSuspend
         handle_alarm_suspend message
@@ -261,19 +261,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 => e
+        log "Received #{message.type} with unknown component id '#{component_id}'", 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,

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.20.2"
+  VERSION = "0.20.4"
 end

metadata

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