perf: 增加报错显示

2025-02-06 16:43:40 +08:00
parent ad95572d5f
commit 06b5275e48
6 changed files with 107 additions and 60 deletions
@@ -2,7 +2,7 @@ from __future__ import annotations

 from types import ModuleType
 from typing import List, Dict
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 from astrbot.core.config import AstrBotConfig

 star_registry: List[StarMetadata] = []
@@ -40,7 +40,7 @@ class StarMetadata:
    config: AstrBotConfig = None
    '''插件配置'''
    
-    star_handler_full_names: List[str] = None
+    star_handler_full_names: List[str] = field(default_factory=list)
    '''注册的 Handler 的全名列表'''

    def __str__(self) -> str:
@@ -57,7 +57,10 @@ class StarHandlerRegistry(Generic[T]):
            if h[1] == handler:
                self._handlers.pop(i)
                break
-        del self.star_handlers_map[handler.handler_full_name]
+        try:
+            del self.star_handlers_map[handler.handler_full_name]
+        except KeyError:
+            pass
    
    def __iter__(self):
        '''使 StarHandlerRegistry 支持迭代'''
@@ -40,6 +40,8 @@ class PluginManager:
        '''保留插件的路径。在 packages 目录下'''
        self.conf_schema_fname = "_conf_schema.json"
        '''插件配置 Schema 文件名'''
+        
+        self.failed_plugin_info = ""

    def _get_classes(self, arg: ModuleType):
        '''获取指定模块（可以理解为一个 python 文件）下所有的类'''
@@ -263,7 +265,6 @@ class PluginManager:
                    metadata.module_path = path
                    star_map[path] = metadata
                    star_registry.append(metadata)
-                    logger.debug(f"插件 {root_dir_name} 载入成功。")
                
                # 禁用/启用插件
                if metadata.module_path in inactivated_plugins:
@@ -297,8 +298,12 @@ class PluginManager:
                    await metadata.star_cls.initialize()
                    
            except BaseException as e:
-                traceback.print_exc()
-                fail_rec += f"加载 {path} 插件时出现问题，原因 {str(e)}\n"
+                logger.error(f"----- 插件 {root_dir_name} 载入失败 -----")
+                errors = traceback.format_exc()
+                for line in errors.split('\n'):
+                    logger.error(f"| {line}")
+                logger.error("----------------------------------")
+                fail_rec += f"加载 {root_dir_name} 插件时出现问题，原因 {str(e)}。\n"

        # 清除 pip.main 导致的多余的 logging handlers
        for handler in logging.root.handlers[:]:
@@ -307,6 +312,7 @@ class PluginManager:
        if not fail_rec:
            return True, None
        else:
+            self.failed_plugin_info = fail_rec
            return False, fail_rec
        
    async def install_plugin(self, repo_url: str):
@@ -75,10 +75,10 @@ class PluginRoute(Route):
                "version": plugin.version,
                "reserved": plugin.reserved,
                "activated": plugin.activated,
-                "handlers": await self.get_plugin_handlers_info(plugin.star_handler_full_names)
+                "handlers": await self.get_plugin_handlers_info(plugin.star_handler_full_names),
            }
            _plugin_resp.append(_t)
-        return Response().ok(_plugin_resp).__dict__
+        return Response().ok(_plugin_resp, message=self.plugin_manager.failed_plugin_info).__dict__
    
    async def get_plugin_handlers_info(self, handler_full_names: list[str]):
        '''解析插件行为'''
@@ -68,7 +68,7 @@ import config from '@/config';
                  <v-tabs-window-item v-for="(config_item, index) in config_data[key2]" v-show="config_template_tab === index"
                    :key="index" :value="index">
                    <v-container>
-                      <v-btn variant="tonal" rounded="xl" color="error" @click="config_data[key2].splice(index, 1)">
+                      <v-btn variant="tonal" rounded="xl" color="error" @click="deleteItem(key2, index)">
                        删除这项
                      </v-btn>

@@ -215,6 +215,20 @@ export default {
      // new_tmpl_cfg.id = "new_" + val + "_" + this.config_data[config_item_name].length;
      this.config_data[config_item_name].push(new_tmpl_cfg);
      this.config_template_tab = this.config_data[config_item_name].length - 1;
+    },
+    deleteItem(config_item_name, index) {
+      console.log(config_item_name, index);
+      let new_list = [];
+      for (let i = 0; i < this.config_data[config_item_name].length; i++) {
+        if (i !== index) {
+          new_list.push(this.config_data[config_item_name][i]);
+        }
+      }
+      this.config_data[config_item_name] = new_list;
+
+      if (this.config_template_tab > 0) {
+        this.config_template_tab -= 1;
+      }
    }
  },
 }
@@ -15,7 +15,30 @@ import { max } from 'date-fns';
    </v-alert>
    <v-col cols="12" md="12">
      <div style="background-color: white; width: 100%; padding: 16px; border-radius: 10px;">
-        <h3>🧩 已安装的插件</h3>
+        <div style="display: flex; align-items: center;">
+          <h3>🧩 已安装的插件</h3>
+
+          <v-dialog max-width="500px">
+            <template v-slot:activator="{ props }">
+              <v-btn v-bind="props" v-if="extension_data.message" icon  size="small" color="error"
+                style="margin-left: auto;" variant="plain">
+                <v-icon>mdi-alert-circle</v-icon>
+              </v-btn>
+            </template>
+            <v-card>
+              <v-card-title class="headline">错误信息</v-card-title>
+              <v-card-text>{{ extension_data.message }}
+                <br>
+                <small>详情请检查控制台</small> 
+              </v-card-text>
+              
+              <v-card-actions>
+                <v-spacer></v-spacer>
+                <v-btn color="primary" text>关闭</v-btn>
+              </v-card-actions>
+            </v-card>
+          </v-dialog>
+        </div>
      </div>
    </v-col>
    <v-col cols="12" md="6" lg="3" v-for="extension in extension_data.data">
@@ -47,50 +70,50 @@ import { max } from 'date-fns';
      </ExtensionCard>
    </v-col>
    <v-col cols="12" md="12">
-    <div style="background-color: white; width: 100%; padding: 16px; border-radius: 10px;">
-      <div style="display: flex; align-items: center;">
-        <h3>🧩 插件市场</h3>
-        <small style="margin-left: 16px;">如无法显示，请打开 <a
-            href="https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json">链接</a> 复制想安装插件对应的 `repo`
-          链接然后点击右下角 + 号安装，或打开链接下载压缩包安装。</small>
-        <v-btn icon @click="isListView = !isListView" size="small" style="margin-left: auto;" variant="plain">
-          <v-icon>{{ isListView ? 'mdi-view-grid' : 'mdi-view-list' }}</v-icon>
-        </v-btn>  
+      <div style="background-color: white; width: 100%; padding: 16px; border-radius: 10px;">
+        <div style="display: flex; align-items: center;">
+          <h3>🧩 插件市场</h3>
+          <small style="margin-left: 16px;">如无法显示，请打开 <a
+              href="https://soulter.github.io/AstrBot_Plugins_Collection/plugins.json">链接</a> 复制想安装插件对应的 `repo`
+            链接然后点击右下角 + 号安装，或打开链接下载压缩包安装。</small>
+          <v-btn icon @click="isListView = !isListView" size="small" style="margin-left: auto;" variant="plain">
+            <v-icon>{{ isListView ? 'mdi-view-grid' : 'mdi-view-list' }}</v-icon>
+          </v-btn>
+        </div>
      </div>
-    </div>
-  </v-col>
-
-  <v-col cols="12" md="12" v-if="announcement">
-    <v-banner color="success" lines="one" :text="announcement" :stacked="false">
-    </v-banner>
-  </v-col>
-
-  <template v-if="isListView">
-    <v-col cols="12" md="12">
-      <v-data-table :headers="pluginMarketHeaders" :items="pluginMarketData" item-key="name">
-        <template v-slot:item.actions="{ item }">
-          <v-btn v-if="!item.installed" class="text-none mr-2" size="small" text="Read" variant="flat" border
-            @click="extension_url = item.repo; newExtension()">安装</v-btn>
-          <v-btn v-else class="text-none mr-2" size="small" text="Read" variant="flat" border disabled>已安装</v-btn>
-        </template>
-      </v-data-table>
    </v-col>
-  </template>
-  <template v-else>
-    <v-col cols="12" md="6" lg="3" v-for="plugin in pluginMarketData">
-      <ExtensionCard :key="plugin.name" :title="plugin.name" :link="plugin.repo" style="margin-bottom: 4px;">
-        <div style="min-height: 130px; max-height: 130px; overflow: hidden;">
-          <p style="font-weight: bold;">By @{{ plugin.author }}</p>
-          {{ plugin.desc }}
-        </div>
-        <div class="d-flex align-center gap-2">
-          <v-btn v-if="!plugin.installed" class="text-none mr-2" size="small" text="Read" variant="flat" border
-            @click="extension_url = plugin.repo; newExtension()">安装</v-btn>
-          <v-btn v-else class="text-none mr-2" size="small" text="Read" variant="flat" border disabled>已安装</v-btn>
-        </div>
-      </ExtensionCard>
+
+    <v-col cols="12" md="12" v-if="announcement">
+      <v-banner color="success" lines="one" :text="announcement" :stacked="false">
+      </v-banner>
    </v-col>
-  </template>
+
+    <template v-if="isListView">
+      <v-col cols="12" md="12">
+        <v-data-table :headers="pluginMarketHeaders" :items="pluginMarketData" item-key="name">
+          <template v-slot:item.actions="{ item }">
+            <v-btn v-if="!item.installed" class="text-none mr-2" size="small" text="Read" variant="flat" border
+              @click="extension_url = item.repo; newExtension()">安装</v-btn>
+            <v-btn v-else class="text-none mr-2" size="small" text="Read" variant="flat" border disabled>已安装</v-btn>
+          </template>
+        </v-data-table>
+      </v-col>
+    </template>
+    <template v-else>
+      <v-col cols="12" md="6" lg="3" v-for="plugin in pluginMarketData">
+        <ExtensionCard :key="plugin.name" :title="plugin.name" :link="plugin.repo" style="margin-bottom: 4px;">
+          <div style="min-height: 130px; max-height: 130px; overflow: hidden;">
+            <p style="font-weight: bold;">By @{{ plugin.author }}</p>
+            {{ plugin.desc }}
+          </div>
+          <div class="d-flex align-center gap-2">
+            <v-btn v-if="!plugin.installed" class="text-none mr-2" size="small" text="Read" variant="flat" border
+              @click="extension_url = plugin.repo; newExtension()">安装</v-btn>
+            <v-btn v-else class="text-none mr-2" size="small" text="Read" variant="flat" border disabled>已安装</v-btn>
+          </div>
+        </ExtensionCard>
+      </v-col>
+    </template>

    <v-col style="margin-bottom: 16px;" cols="12" md="12">
      <small><a href="https://astrbot.app/dev/plugin.html">插件开发文档</a></small> |
@@ -209,11 +232,11 @@ import { max } from 'date-fns';
    </template>
    <v-card>
      <v-card-title>
-        <span class="text-h5">{{selectedPlugin.name}} 插件行为</span>
+        <span class="text-h5">{{ selectedPlugin.name }} 插件行为</span>
      </v-card-title>
      <v-card-text>
        <v-data-table style="font-size: 17px;" :headers="plugin_handler_info_headers" :items="selectedPlugin.handlers"
-          item-key="name" >
+          item-key="name">
          <template v-slot:header.id="{ column }">
            <p style="font-weight: bold;">{{ column.title }}</p>
          </template>
@@ -262,7 +285,8 @@ export default {
  data() {
    return {
      extension_data: {
-        "data": []
+        "data": [],
+        "message": ""
      },
      extension_url: "",
      status: "",
@@ -338,7 +362,8 @@ export default {
    },
    getExtensions() {
      axios.get('/api/plugin/get').then((res) => {
-        this.extension_data.data = res.data.data;
+        this.extension_data = res.data;
+
        this.checkAlreadyInstalled();
      });
    },
@@ -368,7 +393,7 @@ export default {
            this.onLoadingDialogResult(2, res.data.message, -1);
            return;
          }
-          this.extension_data.data = res.data.data;
+          this.extension_data = res.data;
          this.upload_file = "";
          this.onLoadingDialogResult(1, res.data.message);
          this.dialog = false;
@@ -389,8 +414,7 @@ export default {
              this.onLoadingDialogResult(2, res.data.message, -1);
              return;
            }
-            this.extension_data.data = res.data.data;
-            console.log(this.extension_data);
+            this.extension_data = res.data;
            this.extension_url = "";
            this.onLoadingDialogResult(1, res.data.message);
            this.dialog = false;
@@ -412,7 +436,7 @@ export default {
            this.toast(res.data.message, "error");
            return;
          }
-          this.extension_data.data = res.data.data;
+          this.extension_data = res.data;
          this.toast(res.data.message, "success");
          this.dialog = false;
          this.getExtensions();
@@ -430,7 +454,7 @@ export default {
            this.onLoadingDialogResult(2, res.data.message, -1);
            return;
          }
-          this.extension_data.data = res.data.data;
+          this.extension_data = res.data;
          console.log(this.extension_data);
          this.onLoadingDialogResult(1, res.data.message);
          this.dialog = false;