tdlib-ruby 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9a09d6aacb86936097c8e639dea0ac3930cd4f8
-  data.tar.gz: f5b25381a3aee0a60d45042115d943ac20b9242b
+  metadata.gz: f7668dcf652a419af320628d4452b980fcc6b14d
+  data.tar.gz: bdc0bbe0e4bb6a1d9b4035ac8ac620d19e5105f0
 SHA512:
-  metadata.gz: ef289a28405f4267953819f2f626ece72ad5abf18b77ec989b5756197fd0e3715c44a00d4476c8603597d352ac9b0dc21302ebbffce8083e24ce78736a501865
-  data.tar.gz: 7efb461c9258ce835a36f611c274155825d6492d93d7d6cff7d9a25399656091dc0bf2e1aaf3b4bc2f52363fd96f8f1dffd2be1a8a0ec82b876451b3578564f5
+  metadata.gz: 8886e255f1410795e460fe2d39b099c88c7f4e4c1dabea0bc16eaba1cd120720a185dba71e076063e84b3d01073e07063bf1b41ea4ad77efe3cf81151e55b1fe
+  data.tar.gz: 4d14e17af82aef8a6e9ce58e5332f3f20a74c3e25434a04c3946f22e442aea8ceb3c568111b7f83bde1f6923dfdc5f5d54521dd396da6906e7df492b5b227aa3

data/ChangeLog.md

@@ -1,3 +1,7 @@
+### 0.9.2 / 2018-05-04
+
+* Fix some potential deadlocks
+
 ### 0.9.1 / 2018-04-27
 
 * Fix deadlock in Client#on_ready

data/lib/tdlib-ruby.rb

@@ -1,6 +1,5 @@
 require 'tdlib/version'
 require 'dry/configurable'
-require 'celluloid'
 
 module TD
   extend Dry::Configurable

data/lib/tdlib/client.rb

@@ -58,7 +58,7 @@
 #
 #   p @me
 class TD::Client
-  TIMEOUT = 10
+  TIMEOUT = 20
 
   def initialize(td_client = TD::Api.client_create,
                  update_manager = TD::UpdateManager.new(td_client),
@@ -66,7 +66,8 @@ class TD::Client
     @td_client = td_client
     @update_manager = update_manager
     @config = TD.config.client.to_h.merge(extra_config)
-    @ready_condition = Celluloid::Condition.new
+    @ready_condition_mutex = Mutex.new
+    @ready_condition = ConditionVariable.new
     authorize
     @update_manager.run
   end
@@ -92,15 +93,25 @@ class TD::Client
   # @param [Hash] query
   # @return [Hash]
   def broadcast_and_receive(query, timeout: TIMEOUT)
-    condition = Celluloid::Condition.new
+    condition = ConditionVariable.new
     extra = TD::Utils.generate_extra(query)
-    handler = ->(update) { condition.signal(update) if update['@extra'] == extra }
+    result = nil
+    mutex = Mutex.new
+    handler = ->(update) do
+      next unless update['@extra'] == extra
+      mutex.synchronize do
+        result = update
+        condition.signal
+      end
+    end
     @update_manager.add_handler(handler)
     query['@extra'] = extra
-    TD::Api.client_send(@td_client, query)
-    condition.wait(timeout)
-  rescue Celluloid::ConditionError
-    raise TD::TimeoutError
+    mutex.synchronize do
+      TD::Api.client_send(@td_client, query)
+      condition.wait(mutex, timeout)
+      raise TD::TimeoutError if result.nil?
+      result
+    end
   end
 
   # Synchronously executes TDLib request
@@ -128,9 +139,10 @@ class TD::Client
   end
 
   def on_ready(timeout: TIMEOUT, &_)
-    yield self if @ready || @ready_condition.wait(timeout)
-  rescue Celluloid::ConditionError
-    raise TD::TimeoutError
+    @ready_condition_mutex.synchronize do
+      return(yield self) if @ready || (@ready_condition.wait(@ready_condition_mutex, timeout) && @ready)
+      raise TD::TimeoutError
+    end
   end
 
   # Stops update manager and destroys TDLib client
@@ -163,8 +175,10 @@ class TD::Client
         broadcast(encryption_key_query)
       else
         @update_manager.remove_handler(handler)
-        @ready = true
-        @ready_condition.signal(true)
+        @ready_condition_mutex.synchronize do
+          @ready = true
+          @ready_condition.broadcast
+        end
       end
     end
     @update_manager.add_handler(handler)

data/lib/tdlib/update_manager.rb

@@ -1,4 +1,6 @@
 class TD::UpdateManager
+  TIMEOUT = 30
+
   attr_reader :handlers
 
   def initialize(td_client)
@@ -34,7 +36,7 @@ class TD::UpdateManager
   private
 
   def handle_update
-    update = TD::Api.client_receive(@td_client, 10)
+    update = TD::Api.client_receive(@td_client, TIMEOUT)
     @mutex.synchronize do
       @handlers.each { |h| h.call(update) } unless update.nil?
     end

data/lib/tdlib/version.rb

@@ -1,4 +1,4 @@
 module TD
   # tdlib-ruby version
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/integration/tdlib_spec.rb

@@ -22,6 +22,12 @@ describe TD::Client do
 
     it { is_expected.to include(client) }
     it { is_expected.to include('ready') }
+
+    context 'when timeout reached' do
+      subject { client.on_ready(timeout: 0.0001) { [client, 'ready'] } }
+
+      it { expect { subject }.to raise_error(TD::TimeoutError) }
+    end
   end
 
   describe '#broadcast' do
@@ -46,6 +52,12 @@ describe TD::Client do
     subject { client.on_ready { client.broadcast_and_receive(payload) } }
 
     it { is_expected.to include('@type', 'entities') }
+
+    context 'when timeout reached' do
+      subject { client.on_ready(timeout: 0.0001) { client.broadcast_and_receive(payload) } }
+
+      it { expect { subject }.to raise_error(TD::TimeoutError) }
+    end
   end
 
   describe '#on' do

data/tdlib-ruby.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_runtime_dependency 'dry-configurable', '~> 0.7'
-  gem.add_runtime_dependency 'celluloid', '~> 0.17'
 
   gem.add_development_dependency 'bundler', '~> 1.10'
   gem.add_development_dependency 'rake', '12.3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdlib-ruby
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Southbridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
-- !ruby/object:Gem::Dependency
-  name: celluloid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement