From 4911a879c9ebe32d3dac256adde79939ddbfe577 Mon Sep 17 00:00:00 2001 From: Denis <87643305+love-apples@users.noreply.github.com> Date: Fri, 16 May 2025 13:02:12 +0300 Subject: [PATCH] fix --- .env | 4 +-- credentials.json | 60 +++++++++++++++---------------- credentials_backup.json | 2 +- main.py | 3 +- steam_guard.log | 79 +++++++++++++++++++++++++++++++++++++++++ steam_parser/steam.py | 27 +++++++++----- 6 files changed, 133 insertions(+), 42 deletions(-) diff --git a/.env b/.env index 14cc80d..0146d39 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ -API_ID= -API_HASH= +API_ID=21965168 +API_HASH=99a551f86da94fbe39097f449434fd53 CHANNEL_URL=https://t.me/Burger_Game \ No newline at end of file diff --git a/credentials.json b/credentials.json index 787af4d..0870e20 100644 --- a/credentials.json +++ b/credentials.json @@ -1,5 +1,35 @@ { "accounts": [ + { + "username": "steamok1089773", + "password": "steamok987", + "date": "2025-05-16T12:29:33" + }, + { + "username": "ets2xiajsh", + "password": "https://playerok.com/profile/QAVIX/products", + "date": "2025-05-15T22:29:18" + }, + { + "username": "qq1070414930", + "password": "mhEklDDkjP", + "date": "2025-05-15T19:27:34" + }, + { + "username": "ivpopov13", + "password": "BQDhvkGfAPYh4Voqd8aco", + "date": "2025-05-15T14:11:40" + }, + { + "username": "amlv63032", + "password": "CExXMoJXF1TU", + "date": "2025-05-15T10:30:16" + }, + { + "username": "operpolnomochenxd", + "password": "208368382DashJiovanniNumber030993994", + "date": "2025-05-14T21:03:45" + }, { "username": "thb111990", "password": "steamok111990", @@ -219,36 +249,6 @@ "username": "fpfuryfamily", "password": "thxfp362", "date": "2025-05-02T15:07:06" - }, - { - "username": "ShezyyyFunPay", - "password": "funpay.com/users/8943271/", - "date": "2025-05-01T16:45:17" - }, - { - "username": "fmih9tqp", - "password": "BulbulofficialFunPay", - "date": "2025-05-01T16:45:17" - }, - { - "username": "impericon", - "password": "2O9CLXJFBQXT", - "date": "2025-04-30T21:47:13" - }, - { - "username": "fpfuryfamily", - "password": "thxfp362", - "date": "2025-04-30T14:23:32" - }, - { - "username": "komski01", - "password": "omarca06", - "date": "2025-04-29T22:59:56" - }, - { - "username": "quincypugy", - "password": "0Heh%v4SSG", - "date": "2025-04-29T18:42:08" } ] } \ No newline at end of file diff --git a/credentials_backup.json b/credentials_backup.json index 451ff13..f412dc3 100644 --- a/credentials_backup.json +++ b/credentials_backup.json @@ -1 +1 @@ -{"accounts": [{"username": "enigma2370", "password": "users/14642501", "date": "2025-05-13T15:40:48"}, {"username": "enigma2370", "password": "users/14642501", "date": "2025-05-13T15:33:40"}, {"username": "enigma2370", "password": "users/14642501", "date": "2025-05-13T15:32:32"}, {"username": "thb111990", "password": "steamok111990", "date": "2025-05-14T16:16:05"}, {"username": "lrtts643631", "password": "dGCR2cEfN_", "date": "2025-05-14T12:44:33"}, {"username": "hazer3", "password": "S2477TT27EC6", "date": "2025-05-14T11:11:14"}, {"username": "brbba2063", "password": "che600220", "date": "2025-05-13T21:52:58"}]} \ No newline at end of file +{"accounts": [{"username": "enigma2370", "password": "users/14642501", "date": "2025-05-13T15:40:48"}, {"username": "enigma2370", "password": "users/14642501", "date": "2025-05-13T15:33:40"}, {"username": "enigma2370", "password": "users/14642501", "date": "2025-05-13T15:32:32"}, {"username": "thb111990", "password": "steamok111990", "date": "2025-05-14T16:16:05"}, {"username": "lrtts643631", "password": "dGCR2cEfN_", "date": "2025-05-14T12:44:33"}, {"username": "hazer3", "password": "S2477TT27EC6", "date": "2025-05-14T11:11:14"}, {"username": "brbba2063", "password": "che600220", "date": "2025-05-13T21:52:58"}, {"username": "ets2xiajsh", "password": "https://playerok.com/profile/QAVIX/products", "date": "2025-05-14T16:16:05"}, {"username": "steamok1089773", "password": "steamok987", "date": "2025-05-16T12:29:33"}, {"username": "ets2xiajsh", "password": "https://playerok.com/profile/QAVIX/products", "date": "2025-05-15T22:29:18"}, {"username": "qq1070414930", "password": "mhEklDDkjP", "date": "2025-05-15T19:27:34"}, {"username": "ivpopov13", "password": "BQDhvkGfAPYh4Voqd8aco", "date": "2025-05-15T14:11:40"}]} \ No newline at end of file diff --git a/main.py b/main.py index 033c835..e901d7b 100644 --- a/main.py +++ b/main.py @@ -71,4 +71,5 @@ async def fetch_and_monitor_accounts(): if __name__ == '__main__': - asyncio.run(fetch_and_monitor_accounts()) \ No newline at end of file + asyncio.run(fetch_and_monitor_accounts()) + # asyncio.run(SteamLogin().open_steam_login_page_and_type()) \ No newline at end of file diff --git a/steam_guard.log b/steam_guard.log index 567008a..4ea5c00 100644 --- a/steam_guard.log +++ b/steam_guard.log @@ -64,3 +64,82 @@ 2025-05-14 17:57:25,245 - steam_parser.steam - INFO - Вход для аккаунта lrtts643631 не удался. Ошибка: семейный доступ 2025-05-14 17:57:46,616 - steam_parser.steam - INFO - Вход для аккаунта hazer3 не удался. Ошибка: красная табличка 2025-05-14 17:58:09,894 - steam_parser.steam - INFO - Вход для аккаунта brbba2063 не удался. Ошибка: красная табличка +2025-05-16 12:45:58,328 - steam_parser.steam - INFO - ✅ Guard code установлен для аккаунта: ets2xiajsh +2025-05-16 12:51:00,688 - pyrogram.session.auth - INFO - Start creating a new auth key on DC2 +2025-05-16 12:51:00,689 - pyrogram.connection.connection - INFO - Connecting... +2025-05-16 12:51:00,690 - pyrogram.connection.connection - INFO - Connected! Production DC2 - IPv4 +2025-05-16 12:51:02,939 - pyrogram.session.auth - INFO - Done auth key exchange: DhGenOk +2025-05-16 12:51:02,940 - pyrogram.connection.connection - INFO - Disconnected +2025-05-16 12:51:02,954 - pyrogram.connection.connection - INFO - Connecting... +2025-05-16 12:51:02,955 - pyrogram.connection.connection - INFO - Connected! Production DC2 - IPv4 +2025-05-16 12:51:02,956 - pyrogram.session.session - INFO - NetworkTask started +2025-05-16 12:51:03,676 - pyrogram.session.session - INFO - Session initialized: Pyrogram v2.2.3 (Layer 203) +2025-05-16 12:51:03,677 - pyrogram.session.session - INFO - Device: CPython 3.10.0 - Pyrogram 2.2.3 +2025-05-16 12:51:03,677 - pyrogram.session.session - INFO - System: Windows 10 (en) +2025-05-16 12:51:03,677 - pyrogram.session.session - INFO - Session started +2025-05-16 12:51:03,680 - pyrogram.session.session - INFO - PingTask started +2025-05-16 12:51:23,029 - pyrogram.session.session - INFO - PingTask stopped +2025-05-16 12:51:23,029 - pyrogram.connection.connection - INFO - Disconnected +2025-05-16 12:51:23,030 - pyrogram.session.session - INFO - NetworkTask stopped +2025-05-16 12:51:23,030 - pyrogram.session.session - INFO - Session stopped +2025-05-16 12:51:23,039 - pyrogram.session.auth - INFO - Start creating a new auth key on DC1 +2025-05-16 12:51:23,039 - pyrogram.connection.connection - INFO - Connecting... +2025-05-16 12:51:23,040 - pyrogram.connection.connection - INFO - Connected! Production DC1 - IPv4 +2025-05-16 12:51:25,707 - pyrogram.session.auth - INFO - Done auth key exchange: DhGenOk +2025-05-16 12:51:25,707 - pyrogram.connection.connection - INFO - Disconnected +2025-05-16 12:51:25,721 - pyrogram.connection.connection - INFO - Connecting... +2025-05-16 12:51:25,722 - pyrogram.connection.connection - INFO - Connected! Production DC1 - IPv4 +2025-05-16 12:51:25,722 - pyrogram.session.session - INFO - NetworkTask started +2025-05-16 12:51:27,374 - pyrogram.session.session - INFO - Session initialized: Pyrogram v2.2.3 (Layer 203) +2025-05-16 12:51:27,374 - pyrogram.session.session - INFO - Device: CPython 3.10.0 - Pyrogram 2.2.3 +2025-05-16 12:51:27,374 - pyrogram.session.session - INFO - System: Windows 10 (en) +2025-05-16 12:51:27,374 - pyrogram.session.session - INFO - Session started +2025-05-16 12:51:27,374 - pyrogram.session.session - INFO - PingTask started +2025-05-16 12:51:37,036 - pyrogram.dispatcher - INFO - Started 16 HandlerTasks +2025-05-16 12:51:39,584 - __main__ - INFO - +✅ Сохранено 50 аккаунтов в credentials.json +2025-05-16 12:53:06,874 - steam_parser.steam - INFO - ✅ Guard code установлен для аккаунта: steamok1089773 +2025-05-16 12:54:55,102 - pyrogram.connection.connection - INFO - Connecting... +2025-05-16 12:54:55,104 - pyrogram.connection.connection - INFO - Connected! Production DC1 - IPv4 +2025-05-16 12:54:55,106 - pyrogram.session.session - INFO - NetworkTask started +2025-05-16 12:54:56,204 - pyrogram.session.session - INFO - Session initialized: Pyrogram v2.2.3 (Layer 203) +2025-05-16 12:54:56,204 - pyrogram.session.session - INFO - Device: CPython 3.10.0 - Pyrogram 2.2.3 +2025-05-16 12:54:56,204 - pyrogram.session.session - INFO - System: Windows 10 (en) +2025-05-16 12:54:56,204 - pyrogram.session.session - INFO - Session started +2025-05-16 12:54:56,215 - pyrogram.session.session - INFO - PingTask started +2025-05-16 12:54:56,965 - pyrogram.dispatcher - INFO - Started 16 HandlerTasks +2025-05-16 12:54:58,857 - __main__ - INFO - +✅ Сохранено 50 аккаунтов в credentials.json +2025-05-16 12:56:11,688 - steam_parser.steam - INFO - ✅ Guard code установлен для аккаунта: ets2xiajsh +2025-05-16 12:57:49,539 - pyrogram.connection.connection - INFO - Connecting... +2025-05-16 12:57:49,542 - pyrogram.connection.connection - INFO - Connected! Production DC1 - IPv4 +2025-05-16 12:57:49,544 - pyrogram.session.session - INFO - NetworkTask started +2025-05-16 12:57:50,765 - pyrogram.session.session - INFO - Session initialized: Pyrogram v2.2.3 (Layer 203) +2025-05-16 12:57:50,765 - pyrogram.session.session - INFO - Device: CPython 3.10.0 - Pyrogram 2.2.3 +2025-05-16 12:57:50,766 - pyrogram.session.session - INFO - System: Windows 10 (en) +2025-05-16 12:57:50,766 - pyrogram.session.session - INFO - Session started +2025-05-16 12:57:50,774 - pyrogram.session.session - INFO - PingTask started +2025-05-16 12:57:51,414 - pyrogram.dispatcher - INFO - Started 16 HandlerTasks +2025-05-16 12:57:53,257 - __main__ - INFO - +✅ Сохранено 50 аккаунтов в credentials.json +2025-05-16 12:58:53,750 - steam_parser.steam - INFO - ✅ Guard code установлен для аккаунта: qq1070414930 +2025-05-16 12:59:40,770 - steam_parser.steam - INFO - Вход для аккаунта ivpopov13 не удался. Ошибка: Message: invalid session id +Stacktrace: + GetHandleVerifier [0x00007FF6BBF3CF65+75717] + GetHandleVerifier [0x00007FF6BBF3CFC0+75808] + (No symbol) [0x00007FF6BBD08DCC] + (No symbol) [0x00007FF6BBD4F54F] + (No symbol) [0x00007FF6BBD87242] + (No symbol) [0x00007FF6BBD81C63] + (No symbol) [0x00007FF6BBD80D29] + (No symbol) [0x00007FF6BBCD5A55] + GetHandleVerifier [0x00007FF6BC23D74D+3223469] + GetHandleVerifier [0x00007FF6BC237CF2+3200338] + GetHandleVerifier [0x00007FF6BC255B23+3322755] + GetHandleVerifier [0x00007FF6BBF56A3A+180890] + GetHandleVerifier [0x00007FF6BBF5E13F+211359] + (No symbol) [0x00007FF6BBCD4AC8] + GetHandleVerifier [0x00007FF6BC326FF8+4180056] + BaseThreadInitThunk [0x00007FF9DF79259D+29] + RtlUserThreadStart [0x00007FF9E0CCAF38+40] + diff --git a/steam_parser/steam.py b/steam_parser/steam.py index bca4e56..6df5702 100644 --- a/steam_parser/steam.py +++ b/steam_parser/steam.py @@ -16,15 +16,15 @@ class SteamLogin(): if not os.path.exists('credentials_backup.json'): open('credentials_backup.json', 'w').write(json.dumps({'accounts': []})) - options = Options() + self.options = Options() prefs = { "credentials_enable_service": False, "profile.password_manager_enabled": False, "profile.password_manager_leak_detection": False # Отключение проверки утечек паролей } - options.add_experimental_option("prefs", prefs) + self.options.add_experimental_option("prefs", prefs) self.driver = webdriver.Chrome( - options=options + options=self.options ) def __wait_get(self, xpath: str, timeout: int = 15): @@ -43,6 +43,15 @@ class SteamLogin(): open('credentials_backup.json', 'w').write(json.dumps(data)) + + def __restart_driver(self): + self.driver.quit() + self.driver = webdriver.Chrome( + options=self.options + ) + self.driver.get("https://steamcommunity.com/login/home/?goto=") + # time.sleep(15) + def open_steam_login_page_and_type(self): # Открываем страницу входа в Steam @@ -60,13 +69,13 @@ class SteamLogin(): if account in archive: continue - time.sleep(30) + # time.sleep(30) username = account['username'] password = account['password'] # Задержка перед заходом в аккаунт - WebDriverWait(self.driver, 30).until( + WebDriverWait(self.driver, 15).until( EC.presence_of_element_located(("xpath", '//*[@id="responsive_page_template_content"]/div[1]/div[1]/div/div/div/div[2]/div/form/div[1]/input')) ) @@ -99,7 +108,7 @@ class SteamLogin(): if is_family: self.__wait_get('//*[@id="account_pulldown"]').click() self.__wait_get('//*[@id="account_dropdown"]/div/a[last()]').click() - self.driver.get("https://steamcommunity.com/login/home/?goto=") + self.__restart_driver() self.__write_to_json(account) logger.info(f"Вход для аккаунта {username} не удался. Ошибка: семейный доступ") continue @@ -115,6 +124,8 @@ class SteamLogin(): WebDriverWait(self.driver, 10).until( EC.presence_of_element_located(('xpath', '//*[@id="main_content"]/div[2]/div/div[2]/div[3]/div[5]/div[2]/a')) ).click() + + # ключевой момент WebDriverWait(self.driver, 10).until( EC.presence_of_element_located(('xpath', '//*[@id="email_authenticator_form"]/div/div[2]/label')) ).click() @@ -123,7 +134,7 @@ class SteamLogin(): if is_red: self.__wait_get('//*[@id="account_pulldown"]').click() self.__wait_get('//*[@id="account_dropdown"]/div/a[last()]').click() - self.driver.get("https://steamcommunity.com/login/home/?goto=") + self.__restart_driver() self.__write_to_json(account) logger.info(f"Вход для аккаунта {username} не удался. Ошибка: красная табличка") continue @@ -145,5 +156,5 @@ class SteamLogin(): # Возвращаемся на страницу входа для следующего аккаунта self.__write_to_json(account) - self.driver.get("https://steamcommunity.com/login/home/?goto=") + self.__restart_driver()