grammerb 1.5.4-x86_64-linux → 1.5.5-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b848b7175bf0f4ab87b15dd570c7d7845cb6c27748e629382c6a426ec295f624
-  data.tar.gz: e824d41981048b92bee4dbb5aef44a14765cadda834a7eb304613f90287fff1f
+  metadata.gz: cfa427b7dfa8ba5bf41259e06da241a933b25bc3e7480dbb23d1c4a1f57e0a64
+  data.tar.gz: b84e918c1e120b4dabbd2e4f2f6cd8830c382f805c74fbbdf811465adc348b0f
 SHA512:
-  metadata.gz: 49f66c4dba23b9eee67bf963ffa098e6e8d69906b6b1acc66b03430576421dc50e85b9910c8fb21beeb620160651aa00eb9b3f662ccfd557fe33d3f66a60bd5c
-  data.tar.gz: 3124b1fa71ea18ab236d7e0ad35881a00fcfec2f1d4521ad20627e10b5528517cfca2af47272d7931cd795f97e980f01bcf9ce98ffe57b18911e475f2a8884a7
+  metadata.gz: db315a46f7cc4519fddc2d80b1734dde185fb5213a1bc001563023bbb8646e76ac4ff24916ea7a2aab124badb8863121a7da70613c855de5c7e37d45fee5639c
+  data.tar.gz: a4a844fea3eb1e67d3aaf0adafdd52ea8aff08c8325d7f22c75dcc00ed2f5363e19b1cfaec5e17dc18fb5a41fa787b365e86b3e772725c81e0527a368992cb3c

data/lib/grammerb/client.rb

@@ -47,6 +47,8 @@ module Grammerb
       @logger = logger || default_logger
       @entity_cache = {}
       @entity_cache_mu = Mutex.new
+      @entity_cache_ttl = 300 # 5 minutes
+      @entity_cache_max = 1000
     end
 
     # --- Connection ---
@@ -249,13 +251,13 @@ module Grammerb
 
     def get_entity(entity)
       key = peer_id(entity)
-      cached = @entity_cache_mu.synchronize { @entity_cache[key] }
+      cached = entity_cache_get(key)
       return cached if cached
 
       h = safe_native { @native.get_entity(key) }
       return nil unless h
       peer = Types::Peer.new(h)
-      @entity_cache_mu.synchronize { @entity_cache[key] = peer }
+      entity_cache_set(key, peer)
       peer
     end
 
@@ -267,13 +269,13 @@ module Grammerb
     def resolve_username(username)
       normalized = username.to_s.delete_prefix("@")
       key = "@#{normalized}"
-      cached = @entity_cache_mu.synchronize { @entity_cache[key] }
+      cached = entity_cache_get(key)
       return cached if cached
 
       h = safe_native { @native.resolve_username(normalized) }
       return nil unless h
       peer = Types::Peer.new(h)
-      @entity_cache_mu.synchronize { @entity_cache[key] = peer }
+      entity_cache_set(key, peer)
       peer
     end
 
@@ -417,33 +419,33 @@ module Grammerb
 
     # --- Files ---
 
-    def send_file(chat, path, caption: nil, parse_mode: nil, reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_file(chat, path, caption: nil, parse_mode: nil, reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_file(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_file(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
-    def send_photo(chat, path, caption: nil, parse_mode: nil, reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_photo(chat, path, caption: nil, parse_mode: nil, reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_photo(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_photo(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
-    def send_audio(chat, path, caption: nil, parse_mode: nil, duration: 0, title: nil, performer: nil, reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_audio(chat, path, caption: nil, parse_mode: nil, duration: 0, title: nil, performer: nil, reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_audio(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, duration, title, performer, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_audio(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, duration, title, performer, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
-    def send_video(chat, path, caption: nil, parse_mode: nil, duration: 0, width: 0, height: 0, supports_streaming: true, round_message: false, reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_video(chat, path, caption: nil, parse_mode: nil, duration: 0, width: 0, height: 0, supports_streaming: true, round_message: false, reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_video(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, duration, width, height, supports_streaming, round_message, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_video(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, duration, width, height, supports_streaming, round_message, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
-    def send_voice(chat, path, caption: nil, parse_mode: nil, duration: 0, waveform: nil, reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_voice(chat, path, caption: nil, parse_mode: nil, duration: 0, waveform: nil, reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_voice(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, duration, waveform, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_voice(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, duration, waveform, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
@@ -455,15 +457,19 @@ module Grammerb
       safe_native { @native.send_album(peer_id(chat), items, reply_to, silent, markup) }.map { |h| h ? wrap_message(h) : nil }
     end
 
-    def download_media(chat, message_id, path, &progress)
+    def download_media(chat, message_id, path, timeout: 300, &progress)
       if progress
         safe_native { @native.start_download_media(peer_id(chat), message_id, path.to_s) }
+        deadline = Process.clock_gettime(Process::CLOCK_MONOTONIC) + timeout
         loop do
-          p = @native.poll_download_progress
+          p = safe_native { @native.poll_download_progress }
           if p
             progress.call(p[:downloaded], p[:total])
             break if p[:done]
           else
+            if Process.clock_gettime(Process::CLOCK_MONOTONIC) > deadline
+              raise Errors::TimeoutError, "Download timed out after #{timeout} seconds"
+            end
             sleep 0.05
           end
         end
@@ -474,39 +480,39 @@ module Grammerb
 
     # --- Special Media ---
 
-    def send_location(chat, lat, long, accuracy_radius: nil, reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_location(chat, lat, long, accuracy_radius: nil, reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_location(peer_id(chat), lat.to_f, long.to_f, accuracy_radius, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_location(peer_id(chat), lat.to_f, long.to_f, accuracy_radius, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
-    def send_venue(chat, lat, long, title:, address:, provider: "", venue_id: "", venue_type: "", reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_venue(chat, lat, long, title:, address:, provider: "", venue_id: "", venue_type: "", reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_venue(peer_id(chat), lat.to_f, long.to_f, title.to_s, address.to_s, provider.to_s, venue_id.to_s, venue_type.to_s, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_venue(peer_id(chat), lat.to_f, long.to_f, title.to_s, address.to_s, provider.to_s, venue_id.to_s, venue_type.to_s, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
-    def send_contact(chat, phone_number:, first_name:, last_name: "", vcard: "", reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_contact(chat, phone_number:, first_name:, last_name: "", vcard: "", reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_contact(peer_id(chat), phone_number.to_s, first_name.to_s, last_name.to_s, vcard.to_s, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_contact(peer_id(chat), phone_number.to_s, first_name.to_s, last_name.to_s, vcard.to_s, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
-    def send_dice(chat, emoticon: "\u{1F3B2}", reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_dice(chat, emoticon: "\u{1F3B2}", reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_dice(peer_id(chat), emoticon.to_s, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_dice(peer_id(chat), emoticon.to_s, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
-    def send_sticker(chat, path, reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_sticker(chat, path, reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_sticker(peer_id(chat), path.to_s, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_sticker(peer_id(chat), path.to_s, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
-    def send_animation(chat, path, caption: nil, parse_mode: nil, duration: 0, width: 0, height: 0, reply_to: nil, silent: false, schedule: nil, buttons: nil, reply_markup: nil)
+    def send_animation(chat, path, caption: nil, parse_mode: nil, duration: 0, width: 0, height: 0, reply_to: nil, silent: false, schedule: nil, topic_id: nil, buttons: nil, reply_markup: nil)
       markup = reply_markup || (buttons ? build_buttons(buttons) : nil)
-      h = safe_native { @native.send_animation(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, duration, width, height, reply_to, silent, schedule&.to_i, markup) }
+      h = safe_native { @native.send_animation(peer_id(chat), path.to_s, (caption || "").to_s, parse_mode, duration, width, height, reply_to, silent, schedule&.to_i, topic_id, markup) }
       wrap_message(h)
     end
 
@@ -718,6 +724,30 @@ module Grammerb
 
     private
 
+    def entity_cache_get(key)
+      @entity_cache_mu.synchronize do
+        entry = @entity_cache[key]
+        return nil unless entry
+        value, ts = entry
+        if (Process.clock_gettime(Process::CLOCK_MONOTONIC) - ts) > @entity_cache_ttl
+          @entity_cache.delete(key)
+          return nil
+        end
+        value
+      end
+    end
+
+    def entity_cache_set(key, value)
+      @entity_cache_mu.synchronize do
+        # Evict oldest entries when cache is full
+        if @entity_cache.size >= @entity_cache_max
+          oldest_key = @entity_cache.min_by { |_, (_, ts)| ts }&.first
+          @entity_cache.delete(oldest_key) if oldest_key
+        end
+        @entity_cache[key] = [value, Process.clock_gettime(Process::CLOCK_MONOTONIC)]
+      end
+    end
+
     # Wrap native calls: catch RuntimeError from Rust and re-raise as Grammerb::Errors.
     def safe_native
       yield

data/lib/grammerb/errors.rb

@@ -5,6 +5,7 @@ module Grammerb
     class ConnectionError < Error; end
     class AuthError < Error; end
     class NotConnectedError < Error; end
+    class TimeoutError < Error; end
 
     # Telegram-specific errors
     class RPCError < Error

data/lib/grammerb/version.rb

@@ -1,4 +1,4 @@
 # lib/grammerb/version.rb
 module Grammerb
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grammerb
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: x86_64-linux
 authors:
 - Developer