xync-client 0.0.78__tar.gz → 0.0.80.dev2__tar.gz

{xync_client-0.0.78/xync_client.egg-info → xync_client-0.0.80.dev2}/PKG-INFO

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

@@ -11,7 +11,7 @@ logging.basicConfig(level=logging.INFO)
 
 
 async def _input(page):
-    for i in input("email: "):
+    for i in input("Login: "):
         await page.keyboard.press(i)
     await page.wait_for_timeout(1000)
 
@@ -19,7 +19,7 @@ async def _input(page):
 async def payment(page, agent, account, amount, cur):
     await page.goto("https://payeer.com/en/account/send/")
     fiat_accounts = await page.locator(
-        ".balance-item.balance-item--green.balance-item--rub.balance-curr--rub "
+        f".balance-item.balance-item--green.balance-item--{cur.lower()}"
     ).all_text_contents()
     if float(amount) <= float(fiat_accounts[0].replace(",", "").strip()):
         await page.locator('input[name="param_ACCOUNT_NUMBER"]').fill(account)
@@ -38,49 +38,60 @@ async def payment(page, agent, account, amount, cur):
             await page.locator(".input4").fill(agent.auth.get("master_key"))
             time.sleep(1)
             await page.click(".ok.button_green2")
-        time.sleep(1)
-        await page.goto("https://payeer.com/ru/account/history/")
-        await page.click('[class^="history-id-"] a.link')
-        time.sleep(1)
-        receipt = await page.query_selector(".ui-dialog.ui-corner-all")
-        await receipt.screenshot(path="screen.png")
-        logging.info(f"Payeer sent {amount}{cur} to {amount}")
+        time.sleep(2)
+        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()
+            number_transaction = transaction[0].replace("Transaction #", "").split()[0]
+            await page.goto("https://payeer.com/ru/account/history/")
+            await page.click(f".history-id-{number_transaction} a.link")
+            time.sleep(1)
+            receipt = await page.query_selector(".ui-dialog.ui-corner-all")
+            time.sleep(1)
+            await receipt.screenshot(path="screen.png")
+            logging.info(f"Payeer sent {amount}{cur} to {account}")
+        else:
+            print("какая то ошибка")
     else:
-        logging.error(f"Payeer {fiat_accounts[0].strip()} to {amount}")
+        logging.error(f"Payeer no have {amount}, only {fiat_accounts[0].strip()}{cur} to {account}")
 
 
-async def main():
+async def main(account, amount, cur):
     _ = await init_db(TORM, True)
     agent = await models.PmAgent.filter(pm__norm="payeer", auth__isnull=False).first()
-    async with AsyncCamoufox(os=["macos"], headless=True) as playwright:
+    async with AsyncCamoufox(os=["macos"], headless=False) as playwright:
         context = await playwright.new_context(storage_state=agent.state, record_video_dir="videos")
         page = await context.new_page()
         # await page.wait_for_timeout(15000)
         await page.goto("https://payeer.com/en/", wait_until="domcontentloaded", timeout=60000)
-
         try:
-            if not agent.state:
+            if await page.locator('.btn.btn--create:has-text("Create Account")').count():
+                agent.state = {}
                 await asyncio.sleep(1)
                 await page.click(".btn.btn--login.white-login")
-                time.sleep(2)
+                time.sleep(1)
                 await page.locator('input[name="email"]').fill(agent.auth.get("email"))
                 time.sleep(1)
                 await page.locator('input[name="password"]').fill(agent.auth.get("passwd"))
                 time.sleep(1)
                 await page.locator(".login-form__login-btn.step1").click()
-                time.sleep(5)
-                await page.locator(".login-form__login-btn.step1").click()
+                time.sleep(7)
+                if await page.locator(".login-form__login-btn.step1").is_visible():
+                    await page.click(".login-form__login-btn.step1", timeout=7000)
                 time.sleep(1)
-                if await page.locator(".form-input-top").is_visible():
+                if await page.locator('.form-input-top:has-text("Enter the verification code")').count():
                     await _input(page)
                     await page.click(".login-form__login-btn.step2")
                 agent.state = await page.context.storage_state()
                 await agent.save()
                 time.sleep(5)
-            await payment(page, agent, "P1132982965", "10.5", "RUB")
+            await payment(page, agent, account, amount, cur)
         finally:
             await playwright.close()
 
 
 if __name__ == "__main__":
-    asyncio.run(main())
+    import sys
+
+    _, account, amount, *__ = sys.argv
+    asyncio.run(main(account, amount, __ and __[0] or "RUB"))

{xync_client-0.0.78 → xync_client-0.0.80.dev2/xync_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.78
+Version: 0.0.80.dev2
 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.78 → xync_client-0.0.80.dev2}/xync_client.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ README.md
 __init__.py
 makefile
 pyproject.toml
+screen.png
 tests/TestAgent.py
 tests/TestAsset.py
 tests/TestEx.py