baza.rb 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 055d08eba666af0bcadcea162c8b47ccbdd7b9ffc1647830999112a503ad8907
-  data.tar.gz: 966991989ab8c9fc2dba9f2c2498a38278a8d70195742266d452c34af33328fb
+  metadata.gz: ebcb57db3953278c8d402cc38ae954e982062cfc4498e301bc0495a7b3cba95a
+  data.tar.gz: 0a6acf7107e149f8515911542460266b95b825df586576713734648751f2de56
 SHA512:
-  metadata.gz: e699824b88910aa69f738e3329b62b9aece6b296f1e7aec9917b44044b32e14845f1700d774fb4386977fe64a03fcb5bd5e39c15ea4c40053d814a632b95d1ea
-  data.tar.gz: f462b2fcada287d6f6af5f6d11bad0651cfbad83b079957a43fcac92cf8947c479be776c73c8346281e82c78803782c44919d8c19ef38670db344435365b15b8
+  metadata.gz: a40b4c3655a48f0449cb0247f1dd1045344b95868330121b6ce462d874aec6117b1490d12819ceac9afc29217e0352d4d30d2c6ff78c1031761946bb3cf89654
+  data.tar.gz: 7a479de17acf3e82f60327fa7c131605bebf2a0ae2dbfd1fde80ac08a3bcfafd2d40b252ef4d23845de083867a5955244d7079ce5526574d94c1fb9814e62cf8

data/Gemfile.lock

@@ -107,7 +107,7 @@ GEM
     regexp_parser (2.10.0)
     retries (0.0.5)
     rexml (3.4.1)
-    rubocop (1.76.0)
+    rubocop (1.76.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -118,7 +118,7 @@ GEM
       rubocop-ast (>= 1.45.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.45.0)
+    rubocop-ast (1.45.1)
       parser (>= 3.3.7.2)
       prism (~> 1.4)
     rubocop-minitest (0.38.1)

data/lib/baza-rb/fake.rb

@@ -123,6 +123,17 @@ class BazaRb::Fake
     true
   end
 
+  # Find a single durable.
+  #
+  # @param [String] jname The name of the job on the server
+  # @param [String] file The path to the file to upload
+  # @return [Integer] Always returns 42 as the fake durable ID
+  def durable_find(jname, file)
+    assert_name(jname)
+    assert_file(file)
+    42
+  end
+
   # Place a single durable file on the server.
   #
   # @param [String] jname The name of the job on the server

data/lib/baza-rb/version.rb

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

data/lib/baza-rb.rb

@@ -158,25 +158,7 @@ class BazaRb
     data = ''
     elapsed(@loog) do
       Tempfile.open do |file|
-        File.open(file, 'wb') do |f|
-          request = Typhoeus::Request.new(
-            home.append('pull').append("#{id}.fb").to_s,
-            method: :get,
-            headers: headers.merge(
-              'Accept' => 'application/zip, application/factbase'
-            ),
-            accept_encoding: 'gzip',
-            connecttimeout: @timeout,
-            timeout: @timeout
-          )
-          request.on_body do |chunk|
-            f.write(chunk)
-          end
-          retry_it do
-            request.run
-          end
-          checked(request.response)
-        end
+        download(home.append('pull').append("#{id}.fb").to_s, file.path)
         data = File.binread(file)
         throw :"Pulled #{data.bytesize} bytes of job ##{id} factbase at #{@host}"
       end
@@ -388,28 +370,34 @@ class BazaRb
     raise 'The "file" of the durable is nil' if file.nil?
     raise "The file '#{file}' is absent" unless File.exist?(file)
     id = nil
-    elapsed(@loog) do
-      ret =
-        retry_it do
-          checked(
-            Typhoeus::Request.post(
-              home.append('durables').append('place').to_s,
-              body: {
-                '_csrf' => csrf,
-                'jname' => jname,
-                'file' => File.basename(file),
-                'zip' => File.open(file, 'rb')
-              },
-              headers:,
-              connecttimeout: @timeout,
-              timeout: @timeout
-            ),
-            302
-          )
-        end
-      id = ret.headers['X-Zerocracy-DurableId'].to_i
-      throw :"Durable ##{id} (#{file}) placed for job \"#{jname}\" at #{@host}"
+    Tempfile.open do |f|
+      File.write(f.path, 'placeholder')
+      elapsed(@loog) do
+        ret =
+          retry_it do
+            checked(
+              Typhoeus::Request.post(
+                home.append('durables').append('place').to_s,
+                body: {
+                  '_csrf' => csrf,
+                  'jname' => jname,
+                  'file' => File.basename(file),
+                  'zip' => File.open(f, 'rb')
+                },
+                headers:,
+                connecttimeout: @timeout,
+                timeout: @timeout
+              ),
+              302
+            )
+          end
+        id = ret.headers['X-Zerocracy-DurableId'].to_i
+        throw :"Durable ##{id} (#{file}) placed for job \"#{jname}\" at #{@host}"
+      end
     end
+    durable_lock(id, user_agent)
+    durable_save(id, file)
+    durable_unlock(id, user_agent)
     id
   end
 
@@ -446,26 +434,8 @@ class BazaRb
     raise 'The ID of the durable is nil' if id.nil?
     raise 'The ID of the durable must be a positive integer' unless id.positive?
     raise 'The "file" of the durable is nil' if file.nil?
-    FileUtils.mkdir_p(File.dirname(file))
     elapsed(@loog) do
-      File.open(file, 'wb') do |f|
-        request = Typhoeus::Request.new(
-          home.append('durables').append(id).to_s,
-          method: :get,
-          headers: headers.merge(
-            'Accept' => 'application/octet-stream'
-          ),
-          connecttimeout: @timeout,
-          timeout: @timeout
-        )
-        request.on_body do |chunk|
-          f.write(chunk)
-        end
-        retry_it do
-          request.run
-        end
-        checked(request.response)
-      end
+      download(home.append('durables').append(id).to_s, file)
       throw :"Durable ##{id} loaded #{File.size(file)} bytes from #{@host}"
     end
   end
@@ -639,55 +609,28 @@ class BazaRb
   # @return [Boolean] TRUE if a job was successfully popped, FALSE if queue is empty
   # @raise [ServerFailure] If the pop operation fails
   def pop(owner, zip)
-    raise 'The "zip" of the job is nil' if zip.nil?
     success = false
-    FileUtils.rm_f(zip)
-    job = nil
     elapsed(@loog) do
-      File.open(zip, 'wb+') do |f|
-        loop do
-          uri = home.append('pop').add(owner:)
-          uri = uri.add(job:) if job
-          request = Typhoeus::Request.new(
-            uri.to_s,
-            method: :get,
-            headers: headers.merge(
-              'Accept' => 'application/octet-stream',
-              'Range' => "bytes=#{f.size}-"
+      uri = home.append('pop').add(owner:)
+      ret =
+        retry_it do
+          checked(
+            Typhoeus::Request.get(
+              uri.to_s,
+              headers:
             ),
-            connecttimeout: @timeout,
-            timeout: @timeout
+            [204, 302]
           )
-          request.on_body do |chunk|
-            f.write(chunk)
-          end
-          retry_it do
-            request.run
-          end
-          ret = request.response
-          checked(ret, [200, 204, 206])
-          success = ret.code != 204
-          break unless ret.code == 206
-          job = ret.headers['X-Zerocracy-JobId']
-          raise 'Job ID is not returned in X-Zerocracy-JobId' if job.nil?
-          raise "Job ID returned in X-Zerocracy-JobId is not valid (#{job.inspect})" unless job.match?(/^[0-9]+$/)
-          _, v = ret.headers['Content-Range'].split
-          range, total = v.split('/')
-          raise "Total size is not valid (#{total.inspect})" unless total.match?(/^\*|[0-9]+$/)
-          b, e = range.split('-')
-          raise "Range is not valid (#{range.inspect})" unless e.match?(/^[0-9]+$/)
-          len = ret.headers['Content-Length'].to_i
-          unless len.zero?
-            raise "Range size (#{range.inspect}) is not equal to Content-Length" unless len - 1 == e.to_i - b.to_i
-            raise "Range end (#{range.inspect}) is not equal to #{f.size}" if e.to_i != f.size - 1
-          end
-          break if e.to_i == total.to_i - 1
         end
-      end
-      unless success
+      if ret.code == 204
         FileUtils.rm_f(zip)
-        throw :"Nothing to pop at #{@host}"
+        throw :"Nothing to pop at #{uri}"
       end
+      job = ret.headers['X-Zerocracy-JobId']
+      raise 'Job ID is not returned in X-Zerocracy-JobId' if job.nil?
+      raise "Job ID returned in X-Zerocracy-JobId is not valid (#{job.inspect})" unless job.match?(/^[0-9]+$/)
+      download(uri.add(job:), zip)
+      success = true
       throw :"Popped #{File.size(zip)} bytes in ZIP archive at #{@host}"
     end
     success
@@ -794,9 +737,13 @@ class BazaRb
 
   private
 
+  def user_agent
+    "baza.rb #{BazaRb::VERSION}"
+  end
+
   def headers
     {
-      'User-Agent' => "baza.rb #{BazaRb::VERSION}",
+      'User-Agent' => user_agent,
       'Connection' => 'close',
       'X-Zerocracy-Token' => @token
     }
@@ -883,4 +830,90 @@ class BazaRb
     @loog.error(msg)
     raise ServerFailure, msg
   end
+
+  # Download file via GET, in ranges.
+  # @param [String] uri The URI
+  # @param [String] file The path to save to
+  def download(uri, file)
+    raise 'The "file" is nil' if file.nil?
+    FileUtils.mkdir_p(File.dirname(file))
+    elapsed(@loog) do
+      File.open(file, 'wb+') do |f|
+        loop do
+          request = Typhoeus::Request.new(
+            uri.to_s,
+            method: :get,
+            headers: headers.merge(
+              'Accept' => 'application/octet-stream',
+              'Range' => "bytes=#{f.size}-"
+            ),
+            connecttimeout: @timeout,
+            timeout: @timeout
+          )
+          request.on_body do |chunk|
+            f.write(chunk)
+          end
+          retry_it do
+            request.run
+          end
+          ret = request.response
+          checked(ret, [200, 206])
+          break if ret.code == 200
+          _, v = ret.headers['Content-Range'].split
+          range, total = v.split('/')
+          raise "Total size is not valid (#{total.inspect})" unless total.match?(/^\*|[0-9]+$/)
+          b, e = range.split('-')
+          raise "Range is not valid (#{range.inspect})" unless e.match?(/^[0-9]+$/)
+          len = ret.headers['Content-Length'].to_i
+          unless len.zero?
+            raise "Range size (#{range.inspect}) is not equal to Content-Length" unless len - 1 == e.to_i - b.to_i
+            raise "Range end (#{range.inspect}) is not equal to #{f.size}" if e.to_i != f.size - 1
+          end
+          break if e.to_i == total.to_i - 1
+        end
+      end
+      throw :"Downloaded #{File.size(file)} bytes from #{uri}"
+    end
+  end
+
+  # Upload file via PUT, in ranges.
+  # @param [String] uri The URI
+  # @param [String] file The path to save to
+  # @param [Hash] headers Hash of HTTP headers
+  def upload(uri, file, headers = {})
+    raise 'The "file" is nil' if file.nil?
+    raise 'The "file" does not exist' unless File.exist?(file)
+    params = {
+      connecttimeout: @timeout,
+      timeout: @timeout,
+      body: data,
+      headers: headers.merge(
+        'Content-Type' => 'application/octet-stream'
+      )
+    }
+    max = 1_000_000
+    chunk = 0
+    elapsed(@loog) do
+      params[:headers]['X-Zerocracy-Chunk'] = chunk.to_s
+      loop do
+        File.open(file, 'rb') do |f|
+          f.seek(max * chunk)
+          data = f.read(max)
+          data = '' if data.nil?
+          params[:headers]['Content-Length'] = data.bytesize
+          retry_it do
+            checked(
+              Typhoeus::Request.put(
+                uri.to_s,
+                @compress ? zipped(params) : params
+              )
+            )
+          end
+          break if data.empty?
+        end
+        chunk += 1
+      end
+      throw :"Uploaded #{File.size(file)} bytes to #{uri} in #{chunk + 1} chunk(s)"
+    end
+  end
 end

data/test/test_baza-rb.rb

@@ -94,7 +94,7 @@ class TestBazaRb < Minitest::Test
     skip('We are offline') unless we_are_online
     Dir.mktmpdir do |dir|
       file = File.join(dir, "#{fake_name}.bin")
-      File.binwrite(file, 'hello')
+      File.binwrite(file, 'hello, world!' * 100_000)
       jname = fake_name
       refute(LIVE.durable_find(jname, File.basename(file)))
       id = LIVE.durable_place(jname, file)
@@ -179,6 +179,11 @@ class TestBazaRb < Minitest::Test
     stub_request(:post, 'https://example.org/durables/place').to_return(
       status: 302, headers: { 'X-Zerocracy-DurableId' => '42' }
     )
+    stub_request(:get, %r{https://example\.org/durables/42/lock})
+      .to_return(status: 302)
+    stub_request(:get, %r{https://example\.org/durables/42/unlock})
+      .to_return(status: 302)
+    stub_request(:put, 'https://example.org/durables/42').to_return(status: 200)
     Dir.mktmpdir do |dir|
       file = File.join(dir, 'test.bin')
       File.binwrite(file, 'hello')
@@ -212,6 +217,13 @@ class TestBazaRb < Minitest::Test
     job = 4242
     stub_request(:get, 'https://example.org/pop')
       .with(query: { owner: })
+      .to_return(
+        status: 302,
+        headers: { 'X-Zerocracy-JobId' => job },
+        body: ''
+      )
+    stub_request(:get, 'https://example.org/pop')
+      .with(query: { job: })
       .to_return(
         status: 206,
         headers: { 'Content-Range' => 'bytes 0-0/*', 'X-Zerocracy-JobId' => job, 'Content-Length' => 0 },

metadata

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