Эх сурвалжийг харах

feat: update keygens, refactor sentinel/standalone query flow and cleanup registration tools

hujiarui 1 сар өмнө
parent
commit
4ed096dc13

+ 44 - 64
booker.py

@@ -6,10 +6,15 @@ import random
 from datetime import datetime
 from typing import List, Dict, Callable, Optional
 
-from vs_types import GroupConfig, VSPlgConfig, Task, VSBookResult, VSQueryResult, QueryWaitMode, AvailabilityStatus, GroupStatus, PluginStatus, utc_now_str
+from vs_types import (
+    GroupConfig, VSPlgConfig, Task, VSBookResult, VSQueryResult, 
+    AppointmentType, QueryWaitMode, AvailabilityStatus, GroupStatus, PluginStatus, utc_now_str
+)
 from vs_plg_factory import VSPlgFactory 
 from toolkit.vs_cloud_api import VSCloudApi
 from toolkit.proxy_manager import ProxyManager
+from toolkit.thread_pool import ThreadPool
+from toolkit.notifier import notify_book_result
 from utils.safe_redis_cli import SafeRedisClient
 
 
@@ -99,15 +104,19 @@ class BaseBookerGCO:
                 
             self.m_cfg = new_cfg
 
-    def _cleanup_task(self, task: Task, reason: str = ""):
+    def _cleanup_instance(self, instance, reason: str = "", task_ref=None):
         try:
-            if task and task.instance:
-                task.instance.cleanup()
-                ref_str = f" for task={task.task_ref}" if task.task_ref else ""
+            if instance:
+                ref_str = f" for task={task_ref}" if task_ref else ""
                 self._log(f"🧹 Cleaned up instance{ref_str}. Reason: {reason}")
+                instance.cleanup()
         except Exception as e:
             self._log(f"Cleanup failed for instance. Reason: {reason}. Error: {e}")
 
+    def _cleanup_task(self, task: Task, reason: str = ""):
+        if task and task.instance:
+            self._cleanup_instance(task.instance, reason, task.task_ref)
+
     def _remove_task(self, task: Task, reason: str = "", cleanup: bool = True):
         removed = False
         with self.m_lock:
@@ -264,22 +273,11 @@ class BaseBookerGCO:
         def _update_cloud_success():
             try:
                 VSCloudApi.Instance().update_vas_task(str(task_id), {"status": "grabbed", "grabbed_history": grab_info})
-                push_content = (
-                    f"🎉 【预定成功通知】\n"
-                    f"━━━━━━━━━━━━━━━\n"
-                    f"订单编号: {order_id}\n"
-                    f"预约账号: {book_res.account}\n"
-                    f"预约日期: {book_res.book_date}\n"
-                    f"预约时间: {book_res.book_time}\n"
-                    f"预约编号: {book_res.urn}\n"
-                    f"支付链接: {book_res.payment_link if book_res.payment_link else '无需支付/暂无'}\n"
-                    f"━━━━━━━━━━━━━━━\n"
-                )
-                VSCloudApi.Instance().push_weixin_text(push_content)
             except Exception as e:
                 self._log(f"Failed to update success state to cloud: {e}")
 
         ThreadPool.getInstance().enqueue(_update_cloud_success)
+        notify_book_result(book_res, order_id=str(order_id) if order_id else None, logger=self._log)
         self.redis_client.zrem(self.m_tracker_key, task_id)
 
 
@@ -294,20 +292,17 @@ class BuiltinBookerGCO(BaseBookerGCO):
     def _creator_loop(self):
         self._log("Creator loop started.")
         while not self.m_stop_event.wait(1.0):
-            try:
-                if not self._is_within_active_hours():
-                    continue
+            if not self._is_within_active_hours():
+                continue
 
-                if time.time() < self.m_spawn_cooldown_until:
-                    continue
-                
-                with self.m_lock:
-                    current = len(self.m_tasks)
-                    target = self.m_cfg.booker.target_instances
-                if current < target:
-                    self._spawn_worker()
-            except Exception as e:
-                self._log(f'Creator loop exception: {e}')
+            if time.time() < self.m_spawn_cooldown_until:
+                continue
+            
+            with self.m_lock:
+                current = len(self.m_tasks)
+                target = self.m_cfg.booker.target_instances
+            if current < target:
+                self._spawn_worker()
 
     def _spawn_worker(self):
         instance = None
@@ -359,16 +354,10 @@ class BuiltinBookerGCO(BaseBookerGCO):
             ]
             if any(rate_limited_indicators):
                 if plg_cfg and plg_cfg.account.username != "Guest":
-                    VSCloudApi.lock_account(plg_cfg.account.id, self.m_cfg.login_backoff)
+                    VSCloudApi.Instance().lock_account(plg_cfg.account.id, self.m_cfg.login_backoff)
         finally:
-            if not success:
-                if task:
-                    self._remove_task(task, "spawn failed")
-                elif instance:
-                    try:
-                        instance.cleanup()
-                    except Exception:
-                        pass
+            if not success and instance:
+                self._cleanup_instance(instance, "spawn failed")
 
     def _execute_book_job(self, task: Task, query_result: VSQueryResult):
         queue_name = f"auto.{query_result.apt_type.routing_key}"
@@ -525,22 +514,19 @@ class OrderBookerGCO(BaseBookerGCO):
     def _creator_loop(self):
         self._log("Creator loop started.")
         while not self.m_stop_event.wait(1.0):
-            try:
-                if not self._is_within_active_hours():
-                    continue
+            if not self._is_within_active_hours():
+                continue
 
-                if time.time() < self.m_spawn_cooldown_until:
-                    continue
+            if time.time() < self.m_spawn_cooldown_until:
+                continue
 
-                for apt in self.m_cfg.appointment_types:
-                    r_key = apt.routing_key
-                    with self.m_lock:
-                        active = sum(1 for t in self.m_tasks if t.source_queue == r_key)
-                        target = self.m_cfg.booker.target_instances
-                    if active < target:
-                        self._spawn_worker(r_key)
-            except Exception as e:
-                self._log(f'Creator loop exception:{e}')
+            for apt in self.m_cfg.appointment_types:
+                r_key = apt.routing_key
+                with self.m_lock:
+                    active = sum(1 for t in self.m_tasks if t.source_queue == r_key)
+                    target = self.m_cfg.booker.target_instances
+                if active < target:
+                    self._spawn_worker(r_key)
 
     def _spawn_worker(self, target_routing_key: str):
         instance = None
@@ -607,14 +593,8 @@ class OrderBookerGCO(BaseBookerGCO):
                     self.redis_client.zadd(self.m_tracker_key, {str(task_id): time.time() + self.m_cfg.login_backoff})  
         
         finally:
-            if not success:
-                if task:
-                    self._remove_task(task, "spawn failed")
-                elif instance:
-                    try:
-                        instance.cleanup()
-                    except Exception:
-                        pass
-                if task_id:
-                    with self.m_lock:
-                        self.m_task_data_cache.pop(str(task_id), None)
+            if not success and instance:
+                self._cleanup_instance(instance, "spawn failed")
+            if not success and task_id:
+                with self.m_lock:
+                    self.m_task_data_cache.pop(str(task_id), None)

+ 5 - 0
configure.py

@@ -78,6 +78,11 @@ TEST_PROXY = None
 # }
 
 
+# 节点 ID 配置, 这个优先级最高,其次 NODE_ID 的环境变量,最后系统默认值 "node01"
+NODE_ID = None
+# NODE_ID = "Jerry Win11 PC"
+
+
 # Chrome bin 的路径, 这个优先级最高,其次CHROME_BIN 的环境变量,最后系统默认值
 CHROME_PATH = None
 # CHROME_PATH = "E:/ungoogled-chromium_144.0.7559.132-1.1_windows_x64/chrome.exe"

+ 2 - 1
main.py

@@ -10,6 +10,7 @@ from typing import Dict, Any, List
 from vs_types import GroupConfig, BookerStandaloneConfig, RoleStatus, utc_now_str
 from gco_wrapper import GCOWrapper
 from logger_setup import setup_app_logger
+import configure
 from configure import REDIS_CFG
 from sentinel import SentinelGCO
 from booker import BuiltinBookerGCO, OrderBookerGCO
@@ -255,7 +256,7 @@ def main():
     role = args.role
     use_cloud = args.config is None
     config_path = args.config or f"config/config_{role}.json"
-    node_id = os.getenv("NODE_ID", "node01")
+    node_id = getattr(configure, "NODE_ID", None) or os.getenv("NODE_ID", "node01")
     status_key = f"vs:status:{role}:{node_id}"
 
     logger = setup_app_logger(role.title())

+ 31 - 40
sentinel.py

@@ -10,6 +10,7 @@ from vs_types import GroupConfig, VSPlgConfig, Task, QueryWaitMode, GroupStatus,
 from vs_plg_factory import VSPlgFactory 
 from toolkit.vs_cloud_api import VSCloudApi
 from toolkit.proxy_manager import ProxyManager
+from toolkit.notifier import notify_date_changes
 from utils.safe_redis_cli import SafeRedisClient
 
 class SentinelGCO:
@@ -23,6 +24,7 @@ class SentinelGCO:
         self.redis_client = SafeRedisClient(redis_conf, self.m_logger)
         self.m_last_group_query_time = 0.0
         self.m_spawn_cooldown_until = 0.0
+        self.m_current_dates = {}
 
     def _log(self, message):
         if self.m_logger:
@@ -101,13 +103,17 @@ class SentinelGCO:
         for task in tasks_to_cleanup:
             self._cleanup_task(task, "sentinel stopped")
 
-    def _cleanup_task(self, task: Task, reason: str):
+    def _cleanup_instance(self, instance, reason: str = ""):
         try:
-            if task and task.instance:
-                self._log(f"Cleaning up sentinel instance. reason={reason}")
-                task.instance.cleanup()
+            if instance:
+                self._log(f"🧹 Cleaned up instance. Reason: {reason}")
+                instance.cleanup()
         except Exception as e:
-            self._log(f"Cleanup failed. reason={reason}, error={e}")
+            self._log(f"Cleanup failed for instance. Reason: {reason}. Error: {e}")
+
+    def _cleanup_task(self, task: Task, reason: str):
+        if task and task.instance:
+            self._cleanup_instance(task.instance, reason)
 
     def _remove_task(self, task: Task, reason: str):
         removed = False
@@ -180,8 +186,11 @@ class SentinelGCO:
                     apt_types = self.m_cfg.appointment_types
                     if not apt_types:
                         continue
-                    weights = [float(item.weight) for item in apt_types]
-                    apt_type = random.choices(apt_types, weights=weights, k=1)[0]
+                    weights = [max(0.0, float(item.weight)) for item in apt_types]
+                    if sum(weights) > 0:
+                        apt_type = random.choices(apt_types, weights=weights, k=1)[0]
+                    else:
+                        apt_type = random.choice(apt_types)
                     
                     interval = 30
                     mode = task.qw_cfg.mode
@@ -194,14 +203,9 @@ class SentinelGCO:
 
                     self.m_last_group_query_time = now
                     try:
-                        VSCloudApi.Instance().slot_refresh_start(
-                            apt_type.routing_key, 
-                            country=apt_type.country, 
-                            city=apt_type.city, 
-                            visa_type=apt_type.visa_type
-                        )
                         result = task.instance.query(apt_type)
                         result.apt_type = apt_type
+                        notify_date_changes(result, cache=self.m_current_dates, logger=self._log)
                         if result.success:
                             ttl = self.m_cfg.sentinel.signal_ttl
                             self._log(f"🔥 SLOT FOUND! Writing signal to Redis (TTL: {ttl}s)")
@@ -213,12 +217,8 @@ class SentinelGCO:
                             }
                             redis_key = self._get_redis_key(apt_type.routing_key)
                             self.redis_client.setex(redis_key, ttl, json.dumps(payload))
-                            payload["query_result"]["website"] = self.m_cfg.website
-                            VSCloudApi.Instance().slot_snapshot_report(payload["query_result"])
-                        VSCloudApi.Instance().slot_refresh_success(apt_type.routing_key)
                     except Exception as e:
                         self._log(f"Query exception: {e}")
-                        VSCloudApi.Instance().slot_refresh_fail(apt_type.routing_key, error=str(e))
                     finally:
                         task.next_run = time.time() + interval
                     break
@@ -228,21 +228,18 @@ class SentinelGCO:
     def _creator_loop(self):
         self._log("Creator loop started.")
         while not self.m_stop_event.wait(1.0):
-            try:
-                if not self._is_within_active_hours():
-                    continue
+            if not self._is_within_active_hours():
+                continue
 
-                if time.time() < self.m_spawn_cooldown_until:
-                    continue
-                
-                with self.m_lock:
-                    current = len(self.m_tasks)
-                    target = self.m_cfg.sentinel.target_instances
-                
-                if current < target:
-                    self._spawn_sentinel_worker()
-            except Exception as e:
-                self._log(f'Creator loop exception: {e}')
+            if time.time() < self.m_spawn_cooldown_until:
+                continue
+            
+            with self.m_lock:
+                current = len(self.m_tasks)
+                target = self.m_cfg.sentinel.target_instances
+            
+            if current < target:
+                self._spawn_sentinel_worker()
 
     def _spawn_sentinel_worker(self):
         instance = None
@@ -287,13 +284,7 @@ class SentinelGCO:
             ]
             if any(rate_limited_indicators):
                 if plg_cfg and plg_cfg.account.username != "Guest":
-                    VSCloudApi.lock_account(plg_cfg.account.id, self.m_cfg.login_backoff)
+                    VSCloudApi.Instance().lock_account(plg_cfg.account.id, self.m_cfg.login_backoff)
         finally:
-            if not success:
-                if task:
-                    self._remove_task(task, "spawn failed")
-                elif instance is not None:
-                    try:
-                        instance.cleanup()
-                    except Exception:
-                        pass
+            if not success and instance:
+                self._cleanup_instance(instance, "spawn failed")

+ 44 - 66
standalone.py

@@ -8,9 +8,8 @@ from typing import Dict, Callable, Optional
 from vs_types import BookerStandaloneConfig, QueryWaitMode, VSPlgConfig, VSQueryResult, VSBookResult, GroupStatus, PluginStatus, utc_now_str
 from vs_plg_factory import VSPlgFactory
 from utils.safe_redis_cli import SafeRedisClient
-from toolkit.vs_cloud_api import VSCloudApi
 from toolkit.proxy_manager import ProxyManager
-from toolkit.thread_pool import ThreadPool
+from toolkit.notifier import notify_date_changes, notify_book_result
 
 
 class StandaloneGCO:
@@ -30,6 +29,7 @@ class StandaloneGCO:
         self.m_last_login_time = 0
         self.m_next_query_time = 0
         self.m_next_keepalive_time = 0
+        self.m_last_wait_log_time = 0.0
         self.m_current_dates = {}
         self.redis_client = SafeRedisClient(redis_conf, self.m_logger)
 
@@ -127,47 +127,6 @@ class StandaloneGCO:
                 finally:
                     self.m_instance = None
 
-    def _notify_date_changes(self, query_result: VSQueryResult):
-        current_earliest_date = query_result.earliest_date
-        apt_type = query_result.apt_type
-        if current_earliest_date:
-            last_date = self.m_current_dates.get(apt_type.routing_key)
-            if last_date != current_earliest_date:
-                self.m_current_dates[apt_type.routing_key] = current_earliest_date
-                def _push_to_wx():
-                    try:
-                        push_content = (
-                            f"📢【档期变化通知】\n"
-                            f"最早日期: {query_result.earliest_date}\n"
-                            f"目标国家: {apt_type.country}\n"
-                            f"递交城市: {apt_type.city}\n"
-                            f"签证类型: {apt_type.visa_type}\n"
-                            f"Routing: {apt_type.routing_key}"
-                        )
-                        VSCloudApi.Instance().push_weixin_text(push_content)
-                    except Exception as e:
-                        self._log(f"Failed to notify to cloud: {e}")
-                ThreadPool.getInstance().enqueue(_push_to_wx)
-
-    def _notify_book_result(self, book_result: VSBookResult):
-        if book_result.success:
-            def _update_cloud_success():
-                try:
-                    push_content = (
-                        f"🎉 【预定成功通知】\n"
-                        f"━━━━━━━━━━━━━━━\n"
-                        f"预约账号: {book_result.account}\n"
-                        f"预约日期: {book_result.book_date}\n"
-                        f"预约时间: {book_result.book_time}\n"
-                        f"预约编号: {book_result.urn}\n"
-                        f"支付链接: {book_result.payment_link if book_result.payment_link else '无需支付/暂无'}\n"
-                        f"━━━━━━━━━━━━━━━\n"
-                    )
-                    VSCloudApi.Instance().push_weixin_text(push_content)
-                except Exception as e:
-                    self._log(f"Failed to update success state to cloud: {e}")
-            ThreadPool.getInstance().enqueue(_update_cloud_success)
-
     def _init_instance(self):
         """初始化单实例并进行登录创建会话"""
         self._cleanup_instance("recreating new session")
@@ -195,16 +154,12 @@ class StandaloneGCO:
             self.m_instance = instance
 
         self._log("Creating session...")
-        try:
-            instance.create_session()
-            self.m_last_login_time = time.time()
-            interval = self._get_wait_interval()
-            self.m_next_query_time = time.time() + interval
-            self.m_next_keepalive_time = time.time() + 10.0
-            self._log(f"Session created successfully. Initial query scheduled in {interval:.1f}s (at {datetime.fromtimestamp(self.m_next_query_time).strftime('%H:%M:%S')}).")
-        except Exception:
-            self._cleanup_instance("session creation failed")
-            raise
+        self.m_last_login_time = time.time()
+        instance.create_session()
+        interval = self._get_wait_interval()
+        self.m_next_query_time = time.time() + interval
+        self.m_next_keepalive_time = time.time() + 10.0
+        self._log(f"Session created successfully. Initial query scheduled in {interval:.1f}s (at {datetime.fromtimestamp(self.m_next_query_time).strftime('%H:%M:%S')}).")
 
     def _worker_loop(self):
         """
@@ -227,8 +182,10 @@ class StandaloneGCO:
                     try:
                         self._init_instance()
                     except Exception as e:
-                        self._log(f"Failed to create session: {e}. Retrying in 30s...")
-                        self.m_stop_event.wait(30.0)
+                        self._cleanup_instance("session creation failed")
+                        cooldown = self.m_cfg.login_interval
+                        self._log(f"Failed to create session: {e}. Retrying in {int(cooldown)}s (login interval cooldown)...")
+                        self.m_stop_event.wait(cooldown)
                         continue
 
                 # 2. 健康检查
@@ -237,13 +194,26 @@ class StandaloneGCO:
                     self._cleanup_instance("session health check failed")
                     continue
 
-                # 3. 查询等待与周期性保活(每10秒)
+                # 3. 查询等待与周期性保活
                 now = time.time()
                 if now < self.m_next_query_time:
+                    remaining = self.m_next_query_time - now
+                    next_query_str = datetime.fromtimestamp(self.m_next_query_time).strftime('%H:%M:%S')
+                    keep_alive_sec = self.m_cfg.keep_alive
+
+                    # 周期性保活
                     if self.m_instance and now >= self.m_next_keepalive_time:
                         self.m_instance.keep_alive()
-                        self.m_next_keepalive_time = now + 30.0
-                    wait_sec = min(self.m_next_query_time - now, 1.0)
+                        self.m_next_keepalive_time = now + keep_alive_sec
+                        self._log(f"Session keepalive sent. Next query at {next_query_str} (remaining: {remaining:.0f}s)...")
+                        self.m_last_wait_log_time = now
+
+                    # 周期性显示等待倒计时(每隔 15 秒提示一次)
+                    elif now - self.m_last_wait_log_time >= 15.0 and remaining > 3.0:
+                        self.m_last_wait_log_time = now
+                        self._log(f"Waiting for next query at {next_query_str} (remaining: {remaining:.0f}s)...")
+
+                    wait_sec = min(remaining, 1.0)
                     self.m_stop_event.wait(wait_sec)
                     continue
 
@@ -253,28 +223,36 @@ class StandaloneGCO:
                     self.m_stop_event.wait(2.0)
                     continue
 
-                weights = [float(t.weight) for t in apt_types]
-                apt_type = random.choices(apt_types, weights=weights, k=1)[0]
+                weights = [max(0.0, float(t.weight)) for t in apt_types]
+                if sum(weights) > 0:
+                    apt_type = random.choices(apt_types, weights=weights, k=1)[0]
+                else:
+                    apt_type = random.choice(apt_types)
 
                 self._log(f"Querying slots for {apt_type.routing_key}...")
                 query_result = self.m_instance.query(apt_type)
                 query_result.apt_type = apt_type
-                interval = self._get_wait_interval()
-                self.m_next_query_time = time.time() + interval
-                self.m_next_keepalive_time = time.time() + 10.0
-                self._log(f"Next query scheduled in {interval:.1f}s (at {datetime.fromtimestamp(self.m_next_query_time).strftime('%H:%M:%S')})...")
-                self._notify_date_changes(query_result)
+                notify_date_changes(query_result, cache=self.m_current_dates, logger=self._log)
 
                 # 5. 发现档期,执行自动预定
                 if query_result.success:
                     self._log("🔥 SLOT FOUND! Initiating AUTO-BOOKING...")
                     book_result = self.m_instance.book(query_result, self.m_cfg.user_preferences)
-                    self._notify_book_result(book_result)
+                    notify_book_result(book_result, logger=self._log)
                     if book_result.success:
                         self._log(f"🎉 BOOKING SUCCESSFUL for {apt_type.routing_key}!")
                         # 预定成功后可继续或等待后续任务
                         self.m_stop_event.wait(5.0)
 
+                # 6. 在所有操作(包括抢单流程)执行完毕后,再统一计算并调度下一次查询时间与保活时间
+                interval = self._get_wait_interval()
+                now = time.time()
+                self.m_next_query_time = now + interval
+                keep_alive_sec = self.m_cfg.keep_alive
+                self.m_next_keepalive_time = now + keep_alive_sec
+                self.m_last_wait_log_time = now
+                self._log(f"Next query scheduled in {interval:.1f}s (at {datetime.fromtimestamp(self.m_next_query_time).strftime('%H:%M:%S')})...")
+
             except Exception as e:
                 self._log(f"Standalone loop exception: {e}")
                 self.m_stop_event.wait(2.0)

+ 486 - 0
supersaas_keygen.py

@@ -0,0 +1,486 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+SuperSaaS 希腊驻都柏林大使馆签证预约自动注册机
+Target URL: https://www.supersaas.com/schedule/login/GreekEmbassyInDublin/Visas
+
+特性:
+1. 纯协议底层(Fast HTTP Protocol),毫秒级极速注册,无需笨重浏览器,低内存高并发。
+2. 自动化集成 CapSolver 自动破解 Google reCAPTCHA v2 (Invisible)。
+3. 真实爱尔兰本地人设数据生成器(姓名、手机号 +353、都柏林地址)。
+4. 注册完成后自动执行登录探针,双重确认账号 100% 可用。
+5. 支持多线程并发批量注册与代理池(config/proxies.json / 文本文件 / 单代理)轮询。
+6. 支持自动持久化到本地 TXT/JSON,并支持同步上传至云端账号池(字符串 pool_name,如 ie.gr.sentinel)。
+"""
+
+import os
+import re
+import sys
+import json
+import time
+import random
+import string
+import logging
+import argparse
+import threading
+from datetime import datetime
+from typing import Optional, Dict, Any, List, Tuple
+from concurrent.futures import ThreadPoolExecutor, as_completed
+
+import requests
+
+from utils.plugin_utils import solve_capsolver_recaptcha
+
+# ==============================================================================
+# 日志格式配置
+# ==============================================================================
+logging.basicConfig(
+    level=logging.INFO,
+    format='%(asctime)s [%(levelname)s] %(message)s',
+    datefmt='%H:%M:%S'
+)
+logger = logging.getLogger("SuperSaaS-Keygen")
+
+# ==============================================================================
+# 常量与默认配置
+# ==============================================================================
+DEFAULT_ACCOUNT_NAME = "GreekEmbassyInDublin"
+DEFAULT_SCHEDULE_NAME = "Visas"
+RECAPTCHA_SITEKEY = "6LfNcjEUAAAAAFoKzSZ0ckngvjZbTzOhIi0yVcGg"
+DEFAULT_CAPSOLVER_KEY = "CAP-5441DD341DD3CC2FAEF0BE6FE493EE9A"
+DEFAULT_UPLOAD_API = "https://api.text.skin/api/account/add"
+DEFAULT_UPLOAD_TOKEN = "tok_e946329a60ff45ba807f3f41b0e8b7fc"
+
+IRISH_FIRST_NAMES = [
+    "Liam", "Noah", "Jack", "Conor", "Sean", "James", "Daniel", "Cillian", "Finn",
+    "Emma", "Grace", "Fiadh", "Sophie", "Emily", "Ava", "Hannah", "Lucy", "Chloe"
+]
+
+IRISH_LAST_NAMES = [
+    "Murphy", "Kelly", "Byrne", "Ryan", "O'Brien", "Walsh", "O'Sullivan", "O'Connor",
+    "Doyle", "McCarthy", "Gallagher", "O'Neill", "Lynch", "Flynn", "Brennan"
+]
+
+DUBLIN_ADDRESSES = [
+    "15 Grafton Street, Dublin 2, D02 YF90",
+    "42 O'Connell Street Lower, North City, Dublin 1, D01 W2R3",
+    "88 Henry Street, North City, Dublin 1, D01 E4F5",
+    "23 Dawson Street, Dublin 2, D02 HX65",
+    "7 Kildare Street, Dublin 2, D02 P820",
+    "104 Baggot Street Lower, Dublin 2, D02 Y579",
+    "35 Rathmines Road Lower, Dublin 6, D06 R284",
+    "18 Ranelagh Road, Dublin 6, D06 P273",
+    "56 Georges Street South, Dublin 2, D02 V241"
+]
+
+
+# ==============================================================================
+# 代理池加载工具
+# ==============================================================================
+def load_proxies_from_config(pool_name: str) -> List[str]:
+    """从 config/proxies.json 读取指定代理池并转换为 proxy URL 列表"""
+    config_path = os.path.join(ROOT_DIR, 'config', 'proxies.json')
+    try:
+        with open(config_path, 'r', encoding='utf-8') as f:
+            data = json.load(f)
+            raw_list = data.get(pool_name) or data.get('local', [])
+            if not raw_list:
+                raise ValueError(f"代理池 '{pool_name}' 为空且不存在 local 代理!")
+            
+            proxies = []
+            for item in raw_list:
+                if isinstance(item, str):
+                    proxies.append(item)
+                elif isinstance(item, dict):
+                    proto = item.get("proto", "http")
+                    ip = item.get("ip")
+                    port = item.get("port")
+                    user = item.get("username") or item.get("user")
+                    pwd = item.get("password") or item.get("pwd")
+                    if user and pwd:
+                        proxies.append(f"{proto}://{user}:{pwd}@{ip}:{port}")
+                    else:
+                        proxies.append(f"{proto}://{ip}:{port}")
+            return proxies
+    except Exception as e:
+        logger.error(f"读取代理配置文件失败: {e}")
+        return []
+
+
+# ==============================================================================
+# 上传账号至中心服务器
+# ==============================================================================
+def upload_account_to_server(account: Dict[str, Any], pool_name: str, api_url: str = DEFAULT_UPLOAD_API, api_token: str = DEFAULT_UPLOAD_TOKEN) -> bool:
+    """将注册成功的账号上报到中心服务器"""
+    headers = {
+        'accept': 'application/json',
+        'Authorization': f'Bearer {api_token}',
+        'Content-Type': 'application/json'
+    }
+
+    payload = {
+        "pool_name": pool_name,
+        "username": account.get("email"),
+        "password": account.get("password"),
+        "extra_data": {
+            "full_name": account.get("full_name"),
+            "mobile": account.get("mobile"),
+            "address": account.get("address"),
+            "created_at": datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+        }
+    }
+
+    try:
+        logger.info(f"Uploading account {account.get('email')} to server (Pool: {pool_name})...")
+        resp = requests.post(api_url, json=payload, headers=headers, timeout=10)
+        if resp.status_code == 200:
+            logger.info(f"✅ [API Upload Success] Server responded: {resp.text}")
+            return True
+        else:
+            logger.error(f"❌ [API Upload Failed] Status: {resp.status_code}, Body: {resp.text}")
+            return False
+    except Exception as e:
+        logger.error(f"❌ [API Upload Error]: {e}")
+        return False
+
+
+# ==============================================================================
+# 单个 SuperSaaS 注册执行器
+# ==============================================================================
+class SuperSaaSRegistrator:
+    """单个 SuperSaaS 账号注册器"""
+
+    def __init__(
+        self,
+        account_name: str = DEFAULT_ACCOUNT_NAME,
+        schedule_name: str = DEFAULT_SCHEDULE_NAME,
+        capsolver_key: Optional[str] = None,
+        proxy: Optional[str] = None,
+        timeout: int = 30
+    ):
+        self.account_name = account_name
+        self.schedule_name = schedule_name
+        self.capsolver_key = capsolver_key or os.getenv("CAPSOLVER_KEY") or DEFAULT_CAPSOLVER_KEY
+        self.proxy = proxy
+        self.timeout = timeout
+
+        self.base_url = "https://www.supersaas.com"
+        self.register_path = f"/users/new/{self.account_name}?after=%2Fschedule%2F{self.account_name}%2F{self.schedule_name}&return=%2Fschedule%2Flogin%2F{self.account_name}%2F{self.schedule_name}"
+        self.register_url = f"{self.base_url}{self.register_path}"
+        self.login_url = f"{self.base_url}/schedule/login/{self.account_name}/{self.schedule_name}"
+
+        self.session = requests.Session()
+        if self.proxy:
+            self.session.proxies = {
+                "http": self.proxy,
+                "https": self.proxy
+            }
+
+        self.headers = {
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
+            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8",
+            "Accept-Language": "en-US,en;q=0.9",
+            "Origin": self.base_url,
+            "Referer": self.register_url,
+        }
+
+    @staticmethod
+    def generate_random_profile(domain: str = "text.skin", custom_prefix: Optional[str] = None, password: Optional[str] = None) -> Dict[str, str]:
+        """生成逼真的爱尔兰本地申请人资料"""
+        first = random.choice(IRISH_FIRST_NAMES)
+        last = random.choice(IRISH_LAST_NAMES)
+        full_name = f"{first} {last}"
+
+        rand_num = random.randint(100, 9999)
+        if custom_prefix:
+            email_user = f"{custom_prefix}_{rand_num}"
+        else:
+            email_user = f"{first.lower()}{last.lower()}{rand_num}"
+        
+        email = f"{email_user}@{domain}"
+        
+        if not password:
+            pwd_tail = ''.join(random.choices(string.digits, k=4))
+            password = f"GreekPass@{pwd_tail}"
+
+        mobile_prefix = random.choice(['83', '85', '86', '87', '89'])
+        mobile_body = ''.join(random.choices(string.digits, k=7))
+        mobile = f"+353{mobile_prefix}{mobile_body}"
+
+        address = random.choice(DUBLIN_ADDRESSES)
+
+        return {
+            "email": email,
+            "password": password,
+            "full_name": full_name,
+            "mobile": mobile,
+            "address": address
+        }
+
+    def register(self, profile: Dict[str, str]) -> Tuple[bool, str]:
+        """
+        执行单个账号的注册流程:
+        1. 获取初始 Session 页面和 Cookie
+        2. 调用 CapSolver 破解 Google reCAPTCHA v2
+        3. 提交表单数据
+        4. 校验响应(302 重定向到日程即为注册成功)
+        """
+        email = profile["email"]
+        logger.info(f"[*] Starting registration for [{email}]...")
+
+        # 1. 访问注册页面获取 Session Cookie
+        try:
+            r_get = self.session.get(self.register_url, headers=self.headers, timeout=self.timeout)
+            if r_get.status_code != 200:
+                return False, f"GET register page failed with HTTP {r_get.status_code}"
+        except Exception as e:
+            return False, f"Connection error getting register page: {e}"
+
+        # 2. 求解 reCAPTCHA 验证码
+        logger.info(f"[*] Solving Google reCAPTCHA for [{email}] via CapSolver...")
+        t0 = time.time()
+        try:
+            recaptcha_token = solve_capsolver_recaptcha(
+                api_token=self.capsolver_key,
+                site_key=RECAPTCHA_SITEKEY,
+                page_url=self.register_url,
+                task_type="ReCaptchaV2TaskProxyLess"
+            )
+        except Exception as e:
+            return False, f"CapSolver solve error: {e}"
+        
+        solve_time = time.time() - t0
+        logger.info(f"[+] reCAPTCHA solved in {solve_time:.1f}s")
+
+        # 3. 构造 POST 表单数据
+        payload = {
+            "user[name]": profile["email"],
+            "user[password]": profile["password"],
+            "user[full_name]": profile["full_name"],
+            "user[mobile]": profile["mobile"],
+            "user[address]": profile["address"],
+            "check": "",  # Honeypot 字段,必须留空
+            "commit": "Create",
+            "g-recaptcha-response": recaptcha_token
+        }
+
+        # 4. 发起注册 POST 请求
+        try:
+            r_post = self.session.post(
+                self.register_url,
+                data=payload,
+                headers=self.headers,
+                allow_redirects=False,
+                timeout=self.timeout
+            )
+        except Exception as e:
+            return False, f"POST register error: {e}"
+
+        # 5. 校验注册结果
+        if r_post.status_code in (302, 303):
+            loc = r_post.headers.get("Location", "")
+            if f"/schedule/{self.account_name}" in loc:
+                logger.info(f"[✓] Registration SUCCESS! Redirected to: {loc}")
+                return True, "Success"
+            else:
+                return False, f"Unexpected redirect target: {loc}"
+        else:
+            flash_matches = re.findall(r'<span id="flash"[^>]*>(.*?)</span>', r_post.text, re.DOTALL)
+            err_msg = flash_matches[0].strip() if flash_matches else f"HTTP {r_post.status_code}"
+            return False, f"Server rejected: {err_msg}"
+
+    def verify_login(self, email: str, password: str) -> bool:
+        """注册后探针测试:尝试独立登录该账号,验证数据库持久化和密码正确性"""
+        login_session = requests.Session()
+        if self.proxy:
+            login_session.proxies = {"http": self.proxy, "https": self.proxy}
+
+        headers = dict(self.headers)
+        headers["Referer"] = self.login_url
+
+        try:
+            login_session.get(self.login_url, headers=headers, timeout=self.timeout)
+            login_data = {
+                "name": email,
+                "password": password,
+                "remember": "K",
+                "button": ""
+            }
+            r = login_session.post(self.login_url, data=login_data, headers=headers, allow_redirects=False, timeout=self.timeout)
+            if r.status_code in (302, 303):
+                target_url = r.headers.get("Location", "")
+                r_target = login_session.get(target_url, headers=headers, timeout=self.timeout)
+                return "Sign out" in r_target.text or "Log out" in r_target.text
+            return False
+        except Exception as e:
+            logger.warning(f"[!] Login verify failed with exception: {e}")
+            return False
+
+
+# ==============================================================================
+# 批量注册任务调度与输出持久化
+# ==============================================================================
+class SuperSaaSRegistrationManager:
+    """批量注册管理器"""
+
+    def __init__(
+        self,
+        count: int = 1,
+        threads: int = 2,
+        domain: str = "text.skin",
+        custom_prefix: Optional[str] = None,
+        custom_password: Optional[str] = None,
+        capsolver_key: Optional[str] = None,
+        proxies: Optional[List[str]] = None,
+        output_file: str = "data/supersaas_accounts.txt",
+        account_pool: Optional[str] = None,
+        upload_api_token: str = DEFAULT_UPLOAD_TOKEN
+    ):
+        self.count = count
+        self.threads = threads
+        self.domain = domain
+        self.custom_prefix = custom_prefix
+        self.custom_password = custom_password
+        self.capsolver_key = capsolver_key
+        self.proxies = proxies or []
+        self.output_file = output_file
+        self.account_pool = account_pool
+        self.upload_api_token = upload_api_token
+
+        self.success_list: List[Dict[str, Any]] = []
+        self.fail_count = 0
+        self.lock = threading.Lock()
+
+        os.makedirs(os.path.dirname(self.output_file) or ".", exist_ok=True)
+
+    def _get_next_proxy(self) -> Optional[str]:
+        if not self.proxies:
+            return None
+        return random.choice(self.proxies)
+
+    def _worker(self, task_idx: int) -> Optional[Dict[str, Any]]:
+        proxy = self._get_next_proxy()
+        registrator = SuperSaaSRegistrator(
+            capsolver_key=self.capsolver_key,
+            proxy=proxy
+        )
+        profile = registrator.generate_random_profile(
+            domain=self.domain,
+            custom_prefix=self.custom_prefix,
+            password=self.custom_password
+        )
+
+        ok, msg = registrator.register(profile)
+        if ok:
+            verified = registrator.verify_login(profile["email"], profile["password"])
+            profile["verified"] = verified
+            profile["registered_at"] = time.strftime("%Y-%m-%d %H:%M:%S")
+
+            with self.lock:
+                self.success_list.append(profile)
+                self._save_account_record(profile)
+
+            # 如果指定了云端账号池名称(字符串,如 ie.gr.sentinel)
+            if self.account_pool:
+                upload_account_to_server(profile, pool_name=self.account_pool, api_token=self.upload_api_token)
+
+            logger.info(f"[{task_idx}/{self.count}] 🚀 Account created & verified: {profile['email']} | Pass: {profile['password']}")
+            return profile
+        else:
+            with self.lock:
+                self.fail_count += 1
+            logger.error(f"[{task_idx}/{self.count}] ❌ Registration failed for {profile['email']}: {msg}")
+            return None
+
+    def _save_account_record(self, profile: Dict[str, Any]):
+        """将成功账号追加写入本地文件"""
+        line = f"{profile['email']}----{profile['password']}----{profile['full_name']}----{profile['mobile']}\n"
+        with open(self.output_file, "a", encoding="utf-8") as f:
+            f.write(line)
+
+        json_path = os.path.splitext(self.output_file)[0] + ".json"
+        all_data = []
+        if os.path.exists(json_path):
+            try:
+                with open(json_path, "r", encoding="utf-8") as f:
+                    all_data = json.load(f)
+            except Exception:
+                all_data = []
+        all_data.append(profile)
+        with open(json_path, "w", encoding="utf-8") as f:
+            json.dump(all_data, f, indent=2, ensure_ascii=False)
+
+    def run(self):
+        """启动并发批量注册流程"""
+        start_time = time.time()
+        logger.info(f"=== Starting SuperSaaS Batch Registration (Target: {self.count}, Threads: {self.threads}, Account Pool: {self.account_pool or 'None'}) ===")
+
+        with ThreadPoolExecutor(max_workers=self.threads) as executor:
+            futures = [executor.submit(self._worker, i + 1) for i in range(self.count)]
+            for fut in as_completed(futures):
+                try:
+                    fut.result()
+                except Exception as e:
+                    logger.error(f"Worker unhandled exception: {e}")
+
+        elapsed = time.time() - start_time
+        success_cnt = len(self.success_list)
+        logger.info("=" * 60)
+        logger.info(f"Batch completed in {elapsed:.1f}s | Success: {success_cnt} | Failed: {self.fail_count}")
+        logger.info(f"Results saved to: {self.output_file} & {os.path.splitext(self.output_file)[0]}.json")
+        logger.info("=" * 60)
+
+
+# ==============================================================================
+# 命令行入口
+# ==============================================================================
+def main():
+    parser = argparse.ArgumentParser(description="SuperSaaS Greek Embassy in Dublin 自动注册机")
+    parser.add_argument("--count", "--target", "-c", type=int, default=1, help="需要注册的账号数量 (默认 1)")
+    parser.add_argument("--threads", "-t", type=int, default=2, help="并发线程数 (默认 2)")
+    parser.add_argument("--domain", "-d", type=str, default="text.skin", help="生成的邮箱域名 (默认 text.skin)")
+    parser.add_argument("--prefix", "--account-prefix", "-p", type=str, default=None, help="邮箱前缀自定义名称 (默认随机英文名)")
+    parser.add_argument("--password", "-pwd", type=str, default=None, help="统一指定密码 (默认随机生成强密码)")
+    parser.add_argument("--capsolver-key", type=str, default=None, help="CapSolver API Key (未指定则读取环境变量或默认值)")
+    
+    # 代理相关参数(支持代理池名 / 代理文本文件 / 单代理)
+    parser.add_argument("--proxy-pool", type=str, default=None, help="从 config/proxies.json 中读取的代理池名称 (如 ie.nl.sentinel)")
+    parser.add_argument("--proxy-file", type=str, default=None, help="代理池文本文件 (每行一个代理地址)")
+    parser.add_argument("--proxy", type=str, default=None, help="单代理地址 (格式: http://user:pass@host:port)")
+
+    # 存储与云端参数
+    parser.add_argument("--output", "-o", type=str, default="data/supersaas_accounts.txt", help="账号输出文件路径")
+    parser.add_argument("--account-pool", "--account-pool-name", "--upload-pool-id", type=str, default=None, help="云端账号池名称 (字符串,如 ie.gr.sentinel)")
+    parser.add_argument("--upload-token", type=str, default=DEFAULT_UPLOAD_TOKEN, help="云端上传 API Token")
+
+    args = parser.parse_args()
+
+    proxies = []
+    if args.proxy_pool:
+        proxies = load_proxies_from_config(args.proxy_pool)
+        logger.info(f"[*] 从 config/proxies.json 成功加载代理 {len(proxies)} 个 (Pool: {args.proxy_pool})")
+    elif args.proxy_file and os.path.exists(args.proxy_file):
+        with open(args.proxy_file, "r", encoding="utf-8") as f:
+            proxies = [line.strip() for line in f if line.strip()]
+        logger.info(f"[*] 从文本文件成功加载代理 {len(proxies)} 个 ({args.proxy_file})")
+    elif args.proxy:
+        proxies.append(args.proxy)
+
+    manager = SuperSaaSRegistrationManager(
+        count=args.count,
+        threads=args.threads,
+        domain=args.domain,
+        custom_prefix=args.prefix,
+        custom_password=args.password,
+        capsolver_key=args.capsolver_key,
+        proxies=proxies,
+        output_file=args.output,
+        account_pool=args.account_pool,
+        upload_api_token=args.upload_token
+    )
+    manager.run()
+
+
+if __name__ == "__main__":
+    main()

+ 2 - 1
tls_registration_bot.py → tls_keygen.py

@@ -1,6 +1,7 @@
 import time
 import json
 import os
+import sys
 import re
 import uuid
 import socket
@@ -27,7 +28,7 @@ from utils.fake_utils import generate_random_account_detail
     
 def load_proxies(pool_name):
     """从 config/proxies.json 读取对应的代理池"""
-    config_path = os.path.join(os.path.dirname(__file__), 'config', 'proxies.json')
+    config_path = os.path.join(ROOT_DIR, 'config', 'proxies.json')
     try:
         with open(config_path, 'r', encoding='utf-8') as f:
             data = json.load(f)

+ 0 - 838
tls_registration_gui.py

@@ -1,838 +0,0 @@
-import sys
-import time
-import json
-import os
-import re
-import uuid
-import socket
-import threading
-import random
-import requests
-from datetime import datetime
-from typing import Optional, Dict
-
-from PyQt5.QtWidgets import (
-    QApplication, QMainWindow, QWidget, QVBoxLayout, QHBoxLayout, 
-    QGridLayout, QGroupBox, QLabel, QLineEdit, QSpinBox, QPushButton, 
-    QTableWidget, QTableWidgetItem, QAbstractItemView, QTextEdit, 
-    QHeaderView, QMessageBox
-)
-from PyQt5.QtCore import pyqtSignal, QObject, Qt
-
-from DrissionPage.common import Keys
-from DrissionPage import ChromiumPage, ChromiumOptions
-
-import configure
-from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
-from toolkit.vs_cloud_api import VSCloudApi
-from toolkit.mihomo_tunnel import MihomoTunnel
-from vs_types import BizLogicError 
-from utils.mouse import HumanMouse
-from utils.keyboard import HumanKeyboard
-from utils.fingerprint_utils import FingerprintGenerator
-from utils.fake_utils import generate_random_account_detail
-
-def load_proxies(pool_name):
-    """从 config/proxies.json 读取对应的代理池"""
-    config_path = os.path.join(os.path.dirname(__file__), 'config', 'proxies.json')
-    try:
-        with open(config_path, 'r', encoding='utf-8') as f:
-            data = json.load(f)
-            proxies = data.get(pool_name, [])
-            if not proxies:
-                raise ValueError(f"代理池 '{pool_name}' 为空或不存在!")
-            return proxies
-    except Exception as e:
-        raise Exception(f"读取代理配置文件失败: {e}")
-
-# ================= 用于跨线程更新UI的信号类 =================
-class GuiSignals(QObject):
-    log_signal = pyqtSignal(str)              # 传递日志文本
-    status_signal = pyqtSignal(int, str)      # 传递行号和状态文本
-
-# ================= 核心业务类 =================
-class TlsRegistrator:
-    def __init__(self, tls_url, proxy_config: Optional[Dict]=None, capsolver_key: Optional[str]=None, signals: GuiSignals=None):
-        self.proxy_config = proxy_config
-        self.capsolver_key = capsolver_key
-        self.account_detail = None  # 动态绑定
-        self.signals = signals      # 绑定UI信号
-        
-        self.instance_id = uuid.uuid4().hex[:8]
-        self.tls_url = tls_url
-        self.workspace = os.path.abspath(os.path.join("data/temp_browser_data", f"reg_session_{self.instance_id}"))
-        self.page = None
-        self.mouse = None
-        self.keyboard = None
-        self.tunnel = None
-
-    def _log(self, msg):
-        now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-        log_str = f"[{now}][Bot-{self.instance_id}] {msg}"
-        if self.signals:
-            self.signals.log_signal.emit(log_str)
-        else:
-            print(log_str)
-
-    def _get_free_port(self):
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            s.bind(('', 0))
-            return s.getsockname()[1]
-        
-    def save_screenshot(self, name_prefix):
-        try:
-            timestamp = int(time.time())
-            filename = f"{self.instance_id}_{name_prefix}_{timestamp}.jpg"
-            save_path = os.path.join("data", filename)
-            os.makedirs("data", exist_ok=True)
-            self.page.get_screenshot(path=save_path, full_page=False)
-            self._log(f"Screenshot saved to {save_path}")
-        except Exception as e:
-            self._log(f"Failed to save screenshot: {e}")
-
-    def init_browser(self):
-        self._log("Initializing browser...")
-        co = ChromiumOptions()
-        port = self._get_free_port()
-        co.set_local_port(port)
-        co.set_user_data_path(self.workspace)
-        
-        chrome_path = configure.CHROME_PATH or os.getenv("CHROME_BIN")
-        if chrome_path and os.path.exists(chrome_path):
-            co.set_paths(browser_path=chrome_path)
-        
-        if self.proxy_config and self.proxy_config.get("ip"):
-            p = self.proxy_config
-            if p.get('username') and p.get('password'):
-                self._log(f"Starting Proxy Tunnel for {p.get('ip')}...")
-                exit_node = {
-                    "name": "ExitNode", "type": p.get('proto'),
-                    "server": p.get('ip'), "port": p.get('port'),
-                    "username": p.get('username'), "password": p.get('password')
-                }
-                relay_node = random.choice(configure.MIHOMO_RELAY_NODES) if configure.MIHOMO_RELAY_NODES else None
-                mihomo_path = configure.MIHOMO_BIN_PATH or os.getenv("MIHOMO_BIN")
-                if not mihomo_path:
-                    raise BizLogicError(message='Mihomo path is null')
-                self.tunnel = MihomoTunnel(mihomo_path, exit_node=exit_node, relay_node=relay_node)
-                local_proxy = self.tunnel.start()
-                co.set_argument(f'--proxy-server={local_proxy}')
-            else:
-                proxy_str = f"{p.get('proto')}://{p.get('ip')}:{p.get('port')}"
-                co.set_argument(f'--proxy-server={proxy_str}')
-        else:
-            self._log("[WARN] No proxy configured!")
-
-        fingerprint_gen = FingerprintGenerator()
-        specific_fp = fingerprint_gen.generate(self.instance_id)
-        
-        co.headless(False)
-        co.set_argument('--no-sandbox')
-        co.set_argument('--disable-dev-shm-usage')
-        co.set_argument('--window-size=1920,1080')
-        co.set_argument('--disable-blink-features=AutomationControlled')
-        co.set_argument(f"--fingerprint={specific_fp.get('seed')}")
-        co.set_argument(f"--fingerprint-platform={specific_fp.get('platform')}")
-        co.set_argument(f"--fingerprint-brand={specific_fp.get('brand')}")
-        
-        self.page = ChromiumPage(co)
-        self.page.get(self.tls_url)
-        time.sleep(5)
-        
-        cf_bypasser = CloudflareBypasser(self.page, log=True)
-        cf_bypasser.bypass(max_retry=8)
-        time.sleep(3)
-        cf_bypasser.handle_waiting_room()
-        
-        self._log("正在初始化拟人化工具...")
-        self.mouse = HumanMouse(self.page, debug=False)
-        self.keyboard = HumanKeyboard(self.page)
-        
-        viewport_width = self.page.rect.viewport_size[0]
-        viewport_height = self.page.rect.viewport_size[1]
-        init_x = random.randint(10, viewport_width - 10)
-        init_y = random.randint(10, viewport_height - 10)
-        self.mouse.move(init_x, init_y) 
-        self._log("浏览器初始化完成。")
-
-    def solve_captcha(self, page_url: str, task_type: str, site_key: str, use_proxy=False, action: str=None, api_domain: str=None) -> str:
-        if not self.capsolver_key: raise ValueError("Capsolver API key missing")
-        task = {"type": task_type, "websiteURL": page_url, "websiteKey": site_key}
-        if api_domain: task["apiDomain"] = api_domain
-        if use_proxy:
-            proxy = self.proxy_config
-            task["proxyType"] = proxy.get('proto', 'http')
-            task["proxyAddress"] = proxy.get('ip')
-            task["proxyPort"] = int(proxy.get('port'))
-            if proxy.get('username'):
-                task["proxyLogin"] = proxy.get('username')
-                task["proxyPassword"] = proxy.get('password')
-        if action: task["pageAction"] = action
-
-        payload = {"clientKey": self.capsolver_key, "task": task}
-        res = requests.post("https://api.capsolver.com/createTask", json=payload, timeout=20)
-        if res.status_code != 200 or res.json().get("errorId") != 0:
-            raise Exception(f"Failed to create capsolver task: {res.text}")
-        task_id = res.json().get("taskId")
-        
-        for _ in range(30):
-            r = requests.post("https://api.capsolver.com/getTaskResult", json={"clientKey": self.capsolver_key, "taskId": task_id}, timeout=20)
-            data = r.json()
-            if data.get("status") == "ready": 
-                return data["solution"].get("gRecaptchaResponse") or data["solution"].get("token")
-            time.sleep(3)
-        raise Exception("Capsolver task timeout")
-
-    def register(self):
-        email = self.account_detail.get('email')
-        password = self.account_detail.get('pwd')
-        self._log(f"开始执行自动注册: {email}")
-
-        btn_selector = '#submit'
-        if not self.page.wait.ele_displayed(btn_selector, timeout=3):
-            register_btn = self.page.ele("tag:a@@href:registration")
-            if register_btn: self.mouse.human_click_ele(register_btn)
-            time.sleep(3)
-        if not self.page.wait.ele_displayed(btn_selector, timeout=10):
-            raise BizLogicError(message=f"Can't find selector={btn_selector}")
-            
-        time.sleep(random.uniform(0.5, 1))
-        self._log("正在填写邮箱和密码...")
-        self.mouse.human_click_ele(self.page.ele('#email'))
-        self.keyboard.type_text(email, humanize=True)
-        time.sleep(random.uniform(0.2, 0.5))
-        
-        self.mouse.human_click_ele(self.page.ele('#password'))
-        self.keyboard.type_text(password, humanize=True)
-        time.sleep(random.uniform(0.2, 0.5))
-        
-        self.mouse.human_click_ele(self.page.ele('#confirm-password'))
-        self.keyboard.type_text(password, humanize=True)
-        time.sleep(random.uniform(0.2, 0.5))
-
-        self._log("正在勾选必选条款...")
-        for checkbox_id in ['#terms-and-conditions', '#biometric-data', '#privacy-notice']:
-            self.mouse.human_click_ele(self.page.ele(checkbox_id).next())
-            time.sleep(random.uniform(0.3, 0.6))
-                
-        self._log("提交注册...")
-        time.sleep(random.uniform(0.3, 0.6))
-        self.mouse.human_click_ele(self.page.ele(btn_selector))
-
-        self._log("正在等待验证结果 (最多15秒)...")
-        success_dialog = self.page.wait.ele_displayed('tag:h1@text():Check your email inbox', timeout=15)
-        if not success_dialog:
-            self.save_screenshot("failed_submit.png") 
-            raise BizLogicError(message='Failed to submit account registration')     
-        self._log("✅ 操作成功!已弹出提示:Check your email inbox")
-        return True
-    
-    def activate(self, sent_at=None):
-        email = self.account_detail.get('email')
-        if not sent_at:
-            sent_at = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
-        
-        self._log("获取激活邮件...")
-        content_out = VSCloudApi.Instance().fetch_mail_content(
-            email='hujiarui8@gmail.com', sender='TLSContact', recipient=email,
-            subject_keywords='TLSContact', body_keywords='', sent_date=sent_at, expiry=600
-        )
-        match = re.search(r'https://\S+', content_out)
-        activate_link = match.group(0) if match else None
-        if not activate_link:
-            raise Exception("未找到激活链接")
-            
-        self.page.get(activate_link)
-        btn_selector = "#activation-pending-button"
-        if not self.page.wait.ele_displayed(btn_selector, timeout=10):
-            raise BizLogicError(message=f"Wait ele={btn_selector} timeout")
-        self.page.ele(btn_selector).click()
-        time.sleep(3)
-        self._log("✅ 激活成功!")
-    
-    def make_account_useful(self):
-        def fill_date_field(page, selector, date_str):
-            if not date_str:
-                return
-            ele = page.ele(selector)
-            ele.scroll.to_see(center=True)
-            js_detect_format = """
-                const parts = new Intl.DateTimeFormat().formatToParts(new Date(2023, 11, 31));
-                let format = [];
-                for (let part of parts) {
-                    if (part.type === 'year') format.push('Y');
-                    if (part.type === 'month') format.push('M');
-                    if (part.type === 'day') format.push('D');
-                }
-                return format;
-            """
-            date_format = page.run_js(js_detect_format)
-            year, month, day = date_str.split('-')
-            date_dict = {'Y': year, 'M': month.zfill(2), 'D': day.zfill(2)}
-            ele.click()
-            time.sleep(0.1)
-            page.actions.type(Keys.LEFT * 3)
-            time.sleep(0.1)
-            for i, char in enumerate(date_format):
-                val = date_dict[char]
-                page.actions.type(val)
-                time.sleep(0.1)
-                if char == 'Y':
-                    if i < 2:
-                        page.actions.type(Keys.RIGHT)
-                        time.sleep(0.1)
-
-        # email = self.account_detail.get('email')
-        # password = self.account_detail.get('pwd')
-        # location = self.account_detail.get('location')
-        
-        # self._log("=== 开始执行自动填表流程 ===")
-        # btn_selector = 'tag:button@@text():Login'
-        # if not self.page.wait.ele_displayed(btn_selector, timeout=3):
-        #     login_btn = self.page.ele("tag:a@@href:login")
-        #     if login_btn: self.mouse.human_click_ele(login_btn)
-        #     time.sleep(3)
-        # if not self.page.wait.ele_displayed(btn_selector, timeout=10):
-        #     raise BizLogicError(message=f"Can't find selector={btn_selector}")
-            
-        # recpatchav2_token = ""
-        # if self.page.ele('.g-recaptcha') or self.page.ele('xpath://iframe[contains(@src, "recaptcha")]'):
-        #     self._log("Solving ReCaptcha...")
-        #     recpatchav2_token = self.solve_captcha(self.page.url, "ReCaptchaV2TaskProxyLess", "6LcDpXcfAAAAAM7wOEsF_38DNsL20tTvPTKxpyn0")
-        
-        # input_ele = self.page.ele('tag:label@@text():Email').next()
-        # self.mouse.human_click_ele(input_ele)
-        # time.sleep(random.uniform(0.2, 0.6))
-        # self.keyboard.type_text(email, humanize=True)
-        # time.sleep(random.uniform(0.5, 1.2)) 
-    
-        # input_ele = self.page.ele('tag:label@@text():Password').next()
-        # self.mouse.human_click_ele(input_ele)
-        # time.sleep(random.uniform(0.2, 0.6))
-        # self.keyboard.type_text(password, humanize=True)
-        
-        # if recpatchav2_token:
-        #     inject_recpatchav2_token_js = f"""
-        #     var g = document.getElementById('g-recaptcha-response');
-        #     if(g) {{ g.value = "{recpatchav2_token}"; }}
-        #     """
-        #     self._log("Inject ReCaptchaV2 Token via JS...")
-        #     self.page.run_js(inject_recpatchav2_token_js)
-        #     time.sleep(random.uniform(0.5, 1.0))
-        
-        # self._log("Submitting Login...")
-        # time.sleep(random.uniform(0.3, 0.8))
-        # login_btn = self.page.ele('tag:button@@text():Login')
-        # self.mouse.human_click_ele(login_btn)
-
-        # self._log("Waiting for dashboard redirect...")
-        # self.page.wait.url_change('login-actions', exclude=True, timeout=45)
-        # time.sleep(4)
-
-        # if "login-actions" in self.page.url or "auth" in self.page.url:
-        #     raise BizLogicError(message="Login Failed! Invalid credentials or Captcha rejected.")
-
-        # self._log("Waiting for dashboard...")
-        # self.page.wait.load_start()
-        # time.sleep(5)
-
-        # self._log("Parsing Dashboard for Travel Group...")
-        # html = self.page.html
-        # js_pattern = r'\\"travelGroups\\":\s*(\[.*?\]),\\"availableCountriesToCreateGroups'
-        # js_match = re.search(js_pattern, html, re.DOTALL)
-        
-        # groups = []
-        # if js_match:
-        #     json_str = js_match.group(1).replace(r'\"', '"')
-        #     groups = json.loads(json_str)
-
-        # travel_group = None
-        # for g in groups:
-        #     if location in g.get('vacName', ''):
-        #         travel_group = g
-        #         break
-        
-        # if not travel_group:
-        #     raise BizLogicError(message=f"Travel Group not found for {location}")
-        
-        # formgroup_id = travel_group.get('formGroupId')
-        # self._log(f"Waiting for group button to render: {formgroup_id}")
-        # btn_selector = f'tag:a@@data-testid=btn-select-group'            
-        # self._log(f"Select group_id={formgroup_id}...")
-        # self.mouse.human_click_ele(self.page.ele(btn_selector))
-        
-        # self._log("Waiting for url redirect...")
-        # self.page.wait.url_change('travel-groups', exclude=True, timeout=45)
-        # time.sleep(2)
-
-        # if "travel-groups" in self.page.url or "auth" in self.page.url:
-        #     raise BizLogicError(message="Redirect to service-level Failed!")
-        
-        # btn_selector_add = 'tag:button@@data-testid=btn-add-applicant'
-        # btn_selector_max = 'tag:button@@data-testid=btn-max-number-of-applicants'
-        # error_selector = 'tag:h2@text():Something went wrong'
-
-        # for attempt in range(2):
-        #     try:
-        #         btn_selector = btn_selector_add
-        #         if not self.page.wait.ele_displayed(btn_selector, timeout=10):
-        #             btn_selector = btn_selector_max
-        #             if not self.page.ele(btn_selector):
-        #                 raise BizLogicError(message=f"Can't find selector={btn_selector}")
-
-        #         add_btn = self.page.ele(btn_selector)
-        #         add_btn.scroll.to_see(center=True)
-        #         time.sleep(random.uniform(0.6, 0.8))
-        #         add_btn.click()
-
-        #         if self.page.wait.ele_displayed(error_selector, timeout=5):
-        #             raise BizLogicError("Page shows 'Something went wrong'")
-        #         break
-        #     except Exception as e:
-        #         if attempt == 0:
-        #             self.page.refresh()
-        #             time.sleep(5)
-        #         else:
-        #             raise BizLogicError(message=f"Click add applicant failed after retry: {e}")
-        
-        self._log("开始填充表单字段...")
-        visa_type = self.account_detail.get("visa_type")
-        if visa_type:
-            btn = self.page.ele('tag:button@@data-testid=input-visa-type')
-            btn.scroll.to_see(center=True)
-            btn.click()
-            time.sleep(0.5)
-            self.page.ele(f'tag:span@@text():{visa_type}').click(by_js=True)
-            time.sleep(0.5)
-
-        tavel_purpose = self.account_detail.get("travel_purpose")
-        if tavel_purpose:
-            btn = self.page.ele('tag:button@@data-testid=input-travel-purpose')
-            btn.scroll.to_see(center=True)
-            btn.click()
-            time.sleep(0.5)
-            self.page.ele(f'tag:span@@text():{tavel_purpose}').click(by_js=True)
-            time.sleep(0.5)
-
-        application_form_id = self.account_detail.get('application_form_id')
-        if application_form_id:
-            ele = self.page.ele('tag:input@@data-testid=f_cai')
-            ele.scroll.to_see(center=True)
-            ele.input(application_form_id)
-
-        last_name = self.account_detail.get('last_name')
-        if last_name:
-            ele = self.page.ele('tag:input@@data-testid=f_pers_surnames')
-            ele.scroll.to_see(center=True)
-            ele.input(last_name.upper())
-
-        first_name = self.account_detail.get('first_name')
-        if first_name:
-            ele = self.page.ele('tag:input@@data-testid=f_pers_givennames')
-            ele.scroll.to_see(center=True)
-            ele.input(first_name.upper())
-
-        gender = self.account_detail.get('gender')
-        if gender:
-            try:
-                gender = gender.capitalize()
-                ele = self.page.ele(f'tag:label@@text():{gender}')
-                ele.scroll.to_see(center=True)
-                ele.click()
-            except Exception as e:
-                self._log(e)
-            
-        fill_date_field(self.page, 'tag:input@@data-testid=f_pers_birth_date', self.account_detail.get('birthday'))
-
-        nationality = self.account_detail.get('nationality')
-        if nationality:
-            nationality = nationality.title()
-            btn = self.page.ele('tag:label@@for=f_pers_nationality').next()
-            btn.scroll.to_see(center=True)
-            btn.click()
-            time.sleep(0.5)
-            self.page.ele(f'tag:li@@role=option@@text():{nationality}').click(by_js=True)
-            time.sleep(0.5)
-            
-        province_residence = self.account_detail.get('province_residence')
-        if province_residence:
-            try:
-                province_residence = province_residence.title()
-                btn = self.page.ele('tag:label@@for=f_pers_province').next()
-                btn.scroll.to_see(center=True)
-                btn.click()
-                time.sleep(0.5)
-                self.page.ele(f'tag:li@@role=option@@text():{province_residence}').click(by_js=True)
-                time.sleep(0.5)
-            except Exception as e:
-                self._log(e)
-
-        passport_type = self.account_detail.get('passport_type')
-        if passport_type:
-            btn = self.page.ele('tag:label@@for=f_identity_type').next()
-            btn.scroll.to_see(center=True)
-            btn.click()
-            time.sleep(0.5)
-            self.page.ele(f'tag:li@@role=option@@text():{passport_type}').click(by_js=True)
-            time.sleep(0.5)
-            
-        passport_no = self.account_detail.get('passport_no')
-        if passport_no:
-            ele = self.page.ele('tag:input@@data-testid=f_pass_num')
-            ele.scroll.to_see(center=True)
-            ele.input(passport_no.upper())
-            
-        passport_issue_date = self.account_detail.get('passport_issue_date')
-        if passport_issue_date:
-            try:
-                fill_date_field(self.page, 'tag:input@@data-testid=fi_passport_issue_date', passport_issue_date)
-                time.sleep(0.5)
-            except Exception as e:
-                self._log(e)
-                
-        passport_expiry_date = self.account_detail.get('passport_expiry_date')
-        if passport_expiry_date:
-            try:
-                fill_date_field(self.page, 'tag:input@@data-testid=fi_passport_expiry_date', passport_expiry_date)
-                time.sleep(0.5)
-            except Exception as e:
-                self._log(e)
-            
-        phone_country_code = self.account_detail.get('phone_country_code')
-        phone_number = self.account_detail.get('phone_number')
-        if phone_country_code:
-            div = self.page.ele('tag:label@@for=f_pers_mobile_phone').next()
-            btn = div.ele('tag:button')
-            btn.scroll.to_see(center=True)
-            btn.click()
-            time.sleep(0.5)
-            self.page.ele(f'tag:li@@role=option@@text():+{phone_country_code}').click(by_js=True)
-            time.sleep(0.5)
-            div.ele('tag:input@@type:tel').input(phone_number)
-
-        fill_date_field(self.page, 'tag:input@@data-testid=fi_trav_origin_departure_date', self.account_detail.get('departure_origin_date'))
-        fill_date_field(self.page, 'tag:input@@data-testid=f_trav_departure_date', self.account_detail.get('arrival_schengen_area_date'))
-        fill_date_field(self.page, 'tag:input@@data-testid=f_trav_arrival_date', self.account_detail.get('departure_schengen_area_date'))
-            
-        submit_btn = self.page.ele('tag:button@@data-testid=btn-submit')
-        submit_btn.scroll.to_see(center=True)
-        time.sleep(1)
-        submit_btn.click()
-        time.sleep(6)
-        
-        confirm_btn = self.page.ele('tag:button@@text():Confirm')
-        if confirm_btn:
-            confirm_btn.scroll.to_see(center=True)
-            confirm_btn.click()
-            time.sleep(6)
-        self._log("✅ 自动填表提交成功!")
-        
-    def upload_account_to_server(self):
-        api_url = 'https://api.text.skin/api/account/add'
-        api_token = 'tok_e946329a60ff45ba807f3f41b0e8b7fc'
-
-        headers = {
-            'accept': 'application/json',
-            'Authorization': f'Bearer {api_token}',
-            'Content-Type': 'application/json'
-        }
-
-        payload = {
-            "pool_name": self.account_detail.get("pool_name", "default_pool"),
-            "username": self.account_detail.get("email"),
-            "password": self.account_detail.get("pwd"),
-            "extra_data": self.account_detail
-        }
-
-        try:
-            self._log(f"Uploading account {self.account_detail['email']} to server...")
-            resp = requests.post(api_url, json=payload, headers=headers, timeout=10)
-            if resp.status_code == 200:
-                self._log(f"✅ [API Upload Success] Server responded: {resp.text}")
-                return True
-            else:
-                self._log(f"❌ [API Upload Failed] Status: {resp.status_code}, Body: {resp.text}")
-                return False
-        except Exception as e:
-            self._log(f"❌ [API Upload Error]: {e}")
-            return False
-
-    def cleanup(self):
-        self._log("Cleaning up resources...")
-        if self.page:
-            try: self.page.quit()
-            except: pass
-
-# ================= PyQt5 GUI 主窗口 =================
-class MainWindow(QMainWindow):
-    def __init__(self):
-        super().__init__()
-        self.setWindowTitle("TLS 批量注册工具 v1.0 (PyQt5)")
-        self.resize(1000, 700)
-
-        self.bot = None
-        self.profiles = []
-        self.capsolver_key = os.getenv("CAPSOLVER_KEY", "CAP-5441DD341DD3CC2FAEF0BE6FE493EE9A")
-
-        # 实例化信号类并绑定槽函数
-        self.signals = GuiSignals()
-        self.signals.log_signal.connect(self.append_log)
-        self.signals.status_signal.connect(self.update_table_status)
-
-        self.init_ui()
-
-    def init_ui(self):
-        main_widget = QWidget()
-        main_layout = QVBoxLayout(main_widget)
-
-        # 1. 基础设置区域
-        group_settings = QGroupBox("1. 基础设置")
-        layout_settings = QGridLayout()
-        
-        layout_settings.addWidget(QLabel("地区 (如 CN-Beijing):"), 0, 0)
-        self.input_region = QLineEdit("CN-Beijing")
-        layout_settings.addWidget(self.input_region, 0, 1)
-
-        layout_settings.addWidget(QLabel("代理池名 (从proxies.json读取):"), 0, 2)
-        self.input_pool = QLineEdit("local")
-        layout_settings.addWidget(self.input_pool, 0, 3)
-
-        layout_settings.addWidget(QLabel("目标 URL:"), 1, 0)
-        self.input_url = QLineEdit("https://visas-fr.tlscontact.com/en-us/country/gb/vac/gbLON2fr")
-        layout_settings.addWidget(self.input_url, 1, 1, 1, 3)
-
-        group_settings.setLayout(layout_settings)
-        main_layout.addWidget(group_settings)
-
-        # 2. 生成区域
-        group_gen = QGroupBox("2. 生成虚拟信息")
-        layout_gen = QHBoxLayout()
-        layout_gen.addWidget(QLabel("生成数量 (1-100):"))
-        self.spin_count = QSpinBox()
-        self.spin_count.setRange(1, 100)
-        self.spin_count.setValue(5)
-        layout_gen.addWidget(self.spin_count)
-
-        self.btn_generate = QPushButton("生成虚拟信息")
-        self.btn_generate.setStyleSheet("background-color: lightblue;")
-        self.btn_generate.clicked.connect(self.action_generate)
-        layout_gen.addWidget(self.btn_generate)
-        layout_gen.addStretch()
-
-        group_gen.setLayout(layout_gen)
-        main_layout.addWidget(group_gen)
-
-        # 3. 表格展示区域
-        self.table = QTableWidget()
-        self.table.setColumnCount(5)
-        self.table.setHorizontalHeaderLabels(["序号", "邮箱", "密码", "姓名", "当前状态"])
-        self.table.horizontalHeader().setSectionResizeMode(QHeaderView.Stretch)
-        self.table.setSelectionBehavior(QAbstractItemView.SelectRows)
-        self.table.setEditTriggers(QAbstractItemView.NoEditTriggers)
-        main_layout.addWidget(self.table)
-
-        # 4. 浏览器操作区域
-        group_actions = QGroupBox("3. 浏览器操作 (需先在表格中点击选中一行)")
-        layout_actions = QHBoxLayout()
-
-        self.btn_start = QPushButton("[全局] 启动浏览器")
-        self.btn_start.clicked.connect(self.action_start_browser)
-        layout_actions.addWidget(self.btn_start)
-
-        self.btn_register = QPushButton("1. 自动注册并激活")
-        self.btn_register.setStyleSheet("background-color: #d0f0c0;")
-        self.btn_register.clicked.connect(self.action_register)
-        layout_actions.addWidget(self.btn_register)
-
-        self.btn_fill = QPushButton("2. 自动填表")
-        self.btn_fill.setStyleSheet("background-color: #ffd700;")
-        self.btn_fill.clicked.connect(self.action_fill)
-        layout_actions.addWidget(self.btn_fill)
-
-        self.btn_upload = QPushButton("3. 上报并标记已用")
-        self.btn_upload.setStyleSheet("background-color: #ffb6c1;")
-        self.btn_upload.clicked.connect(self.action_upload)
-        layout_actions.addWidget(self.btn_upload)
-
-        self.btn_close = QPushButton("[全局] 关闭浏览器")
-        self.btn_close.setStyleSheet("color: red;")
-        self.btn_close.clicked.connect(self.action_close_browser)
-        layout_actions.addWidget(self.btn_close)
-
-        group_actions.setLayout(layout_actions)
-        main_layout.addWidget(group_actions)
-
-        # 5. 日志区域
-        group_log = QGroupBox("运行日志")
-        layout_log = QVBoxLayout()
-        self.text_log = QTextEdit()
-        self.text_log.setReadOnly(True)
-        layout_log.addWidget(self.text_log)
-        group_log.setLayout(layout_log)
-        main_layout.addWidget(group_log)
-
-        self.setCentralWidget(main_widget)
-
-    # ---------------- 槽函数:UI 更新 ----------------
-    def append_log(self, text):
-        self.text_log.append(text)
-        self.text_log.moveCursor(self.text_log.textCursor().End)
-
-    def update_table_status(self, row, status):
-        item = QTableWidgetItem(status)
-        item.setTextAlignment(Qt.AlignCenter)
-        self.table.setItem(row, 4, item)
-
-    # ---------------- 业务逻辑触发 ----------------
-    def run_in_thread(self, target_func, *args):
-        t = threading.Thread(target=target_func, args=args, daemon=True)
-        t.start()
-
-    def action_generate(self):
-        count = self.spin_count.value()
-        region = self.input_region.text().strip()
-        pool = self.input_pool.text().strip()
-
-        self.append_log(f"开始生成 {count} 个 {region} 地区的虚拟信息...")
-        self.profiles.clear()
-        self.table.setRowCount(0)
-
-        for i in range(count):
-            try:
-                acc = generate_random_account_detail(region)
-                acc['pool_name'] = pool
-                self.profiles.append(acc)
-
-                self.table.insertRow(i)
-                self.table.setItem(i, 0, QTableWidgetItem(str(i+1)))
-                self.table.setItem(i, 1, QTableWidgetItem(acc.get('email', '')))
-                self.table.setItem(i, 2, QTableWidgetItem(acc.get('pwd', '')))
-                
-                name = f"{acc.get('first_name','')} {acc.get('last_name','')}"
-                self.table.setItem(i, 3, QTableWidgetItem(name))
-                
-                self.update_table_status(i, "就绪")
-            except Exception as e:
-                self.append_log(f"生成时出错: {e}")
-        
-        self.append_log("✅ 虚拟信息生成完毕!")
-
-    def action_start_browser(self):
-        pool = self.input_pool.text().strip()
-        url = self.input_url.text().strip()
-
-        def _task():
-            try:
-                self.signals.log_signal.emit(f"正在读取代理池 {pool} ...")
-                proxies = load_proxies(pool)
-                proxy = random.choice(proxies)
-                self.signals.log_signal.emit(f"已选取代理: {proxy.get('ip')}")
-
-                self.bot = TlsRegistrator(
-                    tls_url=url, 
-                    proxy_config=proxy, 
-                    capsolver_key=self.capsolver_key,
-                    signals=self.signals
-                )
-                self.bot.init_browser()
-            except Exception as e:
-                self.signals.log_signal.emit(f"❌ 浏览器启动失败: {e}")
-
-        self.run_in_thread(_task)
-
-    def _get_selected_row(self):
-        row = self.table.currentRow()
-        if row < 0:
-            QMessageBox.warning(self, "警告", "请先在表格中点击选中需要操作的虚拟账号!")
-            return None
-        return row
-
-    def action_register(self):
-        row = self._get_selected_row()
-        if row is None: return
-        if not self.bot:
-            QMessageBox.warning(self, "警告", "请先启动浏览器!")
-            return
-
-        profile = self.profiles[row]
-
-        def _task():
-            try:
-                self.bot.account_detail = profile
-                self.signals.status_signal.emit(row, "注册中...")
-                sent_at = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S")
-                
-                self.bot.register()
-                self.signals.status_signal.emit(row, "激活中...")
-                
-                self.bot.activate(sent_at=sent_at)
-                self.signals.status_signal.emit(row, "注册激活完成")
-            except Exception as e:
-                self.signals.log_signal.emit(f"❌ 注册过程异常: {e}")
-                self.signals.status_signal.emit(row, "注册失败")
-
-        self.run_in_thread(_task)
-
-    def action_fill(self):
-        row = self._get_selected_row()
-        if row is None: return
-        if not self.bot:
-            QMessageBox.warning(self, "警告", "请先启动浏览器!")
-            return
-
-        profile = self.profiles[row]
-
-        def _task():
-            try:
-                self.bot.account_detail = profile
-                self.signals.status_signal.emit(row, "填表中...")
-                
-                self.bot.make_account_useful()
-                
-                self.signals.status_signal.emit(row, "填表完成")
-            except Exception as e:
-                self.signals.log_signal.emit(f"❌ 填表过程异常: {e}")
-                self.signals.status_signal.emit(row, "填表失败")
-
-        self.run_in_thread(_task)
-
-    def action_upload(self):
-        row = self._get_selected_row()
-        if row is None: return
-        if not self.bot: return
-
-        profile = self.profiles[row]
-
-        def _task():
-            try:
-                self.bot.account_detail = profile
-                self.signals.status_signal.emit(row, "上报中...")
-                
-                success = self.bot.upload_account_to_server()
-                if success:
-                    self.signals.status_signal.emit(row, "已使用(上报成功)")
-                else:
-                    self.signals.status_signal.emit(row, "上报失败")
-            except Exception as e:
-                self.signals.log_signal.emit(f"❌ 上报异常: {e}")
-                self.signals.status_signal.emit(row, "上报异常")
-
-        self.run_in_thread(_task)
-
-    def action_close_browser(self):
-        if self.bot:
-            self.bot.cleanup()
-            self.bot = None
-            self.append_log("✅ 浏览器已关闭。")
-            
-    def closeEvent(self, event):
-        """主窗口关闭时,确保清理资源"""
-        if self.bot:
-            self.bot.cleanup()
-        event.accept()
-
-if __name__ == "__main__":
-    app = QApplication(sys.argv)
-    window = MainWindow()
-    window.show()
-    sys.exit(app.exec_())

+ 81 - 0
toolkit/notifier.py

@@ -0,0 +1,81 @@
+from typing import Dict, Callable, Optional
+from vs_types import VSQueryResult, VSBookResult
+from toolkit.vs_cloud_api import VSCloudApi
+from toolkit.thread_pool import ThreadPool
+
+
+def notify_date_changes(
+    query_result: VSQueryResult,
+    cache: Optional[Dict[str, str]] = None,
+    logger: Optional[Callable[[str], None]] = None
+) -> bool:
+    """
+    档期变化微信通知。
+    若提供了 cache 字典(如 {routing_key: earliest_date}),仅在最早档期发生变化时推送并更新 cache。
+    """
+    current_earliest_date = query_result.earliest_date
+    apt_type = query_result.apt_type
+    if not current_earliest_date or not apt_type:
+        return False
+
+    if cache is not None:
+        last_date = cache.get(apt_type.routing_key)
+        if last_date == current_earliest_date:
+            return False
+        cache[apt_type.routing_key] = current_earliest_date
+
+    def _push_to_wx():
+        try:
+            push_content = (
+                f"📢【档期变化通知】\n"
+                f"最早日期: {query_result.earliest_date}\n"
+                f"目标国家: {apt_type.country}\n"
+                f"递交城市: {apt_type.city}\n"
+                f"签证类型: {apt_type.visa_type}\n"
+                f"Routing: {apt_type.routing_key}"
+            )
+            VSCloudApi.Instance().push_weixin_text(push_content)
+        except Exception as e:
+            if logger:
+                logger(f"Failed to notify date change to cloud: {e}")
+
+    ThreadPool.getInstance().enqueue(_push_to_wx)
+    return True
+
+
+def notify_book_result(
+    book_result: VSBookResult,
+    order_id: Optional[str] = None,
+    logger: Optional[Callable[[str], None]] = None
+) -> bool:
+    """
+    预定成功微信通知。
+    仅在 book_result.success 为 True 时进行推送。
+    """
+    if not book_result.success:
+        return False
+
+    def _push_to_wx():
+        try:
+            lines = [
+                "🎉 【预定成功通知】",
+                "━━━━━━━━━━━━━━━",
+            ]
+            if order_id:
+                lines.append(f"订单编号: {order_id}")
+            lines.extend([
+                f"预约账号: {book_result.account}",
+                f"预约日期: {book_result.book_date}",
+                f"预约时间: {book_result.book_time}",
+                f"预约编号: {book_result.urn}",
+                f"支付链接: {book_result.payment_link if book_result.payment_link else '无需支付/暂无'}",
+                "━━━━━━━━━━━━━━━",
+            ])
+            push_content = "\n".join(lines)
+            VSCloudApi.Instance().push_weixin_text(push_content)
+        except Exception as e:
+            if logger:
+                logger(f"Failed to notify book result to cloud: {e}")
+
+    ThreadPool.getInstance().enqueue(_push_to_wx)
+    return True

+ 29 - 0
utils/browser_utils.py

@@ -0,0 +1,29 @@
+from DrissionPage import ChromiumPage, ChromiumOptions
+
+
+def open_browser():
+    options = ChromiumOptions()
+    options.set_local_port(28888)
+    options.set_argument(arg='--disable-notifications', value=True)
+    options.set_argument(arg='--disable-extensions', value=False)
+    options.set_argument(arg='--disable-background-networking', value=True)
+    options.set_argument(arg='--disable-gpu', value=True)
+    options.set_argument(arg='--dns-prefetch-disable', value=True)
+    options.set_argument(arg='--disable-infobars', value=True)
+    options.set_argument(arg='--disable-dev-shm-usage', value=True)
+    options.set_argument(arg='--enable-automation', value=False)
+    options.set_argument(arg='--log-level', value='3')
+    options.set_argument(arg='--start-maximized', value=True)
+    options.set_argument(arg='--ignore-ssl-errors', value=True)
+    options.set_argument(arg='--no-sandbox')
+    options.headless(False)
+    options.incognito(False)
+    driver = ChromiumPage(addr_or_opts=options)
+    driver.set.window.max()
+    return driver
+
+def attach_browser():
+    return ChromiumPage(addr_or_opts=28888)
+
+def quit_browser(driver):
+    driver.quit()

+ 13 - 8
utils/cloudflare_bypass_for_scraping.py

@@ -63,16 +63,19 @@ class CloudflareBypasser:
         if not host_ele:
             return None
 
+        orig_timeout = getattr(getattr(self.driver, "timeouts", None), "base", 2)
         try:
+            if hasattr(self.driver, "set") and hasattr(self.driver.set, "timeouts"):
+                self.driver.set.timeouts(base=0.3)
             host_sr = getattr(host_ele, "shadow_root", None)
             if not host_sr:
                 return None
 
-            iframe = host_sr.child()
+            iframe = host_sr.child(timeout=0.3)
             if not iframe:
                 return None
 
-            body = iframe("tag:body")
+            body = iframe("tag:body", timeout=0.3)
             if not body:
                 return None
 
@@ -80,17 +83,20 @@ class CloudflareBypasser:
             if not body_sr:
                 return None
 
-            return body_sr("tag:input")
+            return body_sr("tag:input", timeout=0.3)
         except Exception as e:
             self.log_message(f"Error extracting button from host element: {e}")
             return None
+        finally:
+            if hasattr(self.driver, "set") and hasattr(self.driver.set, "timeouts"):
+                self.driver.set.timeouts(base=orig_timeout)
 
     def locate_cf_button(self, dfs: bool = False) -> Optional[ChromiumElement]:
         """
         定位 Cloudflare 验证复选框按钮。
         
         策略 1(主路径,毫秒级):扫描主文档中的 'cf-turnstile-response' 隐藏 input,
-        其父级容器或同级兄弟 div 即为真实 shadow_root 宿主,直接提取目标按钮。
+        其前置同级兄弟 div 或父级容器即为真实 shadow_root 宿主,直接提取目标按钮。
         
         策略 2(备用路径):若主路径未命中且显式开启 dfs=True,则从 body 递归搜索。
         """
@@ -107,13 +113,12 @@ class CloudflareBypasser:
                     if not parent:
                         continue
 
-                    # 兼容不同版本 Turnstile 容器结构:
-                    # A. parent 本身挂载 shadow_root
-                    # B. parent 内部的前置同级 <div> 挂载 shadow_root
-                    host_candidates = [parent]
+                    # 优先检查同级前置兄弟 <div>(在大多数现代 Turnstile 结构中该 div 才是 shadow_root 宿主)
+                    host_candidates = []
                     sibling_div = parent.ele("tag:div", timeout=0.3)
                     if sibling_div:
                         host_candidates.append(sibling_div)
+                    host_candidates.append(parent)
 
                     for candidate in host_candidates:
                         button = self._extract_turnstile_button_from_host(candidate)

+ 349 - 66
vfs_registration_bot.py → vfs_keygen.py

@@ -1,4 +1,5 @@
 import os
+import sys
 import re
 import uuid
 import random
@@ -12,7 +13,7 @@ import base64
 import requests
 import argparse
 from datetime import datetime, timezone
-from urllib.parse import urlparse, urlencode
+from urllib.parse import urlparse, urlencode, parse_qs
 
 from bs4 import BeautifulSoup
 from cryptography.hazmat.primitives import serialization, hashes
@@ -128,7 +129,7 @@ class BrowserResponse:
 # ==========================================
 def load_proxies(pool_name):
     """从 config/proxies.json 读取对应的代理池"""
-    config_path = os.path.join(os.path.dirname(__file__), 'config', 'proxies.json')
+    config_path = os.path.join(ROOT_DIR, 'config', 'proxies.json')
     try:
         with open(config_path, 'r', encoding='utf-8') as f:
             data = json.load(f)
@@ -209,6 +210,7 @@ class VFSRegistrationBotV3:
         chrome_path = configure.CHROME_PATH or os.getenv("CHROME_BIN")
         if chrome_path and os.path.exists(chrome_path):
             co.set_paths(browser_path=chrome_path)
+        co.set_user_data_path(self.workspace)
 
         if self.proxy_config and self.proxy_config.get("ip"):
             p = self.proxy_config
@@ -255,7 +257,15 @@ class VFSRegistrationBotV3:
             window.cf_token = null;
             var st = document.getElementById('status');
             if(st) { st.innerText = 'Resetting verification...'; st.style.color = '#666'; }
-            try { window.turnstile.reset(); } catch(e) {}
+            try { 
+                if (window.turnstile) {
+                    if (window.my_widget_id !== undefined) {
+                        window.turnstile.reset(window.my_widget_id);
+                    } else {
+                        window.turnstile.reset();
+                    }
+                }
+            } catch(e) {}
             """)
             return
 
@@ -276,10 +286,11 @@ class VFSRegistrationBotV3:
             </div>
         `;
         window.cf_token = null;
+        window.my_widget_id = undefined;
 
         function initTurnstile() {{
             try {{
-                window.turnstile.render('#my-turnstile', {{
+                window.my_widget_id = window.turnstile.render('#my-turnstile', {{
                     sitekey: '{self.sitekey}',
                     callback: function(token) {{
                         window.cf_token = token;
@@ -289,6 +300,14 @@ class VFSRegistrationBotV3:
                             st.style.color = '#16a34a';
                         }}
                     }},
+                    'expired-callback': function() {{
+                        window.cf_token = null;
+                        var st = document.getElementById('status');
+                        if (st) {{
+                            st.innerText = '⚠️ Token expired. Re-verifying...';
+                            st.style.color = '#f59e0b';
+                        }}
+                    }},
                     'error-callback': function() {{
                         var st = document.getElementById('status');
                         if (st) {{
@@ -317,71 +336,152 @@ class VFSRegistrationBotV3:
         self.injected = True
         self._log("Turnstile injected successfully.")
 
-    def _get_turnstile_token(self, timeout_sec=40):
-        """等待或自动点击 Turnstile 获取 token"""
+    def _get_turnstile_token(self, timeout_sec=90):
+        """等待或自动点击 Turnstile 获取 token (支持 getResponse API、回调变量与隐藏 input 多路提取)"""
         self._log("Waiting for Turnstile verification...")
-        cf_bypasser = CloudflareBypasser(self.page, log=True)
+        cf_bypasser = CloudflareBypasser(self.page, log=False)
         start_t = time.time()
+        last_log_t = 0.0
+        click_attempted = False
         
+        js_inspect = """
+        var t = null;
+        try {
+            if (window.turnstile && typeof window.turnstile.getResponse === 'function') {
+                if (window.my_widget_id !== undefined && window.my_widget_id !== null) {
+                    t = window.turnstile.getResponse(window.my_widget_id);
+                }
+                if (!t) {
+                    t = window.turnstile.getResponse();
+                }
+            }
+        } catch(e) {}
+
+        var inputVal = (function() {
+            var el = document.querySelector('input[name="cf-turnstile-response"], [name*="turnstile-response"], [name="cf_challenge_response"]');
+            if (el && el.value && el.value.length > 20) return el.value;
+            if (window.my_widget_id) {
+                var el2 = document.getElementById(window.my_widget_id + "_response");
+                if (el2 && el2.value && el2.value.length > 20) return el2.value;
+            }
+            var all = document.querySelectorAll('input, textarea');
+            for (var i = 0; i < all.length; i++) {
+                var n = all[i].name || all[i].id || '';
+                if ((n.indexOf('turnstile') !== -1 || n.indexOf('cf-') !== -1) && all[i].value && all[i].value.length > 20) {
+                    return all[i].value;
+                }
+            }
+            return null;
+        })();
+
+        return {
+            cf_token: (window.cf_token && window.cf_token.length > 20) ? window.cf_token : null,
+            response: (t && t.length > 20) ? t : null,
+            input_val: inputVal || null,
+            status_text: document.getElementById('status') ? document.getElementById('status').innerText : null,
+            has_turnstile: !!window.turnstile,
+            widget_id: window.my_widget_id !== undefined ? window.my_widget_id : null
+        };
+        """
+
         while time.time() - start_t < timeout_sec:
-            token = self.page.run_js('return window.cf_token;')
-            if token:
-                self._log("✅ Turnstile token acquired!")
-                return token
+            # 1. 优先通过 JS 检查状态与提取 Token
+            try:
+                state = self.page.run_js(js_inspect)
+                if state:
+                    token = state.get('cf_token') or state.get('response') or state.get('input_val')
+                    if token:
+                        self._log(f"✅ Turnstile token acquired! (len: {len(token)})")
+                        return token
+                    
+                    if time.time() - last_log_t > 3.0:
+                        last_log_t = time.time()
+                        self._log(f"Turnstile state: status='{state.get('status_text')}', has_turnstile={state.get('has_turnstile')}, widget_id={state.get('widget_id')}")
+            except Exception as e:
+                if time.time() - last_log_t > 3.0:
+                    last_log_t = time.time()
+                    self._log(f"Turnstile inspect warning: {e}")
             
+            # 2. 备选 DrissionPage 元素探测
             try:
                 ele = self.page.ele('@name=cf-turnstile-response', timeout=0.1)
-                if ele and ele.value:
-                    self._log("✅ Turnstile token acquired from input tag!")
+                if ele and ele.value and len(ele.value) > 20:
+                    self._log(f"✅ Turnstile token acquired from input tag! (len: {len(ele.value)})")
                     return ele.value
-            except:
+            except Exception:
                 pass
             
-            # 尝试点击验证复选框
-            if time.time() - start_t > 2:
+            # 3. 尝试自动点击验证复选框 (仅在加载出 widget 且未点过时尝试一次,绝不阻塞主循环)
+            now = time.time()
+            if not click_attempted and (now - start_t > 2.0):
                 try:
-                    cf_bypasser.click_verification_button(is_dfs=False)
-                except:
+                    res = cf_bypasser.click_verification_button(is_dfs=False)
+                    if res:
+                        self._log("Clicked Turnstile verification checkbox.")
+                        click_attempted = True
+                except Exception:
                     pass
                 
-            time.sleep(0.8)
+            time.sleep(0.3)
+
+        # 4. 超时兜底再次复查一次
+        try:
+            state = self.page.run_js(js_inspect)
+            if state:
+                token = state.get('cf_token') or state.get('response') or state.get('input_val')
+                if token:
+                    self._log(f"✅ Turnstile token acquired on final check! (len: {len(token)})")
+                    return token
+        except Exception:
+            pass
             
         return None
 
-    def _perform_js_fetch(self, method, url, headers=None, data=None, json_data=None):
-        """在当前纯净页面上下文中执行同源/跨域 fetch"""
-        fetch_options = {
-            "method": method.upper(),
-            "headers": headers or {},
-            "credentials": "include"
-        }
-        
-        if json_data:
-            fetch_options['body'] = json.dumps(json_data)
-            fetch_options['headers']['Content-Type'] = 'application/json'
-        elif data:
-            fetch_options['body'] = urlencode(data) if isinstance(data, dict) else str(data)
-            fetch_options['headers']['Content-Type'] = 'application/x-www-form-urlencoded'
-
-        js_script = f"""
-        const url = "{url}";
-        const options = {json.dumps(fetch_options)};
-        return fetch(url, options)
-            .then(async response => {{
-                const text = await response.text();
-                const headers = {{}};
-                response.headers.forEach((value, key) => headers[key] = value);
-                return {{
-                    status: response.status,
-                    body: text,
-                    headers: headers,
-                    url: response.url
-                }};
-            }})
-            .catch(err => ({{ status: 0, body: err.toString() }}));
-        """
-        res_dict = self.page.run_js(js_script, timeout=30)
-        return BrowserResponse(res_dict)
+    def _perform_js_fetch(self, method, url, headers=None, data=None, json_data=None, retries=2):
+        """在当前纯净页面上下文中执行同源/跨域 fetch,支持轻量重试"""
+        for attempt in range(retries + 1):
+            try:
+                fetch_options = {
+                    "method": method.upper(),
+                    "headers": headers or {},
+                    "credentials": "include"
+                }
+                
+                if json_data is not None:
+                    fetch_options['body'] = json.dumps(json_data)
+                    fetch_options['headers']['Content-Type'] = 'application/json'
+                elif data is not None:
+                    fetch_options['body'] = urlencode(data) if isinstance(data, dict) else str(data)
+                    fetch_options['headers']['Content-Type'] = 'application/x-www-form-urlencoded'
+
+                js_script = f"""
+                const url = "{url}";
+                const options = {json.dumps(fetch_options)};
+                return fetch(url, options)
+                    .then(async response => {{
+                        const text = await response.text();
+                        const headers = {{}};
+                        response.headers.forEach((value, key) => headers[key] = value);
+                        return {{
+                            status: response.status,
+                            body: text,
+                            headers: headers,
+                            url: response.url
+                        }};
+                    }})
+                    .catch(err => ({{ status: 0, body: err.toString() }}));
+                """
+                res_dict = self.page.run_js(js_script, timeout=30)
+                resp = BrowserResponse(res_dict)
+                if resp.status_code != 0 or attempt == retries:
+                    return resp
+                self._log(f"Fetch got status 0 ({resp.text}), retrying ({attempt+1}/{retries})...")
+                time.sleep(1.5)
+            except Exception as e:
+                if attempt == retries:
+                    return BrowserResponse({'status': 0, 'body': str(e)})
+                time.sleep(1.5)
+        return BrowserResponse({'status': 0, 'body': 'Unknown fetch failure'})
 
     def _wait_for_activation_link(self, username, max_wait_sec=60):
         self._log(f"Waiting for activation email for {username}...")
@@ -415,7 +515,9 @@ class VFSRegistrationBotV3:
                         if content:
                             soup = BeautifulSoup(content, "html.parser")
                             link = soup.find("a", string="ActivateAccount")
-                            if link:
+                            if not link:
+                                link = soup.find("a", href=re.compile(r"activateemail", re.I))
+                            if link and link.get("href"):
                                 return link["href"].replace(" ", "").replace("\n", "").replace("\r", "").strip()
             except Exception as e:
                 logger.warning(f"Error fetching email: {e}")
@@ -425,6 +527,198 @@ class VFSRegistrationBotV3:
             
         return None
 
+    def _activate_account(self, account, activate_link: str) -> bool:
+        """
+        激活账号 - 多重保障机制:
+        1. API 直连激活 (轻量、跳过前端昂贵资源加载与渲染)
+        2. 浏览器打开链接 (自动穿透 Cloudflare 盾 + 宽松关键词匹配 + 自动刷新)
+        3. 状态验证 (通过登录探针确认是否已激活)
+        """
+        self._log(f"Activating account: {activate_link}")
+        country_code = account.get('country_code', '').lower()
+        api_domain = 'https://lift-apicn.vfsglobal.com' if country_code == 'chn' else 'https://lift-api.vfsglobal.com'
+        
+        # 1. 精确提取 q 激活参数,必须保留原始 + 号,不得用 parse_qs 替换为空格!
+        q_token = ""
+        m = re.search(r'[?&]q=([^&\s]+)', activate_link)
+        if m:
+            q_token = m.group(1).replace(" ", "+")
+        else:
+            self._log(f"Failed to regex extract q parameter from {activate_link}")
+
+        # ----------------------------------------------------
+        # 策略 1: 在已持有 CF Clearance 的当前会话中直接调用后端激活接口
+        # ----------------------------------------------------
+        if q_token:
+            try:
+                headers = {
+                    'content-type': 'application/json;charset=utf-8',
+                    'accept': 'application/json, text/plain, */*',
+                    'route': f"{account['country_code']}/en/{account['mission_code']}",
+                    'clientsource': VFSHelper.get_client_source(),
+                }
+                
+                # 经过逆向分析,后端 GAGateway.IdentityController.ActivateEmail 接收标准模型:
+                # {"token": ..., "missioncode": ..., "countrycode": ...}
+                post_body = {
+                    "token": q_token,
+                    "missioncode": account.get('mission_code', ''),
+                    "countrycode": account.get('country_code', '')
+                }
+                api_resp = self._perform_js_fetch(
+                    'POST',
+                    f"{api_domain}/user/activateemail",
+                    headers=headers,
+                    json_data=post_body
+                )
+                self._log(f"API Activation (POST /user/activateemail) Response ({api_resp.status_code}): {api_resp.text[:150]}")
+                
+                if api_resp.status_code == 200:
+                    try:
+                        rj = api_resp.json()
+                        err = rj.get("error", {})
+                        # 成功响应 code 200, 或者 507 ("Account is already active")
+                        if (rj.get("code") in [200, "200", 0, "0"] or 
+                            err.get("code") in [200, "200", 507, "507"] or 
+                            "already active" in api_resp.text.lower() or 
+                            "activated" in api_resp.text.lower() or
+                            "success" in api_resp.text.lower()):
+                            logger.info(f"🎉 Account {account['username']} activated successfully via API!")
+                            return True
+                    except Exception:
+                        if "already active" in api_resp.text.lower() or "activated" in api_resp.text.lower() or "success" in api_resp.text.lower():
+                            logger.info(f"🎉 Account {account['username']} activated successfully via API!")
+                            return True
+
+                if api_resp.status_code in [404, 405]:
+                    get_resp = self._perform_js_fetch(
+                        'GET',
+                        f"{api_domain}/user/activateemail?q={q_token}",
+                        headers=headers
+                    )
+                    self._log(f"API Activation (GET /user/activateemail) Response ({get_resp.status_code}): {get_resp.text[:120]}")
+                    if get_resp.status_code == 200 and ("success" in get_resp.text.lower() or "activated" in get_resp.text.lower() or "already active" in get_resp.text.lower()):
+                        logger.info(f"🎉 Account {account['username']} activated successfully via GET API!")
+                        return True
+
+            except Exception as e:
+                self._log(f"Direct API activation attempt error: {e}")
+
+        # ----------------------------------------------------
+        # 策略 2: 浏览器打开激活链接(带自动 CF 盾点击穿透、模糊匹配与刷新重试)
+        # ----------------------------------------------------
+        main_tab_id = None
+        activate_tab = None
+        try:
+            try:
+                main_tab_id = self.page.tab_id
+            except Exception:
+                pass
+            self._log(f"Opening activation tab in browser: {activate_link}")
+            activate_tab = self.page.new_tab(activate_link)
+            cf_bypasser = CloudflareBypasser(activate_tab, log=False)
+            start_t = time.time()
+            max_wait_sec = 40
+            refreshed = False
+
+            success_keywords = [
+                "activation successful",
+                "activated successfully",
+                "account has been activated",
+                "account is activated",
+                "your account is active",
+                "already activated",
+                "already verified",
+                "sign in to continue",
+                "registration complete",
+                "login",
+                "sign in",
+            ]
+
+            while time.time() - start_t < max_wait_sec:
+                # 1. 尝试穿透可能的 Cloudflare 验证盾
+                try:
+                    cf_bypasser.click_verification_button(is_dfs=False)
+                except Exception:
+                    pass
+
+                # 2. 检查 URL 跳转(如果跳到了登录页,说明激活成功)
+                try:
+                    cur_url = (activate_tab.url or "").lower()
+                    if "/login" in cur_url or "activated=true" in cur_url or "success" in cur_url:
+                        logger.info(f"🎉 Account {account['username']} activated (redirected to: {cur_url})!")
+                        return True
+                except Exception:
+                    pass
+
+                # 3. 检查页面 HTML / 文本
+                try:
+                    page_html = (activate_tab.html or "").lower()
+                    for kw in success_keywords:
+                        if kw in page_html:
+                            logger.info(f"🎉 Account {account['username']} activated successfully (matched: '{kw}')!")
+                            return True
+
+                    # 若卡在白屏或 18 秒未加载出任何实质内容,尝试刷新页面
+                    if not refreshed and (time.time() - start_t > 18):
+                        self._log("Activation page slow/stuck, executing tab refresh...")
+                        activate_tab.refresh()
+                        refreshed = True
+                except Exception as e:
+                    self._log(f"Activation polling warning: {e}")
+
+                time.sleep(1.0)
+
+            # ----------------------------------------------------
+            # 策略 3: 登录探针兜底验证 (探测账号是否实际已生效)
+            # ----------------------------------------------------
+            self._log("Browser wait timed out. Checking account activation status via login probe...")
+            cf_token = self._get_turnstile_token(timeout_sec=15)
+            if cf_token:
+                login_data = {
+                    "username": account['username'],
+                    "password": VFSHelper.encrypt_password(account['password']),
+                    "missioncode": account['mission_code'],
+                    "countrycode": account['country_code'],
+                    "languageCode": "en-US",
+                    "captcha_version": "cloudflare-v1",
+                    "captcha_api_key": cf_token
+                }
+                headers = {
+                    'content-type': 'application/json;charset=utf-8',
+                    'accept': 'application/json, text/plain, */*',
+                    'route': f"{account['country_code']}/en/{account['mission_code']}",
+                    'clientsource': VFSHelper.get_client_source(),
+                }
+                login_resp = self._perform_js_fetch('POST', f"{api_domain}/user/login", headers=headers, json_data=login_data)
+                login_text = login_resp.text.lower()
+                self._log(f"Login probe response ({login_resp.status_code}): {login_resp.text[:120]}")
+                
+                if login_resp.status_code == 200 or "accesstoken" in login_text or "enableotpauthentication" in login_text:
+                    logger.info(f"🎉 Account {account['username']} verified activated via login probe!")
+                    return True
+                elif "not activated" in login_text or "activate your account" in login_text:
+                    logger.error(f"Account {account['username']} probe confirmed: not activated.")
+                    return False
+
+            logger.error("Activation verification failed: all strategies timed out.")
+            return False
+
+        except Exception as e:
+            logger.error(f"Exception in activation flow: {e}")
+            return False
+        finally:
+            if activate_tab:
+                try:
+                    activate_tab.close()
+                except Exception:
+                    pass
+            if main_tab_id:
+                try:
+                    self.page = self.page.get_tab(main_tab_id)
+                except Exception:
+                    pass
+
     def register(self, account):
         """执行单个账号的纯净注册流程"""
         try:
@@ -486,18 +780,7 @@ class VFSRegistrationBotV3:
                 activate_link = self._wait_for_activation_link(account['username'])
                 
                 if activate_link:
-                    self._log(f"Activating account: {activate_link}")
-                    activate_tab = self.page.new_tab(activate_link)
-                    try:
-                        success_ele = activate_tab.ele('Activation Successful', timeout=30)
-                        if success_ele:
-                            logger.info(f"🎉 Account {account['username']} activated successfully!")
-                            return True
-                        else:
-                            logger.error("Activation verification failed. Success text not found.")
-                            return False
-                    finally:
-                        activate_tab.close()
+                    return self._activate_account(account, activate_link)
                 else:
                     logger.error("Timeout waiting for activation email.")
                     return False

+ 2 - 1
vs_types.py

@@ -76,7 +76,7 @@ class PluginConfig(BaseModel):
     plugin_proto: str = Field(default="IVSPlg")
 
 class AppointmentType(BaseModel):
-    weight: int = 0
+    weight: int = 1
     routing_key: str = ''
     country: str = ''
     city: str = ''
@@ -146,6 +146,7 @@ class BookerStandaloneConfig(BaseModel):
     active_time_start: str = "00:00"    # 默认执行起始时间
     active_time_end: str = "23:59"      # 默认执行结束时间
     session_max_life: int = 30*60       # 单位 秒
+    keep_alive: int = 60                # 保活间隔 单位 秒
     query_wait: QueryWaitConfig = Field(default_factory=QueryWaitConfig)
     login_interval: int = 1800          # 登录间隔
     plugin_config: PluginConfig = Field(default_factory=PluginConfig)