rsmp 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6f7fa1f60ca721461cbd01259dbce26eaa84053a4f30417ab2fda58a6036488
-  data.tar.gz: 9a9a7585b0364d3359c96de831c16d6f2cf6efb831a1460460d897291e089235
+  metadata.gz: 5cabe89d692eb93c0d2e5af449152ff5967b1318fd0163384a57c975673ffe87
+  data.tar.gz: cb53ef7c36c6609eed242e67db16fbf7a57455ca06de90599cb15e324a4cbc87
 SHA512:
-  metadata.gz: c0e52d579f96ca22e6e836b137d48d894ed9007d8a638cfcd8adbaa2a4bcc9af7999c10ba9232ff4cef1cd83f30f0c0aef7da0ad0e684e73950bce36d45ac9be
-  data.tar.gz: 51a1b83230b74632bd37be1eb48f5f435fcb597e6a9b26e22f5cace165f20a8a3bfed5c866281cba590f9e188d05d073b2d8c3e3bafd76e69858aeaf7c37a185
+  metadata.gz: 9520a1bd0b66eb19d7b17fda09cc8fcd1efb2219c098bf315faa0d04ba953a0e4b5ab823a8bbc425697635fac49e04b777b9dd2ec481f7651c0397c832aed2b0
+  data.tar.gz: a09905ee1f2128a44cbff599f36fa166601a69d97bd2f814c4d0523dfb68bbe5deafdea599b42d6dc9a251e14a48fb5b8b5f8b5a32af2b3dd8ada964b928b59b

data/lib/rsmp/node.rb

@@ -17,6 +17,7 @@ module RSMP
         task.annotate self.class
         @task = task
         start_action
+        idle
       end
     rescue Errno::EADDRINUSE => e
       log "Cannot start: #{e.to_s}", level: :error
@@ -25,6 +26,12 @@ module RSMP
       exiting
     end
 
+    def idle
+      loop do
+        @task.sleep 60
+      end
+    end
+
     def stop
       @task.stop if @task
     end

data/lib/rsmp/probe.rb

@@ -94,10 +94,20 @@ module RSMP
 
     def matches? item
       raise ArgumentError unless item
-      return false if @options[:type] && (item[:message] == nil || (item[:message].type != @options[:type]))
+
+      if @options[:type]
+        return false if item[:message] == nil
+        if @options[:type].is_a? Array
+          return false unless @options[:type].include? item[:message].type
+        else
+          return false unless item[:message].type == @options[:type]
+        end
+      end
       return if @options[:level] && item[:level] != @options[:level]
       return false if @options[:with_message] && !(item[:direction] && item[:message])
-      return false if @block && @block.call(item) == false
+      if @block
+        return false if @block.call(item) == false
+      end
       true
     end
   end

data/lib/rsmp/site_proxy.rb

@@ -134,7 +134,7 @@ module RSMP
           "sS" => status_list
       })
       send_message message
-      return message, wait_for_status_response(component: component, timeout: timeout)
+      return message, wait_for_status_response(message: message, timeout: timeout)
     end
 
     def process_status_response message
@@ -143,9 +143,17 @@ module RSMP
     end
 
     def wait_for_status_response options
-      raise ArgumentError unless options[:component]
-      item = @archive.capture(@task, options.merge(type: "StatusResponse", with_message: true, num: 1)) do |item|
-        # check component
+      raise ArgumentError unless options[:message]
+      item = @archive.capture(@task, options.merge(
+        type: ['StatusResponse','MessageNotAck'],
+        with_message: true,
+        num: 1
+      )) do |item|
+        if item[:message].type == 'MessageNotAck'
+          next item[:message].attribute('oMId') == options[:message].m_id
+        elsif item[:message].type == 'StatusResponse'
+          next item[:message].attribute('cId') == options[:message].attribute('cId')
+        end
       end
       item[:message] if item
     end

data/lib/rsmp/supervisor.rb

@@ -30,7 +30,8 @@ module RSMP
         'status_response_timeout' => 1,
         'status_update_timeout' => 1,
         'site_connect_timeout' => 2,
-        'site_ready_timeout' => 1
+        'site_ready_timeout' => 1,
+        'stop_after_first_session' => false
       }
       
       if options[:supervisor_settings]
@@ -128,6 +129,8 @@ module RSMP
       proxy.run     # will run until the site disconnects
       @proxies.delete proxy
       site_ids_changed
+
+      stop if @supervisor_settings['stop_after_first_session']
     end
 
     def site_ids_changed

data/lib/rsmp/supervisor_proxy.rb

@@ -174,6 +174,7 @@ module RSMP
     def process_status_subcribe message
       log "Received #{message.type}", message: message, level: :log
 
+
       # @status_subscriptions is organized by component/code/name, for example:
       #
       # {"AA+BBCCC=DDDEE002"=>{"S001"=>["number"]}}

data/lib/rsmp/version.rb

@@ -1,3 +1,3 @@
 module RSMP
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/rsmp/wait.rb

@@ -5,7 +5,7 @@ module RSMP
 
     def self.wait_for task, condition, timeout, &block
       task.with_timeout(timeout) do
-        loop do
+        while task.running? do
           value = condition.wait
           result = yield value 
           return result if result   # return result of check, if not nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsmp
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Emil Tin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-08 00:00:00.000000000 Z
+date: 2019-12-09 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.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: RoadSide Message Protocol (RSMP) library.