pubnub 3.3.0.2 → 3.3.0.5

data/lib/pubnub.rb

@@ -28,6 +28,17 @@ require 'active_support/core_ext/object/blank'
 
 class Pubnub
 
+  SUCCESS_RESPONSE = 200
+
+  TIMEOUT_BAD_RESPONSE_CODE = 1
+  TIMEOUT_BAD_JSON_RESPONSE = 0.5
+  TIMEOUT_GENERAL_ERROR = 1
+  TIMEOUT_SUBSCRIBE = 310
+  TIMEOUT_NON_SUBSCRIBE = 5
+
+  PUBNUB_LOGGER = Logger.new("/tmp/pubnubError.log")
+  PUBNUB_LOGGER.level = Logger::DEBUG
+
   class PresenceError < RuntimeError;
   end
   class PublishError < RuntimeError;
@@ -39,10 +50,7 @@ class Pubnub
 
   attr_accessor :publish_key, :subscribe_key, :secret_key, :cipher_key, :ssl, :channel, :origin, :session_uuid
 
-
-  #ORIGINS = %w(newcloud-virginia.pubnub.com newcloud-california.pubnub.com newcloud-ireland.pubnub.com newcloud-tokyo.pubnub.com)
   ORIGIN_HOST = 'pubsub.pubnub.com'
-  #ORIGIN_HOST = 'newcloud-california.pubnub.com'
   #ORIGIN_HOST = 'test.pubnub.com'
 
   def initialize(*args)
@@ -85,6 +93,7 @@ class Pubnub
     #TODO: refactor into initializer code on request instantiation
 
     publish_request.ssl = @ssl
+    publish_request.set_origin(options)
     publish_request.set_channel(options)
     publish_request.set_callback(options)
     publish_request.set_cipher_key(options, self.cipher_key)
@@ -109,6 +118,7 @@ class Pubnub
     #TODO: refactor into initializer code on request instantiation
 
     subscribe_request.ssl = @ssl
+    subscribe_request.set_origin(options)
     subscribe_request.set_channel(options)
     subscribe_request.set_callback(options)
     subscribe_request.set_cipher_key(options, self.cipher_key) unless subscribe_request.operation == "presence"
@@ -267,51 +277,25 @@ class Pubnub
   end
 
   private
-  
+
   def _request(request, is_reactor_running = false)
     request.format_url!
-    #puts("- Fetching #{request.url}")
     Thread.new{
       begin
 
-        conn = EM::HttpRequest.new(request.url, :inactivity_timeout => 310)#client times out in 310s unless the server returns or timeout first
+        operation_timeout = %w(subscribe presence).include?(request.operation) ? TIMEOUT_SUBSCRIBE : TIMEOUT_NON_SUBSCRIBE
+        conn = EM::HttpRequest.new(request.url, :inactivity_timeout => operation_timeout) #client times out in 310s unless the server returns or timeout first
         req = conn.get()
 
         req.errback{
-          if req.response.blank?
-            puts("#{Time.now}: Reconnecting from timeout.")
-
-            EM::Timer.new(1) do
-              _request(request, is_reactor_running)
-            end
-          else
-            error_message = "Unknown Error: #{req.response.to_s}"
-            puts(error_message)
-            request.callback.call([0, error_message])
-
-            EM.stop unless is_reactor_running
-          end
+          logAndRetryGeneralError(is_reactor_running, req, request)
         }
 
         req.callback {
-          request.package_response!(req.response)
-          cycle = request.callback.call(request.response)
-
-          only_success_status_is_acceptable = 200
-
-          if (req.response_header.http_status.to_i != only_success_status_is_acceptable)
-
-            error_message = "Server Error, status: #{req.response_header.http_status}, extended info: #{req.response}"
-            puts(error_message)
-            EM.stop unless is_reactor_running
+          if checkForBadJSON(req) == true
+            logAndRetryBadJSON(is_reactor_running, req, request)
           else
-
-            if %w(subscribe presence).include?(request.operation) && (cycle != false || request.first_request?)
-              _request(request, is_reactor_running)
-            else
-              EM.stop unless is_reactor_running
-            end
-
+            processGoodResponse(is_reactor_running, req, request)
           end
         }
 
@@ -323,6 +307,72 @@ class Pubnub
     }
   end
 
+  def checkForBadJSON(req)
+    jsonError = false
+    begin
+      JSON.parse(req.response)
+    rescue => e
+      jsonError = true
+    end
+    jsonError
+  end
+
+  def processGoodResponse(is_reactor_running, req, request)
+
+    if (req.response_header.http_status.to_i != SUCCESS_RESPONSE)
+      logAndRetryBadResponseCode(is_reactor_running, req, request)
+    else
 
+      request.package_response!(req.response)
+      cycle = request.callback.call(request.response)
+
+      if %w(subscribe presence).include?(request.operation) && (cycle != false || request.first_request?)
+        _request(request, is_reactor_running)
+      else
+        EM.stop unless is_reactor_running
+      end
+    end
+  end
+
+  def logAndRetryGeneralError(is_reactor_running, req, request)
+    errMsg = "#{Time.now}: Network connectivity issue while attempting to reach #{request.url}"
+    logError(errMsg)
+    retryRequest(is_reactor_running, req, request, TIMEOUT_GENERAL_ERROR)
+  end
+
+  def logAndRetryBadJSON(is_reactor_running, req, request)
+    errMsg = "#{Time.now}: Retrying from bad JSON: #{req.response.to_s}"
+    logError(errMsg)
+    retryRequest(is_reactor_running, req, request, TIMEOUT_BAD_JSON_RESPONSE)
+  end
+
+  def logAndRetryBadResponseCode(is_reactor_running, req, request)
+    errMsg = "#{Time.now}: Retrying from bad server response code: (#{req.response_header.http_status.to_i}) #{req.response.to_s}"
+    logError(errMsg)
+    retryRequest(is_reactor_running, req, request, TIMEOUT_BAD_RESPONSE_CODE)
+  end
+
+  def logError(errMsg)
+    PUBNUB_LOGGER.debug(errMsg)
+  end
+
+  def retryRequest(is_reactor_running, req, request, delay)
+
+    if %w(subscribe presence).include?(request.operation)
+      EM::Timer.new(delay) do
+        _request(request, is_reactor_running)
+      end
+    else
+      error_msg = [0, "Request to #{request.url} failed."]
+
+      request.set_error(true)
+      request.callback.call(error_msg)
+
+      PUBNUB_LOGGER.debug(error_msg)
+
+      EM.stop unless is_reactor_running
+    end
+
+  end
 
-end
+end

data/lib/pubnub_request.rb

@@ -1,6 +1,6 @@
 class PubnubRequest
   attr_accessor :cipher_key, :host, :query, :response, :timetoken, :url, :operation, :callback, :publish_key, :subscribe_key, :secret_key, :channel, :jsonp, :message, :ssl, :port
-  attr_accessor :history_limit, :history_count, :history_start, :history_end, :history_reverse, :session_uuid, :last_timetoken
+  attr_accessor :history_limit, :history_count, :history_start, :history_end, :history_reverse, :session_uuid, :last_timetoken, :origin, :error
 
   class RequestError < RuntimeError;
   end
@@ -40,6 +40,24 @@ class PubnubRequest
         self.channel == another.channel && self.message == another.message
   end
 
+  def set_error(options)
+    options = HashWithIndifferentAccess.new(options)
+
+    if options[:error].present?
+      self.error = true
+    end
+    self
+  end
+
+  def set_origin(options)
+    options = HashWithIndifferentAccess.new(options)
+
+    if options[:origin].present?
+      self.origin = options[:origin].to_s
+      self
+    end
+  end
+
   def set_channel(options)
     options = HashWithIndifferentAccess.new(options)
 
@@ -186,10 +204,10 @@ class PubnubRequest
     raise(Pubnub::PublishError, "Missing .operation in PubnubRequest object") if self.operation.blank?
 
     if @ssl.present?
-      origin = 'https://' + Pubnub::ORIGIN_HOST
+      origin = 'https://' + (self.origin.present? ? self.origin : Pubnub::ORIGIN_HOST)
       @port = 443
     else
-      origin = 'http://' + Pubnub::ORIGIN_HOST
+      origin = 'http://' + (self.origin.present? ? self.origin : Pubnub::ORIGIN_HOST)
       @port = 80
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pubnub
 version: !ruby/object:Gem::Version
-  version: 3.3.0.2
+  version: 3.3.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2013-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -121,8 +121,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: PubNub Official Ruby gem
 test_files: []
+has_rdoc: