fcmpush 1.0.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9cd6eef6540ebc26b483f24558870bfd8eecb97f479611519ce4550483336d0
-  data.tar.gz: 6a137e1f554500d626f12e68b7a9c6734ebd0e537db27f07155f6d8c9baf5c94
+  metadata.gz: 0f74702c902a7c7c3c7b15c9a242a715dd3d3b58a37c0b527530dbb9cfc38b74
+  data.tar.gz: 9f93f6571276546ac487ed3c39b15f6b7223c07d8a3eeac058a925a78856a5d1
 SHA512:
-  metadata.gz: 789a5bdf88fc4ce1f8bdf4289da4cdb4da6f58ee87aa0531f2e5c3d6b82ca7ab2293ff5155725c589f1db554c9646bfced65de0010bc31c3fcb8de7ae37a2b81
-  data.tar.gz: 3c5af92191e371c1beb2501dfef07cdf122ae41512937fbc8a1154f7d81aa94e2a72351d1544c6210636aaab11126015dd4b7d8b1bda1a32bed1c560b01c9a62
+  metadata.gz: 05044cba1bf67f672e94f8b3097a9fe841e65609e50d8c3b9a9ed2999d29a0cb3be1dc36ab8b557ea28386c12bad58e9b3bbb00fdd45b3c6be3dc6f73ca73086
+  data.tar.gz: 045dee042ec4079c2c041764c2c0cec198da0c1bd13f1d5bfdde47bc7d9d0c0693d07eb64470d99ef5ec90e428a9de95df18ae974e7c8e9b48fe543a6f3efd49

data/fcmpush.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3', '< 2.8'
+  spec.required_ruby_version = '>= 2.4', '<= 3.0'
 
-  spec.add_dependency 'googleauth', '>= 0.9.0'
-  spec.add_dependency 'net-http-persistent', '>= 3.1.0'
+  spec.add_dependency 'google-apis-identitytoolkit_v3'
+  spec.add_dependency 'net-http-persistent', '~> 4.0.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13'

data/lib/fcmpush/batch.rb

@@ -0,0 +1,37 @@
+module Fcmpush
+  module Batch
+    PART_BOUNDRY = '__END_OF_PART__'.freeze
+
+    def make_batch_payload(messages, headers)
+      uri = URI.join(domain, path)
+      subrequests = messages.map do |payload|
+        req = Net::HTTP::Post.new(uri, headers)
+        req.body = payload
+        req
+      end
+      subrequests.map.with_index { |req, idx| create_part(req, PART_BOUNDRY, idx) }.join + "--#{PART_BOUNDRY}\r\n"
+    end
+
+    def create_part(request, part_boundry, idx)
+      serialized_request = serialize_sub_request(request)
+      "--#{part_boundry}\r\n" \
+        "Content-Length: #{serialized_request.length}\r\n" \
+        "Content-Type: application/http\r\n" \
+        "Content-Id: #{idx + 1}\r\n" \
+        "Content-Transfer-Encoding: binary\r\n" \
+        "\r\n" \
+        "#{serialized_request}\r\n"
+    end
+
+    def serialize_sub_request(request)
+      body_str = request.body.is_a?(String) ? request.body : request.body.to_json
+      subreqest = "POST #{request.path} HTTP/1.1\r\n" \
+                  "Content-Length: #{body_str.length}\r\n"
+      request.to_hash.each do |k, v|
+        subreqest += "#{k}: #{v.join(';')}\r\n"
+      end
+      subreqest += "\r\n" \
+                   "#{body_str}\r\n"
+    end
+  end
+end

data/lib/fcmpush/batch_response.rb

@@ -0,0 +1,39 @@
+require 'delegate' if RUBY_VERSION >= '2.7'
+
+module Fcmpush
+  class BatchResponse < DelegateClass(Net::HTTPResponse)
+    alias response __getobj__
+    alias headers to_hash
+    HAS_SYMBOL_GC = RUBY_VERSION > '2.2.0'
+
+    def json
+      parsable? ? @parsed ||= parse_body(body) : nil
+    end
+
+    def inspect
+      "#<BatchResponse response: #{response.inspect}, json: #{json}>"
+    end
+    alias to_s inspect
+
+    def parsable?
+      !body.nil? && !body.empty?
+    end
+
+    def success_count
+      @success_count ||= json.length - failure_count
+    end
+
+    def failure_count
+      @failure_count ||= json.select { |i| i[:error] }.size
+    end
+
+    private
+
+      def parse_body(raw_body)
+        devider = raw_body.match(/(\r\n--batch_.*)\r\n/)[1]
+        raw_body.split(devider)[1..-2].map do |response|
+          JSON.parse(response.split("\r\n\r\n")[2], symbolize_names: HAS_SYMBOL_GC)
+        end
+      end
+  end
+end

data/lib/fcmpush/client.rb

@@ -1,13 +1,17 @@
 require 'fcmpush/exceptions'
+require 'fcmpush/batch'
 require 'fcmpush/json_response'
+require 'fcmpush/batch_response'
 
 module Fcmpush
   V1_ENDPOINT_PREFIX = '/v1/projects/'.freeze
   V1_ENDPOINT_SUFFIX = '/messages:send'.freeze
   TOPIC_DOMAIN = 'https://iid.googleapis.com'.freeze
   TOPIC_ENDPOINT_PREFIX = '/iid/v1'.freeze
+  BATCH_ENDPOINT = '/batch'.freeze
 
   class Client
+    include Batch
     attr_reader :domain, :path, :connection, :configuration, :server_key, :access_token, :access_token_expiry
 
     def initialize(domain, project_id, configuration, **options)
@@ -15,7 +19,7 @@ module Fcmpush
       @project_id = project_id
       @path = V1_ENDPOINT_PREFIX + project_id.to_s + V1_ENDPOINT_SUFFIX
       @options = {}.merge(options)
-      @configuration = configuration
+      @configuration = configuration.dup
       access_token_response = v1_authorize
       @access_token = access_token_response['access_token']
       @access_token_expiry = Time.now.utc + access_token_response['expires_in']
@@ -25,8 +29,13 @@ module Fcmpush
 
     def v1_authorize
       @auth ||= if configuration.json_key_io
+                  io = if configuration.json_key_io.respond_to?(:read)
+                         configuration.json_key_io
+                       else
+                         File.open(configuration.json_key_io)
+                       end
                   Google::Auth::ServiceAccountCredentials.make_creds(
-                    json_key_io: File.open(configuration.json_key_io),
+                    json_key_io: io,
                     scope: configuration.scope
                   )
                 else
@@ -60,6 +69,14 @@ module Fcmpush
       raise NetworkError, "A network error occurred: #{e.class} (#{e.message})"
     end
 
+    def batch_push(messages, query: {}, headers: {})
+      uri, request = make_batch_request(messages, query, headers)
+      response = exception_handler(connection.request(uri, request))
+      BatchResponse.new(response)
+    rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+      raise NetworkError, "A network error occurred: #{e.class} (#{e.message})"
+    end
+
     private
 
       def make_push_request(body, query, headers)
@@ -121,5 +138,18 @@ module Fcmpush
           registration_tokens: instance_ids
         }.to_json
       end
+
+      def make_batch_request(messages, query, headers)
+        uri = URI.join(domain, BATCH_ENDPOINT)
+        uri.query = URI.encode_www_form(query) unless query.empty?
+
+        access_token_refresh
+        headers = v1_authorized_header(headers)
+        post = Net::HTTP::Post.new(uri, headers)
+        post['Content-Type'] = "multipart/mixed; boundary=#{::Fcmpush::Batch::PART_BOUNDRY}"
+        post.body = make_batch_payload(messages, headers)
+
+        [uri, post]
+      end
   end
 end

data/lib/fcmpush/version.rb

@@ -1,3 +1,3 @@
 module Fcmpush
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.3.1'.freeze
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: fcmpush
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.3.1
 platform: ruby
 authors:
 - miyataka
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: googleauth
+  name: google-apis-identitytoolkit_v3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: 
+description:
 email:
 - voyager.3taka28@gmail.com
 executables: []
@@ -89,6 +89,8 @@ extra_rdoc_files: []
 files:
 - fcmpush.gemspec
 - lib/fcmpush.rb
+- lib/fcmpush/batch.rb
+- lib/fcmpush/batch_response.rb
 - lib/fcmpush/client.rb
 - lib/fcmpush/configuration.rb
 - lib/fcmpush/exceptions.rb
@@ -100,7 +102,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/miyataka/fcmpush
   source_code_uri: https://github.com/miyataka/fcmpush
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -108,18 +110,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
-  - - "<"
+      version: '2.4'
+  - - "<="
     - !ruby/object:Gem::Version
-      version: '2.8'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Firebase Cloud Messaging API wrapper for ruby, supports HTTP v1. And including
   access_token Auto Refresh feature!