Merge pull request #101 from aliensb/main

add support for linux

.env

@@ -1,2 +1,2 @@
-version=1.4.04
-VERSION=1.4.04
+version=1.4.06
+VERSION=1.4.06

.gitignore

@@ -1,8 +1,47 @@
-cursor_accounts.txt
-/venv
-/__pycache__
-dist
-build
+__pycache__
+server/
+venv/
+check_license.py
+cursor_modifier.py
+reset_machine.py
+Run_Venv.bat
+token_monitor.py
+get_mac.py
+.gitignore
+build.bat
+build.mac.command
+build.py
+build.sh
+ENV/
+
 install.bat
 run.bat
+
 temp_account_info.txt
+
+.env copy
+
+# PyInstaller
+build/
+dist/
+*.spec2
+
+credentials.txt
+cursor_accounts.txt
+recaptcha.py
+install_requirements.bat
+
+# IDE
+.idea/
+.vscode/
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Project specific
+*.log
+*.db
+*.sqlite3

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## v1.4.06
+
+1. Add: Blocked Domains Loaded | 增加被屏蔽的域名加載
+2. Fix: Cleanup Error | 修復清理進程時出錯
+3. Fix: Blocked Domains Loaded Error | 修復被屏蔽的域名加載錯誤
+4. Fix: Available Domains Loaded Error | 修復可用域名加載錯誤
+5. Fix: Domains Filtered Error | 修復過濾後剩餘域名錯誤
+6. Fix: Domains Excluded Error | 修復排除域名錯誤
+
+
+## v1.4.05
+
+1. Fix: macOS Language Detection | 修復macOS語言檢測
+
+
 ## v1.4.04
 
 1. Change Some Language Info to English | 更改一些語言信息為英文

block_domain.txt

@@ -0,0 +1 @@
+oakon.com

cursor_auth.py

@@ -26,6 +26,10 @@ class CursorAuth:
             self.db_path = os.path.join(
                 os.getenv("APPDATA"), "Cursor", "User", "globalStorage", "state.vscdb"
             )
+        elif os.name =='posix':
+            self.db_path = os.path.expanduser(
+                            "~/.config/Cursor/User/globalStorage/state.vscdb"
+                        )
         else:  # macOS
             self.db_path = os.path.expanduser(
                 "~/Library/Application Support/Cursor/User/globalStorage/state.vscdb"

locales/en.json

@@ -203,7 +203,23 @@
         "verification_code_found": "Verification Code Found",
         "verification_code_not_found": "Verification Code Not Found",
         "verification_code_error": "Verification Code Error: {error}",
-        "address": "Email Address"
+        "address": "Email Address",
+        "all_domains_blocked": "All Domains Blocked, Switching Service",
+        "no_available_domains_after_filtering": "No Available Domains After Filtering",
+        "switching_service": "Switching to {service} Service",
+        "domains_list_error": "Failed to Get Domains List: {error}",
+        "failed_to_get_available_domains": "Failed to Get Available Domains",
+        "domains_excluded": "Domains Excluded: {domains}",
+        "failed_to_create_account": "Failed to Create Account",
+        "account_creation_error": "Account Creation Error: {error}",
+        "blocked_domains": "Blocked Domains: {domains}",
+        "blocked_domains_loaded": "Blocked Domains Loaded: {count}",
+        "blocked_domains_loaded_error": "Blocked Domains Loaded Error: {error}",
+        "blocked_domains_loaded_success": "Blocked Domains Loaded Successfully",
+        "blocked_domains_loaded_timeout": "Blocked Domains Loaded Timeout: {timeout}s",
+        "blocked_domains_loaded_timeout_error": "Blocked Domains Loaded Timeout Error: {error}",
+        "available_domains_loaded": "Available Domains Loaded: {count}",
+        "domains_filtered": "Domains Filtered: {count}"
     },
     "update": {
         "title": "Disable Cursor Auto Update",

locales/zh_cn.json

@@ -200,7 +200,23 @@
         "verification_code_found": "找到验证码",
         "verification_code_not_found": "未找到验证码",
         "verification_code_error": "验证码错误: {error}",
-        "address": "邮箱地址"
+        "address": "邮箱地址",
+        "all_domains_blocked": "所有域名都被屏蔽了，切换服务",
+        "no_available_domains_after_filtering": "过滤后没有可用域名",
+        "switching_service": "切换到 {service} 服务",
+        "domains_list_error": "获取域名列表失败: {error}",
+        "failed_to_get_available_domains": "获取可用域名失败",
+        "blocked_domains_loaded": "加载了 {count} 个被屏蔽的域名",
+        "domains_excluded": "排除了 {domains} 个被屏蔽的域名",
+        "failed_to_create_account": "创建账户失败",
+        "account_creation_error": "账户创建错误: {error}",
+        "blocked_domains": "被屏蔽的域名: {domains}",
+        "blocked_domains_loaded_error": "加载被屏蔽的域名失败: {error}",
+        "blocked_domains_loaded_success": "加载被屏蔽的域名成功",
+        "blocked_domains_loaded_timeout": "加载被屏蔽的域名超时: {timeout}秒",
+        "blocked_domains_loaded_timeout_error": "加载被屏蔽的域名超时错误: {error}",
+        "available_domains_loaded": "获取到 {count} 个可用域名",
+        "domains_filtered": "过滤后剩餘 {count} 個可用域名"
     },
     "update": {
         "title": "禁用 Cursor 自动更新",

locales/zh_tw.json

@@ -181,7 +181,23 @@
         "verification_code_found": "找到驗證碼",
         "verification_code_not_found": "未找到驗證碼",
         "verification_code_error": "驗證碼錯誤: {error}",
-        "address": "郵箱地址"
+        "address": "郵箱地址",
+        "all_domains_blocked": "所有域名都被屏蔽了，切換服務",
+        "no_available_domains_after_filtering": "過濾後沒有可用域名",
+        "switching_service": "切換到 {service} 服務",
+        "domains_list_error": "獲取域名列表失敗: {error}",
+        "failed_to_get_available_domains": "獲取可用域名失敗",
+        "domains_excluded": "排除的域名: {domains}",
+        "failed_to_create_account": "創建帳戶失敗",
+        "account_creation_error": "帳戶創建錯誤: {error}",
+        "blocked_domains": "被屏蔽的域名: {domains}",
+        "blocked_domains_loaded": "加載被屏蔽的域名: {domains}",
+        "blocked_domains_loaded_error": "加載被屏蔽的域名失敗: {error}",
+        "blocked_domains_loaded_success": "加載被屏蔽的域名成功",
+        "blocked_domains_loaded_timeout": "加載被屏蔽的域名超時: {timeout}秒",
+        "blocked_domains_loaded_timeout_error": "加載被屏蔽的域名超時錯誤: {error}",
+        "available_domains_loaded": "獲取到 {count} 個可用域名",
+        "domains_filtered": "過濾後剩餘 {count} 個可用域名"
     },
     "update": {
         "title": "禁用 Cursor 自动更新",

main.py

@@ -5,11 +5,15 @@ import sys
 import json
 from logo import print_logo
 from colorama import Fore, Style, init
-import ctypes
-from ctypes import windll
 import locale
 import platform
 
+# 只在 Windows 系统上导入 windll
+if platform.system() == 'Windows':
+    import ctypes
+    # 只在 Windows 上导入 windll
+    from ctypes import windll
+
 # 初始化colorama
 init()
 
@@ -29,8 +33,8 @@ EMOJI = {
 
 class Translator:
     def __init__(self):
-        self.current_language = self.detect_system_language()  # Changed to use system language
         self.translations = {}
+        self.current_language = self.detect_system_language()  # 使用正确的方法名
         self.fallback_language = 'en'  # Fallback language if translation is missing
         self.load_translations()
     
@@ -51,8 +55,12 @@ class Translator:
     def _detect_windows_language(self):
         """Detect language on Windows systems"""
         try:
-            # Get the keyboard layout
-            user32 = ctypes.WinDLL('user32', use_last_error=True)
+            # 确保我们在 Windows 上
+            if platform.system() != 'Windows':
+                return 'en'
+                
+            # 获取键盘布局
+            user32 = ctypes.windll.user32
             hwnd = user32.GetForegroundWindow()
             threadid = user32.GetWindowThreadProcessId(hwnd, 0)
             layout_id = user32.GetKeyboardLayout(threadid) & 0xFFFF

new_tempemail.py

@@ -23,6 +23,47 @@ class NewTempEmail:
         self.token = None
         self.email = None
         self.password = None
+        self.blocked_domains = self.get_blocked_domains()
+        
+    def get_blocked_domains(self):
+        """Get blocked domains list"""
+        try:
+            block_url = "https://raw.githubusercontent.com/yeongpin/cursor-free-vip/main/block_domain.txt"
+            response = requests.get(block_url, timeout=5)
+            if response.status_code == 200:
+                # Split text and remove empty lines
+                domains = [line.strip() for line in response.text.split('\n') if line.strip()]
+                if self.translator:
+                    print(f"{Fore.CYAN}ℹ️ {self.translator.get('email.blocked_domains_loaded', count=len(domains))}{Style.RESET_ALL}")
+                else:
+                    print(f"{Fore.CYAN}ℹ️ 已加载 {len(domains)} 个被屏蔽的域名{Style.RESET_ALL}")
+                return domains
+            return []
+        except Exception as e:
+            if self.translator:
+                print(f"{Fore.YELLOW}⚠️ {self.translator.get('email.blocked_domains_error', error=str(e))}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.YELLOW}⚠️ 获取被屏蔽域名列表失败: {str(e)}{Style.RESET_ALL}")
+            return []
+    
+    def exclude_blocked_domains(self, domains):
+        """Exclude blocked domains"""
+        if not self.blocked_domains:
+            return domains
+            
+        filtered_domains = []
+        for domain in domains:
+            if domain['domain'] not in self.blocked_domains:
+                filtered_domains.append(domain)
+                
+        excluded_count = len(domains) - len(filtered_domains)
+        if excluded_count > 0:
+            if self.translator:
+                print(f"{Fore.YELLOW}⚠️ {self.translator.get('email.domains_excluded', domains=excluded_count)}{Style.RESET_ALL}")
+            else:
+                print(f"{Fore.YELLOW}⚠️ 已排除 {excluded_count} 个被屏蔽的域名{Style.RESET_ALL}")
+                
+        return filtered_domains
         
     def _generate_credentials(self):
         """生成随机用户名和密码"""
@@ -39,42 +80,112 @@ class NewTempEmail:
                 print(f"{Fore.CYAN}ℹ️ 正在访问 {self.selected_service['name']}...{Style.RESET_ALL}")
             
             # 获取可用域名列表
-            domains_response = requests.get(f"{self.api_url}/domains")
-            if domains_response.status_code != 200:
-                raise Exception(f"{self.translator.get('email.failed_to_get_available_domains')}")
+            try:
+                domains_response = requests.get(f"{self.api_url}/domains", timeout=10)
+                if domains_response.status_code != 200:
+                    print(f"{Fore.RED}❌ {self.translator.get('email.domains_list_error', error=domains_response.status_code)}{Style.RESET_ALL}")
+                    print(f"{Fore.RED}❌ {self.translator.get('email.domains_list_error', error=domains_response.text)}{Style.RESET_ALL}")
+                    raise Exception(f"{self.translator.get('email.failed_to_get_available_domains') if self.translator else 'Failed to get available domains'}")
+                    
+                domains = domains_response.json()["hydra:member"]
+                print(f"{Fore.CYAN}ℹ️ {self.translator.get('email.available_domains_loaded', count=len(domains))}{Style.RESET_ALL}")
                 
-            domains = domains_response.json()["hydra:member"]
-            if not domains:
-                raise Exception(f"{self.translator.get('email.no_available_domains')}")
+                if not domains:
+                    raise Exception(f"{self.translator.get('email.no_available_domains') if self.translator else '没有可用域名'}")
+            except Exception as e:
+                print(f"{Fore.RED}❌ 获取域名列表时出错: {str(e)}{Style.RESET_ALL}")
+                raise
+                
+            # 排除被屏蔽的域名
+            try:
+                filtered_domains = self.exclude_blocked_domains(domains)
+                if self.translator:
+                    print(f"{Fore.CYAN}ℹ️ {self.translator.get('email.domains_filtered', count=len(filtered_domains))}{Style.RESET_ALL}")
+                else:
+                    print(f"{Fore.CYAN}ℹ️ 过滤后剩余 {len(filtered_domains)} 个可用域名{Style.RESET_ALL}")
+                
+                if not filtered_domains:
+                    if self.translator:
+                        print(f"{Fore.RED}❌ {self.translator.get('email.all_domains_blocked')}{Style.RESET_ALL}")
+                    else:
+                        print(f"{Fore.RED}❌ 所有域名都被屏蔽了，尝试切换服务{Style.RESET_ALL}")
+                    
+                    # 切换到另一个服务
+                    for service in self.services:
+                        if service["api_url"] != self.api_url:
+                            self.selected_service = service
+                            self.api_url = service["api_url"]
+                            if self.translator:
+                                print(f"{Fore.CYAN}ℹ️ {self.translator.get('email.switching_service', service=service['name'])}{Style.RESET_ALL}")
+                            else:
+                                print(f"{Fore.CYAN}ℹ️ 切换到 {service['name']} 服务{Style.RESET_ALL}")
+                            return self.create_email()  # 递归调用
+                    
+                    raise Exception(f"{self.translator.get('email.no_available_domains_after_filtering') if self.translator else '过滤后没有可用域名'}")
+            except Exception as e:
+                print(f"{Fore.RED}❌ 过滤域名时出错: {str(e)}{Style.RESET_ALL}")
+                raise
                 
             # 生成随机用户名和密码
-            username, password = self._generate_credentials()
-            self.password = password
+            try:
+                username, password = self._generate_credentials()
+                self.password = password
+                
+                # 创建邮箱账户
+                selected_domain = filtered_domains[0]['domain']
+                email = f"{username}@{selected_domain}"
+                
+                print(f"{Fore.CYAN}ℹ️ 尝试创建邮箱: {email}{Style.RESET_ALL}")
+                
+                account_data = {
+                    "address": email,
+                    "password": password
+                }
+            except Exception as e:
+                print(f"{Fore.RED}❌ 生成凭据时出错: {str(e)}{Style.RESET_ALL}")
+                raise
             
-            # 创建邮箱账户
-            email = f"{username}@{domains[0]['domain']}"
-            account_data = {
-                "address": email,
-                "password": password
-            }
-            
-            create_response = requests.post(f"{self.api_url}/accounts", json=account_data)
-            if create_response.status_code != 201:
-                raise Exception(f"{self.translator.get('email.failed_to_create_account')}")
+            # 创建账户
+            try:
+                create_response = requests.post(f"{self.api_url}/accounts", json=account_data, timeout=15)
+                
+                if create_response.status_code != 201:
+                    print(f"{Fore.RED}❌ 创建账户失败: 状态码 {create_response.status_code}{Style.RESET_ALL}")
+                    print(f"{Fore.RED}❌ 响应内容: {create_response.text}{Style.RESET_ALL}")
+                    
+                    # 如果是域名问题，尝试下一个域名
+                    if len(filtered_domains) > 1 and ("domain" in create_response.text.lower() or "address" in create_response.text.lower()):
+                        print(f"{Fore.YELLOW}⚠️ 尝试使用下一个可用域名...{Style.RESET_ALL}")
+                        # 将当前域名添加到屏蔽列表
+                        if selected_domain not in self.blocked_domains:
+                            self.blocked_domains.append(selected_domain)
+                        # 递归调用自己
+                        return self.create_email()
+                        
+                    raise Exception(f"{self.translator.get('email.failed_to_create_account') if self.translator else '创建账户失败'}")
+            except Exception as e:
+                print(f"{Fore.RED}❌ 创建账户时出错: {str(e)}{Style.RESET_ALL}")
+                raise
                 
             # 获取访问令牌
-            token_data = {
-                "address": email,
-                "password": password
-            }
-            
-            token_response = requests.post(f"{self.api_url}/token", json=token_data)
-            if token_response.status_code != 200:
-                raise Exception(f"{self.translator.get('email.failed_to_get_access_token')}")
+            try:
+                token_data = {
+                    "address": email,
+                    "password": password
+                }
+                
+                token_response = requests.post(f"{self.api_url}/token", json=token_data, timeout=10)
+                if token_response.status_code != 200:
+                    print(f"{Fore.RED}❌ 获取令牌失败: 状态码 {token_response.status_code}{Style.RESET_ALL}")
+                    print(f"{Fore.RED}❌ 响应内容: {token_response.text}{Style.RESET_ALL}")
+                    raise Exception(f"{self.translator.get('email.failed_to_get_access_token') if self.translator else '获取访问令牌失败'}")
+                    
+                self.token = token_response.json()["token"]
+                self.email = email
+            except Exception as e:
+                print(f"{Fore.RED}❌ 获取令牌时出错: {str(e)}{Style.RESET_ALL}")
+                raise
                 
-            self.token = token_response.json()["token"]
-            self.email = email
-            
             if self.translator:
                 print(f"{Fore.GREEN}✅ {self.translator.get('email.create_success')}: {email}{Style.RESET_ALL}")
             else:

scripts/install.sh

@@ -50,12 +50,25 @@ get_latest_version() {
     echo -e "${GREEN}✅ 找到最新版本: ${VERSION}${NC}"
 }
 
-# 檢測系統類型
+# 檢測系統類型和架構
 detect_os() {
     if [[ "$(uname)" == "Darwin" ]]; then
-        OS="mac"
-    else
+        # 检测 macOS 架构
+        ARCH=$(uname -m)
+        if [[ "$ARCH" == "arm64" ]]; then
+            OS="mac_arm64"
+            echo -e "${CYAN}ℹ️ 检测到 macOS ARM64 架构${NC}"
+        else
+            OS="mac_intel"
+            echo -e "${CYAN}ℹ️ 检测到 macOS Intel 架构${NC}"
+        fi
+    elif [[ "$(uname)" == "Linux" ]]; then
         OS="linux"
+        echo -e "${CYAN}ℹ️ 检测到 Linux 系统${NC}"
+    else
+        # 假设是 Windows
+        OS="windows"
+        echo -e "${CYAN}ℹ️ 检测到 Windows 系统${NC}"
     fi
 }
 
@@ -67,11 +80,51 @@ install_cursor_free_vip() {
     local download_url="https://github.com/yeongpin/cursor-free-vip/releases/download/v${VERSION}/${binary_name}"
     
     echo -e "${CYAN}ℹ️ 正在下載到 ${downloads_dir}...${NC}"
+    echo -e "${CYAN}ℹ️ 下載鏈接: ${download_url}${NC}"
+    
+    # 先检查文件是否存在
+    if curl --output /dev/null --silent --head --fail "$download_url"; then
+        echo -e "${GREEN}✅ 文件存在，开始下载...${NC}"
+    else
+        echo -e "${RED}❌ 下载链接不存在: ${download_url}${NC}"
+        echo -e "${YELLOW}⚠️ 尝试不带架构的版本...${NC}"
+        
+        # 尝试不带架构的版本
+        if [[ "$OS" == "mac_arm64" || "$OS" == "mac_intel" ]]; then
+            OS="mac"
+            binary_name="CursorFreeVIP_${VERSION}_${OS}"
+            download_url="https://github.com/yeongpin/cursor-free-vip/releases/download/v${VERSION}/${binary_name}"
+            echo -e "${CYAN}ℹ️ 新下载链接: ${download_url}${NC}"
+            
+            if ! curl --output /dev/null --silent --head --fail "$download_url"; then
+                echo -e "${RED}❌ 新下载链接也不存在${NC}"
+                exit 1
+            fi
+        else
+            exit 1
+        fi
+    fi
+    
+    # 下载文件
     if ! curl -L -o "${binary_path}" "$download_url"; then
         echo -e "${RED}❌ 下載失敗${NC}"
         exit 1
     fi
     
+    # 检查下载的文件大小
+    local file_size=$(stat -f%z "${binary_path}" 2>/dev/null || stat -c%s "${binary_path}" 2>/dev/null)
+    echo -e "${CYAN}ℹ️ 下載的文件大小: ${file_size} 字節${NC}"
+    
+    # 如果文件太小，可能是错误信息
+    if [ "$file_size" -lt 1000 ]; then
+        echo -e "${YELLOW}⚠️ 警告: 下載的文件太小，可能不是有效的可執行文件${NC}"
+        echo -e "${YELLOW}⚠️ 文件內容:${NC}"
+        cat "${binary_path}"
+        echo ""
+        echo -e "${RED}❌ 下載失敗，請檢查版本號和操作系統是否正確${NC}"
+        exit 1
+    fi
+    
     echo -e "${CYAN}ℹ️ 正在設置執行權限...${NC}"
     chmod +x "${binary_path}"