rsmp 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f54121873905da2e5ffa4914f4f454fc4b59c7283e482b6b89b4035d686b7779
-  data.tar.gz: 523d2e310ebec8f4df07592fcb501d91f604ba8ea1c4625482c7d8d011340a6f
+  metadata.gz: dde978c380def64dfcad00d0a7c9845a7c57476828623664dcf2ace7f3f6b669
+  data.tar.gz: 6dadc564b21089271b9921f876b95c899ad42c5bbc27b9250d34b47648447937
 SHA512:
-  metadata.gz: 807d2283a18f4a9c4e45594d4ae85e75464cde3792eb941342a825e8765a00d21f7d541fac03191680e28eb7e4af4c6624cb6ce80486da191cf3bc2b3f2d6431
-  data.tar.gz: 6adc50becc91e2deab2c8099808a492a2440d072188227147742bd51ec1310f8a1075e3bed72f2989581ba11125b9beeda8134704d8a42e131ac1dac9a76eca1
+  metadata.gz: 7bc25b5125c599a5c46db4c919e8bf6891ddad0631de6264dfe5df97eac5cdf85768f099df8f41bff26203fb6fb15d95f4b09c8e2d4b32e80b24b3065be88d1e
+  data.tar.gz: 8b58da0f830cc4e4fa7f0906a2d691a3d1548b364c21e320c0f597ce4da873dd16b2db0d5e196c70f21fa9126c24a4e3f4c951586768cad0f99b78047ed7eb18

data/.github/workflows/rspec.yaml

@@ -0,0 +1,14 @@
+# This workflow runs RSpec tests
+
+name: RSpec
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        # ruby-version is not needed because we have a .ruby-version file
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rspec

data/.ruby-version

@@ -1 +1 @@
-3.0.3
+3.1.0

data/Gemfile.lock

@@ -1,27 +1,21 @@
 PATH
   remote: .
   specs:
-    rsmp (0.8.3)
+    rsmp (0.9.0)
       async (~> 1.29.1)
-      async-io (~> 1.32.1)
+      async-io (~> 1.32.2)
       colorize (~> 0.8.1)
       rsmp_schemer
-      thor (~> 1.0.1)
+      thor (~> 1.2.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    aruba (1.1.2)
+    aruba (2.0.0)
       bundler (>= 1.17, < 3.0)
       childprocess (>= 2.0, < 5.0)
       contracts (>= 0.16.0, < 0.18.0)
-      cucumber (>= 2.4, < 7.0)
+      cucumber (>= 4.0, < 8.0)
       rspec-expectations (~> 3.4)
       thor (~> 1.0)
     async (1.29.2)
@@ -33,68 +27,56 @@ GEM
     builder (3.2.4)
     childprocess (4.1.0)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
     console (1.14.0)
       fiber-local
     contracts (0.17)
-    cucumber (6.1.0)
+    cucumber (7.1.0)
       builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 9.0, >= 9.0.1)
-      cucumber-create-meta (~> 4.0, >= 4.0.0)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
-      cucumber-gherkin (~> 18.1, >= 18.1.0)
-      cucumber-html-formatter (~> 13.0, >= 13.0.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-      cucumber-wire (~> 5.0, >= 5.0.1)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-create-meta (~> 6.0, >= 6.0.1)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-html-formatter (~> 17.0, >= 17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-wire (~> 6.2, >= 6.2.0)
       diff-lcs (~> 1.4, >= 1.4.4)
       mime-types (~> 3.3, >= 3.3.1)
       multi_test (~> 0.1, >= 0.1.2)
       sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-core (9.0.1)
-      cucumber-gherkin (~> 18.1, >= 18.1.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-      cucumber-tag-expressions (~> 3.0, >= 3.0.1)
-    cucumber-create-meta (4.0.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
+    cucumber-core (10.1.1)
+      cucumber-gherkin (~> 22.0, >= 22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+      cucumber-tag-expressions (~> 4.1, >= 4.1.0)
+    cucumber-create-meta (6.0.4)
+      cucumber-messages (~> 17.1, >= 17.1.1)
       sys-uname (~> 1.2, >= 1.2.2)
-    cucumber-cucumber-expressions (12.1.1)
-    cucumber-gherkin (18.1.1)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-    cucumber-html-formatter (13.0.0)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-    cucumber-messages (15.0.0)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (3.0.1)
-    cucumber-wire (5.0.1)
-      cucumber-core (~> 9.0, >= 9.0.1)
-      cucumber-cucumber-expressions (~> 12.1, >= 12.1.1)
-      cucumber-messages (~> 15.0, >= 15.0.0)
-    diff-lcs (1.4.4)
-    ecma-re-validator (0.3.0)
-      regexp_parser (~> 2.0)
-    ffi (1.15.3)
+    cucumber-cucumber-expressions (14.0.0)
+    cucumber-gherkin (22.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.1)
+    cucumber-html-formatter (17.0.0)
+      cucumber-messages (~> 17.1, >= 17.1.0)
+    cucumber-messages (17.1.1)
+    cucumber-tag-expressions (4.1.0)
+    cucumber-wire (6.2.1)
+      cucumber-core (~> 10.1, >= 10.1.0)
+      cucumber-cucumber-expressions (~> 14.0, >= 14.0.0)
+    diff-lcs (1.5.0)
+    ecma-re-validator (0.4.0)
+      regexp_parser (~> 2.2)
+    ffi (1.15.5)
     fiber-local (1.0.0)
     hana (1.3.7)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
     json_schemer (0.2.18)
       ecma-re-validator (~> 0.3)
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       uri_template (~> 0.7)
-    middleware (0.1.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.4)
+    mime-types-data (3.2022.0105)
     multi_test (0.1.2)
     nio4r (2.5.8)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.2.0)
     rsmp_schemer (0.3.2)
       json_schemer (~> 0.2.18)
@@ -104,37 +86,34 @@ GEM
       rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
+    rspec-support (3.10.3)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    thor (1.0.1)
-    thread_safe (0.3.6)
+    thor (1.2.1)
     timecop (0.9.4)
     timers (4.3.3)
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
     uri_template (0.7.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   x86_64-darwin-20
   x86_64-darwin-21
+  x86_64-linux
 
 DEPENDENCIES
-  aruba (~> 1.1.2)
-  bundler (~> 2.2.21)
-  cucumber (~> 6.1.0)
-  rake (~> 13.0.3)
+  aruba (~> 2.0.0)
+  bundler (~> 2.3.6)
+  cucumber (~> 7.1.0)
+  rake (~> 13.0.6)
   rsmp!
   rspec (~> 3.10.0)
-  rspec-expectations (~> 3.10.1)
+  rspec-expectations (~> 3.10.2)
   timecop (~> 0.9.4)
 
 BUNDLED WITH
-   2.2.32
+   2.3.6

data/README.md

@@ -23,7 +23,7 @@ $ git submodule update   # fetch submodules
 
 Alternatively, you can pass --recurse-submodules to the git clone command, and it will automatically initialize and update each submodule in the repository.
 
-## Usage 
+## Usage
 ### Site and Supervisor
 The RSMP::Site and RSMP::Supervisor classes can be used to run a RSMP site.
 
@@ -172,7 +172,7 @@ Use the ```tlc``` site type to run an emulation of a traffic light controller. T
 ### CLI help and options.
 Use ```--help <command>``` to get a list of available options.
 
-Use ```--config <path>``` to point to a .yaml config file, controlling things like IP adresses, ports, and log output. Examples of config files can be found the folder ```config/```. 
+Use ```--config <path>``` to point to a .yaml config file, controlling things like IP adresses, ports, and log output. Examples of config files can be found the folder ```config/```.
 
 ## Tests
 ### RSpec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # Make IRB run inside Async, so async task
-# will run the the background. 
+# will run the the background.
 
 require 'bundler/setup'
 require 'irb'

data/config/tlc.yaml

@@ -20,17 +20,18 @@ signal_plans:
     dynamic_bands:
       1: 0
       2: 5
-    states:
-      A1: '123efg'
-      A2: '123efg'
-      B1: '123efg'
-      B2: '123efg'
-  2:
     states:
       A1: '111NBB'
       A2: '11NBBB'
       B1: 'BBB11N'
       B2: 'BBB1NB'
+  2:
+    states:
+      A1: 'NNNNBB'
+      A2: 'NNNNBN'
+      B1: 'BBNNNN'
+      B2: 'BNNNNN'
+startup_sequence: 'efg'
 intervals:
   timer: 0.1
   watchdog: 0.1
@@ -48,3 +49,4 @@ log:
   level: false
   debug: true
   json: true
+live_output: tmp/tlc.state

data/documentation/classes_and_modules.md

@@ -14,13 +14,13 @@ SupervisorProxy    SiteProxy - - include Components, SiteProxyWait
 
 ## Modules
 ### Logging
-Handle logging.
+Handles logging.
 
-### Wait
-Handles waiting for an async condition and block.
+### Task
+Handles async tasks.
 
 ### Components
-Component handling.
+Handles RSMP components.
 
 ## Classes
 ### Node

data/documentation/collecting_message.md

@@ -1,7 +1,7 @@
 # Collection
 You often need to collect messages or responses. The collector classes are used to collect message asyncronously. Other tasks continue until the collection completes, time outs or is cancelled.
 
-A collector can collect ingoing and/or outgoing messages. 
+A collector can collect ingoing and/or outgoing messages.
 
 An object that includes the Notifier module (or implements the same functionality) must be provided when you construct a Collected. The collector will attach itself to this notifier when it starts collecting, to receive messages. The SiteProxy and SupervisorProxy classes both include the Notifier module, and can therefore be used as message sources.
 
@@ -32,7 +32,7 @@ outgoing: Whether to collect outgoing messages. Defaults to true
 component: An RSMP component id.
 
 ### Collecting
-Use collect() to start collecting and wait for completion or timeout. The status will be returned. 
+Use collect() to start collecting and wait for completion or timeout. The status will be returned.
 
 ```ruby
 result = collector.collect # => :ok, :timeout or :cancelled

data/documentation/tasks.md

@@ -0,0 +1,149 @@
+# Tasks
+
+## Concurrency
+When you use a site or a supervisor, it runs asyncronously so you can run several concurrently, or do other things concurrently, like sending messages and waiting for reponses.
+
+Concurrency is provided by Ruby Fiber Scheduler and the Async gem. and used to:
+
+- Runn multiple sites or supervisors
+- Run multiple connections from each site or supervisor
+- Wait for messages, connections or states
+
+Classes don't inherit from Async::Task. Instead they include task as instance variables. This means that the hierachy of objects and tasks can be different.
+
+## Task module
+The `Task` module is used by the `Node` and `Proxy` classes and defines a life cycle for handling async tasks.
+
+A single main tasks is kept in `@task`. If subclasses need subtask, they can start them as needed, inside the main task.
+
+You first call `start`. If `@task` already exists, it will return immedatiately.
+Otherwise an async task is created and stored in `@task`, and `run` is called inside this task, to handle any long-running jobs, like listening for incoming messages. By default `run` calls `start_subtasks`, but should be overriden to do actual work as well.
+The call to `start` returns immediately, with the async task running concurently.
+
+If you want to stop the task, call `stop`. It will fist call `stop_subtasks` and then `stop_task` which calls Async#stop on `@task` and sets `@task` to `nil`.
+
+## Stopping tasks
+If a task stops itself, code after the call to `stop` will not be run, unless you use an ensure block:
+
+```ruby
+require 'async'
+
+Async do |task|
+	task.stop
+	puts "I just stopped"   # this will not be reaced, because the task was stopped
+end
+
+Async do |task|
+	task.stop
+ensure
+	puts "I just stopped"   # this will be reached
+end
+```
+This can happen if either the task stops itself directly, or if it stops task higher up in the task hierarchy.
+
+For example, when a timer task finds that an acknowledgement was not received in time, and then closes the connection by calling stop() on the Proxy, the proxy which will then in turn stop the timer task. So any code that should be run after that must be inside an ensure block.
+
+## Proxies
+A site connects to one of more supervisors. A proxy is created and run to handle each connection.
+
+A site can connect to one or more supervisor. It creates a proxy for each and runs them.
+
+When the proxy is run, it creates an async task to read incoming messages. This reader task is stored in `@reader`and will be a sub task of the site/supervisor main task.
+
+A proxy also creates a timer task, stored in `@timer`. This task is used to check watchdog and acknowledgement timeouts.
+
+Proxies build on the Task module functionality by handling RSMP communication via a TCP socket.
+
+The TCP socket can be open or closed. The RSMP communication first goes through a handshake sequence before being ready. The `status` attribute keeps track of this, and can be either `:disconnected`, `:connected` or `:ready`
+
+Proxies provide `connect` and `close` for starting and stopping commununication.
+
+A supervisor proxies connects actively to a site proxy, whereas a site proxy waits for the supervisor proxy to connect.
+
+A supervisor proxy is created at startup, and is responsible for creating the TCP socket and connecting to the supervisor.
+
+A site proxy is also created at startup, but the socket is created in the supervisor by `Aync::Endpoint#accept`when a site connects.
+
+## Object Hierarchy
+A Site has one or more SupervisorProxies, which represent connections to the remote supervisor. 
+
+A Supervisor has one or more SiteProxies, which represent connections to the remote site.
+
+SiteProxy and SupervisorProxy both inherit from Proxy and have a reader task and a timer task. These are just Async tasks, not separate classes.
+
+## Task Hierachy
+When you start an Async task, the parent will be the currently running task, unless you specify a different parent task.
+
+The Async task hierarchy is similar to the object hierachy, with the difference that proxies have reader and timer tasks. And Async::IO which is used to handle TPC connections concurently, will create some intermediate tasks:
+
+```
+Supervisor @task
+	accepting connections      # this task is created by Async::IO
+		incoming connection 1    # this task is created by Async::IO
+			SiteProxy @task
+				SiteProxy @reader
+				SiteProxy @timer
+		incoming connection 2    # this task is created by Async::IO
+			SiteProxy @task
+				SiteProxy @reader
+				SiteProxy @timer
+
+```
+
+
+A Site run from the CLI, before it connects to a supervisor:
+
+```
+#<Async::Reactor:0xb90 1 children (running)>
+	#<Async::Task:0xba4 cli (running)>
+		#<Async::Task:0xbcc RSMP::TLC::TrafficControllerSite main task (running)>
+			#<Async::Task:0xbe0 RSMP::SupervisorProxy main task (running)>
+			#<Async::Task:0xbf4 tlc timer (running)>
+```
+
+After the site connects to a supervisor:
+
+```
+#<Async::Reactor:0xadc 1 children (running)>
+	#<Async::Task:0xaf0 cli (running)>
+		#<Async::Task:0xb18 RSMP::TLC::TrafficControllerSite main task (running)>
+			#<Async::Task:0xb2c RSMP::SupervisorProxy main task (running)>
+				#<Async::Task:0xb40 reader (running)>
+				#<Async::Task:0xb54 timer (running)>
+			#<Async::Task:0xb68 tlc timer (running)>
+```
+
+
+
+A supervisor run from the CLI, before any sites have connected:
+
+```
+#<Async::Reactor:0x94c 1 children (running)>
+	#<Async::Task:0x960 cli (running)>
+		#<Async::Task:0x988 RSMP::Supervisor main task (running)>
+			#<Async::Task:0x99c accepting connections #<Addrinfo: 0.0.0.0:14111 TCP> [fd=12] (running)>
+```
+
+The supervisor after a site has connected
+
+```
+#<Async::Reactor:0x94c 1 children (running)>
+	#<Async::Task:0x960 cli (running)>
+		#<Async::Task:0x988 RSMP::Supervisor main task (running)>
+			#<Async::Task:0x99c accepting connections #<Addrinfo: 0.0.0.0:13111 TCP> [fd=12] (running)>
+				#<Async::Task:0xac8 incoming connection #<Addrinfo: 127.0.0.1:51778 TCP> [fd=13] (running)>
+					#<Async::Task:0xadc RSMP::SiteProxy main task (running)>
+						#<Async::Task:0xaf0 reader (running)>
+						#<Async::Task:0xb04 timer (running)>
+```
+
+The task hierachy matters when you stop a task or iterate on subtasks. Note that calling `Task#wait`
+ does not wait for subtasks, whereas Task#stop stops all subtasks.
+
+## Transient tasks
+If you mark an Async task with `transient: true` when you created it, that task will be stopped aas soon as all normal task are completed. They will also be moved up the hierarchy if the parent is complete, but not the grandparent.
+
+Transient tasks can be used to cleanup, but using an `ensure` block in the transient task. When you call `stop` on a task, an Async::Stop exception is raised, which will run the code in the `ensure` block.
+
+Some of the RSpec tests runs tests in in transient task. As soon as the main test code is complete, any subtasks like Sites or Supervisors that might otherwise prevent the test from completing, will be stopped automatically.
+

data/lib/rsmp/archive.rb

@@ -20,11 +20,11 @@ module RSMP
 
     def self.prepare_item item
       raise ArgumentError unless item.is_a? Hash
-    
+
       cleaned = item.select { |k,v| [:author,:level,:ip,:port,:site_id,:component,:text,:message,:exception].include? k }
       cleaned[:timestamp] = Clock.now
       if item[:message]
-        cleaned[:direction] = item[:message].direction 
+        cleaned[:direction] = item[:message].direction
         cleaned[:component] = item[:message].attributes['cId']
       end
 
@@ -54,7 +54,7 @@ module RSMP
         @items.shift
       end
     end
-    
+
     private
 
     def find options, &block

data/lib/rsmp/cli.rb

@@ -11,7 +11,7 @@ module RSMP
     desc "site", "Run RSMP site"
     method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'
     method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
-    method_option :supervisors, :type => :string, :aliases => "-s", banner: 'ip:port,... list of supervisor to connect to'      
+    method_option :supervisors, :type => :string, :aliases => "-s", banner: 'ip:port,... list of supervisor to connect to'
     method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
     method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
     method_option :type, :type => :string, :aliases => "-t", banner: 'Type of site: [tlc]'
@@ -60,19 +60,35 @@ module RSMP
             site_class = RSMP::Site
         end
       end
-      site_class.new(site_settings:settings, log_settings: log_settings).start
+      Async do |task|
+        task.annotate 'cli'
+        loop do
+          begin
+            site = site_class.new(site_settings:settings, log_settings: log_settings)
+            site.start
+            site.wait
+          rescue RSMP::Restart
+            site.stop
+          end
+        end
+      end
+    rescue Interrupt
+      # cntr-c
     rescue RSMP::Schemer::UnknownSchemaTypeError => e
       puts "Cannot start site: #{e}"
     rescue RSMP::Schemer::UnknownSchemaVersionError => e
       puts "Cannot start site: #{e}"
     rescue Psych::SyntaxError => e
       puts "Cannot read config file #{e}"
+    rescue Exception => e
+      puts "Uncaught error: #{e}"
+      puts caller.join("\n")
     end
 
     desc "supervisor", "Run RSMP supervisor"
     method_option :config, :type => :string, :aliases => "-c", banner: 'Path to .yaml config file'
     method_option :id, :type => :string, :aliases => "-i", banner: 'RSMP site id'
-    method_option :ip, :type => :numeric, banner: 'IP address to listen on'      
+    method_option :ip, :type => :numeric, banner: 'IP address to listen on'
     method_option :port, :type => :string, :aliases => "-p", banner: 'Port to listen on'
     method_option :log, :type => :string, :aliases => "-l", banner: 'Path to log file'
     method_option :json, :type => :boolean, :aliases => "-j", banner: 'Show JSON messages in log'
@@ -110,7 +126,14 @@ module RSMP
         log_settings['json'] = options[:json]
       end
 
-      RSMP::Supervisor.new(supervisor_settings:settings,log_settings:log_settings).start
+      Async do |task|
+        task.annotate 'cli'
+        supervisor = RSMP::Supervisor.new(supervisor_settings:settings,log_settings:log_settings)
+        supervisor.start
+        supervisor.wait
+      end
+    rescue Interrupt
+      # ctrl-c
     rescue RSMP::ConfigurationError => e
       puts "Cannot start supervisor: #{e}"
     end

data/lib/rsmp/collect/aggregated_status_collector.rb

@@ -2,7 +2,7 @@ module RSMP
   # Class for waiting for an aggregated status response
   class AggregatedStatusCollector < Collector
     def initialize proxy, options={}
-      required = { type: ['AggregatedStatus','MessageNotAck'], title: 'aggregated status' }
+      required = { type: 'AggregatedStatus', title: 'aggregated status' }
       super proxy, options.merge(required)
     end
   end

data/lib/rsmp/collect/collector.rb

@@ -51,12 +51,12 @@ module RSMP
       @status == :collecting
     end
 
-    # Is collection active?
+    # Is collection complete?
     def ok?
       @status == :ok
     end
 
-    # Has collection time out?
+    # Has collection timed out?
     def timeout?
       @status == :timeout
     end
@@ -81,6 +81,13 @@ module RSMP
       @outgoing == true
     end
 
+    # if an errors caused collection to abort, then raise it
+    # return self, so this can be tucked on to calls that return a collector
+    def ok!
+      raise @error if @error
+      self
+    end
+
     # Collect message
     # Will return once all messages have been collected, or timeout is reached
     def collect &block
@@ -94,9 +101,8 @@ module RSMP
     # Collect message
     # Returns the collected messages, or raise an exception in case of a time out.
     def collect! &block
-      if collect(&block) == :timeout
-        raise RSMP::TimeoutError.new describe_progress
-      end
+      collect(&block)
+      ok!
       @messages
     end
 
@@ -112,6 +118,7 @@ module RSMP
       end
       @status
     rescue Async::TimeoutError
+      @error = RSMP::TimeoutError.new describe_progress
       @status = :timeout
     end
 
@@ -120,7 +127,7 @@ module RSMP
     # If timeout is reached, an exceptioin is raised.
     def wait!
       wait
-      raise RSMP::TimeoutError.new(describe_progress) if timeout?
+      raise @error if timeout?
       @messages
     end
 

data/lib/rsmp/collect/command_response_collector.rb

@@ -3,7 +3,7 @@ module RSMP
   class CommandResponseCollector < StateCollector
     def initialize proxy, want, options={}
       super proxy, want, options.merge(
-        type: ['CommandResponse','MessageNotAck'],
+        type: 'CommandResponse',
         title:'command response'
       )
     end

data/lib/rsmp/collect/state_collector.rb

@@ -25,7 +25,7 @@ module RSMP
   # matches this input:
   #
   # {"cCI"=>"M0104", "n"=>"month", "v"=>"9", "age"=>"recent"}
-  # 
+  #
   # And the result is stored as:
   # {
   #   {"cCI"=>"M0104", "cO"=>"setDate", "n"=>"month", "v"=>/\d+/} =>

data/lib/rsmp/collect/status_collector.rb

@@ -2,8 +2,9 @@ module RSMP
   # Base class for waiting for status updates or responses
   class StatusCollector < StateCollector
     def initialize proxy, want, options={}
-      super proxy, want, options.merge(title: 'status response', type:['MessageNotAck'])
+      super proxy, want, options.merge(title: 'status response')
 
+      @options[:type] ||= []
       @options[:type] << 'StatusUpdate' unless options[:updates] == false
       @options[:type] << 'StatusResponse' unless options[:reponses] == false
     end

data/lib/rsmp/components.rb

@@ -3,7 +3,7 @@
 module RSMP
   module Components
     attr_reader :components
-    
+
     def initialize_components
       @components = {}
     end
@@ -25,10 +25,10 @@ module RSMP
 
     def check_main_component settings
       unless settings['main'] && settings['main'].size >= 1
-        raise ConfigurationError.new("main component must be defined") 
+        raise ConfigurationError.new("main component must be defined")
       end
       if settings['main'].size > 1
-        raise ConfigurationError.new("only one main component can be defined, found #{settings['main'].keys.join(', ')}") 
+        raise ConfigurationError.new("only one main component can be defined, found #{settings['main'].keys.join(', ')}")
       end
     end