rfetion 0.3.9 → 0.3.10

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

data/lib/rfetion/fetion.rb

@@ -105,9 +105,24 @@ class Fetion
 
   def register
     @logger.info "fetion http register"
+    call = next_call
     arg = '<args><device type="PC" version="44" client-version="3.2.0540" /><caps value="simple-im;im-session;temp-group;personal-group" /><events value="contact;permission;system-message;personal-group" /><user-info attributes="all" /><presence><basic value="400" desc="" /></presence></args>'
 
-    call = next_call
+    register_first(call, arg)
+
+    # get nonce, it failed, try again 16s later
+    begin
+      register_second(call, arg)
+    rescue
+      sleep(16)
+      register_second(call, arg)
+    end
+    @logger.info "fetion http register success"
+  end
+
+  def register_first(call, arg)
+    @logger.debug "fetion http register first"
+
     curl_exec(next_url, @ssic, FETION_SIPP)
 
     msg = sip_create("R fetion.com.cn SIP-C/2.0", {'F' => @sid, 'I' => call, 'Q' => '1 R'}, arg) + FETION_SIPP
@@ -125,13 +140,18 @@ class Fetion
     @logger.debug "salt: #{@salt}"
     @logger.debug "cnonce: #{@cnonce}"
     @logger.debug "response: #{@response}"
+    @logger.debug "fetion http register first success"
+  end
+
+  def register_second(call, arg)
+    @logger.debug "fetion http register second"
 
     msg = sip_create('R fetion.com.cn SIP-C/2.0', {'F' => @sid, 'I' => call, 'Q' => '2 R', 'A' => "Digest algorithm=\"SHA1-sess\",response=\"#{@response}\",cnonce=\"#{@cnonce}\",salt=\"#{@salt}\""}, arg) + FETION_SIPP
     curl_exec(next_url, @ssic, msg)
     response = curl_exec(next_url, @ssic, FETION_SIPP)
 
     raise FetionException.new('Fetion Error: Register failed.') unless response.is_a? Net::HTTPSuccess
-    @logger.info "fetion http register success"
+    @logger.debug "fetion http register second success"
   end
 
   def get_buddy_list

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.3.9"
+  s.version = "0.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2009-11-21}
+  s.date = %q{2009-11-22}
   s.description = %q{rfetion is a ruby gem for China Mobile fetion service that you can send SMS free.}
   s.email = %q{flyerhzm@gmail.com}
   s.executables = ["rfetion", "rfetion"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-21 00:00:00 +08:00
+date: 2009-11-22 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency