rsmp 0.1.31 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f80e0af2bf0edfda1135147a08767bb2ab5bcd9af8a16275c720d31b3111277f
-  data.tar.gz: 39305d0736734baf1bbbb95a765ede6966ade096644a667478f9cb11049d3ae1
+  metadata.gz: a9146bde932fc22eeb1f696e9446d063cf98942afa46ef7a876a3ae9b5e3070a
+  data.tar.gz: 5044ef657416b04e1e6a519ded5d500d7fe6c98fcde4a1697a0e08a1540d5e3b
 SHA512:
-  metadata.gz: 4c94bb1a213635658e290d53098ee4cd7944dac8d14a1bedd14b0762755d8388344221cfd590197a45328091b1df209d519773cb335b894f23049b58f16b3a85
-  data.tar.gz: e0fd3077875214a36f2142dda0cec205266741be4e9c45e3d8283198f49e5340597bd486daeb5e8d8aeac17047dc913e70c1814386e0d5d459afd39858d37fa6
+  metadata.gz: d914ba6a4c7b2ba491999e16be4ae5d12b39ab30482952fec8b07e11ba1801f4bbc6623684c53d0d868258f60cb86b4ddc46cfd0235736d91889b0634516f9b8
+  data.tar.gz: a4d7f7fa683c31ed002d2a57c4f0a6f63f1bd99fd7703f25e72ce69d32073f1f19353476f91d7c597feb72ddcc4ff9b71e3108cf13e2bc7b9d0a1534115fcdf8

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.31)
+    rsmp (0.1.36)
       async (~> 1.28.7)
       async-io (~> 1.30.2)
       colorize (~> 0.8.1)
-      rsmp_schemer (~> 0.2.0)
+      rsmp_schemer
       thor (~> 1.0.1)
 
 GEM
@@ -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)
@@ -64,7 +64,7 @@ GEM
     nio4r (2.5.7)
     rake (13.0.1)
     regexp_parser (2.1.1)
-    rsmp_schemer (0.2.0)
+    rsmp_schemer (0.3)
       json_schemer (~> 0.2.18)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)

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
         },
@@ -52,7 +53,7 @@ module RSMP
     def check_sxl_version
       sxl = @site_settings['sxl']
       version = @site_settings['sxl_version']
-      RSMP::Schemer::find_schema! sxl, version
+      RSMP::Schemer::find_schema! sxl, version, lenient: true
     end
 
     def reconnect
@@ -74,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
 
@@ -91,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
@@ -142,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
 
@@ -308,7 +308,7 @@ module RSMP
       # comes from the Version message send by the site
       type = 'tlc'
       version = message.attribute 'SXL'
-      RSMP::Schemer::find_schema! type, version 
+      RSMP::Schemer::find_schema! type, version, lenient: true
 
       # store sxl version requested by site
       # TODO should check agaist site settings

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.rb

@@ -49,7 +49,6 @@ module RSMP
           raise RSMP::ConfigurationError.new("Configuration for site '#{site_id}' is empty")
         end
         sxl = settings['sxl']
-        sxl = 'tlc' unless sxl    # temporary fix until configs are updated
         unless sxl
           raise RSMP::ConfigurationError.new("Configuration error for site '#{site_id}': No SXL specified")
         end

data/lib/rsmp/supervisor_proxy.rb

@@ -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.31"
+  VERSION = "0.1.36"
 end

data/rsmp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-io", "~> 1.30.2"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.0.1"
-  spec.add_dependency "rsmp_schemer", "~> 0.2.0"
+  spec.add_dependency "rsmp_schemer"
 
   spec.add_development_dependency "bundler", "~> 2.2.3"
   spec.add_development_dependency "rake", "~> 13.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.36
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-02 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -70,16 +70,16 @@ dependencies:
   name: rsmp_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement