onstomp 1.0.3 → 1.0.4

data/spec/onstomp/connections/heartbeating_spec.rb

@@ -65,30 +65,6 @@ module OnStomp::Connections
       end
     end
     
-    describe ".duration_since_transmitted" do
-      it "should be nil if last_transmitted_at is nil" do
-        connection.stub(:last_transmitted_at => nil)
-        connection.duration_since_transmitted.should be_nil
-      end
-      it "should be the difference between now and the last_transmitted_at in milliseconds" do
-        Time.stub(:now => 10)
-        connection.stub(:last_transmitted_at => 8.5)
-        connection.duration_since_transmitted.should == 1500
-      end
-    end
-    
-    describe ".duration_since_received" do
-      it "should be nil if last_received_at is nil" do
-        connection.stub(:last_received_at => nil)
-        connection.duration_since_received.should be_nil
-      end
-      it "should be the difference between now and the last_received_at in milliseconds" do
-        Time.stub(:now => 10)
-        connection.stub(:last_received_at => 6)
-        connection.duration_since_received.should == 4000
-      end
-    end
-    
     describe ".client_pulse?" do
       it "should be true if client heartbeating is disabled" do
         connection.stub(:heartbeat_client_limit => 0)

data/spec/onstomp/connections_spec.rb

@@ -24,12 +24,12 @@ module OnStomp
       let(:stomp_1_0_class) { mock('stomp 1.0 class') }
       let(:stomp_1_1_class) { mock('stomp 1.1 class') }
       let(:stomp_1_0) {
-        mock('stomp 1.0', :is_a? => false).tap do |m|
+        mock('stomp 1.0', :is_a? => false, :read_timeout => 30, :write_timeout => 20).tap do |m|
           m.stub(:is_a?).with(stomp_1_0_class).and_return(true)
         end
       }
       let(:stomp_1_1) {
-        mock('stomp 1.1', :is_a? => false).tap do |m|
+        mock('stomp 1.1', :is_a? => false, :read_timeout => 30, :write_timeout => 20).tap do |m|
           m.stub(:is_a?).with(stomp_1_1_class).and_return(true)
         end
       }
@@ -77,14 +77,20 @@ module OnStomp
         it "should create a 1.0 connection" do
           stomp_1_0.should_receive(:connect).and_return(['1.0', connected_frame])
           stomp_1_0.should_receive(:configure).with(connected_frame, pend_events)
-          Connections.connect client, user_headers, connect_headers, pend_events
+          stomp_1_0.should_receive(:read_timeout=).with(5)
+          stomp_1_0.should_receive(:write_timeout=).with(10)
+          Connections.connect client, user_headers, connect_headers, pend_events, 5, 10
         end
         it "should create a 1.1 connection" do
           stomp_1_0.should_receive(:connect).and_return(['1.1', connected_frame])
           stomp_1_0.should_receive(:socket).and_return(tcp_socket)
+          stomp_1_0.should_receive(:read_timeout=).with(10)
+          stomp_1_0.should_receive(:write_timeout=).with(5)
           stomp_1_1_class.should_receive(:new).with(tcp_socket, client).and_return(stomp_1_1)
           stomp_1_1.should_receive(:configure).with(connected_frame, pend_events)
-          Connections.connect client, user_headers, connect_headers, pend_events
+          stomp_1_1.should_receive(:read_timeout=).with(30)
+          stomp_1_1.should_receive(:write_timeout=).with(20)
+          Connections.connect client, user_headers, connect_headers, pend_events, 10, 5
         end
       end
       
@@ -105,7 +111,9 @@ module OnStomp
             ssl_context.should_receive(:"#{k}=").with(v)
           end
           ssl_socket.should_receive(:post_connection_check).with(ssl_options[:post_connection_check])
-          Connections.connect client, user_headers, connect_headers, pend_events
+          stomp_1_0.should_receive(:read_timeout=).with(5)
+          stomp_1_0.should_receive(:write_timeout=).with(10)
+          Connections.connect client, user_headers, connect_headers, pend_events, 5, 10
         end
         it "should create a 1.1 connection" do
           client.stub(:ssl => nil)
@@ -117,9 +125,13 @@ module OnStomp
           end
           ssl_socket.should_receive(:post_connection_check).with(client_uri.host)
           stomp_1_0.should_receive(:socket).and_return(ssl_socket)
+          stomp_1_0.should_receive(:read_timeout=).with(10)
+          stomp_1_0.should_receive(:write_timeout=).with(5)
           stomp_1_1_class.should_receive(:new).with(ssl_socket, client).and_return(stomp_1_1)
           stomp_1_1.should_receive(:configure).with(connected_frame, pend_events)
-          Connections.connect client, user_headers, connect_headers, pend_events
+          stomp_1_1.should_receive(:read_timeout=).with(30)
+          stomp_1_1.should_receive(:write_timeout=).with(20)
+          Connections.connect client, user_headers, connect_headers, pend_events, 10, 5
         end
       end
       
@@ -130,7 +142,7 @@ module OnStomp
           Connections.stub(:negotiate_connection).and_raise OnStomp::OnStompError
           stomp_1_0.should_receive(:close).with(true)
           lambda {
-            Connections.connect client, user_headers, connect_headers, pend_events
+            Connections.connect client, user_headers, connect_headers, pend_events, 5, 10
           }.should raise_error(OnStomp::OnStompError)
         end
       end

data/spec/onstomp/full_stacks/failover_spec.rb

@@ -31,76 +31,92 @@ describe OnStomp::Failover, "full stack test", :fullstack => true, :failover =>
     # 
     it "should failover" do
       # Occasionally generates: ["CONNECT", "DISCONNECT", "BEGIN", "SEND", "SUBSCRIBE", "SEND", "COMMIT"]
-      committed = false
       brokers.first.kill_on_command 'SUBSCRIBE'
-      killed = false
+      brokers.last.accept_delay = 1
       
       client = OnStomp::Failover::Client.new('failover:(stomp://localhost:10102,stomp://localhost:10103)')
       client.on_subscribe do |s, rc|
         # This frame will almost always get written to the first broker before the hangup occurs
-        client.send '/queue/onstomp/failover/test', 'are you receiving?',
-          :'x-onstomp-real-client' => rc.uri
+        client.send '/queue/onstomp/failover/test', 'are you receiving?'
       end
       
       client.connect
-      client.send '/queue/onstomp/failover/test', '4-3-2-1 Earth Below Me',
-        :'x-onstomp-real-client' => client.active_client.uri
-      client.begin 't-1234', :'x-onstomp-real-client' => client.active_client.uri
+      client.send '/queue/onstomp/failover/test', '4-3-2-1 Earth Below Me'
+      client.begin 't-1234'
       client.send '/queue/onstomp/failover/test', 'hello major tom',
-        :transaction => 't-1234', :'x-onstomp-real-client' => client.active_client.uri
-      client.subscribe('/queue/onstomp/failover/test', :'x-onstomp-real-client' => client.active_client.uri) do |m|
+        :transaction => 't-1234'
+      client.subscribe('/queue/onstomp/failover/test') do |m|
       end
       Thread.pass while client.connected?
       
-      client.send '/queue/onstomp/failover/test', 'Are you receiving?',
-        :'x-onstomp-real-client' => client.active_client.uri
-      sub = client.subscribe('/queue/onstomp/failover/test2', :'x-onstomp-real-client' => client.active_client.uri) do |m|
+      client.send '/queue/onstomp/failover/test', 'Are you receiving?'
+      sub = client.subscribe('/queue/onstomp/failover/test2') do |m|
       end
-      client.unsubscribe sub, :'x-onstomp-real-client' => client.active_client.uri
-      client.commit 't-1234', :'x-onstomp-real-client' => client.active_client.uri
-      #Thread.pass until client.connected?
-      client.disconnect :'x-onstomp-real-client' => client.active_client.uri
+      client.unsubscribe sub
+      client.commit 't-1234'
+
+      # Need to ensure that the DISCONNECT frame was actually received by
+      # the broker
+      client.disconnect :receipt => 'rcpt-disconnect'
       brokers.each(&:join)
       brokers.first.frames_received.map(&:command).should == ["CONNECT", "SEND", "BEGIN", "SEND", "SUBSCRIBE"]
+      # The reason there is only one SUBSCRIBE and no UNSUBSCRIBE is that
+      # the pair will cancel out before the connection has been re-established.
       brokers.last.frames_received.map(&:command).should == ["CONNECT", "BEGIN", "SEND", "SUBSCRIBE", "SEND", "COMMIT", "SEND", "DISCONNECT"]
     end
   end
+
   describe "failing over with a Receipts buffer" do
     it "should failover" do
-      committed = false
-      killed = false
       brokers.first.kill_on_command 'SUBSCRIBE'
+      brokers.last.accept_delay = 1
       
       client = OnStomp::Failover::Client.new('failover:(stomp://localhost:10102,stomp://localhost:10103)',
         :buffer => OnStomp::Failover::Buffers::Receipts)
-      client.on_subscribe do |s, rc|
+      check_for_maybes = []
+      client.after_transmitting do |f, c, *_|
+        #puts "Sending: #{f.command} to #{c.uri}"
+        if c.uri.to_s == 'stomp://localhost:10102' && f.headers?(:receipt,:may_be_receipted)
+          check_for_maybes << f
+        end
+      end
+      client.on_receipt do |r, c, *_|
+        if c.uri.to_s == 'stomp://localhost:10102'
+          check_for_maybes.reject! { |f| f[:receipt] == r[:'receipt-id'] }
+        end
+      end
+      client.on_subscribe do |s, *_|
         # This frame will get written, but the broker will hang up before
         # a RECEIPT is given, so it will get repeated
-        client.send '/queue/onstomp/failover/test', 'are you receiving?',
-          :'x-onstomp-real-client' => rc.uri
+        client.send '/queue/onstomp/failover/test', 'are you receiving?'
       end
       
       client.connect
       client.send '/queue/onstomp/failover/test', '4-3-2-1 Earth Below Me',
-        :'x-onstomp-real-client' => client.active_client.uri
-      client.begin 't-1234', :'x-onstomp-real-client' => client.active_client.uri
+        :may_be_receipted => '1'
+      client.begin 't-1234'
       client.send '/queue/onstomp/failover/test', 'hello major tom',
-        :transaction => 't-1234', :'x-onstomp-real-client' => client.active_client.uri
-      client.subscribe('/queue/onstomp/failover/test', :'x-onstomp-real-client' => client.active_client.uri) do |m|
+        :transaction => 't-1234'
+      client.subscribe('/queue/onstomp/failover/test') do |m|
       end
       Thread.pass while client.connected?
       
-      client.send '/queue/onstomp/failover/test', 'Are you receiving?',
-        :'x-onstomp-real-client' => client.active_client.uri
-      sub = client.subscribe('/queue/onstomp/failover/test2', :'x-onstomp-real-client' => client.active_client.uri) do |m|
+      client.send '/queue/onstomp/failover/test', 'Are you receiving?'
+      sub = client.subscribe('/queue/onstomp/failover/test2') do |m|
       end
-      client.unsubscribe sub, :'x-onstomp-real-client' => client.active_client.uri
-      client.commit 't-1234', :'x-onstomp-real-client' => client.active_client.uri
-      #Thread.pass until client.connected?
-      client.disconnect :'x-onstomp-real-client' => client.active_client.uri
+      client.unsubscribe sub
+      client.commit 't-1234'
+
+      # Need to ensure that the DISCONNECT frame was actually received by
+      # the broker
+      client.disconnect :receipt => 'rcpt-disconnect'
       brokers.each(&:join)
+      may_be_present = check_for_maybes.map(&:command)
+      # The reason there is only one SUBSCRIBE and no UNSUBSCRIBE is that
+      # the pair will cancel out before the connection has been re-established.
       brokers.first.frames_received.map(&:command).should == ["CONNECT", "SEND", "BEGIN", "SEND", "SUBSCRIBE"]
-      brokers.last.frames_received.map(&:command).should == ["CONNECT", "SEND", "BEGIN", "SEND", "SUBSCRIBE", "SEND", "SEND", "COMMIT", "SEND", "DISCONNECT"]
+      brokers.last.frames_received.map(&:command).should == (["CONNECT"] +
+        may_be_present + ["BEGIN", "SEND", "SUBSCRIBE", "SEND", "SEND", "COMMIT", "SEND", "DISCONNECT"])
     end
   end
 end

data/spec/onstomp/full_stacks/onstomp_spec.rb

@@ -3,6 +3,14 @@ require 'spec_helper'
 require File.expand_path('../test_broker', __FILE__)
 
 describe OnStomp::Client, "full stack test (stomp+ssl:)", :fullstack => true do
+  def encode_body body, encoding
+    if RUBY_VERSION >= '1.9'
+      body.encode(encoding)
+    else
+      body
+    end
+  end
+  
   describe "STOMP 1.0" do
     let(:broker) {
       TestBroker.new 10101
@@ -15,16 +23,49 @@ describe OnStomp::Client, "full stack test (stomp+ssl:)", :fullstack => true do
     end
   
     describe "connecting" do
-      it "should connect to the broker given a CA path" do
+      it "should run just fine" do
+        blocked_up = false
         client = OnStomp::Client.new('stomp://localhost:10101')
+        client.on_connection_blocked do |*_|
+          blocked_up = true
+        end
+        client.write_timeout = 1
         client.connect
         client.send '/queue/test', 'my message body', {
           "this:is\na \\fun\\ header" => 'blather matter'
         }
-        client.send '/queue/test', "\x01\x02\x03\x04\x05\x06".encode('BINARY'),
+        client.send '/queue/test', encode_body("\x01\x02\x03\x04\x05\x06", 'BINARY'),
           :'content-type' => 'application/octet-stream'
-        client.disconnect
+        sleep 1.5
+        client.send '/queue/test', encode_body("hëllo", 'ISO-8859-1')
+        client.disconnect :receipt => 'rcpt-disconnect'
         broker.join
+        blocked_up.should be_false
+      end
+      
+      it "should block on write" do
+        blocked_up = false
+        client = OnStomp::Client.new('stomp://localhost:10101')
+        client.on_connection_blocked do |*_|
+          blocked_up = true
+        end
+        client.write_timeout = 1
+        client.connect
+        # Can't seem to make this happen, so we'll do the next best thing.
+        con = client.connection
+        def con.ready_for_write?
+          false
+        end
+        client.send '/queue/test', 'my message body', {
+          "this:is\na \\fun\\ header" => 'blather matter'
+        }
+        client.send '/queue/test', encode_body("\x01\x02\x03\x04\x05\x06", 'BINARY'),
+            :'content-type' => 'application/octet-stream'
+        sleep 1.5
+        client.send '/queue/test', encode_body("hëllo", 'ISO-8859-1')
+        client.disconnect
+        broker.stop
+        blocked_up.should be_true
       end
     end
   end
@@ -48,7 +89,7 @@ describe OnStomp::Client, "full stack test (stomp+ssl:)", :fullstack => true do
         client.send '/queue/test', 'my message body', {
           "this:is\na \\fun\\ header" => 'blather matter'
         }
-        client.send '/queue/test', "\x01\x02\x03\x04\x05\x06".encode('BINARY'),
+        client.send '/queue/test', encode_body("\x01\x02\x03\x04\x05\x06", 'BINARY'),
           :'content-type' => 'application/octet-stream'
         client.disconnect
         broker.join

data/spec/onstomp/full_stacks/onstomp_ssh_spec.rb

@@ -3,6 +3,14 @@ require 'spec_helper'
 require File.expand_path('../test_broker', __FILE__)
 
 describe OnStomp::Client, "full stack test (stomp+ssl:)", :fullstack => true do
+  def encode_body body, encoding
+    if RUBY_VERSION >= '1.9'
+      body.encode(encoding)
+    else
+      body
+    end
+  end
+  
   describe "STOMP 1.0" do
     let(:broker) {
       TestSSLBroker.new 10103
@@ -24,7 +32,7 @@ describe OnStomp::Client, "full stack test (stomp+ssl:)", :fullstack => true do
         client.send '/queue/test', 'my message body', {
           "this:is\na \\fun\\ header" => 'blather matter'
         }
-        client.send '/queue/test', "\x01\x02\x03\x04\x05\x06".encode('BINARY'),
+        client.send '/queue/test', encode_body("\x01\x02\x03\x04\x05\x06",'BINARY'),
           :'content-type' => 'application/octet-stream'
         client.disconnect
         broker.join
@@ -63,7 +71,7 @@ describe OnStomp::Client, "full stack test (stomp+ssl:)", :fullstack => true do
         client.send '/queue/test', 'my message body', {
           "this:is\na \\fun\\ header" => 'blather matter'
         }
-        client.send '/queue/test', "\x01\x02\x03\x04\x05\x06".encode('BINARY'),
+        client.send '/queue/test', encode_body("\x01\x02\x03\x04\x05\x06",'BINARY'),
           :'content-type' => 'application/octet-stream'
         client.disconnect
         broker.join

data/spec/onstomp/full_stacks/test_broker.rb

@@ -7,7 +7,7 @@ class TestBroker
   
   attr_reader :messages, :sessions, :mau_dib
   attr_reader :frames_received, :frames_transmitted
-  attr_accessor :session_class
+  attr_accessor :session_class, :accept_delay
   
   def initialize(port=61613)
     @frames_received = []
@@ -24,6 +24,7 @@ class TestBroker
       $stdout.puts "Could not bind: #{ex}"
     end
     @session_class = Session10
+    @accept_delay = nil
   end
     
   def kill_on_command command
@@ -38,7 +39,6 @@ class TestBroker
       end
       msg[:'message-id'] = "msg-#{Time.now.to_f}"
       dest = msg[:destination]
-      #$stdout.puts "Enqueuing on #{dest}"
       if !@subscribes[dest].empty?
         session, subid = @subscribes[dest].first
         deliver_message msg, session, subid
@@ -46,7 +46,6 @@ class TestBroker
         @messages[dest] << msg
       end
     end
-    #$stdout.puts "Done enqueueing!"
   end
   
   def deliver_message msg, sess, subid
@@ -88,6 +87,7 @@ class TestBroker
       begin
         loop do
           sock = @socket.accept
+          @accept_delay && sleep(@accept_delay)
           @session_mutex.synchronize do
             @sessions << @session_class.new(self, sock)
           end
@@ -133,6 +133,12 @@ class TestBroker
     def init_connection
       @connection = OnStomp::Connections::Stomp_1_0.new(socket, self)
       @processor = OnStomp::Components::ThreadedProcessor.new self
+      @killing = false
+      @session_killer = Thread.new do
+        Thread.pass until @killing
+        @socket.close rescue nil
+        @processor.stop rescue nil
+      end
     end
     
     def reply_to_connect connect_frame
@@ -150,22 +156,19 @@ class TestBroker
     
     def init_events
       on_subscribe do |s,_|
-        #$stdout.puts "Got SUBSCRIBE: #{s.headers.to_hash.inspect}"
-        @server.subscribe s, self
+        @server.subscribe(s, self) unless @killing
       end
       
       on_unsubscribe do |u, _|
-        #$stdout.puts "Got UNSUBSCRIBE: #{u.headers.to_hash.inspect}"
-        @server.unsubscribe u, self
+        @server.unsubscribe(u, self) unless @killing
       end
       
       on_send do  |s,_|
-        #$stdout.puts "Got a SEND frame! #{s.body.inspect}"
-        @server.enqueue_message s
+        @server.enqueue_message(s) unless @killing
       end
       
       on_disconnect do |d,_|
-        @connection.close
+        #@connection.close
       end
       
       after_transmitting do |f,_|
@@ -173,13 +176,14 @@ class TestBroker
       end
       
       before_receiving do |f,_|
-        @server.frames_received << f
+        @server.frames_received << f unless @killing
         if @server.mau_dib && f.command == @server.mau_dib
           kill
-        end
-        if f.header? :receipt
-          transmit OnStomp::Components::Frame.new('RECEIPT',
-            :'receipt-id' => f[:receipt])
+        elsif !@killing
+          if f.header? :receipt
+            transmit OnStomp::Components::Frame.new('RECEIPT',
+              :'receipt-id' => f[:receipt])
+          end
         end
       end
     end
@@ -203,13 +207,12 @@ class TestBroker
     def join
       if @connection.connected?
         #@connection.close
-        @processor.join
+        @processor.join rescue nil
       end
     end
     
     def kill
-      @socket.close
-      @processor.stop
+      @killing = true
     end
     
     def stop