Update autotrack.py

autotrack.py

@@ -1,36 +1,54 @@
-
-
+# autotrack.py — Unlimited milestones: 1.5× then 2×, 3×, 4×, ...
 import os
 import re
 import time
-import math
 import asyncio
 import aiohttp
+import sqlite3
 from dataclasses import dataclass, field
-from typing import Optional, Dict, List, Tuple
+from typing import Optional, Dict, Tuple
 from datetime import datetime, timezone, timedelta
 
-from telethon import events, TelegramClient
+from telethon import TelegramClient, events
+from telethon.sessions import StringSession, MemorySession
 
 # =========================
 # ENV / CONFIG
 # =========================
+API_ID = int(os.environ.get("API_ID", "0"))
+API_HASH = os.environ.get("API_HASH", "")
+STRING_SESSION = os.environ.get("STRING_SESSION", "")
+
+# Announce ke grup kamu (dipakai juga sebagai sumber pesan)
 TARGET_CHAT = os.environ.get("TARGET_CHAT", "https://t.me/MidasTouchsignalll")
+
+# Polling interval harga
 TRACK_POLL_SECS = int(os.environ.get("TRACK_POLL_SECS", "20"))
 
-MIN_START_MULT = float(os.environ.get("MIN_START_MULT", "1.5"))     # start dari x1.5
-STEP_MULT = float(os.environ.get("STEP_MULT", "0.5"))               # naik 0.5 tiap hit
-USE_MULTIPLICATIVE_STEP = os.environ.get("USE_MULTIPLICATIVE_STEP", "0") == "1"
+# Ambang reply awal (default 1.5×)
+REPLY_FROM_MULTIPLE = float(os.environ.get("REPLY_FROM_MULTIPLE", "1.5"))
+
+# Unlimited mode: selalu lanjut 2×, 3×, 4×, ...
+# Tidak berhenti otomatis
+STOP_WHEN_HIT = False
 
+# Abaikan pesan lebih tua dari (startup - buffer)
 BACKFILL_BUFFER_MINUTES = int(os.environ.get("BACKFILL_BUFFER_MINUTES", "3"))
-BOT_MARKER = os.environ.get("BOT_MARKER", "【MT-AUTOTRACK】")
 
+# Marker antirecursive: ditambahkan ke semua pengumuman bot (milestone)
+BOT_MARKER = "【MT-AUTOTRACK】"
+
+# Lokasi DB milik botsignal (untuk ambil msg_id pesan awal)
+BOTSIGNAL_DB = os.environ.get("BOTSIGNAL_DB", "/tmp/botsignal.db")
+
+# =========================
 # HTTP endpoints
+# =========================
 DEXSCREENER_TOKEN_URL = "https://api.dexscreener.com/latest/dex/tokens/"
 JUPITER_URL = "https://price.jup.ag/v6/price?ids="  # free (Solana only)
 
 # =========================
-# Helpers (formatting)
+# Helpers
 # =========================
 def _fmt_money(x: Optional[float]) -> str:
     if x is None:
@@ -55,6 +73,7 @@ def _fmt_big(x: Optional[float]) -> str:
 # =========================
 CA_SOL_RE = re.compile(r"\b[1-9A-HJ-NP-Za-km-z]{32,48}\b")   # Solana base58 (approx)
 CA_EVM_RE = re.compile(r"\b0x[a-fA-F0-9]{40}\b")             # EVM 0x...
+
 CA_LABEL_RE = re.compile(r"\bCA\s*[:=]\s*(\S+)", re.IGNORECASE)
 
 def extract_ca(text: str) -> Optional[str]:
@@ -68,16 +87,40 @@ def extract_ca(text: str) -> Optional[str]:
             return cand.lower()
         if CA_SOL_RE.fullmatch(cand):
             return cand
-    m2 = CA_EVM_RE.search(text)
+    m2 = CA_EVM_RE.search(text or "")
     if m2:
         return m2.group(0).lower()
-    m3 = CA_SOL_RE.search(text)
+    m3 = CA_SOL_RE.search(text or "")
     if m3:
         return m3.group(0)
     return None
 
+def ca_key_for_db(ca: str) -> Optional[str]:
+    if not ca:
+        return None
+    if CA_EVM_RE.fullmatch(ca):
+        return f"ca:evm:{ca.lower()}"
+    if CA_SOL_RE.fullmatch(ca):
+        return f"ca:sol:{ca}"
+    return None
+
+def lookup_origin_msg_id(keyword: str) -> Optional[int]:
+    """Ambil msg_id pertama dari DB botsignal untuk keyword entitas CA."""
+    try:
+        conn = sqlite3.connect(BOTSIGNAL_DB)
+        cur = conn.cursor()
+        cur.execute("SELECT msg_id FROM last_posted WHERE keyword = ?", (keyword,))
+        row = cur.fetchone()
+        conn.close()
+        if row and isinstance(row[0], int):
+            return row[0]
+        return None
+    except Exception as e:
+        print(f"[TRACK][DB] lookup error: {e}")
+        return None
+
 # =========================
-# Tracker core (generator milestones)
+# Tracker core (UNLIMITED)
 # =========================
 @dataclass
 class TrackItem:
@@ -87,24 +130,18 @@ class TrackItem:
     entry_mcap: Optional[float] = None
     symbol_hint: Optional[str] = None
     source_link: Optional[str] = None
-    poll_secs: int = TRACK_POLL_SECS
-    # generator state
-    next_target: float = field(default_factory=lambda: max(1.5, MIN_START_MULT))
+    poll_secs: int = 20
+    next_milestone: float = field(default_factory=lambda: REPLY_FROM_MULTIPLE)
     started_at: float = field(default_factory=time.time)
 
 class PriceTracker:
-    """
-    Milestone tanpa batas.
-    - next_target dimulai dari MIN_START_MULT (default 1.5).
-    - Saat ratio >= next_target → announce, lalu next_target += STEP_MULT (atau *= (1+STEP) jika USE_MULTIPLICATIVE_STEP=1).
-    """
     def __init__(self, client: TelegramClient, announce_chat):
         self.client = client
         self.announce_chat = announce_chat
         self._tasks: Dict[str, asyncio.Task] = {}
         self._items: Dict[str, TrackItem] = {}
 
-    # ---------- HTTP ----------
+    # -------- HTTP helpers --------
     async def _get(self, url: str, headers: Optional[Dict[str, str]] = None, timeout: int = 8):
         tout = aiohttp.ClientTimeout(total=timeout)
         async with aiohttp.ClientSession(timeout=tout, headers=headers) as sess:
@@ -114,9 +151,6 @@ class PriceTracker:
                 return await r.json()
 
     async def _dexscreener_price(self, ca: str) -> Optional[Tuple[Optional[float], Optional[str], Optional[float]]]:
-        """
-        Return (priceUsd, symbol, marketCapUsd/FDV) from 'best pair' by highest USD liquidity.
-        """
         data = await self._get(DEXSCREENER_TOKEN_URL + ca)
         if not data:
             return None
@@ -137,7 +171,6 @@ class PriceTracker:
         return (price, symbol, mcap)
 
     async def _jupiter_price(self, ca: str) -> Optional[float]:
-        """Fallback for Solana via Jupiter."""
         try:
             data = await self._get(JUPITER_URL + ca)
             if not data:
@@ -151,51 +184,44 @@ class PriceTracker:
             return None
 
     async def _get_snapshot(self, ca: str) -> Optional[Dict[str, Optional[float]]]:
-        """Return dict {price, mcap, symbol_hint} from Dexscreener then Jupiter fallback."""
         res = await self._dexscreener_price(ca)
         if res:
             price, sym, mcap = res
             if price is None:
                 jp = await self._jupiter_price(ca)
                 price = jp if jp is not None else None
-            return {"price": price, "symbol_hint": sym, "mcap": mcap}
+            return {"price": price, "mcap": mcap, "symbol_hint": sym}
         jp = await self._jupiter_price(ca)
         if jp is not None:
-            return {"price": jp, "symbol_hint": None, "mcap": None}
+            return {"price": jp, "mcap": None, "symbol_hint": None}
         return None
 
-    # ---------- Announce ----------
+    # -------- Announce helpers --------
     def _name(self, item: TrackItem) -> str:
         s = item.symbol_hint or ""
         return f"{s} ({item.ca[:4]}…{item.ca[-4:]})" if s else item.ca
 
-    async def _say(self, text: str):
+    async def _send_reply_to_origin(self, ca: str, text: str):
         try:
-            await self.client.send_message(self.announce_chat, f"{text}\n\n{BOT_MARKER}", link_preview=False)
+            key = ca_key_for_db(ca)
+            reply_to_id = lookup_origin_msg_id(key) if key else None
+            if reply_to_id:
+                await self.client.send_message(self.announce_chat, f"{text}\n\n{BOT_MARKER}", reply_to=reply_to_id, link_preview=False)
+            else:
+                await self.client.send_message(self.announce_chat, f"{text}\n\n{BOT_MARKER}", link_preview=False)
         except Exception as e:
-            print(f"[TRACK] announce failed: {e}")
+            print(f"[TRACK] reply failed: {e}")
 
-    def _start_text(self, item: TrackItem, basis_label: str) -> str:
-        entry_disp = _fmt_big(item.entry_mcap) if item.basis == "mcap" else _fmt_money(item.entry_price)
-        return (
-            "💎 [MidasTouch Signal] 💎\n"
-            "New contract detected:\n\n"
-            f"CA: `{item.ca}`\n\n"
-            f"Tracking Basis: **{basis_label}**\n"
-            f"Entry: {entry_disp} • Next milestone: {item.next_target:.2f}×\n"
-            + (f"🔗 {item.source_link}\n" if item.source_link else "")
-            + "\nRemember: This is a signal, not financial advice.\n"
-            "Stay safe, stay golden ✨"
-        )
-
-    def _milestone_text(self, item: TrackItem, hit_level: float, ratio: float, cur_price: Optional[float], cur_mcap: Optional[float]) -> str:
+    def _milestone_text(self, item: TrackItem, m: float, ratio: float,
+                        cur_price: Optional[float], cur_mcap: Optional[float]) -> str:
+        dexs_link = f"https://dexscreener.com/token/{item.ca}"
+        axiom_link = "https://axiom.trade/@1144321"
         if item.basis == "mcap":
             change = f"{_fmt_big(item.entry_mcap)} → {_fmt_big(cur_mcap)}  (~{ratio:.2f}×)"
-            milestone_line = f"Milestone reached: **{hit_level:.2f}× Market Cap**"
+            milestone_line = f"Milestone reached: **{m}× Market Cap**"
         else:
             change = f"{_fmt_money(item.entry_price)} → {_fmt_money(cur_price)}  (~{ratio:.2f}×)"
-            milestone_line = f"Milestone reached: **{hit_level:.2f}× Price**"
-
+            milestone_line = f"Milestone reached: **{m}× Price**"
         elapsed = int(time.time() - item.started_at)
         mm, ss = divmod(elapsed, 60)
         return (
@@ -204,18 +230,20 @@ class PriceTracker:
             f"{self._name(item)}\n"
             f"{change}\n"
             f"⏱️ {mm}m {ss}s since call\n"
-            + (f"🔗 {item.source_link}\n" if item.source_link else "")
-            + f"CA: `{item.ca}`\n\n"
-            "Remember: This is a signal, not financial advice.\n"
-            "Stay safe, stay golden ✨"
+            f"🔎 [Dexscreener]({dexs_link})\n"
+            f"🛒 [Trade on Axiom]({axiom_link})\n"
+            f"CA: `{item.ca}`"
         )
 
-    # ---------- Loop ----------
+    def _next_target_after(self, current_target: float) -> float:
+        # Setelah 1.5×, lanjut integer berikutnya: 2×, 3×, 4×, ...
+        return 2.0 if current_target < 2.0 else current_target + 1.0
+
+    # -------- Loop --------
     async def _loop(self, item: TrackItem):
-        # init snapshot
         snap = await self._get_snapshot(item.ca)
         if not snap:
-            await self._say(f"⚠️ Failed to start tracking for `{item.ca}` (no initial price/mcap).")
+            print(f"[TRACK] init snapshot failed for {item.ca}")
             return
 
         if item.entry_price is None:
@@ -225,16 +253,9 @@ class PriceTracker:
         if not item.symbol_hint and snap.get("symbol_hint"):
             item.symbol_hint = snap.get("symbol_hint")
 
-        # Jika basis mcap tapi tidak ada mcap → fallback ke price
         if item.basis == "mcap" and not item.entry_mcap:
             item.basis = "price"
 
-        # Pastikan next_target minimal MIN_START_MULT dan > 1.0
-        item.next_target = max(MIN_START_MULT, 1.0001)
-
-        basis_label = "Market Cap" if item.basis == "mcap" else "Price"
-        await self._say(self._start_text(item, basis_label))
-
         while True:
             snap = await self._get_snapshot(item.ca)
             if not snap:
@@ -246,7 +267,6 @@ class PriceTracker:
             if not item.symbol_hint and snap.get("symbol_hint"):
                 item.symbol_hint = snap.get("symbol_hint")
 
-            # ratio
             if item.basis == "mcap":
                 if not (item.entry_mcap and cur_mcap):
                     await asyncio.sleep(item.poll_secs)
@@ -258,88 +278,132 @@ class PriceTracker:
                     continue
                 ratio = (cur_price / item.entry_price) if item.entry_price > 0 else 0.0
 
-            # --- GENERATOR TANPA BATAS ---
-            # Kirim semua milestone yang terlewati (kalau harga "loncat")
-            # contoh: next_target 2.0 tapi ratio 2.7 → kirim 2.0 dan 2.5
-            hits_this_poll = 0
-            while ratio >= item.next_target:
-                # Anti spam: batasi hit per poll (optional)
-                if hits_this_poll >= 4:
-                    break
-                hit_level = item.next_target
-                await self._say(self._milestone_text(item, hit_level, ratio, cur_price, cur_mcap))
-                # next target
-                if USE_MULTIPLICATIVE_STEP:
-                    # multiplicative: misal STEP_MULT=0.5 => next *= 1.5
-                    item.next_target = round(item.next_target * (1.0 + STEP_MULT), 6)
-                else:
-                    # additive: next += 0.5
-                    item.next_target = round(item.next_target + STEP_MULT, 6)
-                hits_this_poll += 1
+            # Unlimited milestones
+            while ratio >= item.next_milestone:
+                text = self._milestone_text(item, item.next_milestone, ratio, cur_price, cur_mcap)
+                await self._send_reply_to_origin(item.ca, text)
+                # Naikkan target ke milestone berikut
+                item.next_milestone = self._next_target_after(item.next_milestone)
 
             await asyncio.sleep(item.poll_secs)
 
-    # ---------- Public ----------
+    # -------- Public --------
     def is_tracking(self, ca: str) -> bool:
-        return ca in self._tasks and not self._tasks[ca].done()
-
-    async def start(self, ca: str, basis: str = "mcap", source_link: Optional[str] = None, symbol_hint: Optional[str] = None, poll_secs: Optional[int] = None):
+        t = self._tasks.get(ca)
+        return bool(t) and not t.done()
+
+    async def start(self, ca: str, *, basis: str = "mcap",
+                    entry_price: Optional[float] = None,
+                    entry_mcap: Optional[float] = None,
+                    poll_secs: int = 20,
+                    source_link: Optional[str] = None,
+                    symbol_hint: Optional[str] = None):
+        ca = ca.strip()
         if self.is_tracking(ca):
             return
-        item = TrackItem(ca=ca, basis=basis, source_link=source_link, symbol_hint=symbol_hint)
-        if poll_secs:
-            item.poll_secs = poll_secs
-        task = asyncio.create_task(self._loop(item))
-        self._tasks[ca] = task
+        item = TrackItem(
+            ca=ca,
+            basis=basis.lower(),
+            entry_price=entry_price,
+            entry_mcap=entry_mcap,
+            poll_secs=poll_secs,
+            source_link=source_link,
+            symbol_hint=symbol_hint,
+            next_milestone=REPLY_FROM_MULTIPLE,
+        )
+        self._tasks[ca] = asyncio.create_task(self._loop(item))
+
 
 # =========================
-# Wiring ke Telethon: setup_autotrack(client)
+# Setup: attach to existing client from botsignal
 # =========================
-def setup_autotrack(client: TelegramClient):
-    """
-    Pasang handler yang:
-    - Mendengar pesan BARU dari TARGET_CHAT kamu.
-    - Ekstrak CA dari teks.
-    - Mulai tracking otomatis bila belum berjalan.
-    - Skip pesan yang berasal dari bot sendiri (ada BOT_MARKER).
-    """
-    tracker = PriceTracker(client, announce_chat=TARGET_CHAT)
-    started_at = datetime.now(timezone.utc)
+def setup_autotrack(shared_client: TelegramClient, announce_chat: str | None = None):
+    global client, tracker, startup_time_utc
+    client = shared_client
+    ac = announce_chat or TARGET_CHAT
+    tracker = PriceTracker(client, announce_chat=ac)
+    startup_time_utc = datetime.now(timezone.utc)
+    client.add_event_handler(on_new_message, events.NewMessage(chats=(TARGET_CHAT,)))
+    print("[AUTOTRACK] attached to shared client; listening on", TARGET_CHAT)
 
-    @client.on(events.NewMessage(chats=TARGET_CHAT))
-    async def _on_new_message(ev: events.NewMessage.Event):
-        msg = ev.message
-        # Hindari recursive: jika pesan berisi marker bot, abaikan
-        if msg.raw_text and BOT_MARKER in msg.raw_text:
-            return
+# =========================
+# Client bootstrap
+# =========================
+def build_client() -> TelegramClient:
+    if STRING_SESSION:
+        print(">> Using StringSession (persistent).")
+        return TelegramClient(StringSession(STRING_SESSION), API_ID, API_HASH)
+    print(">> Using MemorySession (login each run).")
+    return TelegramClient(MemorySession(), API_ID, API_HASH)
+
+client: TelegramClient | None = None
+startup_time_utc = None
+me_user_id: Optional[int] = None
+tracker: PriceTracker | None = None
 
-        # Hindari backfill pesan lama di awal start
-        if msg.date:
-            if msg.date.tzinfo is None:
-                msg_dt = msg.date.replace(tzinfo=timezone.utc)
-            else:
-                msg_dt = msg.date.astimezone(timezone.utc)
-            if msg_dt < (started_at - timedelta(minutes=BACKFILL_BUFFER_MINUTES)):
-                return
+# =========================
+# Event handler: ONLY your group
+# =========================
+CUTOFF_BUFFER = timedelta(minutes=BACKFILL_BUFFER_MINUTES)
+
+def _is_old_message(msg_dt: Optional[datetime]) -> bool:
+    if not isinstance(msg_dt, datetime):
+        return False
+    return msg_dt.replace(tzinfo=timezone.utc) < (startup_time_utc - CUTOFF_BUFFER)
+
+def _is_bot_own_message(event) -> bool:
+    txt = (event.raw_text or "") if hasattr(event, "raw_text") else ""
+    return BOT_MARKER in (txt or "")
 
-        text = (msg.raw_text or "").strip()
+async def on_new_message(event):
+    try:
+        if _is_bot_own_message(event):
+            return
+        msg = event.message
+        if _is_old_message(getattr(msg, "date", None)):
+            return
+        text = msg.message or (getattr(msg, "raw_text", None) or "")
         ca = extract_ca(text)
         if not ca:
             return
-
-        # Link sumber (opsional)
-        src_link = None
+        # Optional: link back to source (tidak dipakai di teks sekarang, tapi disimpan kalau perlu)
+        source_link = None
         try:
-            src_link = await client.get_messages(TARGET_CHAT, ids=msg.id)
-            if getattr(src_link, "id", None) is not None:
-                # gunakan t.me link standar (public group disarankan)
-                src_link = f"https://t.me/{ev.chat.username}/{msg.id}" if getattr(ev.chat, "username", None) else None
+            chat = await event.get_chat()
+            uname = getattr(chat, "username", None)
+            mid = getattr(msg, "id", None)
+            if uname and mid:
+                source_link = f"https://t.me/{uname}/{mid}"
         except:
-            src_link = None
-
-        # Start tracking bila belum
-        if not tracker.is_tracking(ca):
-            # default basis mcap; fallback ke price terjadi di _loop jika mcap tidak tersedia
-            await tracker.start(ca=ca, basis="mcap", source_link=src_link)
+            pass
+        await tracker.start(
+            ca=ca,
+            basis="mcap",
+            poll_secs=TRACK_POLL_SECS,
+            source_link=source_link,
+        )
+    except Exception as e:
+        print(f"[AUTOTRACK] error: {e}")
 
-    return tracker  # optional: bisa dipakai kalau mau manual query status
+# =========================
+# Entrypoint
+# =========================
+async def main():
+    global client, tracker, startup_time_utc
+    if client is None:
+        client = build_client()
+    startup_time_utc = datetime.now(timezone.utc)
+    tracker = PriceTracker(client, announce_chat=TARGET_CHAT)
+    await client.start()
+    try:
+        me = await client.get_me()
+        globals()["me_user_id"] = int(getattr(me, "id", 0))
+        print(f">> Logged in as: {getattr(me, 'username', None) or me_user_id}")
+    except Exception as e:
+        print(f"Warning: cannot resolve self id: {e}")
+    print(f"AutoTrack running (unlimited milestones; first reply ≥ {REPLY_FROM_MULTIPLE}×). Listening ONLY your group for NEW messages...")
+    client.add_event_handler(on_new_message, events.NewMessage(chats=(TARGET_CHAT,)))
+    await client.run_until_disconnected()
+
+if __name__ == "__main__":
+    asyncio.run(main())