tdlib-ruby 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2e11ed2e37f6949476c1b50f69f754692ff91fb
-  data.tar.gz: 25639d93e2f8d29e0ef3283dcddd3b31a8e1fbb2
+  metadata.gz: '048a775eb8c8d07edb85a39c335d9ff33b5d8032'
+  data.tar.gz: a5b940f2431cf9dffd76fa41775dddc37fc0cfe4
 SHA512:
-  metadata.gz: 748462dfb42dc3ae79dbc2099af326270184a41641c9545961650f868088d3fe3b0cf02cd626ad3f1511511d0311f52088fdba8a54e7060d1ddfcd55bdea5e3b
-  data.tar.gz: c31362d10969c1eba778bb63fc62526c6ed80b73afc57309adcedd3896dab81914bc67dd4499818eaa919f10a4e5fbd6a1b8f0e5cdb39d03e0ec844ffbc8abae
+  metadata.gz: 74503569ec06caf882341062c719e32bcbc3715f02a638993800f1e9ec151685b483e7c7152b36e77327f6cd2ea2e135dacbee7412c07b4169b5939481c1c8eb
+  data.tar.gz: a28c24da2eae0d59313ecd4f6e9de9336a243747da8d6d266143463e8a4d185c745899c450148da65715b02ed122afd694d754947f538df002691a1a4e5c5ccf

data/ChangeLog.md

@@ -1,4 +1,9 @@
-### 0.3.0 / 2018-02-16
+### 0.4.0 / 2018-04-12
+
+* Add configurable timeout
+* Fix hanging threads after timeout
+
+### 0.3.0 / 2018-04-04
 
 * Use Concurrent::Promise instead of timeout module
 * Add integration tests

data/lib/tdlib/client.rb

@@ -60,7 +60,7 @@
 class TD::Client
   include Concurrent
 
-  TIMEOUT = 20
+  TIMEOUT = 10
 
   def initialize(td_client = TD::Api.client_create,
                  update_manager = TD::UpdateManager.new(td_client),
@@ -91,7 +91,7 @@ class TD::Client
   # Sends asynchronous request to the TDLib client and returns received update synchronously
   # @param [Hash] query
   # @return [Hash]
-  def broadcast_and_receive(query)
+  def broadcast_and_receive(query, timeout: TIMEOUT)
     result = nil
     extra = TD::Utils.generate_extra(query)
     handler = ->(update) { result = update if update['@extra'] == extra }
@@ -99,10 +99,11 @@ class TD::Client
     query['@extra'] = extra
     TD::Api.client_send(@td_client, query)
     promise = Promise.new do
-      until result do end
+      time_start = Time.now
+      until result || Time.now - time_start > timeout do end
       result
     end
-    promise.execute.value(TIMEOUT) || (raise TD::TimeoutError)
+    promise.execute.value(timeout) || (raise TD::TimeoutError)
   end
 
   # Synchronously executes TDLib request
@@ -129,8 +130,12 @@ class TD::Client
     @update_manager.add_handler(handler)
   end
 
-  def on_ready(&_)
-    raise TD::TimeoutError unless Promise.execute { until @ready do end }.then { self }.execute.value(TIMEOUT)
+  def on_ready(timeout: TIMEOUT, &_)
+    promise = Promise.new do
+      time_start = Time.now
+      until @ready || Time.now - time_start > timeout do end
+    end
+    raise TD::TimeoutError unless promise.execute.then { self }.execute.value(timeout)
     yield self
   end
 

data/lib/tdlib/update_manager.rb

@@ -4,7 +4,6 @@ class TD::UpdateManager
   def initialize(td_client)
     @td_client = td_client
     @handlers = []
-    @handlers_for_removal = []
     @mutex = Mutex.new
     init_update_loop
   end

data/lib/tdlib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdlib-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Southbridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-04 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable