jekyll-hackclub 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 946c0c6e84743e07d73f28be93196ab5b36f64aac96b6b38c874f2f312b64bcd
-  data.tar.gz: e1042a102d08ca8591bfd7ea152d1ff5b3603257372c301bd94d9d224e834417
+  metadata.gz: 5d49c6c3dffd7091a3d90afa44de41199e91f21f2d31fac0c6597b671e11bb56
+  data.tar.gz: a4d165bb7ba68d396b591ae8cb1e56720bd14530030daa74bfc53e34494cb750
 SHA512:
-  metadata.gz: c93c3636b08e11618087f9927dee95e724721b7ff2675e7868c6da030a863a0e8bff1c9803d1cc8ac0d16bb93c85228c80bf30ea3ac41f74ccf3c0cbdd6ac2c0
-  data.tar.gz: d44840b14ac1712cb1d1469287d3e6b9a64984c4ef22731654dfae51ea806330c7ef0fa535b5559af236cba1c6e8f162a5dfdeccc8e2da925037129074189171
+  metadata.gz: 77ce124b786ace36b4e62ae916d53ba318c6c1511f9516a3774e26f9e914e47696d8cb0096eb3f0cd90740223b91303c974f16b9e992ad2f854653501471b588
+  data.tar.gz: 71a709072086f7c47fd02d4f3f83085ac64ac4de354a1964f771680a898b51dc38c0a35d046f23ba17ad3a38fc7565651a75e9caff34183441536d59c547df6e

data/lib/server-bridge.rb

@@ -3,27 +3,49 @@ require "json"
 require "uri"
 
 module HackclubRequest
-    DEFAULT_EMOJI = "https://emoji.slack-edge.com/T0266FRGM/alibaba-question/c5ba32ce553206b8.png" # :alibaba-question:
+    DEFAULT_EMOJI = "https://cdn.hackclub.com/019ce841-fe66-72e6-bb16-d57a93ac574f/alibaba-question.png" # :alibaba-question:
     @host = Jekyll.configuration({})['HACKCLUB_API'] || "https://hackclub.mathiasd.fr"
+    DEFAULT_RETRIES = 3
+    RETRYABLE_STATUS_CODES = [408, 425, 429, 500, 502, 503, 504].freeze
 
     class << self
         attr_accessor :host
     end
 
-    def self.make_request(path)
+    def self.make_request(path, retries: DEFAULT_RETRIES, base_delay: 0.25)
         uri = URI("#{host}#{path}")
-        req = Net::HTTP::Get.new(uri)
-        req['Referer'] = "jekyll-hackclub"
+        attempts = 0
 
-        res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https") do |http|
-            http.request(req)
+        while attempts < retries
+            attempts += 1
+
+            begin
+                req = Net::HTTP::Get.new(uri)
+                req['Referer'] = "jekyll-hackclub"
+
+                res = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == "https", open_timeout: 3, read_timeout: 6) do |http|
+                    http.request(req)
+                end
+
+                if RETRYABLE_STATUS_CODES.include?(res.code.to_i)
+                    sleep(base_delay * attempts) if attempts < retries
+                    next
+                end
+
+                return JSON.parse(res.body), res
+            rescue JSON::ParserError
+                return {}, res
+            rescue => e
+                if attempts < retries
+                    sleep(base_delay * attempts)
+                    next
+                end
+
+                warn "Request to #{uri} failed after #{attempts} attempts: #{e}"
+                return {}, nil
+            end
         end
 
-        return JSON.parse(res.body), res
-    rescue JSON::ParserError
-        return {}, res
-    rescue => e
-        warn "Request to #{uri} failed: #{e}"
         return {}, nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-hackclub
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - MathiasDPX