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

{xync_client-0.0.108/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.108
+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
@@ -14,6 +14,7 @@ Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
 Requires-Dist: kurigram
+Requires-Dist: playwright
 Requires-Dist: python-dotenv
 Requires-Dist: python-okx
 Requires-Dist: pyrogram-client

{xync_client-0.0.108 → xync_client-0.0.111}/pyproject.toml

@@ -17,6 +17,7 @@ dependencies = [
     "pyotp",
 #    "kurigram @ git+https://github.com/mixartemev/pyrogram.git",
     "kurigram",
+    "playwright",
     "python-dotenv",
     "python-okx",
     "pyrogram-client",

{xync_client-0.0.108 → xync_client-0.0.111}/xync_client/Bybit/InAgent.py

@@ -126,7 +126,7 @@ class InAgentClient(BaseInAgentClient):
                                                         addr__coin_id=order_db.ad.pair_side.pair.coin_id,
                                                         addr__actor=self.agent_client.actor,
                                                     )
-                                                    ass.free -= float(order_db.amount / order_db.ad.price)
+                                                    ass.free -= int(order_db.amount / order_db.ad.price)
                                                     await ass.save(update_fields=["free"])
                                                     # обновляем остаток валюты
                                                     fiat = await models.Fiat.get(cred_id=order_db.cred_id)
@@ -247,7 +247,7 @@ class InAgentClient(BaseInAgentClient):
     async def send_payment(self, order_db: models.Order, dest):
         if order_db.status not in (OrderStatus.created, OrderStatus.requested):
             return
-        int_am = round(order_db.amount * 10**-2, 2)
+        fmt_am = round(order_db.amount * 10**-2, 2)
         pma, cur = await self.get_pma_by_pmex(order_db)
         async with in_transaction():
             # отмечаем ордер на бирже "оплачен"
@@ -259,9 +259,9 @@ class InAgentClient(BaseInAgentClient):
                 paymentId=str(credex.exid),  # credex.exid
             )
             # проверяем не отправляли ли мы уже перевод по этому ордеру
-            if t := await models.Transfer.get_or_none(order=order_db, amount=int_am):
-                await pma.bot.send(f"Order# {order_db.exid}: Double send {int_am}{cur} to {dest} #{t.pmid}!")
-                raise Exception(f"Order# {order_db.exid}: Double send {int_am}{cur} to {dest} #{t.pmid}!")
+            if t := await models.Transfer.get_or_none(order=order_db, amount=order_db.amount):
+                await pma.bot.send(f"Order# {order_db.exid}: Double send {fmt_am}{cur} to {dest} #{t.pmid}!")
+                raise Exception(f"Order# {order_db.exid}: Double send {fmt_am}{cur} to {dest} #{t.pmid}!")
 
             # ставим в бд статус "оплачен"
             order_db.status = OrderStatus.paid
@@ -271,13 +271,13 @@ class InAgentClient(BaseInAgentClient):
             ass = await models.Asset.get(
                 addr__coin_id=order_db.ad.pair_side.pair.coin_id, addr__actor=self.agent_client.actor
             )
-            ass.free += float(order_db.amount / order_db.ad.price)
+            ass.free += int(order_db.amount / order_db.ad.price)
             await ass.save(update_fields=["free"])
             # отправляем деньги
-            tid, img, rest_amount = await pma.send(dest=dest, amount=int_am, cur=cur)
+            tid, img, rest_amount = await pma.send(dest=dest, amount=fmt_am, cur=cur)
             # создаем перевод в бд
             t, _ = await models.Transfer.update_or_create(
-                {"amount": int_am * 100},
+                {"amount": order_db.amount},
                 order=order_db,
                 pmid=tid,
             )
@@ -288,7 +288,7 @@ class InAgentClient(BaseInAgentClient):
                 self.agent_client.api.send_chat_message(
                     orderId=str(order_db.exid), contentType="pic", message=res["url"], msgUuid=uuid4().hex
                 )
-            logging.info(f"Order {order_db.exid} PAID at {datetime.now()}: {int_am}!")
+            logging.info(f"Order {order_db.exid} PAID at {datetime.now()}: {fmt_am}!")
 
     async def get_pma_by_cdex(self, order: OrderFull) -> tuple[PmAgentClient | None, CredEx] | None:
         cdxs = await models.CredEx.filter(

{xync_client-0.0.108 → 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,49 +38,58 @@ 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)
-            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")
-            await click_send(page.locator(".btn.n-form--btn.n-form--btn-mod:not(.repeat)"))
+            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 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/")
                 await page.click(f".history-id-{trans_num} a.link")
-                await page.wait_for_selector(".ui-dialog.ui-corner-all", state="visible")
+                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, time: datetime = None, tid: str | int = None
+        self, amount: Decimal | int | float, cur: str, tme: datetime = None, tid: str | int = None
     ) -> tuple[Decimal | None, int | None]:
         history = self.api.history(type="incoming", append=tid, count=3)
         if tid:
@@ -92,7 +100,7 @@ class Client(PmAgentClient):
             if (
                 amount <= Decimal(h["creditedAmount"]) <= ceil(amount)
                 and h["creditedCurrency"] == cur
-                and datetime.fromisoformat(h["date"]) > time - timedelta(minutes=1)
+                and datetime.fromisoformat(h["date"]) > tme - timedelta(minutes=1)
             )
         ]
         if not (t := t and t[0]):
@@ -104,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(1)
-    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(loc: Locator, count: int = 1):
-    if await loc.is_visible():
-        sleep(1)
-        await loc.click(delay=90)
-        try:
-            await loc.wait_for(state="hidden", timeout=2000 * count)
-        except TimeoutError:
-            if count < 4:
-                logging.warning("Click repeated!")
-                await click_send(loc, count + 1)
-            else:
-                raise TimeoutError
-
-
 async def main(uid: int):
     from x_model import init_db
 
@@ -136,7 +119,7 @@ async def main(uid: int):
     playwright: Playwright = await async_playwright().start()
     pyr = Client(uid)
     try:
-        await pyr.start(playwright)
+        await pyr.start(playwright, True)
 
         dest, amount, cur = "P79619335", 2, "RUB"
 

{xync_client-0.0.108 → xync_client-0.0.111}/xync_client/Pms/Payeer/login.py

@@ -1,51 +1,36 @@
-from time import sleep
-
 from selenium.webdriver.common.by import By
 import undetected_chromedriver as uc
 from xync_schema.models import PmAgent
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.action_chains import ActionChains
+import time
 
 
 async def login(agent: PmAgent):
-    driver = uc.Chrome(no_sandbox=True, headless=True)
+    driver = uc.Chrome(no_sandbox=True, headless=False)
     wait = WebDriverWait(driver, timeout=10)
     try:
-        driver.get("https://payeer.com/ru/auth")
+        driver.get("https://payeer.com/en/auth")
         wait.until(EC.invisibility_of_element_located((By.TAG_NAME, "lottie-player")))
         login_link = wait.until(EC.element_to_be_clickable((By.CLASS_NAME, "button.button_empty")))
-        try:
-            login_link.click()
-        except Exception:
-            driver.execute_script("arguments[0].click();", login_link)
+        login_link.click()
         email_field = wait.until(EC.presence_of_element_located((By.NAME, "email")))
         email_field.send_keys(agent.auth.get("email"))
         password_field = wait.until(EC.presence_of_element_located((By.NAME, "password")))
         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")))
-        sleep(1)
-        try:
-            login_button.click()
-        except Exception:
-            driver.execute_script("arguments[0].click();", login_button)
-        try:
-            login_button = wait.until(EC.element_to_be_clickable((By.CLASS_NAME, "login-form__login-btn.step1")))
-            driver.execute_script("arguments[0].click();", login_button)
-        except Exception:
-            pass
+        login_button.click()
+        time.sleep(5)
+        login_button.click()
+        time.sleep(1)
         if (v := driver.find_elements(By.CLASS_NAME, "form-input-top")) and v[0].text == "Введите проверочный код":
             code = input("Email code: ")
             actions = ActionChains(driver)
             for char in code:
                 actions.send_keys(char).perform()
             step2_button = wait.until(EC.element_to_be_clickable((By.CLASS_NAME, "login-form__login-btn.step2")))
-            try:
-                step2_button.click()
-            except Exception:
-                driver.execute_script("arguments[0].click();", step2_button)
-
-        sleep(1)
+            step2_button.click()
         agent.state = {"cookies": driver.get_cookies()}
         await agent.save()
     finally:

{xync_client-0.0.108 → 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.108
+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
@@ -14,6 +14,7 @@ Requires-Dist: python-binance
 Requires-Dist: pybit
 Requires-Dist: pyotp
 Requires-Dist: kurigram
+Requires-Dist: playwright
 Requires-Dist: python-dotenv
 Requires-Dist: python-okx
 Requires-Dist: pyrogram-client

{xync_client-0.0.108 → xync_client-0.0.111}/xync_client.egg-info/requires.txt

@@ -7,6 +7,7 @@ python-binance
 pybit
 pyotp
 kurigram
+playwright
 python-dotenv
 python-okx
 pyrogram-client