b2-client 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 363125274c03af55134baf86b01809e5a734e95ee66387d99d11f944335dbf77
-  data.tar.gz: df553ccde16861367d1880b707e1b9cfcaad9d6ce3b9c57d7dee29bb63fd9598
+  metadata.gz: 405cc51a4b94788687e8ccfa7aa774df40c29135b9ac89251405f56c32d73835
+  data.tar.gz: 820653192390b83efbb713f4104d739b496e75d3ae9c39dec6b99b3ac2e1af77
 SHA512:
-  metadata.gz: 832053595b87941afbd6c04b9ff7a3497501540856e329db4346c06b0c43cf01eb45c2e8536826f03d337a430a14e9c3da68cbdb0426c45cae15ee746a50e401
-  data.tar.gz: f8912c4ba9c8f00e0554ecf01a9f1919c154efa14ad749e42bd74891ae389529d97272f2579de467737f0eed79b6ac35e6221c38031293aaee2384761d43e57d
+  metadata.gz: 73a212dbb80684eca0097f9e784ab8815a559e3a810cdb448eaf74fb9ec49a594c5f3f78790870fc05ce3fe47dc0accfb62f931dce6811178b771f63884fcdd1
+  data.tar.gz: 7f6a23851372cd9fa317faab23fa09fcca35344e024fe8c1496c3204bffdb258e75197f1e115b45c5b5f400b0f872b738827973bb5469b2d2b11d7a1bc9c6892

data/lib/b2.rb

@@ -5,37 +5,46 @@ require 'net/http'
 require File.expand_path('../b2/errors', __FILE__)
 require File.expand_path('../b2/file', __FILE__)
 require File.expand_path('../b2/bucket', __FILE__)
+require File.expand_path('../b2/api_connection', __FILE__)
 require File.expand_path('../b2/connection', __FILE__)
 require File.expand_path('../b2/upload_chunker', __FILE__)
 
 class B2
   
-  def initialize(account_id:, application_key:)
-    @account_id = account_id
-    @connection = B2::Connection.new(account_id, application_key)
+  def initialize(key_id: , secret: )
+    @connection = B2::Connection.new(key_id, secret)
+  end
+  
+  def account_id
+    @connection.account_id
   end
   
   def buckets
     @connection.buckets
   end
   
+  def bucket(name)
+    bs = @connection.post('/b2api/v2/b2_list_buckets', {accountId: account_id, bucketName: name})['buckets']
+    B2::Bucket.new(bs.first, @connection)
+  end
+  
   def file(bucket, key)
     bucket_id = @connection.lookup_bucket_id(bucket)
     
-    file = @connection.post('/b2api/v1/b2_list_file_names', {
+    file = @connection.post('/b2api/v2/b2_list_file_names', {
       bucketId: bucket_id,
       startFileName: key
     })['files'].find {|f| f['fileName'] == key }
 
-    file ? B2::File.new(file.merge({'bucketId' => bucket_id})) : nil
+    file ? B2::File.new(file.merge({'bucketId' => bucket_id}), @connection) : nil
   end
   
   def delete(bucket, key)
     object = file(bucket, key)
     if object
-      @connection.post('/b2api/v1/b2_delete_file_version', {
-        fileName: file.name,
-        fileId: file.id
+      @connection.post('/b2api/v2/b2_delete_file_version', {
+        fileName: object.name,
+        fileId: object.id
       })
     else
       false
@@ -43,7 +52,7 @@ class B2
   end
   
   def get_upload_token(bucket)
-    @connection.post("/b2api/v1/b2_get_upload_url", {
+    @connection.post("/b2api/v2/b2_get_upload_url", {
       bucketId: @connection.lookup_bucket_id(bucket)
     })
   end
@@ -85,11 +94,11 @@ class B2
 
   
   def download_to_file(bucket, key, filename)
-    file = File.open(filename, 'w')
+    file = ::File.open(filename, 'wb')
     download(bucket, key) do |chunk|
       file << chunk
     end
     file.close
   end
 
-end
+end

data/lib/b2/api_connection.rb

@@ -0,0 +1,101 @@
+class B2
+  class APIConnection
+    
+    attr_reader :key_id, :key_secret, :download_url
+    
+    def initialize(key_id, secret)
+      @key_id = key_id
+      @key_secret = secret
+    end
+    
+    def connect!
+      conn = Net::HTTP.new('api.backblazeb2.com', 443)
+      conn.use_ssl = true
+      
+      req = Net::HTTP::Get.new('/b2api/v2/b2_authorize_account')
+      req.basic_auth(@key_id, @key_secret)
+
+      key_expiration = Time.now.to_i + 86_400 #24hr expiry
+      resp = conn.start { |http| http.request(req) }
+      if resp.is_a?(Net::HTTPSuccess)
+        resp = JSON.parse(resp.body)
+      else
+        raise "Error connecting to B2 API"
+      end
+
+      uri = URI.parse(resp['apiUrl'])
+      @connection = Net::HTTP.new(uri.host, uri.port)
+      @connection.use_ssl = uri.scheme == 'https'
+      @connection.start
+
+      @auth_token_expires_at = key_expiration
+      @account_id = resp['accountId']
+      @minimum_part_size = resp['absoluteMinimumPartSize']
+      @recommended_part_size = resp['recommendedPartSize']
+      @auth_token = resp['authorizationToken']
+      @download_url = resp['downloadUrl']
+      @buckets_cache = []
+    end
+
+    def account_id
+      return @account_id if !@account_id.nil?
+      
+      connect!
+      @account_id
+    end
+    
+    def disconnect!
+      if @connection
+        @connection.finish if @connection.active?
+        @connection = nil
+      end
+    end
+    
+    def reconnect!
+      disconnect!
+      connect!
+    end
+    
+    def authorization_token
+      if @auth_token_expires_at.nil? || @auth_token_expires_at <= Time.now.to_i
+        reconnect!
+      end
+      @auth_token
+    end
+    
+    def active?
+      !@connection.nil? && @connection.active?
+    end
+    
+    def connection
+      reconnect! if !active?
+      @connection
+    end
+
+    def send_request(request, body=nil, &block)
+      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)
+          else
+            return_value = JSON.parse(response.body)
+          end
+        else
+          raise "Error connecting to B2 API #{response.body}"
+        end
+      end
+      disconnect! if close_connection
+
+      return_value
+    end
+    
+  end
+end

data/lib/b2/bucket.rb

@@ -14,7 +14,7 @@ class B2
     end
     
     def get_upload_token
-      @connection.post("/b2api/v1/b2_get_upload_url", { bucketId: @id })
+      @connection.post("/b2api/v2/b2_get_upload_url", { bucketId: @id })
     end
     
     def upload_file(key, io_or_string, mime_type: nil, sha1: nil, content_disposition: nil, info: {})
@@ -46,9 +46,19 @@ class B2
       
       B2::File.new(result, @connection)
     end
+  
+    def keys(prefix: nil, delimiter: nil)
+      #TODO: add abilty to get all names
+      @connection.post('/b2api/v2/b2_list_file_names', {
+        bucketId: @id,
+        maxFileCount: 1000,
+        prefix: prefix,
+        delimiter: delimiter
+      })['files'].map{ |f| f['fileName'] }
+    end
     
     def has_key?(key)
-      !@connection.post('/b2api/v1/b2_list_file_names', {
+      !@connection.post('/b2api/v2/b2_list_file_names', {
         bucketId: @id,
         startFileName: key,
         maxFileCount: 1,
@@ -57,7 +67,7 @@ class B2
     end
 
     def file(key)
-      file = @connection.post('/b2api/v1/b2_list_file_names', {
+      file = @connection.post('/b2api/v2/b2_list_file_names', {
         bucketId: @id,
         startFileName: key,
         maxFileCount: 1,
@@ -80,4 +90,4 @@ class B2
     end
 
   end
-end
+end

data/lib/b2/connection.rb

@@ -1,93 +1,67 @@
 require 'cgi'
+require 'thread'
 
 class B2
   class Connection
     
-    attr_reader :account_id, :application_key, :download_url
-    
-    def initialize(account_id, application_key)
-      @account_id = account_id
-      @application_key = application_key
-    end
-    
-    def connect!
-      conn = Net::HTTP.new('api.backblazeb2.com', 443)
-      conn.use_ssl = true
+    def initialize(key_id, secret, pool: 5, timeout: 5)
+      @mutex        = Mutex.new
+      @availability = ConditionVariable.new
+      @max          = pool
+      @timeout      = timeout
+      @free_pool    = []
+      @used_pool    = []
       
-      req = Net::HTTP::Get.new('/b2api/v1/b2_authorize_account')
-      req.basic_auth(account_id, application_key)
-
-      key_expiration = Time.now.to_i + 86_400 #24hr expiry
-      resp = conn.start { |http| http.request(req) }
-      if resp.is_a?(Net::HTTPSuccess)
-        resp = JSON.parse(resp.body)
-      else
-        raise "Error connecting to B2 API"
-      end
-
-      uri = URI.parse(resp['apiUrl'])
-      @connection = Net::HTTP.new(uri.host, uri.port)
-      @connection.use_ssl = uri.scheme == 'https'
-      @connection.start
+      @key_id = key_id
+      @key_secret = secret
 
-      @auth_token_expires_at = key_expiration
-      @minimum_part_size = resp['absoluteMinimumPartSize']
-      @recommended_part_size = resp['recommendedPartSize']
-      @auth_token = resp['authorizationToken']
-      @download_url = resp['downloadUrl']
       @buckets_cache = []
     end
     
-    def disconnect!
-      if @connection
-        @connection.finish if @connection.active?
-        @connection = nil
-      end
+    def account_id
+      return @account_id if !@account_id.nil?
+      
+      @account_id = with_connection { |conn| conn.account_id }
     end
-    
-    def reconnect!
-      disconnect!
-      connect!
+
+    def with_connection
+      conn = @mutex.synchronize do
+        cxn = if !@free_pool.empty?
+          @free_pool.shift
+        elsif @free_pool.size + @used_pool.size < @max
+          B2::APIConnection.new(@key_id, @key_secret)
+        else
+          @availability.wait(@mutex, @timeout)
+          @free_pool.shift || B2::APIConnection.new(@key_id, @key_secret)
+        end
+        
+        @used_pool << cxn
+        cxn
+      end
+      
+      yield conn
+    ensure
+      @mutex.synchronize do
+        @used_pool.delete(conn)
+        @free_pool << conn if conn.active?
+        @availability.signal()
+      end
     end
     
     def authorization_token
-      if @auth_token_expires_at.nil? || @auth_token_expires_at <= Time.now.to_i
-        reconnect!
-      end
-      @auth_token
+      with_connection { |conn| conn.authorization_token }
     end
     
-    def active?
-      !@connection.nil? && @connection.active?
-    end
-
     def send_request(request, body=nil, &block)
-      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)
-          else
-            return_value = JSON.parse(response.body)
-          end
-        else
-          raise "Error connecting to B2 API #{response.body}"
-        end
-      end
-      @connection.finish if close_connection
-
-      return_value
+      with_connection { |conn| conn.send_request(request, body, &block) }
+    end
+    
+    def download_url
+      with_connection { |conn| conn.download_url }
     end
 
     def buckets
-      post('/b2api/v1/b2_list_buckets', {accountId: @account_id})['buckets'].map do |b|
+      post('/b2api/v2/b2_list_buckets', {accountId: account_id})['buckets'].map do |b|
         B2::Bucket.new(b, self)
       end
     end
@@ -95,30 +69,30 @@ class B2
     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
     end
 
     def get_download_url(bucket, filename, expires_in: 3_600, disposition: nil)
-      response = post("/b2api/v1/b2_get_download_authorization", {
+      response = post("/b2api/v2/b2_get_download_authorization", {
         bucketId: lookup_bucket_id(bucket),
         fileNamePrefix: filename,
         validDurationInSeconds: expires_in,
         b2ContentDisposition: disposition
       })
-      url =  @download_url + '/file/' + bucket + '/' + filename + "?Authorization=" + response['authorizationToken']
+      url =  download_url + '/file/' + bucket + '/' + filename + "?Authorization=" + response['authorizationToken']
       url += "&b2ContentDisposition=#{CGI.escape(disposition)}" if disposition
       url
     end
 
-    def download(bucket, key, to=nil, &block)
+    def download(bucket, key, to=nil)
       opened_file = (to && to.is_a?(String))
       to = ::File.open(to, 'wb') if to.is_a?(String)
       digestor = Digest::SHA1.new
       data = ""
     
-      uri = URI.parse(@download_url)
+      uri = URI.parse(download_url)
       conn = Net::HTTP.new(uri.host, uri.port)
       conn.use_ssl = uri.scheme == 'https'
 
@@ -132,15 +106,15 @@ class B2
               digestor << chunk
               if to
                 to << chunk
-              elsif block
-                block(chunk)
+              elsif block_given?
+                yield(chunk)
               else
                 data << chunk
               end
             end
       
-            if digestor.hexdigest != response['X-Bz-Content-Sha1']
-              raise 'file error'
+            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'])
@@ -164,7 +138,7 @@ class B2
       elsif to
         to.flush
       end
-      block.nil? && to.nil? ? data : nil
+      !block_given? && to.nil? ? data : nil
     end
     
     def get(path, body=nil, &block)
@@ -180,4 +154,5 @@ class B2
     end
     
   end
-end
+end
+

data/lib/b2/errors.rb

@@ -6,4 +6,7 @@ class B2
   class NotFound < Error
   end
 
+  class FileIntegrityError < Error
+  end
+
 end

data/lib/b2/file.rb

@@ -26,7 +26,7 @@ class B2
     end
     
     def delete!
-      @connection.post('/b2api/v1/b2_delete_file_version', {
+      @connection.post('/b2api/v2/b2_delete_file_version', {
         fileId: @id,
         fileName: @name
       })

data/lib/b2/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: b2-client
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -36,6 +36,7 @@ files:
 - README.md
 - b2-client.gemspec
 - lib/b2.rb
+- lib/b2/api_connection.rb
 - lib/b2/bucket.rb
 - lib/b2/client.rb
 - lib/b2/connection.rb
@@ -62,8 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Backblaze B2 Client