ksaa 2025.11b1__py3-none-any.whl → 2025.11b3__py3-none-any.whl

kaa/application/core/feedback_service.py

@@ -0,0 +1,121 @@
+import logging
+import os
+import re
+import zipfile
+from datetime import datetime, timedelta
+from typing import Optional, Callable, Dict, Any
+
+import cv2
+from pydantic import BaseModel
+
+from kaa.errors import ReportCreationError, UploadError
+
+logger = logging.getLogger(__name__)
+
+
+class BugReportResult(BaseModel):
+    """错误报告创建结果的模型"""
+    file_path: str
+    upload_url: Optional[str] = None
+    message: str
+
+
+def _sanitize_filename(s: str) -> str:
+    """过滤掉文件名中的非法字符"""
+    return re.sub(r'[\\/:*?"<>|]', '_', s)
+
+
+class FeedbackService:
+    """处理反馈和错误报告的逻辑"""
+
+    def report(self, title: str, description: str, version: str, upload: bool, on_progress: Optional[Callable[[Dict[str, Any]], None]] = None) -> BugReportResult:
+        """
+        创建并可能上传一个错误报告。
+
+        :param title: 报告标题。
+        :param description: 报告描述。
+        :param version: 当前版本。
+        :param upload: 是否上传报告。
+        :param on_progress: 进度回调函数，用于实时回报进度。
+        :return: 一个 BugReportResult 对象。
+        :raises ReportCreationError: 如果报告创建失败。
+        :raises UploadError: 如果报告上传失败。
+        """
+        from kotonebot import device
+        from kotonebot.backend.context import ContextStackVars
+        
+        total_steps = 6 if upload else 5
+        def _progress(data: Dict[str, Any]):
+            if on_progress:
+                on_progress(data)
+
+        os.makedirs('logs', exist_ok=True)
+        os.makedirs('reports', exist_ok=True)
+
+        safe_title = _sanitize_filename(title)[:30] or "无标题"
+        timestamp = datetime.now().strftime("%y-%m-%d-%H-%M-%S")
+        path = f'./reports/bug_{timestamp}_{safe_title}.zip'
+        
+        try:
+            with zipfile.ZipFile(path, 'w', zipfile.ZIP_DEFLATED, compresslevel=9) as zipf:
+                _progress({'type': 'packing', 'item': '描述文件', 'step': 1, 'total_steps': total_steps})
+                description_content = f"标题：{title}\n类型：bug\n内容：\n{description}"
+                zipf.writestr('description.txt', description_content.encode('utf-8'))
+
+                _progress({'type': 'packing', 'item': '上次截图', 'step': 2, 'total_steps': total_steps})
+                try:
+                    stack = ContextStackVars.current()
+                    if stack and stack._screenshot is not None:
+                        img = cv2.imencode('.png', stack._screenshot)[1].tobytes()
+                        zipf.writestr('last_screenshot.png', img)
+                except Exception as e:
+                    logger.warning(f"保存上次截图失败: {e}")
+
+                _progress({'type': 'packing', 'item': '当前截图', 'step': 3, 'total_steps': total_steps})
+                try:
+                    screenshot = device.screenshot()
+                    img = cv2.imencode('.png', screenshot)[1].tobytes()
+                    zipf.writestr('current_screenshot.png', img)
+                except Exception as e:
+                    logger.warning(f"保存当前截图失败: {e}")
+
+                _progress({'type': 'packing', 'item': '配置文件', 'step': 4, 'total_steps': total_steps})
+                if os.path.exists('config.json'):
+                    zipf.write('config.json')
+
+                _progress({'type': 'packing', 'item': '日志', 'step': 5, 'total_steps': total_steps})
+                if os.path.exists('logs'):
+                    for root, _, files in os.walk('logs'):
+                        for file in files:
+                            file_path = os.path.join(root, file)
+                            arcname = os.path.join('logs', os.path.relpath(file_path, 'logs'))
+                            zipf.write(file_path, arcname)
+                
+                zipf.writestr('version.txt', version)
+        except Exception as e:
+            raise ReportCreationError(str(e)) from e
+
+        file_path = os.path.abspath(path)
+
+        if not upload:
+            message = f"报告已保存至 {file_path}"
+            _progress({'type': 'done', 'file_path': file_path, 'step': 5, 'total_steps': total_steps})
+            return BugReportResult(file_path=file_path, message=message)
+
+        # 上传报告
+        from kotonebot.ui.file_host.sensio import upload as upload_file
+        _progress({'type': 'uploading', 'item': '报告', 'step': 6, 'total_steps': total_steps})
+        try:
+            url = upload_file(file_path)
+        except Exception as e:
+            raise UploadError(str(e)) from e
+
+        expire_time = datetime.now() + timedelta(days=7)
+        final_msg = (
+            f"报告导出成功：{url}\n\n"
+            f"此链接将于 {expire_time.strftime('%Y-%m-%d %H:%M:%S')}（7 天后）过期\n\n"
+            '复制以上文本并反馈给开发者'
+        )
+        _progress({'type': 'done', 'url': url, 'step': 6, 'total_steps': total_steps})
+        return BugReportResult(file_path=file_path, upload_url=url, message=final_msg)
+

kaa/application/core/misc_core.py

@@ -1,11 +1,14 @@
 import os
 import sys
 
-from kotonebot.interop.win.shortcut import create_shortcut
+from kotonebot.util import is_windows, require_windows
+if is_windows():
+    from kotonebot.interop.win.shortcut import create_shortcut
 from kaa.errors import LauncherNotFoundError
 
 
 def create_desktop_shortcut(start_immediately: bool):
+    require_windows('create_desktop_shortcut')
     exe_path = os.path.abspath('./kaa.exe')
     if not os.path.exists(exe_path):
         raise LauncherNotFoundError()

kaa/application/core/update_service.py

@@ -0,0 +1,208 @@
+import logging
+import os
+import subprocess
+import sys
+import json
+import zipfile
+import threading
+import time
+from typing import Optional, List
+from pydantic import BaseModel, Field
+
+from kaa.errors import (
+    UpdateFetchListError, CompatibilityError, UpdateInstallError
+)
+
+logger = logging.getLogger(__name__)
+
+class VersionInfo(BaseModel):
+    """存储版本信息的 Pydantic 模型"""
+    versions: List[str] = Field(default_factory=list)
+    latest: Optional[str] = None
+    installed_version: Optional[str] = None
+    launcher_version: Optional[str] = None
+
+def _compare_versions(version1: str, version2: str) -> int:
+    """
+    比较两个版本字符串。
+
+    :param version1: 第一个版本号
+    :param version2: 第二个版本号
+    :return: -1 表示 version1 < version2, 0 表示 version1 == version2, 1 表示 version1 > version2
+    """
+    if version1 == "0.4.x":
+        version1 = "0.4.0"
+
+    def parse(v):
+        v = v.lstrip('v')
+        parts = v.split('.')
+        base = []
+        pre_release = ''
+        for part in parts:
+            if 'b' in part:
+                base.append(int(part.split('b')[0]))
+                pre_release = ('b', int(part.split('b')[1]))
+                break
+            elif 'a' in part:
+                base.append(int(part.split('a')[0]))
+                pre_release = ('a', int(part.split('a')[1]))
+                break
+            elif 'rc' in part:
+                base.append(int(part.split('rc')[0]))
+                pre_release = ('rc', int(part.split('rc')[1]))
+                break
+            else:
+                base.append(int(part))
+        
+        pre_map = {'a': -2, 'b': -1, 'rc': -0.5}
+        if pre_release:
+            return tuple(base) + (pre_map[pre_release[0]], pre_release[1])
+        return tuple(base) + (0, 0)
+
+    v1_parsed = parse(version1)
+    v2_parsed = parse(version2)
+
+    if v1_parsed < v2_parsed:
+        return -1
+    if v1_parsed > v2_parsed:
+        return 1
+    return 0
+
+class UpdateService:
+    """处理应用程序更新逻辑"""
+
+    def __init__(self, repo_name: str = "ksaa"):
+        self.repo_name = repo_name
+        self.bootstrap_pyz_path = os.path.join(os.getcwd(), "bootstrap.pyz")
+
+    def _get_launcher_version(self) -> Optional[str]:
+        """
+        从 bootstrap.pyz/meta.py 读取启动器版本。
+        
+        :return: 启动器版本字符串，如果无法确定则返回 None。
+        """
+        if not os.path.exists(self.bootstrap_pyz_path):
+            logger.warning("bootstrap.pyz not found.")
+            return None
+
+        try:
+            with zipfile.ZipFile(self.bootstrap_pyz_path, 'r') as zf:
+                if 'meta.py' not in zf.namelist():
+                    logger.warning("meta.py not found in bootstrap.pyz, assuming legacy launcher.")
+                    return "0.4.x"
+
+                meta_content = zf.read('meta.py').decode('utf-8')
+                exec_globals = {}
+                exec_locals = {}
+                exec(meta_content, exec_globals, exec_locals)
+
+                version = exec_locals.get('VERSION')
+                if version and isinstance(version, str):
+                    logger.info(f"Launcher version from meta.py: {version}")
+                    return version.lstrip('v')
+                else:
+                    logger.warning("VERSION not found in meta.py.")
+                    return None
+        except zipfile.BadZipFile:
+            logger.info("bootstrap.pyz is not a valid zip file, assuming legacy launcher.")
+            return "0.4.x"
+        except Exception as e:
+            logger.error(f"Failed to read launcher version: {e}", exc_info=True)
+            return None
+
+    def list_remote_versions(self) -> VersionInfo:
+        """
+        从 PyPI 获取可用版本。
+
+        :return: 包含版本数据的 VersionInfo 对象。
+        :raises UpdateFetchListError: 如果无法获取或解析版本列表。
+        """
+        cmd = [
+            sys.executable, "-m", "pip", "index", "versions", self.repo_name,
+            "--json", "--pre",
+            "--index-url", "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple",
+            "--trusted-host", "mirrors.tuna.tsinghua.edu.cn"
+        ]
+        logger.info(f"Executing: {' '.join(cmd)}")
+
+        try:
+            result = subprocess.run(
+                cmd,
+                capture_output=True,
+                text=True,
+                timeout=30,
+                check=False
+            )
+
+            if result.returncode != 0:
+                raise UpdateFetchListError(result.stderr)
+
+            data = json.loads(result.stdout)
+            version_info = VersionInfo(
+                versions=data.get("versions", []),
+                latest=data.get("latest"),
+                installed_version=data.get("installed_version")
+            )
+            version_info.launcher_version = self._get_launcher_version()
+            logger.info(f"Found {len(version_info.versions)} available versions.")
+            return version_info
+
+        except (subprocess.TimeoutExpired, json.JSONDecodeError, Exception) as e:
+            raise UpdateFetchListError(str(e)) from e
+
+    def _check_compatibility(self, target_version: str) -> Optional[str]:
+        """
+        检查启动器是否与目标版本兼容。
+        
+        :raises CompatibilityError: 如果启动器不兼容。
+        :return: 如果有潜在问题，则返回警告消息，否则返回 None。
+        """
+        launcher_version = self._get_launcher_version()
+        if not launcher_version:
+            return "无法获取启动器版本，可以继续安装但可能存在兼容性问题"
+
+        logger.info(f"Launcher version: {launcher_version}, Target version: {target_version}")
+
+        if _compare_versions(launcher_version, "0.5.0") < 0:
+            if _compare_versions(target_version, "2025.9b1") >= 0:
+                raise CompatibilityError(launcher_version, target_version)
+            else:
+                return "启动器版本较低，建议升级到 v0.5.0 以上"
+        return None
+
+    def install_version(self, version: str):
+        """
+        安装应用程序的特定版本。
+
+        :param version: 要安装的版本。
+        :raises CompatibilityError: 如果启动器不兼容。
+        :raises UpdateInstallError: 如果安装过程启动失败。
+        """
+        if not version:
+            raise ValueError("A version must be selected to install.")
+
+        warning = self._check_compatibility(version)
+        if warning:
+            logger.warning(warning)
+
+        def _install_and_exit():
+            try:
+                time.sleep(1)
+                cmd = [sys.executable, self.bootstrap_pyz_path, f"--install-version={version}"]
+                logger.info(f"Starting installation via launcher: {' '.join(cmd)}")
+
+                subprocess.Popen(
+                    cmd,
+                    cwd=os.getcwd(),
+                    creationflags=subprocess.CREATE_NEW_CONSOLE if os.name == 'nt' else 0
+                )
+                logger.info("Installation process started. Exiting current application.")
+                os._exit(0)
+            except Exception as e:
+                logger.critical(f"Failed to launch installation process: {e}", exc_info=True)
+                
+        try:
+            install_thread = threading.Thread(target=_install_and_exit, daemon=True)
+            install_thread.start()
+        except Exception as e:
+            raise UpdateInstallError(str(e)) from e

kaa/config/schema.py

@@ -78,6 +78,8 @@ class ProduceConfig(ConfigBaseModel):
     """培育的次数。"""
     produce_timeout_cd: int = 60
     """推荐卡检测用时上限；若超时，则随机选择卡片打出。单位为秒，最少为20sec，DMM用户可以设置为30sec"""
+    interrupt_timeout: int = 90
+    """检测超时时间。单位秒。"""
     enable_fever_month: Literal['on', 'off', 'ignore'] = 'ignore'
     """
     是否自动启用强化月间。
@@ -200,6 +202,10 @@ class MiscConfig(ConfigBaseModel):
     * release: 只使用稳定版。
     * beta: 包含预发布版本（如 alpha/beta/rc）。
     """
+    log_level: Literal['debug', 'verbose'] = 'debug'
+    """
+    日志等级。
+    """
 
 class IdleModeConfig(ConfigBaseModel):
     enabled: bool = False

kaa/errors.py

@@ -1,4 +1,5 @@
 import os
+import platform
 from kotonebot.errors import UserFriendlyError
 
 
@@ -19,6 +20,58 @@ class KaaUserFriendlyError(UserFriendlyError, KaaError):
     def __str__(self):
         return f'【发生错误】{self.message}。访问 {self.help_link} 以获取更多帮助。'
 
+class ServiceError(KaaUserFriendlyError):
+    """Base class for service-related errors."""
+    def __init__(self, message: str, help_link: str):
+        super().__init__(message, help_link)
+
+class UpdateServiceError(ServiceError):
+    """Base class for update service errors."""
+    pass
+
+class UpdateFetchListError(UpdateServiceError):
+    def __init__(self, reason: str):
+        super().__init__(
+            f'Failed to fetch version list: {reason}',
+            '' # TODO
+        )
+
+class CompatibilityError(UpdateServiceError):
+    def __init__(self, launcher_version: str, target_version: str):
+        super().__init__(
+            f"❌ 版本兼容性错误\n\n"
+            f"启动器版本: {launcher_version}\n"
+            f"要安装的版本: {target_version}\n\n"
+            f"v2025.9b1 及以上版本需要**启动器 v0.5.0*** 或更高版本支持。\n"
+            f"请先升级启动器到 v0.5.0 以上版本。",
+            ''
+        )
+
+class UpdateInstallError(UpdateServiceError):
+    def __init__(self, reason: str):
+        super().__init__(
+            f'Failed to start installation process: {reason}',
+            'https://www.kdocs.cn/l/cetCY8mGKHLj?linkname=some-link' # TODO
+        )
+
+class FeedbackServiceError(ServiceError):
+    """Base class for feedback service errors."""
+    pass
+
+class ReportCreationError(FeedbackServiceError):
+    def __init__(self, reason: str):
+        super().__init__(
+            f'Failed to create bug report: {reason}',
+            'https://www.kdocs.cn/l/cetCY8mGKHLj?linkname=some-link' # TODO
+        )
+
+class UploadError(FeedbackServiceError):
+    def __init__(self, reason: str):
+        super().__init__(
+            f'Failed to upload bug report: {reason}',
+            'https://www.kdocs.cn/l/cetCY8mGKHLj?linkname=some-link' # TODO
+        )
+
 class ProduceSolutionNotFoundError(KaaUserFriendlyError):
     def __init__(self, solution_id: str):
         self.solution_id = solution_id
@@ -79,3 +132,10 @@ class DmmGameLaunchError(KaaUserFriendlyError):
             f'绕过 DMM 启动器失败，原因：{reason}',
             'https://www.kdocs.cn/l/cetCY8mGKHLj?linkname=pSw7QcH1Kx'
         )
+
+class WindowsOnlyError(KaaUserFriendlyError):
+    def __init__(self, feature_name: str):
+        super().__init__(
+            f'此功能（{feature_name}）仅在 Windows 上可用。当前系统为 {platform.system()}。请不要使用此功能，或在 Windows 上运行 kaa。',
+            'https://www.kdocs.cn/l/cetCY8mGKHLj?linkname=LbvACPfiCw'
+        )