Update app.py

app.py

@@ -85,39 +85,39 @@ def get_ranges_with_count():
             
         date = get_search_date()
         print(f"\n🔍 AMBIL RANGE - Tanggal: {date}")
-        print(f"📤 POST ke: {GET_RANGE_URL}")
         
         r = session.post(GET_RANGE_URL, data={
             "_token": csrf_token,
             "from": date,
             "to": date
-        }, timeout=30)
-        
-        print(f"📊 Response status: {r.status_code}")
-        print(f"📄 Response preview: {r.text[:200]}")
+        }, timeout=15)
         
         soup = BeautifulSoup(r.text, "html.parser")
         ranges_data = []
+        
         items = soup.select(".item")
-        print(f"📦 Ditemukan {len(items)} item range")
+        print(f"📦 Total items: {len(items)}")
         
-        for idx, item in enumerate(items, 1):
+        for item in items:
             try:
-                name_div = item.select_one(".col-sm-4")
-                if not name_div: 
-                    print(f"  {idx}. ❌ Tidak ada name_div")
-                    continue
-                    
-                rng = name_div.get_text(strip=True)
-                print(f"  {idx}. Nama range: {rng}")
+                card = item.select_one(".card[onclick]")
+                if card:
+                    onclick = card.get("onclick", "")
+                    match = re.search(r"getDetials\('(.+?)'\)", onclick)
+                    if match:
+                        rng = match.group(1)
+                    else:
+                        name_div = item.select_one(".col-sm-4")
+                        rng = name_div.get_text(strip=True) if name_div else "UNKNOWN"
+                else:
+                    name_div = item.select_one(".col-sm-4")
+                    rng = name_div.get_text(strip=True) if name_div else "UNKNOWN"
                 
                 count_p = item.select_one(".col-3 .mb-0.pb-0")
                 count = 0
                 if count_p:
-                    count_text = count_p.get_text(strip=True)
-                    print(f"      Count text: '{count_text}'")
                     try:
-                        count = int(count_text)
+                        count = int(count_p.get_text(strip=True))
                     except:
                         count = 0
                 
@@ -125,10 +125,10 @@ def get_ranges_with_count():
                     "name": rng,
                     "count": count
                 })
-                print(f"      ✅ {rng} - {count} SMS")
+                print(f"  ✅ {rng} - {count} SMS")
                 
             except Exception as e:
-                print(f"  ❌ Error parse item {idx}: {e}")
+                print(f"  ❌ Error parse: {e}")
                 continue
         
         return ranges_data
@@ -144,54 +144,62 @@ def get_numbers_with_count(rng):
             
         date = get_search_date()
         print(f"\n    📞 AMBIL NOMOR: {rng}")
-        print(f"    📤 POST ke: {GET_NUMBER_URL}")
         
         r = session.post(GET_NUMBER_URL, data={
             "_token": csrf_token,
             "start": date,
             "end": date,
             "range": rng
-        }, timeout=30)
-        
-        print(f"    📊 Status: {r.status_code}")
+        }, timeout=15)
         
-        if r.status_code != 200:
-            print(f"    ❌ Gagal! Status: {r.status_code}")
-            return []
-            
         soup = BeautifulSoup(r.text, "html.parser")
         numbers_data = []
         
-        divs = soup.find_all("div", onclick=True)
-        print(f"    📦 Ditemukan {len(divs)} div dengan onclick")
+        # METHOD 1: Extract dari onclick attribute
+        for div in soup.find_all("div", onclick=True):
+            onclick = div.get("onclick", "")
+            match = re.search(r"getDetialsNumber\w+\('(\d+)',\s*'(\d+)'\)", onclick)
+            if match:
+                num = match.group(1)
+                id_number = match.group(2)
+                
+                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
+                })
+                print(f"        ✅ {mask_number(num)} - {count} SMS")
         
-        for div in divs:
-            try:
-                onclick = div.get("onclick", "")
-                if "getDetialsNumber" in onclick:
-                    num = div.get_text(strip=True)
-                    print(f"        Nomor ditemukan: {num}")
+        # METHOD 2: Extract dari teks div
+        if len(numbers_data) == 0:
+            for div in soup.find_all("div", class_="col-sm-4"):
+                text = div.get_text(strip=True)
+                if re.match(r'^\d{10,}$', text):
+                    num = text
+                    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
                     
-                    if num and num.isdigit() and len(num) > 5:
-                        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
-                        })
-                        print(f"        ✅ {mask_number(num)} - {count} SMS")
-                        
-            except Exception as e:
-                print(f"        ❌ Error: {e}")
-                continue
+                    numbers_data.append({
+                        "number": num,
+                        "count": count
+                    })
+                    print(f"        ✅ {mask_number(num)} - {count} SMS")
         
         return numbers_data
         
@@ -210,58 +218,40 @@ def get_sms_fast(rng, number):
         if cache_key in sms_cache:
             timestamp, results = sms_cache[cache_key]
             if time.time() - timestamp < 5:
-                print(f"      💾 Cache hit: {len(results)} SMS")
                 return results
         
-        parts = rng.split()
-        range_name = parts[0] + " " + parts[1] if len(parts) >= 2 else rng
-        
         print(f"      📨 AMBIL SMS: {mask_number(number)}")
-        print(f"      📤 POST ke: {GET_SMS_URL}")
+        print(f"      📤 Range: '{rng}'")
         
         r = session.post(GET_SMS_URL, data={
             "_token": csrf_token,
             "start": date,
             "end": date,
             "Number": number,
-            "Range": range_name
+            "Range": rng
         }, timeout=30)
         
-        print(f"      📊 Status: {r.status_code}")
-        
-        if r.status_code != 200:
-            print(f"      ❌ Gagal! Status: {r.status_code}")
-            return []
-            
         soup = BeautifulSoup(r.text, "html.parser")
         results = []
+        
         cards = soup.select("div.card.card-body")
-        print(f"      📦 Ditemukan {len(cards)} SMS cards")
         
-        for idx, card in enumerate(cards, 1):
+        for card in cards:
             try:
                 service = "UNKNOWN"
                 service_div = card.select_one("div.col-sm-4")
                 if service_div:
                     raw = service_div.get_text(strip=True)
                     service = map_service(raw)
-                    print(f"        Card {idx}: Service = {service}")
                 
                 msg_p = card.find("p", class_="mb-0 pb-0")
                 if msg_p:
                     sms = msg_p.get_text(strip=True)
-                    print(f"        SMS: {sms[:50]}...")
                     otp = extract_otp(sms)
                     if otp:
                         results.append((service, sms, otp))
                         print(f"        ✅ OTP: {otp} - {service}")
-                    else:
-                        print(f"        ⚠️ Tidak ada OTP dalam SMS")
-                else:
-                    print(f"        ❌ Tidak ada msg_p")
-                    
-            except Exception as e:
-                print(f"        ❌ Error parse card {idx}: {e}")
+            except:
                 continue
         
         sms_cache[cache_key] = (time.time(), results)
@@ -273,11 +263,17 @@ def get_sms_fast(rng, number):
 
 def extract_otp(text):
     if not text: return None
-    m = re.search(r"\b(\d{4,6})\b", text) 
-    if not m:
-        m = re.search(r"\b(\d{3}[- ]?\d{3})\b", text)
+    
+    # Cari pola 3 digit - 3 digit (530-736)
+    m = re.search(r"\b(\d{3}[- ]?\d{3})\b", text)
     if m:
         return m.group(0).replace("-", "").replace(" ", "")
+    
+    # Cari pola 4-6 digit biasa
+    m = re.search(r"\b(\d{4,6})\b", text) 
+    if m:
+        return m.group(0)
+    
     return None
 
 def clean_country(rng):
@@ -312,7 +308,6 @@ def add_otp_log(country, number, service, otp, sms):
     }
     otp_logs.appendleft(log_entry)
     broadcast_sse(log_entry)
-    print(f"      📊 OTP TERSIMPAN DI DASHBOARD: {otp} - {service}")
     return log_entry
 
 def broadcast_sse(data):
@@ -576,10 +571,6 @@ def main():
         print(f"⏳ Login gagal, percobaan ke-{login_attempts}/5...")
         time.sleep(3)
     
-    if not LOGIN_SUCCESS:
-        print("\n❌❌❌ GAGAL LOGIN! BOT TIDAK BISA JALAN ❌❌❌")
-        print("💡 CEK USERNAME/PASSWORD!")
-    
     last_cleanup = time.time()
     loop_count = 0
     
@@ -606,87 +597,58 @@ def main():
             ranges_data = get_ranges_with_count()
             
             if not ranges_data:
-                print("⚠️ TIDAK ADA DATA RANGE! Cek session atau struktur HTML")
+                print("⚠️ TIDAK ADA DATA RANGE!")
                 time.sleep(5)
                 continue
             
-            print(f"\n📋 RANGES DITEMUKAN: {len(ranges_data)}")
-            
             for range_item in ranges_data:
                 rng = range_item["name"]
                 current_count = range_item["count"]
                 prev_count = range_counter.get(rng, 0)
                 
-                print(f"\n  📌 RANGE: {rng}")
-                print(f"     Current: {current_count} | Previous: {prev_count}")
-                
                 if current_count > prev_count:
                     country = clean_country(rng)
-                    print(f"  🔥🔥🔥 RANGE BERUBAH: {country} 🔥🔥🔥")
-                    print(f"     📊 {prev_count} → {current_count} SMS (baru: {current_count - prev_count})")
+                    print(f"\n🔥 RANGE BERUBAH: {country}")
+                    print(f"   📊 {prev_count} → {current_count} SMS (baru: {current_count - prev_count})")
                     range_counter[rng] = current_count
                     
                     numbers_data = get_numbers_with_count(rng)
                     
-                    if numbers_data:
-                        print(f"     📞 Ditemukan {len(numbers_data)} nomor dengan SMS")
+                    for number_item in numbers_data:
+                        num = number_item["number"]
+                        num_count = number_item["count"]
+                        key = f"{rng}-{num}"
+                        prev_num_count = sms_counter.get(key, 0)
                         
-                        for number_item in numbers_data:
-                            num = number_item["number"]
-                            num_count = number_item["count"]
-                            key = f"{rng}-{num}"
-                            prev_num_count = sms_counter.get(key, 0)
+                        if num_count > prev_num_count:
+                            print(f"   📱 Nomor: {mask_number(num)}")
+                            print(f"      📨 {prev_num_count} → {num_count} SMS (baru: {num_count - prev_num_count})")
+                            sms_counter[key] = num_count
                             
-                            print(f"        📱 Nomor: {mask_number(num)} - Count: {num_count} (prev: {prev_num_count})")
+                            all_sms = get_sms_fast(rng, num)
+                            new_sms = all_sms[prev_num_count:]
                             
-                            if num_count > prev_num_count:
-                                print(f"           📨 {prev_num_count} → {num_count} SMS (baru: {num_count - prev_num_count})")
-                                sms_counter[key] = num_count
-                                
-                                all_sms = get_sms_fast(rng, num)
-                                new_sms = all_sms[prev_num_count:]
-                                
-                                if new_sms:
-                                    print(f"           📦 {len(new_sms)} SMS BARU DITEMUKAN!")
-                                    
-                                    for service, sms, otp in new_sms:
-                                        if otp:
-                                            sms_id = f"{rng}-{num}-{otp}"
-                                            if sms_id not in sent_cache:
-                                                masked = mask_number(num)
-                                                sent_cache.add(sms_id)
-                                                add_otp_log(country, masked, service, otp, sms)
-                                                print(f"           ✅ OTP: {otp} - {service} (DITAMBAHKAN KE DASHBOARD)")
-                                            else:
-                                                print(f"           ⏭️ OTP {otp} sudah ada di cache")
-                                        else:
-                                            print(f"           ⚠️ SMS tanpa OTP")
-                                else:
-                                    print(f"           ⚠️ TIDAK ADA SMS BARU (semua sudah diproses)")
-                            else:
-                                print(f"           ⏭️ Tidak ada SMS baru untuk nomor ini")
-                    else:
-                        print(f"     ⚠️ TIDAK ADA NOMOR dengan SMS di range {country}")
+                            for service, sms, otp in new_sms:
+                                if otp:
+                                    sms_id = f"{rng}-{num}-{otp}"
+                                    if sms_id not in sent_cache:
+                                        masked = mask_number(num)
+                                        sent_cache.add(sms_id)
+                                        add_otp_log(country, masked, service, otp, sms)
+                                        print(f"      ✅ OTP: {otp} - {service}")
                     
-                    print(f"     ✅ Selesai proses {country}")
+                    print(f"   ✅ Selesai proses {country}")
                     time.sleep(0.5)
-                else:
-                    print(f"  ⏭️ RANGE TIDAK BERUBAH (count sama: {current_count})")
             
-            print("\n⏳ Tidur 3 detik sebelum scan ulang...")
-            time.sleep(3)
+            print("\n⏳ Tidur 2 detik...")
+            time.sleep(2)
             
         except Exception as e:
-            print(f"\n❌❌❌ ERROR UTAMA: {str(e)}")
-            print(f"📋 Tipe error: {type(e).__name__}")
-            print("⏳ Coba lagi dalam 5 detik...")
-            time.sleep(5)
+            print(f"❌ Error: {e}")
+            time.sleep(3)
 
 if __name__ == "__main__":
     try:
         main()
     except KeyboardInterrupt:
-        print("\n🛑 BOT STOPPED")
-    except Exception as e:
-        print(f"\n💥 FATAL ERROR: {e}")
-        time.sleep(5)
+        print("\n🛑 BOT STOPPED")