xync-client 0.0.110__tar.gz → 0.0.111__tar.gz

{xync_client-0.0.110/xync_client.egg-info → xync_client-0.0.111}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.110
+Version: 0.0.111
 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.110 → xync_client-0.0.111}/xync_client/Pms/Payeer/__init__.py

@@ -1,4 +1,3 @@
-import logging
 from asyncio import run
 from datetime import datetime
 from decimal import Decimal
@@ -8,7 +7,7 @@ from time import sleep
 
 from asyncpg.pgproto.pgproto import timedelta
 from payeer_api import PayeerAPI
-from playwright.async_api import async_playwright, Playwright, Locator
+from playwright.async_api import async_playwright, Playwright
 from playwright._impl._errors import TimeoutError
 
 from xync_client.loader import TORM
@@ -39,50 +38,55 @@ class Client(PmAgentClient):
             await self.page.context.add_cookies([cookie])
         await self.page.goto(self.pages.SEND)
 
-    async def send(self, dest: str, amount: int, cur: str) -> tuple[int, bytes, float]:
-        self.last_active = datetime.now()
+    async def send(self, dest: str, amount: int, cur: str) -> tuple[int, bytes] | int:
         page = self.page
-        try:
-            await page.goto(self.pages.SEND)
-        except TimeoutError:
-            await login(self.agent)
-            for cookie in self.agent.state["cookies"]:
-                await page.context.add_cookies([cookie])
-            await page.goto("https://payeer.com/en/account/send/")
+        if not page.url.startswith(self.pages.SEND):
+            try:
+                await page.goto(self.pages.SEND)
+            except TimeoutError:
+                await login(self.agent)
+                for cookie in self.agent.state["cookies"]:
+                    await page.context.add_cookies([cookie])
+                await page.goto("https://payeer.com/en/account/send/")
         fiat_accounts = await page.locator(
             f".balance-item.balance-item--green.balance-item--{cur.lower()}"
         ).all_text_contents()
-        has_amount = float(fiat_accounts[0].replace(",", "").strip())
-        if float(amount) <= has_amount:
+        if float(amount) <= float(fiat_accounts[0].replace(",", "").strip()):
             await page.locator('input[name="param_ACCOUNT_NUMBER"]').fill(dest)
             await page.locator("select[name=curr_receive]").select_option(value=cur)
+            sleep(0.9)
+            await page.locator('input[name="sum_receive"]').fill(str(amount))
+            sleep(0.1)
+            # await page.locator("div.n-form--title").first.click()
+            # sleep(0.1)
+            await page.click(".btn.n-form--btn.n-form--btn-mod")
             sleep(0.5)
-            await fill_amount(page.locator('input[name="sum_receive"]'), str(amount))
-            await page.wait_for_selector(".btn.n-form--btn.n-form--btn-mod", state="visible", timeout=3000)
-            sleep(1.5)
-            await click_send(page.locator(".btn.n-form--btn.n-form--btn-mod:not(.repeat)"))
-            await page.locator(".note_txt").wait_for(state="visible", timeout=6000)
+            await page.click(".btn.n-form--btn.n-form--btn-mod")
+            sleep(1.2)
+            if await page.locator(".input4").count():
+                await page.locator(".input4").fill(self.agent.auth.get("master_key"))
+                await page.click(".ok.button_green2")
+            sleep(0.1)
+            await page.locator(".note_txt").wait_for(state="visible")
             if await page.locator('.note_txt:has-text("successfully completed")').count():
                 transaction = await page.locator(".note_txt").all_text_contents()
                 trans_num = int(transaction[0].replace("Transaction #", "").split()[0])
                 await page.goto("https://payeer.com/ru/account/history/")
-                sleep(1.5)
                 await page.click(f".history-id-{trans_num} a.link")
-                await page.wait_for_selector(".ui-dialog.ui-corner-all", state="visible", timeout=5000)
                 sleep(1)
                 receipt = await page.query_selector(".ui-dialog.ui-corner-all")
-                return trans_num, await receipt.screenshot(path=f"tmp/{dest}.png"), has_amount
+                return trans_num, await receipt.screenshot(path=f"tmp/{dest}.png")
             else:
                 await self.bot.send("Payeer хз", self.uid, photo=await self.page.screenshot())
-                raise Exception(dest, amount, cur)
+                return -1
         else:
-            have_amount = float(fiat_accounts[0].strip())
+            have_amount = int(fiat_accounts[0].strip())
             await self.bot.send(
                 f"Payeer no have {amount}, only {have_amount}{cur} to {dest}",
                 self.uid,
                 photo=await self.page.screenshot(),
             )
-            raise Exception(f"Need {amount}{cur}, but has only {has_amount}")
+            return have_amount
 
     def check_in(
         self, amount: Decimal | int | float, cur: str, tme: datetime = None, tid: str | int = None
@@ -108,31 +112,6 @@ class Client(PmAgentClient):
     async def proof(self) -> bytes: ...
 
 
-async def fill_amount(loc: Locator, amount: str):
-    await loc.wait_for(state="visible")
-    await loc.fill(amount)
-    sleep(2)
-    if await loc.input_value() != amount or await loc.input_value() != amount:
-        logging.warning("Fill amount repeated!")
-        await fill_amount(loc, amount)
-    else:
-        ...
-
-
-async def click_send(loc1: Locator, count: int = 1):
-    if await loc1.is_visible():
-        await loc1.click(delay=90)
-        sleep(2)
-        try:
-            await loc1.wait_for(state="hidden", timeout=2000 * count)
-        except TimeoutError:
-            if count < 4:
-                logging.warning("Click repeated!")
-                await click_send(loc1, count + 1)
-            else:
-                raise TimeoutError
-
-
 async def main(uid: int):
     from x_model import init_db
 

{xync_client-0.0.110 → xync_client-0.0.111/xync_client.egg-info}/PKG-INFO

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