xync-client 0.0.114__py3-none-any.whl → 0.0.155__py3-none-any.whl

xync_client/Abc/PmAgent.py

@@ -4,76 +4,77 @@ from datetime import datetime, timedelta
 from decimal import Decimal
 from enum import StrEnum
 
-from playwright.async_api import Page, Playwright
+from PGram import Bot
+from playwright.async_api import Page, Browser
 from pyro_client.client.file import FileClient
-from xync_client.loader import TOKEN
+from pyro_client.client.user import UserClient
+from tortoise.timezone import now
+
 from xync_schema.enums import UserStatus
-from xync_schema.models import PmAgent, User
+from xync_schema.models import PmAgent, User, Transfer
+
+from xync_client.Abc.HasAbotUid import HasAbotUid
 
 
 class LoginFailedException(Exception): ...
 
 
-class PmAgentClient(metaclass=ABCMeta):
+class PmAgentClient(HasAbotUid, metaclass=ABCMeta):
     class Pages(StrEnum):
         base = "https://host"
         LOGIN = base + "login"
         SEND = base + "send"
         OTP_LOGIN = base + "login/otp"
 
+    browser: Browser
     norm: str
-    uid: int
     agent: PmAgent
-    bot: FileClient
+    ubot: FileClient | UserClient = None
     page: Page
     pages: type(StrEnum) = Pages
-    last_page: int = 0
-    last_active: datetime = datetime.now()
+    last_active: datetime = now()
+    with_userbot: bool = False
     _is_started: bool = False
 
-    async def start(self, pw: Playwright, headed: bool = False) -> "PmAgentClient":
-        dct = dict(user__status__gte=UserStatus.PAY, pm__norm=self.norm)
-        if self.uid:
-            dct.update({"user__username_id": self.uid})
-
-        self.bot = FileClient(TOKEN)
-        await self.bot.start()
-
-        self.agent = await PmAgent.get_or_none(**dct).prefetch_related("user__username__session")
-        if not self.agent:
-            await self.bot.send(f"No active users with agent for {self.norm}!", self.uid)
-            raise Exception(f"No active users for {self.norm}!")
-
-        self.browser = await pw.chromium.launch(channel="chrome", headless=not headed)
+    async def start(self) -> "PmAgentClient":
+        if self.with_userbot:
+            self.ubot = UserClient(self.uid)
+            await self.ubot.start()
+        # noinspection PyTypeChecker
         context = await self.browser.new_context(storage_state=self.agent.state)
         self.page = await context.new_page()
-        await self.page.goto(self.pages.SEND)  # Оптимистично переходим сразу на страницу отправки
+        await self.page.goto(self.pages.SEND, wait_until="commit")  # Оптимистично переходим сразу на страницу отправки
         if self.page.url.startswith(self.pages.LOGIN):  # Если перебросило на страницу логина
             await self._login()  # Логинимся
         if not self.page.url.startswith(self.pages.SEND):  # Если в итоге не удалось попасть на отправку
-            await self.bot.send(self.norm + " not logged in!", self.uid, photo=await self.page.screenshot())
+            await self.receive(self.norm + " not logged in!", photo=await self.page.screenshot())
             raise LoginFailedException(f"User {self.agent.user_id} has not logged in")
         loop = get_running_loop()
-        self.last_active = datetime.now()
+        self.last_active = now()
         loop.create_task(self._idle())  # Бесконечно пасёмся в фоне на странице отправки, что бы куки не протухли
         self._is_started = True
         return self
 
+    def get_topup(self, tid: str) -> dict: ...
+
     async def _idle(self):  # todo: не мешать другим процессам, обновлять на другой вкладке?
         while (await User.get(username_id=self.uid)).status >= UserStatus.ACTIVE:
-            await self.page.wait_for_timeout(15 * 1000)
-            if self.last_active < datetime.now() - timedelta(seconds=20):
-                await self.page.reload()
-                self.last_active = datetime.now()
-        await self.bot.send(self.norm + " stoped", self.uid)
+            await self.page.wait_for_timeout(30 * 1000)
+            if self.last_active < now() - timedelta(minutes=1):
+                await self.page.reload(wait_until="commit")
+                self.last_active = now()
+        await self.receive(self.norm + " stoped")
         await self.stop()
 
     async def stop(self):
         # save state
+        # noinspection PyTypeChecker
         self.agent.state = await self.page.context.storage_state()
         await self.agent.save()
         # closing
-        await self.bot.stop()
+        await self.abot.stop()
+        if self.ubot:
+            await self.ubot.stop()
         await self.page.context.close()
         await self.page.context.browser.close()
         self._is_started = False
@@ -82,13 +83,19 @@ class PmAgentClient(metaclass=ABCMeta):
     async def _login(self): ...
 
     @abstractmethod
-    async def send(self, dest, amount: int, cur: str) -> tuple[int, bytes, float]: ...
+    async def send(self, t: Transfer) -> tuple[int, bytes] | float: ...
 
     @abstractmethod  # проверка поступления определенной суммы за последние пол часа (минимум), return точную сумму
-    async def check_in(self, amount: int | Decimal | float, cur: str, tid: str | int = None) -> float | None: ...
+    async def check_in(
+        self, amount: int | Decimal | float, cur: str, dt: datetime, tid: str | int = None
+    ) -> float | None: ...
 
     @abstractmethod  # видео входа в аккаунт, и переход в историю поступлений за последние сутки (минимум)
     async def proof(self) -> bytes: ...
 
-    def __init__(self, uid: int = None):
-        self.uid = uid
+    def __init__(self, agent: PmAgent, browser: Browser, abot: Bot):
+        self.agent = agent
+        self.browser = browser
+        self.abot = abot
+        self.uid = agent.user.username_id
+        self.norm = agent.pm.norm

xync_client/Abc/xtype.py

@@ -3,7 +3,7 @@ from typing import Literal
 from pydantic import BaseModel, model_validator
 from x_model.types import BaseUpd
 from xync_schema.enums import PmType
-from xync_schema.models import Country, Pm, Ex
+from xync_schema.models import Country, Pm, Ex, CredEx
 from xync_schema.xtype import PmExBank
 
 from xync_client.pm_unifier import PmUni
@@ -53,7 +53,9 @@ class BaseOrderReq(BaseModel):
     asset_amount: float | None = None
     fiat_amount: float | None = None
 
-    # todo: mv from to base to special ex class
+    pmex_exid: str = None  # int
+
+    # todo: mv from base to special ex class
     amount_is_fiat: bool = True
     is_sell: bool = None
     cur_exid: int | str = None
@@ -106,3 +108,23 @@ class BaseCad(BaseAdUpdate):
     side: Literal[0, 1]  # 0 - покупка, 1 - продажа
     tokenId: str
     userId: str
+
+
+class GetAds(BaseModel):
+    coin_id: int | str
+    cur_id: int | str
+    is_sell: bool
+    pm_ids: list[int | str] | None = None
+    amount: int | None = None
+
+
+class AdUpd(BaseAdUpdate, GetAds):
+    price: float
+    pm_ids: list[int | str]
+    amount: float
+    premium: float | None = None
+    credexs: list[CredEx] | None = None
+    quantity: float | None = None
+
+    class Config:
+        arbitrary_types_allowed = True

xync_client/Binance/ex.py

@@ -6,7 +6,7 @@ from x_model import init_db
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.Binance.etype import pm, ad
 from xync_client.Abc.xtype import PmEx, MapOfIdsList
-from xync_client.loader import TOKEN, TORM
+from xync_client.loader import NET_TOKEN, TORM
 
 from xync_schema.models import Ex
 from xync_schema import xtype
@@ -139,7 +139,7 @@ class ExClient(BaseExClient):
 async def main():
     _ = await init_db(TORM)
     ex = await Ex.get(name="Binance")
-    async with FileClient(TOKEN) as b:
+    async with FileClient(NET_TOKEN) as b:
         cl = ExClient(ex, b)
         await cl.set_pms()
         await cl.set_coins()

xync_client/BingX/ex.py

@@ -8,7 +8,7 @@ from xync_schema import xtype
 
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.BingX.base import BaseBingXClient
-from xync_client.loader import TOKEN, TORM
+from xync_client.loader import NET_TOKEN, TORM
 from xync_client.Abc.xtype import MapOfIdsList
 from xync_client.BingX.etype import ad, pm
 from xync_client.Abc.xtype import PmEx
@@ -93,7 +93,7 @@ class ExClient(BaseExClient, BaseBingXClient):
 async def main():
     _ = await init_db(TORM, True)
     bg = await Ex.get(name="BingX").prefetch_related("pm_reps")
-    async with FileClient(TOKEN) as b:
+    async with FileClient(NET_TOKEN) as b:
         b: FileClient
         cl = ExClient(bg, b)
         _ads = await cl.ads(

xync_client/BitGet/ex.py

@@ -6,7 +6,7 @@ from xync_schema.models import Ex
 from xync_schema import xtype
 
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.loader import TORM, TOKEN
+from xync_client.loader import TORM, NET_TOKEN
 from xync_client.Abc.xtype import PmEx, MapOfIdsList
 from xync_client.BitGet.etype import ad
 
@@ -94,7 +94,7 @@ class ExClient(BaseExClient):
 async def main():
     _ = await init_db(TORM, True)
     bg = await Ex.get(name="BitGet")
-    cl = ExClient(bg, FileClient(TOKEN))
+    cl = ExClient(bg, FileClient(NET_TOKEN))
     _ads = await cl.ads("USDT", "RUB", False, [])
     await cl.curs()
     await cl.coins()