pubnub 5.3.4 → 5.4.0

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    pubnub (5.3.4)
+    pubnub (5.4.0)
       addressable (>= 2.0.0)
-      concurrent-ruby (~> 1.1.5)
-      concurrent-ruby-edge (~> 0.5.0)
+      concurrent-ruby (~> 1.3.4)
+      concurrent-ruby-edge (~> 0.7.1)
       dry-validation (~> 1.0)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 2.2.0, < 3)
@@ -13,62 +13,65 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
     awesome_print (1.9.2)
-    bigdecimal (3.1.6)
-    binding_of_caller (1.0.0)
-      debug_inspector (>= 0.0.1)
-    builder (3.2.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    binding_of_caller (1.0.1)
+      debug_inspector (>= 1.2.0)
+    builder (3.3.0)
     codacy-coverage (2.2.1)
       simplecov
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    concurrent-ruby-edge (0.5.0)
-      concurrent-ruby (~> 1.1.5)
-    crack (0.4.5)
+    concurrent-ruby (1.3.4)
+    concurrent-ruby-edge (0.7.1)
+      concurrent-ruby (~> 1.3)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    cucumber (9.1.2)
-      builder (~> 3.2, >= 3.2.4)
-      cucumber-ci-environment (~> 9.2, >= 9.2.0)
-      cucumber-core (~> 12.0)
+    cucumber (9.2.0)
+      builder (~> 3.2)
+      cucumber-ci-environment (> 9, < 11)
+      cucumber-core (> 13, < 14)
       cucumber-cucumber-expressions (~> 17.0)
-      cucumber-gherkin (> 24, < 27)
+      cucumber-gherkin (> 24, < 28)
       cucumber-html-formatter (> 20.3, < 22)
       cucumber-messages (> 19, < 25)
       diff-lcs (~> 1.5)
-      mini_mime (~> 1.1, >= 1.1.5)
-      multi_test (~> 1.1, >= 1.1.0)
-      sys-uname (~> 1.2, >= 1.2.3)
-    cucumber-ci-environment (9.2.0)
-    cucumber-core (12.0.0)
-      cucumber-gherkin (>= 25, < 27)
+      mini_mime (~> 1.1)
+      multi_test (~> 1.1)
+      sys-uname (~> 1.2)
+    cucumber-ci-environment (10.0.1)
+    cucumber-core (13.0.3)
+      cucumber-gherkin (>= 27, < 28)
       cucumber-messages (>= 20, < 23)
-      cucumber-tag-expressions (~> 5.0, >= 5.0.4)
-    cucumber-cucumber-expressions (17.0.1)
-    cucumber-gherkin (26.2.0)
-      cucumber-messages (>= 19.1.4, < 22.1)
-    cucumber-html-formatter (21.2.0)
-      cucumber-messages (> 19, < 25)
+      cucumber-tag-expressions (> 5, < 7)
+    cucumber-cucumber-expressions (17.1.0)
+      bigdecimal
+    cucumber-gherkin (27.0.0)
+      cucumber-messages (>= 19.1.4, < 23)
+    cucumber-html-formatter (21.7.0)
+      cucumber-messages (> 19, < 27)
     cucumber-messages (22.0.0)
-    cucumber-tag-expressions (5.0.6)
+    cucumber-tag-expressions (6.1.0)
     debug_inspector (1.2.0)
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    dry-configurable (1.1.0)
+    diff-lcs (1.5.1)
+    docile (1.4.1)
+    dry-configurable (1.2.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
+    dry-inflector (1.1.0)
     dry-initializer (3.1.1)
     dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
-    dry-schema (1.13.3)
+    dry-schema (1.13.4)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)
       dry-core (~> 1.0, < 2)
@@ -89,17 +92,18 @@ GEM
       dry-initializer (~> 3.0)
       dry-schema (>= 1.12, < 2)
       zeitwerk (~> 2.6)
-    ffi (1.16.3)
-    hashdiff (1.1.0)
+    ffi (1.17.0)
+    hashdiff (1.1.1)
     httpclient (2.8.3)
     interception (0.5)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    method_source (1.0.0)
+    lint_roller (1.1.0)
+    method_source (1.1.0)
     mini_mime (1.1.5)
     multi_test (1.1.0)
-    parallel (1.24.0)
-    parser (3.3.0.5)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
       racc
     pry (0.14.2)
@@ -111,57 +115,72 @@ GEM
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
-    public_suffix (5.0.4)
-    racc (1.7.3)
+    public_suffix (6.0.1)
+    racc (1.8.1)
     rainbow (3.1.1)
-    regexp_parser (2.9.0)
-    rexml (3.2.6)
-    rr (3.1.0)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    regexp_parser (2.9.2)
+    rexml (3.3.8)
+    rr (3.1.1)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.12.1)
-    rubocop (1.60.2)
+    rspec-support (3.13.1)
+    rubocop (1.66.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.23.0)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    sys-uname (1.2.3)
+    standard (1.41.1)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.66.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.5)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.6.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.23.0)
+    sys-uname (1.3.0)
       ffi (~> 1.1)
     timers (4.3.5)
-    unicode-display_width (2.5.0)
-    vcr (6.2.0)
-    webmock (3.19.1)
+    unicode-display_width (2.6.0)
+    vcr (6.3.1)
+      base64
+    webmock (3.24.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -180,6 +199,7 @@ DEPENDENCIES
   rspec-retry
   rubocop
   simplecov (>= 0.21.2)
+  standard
   vcr
   webmock
 

data/VERSION

@@ -1 +1 @@
-5.3.4
+5.4.0

data/lib/pubnub/client/events.rb

@@ -4,14 +4,16 @@ module Pubnub
   class Client
     # Module that holds generator for all events
     module Events
-      EVENTS = %w[publish subscribe presence leave history here_now audit grant grant_token revoke_token delete_messages
-                  revoke time heartbeat where_now set_state state channel_registration message_counts signal
-                  add_message_action get_message_actions remove_message_action
-                  add_channels_to_push list_push_provisions remove_channels_from_push remove_device_from_push
-                  set_uuid_metadata set_channel_metadata remove_uuid_metadata remove_channel_metadata
-                  get_uuid_metadata get_all_uuid_metadata get_channel_metadata get_all_channels_metadata
-                  get_channel_members get_memberships set_channel_members set_memberships
-                  remove_memberships remove_channel_members].freeze
+      EVENTS = %w[publish subscribe presence leave history fetch_messages here_now audit grant
+                  grant_token revoke_token delete_messages revoke time heartbeat where_now
+                  set_state state channel_registration message_counts signal add_message_action
+                  get_message_actions remove_message_action add_channels_to_push
+                  list_push_provisions remove_channels_from_push remove_device_from_push
+                  set_uuid_metadata set_channel_metadata remove_uuid_metadata
+                  remove_channel_metadata get_uuid_metadata get_all_uuid_metadata
+                  get_channel_metadata get_all_channels_metadata get_channel_members
+                  get_memberships set_channel_members set_memberships remove_memberships
+                  remove_channel_members].freeze
 
       EVENTS.each do |event_name|
         define_method event_name do |options = {}, &block|

data/lib/pubnub/client.rb

@@ -1,85 +1,86 @@
 # frozen_string_literal: true
 
-require 'base64'
-
-require 'pubnub/error'
-require 'pubnub/uuid'
-require 'pubnub/formatter'
-require 'pubnub/constants'
-require 'pubnub/configuration'
-require 'pubnub/subscribe_callback'
-
-require 'pubnub/modules/crypto/module'
-
-require 'pubnub/schemas/envelope_schema'
-
-require 'pubnub/event'
-require 'pubnub/single_event'
-require 'pubnub/subscribe_event/callbacks'
-require 'pubnub/subscribe_event/formatter'
-require 'pubnub/subscribe_event/heartbeat'
-require 'pubnub/subscribe_event/adding'
-require 'pubnub/subscribe_event/removing'
-require 'pubnub/subscribe_event'
-require 'pubnub/pam'
-require 'pubnub/heart'
-require 'pubnub/subscriber'
-require 'pubnub/telemetry'
-
-require 'pubnub/envelope'
-require 'pubnub/error_envelope'
-
-require 'pubnub/client/events'
-require 'pubnub/client/paged_history'
-require 'pubnub/client/helpers'
-require 'pubnub/client/getters_setters'
-
-require 'pubnub/validators/get_message_actions'
-require 'pubnub/validators/add_message_action'
-require 'pubnub/validators/remove_message_action'
-require 'pubnub/validators/common_validator'
-require 'pubnub/validators/client'
-require 'pubnub/validators/audit'
-require 'pubnub/validators/channel_registration'
-require 'pubnub/validators/grant'
-require 'pubnub/validators/grant_token'
-require 'pubnub/validators/revoke_token'
-require 'pubnub/validators/heartbeat'
-require 'pubnub/validators/here_now'
-require 'pubnub/validators/history'
-require 'pubnub/validators/leave'
-require 'pubnub/validators/presence'
-require 'pubnub/validators/publish'
-require 'pubnub/validators/revoke'
-require 'pubnub/validators/set_state'
-require 'pubnub/validators/state'
-require 'pubnub/validators/subscribe'
-require 'pubnub/validators/time'
-require 'pubnub/validators/where_now'
-require 'pubnub/validators/delete'
-require 'pubnub/validators/message_counts'
-require 'pubnub/validators/add_channels_to_push'
-require 'pubnub/validators/list_push_provisions'
-require 'pubnub/validators/remove_channels_from_push'
-require 'pubnub/validators/remove_device_from_push'
-require 'pubnub/validators/signal'
-require 'pubnub/validators/set_uuid_metadata'
-require 'pubnub/validators/set_channel_metadata'
-require 'pubnub/validators/remove_uuid_metadata'
-require 'pubnub/validators/remove_channel_metadata'
-require 'pubnub/validators/get_uuid_metadata'
-require 'pubnub/validators/get_all_uuid_metadata'
-require 'pubnub/validators/get_channel_metadata'
-require 'pubnub/validators/get_all_channels_metadata'
-require 'pubnub/validators/get_channel_members'
-require 'pubnub/validators/get_memberships'
-require 'pubnub/validators/set_channel_members'
-require 'pubnub/validators/set_memberships'
-require 'pubnub/validators/remove_channel_members'
-require 'pubnub/validators/remove_memberships'
-require 'pubnub/cbor'
-
-Dir[File.join(File.dirname(__dir__), 'pubnub', 'events', '*.rb')].each do |file|
+require "base64"
+
+require "pubnub/error"
+require "pubnub/uuid"
+require "pubnub/formatter"
+require "pubnub/constants"
+require "pubnub/configuration"
+require "pubnub/subscribe_callback"
+
+require "pubnub/modules/crypto/module"
+
+require "pubnub/schemas/envelope_schema"
+
+require "pubnub/event"
+require "pubnub/single_event"
+require "pubnub/subscribe_event/callbacks"
+require "pubnub/subscribe_event/formatter"
+require "pubnub/subscribe_event/heartbeat"
+require "pubnub/subscribe_event/adding"
+require "pubnub/subscribe_event/removing"
+require "pubnub/subscribe_event"
+require "pubnub/pam"
+require "pubnub/heart"
+require "pubnub/subscriber"
+require "pubnub/telemetry"
+
+require "pubnub/envelope"
+require "pubnub/error_envelope"
+
+require "pubnub/client/events"
+require "pubnub/client/paged_history"
+require "pubnub/client/helpers"
+require "pubnub/client/getters_setters"
+
+require "pubnub/validators/get_message_actions"
+require "pubnub/validators/add_message_action"
+require "pubnub/validators/remove_message_action"
+require "pubnub/validators/common_validator"
+require "pubnub/validators/client"
+require "pubnub/validators/audit"
+require "pubnub/validators/channel_registration"
+require "pubnub/validators/grant"
+require "pubnub/validators/grant_token"
+require "pubnub/validators/revoke_token"
+require "pubnub/validators/heartbeat"
+require "pubnub/validators/here_now"
+require "pubnub/validators/history"
+require "pubnub/validators/fetch_messages"
+require "pubnub/validators/leave"
+require "pubnub/validators/presence"
+require "pubnub/validators/publish"
+require "pubnub/validators/revoke"
+require "pubnub/validators/set_state"
+require "pubnub/validators/state"
+require "pubnub/validators/subscribe"
+require "pubnub/validators/time"
+require "pubnub/validators/where_now"
+require "pubnub/validators/delete"
+require "pubnub/validators/message_counts"
+require "pubnub/validators/add_channels_to_push"
+require "pubnub/validators/list_push_provisions"
+require "pubnub/validators/remove_channels_from_push"
+require "pubnub/validators/remove_device_from_push"
+require "pubnub/validators/signal"
+require "pubnub/validators/set_uuid_metadata"
+require "pubnub/validators/set_channel_metadata"
+require "pubnub/validators/remove_uuid_metadata"
+require "pubnub/validators/remove_channel_metadata"
+require "pubnub/validators/get_uuid_metadata"
+require "pubnub/validators/get_all_uuid_metadata"
+require "pubnub/validators/get_channel_metadata"
+require "pubnub/validators/get_all_channels_metadata"
+require "pubnub/validators/get_channel_members"
+require "pubnub/validators/get_memberships"
+require "pubnub/validators/set_channel_members"
+require "pubnub/validators/set_memberships"
+require "pubnub/validators/remove_channel_members"
+require "pubnub/validators/remove_memberships"
+require "pubnub/cbor"
+
+Dir[File.join(File.dirname(__dir__), "pubnub", "events", "*.rb")].each do |file|
   require file
 end
 
@@ -188,7 +189,7 @@ module Pubnub
       validate! @env
       setup_crypto_module
       @telemetry = Telemetry.new
-      Pubnub.logger.debug('Pubnub::Client') do
+      Pubnub.logger.debug("Pubnub::Client") do
         "Created new Pubnub::Client instance. Version: #{Pubnub::VERSION}"
       end
     end
@@ -260,8 +261,8 @@ module Pubnub
     # created and returns it if created, otherwise creates it, assigns
     # it in @env and returns newly created dispatcher.
     def request_dispatcher(origin, event_type, sync)
-      Pubnub.logger.debug('Pubnub::Client') do
-        "Looking for requester for #{sync ? 'sync' : 'async'} #{event_type}"
+      Pubnub.logger.debug("Pubnub::Client") do
+        "Looking for requester for #{sync ? "sync" : "async"} #{event_type}"
       end
 
       if sync
@@ -289,21 +290,21 @@ module Pubnub
     # ==============
     # Terminates request dispatcher for given origin and event type. Usable while restarting subscription.
     def kill_request_dispatcher(origin, event_type)
-      Pubnub.logger.debug('Pubnub::Client') { 'Killing requester' }
+      Pubnub.logger.debug("Pubnub::Client") { "Killing requester" }
       # @env[:req_dispatchers_pool][origin][event_type].async.terminate
       @env[:req_dispatchers_pool][:async][origin][event_type].reset_all
       @env[:req_dispatchers_pool][:async][origin][event_type] = nil
-    rescue StandardError
-      Pubnub.logger.debug('Pubnub::Client') { 'There\'s no requester' }
+    rescue
+      Pubnub.logger.debug("Pubnub::Client") { "There's no requester" }
     end
 
     def sequence_number_for_publish!
       @env[:sequence_number_for_publish] += 1
-      @env[:sequence_number_for_publish] % 2 ** 32
+      @env[:sequence_number_for_publish] % 2**32
     end
 
     def apply_state(event)
-      Pubnub.logger.debug('Pubnub::Client') { 'Apply state' }
+      Pubnub.logger.debug("Pubnub::Client") { "Apply state" }
       create_state_pools(event)
 
       return unless event.state
@@ -361,11 +362,11 @@ module Pubnub
     end
 
     def setup_httpclient(event_type)
-      hc = if ENV['HTTP_PROXY']
-             HTTPClient.new(ENV['HTTP_PROXY'])
-           else
-             HTTPClient.new
-           end
+      hc = if ENV["HTTP_PROXY"]
+        HTTPClient.new(ENV["HTTP_PROXY"])
+      else
+        HTTPClient.new
+      end
 
       case event_type
       when :subscribe_event
@@ -394,14 +395,14 @@ module Pubnub
     end
 
     def setup_app(options)
-      Pubnub.logger = options[:logger] || Logger.new('pubnub.log')
+      Pubnub.logger = options[:logger] || Logger.new("pubnub.log")
       Concurrent.global_logger = Pubnub.logger
       @subscriber = Subscriber.new(self)
       options[:user_id] = options[:uuid] if options[:user_id].nil?
 
       if options[:cipher_key] && options[:crypto_module]
-        puts 'It is expected that only cipherKey or cryptoModule will be configured ' \
-               'at once. PubNub client will use the configured cryptoModule.'
+        puts "It is expected that only cipherKey or cryptoModule will be configured " \
+               "at once. PubNub client will use the configured cryptoModule."
       end
 
       @env = options

data/lib/pubnub/constants.rb

@@ -48,6 +48,8 @@ module Pubnub
     OPERATION_PRESENCE_LEAVE = :leave
     OPERATION_TIME = :time
     OPERATION_HISTORY = :history
+    OPERATION_FETCH_MESSAGES = :fetch_messages
+    OPERATION_FETCH_MESSAGES_WITH_ACTIONS = :fetch_messages_with_actions
     OPERATION_HERE_NOW = :here_now
     OPERATION_WHERE_NOW = :where_now
     OPERATION_GLOBAL_HERE_NOW = :global_here_now
@@ -89,7 +91,8 @@ module Pubnub
 
     OPERATIONS = [
       OPERATION_SUBSCRIBE, OPERATION_HEARTBEAT, OPERATION_PRESENCE, OPERATION_TIME, OPERATION_HISTORY,
-      OPERATION_HERE_NOW, OPERATION_GLOBAL_HERE_NOW, OPERATION_GET_STATE, OPERATION_ADD_MESSAGE_ACTION,
+      OPERATION_FETCH_MESSAGES, OPERATION_FETCH_MESSAGES_WITH_ACTIONS, OPERATION_HERE_NOW,
+      OPERATION_GLOBAL_HERE_NOW, OPERATION_GET_STATE, OPERATION_ADD_MESSAGE_ACTION,
       OPERATION_REMOVE_MESSAGE_ACTION, OPERATION_GET_MESSAGE_ACTIONS, OPERATION_LIST_ALL_CHANNEL_GROUPS,
       OPERATION_LIST_ALL_CHANNELS_IN_CHANNEL_GROUP, OPERATION_CHANNEL_GROUP_ADD, OPERATION_CHANNEL_GROUP_REMOVE,
       OPERATION_AUDIT, OPERATION_GRANT, OPERATION_GRANT_TOKEN, OPERATION_REVOKE, OPERATION_WHERE_NOW,

data/lib/pubnub/event.rb

@@ -65,14 +65,14 @@ module Pubnub
 
       begin
         @app.record_telemetry(@telemetry_name, telemetry_time_start, ::Time.now.to_f)
-      rescue StandardError => error
-        Pubnub.logger.warn('Pubnub::Event') { "Couldn't record telemetry because of #{error}\n#{error.backtrace.join("\n")}" }
+      rescue StandardError => e
+        Pubnub.logger.warn('Pubnub::Event') { "Couldn't record telemetry because of #{e}\n#{e.backtrace.join("\n")}" }
       end
 
       response
-    rescue StandardError => error
-      Pubnub.logger.error('Pubnub::Event') { error }
-      error
+    rescue StandardError => e
+      Pubnub.logger.error('Pubnub::Event') { e }
+      e
     end
 
     def uri(memo = true)
@@ -133,8 +133,8 @@ module Pubnub
 
     def secure_call(cb, arg)
       cb.call arg
-    rescue StandardError => error
-      Pubnub.logger.error('Pubnub::Event') { "Error while calling callback #{error.inspect}" }
+    rescue StandardError => e
+      Pubnub.logger.error('Pubnub::Event') { "Error while calling callback #{e.inspect}" }
     end
 
     def fire_callbacks(envelope)
@@ -150,7 +150,7 @@ module Pubnub
 
       token = @app.env[:token]
       empty_if_blank = {
-        auth: token ? token : @auth_key,
+        auth: token || @auth_key,
         uuid: @app.user_id,
         @telemetry_name => @current_telemetry
       }
@@ -169,21 +169,26 @@ module Pubnub
     end
 
     def create_variables_from_options(options)
-      variables = %w[channel channels message http_sync callback
-                     ssl cipher_key random_iv crypto_module secret_key auth_key
-                     publish_key subscribe_key timetoken action_timetoken message_timetoken
-                     open_timeout read_timeout idle_timeout heartbeat
-                     group action read write delete manage ttl presence start
-                     end count limit reverse presence_callback store skip_validate
-                     state channel_group channel_groups compressed meta customs include_token
-                     replicate with_presence cipher_key_selector include_meta join update get
-                     add remove push_token push_gateway environment topic authorized_uuid
-                     authorized_user_id token type value
-                   ]
+      variables = %w[channel channels message http_sync callback ssl cipher_key random_iv
+                     crypto_module secret_key auth_key publish_key subscribe_key timetoken
+                     action_timetoken message_timetoken open_timeout read_timeout idle_timeout
+                     heartbeat group action read write delete manage ttl presence start end count
+                     limit max reverse presence_callback store skip_validate state channel_group
+                     channel_groups compressed meta customs custom_message_type include_token
+                     include_custom_message_type include_message_actions include_message_type
+                     replicate with_presence cipher_key_selector include_meta include_uuid join
+                     update get add remove push_token push_gateway environment topic
+                     authorized_uuid authorized_user_id token type value]
 
       options = options.each_with_object({}) { |option, obj| obj[option.first.to_sym] = option.last }
 
-      variables.each { |variable| instance_variable_set('@' + variable, options[variable.to_sym]) unless variable.nil? }
+      # variables.each { |variable| instance_variable_set('@' + variable, options[variable.to_sym]) unless variable.nil? }
+      variables.each do |variable|
+        next if variable.nil?
+
+        ivar = "@#{variable}"
+        instance_variable_set(ivar, options[variable.to_sym]) unless instance_variable_defined?(ivar) && !instance_variable_get(ivar).nil?
+      end
 
       return if @event != :subscribe && @event != :presence
 
@@ -208,12 +213,14 @@ module Pubnub
     def compute_cipher_key(data)
       ck = @compute_cipher_key || @cipher_key || @app.env[:cipher_key_selector] || @app.env[:cipher_key].to_s
       return ck unless ck.respond_to?(:call)
+
       ck.call(data)
     end
 
     def compute_random_iv(data)
       ck = @compute_random_iv || @random_iv || @app.env[:random_iv_selector] || @app.env[:random_iv].to_s
       return ck unless ck.respond_to?(:call)
+
       ck.call(data)
     end
 
@@ -221,9 +228,7 @@ module Pubnub
     #
     # @return [Pubnub::Crypto::CryptoProvider, nil] Crypto module for data encryption and
     #   decryption.
-    def crypto_module
-      @crypto_module
-    end
+    attr_reader :crypto_module
 
     def error_message(parsed_response)
       parsed_response['message']