Feature: Auto-close tabs + Fix session persistence

- Add auto-close functionality for download links (?close=1 parameter)
- Fix TELETHON_SESSION_BASE64 restoration with consistent paths
- Add enhanced logging for session debugging
- Update bot to generate links with auto-close by default
- Add base64 dependency for download page generation

Author: itskavin

Cargo.toml

@@ -22,6 +22,7 @@ mime_guess = "2.0.4"
 structopt = "0.3.26"
 teloxide = { version = "0.12", features = ["full"] }
 reqwest = { version = "0.12", features = ["blocking"] }
+base64 = "0.22"
 cli = { path = "cli" }
 shared = { path = "shared" }
 bot = { path = "bot" }

bot/src/queue.rs

@@ -451,19 +451,19 @@ async fn edit_message_with_file_link(
     let file_domain = Config::instance().await.file_domain();
     // Build full URL path using shared util (id + url-safe filename)
     let full_path = build_url_path(unique_id, file_name);
-    info!("Generated download link: {}{}", file_domain, full_path);
+    // Add auto-close parameter for better UX (closes tab after download starts)
+    let full_url_with_close = format!("{}{}?close=1", file_domain, full_path);
+    info!("Generated download link: {}", full_url_with_close);
     let size_str = human_size(file_size as u64);
     let edit_result = bot.get_teloxide_bot().edit_message_text(
         queue_item.message.chat.id,
         queue_item.queue_message.id,
         format!(
-            "✅ <b>File uploaded successfully!</b>\n\n📁 <b>File:</b> {}\n📊 <b>Size:</b> {}\n\n🔗 <b>Download Link:</b>\n<a href=\"{}{}\">{}{}</a>",
+            "✅ <b>File uploaded successfully!</b>\n\n📁 <b>File:</b> {}\n📊 <b>Size:</b> {}\n\n🔗 <b>Download Link:</b>\n<a href=\"{}\">{}</a>",
             file_name,
             size_str,
-            file_domain,
-            full_path,
-            file_domain,
-            full_path
+            full_url_with_close,
+            full_url_with_close
         ),
     )
         .parse_mode(ParseMode::Html)

python_service/docker-entrypoint-enhanced.sh

@@ -4,7 +4,7 @@
 set -e
 
 SESSION_DIR="/app/sessions"
-SESSION_FILE="${SESSION_NAME:-/app/sessions/fasttelethon_session}.session"
+SESSION_FILE="/app/sessions/fasttelethon_session.session"
 BACKUP_DIR="/app/sessions/backups"
 
 # Create necessary directories
@@ -17,18 +17,23 @@ echo "📄 Session file: $SESSION_FILE"
 # 🔑 RESTORE SESSION FROM ENVIRONMENT VARIABLE (for free tier without persistent disk)
 if [ ! -z "$TELETHON_SESSION_BASE64" ]; then
     echo "🔓 Restoring session from TELETHON_SESSION_BASE64 environment variable..."
+    echo "📊 Session length: ${#TELETHON_SESSION_BASE64} chars"
     echo "$TELETHON_SESSION_BASE64" | base64 -d > "$SESSION_FILE"
     if [ $? -eq 0 ]; then
         echo "✅ Session restored successfully from environment variable!"
+        echo "📏 Session file size: $(stat -c%s "$SESSION_FILE") bytes"
         chmod 600 "$SESSION_FILE"
     else
         echo "❌ Failed to decode session from environment variable"
     fi
+else
+    echo "⚠️  TELETHON_SESSION_BASE64 environment variable not set"
 fi
 
 # Check if session file exists
 if [ -f "$SESSION_FILE" ]; then
     echo "✅ Found existing session file"
+    echo "📏 Session file size: $(stat -c%s "$SESSION_FILE") bytes"
 
     # Create backup with timestamp
     BACKUP_FILE="$BACKUP_DIR/session_$(date +%Y%m%d_%H%M%S).session"
@@ -40,7 +45,7 @@ if [ -f "$SESSION_FILE" ]; then
     ls -t session_*.session 2>/dev/null | tail -n +6 | xargs -r rm
     echo "🧹 Cleaned old backups (kept last 5)"
 else
-    echo "⚠️  No existing session file found"
+    echo "⚠️  No existing session file found at $SESSION_FILE"
     echo "   Authorization will be required on startup"
     echo "   Visit /auth endpoint after service starts"
 fi
@@ -56,5 +61,7 @@ echo "🚀 Starting FastTelethon service..."
 echo "📍 Working directory: $(pwd)"
 echo "📂 Files in /app:"
 ls -la /app
+echo "📂 Files in /app/sessions:"
+ls -la /app/sessions || echo "   (sessions directory empty or doesn't exist)"
 
 exec python -m uvicorn main:app --host 0.0.0.0 --port 8001

python_service/main.py

@@ -32,7 +32,7 @@
 API_ID = int(os.getenv("TELEGRAM_API_ID", "0"))
 API_HASH = os.getenv("TELEGRAM_API_HASH", "")
 PHONE = os.getenv("TELEGRAM_PHONE", "")
-SESSION_NAME = os.getenv("SESSION_NAME", "fasttelethon_session")
+SESSION_NAME = os.getenv("SESSION_NAME", "/app/sessions/fasttelethon_session")
 CHANNEL_ID = os.getenv("STORAGE_CHANNEL_ID", "")  # Channel to store files
 
 # Global client and authorization state
@@ -381,8 +381,11 @@ async def backup_session():
     import base64
     session_file = f"{SESSION_NAME}.session"
 
+    logger.info(f"Looking for session file at: {session_file}")
+    
     if not os.path.exists(session_file):
-        raise HTTPException(status_code=404, detail="Session file not found")
+        logger.error(f"Session file not found at {session_file}")
+        raise HTTPException(status_code=404, detail=f"Session file not found at {session_file}")
 
     try:
         with open(session_file, 'rb') as f:

src/server.rs

@@ -13,6 +13,7 @@ use http::{header::CONTENT_TYPE, StatusCode};
 use log::{debug, error, info, warn};
 use teloxide::net::Download;
 use teloxide::prelude::Requester;
+use base64::Engine;
 
 use shared::file_storage::{get_file_metadata, list_all_files, FileMetadata};
 use crate::config::Config;
@@ -219,6 +220,9 @@ async fn files_id(
         }
     }
 
+    // Check if auto-close is requested via ?close=1
+    let auto_close = params.get("close").is_some();
+    
     // Determine content type, allow force download via ?dl=1
     let force_download = params.get("dl").is_some();
     let content_type = if force_download {
@@ -234,6 +238,65 @@ async fn files_id(
     info!("Serving file: {} ({} bytes) with content type: {}", 
           metadata.file_name, file_bytes.len(), content_type);
 
+    // If auto-close requested, return HTML with auto-download and close script
+    if auto_close {
+        let html = format!(
+            r#"<!DOCTYPE html>
+<html>
+<head>
+    <title>Downloading {}</title>
+    <style>
+        body {{ font-family: Arial, sans-serif; text-align: center; padding: 50px; }}
+        .loader {{ border: 5px solid #f3f3f3; border-top: 5px solid #3498db; 
+                   border-radius: 50%; width: 50px; height: 50px; 
+                   animation: spin 1s linear infinite; margin: 20px auto; }}
+        @keyframes spin {{ 0% {{ transform: rotate(0deg); }} 100% {{ transform: rotate(360deg); }} }}
+    </style>
+</head>
+<body>
+    <h2>Downloading {}</h2>
+    <div class="loader"></div>
+    <p>Your download will begin shortly...</p>
+    <p><small>This window will close automatically.</small></p>
+    <script>
+        // Create blob from base64 data and trigger download
+        const base64Data = "{}";
+        const byteCharacters = atob(base64Data);
+        const byteNumbers = new Array(byteCharacters.length);
+        for (let i = 0; i < byteCharacters.length; i++) {{
+            byteNumbers[i] = byteCharacters.charCodeAt(i);
+        }}
+        const byteArray = new Uint8Array(byteNumbers);
+        const blob = new Blob([byteArray], {{ type: '{}' }});
+        const url = window.URL.createObjectURL(blob);
+        const a = document.createElement('a');
+        a.href = url;
+        a.download = "{}";
+        document.body.appendChild(a);
+        a.click();
+        window.URL.revokeObjectURL(url);
+        
+        // Close window after 2 seconds
+        setTimeout(function() {{
+            window.close();
+        }}, 2000);
+    </script>
+</body>
+</html>"#,
+            metadata.file_name,
+            metadata.file_name,
+            base64::engine::general_purpose::STANDARD.encode(&file_bytes),
+            content_type,
+            metadata.file_name
+        );
+        
+        return Ok(Response::builder()
+            .status(StatusCode::OK)
+            .header(CONTENT_TYPE, "text/html; charset=utf-8")
+            .body(html.into())
+            .unwrap());
+    }
+
     Ok(Response::builder()
         .status(StatusCode::OK)
         .header(CONTENT_TYPE, content_type)