Update app.py

app.py

@@ -18,9 +18,10 @@ GET_NUMBER_URL = f"{BASE}/portal/sms/received/getsms/number"
 GET_SMS_URL = f"{BASE}/portal/sms/received/getsms/number/sms"
 
 TELEGRAM_PROXY_URL = "https://danihitambangetjir.termai.cc/api/proxy"
-CUSTOM_DOMAIN = "https://fourstore-tele.hf.space"
+CUSTOM_DOMAIN = "https://fourstore-otp.hf.space"
 ACCOUNTS_FILE = "accounts.json"
 
+# Load accounts dari file
 def load_accounts():
     if os.path.exists(ACCOUNTS_FILE):
         try:
@@ -34,7 +35,10 @@ def save_accounts(accounts):
     with open(ACCOUNTS_FILE, 'w') as f:
         json.dump(accounts, f, indent=2)
 
+# Inisialisasi accounts
 accounts = load_accounts()
+
+# Tambahkan runtime data ke setiap account
 for acc_id in accounts:
     accounts[acc_id]["session"] = None
     accounts[acc_id]["csrf"] = None
@@ -47,7 +51,7 @@ for acc_id in accounts:
     accounts[acc_id]["last_cleanup"] = time.time()
 
 app = Flask('')
-app.secret_key = "fourstore-secret-key-123"
+app.secret_key = "fourstore-multi-account-secret"
 sse_clients = []
 
 def get_wib_time():
@@ -57,63 +61,44 @@ def get_search_date():
     wib = get_wib_time()
     return (wib - timedelta(days=1)).strftime("%Y-%m-%d") if wib.hour < 7 else wib.strftime("%Y-%m-%d")
 
-def login_account(account_id, username, password):
+def login_account(account_id, username, password, bot_token, chat_id):
     try:
-        print(f"\n🔐 LOGIN ACCOUNT: {username}")
-        print(f"📤 Membuat session baru...")
+        print(f"\n🔐 Login untuk: {username}")
         session = httpx.Client(follow_redirects=True, timeout=30.0)
         
-        print(f"📥 GET login page: {LOGIN_URL}")
         r = session.get(LOGIN_URL, timeout=30)
-        print(f"📊 Status code: {r.status_code}")
-        
-        if r.status_code != 200:
-            print(f"❌ Gagal load login page")
-            return False, f"HTTP {r.status_code}"
-        
         soup = BeautifulSoup(r.text, "html.parser")
         token = soup.find("input", {"name": "_token"})
         if not token:
-            print(f"❌ Token CSRF tidak ditemukan dalam HTML")
-            print(f"📄 Preview HTML: {r.text[:200]}")
             return False, "Token tidak ditemukan"
         
         csrf_token = token.get("value")
-        print(f"✅ CSRF Token: {csrf_token[:20]}...")
-        
-        print(f"📤 POST login data...")
         r = session.post(LOGIN_URL, data={
             "_token": csrf_token,
             "email": username,
             "password": password
         }, timeout=30)
-        print(f"📊 Response status: {r.status_code}")
-        
+
         if "dashboard" in r.text.lower() or "logout" in r.text.lower():
-            print(f"✅✅✅ LOGIN BERHASIL! ✅✅✅")
-            print(f"📦 Session aktif, menyimpan data...")
-            
             accounts[account_id]["session"] = session
             accounts[account_id]["csrf"] = csrf_token
             accounts[account_id]["status"] = True
+            accounts[account_id]["username"] = username
+            accounts[account_id]["password"] = password
+            accounts[account_id]["bot_token"] = bot_token
+            accounts[account_id]["chat_id"] = chat_id
             accounts[account_id]["last_login"] = time.time()
             save_accounts(accounts)
-            
             return True, "Login berhasil"
         else:
-            print(f"❌❌❌ LOGIN GAGAL! ❌❌❌")
-            print(f"📄 Response preview: {r.text[:300]}")
-            return False, "Login gagal - cek username/password"
-            
+            return False, "Login gagal"
     except Exception as e:
-        print(f"❌ EXCEPTION: {str(e)}")
         return False, str(e)
 
 def tg_send(account_id, msg):
     try:
         account = accounts.get(account_id)
         if not account or not account.get("bot_token") or not account.get("chat_id"):
-            print(f"⚠️ Telegram: No bot_token/chat_id for {account_id}")
             return False
         
         url = f"{TELEGRAM_PROXY_URL}?url=https://api.telegram.org/bot{account['bot_token']}/sendMessage"
@@ -122,12 +107,9 @@ def tg_send(account_id, msg):
             "text": msg,
             "parse_mode": "Markdown"
         }
-        print(f"📤 Send to Telegram: {msg[:50]}...")
-        r = httpx.post(url, json=payload, timeout=30)
-        print(f"📊 Telegram response: {r.status_code}")
+        httpx.post(url, json=payload, timeout=30)
         return True
-    except Exception as e:
-        print(f"❌ Telegram error: {e}")
+    except:
         return False
 
 def clean_country(rng):
@@ -168,21 +150,16 @@ def extract_otp(text):
 def get_ranges_with_count(account_id):
     account = accounts.get(account_id)
     if not account or not account.get("session") or not account.get("csrf"):
-        print(f"⚠️ Account {account_id} invalid")
         return []
     
     try:
         date = get_search_date()
-        print(f"\n🔍 AMBIL RANGE - {account['username']} - Tanggal: {date}")
-        
         r = account["session"].post(GET_RANGE_URL, data={
             "_token": account["csrf"],
             "from": date,
             "to": date
         }, timeout=15)
-        
-        print(f"📊 Status: {r.status_code}")
-        
+
         soup = BeautifulSoup(r.text, "html.parser")
         ranges_data = []
 
@@ -198,11 +175,9 @@ def get_ranges_with_count(account_id):
                 "name": rng,
                 "count": count
             })
-            print(f"  ✅ {rng} - {count} SMS")
 
         return ranges_data
-    except Exception as e:
-        print(f"❌ Error get_ranges: {e}")
+    except:
         return []
 
 def get_numbers_with_count(account_id, rng):
@@ -212,8 +187,6 @@ def get_numbers_with_count(account_id, rng):
     
     try:
         date = get_search_date()
-        print(f"\n    📞 AMBIL NOMOR: {rng}")
-        
         r = account["session"].post(GET_NUMBER_URL, data={
             "_token": account["csrf"],
             "start": date,
@@ -249,11 +222,30 @@ def get_numbers_with_count(account_id, rng):
                         "number": num,
                         "count": count
                     })
-                    print(f"        ✅ {mask_number(num)} - {count} SMS")
+
+        if len(numbers_data) == 0:
+            for div in soup.find_all("div", class_="col-sm-4"):
+                text = div.get_text(strip=True)
+                match = re.search(r'\b(\d{10,15})\b', text)
+                if match:
+                    num = match.group(1)
+                    parent = div.find_parent("div", class_="card")
+                    count = 0
+                    if parent:
+                        p_tag = parent.find("p", class_="mb-0 pb-0")
+                        if p_tag:
+                            try:
+                                count = int(p_tag.get_text(strip=True))
+                            except:
+                                count = 0
+                    
+                    numbers_data.append({
+                        "number": num,
+                        "count": count
+                    })
 
         return numbers_data
-    except Exception as e:
-        print(f"    ❌ Error get_numbers: {e}")
+    except:
         return []
 
 def get_sms_fast(account_id, rng, number):
@@ -264,14 +256,12 @@ def get_sms_fast(account_id, rng, number):
     try:
         date = get_search_date()
         cache_key = f"{rng}-{number}"
-        
+
         if cache_key in account["sms_cache"]:
             timestamp, results = account["sms_cache"][cache_key]
             if time.time() - timestamp < 5:
-                print(f"      💾 Cache: {len(results)} SMS")
                 return results
 
-        print(f"      📨 AMBIL SMS: {mask_number(number)}")
         r = account["session"].post(GET_SMS_URL, data={
             "_token": account["csrf"],
             "start": date,
@@ -297,14 +287,12 @@ def get_sms_fast(account_id, rng, number):
                     otp = extract_otp(sms)
                     if otp:
                         results.append((service, sms, otp))
-                        print(f"        ✅ OTP: {otp} - {service}")
             except:
                 continue
 
         account["sms_cache"][cache_key] = (time.time(), results)
         return results
-    except Exception as e:
-        print(f"      ❌ Error get_sms: {e}")
+    except:
         return []
 
 def add_otp_log(account_id, country, number, service, otp, sms):
@@ -333,7 +321,6 @@ def add_otp_log(account_id, country, number, service, otp, sms):
     
     broadcast_sse(log_entry)
     save_accounts(accounts)
-    print(f"      📊 OTP LOGGED: {otp}")
     return log_entry
 
 def broadcast_sse(data):
@@ -349,6 +336,7 @@ def broadcast_sse(data):
 
 @app.route('/')
 def home():
+    # Gabungkan semua log dari semua akun
     all_logs = []
     for acc_id, acc in accounts.items():
         if acc.get("otp_logs"):
@@ -378,14 +366,17 @@ def home():
     
     all_services = list(set([log.get('service') for log in all_logs if log.get('service')]))
     
+    # Hitung total OTP dari semua akun
+    total_otp = sum(len(acc.get('sent_cache', [])) for acc in accounts.values())
+    today_otp = len(all_logs)
+    
+    # Daftar akun untuk filter
     accounts_list = []
     for acc_id, acc in accounts.items():
         accounts_list.append({
             "id": acc_id,
             "username": acc.get("username", "Unknown"),
-            "status": acc.get("status", False),
-            "bot": "✅" if acc.get("bot_token") else "❌",
-            "chat": acc.get("chat_id", "-")[:5] + "..." if acc.get("chat_id") and len(acc.get("chat_id")) > 5 else acc.get("chat_id", "-")
+            "status": acc.get("status", False)
         })
     
     html = f"""
@@ -404,6 +395,8 @@ def home():
             .header-top {{ display: flex; justify-content: space-between; align-items: center; margin-bottom: 24px; flex-wrap: wrap; gap: 15px; }}
             .title h1 {{ font-size: 28px; font-weight: 700; background: linear-gradient(135deg, #00f2fe, #4facfe); -webkit-background-clip: text; -webkit-text-fill-color: transparent; }}
             .title p {{ color: #8b949e; font-size: 14px; }}
+            .status-badge {{ padding: 10px 24px; border-radius: 100px; font-weight: 600; font-size: 14px; 
+                          background: #0a4d3c; color: #a0f0d0; border: 1px solid #1a6e5a; }}
             .stats-grid {{ display: grid; grid-template-columns: repeat(4, 1fr); gap: 20px; margin-top: 20px; }}
             .stat-card {{ background: #1a1f2c; padding: 20px; border-radius: 20px; border: 1px solid #2d3540; }}
             .stat-label {{ color: #8b949e; font-size: 13px; text-transform: uppercase; letter-spacing: 0.5px; margin-bottom: 8px; }}
@@ -432,9 +425,10 @@ def home():
             .search-input {{ width: 100%; padding: 14px 20px 14px 48px; background: #1a1f2c; border: 1px solid #2d3540; border-radius: 100px; color: #e4e6eb; font-size: 15px; }}
             .filter-box {{ flex: 1; min-width: 150px; }}
             .filter-select {{ width: 100%; padding: 14px 20px; background: #1a1f2c; border: 1px solid #2d3540; border-radius: 100px; color: #e4e6eb; font-size: 15px; cursor: pointer; }}
+            .clear-btn {{ padding: 8px 16px; background: #2d3a4a; border: none; border-radius: 100px; color: white; font-size: 13px; cursor: pointer; text-decoration: none; }}
             
             .otp-section {{ background: #0f131c; border-radius: 24px; padding: 28px; border: 1px solid #2d3540; overflow-x: auto; }}
-            table {{ width: 100%; border-collapse: collapse; min-width: 1000px; }}
+            table {{ width: 100%; border-collapse: collapse; min-width: 1100px; }}
             th {{ text-align: left; padding: 16px 12px; background: #1a1f2c; color: #00f2fe; font-weight: 600; font-size: 13px; text-transform: uppercase; border-bottom: 2px solid #2d3540; }}
             td {{ padding: 16px 12px; border-bottom: 1px solid #262c38; font-size: 14px; }}
             .otp-badge {{ background: #002b36; color: #00f2fe; font-family: monospace; font-size: 16px; font-weight: 700; padding: 6px 14px; border-radius: 100px; border: 1px solid #00f2fe40; cursor: pointer; user-select: all; }}
@@ -442,12 +436,12 @@ def home():
             .account-badge {{ background: #4a3a2d; padding: 4px 10px; border-radius: 20px; font-size: 11px; display: inline-block; }}
             .whatsapp {{ background: #25D36620; color: #25D366; border: 1px solid #25D36640; }}
             .telegram {{ background: #26A5E420; color: #26A5E4; border: 1px solid #26A5E440; }}
-            .google {{ background: #EA433520; color: #EA4335; border: 1px solid #EA433540; }}
-            .facebook {{ background: #4267B220; color: #4267B2; border: 1px solid #4267B240; }}
-            .temu {{ background: #FF6B6B20; color: #FF6B6B; border: 1px solid #FF6B6B40; }}
+            .number {{ font-family: monospace; }}
+            .empty-state {{ text-align: center; padding: 60px; color: #8b949e; }}
+            .highlight {{ background: #00f2fe30; border-radius: 4px; padding: 0 2px; }}
             .new-row {{ animation: fadeIn 0.3s ease; background: linear-gradient(90deg, #00f2fe10, transparent); }}
-            @keyframes fadeIn {{ from {{ opacity: 0; transform: translateY(-10px); }} to {{ opacity: 1; transform: translateY(0); }} }}
             .toast {{ position: fixed; bottom: 24px; right: 24px; background: #00f2fe; color: #000; padding: 14px 28px; border-radius: 100px; font-weight: 600; z-index: 9999; }}
+            @keyframes fadeIn {{ from {{ opacity: 0; transform: translateY(-10px); }} to {{ opacity: 1; transform: translateY(0); }} }}
         </style>
     </head>
     <body>
@@ -458,15 +452,17 @@ def home():
                         <h1>OTP MULTI ACCOUNT · FOURSTORE</h1>
                         <p>{CUSTOM_DOMAIN}</p>
                     </div>
-                    <div class="stats-grid">
-                        <div class="stat-card"><div class="stat-label">Total Akun</div><div class="stat-value">{len(accounts)}</div></div>
-                        <div class="stat-card"><div class="stat-label">Akun Online</div><div class="stat-value">{sum(1 for a in accounts.values() if a.get('status'))}</div></div>
-                        <div class="stat-card"><div class="stat-label">Total OTP</div><div class="stat-value">{sum(len(a.get('sent_cache', [])) for a in accounts.values())}</div></div>
-                        <div class="stat-card"><div class="stat-label">WIB</div><div class="stat-value" id="wib-time">{get_wib_time().strftime('%H:%M:%S')}</div></div>
-                    </div>
+                    <div class="status-badge">● ONLINE</div>
+                </div>
+                <div class="stats-grid">
+                    <div class="stat-card"><div class="stat-label">Total Akun</div><div class="stat-value">{len(accounts)}</div></div>
+                    <div class="stat-card"><div class="stat-label">Akun Online</div><div class="stat-value">{sum(1 for a in accounts.values() if a.get('status'))}</div></div>
+                    <div class="stat-card"><div class="stat-label">Total OTP</div><div class="stat-value">{total_otp}</div></div>
+                    <div class="stat-card"><div class="stat-label">WIB</div><div class="stat-value" id="wib-time">{get_wib_time().strftime('%H:%M:%S')}</div></div>
                 </div>
             </div>
             
+            <!-- Form Tambah Akun -->
             <div class="add-account-form">
                 <h3 style="margin-bottom: 15px;">➕ Tambah Akun Baru</h3>
                 <form action="/add_account" method="POST" class="form-grid">
@@ -478,10 +474,12 @@ def home():
                 </form>
             </div>
             
+            <!-- Daftar Akun -->
             <div class="account-grid">
                 {generate_account_cards(accounts_list)}
             </div>
             
+            <!-- Search & Filter -->
             <div class="search-section">
                 <div class="search-box">
                     <span class="search-icon">🔍</span>
@@ -490,25 +488,36 @@ def home():
                     </form>
                 </div>
                 <div class="filter-box">
-                    <select class="filter-select" name="service" onchange="window.location.href=updateQuery('service', this.value)">
+                    <select class="filter-select" name="service" onchange="updateFilter('service', this.value)">
                         <option value="">📋 Semua Service</option>
                         {''.join([f'<option value="{s}" {"selected" if filter_service == s else ""}>📱 {s}</option>' for s in sorted(all_services)])}
                     </select>
                 </div>
                 <div class="filter-box">
-                    <select class="filter-select" name="account" onchange="window.location.href=updateQuery('account', this.value)">
+                    <select class="filter-select" name="account" onchange="updateFilter('account', this.value)">
                         <option value="">👤 Semua Akun</option>
                         {''.join([f'<option value="{a["id"]}" {"selected" if filter_account == a["id"] else ""}>👤 {a["username"][:15]}</option>' for a in accounts_list])}
                     </select>
                 </div>
-                <a href="/" class="btn btn-small">Reset</a>
+                <a href="/" class="clear-btn">✕ Reset</a>
                 <span class="result-count">📊 {len(all_logs)} hasil</span>
             </div>
             
+            <!-- Tabel OTP -->
             <div class="otp-section">
                 <h3 style="margin-bottom: 20px;">📨 OTP TERBARU <span style="background:#00f2fe20; padding:4px 12px; border-radius:100px; font-size:12px;">LIVE</span></h3>
                 <table>
-                    <thead><tr><th>WIB</th><th>Akun</th><th>Country</th><th>Number</th><th>Service</th><th>OTP</th><th>Message</th></tr></thead>
+                    <thead>
+                        <tr>
+                            <th>WIB</th>
+                            <th>Akun</th>
+                            <th>Country</th>
+                            <th>Number</th>
+                            <th>Service</th>
+                            <th>OTP</th>
+                            <th>Message</th>
+                        </tr>
+                    </thead>
                     <tbody id="otp-table-body">
                         {generate_otp_rows(all_logs, search_query)}
                     </tbody>
@@ -518,22 +527,28 @@ def home():
         
         <script>
             let eventSource;
+            
             function connectSSE() {{
                 eventSource = new EventSource('/stream');
                 eventSource.onmessage = function(e) {{
                     try {{
                         const data = JSON.parse(e.data);
-                        if (data.otp) location.reload();
+                        if (data.otp) {{
+                            location.reload();
+                        }}
                     }} catch(err) {{}}
                 }};
                 eventSource.onerror = function() {{ setTimeout(connectSSE, 3000); }};
             }}
             
-            function updateQuery(key, value) {{
+            function updateFilter(key, value) {{
                 const url = new URL(window.location.href);
-                if (value) url.searchParams.set(key, value);
-                else url.searchParams.delete(key);
-                return url.toString();
+                if (value) {{
+                    url.searchParams.set(key, value);
+                }} else {{
+                    url.searchParams.delete(key);
+                }}
+                window.location.href = url.toString();
             }}
             
             function loginAccount(accountId) {{
@@ -572,6 +587,9 @@ def home():
     return html
 
 def generate_account_cards(accounts_list):
+    if not accounts_list:
+        return '<div style="grid-column:1/-1; text-align:center; padding:40px; color:#8b949e;">Belum ada akun. Tambah akun di atas!</div>'
+    
     html = ""
     for acc in accounts_list:
         status_class = "online" if acc["status"] else "offline"
@@ -579,21 +597,19 @@ def generate_account_cards(accounts_list):
         <div class="account-card {status_class}">
             <div class="account-status status-{status_class}"></div>
             <h4>{acc['username'][:20]}{'...' if len(acc['username']) > 20 else ''}</h4>
-            <p style="margin-top:8px; color:#8b949e;">Bot: {acc['bot']} | Chat: {acc['chat']}</p>
+            <p style="margin-top:8px; color:#8b949e;">Status: {'🟢 Online' if acc['status'] else '🔴 Offline'}</p>
             <div class="account-actions">
                 <button onclick="loginAccount('{acc['id']}')" class="btn btn-small">Login</button>
                 <button onclick="logoutAccount('{acc['id']}')" class="btn btn-small btn-danger">Logout</button>
-                <a href="/delete_account/{acc['id']}" class="btn btn-small btn-danger" onclick="return confirm('Hapus akun?')">Hapus</a>
+                <a href="/delete_account/{acc['id']}" class="btn btn-small btn-danger" onclick="return confirm('Hapus akun ini?')">Hapus</a>
             </div>
         </div>
         """
-    if not accounts_list:
-        html = "<div style='grid-column:1/-1; text-align:center; padding:40px; color:#8b949e;'>Belum ada akun. Tambah akun di atas!</div>"
     return html
 
 def generate_otp_rows(logs, search_query):
     if not logs:
-        return '<tr><td colspan="7" style="text-align:center; padding:60px; color:#8b949e;">🔍 Belum ada OTP</td></tr>'
+        return '<tr><td colspan="7" class="empty-state">🔍 Belum ada OTP</td></tr>'
     
     rows = ""
     for log in logs[:100]:
@@ -605,7 +621,7 @@ def generate_otp_rows(logs, search_query):
         account = log.get('account_username', 'Unknown')[:15]
         
         if search_query:
-            country = re.sub(f'({re.escape(search_query)})', r'<span class="highlight" style="background:#00f2fe30; border-radius:4px;">\1</span>', country, flags=re.I)
+            country = re.sub(f'({re.escape(search_query)})', r'<span class="highlight">\1</span>', country, flags=re.I)
             number = re.sub(f'({re.escape(search_query)})', r'<span class="highlight">\1</span>', number, flags=re.I)
             otp = re.sub(f'({re.escape(search_query)})', r'<span class="highlight">\1</span>', otp, flags=re.I)
         
@@ -626,13 +642,17 @@ def generate_otp_rows(logs, search_query):
 @app.route('/add_account', methods=['POST'])
 def add_account_route():
     account_id = str(uuid.uuid4())[:8]
-    print(f"\n➕ TAMBAH AKUN BARU: {request.form['username']}")
+    username = request.form['username']
+    password = request.form['password']
+    bot_token = request.form.get('bot_token', '')
+    chat_id = request.form.get('chat_id', '')
+    
     accounts[account_id] = {
         "id": account_id,
-        "username": request.form['username'],
-        "password": request.form['password'],
-        "bot_token": request.form.get('bot_token', ''),
-        "chat_id": request.form.get('chat_id', ''),
+        "username": username,
+        "password": password,
+        "bot_token": bot_token,
+        "chat_id": chat_id,
         "session": None,
         "csrf": None,
         "status": False,
@@ -645,45 +665,39 @@ def add_account_route():
         "created_at": time.time()
     }
     save_accounts(accounts)
-    print(f"✅ Akun ditambahkan: {account_id}")
     return redirect('/')
 
 @app.route('/delete_account/<account_id>')
 def delete_account_route(account_id):
     if account_id in accounts:
-        print(f"\n🗑️ HAPUS AKUN: {accounts[account_id]['username']}")
         del accounts[account_id]
         save_accounts(accounts)
-        print(f"✅ Akun dihapus")
     return redirect('/')
 
 @app.route('/login_account/<account_id>', methods=['POST'])
 def login_account_route(account_id):
     if account_id in accounts:
         acc = accounts[account_id]
-        print(f"\n🔐 Mencoba login untuk: {acc['username']}")
-        success, msg = login_account(account_id, acc['username'], acc['password'])
-        print(f"📝 Result: {success} - {msg}")
-        
+        success, msg = login_account(
+            account_id, 
+            acc['username'], 
+            acc['password'],
+            acc.get('bot_token', ''),
+            acc.get('chat_id', '')
+        )
         if success:
-            print(f"✅ Login BERHASIL! Memulai thread scraper...")
+            # Start thread scraper untuk akun ini
             thread = Thread(target=run_account_scraper, args=(account_id,), daemon=True)
             thread.start()
-            print(f"✅ Thread scraper dimulai untuk {acc['username']}")
-        else:
-            print(f"❌ Login GAGAL: {msg}")
-    
     return redirect('/')
 
 @app.route('/logout_account/<account_id>', methods=['POST'])
 def logout_account_route(account_id):
     if account_id in accounts:
-        print(f"\n🔌 LOGOUT: {accounts[account_id]['username']}")
         accounts[account_id]["status"] = False
         accounts[account_id]["session"] = None
         accounts[account_id]["csrf"] = None
         save_accounts(accounts)
-        print(f"✅ Logout berhasil")
     return redirect('/')
 
 @app.route('/stream')
@@ -705,25 +719,18 @@ def run_account_scraper(account_id):
         return
     
     username = account['username']
-    print(f"\n🚀 STARTING SCRAPER FOR: {username}")
-    loop_count = 0
+    print(f"🚀 Starting scraper for {username}")
     
     while account.get("status"):
-        loop_count += 1
         try:
-            print(f"\n{'='*60}")
-            print(f"🔄 [{username}] LOOP #{loop_count}")
-            print(f"{'='*60}")
-            
             if time.time() - account.get("last_cleanup", 0) > 300:
                 account["sms_cache"] = {}
                 account["sms_counter"] = {}
                 account["range_counter"] = {}
                 account["last_cleanup"] = time.time()
-                print(f"🧹 [{username}] Cache cleared")
+                print(f"🧹 Cache cleared for {username}")
             
             ranges_data = get_ranges_with_count(account_id)
-            print(f"📊 [{username}] Total ranges: {len(ranges_data)}")
             
             for range_item in ranges_data:
                 if not account.get("status"):
@@ -733,15 +740,12 @@ def run_account_scraper(account_id):
                 current_count = range_item["count"]
                 prev_count = account["range_counter"].get(rng, 0)
                 
-                print(f"\n  📌 RANGE: {rng} | current: {current_count} | prev: {prev_count}")
-                
                 if current_count > prev_count:
                     country = clean_country(rng)
-                    print(f"  🔥 RANGE BERUBAH: {country} | {prev_count} → {current_count}")
+                    print(f"\n🔥 RANGE BERUBAH: {country} ({username})")
                     account["range_counter"][rng] = current_count
                     
                     numbers_data = get_numbers_with_count(account_id, rng)
-                    print(f"  📞 Total nomor: {len(numbers_data)}")
                     
                     for number_item in numbers_data:
                         if not account.get("status"):
@@ -752,15 +756,11 @@ def run_account_scraper(account_id):
                         key = f"{rng}-{num}"
                         prev_num_count = account["sms_counter"].get(key, 0)
                         
-                        print(f"\n    📱 Nomor: {mask_number(num)} | count: {num_count} | prev: {prev_num_count}")
-                        
                         if num_count > prev_num_count:
-                            print(f"      📨 SMS baru: {prev_num_count} → {num_count}")
                             account["sms_counter"][key] = num_count
                             
                             all_sms = get_sms_fast(account_id, rng, num)
                             new_sms = all_sms[prev_num_count:]
-                            print(f"      📦 Total SMS baru: {len(new_sms)}")
                             
                             for service, sms, otp in new_sms:
                                 if otp:
@@ -768,33 +768,27 @@ def run_account_scraper(account_id):
                                     if sms_id not in account["sent_cache"]:
                                         masked = mask_number(num)
                                         msg = f"🔔 *NEW OTP*\n🌍 {country}\n📞 `{masked}`\n💬 {service}\n🔐 `{otp}`\n\n{sms[:300]}"
-                                        print(f"      📤 Mengirim OTP {otp} ke Telegram...")
-                                        
                                         if tg_send(account_id, msg):
-                                            if "sent_cache" not in account:
-                                                account["sent_cache"] = []
                                             account["sent_cache"].append(sms_id)
                                             if len(account["sent_cache"]) > 1000:
                                                 account["sent_cache"] = account["sent_cache"][-1000:]
                                             add_otp_log(account_id, country, masked, service, otp, sms)
-                                            print(f"      ✅ OTP {otp} TERKIRIM!")
+                                            print(f"      ✅ OTP: {otp} - {service}")
                     
                     time.sleep(0.5)
-                else:
-                    print(f"  ⏭️ Range tidak berubah")
             
-            print(f"\n⏳ [{username}] Tidur 2 detik...")
             time.sleep(2)
             
         except Exception as e:
-            print(f"❌ ERROR in scraper for {username}: {str(e)}")
+            print(f"❌ Error in scraper for {username}: {e}")
             time.sleep(5)
     
-    print(f"\n🛑 SCRAPER STOPPED FOR: {username}")
+    print(f"🛑 Scraper stopped for {username}")
 
 def run_server():
     app.run(host='0.0.0.0', port=7860, debug=False, threaded=True)
 
+# Start server thread
 Thread(target=run_server, daemon=True).start()
 
 def main():
@@ -803,29 +797,31 @@ def main():
     print("  ⚡ PORT: 7860")
     print(f"  🌐 DOMAIN: {CUSTOM_DOMAIN}")
     print("  📁 Data tersimpan di accounts.json")
-    print("  📋 LOGGING: FULL DETAIL")
     print("="*60 + "\n")
     
-    print(f"📊 Total akun terload: {len(accounts)}")
-    
+    # Login otomatis untuk akun yang sudah login sebelumnya
     for acc_id, acc in accounts.items():
-        print(f"\n📁 Account: {acc['username']}")
-        print(f"   Status: {'ONLINE' if acc.get('status') else 'OFFLINE'}")
-        
         if acc.get("status"):
-            print(f"   🔄 Mencoba login ulang...")
-            success, msg = login_account(acc_id, acc['username'], acc['password'])
+            print(f"🔄 Auto-login untuk {acc['username']}...")
+            success, msg = login_account(
+                acc_id, 
+                acc['username'], 
+                acc['password'],
+                acc.get('bot_token', ''),
+                acc.get('chat_id', '')
+            )
             if success:
                 thread = Thread(target=run_account_scraper, args=(acc_id,), daemon=True)
                 thread.start()
-                print(f"   ✅ {acc['username']} online")
+                print(f"✅ {acc['username']} online")
             else:
-                print(f"   ❌ {acc['username']} offline: {msg}")
+                print(f"❌ {acc['username']} offline: {msg}")
                 acc["status"] = False
                 save_accounts(accounts)
     
     print("\n✅ BOT SIAP! Dashboard: http://localhost:7860")
     
+    # Keep main thread alive
     while True:
         time.sleep(60)