notifiable-apns-apnotic 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ee127117cadea3bf299a7172c9e919ce97fbc17141d689b36c3b9e974ba08e
-  data.tar.gz: b3d161b342c17fb0a766ca265ebe746d69aa38ea881f0a144c138337ca1bd347
+  metadata.gz: e26c3a1d49df1de6ee0534598ff3344ed6596f2e85aa1b344df434bc92fe83d1
+  data.tar.gz: 4bc8a6378ea65ca13f095f07a769a48fae92f4ad75e8a696de5d95385271b8ca
 SHA512:
-  metadata.gz: '0888843fb164aded146ab56ab1512014be3012f184d2f0117acf34e3186fe2bbed0cda64bad542ff3a2c100adc69e9b5fd0eb0f2ff18a031827a87e85c2ee5fc'
-  data.tar.gz: 6efb82c65c040ca97d7f9f6e6ba705670123131a2ec5061bd30fd3000f4a7afde797faee7ee1f528798eae5bb6c211d64a8d8a56109ec66ff302ae51c1c05359
+  metadata.gz: bffcbbf3039e4cb2e1dc135d27faded97f7170a9d696c4f9dc393f22255142cd057e9ee4a6f9ac3e297df6800db15b1138ecb41b2a78e958f50bfa865d0b9180
+  data.tar.gz: 1f3a9867919bb88a975f30c1521832e4a7d390ef4a23295bf288223475de5d32f79532853dbda70f1889c33536aae5da23835e0673f0a3a4a1f2a3c6f9ce389c

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    notifiable-apns-apnotic (0.2.3)
+    notifiable-apns-apnotic (0.3.0)
       apnotic (~> 1.4.1)
+      grocer (~> 0.7.1)
       notifiable-core (>= 0.1.3)
 
 GEM
@@ -32,13 +33,14 @@ GEM
     diff-lcs (1.3)
     factory_bot (4.11.0)
       activesupport (>= 3.0.0)
+    grocer (0.7.1)
     http-2 (0.9.0)
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     minitest (5.11.3)
     net-http2 (0.18.0)
       http-2 (= 0.9.0)
-    notifiable-core (0.1.4)
+    notifiable-core (0.2.0)
       activerecord
       activerecord-import
     pg (1.1.0)

data/lib/notifiable/apns/apnotic/async.rb

@@ -1,5 +1,6 @@
 require 'notifiable'
 require 'apnotic'
+require 'grocer'
 
 module Notifiable
   module Apns
@@ -46,6 +47,11 @@ module Notifiable
           connection.join
           connection.close
           @connection = nil
+          process_feedback if feedback_app_ids.split(',').include?(notification.app.id.to_s)
+        end
+        
+        def feedback_app_ids
+          ENV['APNS_APNOTIC_PROCESS_FEEDBACK_APP_IDS'] || ''
         end
         
         def connection
@@ -71,6 +77,35 @@ module Notifiable
           
           payload
         end
+        
+        def grocer_feedback
+  				@grocer_feedback ||= ::Grocer.feedback(feedback_config)
+        end
+        
+        def feedback_host
+          self.sandbox? ? "feedback.sandbox.push.apple.com" : "feedback.push.apple.com"
+        end
+        
+        def feedback_config
+          {
+            certificate: certificate,
+            passphrase:  passphrase,
+            gateway:     feedback_host,
+            port:        2196,
+            retries:     3
+          }
+        end
+    
+        def process_feedback
+  				grocer_feedback.each do |attempt|
+  					token = attempt.device_token
+  					device_token = DeviceToken.find_by_token(token)
+  					if device_token
+  						device_token.destroy if device_token.updated_at < attempt.timestamp
+  						logger.info("Device #{token} removed at #{attempt.timestamp}")
+  					end
+  				end
+        end
   		end
     end
 	end

data/lib/notifiable/apns/apnotic/grocer_ssl_connection.rb

@@ -0,0 +1,15 @@
+module Grocer
+  class SSLConnection
+    def connect
+      context = OpenSSL::SSL::SSLContext.new
+      context.key  = OpenSSL::PKey::RSA.new(certificate, passphrase)
+      context.cert = OpenSSL::X509::Certificate.new(certificate)
+
+      @sock            = TCPSocket.new(gateway, port)
+      @sock.setsockopt   Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true
+      @ssl             = OpenSSL::SSL::SSLSocket.new(@sock, context)
+      @ssl.sync        = true
+      @ssl.connect
+    end
+  end
+end

data/lib/notifiable/apns/apnotic/version.rb

@@ -1,7 +1,7 @@
 module Notifiable
   module Apns
     module Apnotic
-      VERSION = "0.2.3"
+      VERSION = "0.3.0"
     end
   end
 end

data/notifiable-apns-apnotic.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   
   spec.add_dependency "notifiable-core", ">= 0.1.3"
   spec.add_dependency 'apnotic', '~> 1.4.1'
+  spec.add_dependency 'grocer', '~> 0.7.1'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-apns-apnotic
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Brooke-Smith
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifiable-core
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.1
+- !ruby/object:Gem::Dependency
+  name: grocer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +184,7 @@ files:
 - db/development.sqlite3
 - lib/notifiable/apns/apnotic.rb
 - lib/notifiable/apns/apnotic/async.rb
+- lib/notifiable/apns/apnotic/grocer_ssl_connection.rb
 - lib/notifiable/apns/apnotic/version.rb
 - notifiable-apns-apnotic.gemspec
 homepage: https://github.com/FutureWorkshops/notifiable-apns-apnotic