rsmp 0.1.32 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7992be63350c61210d51f99a820314c3e8d9d7020e5e08e5000d2fb4a054e96e
-  data.tar.gz: b2b0d397391912c748fe6f1a9b7ea1896e17affaead760ac58b1df8b00355164
+  metadata.gz: a20b2e46548b2ebcdc9e3148168fafb7062113d171d88bef186900b0c8fe98a9
+  data.tar.gz: 436e96144e55742c3c9df9f549ca345c21137deb579c10d10fcefdaad1d94a39
 SHA512:
-  metadata.gz: fce26ff77f208cfe072a0f672a66e75e64d7e73fa7fe61ca28604df64a4c1039cc566340338d5734b745bfadf7fdfc9b34ed6e444a78984e97a1e009f07e68c3
-  data.tar.gz: 698e829317c201896b52ac2a3f2c2c9258d947a64b2cf3b6f3dbc82fff987881c65603d3966437b4b699d6962cf1d38d30da1b31b3d09e2c24fa19519aa2cfbc
+  metadata.gz: d2e07fc806b798e15af70789085d6c5ecf582b46dfe9ff7e5ed2cd48f8e8b2d7d74eddb66ed488150dee047d1fc3886b8d84edf7dc85976db570e89544f29160
+  data.tar.gz: 8baba395982e5c105a7e04d3a0c01c91a89ae82fb21cfd180c3fe6adf436cc4b70a437206c1f499f5c5cbfe476746d7cebd1c0b38f1354a467ff4e0f80b6904d

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.32)
+    rsmp (0.1.37)
       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/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/proxy.rb

@@ -162,6 +162,8 @@ module RSMP
           begin
             now = Clock.now
             timer(now)
+          rescue RSMP::Schemer::Error => e
+            puts "Timer: Schema error: #{e}"
           rescue EOFError => e
             log "Timer: Connection closed: #{e}", level: :warning
           rescue IOError => e
@@ -246,7 +248,7 @@ module RSMP
       # TODO
       # what schema should we use to validate the intial Version and MessageAck messages?
       schemas = { core: '3.1.5' }
-      schemas[sxl] = sxl_version if sxl
+      schemas[sxl] = RSMP::Schemer.sanitize_version(sxl_version) if sxl
       schemas
     end
 
@@ -261,7 +263,7 @@ module RSMP
       log_send message, reason
     rescue EOFError, IOError
       buffer_message message
-    rescue SchemaError => e
+    rescue SchemaError, RSMP::Schemer::Error => e
       str = "Could not send #{message.type} because schema validation failed: #{e.message}"
       log str, message: message, level: :error
       notify_error e.exception("#{str} #{message.json}")
@@ -306,7 +308,7 @@ module RSMP
       log str, message: Malformed.new(attributes), level: :warning
       # cannot send NotAcknowledged for a malformed message since we can't read it, just ignore it
       nil
-    rescue SchemaError => e
+    rescue SchemaError, RSMP::Schemer::Error => e
       str = "Received invalid #{message.type}, schema errors: #{e.message}"
       log str, message: message, level: :warning
       notify_error e.exception("#{str} #{message.json}")
@@ -528,18 +530,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 +537,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
@@ -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

@@ -36,7 +36,8 @@ module RSMP
 
     def connection_complete
       super
-      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{@site_sxl_version}", level: :info
+       sanitized_sxl_version = RSMP::Schemer.sanitize_version(@site_sxl_version)
+      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :info
     end
 
     def process_message message
@@ -94,7 +95,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 +135,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,11 +309,13 @@ 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
       @site_sxl_version = message.attribute 'SXL'
+    rescue RSMP::Schemer::UnknownSchemaError => e
+      dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 
     def sxl_version
@@ -327,8 +330,6 @@ module RSMP
       check_rsmp_version message
       check_sxl_version message
       version_accepted message
-    rescue RSMP::Schemer::UnknownSchemaError => e
-      dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 
     def check_site_ids message

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

@@ -54,7 +54,8 @@ module RSMP
 
     def connection_complete
       super
-      log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sxl_version}", level: :info
+      sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
+      log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
     end
 
@@ -123,15 +124,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
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.32"
+  VERSION = "0.1.37"
 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.32
+  version: 0.1.37
 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