@@ -237,41 +260,45 @@ const currentSourceName = computed(() => {
-
-
- {{ tm("market.randomPlugins") }}
-
-
- {{ tm("buttons.reshuffle") }}
-
-
+
+
+
+
+ {{ tm("market.randomPlugins") }}
+
+
+ {{ tm("buttons.reshuffle") }}
+
+
-
-
-
-
-
+
+
+
+
+
+
{
+ 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 {
+ ...detail,
+ 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 = () => {
@@ -15,6 +61,7 @@ export const useExtensionPage = () => {
const { tm } = useModuleI18n("features/extension");
const router = useRouter();
const route = useRoute();
+ const { width } = useDisplay();
const getSelectedGitHubProxy = () => {
if (typeof window === "undefined" || !window.localStorage) return "";
@@ -156,7 +203,7 @@ export const useExtensionPage = () => {
// 卸载插件确认对话框（列表模式用）
const showUninstallDialog = ref(false);
- const pluginToUninstall = ref(null);
+ const uninstallTarget = ref(null);
// 自定义插件源相关
const showSourceDialog = ref(false);
@@ -182,6 +229,15 @@ export const useExtensionPage = () => {
const sortBy = ref("default"); // default, stars, author, updated
const sortOrder = ref("desc"); // desc (降序) or asc (升序)
const randomPluginNames = ref([]);
+ const {
+ showRandomPlugins,
+ toggleRandomPluginsVisibility,
+ collapseRandomPlugins,
+ } = useRandomPluginsDisplay({
+ activeTab,
+ marketSearch,
+ currentPage,
+ });
// 插件市场拼音搜索
const normalizeStr = (s) => (s ?? "").toString().toLowerCase().trim();
@@ -224,18 +280,43 @@ export const useExtensionPage = () => {
]);
// 插件表格的表头定义
- const pluginHeaders = computed(() => [
- { title: tm("table.headers.name"), key: "name", width: "200px" },
- { title: tm("table.headers.description"), key: "desc", width: "180px" },
- { title: tm("table.headers.version"), key: "version", width: "100px" },
- { title: tm("table.headers.author"), key: "author", width: "100px" },
- {
+ const showAuthorColumn = computed(() => width.value >= 1280);
+ const pluginHeaders = computed(() => {
+ const headers = [
+ {
+ title: tm("table.headers.name"),
+ key: "name",
+ width: showAuthorColumn.value ? "24%" : "26%",
+ },
+ {
+ title: tm("table.headers.description"),
+ key: "desc",
+ width: showAuthorColumn.value ? "32%" : "36%",
+ },
+ {
+ title: tm("table.headers.version"),
+ key: "version",
+ width: showAuthorColumn.value ? "12%" : "14%",
+ },
+ ];
+
+ if (showAuthorColumn.value) {
+ headers.push({
+ title: tm("table.headers.author"),
+ key: "author",
+ width: "10%",
+ });
+ }
+
+ headers.push({
title: tm("table.headers.actions"),
key: "actions",
sortable: false,
- width: "520px",
- },
- ]);
+ width: showAuthorColumn.value ? "22%" : "24%",
+ });
+
+ return headers;
+ });
// 过滤要显示的插件
const filteredExtensions = computed(() => {
@@ -404,6 +485,9 @@ export const useExtensionPage = () => {
};
const failedPluginsDict = ref({});
+ const failedPluginItems = computed(() =>
+ buildFailedPluginItems(failedPluginsDict.value),
+ );
const getExtensions = async () => {
loading_.value = true;
@@ -451,6 +535,75 @@ export const useExtensionPage = () => {
loading_.value = false;
}
};
+
+ const reloadFailedPlugin = async (dirName) => {
+ if (!dirName) return;
+
+ try {
+ const res = await axios.post("/api/plugin/reload-failed", { dir_name: dirName });
+ if (res.data.status === "error") {
+ toast(res.data.message || tm("messages.reloadFailed"), "error");
+ return;
+ }
+ toast(res.data.message || tm("messages.reloadSuccess"), "success");
+ await getExtensions();
+ } catch (err) {
+ toast(resolveErrorMessage(err, tm("messages.reloadFailed")), "error");
+ }
+ };
+
+ const requestUninstall = (target) => {
+ if (!target?.id || !target?.kind) return;
+ uninstallTarget.value = target;
+ showUninstallDialog.value = true;
+ };
+
+ const uninstall = async (
+ target,
+ { 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"
+ : "/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");
+
+ try {
+ 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) {
+ toast(resolveErrorMessage(err, tm("messages.operationFailed")), "error");
+ }
+ };
+
+ const requestUninstallPlugin = (name) => {
+ if (!name) return;
+ uninstall({ kind: "normal", id: name }, { skipConfirm: false });
+ };
+
+ const requestUninstallFailedPlugin = (dirName) => {
+ if (!dirName) return;
+ uninstall({ kind: "failed", id: dirName }, { skipConfirm: false });
+ };
const checkUpdate = () => {
const onlinePluginsMap = new Map();
@@ -482,57 +635,34 @@ export const useExtensionPage = () => {
};
const uninstallExtension = async (
- extension_name,
+ extensionName,
optionsOrSkipConfirm = false,
) => {
- let deleteConfig = false;
- let deleteData = false;
- let skipConfirm = false;
-
- // 处理参数：可能是布尔值（旧的 skipConfirm）或对象（新的选项）
+ 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) {
- pluginToUninstall.value = extension_name;
- showUninstallDialog.value = true;
- 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");
- return;
- }
- Object.assign(extension_data, res.data);
- toast(res.data.message, "success");
- getExtensions();
- } catch (err) {
- toast(err, "error");
+ return uninstall(
+ { kind: "normal", id: extensionName },
+ { skipConfirm: optionsOrSkipConfirm },
+ );
}
+
+ return uninstall(
+ { kind: "normal", id: extensionName },
+ { ...(optionsOrSkipConfirm || {}), skipConfirm: true },
+ );
};
// 处理卸载确认对话框的确认事件
- const handleUninstallConfirm = (options) => {
- if (pluginToUninstall.value) {
- uninstallExtension(pluginToUninstall.value, options);
- pluginToUninstall.value = null;
+ const handleUninstallConfirm = async (options) => {
+ const target = uninstallTarget.value;
+ if (!target) return;
+
+ try {
+ await uninstall(target, { ...(options || {}), skipConfirm: true });
+ } finally {
+ uninstallTarget.value = null;
+ showUninstallDialog.value = false;
}
};
@@ -738,15 +868,14 @@ export const useExtensionPage = () => {
const reloadPlugin = async (plugin_name) => {
try {
const res = await axios.post("/api/plugin/reload", { name: plugin_name });
- await getExtensions();
if (res.data.status === "error") {
- toast(res.data.message, "error");
+ toast(res.data.message || tm("messages.reloadFailed"), "error");
return;
}
toast(tm("messages.reloadSuccess"), "success");
- //getExtensions();
+ await getExtensions();
} catch (err) {
- toast(err, "error");
+ toast(resolveErrorMessage(err, tm("messages.reloadFailed")), "error");
}
};
@@ -1027,6 +1156,14 @@ export const useExtensionPage = () => {
versionCompatibilityDialog.message = message;
versionCompatibilityDialog.show = true;
};
+
+ const refreshExtensionsAfterInstallFailure = async () => {
+ try {
+ await getExtensions();
+ } catch (error) {
+ console.debug("Failed to refresh extensions after install failure:", error);
+ }
+ };
const continueInstallIgnoringVersionWarning = async () => {
versionCompatibilityDialog.show = false;
@@ -1036,6 +1173,68 @@ 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 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",
+ },
+ });
+ }
+
+ 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;
+ } else {
+ extension_url.value = "";
+ }
+
+ onLoadingDialogResult(1, resData.message);
+ dialog.value = false;
+ await getExtensions();
+
+ viewReadme({
+ name: resData.data.name,
+ repo: resData.data.repo || null,
+ });
+
+ await checkAndPromptConflicts();
+ };
const newExtension = async (ignoreVersionCheck = false) => {
if (extension_url.value === "" && upload_file.value === null) {
@@ -1050,90 +1249,33 @@ 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);
- return;
- }
- if (res.data.status === "error") {
- onLoadingDialogResult(2, res.data.message, -1);
- 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);
- });
- } 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);
- return;
- }
- toast(res.data.message, res.data.status === "ok" ? "success" : "error");
- if (res.data.status === "error") {
- onLoadingDialogResult(2, res.data.message, -1);
- 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);
- });
+
+ const source = upload_file.value !== null ? "file" : "url";
+ toast(
+ source === "file"
+ ? tm("messages.installing")
+ : tm("messages.installingFromUrl") + " " + extension_url.value,
+ "primary",
+ );
+
+ 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();
}
};
@@ -1371,7 +1513,7 @@ export const useExtensionPage = () => {
installCompat,
versionCompatibilityDialog,
showUninstallDialog,
- pluginToUninstall,
+ uninstallTarget,
showSourceDialog,
showSourceManagerDialog,
sourceName,
@@ -1393,6 +1535,7 @@ export const useExtensionPage = () => {
sortBy,
sortOrder,
randomPluginNames,
+ showRandomPlugins,
normalizeStr,
toPinyinText,
toInitials,
@@ -1407,6 +1550,8 @@ export const useExtensionPage = () => {
randomPlugins,
shufflePlugins,
refreshRandomPlugins,
+ toggleRandomPluginsVisibility,
+ collapseRandomPlugins,
displayItemsPerPage,
totalPages,
paginatedPlugins,
@@ -1416,10 +1561,14 @@ export const useExtensionPage = () => {
resetLoadingDialog,
onLoadingDialogResult,
failedPluginsDict,
+ failedPluginItems,
getExtensions,
handleReloadAllFailed,
+ reloadFailedPlugin,
checkUpdate,
uninstallExtension,
+ requestUninstallPlugin,
+ requestUninstallFailedPlugin,
handleUninstallConfirm,
updateExtension,
showUpdateAllConfirm,