rsmp 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cd9ae260f3226f42fd5d0e2aafbd2daefaebebe7a13863ac9a809609cf78935
-  data.tar.gz: 772ad76e47e4470b15d1245634e9dc6c477b20e41d746f258855a48230340f10
+  metadata.gz: 15537491c95e5c0fc89514111d9947409bd4222b566d69df7376f545b96629a0
+  data.tar.gz: 70399d65fd90a7f0db1bdc75003a3cac47d57052190b55cc6a9a39d119451c6d
 SHA512:
-  metadata.gz: 0f9c480ba0ba82548ca0aa639281f7a44a7489ed096087505a1887f328bf818e83e4549b7fbe0099e83a731cc316d736d64b63b925ad993ac428ad3346990fab
-  data.tar.gz: 892f11941e75f9517b975e1d16202a48046c902febbc89d1c4463c98abe1dccb0416d2425b11af2fa771d967ce173933b476410430da22d405abd35af96031fb
+  metadata.gz: a44a9c93dbfb105de6620a9c42e97ad90b5a32f284f0fc38e25e47c4dff177dc60d3b5fad83812cba585fe4c1b7504afee2fa658ab24f7159dbcef99f897b8f4
+  data.tar.gz: cc77592ac84a15959438786227a602d6f81c82e4b401c48310f50440f53d72270b77f44a439b3ba2fb08ce22087375a486db8ddb71e8639b73360e3a005021e8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.15.2)
+    rsmp (0.16.0)
       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

@@ -59,7 +59,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Emil Tin