rpush 5.2.0 → 6.0.1

data/lib/generators/templates/rename_rapns_to_rpush.rb

@@ -1,4 +1,4 @@
-class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class RenameRapnsToRpush < ActiveRecord::Migration[5.0]
   module Rpush
     class App < ActiveRecord::Base
       self.table_name = 'rpush_apps'
@@ -18,24 +18,12 @@ class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Mig
     rename_table :rapns_apps, :rpush_apps
     rename_table :rapns_feedback, :rpush_feedback
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_notifications, :index_rapns_notifications_multi)
-        rename_index :rpush_notifications, :index_rapns_notifications_multi, :index_rpush_notifications_multi
-      end
-    else
-      if index_name_exists?(:rpush_notifications, :index_rapns_notifications_multi, true)
-        rename_index :rpush_notifications, :index_rapns_notifications_multi, :index_rpush_notifications_multi
-      end
+    if index_name_exists?(:rpush_notifications, :index_rapns_notifications_multi)
+      rename_index :rpush_notifications, :index_rapns_notifications_multi, :index_rpush_notifications_multi
     end
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_feedback, :index_rapns_feedback_on_device_token)
-        rename_index :rpush_feedback, :index_rapns_feedback_on_device_token, :index_rpush_feedback_on_device_token
-      end
-    else
-      if index_name_exists?(:rpush_feedback, :index_rapns_feedback_on_device_token, true)
-        rename_index :rpush_feedback, :index_rapns_feedback_on_device_token, :index_rpush_feedback_on_device_token
-      end
+    if index_name_exists?(:rpush_feedback, :index_rapns_feedback_on_device_token)
+      rename_index :rpush_feedback, :index_rapns_feedback_on_device_token, :index_rpush_feedback_on_device_token
     end
 
     update_type(RenameRapnsToRpush::Rpush::Notification, 'Rapns::Apns::Notification', 'Rpush::Apns::Notification')
@@ -60,24 +48,12 @@ class RenameRapnsToRpush < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Mig
     update_type(RenameRapnsToRpush::Rpush::App, 'Rpush::Adm::App', 'Rapns::Adm::App')
     update_type(RenameRapnsToRpush::Rpush::App, 'Rpush::Wpns::App', 'Rapns::Wpns::App')
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
-        rename_index :rpush_notifications, :index_rpush_notifications_multi, :index_rapns_notifications_multi
-      end
-    else
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi, true)
-        rename_index :rpush_notifications, :index_rpush_notifications_multi, :index_rapns_notifications_multi
-      end
+    if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
+      rename_index :rpush_notifications, :index_rpush_notifications_multi, :index_rapns_notifications_multi
     end
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_feedback, :index_rpush_feedback_on_device_token)
-        rename_index :rpush_feedback, :index_rpush_feedback_on_device_token, :index_rapns_feedback_on_device_token
-      end
-    else
-      if index_name_exists?(:rpush_feedback, :index_rpush_feedback_on_device_token, true)
-        rename_index :rpush_feedback, :index_rpush_feedback_on_device_token, :index_rapns_feedback_on_device_token
-      end
+    if index_name_exists?(:rpush_feedback, :index_rpush_feedback_on_device_token)
+      rename_index :rpush_feedback, :index_rpush_feedback_on_device_token, :index_rapns_feedback_on_device_token
     end
 
     rename_table :rpush_notifications, :rapns_notifications

data/lib/generators/templates/rpush.rb

@@ -46,10 +46,7 @@ Rpush.reflect do |on|
   # Called when a notification is queued internally for delivery.
   # The internal queue for each app runner can be inspected:
   #
-  # Rpush::Daemon::AppRunner.runners.each do |app_id, runner|
-  #   runner.app
-  #   runner.queue_size
-  # end
+  # Rpush::Daemon::AppRunner.status
   #
   # on.notification_enqueued do |notification|
   # end

data/lib/generators/templates/rpush_2_0_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush200Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush200Updates < ActiveRecord::Migration[5.0]
   module Rpush
     class App < ActiveRecord::Base
       self.table_name = 'rpush_apps'
@@ -17,14 +17,8 @@ class Rpush200Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migrat
     add_column :rpush_notifications, :processing, :boolean, null: false, default: false
     add_column :rpush_notifications, :priority, :integer, null: true
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
-        remove_index :rpush_notifications, name: :index_rpush_notifications_multi
-      end
-    else
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi, true)
-        remove_index :rpush_notifications, name: :index_rpush_notifications_multi
-      end
+    if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
+      remove_index :rpush_notifications, name: :index_rpush_notifications_multi
     end
 
     add_index :rpush_notifications, [:delivered, :failed], name: 'index_rpush_notifications_multi', where: 'NOT delivered AND NOT failed'
@@ -52,14 +46,8 @@ class Rpush200Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migrat
     change_column :rpush_feedback, :app_id, :string
     rename_column :rpush_feedback, :app_id, :app
 
-    if ActiveRecord.version >= Gem::Version.new('5.1')
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
-        remove_index :rpush_notifications, name: :index_rpush_notifications_multi
-      end
-    else
-      if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi, true)
-        remove_index :rpush_notifications, name: :index_rpush_notifications_multi
-      end
+    if index_name_exists?(:rpush_notifications, :index_rpush_notifications_multi)
+      remove_index :rpush_notifications, name: :index_rpush_notifications_multi
     end
 
     add_index :rpush_notifications, [:app_id, :delivered, :failed, :deliver_after], name: 'index_rpush_notifications_multi'

data/lib/generators/templates/rpush_2_1_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush210Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush210Updates < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :url_args, :text, null: true
     add_column :rpush_notifications, :category, :string, null: true

data/lib/generators/templates/rpush_2_6_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush260Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush260Updates < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :content_available, :boolean, default: false
   end

data/lib/generators/templates/rpush_2_7_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush270Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush270Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_column :rpush_notifications, :alert, :text
     add_column :rpush_notifications, :notification, :text

data/lib/generators/templates/rpush_3_0_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush300Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush300Updates < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :mutable_content, :boolean, default: false
     change_column :rpush_notifications, :sound, :string, default: nil

data/lib/generators/templates/rpush_3_0_1_updates.rb

@@ -1,4 +1,4 @@
-class Rpush301Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush301Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_column_null :rpush_notifications, :mutable_content, false
     change_column_null :rpush_notifications, :content_available, false

data/lib/generators/templates/rpush_3_1_0_add_pushy.rb

@@ -1,4 +1,4 @@
-class Rpush310AddPushy < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush310AddPushy < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :external_device_id, :string, null: true
   end

data/lib/generators/templates/rpush_3_1_1_updates.rb

@@ -1,4 +1,4 @@
-class Rpush311Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush311Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_table :rpush_notifications do |t|
       t.remove_index name: 'index_rpush_notifications_multi'

data/lib/generators/templates/rpush_3_2_0_add_apns_p8.rb

@@ -1,4 +1,4 @@
-class Rpush320AddApnsP8 < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush320AddApnsP8 < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_apps, :apn_key, :string, null: true
     add_column :rpush_apps, :apn_key_id, :string, null: true

data/lib/generators/templates/rpush_3_2_4_updates.rb

@@ -1,4 +1,4 @@
-class Rpush324Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush324Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_column :rpush_apps, :apn_key, :text, null: true
   end

data/lib/generators/templates/rpush_3_3_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush330Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush330Updates < ActiveRecord::Migration[5.0]
   def self.up
     add_column :rpush_notifications, :thread_id, :string, null: true
   end

data/lib/generators/templates/rpush_3_3_1_updates.rb

@@ -1,11 +1,11 @@
-class Rpush331Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration[5.0] : ActiveRecord::Migration
+class Rpush331Updates < ActiveRecord::Migration[5.0]
   def self.up
     change_column :rpush_notifications, :device_token, :string, null: true
     change_column :rpush_feedback, :device_token, :string, null: true
   end
 
   def self.down
-    change_column :rpush_notifications, :device_token, :string, { null: true, limit: 64 }
-    change_column :rpush_feedback, :device_token, :string, { null: true, limit: 64 }
+    change_column :rpush_notifications, :device_token, :string, null: true, limit: 64
+    change_column :rpush_feedback, :device_token, :string, null: true, limit: 64
   end
 end

data/lib/generators/templates/rpush_4_1_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush410Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"] : ActiveRecord::Migration
+class Rpush410Updates < ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
   def self.up
     add_column :rpush_notifications, :dry_run, :boolean, null: false, default: false
   end

data/lib/generators/templates/rpush_4_1_1_updates.rb

@@ -1,4 +1,4 @@
-class Rpush411Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"] : ActiveRecord::Migration
+class Rpush411Updates < ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
   def self.up
     add_column :rpush_apps, :feedback_enabled, :boolean, default: true
   end

data/lib/generators/templates/rpush_4_2_0_updates.rb

@@ -1,4 +1,4 @@
-class Rpush420Updates < ActiveRecord::VERSION::MAJOR >= 5 ? ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"] : ActiveRecord::Migration
+class Rpush420Updates < ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"]
   def self.up
     add_column :rpush_notifications, :sound_is_json, :boolean, null: true, default: false
   end

data/lib/rpush/client/active_model/adm/data_validator.rb

@@ -5,7 +5,7 @@ module Rpush
         class DataValidator < ::ActiveModel::Validator
           def validate(record)
             return unless record.collapse_key.nil? && record.data.nil?
-            record.errors[:data] << 'must be set unless collapse_key is specified'
+            record.errors.add :data, 'must be set unless collapse_key is specified'
           end
         end
       end

data/lib/rpush/client/active_model/apns/app.rb

@@ -7,29 +7,13 @@ module Rpush
             base.instance_eval do
               validates :environment, presence: true, inclusion: { in: %w(development production sandbox) }
               validates :certificate, presence: true
-              validate :certificate_has_matching_private_key
+              validates_with Rpush::Client::ActiveModel::CertificatePrivateKeyValidator
             end
           end
 
           def service_name
             'apns'
           end
-
-          private
-
-          def certificate_has_matching_private_key
-            result = false
-            if certificate.present?
-              begin
-                x509 = OpenSSL::X509::Certificate.new(certificate)
-                pkey = OpenSSL::PKey::RSA.new(certificate, password)
-                result = x509 && pkey
-              rescue OpenSSL::OpenSSLError
-                errors.add :certificate, 'value must contain a certificate and a private key.'
-              end
-            end
-            result
-          end
         end
       end
     end

data/lib/rpush/client/active_model/apns/device_token_format_validator.rb

@@ -4,8 +4,8 @@ module Rpush
       module Apns
         class DeviceTokenFormatValidator < ::ActiveModel::Validator
           def validate(record)
-            return if record.device_token =~ /^[a-z0-9]\w+$/i
-            record.errors[:device_token] << "is invalid"
+            return if record.device_token =~ /\A[a-z0-9]\w+\z/i
+            record.errors.add :device_token, "is invalid"
           end
         end
       end

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

@@ -52,6 +52,10 @@ module Rpush
             self.data = (data || {}).merge(CONTENT_AVAILABLE_KEY => true)
           end
 
+          def content_available?
+            (self.data || {})[CONTENT_AVAILABLE_KEY]
+          end
+
           def as_json(options = nil) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
             json = ActiveSupport::OrderedHash.new
 

data/lib/rpush/client/active_model/apns/notification_payload_size_validator.rb

@@ -6,7 +6,7 @@ module Rpush
           def validate(record)
             limit = record.class.max_payload_bytesize
             return unless record.payload.bytesize > limit
-            record.errors[:base] << "APN notification cannot be larger than #{limit} bytes. Try condensing your alert and device attributes."
+            record.errors.add :base, "APN notification cannot be larger than #{limit} bytes. Try condensing your alert and device attributes."
           end
         end
       end

data/lib/rpush/client/active_model/apns2/app.rb

@@ -3,7 +3,13 @@ module Rpush
     module ActiveModel
       module Apns2
         module App
-          extend Rpush::Client::ActiveModel::Apns::App
+          def self.included(base)
+            base.instance_eval do
+              validates :environment, presence: true, inclusion: { in: %w(development production sandbox) }
+              validates :certificate, presence: true
+              validates_with Rpush::Client::ActiveModel::CertificatePrivateKeyValidator
+            end
+          end
 
           def service_name
             'apns2'

data/lib/rpush/client/active_model/certificate_private_key_validator.rb

@@ -0,0 +1,19 @@
+module Rpush
+  module Client
+    module ActiveModel
+      class CertificatePrivateKeyValidator < ::ActiveModel::Validator
+        def validate(record)
+          if record.certificate.present?
+            begin
+              x509 = OpenSSL::X509::Certificate.new(record.certificate)
+              pkey = OpenSSL::PKey::RSA.new(record.certificate, record.password)
+              x509 && pkey
+            rescue OpenSSL::OpenSSLError
+              record.errors.add :certificate, 'value must contain a certificate and a private key.'
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Rpush
         class ExpiryCollapseKeyMutualInclusionValidator < ::ActiveModel::Validator
           def validate(record)
             return unless record.collapse_key && !record.expiry
-            record.errors[:expiry] << 'must be set when using a collapse_key'
+            record.errors.add :expiry, 'must be set when using a collapse_key'
           end
         end
       end

data/lib/rpush/client/active_model/payload_data_size_validator.rb

@@ -5,7 +5,7 @@ module Rpush
         def validate(record)
           limit = options[:limit] || 1024
           return unless record.data && record.payload_data_size > limit
-          record.errors[:base] << "Notification payload data cannot be larger than #{limit} bytes."
+          record.errors.add :base, "Notification payload data cannot be larger than #{limit} bytes."
         end
       end
     end

data/lib/rpush/client/active_model/registration_ids_count_validator.rb

@@ -5,7 +5,7 @@ module Rpush
         def validate(record)
           limit = options[:limit] || 100
           return unless record.registration_ids && record.registration_ids.size > limit
-          record.errors[:base] << "Number of registration_ids cannot be larger than #{limit}."
+          record.errors.add :base, "Number of registration_ids cannot be larger than #{limit}."
         end
       end
     end

data/lib/rpush/client/active_model/webpush/app.rb

@@ -0,0 +1,41 @@
+module Rpush
+  module Client
+    module ActiveModel
+      module Webpush
+        module App
+
+          class VapidKeypairValidator < ::ActiveModel::Validator
+            def validate(record)
+              return if record.vapid_keypair.blank?
+              keypair = record.vapid
+              %i[ subject public_key private_key ].each do |key|
+                unless keypair.key?(key)
+                  record.errors.add(:vapid_keypair, "must have a #{key} entry")
+                end
+              end
+            rescue
+              record.errors.add(:vapid_keypair, 'must be valid JSON')
+            end
+          end
+
+          def self.included(base)
+            base.class_eval do
+              alias_attribute :vapid_keypair, :certificate
+              validates :vapid_keypair, presence: true
+              validates_with VapidKeypairValidator
+            end
+          end
+
+          def service_name
+            'webpush'
+          end
+
+          def vapid
+            @vapid ||= JSON.parse(vapid_keypair).symbolize_keys
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,66 @@
+module Rpush
+  module Client
+    module ActiveModel
+      module Webpush
+        module Notification
+
+          class RegistrationValidator < ::ActiveModel::Validator
+            KEYS = %i[ endpoint keys ].freeze
+            def validate(record)
+              return if record.registration_ids.blank?
+              return if record.registration_ids.size > 1
+              reg = record.registration_ids.first
+              unless reg.is_a?(Hash) &&
+                  (KEYS-reg.keys).empty? &&
+                  reg[:endpoint].is_a?(String) &&
+                  reg[:keys].is_a?(Hash)
+                record.errors.add(:base, 'Registration must have :endpoint (String) and :keys (Hash) keys')
+              end
+            end
+          end
+
+          def self.included(base)
+            base.instance_eval do
+              alias_attribute :time_to_live, :expiry
+
+              validates :registration_ids, presence: true
+              validates :data, presence: true
+              validates :time_to_live, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
+
+              validates_with Rpush::Client::ActiveModel::PayloadDataSizeValidator, limit: 4096
+              validates_with Rpush::Client::ActiveModel::RegistrationIdsCountValidator, limit: 1
+              validates_with RegistrationValidator
+            end
+          end
+
+          def data=(value)
+            value = value.stringify_keys if value.respond_to?(:stringify_keys)
+            super value
+          end
+
+          def subscription
+            @subscription ||= registration_ids.first.deep_symbolize_keys
+          end
+
+          def message
+            data['message'].presence if data
+          end
+
+          # https://webpush-wg.github.io/webpush-protocol/#urgency
+          def urgency
+            data['urgency'].presence if data
+          end
+
+          def as_json(_options = nil)
+            {
+              'data'             => data,
+              'time_to_live'     => time_to_live,
+              'registration_ids' => registration_ids
+            }
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/active_model.rb

@@ -3,6 +3,7 @@ require 'active_model'
 require 'rpush/client/active_model/notification'
 require 'rpush/client/active_model/payload_data_size_validator'
 require 'rpush/client/active_model/registration_ids_count_validator'
+require 'rpush/client/active_model/certificate_private_key_validator'
 
 require 'rpush/client/active_model/apns/device_token_format_validator'
 require 'rpush/client/active_model/apns/app'
@@ -32,3 +33,6 @@ require 'rpush/client/active_model/wns/notification'
 require 'rpush/client/active_model/pushy/app'
 require 'rpush/client/active_model/pushy/notification'
 require 'rpush/client/active_model/pushy/time_to_live_validator'
+
+require 'rpush/client/active_model/webpush/app'
+require 'rpush/client/active_model/webpush/notification'

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

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

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

@@ -0,0 +1,11 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Webpush
+        class App < Rpush::Client::ActiveRecord::App
+          include Rpush::Client::ActiveModel::Webpush::App
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Rpush
+  module Client
+    module ActiveRecord
+      module Webpush
+        class Notification < Rpush::Client::ActiveRecord::Notification
+          include Rpush::Client::ActiveModel::Webpush::Notification
+        end
+      end
+    end
+  end
+end
+

data/lib/rpush/client/active_record.rb

@@ -32,3 +32,6 @@ require 'rpush/client/active_record/adm/app'
 
 require 'rpush/client/active_record/pushy/notification'
 require 'rpush/client/active_record/pushy/app'
+
+require 'rpush/client/active_record/webpush/notification'
+require 'rpush/client/active_record/webpush/app'

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

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

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

@@ -0,0 +1,15 @@
+module Rpush
+  module Client
+    module Redis
+      module Webpush
+        class App < Rpush::Client::Redis::App
+          include Rpush::Client::ActiveModel::Webpush::App
+
+          def vapid_keypair=(value)
+            self.certificate = value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Rpush
+  module Client
+    module Redis
+      module Webpush
+        class Notification < Rpush::Client::Redis::Notification
+          include Rpush::Client::ActiveModel::Webpush::Notification
+
+          def time_to_live=(value)
+            self.expiry = value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rpush/client/redis.rb

@@ -44,6 +44,9 @@ require 'rpush/client/redis/wns/badge_notification'
 require 'rpush/client/redis/pushy/app'
 require 'rpush/client/redis/pushy/notification'
 
+require 'rpush/client/redis/webpush/app'
+require 'rpush/client/redis/webpush/notification'
+
 Modis.configure do |config|
   config.namespace = :rpush
 end

data/lib/rpush/configuration.rb

@@ -106,7 +106,7 @@ module Rpush
       client_module = Rpush::Client.const_get(client.to_s.camelize)
       Rpush.send(:include, client_module) unless Rpush.ancestors.include?(client_module)
 
-      [:Apns, :Gcm, :Wpns, :Wns, :Adm, :Pushy].each do |service|
+      [:Apns, :Gcm, :Wpns, :Wns, :Adm, :Pushy, :Webpush].each do |service|
         Rpush.const_set(service, client_module.const_get(service)) unless Rpush.const_defined?(service)
       end
 

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

@@ -107,7 +107,14 @@ module Rpush
         end
 
         def prepare_headers(notification)
-          notification_data(notification)[HTTP2_HEADERS_KEY] || {}
+          headers = {}
+
+          headers['apns-expiration'] = '0'
+          headers['apns-priority'] = '10'
+          headers['apns-topic'] = @app.bundle_id
+          headers['apns-push-type'] = 'background' if notification.content_available?
+
+          headers.merge notification_data(notification)[HTTP2_HEADERS_KEY] || {}
         end
 
         def notification_data(notification)