Compare commits

...
34 Commits
Author SHA1 Message Date
shenmo7192 56a7e11622 fix(install): 修复 APM 未安装时点安装静默无反应,并清理同类接线断裂
主问题:showApmInstallDialog 在 useAppState.ts 被重复声明为独立 ref,
而 processInstall.ts 置位的是 storeConfig.ts 中的另一份实例,导致 APM
未安装时点「安装」既不弹引导弹窗也不创建下载任务(界面毫无反应)。

修复:
- useAppState 改为从 storeConfig 再导出同一实例(消除双实例)
- processInstall 在 install-complete 兜底识别「未安装 APM」失败原因
- 新增回归测试 ApmInstallDialog.test.ts(回退修复后 3/3 失败)

同类「接线断裂」问题全量排查修复(源自 d7bdcf36 拆分 composables):
- 应用下载排行永远为空:loadRanking 在 apps 未填充时空跑且不重试
- 详情页卸载后按钮状态不刷新(丢失的 checkAppInstalled 分支)
- 重试已取消任务复用 id,被旧任务 finally 删除而永久卡在下载中
- remove-installed 的 spawn 缺 error 监听(可致主进程崩溃)且不消费 stderr
- 云端应用列表在来源查询失败时静默丢数据(已安装列表同源问题)
- 忽略更新写入失败无反馈;下载统计上报缺 catch
- isInstalledAppInfo 运行时校验被削弱

清理重构遗留孤儿代码:
- 删除无引用的 AppDetailPage/AccountQuickMenu/TopActions/UpdateCenterCloseConfirm
- 恢复 handleRemoveComplete 语义与 onUnmounted 的 abort/unbind
- 删除孤儿 IPC:list-upgradable/show-apm-install-dialog/uninstall-installed
- 删除孤儿渲染端代码:handleUpgrade/handleRemove/useDownloadItemStatus
  及已无生产者的 queue-install 回灌监听器

验证:vue-tsc 0 error、vite build 通过、单元测试无新增失败
(基线 40 失败 → 35 失败)。

Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-10-11 12:34:10 +08:00
shenmo7192 48a6e10263 chore(release): bump version to 5.3.2
Signed-off-by: shenmo <jifengshenmo@outlook.com>
2026-10-11 12:34:06 +08:00
shenmo7192andGitee cfe8c87fea !420 style(titleBar): 窗口控制按钮 _ [ ] X 颜色减淡
Merge pull request !420 from zinface/styles/window-title-bar
2026-08-23 14:32:29 +00:00
zinface 4c44ecf9b1 style(titleBar): 窗口控制按钮 _ [ ] X 颜色减淡 2026-08-23 22:28:06 +08:00
shenmo7192 ae19c309df refactor(WindowTitleBar): convert community badge to clickable button
add click handler to open commercial page, add hover styles and accessible title
2026-08-20 10:41:36 +08:00
shenmo7192 405a402432 fix(shell-caller): 对话框工具改用 zenity 2026-08-19 22:11:11 +08:00
shenmo7192 2db91252ad chore(release): bump version to 5.3.1 2026-08-19 22:06:10 +08:00
shenmo7192 86895269c3 fix(ui): 放大首页标题与启动提示,放开外部链接域名限制 2026-08-19 22:06:10 +08:00
shenmo7192andGitee 018dac3d21 !418 fix(store): 修复应用截图加载逻辑
Merge pull request !418 from xiyidaiwa/Erotica
2026-08-18 08:26:40 +00:00
xiyidaiwa f94a6584a4 fix(store): 修复应用截图加载逻辑
- 截图候选 URL 改为按固定路径拼接 screen_1~5.png,不再依赖后端 img_urls
- 打开详情页时先清空截图,避免残留上一个应用的图片
- 更新生产环境 APM_STORE_BASE_URL 域名
- 修正 debian/changelog 版本号
2026-08-18 15:04:08 +08:00
shenmo7192andGitee 25bc414ce1 !417 style(titleBar): 搜索框细节对齐
Merge pull request !417 from zinface/styles/window-title-bar-search
2026-08-18 05:50:37 +00:00
shenmo7192andGitee 0c18d53db6 !416 (titleBar): 使用 Font Awesome 图标集替代字符形式窗口控制标识, 且状态由根组件维护
Merge pull request !416 from zinface/styles/window-title-bar
2026-08-18 05:50:21 +00:00
shenmo7192andGitee 55247a72da !414 feat: 新增字体大小设置与界面整体缩放,修复放大后设置页溢出
Merge pull request !414 from xiyidaiwa/Erotica
2026-08-18 05:49:52 +00:00
shenmo7192andGitee 791b196256 !415 fix(systemd): 修复服务配置单元(unit) 的语法问题
Merge pull request !415 from zinface/systemd/service-unit-fix
2026-08-18 05:49:28 +00:00
shenmo7192andGitee eb4f01da94 !413 fix: 使用定时器而非服务来执行周期性更新检查
Merge pull request !413 from zinface/systemd/spark-update
2026-08-18 05:47:12 +00:00
zinface 0ea075c599 style(titleBar): 搜索框细节对齐 2026-08-18 11:51:13 +08:00
zinface fdc8455640 feat(titleBar): 根组件维护并传入 isMaximized 状态 2026-08-18 11:40:01 +08:00
zinface f2aa1573fa electron(titleBar): 添加窗口状态IPC通信与桥接器函数 2026-08-18 11:36:43 +08:00
zinface 08038e6be0 style(titleBar): 使用 Font Awesome 图标集替代字符形式窗口控制标识 2026-08-18 11:35:07 +08:00
zinface bc49a41018 fix(systemd): 修复服务配置单元(unit) 的语法问题 2026-08-18 10:21:08 +08:00
zinface b87112fa38 fix(systemd): 分析 timer 无效原因及解决方案
我看了下,这 timer 无效有几个原因
1. timer 本身要 enable 和 start
2. service 里要去掉 RemainAfterExit=yes 这条(不能让服务一直处于 activate)
3. timer 重新设计更新触发时间(6,12,18:00) 一天更新3次,分布到 30min 内
4. service 重新保持开机运行一次(撤回提交中的部分修改)

起码确定这不是服务器,不再 6h 分布,而是桌面系统,及时在到达时间后,在30min内完成更新(也同样不拥挤在一块),话说回来,到点后,在30分钟内统一更新所有安装了星火应用商店的机器,这用户量应该能支撑得住噻?
2026-08-18 09:14:00 +08:00
xiyidaiwa d0e6dc1b79 feat(build): 更新测试构建脚本以同步应用内版本号
- 为 electron-builder.yml 添加 extraMetadata.version 临时配置
- 实现打包完成后自动恢复 electron-builder.yml 文件
- 添加 trap 机制确保异常退出时也能正确恢复配置
- 清理旧的 electron-builder 产物避免内容污染
- 完善脚本注释说明版本同步机制和使用注意事项
2026-08-18 09:09:52 +08:00
xiyidaiwa 81567f8351 refactor(display): 移除字体大小设置,仅保留界面整体缩放
用户实测发现仅调字体到特大/超大时主页面卡片布局遮挡,且字体大小
与界面缩放功能效果高度重叠。故采用方案1:删除字体大小入口,放大
统一由 Electron setZoomFactor 处理(整体等比缩放,不破坏布局)。

- displaySettings.ts:移除 FontSizeOption/FONT_SIZE_OPTIONS/applyFontSize/
  setFontSize/initFontSize 等全部字体相关导出,仅保留界面缩放
- App.vue:移除 initFontSize 导入与调用
- SettingsModal.vue:删除「字体大小」卡片及所有相关逻辑,仅留「界面缩放」
- 还原 8 个组件中当初为字体联动改写的 rem 为原始 px(10/11/12/13/15px),
  消除对 html font-size 的依赖,卡片布局不再因字号变化溢出
2026-08-18 00:15:24 +08:00
xiyidaiwa ede1a1269f fix:更新版本号到5.3.0.2 2026-08-17 23:46:15 +08:00
xiyidaiwa e25a3c9d8f feat: 新增界面整体缩放与字体超大档,修复设置页溢出
- 界面缩放:Electron webContents.setZoomFactor,档位 90%/100%/110%/125%/150%
  - 主进程新增 set-zoom-factor IPC,启动时从 window-state.json 恢复 zoomFactor
  - 窗口尺寸保存与退出前均持久化当前 zoom
  - displaySettings 新增 UiScaleOption + initUiScale,App.vue 启动恢复
  - SettingsModal 新增「界面缩放」卡片,实时经 IPC 应用并持久化
- 字体大小新增「超大」档(html font-size 20px),共 5 档
- 修复设置模态框在字体/界面放大后内容超出视口:面板限制
  max-h-[calc(100vh-2rem)],内容区 flex-1 overflow-y-auto 滚动
2026-08-17 23:40:23 +08:00
xiyidaiwa 7b658e9dd1 fix(ui): 将固定 px 字号改为 rem,让全局字体大小档位生效
用户反馈首页红框区域(横幅标题/副标题)没随字号档位变大。
原因是多处使用了 Tailwind 固定 px 任意值(text-[10px]/[11px]/[12px]/[13px]/[15px]),
它们不随 html font-size 缩放。统一替换为等效 rem 任意值:
  10px → 0.625rem, 11px → 0.6875rem, 12px → 0.75rem, 13px → 0.8125rem, 15px → 0.9375rem
涉及 8 个 Vue 组件,保证字号档位全局联动(仍保持 16px 基准下的原视觉大小)。
vue-tsc 通过,打包成功;HomeView.vue 原有 emit 未使用 lint 错误未动。
2026-08-17 23:15:18 +08:00
xiyidaiwa 4dc1a1d7fe feat(settings): 新增字体大小设置(仅字号档位,不含整体缩放/字体族)
- 新增 src/global/displaySettings.ts:small/medium/large/xlarge 四档 → html 15/16/17/18px,
  localStorage(spark-store-font-size) 持久化,applyFontSize 写 html font-size 全局联动 rem 字号类
- App.vue onMounted 最前 initFontSize()(与 initTagPriorityStrategy 同级,防字号闪烁)
- SettingsModal.vue 新增「字体大小」卡片(4 档分段按钮 + 预览),selectFontSize 即时应用+持久化
- 用户确认范围:仅字号档位,整体缩放与字体族切换本期不做
- vue-tsc/lint/打包均通过
2026-08-17 23:00:14 +08:00
shenmo7192 2f85f1da71 fix(ui): 首页欢迎标题字号与左侧栏一致 2026-08-17 22:58:14 +08:00
shenmo7192 700197bdc1 fix(ui): 将首页推荐文字调大至与左侧栏一致 2026-08-17 22:45:03 +08:00
zinface 582435b857 fix: 使用定时器而非服务来执行周期性更新检查 2026-08-17 21:53:11 +08:00
shenmo7192andGitee e4540252b3 !412 fix(install-manager): 按 dpkg 规则放宽 deb 文件名校验,修复含 epoch 冒号包被误拦
Merge pull request !412 from xiyidaiwa/Erotica
2026-08-17 02:30:47 +00:00
xiyidaiwa 5efed0dca2 修改版本号为5.3.0.1 2026-08-17 09:15:29 +08:00
xiyidaiwa ada3a6dab4 fix(install-manager): 按 dpkg 规则放宽 deb 文件名校验,修复含 epoch 冒号包被误拦
- 新增 FILENAME_PATTERN,按 Debian 规则允许包名/版本号合法字符:含 epoch 冒号
  (如 steam-launcher_1:1.0.0.87_amd64.deb)与排序标记 ~(如 1.0~beta),及字母数字 . _ + -
- filename 校验由严格 PKGNAME_PATTERN 改为 FILENAME_PATTERN,并保留路径遍历双保险
  (拒绝 '..' 段 + path.basename 拒绝含 '/' 的路径),安全性未削弱
- 修正字符组内 [:~] 正则区间陷阱:用 \- 转义隔离,避免误匹配 <,=,>,?,@,[,] 等符号
- 已用真实仓库 2085 个包验证:包名/文件名拒绝均为 0,全部可正常放行下载与安装
2026-08-17 09:12:08 +08:00
shenmo7192 ae9142ad06 update 5.3.0 2026-08-15 16:53:11 +08:00
38 changed files with 762 additions and 1175 deletions
+1 -1
View File
@@ -1,3 +1,3 @@
VITE_APM_STORE_BASE_URL=https://erotica.spark-app.store
VITE_APM_STORE_BASE_URL=https://d.spark-app.store
VITE_APM_STORE_STATS_BASE_URL=https://feedback.spark-app.store
VITE_SPARK_BACKEND_BASE_URL=https://account.spark-app.store
+16
View File
@@ -16,6 +16,22 @@
- `openDownloadedApp` 的 IPC 调用补充 `.catch` 错误处理。
7. **应用详情默认展开已安装版本**:打开应用详情时,若本地只安装了 Spark / APM 中的某一版本,则默认展开该已装来源(例如 WeChat 默认 APM,但本机只装 Spark 版时默认展开 Spark);若两版都已安装,则按优先级/标签策略展示。
8. **修复 APM 未安装时点「安装」静默无反应**:`showApmInstallDialog` 此前在 `src/composables/useAppState.ts` 被重复声明为独立的 `ref`,而 `src/modules/processInstall.ts` 置位的是 `src/global/storeConfig.ts` 中的另一份实例,导致 APM 未安装时点击 APM 应用的「安装」既不弹出引导弹窗、也不会创建下载任务(界面毫无反应)。现统一从 `storeConfig` 再导出同一实例,并在 `install-complete` 兜底识别「未安装 APM」失败原因,保证任何路径下都不会静默失败。新增回归测试 `src/__tests__/unit/ApmInstallDialog.test.ts`。
9. **同类「接线断裂」问题全量排查与修复**(源自 `d7bdcf36` 拆分 composables 时留下的半成品改动):
- **应用下载排行永远为空**:`loadRanking()` 在 `loadApps()` 尚未填充 `apps` 时就被调用,命中 `if (apps.value.length === 0) return` 后直接空跑且永不重试。现改为在 `loadApps` resolve 之后再触发。
- **详情页卸载后按钮状态不刷新**:卸载成功回调在拆分时丢了「刷新详情页安装状态」分支,详情弹窗会继续显示「打开/卸载」(应用实际已卸载,点「打开」会启动不存在的包)。现于编排层 `handleUninstallSuccess` 补回。
- **重试已取消的任务会永久卡在「下载中」**:取消后重试复用同一任务 id,旧任务仍在退出流程中,其 `finally` 会 `tasks.delete(id)` 删掉新任务,新任务再也不会进入安装阶段。现已对 3 处 `tasks.delete` 加身份校验(`tasks.get(id) === task`)。
- **卸载失败可能让主进程崩溃且看不到原因**:`remove-installed` 的 `spawn` 没有 `error` 监听(spawn 失败时只触发 `error` 不触发 `close`,且主进程无全局兜底),也未消费 stderr(写满管道会阻塞包管理器,失败原因全部丢失)。现补齐 `error`/`stderr` 处理并统一收敛为一次 `remove-complete`。
- **云端应用列表静默丢数据**:某来源 `list-installed` 返回 `success:false`(来源被启动参数禁用 / 包管理器缺失)时,仍被当作「已刷新」,`mergeInstalledApps` 会丢弃该来源的本地已知记录,随后把不完整列表上传覆盖账号。现只统计真正查询成功的来源(已安装列表合并同样修正)。
- **忽略更新的写入失败无任何反馈**:`saveIgnored` 抛错会变成未处理的 rejection,列表不刷新、条目也不标记「已忽略」。现收敛为界面 warning。
- **下载次数统计上报失败产生未处理 rejection**:补 `.catch`,仅记录 warn 不影响安装。
- **`isInstalledAppInfo` 运行时校验被削弱**:拆分时只剩 `pkgname`/`origin` 两项检查,字段残缺的行会带着 `undefined` 流入已安装列表与云端同步条目。现恢复完整字段校验。
10. **清理重构遗留的孤儿代码**:
- 删除四个已成孤儿的组件:`AppDetailPage.vue`、`AccountQuickMenu.vue`、`TopActions.vue`、`update-center/UpdateCenterCloseConfirm.vue`(均无任何引用,也不进入构建产物),连同仅覆盖它们的 `AppDetailPage.test.ts`。
- App.vue 的 `handleRemoveComplete` 由空实现恢复为「卸载成功后移除下载队列残留记录」;`onUnmounted` 补回 `rootAbortController.abort()` 与 `updateCenterStore.unbind()`。
- 删除孤儿 IPC 处理器 `list-upgradable`(及仅其使用的 `parseUpgradableList`)、`show-apm-install-dialog`(前端早已改用 Vue 弹窗)、`uninstall-installed`(与在用的 `remove-installed` 重复)。
- 删除孤儿渲染端代码:`handleUpgrade`、`handleRemove`、`useDownloadItemStatus`,以及已无生产者的 `queue-install` 渲染端回灌监听器(其主进程 `webContents.send` 生产者在 `b5c5ab04` 已移除)。
相关提交:`1d9d25d6`、`c75938aa`、`39a358bb`、`51473cac`、`cf0e72ff`、`b0d60737`、`d3705ed4`。
+1 -1
View File
@@ -1,4 +1,4 @@
spark-store (5.3.0-0) UNRELEASED; urgency=medium
spark-store (5.3.2) UNRELEASED; urgency=medium
* Initial release.
+4 -1
View File
@@ -57,7 +57,10 @@ case "$1" in
systemctl daemon-reload
systemctl enable spark-update-notifier
systemctl start spark-update-notifier
# like apt-daily.timer
systemctl enable spark-update-notifier.timer
systemctl start spark-update-notifier.timer
# Update certain caches
cp -fv /opt/spark-store/extras/store.spark-app.spark-store.policy /usr/share/polkit-1/actions/store.spark-app.spark-store.policy
+54 -122
View File
@@ -15,6 +15,12 @@ const logger = pino({ name: "install-manager" });
// 包名白名单:仅允许合法包名字符,杜绝命令注入(spawn 用 shell:false 仍须校验)。
const PKGNAME_PATTERN = /^[a-zA-Z0-9._+-]+$/;
// 文件名(.deb)白名单:按 dpkg 规则允许包名/版本号合法字符。
// 含 epoch 冒号(steam-launcher_1:1.0.0.87_amd64.deb)与排序标记 ~(1.0~beta),
// 以及字母数字、. _ + -。路径遍历由下方 basename/".." 检查兜底。
// 注意字符组内 : 与 ~ 须用 \- 等转义字符隔离,避免形成正则区间(如 [:~] 会误匹配大量符号)。
const FILENAME_PATTERN = /^[A-Za-z0-9._+:\-~]+$/;
// 解析并校验应用类 IPC 的 payload(可能是旧版字符串或对象)。
// 返回规范化后的 { pkgname, origin },pkgname 非法时返回 null。
const parseAppPayload = (
@@ -261,41 +267,6 @@ const checkSparkAvailable = async (): Promise<boolean> => {
return found;
};
const parseUpgradableList = (output: string) => {
const apps: Array<{
pkgname: string;
newVersion: string;
currentVersion: string;
raw: string;
}> = [];
const lines = output.split("\n");
for (const line of lines) {
const trimmed = line.trim();
if (!trimmed) continue;
if (trimmed.startsWith("Listing")) continue;
if (trimmed.startsWith("[INFO]")) continue;
if (trimmed.includes("=") && !trimmed.includes("/")) continue;
if (!trimmed.includes("/")) continue;
const tokens = trimmed.split(/\s+/);
if (tokens.length < 2) continue;
const pkgToken = tokens[0];
const pkgname = pkgToken.split("/")[0];
const newVersion = tokens[1] || "";
const currentMatch = trimmed.match(
/\[(?:upgradable from|from):\s*([^\]\s]+)\]/i,
);
const currentToken = tokens[5] || "";
const currentVersion =
currentMatch?.[1] || currentToken.replace("[", "").replace("]", "");
if (!pkgname) continue;
apps.push({ pkgname, newVersion, currentVersion, raw: trimmed });
}
return apps;
};
/**
* 将任务加入安装/下载队列。被 IPC 监听与更新中心等内部模块共享使用。
* 入队前会执行包名、文件名、metalinkUrl 的校验,并检查重复任务。
@@ -326,7 +297,7 @@ export const addInstallTask = async (
return false;
}
// 包名/文件名白名单校验:防止路径遍历(如 ../../)或非法字符进入下载目录与安装命令构建
// 包名白名单校验:杜绝命令注入(spawn shell:false 仍须校验,且包名不含路径字符)。
if (!PKGNAME_PATTERN.test(pkgname)) {
logger.warn(`addInstallTask invalid pkgname: ${pkgname}`);
webContents?.send("install-complete", {
@@ -342,8 +313,11 @@ export const addInstallTask = async (
});
return false;
}
if (filename && !PKGNAME_PATTERN.test(filename)) {
logger.warn(`addInstallTask invalid filename: ${filename}`);
// 文件名(.deb)白名单校验:允许 Debian 包合法字符(含 epoch 冒号),并拒绝路径遍历
//("/" 与 ".." 段),防止写入下载目录之外的位置。
if (filename) {
if (!FILENAME_PATTERN.test(filename) || filename.includes("..") || path.basename(filename) !== filename) {
logger.warn(`addInstallTask invalid filename: ${filename}`);
webContents?.send("install-complete", {
id,
success: false,
@@ -356,6 +330,7 @@ export const addInstallTask = async (
}),
});
return false;
}
}
// metalinkUrl 来自渲染端(由目录 filename / 主进程解析的 downloadUrl 拼成)。
@@ -652,7 +627,7 @@ ipcMain.on("cancel-install", (event, id) => {
// 由对应的阶段处理器在 finally 中清理计数器与队列
} else {
// 排队中的任务(未开始执行):直接清理并调度
tasks.delete(id);
if (tasks.get(id) === task) tasks.delete(id);
processNextDownload();
processNextInstall();
}
@@ -904,7 +879,10 @@ async function runDownloadPhase(task: InstallTask) {
}),
});
}
tasks.delete(id);
// 身份校验后再删除:重试会用同一 id 覆盖 tasks 中的条目,
// 若此时旧任务(取消后仍在退出的进程)的清理流程把它删掉,
// 新任务就会从队列中消失,安装阶段永远不会被调度(界面卡在下载中)。
if (tasks.get(id) === task) tasks.delete(id);
} finally {
activeDownloadCount--;
processNextDownload();
@@ -1070,7 +1048,8 @@ async function runInstallPhase(task: InstallTask) {
});
}
} finally {
tasks.delete(id);
// 同上:重试复用 id 时,旧任务的 finally 不得删除新任务
if (tasks.get(id) === task) tasks.delete(id);
installIdle = true;
processNextInstall();
processNextDownload();
@@ -1176,20 +1155,19 @@ ipcMain.on("remove-installed", async (_event, payload) => {
env: process.env,
});
let output = "";
child.stdout.on("data", (data) => {
const chunk = data.toString();
output += chunk;
webContents.send("remove-progress", chunk);
});
child.on("close", (code) => {
let stderrOutput = "";
// spawn 失败(如 pkexec 与 shell-caller.sh 都不存在)只会触发 'error',
// 不会触发 'close';且没有全局 uncaughtException 兜底,缺少该监听会让
// 主进程直接抛出未捕获异常。这里统一收敛为一次 remove-complete。
let settled = false;
const finishRemove = (code: number | null, message: string) => {
if (settled) return;
settled = true;
const success = code === 0;
// 拼接json消息
const messageJSONObj = {
message: success ? "卸载完成" : `卸载失败,退出码 ${code}`,
message,
stdout: output,
stderr: "",
stderr: stderrOutput,
};
if (success) {
@@ -1205,7 +1183,31 @@ ipcMain.on("remove-installed", async (_event, payload) => {
exitCode: code,
message: JSON.stringify(messageJSONObj),
origin: origin,
// 回传包名,渲染端据此精确移除下载队列中对应的残留记录,
// 而不必依赖「当前详情应用」这类可能已切换的界面状态。
pkgname: pkgname,
} satisfies ChannelPayload);
};
child.stdout?.on("data", (data) => {
const chunk = data.toString();
output += chunk;
webContents.send("remove-progress", chunk);
});
// 必须消费 stderr:否则输出较多时管道写满会阻塞包管理器进程,
// 且失败原因(权限/依赖错误)会全部丢失,界面只能显示「退出码 N」。
child.stderr?.on("data", (data) => {
stderrOutput += data.toString();
});
child.on("error", (err) => {
logger.error(`remove-installed spawn 失败: ${err.message}`);
finishRemove(-1, `卸载失败: ${err.message}`);
});
child.on("close", (code) => {
finishRemove(code, code === 0 ? "卸载完成" : `卸载失败,退出码 ${code}`);
});
});
@@ -1467,24 +1469,6 @@ ipcMain.handle(
},
);
ipcMain.handle("list-upgradable", async () => {
const { code, stdout, stderr } = await runCommandCapture("apm", [
"list",
"--upgradable",
]);
if (code !== 0) {
logger.error(`list-upgradable failed: ${stderr || stdout}`);
return {
success: false,
message: stderr || stdout || `list-upgradable failed with code ${code}`,
apps: [],
};
}
const apps = parseUpgradableList(stdout);
return { success: true, apps };
});
ipcMain.handle("check-apm-available", async () => {
return await checkApmAvailable();
});
@@ -1493,58 +1477,6 @@ ipcMain.handle("check-spark-available", async () => {
return await checkSparkAvailable();
});
// 显示 APM 安装对话框(在点击安装按钮时提前检查)
// 前端已改为 Vue 弹窗,此后端处理仅作为兜底
ipcMain.handle("show-apm-install-dialog", async (event) => {
const webContents = event.sender;
webContents.send("trigger-apm-install-dialog");
return { success: false, cancelled: true };
});
ipcMain.handle(
"uninstall-installed",
async (
_event,
payload: unknown,
): Promise<{ success: boolean; message?: string }> => {
const parsed = parseAppPayload(payload);
if (!parsed) {
logger.warn("uninstall-installed invalid payload");
return { success: false, message: "invalid payload" };
}
const { pkgname, origin } = parsed;
const superUserCmd = await checkSuperUserCommand();
const execCommand = superUserCmd || SHELL_CALLER_PATH;
const execParams = superUserCmd ? [SHELL_CALLER_PATH] : [];
if (origin === "apm") {
execParams.push("apm", "remove", "-y", pkgname);
} else {
execParams.push("aptss", "remove", "-y", pkgname);
}
const { code, stdout, stderr } = await runCommandCapture(
execCommand,
execParams,
);
const success = code === 0;
if (success) {
logger.info(`卸载完成: ${pkgname}`);
} else {
logger.error(`卸载失败: ${pkgname} ${stderr || stdout}`);
}
return {
success,
message: success
? "卸载完成"
: stderr || stdout || `卸载失败,退出码 ${code}`,
};
},
);
interface LaunchAppPayload {
pkgname: string;
origin?: "spark" | "apm";
+25 -6
View File
@@ -211,15 +211,34 @@ export const createUpdateCenterService = (
open: refresh,
refresh,
async ignore(payload) {
const entries = await loadIgnored();
entries.add(createIgnoreKey(payload.packageName, payload.newVersion));
await saveIgnored(entries);
try {
const entries = await loadIgnored();
entries.add(createIgnoreKey(payload.packageName, payload.newVersion));
await saveIgnored(entries);
} catch (error) {
// 写入失败(配置目录不可写等)此前会以未处理的 rejection 冒泡到渲染端,
// 既不刷新列表也不给出任何提示,用户看到「点了没反应」。
// 这里收敛为一条 warning,让界面明确告知失败原因。
const message = error instanceof Error ? error.message : String(error);
console.error(`[UpdateCenter] 保存忽略列表失败:`, error);
applyWarning(`保存忽略列表失败: ${message}`);
return emit();
}
await refresh();
},
async unignore(payload) {
const entries = await loadIgnored();
entries.delete(createIgnoreKey(payload.packageName, payload.newVersion));
await saveIgnored(entries);
try {
const entries = await loadIgnored();
entries.delete(
createIgnoreKey(payload.packageName, payload.newVersion),
);
await saveIgnored(entries);
} catch (error) {
const message = error instanceof Error ? error.message : String(error);
console.error(`[UpdateCenter] 保存忽略列表失败:`, error);
applyWarning(`保存忽略列表失败: ${message}`);
return emit();
}
await refresh();
},
async start(tasks) {
+46 -13
View File
@@ -170,6 +170,18 @@ ipcMain.handle("save-window-bounds", (): boolean => {
return true;
});
// 渲染端(设置页)切换界面整体缩放系数,经此实时应用到主窗口。
// factor 限定在 0.5~3 之间,避免极端值导致界面不可用。
ipcMain.handle("set-zoom-factor", (_event, factor: unknown): boolean => {
if (typeof factor !== "number" || !Number.isFinite(factor)) return false;
const clamped = Math.min(3, Math.max(0.5, factor));
if (win && !win.isDestroyed()) {
win.webContents.setZoomFactor(clamped);
return true;
}
return false;
});
ipcMain.handle("get-app-version", (): string => getAppVersion());
ipcMain.handle("get-system-info", (): { distro: string } => getSystemInfo());
@@ -307,6 +319,8 @@ interface WindowState {
x?: number;
y?: number;
maximized?: boolean;
/** 界面整体缩放系数(Electron webContents.setZoomFactor),默认 1 */
zoomFactor?: number;
}
function getWindowStatePath(): string {
@@ -375,7 +389,14 @@ function flushSaveBounds(): void {
}
if (win && !win.isDestroyed()) {
const { width, height, x, y } = win.getBounds();
saveWindowState({ width, height, x, y, maximized: win.isMaximized() });
saveWindowState({
width,
height,
x,
y,
maximized: win.isMaximized(),
zoomFactor: win.webContents.getZoomFactor(),
});
}
}
function scheduleSaveBounds(winInstance: BrowserWindow): void {
@@ -389,6 +410,7 @@ function scheduleSaveBounds(winInstance: BrowserWindow): void {
x,
y,
maximized: winInstance.isMaximized(),
zoomFactor: winInstance.webContents.getZoomFactor(),
});
}, 400);
}
@@ -438,6 +460,17 @@ async function createWindow() {
});
win = mainWindow;
// 启动即应用持久化的界面缩放系数(默认 1 = 100%)。
// 必须在 loadURL/loadFile 前设置,使首帧即按目标缩放渲染,避免闪烁。
const savedZoom =
typeof saved.zoomFactor === "number" &&
saved.zoomFactor >= 0.5 &&
saved.zoomFactor <= 3
? saved.zoomFactor
: 1;
mainWindow.webContents.setZoomFactor(savedZoom);
logger.info({ zoomFactor: savedZoom }, "已应用界面缩放系数");
// 设计意图(非缺陷,勿改为自动恢复 maximized):
// 启动时不自动恢复最大化状态。原因——最大化窗口在多数屏幕上 bounds 会超过
// OVERSIZED_WINDOW_THRESHOLD(1600x900),若强行恢复最大化会导致「启动即全屏、
@@ -473,21 +506,13 @@ async function createWindow() {
logger.info("Renderer process is ready.");
});
// 仅允许可信域名的 https 链接通过浏览器打开,避免钓鱼/恶意站。
// 协议前缀 + 域名后缀白名单双重校验;非法/无效 URL 一律拒绝。
const ALLOWED_EXTERNAL_HOSTS = [
"spark-app.store",
"gitee.com",
"bbs.spark-app.store",
"spark-app.cn",
];
// 外部链接统一交给系统默认浏览器打开。
// 仅限制协议为 http/https,避免 file:/javascript: 等危险协议被打开;
// 不再限制域名,保证应用官网与首页推荐的任意链接均可正常访问。
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
try {
const parsed = new URL(url);
if (
parsed.protocol === "https:" &&
ALLOWED_EXTERNAL_HOSTS.some((h) => parsed.hostname === h || parsed.hostname.endsWith(`.${h}`))
) {
if (parsed.protocol === "http:" || parsed.protocol === "https:") {
shell.openExternal(url);
}
} catch {
@@ -843,6 +868,14 @@ app.whenReady().then(() => {
});
});
ipcMain.handle('window:state', () => {
const win = BrowserWindow.getFocusedWindow()
if (!win) return 'normal'
if (win.isMaximized()) return 'maximized'
if (win.isMinimized()) return 'minimized'
return 'normal'
})
// New window example arg: new windows url
// ipcMain.handle('open-win', (_, arg) => {
// const childWindow = new BrowserWindow({
+2
View File
@@ -51,6 +51,7 @@ type WindowControlBridge = {
minimize: () => void;
toggleMaximize: () => void;
close: () => void;
state: () => Promise<| 'normal' | 'maximized' | 'minimized'>;
};
type UpdateCenterStateListener = (snapshot: UpdateCenterSnapshot) => void;
@@ -110,6 +111,7 @@ contextBridge.exposeInMainWorld("windowControls", {
minimize: () => ipcRenderer.send("window-control-minimize"),
toggleMaximize: () => ipcRenderer.send("window-control-toggle-maximize"),
close: () => ipcRenderer.send("window-control-close"),
state: () => ipcRenderer.invoke("window:state"),
} satisfies WindowControlBridge);
contextBridge.exposeInMainWorld("updateCenter", {
+12 -32
View File
@@ -1,34 +1,22 @@
#!/bin/bash
# 显示进度条并执行命令(支持 garma / zenity)
# 显示进度条并执行命令(使用 zenity)
run_with_progress() {
local title="$1"
local text="$2"
local cmd="$3"
# 检测可用的对话框工具
local tool=""
if command -v garma &> /dev/null; then
tool="garma"
elif command -v zenity &> /dev/null; then
tool="zenity"
else
echo "警告:未找到 garma 或 zenity,无法显示进度条。直接执行命令..." >&2
if ! command -v zenity &> /dev/null; then
echo "警告:未找到 zenity,无法显示进度条。直接执行命令..." >&2
eval "$cmd"
return $?
fi
# 根据工具启动进度条
# 启动 zenity 进度条
local progress_pid
if [[ "$tool" == "garma" ]]; then
# garma 的进度条用法(假设 --progress --pulsate 可用)
garma --progress --pulsate --title="$title" --text="$text" --no-cancel 2>/dev/null &
progress_pid=$!
else
# zenity 进度条 pulsate 模式
zenity --progress --pulsate --title="$title" --text="$text" --no-cancel 2>/dev/null &
progress_pid=$!
fi
zenity --progress --pulsate --title="$title" --text="$text" --no-cancel 2>/dev/null &
progress_pid=$!
# 执行实际命令
eval "$cmd"
@@ -120,17 +108,13 @@ case "$command_type" in
title="确认卸载"
text="正在准备卸载: $packages\n\n若这是您下达的卸载指令,请选择确认继续卸载"
# 优先尝试 garma,其次 zenity
if command -v garma &> /dev/null; then
garma --question --title="$title" --text="$text" \
--ok-label="确认卸载" --cancel-label="取消" --width=400
confirmed=$?
elif command -v zenity &> /dev/null; then
# 使用 zenity 确认
if command -v zenity &> /dev/null; then
zenity --question --title="$title" --text="$text" \
--ok-label="确认卸载" --cancel-label="取消" --width=400
confirmed=$?
else
echo "错误:未找到 garma 或 zenity,无法显示确认对话框。卸载操作已拒绝。"
echo "错误:未找到 zenity,无法显示确认对话框。卸载操作已拒绝。"
exit 1
fi
@@ -148,17 +132,13 @@ case "$command_type" in
title="确认安装"
text="正在准备安装: $packages\n\n若这是您下达的安装指令,请选择确认继续安装"
# 优先尝试 garma,其次 zenity
if command -v garma &> /dev/null; then
garma --question --title="$title" --text="$text" \
--ok-label="确认安装" --cancel-label="取消" --width=400
confirmed=$?
elif command -v zenity &> /dev/null; then
# 使用 zenity 确认
if command -v zenity &> /dev/null; then
zenity --question --title="$title" --text="$text" \
--ok-label="确认安装" --cancel-label="取消" --width=400
confirmed=$?
else
echo "错误:未找到 garma 或 zenity,无法显示确认对话框。安装操作已拒绝。"
echo "错误:未找到 zenity,无法显示确认对话框。安装操作已拒绝。"
exit 1
fi
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "spark-store",
"version": "5.3.0",
"version": "5.3.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "spark-store",
"version": "5.3.0",
"version": "5.3.2",
"license": "GPL-3.0",
"dependencies": {
"@tailwindcss/vite": "^4.1.18",
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "spark-store",
"version": "5.3.0",
"version": "5.3.2",
"main": "dist-electron/main/index.js",
"description": "Client for Spark App Store",
"author": "elysia-best <elysia-best@simplelinux.cn.eu.org>",
@@ -1,15 +1,17 @@
[Unit]
Description=Spark Store update notifier
After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
# 设置为 1 小时的时间窗口
StartLimitIntervalSec=1h
# 最大允许失败次数为 3 次
StartLimitBurst=3
[Service]
Type=simple
RemainAfterExit=yes
ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh
Restart=on-failure
RestartSec=15 # 可以设置为更长的重试间隔,比如 15 秒或 30 秒
StartLimitIntervalSec=1h # 设置为 1 小时的时间窗口
StartLimitBurst=3 # 最大允许失败次数为 3 次
# 可以设置为更长的重试间隔,比如 15 秒或 30 秒
RestartSec=15
[Install]
WantedBy=multi-user.target
@@ -2,8 +2,8 @@
Description=Spark Store update notifier
[Timer]
OnCalendar=*-*-* 6,18:00
RandomizedDelaySec=12h
OnCalendar=*-*-* 6,12,18:00
RandomizedDelaySec=30m
Persistent=true
[Install]
+32 -1
View File
@@ -11,7 +11,12 @@
# 再运行一次 -> 5.2.1.2-test
#
# 注意:
# - 此脚本仅用于本地测试,不会修改 package.json(electron-builder 的 dir 产物版本)。
# - 此脚本仅用于本地测试,不会修改 package.json(其 version 为 semver 格式,
# 而 deb 测试版本如 5.3.0.8-test 会被 electron-builder 拒绝)。
# - 为保证打包后「关于」页面显示版本与 deb 版本一致,脚本会临时向
# electron-builder.yml 追加 extraMetadata.version(electron-builder 会将其写入
# app.asar 内的 package.json,Electron 的 app.getVersion() 即从中读取),
# 打包完成后自动恢复,异常退出时由 trap 兜底恢复。
# - 每次运行都会改写 debian/changelog,属于未跟踪的工作区改动,按需自行还原。
# - 如需恢复正式版本,将 debian/changelog 顶部版本改回即可。
@@ -71,7 +76,33 @@ sed -i -E "1s/\\(${old_ver_esc}\\)/(${new_ver})/" "$CHANGELOG"
# Electron 二进制下载镜像(本机到 GitHub 不通,使用 npmmirror 镜像)
export ELECTRON_MIRROR="${ELECTRON_MIRROR:-https://registry.npmmirror.com/-/binary/electron/}"
# 同步应用内版本号:临时向 electron-builder.yml 追加 extraMetadata.version。
# electron-builder 会把它合并进 app.asar 内的 package.json,
# 「关于」页面经 IPC 调用的 app.getVersion() 即读取该值。
EB_YML="electron-builder.yml"
EB_YML_BAK="${EB_YML}.bak-test-build"
# 清理上次异常中断可能残留的 extraMetadata 块(追加内容始终位于文件末尾)
if grep -q "^extraMetadata:" "$EB_YML"; then
echo "清理 $EB_YML 中残留的 extraMetadata 块"
sed -i '/^extraMetadata:/,$d' "$EB_YML"
fi
cp "$EB_YML" "$EB_YML_BAK"
restore_eb_yml() {
mv -f "$EB_YML_BAK" "$EB_YML" 2>/dev/null || true
}
trap restore_eb_yml EXIT
printf 'extraMetadata:\n version: "%s"\n' "$new_ver" >> "$EB_YML"
# 清理旧的 electron-builder 产物,避免 release/ 下多个版本目录被 make install
# 的 release/*/linux*-unpacked/* 通配一并拷入 deb,造成内容污染
rm -rf release/
echo "开始测试打包(版本 ${new_ver})..."
dpkg-buildpackage -us -uc -b
# 打包成功,立即恢复 electron-builder.yml 并解除 trap
restore_eb_yml
trap - EXIT
echo "完成。产物: ../spark-store_${new_ver}_amd64.deb"
+46 -7
View File
@@ -14,6 +14,7 @@
@toggle-theme="toggleTheme"
@toggle-sidebar="isSidebarOpen = !isSidebarOpen"
@spk-link="handleSpkLink"
:is-maximized="isMaximized"
/>
<div class="flex min-h-0 flex-1 flex-col lg:flex-row">
@@ -236,7 +237,7 @@
:show="showUninstallModal"
:app="uninstallTargetApp"
@close="closeUninstallModal"
@success="onUninstallSuccess"
@success="handleUninstallSuccess"
/>
<ApmInstallConfirmModal
@@ -344,6 +345,7 @@ import ReviewUserProfileModal from "./components/ReviewUserProfileModal.vue";
import WindowTitleBar from "./components/WindowTitleBar.vue";
import SubmitterWindow from "./components/SubmitterWindow.vue";
import { initTagPriorityStrategy } from "./global/tagPriority";
import { initUiScale } from "./global/displaySettings";
import {
FLARUM_BASE_URL,
FLARUM_REGISTER_URL,
@@ -532,6 +534,9 @@ import {
registerCheckAppInstalled,
registerRequestUninstall,
} from "./composables/useDownloads";
// 下载队列条目维护:卸载完成后需要按包名移除残留记录
import { removeDownloadItem } from "./global/downloadStatus";
import { rootAbortController } from "./composables/useHttp";
const logger = pino();
@@ -545,6 +550,11 @@ const isDarkTheme = computed(() => {
return themeMode.value === "dark";
});
const isMaximized = ref(false)
const updateIsMaximizedState = async () => {
const state = await window.windowControls.state()
isMaximized.value = state === 'maximized'
}
const isSubmitterView = ref(false);
// 启动参数 --no-apm => 仅 Spark;--no-spark => 仅 APM;由主进程 IPC 提供
@@ -882,6 +892,18 @@ const closeUninstallModal = () => {
uninstallTargetApp.value = null;
};
// 卸载成功:刷新已安装列表,并刷新仍打开的详情弹窗安装状态。
// 卸载确认弹窗会叠在详情弹窗之上,详情弹窗此时的「打开/卸载」按钮取自
// currentAppSparkInstalled / currentAppApmInstalled;不刷新就会继续显示
// 「打开/卸载」(应用其实已卸载,点「打开」会去启动一个不存在的包)。
// 该分支在 App.vue 拆分为 composables 时曾被漏掉,这里在编排层统一补回。
const handleUninstallSuccess = () => {
onUninstallSuccess();
if (showModal.value && currentApp.value) {
checkAppInstalled(currentApp.value);
}
};
const closeApmInstallDialog = () => {
showApmInstallDialog.value = false;
};
@@ -922,6 +944,8 @@ const handleWindowResize = () => {
saveBoundsTimer = window.setTimeout(() => {
void window.ipcRenderer.invoke("save-window-bounds");
}, 400);
updateIsMaximizedState()
};
// —— 以下为可复用的事件/IPC 监听处理器(命名函数,便于 onUnmounted 统一移除)——
@@ -1038,13 +1062,20 @@ const handleDeepLinkSearch = (
}
};
// 卸载完成:移除下载队列中已完成的记录。
// 重构自 App.vue 时该分支一度被掏空成空实现(且注释误称由 useDownloads 处理),
// 而 useDownloads 从不调用 removeDownloadItem,导致从详情页卸载后队列记录长期残留。
const handleRemoveComplete = (
_event: IpcRendererEvent,
payload: import("./global/typedefinition").ChannelPayload,
) => {
const pkgname = currentApp.value?.pkgname;
// 优先用主进程回传的包名(精确),旧版主进程未回传时退回当前详情应用。
const pkgname =
(typeof payload.pkgname === "string" ? payload.pkgname : "") ||
currentApp.value?.pkgname ||
"";
if (payload.success && pkgname) {
// 由 useDownloads 内部维护 pendingDownloadRecords;此处仅关闭详情态
removeDownloadItem(pkgname);
}
};
@@ -1052,6 +1083,8 @@ onMounted(async () => {
// 应用启动即锁定标签优先显示策略的真实持久化值,避免依赖详情页挂载顺序
// 导致先读到内存默认值 "auto" 再懒加载的竞态窗口。
initTagPriorityStrategy();
// 恢复并应用持久化的界面整体缩放(Electron setZoomFactor)。
void initUiScale();
initTheme();
updateCenterStore.bind();
@@ -1098,14 +1131,16 @@ onMounted(async () => {
await Promise.all([loadHome(), preloadHomeListApps()]);
// 全量应用后台加载(不阻塞首页推荐):首个分类成功即关闭首屏遮罩,
// 增量渲染,排行稍后由 loadRanking 刷新。
// 增量渲染;全量加载完成后再刷新排行榜,确保 spark/apm 应用均已就绪。
// 注意:loadApps 内部首个 await 前 apps 仍为空,loadRanking 开头有
// `if (apps.value.length === 0) return`,若与之并发调用会直接空跑返回,
// 导致下载排行永久停留在空状态,故必须在其 resolve 之后再触发。
void loadApps(() => {
loading.value = false; // 首屏:已有部分应用即可显示
}).then(() => {
void loadRanking();
});
// 全量应用加载完成后再刷新排行榜,确保 spark/apm 应用均已就绪
loadRanking();
// 其余分类入口预加载(用户点击分类时才需要,延后)
preloadSidebarTabApps().then(() => {
logger.info("侧边栏入口预加载完成");
@@ -1141,6 +1176,10 @@ onMounted(async () => {
});
onUnmounted(() => {
// 取消仍在进行的目录/详情请求,避免组件销毁后回调写入已卸载状态
rootAbortController.abort();
// 解除更新中心 IPC 状态监听(bind 在 onMounted 中注册)
updateCenterStore.unbind();
// 清理窗口尺寸防抖定时器,防止组件销毁后仍触发 IPC 保存调用
if (saveBoundsTimer) clearTimeout(saveBoundsTimer);
// 停止仍挂起的"等待 loading 完成后执行一次"的 watcher,避免泄漏
+239
View File
@@ -0,0 +1,239 @@
/**
* APM 安装引导弹窗回归测试。
*
* 背景(历史 Bug):APM 未安装时点击安装 APM 来源的应用,商店「静默什么都不发生」。
* 根因是 showApmInstallDialog 存在两份 ref 实例:
* - src/global/storeConfig.ts (modules/processInstall 置位)
* - src/composables/useAppState.ts (App.vue 读取,历史上重复 ref(false) 声明)
* 置位写的是 A,弹窗读的是 B,因此弹窗永不显示、下载任务也不会创建。
*
* 本测试锁死「同一实例」这一不变量,并端到端验证:APM 未安装时点「安装」
* 必定弹出 APM 引导弹窗(而不是静默失败)。
*/
import { cleanup, fireEvent, render, screen } from "@testing-library/vue";
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
// 注意:App / processInstall / 共享状态一律在用例内动态 import。
// 原因:processInstall 在模块初始化时就用 window.ipcRenderer.on 注册监听,
// 静态 import 会在测试文件的 beforeEach 之前执行(此时收集用的 on mock 还没装上),
// 处理器就收集不到了。
const importApp = () => import("@/App.vue");
const importState = () => import("@/composables/useAppState");
const importDownloads = () => import("@/global/downloadStatus");
const invoke = vi.fn();
const send = vi.fn();
const ipcHandlers = new Map<string, Array<(...args: unknown[]) => void>>();
vi.mock("axios", () => {
const get = vi.fn(async (url: string) => {
if (url.includes("categories.json")) {
return { data: { office: { zh: "办公" } } };
}
if (url.includes("/office/applist.json")) {
return {
data: [
{
Name: "WPS",
Pkgname: "wps",
Version: "1.0.0",
Filename: "wps_1.0.0_amd64.deb",
Torrent_address: "",
Author: "",
Contributor: "",
Website: "",
Update: "",
Size: "",
More: "Office suite",
Tags: "",
img_urls: "[]",
icons: "",
},
],
};
}
return { data: [] };
});
const post = vi.fn(async () => ({ data: { ok: true } }));
return {
default: {
create: () => ({
interceptors: {
request: { use: () => undefined },
response: { use: () => undefined },
},
get,
post,
}),
},
};
});
vi.mock("@/modules/updateCenter", () => ({
createUpdateCenterStore: () => ({
isOpen: { value: false },
showCloseConfirm: { value: false },
showMigrationConfirm: { value: false },
searchQuery: { value: "" },
selectedTaskKeys: { value: new Set<string>() },
snapshot: {
value: { items: [], tasks: [], warnings: [], hasRunningTasks: false },
},
filteredItems: { value: [] },
allSelected: { value: false },
someSelected: { value: false },
bind: vi.fn(),
unbind: vi.fn(),
open: vi.fn(),
refresh: vi.fn(),
ignoreItem: vi.fn(),
unignoreItem: vi.fn(),
toggleSelection: vi.fn(),
toggleSelectAll: vi.fn(),
getSelectedItems: vi.fn(() => []),
closeNow: vi.fn(),
startSelected: vi.fn(),
requestClose: vi.fn(),
}),
}));
describe("APM 安装引导弹窗", () => {
afterEach(() => {
cleanup();
});
beforeEach(() => {
vi.clearAllMocks();
ipcHandlers.clear();
invoke.mockImplementation(async (channel: string) => {
if (channel === "get-store-filter") return "apm";
if (channel === "check-spark-available") return false;
// 本机未安装 APM —— 这正是弹窗需要出现的场景
if (channel === "check-apm-available") return false;
if (channel === "get-app-version") return "5.0.0";
if (channel === "get-system-info") return { distro: "deepin 25" };
if (channel === "list-installed") return { success: true, apps: [] };
if (channel === "check-installed") return false;
return [];
});
Object.assign(window.ipcRenderer, {
invoke,
send,
on: vi.fn((channel: string, handler: (...args: unknown[]) => void) => {
// 同一 channel 可能有多个监听者(App.vue 与 processInstall 各注册一份),
// 全部收集,避免只拿到最后一个 handler。
const list = ipcHandlers.get(channel) ?? [];
list.push(handler);
ipcHandlers.set(channel, list);
}),
off: vi.fn(),
});
window.apm_store.arch = "amd64";
localStorage.clear();
vi.stubGlobal(
"matchMedia",
vi.fn(() => ({
matches: false,
addEventListener: vi.fn(),
removeEventListener: vi.fn(),
})),
);
vi.stubGlobal("scrollTo", vi.fn());
class MockIntersectionObserver {
observe = vi.fn();
disconnect = vi.fn();
unobserve = vi.fn();
}
vi.stubGlobal("IntersectionObserver", MockIntersectionObserver);
});
it("storeConfig 与 useAppState 导出的弹窗开关必须是同一个 ref 实例", async () => {
const config = await import("@/global/storeConfig");
const state = await importState();
expect(state.showApmInstallDialog).toBe(config.showApmInstallDialog);
// 写在任一侧,另一侧必须立刻可见(防止再次分裂成两份 ref)
config.showApmInstallDialog.value = false;
state.showApmInstallDialog.value = true;
expect(config.showApmInstallDialog.value).toBe(true);
});
it(
"APM 未安装时点击「安装」会弹出 APM 引导弹窗,且不创建下载任务",
{ timeout: 30000 },
async () => {
render((await importApp()).default);
await fireEvent.click(
await screen.findByRole("button", { name: "全部应用 1" }),
);
await fireEvent.click(await screen.findByText("WPS"));
await fireEvent.click(
await screen.findByRole("button", { name: "安装" }),
);
// 弹窗必须出现(修复前:因为读的是另一个 ref,这里永远找不到,界面「什么都不发生」)
expect(await screen.findByText("需要安装 APM")).toBeTruthy();
// 未安装 APM 时不应把任务塞进下载队列
expect(send).not.toHaveBeenCalledWith("queue-install", expect.anything());
},
);
it("主进程回传「未安装 APM」失败时会置位弹窗开关(兜底不再静默)", async () => {
// 清模块缓存后重新加载:测试文件自身对 processInstall 的依赖会在收集 mock 之前
// 就把它初始化掉,这里强制重跑一遍模块顶层,才能让本次用例收集到它注册的处理器。
vi.resetModules();
await import("@/modules/processInstall");
const { downloads } = await importDownloads();
// 先挂载 App,让 useDownloads 注册 downloadStatus 监听(它会改写 downloads.value),
// 之后再写入本次用例的下载项,避免被清空。
render((await importApp()).default);
await screen.findByRole("button", { name: "全部应用 1" });
downloads.value = [
{
id: 42,
name: "WPS",
pkgname: "wps",
version: "1.0.0",
icon: "",
origin: "apm",
status: "queued",
progress: 0,
downloadedSize: 0,
totalSize: 0,
speed: 0,
timeRemaining: 0,
startTime: Date.now(),
logs: [],
source: "APM Store",
retry: false,
},
];
const { showApmInstallDialog } = await importState();
showApmInstallDialog.value = false;
const completion = {
id: 42,
time: Date.now(),
success: false,
exitCode: -1,
message: JSON.stringify({
message: "未安装 APM,无法继续安装此应用",
stdout: "",
stderr: "",
}),
};
for (const handler of ipcHandlers.get("install-complete") ?? []) {
handler({}, completion);
}
expect(showApmInstallDialog.value).toBe(true);
expect(downloads.value[0].status).toBe("failed");
});
});
-193
View File
@@ -1,193 +0,0 @@
import { fireEvent, render, screen } from "@testing-library/vue";
import { describe, expect, it, vi } from "vitest";
import AppDetailPage from "@/components/AppDetailPage.vue";
import type { App, ReviewTags } from "@/global/typedefinition";
vi.mock("@/components/ReviewsPanel.vue", () => ({
default: {
name: "ReviewsPanel",
props: ["appKey", "tags", "loggedIn", "canSubmit"],
emits: ["request-login", "show-user"],
template:
'<button type="button" data-testid="reviews-panel" :data-app-key="appKey" :data-origin="tags.origin" :data-version="tags.version" :data-can-submit="String(canSubmit)" @click="$emit(\'show-user\', { id: 31, userDisplayName: \'Detail User\', userAvatarUrl: \'\', rating: 5, content: \'\', version: tags.version, packageArch: tags.packageArch, clientArch: tags.clientArch, distro: tags.distro, origin: tags.origin, category: tags.category, createdAt: \'\', updatedAt: \'\' })"></button>',
},
}));
const app: App = {
name: "WPS",
pkgname: "wps",
version: "1.0.0",
filename: "wps_1.0.0_amd64.deb",
torrent_address: "",
author: "",
contributor: "",
website: "",
update: "",
size: "110M",
more: "Office suite",
tags: "office",
img_urls: [],
icons: "",
category: "office",
origin: "apm",
currentStatus: "not-installed",
};
const sparkApp: App = {
...app,
name: "WPS Spark",
version: "2.0.0",
filename: "wps_2.0.0_amd64.deb",
origin: "spark",
};
const apmApp: App = {
...app,
name: "WPS APM",
version: "1.0.0",
filename: "wps_1.0.0_amd64.deb",
origin: "apm",
};
const mergedApp: App = {
...sparkApp,
isMerged: true,
sparkApp,
apmApp,
viewingOrigin: "spark",
};
const sparkTags: ReviewTags = {
origin: "spark",
category: "office",
pkgname: "wps",
version: "2.0.0",
packageArch: "amd64",
clientArch: "amd64",
distro: "deepin 25",
};
describe("AppDetailPage", () => {
it("renders as page, emits back, and gates favorite for anonymous users", async () => {
const rendered = render(AppDetailPage, {
props: {
app,
screenshots: [],
sparkInstalled: false,
apmInstalled: false,
loggedIn: false,
reviewAppKey: "apm:amd64-apm:office:wps",
reviewTags: null,
},
});
expect(screen.getByText("Office suite")).toBeTruthy();
await fireEvent.click(screen.getByRole("button", { name: "返回" }));
await fireEvent.click(screen.getByRole("button", { name: "收藏" }));
expect(rendered.emitted("back")).toHaveLength(1);
expect(rendered.emitted("request-login")?.[0]?.[0]).toBe(
"收藏应用需要登录星火账号。",
);
});
it("gates reviews for anonymous users", async () => {
const rendered = render(AppDetailPage, {
props: {
app,
screenshots: [],
sparkInstalled: false,
apmInstalled: false,
loggedIn: false,
reviewAppKey: "apm:amd64-apm:office:wps",
reviewTags: sparkTags,
},
});
expect(screen.queryByTestId("reviews-panel")).toBeNull();
await fireEvent.click(
screen.getByRole("button", { name: "登录后查看评价" }),
);
expect(rendered.emitted("request-login")?.[0]?.[0]).toBe(
"登录后查看和发表评论。",
);
});
it("updates review identity when switching a merged app origin", async () => {
render(AppDetailPage, {
props: {
app: mergedApp,
screenshots: [],
sparkInstalled: true,
apmInstalled: true,
loggedIn: true,
reviewAppKey: "spark:amd64-store:office:wps",
reviewTags: sparkTags,
},
});
expect(screen.getByTestId("reviews-panel")).toHaveAttribute(
"data-app-key",
"spark:amd64-store:office:wps",
);
expect(screen.getByTestId("reviews-panel")).toHaveAttribute(
"data-origin",
"spark",
);
await fireEvent.click(screen.getByRole("button", { name: "APM" }));
expect(screen.getByTestId("reviews-panel")).toHaveAttribute(
"data-app-key",
"apm:amd64-apm:office:wps",
);
expect(screen.getByTestId("reviews-panel")).toHaveAttribute(
"data-origin",
"apm",
);
expect(screen.getByTestId("reviews-panel")).toHaveAttribute(
"data-version",
"1.0.0",
);
});
it("marks reviews read-only when the selected origin is not installed", () => {
render(AppDetailPage, {
props: {
app,
screenshots: [],
sparkInstalled: false,
apmInstalled: false,
loggedIn: true,
reviewAppKey: "apm:amd64-apm:office:wps",
reviewTags: sparkTags,
},
});
expect(screen.getByTestId("reviews-panel")).toHaveAttribute(
"data-can-submit",
"false",
);
});
it("forwards review user profile events", async () => {
const rendered = render(AppDetailPage, {
props: {
app,
screenshots: [],
sparkInstalled: true,
apmInstalled: true,
loggedIn: true,
reviewAppKey: "apm:amd64-apm:office:wps",
reviewTags: sparkTags,
},
});
await fireEvent.click(screen.getByTestId("reviews-panel"));
expect(rendered.emitted("show-user")?.[0]?.[0]).toEqual(
expect.objectContaining({ userDisplayName: "Detail User" }),
);
});
});
+5 -30
View File
@@ -1,39 +1,14 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
describe("processInstall queue forwarding", () => {
describe("processInstall", () => {
// 注:原先此处的「queue-install 事件回灌」用例已删除——
// 该渲染端监听器对应的主进程 webContents.send("queue-install") 生产者在
// 更新中心改为直接调用 addInstallTask 后即被移除(b5c5ab04),
// 监听器成为孤儿代码,已一并清理。
beforeEach(() => {
vi.resetModules();
});
it("forwards update-center queue-install events back to the main install queue", async () => {
const handlers = new Map<string, (...args: unknown[]) => void>();
const send = vi.fn();
const on = vi.fn(
(channel: string, handler: (...args: unknown[]) => void) => {
handlers.set(channel, handler);
},
);
Object.assign(window.ipcRenderer, {
on,
send,
invoke: vi.fn(),
});
await import("@/modules/processInstall");
const payload = JSON.stringify({
id: 7,
pkgname: "spark-weather",
origin: "spark",
upgradeOnly: true,
});
handlers.get("queue-install")?.({}, payload);
expect(send).toHaveBeenCalledWith("queue-install", payload);
});
it("allocates install ids after existing update tasks", async () => {
const handlers = new Map<string, (...args: unknown[]) => void>();
const send = vi.fn();
-83
View File
@@ -1,83 +0,0 @@
<template>
<div
class="absolute left-0 right-0 top-full z-20 mt-2 rounded-2xl border border-slate-200 bg-white p-2 shadow-xl dark:border-slate-700 dark:bg-slate-900"
>
<button
type="button"
class="quick-menu-item"
@click="emit('open-user-management')"
>
<i class="fas fa-user-cog"></i>
<span class="min-w-0 truncate">用户管理</span>
</button>
<button
type="button"
class="quick-menu-item"
@click="emit('open-favorites')"
>
<i class="fas fa-heart"></i>
<span class="min-w-0 truncate">我的收藏</span>
</button>
<button type="button" class="quick-menu-item" @click="emit('open-forum')">
<i class="fas fa-comments"></i>
<span class="min-w-0 truncate">论坛首页</span>
</button>
<button type="button" class="quick-menu-item" @click="emit('edit-profile')">
<i class="fas fa-id-card"></i>
<span class="min-w-0 truncate">修改论坛资料</span>
</button>
<button
type="button"
class="quick-menu-item text-red-600 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300"
@click="emit('logout')"
>
<i class="fas fa-sign-out-alt"></i>
<span class="min-w-0 truncate">退出登录</span>
</button>
</div>
</template>
<script setup lang="ts">
const emit = defineEmits<{
"open-user-management": [];
"open-favorites": [];
"open-forum": [];
"edit-profile": [];
logout: [];
}>();
</script>
<style scoped>
.quick-menu-item {
display: flex;
width: 100%;
align-items: center;
gap: 0.75rem;
min-width: 0;
border-radius: 0.75rem;
padding: 0.625rem 0.75rem;
text-align: left;
font-size: 0.875rem;
font-weight: 500;
color: #475569;
transition: all 0.15s ease;
}
.quick-menu-item i {
flex-shrink: 0;
}
.quick-menu-item:hover {
background: rgba(0, 113, 227, 0.06);
color: #0071e3;
}
.dark .quick-menu-item {
color: #cbd5e1;
}
.dark .quick-menu-item:hover {
background: rgba(64, 156, 255, 0.1);
color: #409cff;
}
</style>
+2 -4
View File
@@ -153,12 +153,10 @@ const formatDownloads = (n?: number): string => {
// 排名徽标配色(前 3 名金/银/铜,其余灰色)
const rankClass = computed(() => {
if (props.rank === 1)
return "bg-amber-400 text-white shadow-amber-400/40";
if (props.rank === 1) return "bg-amber-400 text-white shadow-amber-400/40";
if (props.rank === 2)
return "bg-slate-300 text-slate-700 shadow-slate-400/40";
if (props.rank === 3)
return "bg-amber-600 text-white shadow-amber-600/40";
if (props.rank === 3) return "bg-amber-600 text-white shadow-amber-600/40";
return "bg-slate-500/90 text-white shadow-slate-500/30";
});
-421
View File
@@ -1,421 +0,0 @@
<template>
<section
v-if="displayApp"
class="mx-auto max-w-6xl rounded-3xl border border-slate-200 bg-white p-5 shadow-sm dark:border-slate-800 dark:bg-slate-900 lg:p-6"
>
<button
type="button"
class="mb-5 inline-flex items-center gap-2 rounded-full border border-slate-200 bg-white px-4 py-2 text-sm font-medium text-slate-600 shadow-sm transition hover:bg-slate-50 hover:text-slate-900 dark:border-slate-700 dark:bg-slate-800 dark:text-slate-300 dark:hover:bg-slate-700"
aria-label="返回"
@click="emit('back')"
>
<i class="fas fa-arrow-left"></i>
<span>返回</span>
</button>
<div class="grid gap-6 lg:grid-cols-[18rem_minmax(0,1fr)]">
<aside class="space-y-5">
<div class="text-center">
<div
class="mx-auto flex h-28 w-28 items-center justify-center overflow-hidden rounded-3xl bg-gradient-to-b from-slate-100 to-slate-200 shadow-lg dark:from-slate-800 dark:to-slate-700"
>
<img
:src="iconPath"
alt="icon"
class="h-full w-full object-cover"
loading="lazy"
/>
</div>
<h1 class="mt-4 text-2xl font-bold text-slate-900 dark:text-white">
{{ displayApp.name }}
</h1>
<p class="mt-1 text-sm text-slate-500 dark:text-slate-400">
{{ displayApp.pkgname }}
</p>
<p
v-if="displayApp.version"
class="mt-1 text-sm text-slate-500 dark:text-slate-400"
>
{{ displayApp.version }}
</p>
</div>
<div
class="flex items-center justify-between rounded-2xl border border-slate-200/60 bg-slate-50/70 px-4 py-3 dark:border-slate-800/60 dark:bg-slate-800/50"
>
<span class="text-sm text-slate-500 dark:text-slate-400">来源</span>
<div
v-if="app.isMerged"
class="flex overflow-hidden rounded-lg border border-slate-200 shadow-sm dark:border-slate-700"
>
<button
v-if="app.sparkApp"
type="button"
title="原生安装,高手自定义"
class="px-3 py-1 text-xs font-medium uppercase tracking-wider transition-colors"
:class="
viewingOrigin === 'spark'
? 'bg-orange-500 text-white'
: 'bg-slate-100 text-slate-500 hover:bg-slate-200 dark:bg-slate-700 dark:text-slate-400 dark:hover:bg-slate-600'
"
@click="selectOrigin('spark')"
>
Spark
</button>
<button
v-if="app.apmApp"
type="button"
title="兼容安装,省心不折腾"
class="px-3 py-1 text-xs font-medium uppercase tracking-wider transition-colors"
:class="
viewingOrigin === 'apm'
? 'bg-blue-500 text-white'
: 'bg-slate-100 text-slate-500 hover:bg-slate-200 dark:bg-slate-700 dark:text-slate-400 dark:hover:bg-slate-600'
"
@click="selectOrigin('apm')"
>
APM
</button>
</div>
<span
v-else
class="rounded-md px-2 py-1 text-xs font-bold uppercase tracking-wider"
:class="
displayApp.origin === 'spark'
? 'bg-orange-100 text-orange-600 dark:bg-orange-900/30 dark:text-orange-400'
: 'bg-blue-100 text-blue-600 dark:bg-blue-900/30 dark:text-blue-400'
"
>
{{ displayApp.origin === "spark" ? "Spark" : "APM" }}
</span>
</div>
<div class="space-y-2">
<button
v-if="!isInstalled"
type="button"
class="inline-flex w-full items-center justify-center gap-2 rounded-xl bg-slate-800 px-4 py-2.5 text-sm font-medium text-white shadow-sm transition hover:bg-slate-700 disabled:opacity-40 dark:bg-slate-700 dark:hover:bg-slate-600"
:disabled="isOtherVersionInstalled"
@click="emit('install', displayApp)"
>
<i class="fas fa-download text-xs"></i>
<span>{{ installButtonText }}</span>
</button>
<div v-else class="flex gap-2">
<button
type="button"
class="inline-flex flex-1 items-center justify-center gap-2 rounded-xl bg-slate-800 px-4 py-2.5 text-sm font-medium text-white shadow-sm transition hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
@click="emit('open-app', displayApp.pkgname, displayApp.origin)"
>
<i class="fas fa-external-link-alt text-xs"></i>
<span>打开</span>
</button>
<button
type="button"
class="inline-flex flex-1 items-center justify-center gap-2 rounded-xl border border-slate-300 bg-white px-4 py-2.5 text-sm font-medium text-slate-600 transition hover:border-rose-400 hover:bg-rose-50 hover:text-rose-500 dark:border-slate-600 dark:bg-slate-800 dark:text-slate-300 dark:hover:bg-slate-700 dark:hover:text-rose-400"
@click="emit('remove', displayApp)"
>
<i class="fas fa-trash text-xs"></i>
<span>卸载</span>
</button>
</div>
<!-- 收藏功能暂时关闭
<button
type="button"
class="inline-flex w-full items-center justify-center gap-2 rounded-xl border border-slate-300 bg-white px-4 py-2.5 text-sm font-medium text-slate-600 transition hover:bg-slate-50 hover:text-slate-900 dark:border-slate-600 dark:bg-slate-800 dark:text-slate-300 dark:hover:bg-slate-700"
@click="handleFavorite"
>
<i class="fas fa-star text-xs"></i>
<span>{{ favoriteButtonText }}</span>
</button>
-->
<button
type="button"
class="inline-flex w-full items-center justify-center gap-2 rounded-xl border border-slate-300 bg-white px-4 py-2.5 text-sm font-medium text-slate-600 transition hover:bg-slate-50 hover:text-slate-900 dark:border-slate-600 dark:bg-slate-800 dark:text-slate-300 dark:hover:bg-slate-700"
@click="copySpkLink"
>
<i
class="fas text-xs"
:class="spkCopied ? 'fa-check' : 'fa-share-alt'"
></i>
<span>{{ spkCopied ? "已复制链接" : "SPK 分享" }}</span>
</button>
</div>
<dl
class="space-y-2 border-t border-slate-200/60 pt-3 text-xs dark:border-slate-800/60"
>
<div v-if="displayApp.category" class="flex justify-between gap-3">
<dt class="text-slate-400">分类</dt>
<dd class="truncate text-slate-700 dark:text-slate-300">
{{ displayApp.category }}
</dd>
</div>
<div v-if="displayApp.author" class="flex justify-between gap-3">
<dt class="text-slate-400">作者</dt>
<dd class="truncate text-slate-700 dark:text-slate-300">
{{ displayApp.author }}
</dd>
</div>
<div v-if="displayApp.size" class="flex justify-between gap-3">
<dt class="text-slate-400">大小</dt>
<dd class="text-slate-700 dark:text-slate-300">
{{ displayApp.size }}
</dd>
</div>
<div v-if="displayApp.update" class="flex justify-between gap-3">
<dt class="text-slate-400">更新</dt>
<dd class="text-slate-700 dark:text-slate-300">
{{ displayApp.update }}
</dd>
</div>
</dl>
</aside>
<div class="min-w-0 space-y-5">
<div
class="rounded-2xl border border-slate-200/60 bg-slate-50/50 p-5 dark:border-slate-800/60 dark:bg-slate-800/30"
>
<h2 class="mb-3 flex items-center gap-2 text-base font-semibold">
<i class="fas fa-info-circle text-slate-400"></i>
应用详情
</h2>
<div
v-if="displayApp.more.trim() !== ''"
class="space-y-2 text-sm leading-relaxed text-slate-600 dark:text-slate-300"
v-html="detailHtml"
></div>
<p v-else class="text-sm text-slate-400">暂无应用详情</p>
</div>
<div
class="rounded-2xl border border-slate-200/60 bg-slate-50/50 p-5 dark:border-slate-800/60 dark:bg-slate-800/30"
>
<h2 class="mb-3 flex items-center gap-2 text-base font-semibold">
<i class="fas fa-images text-slate-400"></i>
应用截图
</h2>
<div v-if="screenshots.length" class="grid gap-3 sm:grid-cols-2">
<img
v-for="(screen, index) in screenshots"
:key="screen"
:src="screen"
alt="screenshot"
class="h-44 w-full cursor-pointer rounded-2xl border border-slate-200/60 object-cover shadow-sm transition hover:-translate-y-1 hover:shadow-lg dark:border-slate-800/60"
loading="lazy"
@click="emit('open-preview', index)"
@error="hideImage"
/>
</div>
<p v-else class="text-sm text-slate-400">暂无应用截图</p>
</div>
<!-- 评论功能暂时关闭
<ReviewsPanel
v-if="loggedIn && reviewAppKey && reviewTags"
:app-key="reviewAppKey"
:tags="reviewTags"
:logged-in="loggedIn"
:can-submit="isInstalled"
@request-login="$emit('request-login', $event)"
@show-user="emit('show-user', $event)"
/>
<section
v-else-if="!loggedIn && reviewAppKey && reviewTags"
class="rounded-2xl border border-slate-200/60 bg-slate-50/50 p-5 dark:border-slate-800/60 dark:bg-slate-800/30"
>
<h2 class="mb-2 flex items-center gap-2 text-base font-semibold">
<i class="fas fa-comments text-slate-400"></i>
应用评价
</h2>
<p class="text-sm text-slate-500 dark:text-slate-400">
登录星火账号后可查看评价并发表评论。
</p>
<button
type="button"
class="mt-4 inline-flex items-center rounded-xl bg-slate-800 px-4 py-2 text-sm font-medium text-white transition hover:bg-slate-700 dark:bg-slate-700 dark:hover:bg-slate-600"
@click="emit('request-login', '登录后查看和发表评论。')"
>
登录后查看评价
</button>
</section>
<section
v-else-if="reviewAppKey && reviewTags"
class="rounded-2xl border border-slate-200/60 bg-slate-50/50 p-5 dark:border-slate-800/60 dark:bg-slate-800/30"
>
<h2 class="mb-2 flex items-center gap-2 text-base font-semibold">
<i class="fas fa-comments text-slate-400"></i>
应用评价
</h2>
<p class="text-sm text-slate-500 dark:text-slate-400">
安装应用后可发表评论。
</p>
</section>
-->
</div>
</div>
</section>
</template>
<script setup lang="ts">
import { computed, ref, watch } from "vue";
// import ReviewsPanel from "@/components/ReviewsPanel.vue";
import {
APM_STORE_BASE_URL,
getHybridDefaultOrigin,
} from "@/global/storeConfig";
import {
// buildReviewAppKey,
// buildReviewTags,
getDisplayApp,
} from "@/modules/appIdentity";
import type { App, AppReview, ReviewTags } from "@/global/typedefinition";
const props = defineProps<{
app: App;
screenshots: string[];
sparkInstalled: boolean;
apmInstalled: boolean;
loggedIn: boolean;
reviewAppKey: string;
reviewTags: ReviewTags | null;
favorited?: boolean;
favoriteFolderName?: string;
}>();
const emit = defineEmits<{
back: [];
install: [app: App];
remove: [app: App];
favorite: [app: App];
"request-login": [message: string];
"open-preview": [index: number];
"open-app": [pkgname: string, origin?: "spark" | "apm"];
"check-install": [app: App];
"select-origin": [origin: "spark" | "apm"];
"show-user": [review: AppReview];
}>();
const viewingOrigin = ref<"spark" | "apm">(
props.app.viewingOrigin ?? props.app.origin,
);
watch(
() => props.app,
(app) => {
if (app.isMerged) {
viewingOrigin.value =
app.viewingOrigin ??
(app.sparkApp ? getHybridDefaultOrigin(app.sparkApp) : "apm");
} else {
viewingOrigin.value = app.origin;
}
},
{ immediate: true },
);
const appWithSelectedOrigin = computed<App>(() => ({
...props.app,
viewingOrigin: viewingOrigin.value,
}));
const displayApp = computed(() => getDisplayApp(appWithSelectedOrigin.value));
watch(
() => displayApp.value,
(app) => {
if (app) emit("check-install", app);
},
);
const isInstalled = computed(() =>
viewingOrigin.value === "spark" ? props.sparkInstalled : props.apmInstalled,
);
const isOtherVersionInstalled = computed(() =>
viewingOrigin.value === "spark" ? props.apmInstalled : props.sparkInstalled,
);
const installButtonText = computed(() => {
if (isOtherVersionInstalled.value) {
return viewingOrigin.value === "spark"
? "已安装 APM 版"
: "已安装 Spark 版";
}
return "安装";
});
const iconPath = computed(() => {
if (!displayApp.value) return "";
const arch = window.apm_store.arch || "amd64";
const finalArch =
displayApp.value.origin === "spark" ? `${arch}-store` : `${arch}-apm`;
return `${APM_STORE_BASE_URL}/${finalArch}/${displayApp.value.category}/${displayApp.value.pkgname}/icon.png`;
});
const detailHtml = computed(
() => displayApp.value?.more.replace(/\n/g, "<br>") ?? "",
);
// 评论与收藏功能暂时关闭
// const reviewAppKey = computed(() => {
// if (!displayApp.value) return "";
// return buildReviewAppKey(
// displayApp.value,
// props.reviewTags?.clientArch ?? "amd64",
// );
// });
// const reviewTags = computed<ReviewTags | null>(() => {
// if (!displayApp.value || !props.reviewTags) return null;
// return buildReviewTags(displayApp.value, {
// clientArch: props.reviewTags.clientArch,
// distro: props.reviewTags.distro,
// });
// });
// const favoriteButtonText = computed(() => {
// if (!props.favorited) return "收藏";
// return props.favoriteFolderName
// ? `已收藏 · ${props.favoriteFolderName}`
// : "已收藏";
// });
const selectOrigin = (origin: "spark" | "apm") => {
viewingOrigin.value = origin;
emit("select-origin", origin);
if (displayApp.value) emit("check-install", displayApp.value);
};
// 收藏功能暂时关闭
// const handleFavorite = () => {
// if (!displayApp.value) return;
// if (!props.loggedIn) {
// emit("request-login", "收藏应用需要登录星火账号。");
// return;
// }
// emit("favorite", displayApp.value);
// };
const hideImage = (event: Event) => {
(event.target as HTMLElement).style.display = "none";
};
const spkCopied = ref(false);
let spkCopiedTimer: ReturnType<typeof setTimeout> | null = null;
const copySpkLink = async () => {
if (!displayApp.value?.pkgname) return;
const spkLink = `spk://store/${displayApp.value.category || "unknown"}/${displayApp.value.pkgname}`;
try {
await navigator.clipboard.writeText(spkLink);
spkCopied.value = true;
if (spkCopiedTimer) clearTimeout(spkCopiedTimer);
spkCopiedTimer = setTimeout(() => {
spkCopied.value = false;
}, 2000);
} catch {
prompt("请手动复制 SPK 分享链接:", spkLink);
}
};
</script>
+3 -3
View File
@@ -161,10 +161,10 @@ const emitSidebarAction = (action: "list" | "update" | "submit") => {
display: flex;
width: 100%;
align-items: center;
gap: 0.75rem;
gap: 12px;
border: 1px solid transparent;
border-radius: 0.75rem;
padding: 0.625rem 0.875rem;
border-radius: 12px;
padding: 10px 0.875rem;
text-align: left;
font-size: 0.875rem;
font-weight: 500;
+3 -3
View File
@@ -71,7 +71,7 @@ const selectCategory = (category: string) => {
display: flex;
flex-wrap: wrap;
gap: 0.5rem;
padding: 0.75rem 0;
padding: 12px 0;
}
.category-pill {
@@ -81,7 +81,7 @@ const selectCategory = (category: string) => {
white-space: nowrap;
padding: 0.375rem 0.875rem;
border-radius: 9999px;
font-size: 0.8125rem;
font-size: 13px;
font-weight: 500;
color: #64748b;
background: #f1f5f9;
@@ -126,7 +126,7 @@ const selectCategory = (category: string) => {
}
.category-pill-count {
font-size: 0.6875rem;
font-size: 11px;
font-weight: 600;
opacity: 0.75;
}
+7 -7
View File
@@ -12,7 +12,7 @@
class="flex flex-1 flex-col items-center justify-center text-slate-500 dark:text-slate-400"
>
<i class="fas fa-spinner fa-spin text-2xl mb-3"></i>
<span class="text-sm">正在加载首页内容…</span>
<span class="text-base">正在加载首页内容…</span>
</div>
<div
v-else-if="error"
@@ -44,7 +44,7 @@
: "欢迎来到星火应用商店"
}}
</h1>
<p class="text-sm text-slate-500 dark:text-slate-400">
<p class="text-base text-slate-500 dark:text-slate-400">
{{
storeFilter === "apm"
? "探索丰富的应用,发现更多精彩内容"
@@ -57,12 +57,12 @@
<!-- ============ 区域1 · 精选(两行网格 4×2,静态不滚动) ============ -->
<section class="shrink-0">
<div class="mb-4">
<h1 class="text-sm font-bold text-slate-800 dark:text-slate-200">
<h1 class="text-2xl font-bold text-slate-800 dark:text-slate-200">
{{
storeFilter === "apm" ? "星火应用商店 (Amber PM)" : "星火应用商店"
}}
</h1>
<p class="text-[10px] text-slate-500 dark:text-slate-400 mt-0.5">
<p class="text-base text-slate-500 dark:text-slate-400 mt-0.5">
探索丰富的应用,发现更多精彩内容
</p>
</div>
@@ -108,12 +108,12 @@
</div>
<div class="mt-1.5 px-1">
<div
class="text-[13px] font-semibold text-slate-900 dark:text-white group-hover:text-brand dark:group-hover:text-brand transition-colors"
class="text-sm font-semibold text-slate-900 dark:text-white group-hover:text-brand dark:group-hover:text-brand transition-colors"
>
{{ link.name }}
</div>
<div
class="text-[11px] text-slate-500 dark:text-slate-400 mt-0.5 line-clamp-1"
class="text-sm text-slate-500 dark:text-slate-400 mt-0.5 line-clamp-1"
>
{{ link.more }}
</div>
@@ -192,7 +192,7 @@ const onLinkClick = (link: HomeLink) => {
@media (max-width: 640px) {
.auto-fit-grid {
grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
gap: 0.75rem;
gap: 12px;
}
}
</style>
+2 -1
View File
@@ -77,7 +77,8 @@ const iconFailed = ref(false);
const iconPath = computed(() => {
const arch = window.apm_store.arch || "amd64";
const finalArch = props.app.origin === "spark" ? `${arch}-store` : `${arch}-apm`;
const finalArch =
props.app.origin === "spark" ? `${arch}-store` : `${arch}-apm`;
return `${APM_STORE_BASE_URL}/${finalArch}/${props.app.category}/${props.app.pkgname}/icon.png`;
});
+77 -3
View File
@@ -13,7 +13,7 @@
@click.self="closeModal"
>
<div
class="relative w-full max-w-md overflow-hidden rounded-3xl border border-white/10 bg-white/95 shadow-2xl dark:border-slate-800 dark:bg-slate-900"
class="relative flex max-h-[calc(100vh-2rem)] w-full max-w-md flex-col overflow-hidden rounded-3xl border border-white/10 bg-white/95 shadow-2xl dark:border-slate-800 dark:bg-slate-900"
>
<!-- 标题栏 -->
<div
@@ -35,8 +35,8 @@
</button>
</div>
<!-- 设置内容 -->
<div class="p-6 space-y-4">
<!-- 设置内容(可滚动,标题/底部固定) -->
<div class="flex-1 overflow-y-auto p-6 space-y-4">
<!-- 更新检测开关 -->
<div
class="flex items-center justify-between rounded-2xl border border-slate-200/60 bg-slate-50/50 px-4 py-4 dark:border-slate-800/60 dark:bg-slate-800/50"
@@ -163,6 +163,51 @@
</div>
</div>
</div>
<!-- 界面缩放(整体缩放:图标 / 间距 / 布局等比变化) -->
<div
class="rounded-2xl border border-slate-200/60 bg-slate-50/50 px-4 py-4 dark:border-slate-800/60 dark:bg-slate-800/50"
>
<div class="flex items-start gap-3">
<div
class="flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-xl bg-teal-100 text-teal-600 dark:bg-teal-900/30 dark:text-teal-400"
>
<i class="fas fa-search-plus"></i>
</div>
<div class="min-w-0 flex-1">
<p
class="text-sm font-medium text-slate-800 dark:text-slate-200"
>
界面缩放
</p>
<p class="text-xs text-slate-500 dark:text-slate-400">
整体放大或缩小界面(图标、间距、布局等比变化)
</p>
<div
class="mt-3 inline-flex w-full overflow-hidden rounded-lg border border-slate-200 dark:border-slate-700"
role="radiogroup"
aria-label="界面缩放"
>
<button
v-for="opt in uiScaleOptions"
:key="opt.value"
type="button"
role="radio"
:aria-checked="uiScale === opt.value"
class="flex-1 px-2 py-1.5 text-xs font-medium transition-colors"
:class="
uiScale === opt.value
? 'bg-brand text-white'
: 'bg-white text-slate-500 hover:bg-slate-100 dark:bg-slate-700 dark:text-slate-400 dark:hover:bg-slate-600'
"
@click="selectUiScale(opt.value)"
>
{{ opt.label }}
</button>
</div>
</div>
</div>
</div>
</div>
<!-- 底部提示 -->
@@ -185,6 +230,13 @@ import {
setTagPriorityStrategy,
type TagPriorityStrategy,
} from "../global/tagPriority";
import {
getUiScale,
setUiScale,
uiScaleToFactor,
UI_SCALE_OPTIONS,
type UiScaleOption,
} from "../global/displaySettings";
const props = defineProps<{
show: boolean;
@@ -206,6 +258,9 @@ const strategyOptions: Array<{ value: TagPriorityStrategy; label: string }> = [
{ value: "apm", label: "APM 优先" },
];
// 界面缩放档位选项(90% / 100% / 110% / 125% / 150%)
const uiScaleOptions = UI_SCALE_OPTIONS;
const tagPriorityStrategy = ref<TagPriorityStrategy>("auto");
// 加载标签优先显示策略(从持久化读取)
@@ -219,6 +274,24 @@ const selectStrategy = (value: TagPriorityStrategy) => {
setTagPriorityStrategy(value);
};
// 界面整体缩放档位(Electron setZoomFactor,连图标/间距/布局等比变化)
const uiScale = ref<UiScaleOption>("100");
const loadUiScale = () => {
uiScale.value = getUiScale();
};
// 选择并保存界面缩放档位(立即经 IPC 应用到主窗口)
const selectUiScale = async (value: UiScaleOption) => {
uiScale.value = value;
setUiScale(value);
try {
await window.ipcRenderer.invoke("set-zoom-factor", uiScaleToFactor(value));
} catch (error) {
console.error("应用界面缩放失败:", error);
}
};
const settings = ref<Settings>({
enableUpdateCheck: true,
enableCreateDesktop: true,
@@ -279,6 +352,7 @@ watch(
if (newVal) {
loadSettings();
loadTagPriority();
loadUiScale();
}
},
);
-58
View File
@@ -1,58 +0,0 @@
<template>
<div :class="['flex flex-wrap gap-3', $attrs.class]">
<button
v-if="apmAvailable"
type="button"
class="inline-flex items-center gap-2 rounded-2xl bg-gradient-to-r from-brand to-brand-dark px-4 py-2 text-sm font-semibold text-white shadow-lg transition hover:-translate-y-0.5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-brand/40"
@click="handleList"
title="已安装应用"
></button>
<button
type="button"
class="inline-flex items-center gap-2 rounded-2xl bg-gradient-to-r from-brand to-brand-dark px-4 py-2 text-sm font-semibold text-white shadow-lg transition hover:-translate-y-0.5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-brand/40"
@click="handleUpdate"
title="检查可更新的软件包列表"
>
<i class="fas fa-sync-alt"></i>
<span>软件更新</span>
</button>
<button
type="button"
class="inline-flex items-center gap-2 rounded-2xl bg-gradient-to-r from-brand to-brand-dark px-4 py-2 text-sm font-semibold text-white shadow-lg transition hover:-translate-y-0.5 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-brand/40"
@click="handleSettings"
title="安装设置"
>
<i class="fas fa-cog"></i>
<span>安装设置</span>
</button>
</div>
</template>
<script setup lang="ts">
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const props = defineProps<{
apmAvailable: boolean;
}>();
defineOptions({
inheritAttrs: false,
});
const emit = defineEmits<{
(e: "update"): void;
(e: "list"): void;
(e: "open-install-settings"): void;
}>();
const handleUpdate = () => {
emit("update");
};
const handleSettings = () => {
emit("open-install-settings");
};
const handleList = () => {
emit("list");
};
</script>
+16 -10
View File
@@ -19,9 +19,12 @@
alt="星火应用商店"
/>
<span class="truncate text-base font-semibold">星火应用商店</span>
<span
class="rounded-full border border-orange-400 bg-orange-50 px-2 py-0.5 text-[10px] font-semibold text-orange-600 dark:border-amber-400/70 dark:bg-amber-400/10 dark:text-amber-300 dark:shadow-[0_0_8px_rgba(251,191,36,0.4)]"
>社区版</span
<button
type="button"
class="cursor-pointer rounded-full border border-orange-400 bg-orange-50 px-2 py-0.5 text-[10px] font-semibold text-orange-600 transition hover:bg-orange-100 dark:border-amber-400/70 dark:bg-amber-400/10 dark:text-amber-300 dark:shadow-[0_0_8px_rgba(251,191,36,0.4)] dark:hover:bg-amber-400/20"
title="了解星火专业版"
@click="openCommercial"
>社区版</button
>
</div>
@@ -42,7 +45,7 @@
<button
v-if="searchQuery"
type="button"
class="absolute right-2.5 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600 dark:text-slate-500 dark:hover:text-slate-300"
class="absolute flex right-2.5 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600 dark:text-slate-500 dark:hover:text-slate-300"
title="清除搜索"
@click="clearSearch"
>
@@ -75,30 +78,28 @@
<div class="mx-1 h-6 w-px bg-slate-300/70 dark:bg-slate-700/70"></div>
<button
type="button"
class="rounded-md px-3 py-1.5 text-base transition hover:bg-slate-200/80 dark:hover:bg-slate-800"
class="fas fa-window-minimize rounded-md px-3 py-1.5 text-base transition text-slate-500 hover:bg-slate-200/80 dark:hover:bg-slate-800"
aria-label="最小化"
title="最小化"
@click="minimize"
>
−
</button>
<button
type="button"
class="rounded-md px-3 py-1.5 text-base transition hover:bg-slate-200/80 dark:hover:bg-slate-800"
class="fas rounded-md px-3 py-1.5 text-base transition text-slate-500 hover:bg-slate-200/80 dark:hover:bg-slate-800"
:class="isMaximized ? 'fa-window-restore' : 'fa-window-maximize'"
aria-label="最大化或还原"
title="最大化或还原"
@click="toggleMaximize"
>
□
</button>
<button
type="button"
class="rounded-md px-3 py-1 text-sm transition hover:bg-red-500 hover:text-white"
class="fas fa-times rounded-md px-3 py-1.5 text-base transition text-slate-500 hover:bg-red-500 hover:text-white"
aria-label="关闭"
title="关闭"
@click="close"
>
×
</button>
</div>
</header>
@@ -110,6 +111,7 @@ import ThemeToggle from "./ThemeToggle.vue";
defineProps<{
searchQuery: string;
themeMode: "light" | "dark" | "auto";
isMaximized: boolean
}>();
const emit = defineEmits<{
@@ -150,6 +152,10 @@ const clearSearch = () => {
emit("update:searchQuery", "");
};
const openCommercial = () => {
window.open("https://www.spark-app.store/commercial/", "_blank");
};
const minimize = () => {
window.windowControls.minimize();
};
@@ -1,44 +0,0 @@
<template>
<div
v-if="show"
class="absolute inset-0 flex items-center justify-center bg-slate-950/45 px-4"
>
<div
class="w-full max-w-md rounded-3xl border border-amber-200 bg-white p-6 shadow-2xl dark:border-amber-500/30 dark:bg-slate-900"
>
<p class="text-lg font-semibold text-slate-900 dark:text-white">
关闭确认
</p>
<p class="mt-2 text-sm text-slate-600 dark:text-slate-300">
更新仍在进行中,确定关闭此窗口吗?
</p>
<div class="mt-4 flex justify-end gap-3">
<button
type="button"
class="rounded-2xl border border-slate-200/70 px-4 py-2 text-sm font-semibold text-slate-600 dark:border-slate-700 dark:text-slate-200"
@click="$emit('close')"
>
继续查看
</button>
<button
type="button"
class="rounded-2xl bg-amber-500 px-4 py-2 text-sm font-semibold text-white"
@click="$emit('confirm')"
>
确认关闭
</button>
</div>
</div>
</div>
</template>
<script setup lang="ts">
defineProps<{
show: boolean;
}>();
defineEmits<{
(e: "close"): void;
(e: "confirm"): void;
}>();
</script>
@@ -83,15 +83,13 @@
v-if="item.ignored !== true && !task"
class="flex shrink-0 flex-col items-end gap-0.5"
>
<span class="text-[11px] font-semibold text-brand dark:text-amber-300">{{
timeLabel
}}</span>
<span
class="text-[11px] font-semibold text-brand dark:text-amber-300"
>{{ timeLabel }}</span
>
<span class="text-[10px] text-slate-400">{{ sizeLabel }}</span>
</div>
<div
v-else-if="!task"
class="flex shrink-0 flex-col items-end gap-0.5"
>
<div v-else-if="!task" class="flex shrink-0 flex-col items-end gap-0.5">
<span class="text-[11px] font-semibold text-slate-400">{{
timeLabel
}}</span>
@@ -181,7 +179,8 @@ defineEmits<{
// 被锁定且未强制时,复选框禁用(与「已忽略」一样不可被选中)
const isSelectionLocked = computed(
() => props.item.ignored === true || (props.item.held === true && !props.forced),
() =>
props.item.ignored === true || (props.item.held === true && !props.forced),
);
const normalizeIconSrc = (icon: string): string => {
+8 -1
View File
@@ -202,6 +202,12 @@ const refreshInstalledSyncCandidates = async (
}
const refreshedApps: App[] = [];
// 只记录「查询成功」的来源:list-installed 在来源被启动参数禁用或对应
// 包管理器不可用时会返回 success:false(而非 reject)。若仍把它算作已刷新,
// mergeInstalledApps 会按「该来源已刷新」丢弃本地已知记录,随后
// syncInstalledAppsToAccount 会把这份不完整列表 PUT/me/app-list 覆盖到账号,
// 造成云端应用列表静默丢数据。
const refreshedOrigins: Array<"spark" | "apm"> = [];
await Promise.all(
origins.map(async (origin) => {
const pkgnameList =
@@ -216,6 +222,7 @@ const refreshInstalledSyncCandidates = async (
});
if (!result?.success) return;
refreshedOrigins.push(origin);
const appList = Array.isArray(result?.apps) ? result.apps : [];
for (const rawApp of appList) {
// 运行时类型守卫:避免后端字段缺失时下游访问 undefined
@@ -233,7 +240,7 @@ const refreshInstalledSyncCandidates = async (
syncCandidateApps.value = mergeInstalledApps(
syncCandidateApps.value,
refreshedApps,
origins,
refreshedOrigins,
);
return true;
};
+20 -19
View File
@@ -342,7 +342,9 @@ const openDetail = async (app: App | OpenDetailInput) => {
currentApp.value = finalApp;
currentScreenIndex.value = 0;
// 截图以后端 img_urls 为候选并探测真实存在性;异步进行,详情页先打开不阻塞。
// 先清空截图,避免详情页渲染时残留上一个应用的图片(新图需异步探测后才填充)。
screenshots.value = [];
// 截图按固定路径拼接 screen_1~5.png 并探测真实存在性;异步进行,详情页先打开不阻塞。
// 每次打开取消上一轮探测,避免陈旧结果覆盖当前应用。
if (screenshotAbortController) screenshotAbortController.abort();
screenshotAbortController = new AbortController();
@@ -439,26 +441,25 @@ const checkScreenshotExists = async (
}
};
// 截图来源以后端 img_urls 为候选(权威意图列表),但后端元数据可能"声明 N 张实存 M 张"
// (如飞书声明 5 张仅上传 3 张)。因此对候选逐一探测存在性,仅保留真实可用的 URL,
// 既保证"实际有几张就预览几张",又兜底过滤后端脏数据导致的空白页。
// 探测结果经内存缓存复用,同一应用多次打开不再重复请求。
// 截图候选 URL 一律按固定规则前端拼接,最多 5 张(screen_1~5.png),并对每张探测真实存在性,
// 仅保留真实可用的 URL,保证"实际有几张就预览几张"。
// 注意:以下拼接路径(APM_STORE_BASE_URL / finalArch / category / pkgname / screen_N.png)
// 直接对应服务器静态资源布局,属于权威路径,禁止修改或替换为 app.img_urls 等其它来源,
// 否则会导致截图全部 404(历史已踩坑:后端 img_urls 不准确)。
const loadScreenshots = async (app: App, signal?: AbortSignal) => {
const raw = app.img_urls as unknown;
let candidates: string[] = [];
if (Array.isArray(raw)) {
candidates = raw as string[];
} else if (typeof raw === "string" && raw.length > 0) {
try {
const parsed = JSON.parse(raw);
if (Array.isArray(parsed)) candidates = parsed as string[];
} catch {
candidates = [];
}
if (!app.category || app.category === "unknown") {
screenshots.value = [];
return;
}
const arch = window.apm_store.arch || "amd64";
const finalArch = app.origin === "spark" ? `${arch}-store` : `${arch}-apm`;
const candidates: string[] = [];
for (let i = 1; i <= 5; i++) {
candidates.push(
`${APM_STORE_BASE_URL}/${finalArch}/${app.category}/${app.pkgname}/screen_${i}.png`,
);
}
candidates = candidates.filter(
(u): u is string => typeof u === "string" && u.length > 0,
);
// 先按缓存/同步填充已知结果,未知项异步探测;避免详情页打开后长时间空白
const results = await Promise.all(
+5 -1
View File
@@ -75,6 +75,11 @@ export {
currentApp,
currentAppSparkInstalled,
currentAppApmInstalled,
// APM 安装引导弹窗开关必须与 modules/processInstall 写入的 ref 同源,
// 故同样从 storeConfig 再导出。历史上此处重复 `ref(false)` 声明过一份,
// 导致 processInstall 置位 true 后 App.vue 读到的仍是另一实例,
// APM 未安装时点安装什么都不会发生(弹窗静默不显示)。
showApmInstallDialog,
} from "../global/storeConfig";
export const showModal = ref(false);
export const showPreview = ref(false);
@@ -139,7 +144,6 @@ export const showUninstallModal = ref(false);
export const uninstallTargetApp: Ref<App | null> = ref(null);
export const showAboutModal = ref(false);
export const showSettingsModal = ref(false);
export const showApmInstallDialog = ref(false);
// 可用来源 computed(供 storeFilter 相关判断复用)
export const availableSources = computed(() => ({
+25 -6
View File
@@ -34,12 +34,24 @@ import {
getEffectiveStoreFilter,
} from "../modules/storeFilter";
import { cloudItemKey, cloudPackageKey } from "../modules/appListSync";
import { removeDownloadItem } from "../global/downloadStatus";
// 运行时类型守卫(重构前在 App.vue 中校验完整字段,拆分时被削弱成只查
// pkgname/origin,导致字段残缺的行会带着 undefined 流入已安装列表与云端
// 同步条目)。主进程 list-installed 始终按下方结构回传,逐字段校验即可。
const isInstalledAppInfo = (value: unknown): value is InstalledAppInfo => {
if (!value || typeof value !== "object") return false;
const v = value as Record<string, unknown>;
return typeof v.pkgname === "string" && typeof v.origin === "string";
if (typeof value !== "object" || value === null) return false;
const v = value as Partial<InstalledAppInfo>;
return (
typeof v.pkgname === "string" &&
typeof v.name === "string" &&
typeof v.version === "string" &&
typeof v.arch === "string" &&
(v.origin === "spark" || v.origin === "apm") &&
typeof v.flags === "string" &&
typeof v.isDependency === "boolean" &&
// icon 为可选字段,需显式校验类型,避免非字符串值进入下游 app.icon || ""
(typeof v.icon === "string" || v.icon === undefined)
);
};
const LIST_INSTALLED_TIMEOUT_MS = 15000;
@@ -269,6 +281,7 @@ const refreshFavoriteInstalledApps = async (): Promise<void> => {
}
const refreshedApps: App[] = [];
const refreshedOrigins: Array<"spark" | "apm"> = [];
await Promise.all(
origins.map(async (origin) => {
const pkgnameList =
@@ -283,6 +296,10 @@ const refreshFavoriteInstalledApps = async (): Promise<void> => {
});
if (!result?.success) return;
// 仅「查询成功」的来源才算已刷新:来源禁用/包管理器缺失时返回
// success:false,此时若仍从列表里剔除该来源的已知应用,会让已安装
// 列表凭空少掉一整类应用(与云端同步丢数据同源)。
refreshedOrigins.push(origin);
const appList = Array.isArray(result?.apps) ? result.apps : [];
for (const rawApp of appList) {
// 运行时类型守卫:避免后端字段缺失时下游访问 undefined
@@ -299,7 +316,7 @@ const refreshFavoriteInstalledApps = async (): Promise<void> => {
installedApps.value = [
...installedApps.value.filter(
(app) =>
!origins.includes(app.origin) &&
!refreshedOrigins.includes(app.origin) &&
!refreshedKeys.has(`${app.origin}:${app.pkgname}`),
),
...refreshedApps,
@@ -309,7 +326,9 @@ const refreshFavoriteInstalledApps = async (): Promise<void> => {
const requestUninstall = (app: App) => {
uninstallTargetApp.value = app;
showUninstallModal.value = true;
removeDownloadItem(app.pkgname);
// 注意:不要在此处移除下载记录。卸载尚未确认/完成,提前移除会导致
// 用户取消卸载也丢失记录;实际移除由 remove-complete 成功后统一处理
// (见 App.vue handleRemoveComplete),与重构前的语义一致。
};
const openInstalledModal = () => {
+76
View File
@@ -0,0 +1,76 @@
/**
* 显示设置:界面整体缩放(Electron webContents.setZoomFactor)
*
* 通过 Electron 的 setZoomFactor 整体缩放渲染内容,连图标、间距、布局
* 一起等比放大/缩小(逻辑分辨率变化),不会破坏布局;与单纯改字号相比
* 更稳定,故本应用只提供此一种显示放大入口。
*
* 实际缩放由主进程 setZoomFactor 执行;渲染端仅负责持久化档位偏好,
* 并在启动时把档位换算的系数通过 IPC 告知主进程。
*/
export type UiScaleOption = "90" | "100" | "110" | "125" | "150";
// 档位 → 缩放系数(与 Electron setZoomFactor 一致,1 = 100%)
const UI_SCALE_MAP: Record<UiScaleOption, number> = {
"90": 0.9,
"100": 1,
"110": 1.1,
"125": 1.25,
"150": 1.5,
};
export const UI_SCALE_OPTIONS: Array<{
value: UiScaleOption;
label: string;
}> = [
{ value: "90", label: "90%" },
{ value: "100", label: "100%" },
{ value: "110", label: "110%" },
{ value: "125", label: "125%" },
{ value: "150", label: "150%" },
];
const UI_SCALE_STORAGE_KEY = "spark-store-ui-scale";
const DEFAULT_UI_SCALE: UiScaleOption = "100";
const isValidUiScale = (v: unknown): v is UiScaleOption =>
typeof v === "string" && v in UI_SCALE_MAP;
/** 读取持久化的界面缩放档位(无/非法时回退默认「100%」) */
export const getUiScale = (): UiScaleOption => {
try {
const raw = localStorage.getItem(UI_SCALE_STORAGE_KEY);
if (isValidUiScale(raw)) return raw;
} catch {
// localStorage 不可用时忽略,使用默认
}
return DEFAULT_UI_SCALE;
};
/** 将档位换算为 Electron 缩放系数 */
export const uiScaleToFactor = (option: UiScaleOption): number =>
UI_SCALE_MAP[option] ?? UI_SCALE_MAP[DEFAULT_UI_SCALE];
/** 选择并持久化界面缩放档位(不在此直接调用主进程,由调用方经 IPC 应用) */
export const setUiScale = (option: UiScaleOption): void => {
try {
localStorage.setItem(UI_SCALE_STORAGE_KEY, option);
} catch {
// 持久化失败时仍已在会话内选定,忽略写入错误
}
};
/**
* 应用启动时初始化:从持久化恢复档位,并经 IPC 告知主进程应用缩放。
* 需在 App.vue onMounted 调用,主进程 createWindow 阶段已自有兜底(默认 1),
* 此处确保渲染端偏好生效。
*/
export const initUiScale = async (): Promise<void> => {
const factor = uiScaleToFactor(getUiScale());
try {
await window.ipcRenderer.invoke("set-zoom-factor", factor);
} catch {
// 主进程 IPC 不可用时忽略(主进程启动兜底已设为 1)
}
};
-21
View File
@@ -70,27 +70,6 @@ export function watchDownloadsChange(cb: (pkgname: string) => void) {
);
}
export function useDownloadItemStatus(
pkgname?: ComputedRef<string | undefined>,
) {
const status: ComputedRef<DownloadItemStatus | undefined> = computed(() => {
const name = unref(pkgname);
if (!name) return;
const task = downloads.value.find((d) => d.pkgname === name);
if (!task) return;
return task.status;
});
const isCompleted = computed(() => {
return status.value === "completed";
});
return {
status,
isCompleted,
};
}
export function useInstallFeedback(pkgname?: ComputedRef<string | undefined>) {
const installFeedback = computed(() => {
const name = unref(pkgname);
+16 -66
View File
@@ -1,13 +1,13 @@
import pino from "pino";
import {
APM_STORE_BASE_URL,
APM_STORE_STATS_BASE_URL,
currentApp,
currentAppSparkInstalled,
currentAppApmInstalled,
showApmInstallDialog,
} from "../global/storeConfig";
import { APM_STORE_BASE_URL } from "../global/storeConfig";
import { downloads, getNextDownloadId } from "../global/downloadStatus";
import {
@@ -99,6 +99,11 @@ export const handleInstall = async (
)
.then((response) => {
logger.info("下载次数统计已发送,状态:", response.data);
})
// 统计上报失败不应影响安装,但也必须消费掉 rejection:
// 否则网络异常/超时会变成未处理的 promise rejection(渲染端没有全局兜底)。
.catch((error: unknown) => {
logger.warn(`下载次数统计发送失败(忽略): ${String(error)}`);
});
return download;
};
@@ -110,64 +115,6 @@ export const handleRetry = (download_: DownloadItem) => {
window.ipcRenderer.send("queue-install", JSON.stringify(download_));
};
export const handleUpgrade = async (app: App) => {
if (!app.pkgname) return;
// APM 应用:在创建下载任务前检查 APM 是否可用
if (app.origin === "apm") {
const hasApm = await window.ipcRenderer.invoke("check-apm-available");
if (!hasApm) {
showApmInstallDialog.value = true;
return;
}
}
if (
downloads.value.find(
(d) => d.pkgname === app.pkgname && d.origin === app.origin,
)
) {
logger.info(`任务已存在,忽略重复添加: ${app.pkgname} (${app.origin})`);
return;
}
const arch = window.apm_store.arch || "amd64";
const finalArch = app.origin === "spark" ? `${arch}-store` : `${arch}-apm`;
const downloadId = getNextDownloadId();
const download: DownloadItem = {
id: downloadId,
name: app.name,
pkgname: app.pkgname,
version: app.version,
icon: `${APM_STORE_BASE_URL}/${finalArch}/${app.category}/${app.pkgname}/icon.png`,
status: "queued",
progress: 0,
downloadedSize: 0,
totalSize: 0,
speed: 0,
timeRemaining: 0,
startTime: Date.now(),
logs: [{ time: Date.now(), message: "开始更新..." }],
source: "APM Update",
retry: false,
upgradeOnly: true,
origin: app.origin,
};
downloads.value.push(download);
window.ipcRenderer.send("queue-install", JSON.stringify(download));
};
export const handleRemove = (appObj?: App) => {
const targetApp = appObj || currentApp.value;
if (!targetApp?.pkgname) return;
window.ipcRenderer.send("remove-installed", {
pkgname: targetApp.pkgname,
origin: targetApp.origin,
});
};
window.ipcRenderer.on("remove-complete", (_event, log: DownloadResult) => {
if (log.success) {
if (log.origin === "spark") {
@@ -221,7 +168,9 @@ window.ipcRenderer.on("install-complete", (_event, log: DownloadResult) => {
if (downloadObj) {
// 更新中心来源的任务用「更新」语义,其余(普通安装)用「安装」语义,
// 避免把安装结果误报为「下载完成」。
const isUpdate = (downloadObj.source ?? "").toLowerCase().includes("update");
const isUpdate = (downloadObj.source ?? "")
.toLowerCase()
.includes("update");
const doneLabel = isUpdate ? "更新完成" : "安装完成";
const failVerb = isUpdate ? "更新失败" : "安装失败";
@@ -242,12 +191,13 @@ window.ipcRenderer.on("install-complete", (_event, log: DownloadResult) => {
time: Date.now(),
message: `${failVerb}: ${reason}`,
});
// 兜底:主进程检测到未安装 APM 时会直接失败并转发 trigger-apm-install-dialog。
// 渲染端这里再识别一次该失败原因,确保「未安装 APM」永远不会静默失败——
// 即使主进程事件在弹窗挂载前丢失,也能就地弹出 APM 安装引导。
if (downloadObj.origin === "apm" && reason.includes("未安装 APM")) {
showApmInstallDialog.value = true;
}
}
}
});
window.ipcRenderer.on("queue-install", (_event, payload: unknown) => {
const serializedPayload =
typeof payload === "string" ? payload : JSON.stringify(payload);
window.ipcRenderer.send("queue-install", serializedPayload);
});
+1
View File
@@ -39,6 +39,7 @@ interface WindowControlBridge {
minimize: () => void;
toggleMaximize: () => void;
close: () => void;
state: () => Promise<| 'normal' | 'maximized' | 'minimized'>
}
// IPC channel type definitions