feat: 客户端灵动岛 + 上课时段紧急通知二次确认,并修复打包/校验脚本在 Electron 宿主下的多个缺陷
## 客户端灵动岛(动态岛)
- 新增独立透明置顶窗口:桌面中上方常驻、不占任务栏、不抢焦点(268x44 胶囊 / 404x316 详情 / 424x344 紧急)
- 三种形态与动画:隐藏 ↔ 胶囊 ↔ 详情,尺寸用 easeOutCubic 260ms 逐帧缓动、透明度单独淡入淡出
(尺寸与淡入使用各自动画令牌,避免互相打断导致窗口卡在胶囊尺寸)
- 行为:普通通知变「新消息 · 共 N 条」胶囊,点击展开详情;上课时段自动隐藏并进入待发队列,
下课后自动弹出;紧急通知无论是否上课立即展开(红色呼吸光晕 + 紧急角标,无需点击)
- 上课状态来自 GET /api/schedules/current(10s 心跳 + 下课时长定时器),
新增 src/main/island.ts(控制器/IPC)、src/preload/island.ts、src/island/IslandApp.vue、
src/renderer/island/bridge.ts、island.html 与多页 Vite 构建
## 上课时段发布紧急通知的二次确认
- 服务端:priority=URGENT 且当前处于上课时间段且未带 confirmDuringClass 时返回
409 URGENT_DURING_CLASS(携带 current/next/week/serverTime),绕过界面调接口同样被拦截
- 新增 GET /api/schedules/current(inClass/current/next,at 参数用于诊断与测试)
- Web 管理端:全屏警告遮罩(UrgentClassWarning.vue),显示正在上的课时段与待发布标题,
确认按钮带 3 秒倒计时(圆环进度,倒计时结束前禁用),取消即不发;并发命中 409 同样兜底弹窗
## 打包与验证脚本修复(Electron 宿主环境)
- scripts/lib/node-runtime.mjs:定位真正的 node.exe。此前经 pnpm 运行时 process.execPath 指向
Electron,dist:server 会把 Electron 复制成安装包内的 node.exe,dist:win 会让 electron-builder 报
Unknown argument: .../cli.js(改为显式使用真实 Node)
- scripts/lib/electron-env.mjs:启动 Electron 前清理继承的 ELECTRON_RUN_AS_NODE(否则 Electron 退化为
纯 Node,require('electron') 直接 MODULE_NOT_FOUND),并从 path.txt 定位 electron.exe
(process.versions.electron 存在时 import 'electron' 返回的是 API 对象而非路径)
- scripts/dist-server.mjs:新增构建产物新鲜度校验(曾出现 server 已重建但打进安装包的 shared/dist 是旧的,
安装后服务启动即报 does not provide an export named MAX_TERM_WEEK)
- scripts/ui-smoke:新增 live-probe.mjs 真实制造/清理上课时段,Electron 驱动真实点击断言全屏警告文案、
按钮禁用与 3 秒倒计时时长(实测 2966ms),测试后自动删除探针课表与测试通知
## 验证结果
- pnpm verify:e2e 62/62(新增上课时段拦截、二次确认后发布、普通通知不受限等 8 项)
- pnpm verify:web 8/8(新增上课时段紧急通知全屏警告 + 倒计时)
- pnpm verify:desktop 18/18(新增灵动岛窗口/上课隐藏/下课弹出/紧急立即展开/胶囊点击展开 + 截图)
- 打包后 EXE 冒烟 15/15(packaged: true,退出码 0)
- 服务端安装程序升级安装:.env 与数据库保持不变,/api/schedules/current 正常
- pnpm lint / format:check / typecheck 全部通过
This commit is contained in:
1 parent
5545ef6f55
commit
3a9f8812fc
40 files changed
+3062
-149
No files matched your search
@@ -13,11 +13,14 @@
|
||||
* UI_SMOKE_USER 默认 teacher1
|
||||
* UI_SMOKE_PASS 默认 teacher123
|
||||
* UI_SMOKE_RESULT 结果 JSON 输出路径(可选)
|
||||
* UI_SMOKE_SKIP_PROBE=1 跳过"上课时段探针"(只跑基础 UI 校验)
|
||||
*/
|
||||
import { spawn } from 'node:child_process';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { resolveElectronEnv, resolveElectronExecutable } from '../lib/electron-env.mjs';
|
||||
import { cleanupInClassProbe, setupInClassProbe } from './live-probe.mjs';
|
||||
|
||||
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..', '..');
|
||||
const electronDir = path.join(root, 'packages', 'desktop-client', 'node_modules', 'electron');
|
||||
@@ -28,11 +31,7 @@ if (!fs.existsSync(electronDir)) {
|
||||
process.exit(2);
|
||||
}
|
||||
|
||||
const pathFile = path.join(electronDir, 'path.txt');
|
||||
const executable = fs.existsSync(pathFile)
|
||||
? path.join(electronDir, 'dist', fs.readFileSync(pathFile, 'utf8').trim())
|
||||
: path.join(electronDir, 'dist', 'electron.exe');
|
||||
|
||||
const executable = resolveElectronExecutable(electronDir);
|
||||
if (!fs.existsSync(executable)) {
|
||||
console.error(`[ui-smoke] Electron 可执行文件不存在:${executable}`);
|
||||
console.error(' 请执行:node packages/desktop-client/node_modules/electron/install.js');
|
||||
@@ -50,18 +49,63 @@ fs.rmSync(profileDir, { recursive: true, force: true });
|
||||
console.log(`[ui-smoke] 目标:${target}`);
|
||||
console.log(`[ui-smoke] Electron:${executable}`);
|
||||
|
||||
/**
|
||||
* 上课时段探针:让服务端真实认定"现在正在上课",
|
||||
* 以便验证「上课时段发布紧急通知 → 全屏警告 + 3 秒倒计时」。
|
||||
*/
|
||||
const urgentTitle = `UI 冒烟紧急通知 ${Date.now()}`;
|
||||
let probe = null;
|
||||
let probeError = '';
|
||||
|
||||
if (process.env.UI_SMOKE_SKIP_PROBE === '1') {
|
||||
probeError = '已通过 UI_SMOKE_SKIP_PROBE=1 跳过探针';
|
||||
console.log(`[ui-smoke] ${probeError}`);
|
||||
} else {
|
||||
try {
|
||||
probe = await setupInClassProbe({
|
||||
baseUrl: new URL(target).origin,
|
||||
username: process.env.UI_SMOKE_USER ?? 'teacher1',
|
||||
password: process.env.UI_SMOKE_PASS ?? 'teacher123',
|
||||
});
|
||||
if (!probe.inClass) probeError = '探针课表已创建,但服务端仍未判定为上课时段';
|
||||
console.log(
|
||||
`[ui-smoke] 上课时段探针:班级=${probe.className} 上课中=${probe.inClass} ` +
|
||||
`时段=${probe.period ? `${probe.period.startTime}-${probe.period.endTime} · ${probe.period.courseName}` : '-'}`,
|
||||
);
|
||||
} catch (error) {
|
||||
probeError = String(error?.message ?? error);
|
||||
console.error(`[ui-smoke] 上课时段探针准备失败:${probeError}`);
|
||||
console.error(' "上课时段紧急通知二次确认"校验项将被记为失败。');
|
||||
}
|
||||
}
|
||||
|
||||
const child = spawn(executable, [entry], {
|
||||
cwd: root,
|
||||
stdio: 'inherit',
|
||||
env: {
|
||||
...process.env,
|
||||
env: resolveElectronEnv({
|
||||
UI_SMOKE_URL: target,
|
||||
UI_SMOKE_RESULT: resultFile,
|
||||
UI_SMOKE_PROFILE: profileDir,
|
||||
},
|
||||
UI_SMOKE_URGENT_TITLE: urgentTitle,
|
||||
UI_SMOKE_INCLASS: probe?.inClass ? '1' : '0',
|
||||
UI_SMOKE_PROBE_DETAIL: probeError,
|
||||
}),
|
||||
});
|
||||
|
||||
child.on('exit', (code) => {
|
||||
child.on('exit', async (code) => {
|
||||
if (probe) {
|
||||
try {
|
||||
const removed = await cleanupInClassProbe(probe, { notificationTitle: urgentTitle });
|
||||
console.log(
|
||||
removed.length > 0
|
||||
? `[ui-smoke] 探针清理完成:${removed.join(', ')}`
|
||||
: '[ui-smoke] 探针清理完成(无残留数据)',
|
||||
);
|
||||
} catch (error) {
|
||||
console.error(`[ui-smoke] 探针清理失败(请手动检查演示数据):${error?.message ?? error}`);
|
||||
}
|
||||
}
|
||||
|
||||
if (code === 0) {
|
||||
console.log(`[ui-smoke] 全部通过,结果文件:${resultFile}`);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user