优化启动速度

This commit is contained in:
2026-02-19 19:22:18 +08:00
parent 058b128eec
commit 1cf729e7fd
3 changed files with 99 additions and 52 deletions

View File

@@ -138,7 +138,7 @@ const parseUpgradableList = (output: string) => {
// Listen for download requests from renderer process
ipcMain.on("queue-install", async (event, download_json) => {
const download = JSON.parse(download_json);
const { id, pkgname, metalinkUrl, filename } = download || {};
const { id, pkgname, metalinkUrl, filename, upgradeOnly } = download || {};
if (!id || !pkgname) {
logger.warn("passed arguments missing id or pkgname");
@@ -172,17 +172,28 @@ ipcMain.on("queue-install", async (event, download_json) => {
const execParams = [];
const downloadDir = `/tmp/spark-store/download/${pkgname}`;
if (superUserCmd.length > 0) {
// 升级操作:使用 spark-update-tool
if (upgradeOnly) {
execCommand = "pkexec";
execParams.push("spark-update-tool", pkgname);
logger.info(`升级模式: 使用 spark-update-tool 升级 ${pkgname}`);
} else if (superUserCmd.length > 0) {
execCommand = superUserCmd;
execParams.push(SHELL_CALLER_PATH);
if (metalinkUrl && filename) {
execParams.push("ssinstall", `${downloadDir}/${filename}`, "--delete-after-install");
} else {
execParams.push("aptss", "install", "-y", pkgname);
}
} else {
execCommand = SHELL_CALLER_PATH;
}
if (metalinkUrl && filename) {
execParams.push("ssinstall", `${downloadDir}/${filename}` , "--delete-after-install");
} else {
execParams.push("aptss", "install", "-y", pkgname);
if (metalinkUrl && filename) {
execParams.push("ssinstall", `${downloadDir}/${filename}`, "--delete-after-install");
} else {
execParams.push("aptss", "install", "-y", pkgname);
}
}
const task: InstallTask = {

View File

@@ -140,6 +140,26 @@ ipcMain.on("set-theme-source", (event, theme: "system" | "light" | "dark") => {
nativeTheme.themeSource = theme;
});
// 启动系统更新工具(使用 pkexec 提升权限)
ipcMain.handle("run-update-tool", async () => {
try {
const { spawn } = await import("node:child_process");
const pkexecPath = "/usr/bin/pkexec";
const args = ["spark-update-tool"];
const child = spawn(pkexecPath, args, {
detached: true,
stdio: "ignore",
});
// 让子进程在后台运行且不影响主进程退出
child.unref();
logger.info("Launched pkexec spark-update-tool");
return { success: true };
} catch (err) {
logger.error({ err }, "Failed to launch spark-update-tool");
return { success: false, message: (err as Error)?.message || String(err) };
}
});
app.whenReady().then(() => {
// Set User-Agent for client
session.defaultSession.webRequest.onBeforeSendHeaders((details, callback) => {

View File

@@ -346,8 +346,15 @@ const nextScreen = () => {
}
};
const handleUpdate = () => {
openUpdateModal();
const handleUpdate = async () => {
try {
const result = await window.ipcRenderer.invoke("run-update-tool");
if (!result || !result.success) {
logger.warn(`启动更新工具失败: ${result?.message || "未知错误"}`);
}
} catch (error) {
logger.error(`调用更新工具时出错: ${error}`);
}
};
const handleList = () => {
@@ -639,54 +646,58 @@ const loadCategories = async () => {
}
};
const loadApps = async () => {
loading.value = true;
const loadApps = async (onFirstBatch?: () => void) => {
try {
logger.info("开始加载应用数据...");
logger.info("开始加载应用数据(并发分批)...");
// 改为顺序加载,避免同时发送过多请求
for (const category of Object.keys(categories.value)) {
try {
logger.info(`加载分类: ${category}`);
const response = await axiosInstance.get<AppJson[]>(
cacheBuster(`/${window.apm_store.arch}/${category}/applist.json`),
);
const categoriesList = Object.keys(categories.value || {});
const concurrency = 4; // 同时并发请求数量,可根据网络条件调整
const categoryApps = response.status === 200 ? response.data : [];
categoryApps.forEach((appJson) => {
// Convert AppJson to App here
const normalizedApp: App = {
name: appJson.Name,
pkgname: appJson.Pkgname,
version: appJson.Version,
filename: appJson.Filename,
torrent_address: appJson.Torrent_address,
author: appJson.Author,
contributor: appJson.Contributor,
website: appJson.Website,
update: appJson.Update,
size: appJson.Size,
more: appJson.More,
tags: appJson.Tags,
img_urls:
typeof appJson.img_urls === "string"
? JSON.parse(appJson.img_urls)
: appJson.img_urls,
icons: appJson.icons,
category: category,
currentStatus: "not-installed",
};
apps.value.push(normalizedApp);
});
} catch (error) {
logger.warn(`加载分类 ${category} 失败: ${error}`);
// 继续加载其他分类
}
for (let i = 0; i < categoriesList.length; i += concurrency) {
const batch = categoriesList.slice(i, i + concurrency);
await Promise.all(
batch.map(async (category) => {
try {
logger.info(`加载分类: ${category}`);
const response = await axiosInstance.get<AppJson[]>(
cacheBuster(`/${window.apm_store.arch}/${category}/applist.json`),
);
const categoryApps = response.status === 200 ? response.data : [];
categoryApps.forEach((appJson) => {
const normalizedApp: App = {
name: appJson.Name,
pkgname: appJson.Pkgname,
version: appJson.Version,
filename: appJson.Filename,
torrent_address: appJson.Torrent_address,
author: appJson.Author,
contributor: appJson.Contributor,
website: appJson.Website,
update: appJson.Update,
size: appJson.Size,
more: appJson.More,
tags: appJson.Tags,
img_urls:
typeof appJson.img_urls === "string"
? JSON.parse(appJson.img_urls)
: appJson.img_urls,
icons: appJson.icons,
category: category,
currentStatus: "not-installed",
};
apps.value.push(normalizedApp);
});
} catch (error) {
logger.warn(`加载分类 ${category} 失败: ${error}`);
}
}),
);
// 首批完成回调(用于隐藏首屏 loading
if (i === 0 && typeof onFirstBatch === "function") onFirstBatch();
}
} catch (error) {
logger.error(`加载应用数据失败: ${error}`);
} finally {
loading.value = false;
}
};
@@ -699,7 +710,12 @@ onMounted(async () => {
initTheme();
await loadCategories();
await loadApps();
// 先显示 loading并异步开始分批加载应用列表。
loading.value = true;
loadApps(() => {
// 当第一批分类加载完成后,隐藏首屏 loading
loading.value = false;
});
// 设置键盘导航
document.addEventListener("keydown", (e) => {