RubyGems - telegem - Versions diffs - 1.0.6 → 2.0.0 - Mend

telegem 1.0.6 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

checksums.yaml +4 -4
data/docs/Api.md +146 -354
data/docs/Cookbook(copy_paste).md +644 -0
data/docs/Getting_started.md +348 -0
data/docs/webhook_setup.md +199 -0
data/lib/api/client.rb +123 -49
data/lib/api/types.rb +283 -67
data/lib/core/bot.rb +91 -56
data/lib/core/context.rb +96 -110
data/lib/markup/.gitkeep +0 -0
data/lib/markup/keyboard.rb +53 -38
data/lib/telegem.rb +15 -5
data/lib/webhook/server.rb +246 -112
metadata +108 -17
data/docs/Cookbook.md +0 -407
data/docs/SETTING_WEBHOOK.md +0 -367
data/docs/UNDERSTANDING-WEBHOOK-n-POLLING.md +0 -241

data/lib/webhook/server.rb CHANGED Viewed

@@ -1,132 +1,196 @@
-# lib/webhook/server.rb - HTTPX VERSION
+# lib/webhook/server.rb - V2.0.0 (CLOUD-READY)
 require 'json'
-require 'webrick'
+require 'rack'
 module Telegem
   module Webhook
     class Server
-      attr_reader :bot, :port, :host, :logger, :server, :running
-      def initialize(bot, port: nil, host: '0.0.0.0', logger: nil)
+      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)
         @bot = bot
-        @port = port || ENV['PORT'] || 1000
+        @port = port || ENV['PORT'] || 3000
         @host = host
         @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"
       end
+      # Production server with Puma
       def run
         return if @running
         @logger.info "🚀 Starting Telegem webhook server on #{@host}:#{@port}"
-        @logger.info "📝 Set your Telegram webhook to: #{webhook_url}"
+        @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
-        @server_thread = Thread.new do
-          begin
-            # Create WEBrick server
-            @server = WEBrick::HTTPServer.new(
-              Port: @port,
-              BindAddress: @host,
-              Logger: @logger,
-              AccessLog: []
-            )
-            # Mount the webhook endpoint
-            @server.mount_proc("/webhook/#{@bot.token}") do |req, res|
-              handle_webhook_request(req, res)
-            end
-            # Mount health check
-            @server.mount_proc('/health') do |req, res|
-              res.status = 200
-              res.content_type = 'text/plain'
-              res.body = 'OK'
-            end
-            # Mount root
-            @server.mount_proc('/') do |req, res|
-              res.status = 200
-              res.content_type = 'text/html'
-              res.body = <<~HTML
-                <html>
-                  <head><title>Telegem Webhook Server</title></head>
-                  <body>
-                    <h1>Telegem Webhook Server</h1>
-                    <p>Webhook URL: <code>#{webhook_url}</code></p>
-                    <p>Status: <span style="color: green;">Running</span></p>
-                    <p><a href="/health">Health Check</a></p>
-                  </body>
-                </html>
-              HTML
-            end
-            # Handle shutdown signals
-            ['INT', 'TERM'].each do |signal|
-              Signal.trap(signal) { shutdown }
-            end
-            # Start the server
-            @server.start
-          rescue => e
-            @logger.error "❌ Webhook server error: #{e.class}: #{e.message}"
-            @logger.error e.backtrace.join("\n") if e.backtrace
-            raise
-          ensure
-            @running = false
-          end
-        end
+        app = build_rack_app
+        start_puma_server(app)
         self
       end
       def stop
         return unless @running
         @logger.info "🛑 Stopping webhook server..."
         @running = false
-        # Stop WEBrick server
-        @server&.shutdown
-        # Wait for server thread
-        @server_thread&.join(5)
+        @server&.stop
+        @thread_pool.shutdown
+        @thread_pool.wait_for_termination(5)
         @logger.info "✅ Webhook server stopped"
       end
       alias_method :shutdown, :stop
       def running?
         @running
       end
       def webhook_url
-        base_url = ENV['WEBHOOK_URL'] || "http://#{@host}:#{@port}"
-        "#{base_url}/webhook/#{@bot.token}"
+        # For cloud platforms, use their URL
+        if cloud_url = detect_cloud_url
+          "#{cloud_url}#{@webhook_path}"
+        elsif ENV['WEBHOOK_URL']
+          ENV['WEBHOOK_URL']
+        else
+          # Local development
+          "https://#{@host}:#{@port}#{@webhook_path}"
+        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)
+      end
+      def delete_webhook
+        @bot.api.call!('deleteWebhook', {})
+      end
+      # Quick setup helper
+      def self.setup(bot, **options)
+        server = new(bot, **options)
+        server.run
+        server.set_webhook
+        server
+      end
       private
-      def handle_webhook_request(req, res)
-        # Only accept POST requests
-        unless req.request_method == 'POST'
-          res.status = 405
-          res.content_type = 'text/plain'
-          res.body = 'Method Not Allowed'
-          return
+      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']]
+        end
         begin
-          # Parse the update
           body = req.body.read
           update_data = JSON.parse(body)
-          # Process the update in a separate thread to keep response fast
-          Thread.new do
+          # Process in thread pool (not spawn new threads!)
+          @thread_pool.post do
             begin
               @bot.process(update_data)
             rescue => e
@@ -134,57 +198,127 @@ module Telegem
             end
           end
-          # Immediate response to Telegram
-          res.status = 200
-          res.content_type = 'text/plain'
-          res.body = 'OK'
-        rescue JSON::ParserError => e
-          @logger.error "Invalid JSON in webhook request: #{e.message}"
-          res.status = 400
-          res.content_type = 'text/plain'
-          res.body = 'Bad Request'
+          [200, { 'Content-Type' => 'text/plain' }, ['OK']]
+        rescue JSON::ParserError
+          [400, { 'Content-Type' => 'text/plain' }, ['Bad Request']]
         rescue => e
-          @logger.error "Error handling webhook: #{e.class}: #{e.message}"
-          res.status = 500
-          res.content_type = 'text/plain'
-          res.body = 'Internal Server Error'
+          @logger.error "Webhook error: #{e.message}"
+          [500, { 'Content-Type' => 'text/plain' }, ['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
-    # Middleware for Rack apps (Rails, Sinatra, etc.)
+    # Rack Middleware for existing apps
     class Middleware
-      def initialize(app, bot)
+      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)
       end
       def call(env)
         req = Rack::Request.new(env)
-        # Check if this is a webhook request
-        if req.post? && req.path == "/webhook/#{@bot.token}"
+        if req.post? && req.path == "/webhook"
           handle_webhook(req)
         else
           @app.call(env)
         end
       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)
-          # Process async in background
-          Thread.new { @bot.process(update_data) }
+          @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}") if @bot.logger
+          @bot.logger&.error("Webhook error: #{e.message}")
           [500, { 'Content-Type' => 'text/plain' }, ['Internal Server Error']]
         end
       end

metadata CHANGED Viewed

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: telegem
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 2.0.0
 platform: ruby
 authors:
-- Your Name
+- sick_phantom
 bindir: exe
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -15,14 +15,68 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: '0.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: '0.20'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -43,32 +97,62 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.18'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '1.50'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.0
-description: Blazing-fast Telegram Bot framework with true async/await patterns, inspired
-  by Telegraf.js
+        version: '1.50'
+description: |
+  Telegem is a modern Telegram Bot Framework for Ruby inspired by Telegraf.js.
+  Built with async-first design using HTTPX, featuring scenes, middleware,
+  and a clean DSL. Perfect for building scalable Telegram bots.
 email:
-- your-email@example.com
+- ynwghosted@icloud.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -84,19 +168,20 @@ files:
 - Test-Projects/pizza_test_bot_guide.md
 - docs/.gitkeep
 - docs/Api.md
-- docs/Cookbook.md
+- docs/Cookbook(copy_paste).md
+- docs/Getting_started.md
 - docs/How_to_use.md
 - docs/QuickStart.md
-- docs/SETTING_WEBHOOK.md
-- docs/UNDERSTANDING-WEBHOOK-n-POLLING.md
 - docs/Understanding_Scene.md
 - docs/Usage.md
+- docs/webhook_setup.md
 - lib/api/client.rb
 - lib/api/types.rb
 - lib/core/bot.rb
 - lib/core/composer.rb
 - lib/core/context.rb
 - lib/core/scene.rb
+- lib/markup/.gitkeep
 - lib/markup/keyboard.rb
 - lib/session/memory_store.rb
 - lib/session/middleware.rb
@@ -110,7 +195,13 @@ metadata:
   homepage_uri: https://gitlab.com/ruby-telegem/telegem
   source_code_uri: https://gitlab.com/ruby-telegem/telegem
   changelog_uri: https://gitlab.com/ruby-telegem/telegem/-/blob/main/CHANGELOG.md
-  documentation_uri: https://gitlab.com/ruby-telegem/telegem/-/tree/main/docs
+  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.0!\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"
 rdoc_options: []
 require_paths:
 - lib
@@ -127,5 +218,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.9
 specification_version: 4
-summary: Modern, async Telegram Bot API for Ruby
+summary: Modern, fast Telegram Bot Framework for Ruby
 test_files: []