rsmp 0.15.2 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cd9ae260f3226f42fd5d0e2aafbd2daefaebebe7a13863ac9a809609cf78935
-  data.tar.gz: 772ad76e47e4470b15d1245634e9dc6c477b20e41d746f258855a48230340f10
+  metadata.gz: 3e3b96502eec33d2827725a3820daf3b691c1fbb89919598c5c0193e25d5c320
+  data.tar.gz: 81ed13b87cbb060a3ca3d8006334a63d85633117356c02659c375ec0c63daaef
 SHA512:
-  metadata.gz: 0f9c480ba0ba82548ca0aa639281f7a44a7489ed096087505a1887f328bf818e83e4549b7fbe0099e83a731cc316d736d64b63b925ad993ac428ad3346990fab
-  data.tar.gz: 892f11941e75f9517b975e1d16202a48046c902febbc89d1c4463c98abe1dccb0416d2425b11af2fa771d967ce173933b476410430da22d405abd35af96031fb
+  metadata.gz: a6d131786b413cb91286f5d61c130071e95fe962bd3c7569205af57927d2409362205c39ab529cf5dc5b3f34a8c4057068da1b9f206cd5b6b97c93b7abc13094
+  data.tar.gz: 4c4419b251ef446a5a75b0acc098e51534ae3c0080e2ae4e9a1dc5a872c87696e29a491f89a75ce0245eb20a40e0fda5183e693e45a5bfe04bee944a7edac479

data/Gemfile.lock

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

data/config/tlc.yaml

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

data/lib/rsmp/proxy.rb

@@ -13,7 +13,7 @@ module RSMP
     include Inspect
     include Task
 
-    attr_reader :state, :archive, :connection_info, :sxl, :collector, :ip, :port, :node
+    attr_reader :state, :archive, :connection_info, :sxl, :collector, :ip, :port, :node, :rsmp_version
 
     def initialize options
       @node = options[:node]
@@ -28,6 +28,7 @@ module RSMP
     def disconnect
     end
 
+
     # wait for the reader task to complete,
     # which is not expected to happen before the connection is closed
     def wait_for_reader
@@ -314,12 +315,9 @@ module RSMP
     end
 
     def get_schemas
-      # normally we have an sxl, but during connection, it hasn't been established yet
-      # at these times we only validate against the core schema
-      # TODO
-      # what schema should we use to validate the initial Version and MessageAck messages?
       schemas = { core: RSMP::Schema.latest_core_version } # use latest core
-      schemas[sxl] = RSMP::Schema.sanitize_version(sxl_version) if sxl && sxl_version
+      schemas[:core] = rsmp_versions.last if rsmp_versions
+      schemas[sxl] = RSMP::Schema.sanitize_version(sxl_version.to_s) if sxl && sxl_version
       schemas
     end
 
@@ -460,7 +458,7 @@ module RSMP
     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"]
+      [@site_settings["rsmp_versions"]].flatten
     end
 
     def check_rsmp_version message

data/lib/rsmp/site.rb

@@ -18,6 +18,10 @@ module RSMP
       build_proxies
     end
 
+    def sxl_version
+      @site_settings['sxl_version']
+    end
+
     def site_id
       @site_settings['site_id']
     end
@@ -59,7 +63,7 @@ module RSMP
 
     def check_sxl_version
       sxl = @site_settings['sxl']
-      version = @site_settings['sxl_version']
+      version = @site_settings['sxl_version'].to_s
       RSMP::Schema::find_schema! sxl, version, lenient: true
     end
 

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: :log
+      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
     end
 
@@ -308,11 +308,10 @@ module RSMP
     end
 
     def check_sxl_version message
-
       # check that we have a schema for specified sxl type and version
       # note that the type comes from the site config, while the version
       # comes from the Version message send by the site
-      type = 'tlc'
+      type = @site_settings['sxl']
       version = message.attribute 'SXL'
       RSMP::Schema::find_schema! type, version, lenient: true
 
@@ -332,7 +331,6 @@ module RSMP
     def process_version message
       return extraneous_version message if @version_determined
       check_site_ids message
-      check_rsmp_version message
       check_sxl_version message
       version_accepted message
     end
@@ -341,8 +339,6 @@ module RSMP
       # RSMP support multiple site ids. we don't support this yet. instead we use the first id only
       site_id = message.attribute("siteId").map { |item| item["sId"] }.first
       @supervisor.check_site_id site_id
-      @site_id = site_id
-      setup_site_settings
       site_ids_changed
     end
 

data/lib/rsmp/supervisor.rb

@@ -138,8 +138,7 @@ module RSMP
     def peek_version_message protocol
       json = protocol.peek_line
       attributes = Message.parse_attributes json
-      message = Message.build attributes, json
-      message.attribute('siteId').first['sId']
+       Message.build attributes, json
     end
 
     # accept an incoming connecting by creating and starting a proxy
@@ -169,7 +168,9 @@ module RSMP
         archive: @archive
       }
 
-      id = peek_version_message protocol
+      version_message = peek_version_message protocol
+      id = version_message.attribute('siteId').first['sId']
+
       proxy = find_site id
       if proxy
         if proxy.connected?
@@ -182,6 +183,11 @@ module RSMP
         proxy = build_proxy settings.merge(site_id:id)    # keep the id learned by peeking above
         @proxies.push proxy
       end
+
+      proxy.setup_site_settings
+      proxy.check_rsmp_version version_message
+      log "Validating using core version #{proxy.rsmp_version}", level: :debug
+
       proxy.start     # will run until the site disconnects
       proxy.wait
     ensure

data/lib/rsmp/supervisor_proxy.rb

@@ -84,6 +84,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
+      set_state :ready
       start_watchdog
       if @site_settings['send_after_connect']
         send_all_aggregated_status

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.15.2"
+  VERSION = "0.16.2"
 end

metadata

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