Push0r 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b1cd13adeaeb9f26f459bdb66a3cc67592568f
-  data.tar.gz: 61cdaa0fb84ec168851fafd8b331099489a80392
+  metadata.gz: ce91f193ec033c63cc346d17b0f33d5cb88eb07c
+  data.tar.gz: 2ebcec3b1f598c26bde48ed7bbad1cd415bcc8bc
 SHA512:
-  metadata.gz: 02a891c44c26f3c3818c5a156b7baee016daad50ee63e4c6301b671a5ddd4401f8fa078e7b7c088ad7a06b013de74a6b45f0d7a56a10793058fc2fbbc2277087
-  data.tar.gz: 4a3322b16d2b5c8f465a0a109a5794ca71d276b95c1058afa12871915ce677b9a729303dd1bd4fec1c4454bd84acd4323cb98dc63cd70b164b742d5546e1e036
+  metadata.gz: 0c3cf872531d79e1390bd24deda798665139e9d0b877c8b93c7b22e5ab918fe8e7c96bb805b6f8ccbcadba7705d2b215d304fcbadd885a232e54ea4134f83778
+  data.tar.gz: 896726f6c6a06cf920edc2b9ebce22e090eee8e82f029a718545420f6564443c49bca4452f8136df93702dffe11ab52f47888edd4cfdc8d1215377eca6041323

data/lib/push0r/APNS/ApnsService.rb

@@ -51,8 +51,14 @@ module Push0r
 		# @see Service#end_push
 		def end_push
 			failed_messages = []
+			result = false
 			begin
-				setup_ssl
+				begin
+					setup_ssl(true)
+				rescue SocketError => e
+					puts "Error: #{e}"
+					break
+				end
 				(result, error_message, error_code) = transmit_messages
 				if result == false
 					failed_messages << FailedMessage.new(error_code, error_message.receiver_token, error_message)
@@ -61,28 +67,63 @@ module Push0r
 				end
 			end while result != true
 
-			unless @ssl.nil?
-				@ssl.close
-			end
-			unless @sock.nil?
-				@sock.close
-			end
+			close_ssl
 
 			@messages = [] ## reset
 			return [failed_messages, []]
 		end
 
+		# Calls the APNS feedback service and returns an array of expired push tokens
+		# @return [Array<String>] an array of expired push tokens
+		def get_feedback
+			tokens = []
+			
+			begin
+				setup_ssl(true)
+			rescue SocketError => e
+				puts "Error: #{e}"
+				return tokens
+			end
+			
+			if IO.select([@ssl], nil, nil, 0.5)
+				while line = @ssl.read(38)			
+					f = line.unpack('N1n1H64')
+					time = Time.at(f[0])
+					token = f[2].scan(/.{8}/).join(" ")
+					tokens << token
+				end	
+			end
+	
+			close_ssl
+			
+			return tokens
+		end
+
 		private
-		def setup_ssl
+		def setup_ssl(for_feedback = false)
+			close_ssl
 			ctx = OpenSSL::SSL::SSLContext.new
 
 			ctx.key = OpenSSL::PKey::RSA.new(@certificate_data, '')
 			ctx.cert = OpenSSL::X509::Certificate.new(@certificate_data)
-
-			@sock = TCPSocket.new(@sandbox_environment ? "gateway.sandbox.push.apple.com" : "gateway.push.apple.com", 2195)
+			
+			unless for_feedback
+				@sock = TCPSocket.new(@sandbox_environment ? "gateway.sandbox.push.apple.com" : "gateway.push.apple.com", 2195)
+			else
+				@sock = TCPSocket.new(@sandbox_environment ? "feedback.sandbox.push.apple.com" : "feedback.push.apple.com", 2195)
+			end
 			@ssl = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
 			@ssl.connect
 		end
+		
+		def close_ssl
+			unless @ssl.nil?
+				@ssl.close
+			end
+			unless @sock.nil?
+				@sock.close
+			end
+		end
 
 		def reset_message(error_identifier)
 			index = @messages.find_index {|o| o.identifier == error_identifier}
@@ -150,7 +191,7 @@ module Push0r
 
 			@ssl.write(pushdata)
 
-			if IO.select([@ssl], nil, nil, 2)
+			if IO.select([@ssl], nil, nil, 0.5)
 				begin
 					read_buffer = @ssl.read(6)
 				rescue Exception

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Push0r
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Kai Straßmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec