rpush 7.0.1 → 9.0.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 9.0.0
 platform: ruby
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2024-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -78,14 +78,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -135,19 +141,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webpush
+  name: web-push
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: googleauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -166,16 +200,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -264,16 +298,16 @@ dependencies:
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -294,14 +328,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '1.66'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: '1.66'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -316,6 +350,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -413,8 +489,8 @@ files:
 - lib/generators/templates/rpush_4_1_0_updates.rb
 - lib/generators/templates/rpush_4_1_1_updates.rb
 - lib/generators/templates/rpush_4_2_0_updates.rb
+- lib/generators/templates/rpush_7_1_0_updates.rb
 - lib/rpush.rb
-- lib/rpush/apns_feedback.rb
 - lib/rpush/cli.rb
 - lib/rpush/client/active_model.rb
 - lib/rpush/client/active_model/adm/app.rb
@@ -429,9 +505,10 @@ files:
 - lib/rpush/client/active_model/apnsp8/app.rb
 - lib/rpush/client/active_model/apnsp8/notification.rb
 - lib/rpush/client/active_model/certificate_private_key_validator.rb
-- lib/rpush/client/active_model/gcm/app.rb
-- lib/rpush/client/active_model/gcm/expiry_collapse_key_mutual_inclusion_validator.rb
-- lib/rpush/client/active_model/gcm/notification.rb
+- lib/rpush/client/active_model/fcm/app.rb
+- lib/rpush/client/active_model/fcm/expiry_collapse_key_mutual_inclusion_validator.rb
+- lib/rpush/client/active_model/fcm/notification.rb
+- lib/rpush/client/active_model/fcm/notification_keys_in_allowed_list_validator.rb
 - lib/rpush/client/active_model/notification.rb
 - lib/rpush/client/active_model/payload_data_size_validator.rb
 - lib/rpush/client/active_model/pushy/app.rb
@@ -456,8 +533,8 @@ files:
 - lib/rpush/client/active_record/apnsp8/app.rb
 - lib/rpush/client/active_record/apnsp8/notification.rb
 - lib/rpush/client/active_record/app.rb
-- lib/rpush/client/active_record/gcm/app.rb
-- lib/rpush/client/active_record/gcm/notification.rb
+- lib/rpush/client/active_record/fcm/app.rb
+- lib/rpush/client/active_record/fcm/notification.rb
 - lib/rpush/client/active_record/notification.rb
 - lib/rpush/client/active_record/pushy/app.rb
 - lib/rpush/client/active_record/pushy/notification.rb
@@ -480,8 +557,8 @@ files:
 - lib/rpush/client/redis/apnsp8/app.rb
 - lib/rpush/client/redis/apnsp8/notification.rb
 - lib/rpush/client/redis/app.rb
-- lib/rpush/client/redis/gcm/app.rb
-- lib/rpush/client/redis/gcm/notification.rb
+- lib/rpush/client/redis/fcm/app.rb
+- lib/rpush/client/redis/fcm/notification.rb
 - lib/rpush/client/redis/notification.rb
 - lib/rpush/client/redis/pushy/app.rb
 - lib/rpush/client/redis/pushy/notification.rb
@@ -497,9 +574,6 @@ files:
 - lib/rpush/daemon.rb
 - lib/rpush/daemon/adm.rb
 - lib/rpush/daemon/adm/delivery.rb
-- lib/rpush/daemon/apns.rb
-- lib/rpush/daemon/apns/delivery.rb
-- lib/rpush/daemon/apns/feedback_receiver.rb
 - lib/rpush/daemon/apns2.rb
 - lib/rpush/daemon/apns2/delivery.rb
 - lib/rpush/daemon/apnsp8.rb
@@ -511,15 +585,14 @@ files:
 - lib/rpush/daemon/delivery.rb
 - lib/rpush/daemon/delivery_error.rb
 - lib/rpush/daemon/dispatcher/apns_http2.rb
-- lib/rpush/daemon/dispatcher/apns_tcp.rb
 - lib/rpush/daemon/dispatcher/apnsp8_http2.rb
 - lib/rpush/daemon/dispatcher/http.rb
-- lib/rpush/daemon/dispatcher/tcp.rb
 - lib/rpush/daemon/dispatcher_loop.rb
 - lib/rpush/daemon/errors.rb
+- lib/rpush/daemon/fcm.rb
+- lib/rpush/daemon/fcm/delivery.rb
 - lib/rpush/daemon/feeder.rb
-- lib/rpush/daemon/gcm.rb
-- lib/rpush/daemon/gcm/delivery.rb
+- lib/rpush/daemon/google_credential_cache.rb
 - lib/rpush/daemon/interruptible_sleep.rb
 - lib/rpush/daemon/loggable.rb
 - lib/rpush/daemon/proc_title.rb
@@ -540,7 +613,6 @@ files:
 - lib/rpush/daemon/store/redis.rb
 - lib/rpush/daemon/string_helpers.rb
 - lib/rpush/daemon/synchronizer.rb
-- lib/rpush/daemon/tcp_connection.rb
 - lib/rpush/daemon/webpush.rb
 - lib/rpush/daemon/webpush/delivery.rb
 - lib/rpush/daemon/wns.rb
@@ -566,12 +638,10 @@ files:
 - spec/.rubocop.yml
 - spec/functional/adm_spec.rb
 - spec/functional/apns2_spec.rb
-- spec/functional/apns_spec.rb
 - spec/functional/cli_spec.rb
 - spec/functional/embed_spec.rb
-- spec/functional/gcm_priority_spec.rb
-- spec/functional/gcm_spec.rb
-- spec/functional/new_app_spec.rb
+- spec/functional/fcm_priority_spec.rb
+- spec/functional/fcm_spec.rb
 - spec/functional/pushy_spec.rb
 - spec/functional/retry_spec.rb
 - spec/functional/synchronization_spec.rb
@@ -586,7 +656,6 @@ files:
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
-- spec/unit/apns_feedback_spec.rb
 - spec/unit/client/active_record/adm/app_spec.rb
 - spec/unit/client/active_record/adm/notification_spec.rb
 - spec/unit/client/active_record/apns/app_spec.rb
@@ -596,8 +665,8 @@ files:
 - spec/unit/client/active_record/apns2/notification_spec.rb
 - spec/unit/client/active_record/apnsp8/notification_spec.rb
 - spec/unit/client/active_record/app_spec.rb
-- spec/unit/client/active_record/gcm/app_spec.rb
-- spec/unit/client/active_record/gcm/notification_spec.rb
+- spec/unit/client/active_record/fcm/app_spec.rb
+- spec/unit/client/active_record/fcm/notification_spec.rb
 - spec/unit/client/active_record/notification_spec.rb
 - spec/unit/client/active_record/pushy/app_spec.rb
 - spec/unit/client/active_record/pushy/notification_spec.rb
@@ -618,8 +687,8 @@ files:
 - spec/unit/client/redis/apns2/notification_spec.rb
 - spec/unit/client/redis/apnsp8/notification_spec.rb
 - spec/unit/client/redis/app_spec.rb
-- spec/unit/client/redis/gcm/app_spec.rb
-- spec/unit/client/redis/gcm/notification_spec.rb
+- spec/unit/client/redis/fcm/app_spec.rb
+- spec/unit/client/redis/fcm/notification_spec.rb
 - spec/unit/client/redis/notification_spec.rb
 - spec/unit/client/redis/pushy/app_spec.rb
 - spec/unit/client/redis/pushy/notification_spec.rb
@@ -635,8 +704,8 @@ files:
 - spec/unit/client/shared/apns/feedback.rb
 - spec/unit/client/shared/apns/notification.rb
 - spec/unit/client/shared/app.rb
-- spec/unit/client/shared/gcm/app.rb
-- spec/unit/client/shared/gcm/notification.rb
+- spec/unit/client/shared/fcm/app.rb
+- spec/unit/client/shared/fcm/notification.rb
 - spec/unit/client/shared/notification.rb
 - spec/unit/client/shared/pushy/app.rb
 - spec/unit/client/shared/pushy/notification.rb
@@ -649,18 +718,15 @@ files:
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/adm/delivery_spec.rb
 - spec/unit/daemon/apns/certificate_expired_error_spec.rb
-- spec/unit/daemon/apns/delivery_spec.rb
-- spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/apnsp8/delivery_spec.rb
 - spec/unit/daemon/app_runner_spec.rb
 - spec/unit/daemon/batch_spec.rb
 - spec/unit/daemon/delivery_error_spec.rb
 - spec/unit/daemon/delivery_spec.rb
 - spec/unit/daemon/dispatcher/http_spec.rb
-- spec/unit/daemon/dispatcher/tcp_spec.rb
 - spec/unit/daemon/dispatcher_loop_spec.rb
+- spec/unit/daemon/fcm/delivery_spec.rb
 - spec/unit/daemon/feeder_spec.rb
-- spec/unit/daemon/gcm/delivery_spec.rb
 - spec/unit/daemon/proc_title_spec.rb
 - spec/unit/daemon/pushy/delivery_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
@@ -670,7 +736,6 @@ files:
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
 - spec/unit/daemon/store/redis_spec.rb
-- spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/webpush/delivery_spec.rb
 - spec/unit/daemon/wns/delivery_spec.rb
 - spec/unit/daemon/wns/post_request_spec.rb
@@ -706,14 +771,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: The push notification service for Ruby.
@@ -721,12 +786,10 @@ test_files:
 - spec/.rubocop.yml
 - spec/functional/adm_spec.rb
 - spec/functional/apns2_spec.rb
-- spec/functional/apns_spec.rb
 - spec/functional/cli_spec.rb
 - spec/functional/embed_spec.rb
-- spec/functional/gcm_priority_spec.rb
-- spec/functional/gcm_spec.rb
-- spec/functional/new_app_spec.rb
+- spec/functional/fcm_priority_spec.rb
+- spec/functional/fcm_spec.rb
 - spec/functional/pushy_spec.rb
 - spec/functional/retry_spec.rb
 - spec/functional/synchronization_spec.rb
@@ -741,7 +804,6 @@ test_files:
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
-- spec/unit/apns_feedback_spec.rb
 - spec/unit/client/active_record/adm/app_spec.rb
 - spec/unit/client/active_record/adm/notification_spec.rb
 - spec/unit/client/active_record/apns/app_spec.rb
@@ -751,8 +813,8 @@ test_files:
 - spec/unit/client/active_record/apns2/notification_spec.rb
 - spec/unit/client/active_record/apnsp8/notification_spec.rb
 - spec/unit/client/active_record/app_spec.rb
-- spec/unit/client/active_record/gcm/app_spec.rb
-- spec/unit/client/active_record/gcm/notification_spec.rb
+- spec/unit/client/active_record/fcm/app_spec.rb
+- spec/unit/client/active_record/fcm/notification_spec.rb
 - spec/unit/client/active_record/notification_spec.rb
 - spec/unit/client/active_record/pushy/app_spec.rb
 - spec/unit/client/active_record/pushy/notification_spec.rb
@@ -773,8 +835,8 @@ test_files:
 - spec/unit/client/redis/apns2/notification_spec.rb
 - spec/unit/client/redis/apnsp8/notification_spec.rb
 - spec/unit/client/redis/app_spec.rb
-- spec/unit/client/redis/gcm/app_spec.rb
-- spec/unit/client/redis/gcm/notification_spec.rb
+- spec/unit/client/redis/fcm/app_spec.rb
+- spec/unit/client/redis/fcm/notification_spec.rb
 - spec/unit/client/redis/notification_spec.rb
 - spec/unit/client/redis/pushy/app_spec.rb
 - spec/unit/client/redis/pushy/notification_spec.rb
@@ -790,8 +852,8 @@ test_files:
 - spec/unit/client/shared/apns/feedback.rb
 - spec/unit/client/shared/apns/notification.rb
 - spec/unit/client/shared/app.rb
-- spec/unit/client/shared/gcm/app.rb
-- spec/unit/client/shared/gcm/notification.rb
+- spec/unit/client/shared/fcm/app.rb
+- spec/unit/client/shared/fcm/notification.rb
 - spec/unit/client/shared/notification.rb
 - spec/unit/client/shared/pushy/app.rb
 - spec/unit/client/shared/pushy/notification.rb
@@ -804,18 +866,15 @@ test_files:
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/adm/delivery_spec.rb
 - spec/unit/daemon/apns/certificate_expired_error_spec.rb
-- spec/unit/daemon/apns/delivery_spec.rb
-- spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/apnsp8/delivery_spec.rb
 - spec/unit/daemon/app_runner_spec.rb
 - spec/unit/daemon/batch_spec.rb
 - spec/unit/daemon/delivery_error_spec.rb
 - spec/unit/daemon/delivery_spec.rb
 - spec/unit/daemon/dispatcher/http_spec.rb
-- spec/unit/daemon/dispatcher/tcp_spec.rb
 - spec/unit/daemon/dispatcher_loop_spec.rb
+- spec/unit/daemon/fcm/delivery_spec.rb
 - spec/unit/daemon/feeder_spec.rb
-- spec/unit/daemon/gcm/delivery_spec.rb
 - spec/unit/daemon/proc_title_spec.rb
 - spec/unit/daemon/pushy/delivery_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
@@ -825,7 +884,6 @@ test_files:
 - spec/unit/daemon/store/active_record/reconnectable_spec.rb
 - spec/unit/daemon/store/active_record_spec.rb
 - spec/unit/daemon/store/redis_spec.rb
-- spec/unit/daemon/tcp_connection_spec.rb
 - spec/unit/daemon/webpush/delivery_spec.rb
 - spec/unit/daemon/wns/delivery_spec.rb
 - spec/unit/daemon/wns/post_request_spec.rb

data/lib/rpush/apns_feedback.rb

@@ -1,18 +0,0 @@
-module Rpush
-  def self.apns_feedback
-    require 'rpush/daemon'
-    Rpush::Daemon.common_init
-
-    Rpush::Apns::App.all.each do |app|
-      # Redis stores every App type on the same namespace, hence the
-      # additional filtering
-      next unless app.service_name == 'apns'
-      next unless app.feedback_enabled
-
-      receiver = Rpush::Daemon::Apns::FeedbackReceiver.new(app)
-      receiver.check_for_feedback
-    end
-
-    nil
-  end
-end

data/lib/rpush/client/active_model/gcm/notification.rb

@@ -1,62 +0,0 @@
-module Rpush
-  module Client
-    module ActiveModel
-      module Gcm
-        module Notification
-          GCM_PRIORITY_HIGH = Rpush::Client::ActiveModel::Apns::Notification::APNS_PRIORITY_IMMEDIATE
-          GCM_PRIORITY_NORMAL = Rpush::Client::ActiveModel::Apns::Notification::APNS_PRIORITY_CONSERVE_POWER
-          GCM_PRIORITIES = [GCM_PRIORITY_HIGH, GCM_PRIORITY_NORMAL]
-
-          def self.included(base)
-            base.instance_eval do
-              validates :registration_ids, presence: true
-              validates :priority, inclusion: { in: GCM_PRIORITIES }, allow_nil: true
-              validates :dry_run, inclusion: { in: [true, false] }
-
-              validates_with Rpush::Client::ActiveModel::PayloadDataSizeValidator, limit: 4096
-              validates_with Rpush::Client::ActiveModel::RegistrationIdsCountValidator, limit: 1000
-
-              validates_with Rpush::Client::ActiveModel::Gcm::ExpiryCollapseKeyMutualInclusionValidator
-            end
-          end
-
-          # This is a hack. The schema defines `priority` to be an integer, but GCM expects a string.
-          # But for users of rpush to have an API they might expect (setting priority to `high`, not 10)
-          # we do a little conversion here.
-          # I'm not happy about it, but this will have to do until I can take a further look.
-          def priority=(priority)
-            case priority
-              when 'high', GCM_PRIORITY_HIGH
-                super(GCM_PRIORITY_HIGH)
-              when 'normal', GCM_PRIORITY_NORMAL
-                super(GCM_PRIORITY_NORMAL)
-              else
-                errors.add(:priority, 'must be one of either "normal" or "high"')
-            end
-          end
-
-          def as_json(options = nil) # rubocop:disable Metrics/PerceivedComplexity
-            json = {
-                'registration_ids' => registration_ids,
-                'delay_while_idle' => delay_while_idle,
-                'data' => data
-            }
-            json['collapse_key'] = collapse_key if collapse_key
-            json['content_available'] = content_available if content_available
-            json['mutable_content'] = mutable_content if mutable_content
-            json['dry_run'] = dry_run if dry_run
-            json['notification'] = notification if notification
-            json['priority'] = priority_for_notification if priority
-            json['time_to_live'] = expiry if expiry
-            json
-          end
-
-          def priority_for_notification
-            return 'high' if priority == GCM_PRIORITY_HIGH
-            'normal' if priority == GCM_PRIORITY_NORMAL
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rpush/daemon/apns/delivery.rb

@@ -1,43 +0,0 @@
-module Rpush
-  module Daemon
-    module Apns
-      class Delivery < Rpush::Daemon::Delivery
-        def initialize(app, connection, batch)
-          @app = app
-          @connection = connection
-          @batch = batch
-        end
-
-        def perform
-          @connection.write(batch_to_binary)
-          mark_batch_delivered
-          describe_deliveries
-        rescue Rpush::Daemon::TcpConnectionError => error
-          mark_batch_retryable(Time.now + 10.seconds, error)
-          raise
-        rescue StandardError => error
-          mark_batch_failed(error)
-          raise
-        ensure
-          @batch.all_processed
-        end
-
-        protected
-
-        def batch_to_binary
-          payload = ""
-          @batch.each_notification do |notification|
-            payload << notification.to_binary
-          end
-          payload
-        end
-
-        def describe_deliveries
-          @batch.each_notification do |notification|
-            log_info("#{notification.id} sent to #{notification.device_token}")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rpush/daemon/apns/feedback_receiver.rb

@@ -1,91 +0,0 @@
-# encoding: UTF-8
-
-module Rpush
-  module Daemon
-    module Apns
-      class FeedbackReceiver
-        include Reflectable
-        include Loggable
-
-        TUPLE_BYTES = 38
-        HOSTS = {
-          production: ['feedback.push.apple.com', 2196],
-          development: ['feedback.sandbox.push.apple.com', 2196], # deprecated
-          sandbox: ['feedback.sandbox.push.apple.com', 2196]
-        }
-
-        def initialize(app)
-          @app = app
-          @host, @port = HOSTS[@app.environment.to_sym]
-          @certificate = app.certificate
-          @password = app.password
-          @interruptible_sleep = InterruptibleSleep.new
-        end
-
-        def start
-          return if Rpush.config.push
-          return unless @app.feedback_enabled
-          Rpush.logger.info("[#{@app.name}] Starting feedback receiver... ", true)
-
-          @thread = Thread.new do
-            loop do
-              break if @stop
-              check_for_feedback
-              @interruptible_sleep.sleep(Rpush.config.apns.feedback_receiver.frequency)
-            end
-
-            Rpush::Daemon.store.release_connection
-          end
-
-          puts Rainbow('✔').green if Rpush.config.foreground && Rpush.config.foreground_logging
-        end
-
-        def stop
-          @stop = true
-          @interruptible_sleep.stop
-          @thread.join if @thread
-        rescue StandardError => e
-          log_error(e)
-          reflect(:error, e)
-        ensure
-          @thread = nil
-        end
-
-        def check_for_feedback
-          connection = nil
-          begin
-            connection = Rpush::Daemon::TcpConnection.new(@app, @host, @port)
-            connection.connect
-            tuple = connection.read(TUPLE_BYTES)
-
-            while tuple
-              timestamp, device_token = parse_tuple(tuple)
-              create_feedback(timestamp, device_token)
-              tuple = connection.read(TUPLE_BYTES)
-            end
-          rescue StandardError => e
-            log_error(e)
-            reflect(:error, e)
-          ensure
-            connection.close if connection
-          end
-        end
-
-        protected
-
-        def parse_tuple(tuple)
-          failed_at, _, device_token = tuple.unpack("N1n1H*")
-          [Time.at(failed_at).utc, device_token]
-        end
-
-        def create_feedback(failed_at, device_token)
-          formatted_failed_at = failed_at.strftime('%Y-%m-%d %H:%M:%S UTC')
-          log_info("[FeedbackReceiver] Delivery failed at #{formatted_failed_at} for #{device_token}.")
-
-          feedback = Rpush::Daemon.store.create_apns_feedback(failed_at, device_token, @app)
-          reflect(:apns_feedback, feedback)
-        end
-      end
-    end
-  end
-end