nonebot-plugin-shiro-web-console 0.1.12__tar.gz → 0.1.14__tar.gz

{nonebot_plugin_shiro_web_console-0.1.12 → nonebot_plugin_shiro_web_console-0.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nonebot-plugin-shiro-web-console
-Version: 0.1.12
+Version: 0.1.14
 Summary: 一个用于 NoneBot2 的网页控制台插件，支持通过浏览器查看日志和发送消息
 Project-URL: Homepage, https://github.com/luojisama/nonebot-plugin-shiro-web-console
 Project-URL: Bug Tracker, https://github.com/luojisama/nonebot-plugin-shiro-web-console/issues
@@ -58,3 +58,15 @@ pip install nonebot-plugin-shiro-web-console
 ```env
 web_console_password=your_password  # 设置固定登录密码
 ```
+
+## 更新日志
+
+### v0.1.14
+- **新增**：完整运行日志记录功能，支持在网页端直接下载。
+- **优化**：添加插件商店操作锁，解决多插件同时更新导致的冲突问题。
+- **优化**：改进插件版本获取逻辑，准确对比版本号并过滤非更新项。
+- **优化**：优化移动端适配及部分 UI 交互。
+
+## 许可证
+
+MIT

{nonebot_plugin_shiro_web_console-0.1.12 → nonebot_plugin_shiro_web_console-0.1.14}/README.md

@@ -27,3 +27,15 @@ pip install nonebot-plugin-shiro-web-console
 ```env
 web_console_password=your_password  # 设置固定登录密码
 ```
+
+## 更新日志
+
+### v0.1.14
+- **新增**：完整运行日志记录功能，支持在网页端直接下载。
+- **优化**：添加插件商店操作锁，解决多插件同时更新导致的冲突问题。
+- **优化**：改进插件版本获取逻辑，准确对比版本号并过滤非更新项。
+- **优化**：优化移动端适配及部分 UI 交互。
+
+## 许可证
+
+MIT

{nonebot_plugin_shiro_web_console-0.1.12 → nonebot_plugin_shiro_web_console-0.1.14}/nonebot_plugin_shiro_web_console/__init__.py

@@ -35,7 +35,7 @@ __plugin_meta__ = PluginMetadata(
     supported_adapters={"~onebot.v11"},
     extra={
         "author": "luojisama",
-        "version": "0.1.12",
+        "version": "0.1.13",
         "pypi_test": "nonebot-plugin-shiro-web-console",
     },
 )
@@ -611,6 +611,7 @@ if app:
     @app.get("/web_console/api/plugins", dependencies=[Depends(check_auth)])
     async def get_plugins():
         from nonebot import get_loaded_plugins
+        from importlib.metadata import version, PackageNotFoundError
         import os
         plugins = []
         for p in get_loaded_plugins():
@@ -627,11 +628,26 @@ if app:
             elif module_name.startswith("nonebot_plugin_"):
                 plugin_type = "store"
                 
+            # 获取版本号
+            ver = "0.0.0"
+            # 优先尝试从 importlib 获取真实安装版本
+            try:
+                # 尝试将包名中的下划线替换为连字符（常见 PyPI 命名规范）
+                pkg_name = module_name.replace("_", "-")
+                ver = version(pkg_name)
+            except PackageNotFoundError:
+                try:
+                    ver = version(module_name)
+                except PackageNotFoundError:
+                    # 如果获取失败，回退到元数据中的版本
+                    if metadata and metadata.extra and "version" in metadata.extra:
+                         ver = metadata.extra.get("version", "0.0.0")
+
             plugins.append({
                 "id": p.name,
                 "name": metadata.name if metadata else p.name,
                 "description": metadata.description if metadata else "暂无描述",
-                "version": metadata.extra.get("version", "1.0.0") if metadata and metadata.extra else "1.0.0",
+                "version": ver,
                 "type": plugin_type,
                 "module": module_name,
                 "homepage": metadata.homepage if metadata else None
@@ -751,84 +767,90 @@ if app:
 
     @app.post("/web_console/api/store/action", dependencies=[Depends(check_auth)])
     async def store_action(request: Request):
-        data = await request.json()
-        action = data.get("action")  # install, update, uninstall
-        plugin_name = data.get("plugin")
+        # 尝试获取锁，如果已被占用则立即返回错误，或等待
+        # 这里选择等待，确保操作按顺序执行
+        if store_lock.locked():
+             logger.warning("插件操作正在进行中，请求已排队...")
         
-        if not action or not plugin_name:
-            return {"error": "参数错误"}
+        async with store_lock:
+            data = await request.json()
+            action = data.get("action")  # install, update, uninstall
+            plugin_name = data.get("plugin")
             
-        if not re.match(r'^[a-zA-Z0-9_-]+$', plugin_name):
-            return {"error": "非法插件名称"}
-
-        # 执行命令
-        import asyncio
-        import sys
-        
-        # 构建命令
-        cmd = []
-        # 尝试定位 nb 命令
-        import shutil
-        nb_path = shutil.which("nb")
-        
-        if not nb_path:
-            # 如果系统 PATH 中找不到，再尝试在 Python 脚本目录下找
-            script_dir = os.path.dirname(sys.executable)
-            possible_nb = os.path.join(script_dir, "nb.exe" if sys.platform == "win32" else "nb")
-            if os.path.exists(possible_nb):
-                nb_path = possible_nb
-            else:
-                nb_path = "nb" # 最后的保底，尝试直接运行 nb
-
-        # 获取项目根目录 (通常是当前工作目录)
-        root_dir = Path.cwd()
+            if not action or not plugin_name:
+                return {"error": "参数错误"}
+                
+            if not re.match(r'^[a-zA-Z0-9_-]+$', plugin_name):
+                return {"error": "非法插件名称"}
 
-        if action == "install":
-            cmd = [nb_path, "plugin", "install", plugin_name]
-        elif action == "update":
-            cmd = [nb_path, "plugin", "update", plugin_name]
-        elif action == "uninstall":
-            cmd = [nb_path, "plugin", "uninstall", plugin_name]
-        else:
-            return {"error": "无效操作"}
-            
-        logger.info(f"开始执行插件操作: {' '.join(cmd)} (工作目录: {root_dir})")
-        
-        try:
-            process = await asyncio.create_subprocess_exec(
-                *cmd,
-                stdout=asyncio.subprocess.PIPE,
-                stderr=asyncio.subprocess.PIPE,
-                cwd=str(root_dir)
-            )
+            # 执行命令
+            import asyncio
+            import sys
             
-            stdout_bytes, stderr_bytes = await process.communicate()
+            # 构建命令
+            cmd = []
+            # 尝试定位 nb 命令
+            import shutil
+            nb_path = shutil.which("nb")
             
-            def safe_decode(data: bytes) -> str:
-                if not data:
-                    return ""
-                for encoding in ["utf-8", "gbk", "cp936"]:
-                    try:
-                        return data.decode(encoding).strip()
-                    except UnicodeDecodeError:
-                        continue
-                return data.decode("utf-8", errors="replace").strip()
+            if not nb_path:
+                # 如果系统 PATH 中找不到，再尝试在 Python 脚本目录下找
+                script_dir = os.path.dirname(sys.executable)
+                possible_nb = os.path.join(script_dir, "nb.exe" if sys.platform == "win32" else "nb")
+                if os.path.exists(possible_nb):
+                    nb_path = possible_nb
+                else:
+                    nb_path = "nb" # 最后的保底，尝试直接运行 nb
 
-            stdout = safe_decode(stdout_bytes)
-            stderr = safe_decode(stderr_bytes)
-            
-            if process.returncode == 0:
-                msg = f"插件 {plugin_name} {action} 成功"
-                logger.info(msg)
-                return {"msg": msg, "output": stdout}
+            # 获取项目根目录 (通常是当前工作目录)
+            root_dir = Path.cwd()
+
+            if action == "install":
+                cmd = [nb_path, "plugin", "install", plugin_name]
+            elif action == "update":
+                cmd = [nb_path, "plugin", "update", plugin_name]
+            elif action == "uninstall":
+                cmd = [nb_path, "plugin", "uninstall", plugin_name]
             else:
-                error_msg = stderr or stdout
-                logger.error(f"插件操作失败: {error_msg}")
-                return {"error": error_msg}
+                return {"error": "无效操作"}
                 
-        except Exception as e:
-            logger.error(f"执行插件命令时发生异常: {e}")
-            return {"error": str(e)}
+            logger.info(f"开始执行插件操作: {' '.join(cmd)} (工作目录: {root_dir})")
+            
+            try:
+                process = await asyncio.create_subprocess_exec(
+                    *cmd,
+                    stdout=asyncio.subprocess.PIPE,
+                    stderr=asyncio.subprocess.PIPE,
+                    cwd=str(root_dir)
+                )
+                
+                stdout_bytes, stderr_bytes = await process.communicate()
+                
+                def safe_decode(data: bytes) -> str:
+                    if not data:
+                        return ""
+                    for encoding in ["utf-8", "gbk", "cp936"]:
+                        try:
+                            return data.decode(encoding).strip()
+                        except UnicodeDecodeError:
+                            continue
+                    return data.decode("utf-8", errors="replace").strip()
+
+                stdout = safe_decode(stdout_bytes)
+                stderr = safe_decode(stderr_bytes)
+                
+                if process.returncode == 0:
+                    msg = f"插件 {plugin_name} {action} 成功"
+                    logger.info(msg)
+                    return {"msg": msg, "output": stdout}
+                else:
+                    error_msg = stderr or stdout
+                    logger.error(f"插件操作失败: {error_msg}")
+                    return {"error": error_msg}
+                    
+            except Exception as e:
+                logger.error(f"执行插件命令时发生异常: {e}")
+                return {"error": str(e)}
 
     @app.post("/web_console/api/plugins/{plugin_id}/config", dependencies=[Depends(check_auth)])
     async def update_plugin_config(plugin_id: str, new_config: dict):

{nonebot_plugin_shiro_web_console-0.1.12 → nonebot_plugin_shiro_web_console-0.1.14}/nonebot_plugin_shiro_web_console/static/index.html

@@ -554,6 +554,7 @@
                         <div style="font-weight: bold; font-size: 1.2em;">NoneBot 日志</div>
                         <div style="display: flex; gap: 10px;">
                             <button onclick="fetchLogs()" style="padding: 5px 12px; background: var(--primary-color); color: white; border: none; border-radius: 4px; cursor: pointer; font-size: 0.9em;">刷新</button>
+                            <button id="btn-download-log" onclick="downloadFullLog()" style="padding: 5px 12px; background: #28a745; color: white; border: none; border-radius: 4px; cursor: pointer; font-size: 0.9em;" title="下载完整运行日志">下载日志</button>
                             <button onclick="document.getElementById('log-viewer').innerHTML = ''" style="padding: 5px 12px; background: #dc3545; color: white; border: none; border-radius: 4px; cursor: pointer; font-size: 0.9em;">清屏</button>
                         </div>
                     </div>
@@ -1092,6 +1093,19 @@
             }
         }
 
+        function compareVersions(v1, v2) {
+            const parts1 = v1.split('.').map(p => parseInt(p, 10) || 0);
+            const parts2 = v2.split('.').map(p => parseInt(p, 10) || 0);
+            
+            for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
+                const n1 = parts1[i] || 0;
+                const n2 = parts2[i] || 0;
+                if (n1 > n2) return 1;
+                if (n1 < n2) return -1;
+            }
+            return 0;
+        }
+
         async function openUpdates() {
             const listEl = document.getElementById('updates-list');
             const countEl = document.getElementById('updates-count');
@@ -1122,12 +1136,12 @@
                     const storePlugin = storeData.find(s => s.module_name === local.module || s.project_link === local.id);
                     
                     if (storePlugin) {
-                        // 简单版本比较: 如果字符串不相等，且 store 版本通常较新
                         // 移除 'v' 前缀进行比较
                         const v1 = (local.version || '0.0.0').replace(/^v/, '');
                         const v2 = (storePlugin.version || '0.0.0').replace(/^v/, '');
                         
-                        if (v1 !== v2) {
+                        // 只显示商店版本大于本地版本的情况
+                        if (compareVersions(v2, v1) > 0) {
                             updates.push({
                                 local: local,
                                 store: storePlugin
@@ -1684,6 +1698,36 @@
         sendBtn.onclick = sendMessage;
         msgInput.onkeypress = (e) => { if (e.key === 'Enter') sendMessage(); };
 
+        // 下载完整日志
+        async function downloadFullLog() {
+            const btn = document.getElementById('btn-download-log');
+            const originalText = btn.textContent;
+            btn.textContent = '下载中...';
+            btn.disabled = true;
+            try {
+                const res = await authorizedFetch('/web_console/api/logs/download');
+                if (res.status === 404) {
+                    alert('暂无完整日志记录');
+                    return;
+                }
+                if (!res.ok) throw new Error('下载失败');
+                const blob = await res.blob();
+                const url = window.URL.createObjectURL(blob);
+                const a = document.createElement('a');
+                a.href = url;
+                a.download = `nonebot_full_${new Date().toISOString().slice(0,10)}.log`;
+                document.body.appendChild(a);
+                a.click();
+                window.URL.revokeObjectURL(url);
+                document.body.removeChild(a);
+            } catch (e) {
+                alert('下载日志失败: ' + e.message);
+            } finally {
+                btn.textContent = originalText;
+                btn.disabled = false;
+            }
+        }
+
         // 初始化
         fetchChats();
         initWS();

{nonebot_plugin_shiro_web_console-0.1.12 → nonebot_plugin_shiro_web_console-0.1.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-shiro-web-console"
-version = "0.1.12"
+version = "0.1.14"
 description = "一个用于 NoneBot2 的网页控制台插件，支持通过浏览器查看日志和发送消息"
 readme = "README.md"
 requires-python = ">=3.9"