rsmp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce30f264a7328d7e272f655821ace2fc1a7a7e38a27a7d636f1cea859d10750d
-  data.tar.gz: 34009cd95e04c16dd14ab05c38dc86b9edfd581c4ed3071c97b9385da4dd7a89
+  metadata.gz: 8ade1272155b959eee2f256b18425d9e1b14f3d4f2edeeebf73a1d29fbc4f78d
+  data.tar.gz: 3fafb63cb31a0e8a5db5c4d010d907b85ef8dbfd5100ae17bad6abe9926106d9
 SHA512:
-  metadata.gz: 3c4024f635000e632061e7026a2d3d9c6f73bc56f4ec0c2758518f1734b148ab81edb1f305c81a31d501dfab6b84975793a12e0a662e634edc8e3e46dcf8dff4
-  data.tar.gz: 3668868ba224b9fca05a2b00b847c53a4f31b31745779346c55380eebea138b8150c3be2b5fe022970e4e9f0d7be0e64ba1178cfbe7ffed0c2f813afa96a9827
+  metadata.gz: 3325ace5e118a54366f1333534f15f840c24d8dd272c2d7badef868b2ef23c4e029d1e2e9627af9fe9519222504c1e5a250f17957f7df0bc294c9a3e8a039459
+  data.tar.gz: 2820ddf6b3ab584e86f7a9a2ab0fb724092ae7ce550e8123715b412867cf926850fa76033cea0a5b5275b3943621ca53b170981201a46560aa852cda161b9900

data/CHANGELOG.md

@@ -2,3 +2,12 @@
 
 ## 0.1.0
 Initial release.
+
+## 0.1.1
+Refactoring.
+
+## 0.1.2
+Refactoring.
+
+## 0.1.3
+Refactoring.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.1.1)
+    rsmp (0.1.3)
       async (~> 1.23.0)
       async-io (~> 1.27.0)
       colorize (~> 0.8.1)

data/config/supervisor.yaml

@@ -13,7 +13,6 @@ status_update_timeout: 1
 
 sites:
   AA+BBCCC=DDD:    # rsmp simulator
-    sxl: core
   RN+SI0001:       # ruby rsmp site
 
 log:

data/lib/rsmp/message.rb

@@ -11,7 +11,7 @@ module RSMP
       @@schemas = {}
 
       core_schema_path = File.join(schema_path,'core','rsmp.json')
-      @@schemas['core'] = JSONSchemer.schema( Pathname.new(core_schema_path) )
+      @@schemas[nil] = JSONSchemer.schema( Pathname.new(core_schema_path) )
 
       tlc_schema_path = File.join(schema_path,'tlc','sxl.json')
       @@schemas['traffic_light_controller'] = JSONSchemer.schema( Pathname.new(tlc_schema_path) )
@@ -19,7 +19,7 @@ module RSMP
       @@schemas
     end
 
-    def self.get_schema sxl = 'core'
+    def self.get_schema sxl=nil
       schema = @@schemas[sxl]
       raise SchemaError.new("Unknown schema #{sxl}") unless schema
       schema
@@ -28,14 +28,14 @@ module RSMP
     @@schemas = load_schemas
 
 
-    def self.parse_attributes packet
-      raise ArgumentError unless packet
-      JSON.parse packet
+    def self.parse_attributes json
+      raise ArgumentError unless json
+      JSON.parse json
     rescue JSON::ParserError
-      raise InvalidPacket, bin_to_chars(packet)
+      raise InvalidPacket, bin_to_chars(json)
     end
 
-    def self.build attributes, packet
+    def self.build attributes, json
       validate_message_type attributes
       case attributes["type"]
       when "MessageAck"
@@ -67,7 +67,7 @@ module RSMP
       else
         message = Unknown.new attributes
       end
-      message.json = packet
+      message.json = json
       message.direction = :in
       message
     end
@@ -129,9 +129,10 @@ module RSMP
       @attributes["mId"] ||= SecureRandom.uuid()
     end
 
-    def validate
-      unless Message.get_schema.valid? attributes
-        errors = Message.get_schema.validate attributes
+    def validate sxl=nil
+      schema = Message.get_schema(sxl)
+      unless schema.valid? attributes
+        errors = schema.validate attributes
         error_string = errors.map do |item|
           [item['data_pointer'],item['type'],item['details']].compact.join(' ')
         end.join(", ")
@@ -153,10 +154,6 @@ module RSMP
 
     def generate_json
       @json = JSON.generate @attributes
-
-      # wrap json with a form feed to create an rsmp packet,
-      #as required by the rsmp specification
-      @out = "#{@json}"
     end
 
   end
@@ -176,11 +173,6 @@ module RSMP
       }.merge attributes)
     end
 
-    def validate
-      super &&
-      @attributes["RSMP"].is_a?(Array) && @attributes["RSMP"].size >= 1
-    end
-
     def versions
       attribute("RSMP").map{ |item| item["vers"] }
     end

data/lib/rsmp/proxy.rb

@@ -2,7 +2,7 @@
 
 module RSMP  
   class Proxy < Base
-    attr_reader :site_ids, :state, :archive, :connection_info
+    attr_reader :site_ids, :state, :archive, :connection_info, :sxl
 
     def initialize options
       super options
@@ -11,6 +11,7 @@ module RSMP
       @socket = options[:socket]
       @ip = options[:ip]
       @connection_info = options[:info]
+      @sxl = nil
       clear
     end
 
@@ -73,11 +74,11 @@ module RSMP
       @reader = @task.async do |task|
         task.annotate "reader"
         @stream = Async::IO::Stream.new(@socket)
-        @protocol = Async::IO::Protocol::Line.new(@stream,"\f") # rsmp messages are json terminated with a form-feed
+        @protocol = Async::IO::Protocol::Line.new(@stream,RSMP::WRAPPING_DELIMITER) # rsmp messages are json terminated with a form-feed
 
-        while packet = @protocol.read_line
+        while json = @protocol.read_line
           beginning = Time.now
-          message = process_packet packet
+          message = process_packet json
           duration = Time.now - beginning
           ms = (duration*1000).round(4)
           per_second = (1.0 / duration).round
@@ -169,7 +170,7 @@ module RSMP
       @awaiting_acknowledgement.clone.each_pair do |m_id, message|
         latest = message.timestamp + timeout
         if now > latest
-          log "No acknowledgements for #{message.type} within #{timeout} seconds", level: :error
+          log "No acknowledgements for #{message.type} #{message.m_id_short} within #{timeout} seconds", level: :error
           stop
           return true
         end
@@ -199,11 +200,11 @@ module RSMP
 
     def send_message message, reason=nil
       raise IOError unless @protocol
-      message.validate
       message.generate_json
+      message.validate sxl
       message.direction = :out
       expect_acknowledgement message
-      @protocol.write_lines message.out
+      @protocol.write_lines message.json
       log_send message, reason
     rescue EOFError, IOError
       buffer_message message
@@ -230,15 +231,15 @@ module RSMP
       end
     end
 
-    def process_packet packet
-      attributes = Message.parse_attributes packet
-      message = Message.build attributes, packet
+    def process_packet json
+      attributes = Message.parse_attributes json
+      message = Message.build attributes, json
       message.validate
       expect_version_message(message) unless @version_determined
       process_message message
       message
     rescue InvalidPacket => e
-      warning "Received invalid package, must be valid JSON but got #{packet.size} bytes: #{e.message}"
+      warning "Received invalid package, must be valid JSON but got #{json.size} bytes: #{e.message}"
       nil
     rescue MalformedMessage => e
       warning "Received malformed message, #{e.message}", Malformed.new(attributes)
@@ -309,14 +310,14 @@ module RSMP
       site_ids_changed
       rsmp_version = check_rsmp_version message
       set_state :version_determined
-      check_sxl_version
+      check_sxl_version message
       version_accepted message, rsmp_version
     end
 
     def site_ids_changed
     end
 
-    def check_sxl_version
+    def check_sxl_version message
     end
 
     def acknowledge original
@@ -358,7 +359,7 @@ module RSMP
       version_response = Version.new({
         "RSMP"=>versions_hash,
         "siteId"=>[{"sId"=>@settings["site_id"]}],
-        "SXL"=>"1.1"
+        "SXL"=>sxl_version
       })
       send_message version_response
     end

data/lib/rsmp/site.rb

@@ -27,6 +27,7 @@ module RSMP
           { 'ip' => '127.0.0.1', 'port' => 12111 }
         ],
         'rsmp_versions' => ['3.1.1','3.1.2','3.1.3','3.1.4'],
+        'sxl_version' => '1.0.7',
         'timer_interval' => 0.1,
         'watchdog_interval' => 1,
         'watchdog_timeout' => 2,
@@ -160,6 +161,5 @@ module RSMP
         proxy.stop
       end
     end
-
   end
 end

data/lib/rsmp/site_base.rb

@@ -18,6 +18,10 @@ module RSMP
       end
     end
 
+    def add_component component
+      @components[component.c_id] = component
+    end
+
     def build_component id, settings={}
       Component.new id: id, node: self, grouped: true
     end

data/lib/rsmp/site_proxy.rb

@@ -216,5 +216,16 @@ module RSMP
       @settings["watchdog_interval"] = interval
     end
 
+    def check_sxl_version message
+      super message
+      @site_sxl_version = message.attribute 'SXL'
+    end
+
+    def sxl_version
+      # a supervisor does not maintain it's own sxl version
+      # instead we use what the site requests
+      @site_sxl_version
+    end
+
   end
 end

data/lib/rsmp/supervisor.rb

@@ -215,6 +215,5 @@ module RSMP
 
     def aggregated_status_changed site_proxy, component
     end
-
   end
 end

data/lib/rsmp/supervisor_proxy.rb

@@ -13,6 +13,7 @@ module RSMP
       @port = options[:port]
       @status_subscriptions = {}
       @status_subscriptions_mutex = Mutex.new
+      @sxl = @site_settings['sxl']
     end
 
     def node
@@ -39,7 +40,7 @@ module RSMP
       @endpoint = Async::IO::Endpoint.tcp(@ip, @port)
       @socket = @endpoint.connect
       @stream = Async::IO::Stream.new(@socket)
-      @protocol = Async::IO::Protocol::Line.new(@stream,"\f") # rsmp messages are json terminated with a form-feed
+      @protocol = Async::IO::Protocol::Line.new(@stream,RSMP::WRAPPING_DELIMITER) # rsmp messages are json terminated with a form-feed
     end
 
     def connection_complete
@@ -288,5 +289,8 @@ module RSMP
       send_message message
     end
 
+    def sxl_version
+      @site_settings['sxl_version']
+    end
   end
 end

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Emil Tin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2019-12-04 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.