Update app.py

app.py

@@ -85,8 +85,8 @@ def save_accounts_to_mongodb(accounts_dict):
                 acc_copy = acc.copy()
                 acc_copy.pop("session", None)
                 acc_copy.pop("csrf", None)
-                acc_copy.pop("otp_logs", None)
-                acc_copy.pop("sent_cache", None)
+                if "otp_logs" in acc_copy and len(acc_copy["otp_logs"]) > 100:
+                    acc_copy["otp_logs"] = acc_copy["otp_logs"][:100]
                 acc_copy.pop("sms_cache", None)
                 acc_copy.pop("sms_counter", None)
                 acc_copy.pop("range_counter", None)
@@ -109,7 +109,8 @@ def load_accounts_from_file():
                     data[acc_id]["session"] = None
                     data[acc_id]["csrf"] = None
                     data[acc_id]["status"] = False
-                    data[acc_id]["otp_logs"] = []
+                    if "otp_logs" not in data[acc_id]:
+                        data[acc_id]["otp_logs"] = []
                     data[acc_id]["sent_cache"] = []
                     data[acc_id]["sms_cache"] = {}
                     data[acc_id]["sms_counter"] = {}
@@ -128,8 +129,8 @@ def save_accounts_to_file(accounts_dict):
             acc_copy = acc.copy()
             acc_copy.pop("session", None)
             acc_copy.pop("csrf", None)
-            acc_copy.pop("otp_logs", None)
-            acc_copy.pop("sent_cache", None)
+            if "otp_logs" in acc_copy and len(acc_copy["otp_logs"]) > 100:
+                acc_copy["otp_logs"] = acc_copy["otp_logs"][:100]
             acc_copy.pop("sms_cache", None)
             acc_copy.pop("sms_counter", None)
             acc_copy.pop("range_counter", None)
@@ -151,12 +152,20 @@ app = Flask('')
 app.secret_key = "fourstore-multi-account-secret"
 sse_clients = []
 
+global_otp_logs = []
+
+def get_utc_time():
+    return datetime.now(timezone.utc)
+
 def get_wib_time():
     return datetime.now(timezone.utc) + timedelta(hours=7)
 
+def get_wib_time_str():
+    return get_wib_time().strftime("%H:%M:%S")
+
 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")
+    now_utc = datetime.now(timezone.utc)
+    return now_utc.strftime("%Y-%m-%d")
 
 def login_account(account_id, username, password, bot_token, chat_id):
     try:
@@ -242,22 +251,32 @@ def map_service(raw):
     if 'instagram' in s or 'ig' in s: return "INSTAGRAM"
     if 'tiktok' in s: return "TIKTOK"
     if 'temu' in s: return "TEMU"
+    if 'shopee' in s: return "SHOPEE"
+    if 'tokopedia' in s: return "TOKOPEDIA"
+    if 'grab' in s: return "GRAB"
+    if 'gojek' in s or 'go-jek' in s: return "GOJEK"
     return raw.upper()
 
 def extract_otp(text):
     if not text: return None
-    m = re.search(r"\b(\d{3}[- ]?\d{3})\b", text)
+    m = re.search(r"\b(\d{6})\b", text)
     if m:
-        return m.group(0).replace("-", "").replace(" ", "")
-    m = re.search(r"\b(\d{4,6})\b", text) 
+        return m.group(0)
+    m = re.search(r"\b(\d{4,5})\b", text)
     if m:
         return m.group(0)
+    m = re.search(r"\b(\d{3}[- ]?\d{3})\b", text)
+    if m:
+        return m.group(0).replace("-", "").replace(" ", "")
     digits = re.findall(r'\d+', text)
     for d in digits:
         if 4 <= len(d) <= 6:
             return d
     return None
 
+def generate_otp_id(account_id, rng, number, otp, service):
+    return f"{account_id}-{rng}-{number}-{otp}-{service}"
+
 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"):
@@ -288,7 +307,8 @@ def get_ranges_with_count(account_id):
             })
 
         return ranges_data
-    except:
+    except Exception as e:
+        print(f"Error get_ranges: {e}")
         return []
 
 def get_numbers_with_count(account_id, rng):
@@ -356,7 +376,8 @@ def get_numbers_with_count(account_id, rng):
                     })
 
         return numbers_data
-    except:
+    except Exception as e:
+        print(f"Error get_numbers: {e}")
         return []
 
 def get_sms_fast(account_id, rng, number):
@@ -403,24 +424,49 @@ def get_sms_fast(account_id, rng, number):
 
         account["sms_cache"][cache_key] = (time.time(), results)
         return results
-    except:
+    except Exception as e:
+        print(f"Error get_sms: {e}")
         return []
 
-def add_otp_log(account_id, country, number, service, otp, sms):
+def is_otp_sent(account_id, otp_id):
+    account = accounts.get(account_id)
+    if not account:
+        return True
+    return otp_id in account.get("sent_cache", [])
+
+def mark_otp_sent(account_id, otp_id):
+    account = accounts.get(account_id)
+    if not account:
+        return
+    
+    if "sent_cache" not in account:
+        account["sent_cache"] = []
+    
+    account["sent_cache"].append(otp_id)
+    if len(account["sent_cache"]) > 1000:
+        account["sent_cache"] = account["sent_cache"][-1000:]
+
+def add_otp_log(account_id, country, number, service, otp, sms, otp_id):
     account = accounts.get(account_id)
     if not account:
         return
     
     wib = get_wib_time()
+    wib_str = wib.strftime("%Y-%m-%d %H:%M:%S WIB")
+    time_only = wib.strftime("%H:%M:%S")
+    
     log_entry = {
-        "time": wib.strftime("%H:%M:%S"),
+        "time": time_only,
+        "time_full": wib_str,
+        "timestamp": time.time(),
         "country": country,
         "number": number,
         "service": service,
         "otp": otp,
-        "sms": sms[:80] + "..." if len(sms) > 80 else sms,
+        "sms": sms[:150] + "..." if len(sms) > 150 else sms,
         "account_id": account_id,
-        "account_username": mask_email(account.get("username", "Unknown"))
+        "account_username": mask_email(account.get("username", "Unknown")),
+        "otp_id": otp_id
     }
     
     if "otp_logs" not in account:
@@ -430,7 +476,18 @@ def add_otp_log(account_id, country, number, service, otp, sms):
     if len(account["otp_logs"]) > 100:
         account["otp_logs"] = account["otp_logs"][:100]
     
+    global_otp_logs.insert(0, log_entry)
+    if len(global_otp_logs) > 500:
+        global_otp_logs[:] = global_otp_logs[:500]
+    
     broadcast_sse(log_entry)
+    
+    if mongo_client:
+        save_accounts_to_mongodb(accounts)
+    else:
+        save_accounts_to_file(accounts)
+    
+    print(f"✅ Log ditambahkan: {service} - {otp} - {time_only}")
     return log_entry
 
 def broadcast_sse(data):
@@ -446,15 +503,7 @@ def broadcast_sse(data):
 
 @app.route('/')
 def home():
-    all_logs = []
-    for acc_id, acc in accounts.items():
-        if acc.get("otp_logs"):
-            for log in acc["otp_logs"]:
-                log_copy = log.copy()
-                log_copy["account_username"] = mask_email(acc.get("username", "Unknown"))
-                all_logs.append(log_copy)
-    
-    all_logs = sorted(all_logs, key=lambda x: x.get("time", ""), reverse=True)
+    all_logs = global_otp_logs.copy()
     
     search_query = request.args.get('q', '').lower()
     filter_service = request.args.get('service', '')
@@ -464,15 +513,21 @@ def home():
                     search_query in log.get('country', '').lower() or 
                     search_query in log.get('number', '').lower() or 
                     search_query in log.get('otp', '').lower() or 
-                    search_query in log.get('sms', '').lower()]
+                    search_query in log.get('sms', '').lower() or
+                    search_query in log.get('account_username', '').lower()]
 
     if filter_service:
         all_logs = [log for log in all_logs if log.get('service') == filter_service]
     
     all_services = list(set([log.get('service') for log in all_logs if log.get('service')]))
     
-    total_otp = sum(len(acc.get('sent_cache', [])) for acc in accounts.values())
-    today_otp = len(all_logs)
+    total_otp = len(global_otp_logs)
+    today_otp = len([l for l in global_otp_logs if l.get('time_full', '').startswith(get_wib_time().strftime("%Y-%m-%d"))])
+    
+    service_stats = {}
+    for log in global_otp_logs[:50]:
+        service = log.get('service', 'UNKNOWN')
+        service_stats[service] = service_stats.get(service, 0) + 1
     
     html = f"""
     <!DOCTYPE html>
@@ -513,19 +568,31 @@ def home():
             .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; }}
             
+            .stats-mini {{ display: flex; gap: 12px; flex-wrap: wrap; margin: 10px 0; }}
+            .service-tag {{ background: #1a1f2c; padding: 6px 14px; border-radius: 100px; font-size: 12px; border: 1px solid #2d3540; }}
+            
             .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; }}
-            .service-badge {{ background: #2d3a4a; padding: 6px 14px; border-radius: 100px; font-size: 12px; font-weight: 600; display: inline-block; }}
+            .service-badge {{ padding: 6px 14px; border-radius: 100px; font-size: 12px; font-weight: 600; display: inline-block; }}
             .whatsapp {{ background: #25D36620; color: #25D366; border: 1px solid #25D36640; }}
             .telegram {{ background: #26A5E420; color: #26A5E4; border: 1px solid #26A5E440; }}
+            .google {{ background: #4285F420; color: #4285F4; border: 1px solid #4285F440; }}
+            .facebook {{ background: #1877F220; color: #1877F2; border: 1px solid #1877F240; }}
+            .instagram {{ background: #E4405F20; color: #E4405F; border: 1px solid #E4405F40; }}
+            .tiktok {{ background: #00000020; color: #FFFFFF; border: 1px solid #FFFFFF40; }}
+            .shopee {{ background: #EE4D2D20; color: #EE4D2D; border: 1px solid #EE4D2D40; }}
+            .tokopedia {{ background: #42B54920; color: #42B549; border: 1px solid #42B54940; }}
+            .grab {{ background: #00B14F20; color: #00B14F; border: 1px solid #00B14F40; }}
+            .gojek {{ background: #00880A20; color: #00880A; border: 1px solid #00880A40; }}
             .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); }}
             .toast {{ position: fixed; bottom: 24px; right: 24px; background: #00f2fe; color: #000; padding: 14px 28px; border-radius: 100px; font-weight: 600; z-index: 9999; }}
+            .account-badge {{ background: #2d3a4a; padding: 4px 12px; border-radius: 100px; font-size: 12px; }}
             @keyframes fadeIn {{ from {{ opacity: 0; transform: translateY(-10px); }} to {{ opacity: 1; transform: translateY(0); }} }}
         </style>
     </head>
@@ -534,10 +601,10 @@ def home():
             <div class="header">
                 <div class="header-top">
                     <div class="title">
-                        <h1>OTP MULTI ACCOUNT · FOURSTORE</h1>
-                        <p>{CUSTOM_DOMAIN}</p>
+                        <h1>📱 OTP MULTI ACCOUNT · FOURSTORE</h1>
+                        <p>{CUSTOM_DOMAIN} · {get_wib_time().strftime('%d %B %Y')}</p>
                     </div>
-                    <div class="status-badge">● ONLINE</div>
+                    <div class="status-badge">● ONLINE · 24 JAM</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>
@@ -562,7 +629,7 @@ def home():
                 <div class="search-box">
                     <span class="search-icon">🔍</span>
                     <form action="/" method="get" id="searchForm">
-                        <input type="text" class="search-input" name="q" placeholder="Cari OTP..." value="{request.args.get('q', '')}">
+                        <input type="text" class="search-input" name="q" placeholder="Cari country, nomor, OTP, akun..." value="{request.args.get('q', '')}">
                     </form>
                 </div>
                 <div class="filter-box">
@@ -575,8 +642,12 @@ def home():
                 <span class="result-count">📊 {len(all_logs)} hasil</span>
             </div>
             
+            <div class="stats-mini">
+                {''.join([f'<span class="service-tag">{service}: {count}</span>' for service, count in sorted(service_stats.items())][:8])}
+            </div>
+            
             <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>
+                <h3 style="margin-bottom: 20px;">📨 OTP TERBARU <span style="background:#00f2fe20; padding:4px 12px; border-radius:100px; font-size:12px;">LIVE · 24 JAM</span></h3>
                 <table>
                     <thead>
                         <tr>
@@ -609,7 +680,9 @@ def home():
                         }}
                     }} catch(err) {{}}
                 }};
-                eventSource.onerror = function() {{ setTimeout(connectSSE, 3000); }};
+                eventSource.onerror = function() {{ 
+                    setTimeout(connectSSE, 3000); 
+                }};
             }}
             
             function updateFilter(key, value) {{
@@ -626,7 +699,7 @@ def home():
                 navigator.clipboard.writeText(otp).then(() => {{
                     const toast = document.createElement('div');
                     toast.className = 'toast';
-                    toast.textContent = '✅ OTP copied!';
+                    toast.textContent = '✅ OTP copied: ' + otp;
                     document.body.appendChild(toast);
                     setTimeout(() => toast.remove(), 2000);
                 }});
@@ -639,6 +712,10 @@ def home():
                 if (wibEl) wibEl.textContent = now.toISOString().substr(11, 8);
             }}
             
+            setInterval(() => {{
+                location.reload();
+            }}, 30000);
+            
             connectSSE();
             setInterval(updateTime, 1000);
         </script>
@@ -649,16 +726,17 @@ def home():
 
 def generate_otp_rows(logs, search_query):
     if not logs:
-        return '<tr><td colspan="7" class="empty-state">🔍 Belum ada OTP</td></tr>'
+        return '<tr><td colspan="7" class="empty-state">📭 Belum ada OTP · Menunggu OTP masuk...</td></tr>'
     
     rows = ""
-    for log in logs[:100]:
+    for log in logs[:50]:
         country = log.get('country', '')
         number = log.get('number', '')
         otp = log.get('otp', '')
         sms = log.get('sms', '')
         service = log.get('service', 'UNKNOWN')
         account = log.get('account_username', 'Unknown')
+        time_full = log.get('time_full', '')
         
         if search_query:
             country = re.sub(f'({re.escape(search_query)})', r'<span class="highlight">\1</span>', country, flags=re.I)
@@ -666,15 +744,18 @@ def generate_otp_rows(logs, search_query):
             otp = re.sub(f'({re.escape(search_query)})', r'<span class="highlight">\1</span>', otp, flags=re.I)
         
         service_class = service.lower().replace(' ', '')
+        
+        time_tooltip = f' title="{time_full}"'
+        
         rows += f'''
         <tr class="new-row">
-            <td style="color:#00f2fe;">{log.get('time', '')}</td>
+            <td{time_tooltip} style="color:#00f2fe;">{log.get('time', '')}</td>
             <td><span class="account-badge">{account}</span></td>
             <td>{country}</td>
             <td><span class="number">{number}</span></td>
             <td><span class="service-badge {service_class}">{service}</span></td>
             <td><span class="otp-badge" onclick="copyOTP('{otp}')">{otp}</span></td>
-            <td><div style="max-width:300px; overflow:hidden; text-overflow:ellipsis;" title="{log.get('sms', '')}">{log.get('sms', '')}</div></td>
+            <td><div style="max-width:350px; overflow:hidden; text-overflow:ellipsis;" title="{log.get('sms', '')}">{log.get('sms', '')}</div></td>
         </tr>
         '''
     return rows
@@ -746,6 +827,10 @@ def stream():
                 sse_clients.remove(q)
     return Response(generate(), mimetype="text/event-stream")
 
+@app.route('/api/logs')
+def api_logs():
+    return json.dumps(global_otp_logs[:100])
+
 def run_account_scraper(account_id):
     account = accounts.get(account_id)
     if not account:
@@ -760,7 +845,7 @@ def run_account_scraper(account_id):
         loop_count += 1
         try:
             print(f"\n{'='*60}")
-            print(f"🔄 [{masked}] LOOP #{loop_count}")
+            print(f"🔄 [{masked}] LOOP #{loop_count} - {get_wib_time_str()}")
             print(f"{'='*60}")
             
             if time.time() - account.get("last_cleanup", 0) > 300:
@@ -802,25 +887,31 @@ def run_account_scraper(account_id):
                         if num_count > prev_num_count:
                             print(f"   📱 Nomor: {mask_number(num)}")
                             print(f"      📨 {prev_num_count} → {num_count} SMS")
-                            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 ditemukan: {len(all_sms)}")
                             
-                            for service, sms, otp in new_sms:
+                            for i in range(prev_num_count, len(all_sms)):
+                                service, sms, otp = all_sms[i]
+                                
                                 if otp:
-                                    sms_id = f"{rng}-{num}-{otp}"
-                                    if sms_id not in account["sent_cache"]:
+                                    otp_id = generate_otp_id(account_id, rng, num, otp, service)
+                                    
+                                    if not is_otp_sent(account_id, otp_id):
                                         masked_num = mask_number(num)
                                         msg = f"🔔 *NEW OTP*\n🌍 {country}\n📞 `{masked_num}`\n💬 {service}\n🔐 `{otp}`\n\n{sms[:300]}"
                                         print(f"      📤 Mengirim OTP {otp} ke Telegram...")
                                         
                                         if tg_send(account_id, msg):
-                                            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_num, service, otp, sms)
-                                            print(f"      ✅ OTP: {otp} - {service} TERKIRIM!")
+                                            mark_otp_sent(account_id, otp_id)
+                                            add_otp_log(account_id, country, masked_num, service, otp, sms, otp_id)
+                                            print(f"      ✅ OTP: {otp} - {service} TERKIRIM! (ID: {otp_id})")
+                                        else:
+                                            print(f"      ❌ Gagal mengirim OTP {otp}")
+                                    else:
+                                        print(f"      ⏭️ OTP {otp} sudah pernah dikirim sebelumnya (ID: {otp_id})")
+                            
+                            account["sms_counter"][key] = num_count
                     
                     time.sleep(0.5)
                 else:
@@ -838,13 +929,13 @@ def run_account_scraper(account_id):
 def run_server():
     app.run(host='0.0.0.0', port=7860, debug=False, threaded=True)
 
-# Jalankan server Flask
 Thread(target=run_server, daemon=True).start()
 
 def main():
-    print("\n" + "="*60)
-    print("  🔥 OTP MULTI ACCOUNT - FOURSTORE")
-    print("  ⚡ PORT: 7860")
+    print("\n" + "="*70)
+    print("  🔥 OTP MULTI ACCOUNT - FOURSTORE 🔥")
+    print("="*70)
+    print(f"  ⚡ PORT: 7860")
     print(f"  🌐 DOMAIN: {CUSTOM_DOMAIN}")
     if mongo_client:
         print("  📁 Data tersimpan di MongoDB")
@@ -853,10 +944,20 @@ def main():
     print("  📋 LOGGING: FULL DETAIL")
     print("  🔒 EMAIL SENSOR: AKTIF")
     print("  🤖 AUTO LOGIN: AKTIF")
-    print("  📱 TELEGRAM: HANYA KIRIM OTP (TANPA MENU)")
-    print("="*60 + "\n")
+    print("  📱 TELEGRAM: HANYA KIRIM OTP")
+    print("  🛡️ ANTI DUPLIKAT: AKTIF")
+    print("  🌍 SERVER UTC: AKTIF")
+    print("  ⏰ 24 JAM MONITORING: AKTIF")
+    print("="*70 + "\n")
+    
+    for acc_id, acc in accounts.items():
+        if "otp_logs" in acc and acc["otp_logs"]:
+            for log in acc["otp_logs"]:
+                global_otp_logs.append(log)
+    
+    global_otp_logs.sort(key=lambda x: x.get('timestamp', 0), reverse=True)
+    print(f"📊 Total logs dimuat: {len(global_otp_logs)}")
     
-    # Auto login untuk akun yang sudah login sebelumnya
     for acc_id, acc in accounts.items():
         if acc.get("status"):
             masked = mask_email(acc['username'])
@@ -880,10 +981,19 @@ def main():
                 else:
                     save_accounts_to_file(accounts)
     
-    print("\n✅ BOT SIAP! Dashboard: https://fourstore-otp.hf.space")
+    print("\n" + "="*70)
+    print("✅ BOT SIAP! Dashboard: https://fourstore-otp.hf.space")
+    print("🌍 SERVER MENGGUNAKAN UTC - SEARCH DATE: UTC HARI INI")
+    print("⏰ 24 JAM AKTIF - SEMUA OTP AKAN MUNCUL DI WEB")
+    print("="*70 + "\n")
     
     while True:
-        time.sleep(60)
+        time.sleep(300)
+        if mongo_client:
+            save_accounts_to_mongodb(accounts)
+        else:
+            save_accounts_to_file(accounts)
+        print(f"💾 Auto-save data - {get_wib_time_str()}")
 
 if __name__ == "__main__":
     try: