feat: Implement Configuration Management and Enhance Browser Setup

- Add `setup_config` function to manage configuration file across platforms - Extract configuration-related code from `setup_driver` into a separate function - Implement dynamic Chrome path detection for Windows, macOS, and Linux - Add configurable Turnstile verification settings - Update README.md with configuration file details - Enhance localization support for configuration-related messages - Improve code maintainability and platform compatibility
2025-03-07 11:18:43 +08:00
parent 6312d66813
commit 02851c9a09
9 changed files with 322 additions and 150 deletions
--- a/new_signup.py
+++ b/new_signup.py
@@ -4,6 +4,9 @@ import os
 import signal
 import random
 from colorama import Fore, Style
+import configparser
+from pathlib import Path
+import sys

 # 在文件开头添加全局变量
 _translator = None
@@ -94,43 +97,181 @@ def fill_signup_form(page, first_name, last_name, email, translator=None):
            print(f"填写表单时出错: {e}")
        return False

-def setup_driver(translator=None):
-    """设置浏览器驱动"""
-    co = ChromiumOptions()
-    
-    # 使用无痕模式
-    co.set_argument("--incognito")
+def get_default_chrome_path():
+    """Get default Chrome path"""
+    if sys.platform == "win32":
+        paths = [
+            os.path.join(os.environ.get('PROGRAMFILES', ''), 'Google/Chrome/Application/chrome.exe'),
+            os.path.join(os.environ.get('PROGRAMFILES(X86)', ''), 'Google/Chrome/Application/chrome.exe'),
+            os.path.join(os.environ.get('LOCALAPPDATA', ''), 'Google/Chrome/Application/chrome.exe')
+        ]
+    elif sys.platform == "darwin":
+        paths = [
+            "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+        ]
+    else:  # Linux
+        paths = [
+            "/usr/bin/google-chrome",
+            "/usr/bin/google-chrome-stable"
+        ]

-    # 设置随机端口
-    co.set_argument("--no-sandbox")
-    
-    # 设置随机端口
-    co.auto_port()
-    
-    # 使用有头模式(一定要设置为False，模擬人類操作)
-    co.headless(False)
-    
+    for path in paths:
+        if os.path.exists(path):
+            return path
+    return ""
+
+def get_user_documents_path():
+    """Get user Documents folder path"""
+    if sys.platform == "win32":
+        return os.path.join(os.path.expanduser("~"), "Documents")
+    elif sys.platform == "darwin":
+        return os.path.join(os.path.expanduser("~"), "Documents")
+    else:  # Linux
+        # Get actual user's home directory
+        sudo_user = os.environ.get('SUDO_USER')
+        if sudo_user:
+            return os.path.join("/home", sudo_user, "Documents")
+        return os.path.join(os.path.expanduser("~"), "Documents")
+
+def parse_random_time(time_str):
+    """解析随机时间范围配置"""
    try:
-        # 加载插件
-        extension_path = os.path.join(os.getcwd(), "turnstilePatch")
-        if os.path.exists(extension_path):
-            co.set_argument("--allow-extensions-in-incognito")
-            co.add_extension(extension_path)
+        if '-' in time_str:
+            min_time, max_time = map(float, time_str.split('-'))
+        elif ',' in time_str:
+            min_time, max_time = map(float, time_str.split(','))
+        else:
+            min_time = max_time = float(time_str)
+        return min_time, max_time
+    except:
+        return 1, 3  # 默认值
+
+def setup_config(translator=None):
+    """Setup configuration file and return config object"""
+    try:
+        # Set configuration file path
+        config_dir = os.path.join(get_user_documents_path(), ".cursor-free-vip")
+        config_file = os.path.join(config_dir, "config.ini")
+
+        # Create config directory (if it doesn't exist)
+        os.makedirs(config_dir, exist_ok=True)
+
+        # Read or create configuration file
+        config = configparser.ConfigParser()
+        
+        # 默认配置
+        default_config = {
+            'Chrome': {
+                'chromepath': get_default_chrome_path()
+            },
+            'Turnstile': {
+                'handle_turnstile_time': '2',
+                'handle_turnstile_random_time': '1-3'
+            }
+        }
+
+        if os.path.exists(config_file):
+            config.read(config_file)
+            config_modified = False
+
+            # 检查并添加缺失的配置项
+            for section, options in default_config.items():
+                if not config.has_section(section):
+                    config.add_section(section)
+                    config_modified = True
+                for option, value in options.items():
+                    if not config.has_option(section, option):
+                        config.set(section, option, value)
+                        config_modified = True
+                        if translator:
+                            print(f"{Fore.YELLOW}ℹ️ {translator.get('register.config_option_added', option=f'{section}.{option}') if translator else f'添加配置项: {section}.{option}'}{Style.RESET_ALL}")
+
+            # 如果有新增配置项，保存文件
+            if config_modified:
+                with open(config_file, 'w', encoding='utf-8') as f:
+                    config.write(f)
+                if translator:
+                    print(f"{Fore.GREEN}✅ {translator.get('register.config_updated') if translator else '配置文件已更新'}{Style.RESET_ALL}")
+        else:
+            # 创建新配置文件
+            config = configparser.ConfigParser()
+            for section, options in default_config.items():
+                config.add_section(section)
+                for option, value in options.items():
+                    config.set(section, option, value)
+            
+            with open(config_file, 'w', encoding='utf-8') as f:
+                config.write(f)
+            if translator:
+                print(f"{Fore.GREEN}✅ {translator.get('register.config_created') if translator else '已创建配置文件'}: {config_file}{Style.RESET_ALL}")
+
+        return config
+
    except Exception as e:
        if translator:
-            print(f"{Fore.RED}❌ {translator.get('register.extension_load_error', error=str(e))}{Style.RESET_ALL}")
-        else:
-            print(f"加载插件失败: {e}")
-    
-    if translator:
-        print(f"{Fore.CYAN}🚀 {translator.get('register.starting_browser')}{Style.RESET_ALL}")
-    else:
-        print("正在启动浏览器...")
-    page = ChromiumPage(co)
-    
-    return page
+            print(f"{Fore.RED}❌ {translator.get('register.config_setup_error', error=str(e)) if translator else f'配置设置出错: {str(e)}'}{Style.RESET_ALL}")
+        raise

-def handle_turnstile(page, translator=None):
+def setup_driver(translator=None):
+    """Setup browser driver"""
+    try:
+        # 获取配置
+        config = setup_config(translator)
+        
+        # Get Chrome path
+        chrome_path = config.get('Chrome', 'chromepath', fallback=get_default_chrome_path())
+        
+        if not chrome_path or not os.path.exists(chrome_path):
+            if translator:
+                print(f"{Fore.YELLOW}⚠️ {translator.get('register.chrome_path_invalid') if translator else 'Chrome路径无效，使用默认路径'}{Style.RESET_ALL}")
+            chrome_path = get_default_chrome_path()
+
+        # Set browser options
+        co = ChromiumOptions()
+        
+        # Set Chrome path
+        co.set_browser_path(chrome_path)
+        
+        # Use incognito mode
+        co.set_argument("--incognito")
+
+        # 设置随机端口
+        co.set_argument("--no-sandbox")
+        
+        # 设置随机端口
+        co.auto_port()
+        
+        # 使用有头模式(一定要设置为False，模拟人类操作)
+        co.headless(False)
+        
+        try:
+            # 加载插件
+            extension_path = os.path.join(os.getcwd(), "turnstilePatch")
+            if os.path.exists(extension_path):
+                co.set_argument("--allow-extensions-in-incognito")
+                co.add_extension(extension_path)
+        except Exception as e:
+            if translator:
+                print(f"{Fore.RED}❌ {translator.get('register.extension_load_error', error=str(e))}{Style.RESET_ALL}")
+            else:
+                print(f"加载插件失败: {e}")
+        
+        if translator:
+            print(f"{Fore.CYAN}🚀 {translator.get('register.starting_browser')}{Style.RESET_ALL}")
+        else:
+            print("正在启动浏览器...")
+        
+        page = ChromiumPage(co)
+        return config, page
+
+    except Exception as e:
+        if translator:
+            print(f"{Fore.RED}❌ {translator.get('register.browser_setup_error', error=str(e))}{Style.RESET_ALL}")
+        else:
+            print(f"设置浏览器时出错: {e}")
+        raise
+
+def handle_turnstile(page, config, translator=None):
    """处理 Turnstile 验证"""
    try:
        if translator:
@@ -138,6 +279,11 @@ def handle_turnstile(page, translator=None):
        else:
            print("\n正在处理 Turnstile 验证...")
        
+        # from config
+        turnstile_time = float(config.get('Turnstile', 'handle_turnstile_time', fallback='2'))
+        random_time_str = config.get('Turnstile', 'handle_turnstile_random_time', fallback='1-3')
+        min_random_time, max_random_time = parse_random_time(random_time_str)
+        
        max_retries = 2
        retry_count = 0

@@ -151,7 +297,7 @@ def handle_turnstile(page, translator=None):
            try:
                # 尝试重置 turnstile
                page.run_js("try { turnstile.reset() } catch(e) { }")
-                time.sleep(2)
+                time.sleep(turnstile_time)  # from config

                # 定位验证框元素
                challenge_check = (
@@ -168,12 +314,12 @@ def handle_turnstile(page, translator=None):
                    else:
                        print("检测到验证框...")
                    
-                    # 随机延时后点击验证
-                    time.sleep(random.uniform(1, 3))
+                    # from config
+                    time.sleep(random.uniform(min_random_time, max_random_time))
                    challenge_check.click()
-                    time.sleep(2)
+                    time.sleep(turnstile_time)  # from config

-                    # 检查验证结果
+                    # check verification result
                    if check_verification_success(page, translator):
                        if translator:
                            print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
@@ -195,7 +341,7 @@ def handle_turnstile(page, translator=None):
                    print("验证通过！")
                return True

-            time.sleep(random.uniform(1, 2))
+            time.sleep(random.uniform(min_random_time, max_random_time))

        if translator:
            print(f"{Fore.RED}❌ {translator.get('register.verification_failed')}{Style.RESET_ALL}")
@@ -240,34 +386,51 @@ def generate_password(length=12):
    chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*"
    return ''.join(random.choices(chars, k=length))

-def fill_password(page, password, translator=None):
-    """填写密码"""
+def fill_password(page, password: str, translator=None) -> bool:
+    """
+    填写密码表单
+    """
    try:
-        if translator:
-            print(f"{Fore.CYAN}🔑 {translator.get('register.setting_password')}{Style.RESET_ALL}")
-        else:
-            print(f"\n{translator.get('register.setting_password')}")
-        password_input = page.ele("@name=password")
+        print(f"{Fore.CYAN}🔑 {translator.get('register.setting_password') if translator else '设置密码'}{Style.RESET_ALL}")
+        
+        # 等待密码框出现
+        max_retries = 5
+        for i in range(max_retries):
+            try:
+                # 使用 DrissionPage 的方式查找密码输入框
+                password_input = page.ele('@type=password', timeout=3)
+                if password_input:
+                    break
+                time.sleep(2)
+            except:
+                if i == max_retries - 1:
+                    print(f"{Fore.RED}❌ {translator.get('register.password_field_not_found') if translator else '未找到密码输入框'}{Style.RESET_ALL}")
+                    return False
+                continue
+
        if password_input:
+            # 清除可能存在的旧值
+            password_input.click()
+            time.sleep(0.5)
            password_input.input(password)
-            time.sleep(random.uniform(0.5, 1.0))
-            
-            submit_button = page.ele("@type=submit")
+            time.sleep(1)
+
+            # 查找并点击提交按钮
+            submit_button = page.ele('@type=submit')
            if submit_button:
                submit_button.click()
-                time.sleep(random.uniform(2.0, 3.0))
-                
-            if translator:
-                print(f"{Fore.GREEN}✅ {translator.get('register.password_success')}{Style.RESET_ALL}")
+                time.sleep(2)
+                return True
            else:
-                print(f"{translator.get('register.password_success')}: {password}")
-            return True
-            
-    except Exception as e:
-        if translator:
-            print(f"{Fore.RED}❌ {translator.get('register.password_error', error=str(e))}{Style.RESET_ALL}")
+                print(f"{Fore.RED}❌ {translator.get('register.continue_button_not_found') if translator else '未找到继续按钮'}{Style.RESET_ALL}")
+                return False
        else:
-            print(f"{translator.get('register.password_error')}: {e}")
+            print(f"{Fore.RED}❌ {translator.get('register.password_input_failed') if translator else '密码输入失败'}{Style.RESET_ALL}")
+            return False
+
+    except Exception as e:
+        print(f"{Fore.RED}❌ {translator.get('register.password_setting_error', error=str(e)) if translator else f'设置密码时出错: {str(e)}'}{Style.RESET_ALL}")
+            
        return False

 def handle_verification_code(browser_tab, email_tab, controller, email, password, translator=None):
@@ -275,8 +438,6 @@ def handle_verification_code(browser_tab, email_tab, controller, email, password
    try:
        if translator:
            print(f"\n{Fore.CYAN}{translator.get('register.waiting_for_verification_code')}{Style.RESET_ALL}")
-        else:
-            print(f"\n{translator.get('register.waiting_for_verification_code')}")
            
        # 检查是否使用手动输入验证码
        if hasattr(controller, 'get_verification_code') and email_tab is None:  # 手动模式
@@ -293,13 +454,11 @@ def handle_verification_code(browser_tab, email_tab, controller, email, password
                # 处理最后一次 Turnstile 验证
                if handle_turnstile(browser_tab, translator):
                    if translator:
-                        print(f"{translator.get('register.verification_success')}")
-                    else:
-                        print(f"{translator.get('register.verification_success')}")
+                        print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
                    time.sleep(2)
                    
                    # 访问设置页面
-                    print(f"{translator.get('register.visiting_url')}: https://www.cursor.com/settings")
+                    print(f"{Fore.CYAN} {translator.get('register.visiting_url')}: https://www.cursor.com/settings{Style.RESET_ALL}")
                    browser_tab.get("https://www.cursor.com/settings")
                    time.sleep(3)  # 等待页面加载
                    return True, browser_tab
@@ -325,23 +484,17 @@ def handle_verification_code(browser_tab, email_tab, controller, email, password
                        time.sleep(random.uniform(0.1, 0.3))
                    if translator:
                        print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
-                    else:
-                        print("验证码填写完成")
                    time.sleep(3)
                    
                    # 处理最后一次 Turnstile 验证
                    if handle_turnstile(browser_tab, translator):
                        if translator:
                            print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
-                        else:
-                            print("最后一次验证通过！")
                        time.sleep(2)
                        
                        # 访问设置页面
                        if translator:
                            print(f"{Fore.CYAN}🔑 {translator.get('register.visiting_url')}: https://www.cursor.com/settings{Style.RESET_ALL}")
-                        else:
-                            print("访问设置页面...")
                        browser_tab.get("https://www.cursor.com/settings")
                        time.sleep(3)  # 等待页面加载
                        return True, browser_tab
@@ -362,31 +515,23 @@ def handle_verification_code(browser_tab, email_tab, controller, email, password

            if translator:
                print(f"{Fore.CYAN}{translator.get('register.start_getting_verification_code')}{Style.RESET_ALL}")
-            else:
-                print("开始获取验证码...")
            
            for attempt in range(max_attempts):
                # 检查是否超时
                if time.time() - start_time > timeout:
                    if translator:
                        print(f"{Fore.RED}❌ {translator.get('register.verification_timeout')}{Style.RESET_ALL}")
-                    else:
-                        print("获取验证码超时...")
                    break
                    
                verification_code = controller.get_verification_code()
                if verification_code:
                    if translator:
                        print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
-                    else:
-                        print(f"成功获取验证码: {verification_code}")
                    break
                    
                remaining_time = int(timeout - (time.time() - start_time))
                if translator:
                    print(f"{Fore.CYAN}{translator.get('register.try_get_code', attempt=attempt + 1, time=remaining_time)}{Style.RESET_ALL}")
-                else:
-                    print(f"第 {attempt + 1} 次尝试获取验证码，剩余时间: {remaining_time}秒...")
                
                # 刷新邮箱
                email_tab.refresh_inbox()
@@ -400,23 +545,17 @@ def handle_verification_code(browser_tab, email_tab, controller, email, password
                
                if translator:
                    print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
-                else:
-                    print("验证码填写完成")
                time.sleep(3)
                
                # 处理最后一次 Turnstile 验证
                if handle_turnstile(browser_tab, translator):
                    if translator:
                        print(f"{Fore.GREEN}✅ {translator.get('register.verification_success')}{Style.RESET_ALL}")
-                    else:
-                        print("最后一次验证通过！")
                    time.sleep(2)
                    
                    # 直接访问设置页面
                    if translator:
                        print(f"{Fore.CYAN}{translator.get('register.visiting_url')}: https://www.cursor.com/settings{Style.RESET_ALL}")
-                    else:
-                        print("访问设置页面...")
                    browser_tab.get("https://www.cursor.com/settings")
                    time.sleep(3)  # 等待页面加载
                    
@@ -426,8 +565,6 @@ def handle_verification_code(browser_tab, email_tab, controller, email, password
                else:
                    if translator:
                        print(f"{Fore.RED}❌ {translator.get('register.verification_failed')}{Style.RESET_ALL}")
-                    else:
-                        print("最后一次验证失败")
                    return False, None
                
            return False, None
@@ -435,8 +572,6 @@ def handle_verification_code(browser_tab, email_tab, controller, email, password
    except Exception as e:
        if translator:
            print(f"{Fore.RED}❌ {translator.get('register.verification_error', error=str(e))}{Style.RESET_ALL}")
-        else:
-            print(f"处理验证码时出错: {e}")
        return False, None

 def handle_sign_in(browser_tab, email, password, translator=None):
@@ -499,25 +634,19 @@ def main(email=None, password=None, first_name=None, last_name=None, email_tab=N
    page = None
    success = False
    try:
-        page = setup_driver(translator)
+        config, page = setup_driver(translator)
        if translator:
            print(f"{Fore.CYAN}🚀 {translator.get('register.browser_started')}{Style.RESET_ALL}")
-        else:
-            print("浏览器已启动")
        
        # 访问注册页面
        url = "https://authenticator.cursor.sh/sign-up"
        if translator:
            print(f"\n{Fore.CYAN}{translator.get('register.visiting_url')}: {url}{Style.RESET_ALL}")
-        else:
-            print(f"\n正在访问: {url}")
        
        # 访问页面
        simulate_human_input(page, url, translator)
        if translator:
            print(f"{Fore.CYAN}{translator.get('register.waiting_for_page_load')}{Style.RESET_ALL}")
-        else:
-            print("等待页面加载...")
        time.sleep(5)
        
        # 如果没有提供账号信息，则生成随机信息
@@ -538,41 +667,33 @@ def main(email=None, password=None, first_name=None, last_name=None, email_tab=N
        if fill_signup_form(page, first_name, last_name, email, translator):
            if translator:
                print(f"\n{Fore.GREEN}{translator.get('register.form_submitted')}{Style.RESET_ALL}")
-            else:
-                print("\n表单已提交，开始验证...")
            
            # 处理第一次 Turnstile 验证
-            if handle_turnstile(page, translator):
+            if handle_turnstile(page, config, translator):
                if translator:
                    print(f"\n{Fore.GREEN}{translator.get('register.first_verification_passed')}{Style.RESET_ALL}")
-                else:
-                    print("\n第一阶段验证通过！")
                
                # 填写密码
                if fill_password(page, password, translator):
                    if translator:
                        print(f"\n{Fore.CYAN}{translator.get('register.waiting_for_second_verification')}{Style.RESET_ALL}")
-                    else:
-                        print("\n等待第二次验证...")
                    time.sleep(2)
                    
                    # 处理第二次 Turnstile 验证
-                    if handle_turnstile(page, translator):
+                    if handle_turnstile(page, config, translator):
                        if translator:
                            print(f"\n{Fore.CYAN}{translator.get('register.waiting_for_verification_code')}{Style.RESET_ALL}")
-                        else:
-                            print("\n开始处理验证码...")
                        if handle_verification_code(page, email_tab, controller, email, password, translator):
                            success = True
                            return True, page  # 返回浏览器实例
                        else:
-                            print("\n验证码处理失败")
+                            print(f"\n{Fore.RED} {translator.get('register.verification_code_processing_failed') if translator else '验证码处理失败'}{Style.RESET_ALL}")
                    else:
-                        print("\n第二次验证失败")
+                        print(f"\n{Fore.RED} {translator.get('register.second_verification_failed') if translator else '第二次验证失败'}{Style.RESET_ALL}")
                else:
-                    print("\n密码设置失败")
+                    print(f"\n{Fore.RED} {translator.get('register.second_verification_failed') if translator else '第二次验证失败'}{Style.RESET_ALL}")
            else:
-                print("\n第一次验证失败")
+                print(f"\n{Fore.RED} {translator.get('register.first_verification_failed') if translator else '第一次验证失败'}{Style.RESET_ALL}")
        
        return False, None