apns_gatling 0.1.5 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ded821dd7dfeeffc971eda81795497a104199b5
-  data.tar.gz: 1eb94b36a9459b19bebfd949d3767d0b795b7f0b
+  metadata.gz: 683a9f97a25ddb358da1ded897fcf852dd394753
+  data.tar.gz: 7f5088c3f030e43c7530ff7f91d5ba75524d93a0
 SHA512:
-  metadata.gz: d73fdc6ae1080d33b4a37e0f24b841961756ac111142e98fa4738e6d7c644885c5f7234b998e8518b788569137a2b930093f32957c7d55119048d2ec8ae90309
-  data.tar.gz: 6c5fe03e2ccd0e302c6a1d7b664ad18da3d3ba6aac51def687f10e2b5640c2cef241a26aed50ee738162a736f4addcf0987b61160ffa909040010dd6fa1aab33
+  metadata.gz: c5e4721d36638633fedeb0c2d7b755316a57d3365f3af2568ee938d145ae7d4972fdbc78d3c831bb2812eb997ecf05000423f3632030946a507c3920070bae78
+  data.tar.gz: 9f9568bd6b3814d2c904f326f4aefe5122762aac79b3c0d20c2591332d87513ee7b5f36f1175a2ff0eb66fb9229dcdf4767b5708d49d940064e70cf7c1ff9770

data/examples/push_message.rb

@@ -22,4 +22,6 @@ client = ApnsGatling::Client.new team_id, auth_key_id, ecdsa_key, true
   end
 end
 
-client.join
+loop {
+  sleep 1
+}

data/lib/apns_gatling/apns_client.rb

@@ -15,6 +15,7 @@ module ApnsGatling
       @token_maker = Token.new(team_id, auth_key_id, ecdsa_key)
       @sandbox = sandbox
       @mutex = Mutex.new
+      @requests = {}
       @cv = ConditionVariable.new
       init_vars
     end
@@ -51,28 +52,62 @@ module ApnsGatling
       end
     end
 
+    def connection_error(e)
+      @mutex.synchronize do 
+        @requests.values.map do | request | 
+          block = request[:block]
+          response = request[:response]
+          if block && response
+            response.error_with("connection failed #{e}")
+            block.call response
+          end
+        end
+        @requests = {}
+        @connection = nil
+      end
+    end
+
     # push message
-    def push(message)
+    def push(message, &block)
       request = Request.new(message, provider_token, host)
-      response = Response.new
-      ensure_socket_open
+      response = Response.new(message)
+      @mutex.synchronize do 
+        @requests[request.id] = {block: block, response: response}
+      end
 
       begin
+        ensure_socket_open
         stream = connection.new_stream
+      rescue SocketError => e
+        response.error_with("create connection failed #{e}")
+        block.call response
+        return
+      rescue StreamLimitExceeded
+        response.error_with('stream limit exceeded')
+        block.call response
+        return
+      rescue ConnectionClosed
+        close
+        response.error_with('connection closed')
+        block.call response
+        return
       rescue StandardError => e
         close
-        raise e
+        response.error_with("standard error #{e}")
+        block.call response
+        return
       end
 
       stream.on(:close) do
         @mutex.synchronize do 
+          @requests.delete request.id
           @token_generated_at = 0 if response.status == '403' && response.error[:reason] == 'ExpiredProviderToken' 
           if @blocking 
             @blocking = false
             @cv.signal
           end
+          block.call response if block
         end
-        yield response
       end
 
       stream.on(:headers) do |h|
@@ -112,12 +147,12 @@ module ApnsGatling
             socket_loop
           rescue EOFError
             init_vars
-            raise SocketError.new('Socket was remotely closed')
+            connection_error(SocketError.new('Socket was remotely closed'))
           rescue Exception => e
             init_vars
-            raise e
+            connection_error(e)
           end
-        end.tap { |t| t.abort_on_exception = true }
+        end
       end
     end
 
@@ -169,6 +204,7 @@ module ApnsGatling
     def close
       exit_thread(@socket_thread)
       init_vars
+      @connection = nil
     end
 
     def exit_thread(thread)

data/lib/apns_gatling/request.rb

@@ -1,9 +1,10 @@
 module ApnsGatling
   class Request
-    attr_reader :host, :path, :auth_token, :headers, :data
+    attr_reader :id, :host, :path, :auth_token, :headers, :data
 
     def initialize(message, auth_token, host)
       path = "/3/device/#{message.token}"
+      @id = message.apns_id
       @path = path
       @auth_token = auth_token
       @headers = headers_from message, auth_token, host, path

data/lib/apns_gatling/response.rb

@@ -4,10 +4,13 @@ module ApnsGatling
   class Response
     # See: https://developer.apple.com/library/content/documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingwithAPNs.html
     attr_accessor :headers, :data
+    attr_reader :message
 
-    def initialize()
+    def initialize(message)
       @headers = {}
       @data = ''
+      @message = message 
+      @internal_error = nil
     end
 
     def status
@@ -22,7 +25,12 @@ module ApnsGatling
       JSON.parse(@data) rescue @data
     end
 
+    def error_with(reason)
+      @internal_error = {reason: reason, 'apns-id': @message.apns_id, status: '0'}
+    end
+
     def error
+      return @internal_error if @internal_error
       if status != '200'
         e = {}
         e.merge!(status: @headers[':status']) if @headers[':status']

data/lib/apns_gatling/version.rb

@@ -1,3 +1,3 @@
 module ApnsGatling
-  VERSION = "0.1.5"
+  VERSION = "0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apns_gatling
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: '0.2'
 platform: ruby
 authors:
 - Cloud
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2