Push0r 0.4.0 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/push0r/APNS/ApnsService.rb +11 -11
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5dab5f24a705dc40492ae3e3f86d3ec3c58d5814
|
|
4
|
+
data.tar.gz: 5fcedb095832448fcd749f68b162b7e5e6fe9923
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9aafcfa1360219dfee53f5de74459b5c73beed1b1bb800ce8d2daf1a95103affa4346e527c114c9268f98b260a24264287a3e366738a8bc66080ee9aedfc9100
|
|
7
|
+
data.tar.gz: 4f23c2c2b55e2d5924063f5ad278ac03118e0451d9ad69c7f9ba1ef87c38c2286b07eaf1cb7536d5a6e52a868c68cb8a0a23282c694572ff02232241305c213e
|
|
@@ -61,7 +61,7 @@ module Push0r
|
|
|
61
61
|
end
|
|
62
62
|
(result, error_message, error_code) = transmit_messages
|
|
63
63
|
if result == false
|
|
64
|
-
failed_messages << FailedMessage.new(error_code, error_message.receiver_token, error_message)
|
|
64
|
+
failed_messages << FailedMessage.new(error_code, [error_message.receiver_token], error_message)
|
|
65
65
|
reset_message(error_message.identifier)
|
|
66
66
|
if @messages.empty? then result = true end
|
|
67
67
|
end
|
|
@@ -77,25 +77,25 @@ module Push0r
|
|
|
77
77
|
# @return [Array<String>] an array of expired push tokens
|
|
78
78
|
def get_feedback
|
|
79
79
|
tokens = []
|
|
80
|
-
|
|
80
|
+
|
|
81
81
|
begin
|
|
82
82
|
setup_ssl(true)
|
|
83
83
|
rescue SocketError => e
|
|
84
84
|
puts "Error: #{e}"
|
|
85
85
|
return tokens
|
|
86
86
|
end
|
|
87
|
-
|
|
88
|
-
if IO.select([@ssl], nil, nil,
|
|
89
|
-
while line = @ssl.read(38)
|
|
87
|
+
|
|
88
|
+
if IO.select([@ssl], nil, nil, 1)
|
|
89
|
+
while line = @ssl.read(38)
|
|
90
90
|
f = line.unpack('N1n1H64')
|
|
91
91
|
time = Time.at(f[0])
|
|
92
92
|
token = f[2].scan(/.{8}/).join(" ")
|
|
93
93
|
tokens << token
|
|
94
|
-
end
|
|
94
|
+
end
|
|
95
95
|
end
|
|
96
|
-
|
|
96
|
+
|
|
97
97
|
close_ssl
|
|
98
|
-
|
|
98
|
+
|
|
99
99
|
return tokens
|
|
100
100
|
end
|
|
101
101
|
|
|
@@ -106,7 +106,7 @@ module Push0r
|
|
|
106
106
|
|
|
107
107
|
ctx.key = OpenSSL::PKey::RSA.new(@certificate_data, '')
|
|
108
108
|
ctx.cert = OpenSSL::X509::Certificate.new(@certificate_data)
|
|
109
|
-
|
|
109
|
+
|
|
110
110
|
unless for_feedback
|
|
111
111
|
@sock = TCPSocket.new(@sandbox_environment ? "gateway.sandbox.push.apple.com" : "gateway.push.apple.com", 2195)
|
|
112
112
|
else
|
|
@@ -115,7 +115,7 @@ module Push0r
|
|
|
115
115
|
@ssl = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
|
|
116
116
|
@ssl.connect
|
|
117
117
|
end
|
|
118
|
-
|
|
118
|
+
|
|
119
119
|
def close_ssl
|
|
120
120
|
unless @ssl.nil?
|
|
121
121
|
@ssl.close
|
|
@@ -191,7 +191,7 @@ module Push0r
|
|
|
191
191
|
|
|
192
192
|
@ssl.write(pushdata)
|
|
193
193
|
|
|
194
|
-
if IO.select([@ssl], nil, nil,
|
|
194
|
+
if IO.select([@ssl], nil, nil, 1)
|
|
195
195
|
begin
|
|
196
196
|
read_buffer = @ssl.read(6)
|
|
197
197
|
rescue Exception
|