{
const sortBy = ref("default"); // default, stars, author, updated
const sortOrder = ref("desc"); // desc (降序) or asc (升序)
const randomPluginNames = ref([]);
+ const showRandomPlugins = ref(true);
// 插件市场拼音搜索
const normalizeStr = (s) => (s ?? "").toString().toLowerCase().trim();
@@ -419,6 +420,14 @@ export const useExtensionPage = () => {
.slice(0, Math.min(RANDOM_PLUGINS_COUNT, shuffled.length))
.map((plugin) => plugin.name);
};
+
+ const toggleRandomPluginsVisibility = () => {
+ showRandomPlugins.value = !showRandomPlugins.value;
+ };
+
+ const collapseRandomPlugins = () => {
+ showRandomPlugins.value = false;
+ };
// 分页计算属性
const displayItemsPerPage = 9; // 固定每页显示9个卡片（3行）
@@ -1448,6 +1457,10 @@ export const useExtensionPage = () => {
// 搜索防抖处理
let searchDebounceTimer = null;
watch(marketSearch, (newVal) => {
+ if (activeTab.value === "market") {
+ collapseRandomPlugins();
+ }
+
if (searchDebounceTimer) {
clearTimeout(searchDebounceTimer);
}
@@ -1458,6 +1471,12 @@ export const useExtensionPage = () => {
currentPage.value = 1;
}, 300); // 300ms 防抖延迟
});
+
+ watch(currentPage, (newPage, oldPage) => {
+ if (newPage === oldPage) return;
+ if (activeTab.value !== "market") return;
+ collapseRandomPlugins();
+ });
// 监听显示模式变化并保存到 localStorage
watch(isListView, (newVal) => {
@@ -1571,6 +1590,7 @@ export const useExtensionPage = () => {
sortBy,
sortOrder,
randomPluginNames,
+ showRandomPlugins,
normalizeStr,
toPinyinText,
toInitials,
@@ -1585,6 +1605,8 @@ export const useExtensionPage = () => {
randomPlugins,
shufflePlugins,
refreshRandomPlugins,
+ toggleRandomPluginsVisibility,
+ collapseRandomPlugins,
displayItemsPerPage,
totalPages,
paginatedPlugins,
From 26e68ed6a52f55d2dd66bea57af00166895c0e80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=B0=B8=E8=B5=AB?= <1259085392@qq.com>
Date: Fri, 27 Feb 2026 23:43:57 +0900
Subject: [PATCH 07/13] refactor: extract extension helpers and simplify
uninstall flow
---
dashboard/src/composables/useTimedMessage.js | 40 ++++
dashboard/src/utils/errorUtils.js | 10 +
.../src/views/extension/useExtensionPage.js | 177 +++++++-----------
3 files changed, 113 insertions(+), 114 deletions(-)
create mode 100644 dashboard/src/composables/useTimedMessage.js
create mode 100644 dashboard/src/utils/errorUtils.js
diff --git a/dashboard/src/composables/useTimedMessage.js b/dashboard/src/composables/useTimedMessage.js
new file mode 100644
index 000000000..526d107af
--- /dev/null
+++ b/dashboard/src/composables/useTimedMessage.js
@@ -0,0 +1,40 @@
+import { reactive } from "vue";
+
+export const useTimedMessage = (initialType = "success") => {
+ const state = reactive({
+ message: "",
+ type: initialType,
+ });
+
+ let timer = null;
+
+ const clearTimer = () => {
+ if (timer) {
+ clearTimeout(timer);
+ timer = null;
+ }
+ };
+
+ const clearMessage = () => {
+ state.message = "";
+ clearTimer();
+ };
+
+ const setMessage = (message, type = initialType, duration = 4000) => {
+ state.message = message || "";
+ state.type = type;
+ clearTimer();
+ if (duration > 0 && state.message) {
+ timer = setTimeout(() => {
+ state.message = "";
+ }, duration);
+ }
+ };
+
+ return {
+ state,
+ setMessage,
+ clearMessage,
+ clearTimer,
+ };
+};
diff --git a/dashboard/src/utils/errorUtils.js b/dashboard/src/utils/errorUtils.js
new file mode 100644
index 000000000..147e00b63
--- /dev/null
+++ b/dashboard/src/utils/errorUtils.js
@@ -0,0 +1,10 @@
+const INVALID_ERROR_STRINGS = new Set(["[object Object]", "undefined", "null"]);
+
+export const resolveErrorMessage = (err, fallbackMessage = "") => {
+ const fromResponse = err?.response?.data?.message;
+ const fromError = err?.message;
+ const raw = err != null ? String(err) : "";
+ const fromString = INVALID_ERROR_STRINGS.has(raw) ? "" : raw;
+
+ return fromResponse || fromError || fromString || fallbackMessage;
+};
diff --git a/dashboard/src/views/extension/useExtensionPage.js b/dashboard/src/views/extension/useExtensionPage.js
index 7bd81dfcd..b971102a3 100644
--- a/dashboard/src/views/extension/useExtensionPage.js
+++ b/dashboard/src/views/extension/useExtensionPage.js
@@ -2,44 +2,13 @@ import axios from "axios";
import { pinyin } from "pinyin-pro";
import { useCommonStore } from "@/stores/common";
import { useI18n, useModuleI18n } from "@/i18n/composables";
-import defaultPluginIcon from "@/assets/images/plugin_icon.png";
import { getPlatformDisplayName } from "@/utils/platformUtils";
+import { useTimedMessage } from "@/composables/useTimedMessage";
+import { resolveErrorMessage } from "@/utils/errorUtils";
import { ref, computed, onMounted, onUnmounted, reactive, watch } from "vue";
import { useRoute, useRouter } from "vue-router";
import { useDisplay } from "vuetify";
-const useTimedMessage = (initialType = "success") => {
- const state = reactive({
- message: "",
- type: initialType,
- });
- let timer = null;
-
- const clearTimer = () => {
- if (timer) {
- clearTimeout(timer);
- timer = null;
- }
- };
-
- const setMessage = (message, type = initialType, duration = 4000) => {
- state.message = message || "";
- state.type = type;
- clearTimer();
- if (duration > 0 && state.message) {
- timer = setTimeout(() => {
- state.message = "";
- }, duration);
- }
- };
-
- return {
- state,
- setMessage,
- clearTimer,
- };
-};
-
export const useExtensionPage = () => {
@@ -171,6 +140,7 @@ export const useExtensionPage = () => {
const {
state: reloadFeedback,
setMessage: setReloadFeedback,
+ clearMessage: clearReloadFeedback,
clearTimer: clearReloadFeedbackTimer,
} = useTimedMessage();
@@ -461,14 +431,6 @@ export const useExtensionPage = () => {
snack_show.value = true;
snack_success.value = success;
};
- const resolveErrorMessage = (err, fallbackMessage = "") => {
- return (
- err?.response?.data?.message ||
- err?.message ||
- String(err) ||
- fallbackMessage
- );
- };
const resetLoadingDialog = () => {
loadingDialog.show = false;
@@ -549,7 +511,7 @@ export const useExtensionPage = () => {
const reloadFailedPlugin = async (dirName) => {
// Reset stale inline feedback before each retry attempt
- setReloadFeedback("", "success", 0);
+ clearReloadFeedback();
if (!dirName) {
return;
@@ -571,34 +533,44 @@ export const useExtensionPage = () => {
}
};
- const requestUninstallPlugin = (name) => {
- if (!name) return;
- uninstallTarget.value = { type: "normal", id: name };
+ const requestUninstall = (kind, id) => {
+ if (!id) return;
+ uninstallTarget.value = { kind, id };
showUninstallDialog.value = true;
};
+ const requestUninstallPlugin = (name) => {
+ requestUninstall("normal", name);
+ };
+
const requestUninstallFailedPlugin = (dirName) => {
- if (!dirName) return;
- uninstallTarget.value = { type: "failed", id: dirName };
- showUninstallDialog.value = true;
+ requestUninstall("failed", dirName);
};
- const uninstallFailedPlugin = async (dirName, options = {}) => {
- const {
- deleteConfig = false,
- deleteData = false,
- skipConfirm = false,
- } = options;
+ const performUninstall = async (target, options = {}) => {
+ if (!target?.id) return;
- if (!skipConfirm) {
- requestUninstallFailedPlugin(dirName);
- return;
- }
+ const { deleteConfig = false, deleteData = false } = options || {};
+ toast(`${tm("messages.uninstalling")} ${target.id}`, "primary");
- toast(tm("messages.uninstalling") + " " + dirName, "primary");
try {
- const res = await axios.post("/api/plugin/uninstall-failed", {
- dir_name: dirName,
+ if (target.kind === "failed") {
+ const res = await axios.post("/api/plugin/uninstall-failed", {
+ dir_name: target.id,
+ delete_config: deleteConfig,
+ delete_data: deleteData,
+ });
+ if (res.data.status === "error") {
+ toast(res.data.message, "error");
+ return;
+ }
+ toast(res.data.message, "success");
+ await getExtensions();
+ return;
+ }
+
+ const res = await axios.post("/api/plugin/uninstall", {
+ name: target.id,
delete_config: deleteConfig,
delete_data: deleteData,
});
@@ -606,12 +578,22 @@ export const useExtensionPage = () => {
toast(res.data.message, "error");
return;
}
+ Object.assign(extension_data, res.data);
toast(res.data.message, "success");
await getExtensions();
} catch (err) {
toast(resolveErrorMessage(err), "error");
}
};
+
+ const uninstallFailedPlugin = async (dirName, options = null) => {
+ if (!dirName) return;
+ if (!options || typeof options !== "object") {
+ requestUninstallFailedPlugin(dirName);
+ return;
+ }
+ await performUninstall({ kind: "failed", id: dirName }, options);
+ };
const checkUpdate = () => {
const onlinePluginsMap = new Map();
@@ -642,69 +624,36 @@ export const useExtensionPage = () => {
});
};
- const uninstallExtension = async (
- extension_name,
- optionsOrSkipConfirm = false,
- ) => {
- let deleteConfig = false;
- let deleteData = false;
- let skipConfirm = false;
-
- // 处理参数：可能是布尔值（旧的 skipConfirm）或对象（新的选项）
+ const uninstallExtension = async (extensionName, optionsOrSkipConfirm = false) => {
+ if (!extensionName) return;
+
if (typeof optionsOrSkipConfirm === "boolean") {
- skipConfirm = optionsOrSkipConfirm;
- } else if (
- typeof optionsOrSkipConfirm === "object" &&
- optionsOrSkipConfirm !== null
- ) {
- deleteConfig = optionsOrSkipConfirm.deleteConfig || false;
- deleteData = optionsOrSkipConfirm.deleteData || false;
- skipConfirm = true; // 如果传递了选项对象，说明已经确认过了
- }
-
- // 如果没有跳过确认且没有传递选项对象，显示自定义卸载对话框
- if (!skipConfirm) {
- requestUninstallPlugin(extension_name);
- return; // 等待对话框回调
- }
-
- // 执行卸载
- toast(tm("messages.uninstalling") + " " + extension_name, "primary");
- try {
- const res = await axios.post("/api/plugin/uninstall", {
- name: extension_name,
- delete_config: deleteConfig,
- delete_data: deleteData,
- });
- if (res.data.status === "error") {
- toast(res.data.message, "error");
+ if (!optionsOrSkipConfirm) {
+ requestUninstallPlugin(extensionName);
return;
}
- Object.assign(extension_data, res.data);
- toast(res.data.message, "success");
- getExtensions();
- } catch (err) {
- toast(err, "error");
+ await performUninstall({ kind: "normal", id: extensionName });
+ return;
}
+
+ const options =
+ typeof optionsOrSkipConfirm === "object" && optionsOrSkipConfirm !== null
+ ? optionsOrSkipConfirm
+ : {};
+ await performUninstall({ kind: "normal", id: extensionName }, options);
};
// 处理卸载确认对话框的确认事件
- const handleUninstallConfirm = (options) => {
+ const handleUninstallConfirm = async (options) => {
const target = uninstallTarget.value;
if (!target) return;
- if (target.type === "failed") {
- uninstallFailedPlugin(target.id, {
- deleteConfig: options?.deleteConfig || false,
- deleteData: options?.deleteData || false,
- skipConfirm: true,
- });
- } else if (target.type === "normal") {
- uninstallExtension(target.id, options);
+ try {
+ await performUninstall(target, options);
+ } finally {
+ uninstallTarget.value = null;
+ showUninstallDialog.value = false;
}
-
- uninstallTarget.value = null;
- showUninstallDialog.value = false;
};
const updateExtension = async (extension_name, forceUpdate = false) => {
@@ -908,7 +857,7 @@ export const useExtensionPage = () => {
const reloadPlugin = async (plugin_name) => {
try {
- reloadFeedback.message = "";
+ clearReloadFeedback();
const res = await axios.post("/api/plugin/reload", { name: plugin_name });
if (res.data.status === "error") {
toast(res.data.message || tm("messages.reloadFailed"), "error");
From 4bab09a4e784d0d1790efb8e18204dcf29db0e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=B0=B8=E8=B5=AB?= <1259085392@qq.com>
Date: Fri, 27 Feb 2026 23:51:30 +0900
Subject: [PATCH 08/13] refactor: improve failed plugin diagnostics and
uninstall flow
---
astrbot/core/star/star_manager.py | 12 +-
.../src/views/extension/useExtensionPage.js | 141 ++++++++++--------
2 files changed, 90 insertions(+), 63 deletions(-)
diff --git a/astrbot/core/star/star_manager.py b/astrbot/core/star/star_manager.py
index 5733cc170..67b255472 100644
--- a/astrbot/core/star/star_manager.py
+++ b/astrbot/core/star/star_manager.py
@@ -461,9 +461,19 @@ def _rebuild_failed_plugin_info(self) -> None:
for dir_name, info in self.failed_plugin_dict.items():
if isinstance(info, dict):
error = info.get("error", "未知错误")
+ display_name = info.get("display_name") or info.get("name") or dir_name
+ version = info.get("version") or info.get("astrbot_version")
+ if version:
+ lines.append(
+ f"加载插件「{display_name}」(目录: {dir_name}, 版本: {version}) 时出现问题，原因：{error}。",
+ )
+ else:
+ lines.append(
+ f"加载插件「{display_name}」(目录: {dir_name}) 时出现问题，原因：{error}。",
+ )
else:
error = str(info)
- lines.append(f"加载 {dir_name} 插件时出现问题，原因 {error}。")
+ lines.append(f"加载插件目录 {dir_name} 时出现问题，原因：{error}。")
self.failed_plugin_info = "\n".join(lines) + "\n"
diff --git a/dashboard/src/views/extension/useExtensionPage.js b/dashboard/src/views/extension/useExtensionPage.js
index b971102a3..ebc53ae12 100644
--- a/dashboard/src/views/extension/useExtensionPage.js
+++ b/dashboard/src/views/extension/useExtensionPage.js
@@ -509,68 +509,69 @@ export const useExtensionPage = () => {
}
};
+ const showReloadFeedback = (message, type) => {
+ clearReloadFeedback();
+ setReloadFeedback(message, type);
+ toast(message, type === "success" ? "success" : "error");
+ };
+
const reloadFailedPlugin = async (dirName) => {
- // Reset stale inline feedback before each retry attempt
+ if (!dirName) return;
clearReloadFeedback();
- if (!dirName) {
- return;
- }
try {
const res = await axios.post("/api/plugin/reload-failed", { dir_name: dirName });
if (res.data.status === "error") {
- const message = res.data.message || tm("messages.reloadFailed");
- setReloadFeedback(message, "error");
- toast(message, "error");
+ showReloadFeedback(res.data.message || tm("messages.reloadFailed"), "error");
return;
}
- setReloadFeedback(res.data.message || tm("messages.reloadSuccess"), "success");
+ showReloadFeedback(res.data.message || tm("messages.reloadSuccess"), "success");
await getExtensions();
} catch (err) {
- const message = resolveErrorMessage(err, tm("messages.reloadFailed"));
- setReloadFeedback(message, "error");
- toast(message, "error");
+ showReloadFeedback(
+ resolveErrorMessage(err, tm("messages.reloadFailed")),
+ "error",
+ );
}
};
- const requestUninstall = (kind, id) => {
- if (!id) return;
- uninstallTarget.value = { kind, id };
+ const openUninstallDialog = (target) => {
+ if (!target?.id) return;
+ uninstallTarget.value = target;
showUninstallDialog.value = true;
};
- const requestUninstallPlugin = (name) => {
- requestUninstall("normal", name);
- };
-
- const requestUninstallFailedPlugin = (dirName) => {
- requestUninstall("failed", dirName);
- };
-
- const performUninstall = async (target, options = {}) => {
- if (!target?.id) return;
-
- const { deleteConfig = false, deleteData = false } = options || {};
- toast(`${tm("messages.uninstalling")} ${target.id}`, "primary");
-
+ const doUninstallNormal = async (
+ name,
+ { deleteConfig = false, deleteData = false } = {},
+ ) => {
+ toast(`${tm("messages.uninstalling")} ${name}`, "primary");
try {
- if (target.kind === "failed") {
- const res = await axios.post("/api/plugin/uninstall-failed", {
- dir_name: target.id,
- delete_config: deleteConfig,
- delete_data: deleteData,
- });
- if (res.data.status === "error") {
- toast(res.data.message, "error");
- return;
- }
- toast(res.data.message, "success");
- await getExtensions();
+ const res = await axios.post("/api/plugin/uninstall", {
+ name,
+ delete_config: deleteConfig,
+ delete_data: deleteData,
+ });
+ if (res.data.status === "error") {
+ toast(res.data.message, "error");
return;
}
+ Object.assign(extension_data, res.data);
+ toast(res.data.message, "success");
+ await getExtensions();
+ } catch (err) {
+ toast(resolveErrorMessage(err), "error");
+ }
+ };
- const res = await axios.post("/api/plugin/uninstall", {
- name: target.id,
+ const doUninstallFailed = async (
+ dirName,
+ { deleteConfig = false, deleteData = false } = {},
+ ) => {
+ toast(`${tm("messages.uninstalling")} ${dirName}`, "primary");
+ try {
+ const res = await axios.post("/api/plugin/uninstall-failed", {
+ dir_name: dirName,
delete_config: deleteConfig,
delete_data: deleteData,
});
@@ -578,7 +579,6 @@ export const useExtensionPage = () => {
toast(res.data.message, "error");
return;
}
- Object.assign(extension_data, res.data);
toast(res.data.message, "success");
await getExtensions();
} catch (err) {
@@ -586,13 +586,36 @@ export const useExtensionPage = () => {
}
};
- const uninstallFailedPlugin = async (dirName, options = null) => {
+ const uninstallNormalPlugin = async (
+ name,
+ { skipConfirm = false, ...options } = {},
+ ) => {
+ if (!name) return;
+ if (!skipConfirm) {
+ openUninstallDialog({ kind: "normal", id: name });
+ return;
+ }
+ await doUninstallNormal(name, options);
+ };
+
+ const uninstallFailedPlugin = async (
+ dirName,
+ { skipConfirm = false, ...options } = {},
+ ) => {
if (!dirName) return;
- if (!options || typeof options !== "object") {
- requestUninstallFailedPlugin(dirName);
+ if (!skipConfirm) {
+ openUninstallDialog({ kind: "failed", id: dirName });
return;
}
- await performUninstall({ kind: "failed", id: dirName }, options);
+ await doUninstallFailed(dirName, options);
+ };
+
+ const requestUninstallPlugin = (name) => {
+ uninstallNormalPlugin(name);
+ };
+
+ const requestUninstallFailedPlugin = (dirName) => {
+ uninstallFailedPlugin(dirName);
};
const checkUpdate = () => {
@@ -624,23 +647,13 @@ export const useExtensionPage = () => {
});
};
- const uninstallExtension = async (extensionName, optionsOrSkipConfirm = false) => {
+ const uninstallExtension = async (extensionName, options = null) => {
if (!extensionName) return;
-
- if (typeof optionsOrSkipConfirm === "boolean") {
- if (!optionsOrSkipConfirm) {
- requestUninstallPlugin(extensionName);
- return;
- }
- await performUninstall({ kind: "normal", id: extensionName });
+ if (options && typeof options === "object") {
+ await uninstallNormalPlugin(extensionName, { ...options, skipConfirm: true });
return;
}
-
- const options =
- typeof optionsOrSkipConfirm === "object" && optionsOrSkipConfirm !== null
- ? optionsOrSkipConfirm
- : {};
- await performUninstall({ kind: "normal", id: extensionName }, options);
+ await uninstallNormalPlugin(extensionName);
};
// 处理卸载确认对话框的确认事件
@@ -649,7 +662,11 @@ export const useExtensionPage = () => {
if (!target) return;
try {
- await performUninstall(target, options);
+ if (target.kind === "normal") {
+ await doUninstallNormal(target.id, options);
+ } else {
+ await doUninstallFailed(target.id, options);
+ }
} finally {
uninstallTarget.value = null;
showUninstallDialog.value = false;
From 4d4aad4da9ca433c233e8b56981df57025cf802d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=B0=B8=E8=B5=AB?= <1259085392@qq.com>
Date: Fri, 27 Feb 2026 23:58:06 +0900
Subject: [PATCH 09/13] refactor: streamline extension uninstall flow
---
.../src/views/extension/useExtensionPage.js | 89 +++++--------------
1 file changed, 24 insertions(+), 65 deletions(-)
diff --git a/dashboard/src/views/extension/useExtensionPage.js b/dashboard/src/views/extension/useExtensionPage.js
index ebc53ae12..232e42004 100644
--- a/dashboard/src/views/extension/useExtensionPage.js
+++ b/dashboard/src/views/extension/useExtensionPage.js
@@ -535,50 +535,36 @@ export const useExtensionPage = () => {
}
};
- const openUninstallDialog = (target) => {
+ const requestUninstall = (target) => {
if (!target?.id) return;
uninstallTarget.value = target;
showUninstallDialog.value = true;
};
- const doUninstallNormal = async (
- name,
+ const performUninstall = async (
+ target,
{ deleteConfig = false, deleteData = false } = {},
) => {
- toast(`${tm("messages.uninstalling")} ${name}`, "primary");
- try {
- const res = await axios.post("/api/plugin/uninstall", {
- name,
- delete_config: deleteConfig,
- delete_data: deleteData,
- });
- if (res.data.status === "error") {
- toast(res.data.message, "error");
- return;
- }
- Object.assign(extension_data, res.data);
- toast(res.data.message, "success");
- await getExtensions();
- } catch (err) {
- toast(resolveErrorMessage(err), "error");
- }
- };
+ if (!target?.id) return;
+
+ const { kind, id } = target;
+ const isNormal = kind === "normal";
+ const payload = isNormal
+ ? { name: id, delete_config: deleteConfig, delete_data: deleteData }
+ : { dir_name: id, delete_config: deleteConfig, delete_data: deleteData };
+ const url = isNormal ? "/api/plugin/uninstall" : "/api/plugin/uninstall-failed";
+
+ toast(`${tm("messages.uninstalling")} ${id}`, "primary");
- const doUninstallFailed = async (
- dirName,
- { deleteConfig = false, deleteData = false } = {},
- ) => {
- toast(`${tm("messages.uninstalling")} ${dirName}`, "primary");
try {
- const res = await axios.post("/api/plugin/uninstall-failed", {
- dir_name: dirName,
- delete_config: deleteConfig,
- delete_data: deleteData,
- });
+ const res = await axios.post(url, payload);
if (res.data.status === "error") {
toast(res.data.message, "error");
return;
}
+ if (isNormal) {
+ Object.assign(extension_data, res.data);
+ }
toast(res.data.message, "success");
await getExtensions();
} catch (err) {
@@ -586,36 +572,12 @@ export const useExtensionPage = () => {
}
};
- const uninstallNormalPlugin = async (
- name,
- { skipConfirm = false, ...options } = {},
- ) => {
- if (!name) return;
- if (!skipConfirm) {
- openUninstallDialog({ kind: "normal", id: name });
- return;
- }
- await doUninstallNormal(name, options);
- };
-
- const uninstallFailedPlugin = async (
- dirName,
- { skipConfirm = false, ...options } = {},
- ) => {
- if (!dirName) return;
- if (!skipConfirm) {
- openUninstallDialog({ kind: "failed", id: dirName });
- return;
- }
- await doUninstallFailed(dirName, options);
- };
-
const requestUninstallPlugin = (name) => {
- uninstallNormalPlugin(name);
+ requestUninstall({ kind: "normal", id: name });
};
const requestUninstallFailedPlugin = (dirName) => {
- uninstallFailedPlugin(dirName);
+ requestUninstall({ kind: "failed", id: dirName });
};
const checkUpdate = () => {
@@ -649,11 +611,13 @@ export const useExtensionPage = () => {
const uninstallExtension = async (extensionName, options = null) => {
if (!extensionName) return;
+
if (options && typeof options === "object") {
- await uninstallNormalPlugin(extensionName, { ...options, skipConfirm: true });
+ await performUninstall({ kind: "normal", id: extensionName }, options);
return;
}
- await uninstallNormalPlugin(extensionName);
+
+ requestUninstall({ kind: "normal", id: extensionName });
};
// 处理卸载确认对话框的确认事件
@@ -662,11 +626,7 @@ export const useExtensionPage = () => {
if (!target) return;
try {
- if (target.kind === "normal") {
- await doUninstallNormal(target.id, options);
- } else {
- await doUninstallFailed(target.id, options);
- }
+ await performUninstall(target, options);
} finally {
uninstallTarget.value = null;
showUninstallDialog.value = false;
@@ -1588,7 +1548,6 @@ export const useExtensionPage = () => {
reloadFailedPlugin,
checkUpdate,
uninstallExtension,
- uninstallFailedPlugin,
requestUninstallPlugin,
requestUninstallFailedPlugin,
handleUninstallConfirm,
From f097bdea606911c0eecadac2aad8460c812d93db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=B0=B8=E8=B5=AB?= <1259085392@qq.com>
Date: Sat, 28 Feb 2026 00:08:58 +0900
Subject: [PATCH 10/13] fix: harden failed plugin install tracking and cleanup
---
astrbot/core/star/star_manager.py | 183 ++++++++++--------
dashboard/src/composables/useTimedMessage.js | 12 +-
.../views/extension/InstalledPluginsTab.vue | 9 -
.../src/views/extension/useExtensionPage.js | 26 +--
4 files changed, 106 insertions(+), 124 deletions(-)
diff --git a/astrbot/core/star/star_manager.py b/astrbot/core/star/star_manager.py
index 67b255472..d4e9463e9 100644
--- a/astrbot/core/star/star_manager.py
+++ b/astrbot/core/star/star_manager.py
@@ -976,6 +976,73 @@ async def _cleanup_failed_plugin_install(
f"清理安装失败插件配置失败: {plugin_config_path}，原因: {e!s}",
)
+ def _cleanup_plugin_optional_artifacts(
+ self,
+ *,
+ root_dir_name: str,
+ plugin_label: str,
+ delete_config: bool,
+ delete_data: bool,
+ ) -> None:
+ if delete_config:
+ config_file = os.path.join(
+ self.plugin_config_path,
+ f"{root_dir_name}_config.json",
+ )
+ if os.path.exists(config_file):
+ try:
+ os.remove(config_file)
+ logger.info(f"已删除插件 {plugin_label} 的配置文件")
+ except Exception as e:
+ logger.warning(f"删除插件配置文件失败 ({plugin_label}): {e!s}")
+
+ if delete_data:
+ data_base_dir = os.path.dirname(self.plugin_store_path)
+ for data_dir_name in ("plugin_data", "plugins_data"):
+ plugin_data_dir = os.path.join(
+ data_base_dir,
+ data_dir_name,
+ root_dir_name,
+ )
+ if os.path.exists(plugin_data_dir):
+ try:
+ remove_dir(plugin_data_dir)
+ logger.info(
+ f"已删除插件 {plugin_label} 的持久化数据 ({data_dir_name})",
+ )
+ except Exception as e:
+ logger.warning(
+ f"删除插件持久化数据失败 ({data_dir_name}, {plugin_label}): {e!s}",
+ )
+
+ def _track_failed_install_dir(
+ self,
+ *,
+ dir_name: str,
+ plugin_path: str,
+ error: Exception,
+ ) -> None:
+ if (
+ not dir_name
+ or not plugin_path
+ or not os.path.isdir(plugin_path)
+ or dir_name in self.failed_plugin_dict
+ ):
+ return
+
+ for star in self.context.get_all_stars():
+ if star.root_dir_name == dir_name:
+ return
+
+ self.failed_plugin_dict[dir_name] = self._build_failed_plugin_record(
+ root_dir_name=dir_name,
+ plugin_dir_path=plugin_path,
+ reserved=False,
+ error=error,
+ error_trace=traceback.format_exc(),
+ )
+ self._rebuild_failed_plugin_info()
+
async def install_plugin(
self, repo_url: str, proxy: str = "", ignore_version_check: bool = False
):
@@ -1053,7 +1120,12 @@ async def install_plugin(
}
return plugin_info
- except Exception:
+ except Exception as e:
+ self._track_failed_install_dir(
+ dir_name=dir_name,
+ plugin_path=plugin_path,
+ error=e,
+ )
if dir_name and plugin_path:
logger.warning(
f"安装插件 {dir_name} 失败，插件安装目录：{plugin_path}",
@@ -1109,50 +1181,12 @@ async def uninstall_plugin(
f"移除插件成功，但是删除插件文件夹失败: {e!s}。您可以手动删除该文件夹，位于 addons/plugins/ 下。",
)
- # 删除插件配置文件
- if delete_config and root_dir_name:
- config_file = os.path.join(
- self.plugin_config_path,
- f"{root_dir_name}_config.json",
- )
- if os.path.exists(config_file):
- try:
- os.remove(config_file)
- logger.info(f"已删除插件 {plugin_name} 的配置文件")
- except Exception as e:
- logger.warning(f"删除插件配置文件失败: {e!s}")
-
- # 删除插件持久化数据
- # 注意：需要检查两个可能的目录名（plugin_data 和 plugins_data）
- # data/temp 目录可能被多个插件共享，不自动删除以防误删
- if delete_data and root_dir_name:
- data_base_dir = os.path.dirname(ppath) # data/
-
- # 删除 data/plugin_data 下的插件持久化数据（单数形式，新版本）
- plugin_data_dir = os.path.join(
- data_base_dir, "plugin_data", root_dir_name
- )
- if os.path.exists(plugin_data_dir):
- try:
- remove_dir(plugin_data_dir)
- logger.info(
- f"已删除插件 {plugin_name} 的持久化数据 (plugin_data)"
- )
- except Exception as e:
- logger.warning(f"删除插件持久化数据失败 (plugin_data): {e!s}")
-
- # 删除 data/plugins_data 下的插件持久化数据（复数形式，旧版本兼容）
- plugins_data_dir = os.path.join(
- data_base_dir, "plugins_data", root_dir_name
- )
- if os.path.exists(plugins_data_dir):
- try:
- remove_dir(plugins_data_dir)
- logger.info(
- f"已删除插件 {plugin_name} 的持久化数据 (plugins_data)"
- )
- except Exception as e:
- logger.warning(f"删除插件持久化数据失败 (plugins_data): {e!s}")
+ self._cleanup_plugin_optional_artifacts(
+ root_dir_name=root_dir_name,
+ plugin_label=plugin_name,
+ delete_config=delete_config,
+ delete_data=delete_data,
+ )
async def uninstall_failed_plugin(
self,
@@ -1182,48 +1216,20 @@ async def uninstall_failed_plugin(
f"移除失败插件成功，但是删除插件文件夹失败: {e!s}。您可以手动删除该文件夹，位于 addons/plugins/ 下。",
)
- if delete_config:
- config_file = os.path.join(
- self.plugin_config_path,
- f"{dir_name}_config.json",
+ plugin_label = dir_name
+ if isinstance(failed_info, dict):
+ plugin_label = (
+ failed_info.get("display_name")
+ or failed_info.get("name")
+ or dir_name
)
- if os.path.exists(config_file):
- try:
- os.remove(config_file)
- logger.info(f"已删除失败插件 {dir_name} 的配置文件")
- except Exception as e:
- logger.warning(f"删除失败插件配置文件失败: {e!s}")
- if delete_data:
- data_base_dir = os.path.dirname(self.plugin_store_path)
-
- plugin_data_dir = os.path.join(data_base_dir, "plugin_data", dir_name)
- if os.path.exists(plugin_data_dir):
- try:
- remove_dir(plugin_data_dir)
- logger.info(
- f"已删除失败插件 {dir_name} 的持久化数据 (plugin_data)",
- )
- except Exception as e:
- logger.warning(
- f"删除失败插件持久化数据失败 (plugin_data): {e!s}",
- )
-
- plugins_data_dir = os.path.join(
- data_base_dir,
- "plugins_data",
- dir_name,
- )
- if os.path.exists(plugins_data_dir):
- try:
- remove_dir(plugins_data_dir)
- logger.info(
- f"已删除失败插件 {dir_name} 的持久化数据 (plugins_data)",
- )
- except Exception as e:
- logger.warning(
- f"删除失败插件持久化数据失败 (plugins_data): {e!s}",
- )
+ self._cleanup_plugin_optional_artifacts(
+ root_dir_name=dir_name,
+ plugin_label=plugin_label,
+ delete_config=delete_config,
+ delete_data=delete_data,
+ )
self.failed_plugin_dict.pop(dir_name, None)
self._rebuild_failed_plugin_info()
@@ -1508,7 +1514,12 @@ async def install_plugin_from_file(
)
return plugin_info
- except Exception:
+ except Exception as e:
+ self._track_failed_install_dir(
+ dir_name=dir_name,
+ plugin_path=desti_dir,
+ error=e,
+ )
logger.warning(
f"安装插件 {dir_name} 失败，插件安装目录：{desti_dir}",
)
diff --git a/dashboard/src/composables/useTimedMessage.js b/dashboard/src/composables/useTimedMessage.js
index 526d107af..0e59d5781 100644
--- a/dashboard/src/composables/useTimedMessage.js
+++ b/dashboard/src/composables/useTimedMessage.js
@@ -1,4 +1,4 @@
-import { reactive } from "vue";
+import { reactive, ref } from "vue";
export const useTimedMessage = (initialType = "success") => {
const state = reactive({
@@ -6,12 +6,12 @@ export const useTimedMessage = (initialType = "success") => {
type: initialType,
});
- let timer = null;
+ const timer = ref(null);
const clearTimer = () => {
- if (timer) {
- clearTimeout(timer);
- timer = null;
+ if (timer.value) {
+ clearTimeout(timer.value);
+ timer.value = null;
}
};
@@ -25,7 +25,7 @@ export const useTimedMessage = (initialType = "success") => {
state.type = type;
clearTimer();
if (duration > 0 && state.message) {
- timer = setTimeout(() => {
+ timer.value = setTimeout(() => {
state.message = "";
}, duration);
}
diff --git a/dashboard/src/views/extension/InstalledPluginsTab.vue b/dashboard/src/views/extension/InstalledPluginsTab.vue
index 7192e22a6..1e7c7fefa 100644
--- a/dashboard/src/views/extension/InstalledPluginsTab.vue
+++ b/dashboard/src/views/extension/InstalledPluginsTab.vue
@@ -49,7 +49,6 @@ const {
isListView,
pluginSearch,
loading_,
- reloadFeedback,
currentPage,
dangerConfirmDialog,
selectedDangerPlugin,
@@ -214,14 +213,6 @@ const {
-
- {{ reloadFeedback.message }}
-
-
{
const isListView = ref(getInitialListViewMode());
const pluginSearch = ref("");
const loading_ = ref(false);
- const {
- state: reloadFeedback,
- setMessage: setReloadFeedback,
- clearMessage: clearReloadFeedback,
- clearTimer: clearReloadFeedbackTimer,
- } = useTimedMessage();
// 分页相关
const currentPage = ref(1);
@@ -509,29 +502,19 @@ export const useExtensionPage = () => {
}
};
- const showReloadFeedback = (message, type) => {
- clearReloadFeedback();
- setReloadFeedback(message, type);
- toast(message, type === "success" ? "success" : "error");
- };
-
const reloadFailedPlugin = async (dirName) => {
if (!dirName) return;
- clearReloadFeedback();
try {
const res = await axios.post("/api/plugin/reload-failed", { dir_name: dirName });
if (res.data.status === "error") {
- showReloadFeedback(res.data.message || tm("messages.reloadFailed"), "error");
+ toast(res.data.message || tm("messages.reloadFailed"), "error");
return;
}
- showReloadFeedback(res.data.message || tm("messages.reloadSuccess"), "success");
+ toast(res.data.message || tm("messages.reloadSuccess"), "success");
await getExtensions();
} catch (err) {
- showReloadFeedback(
- resolveErrorMessage(err, tm("messages.reloadFailed")),
- "error",
- );
+ toast(resolveErrorMessage(err, tm("messages.reloadFailed")), "error");
}
};
@@ -834,7 +817,6 @@ export const useExtensionPage = () => {
const reloadPlugin = async (plugin_name) => {
try {
- clearReloadFeedback();
const res = await axios.post("/api/plugin/reload", { name: plugin_name });
if (res.data.status === "error") {
toast(res.data.message || tm("messages.reloadFailed"), "error");
@@ -1377,7 +1359,6 @@ export const useExtensionPage = () => {
// 清理事件监听器
onUnmounted(() => {
window.removeEventListener("astrbot-locale-changed", handleLocaleChange);
- clearReloadFeedbackTimer();
});
// 搜索防抖处理
@@ -1486,7 +1467,6 @@ export const useExtensionPage = () => {
isListView,
pluginSearch,
loading_,
- reloadFeedback,
currentPage,
dangerConfirmDialog,
selectedDangerPlugin,
From 38675e92a4ed91f3bb48d97859c5d883bb1975bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=B0=B8=E8=B5=AB?= <1259085392@qq.com>
Date: Sat, 28 Feb 2026 00:21:07 +0900
Subject: [PATCH 11/13] refactor: simplify extension flows and remove unused
timed message
---
astrbot/core/star/star_manager.py | 30 +-
dashboard/src/composables/useTimedMessage.js | 40 --
.../src/views/extension/useExtensionPage.js | 359 +++++++++++-------
3 files changed, 241 insertions(+), 188 deletions(-)
delete mode 100644 dashboard/src/composables/useTimedMessage.js
diff --git a/astrbot/core/star/star_manager.py b/astrbot/core/star/star_manager.py
index d4e9463e9..9d5a84cd4 100644
--- a/astrbot/core/star/star_manager.py
+++ b/astrbot/core/star/star_manager.py
@@ -1043,6 +1043,19 @@ def _track_failed_install_dir(
)
self._rebuild_failed_plugin_info()
+ def _format_plugin_error(self, key: str, **kwargs) -> str:
+ templates = {
+ "not_found_in_failed_list": "插件不存在于失败列表中。",
+ "reserved_plugin_cannot_uninstall": "该插件是 AstrBot 保留插件，无法卸载。",
+ "plugin_dir_not_exists": "插件目录不存在。",
+ "failed_plugin_dir_remove_error": (
+ "移除失败插件成功，但是删除插件文件夹失败: {error}。"
+ "您可以手动删除该文件夹，位于 addons/plugins/ 下。"
+ ),
+ }
+ template = templates.get(key, key)
+ return template.format(**kwargs)
+
async def install_plugin(
self, repo_url: str, proxy: str = "", ignore_version_check: bool = False
):
@@ -1198,14 +1211,20 @@ async def uninstall_failed_plugin(
async with self._pm_lock:
failed_info = self.failed_plugin_dict.get(dir_name)
if not failed_info:
- raise Exception("插件不存在于失败列表中。")
+ raise Exception(
+ self._format_plugin_error("not_found_in_failed_list"),
+ )
if isinstance(failed_info, dict) and failed_info.get("reserved"):
- raise Exception("该插件是 AstrBot 保留插件，无法卸载。")
+ raise Exception(
+ self._format_plugin_error("reserved_plugin_cannot_uninstall"),
+ )
plugin_path = os.path.join(self.plugin_store_path, dir_name)
if not os.path.exists(plugin_path):
- raise Exception("插件目录不存在。")
+ raise Exception(
+ self._format_plugin_error("plugin_dir_not_exists"),
+ )
self._cleanup_plugin_state(dir_name)
@@ -1213,7 +1232,10 @@ async def uninstall_failed_plugin(
remove_dir(plugin_path)
except Exception as e:
raise Exception(
- f"移除失败插件成功，但是删除插件文件夹失败: {e!s}。您可以手动删除该文件夹，位于 addons/plugins/ 下。",
+ self._format_plugin_error(
+ "failed_plugin_dir_remove_error",
+ error=f"{e!s}",
+ ),
)
plugin_label = dir_name
diff --git a/dashboard/src/composables/useTimedMessage.js b/dashboard/src/composables/useTimedMessage.js
deleted file mode 100644
index 0e59d5781..000000000
--- a/dashboard/src/composables/useTimedMessage.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import { reactive, ref } from "vue";
-
-export const useTimedMessage = (initialType = "success") => {
- const state = reactive({
- message: "",
- type: initialType,
- });
-
- const timer = ref(null);
-
- const clearTimer = () => {
- if (timer.value) {
- clearTimeout(timer.value);
- timer.value = null;
- }
- };
-
- const clearMessage = () => {
- state.message = "";
- clearTimer();
- };
-
- const setMessage = (message, type = initialType, duration = 4000) => {
- state.message = message || "";
- state.type = type;
- clearTimer();
- if (duration > 0 && state.message) {
- timer.value = setTimeout(() => {
- state.message = "";
- }, duration);
- }
- };
-
- return {
- state,
- setMessage,
- clearMessage,
- clearTimer,
- };
-};
diff --git a/dashboard/src/views/extension/useExtensionPage.js b/dashboard/src/views/extension/useExtensionPage.js
index 5a53332a7..05f9ea98a 100644
--- a/dashboard/src/views/extension/useExtensionPage.js
+++ b/dashboard/src/views/extension/useExtensionPage.js
@@ -8,6 +8,50 @@ import { ref, computed, onMounted, onUnmounted, reactive, watch } from "vue";
import { useRoute, useRouter } from "vue-router";
import { useDisplay } from "vuetify";
+const useRandomPluginsDisplay = ({ activeTab, marketSearch, currentPage }) => {
+ const showRandomPlugins = ref(true);
+
+ const toggleRandomPluginsVisibility = () => {
+ showRandomPlugins.value = !showRandomPlugins.value;
+ };
+
+ const collapseRandomPlugins = () => {
+ showRandomPlugins.value = false;
+ };
+
+ watch(marketSearch, () => {
+ if (activeTab.value === "market") {
+ collapseRandomPlugins();
+ }
+ });
+
+ watch(currentPage, (newPage, oldPage) => {
+ if (newPage === oldPage) return;
+ if (activeTab.value !== "market") return;
+ collapseRandomPlugins();
+ });
+
+ return {
+ showRandomPlugins,
+ toggleRandomPluginsVisibility,
+ collapseRandomPlugins,
+ };
+};
+
+const buildFailedPluginItems = (raw) => {
+ return Object.entries(raw || {}).map(([dirName, info]) => {
+ const detail = info && typeof info === "object" ? info : {};
+ return {
+ dir_name: dirName,
+ name: detail.name || dirName,
+ display_name: detail.display_name || detail.name || dirName,
+ error: detail.error || "",
+ traceback: detail.traceback || "",
+ reserved: !!detail.reserved,
+ };
+ });
+};
+
export const useExtensionPage = () => {
@@ -184,7 +228,15 @@ export const useExtensionPage = () => {
const sortBy = ref("default"); // default, stars, author, updated
const sortOrder = ref("desc"); // desc (降序) or asc (升序)
const randomPluginNames = ref([]);
- const showRandomPlugins = ref(true);
+ const {
+ showRandomPlugins,
+ toggleRandomPluginsVisibility,
+ collapseRandomPlugins,
+ } = useRandomPluginsDisplay({
+ activeTab,
+ marketSearch,
+ currentPage,
+ });
// 插件市场拼音搜索
const normalizeStr = (s) => (s ?? "").toString().toLowerCase().trim();
@@ -383,14 +435,6 @@ export const useExtensionPage = () => {
.slice(0, Math.min(RANDOM_PLUGINS_COUNT, shuffled.length))
.map((plugin) => plugin.name);
};
-
- const toggleRandomPluginsVisibility = () => {
- showRandomPlugins.value = !showRandomPlugins.value;
- };
-
- const collapseRandomPlugins = () => {
- showRandomPlugins.value = false;
- };
// 分页计算属性
const displayItemsPerPage = 9; // 固定每页显示9个卡片（3行）
@@ -440,20 +484,9 @@ export const useExtensionPage = () => {
};
const failedPluginsDict = ref({});
- const failedPluginItems = computed(() => {
- const raw = failedPluginsDict.value || {};
- return Object.entries(raw).map(([dirName, info]) => {
- const detail = info && typeof info === "object" ? info : {};
- return {
- dir_name: dirName,
- name: detail.name || dirName,
- display_name: detail.display_name || detail.name || dirName,
- error: detail.error || "",
- traceback: detail.traceback || "",
- reserved: !!detail.reserved,
- };
- });
- });
+ const failedPluginItems = computed(() =>
+ buildFailedPluginItems(failedPluginsDict.value),
+ );
const getExtensions = async () => {
loading_.value = true;
@@ -519,34 +552,48 @@ export const useExtensionPage = () => {
};
const requestUninstall = (target) => {
- if (!target?.id) return;
+ if (!target?.action) return;
uninstallTarget.value = target;
showUninstallDialog.value = true;
};
- const performUninstall = async (
- target,
+ const performUninstallNormal = async (
+ pluginName,
{ deleteConfig = false, deleteData = false } = {},
) => {
- if (!target?.id) return;
-
- const { kind, id } = target;
- const isNormal = kind === "normal";
- const payload = isNormal
- ? { name: id, delete_config: deleteConfig, delete_data: deleteData }
- : { dir_name: id, delete_config: deleteConfig, delete_data: deleteData };
- const url = isNormal ? "/api/plugin/uninstall" : "/api/plugin/uninstall-failed";
-
- toast(`${tm("messages.uninstalling")} ${id}`, "primary");
-
+ toast(`${tm("messages.uninstalling")} ${pluginName}`, "primary");
try {
- const res = await axios.post(url, payload);
+ const res = await axios.post("/api/plugin/uninstall", {
+ name: pluginName,
+ delete_config: deleteConfig,
+ delete_data: deleteData,
+ });
if (res.data.status === "error") {
toast(res.data.message, "error");
return;
}
- if (isNormal) {
- Object.assign(extension_data, res.data);
+ Object.assign(extension_data, res.data);
+ toast(res.data.message, "success");
+ await getExtensions();
+ } catch (err) {
+ toast(resolveErrorMessage(err), "error");
+ }
+ };
+
+ const performUninstallFailed = async (
+ dirName,
+ { deleteConfig = false, deleteData = false } = {},
+ ) => {
+ toast(`${tm("messages.uninstalling")} ${dirName}`, "primary");
+ try {
+ const res = await axios.post("/api/plugin/uninstall-failed", {
+ dir_name: dirName,
+ delete_config: deleteConfig,
+ delete_data: deleteData,
+ });
+ if (res.data.status === "error") {
+ toast(res.data.message, "error");
+ return;
}
toast(res.data.message, "success");
await getExtensions();
@@ -556,11 +603,23 @@ export const useExtensionPage = () => {
};
const requestUninstallPlugin = (name) => {
- requestUninstall({ kind: "normal", id: name });
+ if (!name) return;
+ requestUninstall({
+ label: name,
+ action: async (options) => {
+ await performUninstallNormal(name, options);
+ },
+ });
};
const requestUninstallFailedPlugin = (dirName) => {
- requestUninstall({ kind: "failed", id: dirName });
+ if (!dirName) return;
+ requestUninstall({
+ label: dirName,
+ action: async (options) => {
+ await performUninstallFailed(dirName, options);
+ },
+ });
};
const checkUpdate = () => {
@@ -595,12 +654,21 @@ export const useExtensionPage = () => {
const uninstallExtension = async (extensionName, options = null) => {
if (!extensionName) return;
+ if (typeof options === "boolean") {
+ if (options) {
+ await performUninstallNormal(extensionName);
+ } else {
+ requestUninstallPlugin(extensionName);
+ }
+ return;
+ }
+
if (options && typeof options === "object") {
- await performUninstall({ kind: "normal", id: extensionName }, options);
+ await performUninstallNormal(extensionName, options);
return;
}
- requestUninstall({ kind: "normal", id: extensionName });
+ requestUninstallPlugin(extensionName);
};
// 处理卸载确认对话框的确认事件
@@ -609,7 +677,7 @@ export const useExtensionPage = () => {
if (!target) return;
try {
- await performUninstall(target, options);
+ await target.action(options);
} finally {
uninstallTarget.value = null;
showUninstallDialog.value = false;
@@ -1123,6 +1191,103 @@ export const useExtensionPage = () => {
const cancelInstallOnVersionWarning = () => {
versionCompatibilityDialog.show = false;
};
+
+ const handleInstallResponse = async (resData, { toastStatus = false } = {}) => {
+ if (
+ resData.status === "warning" &&
+ resData.data?.warning_type === "astrbot_version_incompatible"
+ ) {
+ onLoadingDialogResult(2, resData.message, -1);
+ showVersionCompatibilityWarning(resData.message);
+ await refreshExtensionsAfterInstallFailure();
+ return false;
+ }
+
+ if (toastStatus) {
+ toast(resData.message, resData.status === "ok" ? "success" : "error");
+ }
+
+ if (resData.status === "error") {
+ onLoadingDialogResult(2, resData.message, -1);
+ await refreshExtensionsAfterInstallFailure();
+ return false;
+ }
+
+ return true;
+ };
+
+ const installFromFile = async (ignoreVersionCheck) => {
+ toast(tm("messages.installing"), "primary");
+ const formData = new FormData();
+ formData.append("file", upload_file.value);
+ formData.append("ignore_version_check", String(ignoreVersionCheck));
+
+ try {
+ const res = await axios.post("/api/plugin/install-upload", formData, {
+ headers: {
+ "Content-Type": "multipart/form-data",
+ },
+ });
+ loading_.value = false;
+
+ const canContinue = await handleInstallResponse(res.data);
+ if (!canContinue) return;
+
+ upload_file.value = null;
+ onLoadingDialogResult(1, res.data.message);
+ dialog.value = false;
+ await getExtensions();
+
+ viewReadme({
+ name: res.data.data.name,
+ repo: res.data.data.repo || null,
+ });
+
+ await checkAndPromptConflicts();
+ } catch (err) {
+ loading_.value = false;
+ onLoadingDialogResult(2, err, -1);
+ await refreshExtensionsAfterInstallFailure();
+ }
+ };
+
+ const installFromUrl = async (ignoreVersionCheck) => {
+ toast(
+ tm("messages.installingFromUrl") + " " + extension_url.value,
+ "primary",
+ );
+
+ try {
+ const res = await axios.post("/api/plugin/install", {
+ url: extension_url.value,
+ proxy: getSelectedGitHubProxy(),
+ ignore_version_check: ignoreVersionCheck,
+ });
+ loading_.value = false;
+
+ const canContinue = await handleInstallResponse(res.data, {
+ toastStatus: true,
+ });
+ if (!canContinue) return;
+
+ extension_url.value = "";
+ onLoadingDialogResult(1, res.data.message);
+ dialog.value = false;
+ await getExtensions();
+
+ viewReadme({
+ name: res.data.data.name,
+ repo: res.data.data.repo || null,
+ });
+
+ await checkAndPromptConflicts();
+ } catch (err) {
+ loading_.value = false;
+ toast(tm("messages.installFailed") + " " + err, "error");
+ onLoadingDialogResult(2, err, -1);
+ await refreshExtensionsAfterInstallFailure();
+ }
+ };
const newExtension = async (ignoreVersionCheck = false) => {
if (extension_url.value === "" && upload_file.value === null) {
@@ -1137,97 +1302,13 @@ export const useExtensionPage = () => {
loading_.value = true;
loadingDialog.title = tm("status.loading");
loadingDialog.show = true;
+
if (upload_file.value !== null) {
- toast(tm("messages.installing"), "primary");
- const formData = new FormData();
- formData.append("file", upload_file.value);
- formData.append("ignore_version_check", String(ignoreVersionCheck));
- axios
- .post("/api/plugin/install-upload", formData, {
- headers: {
- "Content-Type": "multipart/form-data",
- },
- })
- .then(async (res) => {
- loading_.value = false;
- if (
- res.data.status === "warning" &&
- res.data.data?.warning_type === "astrbot_version_incompatible"
- ) {
- onLoadingDialogResult(2, res.data.message, -1);
- showVersionCompatibilityWarning(res.data.message);
- await refreshExtensionsAfterInstallFailure();
- return;
- }
- if (res.data.status === "error") {
- onLoadingDialogResult(2, res.data.message, -1);
- await refreshExtensionsAfterInstallFailure();
- return;
- }
- upload_file.value = null;
- onLoadingDialogResult(1, res.data.message);
- dialog.value = false;
- await getExtensions();
-
- viewReadme({
- name: res.data.data.name,
- repo: res.data.data.repo || null,
- });
-
- await checkAndPromptConflicts();
- })
- .catch(async (err) => {
- loading_.value = false;
- onLoadingDialogResult(2, err, -1);
- await refreshExtensionsAfterInstallFailure();
- });
- } else {
- toast(
- tm("messages.installingFromUrl") + " " + extension_url.value,
- "primary",
- );
- axios
- .post("/api/plugin/install", {
- url: extension_url.value,
- proxy: getSelectedGitHubProxy(),
- ignore_version_check: ignoreVersionCheck,
- })
- .then(async (res) => {
- loading_.value = false;
- if (
- res.data.status === "warning" &&
- res.data.data?.warning_type === "astrbot_version_incompatible"
- ) {
- onLoadingDialogResult(2, res.data.message, -1);
- showVersionCompatibilityWarning(res.data.message);
- await refreshExtensionsAfterInstallFailure();
- return;
- }
- toast(res.data.message, res.data.status === "ok" ? "success" : "error");
- if (res.data.status === "error") {
- onLoadingDialogResult(2, res.data.message, -1);
- await refreshExtensionsAfterInstallFailure();
- return;
- }
- extension_url.value = "";
- onLoadingDialogResult(1, res.data.message);
- dialog.value = false;
- await getExtensions();
-
- viewReadme({
- name: res.data.data.name,
- repo: res.data.data.repo || null,
- });
-
- await checkAndPromptConflicts();
- })
- .catch(async (err) => {
- loading_.value = false;
- toast(tm("messages.installFailed") + " " + err, "error");
- onLoadingDialogResult(2, err, -1);
- await refreshExtensionsAfterInstallFailure();
- });
+ await installFromFile(ignoreVersionCheck);
+ return;
}
+
+ await installFromUrl(ignoreVersionCheck);
};
const normalizePlatformList = (platforms) => {
@@ -1364,10 +1445,6 @@ export const useExtensionPage = () => {
// 搜索防抖处理
let searchDebounceTimer = null;
watch(marketSearch, (newVal) => {
- if (activeTab.value === "market") {
- collapseRandomPlugins();
- }
-
if (searchDebounceTimer) {
clearTimeout(searchDebounceTimer);
}
@@ -1378,12 +1455,6 @@ export const useExtensionPage = () => {
currentPage.value = 1;
}, 300); // 300ms 防抖延迟
});
-
- watch(currentPage, (newPage, oldPage) => {
- if (newPage === oldPage) return;
- if (activeTab.value !== "market") return;
- collapseRandomPlugins();
- });
// 监听显示模式变化并保存到 localStorage
watch(isListView, (newVal) => {
From 21d609a5010ec53c23e502c526e0f7ec98a506c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=B0=B8=E8=B5=AB?= <1259085392@qq.com>
Date: Sat, 28 Feb 2026 00:29:12 +0900
Subject: [PATCH 12/13] fix: improve failed uninstall idempotency and extension
error handling
---
astrbot/core/star/star_manager.py | 30 +++----
.../src/views/extension/useExtensionPage.js | 78 +++++++------------
2 files changed, 44 insertions(+), 64 deletions(-)
diff --git a/astrbot/core/star/star_manager.py b/astrbot/core/star/star_manager.py
index 9d5a84cd4..b4980f7c5 100644
--- a/astrbot/core/star/star_manager.py
+++ b/astrbot/core/star/star_manager.py
@@ -1047,7 +1047,6 @@ def _format_plugin_error(self, key: str, **kwargs) -> str:
templates = {
"not_found_in_failed_list": "插件不存在于失败列表中。",
"reserved_plugin_cannot_uninstall": "该插件是 AstrBot 保留插件，无法卸载。",
- "plugin_dir_not_exists": "插件目录不存在。",
"failed_plugin_dir_remove_error": (
"移除失败插件成功，但是删除插件文件夹失败: {error}。"
"您可以手动删除该文件夹，位于 addons/plugins/ 下。"
@@ -1220,22 +1219,23 @@ async def uninstall_failed_plugin(
self._format_plugin_error("reserved_plugin_cannot_uninstall"),
)
- plugin_path = os.path.join(self.plugin_store_path, dir_name)
- if not os.path.exists(plugin_path):
- raise Exception(
- self._format_plugin_error("plugin_dir_not_exists"),
- )
-
self._cleanup_plugin_state(dir_name)
- try:
- remove_dir(plugin_path)
- except Exception as e:
- raise Exception(
- self._format_plugin_error(
- "failed_plugin_dir_remove_error",
- error=f"{e!s}",
- ),
+ plugin_path = os.path.join(self.plugin_store_path, dir_name)
+ if os.path.exists(plugin_path):
+ try:
+ remove_dir(plugin_path)
+ except Exception as e:
+ raise Exception(
+ self._format_plugin_error(
+ "failed_plugin_dir_remove_error",
+ error=f"{e!s}",
+ ),
+ )
+ else:
+ logger.debug(
+ "插件目录不存在，视为已部分卸载状态，继续清理失败插件记录和可选产物: %s",
+ plugin_path,
)
plugin_label = dir_name
diff --git a/dashboard/src/views/extension/useExtensionPage.js b/dashboard/src/views/extension/useExtensionPage.js
index 05f9ea98a..c4898a85b 100644
--- a/dashboard/src/views/extension/useExtensionPage.js
+++ b/dashboard/src/views/extension/useExtensionPage.js
@@ -42,6 +42,7 @@ const buildFailedPluginItems = (raw) => {
return Object.entries(raw || {}).map(([dirName, info]) => {
const detail = info && typeof info === "object" ? info : {};
return {
+ ...detail,
dir_name: dirName,
name: detail.name || dirName,
display_name: detail.display_name || detail.name || dirName,
@@ -552,49 +553,36 @@ export const useExtensionPage = () => {
};
const requestUninstall = (target) => {
- if (!target?.action) return;
+ if (!target?.id || !target?.kind) return;
uninstallTarget.value = target;
showUninstallDialog.value = true;
};
- const performUninstallNormal = async (
- pluginName,
+ const performUninstall = async (
+ target,
{ deleteConfig = false, deleteData = false } = {},
) => {
- toast(`${tm("messages.uninstalling")} ${pluginName}`, "primary");
- try {
- const res = await axios.post("/api/plugin/uninstall", {
- name: pluginName,
- delete_config: deleteConfig,
- delete_data: deleteData,
- });
- if (res.data.status === "error") {
- toast(res.data.message, "error");
- return;
- }
- Object.assign(extension_data, res.data);
- toast(res.data.message, "success");
- await getExtensions();
- } catch (err) {
- toast(resolveErrorMessage(err), "error");
- }
- };
+ if (!target?.id || !target?.kind) return;
+
+ const isFailed = target.kind === "failed";
+ const endpoint = isFailed
+ ? "/api/plugin/uninstall-failed"
+ : "/api/plugin/uninstall";
+ const payload = isFailed
+ ? { dir_name: target.id, delete_config: deleteConfig, delete_data: deleteData }
+ : { name: target.id, delete_config: deleteConfig, delete_data: deleteData };
+
+ toast(`${tm("messages.uninstalling")} ${target.id}`, "primary");
- const performUninstallFailed = async (
- dirName,
- { deleteConfig = false, deleteData = false } = {},
- ) => {
- toast(`${tm("messages.uninstalling")} ${dirName}`, "primary");
try {
- const res = await axios.post("/api/plugin/uninstall-failed", {
- dir_name: dirName,
- delete_config: deleteConfig,
- delete_data: deleteData,
- });
+ const res = await axios.post(endpoint, payload);
if (res.data.status === "error") {
toast(res.data.message, "error");
return;
}
+ if (!isFailed) {
+ Object.assign(extension_data, res.data);
+ }
toast(res.data.message, "success");
await getExtensions();
} catch (err) {
@@ -604,22 +592,12 @@ export const useExtensionPage = () => {
const requestUninstallPlugin = (name) => {
if (!name) return;
- requestUninstall({
- label: name,
- action: async (options) => {
- await performUninstallNormal(name, options);
- },
- });
+ requestUninstall({ kind: "normal", id: name });
};
const requestUninstallFailedPlugin = (dirName) => {
if (!dirName) return;
- requestUninstall({
- label: dirName,
- action: async (options) => {
- await performUninstallFailed(dirName, options);
- },
- });
+ requestUninstall({ kind: "failed", id: dirName });
};
const checkUpdate = () => {
@@ -656,7 +634,7 @@ export const useExtensionPage = () => {
if (typeof options === "boolean") {
if (options) {
- await performUninstallNormal(extensionName);
+ await performUninstall({ kind: "normal", id: extensionName });
} else {
requestUninstallPlugin(extensionName);
}
@@ -664,7 +642,7 @@ export const useExtensionPage = () => {
}
if (options && typeof options === "object") {
- await performUninstallNormal(extensionName, options);
+ await performUninstall({ kind: "normal", id: extensionName }, options);
return;
}
@@ -677,7 +655,7 @@ export const useExtensionPage = () => {
if (!target) return;
try {
- await target.action(options);
+ await performUninstall(target, options);
} finally {
uninstallTarget.value = null;
showUninstallDialog.value = false;
@@ -1246,7 +1224,8 @@ export const useExtensionPage = () => {
await checkAndPromptConflicts();
} catch (err) {
loading_.value = false;
- onLoadingDialogResult(2, err, -1);
+ const message = resolveErrorMessage(err, tm("messages.installFailed"));
+ onLoadingDialogResult(2, message, -1);
await refreshExtensionsAfterInstallFailure();
}
};
@@ -1283,8 +1262,9 @@ export const useExtensionPage = () => {
await checkAndPromptConflicts();
} catch (err) {
loading_.value = false;
- toast(tm("messages.installFailed") + " " + err, "error");
- onLoadingDialogResult(2, err, -1);
+ const message = resolveErrorMessage(err, tm("messages.installFailed"));
+ toast(message, "error");
+ onLoadingDialogResult(2, message, -1);
await refreshExtensionsAfterInstallFailure();
}
};
From 637f7d0bae843270400eb88cc443c96a4e62a4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=B0=B8=E8=B5=AB?= <1259085392@qq.com>
Date: Sat, 28 Feb 2026 00:39:30 +0900
Subject: [PATCH 13/13] refactor: unify extension install-uninstall
orchestration
---
astrbot/core/star/error_messages.py | 18 ++
astrbot/core/star/star_manager.py | 19 +-
.../locales/en-US/features/extension.json | 1 +
.../locales/zh-CN/features/extension.json | 1 +
dashboard/src/utils/errorUtils.js | 44 ++++-
.../src/views/extension/useExtensionPage.js | 162 ++++++++----------
6 files changed, 138 insertions(+), 107 deletions(-)
create mode 100644 astrbot/core/star/error_messages.py
diff --git a/astrbot/core/star/error_messages.py b/astrbot/core/star/error_messages.py
new file mode 100644
index 000000000..99de4d19b
--- /dev/null
+++ b/astrbot/core/star/error_messages.py
@@ -0,0 +1,18 @@
+"""Shared plugin error message templates for star manager flows."""
+
+PLUGIN_ERROR_TEMPLATES = {
+ "not_found_in_failed_list": "插件不存在于失败列表中。",
+ "reserved_plugin_cannot_uninstall": "该插件是 AstrBot 保留插件，无法卸载。",
+ "failed_plugin_dir_remove_error": (
+ "移除失败插件成功，但是删除插件文件夹失败: {error}。"
+ "您可以手动删除该文件夹，位于 addons/plugins/ 下。"
+ ),
+}
+
+
+def format_plugin_error(key: str, **kwargs) -> str:
+ template = PLUGIN_ERROR_TEMPLATES.get(key, key)
+ try:
+ return template.format(**kwargs)
+ except Exception:
+ return template
diff --git a/astrbot/core/star/star_manager.py b/astrbot/core/star/star_manager.py
index b4980f7c5..68c58fdae 100644
--- a/astrbot/core/star/star_manager.py
+++ b/astrbot/core/star/star_manager.py
@@ -31,6 +31,7 @@
from . import StarMetadata
from .command_management import sync_command_configs
from .context import Context
+from .error_messages import format_plugin_error
from .filter.permission import PermissionType, PermissionTypeFilter
from .star import star_map, star_registry
from .star_handler import EventType, star_handlers_registry
@@ -1043,18 +1044,6 @@ def _track_failed_install_dir(
)
self._rebuild_failed_plugin_info()
- def _format_plugin_error(self, key: str, **kwargs) -> str:
- templates = {
- "not_found_in_failed_list": "插件不存在于失败列表中。",
- "reserved_plugin_cannot_uninstall": "该插件是 AstrBot 保留插件，无法卸载。",
- "failed_plugin_dir_remove_error": (
- "移除失败插件成功，但是删除插件文件夹失败: {error}。"
- "您可以手动删除该文件夹，位于 addons/plugins/ 下。"
- ),
- }
- template = templates.get(key, key)
- return template.format(**kwargs)
-
async def install_plugin(
self, repo_url: str, proxy: str = "", ignore_version_check: bool = False
):
@@ -1211,12 +1200,12 @@ async def uninstall_failed_plugin(
failed_info = self.failed_plugin_dict.get(dir_name)
if not failed_info:
raise Exception(
- self._format_plugin_error("not_found_in_failed_list"),
+ format_plugin_error("not_found_in_failed_list"),
)
if isinstance(failed_info, dict) and failed_info.get("reserved"):
raise Exception(
- self._format_plugin_error("reserved_plugin_cannot_uninstall"),
+ format_plugin_error("reserved_plugin_cannot_uninstall"),
)
self._cleanup_plugin_state(dir_name)
@@ -1227,7 +1216,7 @@ async def uninstall_failed_plugin(
remove_dir(plugin_path)
except Exception as e:
raise Exception(
- self._format_plugin_error(
+ format_plugin_error(
"failed_plugin_dir_remove_error",
error=f"{e!s}",
),
diff --git a/dashboard/src/i18n/locales/en-US/features/extension.json b/dashboard/src/i18n/locales/en-US/features/extension.json
index 484970f3a..7f6a5b3e2 100644
--- a/dashboard/src/i18n/locales/en-US/features/extension.json
+++ b/dashboard/src/i18n/locales/en-US/features/extension.json
@@ -187,6 +187,7 @@
"refreshing": "Refreshing extension list...",
"refreshSuccess": "Extension list refreshed!",
"refreshFailed": "Error occurred while refreshing extension list",
+ "operationFailed": "Operation failed",
"reloadSuccess": "Reload successful",
"reloadFailed": "Reload failed",
"updateSuccess": "Update successful!",
diff --git a/dashboard/src/i18n/locales/zh-CN/features/extension.json b/dashboard/src/i18n/locales/zh-CN/features/extension.json
index 7835a852f..416f2294c 100644
--- a/dashboard/src/i18n/locales/zh-CN/features/extension.json
+++ b/dashboard/src/i18n/locales/zh-CN/features/extension.json
@@ -187,6 +187,7 @@
"refreshing": "正在刷新插件列表...",
"refreshSuccess": "插件列表已刷新！",
"refreshFailed": "刷新插件列表时发生错误",
+ "operationFailed": "操作失败",
"reloadSuccess": "重载成功",
"reloadFailed": "重载失败",
"updateSuccess": "更新成功!",
diff --git a/dashboard/src/utils/errorUtils.js b/dashboard/src/utils/errorUtils.js
index 147e00b63..f81354875 100644
--- a/dashboard/src/utils/errorUtils.js
+++ b/dashboard/src/utils/errorUtils.js
@@ -1,10 +1,44 @@
-const INVALID_ERROR_STRINGS = new Set(["[object Object]", "undefined", "null"]);
+const INVALID_ERROR_STRINGS = new Set(["[object Object]", "undefined", "null", ""]);
+
+const pickResponseMessage = (responseData) => {
+ if (typeof responseData === "string") {
+ return responseData.trim();
+ }
+ if (!responseData || typeof responseData !== "object") {
+ return "";
+ }
+
+ const keys = ["message", "error", "detail", "details", "msg"];
+ for (const key of keys) {
+ const value = responseData[key];
+ if (typeof value === "string" && value.trim()) {
+ return value.trim();
+ }
+ }
+ return "";
+};
export const resolveErrorMessage = (err, fallbackMessage = "") => {
- const fromResponse = err?.response?.data?.message;
- const fromError = err?.message;
- const raw = err != null ? String(err) : "";
- const fromString = INVALID_ERROR_STRINGS.has(raw) ? "" : raw;
+ if (typeof err === "string") {
+ return err.trim() || fallbackMessage;
+ }
+ if (typeof err === "number" || typeof err === "boolean") {
+ return String(err);
+ }
+
+ const fromResponse =
+ pickResponseMessage(err?.response?.data) ||
+ (typeof err?.response?.statusText === "string"
+ ? err.response.statusText.trim()
+ : "");
+ const fromError =
+ typeof err?.message === "string" ? err.message.trim() : "";
+
+ let fromString = "";
+ if (typeof err?.toString === "function") {
+ const value = err.toString().trim();
+ fromString = INVALID_ERROR_STRINGS.has(value) ? "" : value;
+ }
return fromResponse || fromError || fromString || fallbackMessage;
};
diff --git a/dashboard/src/views/extension/useExtensionPage.js b/dashboard/src/views/extension/useExtensionPage.js
index c4898a85b..e2f51fb97 100644
--- a/dashboard/src/views/extension/useExtensionPage.js
+++ b/dashboard/src/views/extension/useExtensionPage.js
@@ -558,12 +558,17 @@ export const useExtensionPage = () => {
showUninstallDialog.value = true;
};
- const performUninstall = async (
+ const uninstall = async (
target,
- { deleteConfig = false, deleteData = false } = {},
+ { deleteConfig = false, deleteData = false, skipConfirm = false } = {},
) => {
if (!target?.id || !target?.kind) return;
+ if (!skipConfirm) {
+ requestUninstall(target);
+ return;
+ }
+
const isFailed = target.kind === "failed";
const endpoint = isFailed
? "/api/plugin/uninstall-failed"
@@ -586,18 +591,18 @@ export const useExtensionPage = () => {
toast(res.data.message, "success");
await getExtensions();
} catch (err) {
- toast(resolveErrorMessage(err), "error");
+ toast(resolveErrorMessage(err, tm("messages.operationFailed")), "error");
}
};
const requestUninstallPlugin = (name) => {
if (!name) return;
- requestUninstall({ kind: "normal", id: name });
+ uninstall({ kind: "normal", id: name }, { skipConfirm: false });
};
const requestUninstallFailedPlugin = (dirName) => {
if (!dirName) return;
- requestUninstall({ kind: "failed", id: dirName });
+ uninstall({ kind: "failed", id: dirName }, { skipConfirm: false });
};
const checkUpdate = () => {
@@ -629,24 +634,23 @@ export const useExtensionPage = () => {
});
};
- const uninstallExtension = async (extensionName, options = null) => {
+ const uninstallExtension = async (
+ extensionName,
+ optionsOrSkipConfirm = false,
+ ) => {
if (!extensionName) return;
- if (typeof options === "boolean") {
- if (options) {
- await performUninstall({ kind: "normal", id: extensionName });
- } else {
- requestUninstallPlugin(extensionName);
- }
- return;
- }
-
- if (options && typeof options === "object") {
- await performUninstall({ kind: "normal", id: extensionName }, options);
- return;
+ if (typeof optionsOrSkipConfirm === "boolean") {
+ return uninstall(
+ { kind: "normal", id: extensionName },
+ { skipConfirm: optionsOrSkipConfirm },
+ );
}
- requestUninstallPlugin(extensionName);
+ return uninstall(
+ { kind: "normal", id: extensionName },
+ { ...(optionsOrSkipConfirm || {}), skipConfirm: true },
+ );
};
// 处理卸载确认对话框的确认事件
@@ -655,7 +659,7 @@ export const useExtensionPage = () => {
if (!target) return;
try {
- await performUninstall(target, options);
+ await uninstall(target, { ...(options || {}), skipConfirm: true });
} finally {
uninstallTarget.value = null;
showUninstallDialog.value = false;
@@ -1194,79 +1198,42 @@ export const useExtensionPage = () => {
return true;
};
- const installFromFile = async (ignoreVersionCheck) => {
- toast(tm("messages.installing"), "primary");
- const formData = new FormData();
- formData.append("file", upload_file.value);
- formData.append("ignore_version_check", String(ignoreVersionCheck));
-
- try {
- const res = await axios.post("/api/plugin/install-upload", formData, {
+ const performInstallRequest = async ({ source, ignoreVersionCheck }) => {
+ if (source === "file") {
+ const formData = new FormData();
+ formData.append("file", upload_file.value);
+ formData.append("ignore_version_check", String(ignoreVersionCheck));
+ return axios.post("/api/plugin/install-upload", formData, {
headers: {
"Content-Type": "multipart/form-data",
},
});
- loading_.value = false;
+ }
- const canContinue = await handleInstallResponse(res.data);
- if (!canContinue) return;
+ return axios.post("/api/plugin/install", {
+ url: extension_url.value,
+ proxy: getSelectedGitHubProxy(),
+ ignore_version_check: ignoreVersionCheck,
+ });
+ };
+ const finalizeSuccessfulInstall = async (resData, source) => {
+ if (source === "file") {
upload_file.value = null;
- onLoadingDialogResult(1, res.data.message);
- dialog.value = false;
- await getExtensions();
-
- viewReadme({
- name: res.data.data.name,
- repo: res.data.data.repo || null,
- });
-
- await checkAndPromptConflicts();
- } catch (err) {
- loading_.value = false;
- const message = resolveErrorMessage(err, tm("messages.installFailed"));
- onLoadingDialogResult(2, message, -1);
- await refreshExtensionsAfterInstallFailure();
+ } else {
+ extension_url.value = "";
}
- };
-
- const installFromUrl = async (ignoreVersionCheck) => {
- toast(
- tm("messages.installingFromUrl") + " " + extension_url.value,
- "primary",
- );
-
- try {
- const res = await axios.post("/api/plugin/install", {
- url: extension_url.value,
- proxy: getSelectedGitHubProxy(),
- ignore_version_check: ignoreVersionCheck,
- });
- loading_.value = false;
-
- const canContinue = await handleInstallResponse(res.data, {
- toastStatus: true,
- });
- if (!canContinue) return;
- extension_url.value = "";
- onLoadingDialogResult(1, res.data.message);
- dialog.value = false;
- await getExtensions();
+ onLoadingDialogResult(1, resData.message);
+ dialog.value = false;
+ await getExtensions();
- viewReadme({
- name: res.data.data.name,
- repo: res.data.data.repo || null,
- });
+ viewReadme({
+ name: resData.data.name,
+ repo: resData.data.repo || null,
+ });
- await checkAndPromptConflicts();
- } catch (err) {
- loading_.value = false;
- const message = resolveErrorMessage(err, tm("messages.installFailed"));
- toast(message, "error");
- onLoadingDialogResult(2, message, -1);
- await refreshExtensionsAfterInstallFailure();
- }
+ await checkAndPromptConflicts();
};
const newExtension = async (ignoreVersionCheck = false) => {
@@ -1283,12 +1250,33 @@ export const useExtensionPage = () => {
loadingDialog.title = tm("status.loading");
loadingDialog.show = true;
- if (upload_file.value !== null) {
- await installFromFile(ignoreVersionCheck);
- return;
- }
+ const source = upload_file.value !== null ? "file" : "url";
+ toast(
+ source === "file"
+ ? tm("messages.installing")
+ : tm("messages.installingFromUrl") + " " + extension_url.value,
+ "primary",
+ );
- await installFromUrl(ignoreVersionCheck);
+ try {
+ const res = await performInstallRequest({ source, ignoreVersionCheck });
+ loading_.value = false;
+
+ const canContinue = await handleInstallResponse(res.data, {
+ toastStatus: source === "url",
+ });
+ if (!canContinue) return;
+
+ await finalizeSuccessfulInstall(res.data, source);
+ } catch (err) {
+ loading_.value = false;
+ const message = resolveErrorMessage(err, tm("messages.installFailed"));
+ if (source === "url") {
+ toast(message, "error");
+ }
+ onLoadingDialogResult(2, message, -1);
+ await refreshExtensionsAfterInstallFailure();
+ }
};
const normalizePlatformList = (platforms) => {