rsmp 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a60faacf7dbd02175c26ff74a0576bcba1eae29d7ac53973ed4991a8952d94d3
-  data.tar.gz: dffbf77a1385be65a90e1b6ebd8edd8a109bd27ee54eeee5d9d3651c64f10abc
+  metadata.gz: a436495b7890003c9c745d9539326867be2604dc31308042d6f9fa982d8a1595
+  data.tar.gz: '083589d05fe1fcff4ffcdd79e92ae4c34b9d8383257005ef316fb265ab5a24af'
 SHA512:
-  metadata.gz: a117f1ddeb790ff61d550359bfa28445b13322b66155c6f213035c7a4f01c27cecb0ea1229c2891125e26e06a54314b9fd8f1002b36bd2c8925daa5f630225e7
-  data.tar.gz: 6e6f9a2e1da0296d9f635b5e07fb74efecaa84b819a7ac16fea84c144a1d48804a3582e4e39de367c5d7fc0ba23da83e30e6650af907848fbc81b309d123dd90
+  metadata.gz: f443511ee9ea01faa4189f84182208362ad25f7a7d483198126b00b78de5454cd1a092ccd8348664553c31502497c4ec3f1df295d7daa7eaa53e22bd8298521b
+  data.tar.gz: 49436d1f1e79fec40b5a0a6f4482e4af29edac9b097380b0cf3359f1a35174a89234a3ea227a99767adb8931640383f5cca81e18105a9f00a44f7edaa11bc5c5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.5.1)
+    rsmp (0.5.5)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)

data/config/supervisor.yaml

@@ -17,7 +17,7 @@ log:
   port: true
   site_id: true
   text: true
-  direction: true
+  direction: false
   level: false
   debug: true
   json: true

data/config/tlc.yaml

@@ -40,7 +40,7 @@ log:
   level: false
   debug: true
   text: true
-  direction: true
+  direction: false
   json: true
   acknowledgements: false
   watchdogs: false

data/lib/rsmp/collect/collector.rb

@@ -61,9 +61,18 @@ module RSMP
       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

data/lib/rsmp/collect/matcher.rb

@@ -70,6 +70,13 @@ module RSMP
       @queries.map { |query| query.message }.uniq
     end
 
+    # Return progress as completes queries vs. total number of queries
+    def progress
+      need = @queries.size
+      reached =  @queries.count { |query| query.done? }
+      { need: need, reached: reached }
+    end
+
     # Are there queries left to match?
     def done?
       @queries.all? { |query| query.done? }

data/lib/rsmp/collect/notifier.rb

@@ -16,12 +16,17 @@ module RSMP
       @notify_queue = []
     end
 
+    def clear_deferred_notify &block
+      @notify_queue = []
+    end
+
     def deferred_notify &block
       was, @defer_notify = @defer_notify, true
       yield
       dequeue_notify
     ensure
       @defer_notify = was
+      @notify_queue = []
     end
 
     def dequeue_notify

data/lib/rsmp/component.rb

@@ -1,4 +1,9 @@
 module RSMP
+
+  # Class that represents an RMSP component.
+  # Currently this class is used by both SiteProxy and SupervisorProxy, and can
+  # therefore represent either a local or remote (proxy) component.
+
   class Component
     include Inspect
 
@@ -19,6 +24,7 @@ module RSMP
       @grouped = grouped
       @alarms = {}
       @statuses = {}
+      @subscribes = {}
       clear_aggregated_status
     end
 
@@ -83,5 +89,74 @@ module RSMP
         @alarms[code] = message
       end
     end
+
+    # Handle an incoming status respone, by storing the values
+    def handle_status_response message
+      store_status message, check_repeated: false
+    end
+
+    # Handle an incoming status update, by storing the values
+    def handle_status_update message
+      store_status message, check_repeated: true
+    end
+
+    # Our proxy subscribed to status updates
+    # Store update rates, so we can check for repeated alarm if we asked for updates only
+    # when there's a change, not on a regular interval.
+    # After subscribing, an update status us send regarless of whether values changes,
+    # and we store that.
+    def handle_status_subscribe status_list
+      status_list.each do |item|
+        sCI, n, uRt = item['sCI'], item['n'], item['uRt']
+
+        # record the update rate, so we can check for repeated status values if rate is zero
+        @subscribes[sCI] ||= {}
+        @subscribes[sCI][n] = {'uRt'=>uRt}
+
+        # record that we expect an upeate, even though the value might not change
+        @statuses[sCI] ||= {}
+        @statuses[sCI][n] ||= {}
+        @statuses[sCI][n][:initial] = true
+      end
+      #pp @subscribes
+    end
+
+    # Our proxy unsubscribed to status updates.
+    # Update our list of update rates.
+    def handle_status_unsubscribe status_list
+      status_list.each do |item|
+        sCI, n = item['sCI'], item['n']
+        if @subscribes[sCI]
+          @subscribes[sCI].delete n
+        end
+        if @subscribes[sCI].empty?
+          @subscribes.delete sCI
+        end
+
+        # remove any mark that would allow the next update to be a repeat
+        item = @statuses.dig sCI, n
+        item.delete(:initial) if item
+      end
+    end
+
+    # Store the latest status update values, optionally
+    # checking that we're not receiving unchanged values if we're subscribed
+    # wit updates only on change
+    def store_status message, check_repeated:
+      message.attribute('sS').each do |item|
+        sCI, n, s, q = item['sCI'], item['n'], item['s'], item['q']
+        uRt = @subscribes.dig(sCI,n,'uRt')
+        new_values = {'s'=>s,'q'=>q}
+        old_values = @statuses.dig(sCI,n)
+        if check_repeated && uRt.to_i == 0
+          if new_values == old_values
+            raise RSMP::RepeatedStatusError.new "no change for #{sCI} '#{n}'"
+          end
+        end
+        @statuses[sCI] ||= {}
+        @statuses[sCI][n] = new_values
+      end
+    end
+
   end
 end

data/lib/rsmp/error.rb

@@ -58,4 +58,7 @@ module RSMP
 
 	class RepeatedAlarmError < Error
 	end
+
+	class RepeatedStatusError < Error
+	end
 end

data/lib/rsmp/logger.rb

@@ -159,9 +159,9 @@ module RSMP
       unless @settings["id"] == false
         length = 4
         if item[:message]
-          parts << Logger.shorten_message_id(item[:message].m_id,length)+' '
+          parts << Logger.shorten_message_id(item[:message].m_id,length).ljust(length)
         else
-          parts << " "*(length+1)
+          parts << ''.ljust(length)
         end
       end
       parts << item[:str].to_s.strip unless @settings["text"] == false
@@ -172,8 +172,10 @@ module RSMP
         parts << item[:exception].backtrace.join("\n")
       end
 
-      out = parts.join(' ').chomp(' ')
-      out
+      parts.map do |s|
+        next '-'.ljust(s.length) if s !~ /\S/  # replace the first char with a dash if string is all whitespace
+        s
+      end.join(' ').rstrip
     end
 
   end

data/lib/rsmp/node.rb

@@ -38,6 +38,10 @@ module RSMP
     def do_deferred item
     end
 
+    def clear_deferred
+      @deferred.clear
+    end    
+
     def do_start task
       task.annotate self.class.to_s
       @task = task

data/lib/rsmp/proxy.rb

@@ -350,7 +350,7 @@ module RSMP
     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}"), message: message
+      notify_error e.exception(str), message: message
       dont_acknowledge message, str
       message
     rescue InvalidMessage => e
@@ -360,10 +360,12 @@ module RSMP
       message
     rescue FatalError => e
       str = "Rejected #{message.type},"
-      notify_error e.exception("#{str} #{message.json}"), message: message
+      notify_error e.exception(str), message: message
       dont_acknowledge message, str, "#{e.message}"
       stop
       message
+    ensure
+      node.clear_deferred
     end
 
     def process_message message

data/lib/rsmp/site_proxy.rb

@@ -68,6 +68,10 @@ module RSMP
         else
           super message
       end
+    rescue RSMP::RepeatedAlarmError, RSMP::RepeatedStatusError => e
+      str = "Rejected #{message.type} message,"
+      dont_acknowledge message, str, "#{e}"
+      notify_error e.exception("#{str}#{e.message} #{message.json}")
     end
 
     def process_command_response message
@@ -145,10 +149,6 @@ module RSMP
       asp = message.attribute("aSp")
       log "Received #{message.type}, #{alarm_code} #{asp} [#{status}]", message: message, level: :log
       acknowledge message
-    rescue RSMP::RepeatedAlarmError => e
-      str = "Rejected #{message.type} message, "
-      dont_acknowledge message, str, "#{e}"
-      notify_error e.exception("#{str}#{e.message} #{message.json}")
     end
 
     def version_acknowledged
@@ -187,6 +187,8 @@ module RSMP
     end
 
     def process_status_response message
+      component = find_component message.attribute("cId")
+      component.handle_status_response message
       log "Received #{message.type}", message: message, level: :log
       acknowledge message
     end
@@ -198,7 +200,7 @@ module RSMP
       message
     end
 
-    def subscribe_to_status component, status_list, options={}
+    def subscribe_to_status component_id, status_list, options={}
       validate_ready 'subscribe to status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
       
@@ -206,10 +208,13 @@ module RSMP
       # but must to remove from the subscribe message
       subscribe_list = status_list.map { |item| item.slice('sCI','n','uRt') }
 
+      component = find_component component_id
+      component.handle_status_subscribe subscribe_list
+
       message = RSMP::StatusSubscribe.new({
           "ntsOId" => '',
           "xNId" => '',
-          "cId" => component,
+          "cId" => component_id,
           "sS" => subscribe_list,
           'mId' => m_id
       })
@@ -218,12 +223,15 @@ module RSMP
       end
     end
 
-    def unsubscribe_to_status component, status_list, options={}
+    def unsubscribe_to_status component_id, status_list, options={}
+      component = find_component component_id
+      component.handle_status_subscribe status_list
+
       validate_ready 'unsubscribe to status'
       message = RSMP::StatusUnsubscribe.new({
           "ntsOId" => '',
           "xNId" => '',
-          "cId" => component,
+          "cId" => component_id,
           "sS" => status_list
       })
       send_message message, validate: options[:validate]
@@ -231,6 +239,8 @@ module RSMP
     end
 
     def process_status_update message
+      component = find_component message.attribute("cId")
+      component.handle_status_update message
       log "Received #{message.type}", message: message, level: :log
       acknowledge message
     end

data/lib/rsmp/supervisor.rb

@@ -175,7 +175,6 @@ module RSMP
         if proxy.connected?
           raise ConnectionError.new("Site #{id} alredy connected from port #{proxy.port}")
         else
-          p proxy.state
           proxy.revive settings
         end
       else

data/lib/rsmp/supervisor_proxy.rb

@@ -225,7 +225,6 @@ module RSMP
     def process_status_subcribe message
       log "Received #{message.type}", message: message, level: :log
 
-
       # @status_subscriptions is organized by component/code/name, for example:
       #
       # {"AA+BBCCC=DDDEE002"=>{"S001"=>["number"]}}
@@ -234,21 +233,14 @@ module RSMP
       # for each component, containing all the requested statuses
 
       update_list = {}
-
       component = message.attributes["cId"]
-      
       @status_subscriptions[component] ||= {}
       update_list[component] ||= {} 
-
-      subs = @status_subscriptions[component]
       now = Time.now  # internal timestamp
 
       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
@@ -287,11 +279,15 @@ module RSMP
       end
     end
 
-    def store_last_sent_status component, code, name, value
+    def store_last_sent_status message
+      component_id = message.attribute('cId')
       @last_status_sent ||= {}
-      @last_status_sent[component] ||= {}
-      @last_status_sent[component][code] ||= {}
-      @last_status_sent[component][code][name] = value
+      @last_status_sent[component_id] ||= {}
+      message.attribute('sS').each do |item|
+        sCI, n, s = item['sCI'], item['n'], item['s']
+        @last_status_sent[component_id][sCI] ||= {}
+        @last_status_sent[component_id][sCI][n] = s
+      end
     end
 
     def status_update_timer now
@@ -312,7 +308,6 @@ module RSMP
               last_sent = fetch_last_sent_status component, code, name
               if current != last_sent
                 should_send = true
-                store_last_sent_status component, code, name, current
               end
             else
               # send at regular intervals
@@ -356,6 +351,7 @@ module RSMP
           "sS"=>sS
         })
         send_message update
+        store_last_sent_status update
       end
     end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.5.1"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.5
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-05 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -258,7 +258,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.