Update bot_core.py

bot_core.py

@@ -1,49 +1,55 @@
-# bot-core.py (multi-source + anti-double KOL, tanpa .env)
-import re, time, sys, asyncio, nest_asyncio, logging
+# bot_core.py (no-tier-filter) - modified: removed refresh steps
+import os
+import re
+import time
+import sys
+import asyncio
+import nest_asyncio
+import logging
 from typing import Optional, Tuple
 from telethon import TelegramClient, events
 from telethon.sessions import StringSession
 from telethon.errors.rpcerrorlist import FloodWaitError
 
-# ========= KONFIG MANUAL =========
-import os
-API_ID = int(os.environ.get("API_ID", "0"))
-API_HASH = os.environ.get("API_HASH", "")
-STRING_SESSION = os.environ.get("STRING_SESSION", "")
-nest_asyncio.apply()
-
-if not (API_ID and API_HASH and STRING_SESSION):
-    raise RuntimeError("API_ID/API_HASH/STRING_SESSION belum di-set di Secrets.")
-# Multi-source: langsung list
-SOURCE_CHATS = [
-    "https://t.me/MidasTouchsignalll",
-    
-]
-TARGET_CHAT = "@solana_trojanbot"
-
-AMOUNT_LABEL = ""      # isi kalau mau klik amount tertentu, misal "0.05 SOL"
-RETRY_LABELS = ["Retry", "Try Again", "Rerty", "RETRY", "RE-TRY", "Try again"]
-
-RETRY_MAX_ATTEMPTS    = 12
-RETRY_SLEEP_SECONDS   = 1.2
-RETRY_OVERALL_TIMEOUT = 60
-DEDUP_TTL_MINUTES     = 600   # anti double KOL dalam menit
-
 # ========= LOGGING =========
+LOG_LEVEL = os.environ.get("LOG_LEVEL", "INFO").upper()
 logger = logging.getLogger("midastouch-bot")
 if not logger.handlers:
     handler = logging.StreamHandler(sys.stdout)
     fmt = logging.Formatter(
         fmt="%(asctime)s | %(levelname)-7s | %(message)s",
-        datefmt="%Y-%m-%d %H:%M:%S",
+        datefmt="%(Y-%m-%d %H:%M:%S",
     )
     handler.setFormatter(fmt)
     logger.addHandler(handler)
-logger.setLevel(logging.INFO)
+logger.setLevel(LOG_LEVEL)
+
+# Biar log Telethon ikut muncul saat DEBUG
+logging.getLogger("telethon").setLevel(logging.WARNING if LOG_LEVEL != "DEBUG" else logging.INFO)
+
+# ======== ENV & KONFIG ========
+API_ID   = int(os.environ.get("API_ID", "0"))
+API_HASH = os.environ.get("API_HASH", "")
+STRING_SESSION = os.environ.get("STRING_SESSION", "")
+
+SOURCE_CHAT = os.environ.get("SOURCE_CHAT", "https://t.me/PEPE_Calls28")
+TARGET_CHAT = os.environ.get("TARGET_CHAT", "@solana_trojanbot")
+AMOUNT_LABEL = os.environ.get("AMOUNT_LABEL", "").strip()
+
+RETRY_LABELS = [x.strip() for x in os.environ.get(
+    "RETRY_LABELS", "Retry,Try Again,Rerty,RETRY,RE-TRY,Try again"
+).split(",") if x.strip()]
+RETRY_MAX_ATTEMPTS    = int(os.environ.get("RETRY_MAX_ATTEMPTS", "12"))
+RETRY_SLEEP_SECONDS   = float(os.environ.get("RETRY_SLEEP_SECONDS", "1.2"))
+RETRY_OVERALL_TIMEOUT = float(os.environ.get("RETRY_OVERALL_TIMEOUT", "60"))
+RECENT_CA_TTL_MINUTES = int(os.environ.get("RECENT_CA_TTL_MINUTES", "60"))
+
+if not (API_ID and API_HASH and STRING_SESSION):
+    raise RuntimeError("API_ID/API_HASH/STRING_SESSION belum di-set di Secrets.")
 
 nest_asyncio.apply()
 
-# ========= REGEX =========
+# ======== REGEX ========
 CA_SOL_RE = re.compile(r"\b([1-9A-HJ-NP-Za-km-z]{32,44})(?:pump)?\b")
 CA_EVM_RE = re.compile(r"\b0x[a-fA-F0-9]{40}\b")
 
@@ -51,7 +57,7 @@ BUY_PAT     = re.compile(r"(?i)buy")
 REFRESH_PAT = re.compile(r"(?i)refresh")
 RETRY_PAT   = re.compile(r"(?i)(" + "|".join(map(re.escape, RETRY_LABELS)) + r")") if RETRY_LABELS else re.compile(r"$^")
 
-# ========= UTIL =========
+# ======== UTIL ========
 def _normalize_chat(s: str) -> str:
     if not s:
         return s
@@ -60,20 +66,10 @@ def _normalize_chat(s: str) -> str:
         s = m.group(1)
     return s.lstrip("@")
 
-def _label_chat_from_event(event) -> str:
-    try:
-        ent = event.chat
-        if getattr(ent, "username", None):
-            return f"@{ent.username}"
-        if getattr(ent, "title", None):
-            return ent.title
-    except Exception:
-        pass
-    return f"id:{getattr(event, 'chat_id', 'unknown')}"
-
 def find_first_ca(text: str) -> Optional[Tuple[str, str]]:
     if not text:
         return None
+    # buang quoted > lines dan rapikan whitespace
     t = re.sub(r"(?m)^>.*", "", text)
     t = re.sub(r"\s+", " ", t).strip()
 
@@ -90,22 +86,20 @@ def find_first_ca(text: str) -> Optional[Tuple[str, str]]:
     logger.info("CA  | ditemukan chain=%s addr=%s", chain, addr)
     return chain, addr
 
-# ========= STATE =========
+# ======== STATE ============
 client = TelegramClient(StringSession(STRING_SESSION), API_ID, API_HASH)
 ca_queue: "asyncio.Queue[str]" = asyncio.Queue()
-recent_ca_info: dict[str, tuple[float, str]] = {}
+recent_ca_ts: dict[str, float] = {}
+_worker_task: asyncio.Task | None = None
 
 def _is_recent(addr: str) -> bool:
-    ts_src = recent_ca_info.get(addr)
-    if not ts_src:
-        return False
-    ts, _ = ts_src
-    return (time.time() - ts) < (DEDUP_TTL_MINUTES * 60)
+    ts = recent_ca_ts.get(addr)
+    return bool(ts and (time.time() - ts) < (RECENT_CA_TTL_MINUTES * 60))
 
-def _mark_ca(addr: str, source_label: str):
-    recent_ca_info[addr] = (time.time(), source_label)
+def _mark_ca(addr: str):
+    recent_ca_ts[addr] = time.time()
 
-# ========= BOT FLOW HELPERS =========
+# ======== BOT FLOW HELPERS ========
 async def refresh_message(msg):
     return await client.get_messages(msg.chat_id, ids=msg.id)
 
@@ -122,10 +116,10 @@ async def wait_new_keyboard(chat, *, min_id: int, timeout=25, interval=0.8):
     return None
 
 async def click_first_match(msg, pat) -> bool:
-    if not msg:
+    if not msg or not msg.buttons:
         return False
     msg = await refresh_message(msg)
-    if not getattr(msg, "buttons", None):
+    if not msg.buttons:
         return False
     for i, row in enumerate(msg.buttons):
         for j, btn in enumerate(row):
@@ -158,6 +152,7 @@ async def click_retry_until_gone(anchor_msg, *, baseline_id: int) -> bool:
             await asyncio.sleep(RETRY_SLEEP_SECONDS)
             continue
 
+        # cek pesan baru yang mungkin punya tombol Retry
         msgs = await client.get_messages(TARGET_CHAT, limit=8)
         for m in msgs:
             if m.id >= baseline_id and m.buttons:
@@ -173,6 +168,7 @@ async def click_retry_until_gone(anchor_msg, *, baseline_id: int) -> bool:
     logger.info("RET | selesai (attempts=%d)", attempts)
     return True
 
+# ======== BUY FLOW (modified: removed refresh waits) ========
 async def buy_flow_with_ca(addr: str):
     logger.info("FLOW| start buy_flow CA=%s", addr)
     last = await client.get_messages(TARGET_CHAT, limit=1)
@@ -192,6 +188,7 @@ async def buy_flow_with_ca(addr: str):
             logger.error("KB  | gagal dapat keyboard setelah fallback")
             return
 
+    # pilih amount jika diminta
     if AMOUNT_LABEL:
         ok_amt = await click_first_match(msg_kb, re.compile(re.escape(AMOUNT_LABEL), re.IGNORECASE))
         logger.info("UI  | pilih amount '%s' → %s", AMOUNT_LABEL, "OK" if ok_amt else "MISS")
@@ -201,18 +198,8 @@ async def buy_flow_with_ca(addr: str):
             msg_kb = msg2 or await refresh_message(msg_kb)
             baseline_id = max(baseline_id, getattr(msg_kb, "id", baseline_id))
 
-    logger.info("WAIT| 15s sebelum Refresh #1")
-    await asyncio.sleep(15)
-    ok_r1 = await click_first_match(msg_kb, REFRESH_PAT)
-    logger.info("UI  | Refresh #1 → %s", "OK" if ok_r1 else "MISS")
-
-    logger.info("WAIT| 15s sebelum Refresh #2")
-    await asyncio.sleep(15)
-    msg_kb = await refresh_message(msg_kb)
-    ok_r2 = await click_first_match(msg_kb, REFRESH_PAT)
-    logger.info("UI  | Refresh #2 → %s", "OK" if ok_r2 else "MISS")
-
-    logger.info("STEP| klik BUY")
+    # === LANGSUNG KE BUY (tanpa refresh) ===
+    logger.info("STEP| klik BUY (tanpa refresh)")
     ok_buy = await click_first_match(msg_kb, BUY_PAT)
     if not ok_buy:
         hit = await search_latest_with_button(TARGET_CHAT, BUY_PAT, min_id=baseline_id, limit=10)
@@ -220,7 +207,7 @@ async def buy_flow_with_ca(addr: str):
             msg_kb = hit
             ok_buy = True
             logger.info("UI  | BUY ditemukan di pesan lain")
-    if not ok_buy and getattr(msg_kb, "buttons", None) and msg_kb.buttons[-1]:
+    if not ok_buy and msg_kb.buttons and msg_kb.buttons[-1]:
         try:
             await msg_kb.click(len(msg_kb.buttons) - 1, 0)
             ok_buy = True
@@ -247,40 +234,34 @@ async def buy_flow_with_ca(addr: str):
     await click_retry_until_gone(msg_kb, baseline_id=baseline_id)
     logger.info("DONE| buy_flow selesai untuk CA=%s", addr)
 
-# ========= ACCEPT / QUEUE =========
-def _accept_ca(addr: str, current_source: str) -> bool:
+# ======== ACCEPT / QUEUE ========
+def _accept_ca(addr: str) -> bool:
     if not addr:
         return False
-    info = recent_ca_info.get(addr)
-    if info:
-        ts, first_src = info
-        age = time.time() - ts
-        if age < (DEDUP_TTL_MINUTES * 60):
-            logger.info(
-                "SKIP| CA %s duplikat (age=%.1fs < %ds) pertama dari [%s], sekarang dari [%s]",
-                addr, age, DEDUP_TTL_MINUTES * 60, first_src, current_source
-            )
-            return False
-    _mark_ca(addr, current_source)
+    if _is_recent(addr):
+        logger.info("SKIP| CA %s sudah diproses baru-baru ini", addr)
+        return False
+    _mark_ca(addr)
     return True
 
-# ========= EVENT HANDLER =========
-@client.on(events.NewMessage(chats=[_normalize_chat(s) for s in SOURCE_CHATS]))
-async def on_message_from_sources(event: events.NewMessage.Event):
-    src_label = _label_chat_from_event(event)
+# ======== EVENT HANDLER (no tier filter) ========
+@client.on(events.NewMessage(chats=_normalize_chat(SOURCE_CHAT)))
+async def on_message_from_source(event: events.NewMessage.Event):
     txt = (event.raw_text or "").strip()
-    logger.info("EVNT| pesan baru dari %s (len=%d)", src_label, len(txt))
+    logger.info("EVNT| pesan baru (len=%d)", len(txt))
 
+    # TANPA filter tier — langsung cari CA
     found = find_first_ca(txt)
     if not found:
+        logger.info("INFO| tidak ada CA di pesan ini")
         return
 
     _, addr = found
-    if _accept_ca(addr, src_label):
+    if _accept_ca(addr):
         await ca_queue.put(addr)
-        logger.info("QUEUE| enqueue CA %s (src=%s)", addr, src_label)
+        logger.info("QUEUE| enqueue CA %s", addr)
 
-# ========= LIFECYCLE =========
+# ======== LIFECYCLE ========
 async def _worker():
     while True:
         addr = await ca_queue.get()
@@ -295,12 +276,11 @@ async def _worker():
             ca_queue.task_done()
 
 async def start_bot_background():
-    logger.info("BOOT| starting bot (sources=%s, target=%s, dedup=%d min)",
-                ",".join([_normalize_chat(s) for s in SOURCE_CHATS]),
-                TARGET_CHAT, DEDUP_TTL_MINUTES)
+    logger.info("BOOT| starting bot (source=%s, target=%s, log=%s)",
+                SOURCE_CHAT, TARGET_CHAT, LOG_LEVEL)
     await client.start()
     asyncio.create_task(_worker())
 
 async def stop_bot():
     logger.info("BOOT| stopping bot…")
-    await client.disconnect()
+    await client.disconnect()