lead_zeppelin 0.1.3 → 0.1.4

data/README.md

@@ -28,10 +28,14 @@ Require the gem, set threads to throw exceptions (optional, but recommended for
 Instantiate a new client and configure it by adding the block of code to handle error responses, and . Provide client.on\_error _before adding applications_.
 
     client = LeadZeppelin::APNS::Client.new do |c|
-      c.on_error do |error_response|
+      c.on_notification_error do |error_response|
         puts "Apple sent back an error response: #{error_response.inspect}"
       end
       
+      c.on_certificate_error do |app|
+        puts "Certificate error failed for #{app}"
+      end
+      
       # You can provide .p12 files too! p12: File.read('./yourapp.p12')
       c.add_application :your_app_identifier, pem: File.read('./yourapp.pem')
     end

data/lib/lead_zeppelin/apns.rb

@@ -10,4 +10,18 @@ require_relative './apns/client'
 require_relative './apns/gateway'
 require_relative './apns/logger'
 require_relative './apns/notification'
-require_relative './apns/error'
+require_relative './apns/error_response'
+
+module LeadZeppelin
+  module APNS
+    def self.client=(client)
+      Mutex.new.synchronize do
+        @client = client
+      end
+
+      def self.client
+        @client
+      end
+    end
+  end
+end

data/lib/lead_zeppelin/apns/application.rb

@@ -4,10 +4,10 @@ module LeadZeppelin
       CONNECTION_POOL_SIZE = 5
       CONNECTION_POOL_TIMEOUT = 5
 
-      attr_reader :name
+      attr_reader :identifier
 
-      def initialize(name, opts={})
-        @name = name
+      def initialize(identifier, opts={})
+        @identifier = identifier
         @opts = opts
 
         @ssl_context = OpenSSL::SSL::SSLContext.new
@@ -28,8 +28,24 @@ module LeadZeppelin
         cp_args = {size:    (@opts[:connection_pool_size] || CONNECTION_POOL_SIZE),
                    timeout: (@opts[:connection_pool_timeout] || CONNECTION_POOL_TIMEOUT)}
 
-        @gateway_connection_pool = ConnectionPool.new(cp_args) do
-          Gateway.new @ssl_context, (@opts[:gateway_opts] || {}).merge(error_block: @opts[:error_block], application_name: @name)
+        begin
+          @gateway_connection_pool = ConnectionPool.new(cp_args) do
+            Gateway.new @ssl_context, (@opts[:gateway_opts] || {}).merge(notification_error_block: @opts[:notification_error_block],
+                                                                         certificate_error_block:  @opts[:certificate_error_block],
+                                                                         application_identifier:   @identifier)
+          end
+
+        rescue OpenSSL::SSL::SSLError => e
+          if e.message =~ /alert certificate unknown/
+            Logger.warn "bad certificate for #{@identifier}, failed to connect"
+
+            if @opts[:certificate_error_block].nil?
+              Logger.warn "removing application #{@identifier} from the client due to bad certificate"
+              APNS.client.remove_application @identifier
+            else
+              @opts[:certificate_error_block].call @identifier
+            end
+          end
         end
       end
 

data/lib/lead_zeppelin/apns/client.rb

@@ -16,12 +16,18 @@ module LeadZeppelin
         # FIXME
         @thread_count = Queue.new
         (opts[:client_threads] || CLIENT_THREADS).times {|t| @thread_count << t}
+        
+        APNS.client = self
       end
 
       attr_accessor :applications
 
-      def on_error(&block)
-        @error_block = block
+      def on_notification_error(&block)
+        @notification_error_block = block
+      end
+
+      def on_certificate_error(&block)
+        @certificate_error_block = block
       end
 
       def poll(frequency=DEFAULT_POLL_FREQUENCY, opts={}, &block)
@@ -47,9 +53,17 @@ module LeadZeppelin
       def add_application(name, opts={})
         Logger.info "adding application \"#{name}\""
         Logger.thread 'a'
+        
+        begin
+          application = Application.new name, opts.merge(notification_error_block: @notification_error_block,
+                                                         certificate_error_block:  @certificate_error_block)
+        rescue OpenSSL::X509::CertificateError => e
+          Logger.error "received a bad certificate for #{name}, not adding application"
+        end
+
         @semaphore.synchronize do
           @applications ||= {}
-          @applications[name] = Application.new name, opts.merge(error_block: @error_block)
+          @applications[name] = application
         end
       end
 

data/lib/lead_zeppelin/apns/gateway.rb

@@ -23,14 +23,13 @@ module LeadZeppelin
             ssl_socket = OpenSSL::SSL::SSLSocket.new socket, @ssl_context
             
             ssl_socket.sync_close = true # when ssl_socket is closed, make sure the regular socket closes too.
+
             ssl_socket.connect
 
             # FIXME TODO CHECK FOR EOFError HERE instead of in process_error
 
-            @semaphore.synchronize do
-              @socket = socket
-              @ssl_socket = ssl_socket
-            end
+            @socket = socket
+            @ssl_socket = ssl_socket
           end
 
           Logger.debug "gateway connection established"
@@ -64,8 +63,8 @@ module LeadZeppelin
 
           reconnect
 
-          if @opts[:error_block].nil? || !@opts[:error_block].respond_to?(:call)
-            Logger.error "You have not implemented an on_error block. This could lead to your account being banned from APNS. See the APNS docs"
+          if @opts[:error_block].nil? || !@opts[:notification_error_block].respond_to?(:call)
+            Logger.warn "You have not implemented an on_notification_error block. This could lead to your account being banned from APNS. See the APNS docs"
           else
             @opts[:error_block].call(error)
           end
@@ -73,7 +72,9 @@ module LeadZeppelin
         rescue EOFError
           # FIXME put in a certificate error pre-check and perhaps an error block for handling this.
           # A better solution is the remove the application altogether from the client..
-          Logger.error "Invalid certificate for #{@opts[:application_name]}, reconnecting for now.."
+          # Sometimes this just means that the socket has disconnected. Apparently Apple does that too.
+          # 
+          Logger.info "socket has closed for #{@opts[:application_identifier]}, reconnecting"
           reconnect
         rescue IO::WaitReadable
           # No data to read, continue

data/lib/lead_zeppelin/version.rb

@@ -1,3 +1,3 @@
 module LeadZeppelin
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lead_zeppelin
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -76,7 +76,6 @@ files:
 - lib/lead_zeppelin/apns.rb
 - lib/lead_zeppelin/apns/application.rb
 - lib/lead_zeppelin/apns/client.rb
-- lib/lead_zeppelin/apns/error.rb
 - lib/lead_zeppelin/apns/gateway.rb
 - lib/lead_zeppelin/apns/logger.rb
 - lib/lead_zeppelin/apns/notification.rb

data/lib/lead_zeppelin/apns/error.rb

@@ -1,26 +0,0 @@
-module LeadZeppelin
-  module APNS
-    class ErrorResponse
-      CODES = {
-        0   => 'No errors encountered',
-        1   => 'Processing error',
-        2   => 'Missing device token',
-        3   => 'Missing topic',
-        4   => 'Missing payload',
-        5   => 'Invalid token size',
-        6   => 'Invalid topic size',
-        7   => 'Invalid payload size',
-        8   => 'Invalid token',
-        255 => 'None (unknown)'
-      }
-
-      attr_reader :code, :identifier, :message, :notification
-
-      def initialize(packet, notification=nil)
-        command, @code, @identifier = packet.unpack 'ccA4'
-        @message = CODES[@code]
-        @notification = notification
-      end
-    end
-  end
-end