baza.rb 0.9.11 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f94511fc54301a20314e8d456a708e37a1cea845db41e9e2f88389f574f76e8f
-  data.tar.gz: 97d8b8027bca5379934eec24aacd006209b3fc0e316f94f90c4ad33c1d64aa05
+  metadata.gz: 3925181637ee67621a9013cda972f3de775c644d67b530573814d40ff064f6f1
+  data.tar.gz: 0d883da9c8f1cc1c4538d303fc3e864e81f4145e443011c7277dc06673bb448d
 SHA512:
-  metadata.gz: 4217832c03755e02d6b2c619282105069f1c9131d690704e2918d2dfeee8343f6511095e27e94a46fb9336063f6470057289befb89714eccc5437a8fd05ff2cb
-  data.tar.gz: 72fd3aabcf03aef3010bafe9659dd5d54e882dffcad12bf8ab0e79e6dad0f34acd5dcf77db7dfe053c740681359d32141863c72676bad489502c29cafe17b63e
+  metadata.gz: 3b21df150b5c2c58efce934266400d589adec2d8fb594a43202801f4ae8050b182feda6b72c5b85a1490a6242483f093fc448323a285c51a0db383b166f4c198
+  data.tar.gz: fdf81673a2ac0a524ab0abd614fba9dae23a791dbff7311aed8d77afa001269b9cd571d84f57fde3f5f6cd7b4f018c6a8b8c79ff1eb78c326825aa3941ac3f39

data/.github/workflows/typos.yml

@@ -16,4 +16,4 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - uses: crate-ci/typos@v1.34.0
+      - uses: crate-ci/typos@v1.35.2

data/Gemfile

@@ -23,7 +23,7 @@ gem 'rubocop-minitest', '~>0.38', require: false
 gem 'rubocop-performance', '~>1.23', require: false
 gem 'rubocop-rake', '~>0.7', require: false
 gem 'simplecov', '~>0.22', require: false
-gem 'simplecov-cobertura', '~>2.1', require: false
+gem 'simplecov-cobertura', '~>3.0', require: false
 gem 'sinatra', '~>4.1', require: false
 gem 'wait_for', '~>0.1', require: false
 gem 'webmock', '~>3.24', require: false

data/Gemfile.lock

@@ -30,13 +30,13 @@ GEM
       rexml
     decoor (0.1.0)
     docile (1.4.1)
-    elapsed (0.1.0)
-      loog (> 0)
-      tago (> 0)
+    elapsed (0.2.0)
+      loog (~> 0.6)
+      tago (~> 0.1)
     ellipsized (0.3.0)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    factbase (0.13.0)
+    factbase (0.14.3)
       backtrace (~> 0.4)
       decoor (~> 0.0)
       ellipsized (~> 0.3)
@@ -47,7 +47,7 @@ GEM
       others (~> 0.0)
       tago (~> 0.0)
       yaml (~> 0.3)
-    faraday (2.13.2)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -65,7 +65,7 @@ GEM
     ffi (1.17.2-x86_64-linux-gnu)
     hashdiff (1.2.0)
     iri (0.11.2)
-    json (2.12.2)
+    json (2.13.2)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
@@ -78,30 +78,30 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multipart-post (2.4.1)
-    mustermann (3.0.3)
+    mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
     net-http (0.6.0)
       uri
     nio4r (2.7.4)
-    nokogiri (1.18.8-arm64-darwin)
+    nokogiri (1.18.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x64-mingw-ucrt)
+    nokogiri (1.18.9-x64-mingw-ucrt)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-darwin)
+    nokogiri (1.18.9-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.18.8-x86_64-linux-gnu)
+    nokogiri (1.18.9-x86_64-linux-gnu)
       racc (~> 1.4)
     online (0.0.1)
       timeout (~> 0.4)
     os (1.1.4)
     others (0.1.1)
     parallel (1.27.0)
-    parser (3.3.8.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     prism (1.4.0)
     public_suffix (6.0.2)
-    puma (6.6.0)
+    puma (6.6.1)
       nio4r (~> 2.0)
     qbash (0.4.5)
       backtrace (> 0)
@@ -109,7 +109,7 @@ GEM
       loog (> 0)
       tago (> 0)
     racc (1.8.1)
-    rack (3.1.16)
+    rack (3.2.0)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
@@ -123,10 +123,10 @@ GEM
     rake (13.3.0)
     random-port (0.7.5)
       tago (> 0)
-    regexp_parser (2.10.0)
+    regexp_parser (2.11.0)
     retries (0.0.5)
     rexml (3.4.1)
-    rubocop (1.78.0)
+    rubocop (1.79.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -134,10 +134,10 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.45.1, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.1)
+    rubocop-ast (1.46.0)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-minitest (0.38.1)
@@ -157,10 +157,10 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-cobertura (2.1.0)
+    simplecov-cobertura (3.0.0)
       rexml
       simplecov (~> 0.19)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     sinatra (4.1.1)
       logger (>= 1.6.0)
@@ -215,7 +215,7 @@ DEPENDENCIES
   rubocop-performance (~> 1.23)
   rubocop-rake (~> 0.7)
   simplecov (~> 0.22)
-  simplecov-cobertura (~> 2.1)
+  simplecov-cobertura (~> 3.0)
   sinatra (~> 4.1)
   wait_for (~> 0.1)
   webmock (~> 3.24)

data/lib/baza-rb/version.rb

@@ -13,5 +13,5 @@
 # Copyright:: Copyright (c) 2024-2025 Yegor Bugayenko
 # License:: MIT
 class BazaRb
-  VERSION = '0.9.11'
+  VERSION = '0.10.0'
 end

data/lib/baza-rb.rb

@@ -57,9 +57,10 @@ class BazaRb
   # @param [Boolean] ssl Whether to use SSL/HTTPS (default: true)
   # @param [Float] timeout Connection and request timeout in seconds (default: 30)
   # @param [Integer] retries Number of retries on connection failure (default: 3)
+  # @param [Integer] pause The factor on pause (<1 means faster, >1 means slower)
   # @param [Loog] loog The logging facility (default: Loog::NULL)
   # @param [Boolean] compress Whether to use GZIP compression for requests/responses (default: true)
-  def initialize(host, port, token, ssl: true, timeout: 30, retries: 3, loog: Loog::NULL, compress: true)
+  def initialize(host, port, token, ssl: true, timeout: 30, retries: 5, pause: 1, loog: Loog::NULL, compress: true)
     @host = host
     @port = port
     @ssl = ssl
@@ -67,6 +68,7 @@ class BazaRb
     @timeout = timeout
     @loog = loog
     @retries = retries
+    @pause = pause
     @compress = compress
   end
 
@@ -652,10 +654,10 @@ class BazaRb
     attempt = 0
     loop do
       ret = yield
-      if ret.code == 429 && attempt < 5
+      if ret.code == 429 && attempt < @retries
         attempt += 1
-        seconds = 2**attempt
-        @loog.info("Server seems to be busy, will sleep for #{seconds} and try again...")
+        seconds = @pause * (2**attempt)
+        @loog.info("Server seems to be busy, will sleep for #{seconds} (attempt no.#{attempt})...")
         sleep(seconds)
         next
       end
@@ -671,10 +673,10 @@ class BazaRb
     attempt = 0
     loop do
       ret = yield
-      if ret.code >= 500 && attempt < 5
+      if ret.code >= 500 && attempt < @retries
         attempt += 1
-        seconds = 2**attempt
-        @loog.info("Server seems to be in trouble, will sleep for #{seconds} and try again...")
+        seconds = @pause * (2**attempt)
+        @loog.info("Server seems to be in trouble, will sleep for #{seconds} (attempt no.#{attempt})...")
         sleep(seconds)
         next
       end
@@ -788,35 +790,42 @@ class BazaRb
     FileUtils.rm_f(file)
     FileUtils.touch(file)
     chunk = 0
+    blanks = [204, 302]
     elapsed(@loog) do
       loop do
-        request = Typhoeus::Request.new(
-          uri.to_s,
-          method: :get,
-          headers: headers.merge(
-            'Accept' => '*',
-            'Accept-Encoding' => 'gzip',
-            'Range' => "bytes=#{File.size(file)}-"
-          ),
-          connecttimeout: @timeout,
-          timeout: @timeout
-        )
         slice = ''
-        request.on_body do |data|
-          slice += data
-        end
-        retry_it do
-          request.run
+        ret = nil
+        retry_if_server_busy do
+          retry_if_server_failed do
+            slice = ''
+            request = Typhoeus::Request.new(
+              uri.to_s,
+              method: :get,
+              headers: headers.merge(
+                'Accept' => '*',
+                'Accept-Encoding' => 'gzip',
+                'Range' => "bytes=#{File.size(file)}-"
+              ),
+              connecttimeout: @timeout,
+              timeout: @timeout
+            )
+            request.on_body do |data|
+              slice += data
+            end
+            retry_it do
+              request.run
+            end
+            ret = request.response
+          end
         end
-        ret = request.response
         msg = [
           "GET #{uri.to_uri.path} #{ret.code}",
           "#{slice.bytesize} bytes",
           ('in gzip' if ret.headers['Content-Encoding'] == 'gzip'),
           ("ranged as #{ret.headers['Content-Range'].inspect}" if ret.headers['Content-Range'])
         ]
-        ret = checked(ret, [200, 206, 302])
-        next if ret.code == 302
+        ret = checked(ret, [200, 206, 204, 302])
+        next if blanks.include?(ret.code)
         if ret.headers['Content-Encoding'] == 'gzip'
           begin
             slice = unzip(slice)
@@ -882,10 +891,14 @@ class BazaRb
         ret =
           retry_it do
             checked(
-              Typhoeus::Request.put(
-                uri.to_s,
-                params
-              )
+              retry_if_server_failed do
+                retry_if_server_busy do
+                  Typhoeus::Request.put(
+                    uri.to_s,
+                    params
+                  )
+                end
+              end
             )
           end
         sent += params[:body].bytesize

data/test/test_baza-rb.rb

@@ -354,18 +354,6 @@ class TestBazaRb < Minitest::Test
     end
   end
 
-  def test_push_with_server_failure
-    WebMock.disable_net_connect!
-    stub_request(:put, 'https://example.org/push/foo')
-      .to_return(status: 503, body: 'oops', headers: { 'X-Zerocracy-Failure': 'the failure' })
-      .to_raise('why second time?')
-    e = assert_raises(StandardError) { fake_baza.push('foo', 'data', []) }
-    [
-      'Invalid response code #503',
-      '"the failure"'
-    ].each { |t| assert_includes(e.message, t, "Can't find '#{t}' in #{e.message.inspect}") }
-  end
-
   def test_real_http
     WebMock.enable_net_connect!
     skip('We are offline') unless we_are_online?
@@ -705,6 +693,49 @@ class TestBazaRb < Minitest::Test
     assert_equal('testuser', fake_baza.whoami)
   end
 
+  def test_download_retries_on_busy_server
+    WebMock.disable_net_connect!
+    Dir.mktmpdir do |dir|
+      file = File.join(dir, 'download.txt')
+      attempts = 0
+      stub_request(:get, 'https://example.org:443/file')
+        .with(headers: { 'Range' => 'bytes=0-' })
+        .to_return do |_request|
+          attempts += 1
+          if attempts < 2
+            { status: 429, body: 'Too Many Requests', headers: {} }
+          else
+            { status: 200, body: 'success content', headers: {} }
+          end
+        end
+      baza = BazaRb.new('example.org', 443, '000', loog: Loog::NULL, compress: false, timeout: 0.1, pause: 0)
+      baza.send(:download, baza.send(:home).append('file'), file)
+      assert_equal(2, attempts, 'Expected two HTTP calls due to 429 retries')
+      assert_equal('success content', File.read(file))
+    end
+  end
+
+  def test_upload_retries_on_busy_server
+    WebMock.disable_net_connect!
+    Dir.mktmpdir do |dir|
+      file = File.join(dir, 'upload.txt')
+      File.write(file, 'test content')
+      attempts = 0
+      stub_request(:put, 'https://example.org:443/file')
+        .to_return do |_request|
+          attempts += 1
+          if attempts < 2
+            { status: 429, body: 'Too Many Requests' }
+          else
+            { status: 200, body: 'OK' }
+          end
+        end
+      baza = BazaRb.new('example.org', 443, '000', loog: Loog::NULL, compress: false, timeout: 0.1, pause: 0)
+      baza.send(:upload, baza.send(:home).append('file'), file)
+      assert_equal(2, attempts, 'Expected 2 HTTP calls due to 429 retries')
+    end
+  end
+
   def test_durable_load_from_sinatra
     WebMock.enable_net_connect!
     Dir.mktmpdir do |dir|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baza.rb
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors:
 - Yegor Bugayenko