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

xync_client/Abc/PmAgent.py

@@ -39,11 +39,6 @@ class PmAgentClient(metaclass=ABCMeta):
         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="chromium-headless-shell", headless=not headed)
         context = await self.browser.new_context(storage_state=self.agent.state)
         self.page = await context.new_page()
@@ -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,6 @@ 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

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,7 +1,9 @@
 import logging
 import re
 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
@@ -12,8 +14,9 @@ from playwright._impl._errors import TimeoutError
 from pyro_client.client.bot import BotClient
 from pyro_client.client.user import UserClient
 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
@@ -57,7 +60,16 @@ def parse_transaction_info(text: str) -> dict[str, str] | None:
     return None
 
 
-class Client:
+class Client(PmAgentClient):
+    async def _login(self):
+        pass
+
+    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
@@ -65,15 +77,50 @@ class Client:
     page: Page
     gmail: GmClient
 
-    def __init__(self, uid: int):
-        self.uid = uid
-        self.gmail = GmClient(uid)
+    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"])
+
+    @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)
@@ -223,7 +270,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-0.0.138.dist-info → xync_client-0.0.139.dist-info}/METADATA

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

@@ -10,7 +10,7 @@ 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=bvBHzzfg5-X6-JSPS0WGC6d69Cr57GWlMFKBq7x1yJw,4024
 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
@@ -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=fHS_0mvih0KRnczh303vmM208IMXwJTbaJMXo60LvHk,11386
+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
@@ -95,7 +95,7 @@ xync_client/TgWallet/order.py,sha256=BOmBx5WWfJv0-_-A8DcR-Xd8utqO_VTmSqSegm0cteQ
 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.139.dist-info/METADATA,sha256=9rxN-VreJl1QAUz5lI4LtIr40e1J2BzTPDFRZNpopXQ,1037
+xync_client-0.0.139.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+xync_client-0.0.139.dist-info/top_level.txt,sha256=bmYEVIIrD3v7yFwH-X15pEfRvzhuAdfsAZ2igvNI4O8,12
+xync_client-0.0.139.dist-info/RECORD,,