rsmp 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39bc5e9f248ab2db6d21e7a3c1e7c9e5ccb7c72e6e2be09dd28cbbaf5f6225d4
-  data.tar.gz: 3215d99759e3fb98f97c591ff9c9a3b2f1b1080306284b50429c46b0f677b137
+  metadata.gz: c1840c079564613302ef539e2c0a502c2cafdabe8c875ab2dfb3b389470becf8
+  data.tar.gz: 35eda6efcfabe4624ba58d5150b3c1263a34a2a0b1f363b1a704566acc65cfed
 SHA512:
-  metadata.gz: 3f1be038f5bee13b83ecc2a5fe9ca79ae4e06ee906aa00d9766874193a24b12bda38752041c8e8fe1436aa98f93f026d9fcd0afbdfcf1b9366e0531a8d5c48f8
-  data.tar.gz: c52b47df3b59b30271c81b71b902fb55e2674de58c36e7458df091e39f1158641b98dcf94c840f8ab4673c35b7484b08770c0c8db1de30647f90df38ad590c34
+  metadata.gz: 32c6bb82731643e24000e2056a19896fa591755b1336ccad74df28b82ee9800cdb16ee96e6d6e1996e09137fa22cfed5c64801d8b131953a4abc94d32ba9ab08
+  data.tar.gz: d588d1e92eb16473ee86e25e0a595d6bd03c4744f113860bbe89be6f3c3df6ab19bb522daea617f28e8b32708a048d4a2895700cda8de34fed6fd986de85c6a4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rsmp (0.13.0)
+    rsmp (0.13.1)
       async (~> 1.29.1)
       async-io (~> 1.32.2)
       colorize (~> 0.8.1)
@@ -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.3.1)
     rsmp_schemer (0.4.0)
       json_schemer (~> 0.2.18)
     rspec (3.10.0)

data/lib/rsmp/site_proxy.rb

@@ -116,8 +116,8 @@ module RSMP
       m_id = options[:m_id] || RSMP::Message.make_m_id
 
       message = RSMP::AggregatedStatusRequest.new({
-          "ntsOId" => '',
-          "xNId" => '',
+          "ntsOId" => @ntsOId,
+          "xNId" => @xNId,
           "cId" => component,
           "mId" => m_id
       })
@@ -187,8 +187,8 @@ module RSMP
       request_list = status_list.map { |item| item.slice('sCI','n') }
 
       message = RSMP::StatusRequest.new({
-          "ntsOId" => '',
-          "xNId" => '',
+          "ntsOId" => @ntsOId,
+          "xNId" => @xNId,
           "cId" => component,
           "sS" => request_list,
           "mId" => m_id
@@ -232,8 +232,8 @@ module RSMP
       component.allow_repeat_updates subscribe_list
 
       message = RSMP::StatusSubscribe.new({
-          "ntsOId" => '',
-          "xNId" => '',
+          "ntsOId" => @ntsOId,
+          "xNId" => @xNId,
           "cId" => component_id,
           "sS" => subscribe_list,
           'mId' => m_id
@@ -262,8 +262,8 @@ module RSMP
       end
 
       message = RSMP::StatusUnsubscribe.new({
-        "ntsOId" => '',
-        "xNId" => '',
+        "ntsOId" => @ntsOId,
+        "xNId" => @xNId,
         "cId" => component_id,
         "sS" => status_list
       })
@@ -292,8 +292,8 @@ module RSMP
       validate_ready 'send command'
       m_id = options[:m_id] || RSMP::Message.make_m_id
       message = RSMP::CommandRequest.new({
-          "ntsOId" => '',
-          "xNId" => '',
+          "ntsOId" => @ntsOId,
+          "xNId" => @xNId,
           "cId" => component,
           "arg" => command_list,
           "mId" => m_id
@@ -369,6 +369,8 @@ module RSMP
       @site_settings = find_site_settings @site_id
       if @site_settings
         @sxl = @site_settings['sxl']
+        @ntsOId = @site_settings['ntsOId']
+        @xNId = @site_settings['xNId']
         setup_components @site_settings['components']
       else
         dont_acknowledge message, 'Rejected', "No config found for site #{@site_id}"

data/lib/rsmp/supervisor_proxy.rb

@@ -15,6 +15,8 @@ module RSMP
       @port = options[:port]
       @status_subscriptions = {}
       @sxl = @site_settings['sxl']
+      @ntsOId = @site_settings['ntsOId']
+      @xNId = @site_settings['xNId']
       @synthetic_id = Supervisor.build_id_from_ip_port @ip, @port
     end
 
@@ -160,6 +162,8 @@ module RSMP
         "se" => component.aggregated_status_bools,
         "mId" => m_id,
       })
+      message.attributes['ntsOId'] = @site_settings['ntsOId'] if @site_settings['ntsOId']
+      message.attributes['xNId'] = @site_settings['xNId'] if @site_settings['xNId']
 
       send_and_optionally_collect message, options do |collect_options|
         Collector.new self, collect_options.merge(task:@task, type: 'MessageAck')

data/lib/rsmp/version.rb

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

metadata

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