rfetion 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/lib/rfetion/fetion.rb

@@ -8,7 +8,7 @@ require 'openssl'
 require 'logger'
 
 class Fetion
-  attr_accessor :mobile_no, :sid, :password, :seq, :ssic, :guid, :uri
+  attr_accessor :mobile_no, :sid, :password, :call, :seq, :alive, :ssic, :guid, :uri
   attr_reader :user_id, :contacts, :buddy_lists, :response, :nickname, :receives
 
   FETION_URL = 'http://221.176.31.39/ht/sd.aspx'
@@ -51,9 +51,9 @@ class Fetion
   def Fetion.keep_alive(options)
     Fetion.open(options) do
       get_contacts
-      keep_alive
+      pulse
       sleep(15)
-      keep_alive
+      pulse
       p receives
     end
   end
@@ -284,6 +284,14 @@ class Fetion
     @logger.info "fetion keep alive success"
   end
 
+  def pulse(expected=SipcMessage::OK)
+    @logger.info "fetion pulse"
+
+    curl_exec(SIPP, next_url, expected)
+
+    @logger.info "fetion pulse success"
+  end
+
   def logout
     @logger.info "fetion logout"
 
@@ -318,6 +326,14 @@ class Fetion
     @logger.info "fetion msg received success"
   end
 
+  def close_session
+    @logger.info "fetion close_session"
+
+    curl_exec(SipcMessage.close_session(self))
+
+    @logger.info "fetion close_session success"
+  end
+
   def parse_ssic(response)
     raise Fetion::LoginException.new('Fetion Error: Login failed.') unless Net::HTTPSuccess === response
     raise Fetion::LoginException.new('Fetion Error: No ssic found in cookie.') unless response['set-cookie'] =~ /ssic=(.*);/
@@ -345,10 +361,6 @@ class Fetion
     @logger.debug "sid: " + @sid
   end
 
-  def pulse(expected=SipcMessage::OK)
-    curl_exec(SIPP, next_url, expected)
-  end
-
   def curl_exec(body='', url=next_url, expected=SipcMessage::OK)
     @logger.debug "fetion curl exec"
     @logger.debug "url: #{url}"
@@ -381,37 +393,10 @@ class Fetion
         @logger.debug "key: #{@key}"
         @logger.debug "signature: #{@signature}"
         @logger.debug "response: #{@response}"
-      elsif sipc_response.contain?('I')
-        create_session(sipc_response)
-      elsif sipc_response.contain?('O')
-        session_connected(sipc_response)
-      else
-        response.body.scan(%r{<results>.*?</results>}).each do |results|
-          doc = Nokogiri::XML(results)
-          doc.root.xpath("/results/user-info/personal").each do |personal_element|
-            @nickname = personal_element['nickname']
-            @logger.debug "nickname: #@nickname"
-          end
-          doc.root.xpath("/results/user-info/contact-list/buddy-lists/buddy-list").each do |buddy_list|
-            @buddy_lists << Fetion::BuddyList.parse(buddy_list)
-          end
-          doc.root.xpath("/results/user-info/contact-list/buddies/b").each do |buddy|
-            @buddies << {:uri => buddy["u"]}
-          end
-        end
-        
-        response.body.scan(%r{<events>.*?</events>}).each do |events|
-          doc = Nokogiri::XML(events)
-          doc.root.xpath("/events/event[@type='PresenceChanged']/contacts/c").each do |c|
-            contact = contacts.find {|contact| contact.id == c['id']}
-            if contact
-              contact.status = c.children.first['b']
-            else
-              @contacts << Fetion::Contact.parse(c) unless c['id'] == @user_id
-            end
-          end
-        end
-        
+      end
+      create_session(sipc_response) if sipc_response.contain?('I')
+      session_connected(sipc_response) if sipc_response.contain?('O')
+      if sipc_response.contain?('M')
         receive_messages = response.body.scan(%r{M #{@sid} SIP-C/4.0.*?BN}m)
         receive_messages = response.body.scan(%r{M #{@sid} SIP-C/4.0.*?SIPP\r?\n?$}m) if receive_messages.empty?
         receive_messages.each do |message_response|
@@ -429,6 +414,32 @@ class Fetion
           msg_received(message_response)
         end
       end
+
+      response.body.scan(%r{<results>.*?</results>}).each do |results|
+        doc = Nokogiri::XML(results)
+        doc.root.xpath("/results/user-info/personal").each do |personal_element|
+          @nickname = personal_element['nickname']
+          @logger.debug "nickname: #@nickname"
+        end
+        doc.root.xpath("/results/user-info/contact-list/buddy-lists/buddy-list").each do |buddy_list|
+          @buddy_lists << Fetion::BuddyList.parse(buddy_list)
+        end
+        doc.root.xpath("/results/user-info/contact-list/buddies/b").each do |buddy|
+          @buddies << {:uri => buddy["u"]}
+        end
+      end
+      
+      response.body.scan(%r{<events>.*?</events>}).each do |events|
+        doc = Nokogiri::XML(events)
+        doc.root.xpath("/events/event[@type='PresenceChanged']/contacts/c").each do |c|
+          contact = contacts.find {|contact| contact.id == c['id']}
+          if contact
+            contact.status = c.children.first['b']
+          else
+            @contacts << Fetion::Contact.parse(c) unless c['id'] == @user_id
+          end
+        end
+      end
     end
     sipc_response
   end

data/lib/rfetion/sipc_message.rb

@@ -2,12 +2,12 @@ require 'guid'
 
 class SipcMessage
   def self.register_first(fetion)
-    sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => '1 R', :CN => ::Guid.new.hexdigest.upcase, :CL => %Q|type="pc" ,version="#{Fetion::VERSION}"|, :with_l => false)
+    sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => "#{fetion.next_alive} R", :CN => ::Guid.new.hexdigest.upcase, :CL => %Q|type="pc" ,version="#{Fetion::VERSION}"|, :with_l => false)
   end
 
   def self.register_second(fetion)
     body = %Q|<args><device machine-code="B04B5DA2F5F1B8D01A76C0EBC841414C" /><caps value="ff" /><events value="7f" /><user-info mobile-no="#{fetion.mobile_no}" user-id="#{fetion.user_id}"><personal version="0" attributes="v4default" /><custom-config version="0" /><contact-list version="0"   buddy-attributes="v4default" /></user-info><credentials domains="fetion.com.cn;m161.com.cn;www.ikuwa.cn;games.fetion.com.cn" /><presence><basic value="400" desc="" /></presence></args>|
-    sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => '2 R', :A => %Q|Digest response="#{fetion.response}",algorithm="SHA1-sess-v4"|, :AK => 'ak-value', :body => body)
+    sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => "#{fetion.next_alive} R", :A => %Q|Digest response="#{fetion.response}",algorithm="SHA1-sess-v4"|, :AK => 'ak-value', :body => body)
   end
 
   def self.get_group_list(fetion)
@@ -55,7 +55,7 @@ class SipcMessage
   end
 
   def self.logout(fetion)
-    sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => '3 R', :X => 0, :with_l => false)
+    sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => "#{fetion.next_alive} R", :X => 0, :with_l => false)
   end
 
   def self.create_session(fetion, last_sipc_response)
@@ -105,6 +105,11 @@ class SipcMessage
     sipc_create(:command => 'B', :F => fetion.sid, :I => fetion.next_call, :Q => '2 B', :T => "sip:#{receiver_uri}", :with_l => false)
   end
 
+  def self.keep_alive(fetion)
+    body = %Q|<args><credentials domains="fetion.com.cn;m161.com.cn;www.ikuwa.cn;games.fetion.com.cn" /></args>|
+    sipc_create(:command => 'R', :F => fetion.sid, :I => 1, :Q => "#{fetion.next_alive} R", :N => 'KeepAlive', :body => body)
+  end
+
   def self.sipc_response(http_response_body, fetion)
     return if http_response_body == Fetion::SIPP
     

data/rfetion.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rfetion}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Richard Huang"]
-  s.date = %q{2010-05-16}
+  s.date = %q{2010-05-17}
   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"]

data/spec/rfetion/fetion_spec.rb

@@ -495,7 +495,7 @@ EOF
     end
   end
 
-  describe "keep-alive" do
+  describe "pulse" do
     before :each do
       @fetion.instance_variable_set(:@seq, 10)
       @fetion.instance_variable_set(:@sid, "730020377")
@@ -516,7 +516,7 @@ Q: 11 BN
 EOF
       response_body.gsub!("\n", "\r\n")
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=11", :body => response_body)
-      @fetion.keep_alive
+      @fetion.pulse
       @fetion.contacts.find {|contact| contact.id == '295098062'}.status.should == "400"
     end
 
@@ -574,7 +574,7 @@ EOF
       response_body.gsub!("\n", "\r\n")
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=14", :body => response_body)
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=15", :body => "SIPP")
-      @fetion.keep_alive
+      @fetion.pulse
       @fetion.receives.collect {|r| r.sip}.should == ["638993408@fetion.com.cn;p=2242"]
       @fetion.receives.collect {|r| r.sent_at}.should == [Time.parse("Sun, 16 May 2010 02:16:00 GMT")]
       @fetion.receives.collect {|r| r.text}.should == ["test"]
@@ -632,7 +632,7 @@ EOF
       response_body.gsub!("\n", "\r\n")
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=13", :body => response_body)
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=14", :body => "SIPP")
-      @fetion.keep_alive
+      @fetion.pulse
       @fetion.receives.collect {|r| r.sip}.should == ["638993408@fetion.com.cn;p=2242"]
       @fetion.receives.collect {|r| r.sent_at}.should == [Time.parse("Sun, 16 May 2010 02:16:00 GMT")]
       @fetion.receives.collect {|r| r.text}.should == ["test"]
@@ -654,6 +654,11 @@ testtesttestSIPP
 EOF
       response_body.gsub!("\n", "\r\n")
       FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=11", :body => response_body)
+      FakeWeb.register_uri(:post, "http://221.176.31.39/ht/sd.aspx?t=s&i=12", :body => "SIPP")
+      @fetion.pulse
+      @fetion.receives.collect {|r| r.sip}.should == ["638993408@fetion.com.cn;p=2242"]
+      @fetion.receives.collect {|r| r.sent_at}.should == [Time.parse("Tue, 11 May 2010 15:18:56 GMT")]
+      @fetion.receives.collect {|r| r.text}.should == ["testtesttest"]
     end
   end
 end

data/spec/rfetion/sipc_message_spec.rb

@@ -19,6 +19,7 @@ describe SipcMessage do
     Guid.stubs(:new).returns(guid)
     guid.stubs(:hexdigest).returns(hexdigest)
     hexdigest.stubs(:upcase).returns("19D28D4978125CAA4F6E54277BA7D9EF")
+    @fetion.alive = 0
     sipc_message =<<-EOF
 R fetion.com.cn SIP-C/4.0
 F: 730020377
@@ -34,6 +35,7 @@ EOF
   end
 
   it "should get register_second" do
+    @fetion.alive = 1
     sipc_message =<<-EOF
 R fetion.com.cn SIP-C/4.0
 F: 730020377
@@ -229,7 +231,26 @@ m=message SIPP
 EOF
     http_response_body.gsub!("\n", "\r\n").chomp!
     last_sipc_response = SipcMessage.sipc_response(http_response_body, @fetion)
-    sipc_message = %Q|SIP-C/4.0 200 OK\r\nI: -13\r\nQ: 14 I\r\nF: sip:638993408@fetion.com.cn;p=2242\r\nK: text/plain\r\nK: text/html-fragment\r\nK: multiparty\r\nK: nudge\r\nL: 129\r\n\r\nv=0\r\no=-0 0 IN 127.0.0.1:8001\r\ns=session\r\nc=IN IP4 127.0.0.1:8001\r\nt=0 0\r\nm=message 8001 sip sip:730020377@fetion.com.cn;p=6907\r\nSIPP|
+    sipc_message =<<-EOF
+SIP-C/4.0 200 OK
+I: -13
+Q: 14 I
+F: sip:638993408@fetion.com.cn;p=2242
+K: text/plain
+K: text/html-fragment
+K: multiparty
+K: nudge
+L: 129
+
+v=0
+o=-0 0 IN 127.0.0.1:8001
+s=session
+c=IN IP4 127.0.0.1:8001
+t=0 0
+m=message 8001 sip sip:730020377@fetion.com.cn;p=6907
+SIPP
+EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
     SipcMessage.create_session(@fetion, last_sipc_response).should == sipc_message
   end
 
@@ -294,6 +315,22 @@ EOF
     SipcMessage.msg_received(@fetion, http_response_body).should == sipc_message
   end
 
+  it "should keep alive" do
+    @fetion.alive = 3
+    sipc_message =<<-EOF
+R fetion.com.cn SIP-C/4.0
+F: 730020377
+I: 1
+Q: 4 R
+N: KeepAlive
+L: 97
+
+<args><credentials domains="fetion.com.cn;m161.com.cn;www.ikuwa.cn;games.fetion.com.cn" /></args>SIPP
+    EOF
+    sipc_message.gsub!("\n", "\r\n").chomp!
+    SipcMessage.keep_alive(@fetion).should == sipc_message
+  end
+
   it "should close session" do
     @fetion.call = 5
     sipc_message =<<-EOF
@@ -310,6 +347,7 @@ EOF
   end
 
   it "should logout" do
+    @fetion.alive = 2
     sipc_message =<<-EOF
 R fetion.com.cn SIP-C/4.0
 F: 730020377

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rfetion
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Richard Huang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-16 00:00:00 -06:00
+date: 2010-05-17 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency