xync-client 0.0.50.dev2__tar.gz → 0.0.50.dev3__tar.gz

{xync_client-0.0.50.dev2/xync_client.egg-info → xync_client-0.0.50.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-client
-Version: 0.0.50.dev2
+Version: 0.0.50.dev3
 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.50.dev2 → xync_client-0.0.50.dev3}/xync_client/Pms/Ozon/__init__.py

@@ -1,23 +1,23 @@
-from asyncio import run
+from asyncio import run, sleep
 from x_model import init_db
 from xync_schema import models
 from xync_client.loader import PG_DSN
 import undetected_chromedriver as uc
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.action_chains import ActionChains
-import time
 
 
-async def loggin(driver, agent) -> None:
+def login(driver, agent) -> None:
     driver.get("https://finance.ozon.ru")
     for cookie in agent.state:
         driver.add_cookie(cookie)
     driver.get("https://finance.ozon.ru/lk")
-    pin = agent.auth.get("code")
-    actions = ActionChains(driver)
-    for char in pin:
-        actions.send_keys(char)
-    actions.perform()
+    if 1:  # todo: только если просит ввести пин-код
+        pin = agent.auth.get("code")
+        actions = ActionChains(driver)
+        for char in pin:
+            actions.send_keys(char)
+        actions.perform()
 
 
 async def send_cred(driver, amount, payment, cred):
@@ -31,24 +31,24 @@ async def main():
     chrome_options.add_argument("--disable-gpu")
     chrome_options.add_argument("--no-sandbox")
     driver = uc.Chrome(options=chrome_options)
+    driver.implicitly_wait(15)
 
     try:
-        if agent.state:
-            await loggin(driver, agent)
-            time.sleep(1000)
-        else:
+        if not agent.state:
             driver.get("https://ozon.ru/ozonid-lite")
-            driver.implicitly_wait(3)
             driver.find_element(By.NAME, "autocomplete").send_keys(agent.auth.get("phone"))
             driver.find_element(By.CLASS_NAME, "b201-a").click()
+            # todo: здесь не всегда просит код, иногда вход по QR или подтверждению из почты
             sms_code = input("Введите 6-ти значный код: ")
-            driver.implicitly_wait(3)
             driver.find_element(By.CLASS_NAME, "d01-a.d01-a5").send_keys(sms_code)
-            driver.implicitly_wait(5)
-            agent.state = driver.get_cookies()  # Получаем все куки
-            await agent.save()
+        # elif 0:  # todo: проверка на залогиненность
+        login(driver, agent)
+        # todo: здесь дальше отправка исходящего платежа и проверка входящего
+        await sleep(5)
 
     finally:
+        agent.state = driver.get_cookies()  # Получаем все куки
+        await agent.save()
         driver.quit()
 
 

{xync_client-0.0.50.dev2 → xync_client-0.0.50.dev3/xync_client.egg-info}/PKG-INFO

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