xync-client 0.0.138__py3-none-any.whl → 0.0.141__py3-none-any.whl

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,29 +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.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="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)  # Оптимистично переходим сразу на страницу отправки
@@ -59,6 +54,8 @@ class PmAgentClient(metaclass=ABCMeta):
         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(30 * 1000)
@@ -90,5 +87,7 @@ class PmAgentClient(metaclass=ABCMeta):
     @abstractmethod  # видео входа в аккаунт, и переход в историю поступлений за последние сутки (минимум)
     async def proof(self) -> bytes: ...
 
-    def __init__(self, uid: int = None):
-        self.uid = uid
+    def __init__(self, agent: PmAgent):
+        self.agent = agent
+        self.uid = agent.user.username_id
+        self.norm = agent.pm.norm

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()

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/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/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/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/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:
@@ -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/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/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/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/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/Pms/Payeer/__init__.py

@@ -19,7 +19,7 @@ from cryptography.hazmat.primitives.ciphers.modes import CBC
 from payeer_api import PayeerAPI
 from playwright.async_api import async_playwright, Playwright, Error
 from playwright._impl._errors import TimeoutError
-from xync_schema.models import TopUp, TopUpAble
+from xync_schema.models import TopUp, TopUpAble, PmAgent
 
 from xync_client.loader import TORM
 
@@ -65,11 +65,10 @@ class Client(PmAgentClient):
     pages: type(StrEnum) = Pages
     api: PayeerAPI
 
-    async def start(self, pw: Playwright, headed: bool = False) -> "PmAgentClient":
-        await super().start(pw, headed)
+    def __init__(self, agent: PmAgent):
+        super().__init__(agent)
         if api_id := self.agent.auth.get("api_id"):
             self.api = PayeerAPI(self.agent.auth["email"], api_id, self.agent.auth["api_sec"])
-        return self
 
     async def _login(self):
         await login(self.agent)
@@ -121,6 +120,17 @@ class Client(PmAgentClient):
         url = "https://payeer.com/merchant/?" + urlencode(params)
         return url, None
 
+    def get_topup(self, tid: str) -> dict:
+        hi = self.api.get_history_info(tid)
+        ti = self.api.shop_order_info(hi["params"]["SHOP_ID"], hi["params"]["ORDER_ID"])["info"]
+        return ti["status"] == "execute" and {
+            "pmid": ti["id"],
+            "from_acc": hi["params"]["ACCOUNT_NUMBER"],
+            "oid": hi["params"]["ORDER_ID"],
+            "amount": int(float(ti["sumOut"]) * 100),
+            "ts": datetime.strptime(ti["dateCreate"], "%d.%m.%Y %H:%M:%S") - timedelta(hours=3),
+        }
+
     async def send(self, dest: str, amount: int, cur: str) -> tuple[int, bytes, int] | int:
         self.last_active = datetime.now()
         page = self.page
@@ -204,8 +214,13 @@ async def main(uid: int):
     from x_model import init_db
 
     _ = await init_db(TORM, True)
+    agent = await PmAgent.get_or_none(pm__norm="payeer", user__username_id=uid).prefetch_related(
+        "user__username__session", "pm"
+    )
+    if not agent:
+        raise Exception(f"No active user #{uid} with agent for volet!")
+    pyr = agent.client()
     playwright: Playwright = await async_playwright().start()
-    pyr = Client(uid)
     try:
         dest, amount, cur = "P79619335", 4, "RUB"
         ta = await TopUpAble.get(pm__norm="payeer")

xync_client/Pms/Volet/__init__.py

@@ -1,22 +1,23 @@
 import logging
 import re
 from asyncio import run, ensure_future
+from decimal import Decimal
 from enum import StrEnum
-from typing import Literal
+from hashlib import sha256
 
 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
+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): ...
@@ -31,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)
@@ -57,65 +50,101 @@ def parse_transaction_info(text: str) -> dict[str, str] | None:
     return None
 
 
-class Client:
+class Client(PmAgentClient):
+    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
+
+    async def proof(self) -> bytes:
+        pass
+
     uid: int
     agent: PmAgent
     bot: UserClient
     api: APIClient
     page: Page
     gmail: GmClient
+    norm: str = "payeer"
+    pages: type(StrEnum) = Pages
+
+    def __init__(self, agent: PmAgent):
+        super().__init__(agent)
+        self.gmail = GmClient(self.uid)
+        self.api = APIClient(self.agent.auth["api"], self.agent.auth["password"], self.agent.auth["login"])
 
-    def __init__(self, uid: int):
-        self.uid = uid
-        self.gmail = GmClient(uid)
+    @staticmethod
+    def form_redirect(topup: TopUp) -> tuple[str, dict | None]:
+        ac_account_email = topup.topupable.auth["ac_account_email"]
+        ac_sci_name = topup.topupable.auth["ac_sci_name"]
+        ac_order_id = str(topup.id)
+        ac_amount = "{0:.2f}".format(topup.amount * 0.01)
+        ac_currency = topup.cur.ticker
+        ac_comments = "XyncPay top up"
+        secret = topup.topupable.auth["secret"]
+        data = [ac_account_email, ac_sci_name, ac_amount, ac_currency, secret, ac_order_id]
+
+        ac_sign = sha256(":".join(data).encode()).hexdigest()
+
+        params = {
+            "ac_account_email": ac_account_email,
+            "ac_sci_name": ac_sci_name,
+            "ac_amount": ac_amount,
+            "ac_currency": ac_currency,
+            "ac_order_id": ac_order_id,
+            "ac_sign": ac_sign,
+            "ac_comments": ac_comments,
+        }
+        url = "https://account.volet.com/sci/"
+        return url, params
+
+    def get_topup(self, tid: str) -> dict:
+        t = self.api.check_by_id(tid)
+        return t["status"] == "COMPLETED" and {
+            "pmid": t["id"],
+            "from_acc": t["walletSrcId"],
+            "oid": t["orderId"],
+            "amount": int(t["amount"] * 100),
+            "ts": t["updatedTime"],
+        }
 
     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")
-        self.api = APIClient(self.agent.auth["api"], self.agent.auth["password"], self.agent.auth["login"])
-        # 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, True))
+        return await super().start(pw, True, 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):
-        await self.go(Pages.SEND)
+    async def send(self, dest: str, amount: float, cur: str) -> tuple[int, bytes, float]:
+        curs_map = {"RUB": "Ruble"}
+
+        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)
@@ -135,7 +164,7 @@ class Client:
             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)
@@ -223,7 +252,13 @@ async def _test():
     logging.basicConfig(level=logging.DEBUG)
     uid = 193017646
     playwright: Playwright = await async_playwright().start()
-    va = Client(uid)
+    agent = await PmAgent.get_or_none(pm__norm="volet", user__username_id=uid).prefetch_related(
+        "user__username__session"
+    )
+    if not agent:
+        raise Exception(f"No active user #{uid} with agent for volet!")
+
+    va = agent.client()
     try:
         await va.start(playwright)
         await va.send("alena.artemeva25@gmail.com", 7.98)

xync_client/Pms/Volet/api.py

@@ -9,6 +9,8 @@ from zeep.client import Client
 
 from xync_client.loader import TORM
 
+period = 5
+
 
 class APIClient:
     wsdl = "https://wallet.advcash.com/wsm/merchantWebService?wsdl"
@@ -83,25 +85,26 @@ class APIClient:
             params.update(walletId=to)
         return self.make_request("sendMoney", params)
 
+    async def check_by_amount(self, amount: decimal, cur: str = "RUB", timeout: int = 5 * 60, past: int = 0):
+        hist: list = self.make_request("history", {"transactionDirection": "INCOMING", "count": 3, "from": 0})
+        if int(hist[0].amount) == int(amount):
+            return hist[0]
+        await sleep(period)
+        past += period
+        if past < timeout:
+            return await self.check_by_amount(amount, cur, timeout, past)
+        return False
 
-period = 5
-
-
-async def check_payment(cl: APIClient, amount: decimal, cur: str = "RUB", timeout: int = 5 * 60, past: int = 0):
-    hist: list = cl.make_request("history", {"transactionDirection": "INCOMING", "count": 3, "from": 0})
-    if int(hist[0].amount) == int(amount):
-        return hist[0]
-    await sleep(period)
-    past += period
-    if past < timeout:
-        return await check_payment(cl, amount, cur, timeout, past)
-    return False
+    def check_by_id(self, tid: str):
+        t: dict = self.make_request("findTransaction", tid)
+        return t
 
 
 async def main():
     _ = await init_db(TORM, True)
     cl = APIClient("main", "mixfixX98", "mixartemev@gmail.com")
-    b = cl.get_balances()
+    # b = cl.get_balances()
+    b = cl.check_by_id("ce9a52be-8085-431e-8e6e-b0be427c6c55")
     cl.make_request("history", {"transactionDirection": "INCOMING", "count": 100, "from": 0})
     print(b)
 

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/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.138.dist-info → xync_client-0.0.141.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.138
+Version: 0.0.141
 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.138.dist-info → xync_client-0.0.141.dist-info}/RECORD

@@ -1,6 +1,6 @@
 xync_client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_client/details.py,sha256=21itVPCgAtaYRR1H9J9oYudj95gafcFjExUN6QL17OI,1330
-xync_client/loader.py,sha256=qAOQqE4id42aOG3jwc0UMBB8roHd6X3_O08qRG7Bfxw,563
+xync_client/loader.py,sha256=zhslCMgtgp-xINPG4qQwhI1ee5Ap1vuoC8oK7GyhyMw,571
 xync_client/pm_unifier.py,sha256=T2Xh-tvcu114P2YBI6RK_XDiaIhyq6ABMrXDuXPlx7A,6541
 xync_client/Abc/Agent.py,sha256=OJaJ1RIMDYAS4xeefeXxVIVI0EKnMczQtrO35MLzqr4,5390
 xync_client/Abc/Asset.py,sha256=hlgyFaU9byr2N2r8Heh-_ICx49SKuKxfRTUA4yQWmEw,454
@@ -10,12 +10,12 @@ xync_client/Abc/Ex.py,sha256=n41-XCjoIV-KpC_lK3jO049tQKbFmE0eDU3SDlgZTws,12986
 xync_client/Abc/Exception.py,sha256=Sts7RpP370NBdjaH_cyXDdHtjge8zXNUGWCrKw49Zyk,482
 xync_client/Abc/InAgent.py,sha256=svKGATUM0c9YIDDEVLc-NxpUNWqZoVr5PjxoxK64RKs,650
 xync_client/Abc/Order.py,sha256=7-FGIJu5z9aYi0A_eJV4F-cp_6Mz_izNpefexDQZvHw,2428
-xync_client/Abc/PmAgent.py,sha256=qrAlnAeGjoJ7E2S3qV28mKEHJuhadJRcshGDD_9Wb1o,4212
+xync_client/Abc/PmAgent.py,sha256=wS1ZQs-hcC8ICDLcc9EfyNBKrM_ZDpJolAg-l_5ro-8,4094
 xync_client/Abc/xtype.py,sha256=o1JEzWmEXCPddtlqWZ6HRTZTKX6SAnvsztbASj21zOQ,2584
 xync_client/Binance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_client/Binance/binance_async.py,sha256=LP2DZaHwkfsp_4Tjvetb-1ntjQtJfODF0OgZpoPx4KU,2688
 xync_client/Binance/earn_api.py,sha256=hvk0MaVTLszIglQXVhbUjGcaHfbF9Ul7FFXmy94U2so,4411
-xync_client/Binance/ex.py,sha256=QACoWp_xFdS9LD1aWv6zZHw-FMCxx1YXkIvt7zn_1gg,5360
+xync_client/Binance/ex.py,sha256=m9KvSS-FjPe0BH-npkoqaIZ2WyNUsddxEgrbUpFzGsw,5368
 xync_client/Binance/exceptions.py,sha256=An-TK5_SKmGXMdGIs_K59u-0iBpqVgOPfkJqrEELcGQ,847
 xync_client/Binance/sapi.py,sha256=_2eXFtcFIerjvyyyqqSnwZxCqQPiMUdqAXJj7hyOQDQ,9584
 xync_client/Binance/web_c2c.py,sha256=WZ2BVq26ZcdOEcRvRsEKxvwe6x-XQ51b-nEFFAaRNOk,9249
@@ -24,19 +24,19 @@ xync_client/Binance/etype/pm.py,sha256=rorFX4HDjqDQwJ7Kqx41KOO1JJAi4yWbe4pkGAMmR
 xync_client/BingX/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_client/BingX/agent.py,sha256=F-QvzPCwwSvgFe5DafscT-puISbqCw23iTnvbfXlV-k,4318
 xync_client/BingX/base.py,sha256=Zx2H21iZrF94cMOz3imz6djMMNzAaB_iJSzDSP6beXo,739
-xync_client/BingX/ex.py,sha256=m47cXkmd6vzh_i4NuNeCcYHcCYz2dX5Jt7q-UTP6CEY,4267
+xync_client/BingX/ex.py,sha256=QzHaEEB_mnOSdMSfvg3Odd9oHortj6wZeIC7fPPFFf4,4275
 xync_client/BingX/req.mjs,sha256=JvLv1KBKsiIVVvRmAFC0RqpsxkBcwqbjk2_PGCubnX0,304
 xync_client/BingX/sign.js,sha256=uTfbKV0Y7bKapOs1AtlT1FmduelwvH2pGqIxCK2z5NY,100086
 xync_client/BingX/etype/ad.py,sha256=aUsZcvhk418d73SaOQlZYYYikHN1zFVYj49d5Xzb6qc,1360
 xync_client/BingX/etype/pm.py,sha256=hKaUHwkZC2ioBv_mNfIIutDkNNhO_ljhsCtSy2uwLAY,128
 xync_client/BitGet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_client/BitGet/agent.py,sha256=YVs3bDY0OcEJGU7m2A8chzO6PFhWDnQQrA-E6MVkBBg,3030
-xync_client/BitGet/ex.py,sha256=nAexKRkguIhq4fYP1tkIaou6oBFjjV2xwlajlJ-9DAE,3757
+xync_client/BitGet/ex.py,sha256=uEvvXuLaJv8o8BFi0bMA3XyBuTfVDWagAjLOHZl-xlE,3765
 xync_client/BitGet/etype/ad.py,sha256=fysSW47wGYjSOPUqY864z857AJz4gjN-nOkI1Jxd27U,1838
 xync_client/BitPapa/ex.py,sha256=U-RRB_RSOtErfRgxOZYWegZ_td_uZO37YKo3Jxchf_w,912
-xync_client/Bybit/InAgent.py,sha256=EzxMwbSVPv5CKGWzILSwKMEvuIzIl4wtdaPNbkhrln0,25294
-xync_client/Bybit/agent.py,sha256=wpFGareRojeG0nW1mBrtxU9HJlQjStsexdTRMm_3s_w,61753
-xync_client/Bybit/ex.py,sha256=DgPOmnjphcSCSsO4ZQjnIlWICNzdtKhNIpVsU93s99k,4707
+xync_client/Bybit/InAgent.py,sha256=QQTRWcZXhNO-AZi9wfCAA-x24FIRL00_f4T5xCVgC10,25324
+xync_client/Bybit/agent.py,sha256=fz76f-6g81TnFoFqWX0AqMaKvnYzgYKfhpkckIOM0cM,61769
+xync_client/Bybit/ex.py,sha256=3oARvReBoDs90FzQY31-L-q_YU-TIRbvWB7z4lwESsA,4715
 xync_client/Bybit/order.py,sha256=H4UIb8hxFGnw1hZuSbr0yZ4qeaCOIZOMc6jEst0ycBs,1713
 xync_client/Bybit/web_earn.py,sha256=qjqS10xlFc8r40IhDdPZ0LxA2dFEGbvBGXdsrUUJCMo,3019
 xync_client/Bybit/web_p2p.py,sha256=sAXzK03t6jwDnz4rrvP2IzI0KxfKa7C_5GuzH1HwLuA,11768
@@ -44,26 +44,26 @@ xync_client/Bybit/ws.py,sha256=OQjZHo_MiAH1dlOs3c-aUZBKyqToNTmH560udh6RYDE,1431
 xync_client/Bybit/etype/ad.py,sha256=HJOHi9KrbLQMpwEyd4oA8436QTNRqrd2HWFF-JNZGDo,8066
 xync_client/Bybit/etype/cred.py,sha256=dgFExLB4e5Wf6SqfU9SOdeooHQa84DRbTGm_OJhNw_o,1354
 xync_client/Bybit/etype/order.py,sha256=rPXw9eHJW3afVPQDRiooUkHfQhmqJ5fTdZ4vKdO6uHQ,8273
-xync_client/Gate/ex.py,sha256=1vSXctCOyZfYDojkHU6u4YSXwYTLg-e7BfAdGKvZ_UM,3727
+xync_client/Gate/ex.py,sha256=QbhB3u7TWnvVGD-AknB2nay6KZjEXQ-1JT9UacX4sWI,3735
 xync_client/Gate/premarket.py,sha256=IW-CgkmNJePJR2j_NRfULNKTePMX35XlhldqdiO76zY,2138
 xync_client/Gate/etype/ad.py,sha256=-EwtFcOWWvtE6UjaOdsuXWDTCVjAIRK0kSEsqPP4Yls,1296
-xync_client/Gmail/__init__.py,sha256=6aXhqtiVS5lA6O_W1276kamnixlH5OmUFklqwbVG4RA,4647
+xync_client/Gmail/__init__.py,sha256=98pRNlyx7e49QJMxzYPcbCROv2m2LGyGkSCGyrh0dow,4646
 xync_client/Htx/agent.py,sha256=rOURgTeY9TsA-IzT78l5-Ze91i0x1PY683mrX38MSgs,7356
 xync_client/Htx/earn.py,sha256=jL6eRwytZEMRom_3bFm1DYthi_GFg-E1Mm3ZDXENHSg,2386
-xync_client/Htx/ex.py,sha256=KobBInICyuEdvwRbMe8SYfAQYczn5_7CvNdu5_CXvL0,6066
+xync_client/Htx/ex.py,sha256=GuWK5lA_MvtSd-0DhKf2MAstKvZMHhc3BIiZSgdwZv4,6074
 xync_client/Htx/etype/__init__.py,sha256=sZIhFOxj2dRQRmMe86-y9vlzOGAPo1qoOi6u1qVxWr0,123
 xync_client/Htx/etype/ad.py,sha256=bShCGHRAvFJxt2io5rjQrEFMB0zZzkTww7sBxIcmLVM,2000
 xync_client/Htx/etype/cred.py,sha256=sAOQTsk7BA8zBWUkkwM6vIQcq1LcSK5NLYGrkTdtkQ8,1129
 xync_client/Htx/etype/pm.py,sha256=ILCP9reFRkfuzmtsJDYomJ3WBTU4s_KE-69JksTxwMk,375
 xync_client/Htx/etype/test.py,sha256=uomFicPE1OoA3WXnXOxhsTtGJEpVCQ0CId9D0NI6vto,893
-xync_client/KuCoin/ex.py,sha256=Ovni7nj4-Z5jeP_YBPQAAq8N31PAu45mzsVIbYlmyMA,3229
+xync_client/KuCoin/ex.py,sha256=w-6-aedlC1mYf8LShMv6pOrQzqMR9E6yIyXGUHQP888,3237
 xync_client/KuCoin/web.py,sha256=--OHS0Z29xjfNUjdTL7K0EDmU4dwej95OJ8Sv4PsxLI,920
 xync_client/KuCoin/etype/ad.py,sha256=MTx90Qo2xFKvfgIr4_qMowjwO23HVpFCD6J7INNFDuQ,1223
 xync_client/KuCoin/etype/pm.py,sha256=S50S5fyY5YeWlcPwO66o-GsPcdqgoeXuxvmEIy6Zqvs,130
-xync_client/Mexc/ex.py,sha256=WuR-MLwcz5rkHuCewE_jkxv3n6_2ZEPSUaU9SzFnGms,4287
+xync_client/Mexc/ex.py,sha256=jpITGa2GTeYayMVStQOomBW-P0YQoXjKExKZi_kS-2A,4295
 xync_client/Mexc/etype/ad.py,sha256=GUgvylx_z64CXNcw0YejUQJHg9F59eRo5v0zU7DRrAM,1434
 xync_client/Mexc/etype/pm.py,sha256=m5kCoMx9IEKUPB-z7YwwymQhASkv2npC4-Z_ePYeeRY,453
-xync_client/Okx/ex.py,sha256=7YQ1e2z1NawObbM9Z5js8kaQdwNhv0BkyU0CA3AZMb4,4534
+xync_client/Okx/ex.py,sha256=WG1NSh7wFMNePV0eXDePWELUBD1ksxE_-Q87QaDXLvE,4542
 xync_client/Okx/etype/ad.py,sha256=rTWMMmDwJK9chBByyihCZcgE5P6c5ti2yR1RbUtev3A,3773
 xync_client/Okx/etype/pm.py,sha256=MaxeyltowP3ESdOjec2HvSfMBwV_mC6w56Xbw-puadc,251
 xync_client/Pms/.gitignore,sha256=uGduC1_B8Wc0RiBzBS1YsrLPClFG2e42r1At9taidMI,6
@@ -72,14 +72,14 @@ xync_client/Pms/Alfa/state.json,sha256=MKE6vl-JsJO9PNCVqoQgBgYZTgYkHCas7USwl8QFt
 xync_client/Pms/MTS/__init__.py,sha256=P_E7W46IZEk8RsEgl7H1xV3JplMT5l9vYQYTYyNbyQ8,2101
 xync_client/Pms/Ozon/__init__.py,sha256=EvQZDSPv0fOT2hNCTP44nXHOIEQvP5bQf_7HVLiZc2I,4123
 xync_client/Pms/Payeer/.gitignore,sha256=sWORdRp8ROppV2CsMEDJ3M_SokrNWCf8b1hlaNs64hg,12
-xync_client/Pms/Payeer/__init__.py,sha256=3Uzb4A_q34vPUOlSk1HoNVQWtPqq1ncRH7MK4BGQei0,8886
+xync_client/Pms/Payeer/__init__.py,sha256=xN3L-IURWJ6oYXq85qu34u0OZEQOXkshgeEuMG29qg8,9584
 xync_client/Pms/Payeer/api.py,sha256=bb8qrlPYyWafel1VR-2nate6xBeRZAVciFJblHygfAs,549
 xync_client/Pms/Payeer/login.py,sha256=W5FAA0reW5x2hSh8sBIWmR38VcYhwvrn1R64IAtWHVw,2921
 xync_client/Pms/Sber/__init__.py,sha256=dxQfd9ZPhFTc_C4xrwaxrV6p0SijDCLNzBeUv3oQG38,4926
 xync_client/Pms/Sber/utils.py,sha256=gIeJspwvoBbOBt-fjxwW4WDHPoL2Evs8LVufsjrFOfo,1870
 xync_client/Pms/Tinkoff/__init__.py,sha256=ZyLvBEUn-vh-85oPUUDS586AHgvx3c-mkQE3yBQtbw8,5580
-xync_client/Pms/Volet/__init__.py,sha256=afbWlAg1s5l4N2dIz5TaeTG-wFz-HIFwzRJQO1NzJAk,9500
-xync_client/Pms/Volet/api.py,sha256=uvXWTzmzD4v7re253Xd-ev68G3Iwh83Z0VutgUThRvU,3383
+xync_client/Pms/Volet/__init__.py,sha256=h1bRO4x58-_-Yf9g3noYow0DDu8P4NFLwx83FnDZptM,10719
+xync_client/Pms/Volet/api.py,sha256=okqppqT7M5E6sswu-xz3L4Y9-ngefBPbFtywRi6A7Xo,3595
 xync_client/Pms/Volet/pl.py,sha256=l7lvUrpjFoObXPHaseOIAcSbkNqJdpy6OLDutxYJH3U,2451
 xync_client/Pms/Volet/_todo_req/req.mjs,sha256=ut3Jw37rL5lY7SskjZ9f1l0VE33tuP-PZEYUTcJMc2I,817
 xync_client/Pms/Volet/_todo_req/req.py,sha256=mKvdPrb-lkQ98Ws92_oBKu5yqyU8Krxy9XwuIhdsBao,1570
@@ -89,13 +89,13 @@ xync_client/Pms/Yandex/__init__.py,sha256=2Fu77vDlnGnhesu-OTSsn8lYsnMGO2eDBxWW57
 xync_client/TgWallet/agent.py,sha256=2fCB8ea8kEAbMqqcflpZUoHTK6_dQZrxmZbrhXci7nk,22066
 xync_client/TgWallet/asset.py,sha256=pNauwSE7tp5mKQVxH3W-B1yyEV6ZCefttVElOhyqJ1c,433
 xync_client/TgWallet/auth.py,sha256=pfoEiOW3bg8oJqD4hFBlSNnxTTVTzr305YrAREqqfFY,1284
-xync_client/TgWallet/ex.py,sha256=4fxJLtBPUBCX29ww_4w2CbYQOh9fE_QeTdkpQoO5cvI,8198
+xync_client/TgWallet/ex.py,sha256=N6z9Ht_wZXRR_6qSj8HMYg4URGiLvSjkUZZaJlgvt8k,8206
 xync_client/TgWallet/inAgent.py,sha256=vJUQNlQviSnDnhSfEubqwz-DnrYtMnS4qZ2gDjnK3Tc,5441
 xync_client/TgWallet/order.py,sha256=BOmBx5WWfJv0-_-A8DcR-Xd8utqO_VTmSqSegm0cteQ,3818
 xync_client/TgWallet/pyd.py,sha256=Ys3E8b3RLuyQ26frWT0F0BorkNxVpxnd18tY4Gp9dik,5636
 xync_client/TgWallet/pyro.py,sha256=2K7QWdo48k4MbbgQt90gdz_HiPck69Njm4xaMjIVgoo,1440
 xync_client/TgWallet/web.py,sha256=kDcv9SKKQPe91mw1qJBpbuyKYCAmZdfdHJylHumLBVU,1608
-xync_client-0.0.138.dist-info/METADATA,sha256=hj6obh0V9c8OVO4E87R_KRryDQez2HU1IWgdU1hEIfg,1037
-xync_client-0.0.138.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-xync_client-0.0.138.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
-xync_client-0.0.138.dist-info/RECORD,,
+xync_client-0.0.141.dist-info/METADATA,sha256=Evn_XBCNvwhXH0mxMhCRRkwc7cMk8ux285aJ9NdRyyI,1037
+xync_client-0.0.141.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.141.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.141.dist-info/RECORD,,