From 54adfa48a238f6734016e215b7049f354277ceca Mon Sep 17 00:00:00 2001 From: Shoaib Burq Date: Mon, 21 Oct 2024 22:17:15 +1100 Subject: [PATCH 1/2] allow passing timout to http request #131 --- lib/fcm.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/fcm.rb b/lib/fcm.rb index 8c32219..5c641a5 100644 --- a/lib/fcm.rb +++ b/lib/fcm.rb @@ -12,9 +12,10 @@ class FCM INSTANCE_ID_API = "https://iid.googleapis.com" TOPIC_REGEX = /[a-zA-Z0-9\-_.~%]+/ - def initialize(json_key_path = "", project_name = "") + def initialize(json_key_path = "", project_name = "", http_options = {}) @json_key_path = json_key_path @project_name = project_name + @http_options = http_options end # See https://firebase.google.com/docs/cloud-messaging/send-message @@ -192,7 +193,7 @@ def send_to_topic_condition(condition, options = {}) def for_uri(uri, extra_headers = {}) connection = ::Faraday.new( url: uri, - request: { timeout: DEFAULT_TIMEOUT } + request: { timeout: @http_options.fetch(:timeout, DEFAULT_TIMEOUT) }, ) do |faraday| faraday.adapter Faraday.default_adapter faraday.headers["Content-Type"] = "application/json" From 2d692f03e3198e36cd179c6b3a9394027e4b16ed Mon Sep 17 00:00:00 2001 From: Shoaib Burq Date: Mon, 21 Oct 2024 22:19:59 +1100 Subject: [PATCH 2/2] Update fcm.rb --- lib/fcm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fcm.rb b/lib/fcm.rb index 5c641a5..3622c77 100644 --- a/lib/fcm.rb +++ b/lib/fcm.rb @@ -193,7 +193,7 @@ def send_to_topic_condition(condition, options = {}) def for_uri(uri, extra_headers = {}) connection = ::Faraday.new( url: uri, - request: { timeout: @http_options.fetch(:timeout, DEFAULT_TIMEOUT) }, + request: { timeout: @http_options.fetch(:timeout, DEFAULT_TIMEOUT) } ) do |faraday| faraday.adapter Faraday.default_adapter faraday.headers["Content-Type"] = "application/json"