mad-p-xmpp4r 0.6.0 → 0.6.1

data/CHANGELOG

@@ -1,3 +1,14 @@
+mad-p-xmpp4r 0.6.1 (21/02/2013)
+===============================
+* Modified to work with BOSH with HTTPBinding::Client
+  - Support stream restart with urn:xmpp:xbosh way.
+  - Removed unnecessary wait until authenticated.
+  - Added Semaphore to wait for auth and bind response.
+  - Hook to setup SSL flags (certificate, etc.)
+  - Adjusted HTTP::Net read_timeout according to http_wait.
+  - Proxy handling.
+  - Respect poll/request BOSH parameters to avoid overactivity.
+
 XMPP4R 0.5 (15/06/2009)
 =======================
 * Many bugs fixed and tests cleanups (better Ruby 1.9 support, in

data/Rakefile

@@ -34,7 +34,7 @@ RDOC_OPTIONS  = [
 # Extra files outside of the lib dir that should be included with the rdocs.
 RDOC_FILES    = (%w( README.rdoc README_ruby19.txt CHANGELOG LICENSE COPYING )).sort
 
-# The full file list used for rdocs, tarballs, gems, and for generating the mad-p-xmpp4r.gemspec.
+# The full file list used for rdocs, tarballs, gems, and for generating the xmpp4r.gemspec.
 PKG_FILES     = (%w( Rakefile setup.rb mad-p-xmpp4r.gemspec ) + RDOC_FILES + Dir["{lib,test,data,tools}/**/*"]).sort
 
 ##############################################################################
@@ -223,7 +223,7 @@ rescue LoadError
 ###
   Packaging Warning : RubyGems is apparently not installed on this
   system and any file add/remove/rename will not
-  be auto-updated in the 'mad-p-xmpp4r.gemspec' when you run any
+  be auto-updated in the 'xmpp4r.gemspec' when you run any
   package tasks.  All such file changes are recommended
   to be packaged on a system with RubyGems installed
   if you intend to push commits to the Git repo so the

data/lib/xmpp4r/httpbinding/client.rb

@@ -125,7 +125,8 @@ module Jabber
         @stream_features = {}
         @http_rid = IdGenerator.generate_id.to_i
         @pending_rid = @http_rid
-        @pending_rid_lock = Semaphore.new
+        @pending_rid_lock = Mutex.new
+        @pending_rid_cv = [] # [ [rid, cv], [rid, cv], ... ]
 
         req_body = REXML::Element.new('body')
         req_body.attributes['rid'] = @http_rid
@@ -202,16 +203,30 @@ module Jabber
       # Receive stanzas ensuring that the 'rid' order is kept
       # result:: [REXML::Element]
       def receive_elements_with_rid(rid, elements)
-        while rid > @pending_rid
-          @pending_rid_lock.wait
+        @pending_rid_lock.synchronize do
+          # Wait until rid == @pending_rid
+          if rid > @pending_rid
+            cv = ConditionVariable.new
+            @pending_rid_cv << [rid, cv]
+            @pending_rid_cv.sort!
+            while rid > @pending_rid
+              cv.wait(@pending_rid_lock)
+            end
+          end
         end
-        @pending_rid = rid + 1
 
         elements.each { |e|
           receive(e)
         }
 
-        @pending_rid_lock.run
+        # Signal waiting elements
+        @pending_rid_lock.synchronize do
+          @pending_rid = rid + 1 # Ensure @pending_rid is modified atomically
+          if @pending_rid_cv.size > 0 && @pending_rid_cv.first.first == @pending_rid
+            next_rid, cv = @pending_rid_cv.shift
+            cv.signal
+          end
+        end
       end
 
       ##
@@ -278,6 +293,7 @@ module Jabber
               # Do not send unneeded requests
               if data.size < 1 and @pending_requests > 0 and !restart
 		@pending_requests += 1 # compensate for decrement in ensure clause
+                Jabber::debuglog "post_data: not sending excessive poll"
                 return
               end
 
@@ -343,40 +359,47 @@ module Jabber
       # Send data,
       # buffered and obeying 'polling' and 'requests' limits
       def send_data(data, restart = false)
-        @lock.synchronize do
-          Jabber::debuglog("send_data")
+        Jabber::debuglog("send_data")
 
-          @send_buffer += data
-          limited_by_polling = false
-          if @pending_requests + 1 == @http_requests
-            limited_by_polling = (@last_send + @http_polling >= Time.now)
-          end
-          limited_by_requests = (@pending_requests + 1 > @http_requests)
-
-          # Can we send?
-          if !limited_by_polling and !limited_by_requests or !@authenticated
-            Jabber::debuglog("send_data non_limited")
-            data = @send_buffer
-            @send_buffer = ''
+        while true do # exit by return
+          @lock.synchronize do
+            if @last_send + 0.05 >= Time.now
+              Jabber::debuglog("send_data too fast: waiting 0.05sec")
+              next
+            end
 
-            Thread.new do
-              Thread.current.abort_on_exception = true
-              sleep(0.05)
-              post_data(data, restart)
+            @send_buffer += data
+            limited_by_polling = false
+            if @pending_requests + 1 == @http_requests && @send_buffer.size == 0
+              limited_by_polling = (@last_send + @http_polling >= Time.now)
             end
+            limited_by_requests = (@pending_requests + 1 > @http_requests)
 
-          elsif !limited_by_requests
-            Jabber::debuglog("send_data limited")
-            Thread.new do
-              Thread.current.abort_on_exception = true
-              # Defer until @http_polling has expired
-              wait = @last_send + @http_polling - Time.now
-              sleep(wait) if wait > 0
-              # Ignore locking, it's already threaded ;-)
-              send_data('', restart)
+            # Can we send?
+            if !limited_by_polling and !limited_by_requests or !@authenticated
+              Jabber::debuglog("send_data non_limited")
+              data = @send_buffer
+              @send_buffer = ''
+
+              Thread.new do
+                Thread.current.abort_on_exception = true
+                post_data(data, restart)
+              end
+              return
+            elsif limited_by_requests
+              Jabber::debuglog("send_data limited by requests")
+              # Do nothing.
+              # When a pending request gets an response, it calls send_data('')
+              return
+            elsif # limited_by_polling && @authenticated
+              # Wait until we get some data to send, or @http_polling expires
+              Jabber::debuglog("send_data limited by polling: #{@http_polling}")
+            else
+              Jabber::errorlog("send_data: can't happen: pending_requests=#{@pending_requests} http_requests=#{@http_requests} send_buffer.size=#{@send_buffer.size} limited_by_polling=#{limited_by_polling} limited_by_requests=#{limited_by_requests}")
+              return
             end
           end
-
+          sleep(0.1)
         end
       end
     end

data/lib/xmpp4r/xmpp4r.rb

@@ -8,7 +8,7 @@ module Jabber
   # XMPP4R Version number.  This is the ONLY place where the version number
   # should be specified.  This constant is used to determine the version of
   # package tarballs and generated gems.
-  XMPP4R_VERSION = '0.6.0'
+  XMPP4R_VERSION = '0.6.1'
 end
 
 require 'xmpp4r/client'

data/mad-p-xmpp4r.gemspec

@@ -242,8 +242,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.8.4"
   s.required_rubygems_version = ">= 0"
   s.rubyforge_project = "mad-p-xmpp4r"
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.24"
   s.specification_version = 3
   s.summary = "This is a fork from XMPP4R (https://github.com/ln/xmpp4r), fixing BOSH"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mad-p-xmpp4r
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies: []
 description: This is a fork from XMPP4R (https://github.com/ln/xmpp4r), fixing BOSH
 email: kaoru.maeda@gmail.com
@@ -279,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mad-p-xmpp4r
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This is a fork from XMPP4R (https://github.com/ln/xmpp4r), fixing BOSH