telegem 2.0.5 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a100bc051a797130ecebdf67164f6d2566fda1241a3240226396412b1cd6d7
-  data.tar.gz: 6f41d93f14122381a14138be904987032abc577c8d0fde33e53d0632505d6363
+  metadata.gz: 272c8898e9301da49ef787a232fe0eca2b1374ed611a04ae43d6ffff0a51053b
+  data.tar.gz: 44c00d019fbcd8da206f7231d9a24cec1c10f00b8f075c8c233a9706ceb6675a
 SHA512:
-  metadata.gz: 11ee3ef944c5ddafeb77c91e9e069bca3631061f073525abf3b7a60f009b8b2c30cc8f12e73a828001b2bec062039b73de55af23896d621b77f7c2dac6e544ca
-  data.tar.gz: 9a378f859712a891550e5fd1647053a7a2dae80065d08f9c1b73f9fbdaf6ff7b006115165a403848866d6ba8da439a351166661200128ed7bfb23af83141f4a6
+  metadata.gz: 55eba2b0e9a9792e5bd4280656a2986a3150a5c9ebec65c6c5fe60144cbc66dd6c460578966b4077fb53d70b65fdcdc5ee40a1561b663cc0892237ade86a72b9
+  data.tar.gz: 1f151636509dd3ba2e63a61db759a45bee1d54a63e9e708694f6a137b517a88d77691728c7be7a371a0aad9c6b41e02d71396aa70f6ec3e418f78161431a37be

data/lib/api/client.rb

@@ -1,4 +1,3 @@
-# lib/api/client.rb - MINIMAL WORKING VERSION
 require 'httpx'
 require 'json'
 
@@ -12,35 +11,54 @@ module Telegem
       def initialize(token, **options)
         @token = token
         @logger = options[:logger] || Logger.new($stdout)
-        @timeout = options[:timeout] || 30
+        timeout = options[:timeout] || 30
         
         @http = HTTPX.with(
-          timeout: { request_timeout: @timeout},
+          timeout: { 
+            request_timeout: timeout,
+            connect_timeout: 10,
+            write_timeout: 10,
+            read_timeout: timeout
+          },
           headers: {
-            'Content-Type' => 'application/json'
+            'Content-Type' => 'application/json',
+            'User-Agent' => "Telegem/#{Telegem::VERSION}"
           }
         )
       end
 
       def call(method, params = {})
         url = "#{BASE_URL}/bot#{@token}/#{method}"
+        @logger.debug("API Call: #{method}") if @logger
         @http.post(url, json: params.compact)
       end
 
       def call!(method, params = {})
         request = call(method, params)
-        request.wait
+        response = request.wait
         
-        if request.error
-          handle_error(request.error)
+        if response.status != 200
+          @logger.error("HTTP Error #{response.status}") if @logger
           return nil
         end
         
-        handle_response(request.response)
+        json = response.json
+        
+        if json && json['ok']
+          json['result']
+        else
+          error_msg = json ? json['description'] : "Invalid response"
+          @logger.error("API Error: #{error_msg}") if @logger
+          nil
+        end
+      rescue => e
+        @logger.error("Error in call!: #{e.class}: #{e.message}") if @logger
+        nil
       end
 
       def upload(method, params)
         url = "#{BASE_URL}/bot#{@token}/#{method}"
+        
         form = params.map do |key, value|
           if file_object?(value)
             [key.to_s, HTTPX::FormData::File.new(value)]
@@ -48,6 +66,7 @@ module Telegem
             [key.to_s, value.to_s]
           end
         end
+        
         @http.post(url, form: form)
       end
 
@@ -64,28 +83,6 @@ module Telegem
 
       private
 
-      def handle_response(response)
-        return nil unless response
-        
-        if response.status != 200
-          raise APIError, "HTTP #{response.status}"
-        end
-        
-        json = response.json
-        return nil unless json
-        
-        if json['ok']
-          json['result']
-        else
-          raise APIError.new(json['description'], json['error_code'])
-        end
-      end
-
-      def handle_error(error)
-        @logger.error("API Error: #{error.message}") if @logger
-        raise APIError, error.message
-      end
-
       def file_object?(obj)
         obj.is_a?(File) || obj.is_a?(StringIO) || obj.is_a?(Tempfile) ||
           (obj.is_a?(String) && File.exist?(obj))

data/lib/core/bot.rb

@@ -4,11 +4,13 @@ require 'logger'
 module Telegem
   module Core
     class Bot
-      attr_reader :token, :api, :handlers, :middleware, :logger, :scenes, :running, :polling_thread
+      attr_reader :token, :api, :handlers, :middleware, :logger, :scenes, 
+                  :running, :polling_thread, :session_store
       
       def initialize(token, **options)
         @token = token
         @api = API::Client.new(token, **options.slice(:logger, :timeout))
+        
         @handlers = {
           message: [],
           callback_query: [],
@@ -18,6 +20,7 @@ module Telegem
           pre_checkout_query: [],
           shipping_query: []
         }
+        
         @middleware = []
         @scenes = {}
         @logger = options[:logger] || Logger.new($stdout)
@@ -35,6 +38,49 @@ module Telegem
         start_workers(options[:worker_count] || 5)
       end
       
+      def start_polling(**options)
+        return if @running
+        
+        @running = true
+        @polling_options = {
+          timeout: 30,
+          limit: 100,
+          allowed_updates: nil
+        }.merge(options)
+        
+        @offset = nil
+        
+        @logger.info "🤖 Starting Telegem bot (polling mode)..."
+        
+        @polling_thread = Thread.new do
+          Thread.current.abort_on_exception = false
+          poll_loop
+        end
+        
+        self
+      end
+      
+      def shutdown
+        return unless @running
+        
+        @logger.info "🛑 Shutting down bot..."
+        @running = false
+        
+        if @polling_thread&.alive?
+          @polling_thread.join(3)
+        end
+        
+        stop_workers
+        
+        @api.close if @api.respond_to?(:close)
+        
+        @logger.info "✅ Bot shutdown complete"
+      end
+      
+      def running?
+        @running
+      end
+      
       def command(name, **options, &block)
         pattern = /^\/#{Regexp.escape(name)}(?:@\w+)?(?:\s+(.+))?$/i
         
@@ -69,26 +115,6 @@ module Telegem
         @scenes[id] = Scene.new(id, &block)
       end
       
-      def start_polling(**options)
-        return if @running
-        
-        @running = true
-        @polling_options = {
-          timeout: 30,
-          limit: 100,
-          allowed_updates: nil
-        }.merge(options)
-        
-        @offset = nil
-        
-        @polling_thread = Thread.new do
-          @logger.info "🤖 Starting Telegem bot (HTTPX async)..."
-          poll_loop
-        end
-        
-        self
-      end
-      
       def webhook(app = nil, port: nil, host: '0.0.0.0', logger: nil, &block)
         require_relative '../webhook/server'
         
@@ -118,113 +144,119 @@ module Telegem
         process_update(update)
       end
       
-      def shutdown
-        @logger.info "🛑 Shutting down..."
-        
-        @running = false
+      private
+      
+      def poll_loop
+        @logger.debug "Entering polling loop"
         
-        @polling_thread&.join(5) if @polling_thread&.alive?
+        while @running
+          begin
+            result = fetch_updates
+            
+            if result && result.is_a?(Hash) && result['ok']
+              handle_updates_response(result)
+            elsif result
+              @logger.warn "Unexpected API response format: #{result.class}"
+            end
+            
+            sleep 0.1 unless @offset.nil?
+            
+          rescue => e
+            handle_error(e)
+            sleep 5
+          end
+        end
         
-        stop_workers
+        @logger.debug "Exiting polling loop"
+      end
+      
+      def fetch_updates
+        params = {
+          timeout: @polling_options[:timeout],
+          limit: @polling_options[:limit]
+        }
+        params[:offset] = @offset if @offset
+        params[:allowed_updates] = @polling_options[:allowed_updates] if @polling_options[:allowed_updates]
         
-        @api.close
+        begin
+          request = @api.get_updates(params)
+          
+          if request.respond_to?(:wait)
+            response = request.wait
+            
+            if response.respond_to?(:status) && response.status == 200
+              json = response.json
+              return json if json && json.is_a?(Hash)
+            else
+              @logger.error("HTTP Error: #{response.status}") if response.respond_to?(:status)
+            end
+          else
+            @logger.error("API didn't return a waitable request: #{request.class}")
+          end
+        rescue => e
+          @logger.error("Error fetching updates: #{e.class}: #{e.message}")
+        end
         
-        @logger.info "✅ Bot stopped"
+        nil
       end
       
-      def running?
-        @running
+      def handle_updates_response(api_response)
+        updates = api_response['result'] || []
+        
+        if updates.any?
+          @logger.debug "Processing #{updates.length} update(s)"
+          
+          updates.each do |update_data|
+            @update_queue << [update_data, nil]
+          end
+          
+          @offset = updates.last['update_id'] + 1
+          @logger.debug "Updated offset to #{@offset}"
+        end
       end
       
-      private
-      
       def start_workers(count)
         count.times do |i|
           @worker_threads << Thread.new do
+            Thread.current.abort_on_exception = false
             worker_loop(i)
           end
         end
+        @logger.debug "Started #{count} worker threads"
       end
       
       def stop_workers
+        @logger.debug "Stopping worker threads"
+        
         @worker_threads.size.times { @update_queue << :shutdown }
+        
         @worker_threads.each do |thread|
           thread.join(2) if thread.alive?
         end
+        
         @worker_threads.clear
       end
       
       def worker_loop(id)
-        @logger.debug "Worker #{id} started" if @logger
+        @logger.debug "Worker #{id} started"
+        
         while @running
           begin
             task = @update_queue.pop
+            
             break if task == :shutdown
             
             update_data, callback = task
-            update = Types::Update.new(update_data)
-            process_update(update)
-            callback&.call(update) if callback.respond_to?(:call)
-          rescue => e
-            @logger.error "Worker #{id} error: #{e.message}"
-          end
-        end
-        @logger.debug "Worker #{id} stopped" if @logger
-      end
-      
-      def poll_loop
-        while @running
-          begin
-            # Get updates - returns HTTPX request object
-            updates_request = fetch_updates
-            
-            # Wait for the request to complete
-            updates_request.wait(@polling_options[:timeout] + 5)
+            process_update(Types::Update.new(update_data))
             
-            # Get the response AFTER waiting
-            response = updates_request.response
-            
-            if response && response.status == 200
-              if json = response.json
-                handle_updates_response(json)
-              end
-            end
-            
-            # Small delay to prevent tight loop
-            sleep 0.1 unless @offset.nil?
+            callback&.call if callback.respond_to?(:call)
             
           rescue => e
-            handle_error(e)
-            sleep 5
+            @logger.error "Worker #{id} error: #{e.message}"
           end
         end
-      end
-      
-      def fetch_updates
-        params = {
-          timeout: @polling_options[:timeout],
-          limit: @polling_options[:limit]
-        }
-        params[:offset] = @offset if @offset
-        params[:allowed_updates] = @polling_options[:allowed_updates] if @polling_options[:allowed_updates]
-        
-        @api.call('getUpdates', params)
-      end
-      
-      def handle_updates_response(api_response)
-        return unless api_response['ok']
-        
-        updates_data = api_response['result'] || []
-        
-        # Queue updates for worker processing
-        updates_data.each do |update_data|
-          @update_queue << [update_data, nil]
-        end
         
-        # Update offset for next poll
-        if updates_data.any?
-          @offset = updates_data.last['update_id'] + 1
-        end
+        @logger.debug "Worker #{id} stopped"
       end
       
       def process_update(update)
@@ -328,8 +360,9 @@ module Telegem
           @error_handler.call(error, ctx)
         else
           @logger.error("❌ Unhandled error: #{error.class}: #{error.message}")
-          @logger.error("Context: #{ctx.raw_update}") if ctx
-          @logger.error(error.backtrace&.join("\n")) if error.backtrace
+          if ctx
+            @logger.error("Context - User: #{ctx.from&.id}, Chat: #{ctx.chat&.id}")
+          end
         end
       end
     end

data/lib/telegem.rb

@@ -3,7 +3,7 @@ require 'logger'
 require 'json'
 
 module Telegem
-  VERSION = "2.0.5".freeze
+  VERSION = "2.0.7".freeze
 end
 
 # Load core components

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telegem
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.7
 platform: ruby
 authors:
 - sick_phantom
@@ -198,7 +198,7 @@ metadata:
   bug_tracker_uri: https://gitlab.com/ruby-telegem/telegem/-/issues
   documentation_uri: https://gitlab.com/ruby-telegem/telegem/-/blob/main/README.md
   rubygems_mfa_required: 'false'
-post_install_message: "Thanks for installing Telegem 2.0.5!\n\nQuick start:\n  bot
+post_install_message: "Thanks for installing Telegem 2.0.7!\n\nQuick start:\n  bot
   = Telegem.new(\"YOUR_TOKEN\")\n  bot.on(:message) { |ctx| ctx.reply(\"Hello!\")
   }\n  bot.start_polling\n\nDocumentation: https://gitlab.com/ruby-telegem/telegem\nHappy
   bot building! \U0001F916\n"