xync-client 0.0.139__tar.gz → 0.0.142__tar.gz

{xync_client-0.0.139/xync_client.egg-info → xync_client-0.0.142}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.139
+Version: 0.0.142
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Abc/PmAgent.py

@@ -6,7 +6,9 @@ from enum import StrEnum
 
 from playwright.async_api import Page, Playwright
 from pyro_client.client.file import FileClient
-from xync_client.loader import TOKEN
+from pyro_client.client.user import UserClient
+
+from xync_client.loader import NET_TOKEN
 from xync_schema.enums import UserStatus
 from xync_schema.models import PmAgent, User
 
@@ -22,24 +24,22 @@ class PmAgentClient(metaclass=ABCMeta):
         OTP_LOGIN = base + "login/otp"
 
     norm: str
-    uid: int
     agent: PmAgent
-    bot: FileClient
+    bot: FileClient | UserClient
     page: Page
     pages: type(StrEnum) = Pages
     last_page: int = 0
     last_active: datetime = datetime.now()
     _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)
+    async def start(self, pw: Playwright, headed: bool = False, userbot: bool = False) -> "PmAgentClient":
+        bot = FileClient(NET_TOKEN)
+        self.bot = UserClient(self.uid, bot) if userbot else bot
         await self.bot.start()
 
-        self.browser = await pw.chromium.launch(channel="chromium-headless-shell", headless=not headed)
+        self.browser = await pw.chromium.launch(
+            channel="chromium" if headed else "chromium-headless-shell", headless=not headed
+        )
         context = await self.browser.new_context(storage_state=self.agent.state)
         self.page = await context.new_page()
         await self.page.goto(self.pages.SEND)  # Оптимистично переходим сразу на страницу отправки
@@ -90,3 +90,4 @@ class PmAgentClient(metaclass=ABCMeta):
     def __init__(self, agent: PmAgent):
         self.agent = agent
         self.uid = agent.user.username_id
+        self.norm = agent.pm.norm

{xync_client-0.0.139 → xync_client-0.0.142}/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-0.0.139 → xync_client-0.0.142}/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-0.0.139 → xync_client-0.0.142}/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()

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Bybit/InAgent.py

@@ -19,7 +19,6 @@ from xync_client.Abc.PmAgent import PmAgentClient
 from xync_schema import models
 from xync_schema.enums import UserStatus, OrderStatus
 
-from xync_client.Pms.Payeer import Client
 from xync_client.Bybit.etype.order import (
     StatusChange,
     CountDown,
@@ -29,7 +28,7 @@ from xync_client.Bybit.etype.order import (
     OrderFull,
     StatusApi,
 )
-from xync_client.loader import TOKEN
+from xync_client.loader import NET_TOKEN
 from xync_client.Abc.InAgent import BaseInAgentClient
 from xync_client.Bybit.agent import AgentClient
 
@@ -407,17 +406,18 @@ async def main():
             person__user__status=UserStatus.ACTIVE,
             person__user__pm_agents__isnull=False,
         )
-        .prefetch_related("ex", "agent", "person__user__pm_agents")
+        .prefetch_related("ex", "agent", "person__user__pm_agents__user", "person__user__pm_agents__pm")
         .first()
     )
 
-    async with FileClient(TOKEN) as b:
+    async with FileClient(NET_TOKEN) as b:
         b: FileClient
         cl: InAgentClient = actor.in_client(b)
         # await cl.agent_client.export_my_ads()
-        payeer_cl = Client(actor.person.user.username_id)
+        # payeer_cl = Client(actor.person.user.username_id)
         for pma in actor.person.user.pm_agents:
-            cl.pmacs[pma.pm_id] = await payeer_cl.start(await async_playwright().start(), False)
+            pcl = pma.client()
+            cl.pmacs[pma.pm_id] = await pcl.start(await async_playwright().start(), False)
         try:
             _ = await cl.start_listen()
         except Exception as e:

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Bybit/agent.py

@@ -43,7 +43,7 @@ from xync_client.Bybit.etype.order import (
     Message,
     Status,
 )
-from xync_client.loader import TORM, TOKEN
+from xync_client.loader import TORM, NET_TOKEN
 
 
 class NoMakerException(Exception):
@@ -1264,7 +1264,7 @@ async def main():
     actor = (
         await models.Actor.filter(ex_id=4, agent__isnull=False).prefetch_related("ex", "agent", "person__user").first()
     )
-    filebot = FileClient(TOKEN)
+    filebot = FileClient(NET_TOKEN)
     await filebot.start()
     # b.add_handler(MessageHandler(cond_start_handler, command("cond")))
     cl: AgentClient = actor.client(filebot)
@@ -1315,10 +1315,10 @@ async def main():
     hist |= papi.history(count=1000, append=list(hist.keys())[-1])
     cl.hist = hist
 
-    cl.completed_orders = await models.Order.filter(status=OrderStatus.completed, transfer__isnull=False).values_list(
-        "exid", flat=True
-    )
-    await cl.get_api_orders()  # 43, 1741294800000, 1749157199999)
+    # cl.completed_orders = await models.Order.filter(status=OrderStatus.completed, transfer__isnull=False).values_list(
+    #     "exid", flat=True
+    # )
+    # await cl.get_api_orders()  # 43, 1741294800000, 1749157199999)
 
     races = await models.Race.filter(started=True).prefetch_related(
         "road__ad__pair_side__pair__cur",

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Bybit/ex.py

@@ -7,7 +7,7 @@ from xync_schema import models, xtype
 from xync_schema.models import Ex, Agent
 
 from xync_client.Abc.Ex import BaseExClient
-from xync_client.loader import TOKEN
+from xync_client.loader import NET_TOKEN
 from xync_client.Bybit.etype import ad
 from xync_client.Abc.xtype import PmEx, MapOfIdsList
 from xync_client.loader import TORM
@@ -114,7 +114,7 @@ class ExClient(BaseExClient):  # Bybit client
 async def main():
     _ = await init_db(TORM, True)
     ex = await Ex.get(name="Bybit")
-    bot: FileClient = FileClient(TOKEN)
+    bot: FileClient = FileClient(NET_TOKEN)
     # await bot.start()
     cl = ExClient(ex, bot)
     await cl.set_pms()

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Gate/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 TOKEN, TORM
+from xync_client.loader import NET_TOKEN, TORM
 from xync_client.Abc.xtype import PmEx, MapOfIdsList
 from xync_client.Gate.etype import ad
 
@@ -93,7 +93,7 @@ class ExClient(BaseExClient):
 async def main():
     _ = await init_db(TORM, True)
     gt = await Ex.get(name="Gate")
-    async with FileClient(TOKEN) as b:
+    async with FileClient(NET_TOKEN) as b:
         cl = ExClient(gt, b)
         await cl.set_pairs()
         pms = await cl.set_coins()

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Gmail/__init__.py

@@ -1,9 +1,9 @@
 from playwright.async_api import Page, Playwright
-from pyro_client.client.bot import BotClient
+from pyro_client.client.file import FileClient
 from pyro_client.client.user import UserClient
 from xync_schema.models import User, Gmail
 
-from xync_client.loader import TOKEN
+from xync_client.loader import NET_TOKEN
 
 
 class GmClient:
@@ -23,7 +23,7 @@ class GmClient:
                 login=input(f"{self.user.last_name} gmail login:"), password=input("password:")
             )
         browser = await pw.chromium.launch(
-            channel="chrome",
+            channel="chrome" if headed else "chromium-headless-shell",
             headless=not headed,
             args=[
                 "--disable-blink-features=AutomationControlled",
@@ -83,8 +83,8 @@ class GmClient:
 
     async def load_bot(self):
         if not self.bot:
-            bot = await BotClient(TOKEN)
-            self.bot = await UserClient(self.uid, bot)
+            bot = FileClient(NET_TOKEN)
+            self.bot = UserClient(self.uid, bot)
         if not self.bot.is_connected:
             await self.bot.start()
 

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Htx/ex.py

@@ -11,7 +11,7 @@ from xync_schema.enums import PmType
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.Abc.xtype import PmEx, MapOfIdsList
 from xync_client.Htx.etype import pm, Country, ad
-from xync_client.loader import TOKEN
+from xync_client.loader import NET_TOKEN
 from xync_client.loader import TORM
 
 
@@ -156,7 +156,7 @@ class ExClient(BaseExClient):
 async def main():
     _ = await init_db(TORM, True)
     ex = await Ex.get(name="Htx")
-    async with FileClient(TOKEN) as b:
+    async with FileClient(NET_TOKEN) as b:
         b: FileClient
         cl = ExClient(ex, b)
         await cl.set_curs()

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/KuCoin/ex.py

@@ -2,7 +2,7 @@ from asyncio import run
 
 from pyro_client.client.file import FileClient
 from x_model import init_db
-from xync_client.loader import TORM, TOKEN
+from xync_client.loader import TORM, NET_TOKEN
 from xync_schema import models
 from xync_schema import xtype
 
@@ -80,7 +80,7 @@ class ExClient(BaseExClient):
 async def main():
     _ = await init_db(TORM, True)
     bg = await models.Ex.get(name="KuCoin")
-    async with FileClient(TOKEN) as b:
+    async with FileClient(NET_TOKEN) as b:
         cl: ExClient = bg.client(b)
         await cl.set_pms()
         await cl.set_coins()

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Mexc/ex.py

@@ -3,7 +3,7 @@ from asyncio import run
 from pyro_client.client.file import FileClient
 from x_model import init_db
 import requests
-from xync_client.loader import TORM, TOKEN
+from xync_client.loader import TORM, NET_TOKEN
 
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.Abc.xtype import PmEx, MapOfIdsList
@@ -90,7 +90,7 @@ class ExClient(BaseExClient):
 
 async def main():
     _ = await init_db(TORM)
-    async with FileClient(TOKEN) as b:
+    async with FileClient(NET_TOKEN) as b:
         ex = await Ex.get(name="Mexc")
         cl = ex.client(b)
         # await ex.curexs.filter(cur__ticker="EUR")

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Okx/ex.py

@@ -1,7 +1,7 @@
 from asyncio import run
 
 from pyro_client.client.file import FileClient
-from pyro_client.loader import TOKEN
+from pyro_client.loader import NET_TOKEN
 from x_model import init_db
 
 from xync_client.Abc.Exception import NoPairOnEx
@@ -102,7 +102,7 @@ class ExClient(BaseExClient):
 async def main():
     _ = await init_db(TORM)
     bg = await models.Ex.get(name="Okx")
-    cl = ExClient(bg, FileClient(TOKEN))
+    cl = ExClient(bg, FileClient(NET_TOKEN))
     await cl.ads("USDT", "EUR", True)
     # curs = await cl.curs()
     # coins = await cl.coins()

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/Pms/Volet/__init__.py

@@ -4,22 +4,20 @@ from asyncio import run, ensure_future
 from decimal import Decimal
 from enum import StrEnum
 from hashlib import sha256
-from typing import Literal
 
 from playwright.async_api import async_playwright, Page, Locator, Position, Playwright  # , FloatRect
 from pyotp import TOTP
 
 # noinspection PyProtectedMember
 from playwright._impl._errors import TimeoutError
-from pyro_client.client.bot import BotClient
 from pyro_client.client.user import UserClient
+from pyrogram.handlers import MessageHandler
 from xync_schema.enums import UserStatus
 from xync_schema.models import Cur, User, PmAgent, Cred, PmCur, Fiat, TopUp
 
 from xync_client.Abc.PmAgent import PmAgentClient
 from xync_client.Gmail import GmClient
 from xync_client.Pms.Volet.api import APIClient
-from xync_client.loader import TOKEN
 
 
 class CaptchaException(Exception): ...
@@ -34,14 +32,6 @@ class NoCodeException(Exception): ...
 class NoMailException(Exception): ...
 
 
-class Pages(StrEnum):
-    base_url = "https://account.volet.com/"
-    LOGIN = base_url + "login"
-    OTP_LOGIN = base_url + "login/otp"
-    HOME = base_url + "pages/transaction"
-    SEND = base_url + "pages/transfer/wallet"
-
-
 def parse_transaction_info(text: str) -> dict[str, str] | None:
     # Поиск ID транзакции
     transaction_id_match = re.search(r"Transaction ID:\s*([\w-]+)", text)
@@ -61,8 +51,12 @@ def parse_transaction_info(text: str) -> dict[str, str] | None:
 
 
 class Client(PmAgentClient):
-    async def _login(self):
-        pass
+    class Pages(StrEnum):
+        base = "https://account.volet.com/"
+        LOGIN = base + "login"
+        OTP_LOGIN = base + "login/otp"
+        # HOME = base + "pages/transaction"
+        SEND = base + "pages/transfer/wallet"
 
     async def check_in(self, amount: int | Decimal | float, cur: str, tid: str | int = None) -> float | None:
         pass
@@ -76,6 +70,8 @@ class Client(PmAgentClient):
     api: APIClient
     page: Page
     gmail: GmClient
+    norm: str = "payeer"
+    pages: type(StrEnum) = Pages
 
     def __init__(self, agent: PmAgent):
         super().__init__(agent)
@@ -118,51 +114,37 @@ class Client(PmAgentClient):
         }
 
     async def start(self, pw: Playwright, headed: bool = False):
-        self.agent = await PmAgent.get(
-            user__username_id=self.uid, user__status__gte=UserStatus.PAY, pm__norm="volet"
-        ).prefetch_related("user__gmail", "user__username__session")
-        # await self.upd_balances()
-        bot = await BotClient(TOKEN)
-        self.bot = await UserClient(self.uid, bot)
-        await self.bot.start()
-
-        browser = await pw.chromium.launch(channel="chrome", headless=not headed, timeout=9000)
-        context = await browser.new_context(storage_state=self.agent.state, locale="en")
-        self.page = await context.new_page()
-        ensure_future(self.gmail.start(pw, headed))
-        await self.go(Pages.HOME)
-        if self.page.url == Pages.LOGIN:
-            await self.login()
-        # elif self.page.url == Pages.OTP_LOGIN:
-        #     await self.login_otp()
-        if self.page.url != Pages.HOME:
-            await self.bot.receive("Not logged in!", photo=await self.page.screenshot())
-            raise Exception(f"User {self.agent.user_id} has not logged in")
-
-    async def wait_for_code(self, typ: Literal["login", "send"]) -> str:
-        code = await self.bot.wait_from(243630567, f"otp_{typ}")
-        return code[-6:]
-
-    async def login(self):
-        await self.page.locator("input#j_username").fill("mixartemev@gmail.com")
+        ensure_future(self.gmail.start(pw, False))
+        return await super().start(pw, False, True)
+
+    async def wait_for_code(self, uid: int, topic: str, hg: tuple[MessageHandler, int]) -> str:
+        code = await self.bot.wait_from(uid, topic, hg)
+        return code and code[-6:]
+
+    async def _login(self):
+        ll = self.page.locator("input#j_username")
+        await ll.fill("mixartemev@gmail.com")
         await self.page.locator("input#j_password").fill("mixfixX98")
+        await self.page.wait_for_timeout(200)
+        await ll.click()
+        volet_bot_id, topic = 243630567, "otp_login"
         await self.page.locator("input#loginToAdvcashButton", has_text="log in").hover()
+        hg = self.bot.subscribe_for(volet_bot_id, topic)  # 243630567 - is volet bot
         await self.page.locator("input#loginToAdvcashButton:not([disabled])", has_text="log in").click()
-        await self.page.wait_for_url(Pages.OTP_LOGIN)
-        await self.login_otp()
-
-    async def login_otp(self):
-        if not (code := await self.wait_for_code("login")):
+        await self.page.wait_for_url(self.pages.OTP_LOGIN)
+        if not (code := await self.wait_for_code(volet_bot_id, topic, hg)):
             await self.bot.receive("no login code", photo=await self.page.screenshot())
             raise NoCodeException(self.agent.user_id)
         await self.page.locator("input#otpId").fill(code)
         await self.page.click("input#checkOtpButton")
-        await self.page.wait_for_url(Pages.HOME)
+        await self.page.wait_for_url(self.pages.SEND)
+
+    async def send(self, dest: str, amount: float, cur: str) -> tuple[int, bytes, float]:
+        curs_map = {"RUB": "Ruble"}
 
-    async def send(self, dest: str, amount: float):
-        await self.go(Pages.SEND)
+        await self.go(self.pages.SEND)
         await self.page.click("[class=combobox-account]")
-        await self.page.click('[class=rf-ulst-itm] b:has-text("Ruble ")')
+        await self.page.click(f'[class=rf-ulst-itm] b:has-text("{curs_map[cur]}") ")')
         await self.page.wait_for_timeout(200)
         await self.page.fill("#srcAmount", str(amount))
         await self.page.fill("#destWalletId", dest)
@@ -182,7 +164,7 @@ class Client(PmAgentClient):
             raise OtpNotSetException(self.agent.user_id)
         await self.page.fill("#securityValue", code)
         await self.page.locator("input[type=submit]", has_text="confirm").click()
-        await self.page.wait_for_url(Pages.SEND)
+        await self.page.wait_for_url(self.pages.SEND)
         await self.page.get_by_role("heading").click()
         slip = await self.page.screenshot(clip={"x": 440, "y": 205, "width": 420, "height": 360})
         await self.bot.receive(f"{amount} to {dest} sent", photo=slip)

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/TgWallet/ex.py

@@ -16,7 +16,7 @@ from xync_client.TgWallet.pyd import (
     _PmsTrait,
     _BaseAd,
 )
-from xync_client.loader import TOKEN, TORM
+from xync_client.loader import NET_TOKEN, TORM
 from xync_client.Abc.Ex import BaseExClient
 from xync_client.Abc.xtype import MapOfIdsList
 from xync_client.TgWallet.auth import AuthClient
@@ -156,7 +156,7 @@ class ExClient(BaseExClient, AuthClient):
 async def _test():
     await init_db(TORM)
     tgex = await models.Ex.get(name="TgWallet")
-    async with FileClient(TOKEN) as b:
+    async with FileClient(NET_TOKEN) as b:
         cl: ExClient = tgex.client(b)
 
         await cl.set_coins()

{xync_client-0.0.139 → xync_client-0.0.142}/xync_client/loader.py

@@ -4,7 +4,7 @@ from xync_schema import models
 
 load_dotenv()
 
-TOKEN = env("TOKEN")
+NET_TOKEN = env("NET_TOKEN")
 PG_DSN = f"postgres://{env('POSTGRES_USER')}:{env('POSTGRES_PASSWORD')}@{env('POSTGRES_HOST', 'xyncdbs')}:{env('POSTGRES_PORT', 5432)}/{env('POSTGRES_DB', env('POSTGRES_USER'))}"
 TORM = {
     "connections": {"default": PG_DSN},

{xync_client-0.0.139 → xync_client-0.0.142/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.139
+Version: 0.0.142
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/client
 Project-URL: Repository, https://gitlab.com/XyncNet/client