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
+42
-5
@@ -17,6 +17,7 @@ import crypto from 'node:crypto';
|
||||
import fs from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
import { resolveNodeRuntime } from './lib/node-runtime.mjs';
|
||||
|
||||
const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
|
||||
const serverDir = path.join(root, 'packages', 'server');
|
||||
@@ -47,13 +48,49 @@ const run = (command, args, options = {}) => {
|
||||
function ensureBuilds() {
|
||||
const serverEntry = path.join(serverDir, 'dist', 'index.js');
|
||||
const webEntry = path.join(webDir, 'dist', 'index.html');
|
||||
const sharedEntry = path.join(root, 'packages', 'shared', 'dist', 'index.js');
|
||||
const missing = [];
|
||||
if (!fs.existsSync(sharedEntry)) missing.push('packages/shared/dist(请先 pnpm build:shared)');
|
||||
if (!fs.existsSync(serverEntry))
|
||||
missing.push('packages/server/dist(请先 pnpm --filter @classhelper/server build)');
|
||||
if (!fs.existsSync(webEntry))
|
||||
missing.push('packages/web-admin/dist(请先 pnpm --filter @classhelper/web-admin build)');
|
||||
if (missing.length > 0) {
|
||||
throw new Error(`缺少构建产物:\n - ${missing.join('\n - ')}`);
|
||||
throw new Error(`缺少构建产物:\n - ${missing.join('\n - ')}\n建议直接执行:pnpm dist:server`);
|
||||
}
|
||||
|
||||
// 新鲜度校验:曾出现过"改动只重新构建了 server,却把旧的 shared/dist 打进安装包",
|
||||
// 结果安装后服务启动即报 "does not provide an export named ..."。这里直接拦住。
|
||||
const newestSource = (dir) => {
|
||||
let newest = 0;
|
||||
const walk = (current) => {
|
||||
for (const entry of fs.readdirSync(current, { withFileTypes: true })) {
|
||||
const full = path.join(current, entry.name);
|
||||
if (entry.isDirectory()) walk(full);
|
||||
else newest = Math.max(newest, fs.statSync(full).mtimeMs);
|
||||
}
|
||||
};
|
||||
if (fs.existsSync(dir)) walk(dir);
|
||||
return newest;
|
||||
};
|
||||
|
||||
const stale = [];
|
||||
const sharedSourceTime = newestSource(path.join(root, 'packages', 'shared', 'src'));
|
||||
const sharedBuildTime = fs.statSync(path.join(root, 'packages', 'shared', 'dist', 'index.js')).mtimeMs;
|
||||
if (sharedSourceTime > sharedBuildTime) stale.push('packages/shared(src 比 dist 新)');
|
||||
|
||||
const serverSourceTime = newestSource(path.join(serverDir, 'src'));
|
||||
const serverBuildTime = fs.statSync(serverEntry).mtimeMs;
|
||||
if (serverSourceTime > serverBuildTime) stale.push('packages/server(src 比 dist 新)');
|
||||
|
||||
const webSourceTime = newestSource(path.join(webDir, 'src'));
|
||||
const webBuildTime = fs.statSync(webEntry).mtimeMs;
|
||||
if (webSourceTime > webBuildTime) stale.push('packages/web-admin(src 比 dist 新)');
|
||||
|
||||
if (stale.length > 0) {
|
||||
throw new Error(
|
||||
`构建产物已过期:\n - ${stale.join('\n - ')}\n请重新构建(推荐直接执行:pnpm dist:server)`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -144,10 +181,10 @@ function buildRuntime() {
|
||||
// Web 管理端
|
||||
copyRecursive(path.join(webDir, 'dist'), path.join(staging, 'web'));
|
||||
|
||||
// Node 运行时
|
||||
const nodeExe = process.execPath;
|
||||
copyRecursive(nodeExe, path.join(staging, 'node.exe'));
|
||||
log(`内置 Node 运行时:${nodeExe}`);
|
||||
// Node 运行时(必须是真正的 node.exe,不能用宿主 Electron 可执行文件)
|
||||
const nodeRuntime = resolveNodeRuntime();
|
||||
copyRecursive(nodeRuntime.path, path.join(staging, 'node.exe'));
|
||||
log(`内置 Node 运行时:${nodeRuntime.path}(${nodeRuntime.version})`);
|
||||
|
||||
// 数据目录:强制清空,避免把打包机上测试用的数据库带进安装包
|
||||
fs.rmSync(path.join(staging, 'data'), { recursive: true, force: true });
|
||||
|
||||
Reference in new issue
Block a user