rsmp 0.1.29 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c123985ef66b5f1a4b1676a01d07900d1a4ca365b93cc06a113bd0a7605679a9
-  data.tar.gz: 5df915ef9e4e6143281ab23ffc48127a71502784e4a132691be2463285762b22
+  metadata.gz: d0b29c33b11951327d41c6ee7fe019d4c7fff8a9e8b7b82da4919dc2935797b4
+  data.tar.gz: 131fbd58b3bff50cfec9d4c90026a5485a2ffb2c84b930429b922555fa7a7037
 SHA512:
-  metadata.gz: 8989828fa898324ce2b5dc9b0d0de2bd90ddc0ff5276ac768ae09526e3adf0728de67e87b01554f7374b25aed5884201367e4368efbaf37b3d594e4958c8ce3e
-  data.tar.gz: 2fd22365257c3f2595fb3329cd047feaa87b9d52aa335232a3126023414bf5859950a11d778d0e8b2a6983644475c95173aa8ec0886b3018850ae156a98c6063
+  metadata.gz: 91c4d3d0d68f1aee82f3026ad39a3910dee30d7161fd866a45c22370cd05260bd380f6ab2c249e7aaa6fc8b1513e792c74bb0f7eec4fdd1ba636bc841d8c2a93
+  data.tar.gz: d15ff60e2d2df3b8b900b23da741d6eb6dba4a62a2512459caa4dab59f8a20b109131314376fb41c01112d01e6929e70135d25fa406b4a37fb831329d13bc5f0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.29)
+    rsmp (0.1.34)
       async (~> 1.28.7)
       async-io (~> 1.30.2)
       colorize (~> 0.8.1)
@@ -28,7 +28,7 @@ GEM
     builder (3.2.4)
     childprocess (3.0.0)
     colorize (0.8.1)
-    console (1.12.0)
+    console (1.13.1)
       fiber-local
     contracts (0.16.0)
     cucumber (3.1.2)

data/lib/rsmp/cli.rb

@@ -30,8 +30,8 @@ module RSMP
       end
 
       if options[:supervisors]
+        settings['supervisors'] = []
         options[:supervisors].split(',').each do |supervisor|
-          settings['supervisors'] ||= []
           ip, port = supervisor.split ':'
           ip = '127.0.0.1' if ip.empty?
           port = '12111' if port.empty?

data/lib/rsmp/component.rb

@@ -28,7 +28,7 @@ module RSMP
       @aggregated_status_bools[5] = true
     end
 
-    def set_aggregated_status status
+    def set_aggregated_status status, options={}
       status = [status] if status.is_a? Symbol
       raise InvalidArgument unless status.is_a? Array
       input = status & AGGREGATED_STATUS_KEYS
@@ -36,7 +36,7 @@ module RSMP
         AGGREGATED_STATUS_KEYS.each_with_index do |key,index|
           @aggregated_status_bools[index] = status.include?(key)
         end
-        aggrated_status_changed
+        aggregated_status_changed options
       end
     end
 
@@ -50,12 +50,12 @@ module RSMP
           @aggregated_status_bools[index] = on
           @aggregated_status << key if on
         end
-        aggrated_status_changed
+        aggregated_status_changed
       end
     end
 
-    def aggrated_status_changed
-      @node.aggrated_status_changed self
+    def aggregated_status_changed options={}
+      @node.aggregated_status_changed self, options
     end
  
     def alarm code:, status:

data/lib/rsmp/components.rb

@@ -8,7 +8,7 @@ module RSMP
       @components = {}
     end
 
-    def aggrated_status_changed component
+    def aggregated_status_changed component, options={}
     end
 
     def setup_components settings

data/lib/rsmp/deep_merge.rb

@@ -1,4 +1,4 @@
-class Hash 
+class Hash
   def deep_merge(other_hash)
     self.merge(other_hash) do |key, old, fresh|
       if old.is_a?(Hash) && fresh.is_a?(Hash)

data/lib/rsmp/proxy.rb

@@ -528,18 +528,6 @@ module RSMP
     def version_acknowledged
     end
 
-    def wait_for_acknowledgement original, timeout
-      raise ArgumentError unless original
-      wait_for(@acknowledgement_condition,timeout) do |message|
-        if message.is_a?(MessageNotAck) && message.attributes["oMId"] == original.m_id
-          raise RSMP::MessageRejected.new(message.attributes['rea'])
-        end
-        message.is_a?(MessageAck) && message.attributes["oMId"] == original.m_id
-      end
-    rescue Async::TimeoutError
-      raise RSMP::TimeoutError.new("Acknowledgement for #{original.type} #{original.m_id} not received within #{timeout}s")
-    end
-
     def node
       raise 'Must be overridden'
     end
@@ -547,5 +535,29 @@ module RSMP
     def author
       node.site_id
     end
+
+    def wait_for_acknowledgement parent_task, options={}, m_id
+      collect(parent_task,options.merge({
+        type: ['MessageAck','MessageNotAck'],
+        num: 1
+      })) do |message|
+        if message.is_a?(MessageNotAck)
+          if message.attribute('oMId') == m_id
+            # set result to an exception, but don't raise it.
+            # this will be returned by the task and stored as the task result
+            # when the parent task call wait() on the task, the exception
+            # will be raised in the parent task, and caught by rspec.
+            # rspec will then show the error and record the test as failed
+            m_id_short = RSMP::Message.shorten_m_id m_id, 8
+            result = RSMP::MessageRejected.new "Aggregated status request #{m_id_short} was rejected: #{message.attribute('rea')}"
+            next true   # done, no more messages wanted
+          end
+        elsif message.is_a?(MessageAck)
+          next true if message.attribute('oMId') == m_id
+        end
+        false
+      end
+    end
+
   end
 end

data/lib/rsmp/site.rb

@@ -14,6 +14,7 @@ module RSMP
       super options
       @proxies = []
       @sleep_condition = Async::Notification.new
+      @proxies_condition = Async::Notification.new
     end
 
     def site_id
@@ -30,7 +31,7 @@ module RSMP
         'sxl' => 'tlc',
         'sxl_version' => '1.0.15',
         'intervals' => {
-          'timer_' => 0.1,
+          'timer' => 0.1,
           'watchdog' => 1,
           'reconnect' => 0.1
         },
@@ -45,7 +46,6 @@ module RSMP
       }
       
       @site_settings = defaults.deep_merge options[:site_settings]
-      pp @site_settings
       check_sxl_version
       setup_components @site_settings['components']
     end
@@ -75,9 +75,9 @@ module RSMP
       SupervisorProxy.new settings
     end
 
-    def aggrated_status_changed component
+    def aggregated_status_changed component, options={}
       @proxies.each do |proxy|
-        proxy.send_aggregated_status component
+        proxy.send_aggregated_status component, options
       end
     end
 
@@ -92,9 +92,11 @@ module RSMP
         archive: @archive
       })
       @proxies << proxy
+      @proxies_condition.signal
       run_site_proxy task, proxy
     ensure
       @proxies.delete proxy
+      @proxies_condition.signal
     end
 
     def run_site_proxy task, proxy
@@ -143,5 +145,19 @@ module RSMP
       end
     end
 
+    def wait_for_supervisor ip, timeout
+      supervisor = find_supervisor ip
+      return supervisor if supervisor
+      wait_for(@proxy_condition,timeout) { find_supervisor ip }
+    rescue Async::TimeoutError
+      raise RSMP::TimeoutError.new "Supervisor '#{ip}' did not connect within #{timeout}s"
+    end
+
+    def find_supervisor ip
+      @proxies.each do |supervisor|
+        return supervisor if ip == :any || supervisor.ip == ip
+      end
+      nil
+    end
   end
 end

data/lib/rsmp/site_proxy.rb

@@ -94,7 +94,7 @@ module RSMP
       if options[:collect]
         result = nil
         task = @task.async do |task|
-          wait_for_aggregated_status task, options[:collect]
+          wait_for_aggregated_status task, options[:collect], m_id
         end
         send_message message, validate: options[:validate]
         return message, task.wait
@@ -134,7 +134,7 @@ module RSMP
       acknowledge message
     end
 
-    def aggrated_status_changed component
+    def aggregated_status_changed component, options={}
       @supervisor.aggregated_status_changed self, component
     end
 

data/lib/rsmp/site_proxy_wait.rb

@@ -2,24 +2,6 @@
 module RSMP
   module SiteProxyWait
 
-    def wait_for_status_updates parent_task, options={}, &send_block
-      send_while_collecting parent_task, send_block do |task, m_id|
-        collect_status_updates_or_responses task, 'StatusUpdate', options, m_id
-      end
-    end
-
-    def wait_for_status_responses parent_task, options={}, &send_block
-      send_while_collecting parent_task, send_block do |task, m_id|
-        collect_status_updates_or_responses task, 'StatusResponse', options, m_id
-      end
-    end
-
-    def wait_for_command_responses parent_task, options={}, &send_block
-      send_while_collecting parent_task, send_block do |task, m_id|
-        collect_command_responses task, options, m_id
-      end
-    end
-
     def wait_for_alarm parent_task, options={}
       matching_alarm = nil
       message = collect(parent_task,options.merge(type: "Alarm", with_message: true, num: 1)) do |message|
@@ -161,24 +143,7 @@ module RSMP
       true
     end
 
-    def send_while_collecting parent_task, send_block, &collect_block
-      m_id = RSMP::Message.make_m_id    # make message id so we can start waiting for it
-
-      # wait for command responses in an async task
-      task = parent_task.async do |task|
-        collect_block.call task, m_id
-      rescue StandardError => e
-        notify_error e, level: :internal
-      end
-
-       # call block, it should send command request using the given m_id
-      send_block.call m_id
-
-      # wait for the response and return it, raise exception if NotAck received, it it timed out
-      task.wait
-    end
-
-    def wait_for_aggregated_status parent_task, options={}
+    def wait_for_aggregated_status parent_task, options, m_id
       collect(parent_task,options.merge({
         type: ['AggregatedStatus','MessageNotAck'],
         num: 1

data/lib/rsmp/supervisor_proxy.rb

@@ -110,7 +110,7 @@ module RSMP
     end
 
     def reconnect_delay
-      interval = @site_settings['intervals']['watchdog']
+      interval = @site_settings['intervals']['reconnect']
       log "Waiting #{interval} seconds before trying to reconnect", level: :info
       @task.sleep interval
     end
@@ -123,15 +123,28 @@ module RSMP
       @version_determined = true
     end
 
-    def send_aggregated_status component
+    def send_aggregated_status component, options={}
+      m_id = options[:m_id] || RSMP::Message.make_m_id
       message = AggregatedStatus.new({
         "aSTS" => clock.to_s,
         "cId" =>  component.c_id,
         "fP" => 'NormalControl',
         "fS" => nil,
-        "se" => component.aggregated_status_bools
+        "se" => component.aggregated_status_bools,
+        "mId" => m_id
       })
-      send_message message
+
+      if options[:collect]
+        result = nil
+        task = @task.async do |task|
+          wait_for_acknowledgement task, options[:collect], m_id
+        end
+        send_message message, validate: options[:validate]
+        return message, task.wait
+      else
+        send_message message, validate: options[:validate]
+        message
+      end
     end
 
     def process_aggregated_status message

data/lib/rsmp/tlc.rb

@@ -69,7 +69,7 @@ module RSMP
         group.move pos
       end
       if pos == 0
-        aggrated_status_changed
+        aggregated_status_changed
       end
     end
 
@@ -798,7 +798,7 @@ module RSMP
       super options
       @sxl = 'traffic_light_controller'
       @security_codes = options[:site_settings]['security_codes']
-      @interval = options[:site_settings]['interval'] || 1
+      @interval = options[:site_settings]['intervals']['timer'] || 1
       unless @main
         raise ConfigurationError.new "TLC must have a main component"
       end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.29"
+  VERSION = "0.1.34"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.34
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async