unipush 0.1.4 → 0.1.5

data/lib/unipush.rb

@@ -1,5 +1,8 @@
+require 'openssl'
+require 'socket'
+require 'active_support/core_ext'
 class Unipush
-  attr_accessor :ios_cert_path
+  attr_accessor :ios_cert_path, :ssl, :socket, :ret # пусть к файлу сертификата
 
 
   def initialize(mode='production')
@@ -19,6 +22,12 @@ class Unipush
     @android_push_url = 'https://android.apis.google.com/c2dm/send'
 
     @last_error = []
+    @unsent_messages = []
+
+    @sock = nil
+    @ssl = nil
+
+    @apns_feedback_conn = nil
   end
 
   def get_last_error
@@ -29,8 +38,44 @@ class Unipush
     @unsent_messages.nil? ? false : @unsent_messages
   end
 
+  def apns_connect
+    cert_path = @ios_cert_path
+    if FileTest.exist?(cert_path)
+      certificate = File.read(cert_path)
+      context = OpenSSL::SSL::SSLContext.new
+      context.key = OpenSSL::PKey::RSA.new(certificate)
+      context.cert = OpenSSL::X509::Certificate.new(certificate)
+      @sock = TCPSocket.new(@ios_push_url, @ios_push_port)
+      @ssl = OpenSSL::SSL::SSLSocket.new(@sock, context)
+      @ssl.sync = true
+      @ssl.connect
+    else
+      @last_error.push("Certificate file does not exist")
+      false
+    end
+  end
+
+
+  def apns_check_conn
+    if @ssl && @sock
+      unless @ssl.state == "SSLOK "
+        self.apns_connect
+      end
+    else
+      self.apns_connect
+    end
+    @ssl.state == "SSLOK "
+  end
+
+  def apns_close
+    if @ssl
+      @ssl.close
+      @sock.close
+    end
+  end
+
   #message={:text=>"", :badge=>0, :newsstand=>true, :track=>true, :add=>{:param1=>1, :param2=>2}}
-  def prepare_ios_message(token, message)
+  def prepare_ios_message(token, message, message_id=0)
     json = ""
     if message[:newsstand]
       json = '{"aps":{"content-available":1}}'
@@ -53,7 +98,7 @@ class Unipush
 
     if message[:track]
       tt = Time.now + 1.day
-      mes =  [1, Random.rand, tt.to_i, 0, 32, token, 0, json.bytesize, json].pack("cNNcca*cca*")
+      mes =  [1, message_id, tt.to_i, 0, 32, token, 0, json.bytesize, json].pack("cNNcca*cca*")
     else
       mes = [0, 0, 32, token, 0, json.bytesize, json].pack("ccca*cca*")
     end
@@ -64,43 +109,36 @@ class Unipush
   # messages = [message2, message2, ...]
   # message=[token, message={:text=>"", :badge=>0, :newsstand=>true, :track=>true, :add=>{:param1=>1, :param2=>2}}]
   def send_ios_messages(messages)
-    cert_path = @ios_cert_path
-    if FileTest.exist?(cert_path)
-      begin
-        certificate = File.read(cert_path)
-        context = OpenSSL::SSL::SSLContext.new
-        context.key = OpenSSL::PKey::RSA.new(certificate)
-        context.cert = OpenSSL::X509::Certificate.new(certificate)
-        socket = TCPSocket.new(@ios_push_url, @ios_push_port)
-        ssl = OpenSSL::SSL::SSLSocket.new(socket, context)
-        ssl.sync = true
-        ssl.connect
-        messages.each_with_index do |m, k|
-          mes = prepare_ios_message(m[0], m[1])
-          if mes
-            ssl.write(mes)
-            if ssl.pending >0 && m[1][:track]
-              tmp = ssl.readline
+    begin
+      messages.each_with_index do |m, k|
+        mes = prepare_ios_message(m[0], m[1], k)
+        if mes
+          if self.apns_check_conn
+            cnt = 0
+            @ssl.write(mes)
+            begin
+              cnt += 1
+              tmp = @ssl.read_nonblock(8)
               reply = tmp.unpack("CCN")
-              @unsent_messages.push(k)
-              @last_error.push("Could not send message #{k} width error: "+reply.join(", "))
+              @unsent_messages.push(reply[2])
+              @last_error.push("Could not send message #{reply[2]} width error: "+reply.join(", "))
+              self.apns_close
+              break
+            rescue IO::WaitReadable
+              retry if cnt<1000
             end
-          else
-            @unsent_messages = [] if @unsent_messages.nil?
-            @unsent_messages.push(k)
+            puts k, cnt
           end
+        else
+          @unsent_messages = [] if @unsent_messages.nil?
+          @unsent_messages.push(k)
         end
-        ssl.close
-        socket.close
-      rescue
-        @last_error.push("Could not send messages. Exception: #{$!.inspect}")
-        false
-      else
-        true
       end
-    else
-      @last_error.push("Certificate file does not exist")
+    rescue
+      @last_error.push("Could not send messages. Exception: #{$!.inspect}")
       false
+    else
+      true
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unipush
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-08-12 00:00:00.000000000 Z
 dependencies: []
 description: A simple push notification sender for iOS and Android
 email: alexey.s.kirov@gmail.com
@@ -38,7 +38,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Unipush