rsmp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43f928133404e5dbc56e1a45eba044b20783bd2decfd1631a0ae2b66e731e5e2
-  data.tar.gz: ad786c056a21aa65a65406edfe3200229a5b02a104871e63e656d4dae4c6910c
+  metadata.gz: 55265e42f3956b7af530055680da60f82c84d34d7febd19286bf7c78bd2048f8
+  data.tar.gz: 445498a67e24c6b63cbfceca009ad736e962717eb89e92239bdd7ad4870cf72f
 SHA512:
-  metadata.gz: 453a4f85fbd4985dc300fd6321c2c534723b251410e6a7c577aff53175197aa1e8898234a1086b1d747fe4e093a67007b6ffd426e15a1b0d3a6ebaa489791f2a
-  data.tar.gz: 7c443d27d2dbc108b5b34af6faf15fa03e145193f83584c465ae685f74de4203db0cd37d06fdee4525a06077cd0a208020e7f9a635b021d20eb92050eeaaa8d5
+  metadata.gz: '0854ca1835fc15e8ccd10059c3f6f30638daf54677d215799eabae0f87fa4de11c9f825319f10ba92f9d25052fc90927fb54eb9f5df19cb714ba9ead236effbf'
+  data.tar.gz: 5d60090a4de455ca03fcb0fc182977ff938d0c8df9ea0bfb69d1dc985546c6de6ece83296bb25a64cc5f9e3b67d94e7694ec9702e08877bd6d9e05853d700ebd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.2.1)
+    rsmp (0.2.2)
       async (~> 1.29.1)
       async-io (~> 1.32.1)
       colorize (~> 0.8.1)
@@ -24,12 +24,12 @@ GEM
       cucumber (>= 2.4, < 7.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
-    async (1.29.1)
+    async (1.29.2)
       console (~> 1.10)
       nio4r (~> 2.3)
       timers (~> 4.1)
-    async-io (1.32.1)
-      async (~> 1.14)
+    async-io (1.32.2)
+      async
     builder (3.2.4)
     childprocess (4.1.0)
     colorize (0.8.1)
@@ -88,7 +88,7 @@ GEM
     mime-types-data (3.2021.0225)
     minitest (5.14.4)
     multi_test (0.1.2)
-    nio4r (2.5.7)
+    nio4r (2.5.8)
     protobuf-cucumber (3.10.8)
       activesupport (>= 3.2)
       middleware

data/lib/rsmp/logger.rb

@@ -96,7 +96,8 @@ module RSMP
           'statistics' => 'light_black',
           'not_acknowledged' => 'cyan',
           'warning' => 'light_yellow',
-          'error' => 'red'
+          'error' => 'red',
+          'debug' => 'light_black'
         }
         colors.merge! @settings["color"] if @settings["color"].is_a?(Hash)
         if colors[level.to_s]

data/lib/rsmp/proxy.rb

@@ -11,22 +11,32 @@ module RSMP
     include Notifier
     include Inspect
 
-    attr_reader :state, :archive, :connection_info, :sxl, :task, :collector
+    attr_reader :state, :archive, :connection_info, :sxl, :task, :collector, :ip, :port
 
     def initialize options
       initialize_logging options
+      setup options
+      initialize_distributor
+      prepare_collection @settings['collect']
+      clear
+    end
+
+    def revive options
+      setup options
+    end
+
+    def setup options
       @settings = options[:settings]
       @task = options[:task]
       @socket = options[:socket]
+      @stream = options[:stream]
+      @protocol = options[:protocol]
       @ip = options[:ip]
       @port = options[:port]
       @connection_info = options[:info]
       @sxl = nil
       @site_settings = nil  # can't pick until we know the site id
-      initialize_distributor
-
-      prepare_collection @settings['collect']
-      clear
+      @state = :stopped
     end
 
     def inspect
@@ -105,8 +115,8 @@ module RSMP
     def start_reader  
       @reader = @task.async do |task|
         task.annotate "reader"
-        @stream = Async::IO::Stream.new(@socket)
-        @protocol = Async::IO::Protocol::Line.new(@stream,WRAPPING_DELIMITER) # rsmp messages are json terminated with a form-feed
+        @stream ||= Async::IO::Stream.new(@socket)
+        @protocol ||= Async::IO::Protocol::Line.new(@stream,WRAPPING_DELIMITER) # rsmp messages are json terminated with a form-feed
 
         while json = @protocol.read_line
           beginning = Time.now

data/lib/rsmp/site_proxy.rb

@@ -15,6 +15,13 @@ module RSMP
       @site_id = nil
     end
 
+    def revive options
+      super options
+      @supervisor = options[:supervisor]
+      @settings = @supervisor.supervisor_settings.clone
+    end
+
+
     def inspect
       "#<#{self.class.name}:#{self.object_id}, #{inspector(
         :@acknowledgements,:@settings,:@site_settings,:@components
@@ -82,8 +89,12 @@ module RSMP
 
     end
 
+    def validate_ready action
+      raise NotReady.new("Can't #{action} because connection is not ready. (Currently #{@state})") unless ready?
+    end
+
     def request_aggregated_status component, options={}
-      raise NotReady unless ready?
+      validate_ready 'request aggregated status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
 
       message = RSMP::AggregatedStatusRequest.new({
@@ -163,7 +174,7 @@ module RSMP
     end
 
     def request_status component, status_list, options={}
-      raise NotReady unless ready?
+      validate_ready 'request status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
 
       # additional items can be used when verifying the response,
@@ -203,7 +214,7 @@ module RSMP
     end
 
     def subscribe_to_status component, status_list, options={}
-      raise NotReady unless ready?
+      validate_ready 'subscribe to status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
       
       # additional items can be used when verifying the response,
@@ -238,7 +249,7 @@ module RSMP
     end
 
     def unsubscribe_to_status component, status_list, options={}
-      raise NotReady unless ready?
+      validate_ready 'unsubscribe to status'
       message = RSMP::StatusUnsubscribe.new({
           "ntsOId" => '',
           "xNId" => '',
@@ -269,7 +280,7 @@ module RSMP
     end
 
     def send_command component, command_list, options={}
-      raise NotReady unless ready?
+      validate_ready 'send command'
       m_id = options[:m_id] || RSMP::Message.make_m_id
       message = RSMP::CommandRequest.new({
           "ntsOId" => '',

data/lib/rsmp/supervisor.rb

@@ -136,6 +136,13 @@ module RSMP
       end
     end
 
+    def peek_version_message protocol
+      json = protocol.peek_line
+      attributes = Message.parse_attributes json
+      message = Message.build attributes, json
+      message.attribute('siteId').first['sId']
+    end
+
     def connect socket, info
       log "Site connected from #{format_ip_and_port(info)}",
           ip: info[:ip],
@@ -144,25 +151,36 @@ module RSMP
           timestamp: Clock.now
 
       authorize_ip info[:ip]
-      check_max_sites
 
-      proxy = build_proxy({
+      stream = Async::IO::Stream.new socket
+      protocol = Async::IO::Protocol::Line.new stream, Proxy::WRAPPING_DELIMITER
+
+      settings = {
         supervisor: self,
         ip: info[:ip],
         port: info[:port],
         task: @task,
         settings: {'collect'=>@supervisor_settings['collect']},
         socket: socket,
+        stream: stream,
+        protocol: protocol,
         info: info,
         logger: @logger,
         archive: @archive
-      })
-      @proxies.push proxy
+      }
+
+      id = peek_version_message protocol
+      proxy = find_site id
+      if proxy
+        proxy.revive settings
+      else
+        check_max_sites
+        proxy = build_proxy settings
+        @proxies.push proxy
+      end
       proxy.run     # will run until the site disconnects
     ensure
-      @proxies.delete proxy
       site_ids_changed
-
       stop if @supervisor_settings['one_shot']
     end
 
@@ -188,7 +206,14 @@ module RSMP
       return find_site(site_id) != nil
     end
 
-    def find_site site_id
+    def find_site_from_ip_port ip, port
+      @proxies.each do |site|
+        return site if site.ip == ip && site.port == port
+      end
+      nil
+    end
+
+   def find_site site_id
       @proxies.each do |site|
         return site if site_id == :any || site.site_id == site_id
       end
@@ -210,12 +235,13 @@ module RSMP
     end
 
     def check_site_id site_id
-      check_site_already_connected site_id
+      #check_site_already_connected site_id
       return site_id_to_site_setting site_id
     end
 
     def check_site_already_connected site_id
-      raise FatalError.new "Site '#{site_id}' already connected" if find_site(site_id)
+      site = find_site(site_id)
+      raise FatalError.new "Site '#{site_id}' already connected" if site != nil && site != self
     end
 
     def site_id_to_site_setting site_id

data/lib/rsmp/tlc.rb

@@ -798,7 +798,7 @@ module RSMP
       super options
       @sxl = 'traffic_light_controller'
       @security_codes = options[:site_settings]['security_codes']
-      @interval = options[:site_settings]['intervals']['timer'] || 1
+      @interval = options[:site_settings].dig('intervals','timer') || 1
       unless @main
         raise ConfigurationError.new "TLC must have a main component"
       end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.26
 signing_key:
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.