rsmp 0.13.0 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39bc5e9f248ab2db6d21e7a3c1e7c9e5ccb7c72e6e2be09dd28cbbaf5f6225d4
-  data.tar.gz: 3215d99759e3fb98f97c591ff9c9a3b2f1b1080306284b50429c46b0f677b137
+  metadata.gz: a7fbae6ef01f7b0d6149360423fb4de524584cf74c7fbf1f5300ebd4115a43e3
+  data.tar.gz: 879d0da2780de89a5ef563b62ca36c4728313389671da5e33d0011c94bba9dac
 SHA512:
-  metadata.gz: 3f1be038f5bee13b83ecc2a5fe9ca79ae4e06ee906aa00d9766874193a24b12bda38752041c8e8fe1436aa98f93f026d9fcd0afbdfcf1b9366e0531a8d5c48f8
-  data.tar.gz: c52b47df3b59b30271c81b71b902fb55e2674de58c36e7458df091e39f1158641b98dcf94c840f8ab4673c35b7484b08770c0c8db1de30647f90df38ad590c34
+  metadata.gz: 2e905d13e37c7af948dc978cbb84257aeb7d292e605f9f98238a81311eb2344e37a1b3699998c75bef81ce844bb28564cecc581c6a3410a2cce76c558e7d6c6c
+  data.tar.gz: c2d737778d4e08f0c80a94af80953d47af23e93ca576ee9f468113c985b89221c8cf6a42bade00e99b5ded549bbe48fdb10541c8e721a061f4b5f8dac672036d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.13.0)
+    rsmp (0.13.3)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)
@@ -68,7 +68,7 @@ GEM
     ffi (1.15.5-x64-mingw32)
     fiber-local (1.0.0)
     hana (1.3.7)
-    json_schemer (0.2.20)
+    json_schemer (0.2.21)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
@@ -79,7 +79,7 @@ GEM
     multi_test (0.1.2)
     nio4r (2.5.8)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.4.0)
     rsmp_schemer (0.4.0)
       json_schemer (~> 0.2.18)
     rspec (3.10.0)

data/lib/rsmp/component.rb

@@ -1,7 +1,7 @@
 module RSMP
   # RSMP component
   class Component < ComponentBase
-    def initialize node:, id:, grouped: false
+    def initialize node:, id:, ntsOId: nil, xNId: nil, grouped: false
       super
     end
 

data/lib/rsmp/component_base.rb

@@ -5,7 +5,8 @@ module RSMP
   class ComponentBase
     include Inspect
 
-    attr_reader :c_id, :node, :alarms, :statuses, :aggregated_status, :aggregated_status_bools, :grouped
+    attr_reader :c_id, :ntsOId, :xNId, :node, :alarms, :statuses,
+      :aggregated_status, :aggregated_status_bools, :grouped
 
     AGGREGATED_STATUS_KEYS = [ :local_control,
                                :communication_distruption,
@@ -16,8 +17,13 @@ module RSMP
                                :rest,
                                :not_connected ]
 
-    def initialize node:, id:, grouped: false
+    def initialize node:, id:,  ntsOId: nil, xNId: nil, grouped: false
+      if grouped==false && (ntsOId || xNId)
+        raise RSMP::ConfigurationError.new("ntsOId and xNId are only allowed for grouped objects")
+      end
       @c_id = id
+      @ntsOId = ntsOId
+      @xNId = xNId
       @node = node
       @grouped = grouped
       clear_aggregated_status

data/lib/rsmp/component_proxy.rb

@@ -1,7 +1,7 @@
 module RSMP
   # A proxy to a remote RSMP component.
   class ComponentProxy < ComponentBase
-    def initialize node:, id:, grouped: false
+    def initialize node:, id:, ntsOId: nil, xNId: nil, grouped: false
       super
       @alarms = {}
       @statuses = {}

data/lib/rsmp/components.rb

@@ -2,10 +2,11 @@
 
 module RSMP
   module Components
-    attr_reader :components
+    attr_reader :components, :main
 
     def initialize_components
       @components = {}
+      @main = nil
     end
 
     def aggregated_status_changed component, options={}
@@ -18,6 +19,7 @@ module RSMP
         if components_by_type
           components_by_type.each_pair do |id,settings|
             @components[id] = build_component(id:id, type:type, settings:settings)
+            @main = @components[id] if type=='main'
           end
         end
       end
@@ -36,10 +38,6 @@ module RSMP
       @components[component.c_id] = component
     end
 
-    #def build_component id:, type:, settings:{}
-    #  Component.new id:id, node: self, grouped: type=='main'
-    #end
-
     def infer_component_type component_id
       Component
     end

data/lib/rsmp/proxy.rb

@@ -438,7 +438,6 @@ module RSMP
     end
 
     def will_not_handle message
-      "WILL NOT HANDLE"
       reason = "since we're a #{self.class.name.downcase}" unless reason
       log "Ignoring #{message.type}, #{reason}", message: message, level: :warning
       dont_acknowledge message, nil, reason
@@ -643,5 +642,13 @@ module RSMP
         return { sent: message }
       end
     end
+
+    def set_nts_message_attributes message
+      return unless main
+      ntsOId =  main.ntsOId
+      xNId =  main.xNId
+      message.attributes['ntsOId'] = ntsOId if ntsOId
+      message.attributes['xNId'] = xNId if xNId
+    end
   end
 end

data/lib/rsmp/site.rb

@@ -161,7 +161,12 @@ module RSMP
     end
 
     def build_component id:, type:, settings:{}
-      Component.new id:id, node: self, grouped: type=='main'
+      if type == 'main'
+        Component.new id:id, node: self, grouped: true,
+          ntsOId: settings['ntsOId'], xNId: settings['xNId']
+      else
+        Component.new id:id, node: self, grouped: false
+      end
     end
   end
 end

data/lib/rsmp/site_proxy.rb

@@ -114,13 +114,11 @@ module RSMP
     def request_aggregated_status component, options={}
       validate_ready 'request aggregated status'
       m_id = options[:m_id] || RSMP::Message.make_m_id
-
       message = RSMP::AggregatedStatusRequest.new({
-          "ntsOId" => '',
-          "xNId" => '',
-          "cId" => component,
-          "mId" => m_id
+        "cId" => component,
+        "mId" => m_id
       })
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         AggregatedStatusCollector.new(
           self,
@@ -187,12 +185,11 @@ module RSMP
       request_list = status_list.map { |item| item.slice('sCI','n') }
 
       message = RSMP::StatusRequest.new({
-          "ntsOId" => '',
-          "xNId" => '',
           "cId" => component,
           "sS" => request_list,
           "mId" => m_id
       })
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         StatusCollector.new(
           self,
@@ -232,12 +229,11 @@ module RSMP
       component.allow_repeat_updates subscribe_list
 
       message = RSMP::StatusSubscribe.new({
-          "ntsOId" => '',
-          "xNId" => '',
           "cId" => component_id,
           "sS" => subscribe_list,
           'mId' => m_id
       })
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         StatusCollector.new(
           self,
@@ -262,11 +258,10 @@ module RSMP
       end
 
       message = RSMP::StatusUnsubscribe.new({
-        "ntsOId" => '',
-        "xNId" => '',
         "cId" => component_id,
         "sS" => status_list
       })
+      set_nts_message_attributes message
       send_message message, validate: options[:validate]
       message
     end
@@ -292,12 +287,11 @@ module RSMP
       validate_ready 'send command'
       m_id = options[:m_id] || RSMP::Message.make_m_id
       message = RSMP::CommandRequest.new({
-          "ntsOId" => '',
-          "xNId" => '',
           "cId" => component,
           "arg" => command_list,
           "mId" => m_id
       })
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         CommandResponseCollector.new(
           self,
@@ -381,7 +375,12 @@ module RSMP
     end
 
     def build_component id:, type:, settings:{}
-      ComponentProxy.new id:id, node: self, grouped: type=='main'
+      if type == 'main'
+        ComponentProxy.new id:id, node: self, grouped: true,
+          ntsOId: settings['ntsOId'], xNId: settings['xNId']
+      else
+        ComponentProxy.new id:id, node: self, grouped: false
+      end
     end
 
   end

data/lib/rsmp/supervisor_proxy.rb

@@ -160,7 +160,7 @@ module RSMP
         "se" => component.aggregated_status_bools,
         "mId" => m_id,
       })
-
+      set_nts_message_attributes message
       send_and_optionally_collect message, options do |collect_options|
         Collector.new self, collect_options.merge(task:@task, type: 'MessageAck')
       end
@@ -254,6 +254,7 @@ module RSMP
         "cTS"=>clock.to_s,
         "rvs"=>rvs
       })
+      set_nts_message_attributes response
       acknowledge message
       send_message response
     end
@@ -272,6 +273,7 @@ module RSMP
         "sS"=>sS,
         "mId" => options[:m_id]
       })
+      set_nts_message_attributes response
       acknowledge message
       send_message response
     end
@@ -409,6 +411,7 @@ module RSMP
           "sTs"=>now,
           "sS"=>sS
         })
+        set_nts_message_attributes update
         send_message update
         store_last_sent_status update
       end
@@ -429,5 +432,8 @@ module RSMP
     def check_sxl_version message
     end
 
+    def main
+      @site.main
+    end
   end
 end

data/lib/rsmp/tlc/traffic_controller.rb

@@ -9,9 +9,9 @@ module RSMP
         :functional_position,
         :startup_sequence_active, :startup_sequence, :startup_sequence_pos
 
-      def initialize node:, id:, cycle_time: 10, signal_plans:,
+      def initialize node:, id:, ntsOId: nil, xNId: nil, cycle_time: 10, signal_plans:,
           startup_sequence:, live_output:nil, inputs:{}
-        super node: node, id: id, grouped: true
+        super node: node, id: id, ntsOId: ntsOId, xNId: xNId, grouped: true
         @signal_groups = []
         @detector_logics = []
         @plans = signal_plans

data/lib/rsmp/tlc/traffic_controller_site.rb

@@ -15,7 +15,7 @@ module RSMP
 
         super options
 
-        unless @main
+        unless main
           raise ConfigurationError.new "TLC must have a main component"
         end
 
@@ -24,7 +24,7 @@ module RSMP
       def start
         super
         start_tlc_timer
-        @main.initiate_startup_sequence
+        main.initiate_startup_sequence
       end
 
       def stop_subtasks
@@ -52,7 +52,10 @@ module RSMP
       def build_component id:, type:, settings:{}
         component = case type
         when 'main'
-          @main = TrafficController.new node: self, id: id,
+          TrafficController.new node: self,
+            id: id,
+            ntsOId: settings['ntsOId'],
+            xNId: settings['xNId'],
             cycle_time: settings['cycle_time'],
             startup_sequence: @startup_sequence,
             signal_plans: @signal_plans,
@@ -60,11 +63,11 @@ module RSMP
             inputs: @site_settings['inputs']
         when 'signal_group'
           group = SignalGroup.new node: self, id: id
-          @main.add_signal_group group
+          main.add_signal_group group
           group
         when 'detector_logic'
           logic = DetectorLogic.new node: self, id: id
-          @main.add_detector_logic logic
+          main.add_detector_logic logic
           logic
         end
       end
@@ -109,8 +112,8 @@ module RSMP
       end
 
       def timer now
-        return unless @main
-        @main.timer now
+        return unless main
+        main.timer now
       end
 
       def verify_security_code level, code

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.13.0"
+  VERSION = "0.13.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.3
 platform: ruby
 authors:
 - Emil Tin
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async