rsmp 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0df1c6fd543202b5e5364133461d565269e5301976301c029e2d4311e6e74611
-  data.tar.gz: 2944466c2816349afe4f350052bb7756909a271d8466aa954294d905c1e69ae4
+  metadata.gz: d6e7b6922c4aad939b08a2235e05a79ef5662534ec401d204255671c2511ede1
+  data.tar.gz: e81f0a7c38fb98317e18ebfb3879f43bd878a947de41b5d49e14953d5ed7f86e
 SHA512:
-  metadata.gz: 5341c781360c44b1a68fd6c483618fc61d580986ba846fc85192ab02dae3318a526d66dcf911ca84518ad02e2b5263c7149c76df135afc589c6a2c75047bdbd7
-  data.tar.gz: 4023179107aac97ef4fa93daee1932e0b6cfbf4a1f11ae42c1831ea3970813737ae9127667578c1515dbad51d93277274999ab2aece8f3acc08d2450e0c15cac
+  metadata.gz: a8dc63658a0082778509d2da33b44e0e80573f1b0aef8fe76c05d816d34e9dd10084de81f38c37df20d6351a9b47b2a33836bbb4405a7143da028f82ef4e2558
+  data.tar.gz: 005bd7b55911a289cd33f521a3850c00ade3622cdce377a1f79e57958925cbc86216b266ffaa6a58a58fdcf66822c5eb34ea48240ff8d29d581f8f2469aa0551

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.7)
+    rsmp (0.1.10)
       async (~> 1.23.0)
       async-io (~> 1.27.1)
       colorize (~> 0.8.1)

data/config/supervisor.yaml

@@ -1,4 +1,3 @@
-site_id: RN+SU0001
 port: 12111
 rsmp_versions:
   - 3.1.1
@@ -6,8 +5,8 @@ rsmp_versions:
   - 3.1.3
   - 3.1.4
 
-watchdog_interval: 5
-watchdog_timeout: 10
+watchdog_interval: 1
+watchdog_timeout: 2
 acknowledgement_timeout: 2
 store_messages: false
 command_response_timeout: 1
@@ -15,9 +14,7 @@ status_response_timeout: 1
 status_update_timeout: 1
 
 sites:
-  KK+AG9998:       # dynniq test tlc
-  AA+BBCCC=DDD:    # rsmp simulator
-  RN+SI0001:       # ruby rsmp site
+  any:
 
 log:
   active: true

data/lib/rsmp/cli.rb

@@ -30,7 +30,7 @@ module RSMP
 
 		if options[:supervisors]
 			options[:supervisors].split(',').each do |supervisor|
-				setting[:supervisors] ||= []
+				settings[:supervisors] ||= []
 					ip, port = supervisor.split ':'
 					ip = '127.0.0.1' if ip.empty?
 					port = '12111' if port.empty?

data/lib/rsmp/proxy.rb

@@ -2,7 +2,7 @@
 
 module RSMP  
   class Proxy < Base
-    attr_reader :site_ids, :state, :archive, :connection_info, :sxl
+    attr_reader :state, :archive, :connection_info, :sxl
 
     def initialize options
       super options
@@ -15,10 +15,6 @@ module RSMP
       clear
     end
 
-    def site_id
-      @site_ids.first   #rsmp connection can represent multiple site ids. pick the first
-    end
-
     def run
       start
       @reader.wait if @reader
@@ -44,7 +40,6 @@ module RSMP
     end
 
     def clear
-      @site_ids = []
       @awaiting_acknowledgement = {}
       @latest_watchdog_received = nil
       @watchdog_started = false
@@ -183,7 +178,7 @@ module RSMP
       timeout = @settings["watchdog_timeout"]
       latest = @latest_watchdog_received + timeout
       left = latest - now
-      log "check watchdog, time:#{timeout}, last:#{@latest_watchdog_received}, now: #{now}, latest:#{latest}, left #{left}, fail:#{left<0}", level: :debug
+      log "Check watchdog, time:#{timeout}, last:#{@latest_watchdog_received}, now: #{now}, latest:#{latest}, left #{left}, fail:#{left<0}", level: :debug
       if left < 0
         log "No Watchdog within #{timeout} seconds, received at #{@latest_watchdog_received}, now is #{now}, diff #{now-latest}", level: :error
         stop
@@ -198,7 +193,7 @@ module RSMP
     end
 
     def log str, options={}
-      super str, options.merge(ip: @ip, port: @port, site_id: site_id)
+      super str, options.merge(ip: @ip, port: @port, site_id: @site_id)
     end
 
     def send_message message, reason=nil
@@ -237,7 +232,7 @@ module RSMP
     def process_packet json
       attributes = Message.parse_attributes json
       message = Message.build attributes, json
-      message.validate
+      message.validate sxl
       expect_version_message(message) unless @version_determined
       process_message message
       message
@@ -299,28 +294,13 @@ module RSMP
       # find versions that both we and the client support
       candidates = message.versions & @settings["rsmp_versions"]
       if candidates.any?
-        # pick latest version
-        version = candidates.sort.last
-        return version
+        @rsmp_version = candidates.sort.last  # pick latest version
       else
         raise FatalError.new "RSMP versions [#{message.versions.join(',')}] requested, but only [#{@settings["rsmp_versions"].join(',')}] supported."
       end
     end
 
     def process_version message
-      return extraneous_version message if @version_determined
-      check_site_ids message
-      site_ids_changed
-      rsmp_version = check_rsmp_version message
-      set_state :version_determined
-      check_sxl_version message
-      version_accepted message, rsmp_version
-    end
-
-    def site_ids_changed
-    end
-
-    def check_sxl_version message
     end
 
     def acknowledge original
@@ -357,10 +337,12 @@ module RSMP
       @state
     end
 
-    def send_version site_id_array, rsmp_versions
-      versions_hash = [rsmp_versions].flatten.map {|v| {"vers" => v} }
+    def send_version site_id, rsmp_versions
+      versions_array = [rsmp_versions].flatten.map {|v| {"vers" => v} }
+      site_id_array = [site_id].flatten.map {|id| {"sId" => id} }
+
       version_response = Version.new({
-        "RSMP"=>versions_hash,
+        "RSMP"=>versions_array,
         "siteId"=>site_id_array,
         "SXL"=>sxl_version
       })
@@ -455,24 +437,6 @@ module RSMP
     def connection_complete
       set_state :ready
     end
-
-    def check_site_ids message
-      message.attribute("siteId").map { |item| item["sId"] }.each do |site_id|
-        check_site_id site_id
-        @site_ids << site_id
-      end
-    end
-
-    def check_site_id site_id
-    end
-
-    def site_id_accetable? site_id
-      true
-    end
-
-    def add_site_id site_id
-      @site_ids << site_id
-    end
     
     def version_acknowledged
     end
@@ -507,6 +471,5 @@ module RSMP
     def author
       node.site_id
     end
-
   end
 end

data/lib/rsmp/site_proxy.rb

@@ -4,13 +4,14 @@ module RSMP
   class SiteProxy < Proxy
     include SiteBase
 
-    attr_reader :supervisor
+    attr_reader :supervisor, :site_id
 
     def initialize options
       super options
       initialize_site
       @supervisor = options[:supervisor]
       @settings = @supervisor.supervisor_settings.clone
+      @site_id = nil
     end
 
     def node
@@ -24,7 +25,7 @@ module RSMP
 
     def connection_complete
       super
-      log "Connection to site #{@site_ids.first} established", level: :info
+      log "Connection to site #{@site_id} established", level: :info
     end
 
     def process_message message
@@ -49,17 +50,16 @@ module RSMP
       end
     end
 
-    def version_accepted message, rsmp_version
-      log "Received Version message for sites [#{@site_ids.join(',')}] using RSMP #{rsmp_version}", message: message, level: :log
+    def version_accepted message
+      log "Received Version message for site #{@site_id} using RSMP #{@rsmp_version}", message: message, level: :log
       start_timer
       acknowledge message
-      send_version message.attributes['siteId'], rsmp_version
-
+      send_version @site_id, @rsmp_version
       @version_determined = true
 
-      site_id = @site_ids.first
       if @settings['sites']
-        @site_settings = @settings['sites'][site_id]
+        @site_settings = @settings['sites'][@site_id]
+        @site_settings =@settings['sites'][:any] unless @site_settings
         if @site_settings
           setup_components @site_settings['components']
         end
@@ -83,7 +83,7 @@ module RSMP
         if @site_settings == nil || @site_settings['components'] == nil
           component = build_component c_id
           @components[c_id] = component
-          log "Adding component #{c_id} to site #{site_id}", level: :info
+          log "Adding component #{c_id} to site #{@site_id}", level: :info
         else
           reason = "component #{c_id} not found"
           dont_acknowledge message, "Ignoring #{message.type}:", reason
@@ -123,10 +123,6 @@ module RSMP
       @supervisor.site_ids_changed
     end
 
-    def check_site_id site_id
-      @site_settings = @supervisor.check_site_id site_id
-    end
-
     def request_status component, status_list, timeout=nil
       raise NotReady unless @state == :ready
       message = RSMP::StatusRequest.new({
@@ -238,7 +234,8 @@ module RSMP
     end
 
     def check_sxl_version message
-      super message
+      # store sxl version requested by site
+      # TODO should check agaist site settings
       @site_sxl_version = message.attribute 'SXL'
     end
 
@@ -248,5 +245,22 @@ module RSMP
       @site_sxl_version
     end
 
+    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
+
+    def check_site_ids message
+      # 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
+      site_ids_changed
+    end
+
+
   end
 end

data/lib/rsmp/supervisor.rb

@@ -19,7 +19,6 @@ module RSMP
 
     def handle_supervisor_settings options
       @supervisor_settings = {
-        'site_id' => 'RN+SU0001',
         'port' => 12111,
         'rsmp_versions' => ['3.1.1','3.1.2','3.1.3','3.1.4'],
         'timer_interval' => 0.1,
@@ -31,7 +30,10 @@ module RSMP
         'status_update_timeout' => 1,
         'site_connect_timeout' => 2,
         'site_ready_timeout' => 1,
-        'stop_after_first_session' => false
+        'stop_after_first_session' => false,
+        'sites' => {
+          :any => {}
+        }
       }
       
       if options[:supervisor_settings]
@@ -40,7 +42,7 @@ module RSMP
         @supervisor_settings.merge! converted
       end
 
-      required = [:port, :rsmp_versions, :site_id, :watchdog_interval, :watchdog_timeout,
+      required = [:port, :rsmp_versions, :watchdog_interval, :watchdog_timeout,
                   :acknowledgement_timeout, :command_response_timeout]
       check_required_settings @supervisor_settings, required
 
@@ -87,7 +89,7 @@ module RSMP
     end
 
     def starting
-      log "Starting supervisor #{@supervisor_settings["site_id"]} on port #{@supervisor_settings["port"]}", 
+      log "Starting supervisor on port #{@supervisor_settings["port"]}", 
           level: :info,
           timestamp: RSMP.now_object
     end
@@ -157,12 +159,14 @@ module RSMP
 
     def find_site site_id
       @proxies.each do |site|
-        return site if site_id == :any || site.site_ids.include?(site_id)
+        return site if site.site_id == site_id
       end
       nil
     end
 
     def wait_for_site site_id, timeout
+      site = find_site site_id
+      return site if site
       RSMP::Wait.wait_for(@task,@site_id_condition,timeout) { find_site site_id }
     rescue Async::TimeoutError
       nil
@@ -195,5 +199,10 @@ module RSMP
 
     def aggregated_status_changed site_proxy, component
     end
+
+    def self.build_id_from_ip_port ip, port
+      Digest::MD5.hexdigest("#{ip}:#{port}")[0..8]
+    end
+
   end
 end

data/lib/rsmp/supervisor_proxy.rb

@@ -1,5 +1,7 @@
 # Handles a site connection to a remote supervisor
 
+require 'digest'
+
 module RSMP  
   class SupervisorProxy < Proxy
 
@@ -14,6 +16,7 @@ module RSMP
       @status_subscriptions = {}
       @status_subscriptions_mutex = Mutex.new
       @sxl = @site_settings['sxl']
+      @synthetic_id = Supervisor.build_id_from_ip_port @ip, @port
     end
 
     def node
@@ -26,7 +29,7 @@ module RSMP
       connect
       @logger.unmute @ip, @port
       start_reader
-      send_version @site_settings["rsmp_versions"]
+      send_version @site_settings['site_id'], @site_settings["rsmp_versions"]
     rescue Errno::ECONNREFUSED
       log "No connection to supervisor at #{@ip}:#{@port}", level: :error
       unless @site.site_settings["reconnect_interval"] == :no
@@ -97,8 +100,8 @@ module RSMP
       @task.sleep interval
     end
 
-    def version_accepted message, rsmp_version
-      log "Received Version message, using RSMP #{rsmp_version}", message: message, level: :log
+    def version_accepted message
+      log "Received Version message, using RSMP #{@rsmp_version}", message: message, level: :log
       start_timer
       acknowledge message
       connection_complete
@@ -191,16 +194,19 @@ module RSMP
 
       component = message.attributes["cId"]
       
-      @status_subscriptions[component] ||= {}    
+      @status_subscriptions[component] ||= {}
       update_list[component] ||= {} 
 
+      subs = @status_subscriptions[component]
+
       message.attributes["sS"].each do |arg|
+        sCI = arg["sCI"]
         subcription = {interval: arg["uRt"].to_i, last_sent_at: nil}
-        @status_subscriptions[component][arg["sCI"]] ||= {}
-        @status_subscriptions[component][arg["sCI"]][arg["n"]] = subcription
+        subs[sCI] ||= {}
+        subs[sCI][arg["n"]] = subcription
 
-        update_list[component][arg["sCI"]] ||= []
-        update_list[component][arg["sCI"]] << arg["n"]
+        update_list[component][sCI] ||= []
+        update_list[component][sCI] << arg["n"]
       end
       acknowledge message
       send_status_updates update_list   # send status after subscribing is accepted
@@ -210,18 +216,16 @@ module RSMP
       log "Received #{message.type}", message: message, level: :log
       component = message.attributes["cId"]
 
-      if @status_subscriptions[component]
-         message.attributes["sS"].each do |arg|
-          if @status_subscriptions[component][arg["sCI"]]
-            @status_subscriptions[component][arg["sCI"]].delete arg["n"]
-          end
-          if @status_subscriptions[component][arg["sCI"]].empty?
-            @status_subscriptions[component].delete(arg["sCI"])
+      subs = @status_subscriptions[component]
+      if subs
+        message.attributes["sS"].each do |arg|
+          sCI = arg["sCI"]
+          if subs[sCI]
+            subs[sCI].delete arg["n"]
+            subs.delete(sCI) if subs[sCI].empty?
           end
         end
-        if @status_subscriptions[component].empty?
-          @status_subscriptions.delete(component)
-        end
+        @status_subscriptions.delete(component) if subs.empty?
       end
       acknowledge message
     end
@@ -270,10 +274,10 @@ module RSMP
         sS = []
         by_code.each_pair do |code,names|
           names.each do |name|
-            sS << { "sCI": code,
-                     "n": name,
-                     "s": rand(100),
-                     "q": "recent" }
+            sS << { "sCI" => code,
+                     "n" => name,
+                     "s" => rand(100).to_s,
+                     "q" => "recent" }
           end
         end
         update = StatusUpdate.new({
@@ -298,5 +302,17 @@ module RSMP
     def sxl_version
       @site_settings['sxl_version']
     end
+
+    def process_version message
+      return extraneous_version message if @version_determined
+      check_rsmp_version message
+      check_sxl_version message
+      @site_id = Supervisor.build_id_from_ip_port @ip, @port
+      version_accepted message
+    end
+
+    def check_sxl_version message
+    end
+
   end
 end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Emil Tin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2019-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -357,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.