telegem 2.1.0 → 3.0.0

data/lib/webhook/server.rb

@@ -1,326 +1,129 @@
-# lib/webhook/server.rb - V2.0.0 (CLOUD-READY)
+require 'async/http/server'
+require 'async/http/endpoint'
 require 'json'
-require 'rack'
+require 'logger'
 
 module Telegem
   module Webhook
     class Server
-      attr_reader :bot, :port, :host, :logger, :running, :secret_token
-      
-      def initialize(bot, port: nil, host: '0.0.0.0', logger: nil, max_threads: 10, secret_token: nil)
+      attr_reader :bot, :port, :host, :logger, :secret_token, :running, :server
+
+      def initialize(bot, port: nil, host: '0.0.0.0', secret_token: nil, logger: nil)
         @bot = bot
-        @port = port || ENV['PORT'] || 3000
+        @port = port || 3000
         @host = host
+        @secret_token = secret_token
         @logger = logger || Logger.new($stdout)
-        @max_threads = max_threads
-        @thread_pool = Concurrent::FixedThreadPool.new(max_threads)
-        @secret_token = secret_token || generate_secret_token
-        @server = nil
         @running = false
-        @webhook_path = "/webhook"
+        @server = nil
       end
-      
-      # Production server with Puma
+
       def run
         return if @running
-        
-        @logger.info "🚀 Starting Telegem webhook server on #{@host}:#{@port}"
-        @logger.info "📝 Set Telegram webhook to: #{webhook_url}"
-        @logger.info "🔐 Secret token: #{@secret_token}"
-        @logger.info "✅ Using Puma (production-ready)"
-        @logger.info "☁️  Cloud-ready: #{cloud_platform}"
-        
+
         @running = true
-        
-        app = build_rack_app
-        start_puma_server(app)
-        
-        self
+        @logger.info "Starting webhook server on #{@host}:#{@port}"
+
+        endpoint = Async::HTTP::Endpoint.parse("http://#{@host}:#{@port}")
+
+        @server = Async::HTTP::Server.for(endpoint) do |request|
+          case request.path
+          when '/webhook'
+            handle_webhook_request(request)
+          when '/health'
+            health_endpoint(request)
+          else
+            [404, {}, ["Not Found"]]
+          end
+        end
+
+        Async do |task|
+          @server.run
+          task.sleep while @running
+        end
+
+        @logger.info "Webhook server running on http://#{@host}:#{@port}"
       end
-      
+
       def stop
         return unless @running
-        
-        @logger.info "🛑 Stopping webhook server..."
+
         @running = false
-        
-        @server&.stop
-        @thread_pool.shutdown
-        @thread_pool.wait_for_termination(5)
-        
-        @logger.info "✅ Webhook server stopped"
-      end
-      
-      alias_method :shutdown, :stop
-      
-      def running?
-        @running
+        @server&.close
+        @logger.info "Webhook server stopped"
+        @server = nil
       end
-      
+
       def webhook_url
-        # For cloud platforms, use their URL
-        if cloud_url = detect_cloud_url
-          "#{cloud_url}#{@webhook_path}"
-        elsif ENV['WEBHOOK_URL']
-          ENV['WEBHOOK_URL']
+        if @secret_token
+          "https://#{@host}:#{@port}/webhook?secret_token=#{@secret_token}"
         else
-          # Local development
-          "https://#{@host}:#{@port}#{@webhook_path}"
+          "https://#{@host}:#{@port}/webhook"
         end
       end
-      
+
       def set_webhook(**options)
-        params = {
-          url: webhook_url,
-          secret_token: @secret_token,
-          drop_pending_updates: true
-        }.merge(options)
-        
-        @bot.api.call!('setWebhook', params)
+        url = webhook_url
+        params = { url: url }
+        params[:secret_token] = @secret_token if @secret_token
+        params.merge!(options)
+
+        @bot.set_webhook(**params)
+        @logger.info "Webhook set to #{url}"
       end
-      
+
       def delete_webhook
-        @bot.api.call!('deleteWebhook', {})
+        @bot.delete_webhook
+        @logger.info "Webhook deleted"
       end
-      
-      # Quick setup helper
-      def self.setup(bot, **options)
-        server = new(bot, **options)
-        server.run
-        server.set_webhook
-        server
+
+      def get_webhook_info
+        info = @bot.get_webhook_info
+        @logger.info "Webhook info retrieved"
+        info
       end
-      
+
       private
-      
-      def build_rack_app
-        Rack::Builder.new do
-          use Rack::CommonLogger
-          use Rack::ShowExceptions if ENV['RACK_ENV'] == 'development'
-          
-          # Health endpoint (required by Render/Railway/Heroku)
-          map "/health" do
-            run ->(env) { 
-              [200, { 
-                'Content-Type' => 'application/json',
-                'Cache-Control' => 'no-cache'
-              }, [{ 
-                status: 'healthy',
-                timestamp: Time.now.iso8601,
-                service: 'telegem-webhook',
-                version: Telegem::VERSION
-              }.to_json]] 
-            }
-          end
-          
-          # Webhook endpoint
-          map "/webhook" do
-            run ->(env) do
-              server = env['telegem.server']
-              req = Rack::Request.new(env)
-              
-              if req.post?
-                server.handle_rack_request(req)
-              else
-                [405, { 'Content-Type' => 'text/plain' }, ['Method Not Allowed']]
-              end
-            end
-          end
-          
-          # Root landing page
-          map "/" do
-            run ->(env) do
-              server = env['telegem.server']
-              [200, { 'Content-Type' => 'text/html' }, [server.landing_page]]
-            end
-          end
-        end
-      end
-      
-      def start_puma_server(app)
-        require 'puma'
-        
-        # Cloud platforms set PORT environment variable
-        port = ENV['PORT'] || @port
-        
-        config = {
-          Host: @host,
-          Port: port,
-          Threads: "0:#{@max_threads}",
-          workers: ENV['WEB_CONCURRENCY']&.to_i || 1,
-          daemonize: false,
-          silent: false,
-          environment: ENV['RACK_ENV'] || 'production',
-          # Cloud platforms handle SSL termination
-          ssl_bind: nil  # Let platform handle SSL
-        }
-        
-        @server = Puma::Server.new(app)
-        @server.add_tcp_listener(@host, port)
-        
-        @server.app = ->(env) do
-          env['telegem.server'] = self
-          app.call(env)
-        end
-        
-        Thread.new do
-          begin
-            @server.run
-          rescue => e
-            @logger.error "❌ Puma server error: #{e.message}"
-            @running = false
-            raise
-          end
-        end
-        
-        sleep 1 until @server.running
-      end
-      
-      def handle_rack_request(req)
-        # Validate secret token from Telegram
-        telegram_token = req.get_header('X-Telegram-Bot-Api-Secret-Token')
-        
-        if @secret_token && telegram_token != @secret_token
-          @logger.warn "⚠️  Invalid secret token from #{req.ip}"
-          return [403, { 'Content-Type' => 'text/plain' }, ['Forbidden']]
+
+      def handle_webhook_request(request)
+        return [405, {}, ["Method Not Allowed"]] unless request.post?
+
+        unless validate_secret_token(request)
+          return [403, {}, ["Forbidden"]]
         end
-        
+
         begin
-          body = req.body.read
+          body = request.body.read
           update_data = JSON.parse(body)
-          
-          # Process in thread pool (not spawn new threads!)
-          @thread_pool.post do
-            begin
-              @bot.process(update_data)
-            rescue => e
-              @logger.error "Error processing update: #{e.message}"
-            end
+
+          Async do |task|
+            process_webhook_update(update_data)
           end
-          
-          [200, { 'Content-Type' => 'text/plain' }, ['OK']]
+
+          [200, {}, ["OK"]]
         rescue JSON::ParserError
-          [400, { 'Content-Type' => 'text/plain' }, ['Bad Request']]
+          [400, {}, ["Bad Request"]]
         rescue => e
           @logger.error "Webhook error: #{e.message}"
-          [500, { 'Content-Type' => 'text/plain' }, ['Internal Server Error']]
+          [500, {}, ["Internal Server Error"]]
         end
       end
-      
-      def landing_page
-        <<~HTML
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <title>Telegem Webhook Server</title>
-              <style>
-                body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; 
-                       max-width: 800px; margin: 0 auto; padding: 20px; }
-                .status { background: #4CAF50; color: white; padding: 5px 10px; border-radius: 3px; }
-                code { background: #f5f5f5; padding: 2px 5px; border-radius: 3px; }
-                a { color: #2196F3; text-decoration: none; }
-              </style>
-            </head>
-            <body>
-              <h1>🤖 Telegem Webhook Server</h1>
-              <p><strong>Status:</strong> <span class="status">Running</span></p>
-              <p><strong>Webhook URL:</strong> <code>#{webhook_url}</code></p>
-              <p><strong>Health Check:</strong> <a href="/health">/health</a></p>
-              <p><strong>Platform:</strong> #{cloud_platform}</p>
-              <hr>
-              <p>To set up your Telegram bot:</p>
-              <pre><code>bot = Telegem.new('YOUR_TOKEN')
-server = bot.webhook
-server.run
-server.set_webhook</code></pre>
-            </body>
-          </html>
-        HTML
-      end
-      
-      def generate_secret_token
-        SecureRandom.hex(32)
-      end
-      
-      def detect_cloud_url
-        # Render
-        if ENV['RENDER_EXTERNAL_URL']
-          ENV['RENDER_EXTERNAL_URL']
-        # Railway
-        elsif ENV['RAILWAY_STATIC_URL']
-          ENV['RAILWAY_STATIC_URL']
-        # Heroku
-        elsif ENV['HEROKU_APP_NAME']
-          "https://#{ENV['HEROKU_APP_NAME']}.herokuapp.com"
-        # Fly.io
-        elsif ENV['FLY_APP_NAME']
-          "https://#{ENV['FLY_APP_NAME']}.fly.dev"
-        # Vercel (if using serverless)
-        elsif ENV['VERCEL_URL']
-          "https://#{ENV['VERCEL_URL']}"
-        else
-          nil
-        end
-      end
-      
-      def cloud_platform
-        if ENV['RENDER'] then 'Render'
-        elsif ENV['RAILWAY'] then 'Railway'
-        elsif ENV['HEROKU_APP_NAME'] then 'Heroku'
-        elsif ENV['FLY_APP_NAME'] then 'Fly.io'
-        elsif ENV['VERCEL'] then 'Vercel'
-        elsif ENV['DYNO'] then 'Heroku'
-        else 'Local/Unknown'
-        end
-      end
-    end
-    
-    # Rack Middleware for existing apps
-    class Middleware
-      def initialize(app, bot, secret_token: nil)
-        @app = app
-        @bot = bot
-        @secret_token = secret_token || ENV['TELEGRAM_SECRET_TOKEN']
-        @thread_pool = Concurrent::FixedThreadPool.new(10)
+
+      def process_webhook_update(update_data)
+        @bot.process(update_data)
+      rescue => e
+        @logger.error "Error processing update: #{e.message}"
       end
-      
-      def call(env)
-        req = Rack::Request.new(env)
-        
-        if req.post? && req.path == "/webhook"
-          handle_webhook(req)
-        else
-          @app.call(env)
-        end
+
+      def validate_secret_token(request)
+        return true unless @secret_token
+
+        token = request.query['secret_token'] || request.headers['x-telegram-bot-api-secret-token']
+        token == @secret_token
       end
-      
-      private
-      
-      def handle_webhook(req)
-        telegram_token = req.get_header('X-Telegram-Bot-Api-Secret-Token')
-        
-        if @secret_token && telegram_token != @secret_token
-          return [403, { 'Content-Type' => 'text/plain' }, ['Forbidden']]
-        end
-        
-        begin
-          update_data = JSON.parse(req.body.read)
-          
-          @thread_pool.post do
-            begin
-              @bot.process(update_data)
-            rescue => e
-              @bot.logger&.error("Webhook error: #{e.message}")
-            end
-          end
-          
-          [200, { 'Content-Type' => 'text/plain' }, ['OK']]
-        rescue JSON::ParserError
-          [400, { 'Content-Type' => 'text/plain' }, ['Bad Request']]
-        rescue => e
-          @bot.logger&.error("Webhook error: #{e.message}")
-          [500, { 'Content-Type' => 'text/plain' }, ['Internal Server Error']]
-        end
+
+      def health_endpoint(request)
+        [200, { 'Content-Type' => 'application/json' }, [{ status: 'ok' }.to_json]]
       end
     end
   end

data/setup.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+# Clean Git history and push fresh
+
+echo "🧹 Cleaning Git history..."
+echo "⚠️  This removes ALL Git history but keeps your code"
+
+# Remove .git directory
+rm -rf .git
+
+# Reinitialize fresh Git
+git init
+
+# Add your files
+git add .
+
+# Commit
+git commit -m "Telegem v3.0.0 
+          - Major rewrite
+          -introduced async 
+          - removed thread_poll
+          "
+
+# Set GitLab remote
+git remote add origin https://oauth2:glpat-31Bznn8ioRy85WZ5lDwGJ286MQp1Omd5aHc5Cw.01.1217avfnk@gitlab.com/ruby-telegem/telegem.git
+
+# Force push (since new repo)
+git push -u origin main --force
+
+echo "✅ Fresh push complete!"
+echo "🌐 View at: https://gitlab.com/ruby-telegem/telegem.git"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telegem
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - sick_phantom
@@ -77,6 +77,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -163,31 +177,17 @@ files:
 - Gemfile.lock
 - LICENSE
 - Readme.md
-- Test-Projects/.gitkeep
-- Test-Projects/Movie-tracker-bot/.gitkeep
-- Test-Projects/Movie-tracker-bot/Gemfile
-- Test-Projects/Movie-tracker-bot/bot.rb
-- Test-Projects/Movie-tracker-bot/handlers/.gitkeep
-- Test-Projects/Movie-tracker-bot/handlers/add_1_.rb
-- Test-Projects/Movie-tracker-bot/handlers/add_2_.rb
-- Test-Projects/Movie-tracker-bot/handlers/premium.rb
-- Test-Projects/Movie-tracker-bot/handlers/report.rb
-- Test-Projects/Movie-tracker-bot/handlers/search.rb
-- Test-Projects/Movie-tracker-bot/handlers/sponsor.rb
-- Test-Projects/Movie-tracker-bot/handlers/start.rb
-- Test-Projects/Movie-tracker-bot/handlers/watch.rb
-- Test-Projects/Test-submitted-by-marvel/.gitkeep
-- Test-Projects/Test-submitted-by-marvel/Marvel-bot.md
-- Test-Projects/bot_test1.rb
-- Test-Projects/pizza_test_bot_guide.md
+- Starts_HallofFame.md
+- Test-Projects/bot.md
+- Test-Projects/bot1.rb
 - docs-src/.gitkeep
 - docs-src/Bot-registration_.PNG
 - docs-src/bot.md
 - docs-src/context|ctx|.md
+- docs-src/ctx.md
 - docs-src/getting-started.md
 - docs-src/keyboard_inline.md
 - docs-src/scene.md
-- docs-src/understanding-ctx.md
 - lib/api/client.rb
 - lib/api/types.rb
 - lib/core/bot.rb
@@ -201,6 +201,7 @@ files:
 - lib/telegem.rb
 - lib/webhook/.gitkeep
 - lib/webhook/server.rb
+- setup.sh
 homepage: https://gitlab.com/ruby-telegem/telegem
 licenses:
 - MIT
@@ -211,7 +212,7 @@ metadata:
   bug_tracker_uri: https://gitlab.com/ruby-telegem/telegem/-/issues
   documentation_uri: https://gitlab.com/ruby-telegem/telegem/-/tree/main/docs-src?ref_type=heads
   rubygems_mfa_required: 'false'
-post_install_message: "Thanks for installing Telegem 2.1.0!\nDocumentation: https://gitlab.com/ruby-telegem/telegem\nHappy
+post_install_message: "Thanks for installing Telegem 3.0.0!\nDocumentation: https://gitlab.com/ruby-telegem/telegem\nHappy
   bot building! \U0001F916\n"
 rdoc_options: []
 require_paths:

data/Test-Projects/Movie-tracker-bot/Gemfile

@@ -1,2 +0,0 @@
-
-ruby "3.1.0"

data/Test-Projects/Movie-tracker-bot/bot.rb

@@ -1,62 +0,0 @@
-require 'json'
-require 'telegem'
-require 'sqlite3'
-require 'fileutils'
-
-
-require_relative './handlers/start'
-require_relative './handlers/add_1_'
-require_relative './handlers/premium'
-require_relative './handlers/add_2_'
-require_relative './handlers/sponsor'
-require_relative './handlers/watch'
-require_relative './handlers/report'
-require_relative './handlers/search'
-  
-bot_token = ENV['BOT_TOKEN'] 
-
-  bot = Telegem.new(ENV['BOT_TOKEN'])
- puts "token is #{bot_token[0..10]}"
- # In your code:
- db = SQLite3::Database.new "movieflix.db"
-
-puts "started sqlite"
-
-StartHandler.new(bot, db)
-SearchHandler.new(bot, db)
-WatchHandler.new(bot, db)
-HelpHandler.new(bot)
-PremiumHandler.new(bot)
-SponsorHandler.new(bot)
-AddHandler.new(bot, db)
-AddHears.new(bot, db)
-
-  port = (ENV['PORT'] || 3000).to_i
-  puts "  📍 Using port: #{port}"
-  puts "  🌐 Bind host: 0.0.0.0"
-  
-  # Start polling
-  bot.start_polling
-  puts " started polling"
-  
-  # Minimal health check server
-  Thread.new do
-    require 'socket'
-    server = TCPServer.new('0.0.0.0', port || 10000)
-    puts "✅ Health check server listening on port #{ENV['PORT'] || 10000}"
-    
-    loop do
-      client = server.accept
-      request = client.gets
-      
-      # Simple response for any request
-      client.puts "HTTP/1.1 200 OK\r\n"
-      client.puts "Content-Type: text/plain\r\n"
-      client.puts "\r\n"
-      client.puts "Telegram Bot is running"
-      client.close
-    end
-    puts "bot is running "
-  end 
-   sleep
-   puts "bot is running alive now "