rsmp 0.1.34 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0b29c33b11951327d41c6ee7fe019d4c7fff8a9e8b7b82da4919dc2935797b4
-  data.tar.gz: 131fbd58b3bff50cfec9d4c90026a5485a2ffb2c84b930429b922555fa7a7037
+  metadata.gz: c4ea2e3bcba66863455973b133f9f1a5147b3dc64f77b9af58e6056dd75abda1
+  data.tar.gz: 4542eb7ac8b9d5c344f01f363ddb906487d3e52ecdef8491b55ec711f6fc0b87
 SHA512:
-  metadata.gz: 91c4d3d0d68f1aee82f3026ad39a3910dee30d7161fd866a45c22370cd05260bd380f6ab2c249e7aaa6fc8b1513e792c74bb0f7eec4fdd1ba636bc841d8c2a93
-  data.tar.gz: d15ff60e2d2df3b8b900b23da741d6eb6dba4a62a2512459caa4dab59f8a20b109131314376fb41c01112d01e6929e70135d25fa406b4a37fb831329d13bc5f0
+  metadata.gz: d2a164e9aeafa7936cc7e3b61d2b22b9417bc534d45a5842b06c93b7b057e235d127d9465838882f1f399897904b7f819c3b083c910418d416e71c81cff1b991
+  data.tar.gz: 38cd5ef14dc5ef9d4e36ff21046eb3fcd9677e586f3754a875632e0ec74a80dbc5fa646c2c1781bf0532d4c5a080dde88831f07f9901a368e42c5e865b4a06fc

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.34)
+    rsmp (0.1.39)
       async (~> 1.28.7)
       async-io (~> 1.30.2)
       colorize (~> 0.8.1)
-      rsmp_schemer (~> 0.2.0)
+      rsmp_schemer
       thor (~> 1.0.1)
 
 GEM
@@ -64,7 +64,7 @@ GEM
     nio4r (2.5.7)
     rake (13.0.1)
     regexp_parser (2.1.1)
-    rsmp_schemer (0.2.0)
+    rsmp_schemer (0.3.1)
       json_schemer (~> 0.2.18)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)

data/lib/rsmp/collector.rb

@@ -45,9 +45,11 @@ module RSMP
       @options[:timeout] = options[:timeout] if options[:timeout]
       @block = block
 
-      listen do
-        task.with_timeout(@options[:timeout]) do
-          @condition.wait
+      unless @done
+        listen do
+          task.with_timeout(@options[:timeout]) do
+            @condition.wait
+          end
         end
       end
 

data/lib/rsmp/proxy.rb

@@ -162,6 +162,8 @@ module RSMP
           begin
             now = Clock.now
             timer(now)
+          rescue RSMP::Schemer::Error => e
+            puts "Timer: Schema error: #{e}"
           rescue EOFError => e
             log "Timer: Connection closed: #{e}", level: :warning
           rescue IOError => e
@@ -246,7 +248,7 @@ module RSMP
       # TODO
       # what schema should we use to validate the intial Version and MessageAck messages?
       schemas = { core: '3.1.5' }
-      schemas[sxl] = sxl_version if sxl
+      schemas[sxl] = RSMP::Schemer.sanitize_version(sxl_version) if sxl
       schemas
     end
 
@@ -261,7 +263,7 @@ module RSMP
       log_send message, reason
     rescue EOFError, IOError
       buffer_message message
-    rescue SchemaError => e
+    rescue SchemaError, RSMP::Schemer::Error => e
       str = "Could not send #{message.type} because schema validation failed: #{e.message}"
       log str, message: message, level: :error
       notify_error e.exception("#{str} #{message.json}")
@@ -306,7 +308,7 @@ module RSMP
       log str, message: Malformed.new(attributes), level: :warning
       # cannot send NotAcknowledged for a malformed message since we can't read it, just ignore it
       nil
-    rescue SchemaError => e
+    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}")

data/lib/rsmp/site.rb

@@ -53,7 +53,7 @@ module RSMP
     def check_sxl_version
       sxl = @site_settings['sxl']
       version = @site_settings['sxl_version']
-      RSMP::Schemer::find_schema! sxl, version
+      RSMP::Schemer::find_schema! sxl, version, lenient: true
     end
 
     def reconnect

data/lib/rsmp/site_proxy.rb

@@ -36,7 +36,8 @@ module RSMP
 
     def connection_complete
       super
-      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{@site_sxl_version}", level: :info
+       sanitized_sxl_version = RSMP::Schemer.sanitize_version(@site_sxl_version)
+      log "Connection to site #{@site_id} established, using core #{@rsmp_version}, #{@sxl} #{sanitized_sxl_version}", level: :info
     end
 
     def process_message message
@@ -308,11 +309,13 @@ module RSMP
       # comes from the Version message send by the site
       type = 'tlc'
       version = message.attribute 'SXL'
-      RSMP::Schemer::find_schema! type, version 
+      RSMP::Schemer::find_schema! type, version, lenient: true
 
       # store sxl version requested by site
       # TODO should check agaist site settings
       @site_sxl_version = message.attribute 'SXL'
+    rescue RSMP::Schemer::UnknownSchemaError => e
+      dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 
     def sxl_version
@@ -327,8 +330,6 @@ module RSMP
       check_rsmp_version message
       check_sxl_version message
       version_accepted message
-    rescue RSMP::Schemer::UnknownSchemaError => e
-      dont_acknowledge message, "Rejected #{message.type} message,", "#{e}"
     end
 
     def check_site_ids message

data/lib/rsmp/supervisor.rb

@@ -49,7 +49,6 @@ module RSMP
           raise RSMP::ConfigurationError.new("Configuration for site '#{site_id}' is empty")
         end
         sxl = settings['sxl']
-        sxl = 'tlc' unless sxl    # temporary fix until configs are updated
         unless sxl
           raise RSMP::ConfigurationError.new("Configuration error for site '#{site_id}': No SXL specified")
         end

data/lib/rsmp/supervisor_proxy.rb

@@ -54,7 +54,8 @@ module RSMP
 
     def connection_complete
       super
-      log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sxl_version}", level: :info
+      sanitized_sxl_version = RSMP::Schemer.sanitize_version(sxl_version)
+      log "Connection to supervisor established, using core #{@rsmp_version}, #{sxl} #{sanitized_sxl_version}", level: :info
       start_watchdog
     end
 

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.34"
+  VERSION = "0.1.39"
 end

data/rsmp.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "async-io", "~> 1.30.2"
   spec.add_dependency "colorize", "~> 0.8.1"
   spec.add_dependency "thor", "~> 1.0.1"
-  spec.add_dependency "rsmp_schemer", "~> 0.2.0"
+  spec.add_dependency "rsmp_schemer"
 
   spec.add_development_dependency "bundler", "~> 2.2.3"
   spec.add_development_dependency "rake", "~> 13.0.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.34
+  version: 0.1.39
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -70,16 +70,16 @@ dependencies:
   name: rsmp_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement