hujiarui 1 lună în urmă
părinte
comite
742dcf8e6d

+ 4 - 4
README.md

@@ -39,11 +39,11 @@ graph LR
     Step6 --> Step7[7. test_cleanup<br>浏览器销毁与临时文件清理]
     Step6 --> Step7[7. test_cleanup<br>浏览器销毁与临时文件清理]
 ```
 ```
 
 
-1. **`test_init`**: 通过插件工厂动态加载目标插件,验证其继承自 `IVSPlg`,并注入 `VSPlgConfig` 与日志记录器。
+1. **`test_init`**: 通过插件工厂动态加载目标插件,验证其继承自 `IPlugin`,并注入 `PluginConfig` 与日志记录器。
 2. **`test_create_session`**: 启动指纹隔离的 Chromium 实例,通过反爬盾挑战(如 Cloudflare Turnstile、AWS WAF、KBA 密保回答),完成登录获取会话凭据(Cookie / JWT / SessionId)。
 2. **`test_create_session`**: 启动指纹隔离的 Chromium 实例,通过反爬盾挑战(如 Cloudflare Turnstile、AWS WAF、KBA 密保回答),完成登录获取会话凭据(Cookie / JWT / SessionId)。
 3. **`test_health_check`**: 触发心跳检查(`health_check()`),验证会话存活状态与页面响应能力。
 3. **`test_health_check`**: 触发心跳检查(`health_check()`),验证会话存活状态与页面响应能力。
 4. **`test_status`**: 抓取插件的运行时指标对象 `PluginStatus`(含会话存活时长、关联代理、账号标识、URL 状态等)。
 4. **`test_status`**: 抓取插件的运行时指标对象 `PluginStatus`(含会话存活时长、关联代理、账号标识、URL 状态等)。
-5. **`test_query`**: 导航至号源日历页面,结合 OCR/大模型识别输入验证码,查询预约号源并输出规范化 `VSQueryResult`(`AvailabilityStatus`、最早已开放日期 `earliest_date` 等)。
+5. **`test_query`**: 导航至号源日历页面,结合 OCR/大模型识别输入验证码,查询预约号源并输出规范化 `QueryResult`(`AvailabilityStatus`、最早已开放日期 `earliest_date` 等)。
 6. **`test_book`** *(可选)*: 当附加 `--book` 参数时执行,根据 `user_inputs` 填报申请人资料、上传护照文档、选择时间槽并锁定预约。
 6. **`test_book`** *(可选)*: 当附加 `--book` 参数时执行,根据 `user_inputs` 填报申请人资料、上传护照文档、选择时间槽并锁定预约。
 7. **`test_cleanup`**: 验证 `cleanup()` 函数能够安全退出浏览器进程,并彻底清除隔离工作区数据(`data/temp_browser_data/`)。
 7. **`test_cleanup`**: 验证 `cleanup()` 函数能够安全退出浏览器进程,并彻底清除隔离工作区数据(`data/temp_browser_data/`)。
 
 
@@ -333,7 +333,7 @@ coordinate/
 │   ├── config_booker.json   # 抢号预约进程配置
 │   ├── config_booker.json   # 抢号预约进程配置
 │   └── config_sentinel.json # 巡检监控进程配置
 │   └── config_sentinel.json # 巡检监控进程配置
 ├── configure.py             # 核心系统配置(Redis、大模型 API、Mihomo 等)
 ├── configure.py             # 核心系统配置(Redis、大模型 API、Mihomo 等)
-├── plugins/                 # 签证中心业务插件 (实现 IVSPlg 规范)
+├── plugins/                 # 签证中心业务插件 (实现 IPlugin 规范)
 │   ├── vfs_plugin.py        # VFS 插件
 │   ├── vfs_plugin.py        # VFS 插件
 │   ├── pol_plugin.py        # 波兰插件 (已接入 CaptchaBreaker)
 │   ├── pol_plugin.py        # 波兰插件 (已接入 CaptchaBreaker)
 │   ├── tls_plugin.py        # TLS 插件
 │   ├── tls_plugin.py        # TLS 插件
@@ -342,7 +342,7 @@ coordinate/
 │   ├── captcha_breaker.py   # 通用多模态大模型验证码识别器
 │   ├── captcha_breaker.py   # 通用多模态大模型验证码识别器
 │   ├── mihomo_tunnel.py     # 智能代理隧道与节点管理
 │   ├── mihomo_tunnel.py     # 智能代理隧道与节点管理
 │   ├── backoff.py           # 指数退避重试器
 │   ├── backoff.py           # 指数退避重试器
-│   └── vs_cloud_api.py      # 云端邮箱验证码与配置同步
+│   └── cloud_api.py      # 云端邮箱验证码与配置同步
 ├── tools/                   # 运维与开发工具
 ├── tools/                   # 运维与开发工具
 │   └── plugin_tester.py     # 插件标准生命周期测试器
 │   └── plugin_tester.py     # 插件标准生命周期测试器
 ├── utils/                   # 辅助机制 (状态机、反爬绕过、指纹配置)
 ├── utils/                   # 辅助机制 (状态机、反爬绕过、指纹配置)

+ 20 - 20
booker.py

@@ -6,14 +6,14 @@ import random
 from datetime import datetime
 from datetime import datetime
 from typing import List, Dict, Callable, Optional
 from typing import List, Dict, Callable, Optional
 
 
-from vs_types import (
-    GroupConfig, VSPlgConfig, Task, VSBookResult, VSQueryResult, 
+from core_types import (
+    GroupConfig, PluginConfig, Task, BookResult, QueryResult, 
     AppointmentType, QueryWaitMode, AvailabilityStatus, GroupStatus, PluginStatus, utc_now_str,
     AppointmentType, QueryWaitMode, AvailabilityStatus, GroupStatus, PluginStatus, utc_now_str,
     BizException, RateLimiteddError, SessionExpiredOrInvalidError, PermissionDeniedError,
     BizException, RateLimiteddError, SessionExpiredOrInvalidError, PermissionDeniedError,
     NetworkTimeoutError
     NetworkTimeoutError
 )
 )
-from vs_plg_factory import VSPlgFactory 
-from toolkit.vs_cloud_api import VSCloudApi
+from plugin_factory import PluginFactory 
+from toolkit.cloud_api import CloudApi
 from toolkit.proxy_manager import ProxyManager
 from toolkit.proxy_manager import ProxyManager
 from toolkit.thread_pool import ThreadPool
 from toolkit.thread_pool import ThreadPool
 from toolkit.notifier import notify_book_result
 from toolkit.notifier import notify_book_result
@@ -28,7 +28,7 @@ class BaseBookerGCO:
 
 
     def __init__(self, cfg: GroupConfig, redis_conf: Dict, logger: Callable[[str], None] = None):
     def __init__(self, cfg: GroupConfig, redis_conf: Dict, logger: Callable[[str], None] = None):
         self.m_cfg = cfg
         self.m_cfg = cfg
-        self.m_factory = VSPlgFactory()
+        self.m_factory = PluginFactory()
         self.m_logger = logger
         self.m_logger = logger
         self.m_tasks: List[Task] = []
         self.m_tasks: List[Task] = []
         self.m_lock = threading.RLock()
         self.m_lock = threading.RLock()
@@ -171,7 +171,7 @@ class BaseBookerGCO:
         action: str,
         action: str,
         err: Exception,
         err: Exception,
         task: Optional[Task] = None,
         task: Optional[Task] = None,
-        plg_cfg: Optional[VSPlgConfig] = None,
+        plg_cfg: Optional[PluginConfig] = None,
         task_id: Optional[int] = None
         task_id: Optional[int] = None
     ) -> None:
     ) -> None:
         """
         """
@@ -197,7 +197,7 @@ class BaseBookerGCO:
                 self._log(f"🔒 [Account Rate Limited] 429 throttled during {action} (Account credential/frequency restricted).")
                 self._log(f"🔒 [Account Rate Limited] 429 throttled during {action} (Account credential/frequency restricted).")
                 if acc and getattr(acc, "username", "") not in ("", "Guest") and getattr(acc, "id", 0):
                 if acc and getattr(acc, "username", "") not in ("", "Guest") and getattr(acc, "id", 0):
                     try:
                     try:
-                        VSCloudApi.Instance().lock_account(acc.id, int(backoff))
+                        CloudApi.Instance().lock_account(acc.id, int(backoff))
                         self._log(f"🔒 Account [{acc.username}] locked for {int(backoff)}s via Cloud API.")
                         self._log(f"🔒 Account [{acc.username}] locked for {int(backoff)}s via Cloud API.")
                     except Exception as lock_err:
                     except Exception as lock_err:
                         self._log(f"Failed to lock account via cloud API: {lock_err}")
                         self._log(f"Failed to lock account via cloud API: {lock_err}")
@@ -306,7 +306,7 @@ class BaseBookerGCO:
         """子类维护循环中对于健康/异常 Task 的额外处理"""
         """子类维护循环中对于健康/异常 Task 的额外处理"""
         pass
         pass
 
 
-    def _is_date_of_interest(self, task: Task, query_result: VSQueryResult) -> bool:
+    def _is_date_of_interest(self, task: Task, query_result: QueryResult) -> bool:
         """判断 query_result 中的可用日期是否在 task 意向范围内(默认 True,Order 模式重写)"""
         """判断 query_result 中的可用日期是否在 task 意向范围内(默认 True,Order 模式重写)"""
         return True
         return True
 
 
@@ -323,7 +323,7 @@ class BaseBookerGCO:
                         continue
                         continue
                     try:
                     try:
                         data = json.loads(raw_data)
                         data = json.loads(raw_data)
-                        query_result = VSQueryResult.model_validate(data['query_result'])
+                        query_result = QueryResult.model_validate(data['query_result'])
                         query_result.apt_type = AppointmentType.model_validate(data['apt_type'])
                         query_result.apt_type = AppointmentType.model_validate(data['apt_type'])
                     except Exception as parse_err:
                     except Exception as parse_err:
                         self._log(f"Data parsing error for {redis_key}: {parse_err}. Deleting corrupted signal.")
                         self._log(f"Data parsing error for {redis_key}: {parse_err}. Deleting corrupted signal.")
@@ -357,7 +357,7 @@ class BaseBookerGCO:
             except Exception as e:
             except Exception as e:
                 self._log(f"Booking trigger loop exception: {e}")
                 self._log(f"Booking trigger loop exception: {e}")
 
 
-    def _execute_book_job(self, task: Task, query_result: VSQueryResult):
+    def _execute_book_job(self, task: Task, query_result: QueryResult):
         raise NotImplementedError
         raise NotImplementedError
 
 
     def _creator_loop(self):
     def _creator_loop(self):
@@ -377,7 +377,7 @@ class BaseBookerGCO:
         
         
         def _update_cloud_success():
         def _update_cloud_success():
             try:
             try:
-                VSCloudApi.Instance().update_vas_task(str(task_id), {"status": "grabbed", "grabbed_history": grab_info})
+                CloudApi.Instance().update_vas_task(str(task_id), {"status": "grabbed", "grabbed_history": grab_info})
             except Exception as e:
             except Exception as e:
                 self._log(f"Failed to update success state to cloud: {e}")
                 self._log(f"Failed to update success state to cloud: {e}")
 
 
@@ -416,13 +416,13 @@ class BuiltinBookerGCO(BaseBookerGCO):
         plg_cfg = None
         plg_cfg = None
         
         
         try:
         try:
-            plg_cfg = VSPlgConfig()
+            plg_cfg = PluginConfig()
             plg_cfg.debug = self.m_cfg.debug
             plg_cfg.debug = self.m_cfg.debug
             plg_cfg.free_config = self.m_cfg.free_config
             plg_cfg.free_config = self.m_cfg.free_config
             plg_cfg.session_max_life = self.m_cfg.session_max_life
             plg_cfg.session_max_life = self.m_cfg.session_max_life
 
 
             if self.m_cfg.need_account:
             if self.m_cfg.need_account:
-                acc = VSCloudApi.Instance().get_next_account(self.m_cfg.booker.account_pool_id, self.m_cfg.booker.account_cd)
+                acc = CloudApi.Instance().get_next_account(self.m_cfg.booker.account_pool_id, self.m_cfg.booker.account_cd)
                 plg_cfg.account = type(plg_cfg.account)(**acc)
                 plg_cfg.account = type(plg_cfg.account)(**acc)
 
 
             if self.m_cfg.need_proxy:
             if self.m_cfg.need_proxy:
@@ -455,14 +455,14 @@ class BuiltinBookerGCO(BaseBookerGCO):
             if not success and instance:
             if not success and instance:
                 self._cleanup_instance(instance, "spawn failed")
                 self._cleanup_instance(instance, "spawn failed")
 
 
-    def _execute_book_job(self, task: Task, query_result: VSQueryResult):
+    def _execute_book_job(self, task: Task, query_result: QueryResult):
         queue_name = f"auto.{query_result.apt_type.routing_key}"
         queue_name = f"auto.{query_result.apt_type.routing_key}"
 
 
         task_id = None
         task_id = None
         task_data = None
         task_data = None
         
         
         try:
         try:
-            task_data = VSCloudApi.Instance().get_vas_task_pop(queue_name)
+            task_data = CloudApi.Instance().get_vas_task_pop(queue_name)
             if not task_data:
             if not task_data:
                 return 
                 return 
             task_id = task_data['id']
             task_id = task_data['id']
@@ -541,7 +541,7 @@ class OrderBookerGCO(BaseBookerGCO):
                 now = time.time()
                 now = time.time()
                 for tid, last_refresh in tasks_to_check.items():
                 for tid, last_refresh in tasks_to_check.items():
                     if now - last_refresh >= refresh_interval:
                     if now - last_refresh >= refresh_interval:
-                        fresh_data = VSCloudApi.Instance().get_vas_task(tid)
+                        fresh_data = CloudApi.Instance().get_vas_task(tid)
                         if fresh_data:
                         if fresh_data:
                             fresh_data['_last_refresh'] = time.time()
                             fresh_data['_last_refresh'] = time.time()
                             
                             
@@ -552,7 +552,7 @@ class OrderBookerGCO(BaseBookerGCO):
             except Exception as e:
             except Exception as e:
                 self._log(f'Cache refresh loop exception: {e}')
                 self._log(f'Cache refresh loop exception: {e}')
 
 
-    def _is_date_of_interest(self, task: Task, query_result: VSQueryResult) -> bool:
+    def _is_date_of_interest(self, task: Task, query_result: QueryResult) -> bool:
         if query_result.availability_status != AvailabilityStatus.Available:
         if query_result.availability_status != AvailabilityStatus.Available:
             return True
             return True
         task_id = task.task_ref
         task_id = task.task_ref
@@ -566,7 +566,7 @@ class OrderBookerGCO(BaseBookerGCO):
         dt = available_date.strftime("%Y-%m-%d")
         dt = available_date.strftime("%Y-%m-%d")
         return dt <= expected_end_date
         return dt <= expected_end_date
 
 
-    def _execute_book_job(self, task: Task, query_result: VSQueryResult):
+    def _execute_book_job(self, task: Task, query_result: QueryResult):
         task_id = task.task_ref
         task_id = task.task_ref
         task_data = None
         task_data = None
 
 
@@ -617,7 +617,7 @@ class OrderBookerGCO(BaseBookerGCO):
         task_id = None
         task_id = None
         try:
         try:
             queue_name = f"auto.{target_routing_key}"
             queue_name = f"auto.{target_routing_key}"
-            task_data = VSCloudApi.Instance().get_vas_task_pop(queue_name)
+            task_data = CloudApi.Instance().get_vas_task_pop(queue_name)
             if not task_data:
             if not task_data:
                 return 
                 return 
             
             
@@ -629,7 +629,7 @@ class OrderBookerGCO(BaseBookerGCO):
             self.redis_client.zadd(self.m_tracker_key, {str(task_id): time.time() + 8*60.0})
             self.redis_client.zadd(self.m_tracker_key, {str(task_id): time.time() + 8*60.0})
             user_inputs = task_data.get('user_inputs', {})
             user_inputs = task_data.get('user_inputs', {})
             
             
-            plg_cfg = VSPlgConfig()
+            plg_cfg = PluginConfig()
             plg_cfg.debug = self.m_cfg.debug
             plg_cfg.debug = self.m_cfg.debug
             plg_cfg.free_config = self.m_cfg.free_config
             plg_cfg.free_config = self.m_cfg.free_config
             plg_cfg.session_max_life = self.m_cfg.session_max_life
             plg_cfg.session_max_life = self.m_cfg.session_max_life

+ 11 - 11
vs_types.py → core_types.py

@@ -63,8 +63,8 @@ class NetworkTimeoutError(BizException):
     def __init__(self, message="Network or browser timeout", extra: Optional[Dict[str, Any]] = None):
     def __init__(self, message="Network or browser timeout", extra: Optional[Dict[str, Any]] = None):
         super().__init__(code=50401, message=message, http_status=504, extra=extra)
         super().__init__(code=50401, message=message, http_status=504, extra=extra)
 
 
-# 语义别名:调度层与插件层统一使用 VSPluginError
-VSPluginError = BizException
+# 语义别名:调度层与插件层统一使用 PluginError
+PluginError = BizException
 
 
 class AvailabilityStatus(str, Enum):
 class AvailabilityStatus(str, Enum):
     NoneAvailable = "NoAvailable"
     NoneAvailable = "NoAvailable"
@@ -86,7 +86,7 @@ class PluginConfig(BaseModel):
     lib_path: str = Field(default="plugins")
     lib_path: str = Field(default="plugins")
     plugin_name: str = Field(default="")
     plugin_name: str = Field(default="")
     plugin_bin: str = Field(default="")
     plugin_bin: str = Field(default="")
-    plugin_proto: str = Field(default="IVSPlg")
+    plugin_proto: str = Field(default="IPlugin")
 
 
 class AppointmentType(BaseModel):
 class AppointmentType(BaseModel):
     weight: int = 1
     weight: int = 1
@@ -137,12 +137,12 @@ class GroupConfig(BaseModel):
     def from_json(cls, data: Dict[str, Any]) -> "GroupConfig":
     def from_json(cls, data: Dict[str, Any]) -> "GroupConfig":
         return cls.model_validate(data)
         return cls.model_validate(data)
 
 
-class VSAccount(BaseModel):
+class Account(BaseModel):
     id: int = 0
     id: int = 0
     username: str = ""
     username: str = ""
     password: str = ""
     password: str = ""
 
 
-class VSProxy(BaseModel):
+class Proxy(BaseModel):
     id: int = 0
     id: int = 0
     proto: str = "http"
     proto: str = "http"
     ip: str = ""
     ip: str = ""
@@ -154,7 +154,7 @@ class BookerStandaloneConfig(BaseModel):
     identifier: str = ""
     identifier: str = ""
     enable: bool = True
     enable: bool = True
     debug: bool = False
     debug: bool = False
-    account: VSAccount = Field(default_factory=VSAccount)
+    account: Account = Field(default_factory=Account)
     proxy_pool: List[str] = Field(default_factory=list)
     proxy_pool: List[str] = Field(default_factory=list)
     active_time_start: str = "00:00"    # 默认执行起始时间
     active_time_start: str = "00:00"    # 默认执行起始时间
     active_time_end: str = "23:59"      # 默认执行结束时间
     active_time_end: str = "23:59"      # 默认执行结束时间
@@ -171,10 +171,10 @@ class BookerStandaloneConfig(BaseModel):
     def from_json(cls, data: Dict[str, Any]) -> "BookerStandaloneConfig":
     def from_json(cls, data: Dict[str, Any]) -> "BookerStandaloneConfig":
         return cls.model_validate(data)
         return cls.model_validate(data)
 
 
-class VSPlgConfig(BaseModel):
+class PluginConfig(BaseModel):
     debug: bool = False
     debug: bool = False
-    account: VSAccount = Field(default_factory=VSAccount)
-    proxy: VSProxy = Field(default_factory=VSProxy)
+    account: Account = Field(default_factory=Account)
+    proxy: Proxy = Field(default_factory=Proxy)
     free_config: dict = Field(default_factory=dict)
     free_config: dict = Field(default_factory=dict)
     session_max_life: int = 30*60       # 单位 秒
     session_max_life: int = 30*60       # 单位 秒
 
 
@@ -186,7 +186,7 @@ class DateAvailability(BaseModel):
     date: Optional[datetime] = None
     date: Optional[datetime] = None
     times: List[TimeSlot] = Field(default_factory=list)
     times: List[TimeSlot] = Field(default_factory=list)
 
 
-class VSQueryResult(BaseModel):
+class QueryResult(BaseModel):
     success: bool = False
     success: bool = False
     apt_type: AppointmentType = Field(default_factory=AppointmentType)
     apt_type: AppointmentType = Field(default_factory=AppointmentType)
     availability_status: AvailabilityStatus = AvailabilityStatus.NoneAvailable
     availability_status: AvailabilityStatus = AvailabilityStatus.NoneAvailable
@@ -218,7 +218,7 @@ class VSQueryResult(BaseModel):
             "snapshot_at": datetime.now(timezone.utc).isoformat()
             "snapshot_at": datetime.now(timezone.utc).isoformat()
         }
         }
    
    
-class VSBookResult(BaseModel):
+class BookResult(BaseModel):
     success: bool = False
     success: bool = False
     session_id: str = ""
     session_id: str = ""
     urn: str = ""
     urn: str = ""

+ 2 - 2
gco_wrapper.py

@@ -2,8 +2,8 @@ import threading
 import collections
 import collections
 from enum import Enum, auto
 from enum import Enum, auto
 from typing import Callable, Type, Any, Dict
 from typing import Callable, Type, Any, Dict
-from vs_types import GroupConfig, GroupStatus
-from vs_log_macros import VSC_INFO
+from core_types import GroupConfig, GroupStatus
+from log_macros import VSC_INFO
 
 
 class State(Enum):
 class State(Enum):
     CREATED = auto()
     CREATED = auto()

+ 0 - 0
vs_log_macros.py → log_macros.py


+ 2 - 2
logger_setup.py

@@ -2,7 +2,7 @@ import os
 import logging
 import logging
 from logging.handlers import RotatingFileHandler
 from logging.handlers import RotatingFileHandler
 
 
-import vs_log_macros  # 导入你的宏模块
+import log_macros  # 导入你的宏模块
 
 
 def setup_app_logger(app_name: str, log_dir: str = "logs") -> logging.Logger:
 def setup_app_logger(app_name: str, log_dir: str = "logs") -> logging.Logger:
     """
     """
@@ -40,6 +40,6 @@ def setup_app_logger(app_name: str, log_dir: str = "logs") -> logging.Logger:
     # 核心:将这个专属 Logger 注入到宏!
     # 核心:将这个专属 Logger 注入到宏!
     # 这样整个系统里所有的 VSC_INFO 都会输出到你的 app_name.log 里!
     # 这样整个系统里所有的 VSC_INFO 都会输出到你的 app_name.log 里!
     # ==========================================
     # ==========================================
-    vs_log_macros.set_active_logger(logger)
+    log_macros.set_active_logger(logger)
 
 
     return logger
     return logger

+ 1 - 1
main.py

@@ -7,7 +7,7 @@ import argparse
 import threading
 import threading
 from typing import Dict, Any, List
 from typing import Dict, Any, List
 
 
-from vs_types import GroupConfig, BookerStandaloneConfig, RoleStatus, utc_now_str
+from core_types import GroupConfig, BookerStandaloneConfig, RoleStatus, utc_now_str
 from gco_wrapper import GCOWrapper
 from gco_wrapper import GCOWrapper
 from logger_setup import setup_app_logger
 from logger_setup import setup_app_logger
 import configure
 import configure

+ 4 - 4
main_sweeper.py

@@ -7,8 +7,8 @@ from typing import Dict
 
 
 from configure import REDIS_CFG
 from configure import REDIS_CFG
 from logger_setup import setup_app_logger
 from logger_setup import setup_app_logger
-from toolkit.vs_cloud_api import VSCloudApi
-from vs_types import BizException
+from toolkit.cloud_api import CloudApi
+from core_types import BizException
 
 
 
 
 class OrphanTaskSweeper:
 class OrphanTaskSweeper:
@@ -80,7 +80,7 @@ class OrphanTaskSweeper:
         try:
         try:
             task_data = None
             task_data = None
             try:
             try:
-                task_data = VSCloudApi.Instance().get_vas_task(str(task_id))
+                task_data = CloudApi.Instance().get_vas_task(str(task_id))
             except BizException as be:
             except BizException as be:
                 if be.code == 40401 or "not found" in be.message.lower():
                 if be.code == 40401 or "not found" in be.message.lower():
                     self.logger.info(f"Task={task_id} not found in cloud. Removing from local tracker.")
                     self.logger.info(f"Task={task_id} not found in cloud. Removing from local tracker.")
@@ -101,7 +101,7 @@ class OrphanTaskSweeper:
 
 
             # 云端状态还是 processing,证明 Worker 真的死机了,强制归还
             # 云端状态还是 processing,证明 Worker 真的死机了,强制归还
             self.logger.info(f"Returning dead task={task_id} to queue.")
             self.logger.info(f"Returning dead task={task_id} to queue.")
-            VSCloudApi.Instance().return_vas_task_to_queue(task_id)
+            CloudApi.Instance().return_vas_task_to_queue(task_id)
             
             
             self.redis_client.zrem(tracker_key, task_id)
             self.redis_client.zrem(tracker_key, task_id)
             self.logger.info(f"✅ Dead task={task_id} successfully rescued and returned.")
             self.logger.info(f"✅ Dead task={task_id} successfully rescued and returned.")

+ 8 - 8
vs_plg.py → plugin.py

@@ -1,10 +1,10 @@
-# vs_plg.py
+# plugin.py
 from typing import Callable, List, Dict
 from typing import Callable, List, Dict
 from abc import ABC, abstractmethod
 from abc import ABC, abstractmethod
-from vs_types import VSPlgConfig, AppointmentType, VSQueryResult, VSBookResult, PluginStatus
+from core_types import PluginConfig, AppointmentType, QueryResult, BookResult, PluginStatus
 
 
 # ================== 接口类 ==================
 # ================== 接口类 ==================
-class IVSPlg(ABC):
+class IPlugin(ABC):
     """
     """
     @brief 签证 API 接口类
     @brief 签证 API 接口类
     该接口定义了签证系统的基本操作,包括配置、会话管理、查询、预订、
     该接口定义了签证系统的基本操作,包括配置、会话管理、查询、预订、
@@ -26,7 +26,7 @@ class IVSPlg(ABC):
         }
         }
     
     
     @abstractmethod
     @abstractmethod
-    def set_config(self, config: VSPlgConfig):
+    def set_config(self, config: PluginConfig):
         """
         """
         @brief 设置 API 的配置信息
         @brief 设置 API 的配置信息
         @param config 签证 API 配置对象
         @param config 签证 API 配置对象
@@ -48,20 +48,20 @@ class IVSPlg(ABC):
         pass
         pass
 
 
     @abstractmethod
     @abstractmethod
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
+    def query(self, apt_type: AppointmentType) -> QueryResult:
         """
         """
         @brief 查询可用的签证预约信息, 抛异常则查询失败
         @brief 查询可用的签证预约信息, 抛异常则查询失败
-        @return VSQueryResult 查询结果
+        @return QueryResult 查询结果
         """
         """
         pass
         pass
 
 
     @abstractmethod
     @abstractmethod
-    def book(self, slot_info: VSQueryResult, user_inputs) -> VSBookResult:
+    def book(self, slot_info: QueryResult, user_inputs) -> BookResult:
         """
         """
         @brief 进行预约操作, 抛异常则预定失败
         @brief 进行预约操作, 抛异常则预定失败
         @param slot_info 查询得到的可用时段信息
         @param slot_info 查询得到的可用时段信息
         @param user_inputs 用户输入的预约信息
         @param user_inputs 用户输入的预约信息
-        @return VSBookResult 预约结果
+        @return BookResult 预约结果
         """
         """
         pass
         pass
     
     

+ 11 - 11
vs_plg_factory.py → plugin_factory.py

@@ -1,14 +1,14 @@
-# vs_plg_factory.py
+# plugin_factory.py
 import importlib.util
 import importlib.util
 import sys
 import sys
 import os
 import os
-from vs_plg import IVSPlg
-from vs_log_macros import VSC_ERROR, VSC_INFO
+from plugin import IPlugin
+from log_macros import VSC_ERROR, VSC_INFO
 
 
-class VSPlgFactory:
+class PluginFactory:
     """
     """
     @brief 签证插件工厂类
     @brief 签证插件工厂类
-    负责动态加载和创建 IVSPlg 接口的实现实例。
+    负责动态加载和创建 IPlugin 接口的实现实例。
     """
     """
     def __init__(self):
     def __init__(self):
         self._registered_plugins = {} # {plugin_name: (module_name, class_name)}
         self._registered_plugins = {} # {plugin_name: (module_name, class_name)}
@@ -23,12 +23,12 @@ class VSPlgFactory:
         self._registered_plugins[plugin_name] = (module_path, class_name)
         self._registered_plugins[plugin_name] = (module_path, class_name)
         VSC_INFO("factory", "Registered plugin '%s' from '%s' class '%s'", plugin_name, module_path, class_name)
         VSC_INFO("factory", "Registered plugin '%s' from '%s' class '%s'", plugin_name, module_path, class_name)
 
 
-    def create(self, group_id: str, plugin_name: str) -> IVSPlg:
+    def create(self, group_id: str, plugin_name: str) -> IPlugin:
         """
         """
-        @brief 创建一个 IVSPlg 实例
+        @brief 创建一个 IPlugin 实例
         @param group_id 实例所属的分组 ID
         @param group_id 实例所属的分组 ID
         @param plugin_name 要创建的插件的注册名称
         @param plugin_name 要创建的插件的注册名称
-        @return IVSPlg 实例
+        @return IPlugin 实例
         """
         """
         if plugin_name not in self._registered_plugins:
         if plugin_name not in self._registered_plugins:
             VSC_ERROR("factory", "Plugin '%s' not registered.", plugin_name)
             VSC_ERROR("factory", "Plugin '%s' not registered.", plugin_name)
@@ -51,9 +51,9 @@ class VSPlgFactory:
             plugin_class = getattr(module, class_name)
             plugin_class = getattr(module, class_name)
             instance = plugin_class(group_id)
             instance = plugin_class(group_id)
             
             
-            if not isinstance(instance, IVSPlg):
-                VSC_ERROR("factory", "Created instance for '%s' is not an IVSPlg.", plugin_name)
-                raise TypeError(f"Plugin '{plugin_name}' class '{class_name}' does not implement IVSPlg.")
+            if not isinstance(instance, IPlugin):
+                VSC_ERROR("factory", "Created instance for '%s' is not an IPlugin.", plugin_name)
+                raise TypeError(f"Plugin '{plugin_name}' class '{class_name}' does not implement IPlugin.")
             
             
             VSC_INFO("factory", "Successfully created instance for group '%s' with plugin '%s'", group_id, plugin_name)
             VSC_INFO("factory", "Successfully created instance for group '%s' with plugin '%s'", group_id, plugin_name)
             return instance
             return instance

+ 12 - 12
plugins/bel_plugin.py

@@ -8,12 +8,12 @@ from datetime import datetime
 from typing import List, Dict, Optional, Any, Callable
 from typing import List, Dict, Optional, Any, Callable
 from DrissionPage import ChromiumPage
 from DrissionPage import ChromiumPage
 
 
-from vs_plg import IVSPlg
-from vs_types import (
-    VSPlgConfig, 
+from plugin import IPlugin
+from core_types import (
+    PluginConfig, 
     AppointmentType, 
     AppointmentType, 
-    VSQueryResult, 
-    VSBookResult, 
+    QueryResult, 
+    BookResult, 
     AvailabilityStatus, 
     AvailabilityStatus, 
     TimeSlot, 
     TimeSlot, 
     DateAvailability, 
     DateAvailability, 
@@ -35,7 +35,7 @@ from utils.plugin_utils import (
 )
 )
 
 
 
 
-class BelPlugin(IVSPlg):
+class BelPlugin(IPlugin):
     """
     """
     Belgium (https://visaonweb.diplomatie.be/en) 签证预约插件 (Browser + Tunnel Mode)
     Belgium (https://visaonweb.diplomatie.be/en) 签证预约插件 (Browser + Tunnel Mode)
     """
     """
@@ -45,7 +45,7 @@ class BelPlugin(IVSPlg):
 
 
     def __init__(self, group_id: str):
     def __init__(self, group_id: str):
         self.group_id = group_id
         self.group_id = group_id
-        self.config: Optional[VSPlgConfig] = None
+        self.config: Optional[PluginConfig] = None
         self.free_config: Dict[str, Any] = {}
         self.free_config: Dict[str, Any] = {}
         self.logger = None
         self.logger = None
         
         
@@ -75,7 +75,7 @@ class BelPlugin(IVSPlg):
         else:
         else:
             print(f'[BelPlugin] [{self.group_id}] [{self.instance_id}] {message}')
             print(f'[BelPlugin] [{self.group_id}] [{self.instance_id}] {message}')
         
         
-    def set_config(self, config: VSPlgConfig):
+    def set_config(self, config: PluginConfig):
         self.config = config
         self.config = config
         self.free_config = config.free_config or {}
         self.free_config = config.free_config or {}
             
             
@@ -149,8 +149,8 @@ class BelPlugin(IVSPlg):
             self.cleanup()
             self.cleanup()
             raise e
             raise e
 
 
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
-        res = VSQueryResult()
+    def query(self, apt_type: AppointmentType) -> QueryResult:
+        res = QueryResult()
         res.success = False
         res.success = False
 
 
         if not self.applicants:
         if not self.applicants:
@@ -267,8 +267,8 @@ class BelPlugin(IVSPlg):
             logger=self._log
             logger=self._log
         )
         )
 
 
-    def book(self, slot_info: VSQueryResult, user_inputs: Dict = None) -> VSBookResult:
-        res = VSBookResult()
+    def book(self, slot_info: QueryResult, user_inputs: Dict = None) -> BookResult:
+        res = BookResult()
         return res
         return res
     
     
     def _perform_request(self, method, url, headers=None, data=None, json_data=None, params=None, retry_count=0):
     def _perform_request(self, method, url, headers=None, data=None, json_data=None, params=None, retry_count=0):

+ 13 - 13
plugins/bls_plugin.py

@@ -22,12 +22,12 @@ from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.backends import default_backend
 
 
 # 框架依赖
 # 框架依赖
-from vs_plg import IVSPlg 
-from vs_types import VSPlgConfig, AppointmentType, VSQueryResult, VSBookResult, DateAvailability, TimeSlot, AvailabilityStatus, NotFoundError, PermissionDeniedError, RateLimiteddError, SessionExpiredOrInvalidError, BizLogicError, PluginStatus, utc_now_str
-from toolkit.vs_cloud_api import VSCloudApi
+from plugin import IPlugin 
+from core_types import PluginConfig, AppointmentType, QueryResult, BookResult, DateAvailability, TimeSlot, AvailabilityStatus, NotFoundError, PermissionDeniedError, RateLimiteddError, SessionExpiredOrInvalidError, BizLogicError, PluginStatus, utc_now_str
+from toolkit.cloud_api import CloudApi
 from toolkit.ocr_engine import PyTorchEngine
 from toolkit.ocr_engine import PyTorchEngine
 
 
-class BlsPlugin(IVSPlg):
+class BlsPlugin(IPlugin):
     """
     """
     BLS 签证预约插件 (精简版)
     BLS 签证预约插件 (精简版)
     """
     """
@@ -37,7 +37,7 @@ class BlsPlugin(IVSPlg):
 
 
     def __init__(self, group_id: str):
     def __init__(self, group_id: str):
         self.group_id = group_id
         self.group_id = group_id
-        self.config: Optional[VSPlgConfig] = None
+        self.config: Optional[PluginConfig] = None
         self.free_config: Dict[str, Any] = {}
         self.free_config: Dict[str, Any] = {}
         self.logger = None
         self.logger = None
         
         
@@ -73,7 +73,7 @@ class BlsPlugin(IVSPlg):
         else:
         else:
             print(f'[BlsPlugin] [{self.group_id}] {message}')
             print(f'[BlsPlugin] [{self.group_id}] {message}')
 
 
-    def set_config(self, config: VSPlgConfig):
+    def set_config(self, config: PluginConfig):
         self.config = config
         self.config = config
         self.free_config = config.free_config or {}
         self.free_config = config.free_config or {}
         # 从配置中读取 OCR 服务地址,如果没有则使用默认
         # 从配置中读取 OCR 服务地址,如果没有则使用默认
@@ -200,8 +200,8 @@ class BlsPlugin(IVSPlg):
     # =========================================================================
     # =========================================================================
     # 2. 查询流程 (Query)
     # 2. 查询流程 (Query)
     # =========================================================================
     # =========================================================================
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
-        res = VSQueryResult()        
+    def query(self, apt_type: AppointmentType) -> QueryResult:
+        res = QueryResult()        
         apt_config = self.free_config.get("apt_configs", {}).get(apt_type.routing_key)
         apt_config = self.free_config.get("apt_configs", {}).get(apt_type.routing_key)
         domain = self.free_config.get("domain")
         domain = self.free_config.get("domain")
 
 
@@ -286,8 +286,8 @@ class BlsPlugin(IVSPlg):
                 
                 
         raise BizLogicError(message='Query page not found required field [var availDates]')
         raise BizLogicError(message='Query page not found required field [var availDates]')
 
 
-    def book(self, slot_info: VSQueryResult, user_inputs: Dict) -> VSBookResult:
-        res = VSBookResult()
+    def book(self, slot_info: QueryResult, user_inputs: Dict) -> BookResult:
+        res = BookResult()
         domain = self.free_config.get("domain")
         domain = self.free_config.get("domain")
         
         
         # 3.1 获取 Manage Page (为了 Token 和 JS 变量)
         # 3.1 获取 Manage Page (为了 Token 和 JS 变量)
@@ -962,7 +962,7 @@ class BlsPlugin(IVSPlg):
             
             
             # 调用云端接口获取邮件内容
             # 调用云端接口获取邮件内容
             # expiry=300 表示邮件有效搜索窗口为 5 分钟
             # expiry=300 表示邮件有效搜索窗口为 5 分钟
-            content_out = VSCloudApi.Instance().fetch_mail_content(
+            content_out = CloudApi.Instance().fetch_mail_content(
                 master_email,
                 master_email,
                 sender,
                 sender,
                 recipient,
                 recipient,
@@ -1016,7 +1016,7 @@ class BlsPlugin(IVSPlg):
     
     
     def _save_http_session(self, page_url):
     def _save_http_session(self, page_url):
         """
         """
-        提取 cookies, local_storage, 存入 VSCloudApi
+        提取 cookies, local_storage, 存入 CloudApi
         """
         """
         cookies_dict = {}
         cookies_dict = {}
         get_dict_fn = getattr(self.session.cookies, "get_dict", None)
         get_dict_fn = getattr(self.session.cookies, "get_dict", None)
@@ -1044,7 +1044,7 @@ class BlsPlugin(IVSPlg):
             proxy_str += f"{self.config.proxy.username}:{self.config.proxy.password}@"
             proxy_str += f"{self.config.proxy.username}:{self.config.proxy.password}@"
         proxy_str += f"{self.config.proxy.ip}:{self.config.proxy.port}"
         proxy_str += f"{self.config.proxy.ip}:{self.config.proxy.port}"
         
         
-        return VSCloudApi.Instance().create_http_session(
+        return CloudApi.Instance().create_http_session(
             sid, cookies_str, "", ua_str, proxy_str, page_url
             sid, cookies_str, "", ua_str, proxy_str, page_url
         )
         )
         
         

+ 16 - 16
plugins/de_plugin.py

@@ -9,12 +9,12 @@ from datetime import datetime, timezone
 from typing import List, Dict, Optional, Any, Callable
 from typing import List, Dict, Optional, Any, Callable
 from DrissionPage import ChromiumPage
 from DrissionPage import ChromiumPage
 
 
-from vs_plg import IVSPlg
-from vs_types import (
-    VSPlgConfig, 
+from plugin import IPlugin
+from core_types import (
+    PluginConfig, 
     AppointmentType, 
     AppointmentType, 
-    VSQueryResult, 
-    VSBookResult, 
+    QueryResult, 
+    BookResult, 
     AvailabilityStatus, 
     AvailabilityStatus, 
     TimeSlot, 
     TimeSlot, 
     DateAvailability, 
     DateAvailability, 
@@ -26,7 +26,7 @@ from vs_types import (
     PluginStatus, 
     PluginStatus, 
     utc_now_str
     utc_now_str
 )
 )
-from toolkit.vs_cloud_api import VSCloudApi
+from toolkit.cloud_api import CloudApi
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
 from toolkit.ocr_engine import DddOcrEngine
 from toolkit.ocr_engine import DddOcrEngine
 from utils.plugin_utils import (
 from utils.plugin_utils import (
@@ -45,7 +45,7 @@ def get_alias_email(email: str, new_domain: str = "text.skin") -> str:
     return f"{local_part}@{new_domain}"
     return f"{local_part}@{new_domain}"
 
 
 
 
-class DePlugin(IVSPlg):
+class DePlugin(IPlugin):
     """
     """
     Germany (Visametric) 签证预约插件 (Browser + Tunnel Mode)
     Germany (Visametric) 签证预约插件 (Browser + Tunnel Mode)
     兼容有日历选时模式 (calendarType != 0) 与无日历排队等候模式 (calendarType == 0)
     兼容有日历选时模式 (calendarType != 0) 与无日历排队等候模式 (calendarType == 0)
@@ -56,7 +56,7 @@ class DePlugin(IVSPlg):
 
 
     def __init__(self, group_id: str):
     def __init__(self, group_id: str):
         self.group_id = group_id
         self.group_id = group_id
-        self.config: Optional[VSPlgConfig] = None
+        self.config: Optional[PluginConfig] = None
         self.free_config: Dict[str, Any] = {}
         self.free_config: Dict[str, Any] = {}
         self.logger = None
         self.logger = None
         
         
@@ -110,7 +110,7 @@ class DePlugin(IVSPlg):
         else:
         else:
             print(f'[DePlugin] [{self.group_id}] [{self.instance_id}] {message}')
             print(f'[DePlugin] [{self.group_id}] [{self.instance_id}] {message}')
         
         
-    def set_config(self, config: VSPlgConfig):
+    def set_config(self, config: PluginConfig):
         self.config = config
         self.config = config
         self.free_config = config.free_config or {}
         self.free_config = config.free_config or {}
         if self.free_config.get("base_url"):
         if self.free_config.get("base_url"):
@@ -361,8 +361,8 @@ class DePlugin(IVSPlg):
         self._log(f"[6/6] Service packages checked (status {resp.status_code})")
         self._log(f"[6/6] Service packages checked (status {resp.status_code})")
         self._log("Pre-validation controls completed successfully.")
         self._log("Pre-validation controls completed successfully.")
 
 
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
-        res = VSQueryResult()
+    def query(self, apt_type: AppointmentType) -> QueryResult:
+        res = QueryResult()
         res.success = False
         res.success = False
         
         
         cal_status = self._get_calendar_status()
         cal_status = self._get_calendar_status()
@@ -419,8 +419,8 @@ class DePlugin(IVSPlg):
 
 
         return res
         return res
 
 
-    def book(self, slot_info: VSQueryResult, user_inputs: Dict = None) -> VSBookResult:
-        res = VSBookResult()
+    def book(self, slot_info: QueryResult, user_inputs: Dict = None) -> BookResult:
+        res = BookResult()
         user_inputs = user_inputs or {}
         user_inputs = user_inputs or {}
         
         
         # 1. 动态检测日历模式
         # 1. 动态检测日历模式
@@ -594,7 +594,7 @@ class DePlugin(IVSPlg):
         """快速查看当前邮箱里已有的旧验证码,用于发码后比对排除旧邮件"""
         """快速查看当前邮箱里已有的旧验证码,用于发码后比对排除旧邮件"""
         try:
         try:
             master_email = self.master_email if self.use_alias_email else recipient
             master_email = self.master_email if self.use_alias_email else recipient
-            c = VSCloudApi.Instance().fetch_mail_content_from_top(
+            c = CloudApi.Instance().fetch_mail_content_from_top(
                 email=master_email,
                 email=master_email,
                 sender="Visametric",
                 sender="Visametric",
                 recipient=recipient,
                 recipient=recipient,
@@ -625,7 +625,7 @@ class DePlugin(IVSPlg):
                 # 策略 1: 优先尝试带精准 sentDate(UTC) 时间戳过滤的 fetch 接口
                 # 策略 1: 优先尝试带精准 sentDate(UTC) 时间戳过滤的 fetch 接口
                 c = None
                 c = None
                 try:
                 try:
-                    c = VSCloudApi.Instance().fetch_mail_content(
+                    c = CloudApi.Instance().fetch_mail_content(
                         email=master_email,
                         email=master_email,
                         sender=sender,
                         sender=sender,
                         recipient=recipient,
                         recipient=recipient,
@@ -639,7 +639,7 @@ class DePlugin(IVSPlg):
 
 
                 # 策略 2: 若 fetch 未立即返回,尝试 fetch-top
                 # 策略 2: 若 fetch 未立即返回,尝试 fetch-top
                 if not c:
                 if not c:
-                    c = VSCloudApi.Instance().fetch_mail_content_from_top(
+                    c = CloudApi.Instance().fetch_mail_content_from_top(
                         email=master_email,
                         email=master_email,
                         sender=sender,
                         sender=sender,
                         recipient=recipient,
                         recipient=recipient,

+ 43 - 21
plugins/grc_plugin.py

@@ -6,12 +6,12 @@ import os
 from datetime import datetime, timezone, timedelta
 from datetime import datetime, timezone, timedelta
 from typing import List, Dict, Any, Callable, Optional, Set, Tuple
 from typing import List, Dict, Any, Callable, Optional, Set, Tuple
 from curl_cffi import requests, const
 from curl_cffi import requests, const
-from vs_plg import IVSPlg
-from vs_types import (
-    VSPlgConfig,
+from plugin import IPlugin
+from core_types import (
+    PluginConfig,
     AppointmentType,
     AppointmentType,
-    VSQueryResult,
-    VSBookResult,
+    QueryResult,
+    BookResult,
     DateAvailability,
     DateAvailability,
     AvailabilityStatus,
     AvailabilityStatus,
     NotFoundError,
     NotFoundError,
@@ -20,6 +20,7 @@ from vs_types import (
     SessionExpiredOrInvalidError,
     SessionExpiredOrInvalidError,
     BizLogicError,
     BizLogicError,
     PluginStatus,
     PluginStatus,
+    TimeSlot,
     utc_now_str
     utc_now_str
 )
 )
 
 
@@ -32,7 +33,7 @@ MODERN_BROWSERS: List[str] = [
     "firefox",
     "firefox",
 ]
 ]
 
 
-class GrcPlugin(IVSPlg):
+class GrcPlugin(IPlugin):
     """
     """
     https://www.supersaas.com/schedule/login/GreekEmbassyInDublin/Visas
     https://www.supersaas.com/schedule/login/GreekEmbassyInDublin/Visas
     签证预约插件
     签证预约插件
@@ -44,7 +45,7 @@ class GrcPlugin(IVSPlg):
 
 
     def __init__(self, group_id: str):
     def __init__(self, group_id: str):
         self.group_id = group_id
         self.group_id = group_id
-        self.config: Optional[VSPlgConfig] = None
+        self.config: Optional[PluginConfig] = None
         self.free_config: Dict[str, Any] = {}
         self.free_config: Dict[str, Any] = {}
         self.is_healthy = True
         self.is_healthy = True
         self.logger = None
         self.logger = None
@@ -57,7 +58,7 @@ class GrcPlugin(IVSPlg):
     def set_log(self, logger: Callable[[str], None]) -> None:
     def set_log(self, logger: Callable[[str], None]) -> None:
         self.logger = logger
         self.logger = logger
 
 
-    def set_config(self, config: VSPlgConfig):
+    def set_config(self, config: PluginConfig):
         self.config = config
         self.config = config
         self.free_config = config.free_config or {}
         self.free_config = config.free_config or {}
         
         
@@ -77,23 +78,29 @@ class GrcPlugin(IVSPlg):
                 return False
                 return False
         return True
         return True
 
 
-    def create_session(self):   
+    def _init_session(self, existing_cookies=None) -> requests.Session:
         curlopt = {
         curlopt = {
             const.CurlOpt.MAXAGE_CONN: 1800,
             const.CurlOpt.MAXAGE_CONN: 1800,
             const.CurlOpt.MAXLIFETIME_CONN: 1800,
             const.CurlOpt.MAXLIFETIME_CONN: 1800,
-            const.CurlOpt.VERBOSE: self.config.debug,
+            const.CurlOpt.VERBOSE: self.config.debug if self.config else False,
         }
         }
-        
-        chosen_browser = random.choice(MODERN_BROWSERS)
-        self._log(f"Using browser fingerprint: {chosen_browser}")
+        if not getattr(self, "fingerprint", None):
+            self.fingerprint = random.choice(MODERN_BROWSERS)
+            self._log(f"Using browser fingerprint: {self.fingerprint}")
 
 
-        self.session = requests.Session(
+        s = requests.Session(
             proxy=self._get_proxy_url(),
             proxy=self._get_proxy_url(),
-            impersonate=chosen_browser,
+            impersonate=self.fingerprint,
             curl_options=curlopt,
             curl_options=curlopt,
             use_thread_local_curl=False,
             use_thread_local_curl=False,
             http_version=const.CurlHttpVersion.V2TLS
             http_version=const.CurlHttpVersion.V2TLS
         )
         )
+        if existing_cookies:
+            s.cookies.update(existing_cookies)
+        return s
+
+    def create_session(self):   
+        self.session = self._init_session()
 
 
         login_url = "https://www.supersaas.com/schedule/login/GreekEmbassyInDublin/Visas"
         login_url = "https://www.supersaas.com/schedule/login/GreekEmbassyInDublin/Visas"
         self._perform_request("GET", login_url)
         self._perform_request("GET", login_url)
@@ -211,8 +218,8 @@ class GrcPlugin(IVSPlg):
         resp = self._perform_request("GET", url, params=params, headers=headers)
         resp = self._perform_request("GET", url, params=params, headers=headers)
         return resp.json()
         return resp.json()
 
 
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
-        res = VSQueryResult()
+    def query(self, apt_type: AppointmentType) -> QueryResult:
+        res = QueryResult()
         res.success = False
         res.success = False
         
         
         url = "https://www.supersaas.com/schedule/GreekEmbassyInDublin/Visas"
         url = "https://www.supersaas.com/schedule/GreekEmbassyInDublin/Visas"
@@ -414,11 +421,11 @@ class GrcPlugin(IVSPlg):
             
             
         return res
         return res
 
 
-    def book(self, slot_info: VSQueryResult, user_inputs: Dict = None) -> VSBookResult:
+    def book(self, slot_info: QueryResult, user_inputs: Dict = None) -> BookResult:
         if user_inputs is None:
         if user_inputs is None:
             user_inputs = {}
             user_inputs = {}
             
             
-        res = VSBookResult()
+        res = BookResult()
         res.success = False
         res.success = False
 
 
         # 重新登录一次,避免session expired
         # 重新登录一次,避免session expired
@@ -617,8 +624,23 @@ class GrcPlugin(IVSPlg):
                 proxy_url = f"{s.proto}://{s.ip}:{s.port}"
                 proxy_url = f"{s.proto}://{s.ip}:{s.port}"
         return proxy_url
         return proxy_url
     
     
-    def _perform_request(self, method, url, headers=None, data=None, json_data=None, params=None):
-        resp = self.session.request(method, url, headers=headers, data=data, json=json_data, params=params, timeout=30)
+    def _perform_request(self, method, url, headers=None, data=None, json_data=None, params=None, retry_count=0):
+        try:
+            resp = self.session.request(method, url, headers=headers, data=data, json=json_data, params=params, timeout=30)
+        except Exception as e:
+            if retry_count < 2:
+                self._log(f"⚠️ [Network/TLS Error] {str(e)[:120]}. Reconnecting transport socket (Try {retry_count+1}/2)...")
+                time.sleep(1.0)
+                old_cookies = None
+                try:
+                    if self.session:
+                        old_cookies = self.session.cookies
+                        self.session.close()
+                except Exception:
+                    pass
+                self.session = self._init_session(existing_cookies=old_cookies)
+                return self._perform_request(method, url, headers=headers, data=data, json_data=json_data, params=params, retry_count=retry_count+1)
+            raise e
         if self.config.debug:
         if self.config.debug:
             self._log(f'[perform request] Response={resp.text[:200]}...\nMethod={method}, Url={url}, Data={data}, JsonData={json_data}, Params={params}')
             self._log(f'[perform request] Response={resp.text[:200]}...\nMethod={method}, Url={url}, Data={data}, JsonData={json_data}, Params={params}')
         if resp.status_code == 200:
         if resp.status_code == 200:

+ 15 - 15
plugins/ita_plugin.py

@@ -18,13 +18,13 @@ from urllib.parse import urljoin, urlparse
 
 
 from DrissionPage import ChromiumPage
 from DrissionPage import ChromiumPage
 from DrissionPage.errors import ElementNotFoundError, PageDisconnectedError
 from DrissionPage.errors import ElementNotFoundError, PageDisconnectedError
-from vs_plg import IVSPlg
-from vs_types import (
+from plugin import IPlugin
+from core_types import (
     AvailabilityStatus, BizLogicError, NotFoundError,
     AvailabilityStatus, BizLogicError, NotFoundError,
     DateAvailability, PermissionDeniedError, PluginStatus, RateLimiteddError,
     DateAvailability, PermissionDeniedError, PluginStatus, RateLimiteddError,
-    SessionExpiredOrInvalidError, VSBookResult, VSQueryResult, utc_now_str,
+    SessionExpiredOrInvalidError, BookResult, QueryResult, utc_now_str,
 )
 )
-from toolkit.vs_cloud_api import VSCloudApi
+from toolkit.cloud_api import CloudApi
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
 from utils.flow_engine import BaseFlow, done, guard, on
 from utils.flow_engine import BaseFlow, done, guard, on
 from utils.mouse import HumanMouse
 from utils.mouse import HumanMouse
@@ -557,7 +557,7 @@ FINAL_PATH = "/BookingCalendar/InsertNewBooking"
 FINAL_ACCEPTED_LABEL = "italy-final-accepted"
 FINAL_ACCEPTED_LABEL = "italy-final-accepted"
 
 
 
 
-def _submit_final_once(plugin, route: ItaRouteConfig, slot: SlotCandidate) -> VSBookResult:
+def _submit_final_once(plugin, route: ItaRouteConfig, slot: SlotCandidate) -> BookResult:
     result = None
     result = None
     try:
     try:
         page = plugin.page
         page = plugin.page
@@ -582,7 +582,7 @@ def _submit_final_once(plugin, route: ItaRouteConfig, slot: SlotCandidate) -> VS
         path = same_origin_path(urljoin("https://prenotami.esteri.it", destination.strip()))
         path = same_origin_path(urljoin("https://prenotami.esteri.it", destination.strip()))
         if not re.fullmatch(r"/Reservation/?|/ReservationDetail/Index/[^/]+/?", path):
         if not re.fullmatch(r"/Reservation/?|/ReservationDetail/Index/[^/]+/?", path):
             raise BizLogicError("Italy final response did not lead to a receipt")
             raise BizLogicError("Italy final response did not lead to a receipt")
-        result = VSBookResult(success=True, account=username, label=FINAL_ACCEPTED_LABEL,
+        result = BookResult(success=True, account=username, label=FINAL_ACCEPTED_LABEL,
                               book_date=slot.day.isoformat(), book_time=slot.time_label)
                               book_date=slot.day.isoformat(), book_time=slot.time_label)
         return result
         return result
     finally:
     finally:
@@ -704,7 +704,7 @@ def validate_cloud_otp_environment(mail_config, recipient):
 
 
 def fetch_otp_from_cloud(mail_config, *, recipient, sent_at, api=None):
 def fetch_otp_from_cloud(mail_config, *, recipient, sent_at, api=None):
     try:
     try:
-        body = (api or VSCloudApi.Instance()).fetch_mail_content(
+        body = (api or CloudApi.Instance()).fetch_mail_content(
             email=mail_config.mailbox_for(recipient), sender=PRENOTAMI_OTP_SENDER, recipient=recipient,
             email=mail_config.mailbox_for(recipient), sender=PRENOTAMI_OTP_SENDER, recipient=recipient,
             subject_keywords="OTP Code", body_keywords="OTP Code:",
             subject_keywords="OTP Code", body_keywords="OTP Code:",
             sent_date=sent_at, expiry=mail_config.expiry_seconds, only_text=True,
             sent_date=sent_at, expiry=mail_config.expiry_seconds, only_text=True,
@@ -873,7 +873,7 @@ class ItaLoginFlow(BaseFlow):
         self.plugin._random_sleep(5, 7)
         self.plugin._random_sleep(5, 7)
 
 
 
 
-class ItaPlugin(IVSPlg):
+class ItaPlugin(IPlugin):
     name = "ita_plugin"
     name = "ita_plugin"
     version = "1.0.3"
     version = "1.0.3"
     description = "意大利 Prenot@Mi 查询与预约插件"
     description = "意大利 Prenot@Mi 查询与预约插件"
@@ -1024,7 +1024,7 @@ class ItaPlugin(IVSPlg):
             route = self._resolve_route(apt_type)
             route = self._resolve_route(apt_type)
             if self._prepared_calendar is None or same_origin_path(self.page.url) != CALENDAR_PATH:
             if self._prepared_calendar is None or same_origin_path(self.page.url) != CALENDAR_PATH:
                 if not self._enter_service(route):
                 if not self._enter_service(route):
-                    return VSQueryResult(success=False, apt_type=apt_type,
+                    return QueryResult(success=False, apt_type=apt_type,
                                          availability_status=AvailabilityStatus.NoneAvailable)
                                          availability_status=AvailabilityStatus.NoneAvailable)
                 self._prepared_calendar = None
                 self._prepared_calendar = None
                 prepare_calendar(self, route, role="query")
                 prepare_calendar(self, route, role="query")
@@ -1035,12 +1035,12 @@ class ItaPlugin(IVSPlg):
             probes = scan_until_first_available_month(self, route)
             probes = scan_until_first_available_month(self, route)
             available = next((days for days in probes if days), ())
             available = next((days for days in probes if days), ())
             if not available:
             if not available:
-                return VSQueryResult(
+                return QueryResult(
                     success=False, apt_type=apt_type,
                     success=False, apt_type=apt_type,
                     availability_status=AvailabilityStatus.NoneAvailable)
                     availability_status=AvailabilityStatus.NoneAvailable)
             earliest = datetime.combine(available[0].day, datetime.min.time())
             earliest = datetime.combine(available[0].day, datetime.min.time())
             self._log(f"Italy Calendar earliest_date={earliest.date().isoformat()}")
             self._log(f"Italy Calendar earliest_date={earliest.date().isoformat()}")
-            return VSQueryResult(
+            return QueryResult(
                 success=True, apt_type=apt_type,
                 success=True, apt_type=apt_type,
                 availability_status=AvailabilityStatus.Available,
                 availability_status=AvailabilityStatus.Available,
                 earliest_date=earliest,
                 earliest_date=earliest,
@@ -1081,7 +1081,7 @@ class ItaPlugin(IVSPlg):
 
 
     def book(self, slot_info, user_inputs=None):
     def book(self, slot_info, user_inputs=None):
         try:
         try:
-            if not self.page or not isinstance(slot_info, VSQueryResult):
+            if not self.page or not isinstance(slot_info, QueryResult):
                 raise BizLogicError("Italy Book requires a Query signal")
                 raise BizLogicError("Italy Book requires a Query signal")
             route = self._resolve_route(slot_info.apt_type)
             route = self._resolve_route(slot_info.apt_type)
             inputs = user_inputs if isinstance(user_inputs, Mapping) else {}
             inputs = user_inputs if isinstance(user_inputs, Mapping) else {}
@@ -1093,7 +1093,7 @@ class ItaPlugin(IVSPlg):
                     self._require_calendar_context(route, role="query", username=username), role="book")
                     self._require_calendar_context(route, role="query", username=username), role="book")
             if self._prepared_calendar is None:
             if self._prepared_calendar is None:
                 if not self._enter_service(route):
                 if not self._enter_service(route):
-                    return VSBookResult(success=False, label=BOOKING_RECHECK_NONE_AVAILABLE_LABEL)
+                    return BookResult(success=False, label=BOOKING_RECHECK_NONE_AVAILABLE_LABEL)
                 prepare_calendar(self, route, role="book")
                 prepare_calendar(self, route, role="book")
             start, end = book_date_preferences(inputs)
             start, end = book_date_preferences(inputs)
             slot = recheck_calendar_before_final(
             slot = recheck_calendar_before_final(
@@ -1102,11 +1102,11 @@ class ItaPlugin(IVSPlg):
                     route, role="book", username=username),
                     route, role="book", username=username),
             )
             )
             if not slot:
             if not slot:
-                return VSBookResult(success=False, label=BOOKING_RECHECK_NONE_AVAILABLE_LABEL)
+                return BookResult(success=False, label=BOOKING_RECHECK_NONE_AVAILABLE_LABEL)
             self._log(f"Italy Book selected {slot.day} {slot.time_label}")
             self._log(f"Italy Book selected {slot.day} {slot.time_label}")
             if self.free_config.get("final_submit_enabled") is True:
             if self.free_config.get("final_submit_enabled") is True:
                 return _submit_final_once(self, route, slot)
                 return _submit_final_once(self, route, slot)
-            return VSBookResult(success=False, label=BOOKING_CALENDAR_PREFINAL_STOP_LABEL)
+            return BookResult(success=False, label=BOOKING_CALENDAR_PREFINAL_STOP_LABEL)
         except PageDisconnectedError as exc:
         except PageDisconnectedError as exc:
             raise SessionExpiredOrInvalidError("Italy browser disconnected during Book") from exc
             raise SessionExpiredOrInvalidError("Italy browser disconnected during Book") from exc
         except ElementNotFoundError as exc:
         except ElementNotFoundError as exc:

+ 14 - 14
plugins/pol_plugin.py

@@ -10,12 +10,12 @@ from typing import List, Dict, Optional, Any, Callable
 import requests
 import requests
 
 
 from toolkit.captcha_breaker import CaptchaBreaker, CaptchaBreakerError
 from toolkit.captcha_breaker import CaptchaBreaker, CaptchaBreakerError
-from vs_plg import IVSPlg
-from vs_types import (
-    VSPlgConfig, 
+from plugin import IPlugin
+from core_types import (
+    PluginConfig, 
     AppointmentType, 
     AppointmentType, 
-    VSQueryResult, 
-    VSBookResult, 
+    QueryResult, 
+    BookResult, 
     AvailabilityStatus, 
     AvailabilityStatus, 
     DateAvailability, 
     DateAvailability, 
     TimeSlot,
     TimeSlot,
@@ -27,11 +27,11 @@ from vs_types import (
     PluginStatus, 
     PluginStatus, 
     utc_now_str
     utc_now_str
 )
 )
-from toolkit.vs_cloud_api import VSCloudApi
+from toolkit.cloud_api import CloudApi
 from utils.plugin_utils import filter_dates_in_range
 from utils.plugin_utils import filter_dates_in_range
 
 
 
 
-class PolPlugin(IVSPlg):
+class PolPlugin(IPlugin):
     """
     """
     Poland (e-konsulat) 签证预约插件 (Pure HTTP REST API Mode)
     Poland (e-konsulat) 签证预约插件 (Pure HTTP REST API Mode)
     基于 official e-konsulat REST API (https://api.e-konsulat.gov.pl) 与大模型视觉验证码识别
     基于 official e-konsulat REST API (https://api.e-konsulat.gov.pl) 与大模型视觉验证码识别
@@ -42,7 +42,7 @@ class PolPlugin(IVSPlg):
 
 
     def __init__(self, group_id: str):
     def __init__(self, group_id: str):
         self.group_id = group_id
         self.group_id = group_id
-        self.config: Optional[VSPlgConfig] = None
+        self.config: Optional[PluginConfig] = None
         self.free_config: Dict[str, Any] = {}
         self.free_config: Dict[str, Any] = {}
         self.logger: Optional[Callable[[str], None]] = None
         self.logger: Optional[Callable[[str], None]] = None
         
         
@@ -70,7 +70,7 @@ class PolPlugin(IVSPlg):
         else:
         else:
             print(f'[PolPlugin] [{self.group_id}] [{self.instance_id}] {message}')
             print(f'[PolPlugin] [{self.group_id}] [{self.instance_id}] {message}')
         
         
-    def set_config(self, config: VSPlgConfig) -> None:
+    def set_config(self, config: PluginConfig) -> None:
         self.config = config
         self.config = config
         self.free_config = config.free_config or {}
         self.free_config = config.free_config or {}
         if self.free_config.get("base_api_url"):
         if self.free_config.get("base_api_url"):
@@ -270,8 +270,8 @@ class PolPlugin(IVSPlg):
             
             
         raise BizLogicError(message=f"Failed to solve and verify captcha after {max_retries} attempts")
         raise BizLogicError(message=f"Failed to solve and verify captcha after {max_retries} attempts")
 
 
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
-        res = VSQueryResult()
+    def query(self, apt_type: AppointmentType) -> QueryResult:
+        res = QueryResult()
         res.success = False
         res.success = False
         res.apt_type = apt_type
         res.apt_type = apt_type
         
         
@@ -357,7 +357,7 @@ class PolPlugin(IVSPlg):
                 f"📅 Dates: {', '.join(available_dates[:5])}\n"
                 f"📅 Dates: {', '.join(available_dates[:5])}\n"
                 f"🔑 Reservation Token: {reservation_token}"
                 f"🔑 Reservation Token: {reservation_token}"
             )
             )
-            VSCloudApi.Instance().push_weixin_text(wechat_msg)
+            CloudApi.Instance().push_weixin_text(wechat_msg)
         else:
         else:
             self._log("ℹ No available slots (tabelaDni is empty).")
             self._log("ℹ No available slots (tabelaDni is empty).")
             res.success = False
             res.success = False
@@ -366,8 +366,8 @@ class PolPlugin(IVSPlg):
             
             
         return res
         return res
 
 
-    def book(self, slot_info: VSQueryResult, user_inputs: Dict = None) -> VSBookResult:
-        res = VSBookResult()
+    def book(self, slot_info: QueryResult, user_inputs: Dict = None) -> BookResult:
+        res = BookResult()
         self._log("Booking via API called.")
         self._log("Booking via API called.")
         return res
         return res
 
 

+ 11 - 11
plugins/prt_plugin.py

@@ -1,9 +1,9 @@
-from vs_plg import IVSPlg
-from vs_types import (
-    VSPlgConfig,
+from plugin import IPlugin
+from core_types import (
+    PluginConfig,
     AppointmentType,
     AppointmentType,
-    VSQueryResult,
-    VSBookResult,
+    QueryResult,
+    BookResult,
     DateAvailability,
     DateAvailability,
     AvailabilityStatus,
     AvailabilityStatus,
     NotFoundError,
     NotFoundError,
@@ -15,7 +15,7 @@ from vs_types import (
     utc_now_str
     utc_now_str
 )
 )
 
 
-class PrtPlugin(IVSPlg):
+class PrtPlugin(IPlugin):
     """
     """
     葡萄牙 (E-Visa / MAE) 签证预约插件
     葡萄牙 (E-Visa / MAE) 签证预约插件
     """
     """
@@ -28,7 +28,7 @@ class PrtPlugin(IVSPlg):
         self.config = None
         self.config = None
         self.logger = None
         self.logger = None
 
 
-    def set_config(self, config: VSPlgConfig):
+    def set_config(self, config: PluginConfig):
         self.config = config
         self.config = config
 
 
     def set_log(self, logger):
     def set_log(self, logger):
@@ -37,11 +37,11 @@ class PrtPlugin(IVSPlg):
     def create_session(self):
     def create_session(self):
         pass
         pass
 
 
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
-        return VSQueryResult()
+    def query(self, apt_type: AppointmentType) -> QueryResult:
+        return QueryResult()
 
 
-    def book(self, slot_info: VSQueryResult, user_inputs) -> VSBookResult:
-        return VSBookResult()
+    def book(self, slot_info: QueryResult, user_inputs) -> BookResult:
+        return BookResult()
 
 
     def keep_alive(self):
     def keep_alive(self):
         pass
         pass

+ 12 - 12
plugins/tls_plugin.py

@@ -8,12 +8,12 @@ from datetime import datetime
 from typing import List, Dict, Optional, Any, Callable
 from typing import List, Dict, Optional, Any, Callable
 from DrissionPage import ChromiumPage, ChromiumOptions
 from DrissionPage import ChromiumPage, ChromiumOptions
 
 
-from vs_plg import IVSPlg
-from vs_types import (
-    VSPlgConfig,
+from plugin import IPlugin
+from core_types import (
+    PluginConfig,
     AppointmentType,
     AppointmentType,
-    VSQueryResult,
-    VSBookResult,
+    QueryResult,
+    BookResult,
     AvailabilityStatus,
     AvailabilityStatus,
     TimeSlot,
     TimeSlot,
     DateAvailability,
     DateAvailability,
@@ -405,7 +405,7 @@ class TlsLoginFlow(BaseFlow):
             self.plugin.session_create_time = time.time()
             self.plugin.session_create_time = time.time()
             self.log("✅ Login & Navigation Success! Reached appointment-booking target page.")
             self.log("✅ Login & Navigation Success! Reached appointment-booking target page.")
 
 
-class TlsPlugin(IVSPlg):
+class TlsPlugin(IPlugin):
     """
     """
     TLSContact 签证预约插件 (DrissionPage 版)
     TLSContact 签证预约插件 (DrissionPage 版)
     """
     """
@@ -415,7 +415,7 @@ class TlsPlugin(IVSPlg):
 
 
     def __init__(self, group_id: str):
     def __init__(self, group_id: str):
         self.group_id = group_id
         self.group_id = group_id
-        self.config: Optional[VSPlgConfig] = None
+        self.config: Optional[PluginConfig] = None
         self.free_config: Dict[str, Any] = {}
         self.free_config: Dict[str, Any] = {}
         self.is_healthy = True
         self.is_healthy = True
         self.logger = None
         self.logger = None
@@ -444,7 +444,7 @@ class TlsPlugin(IVSPlg):
         else:
         else:
             print(f'[TlsPlugin] [{self.group_id}] [{self.instance_id}] {message}')
             print(f'[TlsPlugin] [{self.group_id}] [{self.instance_id}] {message}')
 
 
-    def set_config(self, config: VSPlgConfig):
+    def set_config(self, config: PluginConfig):
         self.config = config
         self.config = config
         self.free_config = config.free_config or {}
         self.free_config = config.free_config or {}
         
         
@@ -519,8 +519,8 @@ class TlsPlugin(IVSPlg):
         self.session_create_time = time.time()
         self.session_create_time = time.time()
         self._log("🎉 TlsLoginFlow completed successfully. Session created.")
         self._log("🎉 TlsLoginFlow completed successfully. Session created.")
 
 
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
-        res = VSQueryResult()
+    def query(self, apt_type: AppointmentType) -> QueryResult:
+        res = QueryResult()
         res.success = False
         res.success = False
         slots = []
         slots = []
         self._log(f"Executing silent JS fetch...") 
         self._log(f"Executing silent JS fetch...") 
@@ -550,8 +550,8 @@ class TlsPlugin(IVSPlg):
             
             
         return res
         return res
 
 
-    def book(self, slot_info: VSQueryResult, user_inputs: Dict = None) -> VSBookResult:
-        res = VSBookResult()
+    def book(self, slot_info: QueryResult, user_inputs: Dict = None) -> BookResult:
+        res = BookResult()
         res.success = False
         res.success = False
         
         
         exp_start = user_inputs.get('expected_start_date', '')
         exp_start = user_inputs.get('expected_start_date', '')

+ 13 - 13
plugins/usa_plugin.py

@@ -8,12 +8,12 @@ from datetime import datetime
 from typing import List, Dict, Optional, Any, Callable
 from typing import List, Dict, Optional, Any, Callable
 from DrissionPage import ChromiumPage
 from DrissionPage import ChromiumPage
 
 
-from vs_plg import IVSPlg
-from vs_types import (
-    VSPlgConfig, 
+from plugin import IPlugin
+from core_types import (
+    PluginConfig, 
     AppointmentType, 
     AppointmentType, 
-    VSQueryResult, 
-    VSBookResult, 
+    QueryResult, 
+    BookResult, 
     AvailabilityStatus, 
     AvailabilityStatus, 
     DateAvailability, 
     DateAvailability, 
     NotFoundError, 
     NotFoundError, 
@@ -257,7 +257,7 @@ class UsaLoginFlow(BaseFlow):
         self.log("🎉 Successfully reached the Slot Search page (Target Page). Session created successfully!")
         self.log("🎉 Successfully reached the Slot Search page (Target Page). Session created successfully!")
 
 
 
 
-class UsaPlugin(IVSPlg):
+class UsaPlugin(IPlugin):
     name = "usa_plugin"
     name = "usa_plugin"
     version = "1.0.0"
     version = "1.0.0"
     description = "美签USVisaScheduling预约插件 (B2C认证、流控调度与自动占位)"
     description = "美签USVisaScheduling预约插件 (B2C认证、流控调度与自动占位)"
@@ -272,7 +272,7 @@ class UsaPlugin(IVSPlg):
 
 
     def __init__(self, group_id: str):
     def __init__(self, group_id: str):
         self.group_id = group_id
         self.group_id = group_id
-        self.config: Optional[VSPlgConfig] = None
+        self.config: Optional[PluginConfig] = None
         self.free_config: Dict[str, Any] = {}
         self.free_config: Dict[str, Any] = {}
         self.is_healthy = True
         self.is_healthy = True
         self.logger = None
         self.logger = None
@@ -305,7 +305,7 @@ class UsaPlugin(IVSPlg):
         self._log(f"Anti-Rate-Limit: Sleeping for {sleep_time:.2f} seconds...")
         self._log(f"Anti-Rate-Limit: Sleeping for {sleep_time:.2f} seconds...")
         time.sleep(sleep_time)
         time.sleep(sleep_time)
 
 
-    def set_config(self, config: VSPlgConfig):
+    def set_config(self, config: PluginConfig):
         """设置 API 的配置信息"""
         """设置 API 的配置信息"""
         self.config = config
         self.config = config
         self.free_config = config.free_config or {}
         self.free_config = config.free_config or {}
@@ -446,10 +446,10 @@ class UsaPlugin(IVSPlg):
         self.session_create_time = time.time()
         self.session_create_time = time.time()
         self._log("🎉 UsaLoginFlow completed successfully. Session created.")
         self._log("🎉 UsaLoginFlow completed successfully. Session created.")
 
 
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
+    def query(self, apt_type: AppointmentType) -> QueryResult:
         """查询可用的签证预约信息"""
         """查询可用的签证预约信息"""
         self._log("Querying available slots...")
         self._log("Querying available slots...")
-        res = VSQueryResult()
+        res = QueryResult()
         res.success = False
         res.success = False
 
 
         location_name = (self.free_config.get('location') or "").strip()
         location_name = (self.free_config.get('location') or "").strip()
@@ -632,9 +632,9 @@ class UsaPlugin(IVSPlg):
                 
                 
             return res
             return res
 
 
-    def book(self, slot_info: VSQueryResult, user_inputs) -> VSBookResult:
+    def book(self, slot_info: QueryResult, user_inputs) -> BookResult:
         """进行预约操作"""
         """进行预约操作"""
-        res = VSBookResult()
+        res = BookResult()
         res.success = False
         res.success = False
         
         
         exp_start = user_inputs.get('expected_date_start', '')
         exp_start = user_inputs.get('expected_date_start', '')
@@ -704,7 +704,7 @@ class UsaPlugin(IVSPlg):
         self._log("Booking submitted successfully!")
         self._log("Booking submitted successfully!")
 
 
         # 构造返回结果
         # 构造返回结果
-        res = VSBookResult()
+        res = BookResult()
         res.success = True
         res.success = True
         res.book_date = selected_slot_date
         res.book_date = selected_slot_date
         res.book_time = selected_slot_time
         res.book_time = selected_slot_time

+ 14 - 14
plugins/vfs_plugin.py

@@ -16,12 +16,12 @@ from cryptography.hazmat.primitives import serialization, hashes
 from cryptography.hazmat.primitives.asymmetric import padding
 from cryptography.hazmat.primitives.asymmetric import padding
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.backends import default_backend
 
 
-from vs_plg import IVSPlg 
-from vs_types import (
-    VSPlgConfig,
+from plugin import IPlugin 
+from core_types import (
+    PluginConfig,
     AppointmentType,
     AppointmentType,
-    VSQueryResult,
-    VSBookResult,
+    QueryResult,
+    BookResult,
     DateAvailability,
     DateAvailability,
     AvailabilityStatus,
     AvailabilityStatus,
     NotFoundError,
     NotFoundError,
@@ -32,7 +32,7 @@ from vs_types import (
     PluginStatus,
     PluginStatus,
     utc_now_str
     utc_now_str
 )
 )
-from toolkit.vs_cloud_api import VSCloudApi
+from toolkit.cloud_api import CloudApi
 from toolkit.captcha_breaker import CaptchaBreaker, CaptchaBreakerError
 from toolkit.captcha_breaker import CaptchaBreaker, CaptchaBreakerError
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
 
 
@@ -114,14 +114,14 @@ from utils.plugin_utils import (
 )
 )
 
 
 
 
-class VfsPlugin(IVSPlg):
+class VfsPlugin(IPlugin):
     name = "vfs_plugin"
     name = "vfs_plugin"
     version = "1.0.1"
     version = "1.0.1"
     description = "VFS Global全球多国签证预约插件 (支持多中心、多签证类型与CF破解)"
     description = "VFS Global全球多国签证预约插件 (支持多中心、多签证类型与CF破解)"
 
 
     def __init__(self, group_id: str):
     def __init__(self, group_id: str):
         self.group_id = group_id
         self.group_id = group_id
-        self.config: Optional[VSPlgConfig] = None
+        self.config: Optional[PluginConfig] = None
         self.free_config: Dict[str, Any] = {}
         self.free_config: Dict[str, Any] = {}
         self.logger = None
         self.logger = None
         
         
@@ -156,7 +156,7 @@ class VfsPlugin(IVSPlg):
         self.sitekey = VFS_TURNSTILE_SITEKEY
         self.sitekey = VFS_TURNSTILE_SITEKEY
         self.injected = False
         self.injected = False
 
 
-    def set_config(self, config: VSPlgConfig):
+    def set_config(self, config: PluginConfig):
         self.config = config
         self.config = config
         self.free_config = config.free_config or {}
         self.free_config = config.free_config or {}
         if self.free_config.get('country_code') == 'chn':
         if self.free_config.get('country_code') == 'chn':
@@ -427,9 +427,9 @@ class VfsPlugin(IVSPlg):
         except:
         except:
             self.real_ip = self.config.proxy.ip
             self.real_ip = self.config.proxy.ip
 
 
-    def query(self, apt_type: AppointmentType) -> VSQueryResult:
+    def query(self, apt_type: AppointmentType) -> QueryResult:
         """查询可预约 Slot"""
         """查询可预约 Slot"""
-        result = VSQueryResult()
+        result = QueryResult()
         apt_config = self.free_config.get("apt_configs", {}).get(apt_type.routing_key)
         apt_config = self.free_config.get("apt_configs", {}).get(apt_type.routing_key)
         self._fetch_configurations(apt_config)
         self._fetch_configurations(apt_config)
         query_result = self._query_earliest_slot(apt_config)
         query_result = self._query_earliest_slot(apt_config)
@@ -686,7 +686,7 @@ class VfsPlugin(IVSPlg):
             sent_at = now_utc.strftime("%Y-%m-%d %H:%M:%S")
             sent_at = now_utc.strftime("%Y-%m-%d %H:%M:%S")
             
             
         self._log(f"Waiting for OTP email...")
         self._log(f"Waiting for OTP email...")
-        content_out = VSCloudApi.Instance().fetch_mail_content(
+        content_out = CloudApi.Instance().fetch_mail_content(
             master_email, sender, recipient, subject_keywords, body_keywords, sent_at, 300, only_text=False
             master_email, sender, recipient, subject_keywords, body_keywords, sent_at, 300, only_text=False
         )
         )
         if content_out:
         if content_out:
@@ -817,7 +817,7 @@ class VfsPlugin(IVSPlg):
             raise BizLogicError("Failed to refresh Cloudflare Turnstile token (Timeout)")
             raise BizLogicError("Failed to refresh Cloudflare Turnstile token (Timeout)")
         return token
         return token
 
 
-    def book(self, slot_info: VSQueryResult, user_inputs) -> VSBookResult:
+    def book(self, slot_info: QueryResult, user_inputs) -> BookResult:
         """
         """
         执行完整的预约流程
         执行完整的预约流程
         """
         """
@@ -826,7 +826,7 @@ class VfsPlugin(IVSPlg):
         user_email = user_inputs.get('email')
         user_email = user_inputs.get('email')
         user_inputs['alias_email'] = get_alias_email(user_email, new_domain="text.skin")
         user_inputs['alias_email'] = get_alias_email(user_email, new_domain="text.skin")
         
         
-        res = VSBookResult()
+        res = BookResult()
         app_type = slot_info.apt_type
         app_type = slot_info.apt_type
         from_date = slot_info.earliest_date.strftime("%Y-%m-%d") if slot_info.earliest_date else datetime.now().strftime("%Y-%m-%d")
         from_date = slot_info.earliest_date.strftime("%Y-%m-%d") if slot_info.earliest_date else datetime.now().strftime("%Y-%m-%d")
         
         

+ 9 - 9
sentinel.py

@@ -6,13 +6,13 @@ import threading
 from datetime import datetime
 from datetime import datetime
 from typing import List, Dict, Callable, Optional
 from typing import List, Dict, Callable, Optional
 
 
-from vs_types import (
-    GroupConfig, VSPlgConfig, Task, QueryWaitMode, GroupStatus, PluginStatus, utc_now_str,
+from core_types import (
+    GroupConfig, PluginConfig, Task, QueryWaitMode, GroupStatus, PluginStatus, utc_now_str,
     BizException, RateLimiteddError, SessionExpiredOrInvalidError, PermissionDeniedError,
     BizException, RateLimiteddError, SessionExpiredOrInvalidError, PermissionDeniedError,
     NetworkTimeoutError
     NetworkTimeoutError
 )
 )
-from vs_plg_factory import VSPlgFactory 
-from toolkit.vs_cloud_api import VSCloudApi
+from plugin_factory import PluginFactory 
+from toolkit.cloud_api import CloudApi
 from toolkit.proxy_manager import ProxyManager
 from toolkit.proxy_manager import ProxyManager
 from toolkit.notifier import notify_date_changes
 from toolkit.notifier import notify_date_changes
 from utils.safe_redis_cli import SafeRedisClient
 from utils.safe_redis_cli import SafeRedisClient
@@ -20,7 +20,7 @@ from utils.safe_redis_cli import SafeRedisClient
 class SentinelGCO:
 class SentinelGCO:
     def __init__(self, cfg: GroupConfig, redis_conf: Dict, logger: Callable[[str], None] = None):
     def __init__(self, cfg: GroupConfig, redis_conf: Dict, logger: Callable[[str], None] = None):
         self.m_cfg = cfg
         self.m_cfg = cfg
-        self.m_factory = VSPlgFactory()
+        self.m_factory = PluginFactory()
         self.m_logger = logger
         self.m_logger = logger
         self.m_tasks: List[Task] = []
         self.m_tasks: List[Task] = []
         self.m_lock = threading.RLock()
         self.m_lock = threading.RLock()
@@ -152,7 +152,7 @@ class SentinelGCO:
         action: str,
         action: str,
         err: Exception,
         err: Exception,
         task: Optional[Task] = None,
         task: Optional[Task] = None,
-        plg_cfg: Optional[VSPlgConfig] = None
+        plg_cfg: Optional[PluginConfig] = None
     ) -> None:
     ) -> None:
         """
         """
         Sentinel 错误调度与自愈策略引擎 (Policy Engine):
         Sentinel 错误调度与自愈策略引擎 (Policy Engine):
@@ -177,7 +177,7 @@ class SentinelGCO:
                 self._log(f"🔒 [Account Rate Limited] 429 throttled during {action} (Account credential/frequency restricted).")
                 self._log(f"🔒 [Account Rate Limited] 429 throttled during {action} (Account credential/frequency restricted).")
                 if acc and getattr(acc, "username", "") not in ("", "Guest") and getattr(acc, "id", 0):
                 if acc and getattr(acc, "username", "") not in ("", "Guest") and getattr(acc, "id", 0):
                     try:
                     try:
-                        VSCloudApi.Instance().lock_account(acc.id, int(backoff))
+                        CloudApi.Instance().lock_account(acc.id, int(backoff))
                         self._log(f"🔒 Account [{acc.username}] locked for {int(backoff)}s via Cloud API.")
                         self._log(f"🔒 Account [{acc.username}] locked for {int(backoff)}s via Cloud API.")
                     except Exception as lock_err:
                     except Exception as lock_err:
                         self._log(f"Failed to lock account via cloud API: {lock_err}")
                         self._log(f"Failed to lock account via cloud API: {lock_err}")
@@ -346,7 +346,7 @@ class SentinelGCO:
         success = False
         success = False
         plg_cfg = None
         plg_cfg = None
         try:
         try:
-            plg_cfg = VSPlgConfig()
+            plg_cfg = PluginConfig()
             plg_cfg.debug = self.m_cfg.debug
             plg_cfg.debug = self.m_cfg.debug
             plg_cfg.free_config = self.m_cfg.free_config
             plg_cfg.free_config = self.m_cfg.free_config
             plg_cfg.session_max_life = self.m_cfg.session_max_life
             plg_cfg.session_max_life = self.m_cfg.session_max_life
@@ -355,7 +355,7 @@ class SentinelGCO:
                 plg_cfg.account.id = 0
                 plg_cfg.account.id = 0
                 plg_cfg.account.username = "Guest"
                 plg_cfg.account.username = "Guest"
             else:
             else:
-                acc = VSCloudApi.Instance().get_next_account(self.m_cfg.sentinel.account_pool_id, self.m_cfg.sentinel.account_cd)
+                acc = CloudApi.Instance().get_next_account(self.m_cfg.sentinel.account_pool_id, self.m_cfg.sentinel.account_cd)
                 plg_cfg.account = type(plg_cfg.account)(**acc)
                 plg_cfg.account = type(plg_cfg.account)(**acc)
             
             
             if self.m_cfg.need_proxy:
             if self.m_cfg.need_proxy:

+ 9 - 9
standalone.py

@@ -5,12 +5,12 @@ import threading
 from datetime import datetime
 from datetime import datetime
 from typing import Dict, Callable, Optional
 from typing import Dict, Callable, Optional
 
 
-from vs_types import (
+from core_types import (
     BookerStandaloneConfig,
     BookerStandaloneConfig,
     QueryWaitMode,
     QueryWaitMode,
-    VSPlgConfig,
-    VSQueryResult,
-    VSBookResult,
+    PluginConfig,
+    QueryResult,
+    BookResult,
     GroupStatus,
     GroupStatus,
     PluginStatus,
     PluginStatus,
     utc_now_str,
     utc_now_str,
@@ -20,10 +20,10 @@ from vs_types import (
     PermissionDeniedError,
     PermissionDeniedError,
     NetworkTimeoutError
     NetworkTimeoutError
 )
 )
-from vs_plg_factory import VSPlgFactory
+from plugin_factory import PluginFactory
 from utils.safe_redis_cli import SafeRedisClient
 from utils.safe_redis_cli import SafeRedisClient
 from toolkit.proxy_manager import ProxyManager
 from toolkit.proxy_manager import ProxyManager
-from toolkit.vs_cloud_api import VSCloudApi
+from toolkit.cloud_api import CloudApi
 from toolkit.notifier import notify_date_changes, notify_book_result
 from toolkit.notifier import notify_date_changes, notify_book_result
 
 
 
 
@@ -37,7 +37,7 @@ class StandaloneGCO:
     def __init__(self, cfg: BookerStandaloneConfig, redis_conf: Dict, logger: Callable[[str], None] = None):
     def __init__(self, cfg: BookerStandaloneConfig, redis_conf: Dict, logger: Callable[[str], None] = None):
         self.m_cfg = cfg
         self.m_cfg = cfg
         self.m_logger = logger
         self.m_logger = logger
-        self.m_factory = VSPlgFactory()
+        self.m_factory = PluginFactory()
         self.m_instance = None
         self.m_instance = None
         self.m_lock = threading.RLock()
         self.m_lock = threading.RLock()
         self.m_stop_event = threading.Event()
         self.m_stop_event = threading.Event()
@@ -154,7 +154,7 @@ class StandaloneGCO:
                 return
                 return
 
 
         plugin_name = self.m_cfg.plugin_config.plugin_name
         plugin_name = self.m_cfg.plugin_config.plugin_name
-        plg_cfg = VSPlgConfig()
+        plg_cfg = PluginConfig()
         plg_cfg.debug = self.m_cfg.debug
         plg_cfg.debug = self.m_cfg.debug
         plg_cfg.account = self.m_cfg.account
         plg_cfg.account = self.m_cfg.account
         proxy = ProxyManager.Instance().get_next_proxy(self.m_cfg.proxy_pool, proxy_cd=600)
         proxy = ProxyManager.Instance().get_next_proxy(self.m_cfg.proxy_pool, proxy_cd=600)
@@ -217,7 +217,7 @@ class StandaloneGCO:
                 self._log(f"🔒 [Account Rate Limited] 429 throttled during {action} (Account credential/frequency restricted).")
                 self._log(f"🔒 [Account Rate Limited] 429 throttled during {action} (Account credential/frequency restricted).")
                 if acc and getattr(acc, "id", 0):
                 if acc and getattr(acc, "id", 0):
                     try:
                     try:
-                        VSCloudApi.Instance().lock_account(acc.id, int(backoff))
+                        CloudApi.Instance().lock_account(acc.id, int(backoff))
                         self._log(f"🔒 Account [{acc.username}] locked for {int(backoff)}s via Cloud API.")
                         self._log(f"🔒 Account [{acc.username}] locked for {int(backoff)}s via Cloud API.")
                     except Exception as lock_err:
                     except Exception as lock_err:
                         self._log(f"Failed to lock account via cloud API: {lock_err}")
                         self._log(f"Failed to lock account via cloud API: {lock_err}")

+ 4 - 4
test/test_cloud_config.py

@@ -22,7 +22,7 @@ class TestCloudConfig(unittest.TestCase):
         self.assertNotEqual(compute_config_hash(data1), compute_config_hash(data3))
         self.assertNotEqual(compute_config_hash(data1), compute_config_hash(data3))
 
 
     def test_fetch_cloud_config_success(self):
     def test_fetch_cloud_config_success(self):
-        with patch("toolkit.vs_cloud_api.VSCloudApi.Instance") as mock_api_inst:
+        with patch("toolkit.cloud_api.CloudApi.Instance") as mock_api_inst:
             mock_inst = MagicMock()
             mock_inst = MagicMock()
             mock_inst.get_node_configurations.return_value = {
             mock_inst.get_node_configurations.return_value = {
                 "items": [{"identifier": "group_a", "enable": True}]
                 "items": [{"identifier": "group_a", "enable": True}]
@@ -33,7 +33,7 @@ class TestCloudConfig(unittest.TestCase):
             self.assertEqual(data, [{"identifier": "group_a", "enable": True}])
             self.assertEqual(data, [{"identifier": "group_a", "enable": True}])
 
 
     def test_fetch_cloud_config_failure(self):
     def test_fetch_cloud_config_failure(self):
-        with patch("toolkit.vs_cloud_api.VSCloudApi.Instance") as mock_api_inst:
+        with patch("toolkit.cloud_api.CloudApi.Instance") as mock_api_inst:
             mock_inst = MagicMock()
             mock_inst = MagicMock()
             mock_inst.get_node_configurations.side_effect = Exception("API down")
             mock_inst.get_node_configurations.side_effect = Exception("API down")
             mock_api_inst.return_value = mock_inst
             mock_api_inst.return_value = mock_inst
@@ -42,7 +42,7 @@ class TestCloudConfig(unittest.TestCase):
             self.assertIsNone(data)
             self.assertIsNone(data)
 
 
     def test_load_cloud_or_cache_success_and_save(self):
     def test_load_cloud_or_cache_success_and_save(self):
-        with patch("toolkit.vs_cloud_api.VSCloudApi.Instance") as mock_api_inst:
+        with patch("toolkit.cloud_api.CloudApi.Instance") as mock_api_inst:
             mock_inst = MagicMock()
             mock_inst = MagicMock()
             mock_inst.get_node_configurations.return_value = {
             mock_inst.get_node_configurations.return_value = {
                 "items": [{"identifier": "group_remote", "enable": True}]
                 "items": [{"identifier": "group_remote", "enable": True}]
@@ -66,7 +66,7 @@ class TestCloudConfig(unittest.TestCase):
                 self.assertEqual(cached_data, [{"identifier": "group_remote", "enable": True}])
                 self.assertEqual(cached_data, [{"identifier": "group_remote", "enable": True}])
 
 
     def test_load_cloud_or_cache_fallback_to_local(self):
     def test_load_cloud_or_cache_fallback_to_local(self):
-        with patch("toolkit.vs_cloud_api.VSCloudApi.Instance") as mock_api_inst:
+        with patch("toolkit.cloud_api.CloudApi.Instance") as mock_api_inst:
             mock_inst = MagicMock()
             mock_inst = MagicMock()
             mock_inst.get_node_configurations.side_effect = Exception("API down")
             mock_inst.get_node_configurations.side_effect = Exception("API down")
             mock_api_inst.return_value = mock_inst
             mock_api_inst.return_value = mock_inst

+ 11 - 11
test/test_metadata_exception.py

@@ -1,7 +1,7 @@
 import unittest
 import unittest
 import time
 import time
 from unittest.mock import MagicMock, patch
 from unittest.mock import MagicMock, patch
-from vs_types import (
+from core_types import (
     BizException,
     BizException,
     RateLimiteddError,
     RateLimiteddError,
     RateLimitedError,
     RateLimitedError,
@@ -11,9 +11,9 @@ from vs_types import (
     NotFoundError,
     NotFoundError,
     BizLogicError,
     BizLogicError,
     NetworkTimeoutError,
     NetworkTimeoutError,
-    VSPluginError,
+    PluginError,
     BookerStandaloneConfig,
     BookerStandaloneConfig,
-    VSPlgConfig,
+    PluginConfig,
 )
 )
 from standalone import StandaloneGCO
 from standalone import StandaloneGCO
 
 
@@ -34,7 +34,7 @@ class TestMetadataExceptions(unittest.TestCase):
         # 别名验证
         # 别名验证
         self.assertIs(RateLimitedError, RateLimiteddError)
         self.assertIs(RateLimitedError, RateLimiteddError)
         self.assertIs(SessionExpiredError, SessionExpiredOrInvalidError)
         self.assertIs(SessionExpiredError, SessionExpiredOrInvalidError)
-        self.assertIs(VSPluginError, BizException)
+        self.assertIs(PluginError, BizException)
 
 
         # 2. SessionExpiredOrInvalidError
         # 2. SessionExpiredOrInvalidError
         err_session = SessionExpiredOrInvalidError("Kicked out")
         err_session = SessionExpiredOrInvalidError("Kicked out")
@@ -75,7 +75,7 @@ class TestMetadataExceptions(unittest.TestCase):
         self.assertIsInstance(normalized_unknown, BizException)
         self.assertIsInstance(normalized_unknown, BizException)
         self.assertEqual(normalized_unknown.code, 50000)
         self.assertEqual(normalized_unknown.code, 50000)
 
 
-    @patch("toolkit.vs_cloud_api.VSCloudApi.Instance")
+    @patch("toolkit.cloud_api.CloudApi.Instance")
     def test_standalone_action_matrix_policy(self, mock_cloud_instance):
     def test_standalone_action_matrix_policy(self, mock_cloud_instance):
         mock_cloud = MagicMock()
         mock_cloud = MagicMock()
         mock_cloud_instance.return_value = mock_cloud
         mock_cloud_instance.return_value = mock_cloud
@@ -122,10 +122,10 @@ class TestMetadataExceptions(unittest.TestCase):
         self.assertIsNone(gco.m_instance)
         self.assertIsNone(gco.m_instance)
         self.assertGreater(gco.m_next_query_time, time.time())
         self.assertGreater(gco.m_next_query_time, time.time())
 
 
-    @patch("toolkit.vs_cloud_api.VSCloudApi.Instance")
+    @patch("toolkit.cloud_api.CloudApi.Instance")
     def test_sentinel_error_dispatch(self, mock_cloud_instance):
     def test_sentinel_error_dispatch(self, mock_cloud_instance):
         from sentinel import SentinelGCO
         from sentinel import SentinelGCO
-        from vs_types import GroupConfig, Task
+        from core_types import GroupConfig, Task
 
 
         mock_cloud = MagicMock()
         mock_cloud = MagicMock()
         mock_cloud_instance.return_value = mock_cloud
         mock_cloud_instance.return_value = mock_cloud
@@ -136,7 +136,7 @@ class TestMetadataExceptions(unittest.TestCase):
         gco = SentinelGCO(cfg=cfg, redis_conf={})
         gco = SentinelGCO(cfg=cfg, redis_conf={})
 
 
         # 场景 1: spawn 时 429 -> 账号被限,锁账号
         # 场景 1: spawn 时 429 -> 账号被限,锁账号
-        plg_cfg = VSPlgConfig()
+        plg_cfg = PluginConfig()
         plg_cfg.account.id = 999
         plg_cfg.account.id = 999
         plg_cfg.account.username = "sentinel_user"
         plg_cfg.account.username = "sentinel_user"
         gco._dispatch_error_policy("spawn", RateLimiteddError(), plg_cfg=plg_cfg)
         gco._dispatch_error_policy("spawn", RateLimiteddError(), plg_cfg=plg_cfg)
@@ -166,10 +166,10 @@ class TestMetadataExceptions(unittest.TestCase):
         gco._dispatch_error_policy("query", PermissionDeniedError(), task=task2)
         gco._dispatch_error_policy("query", PermissionDeniedError(), task=task2)
         self.assertNotIn(task2, gco.m_tasks)
         self.assertNotIn(task2, gco.m_tasks)
 
 
-    @patch("toolkit.vs_cloud_api.VSCloudApi.Instance")
+    @patch("toolkit.cloud_api.CloudApi.Instance")
     def test_booker_error_dispatch(self, mock_cloud_instance):
     def test_booker_error_dispatch(self, mock_cloud_instance):
         from booker import BuiltinBookerGCO
         from booker import BuiltinBookerGCO
-        from vs_types import GroupConfig, Task
+        from core_types import GroupConfig, Task
 
 
         mock_cloud = MagicMock()
         mock_cloud = MagicMock()
         mock_cloud_instance.return_value = mock_cloud
         mock_cloud_instance.return_value = mock_cloud
@@ -194,7 +194,7 @@ class TestMetadataExceptions(unittest.TestCase):
 
 
         # 场景 2: 模拟 spawn 触发 RateLimiteddError -> 账号受限,锁账号
         # 场景 2: 模拟 spawn 触发 RateLimiteddError -> 账号受限,锁账号
         mock_cloud.reset_mock()
         mock_cloud.reset_mock()
-        plg_cfg = VSPlgConfig()
+        plg_cfg = PluginConfig()
         plg_cfg.account.id = 777
         plg_cfg.account.id = 777
         plg_cfg.account.username = "booker_user"
         plg_cfg.account.username = "booker_user"
         gco._dispatch_error_policy("spawn", RateLimiteddError(), plg_cfg=plg_cfg)
         gco._dispatch_error_policy("spawn", RateLimiteddError(), plg_cfg=plg_cfg)

+ 4 - 4
test/test_proxy_manager.py

@@ -7,7 +7,7 @@ if project_root not in sys.path:
     sys.path.insert(0, project_root)
     sys.path.insert(0, project_root)
 
 
 from toolkit.proxy_manager import ProxyManager
 from toolkit.proxy_manager import ProxyManager
-from vs_types import VSProxy, BizLogicError
+from core_types import Proxy, BizLogicError
 
 
 
 
 class TestProxyManager(unittest.TestCase):
 class TestProxyManager(unittest.TestCase):
@@ -20,8 +20,8 @@ class TestProxyManager(unittest.TestCase):
         self.assertIsInstance(res, dict)
         self.assertIsInstance(res, dict)
         self.assertEqual(res["ip"], "127.0.0.1")
         self.assertEqual(res["ip"], "127.0.0.1")
         self.assertEqual(res["port"], 7897)
         self.assertEqual(res["port"], 7897)
-        # 验证能够无缝构建 VSProxy
-        proxy_obj = VSProxy(**res)
+        # 验证能够无缝构建 Proxy
+        proxy_obj = Proxy(**res)
         self.assertEqual(proxy_obj.port, 7897)
         self.assertEqual(proxy_obj.port, 7897)
 
 
     def test_local_proxy_multi_pool(self):
     def test_local_proxy_multi_pool(self):
@@ -30,7 +30,7 @@ class TestProxyManager(unittest.TestCase):
         self.assertIsInstance(res, dict)
         self.assertIsInstance(res, dict)
         self.assertEqual(res["ip"], "127.0.0.1")
         self.assertEqual(res["ip"], "127.0.0.1")
         self.assertTrue(10001 <= res["port"] <= 10400)
         self.assertTrue(10001 <= res["port"] <= 10400)
-        proxy_obj = VSProxy(**res)
+        proxy_obj = Proxy(**res)
         self.assertTrue(10001 <= proxy_obj.port <= 10400)
         self.assertTrue(10001 <= proxy_obj.port <= 10400)
 
 
     def test_invalid_prefix(self):
     def test_invalid_prefix(self):

+ 3 - 3
tls_keygen.py

@@ -18,9 +18,9 @@ from DrissionPage import ChromiumPage, ChromiumOptions
 
 
 import configure
 import configure
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
-from toolkit.vs_cloud_api import VSCloudApi
+from toolkit.cloud_api import CloudApi
 from toolkit.mihomo_tunnel import MihomoTunnel
 from toolkit.mihomo_tunnel import MihomoTunnel
-from vs_types import BizLogicError 
+from core_types import BizLogicError 
 from utils.mouse import HumanMouse
 from utils.mouse import HumanMouse
 from utils.keyboard import HumanKeyboard
 from utils.keyboard import HumanKeyboard
 from utils.fingerprint_utils import FingerprintGenerator
 from utils.fingerprint_utils import FingerprintGenerator
@@ -283,7 +283,7 @@ class TlsRegistrator:
             now_utc = datetime.utcnow()
             now_utc = datetime.utcnow()
             sent_at = now_utc.strftime("%Y-%m-%d %H:%M:%S")
             sent_at = now_utc.strftime("%Y-%m-%d %H:%M:%S")
         
         
-        content_out = VSCloudApi.Instance().fetch_mail_content(
+        content_out = CloudApi.Instance().fetch_mail_content(
             email=email_box,
             email=email_box,
             sender=sender,
             sender=sender,
             recipient=recipient,
             recipient=recipient,

+ 7 - 7
toolkit/vs_cloud_api.py → toolkit/cloud_api.py

@@ -1,4 +1,4 @@
-# toolkit/vs_cloud_api.py
+# toolkit/cloud_api.py
 import requests
 import requests
 import time
 import time
 from urllib.parse import quote
 from urllib.parse import quote
@@ -6,19 +6,19 @@ from datetime import datetime, timezone, timedelta
 from typing import Dict, Any, List, Optional
 from typing import Dict, Any, List, Optional
 
 
 import configure
 import configure
-from vs_types import PermissionDeniedError, RateLimiteddError, SessionExpiredOrInvalidError, BizLogicError 
-from vs_log_macros import VSC_ERROR, VSC_INFO, VSC_WARN, VSC_DEBUG
+from core_types import PermissionDeniedError, RateLimiteddError, SessionExpiredOrInvalidError, BizLogicError 
+from log_macros import VSC_ERROR, VSC_INFO, VSC_WARN, VSC_DEBUG
 
 
 
 
-class VSCloudApi:
+class CloudApi:
     """
     """
-    @brief VSCloudApi 的 Python 实现
+    @brief CloudApi 的 Python 实现
     用于对接云端服务 (打码、邮件、Session存储、任务调度)
     用于对接云端服务 (打码、邮件、Session存储、任务调度)
     """
     """
     _instance = None
     _instance = None
     def __new__(cls, *args, **kwargs):
     def __new__(cls, *args, **kwargs):
         if cls._instance is None:
         if cls._instance is None:
-            cls._instance = super(VSCloudApi, cls).__new__(cls)
+            cls._instance = super(CloudApi, cls).__new__(cls)
             cls._instance.base_url = "https://api.text.skin"
             cls._instance.base_url = "https://api.text.skin"
             cls._instance.api_token = "Bearer tok_e946329a60ff45ba807f3f41b0e8b7fc"
             cls._instance.api_token = "Bearer tok_e946329a60ff45ba807f3f41b0e8b7fc"
             cls._instance.session = requests.Session()
             cls._instance.session = requests.Session()
@@ -26,7 +26,7 @@ class VSCloudApi:
 
 
     @staticmethod
     @staticmethod
     def Instance():
     def Instance():
-        return VSCloudApi()
+        return CloudApi()
 
 
     def _get_headers(self, content_type: str = "application/json") -> Dict[str, str]:
     def _get_headers(self, content_type: str = "application/json") -> Dict[str, str]:
         return {
         return {

+ 6 - 6
toolkit/notifier.py

@@ -1,11 +1,11 @@
 from typing import Dict, Callable, Optional
 from typing import Dict, Callable, Optional
-from vs_types import VSQueryResult, VSBookResult
-from toolkit.vs_cloud_api import VSCloudApi
+from core_types import QueryResult, BookResult
+from toolkit.cloud_api import CloudApi
 from toolkit.thread_pool import ThreadPool
 from toolkit.thread_pool import ThreadPool
 
 
 
 
 def notify_date_changes(
 def notify_date_changes(
-    query_result: VSQueryResult,
+    query_result: QueryResult,
     cache: Optional[Dict[str, str]] = None,
     cache: Optional[Dict[str, str]] = None,
     logger: Optional[Callable[[str], None]] = None
     logger: Optional[Callable[[str], None]] = None
 ) -> bool:
 ) -> bool:
@@ -34,7 +34,7 @@ def notify_date_changes(
                 f"签证类型: {apt_type.visa_type}\n"
                 f"签证类型: {apt_type.visa_type}\n"
                 f"Routing: {apt_type.routing_key}"
                 f"Routing: {apt_type.routing_key}"
             )
             )
-            VSCloudApi.Instance().push_weixin_text(push_content)
+            CloudApi.Instance().push_weixin_text(push_content)
         except Exception as e:
         except Exception as e:
             if logger:
             if logger:
                 logger(f"Failed to notify date change to cloud: {e}")
                 logger(f"Failed to notify date change to cloud: {e}")
@@ -44,7 +44,7 @@ def notify_date_changes(
 
 
 
 
 def notify_book_result(
 def notify_book_result(
-    book_result: VSBookResult,
+    book_result: BookResult,
     order_id: Optional[str] = None,
     order_id: Optional[str] = None,
     logger: Optional[Callable[[str], None]] = None
     logger: Optional[Callable[[str], None]] = None
 ) -> bool:
 ) -> bool:
@@ -72,7 +72,7 @@ def notify_book_result(
                 "━━━━━━━━━━━━━━━",
                 "━━━━━━━━━━━━━━━",
             ])
             ])
             push_content = "\n".join(lines)
             push_content = "\n".join(lines)
-            VSCloudApi.Instance().push_weixin_text(push_content)
+            CloudApi.Instance().push_weixin_text(push_content)
         except Exception as e:
         except Exception as e:
             if logger:
             if logger:
                 logger(f"Failed to notify book result to cloud: {e}")
                 logger(f"Failed to notify book result to cloud: {e}")

+ 6 - 6
toolkit/proxy_manager.py

@@ -4,9 +4,9 @@ import random
 from typing import List, Dict, Any, Optional
 from typing import List, Dict, Any, Optional
 
 
 import configure
 import configure
-from toolkit.vs_cloud_api import VSCloudApi
-from vs_types import BizLogicError
-from vs_log_macros import VSC_INFO, VSC_WARN, VSC_ERROR
+from toolkit.cloud_api import CloudApi
+from core_types import BizLogicError
+from log_macros import VSC_INFO, VSC_WARN, VSC_ERROR
 
 
 
 
 class ProxyManager:
 class ProxyManager:
@@ -14,7 +14,7 @@ class ProxyManager:
     统一代理调度管理器。
     统一代理调度管理器。
     支持显式前缀区分:
     支持显式前缀区分:
       - "local:<pool_name>"  -> 从本地 config/proxies.json 随机分配
       - "local:<pool_name>"  -> 从本地 config/proxies.json 随机分配
-      - "cloud:<pool_name>"  -> 通过 VSCloudApi 请求云端代理池
+      - "cloud:<pool_name>"  -> 通过 CloudApi 请求云端代理池
     严格校验:未带合法前缀将抛出异常。
     严格校验:未带合法前缀将抛出异常。
     """
     """
     _instance = None
     _instance = None
@@ -93,7 +93,7 @@ class ProxyManager:
 
 
             chosen = random.choice(candidate_proxies)
             chosen = random.choice(candidate_proxies)
             
             
-            # 规范化代理字典,确保与 VSProxy 字段完全契合
+            # 规范化代理字典,确保与 Proxy 字段完全契合
             proxy_dict = {
             proxy_dict = {
                 "id": chosen.get("id", 0),
                 "id": chosen.get("id", 0),
                 "proto": chosen.get("proto", "http"),
                 "proto": chosen.get("proto", "http"),
@@ -106,6 +106,6 @@ class ProxyManager:
 
 
         # 如果指定的是云端代理池
         # 如果指定的是云端代理池
         if cloud_targets:
         if cloud_targets:
-            return VSCloudApi.Instance().get_next_proxy(cloud_targets, proxy_cd=proxy_cd)
+            return CloudApi.Instance().get_next_proxy(cloud_targets, proxy_cd=proxy_cd)
 
 
         raise BizLogicError(message=f"No valid local or cloud proxy pool specified in {pools}")
         raise BizLogicError(message=f"No valid local or cloud proxy pool specified in {pools}")

+ 1 - 1
toolkit/thread_pool.py

@@ -1,7 +1,7 @@
 # toolkit/thread_pool.py
 # toolkit/thread_pool.py
 import threading
 import threading
 from concurrent.futures import ThreadPoolExecutor, Future
 from concurrent.futures import ThreadPoolExecutor, Future
-from vs_log_macros import VSC_INFO, VSC_ERROR
+from log_macros import VSC_INFO, VSC_ERROR
 
 
 class ThreadPool:
 class ThreadPool:
     """
     """

+ 29 - 29
tools/plugin_tester.py

@@ -14,17 +14,17 @@ project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
 if project_root not in sys.path:
 if project_root not in sys.path:
     sys.path.insert(0, project_root)
     sys.path.insert(0, project_root)
 
 
-from vs_plg import IVSPlg
-from vs_plg_factory import VSPlgFactory
+from plugin import IPlugin
+from plugin_factory import PluginFactory
 from toolkit.proxy_manager import ProxyManager
 from toolkit.proxy_manager import ProxyManager
-from vs_types import (
-    VSPlgConfig, 
-    VSAccount, 
-    VSProxy, 
+from core_types import (
+    PluginConfig, 
+    Account, 
+    Proxy, 
     AppointmentType, 
     AppointmentType, 
     AvailabilityStatus, 
     AvailabilityStatus, 
-    VSQueryResult, 
-    VSBookResult, 
+    QueryResult, 
+    BookResult, 
     PluginStatus
     PluginStatus
 )
 )
 
 
@@ -60,7 +60,7 @@ class PluginTester:
         self,
         self,
         plugin_name: str,
         plugin_name: str,
         group_id: str = "test.group",
         group_id: str = "test.group",
-        config: Optional[VSPlgConfig] = None,
+        config: Optional[PluginConfig] = None,
         user_inputs: Optional[Dict[str, Any]] = None,
         user_inputs: Optional[Dict[str, Any]] = None,
         appointment_types: Optional[List[AppointmentType]] = None,
         appointment_types: Optional[List[AppointmentType]] = None,
         custom_module_path: Optional[str] = None,
         custom_module_path: Optional[str] = None,
@@ -76,10 +76,10 @@ class PluginTester:
         self.custom_class_name = custom_class_name
         self.custom_class_name = custom_class_name
         self.custom_logger = logger
         self.custom_logger = logger
         
         
-        self.factory = VSPlgFactory()
+        self.factory = PluginFactory()
         self._register_plugins()
         self._register_plugins()
         
         
-        self.plugin: Optional[IVSPlg] = None
+        self.plugin: Optional[IPlugin] = None
         self.results: List[StepResult] = []
         self.results: List[StepResult] = []
 
 
     def _log(self, message: str, level: str = "INFO"):
     def _log(self, message: str, level: str = "INFO"):
@@ -99,11 +99,11 @@ class PluginTester:
             self.factory.register_plugin(self.plugin_name, self.custom_module_path, self.custom_class_name)
             self.factory.register_plugin(self.plugin_name, self.custom_module_path, self.custom_class_name)
 
 
     @staticmethod
     @staticmethod
-    def parse_proxy_url(proxy_url: str) -> VSProxy:
-        """从字符串格式代理地址解析 VSProxy 对象"""
+    def parse_proxy_url(proxy_url: str) -> Proxy:
+        """从字符串格式代理地址解析 Proxy 对象"""
         from urllib.parse import urlparse
         from urllib.parse import urlparse
         parsed = urlparse(proxy_url if "://" in proxy_url else f"http://{proxy_url}")
         parsed = urlparse(proxy_url if "://" in proxy_url else f"http://{proxy_url}")
-        return VSProxy(
+        return Proxy(
             id=1,
             id=1,
             proto=parsed.scheme or "http",
             proto=parsed.scheme or "http",
             ip=parsed.hostname or "127.0.0.1",
             ip=parsed.hostname or "127.0.0.1",
@@ -119,18 +119,18 @@ class PluginTester:
         proxy_url: Optional[str] = None,
         proxy_url: Optional[str] = None,
         free_config: Optional[Dict[str, Any]] = None,
         free_config: Optional[Dict[str, Any]] = None,
         debug: bool = True
         debug: bool = True
-    ) -> VSPlgConfig:
-        """快速构建 VSPlgConfig 配置对象"""
-        account = VSAccount(
+    ) -> PluginConfig:
+        """快速构建 PluginConfig 配置对象"""
+        account = Account(
             id=1,
             id=1,
             username=username,
             username=username,
             password=password
             password=password
         )
         )
-        proxy = VSProxy()
+        proxy = Proxy()
         if proxy_url:
         if proxy_url:
             proxy = PluginTester.parse_proxy_url(proxy_url)
             proxy = PluginTester.parse_proxy_url(proxy_url)
 
 
-        return VSPlgConfig(
+        return PluginConfig(
             account=account,
             account=account,
             proxy=proxy,
             proxy=proxy,
             free_config=free_config or {},
             free_config=free_config or {},
@@ -169,7 +169,7 @@ class PluginTester:
         account_data = plugin_data.get("account") or default_data.get("account") or {}
         account_data = plugin_data.get("account") or default_data.get("account") or {}
         username = user_override or account_data.get("username", "")
         username = user_override or account_data.get("username", "")
         password = password_override or account_data.get("password", "")
         password = password_override or account_data.get("password", "")
-        account = VSAccount(
+        account = Account(
             id=account_data.get("id", 1),
             id=account_data.get("id", 1),
             username=username,
             username=username,
             password=password
             password=password
@@ -179,7 +179,7 @@ class PluginTester:
         if proxy_override:
         if proxy_override:
             if proxy_override.startswith("local:") or proxy_override.startswith("cloud:"):
             if proxy_override.startswith("local:") or proxy_override.startswith("cloud:"):
                 raw_proxy = ProxyManager.Instance().get_next_proxy([proxy_override])
                 raw_proxy = ProxyManager.Instance().get_next_proxy([proxy_override])
-                proxy = VSProxy(**raw_proxy)
+                proxy = Proxy(**raw_proxy)
             else:
             else:
                 proxy = cls.parse_proxy_url(proxy_override)
                 proxy = cls.parse_proxy_url(proxy_override)
         else:
         else:
@@ -188,12 +188,12 @@ class PluginTester:
                 if isinstance(pools, str):
                 if isinstance(pools, str):
                     pools = [pools]
                     pools = [pools]
                 raw_proxy = ProxyManager.Instance().get_next_proxy(pools)
                 raw_proxy = ProxyManager.Instance().get_next_proxy(pools)
-                proxy = VSProxy(**raw_proxy)
+                proxy = Proxy(**raw_proxy)
             else:
             else:
                 proxy_data = plugin_data.get("proxy") or default_data.get("proxy")
                 proxy_data = plugin_data.get("proxy") or default_data.get("proxy")
-                proxy = VSProxy()
+                proxy = Proxy()
                 if proxy_data:
                 if proxy_data:
-                    proxy = VSProxy(
+                    proxy = Proxy(
                         id=proxy_data.get("id", 1),
                         id=proxy_data.get("id", 1),
                         proto=proxy_data.get("proto", "http"),
                         proto=proxy_data.get("proto", "http"),
                         ip=proxy_data.get("ip", ""),
                         ip=proxy_data.get("ip", ""),
@@ -206,7 +206,7 @@ class PluginTester:
         session_max_life = plugin_data.get("session_max_life", default_data.get("session_max_life", 3600))
         session_max_life = plugin_data.get("session_max_life", default_data.get("session_max_life", 3600))
         debug = plugin_data.get("debug", default_data.get("debug", True))
         debug = plugin_data.get("debug", default_data.get("debug", True))
 
 
-        config = VSPlgConfig(
+        config = PluginConfig(
             account=account,
             account=account,
             proxy=proxy,
             proxy=proxy,
             free_config=free_config,
             free_config=free_config,
@@ -352,7 +352,7 @@ class PluginTester:
                     visa_type="Tourist"
                     visa_type="Tourist"
                 )
                 )
 
 
-            query_result: VSQueryResult = self.plugin.query(apt_type)
+            query_result: QueryResult = self.plugin.query(apt_type)
             self._log(f"✅ query() returned success={query_result.success}, status={query_result.availability_status}")
             self._log(f"✅ query() returned success={query_result.success}, status={query_result.availability_status}")
             if query_result.earliest_date:
             if query_result.earliest_date:
                 self._log(f"📅 Earliest Available Date: {query_result.earliest_date.strftime('%Y-%m-%d')}")
                 self._log(f"📅 Earliest Available Date: {query_result.earliest_date.strftime('%Y-%m-%d')}")
@@ -365,7 +365,7 @@ class PluginTester:
         self.results.append(res)
         self.results.append(res)
         return res
         return res
 
 
-    def test_book(self, slot_info: Optional[VSQueryResult] = None, user_inputs: Optional[Dict] = None) -> StepResult:
+    def test_book(self, slot_info: Optional[QueryResult] = None, user_inputs: Optional[Dict] = None) -> StepResult:
         """测试 5: 执行预约锁定"""
         """测试 5: 执行预约锁定"""
         t0 = time.time()
         t0 = time.time()
         self._log("▶ [Step 5/7] Testing book()...")
         self._log("▶ [Step 5/7] Testing book()...")
@@ -376,7 +376,7 @@ class PluginTester:
 
 
         if not slot_info:
         if not slot_info:
             target_apt = self.appointment_types[0] if self.appointment_types else AppointmentType(routing_key=f"{self.group_id}.default")
             target_apt = self.appointment_types[0] if self.appointment_types else AppointmentType(routing_key=f"{self.group_id}.default")
-            slot_info = VSQueryResult(
+            slot_info = QueryResult(
                 success=True,
                 success=True,
                 availability_status=AvailabilityStatus.Available,
                 availability_status=AvailabilityStatus.Available,
                 earliest_date=datetime.now(),
                 earliest_date=datetime.now(),
@@ -391,7 +391,7 @@ class PluginTester:
         }
         }
 
 
         try:
         try:
-            book_res: VSBookResult = self.plugin.book(slot_info=slot_info, user_inputs=inputs)
+            book_res: BookResult = self.plugin.book(slot_info=slot_info, user_inputs=inputs)
             self._log(f"✅ book() returned: success={book_res.success}, urn={book_res.urn}, date={book_res.book_date} {book_res.book_time}")
             self._log(f"✅ book() returned: success={book_res.success}, urn={book_res.urn}, date={book_res.book_date} {book_res.book_time}")
             res = StepResult(name="test_book", success=book_res.success, duration_sec=time.time() - t0, data=book_res)
             res = StepResult(name="test_book", success=book_res.success, duration_sec=time.time() - t0, data=book_res)
         except Exception as e:
         except Exception as e:

+ 6 - 6
utils/cloud_config.py

@@ -3,7 +3,7 @@ import json
 import hashlib
 import hashlib
 import time
 import time
 from typing import Any, Tuple, Optional, Callable
 from typing import Any, Tuple, Optional, Callable
-from toolkit.vs_cloud_api import VSCloudApi
+from toolkit.cloud_api import CloudApi
 
 
 
 
 def compute_config_hash(config_data: Any) -> str:
 def compute_config_hash(config_data: Any) -> str:
@@ -16,12 +16,12 @@ def compute_config_hash(config_data: Any) -> str:
 
 
 def fetch_cloud_config(role: str, node_id: str) -> Optional[Any]:
 def fetch_cloud_config(role: str, node_id: str) -> Optional[Any]:
     """
     """
-    使用内置 VSCloudApi 从云端读取指定 role (entry_type) 及 node_id 的节点配置列表。
+    使用内置 CloudApi 从云端读取指定 role (entry_type) 及 node_id 的节点配置列表。
     接口: GET /api/node-configurations/{entry_type}?node_id={node_id}&pageSize=100
     接口: GET /api/node-configurations/{entry_type}?node_id={node_id}&pageSize=100
     返回 items 数组。
     返回 items 数组。
     """
     """
     try:
     try:
-        data = VSCloudApi.Instance().get_node_configurations(entry_type=role, node_id=node_id, page_size=100)
+        data = CloudApi.Instance().get_node_configurations(entry_type=role, node_id=node_id, page_size=100)
         if data and "items" in data:
         if data and "items" in data:
             return data["items"]
             return data["items"]
     except Exception:
     except Exception:
@@ -64,7 +64,7 @@ def load_remote_or_cache(
 ) -> Tuple[Any, str, bool]:
 ) -> Tuple[Any, str, bool]:
     """
     """
     核心拉取与 Fallback 逻辑:
     核心拉取与 Fallback 逻辑:
-    - 若开启了 use_cloud(默认):尝试调用 VSCloudApi 获取指定 role + node_id 的配置列表,成功则写入本地缓存文件;失败则 Fallback 读取本地缓存。
+    - 若开启了 use_cloud(默认):尝试调用 CloudApi 获取指定 role + node_id 的配置列表,成功则写入本地缓存文件;失败则 Fallback 读取本地缓存。
     - 若未开启 use_cloud(显式传了 -c/--config):直接读取本地配置文件。
     - 若未开启 use_cloud(显式传了 -c/--config):直接读取本地配置文件。
     """
     """
     def log_info(msg: str):
     def log_info(msg: str):
@@ -81,7 +81,7 @@ def load_remote_or_cache(
 
 
     if use_cloud:
     if use_cloud:
         try:
         try:
-            log_info(f"Fetching cloud configuration for role '{role}' (node_id: '{node_id}') via VSCloudApi...")
+            log_info(f"Fetching cloud configuration for role '{role}' (node_id: '{node_id}') via CloudApi...")
             data = fetch_cloud_config(role=role, node_id=node_id)
             data = fetch_cloud_config(role=role, node_id=node_id)
             if data is not None:
             if data is not None:
                 config_hash = compute_config_hash(data)
                 config_hash = compute_config_hash(data)
@@ -91,7 +91,7 @@ def load_remote_or_cache(
             else:
             else:
                 log_warn(f"Cloud config for role '{role}' (node_id: '{node_id}') returned empty/null data.")
                 log_warn(f"Cloud config for role '{role}' (node_id: '{node_id}') returned empty/null data.")
         except Exception as e:
         except Exception as e:
-            log_warn(f"Failed to fetch cloud config for role '{role}' (node_id: '{node_id}') via VSCloudApi: {e}")
+            log_warn(f"Failed to fetch cloud config for role '{role}' (node_id: '{node_id}') via CloudApi: {e}")
             log_warn(f"Fallback to local cache file: {local_cache_path}")
             log_warn(f"Fallback to local cache file: {local_cache_path}")
             
             
     local_data = load_local_config(local_cache_path)
     local_data = load_local_config(local_cache_path)

+ 1 - 1
utils/flow_engine.py

@@ -4,7 +4,7 @@ flow_engine.py - 极简声明式注解流引擎 (基于 DrissionPage 原生 API)
 
 
 import time
 import time
 from typing import Optional, Callable, Dict, Any, Type
 from typing import Optional, Callable, Dict, Any, Type
-from vs_types import BizLogicError
+from core_types import BizLogicError
 
 
 
 
 def on(url: Optional[str] = None, 
 def on(url: Optional[str] = None, 

+ 3 - 3
utils/plugin_updater.py

@@ -5,7 +5,7 @@ import requests
 from typing import Dict, Any, List, Optional
 from typing import Dict, Any, List, Optional
 
 
 
 
-from vs_types import PluginMeta
+from core_types import PluginMeta
 
 
 PLUGINS_DIR = "plugins"
 PLUGINS_DIR = "plugins"
 
 
@@ -29,7 +29,7 @@ def is_newer_version(cloud_version: str, local_version: str) -> bool:
 
 
 def _extract_plugin_meta_from_ast(filepath: str) -> Dict[str, str]:
 def _extract_plugin_meta_from_ast(filepath: str) -> Dict[str, str]:
     """
     """
-    通过 AST 静态分析插件代码中的 IVSPlg 子类元数据(name, version, description),
+    通过 AST 静态分析插件代码中的 Iplugin 子类元数据(name, version, description),
     避免直接 import 产生网络请求或浏览器启动等副作用。
     避免直接 import 产生网络请求或浏览器启动等副作用。
     """
     """
     info = {"version": "1.0.0", "name": "", "description": ""}
     info = {"version": "1.0.0", "name": "", "description": ""}
@@ -47,7 +47,7 @@ def _extract_plugin_meta_from_ast(filepath: str) -> Dict[str, str]:
                         elif target.id == "__description__" and isinstance(node.value, ast.Constant):
                         elif target.id == "__description__" and isinstance(node.value, ast.Constant):
                             info["description"] = str(node.value.value)
                             info["description"] = str(node.value.value)
 
 
-            # 2. 检查类定义 (如 class TlsPlugin(IVSPlg): version = "1.0.0")
+            # 2. 检查类定义 (如 class TlsPlugin(IPlugin): version = "1.0.0")
             elif isinstance(node, ast.ClassDef):
             elif isinstance(node, ast.ClassDef):
                 for item in node.body:
                 for item in node.body:
                     if isinstance(item, ast.Assign):
                     if isinstance(item, ast.Assign):

+ 1 - 1
utils/plugin_utils.py

@@ -14,7 +14,7 @@ from typing import List, Dict, Optional, Any, Callable, Tuple
 from urllib.parse import urlencode
 from urllib.parse import urlencode
 
 
 import configure
 import configure
-from vs_types import BizLogicError, NotFoundError
+from core_types import BizLogicError, NotFoundError
 from toolkit.mihomo_tunnel import MihomoTunnel
 from toolkit.mihomo_tunnel import MihomoTunnel
 from utils.fingerprint_utils import FingerprintGenerator
 from utils.fingerprint_utils import FingerprintGenerator
 from DrissionPage import ChromiumOptions
 from DrissionPage import ChromiumOptions

+ 1 - 1
vfs_keygen.py

@@ -22,7 +22,7 @@ from cryptography.hazmat.backends import default_backend
 
 
 import configure
 import configure
 from DrissionPage import ChromiumPage, ChromiumOptions
 from DrissionPage import ChromiumPage, ChromiumOptions
-from vs_types import RateLimiteddError, BizLogicError
+from core_types import RateLimiteddError, BizLogicError
 from toolkit.mihomo_tunnel import MihomoTunnel
 from toolkit.mihomo_tunnel import MihomoTunnel
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser
 from utils.cloudflare_bypass_for_scraping import CloudflareBypasser