rsmp 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a5a515a9a42c794ebc27efd12ab9d87a1b0281544e06050bfe63f433bdf4a80
-  data.tar.gz: 51e2cca7f3e44cf5c4fe6447151436474f1d5001715e8a4ce54c070ce867565e
+  metadata.gz: 9614e6db6381449fa893901766de8239b7bc025c4454724709dc32b75551b5f3
+  data.tar.gz: fce1a7fb067481f5ca199301bbd91953d0dd8d13f07e66ad365a5ffa24e58966
 SHA512:
-  metadata.gz: ac5c99fb01e74f49a7bab931fefe9314c1d4279e7c0be9d688de622c60892edb0138ac72b676261fc6e86681e01e30f7b59d28ee33e853389af509b9229f5982
-  data.tar.gz: 8050ccd64dc78c49704f403fea069ab62c6f68778a3b3f2fdabba359d74620027959f8ab2bc5ce0fc22193a403301d7454a186fe01f14fd54800534ac640e541
+  metadata.gz: b942ee93f8185051dadac06576087ca8b27b11f8e3c653cb9638a72464941dd72c82c566ede50a46d2bffeb16c809345ef78b3edef7174a74d8ea75e963fa8f1
+  data.tar.gz: 0052cb6afefed493e4ac4e2d48f4c587afe3f377ddabd2492fbeb3c223ff78e39b23ac7b01cd5e564abc3474a5f8f0b35b6edc93c24c453876597c478365ac2a

data/.ruby-version

@@ -0,0 +1 @@
+3.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.7.2)
+    rsmp (0.8.0)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)
@@ -34,7 +34,7 @@ GEM
     childprocess (4.1.0)
     colorize (0.8.1)
     concurrent-ruby (1.1.9)
-    console (1.13.1)
+    console (1.14.0)
       fiber-local
     contracts (0.17)
     cucumber (6.1.0)
@@ -95,7 +95,7 @@ GEM
       thor
       thread_safe
     rake (13.0.3)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rsmp_schemer (0.3.2)
       json_schemer (~> 0.2.18)
     rspec (3.10.0)
@@ -124,6 +124,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-20
+  x86_64-darwin-21
 
 DEPENDENCIES
   aruba (~> 1.1.2)
@@ -136,4 +137,4 @@ DEPENDENCIES
   timecop (~> 0.9.4)
 
 BUNDLED WITH
-   2.2.21
+   2.2.32

data/lib/rsmp/cli.rb

@@ -3,6 +3,10 @@ require 'rsmp'
 
 module RSMP
   class CLI < Thor
+    desc "version", "Show version"
+    def version
+      puts RSMP::VERSION
+    end
 
     desc "site", "Run RSMP site"
     method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'

data/lib/rsmp/collect/collector.rb

@@ -3,7 +3,7 @@ module RSMP
   # Collects ingoing and/or outgoing messages from a notifier.
   # Can filter by message type and wakes up the client once the desired number of messages has been collected.
   class Collector < Listener
-    attr_reader :condition, :messages, :done
+    attr_reader :condition, :messages, :status, :error
 
     def initialize proxy, options={}
       super proxy, options
@@ -17,11 +17,17 @@ module RSMP
       @outgoing = options[:outgoing] == nil ? false : options[:outgoing]
       @condition = Async::Notification.new
       @title = options[:title] || [@options[:type]].flatten.join('/')
-      @options[:timeout] ||= 1
-      @options[:num] ||= 1
       reset
     end
 
+    # Clear all query results
+    def reset
+      @messages = []
+      @error = nil
+      @status = :ready
+      @why = nil
+    end
+
     # Inspect formatter that shows the message we have collected
     def inspect
       "#<#{self.class.name}:#{self.object_id}, #{inspector(:@messages)}>"
@@ -37,90 +43,108 @@ module RSMP
       @outgoing == true
     end
 
-    # Block until all messages have been collected
-    def wait
-      @condition.wait
+    # If collection is complete, return immeditatly. Otherwise wait until
+    # the desired messages have been collected, or timeout is reached.
+    def wait task
+      wait! task
+    rescue RSMP::TimeoutError
+      @status
     end
 
-    # Collect message
-    # Will block until all messages have been collected,
-    # or we time out 
-    def collect task, options={}, &block
-      @options.merge! options
-      @block = block
-      unless @done
-        listen do
-          task.with_timeout(@options[:timeout]) do
-            @condition.wait
-          end
-        end
+    # If collection is complete, return immeditatly. Otherwise wait until
+    # the desired messages have been collected.
+    # If timeout is reached, an exceptioin is raised.
+    def wait! task
+      return @status unless @status == :collecting
+      if @options[:timeout]
+        task.with_timeout(@options[:timeout]) { @condition.wait }
+      else
+        @condition.wait
       end
-      return @error if @error
-      self
+      @status
     rescue Async::TimeoutError
-      str = "#{@title.capitalize} collection"
-      str << " in response to #{options[:m_id]}" if options[:m_id]
-      str << " didn't complete within #{@options[:timeout]}s"
-      reached = progress
-      str << ", reached #{progress[:reached]}/#{progress[:need]}"
-      raise RSMP::TimeoutError.new str
+      @status = :timeout
+      raise RSMP::TimeoutError.new(describe_progress)
     end
 
-    # Return progress as collected vs. number requested
-    def progress
-      need = @options[:num]
-      reached =  @messages.size
-      { need: need, got: reached }
+    # Start collection and return immediately
+    # You can later use wait() to wait for completion
+    def start options={}, &block
+      raise RuntimeError.new("Can't begin unless ready (currenty #{@status})") unless @status == :ready
+      @options.merge! options
+      @block = block
+      raise ArgumentError.new("Num, timeout or block must be provided") unless @options[:num] || @options[:timeout] || @block
+      reset
+      @status = :collecting
+      @notifier.add_listener self if @notifier
     end
 
-    # Get the collected message.
-    def message
-      @messages.first
+    # Collect message
+    # Will return once all messages have been collected, or timeout is reached
+    def collect task, options={}, &block
+      start options, &block
+      wait task
+      @status
+    ensure
+      @notifier.remove_listener self
     end
 
-    # Get the collected messages.
-    def messages
-      @messages
+    # Build a string describing how how progress reached before timeout
+    def describe_progress
+      str = "#{@title.capitalize} collection "
+      str << "in response to #{@options[:m_id]} " if @options[:m_id]
+      str << "didn't complete within #{@options[:timeout]}s, "
+      str << "reached #{@messages.size}/#{@options[:num]}"
+      str
     end
 
-    # Clear all query results
-    def reset
-      @messages = []
-      @error = nil
-      @done = false
+    # Collect message
+    # Returns the collected messages, or raise an exception in case of a time out.
+    def collect! task, options={}, &block
+      case collect(task, options, &block)
+      when :timeout
+        raise RSMP::TimeoutError.new @why
+      else
+        @messages
+      end
     end
 
     # Check if we receive a NotAck related to initiating request, identified by @m_id.
-    def check_not_ack message
+    def reject_not_ack message
       return unless @options[:m_id]
       if message.is_a?(MessageNotAck)
         if message.attribute('oMId') == @options[:m_id]
           m_id_short = RSMP::Message.shorten_m_id @options[:m_id], 8
-          @error = RSMP::MessageRejected.new("#{@title} #{m_id_short} was rejected with '#{message.attribute('rea')}'")
-          complete
+          cancel RSMP::MessageRejected.new("#{@title} #{m_id_short} was rejected with '#{message.attribute('rea')}'")
+          true
         end
-        false
       end
     end
 
     # Handle message. and return true when we're done collecting
     def notify message
       raise ArgumentError unless message
-      raise RuntimeError.new("can't process message when already done") if @done
-      check_not_ack(message)
-      return true if @done
-      check_match message
-      complete if done?
-      @done
+      raise RuntimeError.new("can't process message when done") unless @status == :ready || @status == :collecting
+      unless reject_not_ack(message)
+        perform_match message
+      end
+      @status
     end
 
     # Match message against our collection criteria
-    def check_match message
-      matched = match? message
-      if matched == true
+    def perform_match message
+      return unless type_match?(message)
+      if @block
+        status = [@block.call(message)].flatten
+        keep message if status.include?(:keep)
+        if status.include?(:cancel)
+          cancel('Cancelled by block')
+        else
+          complete if done?
+        end
+      else
         keep message
-      elsif matched == false
-        forget message
+        complete if done?
       end
     end
 
@@ -132,8 +156,14 @@ module RSMP
     # Called when we're done collecting. Remove ourself as a listener,
     # se we don't receive message notifications anymore
     def complete
-      @done = true
-      @proxy.remove_listener self
+      @status = :ok
+      do_stop
+    end
+
+    # Remove ourself as a listener, so we don't receive message notifications anymore,
+    # and wake up the async condition
+    def do_stop
+      @notifier.remove_listener self
       @condition.signal
     end
 
@@ -143,7 +173,7 @@ module RSMP
       case error
       when RSMP::SchemaError
         notify_schema_error error, options
-      when RSMP::ConnectionError
+      when RSMP::DisconnectError
         notify_disconnect error, options
       end
     end
@@ -154,24 +184,23 @@ module RSMP
       message = options[:message]
       return unless message
       klass = message.class.name.split('::').last
-      return unless [@options[:type]].flatten.include? klass
-      @proxy.log "Collect cancelled due to schema error in #{klass} #{message.m_id_short}", level: :debug
+      return unless @options[:type] == nil || [@options[:type]].flatten.include?(klass)
+      @notifier.log "Collection cancelled due to schema error in #{klass} #{message.m_id_short}", level: :debug
       cancel error
     end
 
     # Cancel if we received e notificaiton about a disconnect
     def notify_disconnect error, options
       return unless @options.dig(:cancel,:disconnect)
-      @proxy.log "Collect cancelled due to a connection error: #{error.to_s}", level: :debug
+      @notifier.log "Collection cancelled due to a connection error: #{error.to_s}", level: :debug
       cancel error
     end
 
     # Abort collection
     def cancel error
-      @error = error if error
-      @done = false
-      @proxy.remove_listener self
-      @condition.signal
+      @error = error
+      @status = :cancelled
+      do_stop
     end
 
     # Store a message in the result array
@@ -179,30 +208,20 @@ module RSMP
       @messages << message
     end
 
-    # Remove a message from the result array
-    def forget message
-      @messages.delete message
-    end
-
     # Check a message against our match criteria
-    # Return true if there's a match
-    def match? message
-      raise ArgumentError unless message
-      return if message.direction == :in && @ingoing == false
-      return if message.direction == :out && @outgoing == false
+    # Return true if there's a match, false if not
+    def type_match? message
+      return false if message.direction == :in && @ingoing == false
+      return false if message.direction == :out && @outgoing == false
       if @options[:type]
-        return if message == nil
         if @options[:type].is_a? Array
-          return unless @options[:type].include? message.type
+          return false unless @options[:type].include? message.type
         else
-          return unless message.type == @options[:type]
+          return false unless message.type == @options[:type]
         end
       end
       if @options[:component]
-        return if message.attributes['cId'] && message.attributes['cId'] != @options[:component]
-      end
-      if @block
-        return if @block.call(message) == false
+        return false if message.attributes['cId'] && message.attributes['cId'] != @options[:component]
       end
       true
     end

data/lib/rsmp/collect/listener.rb

@@ -5,8 +5,13 @@ module RSMP
   class Listener
     include Inspect
 
-    def initialize proxy, options={}
-      @proxy = proxy
+    def initialize notifier, options={}
+      @notifier = notifier
+    end
+
+    def change_notifier notifier
+      @notifier.remove_listener self if @notifier
+      @notifier = notifier
     end
 
     def notify message
@@ -16,10 +21,10 @@ module RSMP
     end
 
     def listen &block
-      @proxy.add_listener self
+      @notifier.add_listener self
       yield
     ensure
-      @proxy.remove_listener self
+      @notifier.remove_listener self
     end
 
   end

data/lib/rsmp/collect/matcher.rb

@@ -37,9 +37,9 @@ module RSMP
 
     # Initialize with a list of wanted statuses
     def initialize proxy, want, options={}
+      raise ArgumentError.new("num option cannot be used") if options[:num]
       super proxy, options.merge( ingoing: true, outgoing: false)
       @queries = want.map { |item| build_query item }
-      @want = want
     end
 
     # Build a query object.
@@ -60,11 +60,6 @@ module RSMP
       @queries.map { |query| query.got }.compact
     end
 
-    # get the first message. Useful when you only collect one mesage
-    def message
-      @queries.first.message
-    end
-
     # Get messages from results
     def messages
       @queries.map { |query| query.message }.uniq
@@ -77,14 +72,14 @@ module RSMP
       { need: need, reached: reached }
     end
 
-    # Are there queries left to match?
+    # Are there queries left to type_match?
     def done?
       @queries.all? { |query| query.done? }
     end
 
     # Get a simplified hash of queries, with values set to either true or false,
     # indicating which queries have been matched.
-    def status
+    def query_status
       @queries.map { |query| [query.want, query.done?] }.to_h
     end
 
@@ -95,19 +90,23 @@ module RSMP
 
     # Check if a messages matches our criteria.
     # Match each query against each item in the message
-    def check_match message
-      return unless match?(message)
+    def perform_match message
+      return unless type_match?(message)
       @queries.each do |query|       # look through queries
         get_items(message).each do |item|  # look through items in message
-          matched = query.check_match(item,message)
+          matched = query.perform_match(item,message)
+          if matched == true
+            matched = @block.call(message,item) if @block
+          end
           if matched != nil
             type = {true=>'match',false=>'mismatch'}[matched]
-            @proxy.log "#{@title.capitalize} #{message.m_id_short} collect #{type} #{query.want}, item #{item}", level: :debug
+            @notifier.log "#{@title.capitalize} #{message.m_id_short} collect #{type} #{query.want}, item #{item}", level: :debug
             break
           end
         end
       end
-      @proxy.log "#{@title.capitalize} collect reached #{summary}", level: :debug
+      complete if done?
+      @notifier.log "#{@title.capitalize} collect reached #{summary}", level: :debug
     end
   end
 end

data/lib/rsmp/collect/message_collector.rb

@@ -0,0 +1,209 @@
+module RSMP
+
+  # Collects ingoing and/or outgoing messages from a notifier.
+  # Can filter by message type and wakes up the client once the desired number of messages has been collected.
+  class MessageCollector < Collector
+    attr_reader :condition, :messages, :done
+
+    def initialize proxy, options={}
+      super proxy, options
+      @options = {
+        cancel: {
+          schema_error: true,
+          disconnect: false,
+        }
+      }.deep_merge options
+      @ingoing = options[:ingoing] == nil ? true  : options[:ingoing]
+      @outgoing = options[:outgoing] == nil ? false : options[:outgoing]
+      @condition = Async::Notification.new
+      @title = options[:title] || [@options[:type]].flatten.join('/')
+      @options[:timeout] ||= 1
+      @options[:num] ||= 1
+      reset
+    end
+
+    # Inspect formatter that shows the message we have collected
+    def inspect
+      "#<#{self.class.name}:#{self.object_id}, #{inspector(:@messages)}>"
+    end
+
+    # Want ingoing messages?
+    def ingoing?
+      @ingoing == true
+    end
+
+    # Want outgoing messages?
+    def outgoing?
+      @outgoing == true
+    end
+
+    # Block until all messages have been collected
+    def wait
+      @condition.wait
+    end
+
+    # Collect message
+    # Will block until all messages have been collected,
+    # or we time out
+    def collect task, options={}, &block
+      @options.merge! options
+      @block = block
+      unless @done
+        listen do
+          task.with_timeout(@options[:timeout]) do
+            @condition.wait
+          end
+        end
+      end
+      return @error if @error
+      self
+    rescue Async::TimeoutError
+      str = "#{@title.capitalize} collection"
+      str << " in response to #{options[:m_id]}" if options[:m_id]
+      str << " didn't complete within #{@options[:timeout]}s"
+      reached = progress
+      str << ", reached #{progress[:reached]}/#{progress[:need]}"
+      raise RSMP::TimeoutError.new str
+    end
+
+    # Return progress as collected vs. number requested
+    def progress
+      need = @options[:num]
+      reached =  @messages.size
+      { need: need, got: reached }
+    end
+
+    # Get the collected message.
+    def message
+      @messages.first
+    end
+
+    # Get the collected messages.
+    def messages
+      @messages
+    end
+
+    # Clear all query results
+    def reset
+      @messages = []
+      @error = nil
+      @done = false
+    end
+
+    # Check if we receive a NotAck related to initiating request, identified by @m_id.
+    def check_not_ack message
+      return unless @options[:m_id]
+      if message.is_a?(MessageNotAck)
+        if message.attribute('oMId') == @options[:m_id]
+          m_id_short = RSMP::Message.shorten_m_id @options[:m_id], 8
+          @error = RSMP::MessageRejected.new("#{@title} #{m_id_short} was rejected with '#{message.attribute('rea')}'")
+          complete
+        end
+        false
+      end
+    end
+
+    # Handle message. and return true when we're done collecting
+    def notify message
+      raise ArgumentError unless message
+      raise RuntimeError.new("can't process message when already done") if @done
+      check_not_ack(message)
+      return true if @done
+      perform_match message
+      complete if done?
+      @done
+    end
+
+    # Match message against our collection criteria
+    def perform_match message
+      matched = type_match?(message) && block_match?(message)
+      if matched == true
+        keep message
+      elsif matched == false
+        forget message
+      end
+    end
+
+    # Have we collected the required number of messages?
+    def done?
+      @options[:num] && @messages.size >= @options[:num]
+    end
+
+    # Called when we're done collecting. Remove ourself as a listener,
+    # se we don't receive message notifications anymore
+    def complete
+      @done = true
+      @proxy.remove_listener self
+      @condition.signal
+    end
+
+    # The proxy experienced some error.
+    # Check if this should cause us to cancel.
+    def notify_error error, options={}
+      case error
+      when RSMP::SchemaError
+        notify_schema_error error, options
+      when RSMP::ConnectionError
+        notify_disconnect error, options
+      end
+    end
+
+    # Cancel if we received e schema error for a message type we're collecting
+    def notify_schema_error error, options
+      return unless @options.dig(:cancel,:schema_error)
+      message = options[:message]
+      return unless message
+      klass = message.class.name.split('::').last
+      return unless [@options[:type]].flatten.include? klass
+      @proxy.log "Collect cancelled due to schema error in #{klass} #{message.m_id_short}", level: :debug
+      cancel error
+    end
+
+    # Cancel if we received e notificaiton about a disconnect
+    def notify_disconnect error, options
+      return unless @options.dig(:cancel,:disconnect)
+      @proxy.log "Collect cancelled due to a connection error: #{error.to_s}", level: :debug
+      cancel error
+    end
+
+    # Abort collection
+    def cancel error
+      @error = error if error
+      @done = false
+      @proxy.remove_listener self
+      @condition.signal
+    end
+
+    # Store a message in the result array
+    def keep message
+      @messages << message
+    end
+
+    # Remove a message from the result array
+    def forget message
+      @messages.delete message
+    end
+
+    # Check a message against our match criteria
+    # Return true if there's a match, false if not
+    def type_match? message
+      return false if message.direction == :in && @ingoing == false
+      return false if message.direction == :out && @outgoing == false
+      if @options[:type]
+        if @options[:type].is_a? Array
+          return false unless @options[:type].include? message.type
+        else
+          return false unless message.type == @options[:type]
+        end
+      end
+      if @options[:component]
+        return false if message.attributes['cId'] && message.attributes['cId'] != @options[:component]
+      end
+      true
+    end
+  end
+
+  def block_match? message
+    @block.call(message) == true
+  end
+end

data/lib/rsmp/collect/message_queries.rb

@@ -14,7 +14,7 @@ module RSMP
     end
   end
 
-  # Match a specific status response or update 
+  # Match a specific status response or update
   class StatusQuery < Query
     # Match a status value against a query
     def match? item

data/lib/rsmp/collect/query.rb

@@ -1,5 +1,5 @@
 module RSMP
-    
+
   # Class that matches a single status or command item
   class Query
     attr_reader :want, :got, :message
@@ -18,7 +18,7 @@ module RSMP
 
     # Check an item and set @done to true if it matches
     # Store the item and corresponding message if there's a positive or negative match
-    def check_match item, message
+    def perform_match item, message
       matched = match? item
       if matched != nil
         @message = message

data/lib/rsmp/error.rb

@@ -41,7 +41,7 @@ module RSMP
 	class TimeoutError < Error
 	end
 
-	class DisonnectError < Error
+	class DisconnectError < Error
 	end
 
 	class ConnectionError < Error

data/lib/rsmp/logger.rb

@@ -50,7 +50,7 @@ module RSMP
         'statuses' => ['StatusRequest','StatusSubscribe','StatusUnsubscribe','StatusResponse','StatusUpdate'],
         'commands' => ['CommandRequest','CommandResponse'],
         'watchdogs' => 'Watchdog',
-        'alarms' => ['AlarmIssue','AlarmRequest','AlarmAcknowledged','AlarmSuspend','AlarmResume'],
+        'alarms' => ['Alarm'],
         'aggregated_status' => ['AggregatedStatus','AggregatedStatusRequest']
       }
 
@@ -105,12 +105,10 @@ module RSMP
 
       if item[:message]
         type = item[:message].type
-        ack = type == "MessageAck" || type == "MessageNotAck"
+        ack = (type == "MessageAck" || type == "MessageNotAck")
         @ignorable.each_pair do |key,types|
-          next unless types
           ignore = [types].flatten
           if @settings[key] == false
-            #p [type,ignore_type, [ignore_type].flatten.include?(type)]
             return false if ignore.include?(type)
             if ack
               return false if item[:message].original && ignore.include?(item[:message].original.type)

data/lib/rsmp/node.rb

@@ -6,7 +6,7 @@ module RSMP
     include Wait
     include Inspect
 
-    attr_reader :archive, :logger, :task, :deferred, :error_queue, :clock
+    attr_reader :archive, :logger, :task, :deferred, :error_queue, :clock, :collector
 
     def initialize options
       initialize_logging options
@@ -15,6 +15,8 @@ module RSMP
       @clock = Clock.new
       @error_queue = Async::Queue.new
       @ignore_errors = []
+      options[:collector]
+      @collect = options[:collect]
     end
 
     def ignore_errors classes, &block

data/lib/rsmp/proxy.rb

@@ -15,9 +15,8 @@ module RSMP
 
     def initialize options
       initialize_logging options
-      setup options
       initialize_distributor
-      prepare_collection @settings['collect']
+      setup options
       clear
     end
 
@@ -37,6 +36,10 @@ module RSMP
       @sxl = nil
       @site_settings = nil  # can't pick until we know the site id
       @state = :stopped
+      if options[:collect]
+        @collector = RSMP::Collector.new self, options[:collect]
+        @collector.start
+      end
     end
 
     def inspect
@@ -49,13 +52,6 @@ module RSMP
       node.clock
     end
 
-    def prepare_collection num
-      if num
-        @collector = RSMP::Collector.new self, num: num, ingoing: true, outgoing: true
-        add_listener @collector
-      end
-    end
-
     def collect task, options, &block
       collector = RSMP::Collector.new self, options
       collector.collect task, &block
@@ -86,7 +82,7 @@ module RSMP
       return if @state == :stopped
       set_state :stopping
       stop_tasks
-      notify_error DisonnectError.new("Connection was closed")
+      notify_error DisconnectError.new("Connection was closed")
     ensure
       close_socket
       clear

data/lib/rsmp/site_proxy.rb

@@ -101,15 +101,8 @@ module RSMP
           "cId" => component,
           "mId" => m_id
       })
-      if options[:collect]
-        task = @task.async do |task|
-          collect_aggregated_status task, options[:collect].merge(m_id: m_id)
-        end
-        send_message message, validate: options[:validate]
-        return message, task.wait
-      else
-        send_message message, validate: options[:validate]
-        message
+      send_and_collect_if_needed message, options do |task|
+        collect_aggregated_status task, options[:collect].merge(m_id: m_id, num:1)
       end
     end
 
@@ -181,7 +174,7 @@ module RSMP
           "sS" => request_list,
           "mId" => m_id
       })
-      send_while_collecting message, options do |task|
+      send_and_collect_if_needed message, options do |task|
         collect_status_responses task, status_list, options[:collect].merge(m_id: m_id)
       end
     end
@@ -193,11 +186,15 @@ module RSMP
       acknowledge message
     end
 
-    def send_while_collecting message, options, &block
-      task = @task.async { |task| yield task } if options[:collect]
-      send_message message, validate: options[:validate]
-      return message, task.wait if task
-      message
+    def send_and_collect_if_needed message, options, &block
+      if options[:collect]
+        task = @task.async { |task| yield task }
+        send_message message, validate: options[:validate]
+        { sent: message, collector: task.wait }
+      else
+        send_message message, validate: options[:validate]
+        return { sent: message }
+      end
     end
 
     def subscribe_to_status component_id, status_list, options={}
@@ -218,7 +215,7 @@ module RSMP
           "sS" => subscribe_list,
           'mId' => m_id
       })
-      send_while_collecting message, options do |task|
+      send_and_collect_if_needed message, options do |task|
          collect_status_updates task, status_list, options[:collect].merge(m_id: m_id)
       end
     end
@@ -264,7 +261,7 @@ module RSMP
           "arg" => command_list,
           "mId" => m_id
       })
-      send_while_collecting message, options do |task|
+      send_and_collect_if_needed message, options do |task|
         collect_command_responses task, command_list, options[:collect].merge(m_id: m_id)
       end
     end
@@ -352,19 +349,27 @@ module RSMP
     end
 
     def collect_status_updates task, status_list, options
-      StatusUpdateMatcher.new(self, status_list, options).collect task
+      collector = StatusUpdateMatcher.new(self, status_list, options)
+      collector.collect task
+      collector
     end
 
     def collect_status_responses task, status_list, options
-      StatusResponseMatcher.new(self, status_list, options).collect task
+      collector = StatusResponseMatcher.new(self, status_list, options)
+      collector.collect task
+      collector
     end
 
     def collect_command_responses task, command_list, options
-      CommandResponseMatcher.new(self, command_list, options).collect task
+      collector = CommandResponseMatcher.new(self, command_list, options)
+      collector.collect task
+      collector
     end
 
     def collect_aggregated_status task, options
-      AggregatedStatusMatcher.new(self, options).collect task
+      collector = AggregatedStatusMatcher.new(self, options)
+      collector.collect task
+      collector
     end
   end
 end

data/lib/rsmp/supervisor.rb

@@ -7,7 +7,6 @@ module RSMP
     attr_reader :rsmp_versions, :site_id, :supervisor_settings, :proxies, :logger
 
     def initialize options={}
-
       handle_supervisor_settings( options[:supervisor_settings] || {} )
       super options
       @proxies = []
@@ -161,7 +160,7 @@ module RSMP
         ip: info[:ip],
         port: info[:port],
         task: @task,
-        settings: {'collect'=>@supervisor_settings['collect']},
+        collect: @collect,
         socket: socket,
         stream: stream,
         protocol: protocol,

data/lib/rsmp/supervisor_proxy.rb

@@ -244,10 +244,13 @@ module RSMP
       @status_subscriptions[component] ||= {}
       update_list[component] ||= {} 
       now = Time.now  # internal timestamp
+      subs = @status_subscriptions[component]
 
       message.attributes["sS"].each do |arg|
         sCI = arg["sCI"]
         subcription = {interval: arg["uRt"].to_i, last_sent_at: now}
+        subs[sCI] ||= {}
+        subs[sCI][arg["n"]] = subcription
         update_list[component][sCI] ||= []
         update_list[component][sCI] << arg["n"]
       end
@@ -279,11 +282,7 @@ module RSMP
     end
 
     def fetch_last_sent_status component, code, name
-      if @last_status_sent && @last_status_sent[component] && @last_status_sent[component][code]
-        @last_status_sent[component][code][name]
-      else
-        nil
-      end
+      @last_status_sent.dig component, code, name
     end
 
     def store_last_sent_status message
@@ -307,10 +306,12 @@ module RSMP
         by_code.each_pair do |code,by_name|
           by_name.each_pair do |name,subscription|
             current = nil
+            should_send = false
             if subscription[:interval] == 0 
               # send as soon as the data changes
               if component_object
                 current, age = *(component_object.get_status code, name)
+                current = current.to_s
               end
               last_sent = fetch_last_sent_status component, code, name
               if current != last_sent

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.7.2"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-18 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -189,6 +189,7 @@ files:
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -208,6 +209,7 @@ files:
 - lib/rsmp/collect/collector.rb
 - lib/rsmp/collect/listener.rb
 - lib/rsmp/collect/matcher.rb
+- lib/rsmp/collect/message_collector.rb
 - lib/rsmp/collect/message_matchers.rb
 - lib/rsmp/collect/message_queries.rb
 - lib/rsmp/collect/notifier.rb
@@ -262,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.