rsmp 0.16.7 → 0.16.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4baee11578e53d9753cb5db4401ceae4c7917956f016d15a1891e1024faf70bb
-  data.tar.gz: 3094c40ca669254cbeb1a496c64e07fecd9b45bd838bd8e447c734ab034b864a
+  metadata.gz: f4060389b1398d8bf006419c7536bced8d46dfdb2d6852fe1ce625d08f913eda
+  data.tar.gz: 4623b52e36898a400f82a7b9807c1437010e39509c91d3a693165a6766d75a84
 SHA512:
-  metadata.gz: e6900bed1e040dec7894fa8ead1f06a07f6a907f5010d5d68c9d263265c49bf3bb3464541790be27e9855c899d43dd57c05ac72a889c5d84efcce17038921606
-  data.tar.gz: c34670fd8da9f253bc5a1ba44b1cf20265612f35f50a7d37d64e98d80d63a697980bea5b962315e04a2cda26a2f81ff0993fb5eef21850a932372b7a732afbb4
+  metadata.gz: 8422abc49a3db9d5d9239612ff81af6cb741945e16231b96292c80bc1a6d2e072a62ddc204373a67efc3afbfb7eb9cafcbc3c060c292a589335ba6a13ed8f490
+  data.tar.gz: 5f8a271d7e76d0c0e710c457861a36260bfdd26fdbc69b66ea1035c6c6927512c1a5a8191f8e2ae0b87b763393e178fb0f72228a9d7574719bf2d6c411cff7c3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.16.7)
+    rsmp (0.16.8)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)

data/config/tlc.yaml

@@ -2,7 +2,7 @@ site_id: RN+SI0001
 supervisors:
   - ip: 127.0.0.1
     port: 12111
-rsmp_versions: '3.2'
+core_versions: '3.2'
 sxl: tlc
 sxl_version: '1.1'
 components:

data/lib/rsmp/proxy.rb

@@ -13,8 +13,7 @@ module RSMP
     include Inspect
     include Task
 
-    attr_reader :state, :archive, :connection_info, :sxl, :collector, :ip, :port, :node, :rsmp_version
-
+    attr_reader :state, :archive, :connection_info, :sxl, :collector, :ip, :port, :node, :core_version
     def initialize options
       @node = options[:node]
       initialize_logging options
@@ -316,7 +315,7 @@ module RSMP
 
     def get_schemas
       schemas = { core: RSMP::Schema.latest_core_version } # use latest core
-      schemas[:core] = rsmp_version if rsmp_version
+      schemas[:core] = core_version if core_version
       schemas[sxl] = RSMP::Schema.sanitize_version(sxl_version.to_s) if sxl && sxl_version
       schemas
     end
@@ -455,18 +454,18 @@ module RSMP
       dont_acknowledge message, "Received", "extraneous Version message"
     end
 
-    def rsmp_versions
-      return [RSMP::Schema.latest_core_version] if @site_settings["rsmp_versions"] == 'latest'
-      return RSMP::Schema.core_versions if @site_settings["rsmp_versions"] == 'all'
-      [@site_settings["rsmp_versions"]].flatten
+    def core_versions
+      return [RSMP::Schema.latest_core_version] if @site_settings["core_versions"] == 'latest'
+      return RSMP::Schema.core_versions if @site_settings["core_versions"] == 'all'
+      [@site_settings["core_versions"]].flatten
     end
 
-    def check_rsmp_version message
-      versions = rsmp_versions
+    def check_core_version message
+      versions = core_versions
       # find versions that both we and the client support
       candidates = message.versions & versions
       if candidates.any?
-        @rsmp_version = candidates.sort_by { |v| Gem::Version.new(v) }.last  # pick latest version
+        @core_version = candidates.sort_by { |v| Gem::Version.new(v) }.last  # pick latest version
       else
         raise HandshakeError.new "RSMP versions [#{message.versions.join(',')}] requested, but only [#{versions.join(',')}] supported."
       end
@@ -506,13 +505,13 @@ module RSMP
       raise RSMP::TimeoutError.new "Did not reach state #{state} within #{timeout}s"
     end
 
-    def send_version site_id, rsmp_versions
-      if rsmp_versions=='latest'
+    def send_version site_id, core_versions
+      if core_versions=='latest'
         versions = [RSMP::Schema.latest_core_version]
-      elsif rsmp_versions=='all'
+      elsif core_versions=='all'
         versions = RSMP::Schema.core_versions
       else
-        versions = [rsmp_versions].flatten
+        versions = [core_versions].flatten
       end
       versions_array = versions.map {|v| {"vers" => v} }
 
@@ -662,6 +661,5 @@ module RSMP
       log "StatusSubscribe #{short} acknowledged, allowing repeated status values for #{subscribe_list}", level: :info
       component.allow_repeat_updates subscribe_list
     end
-
   end
 end

data/lib/rsmp/site.rb

@@ -6,7 +6,7 @@ module RSMP
   class Site < Node
     include Components
 
-    attr_reader :rsmp_versions, :site_settings, :logger, :proxies
+    attr_reader :core_versions, :site_settings, :logger, :proxies
 
     def initialize options={}
       super options
@@ -32,7 +32,7 @@ module RSMP
         'supervisors' => [
           { 'ip' => '127.0.0.1', 'port' => 12111 }
         ],
-        'rsmp_versions' => 'all',
+        'core_versions' => 'all',
         'sxl' => 'tlc',
         'sxl_version' => RSMP::Schema.latest_version(:tlc),
         'intervals' => {

data/lib/rsmp/site_proxy.rb

@@ -48,7 +48,7 @@ module RSMP
     def handshake_complete
       super
       sanitized_sxl_version = RSMP::Schema.sanitize_version(@site_sxl_version)
-      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :info
+      log "Connection to site #{@site_id} established, using core #{@core_version}, #{@sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
     end
 
@@ -89,7 +89,7 @@ module RSMP
       log "Received Version message for site #{@site_id}", message: message, level: :log
       start_timer
       acknowledge message
-      send_version @site_id, rsmp_versions
+      send_version @site_id, core_versions
       @version_determined = true
     end
 

data/lib/rsmp/supervisor.rb

@@ -4,7 +4,7 @@
 
 module RSMP
   class Supervisor < Node
-    attr_reader :rsmp_versions, :site_id, :supervisor_settings, :proxies, :logger
+    attr_reader :core_versions, :site_id, :supervisor_settings, :proxies, :logger
 
     def initialize options={}
       handle_supervisor_settings( options[:supervisor_settings] || {} )
@@ -22,7 +22,7 @@ module RSMP
         'port' => 12111,
         'ips' => 'all',
         'guest' => {
-          'rsmp_versions' => 'all',
+          'core_versions' => 'all',
           'sxl' => 'tlc',
           'intervals' => {
             'timer' => 1,
@@ -37,7 +37,7 @@ module RSMP
 
       # merge options into defaults
       @supervisor_settings = defaults.deep_merge(supervisor_settings)
-      @rsmp_versions = @supervisor_settings["guest"]["rsmp_versions"]
+      @core_versions = @supervisor_settings["guest"]["core_versions"]
       check_site_sxl_types
     end
 
@@ -185,8 +185,8 @@ module RSMP
       end
 
       proxy.setup_site_settings
-      proxy.check_rsmp_version version_message
-      log "Validating using core version #{proxy.rsmp_version}", level: :debug
+      proxy.check_core_version version_message
+      log "Validating using core version #{proxy.core_version}", level: :debug
 
       proxy.start     # will run until the site disconnects
       proxy.wait

data/lib/rsmp/supervisor_proxy.rb

@@ -43,7 +43,7 @@ module RSMP
     end
 
     def start_handshake
-      send_version @site_settings['site_id'], @site_settings["rsmp_versions"]
+      send_version @site_settings['site_id'], @site_settings["core_versions"]
     end
 
     # connect to the supervisor and initiate handshake supervisor
@@ -83,7 +83,7 @@ module RSMP
 
     def handshake_complete
       sanitized_sxl_version = RSMP::Schema.sanitize_version(sxl_version)
-      log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
+      log "Connection to supervisor established, using core #{@core_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       set_state :ready
       start_watchdog
       if @site_settings['send_after_connect']
@@ -155,7 +155,7 @@ module RSMP
     end
 
     def version_accepted message
-      log "Received Version message, using RSMP #{@rsmp_version}", message: message, level: :log
+      log "Received Version message, using RSMP #{@core_version}", message: message, level: :log
       start_timer
       acknowledge message
       @version_determined = true
@@ -276,13 +276,23 @@ module RSMP
       v.to_s
     end
 
+    # get name of q field, depending on the core version we're using
+    # it changed from 'ageState' to 'q' in version 3.1.3
+    def q_key
+      if Proxy.version_requirement_met? '>=3.1.3', core_version
+        q_key = 'q'
+      else
+        q_key = 'ageState'
+      end
+    end
+
     def process_status_request message, options={}
       component_id = message.attributes["cId"]
       component = @site.find_component component_id
       log "Received #{message.type}", message: message, level: :log
       sS = message.attributes["sS"].map do |arg|
         value, quality =  component.get_status arg['sCI'], arg['n'], {sxl_version: sxl_version}
-        { "s" => rsmpify_value(value), "q" => quality.to_s }.merge arg
+        { "s" => rsmpify_value(value), q_key => quality.to_s }.merge arg
       end
       response = StatusResponse.new({
         "cId"=>component_id,
@@ -420,7 +430,7 @@ module RSMP
             sS << { "sCI" => code,
                      "n" => status_name,
                      "s" => rsmpify_value(value),
-                     "q" => quality }
+                     q_key => quality }
           end
         end
         update = StatusUpdate.new({
@@ -440,7 +450,7 @@ module RSMP
 
     def process_version message
       return extraneous_version message if @version_determined
-      check_rsmp_version message
+      check_core_version message
       check_sxl_version message
       @site_id = Supervisor.build_id_from_ip_port @ip, @port
       version_accepted message

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.16.7"
+  VERSION = "0.16.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.16.7
+  version: 0.16.8
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-22 00:00:00.000000000 Z
+date: 2022-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async