rpush 4.1.0 → 5.2.0

data/lib/rpush/client/active_record/apns/notification.rb

@@ -3,36 +3,8 @@ module Rpush
     module ActiveRecord
       module Apns
         class Notification < Rpush::Client::ActiveRecord::Notification
-          include Deprecatable
           include Rpush::Client::ActiveModel::Apns::Notification
-
-          def alert=(alert)
-            if alert.is_a?(Hash)
-              write_attribute(:alert, multi_json_dump(alert))
-              self.alert_is_json = true if has_attribute?(:alert_is_json)
-            else
-              write_attribute(:alert, alert)
-              self.alert_is_json = false if has_attribute?(:alert_is_json)
-            end
-          end
-
-          def alert
-            string_or_json = read_attribute(:alert)
-
-            if has_attribute?(:alert_is_json)
-              if alert_is_json?
-                multi_json_load(string_or_json)
-              else
-                string_or_json
-              end
-            else
-              begin
-                multi_json_load(string_or_json)
-              rescue StandardError
-                string_or_json
-              end
-            end
-          end
+          include ActiveRecordSerializableNotification
         end
       end
     end

data/lib/rpush/client/active_record/apns2/notification.rb

@@ -2,7 +2,10 @@ module Rpush
   module Client
     module ActiveRecord
       module Apns2
-        class Notification < Rpush::Client::ActiveRecord::Apns::Notification
+        class Notification < Rpush::Client::ActiveRecord::Notification
+          include Rpush::Client::ActiveModel::Apns::Notification
+          include Rpush::Client::ActiveModel::Apns2::Notification
+          include Rpush::Client::ActiveRecord::Apns::ActiveRecordSerializableNotification
         end
       end
     end

data/lib/rpush/client/active_record/app.rb

@@ -6,7 +6,7 @@ module Rpush
 
         has_many :notifications, class_name: 'Rpush::Client::ActiveRecord::Notification', dependent: :destroy
 
-        validates :name, presence: true, uniqueness: { scope: [:type, :environment] }
+        validates :name, presence: true, uniqueness: { scope: [:type, :environment], case_sensitive: true }
       end
     end
   end

data/lib/rpush/client/active_record/notification.rb

@@ -21,7 +21,7 @@ module Rpush
         def notification=(attrs)
           return unless attrs
           fail ArgumentError, 'must be a Hash' unless attrs.is_a?(Hash)
-          write_attribute(:notification, multi_json_dump(attrs.merge(data || {})))
+          write_attribute(:notification, multi_json_dump(attrs.merge(notification || {})))
         end
 
         def registration_ids=(ids)

data/lib/rpush/client/redis/apns2/notification.rb

@@ -3,6 +3,7 @@ module Rpush
     module Redis
       module Apns2
         class Notification < Rpush::Client::Redis::Notification
+          include Rpush::Client::ActiveModel::Apns::Notification
           include Rpush::Client::ActiveModel::Apns2::Notification
         end
       end

data/lib/rpush/client/redis/app.rb

@@ -18,7 +18,8 @@ module Rpush
         attribute :apn_key_id, :string
         attribute :team_id, :string
         attribute :bundle_id, :string
- 
+        attribute :feedback_enabled, :boolean, default: true
+
         index :name
 
         validates :name, presence: true

data/lib/rpush/client/redis/notification.rb

@@ -20,7 +20,7 @@ module Rpush
 
         attribute :badge, :integer
         attribute :device_token, :string
-        attribute :sound, :string, default: 'default'
+        attribute :sound, [:string, :hash], strict: false, default: 'default'
         attribute :alert, [:string, :hash], strict: false
         attribute :data, :hash
         attribute :expiry, :integer, default: 1.day.to_i
@@ -34,6 +34,7 @@ module Rpush
         attribute :error_description, :string
         attribute :deliver_after, :timestamp
         attribute :alert_is_json, :boolean
+        attribute :sound_is_json, :boolean
         attribute :app_id, :integer
         attribute :collapse_key, :string
         attribute :delay_while_idle, :boolean

data/lib/rpush/client/redis/pushy/notification.rb

@@ -9,7 +9,6 @@ module Rpush
 
           def time_to_live=(value)
             self.expiry = value
-            super
           end
         end
       end

data/lib/rpush/configuration.rb

@@ -16,7 +16,7 @@ module Rpush
     end
   end
 
-  CURRENT_ATTRS = [:push_poll, :embedded, :pid_file, :batch_size, :push, :client, :logger, :log_file, :foreground, :log_level, :plugin, :apns]
+  CURRENT_ATTRS = [:push_poll, :embedded, :pid_file, :batch_size, :push, :client, :logger, :log_file, :foreground, :foreground_logging, :log_level, :plugin, :apns]
   DEPRECATED_ATTRS = []
   CONFIG_ATTRS = CURRENT_ATTRS + DEPRECATED_ATTRS
 
@@ -53,6 +53,7 @@ module Rpush
       self.log_level = (defined?(Rails) && Rails.logger) ? Rails.logger.level : ::Logger::Severity::DEBUG
       self.plugin = OpenStruct.new
       self.foreground = false
+      self.foreground_logging = true
 
       self.apns = ApnsConfiguration.new
 

data/lib/rpush/daemon.rb

@@ -109,7 +109,7 @@ module Rpush
         Feeder.stop
         AppRunner.stop
         delete_pid_file
-        puts ANSI.green { '✔' } if Rpush.config.foreground
+        puts Rainbow('✔').red if Rpush.config.foreground && Rpush.config.foreground_logging
       end
     end
 
@@ -168,7 +168,7 @@ module Rpush
       if Rpush::Daemon::AppRunner.app_ids.count == 0
         puts <<-EOS
 
-* #{ANSI.green { 'Is this your first time using Rpush?' }}
+* #{Rainbow('Is this your first time using Rpush?').green}
   You need to create an App before you can start using Rpush.
   Please refer to the documentation at https://github.com/rpush/rpush
 

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

@@ -24,6 +24,7 @@ module Rpush
 
         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
@@ -36,7 +37,7 @@ module Rpush
             Rpush::Daemon.store.release_connection
           end
 
-          puts ANSI.green { '✔' } if Rpush.config.foreground
+          puts Rainbow('✔').green if Rpush.config.foreground && Rpush.config.foreground_logging
         end
 
         def stop

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

@@ -7,6 +7,7 @@ module Rpush
 
       class Delivery < Rpush::Daemon::Delivery
         RETRYABLE_CODES = [ 429, 500, 503 ]
+        CLIENT_JOIN_TIMEOUT = 60
 
         def initialize(app, http2_client, batch)
           @app = app
@@ -20,7 +21,11 @@ module Rpush
           end
 
           # Send all preprocessed requests at once
-          @client.join
+          @client.join(timeout: CLIENT_JOIN_TIMEOUT)
+        rescue NetHttp2::AsyncRequestTimeout => error
+          mark_batch_retryable(Time.now + 10.seconds, error)
+          @client.close
+          raise
         rescue Errno::ECONNREFUSED, SocketError => error
           mark_batch_retryable(Time.now + 10.seconds, error)
           raise

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

@@ -7,6 +7,7 @@ module Rpush
 
       class Delivery < Rpush::Daemon::Delivery
         RETRYABLE_CODES = [ 429, 500, 503 ]
+        CLIENT_JOIN_TIMEOUT = 60
 
         def initialize(app, http2_client, token_provider, batch)
           @app = app
@@ -22,7 +23,11 @@ module Rpush
           end
 
           # Send all preprocessed requests at once
-          @client.join
+          @client.join(timeout: CLIENT_JOIN_TIMEOUT)
+        rescue NetHttp2::AsyncRequestTimeout => error
+          mark_batch_retryable(Time.now + 10.seconds, error)
+          @client.close
+          raise
         rescue Errno::ECONNREFUSED, SocketError, HTTP2::Error::StreamLimitExceeded => error
           # TODO restart connection when StreamLimitExceeded
           mark_batch_retryable(Time.now + 10.seconds, error)
@@ -133,7 +138,7 @@ module Rpush
           jwt_token = @token_provider.token
 
           headers = {}
-          
+
           headers['content-type'] = 'application/json'
           headers['apns-expiration'] = '0'
           headers['apns-priority'] = '10'

data/lib/rpush/daemon/app_runner.rb

@@ -29,7 +29,7 @@ module Rpush
         Rpush.logger.info("[#{app.name}] Starting #{pluralize(app.connections, 'dispatcher')}... ", true)
         runner = @runners[app.id] = new(app)
         runner.start_dispatchers
-        puts ANSI.green { '✔' } if Rpush.config.foreground
+        puts Rainbow('✔').green if Rpush.config.foreground && Rpush.config.foreground_logging
         runner.start_loops
       rescue StandardError => e
         @runners.delete(app.id)

data/lib/rpush/daemon/batch.rb

@@ -2,6 +2,7 @@ module Rpush
   module Daemon
     class Batch
       include Reflectable
+      include Loggable
 
       attr_reader :num_processed, :notifications, :delivered, :failed, :retryable
 
@@ -31,16 +32,21 @@ module Rpush
           @retryable[deliver_after] ||= []
           @retryable[deliver_after] << notification
         end
+
         Rpush::Daemon.store.mark_retryable(notification, deliver_after, persist: false)
       end
 
-      def mark_all_retryable(deliver_after)
-        @mutex.synchronize do
-          @retryable[deliver_after] = @notifications
-        end
+      def mark_all_retryable(deliver_after, error)
+        retryable_count = 0
+
         each_notification do |notification|
-          Rpush::Daemon.store.mark_retryable(notification, deliver_after, persist: false)
+          next if notification.delivered || notification.failed
+
+          retryable_count += 1
+          mark_retryable(notification, deliver_after)
         end
+
+        log_warn("Will retry #{retryable_count} of #{@notifications.size} notifications after #{deliver_after.strftime('%Y-%m-%d %H:%M:%S')} due to error (#{error.class.name}, #{error.message})")
       end
 
       def mark_delivered(notification)
@@ -54,6 +60,7 @@ module Rpush
         @mutex.synchronize do
           @delivered = @notifications
         end
+
         each_notification do |notification|
           Rpush::Daemon.store.mark_delivered(notification, Time.now, persist: false)
         end

data/lib/rpush/daemon/delivery.rb

@@ -20,8 +20,7 @@ module Rpush
       end
 
       def mark_batch_retryable(deliver_after, error)
-        log_warn("Will retry #{@batch.notifications.size} notifications after #{deliver_after.strftime('%Y-%m-%d %H:%M:%S')} due to error (#{error.class.name}, #{error.message})")
-        @batch.mark_all_retryable(deliver_after)
+        @batch.mark_all_retryable(deliver_after, error)
       end
 
       def mark_delivered

data/lib/rpush/daemon/dispatcher/apns_http2.rb

@@ -2,11 +2,13 @@ module Rpush
   module Daemon
     module Dispatcher
       class ApnsHttp2
+        include Loggable
+        include Reflectable
 
         URLS = {
           production: 'https://api.push.apple.com:443',
-          development: 'https://api.development.push.apple.com:443',
-          sandbox: 'https://api.development.push.apple.com:443'
+          development: 'https://api.sandbox.push.apple.com:443',
+          sandbox: 'https://api.sandbox.push.apple.com:443'
         }
 
         DEFAULT_TIMEOUT = 60

data/lib/rpush/daemon/dispatcher/apnsp8_http2.rb

@@ -7,7 +7,8 @@ module Rpush
 
         URLS = {
           production: 'https://api.push.apple.com',
-          development: 'https://api.development.push.apple.com'
+          development: 'https://api.sandbox.push.apple.com',
+          sandbox: 'https://api.sandbox.push.apple.com'
         }
 
         DEFAULT_TIMEOUT = 60

data/lib/rpush/daemon/signal_handler.rb

@@ -29,7 +29,7 @@ module Rpush
 
       def self.start_handler(read_io)
         @thread = Thread.new do
-          while readable_io = IO.select([read_io]) # rubocop:disable AssignmentInCondition
+          while readable_io = IO.select([read_io]) # rubocop:disable Lint/AssignmentInCondition
             signal = readable_io.first[0].gets.strip
 
             begin

data/lib/rpush/daemon/store/active_record.rb

@@ -183,7 +183,7 @@ module Rpush
 
         private
 
-        def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists
+        def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable Metrics/ParameterLists
           with_database_reconnect_and_retry do
             notification.assign_attributes(attrs)
             notification.data = data

data/lib/rpush/daemon/store/active_record/reconnectable.rb

@@ -67,7 +67,7 @@ module Rpush
 
           def check_database_is_connected
             # Simply asking the adapter for the connection state is not sufficient.
-            Rpush::Client::ActiveRecord::Notification.count
+            Rpush::Client::ActiveRecord::Notification.exists?
           end
 
           def sleep_to_avoid_thrashing

data/lib/rpush/daemon/store/redis.rb

@@ -138,7 +138,7 @@ module Rpush
           nil
         end
 
-        def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable ParameterLists
+        def create_gcm_like_notification(notification, attrs, data, registration_ids, deliver_after, app) # rubocop:disable Metrics/ParameterLists
           notification.assign_attributes(attrs)
           notification.data = data
           notification.registration_ids = registration_ids

data/lib/rpush/daemon/wns/badge_request.rb

@@ -4,14 +4,19 @@ module Rpush
       class BadgeRequest
         def self.create(notification, access_token)
           body = BadgeRequestPayload.new(notification).to_xml
-          uri  = URI.parse(notification.uri)
-          post = Net::HTTP::Post.new(
-            uri.request_uri,
+          uri = URI.parse(notification.uri)
+          headers = {
             "Content-Length" => body.length.to_s,
             "Content-Type" => "text/xml",
             "X-WNS-Type" => "wns/badge",
             "X-WNS-RequestForStatus" => "true",
             "Authorization" => "Bearer #{access_token}"
+          }
+          headers['X-WNS-PRIORITY'] = notification.priority.to_s if notification.priority
+
+          post = Net::HTTP::Post.new(
+            uri.request_uri,
+            headers
           )
           post.body = body
           post

data/lib/rpush/daemon/wns/raw_request.rb

@@ -5,14 +5,21 @@ module Rpush
         def self.create(notification, access_token)
           body = notification.data.to_json
           uri = URI.parse(notification.uri)
-          post = Net::HTTP::Post.new(
-            uri.request_uri,
+          headers = {
             "Content-Length" => body.length.to_s,
             "Content-Type" => "application/octet-stream",
             "X-WNS-Type" => "wns/raw",
             "X-WNS-RequestForStatus" => "true",
             "Authorization" => "Bearer #{access_token}"
+          }
+
+          headers['X-WNS-PRIORITY'] = notification.priority.to_s if notification.priority
+
+          post = Net::HTTP::Post.new(
+            uri.request_uri,
+            headers
           )
+
           post.body = body
           post
         end

data/lib/rpush/daemon/wns/toast_request.rb

@@ -5,13 +5,17 @@ module Rpush
         def self.create(notification, access_token)
           body = ToastRequestPayload.new(notification).to_xml
           uri  = URI.parse(notification.uri)
-          post = Net::HTTP::Post.new(
-            uri.request_uri,
+          headers = {
             "Content-Length" => body.length.to_s,
             "Content-Type" => "text/xml",
             "X-WNS-Type" => "wns/toast",
             "X-WNS-RequestForStatus" => "true",
             "Authorization" => "Bearer #{access_token}"
+          }
+          headers['X-WNS-PRIORITY'] = notification.priority.to_s if notification.priority
+          post = Net::HTTP::Post.new(
+            uri.request_uri,
+            headers
           )
           post.body = body
           post

data/lib/rpush/logger.rb

@@ -79,6 +79,7 @@ module Rpush
     end
 
     def log_foreground(io, formatted_msg, inline)
+      return unless Rpush.config.foreground_logging
       return unless io == STDERR || Rpush.config.foreground
 
       if inline

data/lib/rpush/version.rb

@@ -1,7 +1,7 @@
 module Rpush
   module VERSION
-    MAJOR = 4
-    MINOR = 1
+    MAJOR = 5
+    MINOR = 2
     TINY = 0
     PRE = nil
 

data/spec/.rubocop.yml

@@ -1,4 +1,4 @@
 inherit_from: ../.rubocop.yml
 
-RescueModifier:
+Style/RescueModifier:
   Enabled: false