xync-client 0.0.113__tar.gz → 0.0.115__tar.gz

{xync_client-0.0.113/xync_client.egg-info → xync_client-0.0.115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.113
+Version: 0.0.115
 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.113 → xync_client-0.0.115}/xync_client/Bybit/InAgent.py

@@ -282,7 +282,16 @@ class InAgentClient(BaseInAgentClient):
                 pmid=tid,
             )
             # обновляем остаток валюты
-            await models.Fiat.update_or_create({"amount": rest_amount * 100}, cred_id=order_db.cred_id)
+            await order_db.fetch_related("cred")  # todo: refact
+            await (
+                (
+                    await models.Fiat.get(
+                        cred__person_id=self.agent_client.actor.person_id, cred__pmcur_id=order_db.cred.pmcur_id
+                    )
+                )
+                .update_from_dict({"amount": rest_amount * 100})
+                .save()
+            )
             # отправляем продавцу чек
             if res := self.agent_client.api.upload_chat_file(upload_file=f"tmp/{dest}.png").get("result"):
                 self.agent_client.api.send_chat_message(
@@ -340,7 +349,7 @@ async def main():
         # await cl.agent_client.export_my_ads()
         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(), True)
+            cl.pmacs[pma.pm_id] = await payeer_cl.start(await async_playwright().start(), False)
 
         _ = await cl.start_listen()
         await cl.agent_client.close()

{xync_client-0.0.113 → xync_client-0.0.115}/xync_client/Pms/Payeer/__init__.py

@@ -1,3 +1,4 @@
+import logging
 from asyncio import run
 from datetime import datetime
 from decimal import Decimal
@@ -7,7 +8,7 @@ from time import sleep
 
 from asyncpg.pgproto.pgproto import timedelta
 from payeer_api import PayeerAPI
-from playwright.async_api import async_playwright, Playwright
+from playwright.async_api import async_playwright, Playwright, Error
 from playwright._impl._errors import TimeoutError
 
 from xync_client.loader import TORM
@@ -39,20 +40,23 @@ class Client(PmAgentClient):
         await self.page.goto(self.pages.SEND)
 
     async def send(self, dest: str, amount: int, cur: str) -> tuple[int, bytes, int] | int:
+        self.last_active = datetime.now()
         page = self.page
         if not page.url.startswith(self.pages.SEND):
             try:
                 await page.goto(self.pages.SEND)
-            except TimeoutError:
+            except (TimeoutError, Error):
                 await login(self.agent)
                 for cookie in self.agent.state["cookies"]:
                     await page.context.add_cookies([cookie])
+                sleep(0.5)
                 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:
+            sleep(0.1)
             await page.locator('input[name="param_ACCOUNT_NUMBER"]').fill(dest)
             await page.locator("select[name=curr_receive]").select_option(value=cur)
             sleep(0.9)
@@ -68,7 +72,12 @@ class Client(PmAgentClient):
                 await page.locator(".input4").fill(self.agent.auth.get("master_key"))
                 await page.click(".ok.button_green2")
             sleep(1)
-            await page.locator(".note_txt").wait_for(state="visible")
+            try:
+                await page.locator(".note_txt").wait_for(state="visible", timeout=6000)
+            except TimeoutError as _:
+                logging.error("Repeat!")
+                sleep(0.5)
+                return await self.send(dest, amount, cur)
             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])
@@ -76,7 +85,7 @@ class Client(PmAgentClient):
                 await page.click(f".history-id-{trans_num} a.link")
                 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 - amount
+                return trans_num, await receipt.screenshot(path=f"tmp/{dest}.png"), int(has_amount - amount)
             else:
                 await self.bot.send("Payeer хз", self.uid, photo=await self.page.screenshot())
                 return -1

{xync_client-0.0.113 → xync_client-0.0.115}/xync_client/Pms/Payeer/login.py

@@ -8,7 +8,7 @@ import time
 
 
 async def login(agent: PmAgent):
-    driver = uc.Chrome(no_sandbox=True, headless=False)
+    driver = uc.Chrome(no_sandbox=False, headless=True)
     wait = WebDriverWait(driver, timeout=10)
     try:
         driver.get("https://payeer.com/en/auth")
@@ -21,7 +21,7 @@ async def login(agent: PmAgent):
         password_field.send_keys(agent.auth.get("password"))
         login_button = wait.until(EC.element_to_be_clickable((By.CLASS_NAME, "login-form__login-btn.step1")))
         login_button.click()
-        time.sleep(5)
+        time.sleep(4)
         login_button.click()
         time.sleep(1)
         if (v := driver.find_elements(By.CLASS_NAME, "form-input-top")) and v[0].text == "Введите проверочный код":

{xync_client-0.0.113 → xync_client-0.0.115/xync_client.egg-info}/PKG-INFO

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