rsmp 0.15.1 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54f63cca69dba59878ba09d7463f4767f8489ce53b29139d6acb57c4fc2e5d1e
-  data.tar.gz: f28e12b4230f0c7cb545b9519fbdef68df0179f5e668989689ba83d13f5ce9b6
+  metadata.gz: 837b10c5d2e9549d0a30d5d27cc997622db9290cc9a6e559f84201625c84a266
+  data.tar.gz: 1b7fe703dc1c60f05cfeaacd0ff290dac0684a1dabe851cef624f1309eeca11c
 SHA512:
-  metadata.gz: 415b6caa24f354c51ad61ddc46b06325e7d9dde714186217db142e3cf73e18a3aedecc4a400ab432f5edf14a236163005b7618a4ca2ab63f8d9610440b843d78
-  data.tar.gz: 398baeed8be6a5918546c2954590c4dead4919b613bbf71ea03ec2dae2d2cdf3155c92598c0151869c36e48b635b6a232e0b6ec093a283493e3398962dcbb688
+  metadata.gz: 2a28c3dba00e688d988173e6ca73121b25bac653b2a1906a33292a17e950a47de28e1218327505464ea5706c4474725c15f4324992c9af641a945274760968ce
+  data.tar.gz: 1d9600064f773fbc70aa64cc0aabaf1b64091623a9ba7669af8676369f527831ab2df595c51b10e924ed2ae1f4f34bcd92486af7d7b940b23b304caa426bc332

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.15.1)
+    rsmp (0.16.1)
       async (~> 1.30.3)
       async-io (~> 1.33.0)
       colorize (~> 0.8.1)
-      rsmp_schema (~> 0.2.5)
+      rsmp_schema (~> 0.3.1)
       thor (~> 1.2.1)
 
 GEM
@@ -80,7 +80,7 @@ GEM
     nio4r (2.5.8)
     rake (13.0.6)
     regexp_parser (2.5.0)
-    rsmp_schema (0.2.5)
+    rsmp_schema (0.3.1)
       json_schemer (~> 0.2.21)
       thor (~> 1.2.1)
     rspec (3.10.0)
@@ -100,7 +100,7 @@ GEM
       ffi (~> 1.1)
     thor (1.2.1)
     timecop (0.9.5)
-    timers (4.3.3)
+    timers (4.3.4)
     uri_template (0.7.0)
 
 PLATFORMS

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.1"
+  VERSION = "0.16.1"
 end

data/rsmp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-io", "~> 1.33.0"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.2.1"
-  spec.add_dependency "rsmp_schema", "~> 0.2.5"
+  spec.add_dependency "rsmp_schema", "~> 0.3.1"
 
   spec.add_development_dependency "bundler", "~> 2.3.7"
   spec.add_development_dependency "rake", "~> 13.0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.1
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.5
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement