b2-client 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405cc51a4b94788687e8ccfa7aa774df40c29135b9ac89251405f56c32d73835
-  data.tar.gz: 820653192390b83efbb713f4104d739b496e75d3ae9c39dec6b99b3ac2e1af77
+  metadata.gz: 70e5dc6cc5de5772f02f575cceefa1137ce7750cf2042067c6e06d1809e0758f
+  data.tar.gz: 96e70fb4bbd010ff178a3ac506a62cf5dd85c65d9c6477c78c89687aeda21b5c
 SHA512:
-  metadata.gz: 73a212dbb80684eca0097f9e784ab8815a559e3a810cdb448eaf74fb9ec49a594c5f3f78790870fc05ce3fe47dc0accfb62f931dce6811178b771f63884fcdd1
-  data.tar.gz: 7f6a23851372cd9fa317faab23fa09fcca35344e024fe8c1496c3204bffdb258e75197f1e115b45c5b5f400b0f872b738827973bb5469b2d2b11d7a1bc9c6892
+  metadata.gz: 7908671a61289946d1330ffa0668d38c0952607ab07932520abb3791ff6a217c8ded4b97e66f2b98784368dac62a55aa412ed636ee386bade7d37c80b013c729
+  data.tar.gz: 5e38e319103709afaca046533501b82f30050b48db439ac927bfc67b0fd0ce7f222327c439092236658f821aa3e025d457280acbaf7b1f1faa57cffeb12f0e95

data/lib/b2.rb

@@ -11,6 +11,14 @@ require File.expand_path('../b2/upload_chunker', __FILE__)
 
 class B2
   
+  def self.encode(value)
+    URI.encode_www_form_component(value.force_encoding(Encoding::UTF_8)).gsub("%2F", "/")
+  end
+  
+  def self.decode(value)
+    URI.decode_www_form_component(value, Encoding::UTF_8)
+  end
+  
   def initialize(key_id: , secret: )
     @connection = B2::Connection.new(key_id, secret)
   end
@@ -67,7 +75,7 @@ class B2
     chunker = B2::UploadChunker.new(io_or_string)
     req = Net::HTTP::Post.new(uri.path)
     req['Authorization']      = upload['authorizationToken']
-    req['X-Bz-File-Name']     = B2::File.encode_filename(key)
+    req['X-Bz-File-Name']     = B2.encode(key)
     req['Content-Type']       = mime_type || 'b2/x-auto'
     req['X-Bz-Content-Sha1']  = 'hex_digits_at_end'
     info.each do |key, value|

data/lib/b2/api_connection.rb

@@ -34,7 +34,6 @@ class B2
       @recommended_part_size = resp['recommendedPartSize']
       @auth_token = resp['authorizationToken']
       @download_url = resp['downloadUrl']
-      @buckets_cache = []
     end
 
     def account_id
@@ -73,24 +72,42 @@ class B2
     end
 
     def send_request(request, body=nil, &block)
+      retries = 0
       request['Authorization'] = authorization_token
       request.body = (body.is_a?(String) ? body : JSON.generate(body)) if body
       
       return_value = nil
       close_connection = false
-      connection.request(request) do |response|
-        close_connection = response['Connection'] == 'close'
-        
-        case response
-        when Net::HTTPSuccess
-          if block_given?
-            return_value = yield(response)
+      begin
+        connection.request(request) do |response|
+          close_connection = response['Connection'] == 'close'
+          
+          case response
+          when Net::HTTPSuccess
+            if block_given?
+              return_value = yield(response)
+            else
+              return_value = JSON.parse(response.body)
+            end
           else
-            return_value = JSON.parse(response.body)
+            body = JSON.parse(response.body)
+            case body['code']
+            when 'not_found'
+              raise B2::NotFound(body['message'])
+            when 'expired_auth_token'
+              raise B2::ExpiredAuthToken(body['message'])
+            else
+              raise "Error connecting to B2 API #{response.body}"
+            end
           end
-        else
-          raise "Error connecting to B2 API #{response.body}"
         end
+        
+      # Unexpected EOF (end of file) errors can occur when streaming from a
+      # remote because of Backblaze quota restrictions.
+      rescue B2::ExpiredAuthToken, EOFError
+        reconnect!
+        retries =+ 1
+        retry if retries < 2
       end
       disconnect! if close_connection
 

data/lib/b2/bucket.rb

@@ -27,12 +27,12 @@ class B2
       chunker = sha1 ? io_or_string : B2::UploadChunker.new(io_or_string)
       req = Net::HTTP::Post.new(uri.path)
       req['Authorization']      = upload['authorizationToken']
-      req['X-Bz-File-Name']     = B2::File.encode_filename(key)
+      req['X-Bz-File-Name']     = B2.encode(key)
       req['Content-Type']       = mime_type || 'b2/x-auto'
       req['X-Bz-Content-Sha1']  = sha1 ? sha1 : 'hex_digits_at_end'
-      req['X-Bz-Info-b2-content-disposition'] = content_disposition if content_disposition
+      req['X-Bz-Info-b2-content-disposition'] = B2.encode(content_disposition) if content_disposition
       info.each do |key, value|
-        req["X-Bz-Info-#{key}"] = value
+        req["X-Bz-Info-#{key}"] = B2.encode(value)
       end
       req['Content-Length']     = chunker.size
       req.body_stream           = chunker
@@ -41,7 +41,7 @@ class B2
       result = if resp.is_a?(Net::HTTPSuccess)
         JSON.parse(resp.body)
       else
-        raise "Error connecting to B2 API"
+        raise "Error connecting to B2 API #{resp.body}"
       end
       
       B2::File.new(result, @connection)

data/lib/b2/connection.rb

@@ -15,7 +15,7 @@ class B2
       @key_id = key_id
       @key_secret = secret
 
-      @buckets_cache = []
+      @buckets_cache = Hash.new { |hash, name| hash[name] = bucket(name) }
     end
     
     def account_id
@@ -65,13 +65,17 @@ class B2
         B2::Bucket.new(b, self)
       end
     end
+    
+    def bucket(name)
+      response = post('/b2api/v2/b2_list_buckets', {
+        accountId: account_id,
+        bucketName: name
+      })['buckets']
+      response.map { |b| B2::Bucket.new(b, self) }.first
+    end
 
     def lookup_bucket_id(name)
-      bucket = @buckets_cache.find{ |b| b.name == name }
-      return bucket.id if bucket
-      
-      @buckets_cache = buckets
-      @buckets_cache.find{ |b| b.name == name }&.id
+      @buckets_cache[name].id
     end
 
     def get_download_url(bucket, filename, expires_in: 3_600, disposition: nil)
@@ -99,38 +103,38 @@ class B2
       req = Net::HTTP::Get.new("/file/#{bucket}/#{key}")
       req['Authorization'] = authorization_token
       conn.start do |http|
-        http.request(req) do |response|
-          case response
-          when Net::HTTPSuccess
-            response.read_body do |chunk|
-              digestor << chunk
-              if to
-                to << chunk
-              elsif block_given?
-                yield(chunk)
-              else
-                data << chunk
+          http.request(req) do |response|
+            case response
+            when Net::HTTPSuccess
+              response.read_body do |chunk|
+                digestor << chunk
+                if to
+                  to << chunk
+                elsif block_given?
+                  yield(chunk)
+                else
+                  data << chunk
+                end
               end
-            end
       
-            if response['X-Bz-Content-Sha1'] != 'none' && digestor.hexdigest != response['X-Bz-Content-Sha1']
-              rase B2::FileIntegrityError.new("SHA1 Mismatch, expected: \"#{response['X-Bz-Content-Sha1']}\", actual: \"#{digestor.hexdigest}\"")
-            end
-          when Net::HTTPNotFound
-            raise B2::NotFound.new(JSON.parse(response.body)['message'])
-          else
-            begin
-              body = JSON.parse(response.body)
+              if response['X-Bz-Content-Sha1'] != 'none' && digestor.hexdigest != response['X-Bz-Content-Sha1']
+                rase B2::FileIntegrityError.new("SHA1 Mismatch, expected: \"#{response['X-Bz-Content-Sha1']}\", actual: \"#{digestor.hexdigest}\"")
+              end
+            when Net::HTTPNotFound
+              raise B2::NotFound.new(JSON.parse(response.body)['message'])
+            else
+              begin
+                body = JSON.parse(response.body)
               if body['code'] == 'not_found'
-                raise B2::NotFound(body['message'])
-              else
-                raise "#{body['code']} (#{body['message']})"
+                  raise B2::NotFound(body['message'])
+                else
+                  raise "#{body['code']} (#{body['message']})"
+                end
+              rescue
+                raise response.body
               end
-            rescue
-              raise response.body
             end
           end
-        end
       end
       
       if opened_file

data/lib/b2/errors.rb

@@ -8,5 +8,8 @@ class B2
 
   class FileIntegrityError < Error
   end
+  
+  class ExpiredAuthToken < Error
+  end
 
 end

data/lib/b2/file.rb

@@ -5,7 +5,7 @@ class B2
     
     def initialize(attrs, connection)
       @id = attrs['fileId']
-      @name = B2::File.decode_filename(attrs['fileName'])
+      @name = B2.decode(attrs['fileName'])
       @account_id = attrs['accountId']
       @bucket_id = attrs['bucketId']
       @size = attrs['contentLength']
@@ -17,14 +17,6 @@ class B2
       @connection = connection
     end
     
-    def self.encode_filename(str)
-      URI.encode_www_form_component(str.force_encoding(Encoding::UTF_8)).gsub("%2F", "/")
-    end
-    
-    def self.decode_filename(str)
-      URI.decode_www_form_component(str, Encoding::UTF_8)
-    end
-    
     def delete!
       @connection.post('/b2api/v2/b2_delete_file_version', {
         fileId: @id,

data/lib/b2/version.rb

@@ -1,3 +1,3 @@
 class B2
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: b2-client
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -48,7 +48,7 @@ homepage: https://github.com/malomalo/b2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -63,8 +63,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Backblaze B2 Client
 test_files: []