Compare commits
48 Commits
13187ddce1
...
v1.4.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
68e6c9483f | ||
|
|
63ff32817e | ||
|
|
78544af8de | ||
|
|
7d73592d41 | ||
|
|
bacdd2d82f | ||
|
|
4add295e44 | ||
|
|
88b2e8d355 | ||
|
|
fe5ad13f88 | ||
|
|
c8ce67dc75 | ||
|
|
9add23f6ed | ||
|
|
6d4b5efc95 | ||
|
|
2216720e24 | ||
|
|
36304b88e1 | ||
|
|
6ad9463e73 | ||
|
|
7644b8d4ea | ||
|
|
5e50a8fbcf | ||
|
|
9ee1ea566c | ||
|
|
29f29f6a9e | ||
|
|
baa7622954 | ||
|
|
851c2ce634 | ||
|
|
64349125ba | ||
|
|
a020ee537d | ||
|
|
351e9a92bc | ||
|
|
f5514dd721 | ||
|
|
b94640ca81 | ||
|
|
b8163d7d4f | ||
|
|
569c8e8ecc | ||
|
|
21bb8ef79c | ||
|
|
fbcc656b99 | ||
|
|
3854c0f048 | ||
|
|
7bc6daf1b7 | ||
|
|
db44618ee5 | ||
|
|
2d17a6b792 | ||
|
|
e8aa7d21a8 | ||
|
|
defeb01808 | ||
|
|
b289fb9624 | ||
|
|
103effcfca | ||
|
|
975bee6ce8 | ||
|
|
6a2fba0e57 | ||
|
|
9248be6310 | ||
|
|
ad8b3deb00 | ||
|
|
cccc4e4c8c | ||
|
|
9e577a2226 | ||
|
|
715dfb4d71 | ||
|
|
a25ffd75c5 | ||
|
|
8eaba79c26 | ||
|
|
05a44bb464 | ||
|
|
77fabf2018 |
1
.gitattributes
vendored
1
.gitattributes
vendored
@@ -6,6 +6,7 @@
|
||||
*.js text eol=lf
|
||||
*.json text eol=lf
|
||||
*.yml text eol=lf
|
||||
*.yaml text eol=lf
|
||||
*.tsx text eol=lf
|
||||
*.jsx text eol=lf
|
||||
*.css text eol=lf
|
||||
|
||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -4,6 +4,7 @@ out
|
||||
.DS_Store
|
||||
.eslintcache
|
||||
*.log*
|
||||
.npmrc
|
||||
|
||||
# AI Agent
|
||||
.claude
|
||||
@@ -14,6 +15,8 @@ out
|
||||
# Test outputs
|
||||
coverage/
|
||||
downloads/
|
||||
release-output/
|
||||
build/bin/
|
||||
*.xlsx
|
||||
*.parsed.json
|
||||
|
||||
@@ -40,4 +43,4 @@ logs
|
||||
nul
|
||||
|
||||
# TypeScript incremental compilation cache
|
||||
*.tsbuildinfo
|
||||
*.tsbuildinfo
|
||||
|
||||
@@ -1,176 +0,0 @@
|
||||
# Playwright 浏览器部署指南
|
||||
|
||||
## 概述
|
||||
|
||||
本文档为开发人员提供 ERPAuto 应用程序中 Playwright Chromium 浏览器的部署指南。文档说明如何将浏览器文件从开发机复制到目标用户机器,确保应用程序能够正常运行浏览器自动化任务。
|
||||
|
||||
**重要提示**:部署前请先阅读 [BROWSER_VERSIONS.md](./BROWSER_VERSIONS.md) 了解版本信息。
|
||||
|
||||
## 目标路径
|
||||
|
||||
浏览器文件必须部署在以下路径:
|
||||
|
||||
```
|
||||
%APPDATA%\erpauto\ms-playwright\chromium-1208\
|
||||
```
|
||||
|
||||
完整展开路径示例(Windows):
|
||||
|
||||
```
|
||||
C:\Users\<用户名>\AppData\Roaming\erpauto\ms-playwright\chromium-1208\
|
||||
```
|
||||
|
||||
## 目录结构
|
||||
|
||||
部署完成后,目标目录结构应如下所示:
|
||||
|
||||
```
|
||||
%APPDATA%\erpauto\ms-playwright\
|
||||
└── chromium-1208/
|
||||
└── chrome-win/
|
||||
├── chrome.exe # 浏览器可执行文件
|
||||
├── chrome_dll.dll
|
||||
├── resources/
|
||||
├── locales/
|
||||
└── ... # 其他浏览器文件
|
||||
```
|
||||
|
||||
**关键文件**:`chrome-win/chrome.exe` 必须存在,否则浏览器无法启动。
|
||||
|
||||
## 部署步骤
|
||||
|
||||
### 步骤 1:在开发机上准备
|
||||
|
||||
1. 确保开发机已安装正确版本的 Playwright:
|
||||
|
||||
```bash
|
||||
npm install playwright@1.58.2
|
||||
```
|
||||
|
||||
2. 下载 Chromium 浏览器:
|
||||
|
||||
```bash
|
||||
npx playwright install chromium
|
||||
```
|
||||
|
||||
3. 定位开发机上的浏览器缓存目录:
|
||||
|
||||
```
|
||||
C:\Users\<开发机用户名>\AppData\Local\ms-playwright\chromium-1208
|
||||
```
|
||||
|
||||
### 步骤 2:复制文件
|
||||
|
||||
1. **复制整个浏览器目录**
|
||||
- 将开发机上的 `chromium-1208` 目录完整复制
|
||||
- 不要只复制部分文件,确保所有子目录和文件都包含在内
|
||||
|
||||
2. **粘贴到目标路径**
|
||||
- 在目标机器上创建目录:`%APPDATA%\erpauto\ms-playwright\`
|
||||
- 将 `chromium-1208` 目录粘贴到该路径下
|
||||
|
||||
3. **验证文件完整性**
|
||||
- 确认目标路径存在:`%APPDATA%\erpauto\ms-playwright\chromium-1208\chrome-win\chrome.exe`
|
||||
- 检查文件大小约为 280MB
|
||||
|
||||
### 步骤 3:配置环境变量(可选)
|
||||
|
||||
如需确保应用程序使用正确的浏览器路径,可设置以下环境变量:
|
||||
|
||||
```batch
|
||||
set PLAYWRIGHT_BROWSERS_PATH=%APPDATA%\erpauto\ms-playwright
|
||||
```
|
||||
|
||||
或在应用程序代码中设置:
|
||||
|
||||
```javascript
|
||||
process.env.PLAYWRIGHT_BROWSERS_PATH = path.join(app.getPath('userData'), 'ms-playwright')
|
||||
```
|
||||
|
||||
## 验证步骤
|
||||
|
||||
部署完成后,执行以下验证步骤:
|
||||
|
||||
### 验证 1:检查目录结构
|
||||
|
||||
在目标机器上运行:
|
||||
|
||||
```batch
|
||||
dir %APPDATA%\erpauto\ms-playwright\chromium-1208\chrome-win\chrome.exe
|
||||
```
|
||||
|
||||
应显示文件存在。
|
||||
|
||||
### 验证 2:启动浏览器测试
|
||||
|
||||
运行 ERPAuto 应用程序,执行以下操作:
|
||||
|
||||
1. 登录应用程序
|
||||
2. 进入「数据提取」页面
|
||||
3. 输入一个有效订单号
|
||||
4. 点击「开始提取」
|
||||
5. 观察浏览器是否正常启动并执行任务
|
||||
|
||||
### 验证 3:检查日志
|
||||
|
||||
查看应用程序日志,确认没有浏览器相关的错误信息:
|
||||
|
||||
- 无 "browser not found" 错误
|
||||
- 无 "chromium revision not found" 错误
|
||||
- 无 "PLAYWRIGHT_BROWSERS_PATH" 相关警告
|
||||
|
||||
## 故障排查
|
||||
|
||||
### 问题 1:浏览器无法启动
|
||||
|
||||
**症状**:应用程序报错,提示找不到浏览器或启动失败。
|
||||
|
||||
**解决方案**:
|
||||
|
||||
1. 确认修订号匹配(必须是 1208)
|
||||
2. 检查 `chrome-win/chrome.exe` 文件是否存在
|
||||
3. 验证 `PLAYWRIGHT_BROWSERS_PATH` 环境变量设置正确
|
||||
4. 确认目标机器具有相同的 Playwright 版本(1.58.2)
|
||||
|
||||
### 问题 2:版本不匹配错误
|
||||
|
||||
**症状**:应用程序启动时报出版本冲突错误。
|
||||
|
||||
**解决方案**:
|
||||
|
||||
1. 检查 `package.json` 中的 Playwright 版本是否为 1.58.2
|
||||
2. 确认复制的 Chromium 修订号为 1208
|
||||
3. 参考 [BROWSER_VERSIONS.md](./BROWSER_VERSIONS.md) 核对所有版本信息
|
||||
|
||||
### 问题 3:权限不足
|
||||
|
||||
**症状**:无法写入或读取浏览器目录。
|
||||
|
||||
**解决方案**:
|
||||
|
||||
1. 确保目标目录具有适当的读写权限
|
||||
2. 以管理员身份运行应用程序进行测试
|
||||
3. 检查防病毒软件是否阻止了浏览器执行
|
||||
|
||||
### 问题 4:路径错误
|
||||
|
||||
**症状**:应用程序在错误的位置查找浏览器文件。
|
||||
|
||||
**解决方案**:
|
||||
|
||||
1. 确认 `%APPDATA%` 环境变量指向正确的用户目录
|
||||
2. 检查应用程序是否正确解析了 `userData` 路径
|
||||
3. 在代码中硬编码浏览器路径进行调试
|
||||
|
||||
## 注意事项
|
||||
|
||||
- **仅部署 Chromium**:ERPAuto 只需要 Chromium 浏览器,不需要 Firefox 或 WebKit
|
||||
- **版本一致性**:开发机和目标机器的 Playwright 版本必须一致
|
||||
- **修订号匹配**:Chromium 修订号(1208)必须完全匹配,否则可能出现兼容性问题
|
||||
- **文件完整性**:复制时确保所有文件完整,损坏的浏览器文件会导致启动失败
|
||||
- **网络隔离环境**:目标机器如果无法访问互联网,必须提前部署浏览器文件,因为无法自动下载
|
||||
|
||||
## 参考文档
|
||||
|
||||
- [BROWSER_VERSIONS.md](./BROWSER_VERSIONS.md) - 版本信息和目录结构详情
|
||||
- [README.md](./README.md) - 项目总体说明
|
||||
@@ -1,96 +0,0 @@
|
||||
# Playwright 浏览器版本信息
|
||||
|
||||
本文档记录 ERPAuto 项目使用的 Playwright 浏览器版本和部署信息。
|
||||
|
||||
## 版本信息
|
||||
|
||||
| 组件 | 版本号 |
|
||||
| --------------- | ------------ |
|
||||
| Playwright | 1.58.2 |
|
||||
| Chromium | 145.0.7632.6 |
|
||||
| Chromium 修订号 | 1208 |
|
||||
|
||||
## 浏览器目录结构
|
||||
|
||||
Playwright 将浏览器文件缓存在以下位置:
|
||||
|
||||
### Windows 开发环境
|
||||
|
||||
```
|
||||
C:\Users\<用户名>\AppData\Local\ms-playwright\
|
||||
└── chromium-1208/
|
||||
└── chrome-win/
|
||||
├── chrome.exe
|
||||
└── ...
|
||||
```
|
||||
|
||||
### 目标部署环境
|
||||
|
||||
```
|
||||
%APPDATA%\erpauto\ms-playwright\
|
||||
└── chromium-1208/
|
||||
└── chrome-win/
|
||||
├── chrome.exe
|
||||
└── ...
|
||||
```
|
||||
|
||||
## 部署指南
|
||||
|
||||
### 开发环境准备
|
||||
|
||||
1. 安装 Playwright 1.58.2
|
||||
|
||||
```bash
|
||||
npm install playwright@1.58.2
|
||||
```
|
||||
|
||||
2. 下载 Chromium 浏览器
|
||||
```bash
|
||||
npx playwright install chromium
|
||||
```
|
||||
|
||||
### 浏览器文件复制步骤
|
||||
|
||||
1. **定位源目录**
|
||||
- 开发机上找到 Playwright 浏览器缓存目录
|
||||
- 默认路径:`C:\Users\<用户名>\AppData\Local\ms-playwright\chromium-1208`
|
||||
|
||||
2. **复制浏览器文件**
|
||||
- 将整个 `chromium-1208` 目录复制到部署目标
|
||||
- 目标路径:`%APPDATA%\erpauto\ms-playwright\chromium-1208`
|
||||
|
||||
3. **验证目录结构**
|
||||
- 确认目标路径包含 `chrome-win/chrome.exe`
|
||||
- 确保所有子文件完整复制
|
||||
|
||||
### 环境变量配置
|
||||
|
||||
如需要自定义浏览器路径,可设置环境变量:
|
||||
|
||||
```bash
|
||||
# Windows
|
||||
set PLAYWRIGHT_BROWSERS_PATH=%APPDATA%\erpauto\ms-playwright
|
||||
```
|
||||
|
||||
## 注意事项
|
||||
|
||||
- 仅包含 Chromium 浏览器(Firefox 和 WebKit 不需要)
|
||||
- 浏览器文件体积约为 280MB
|
||||
- 部署时确保目标机器具有相同的 Playwright 版本(1.58.2)
|
||||
- 修订号必须匹配(1208),否则可能出现兼容性问题
|
||||
|
||||
## 故障排查
|
||||
|
||||
### 浏览器无法启动
|
||||
|
||||
1. 检查修订号是否匹配(1208)
|
||||
2. 确认 `chrome-win/chrome.exe` 文件存在
|
||||
3. 验证 PLAYWRIGHT_BROWSERS_PATH 环境变量设置
|
||||
|
||||
### 版本不匹配错误
|
||||
|
||||
确保以下版本一致:
|
||||
|
||||
- package.json 中的 Playwright 版本
|
||||
- 下载的 Chromium 修订号
|
||||
- browsers.json 中定义版本号
|
||||
216
CLAUDE.md
216
CLAUDE.md
@@ -1,143 +1,165 @@
|
||||
# CLAUDE.md
|
||||
|
||||
This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
|
||||
本文件用于给 AI 编程代理提供本项目的最小必要指导。
|
||||
目标不是替代 `README` 或 `docs/`,而是帮助代理快速理解项目结构、工作方式和关键约束。
|
||||
|
||||
## Development Commands
|
||||
## 项目概览
|
||||
|
||||
### Running the Application
|
||||
ERPAuto 是一个基于 Electron 的桌面应用,用于自动化处理 ERP 系统中的数据提取、清理、校验和配置管理。
|
||||
|
||||
技术栈:
|
||||
|
||||
- Electron 39
|
||||
- React 19
|
||||
- TypeScript 5.9
|
||||
- electron-vite / Vite 7
|
||||
- Playwright 1.58
|
||||
- Vitest
|
||||
|
||||
## 常用命令
|
||||
|
||||
开发与构建:
|
||||
|
||||
```bash
|
||||
npm run dev # Start development server with hot reload
|
||||
npm run build # Full build with type checking
|
||||
npm run build:win # Build Windows executable
|
||||
npm run build:mac # Build macOS DMG
|
||||
npm run build:linux # Build Linux AppImage
|
||||
npm run dev
|
||||
npm run build
|
||||
npm run build:win
|
||||
```
|
||||
|
||||
### Code Quality
|
||||
质量检查:
|
||||
|
||||
```bash
|
||||
npm run lint # ESLint check
|
||||
npm run format # Prettier format
|
||||
npm run typecheck # TypeScript check (both main and renderer)
|
||||
npm run typecheck:node # TypeScript check for main process only
|
||||
npm run typecheck:web # TypeScript check for renderer only
|
||||
npm run typecheck
|
||||
npm run typecheck:node
|
||||
npm run typecheck:web
|
||||
npm run lint
|
||||
npm run format
|
||||
```
|
||||
|
||||
### Testing
|
||||
测试:
|
||||
|
||||
```bash
|
||||
npm run test # Run unit tests (Vitest)
|
||||
npm run test:coverage # Run tests with coverage report
|
||||
npm run test:e2e # Run E2E tests (Playwright)
|
||||
npm run test:e2e:ui # Run E2E tests with UI
|
||||
npm run test:e2e:report # Show E2E test report
|
||||
npm run test
|
||||
npm run test:coverage
|
||||
npm run test:e2e
|
||||
```
|
||||
|
||||
## Architecture Overview
|
||||
发布:
|
||||
|
||||
ERPAuto is an **Electron desktop application** for automating ERP system data processing. The application follows the classic Electron architecture with three distinct processes:
|
||||
```bash
|
||||
npm run release:publish -- --channel stable
|
||||
npm run release:publish -- --channel preview
|
||||
```
|
||||
|
||||
### Process Structure
|
||||
详细发布流程见:
|
||||
[docs/build-and-release-guide.md](/d:/FileLib/Projects/CodeMigration/ERPAuto/docs/build-and-release-guide.md)
|
||||
|
||||
1. **Main Process** (`src/main/`)
|
||||
- Node.js environment managing application lifecycle
|
||||
- Entry point: `src/main/index.ts`
|
||||
- Registers all IPC handlers via `registerIpcHandlers()`
|
||||
- Loads configuration from `config.yaml` via ConfigManager at startup
|
||||
## 代码结构
|
||||
|
||||
2. **Preload Script** (`src/preload/`)
|
||||
- Security bridge between main and renderer processes
|
||||
- Exposes type-safe APIs via `contextBridge` as `window.electron` and `window.api`
|
||||
- Central API surface organized by domain (auth, extractor, cleaner, database, etc.)
|
||||
### 主进程
|
||||
|
||||
3. **Renderer Process** (`src/renderer/`)
|
||||
- React 19 + TypeScript UI
|
||||
- Uses exposed preload APIs for all main process communication
|
||||
- Authentication-based routing with role-based access control
|
||||
- 路径:`src/main/`
|
||||
- 入口:`src/main/index.ts`
|
||||
- 职责:
|
||||
- 应用生命周期管理
|
||||
- 配置加载
|
||||
- IPC 注册
|
||||
- 更新服务初始化
|
||||
|
||||
### Service Architecture
|
||||
### 预加载层
|
||||
|
||||
The main process is organized around domain-specific services in `src/main/services/`:
|
||||
- 路径:`src/preload/`
|
||||
- 职责:
|
||||
- 暴露 `window.electron` API
|
||||
- 作为 renderer 和 main 之间的安全桥
|
||||
|
||||
- **ERP Services** (`services/erp/`): Browser automation using Playwright
|
||||
- `ExtractorService` - Downloads material plan data
|
||||
- `CleanerService` - Deletes specified materials with dry-run support
|
||||
- `ErpAuthService` - Handles ERP authentication
|
||||
- `OrderResolverService` - Validates and resolves order numbers
|
||||
- `locators.ts` - ERP element selectors
|
||||
### 渲染进程
|
||||
|
||||
- **Database Services** (`services/database/`): Dual database support
|
||||
- `MySqlService` / `mysql.ts` - MySQL operations
|
||||
- `SqlServerService` / `sql-server.ts` - SQL Server operations
|
||||
- DAO pattern: `discrete-material-plan-dao.ts`, `materials-to-be-deleted-dao.ts`
|
||||
- 路径:`src/renderer/`
|
||||
- 技术:React + TypeScript
|
||||
- 特点:
|
||||
- 通过 preload 暴露的 API 调用主进程
|
||||
- 以登录状态和角色控制主要功能入口
|
||||
|
||||
- **User Services** (`services/user/`): Authentication and session management
|
||||
- `BipUsersDao` - User data access
|
||||
- `SessionManager` - Active session tracking
|
||||
### 服务层
|
||||
|
||||
- **Other Services**:
|
||||
- `config/` - Configuration management
|
||||
- `excel/` - Excel file parsing
|
||||
主进程服务集中在 `src/main/services/`,按领域拆分:
|
||||
|
||||
### IPC Handler Pattern
|
||||
- `erp/`:ERP 浏览器自动化
|
||||
- `database/`:MySQL / SQL Server
|
||||
- `user/`:登录、会话、用户切换
|
||||
- `config/`:YAML 配置管理
|
||||
- `update/`:便携版更新
|
||||
- `excel/`:Excel 处理
|
||||
|
||||
All IPC communication follows a consistent pattern:
|
||||
## 关键事实
|
||||
|
||||
- Handlers are in `src/main/ipc/`, organized by domain (8 modules)
|
||||
- Each handler module exports a `register*Handlers()` function
|
||||
- All handlers are registered in `src/main/ipc/index.ts`
|
||||
- Channel naming follows `domain:action` convention (e.g., `extractor:run`, `auth:login`)
|
||||
### 配置系统
|
||||
|
||||
### Authentication Flow
|
||||
- 使用 YAML 配置
|
||||
- 模板文件:`config.template.yaml`
|
||||
- 开发环境通常使用项目根目录下的 `config.yaml`
|
||||
- 生产环境会将配置放到用户目录
|
||||
|
||||
The application implements a multi-stage authentication system:
|
||||
### IPC 组织方式
|
||||
|
||||
1. **Silent Login**: On startup, attempts automatic login using computer name
|
||||
2. **Fallback**: Shows login dialog if silent login fails
|
||||
3. **Admin User Selection**: Admin users can switch to other user accounts
|
||||
4. **Session Management**: Persistent sessions with role-based permissions (Admin/User/Guest)
|
||||
- 所有 IPC handler 在 `src/main/ipc/`
|
||||
- 每个领域一个 handler 模块
|
||||
- 统一在 `src/main/ipc/index.ts` 注册
|
||||
- channel 命名遵循 `domain:action`
|
||||
|
||||
Admin users see logout buttons and can access user switching. Non-admin users have restricted access based on the user who initiated their session.
|
||||
### 认证与角色
|
||||
|
||||
### Type System
|
||||
当前主要角色是:
|
||||
|
||||
- Separate TypeScript configs: `tsconfig.node.json` (main/preload) and `tsconfig.web.json` (renderer)
|
||||
- Types are co-located with features: `src/main/types/` contains domain-specific type definitions
|
||||
- The preload script exposes a typed API surface that's available in renderer
|
||||
- `Admin`
|
||||
- `User`
|
||||
- `Guest`
|
||||
|
||||
### Path Aliases
|
||||
登录流程支持:
|
||||
|
||||
- `@renderer` → `src/renderer/src` (renderer process)
|
||||
- `@main` → `src/main` (main process, tests only)
|
||||
- `@services` → `src/main/services` (main process, tests only)
|
||||
- `@types` → `src/main/types` (main process, tests only)
|
||||
- 静默登录
|
||||
- 普通登录
|
||||
- 管理员切换用户
|
||||
|
||||
## Configuration Management
|
||||
### 便携版自动更新
|
||||
|
||||
The application uses a YAML-based configuration system (`config.yaml`) managed by `ConfigManager`:
|
||||
项目已实现 Windows 便携版更新,关键点:
|
||||
|
||||
- **Development**: `config.yaml` in project root (easy to edit and version control)
|
||||
- **Production**: `config.yaml` in user data directory (AppData on Windows)
|
||||
- 更新检查基于登录用户角色
|
||||
- 支持 `stable` / `preview` 双通道
|
||||
- `User` 只看 `stable`
|
||||
- `Admin` 同时看 `stable` 和 `preview`
|
||||
- 使用原生 `portable-updater.exe` 完成替换,不依赖 PowerShell
|
||||
|
||||
Key configurations in `config.yaml`:
|
||||
相关文档:
|
||||
|
||||
- **ERP Settings**: URL (fixed infrastructure)
|
||||
- **Database**: MySQL and SQL Server connection configs (dual support)
|
||||
- **Paths**: Data directory and output file settings
|
||||
- **Extraction**: Batch size, verbosity, persistence options
|
||||
- **Validation**: Data source, batch size, match mode
|
||||
- **Order Resolution**: Database table and field names for order number lookup
|
||||
- [docs/portable-auto-update-architecture.md](/d:/FileLib/Projects/CodeMigration/ERPAuto/docs/portable-auto-update-architecture.md)
|
||||
- [docs/build-and-release-guide.md](/d:/FileLib/Projects/CodeMigration/ERPAuto/docs/build-and-release-guide.md)
|
||||
|
||||
Note: ERP credentials (username/password) are stored in the database (`dbo_BIPUsers` table) per user, managed via the Settings UI.
|
||||
## 代理工作约束
|
||||
|
||||
## Key Technologies
|
||||
1. 优先修改现有文件,不要随意新建同类文件。
|
||||
2. 变更前先理解对应模块的现有模式,尽量保持风格一致。
|
||||
3. renderer 不要直接访问 Node/Electron 能力,统一走 preload。
|
||||
4. 配置、IPC、类型定义通常需要同步更新,避免只改一层。
|
||||
5. 涉及发布、更新、构建链路时,优先复用现有脚本,不要重复实现。
|
||||
6. 涉及浏览器部署或更新流程时,先看 `docs/` 里的专题文档。
|
||||
|
||||
- **Electron 39** - Desktop framework
|
||||
- **React 19** - UI framework
|
||||
- **TypeScript 5.9** - Type safety
|
||||
- **Playwright 1.58** - Browser automation for ERP interaction
|
||||
- **electron-vite + Vite 7** - Build tooling
|
||||
- **Zod** - Runtime validation
|
||||
- **Vitest** - Unit tests
|
||||
- **Playwright Test** - E2E tests
|
||||
## 代理优先查看的文档
|
||||
|
||||
- [README.md](/d:/FileLib/Projects/CodeMigration/ERPAuto/README.md)
|
||||
- [docs/build-and-release-guide.md](/d:/FileLib/Projects/CodeMigration/ERPAuto/docs/build-and-release-guide.md)
|
||||
- [docs/portable-auto-update-architecture.md](/d:/FileLib/Projects/CodeMigration/ERPAuto/docs/portable-auto-update-architecture.md)
|
||||
- [docs/browser/PLAYWRIGHT_DEPLOYMENT.md](/d:/FileLib/Projects/CodeMigration/ERPAuto/docs/browser/PLAYWRIGHT_DEPLOYMENT.md)
|
||||
|
||||
## 不放在这里的内容
|
||||
|
||||
以下内容不应继续堆在本文件中:
|
||||
|
||||
- 详细用户使用说明
|
||||
- 大段业务流程说明
|
||||
- 重复的架构长文
|
||||
- 版本发布记录
|
||||
|
||||
这些内容应继续放在 `README` 或 `docs/` 下的专题文档中。
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
# Playwright 部署说明
|
||||
|
||||
## 浏览器路径问题修复
|
||||
|
||||
### 问题描述
|
||||
|
||||
应用启动时提示"浏览器文件未找到",但浏览器文件已经放置在正确路径下。
|
||||
|
||||
**原因**:Playwright 1.48+ 改变了浏览器目录命名规则:
|
||||
|
||||
- **旧格式**:`chromium-win32/chrome.exe`
|
||||
- **新格式**:`chromium-1208/chrome-win64/chrome.exe`(revision 号可能不同)
|
||||
|
||||
### 解决方案
|
||||
|
||||
代码已更新为自动检测新旧两种格式,并显示当前目录内容以便调试。
|
||||
|
||||
## 快速部署
|
||||
|
||||
### 方法 1:使用 Playwright CLI(推荐)
|
||||
|
||||
```bash
|
||||
# 在应用目录运行
|
||||
npx playwright install chromium
|
||||
```
|
||||
|
||||
浏览器会自动下载并安装到正确位置:
|
||||
|
||||
- **用户数据目录**:`%APPDATA%\erpauto\ms-playwright\`
|
||||
- **完整路径**:`C:\Users\pengq\AppData\Roaming\erpauto\ms-playwright\chromium-<revision>\chrome-win64\chrome.exe`
|
||||
|
||||
### 方法 2:手动复制
|
||||
|
||||
如果你已经有 Playwright 浏览器文件,可以复制到应用的用户数据目录:
|
||||
|
||||
1. 找到现有浏览器文件(通常在 `%USERPROFILE%\AppData\Local\ms-playwright`)
|
||||
2. 复制到 `%APPDATA%\erpauto\ms-playwright\`
|
||||
3. 确保目录结构正确:
|
||||
```
|
||||
ms-playwright/
|
||||
├── chromium-1208/
|
||||
│ ├── chrome-win64/
|
||||
│ │ └── chrome.exe
|
||||
│ └── INSTALLATION_COMPLETE
|
||||
└── chromium_headless_shell-1208/
|
||||
└── ...
|
||||
```
|
||||
|
||||
### 方法 3:使用 PLAYWRIGHT_BROWSERS_PATH 环境变量
|
||||
|
||||
将浏览器文件放在共享位置,然后设置环境变量:
|
||||
|
||||
```bash
|
||||
# 系统环境变量
|
||||
setx PLAYWRIGHT_BROWSERS_PATH "D:\shared\playwright-browsers"
|
||||
```
|
||||
|
||||
或在应用启动脚本中设置。
|
||||
|
||||
## 验证安装
|
||||
|
||||
运行应用后,检查是否还有错误提示。如果没有浏览器错误,说明安装成功。
|
||||
|
||||
你也可以在应用日志中查找:
|
||||
|
||||
- `Found Chromium revision: chromium-1208` - 表示成功找到浏览器
|
||||
- `Playwright browser not found` - 表示未找到,会显示可用目录列表
|
||||
|
||||
## 常见问题
|
||||
|
||||
### Q: 显示"浏览器文件未找到"但文件确实在那里
|
||||
|
||||
检查目录结构是否正确:
|
||||
|
||||
```powershell
|
||||
# 查看当前目录内容
|
||||
Get-ChildItem $env:APPDATA\erpauto\ms-playwright
|
||||
|
||||
# 检查 chrome.exe 是否存在
|
||||
Test-Path "$env:APPDATA\erpauto\ms-playwright\chromium-*/chrome-win64/chrome.exe"
|
||||
```
|
||||
|
||||
### Q: 不同用户使用同一个浏览器文件
|
||||
|
||||
使用环境变量 `PLAYWRIGHT_BROWSERS_PATH` 指向共享目录。
|
||||
|
||||
### Q: 离线部署
|
||||
|
||||
1. 在有网络的机器上运行 `npx playwright install chromium`
|
||||
2. 复制整个 `ms-playwright` 目录
|
||||
3. 在目标机器上设置 `PLAYWRIGHT_BROWSERS_PATH` 指向该目录
|
||||
|
||||
## 下次构建
|
||||
|
||||
只需运行:
|
||||
|
||||
```bash
|
||||
npm run build:win
|
||||
```
|
||||
|
||||
所有配置已保存,Playwright 模块和浏览器路径检查会自动处理。
|
||||
247
build/PortableUpdater.cs
Normal file
247
build/PortableUpdater.cs
Normal file
@@ -0,0 +1,247 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
|
||||
internal static class PortableUpdater
|
||||
{
|
||||
private static string _logPath = string.Empty;
|
||||
|
||||
private static int Main(string[] args)
|
||||
{
|
||||
try
|
||||
{
|
||||
var options = ParseArgs(args);
|
||||
|
||||
var targetExe = Require(options, "--targetExe");
|
||||
var downloadedExe = Require(options, "--downloadedExe");
|
||||
var parentPid = int.Parse(Require(options, "--parentPid"));
|
||||
_logPath = Require(options, "--logPath");
|
||||
var argsBase64 = options.ContainsKey("--argsBase64") ? options["--argsBase64"] : string.Empty;
|
||||
|
||||
WriteLog("Portable updater started");
|
||||
WriteLog("Target exe: " + targetExe);
|
||||
WriteLog("Downloaded exe: " + downloadedExe);
|
||||
WriteLog("Parent pid: " + parentPid);
|
||||
|
||||
var appArgs = DecodeArgs(argsBase64);
|
||||
|
||||
WaitForProcessExit(parentPid, 120);
|
||||
WaitForFileAvailable(targetExe, 120);
|
||||
|
||||
var backupExe = targetExe + ".bak";
|
||||
if (File.Exists(backupExe))
|
||||
{
|
||||
WriteLog("Removing stale backup: " + backupExe);
|
||||
File.Delete(backupExe);
|
||||
}
|
||||
|
||||
WriteLog("Backing up current executable");
|
||||
File.Move(targetExe, backupExe);
|
||||
|
||||
try
|
||||
{
|
||||
WriteLog("Replacing executable");
|
||||
File.Move(downloadedExe, targetExe);
|
||||
}
|
||||
catch (Exception replaceError)
|
||||
{
|
||||
WriteLog("Replace failed: " + replaceError.Message);
|
||||
if (File.Exists(backupExe) && !File.Exists(targetExe))
|
||||
{
|
||||
File.Move(backupExe, targetExe);
|
||||
}
|
||||
throw;
|
||||
}
|
||||
|
||||
var startInfo = new ProcessStartInfo
|
||||
{
|
||||
FileName = targetExe,
|
||||
UseShellExecute = false,
|
||||
WorkingDirectory = Path.GetDirectoryName(targetExe) ?? Environment.CurrentDirectory,
|
||||
Arguments = BuildArgumentString(appArgs)
|
||||
};
|
||||
|
||||
WriteLog("Launching updated executable");
|
||||
Process.Start(startInfo);
|
||||
|
||||
if (File.Exists(backupExe))
|
||||
{
|
||||
WriteLog("Removing backup file");
|
||||
File.Delete(backupExe);
|
||||
}
|
||||
|
||||
WriteLog("Portable update completed successfully");
|
||||
return 0;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
WriteLog("Portable update failed: " + ex);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
private static Dictionary<string, string> ParseArgs(string[] args)
|
||||
{
|
||||
var result = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
for (var i = 0; i < args.Length; i++)
|
||||
{
|
||||
var key = args[i];
|
||||
if (!key.StartsWith("--", StringComparison.Ordinal))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var value = i + 1 < args.Length ? args[i + 1] : string.Empty;
|
||||
if (value.StartsWith("--", StringComparison.Ordinal))
|
||||
{
|
||||
result[key] = string.Empty;
|
||||
continue;
|
||||
}
|
||||
|
||||
result[key] = value;
|
||||
i++;
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
private static string Require(Dictionary<string, string> options, string key)
|
||||
{
|
||||
if (!options.ContainsKey(key) || string.IsNullOrWhiteSpace(options[key]))
|
||||
{
|
||||
throw new InvalidOperationException("Missing required argument: " + key);
|
||||
}
|
||||
|
||||
return options[key];
|
||||
}
|
||||
|
||||
private static string[] DecodeArgs(string argsBase64)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(argsBase64))
|
||||
{
|
||||
return Array.Empty<string>();
|
||||
}
|
||||
|
||||
var raw = Encoding.UTF8.GetString(Convert.FromBase64String(argsBase64));
|
||||
return raw.Split(new[] { '\0' }, StringSplitOptions.RemoveEmptyEntries);
|
||||
}
|
||||
|
||||
private static void WaitForProcessExit(int pid, int timeoutSeconds)
|
||||
{
|
||||
var deadline = DateTime.UtcNow.AddSeconds(timeoutSeconds);
|
||||
|
||||
while (DateTime.UtcNow < deadline)
|
||||
{
|
||||
try
|
||||
{
|
||||
using (var process = Process.GetProcessById(pid))
|
||||
{
|
||||
if (process.HasExited)
|
||||
{
|
||||
WriteLog("Parent process exited");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (ArgumentException)
|
||||
{
|
||||
WriteLog("Parent process already exited");
|
||||
return;
|
||||
}
|
||||
|
||||
Thread.Sleep(500);
|
||||
}
|
||||
|
||||
throw new TimeoutException("Timed out waiting for process exit: " + pid);
|
||||
}
|
||||
|
||||
private static void WaitForFileAvailable(string filePath, int timeoutSeconds)
|
||||
{
|
||||
var deadline = DateTime.UtcNow.AddSeconds(timeoutSeconds);
|
||||
|
||||
while (DateTime.UtcNow < deadline)
|
||||
{
|
||||
try
|
||||
{
|
||||
using (File.Open(filePath, FileMode.Open, FileAccess.ReadWrite, FileShare.None))
|
||||
{
|
||||
WriteLog("Target executable is no longer locked");
|
||||
return;
|
||||
}
|
||||
}
|
||||
catch (IOException)
|
||||
{
|
||||
Thread.Sleep(500);
|
||||
}
|
||||
catch (UnauthorizedAccessException)
|
||||
{
|
||||
Thread.Sleep(500);
|
||||
}
|
||||
}
|
||||
|
||||
throw new TimeoutException("Timed out waiting for target executable to become writable: " + filePath);
|
||||
}
|
||||
|
||||
private static void WriteLog(string message)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(_logPath))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
var directory = Path.GetDirectoryName(_logPath);
|
||||
if (!string.IsNullOrWhiteSpace(directory))
|
||||
{
|
||||
Directory.CreateDirectory(directory);
|
||||
}
|
||||
|
||||
File.AppendAllText(
|
||||
_logPath,
|
||||
DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff") + " " + message + Environment.NewLine,
|
||||
Encoding.UTF8
|
||||
);
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Best effort logging only.
|
||||
}
|
||||
}
|
||||
|
||||
private static string BuildArgumentString(IEnumerable<string> args)
|
||||
{
|
||||
var builder = new StringBuilder();
|
||||
|
||||
foreach (var arg in args)
|
||||
{
|
||||
if (builder.Length > 0)
|
||||
{
|
||||
builder.Append(' ');
|
||||
}
|
||||
|
||||
builder.Append(QuoteArgument(arg));
|
||||
}
|
||||
|
||||
return builder.ToString();
|
||||
}
|
||||
|
||||
private static string QuoteArgument(string arg)
|
||||
{
|
||||
if (string.IsNullOrEmpty(arg))
|
||||
{
|
||||
return "\"\"";
|
||||
}
|
||||
|
||||
if (arg.IndexOfAny(new[] { ' ', '\t', '"' }) < 0)
|
||||
{
|
||||
return arg;
|
||||
}
|
||||
|
||||
return "\"" + arg.Replace("\\", "\\\\").Replace("\"", "\\\"") + "\"";
|
||||
}
|
||||
}
|
||||
@@ -52,3 +52,34 @@ orderResolution:
|
||||
tableName: ''
|
||||
productionIdField: ''
|
||||
orderNumberField: ''
|
||||
|
||||
cleaner:
|
||||
queryBatchSize: 100
|
||||
processConcurrency: 1
|
||||
|
||||
logging:
|
||||
level: info
|
||||
auditRetention: 30
|
||||
appRetention: 14
|
||||
|
||||
# RustFS 对象存储配置(用于持久化报告)
|
||||
rustfs:
|
||||
enabled: false # 设置为 true 启用 RustFS 上传
|
||||
endpoint: 'http://192.168.110.114:9000' # RustFS 服务器地址
|
||||
accessKey: '<YOUR_ACCESS_KEY>' # 访问密钥
|
||||
secretKey: '<YOUR_SECRET_KEY>' # 密钥
|
||||
bucket: 'erpauto' # 存储桶名称
|
||||
region: 'us-east-1' # 区域(S3 兼容,默认即可)
|
||||
|
||||
# 便携版自动更新配置
|
||||
update:
|
||||
enabled: false
|
||||
allowDevMode: false
|
||||
endpoint: 'http://192.168.110.114:9000'
|
||||
accessKey: '<YOUR_ACCESS_KEY>'
|
||||
secretKey: '<YOUR_SECRET_KEY>'
|
||||
bucket: 'erpauto'
|
||||
region: 'us-east-1'
|
||||
basePrefix: 'updates/win-portable'
|
||||
checkIntervalMinutes: 30
|
||||
maxAdminHistoryPerChannel: 10
|
||||
|
||||
139
docs/browser/BROWSER_VERSIONS.md
Normal file
139
docs/browser/BROWSER_VERSIONS.md
Normal file
@@ -0,0 +1,139 @@
|
||||
# Playwright 浏览器版本信息
|
||||
|
||||
本文档记录 ERPAuto 当前使用的 Playwright 版本,以及代码中采用的浏览器目录约定。
|
||||
|
||||
## 当前版本
|
||||
|
||||
根据 [package.json](/d:/FileLib/Projects/CodeMigration/ERPAuto/package.json),项目当前依赖为:
|
||||
|
||||
| 组件 | 当前版本 |
|
||||
| --- | --- |
|
||||
| `playwright` | `^1.58.2` |
|
||||
| `playwright-core` | `^1.58.2` |
|
||||
| `@playwright/test` | `^1.58.2` |
|
||||
|
||||
## 当前代码中的目录约定
|
||||
|
||||
根据 [src/main/index.ts](/d:/FileLib/Projects/CodeMigration/ERPAuto/src/main/index.ts),应用启动时会把:
|
||||
|
||||
```text
|
||||
PLAYWRIGHT_BROWSERS_PATH = %APPDATA%\erpauto\ms-playwright
|
||||
```
|
||||
|
||||
随后按以下顺序检查 Chromium:
|
||||
|
||||
1. 优先检查:
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright\chromium-1208\chrome-win64\chrome.exe
|
||||
```
|
||||
|
||||
2. 兼容旧结构:
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright\chromium-win32\chrome.exe
|
||||
```
|
||||
|
||||
3. 如果仍然找不到,则继续扫描任意 `chromium-*` 目录,并尝试:
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright\chromium-<revision>\chrome-win64\chrome.exe
|
||||
```
|
||||
|
||||
这意味着:
|
||||
|
||||
- `chromium-1208` 是当前代码优先查找的默认 revision
|
||||
- 但应用并不只接受 `1208`
|
||||
- 当前主目录结构是 `chrome-win64`
|
||||
|
||||
## 推荐目录结构
|
||||
|
||||
### Windows 开发环境
|
||||
|
||||
```text
|
||||
C:\Users\<用户名>\AppData\Local\ms-playwright\
|
||||
└── chromium-1208/
|
||||
└── chrome-win64/
|
||||
├── chrome.exe
|
||||
└── ...
|
||||
```
|
||||
|
||||
### 目标部署环境
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright\
|
||||
└── chromium-1208/
|
||||
└── chrome-win64/
|
||||
├── chrome.exe
|
||||
└── ...
|
||||
```
|
||||
|
||||
如果不是 `1208`,只要目录名满足 `chromium-*` 且内部存在 `chrome-win64\chrome.exe`,当前代码也能识别。
|
||||
|
||||
## 使用建议
|
||||
|
||||
### 开发环境准备
|
||||
|
||||
1. 安装项目依赖:
|
||||
|
||||
```bash
|
||||
npm install
|
||||
```
|
||||
|
||||
2. 下载 Chromium 浏览器:
|
||||
|
||||
```bash
|
||||
npx playwright install chromium
|
||||
```
|
||||
|
||||
### 复制浏览器文件
|
||||
|
||||
1. 在开发机上找到 Playwright 浏览器缓存目录:
|
||||
|
||||
```text
|
||||
C:\Users\<用户名>\AppData\Local\ms-playwright\
|
||||
```
|
||||
|
||||
2. 复制完整的 `chromium-*` 目录到目标路径:
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright\
|
||||
```
|
||||
|
||||
3. 确保内部存在:
|
||||
|
||||
```text
|
||||
chrome-win64\chrome.exe
|
||||
```
|
||||
|
||||
## 注意事项
|
||||
|
||||
- ERPAuto 当前只依赖 Chromium,不需要 Firefox 和 WebKit
|
||||
- 浏览器文件体积较大,建议按整个 revision 目录复制
|
||||
- 当前代码会优先尝试 `chromium-1208`
|
||||
- 但从实现角度看,“revision 严格等于 1208”不是唯一成功条件
|
||||
- 真正关键的是目录结构与可执行文件路径满足当前查找规则
|
||||
|
||||
## 故障排查
|
||||
|
||||
### 浏览器无法启动
|
||||
|
||||
优先检查:
|
||||
|
||||
1. `%APPDATA%\erpauto\ms-playwright\` 是否存在
|
||||
2. 是否存在 `chromium-1208\chrome-win64\chrome.exe`
|
||||
3. 是否存在其他 `chromium-*` 目录,且包含 `chrome-win64\chrome.exe`
|
||||
4. 是否误用了过时的 `chrome-win\chrome.exe` 路径
|
||||
|
||||
### 版本不匹配或路径不匹配
|
||||
|
||||
建议同时确认:
|
||||
|
||||
- `package.json` 中的 Playwright 版本
|
||||
- 目标机器上实际部署的 Chromium 目录
|
||||
- 当前目录结构是否为 `chrome-win64\chrome.exe`
|
||||
- 应用启动时是否能在 `%APPDATA%\erpauto\ms-playwright\` 下扫描到有效 revision
|
||||
|
||||
## 相关文档
|
||||
|
||||
- [PLAYWRIGHT_DEPLOYMENT.md](./PLAYWRIGHT_DEPLOYMENT.md)
|
||||
179
docs/browser/PLAYWRIGHT_DEPLOYMENT.md
Normal file
179
docs/browser/PLAYWRIGHT_DEPLOYMENT.md
Normal file
@@ -0,0 +1,179 @@
|
||||
# Playwright 部署说明
|
||||
|
||||
本文档聚焦“如何让 ERPAuto 在目标机器上拥有可用的 Playwright Chromium 浏览器”,适合作为实际部署操作说明。
|
||||
|
||||
如果你想看版本信息,请同时参考:
|
||||
|
||||
- [BROWSER_VERSIONS.md](./BROWSER_VERSIONS.md)
|
||||
|
||||
## 背景
|
||||
|
||||
ERPAuto 启动时会把 `PLAYWRIGHT_BROWSERS_PATH` 设置到:
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright
|
||||
```
|
||||
|
||||
随后在该目录下查找 Chromium 浏览器文件。当前代码支持:
|
||||
|
||||
- `chromium-1208\chrome-win64\chrome.exe`
|
||||
- `chromium-win32\chrome.exe`
|
||||
- 任意 `chromium-*` 目录下的 `chrome-win64\chrome.exe`
|
||||
|
||||
因此,部署的本质就是把一个完整可用的 Chromium revision 目录放到这个位置。
|
||||
|
||||
当前查找顺序是:
|
||||
|
||||
1. 先查 `%APPDATA%\erpauto\ms-playwright\chromium-1208\chrome-win64\chrome.exe`
|
||||
2. 再查 `%APPDATA%\erpauto\ms-playwright\chromium-win32\chrome.exe`
|
||||
3. 最后扫描任意 `chromium-*` 目录下的 `chrome-win64\chrome.exe`
|
||||
|
||||
所以从部署角度看,真正重要的不是目录名一定等于 `1208`,而是目录结构满足当前实现的查找规则。
|
||||
|
||||
## 推荐部署方式
|
||||
|
||||
### 方式 1:使用 Playwright CLI
|
||||
|
||||
如果目标机器能联网,最简单的方式是在项目目录执行:
|
||||
|
||||
```bash
|
||||
npx playwright install chromium
|
||||
```
|
||||
|
||||
执行后,需要把下载得到的 `chromium-*` 目录放到:
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright\
|
||||
```
|
||||
|
||||
说明:
|
||||
|
||||
- Playwright 默认下载目录通常是 `%LOCALAPPDATA%\ms-playwright\`
|
||||
- ERPAuto 运行时查找的是 `%APPDATA%\erpauto\ms-playwright\`
|
||||
- 所以“下载成功”不等于“应用一定能找到”,最终还是要确保文件落在 ERPAuto 使用的目录下
|
||||
|
||||
### 方式 2:手动复制
|
||||
|
||||
这是离线环境或最稳定的部署方式。
|
||||
|
||||
1. 在一台已完成 `npx playwright install chromium` 的机器上找到:
|
||||
|
||||
```text
|
||||
C:\Users\<用户名>\AppData\Local\ms-playwright\
|
||||
```
|
||||
|
||||
2. 复制完整的 `chromium-*` 目录,例如:
|
||||
|
||||
```text
|
||||
chromium-1208
|
||||
```
|
||||
|
||||
3. 将该目录复制到目标机器:
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright\
|
||||
```
|
||||
|
||||
4. 确认内部存在:
|
||||
|
||||
```text
|
||||
chrome-win64\chrome.exe
|
||||
```
|
||||
|
||||
## 推荐目录示例
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright\
|
||||
└── chromium-1208/
|
||||
└── chrome-win64/
|
||||
├── chrome.exe
|
||||
├── chrome.dll
|
||||
├── locales/
|
||||
├── resources/
|
||||
└── ...
|
||||
```
|
||||
|
||||
如果你使用的是旧结构,也可兼容:
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright\
|
||||
└── chromium-win32/
|
||||
└── chrome.exe
|
||||
```
|
||||
|
||||
## 验证方式
|
||||
|
||||
### 验证 1:检查文件
|
||||
|
||||
执行:
|
||||
|
||||
```powershell
|
||||
Get-ChildItem $env:APPDATA\erpauto\ms-playwright
|
||||
```
|
||||
|
||||
如果使用默认 revision,再执行:
|
||||
|
||||
```powershell
|
||||
Test-Path "$env:APPDATA\erpauto\ms-playwright\chromium-1208\chrome-win64\chrome.exe"
|
||||
```
|
||||
|
||||
如果你部署的是其他 revision,请按实际目录替换。
|
||||
|
||||
### 验证 2:启动应用
|
||||
|
||||
启动 ERPAuto,观察是否仍弹出“浏览器文件未找到”错误框。
|
||||
|
||||
如果没有弹窗,通常说明启动时的浏览器路径检查已经通过。
|
||||
|
||||
### 验证 3:执行真实业务
|
||||
|
||||
进入依赖 Playwright 的功能页面,执行一次真实流程,确认浏览器可以正常启动。
|
||||
|
||||
## 常见问题
|
||||
|
||||
### 问题 1:文件明明存在,但应用还是报找不到
|
||||
|
||||
常见原因:
|
||||
|
||||
1. 文件放在 `%LOCALAPPDATA%\ms-playwright\`,而不是 `%APPDATA%\erpauto\ms-playwright\`
|
||||
2. 目录结构是旧文档里的 `chrome-win\chrome.exe`
|
||||
3. revision 目录名不符合 `chromium-*`
|
||||
4. 缺少 `chrome-win64\chrome.exe`
|
||||
|
||||
### 问题 2:想多个用户共用同一份浏览器文件
|
||||
|
||||
当前代码在应用启动时会直接把 `PLAYWRIGHT_BROWSERS_PATH` 设为:
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\ms-playwright
|
||||
```
|
||||
|
||||
所以默认行为是“每个用户使用自己的用户目录”。
|
||||
如果要改成共享目录,需要同时改代码,而不是只改系统环境变量。
|
||||
|
||||
### 问题 3:构建时是否会自动打包 Chromium
|
||||
|
||||
不会。
|
||||
|
||||
当前 [package.json](/d:/FileLib/Projects/CodeMigration/ERPAuto/package.json) 的 `build:win` 明确设置了:
|
||||
|
||||
```text
|
||||
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1
|
||||
```
|
||||
|
||||
也就是说:
|
||||
|
||||
- 构建过程不会自动下载浏览器
|
||||
- 打包产物也不自带 Chromium
|
||||
- 浏览器仍需要单独部署到目标机器
|
||||
|
||||
## 结论
|
||||
|
||||
当前最稳妥的部署方式是:
|
||||
|
||||
1. 在联网机器下载 Chromium
|
||||
2. 复制完整 `chromium-*` 目录
|
||||
3. 放到 `%APPDATA%\erpauto\ms-playwright\`
|
||||
4. 确保内部有 `chrome-win64\chrome.exe`
|
||||
|
||||
只要满足这几个条件,ERPAuto 当前实现就能正确识别并使用浏览器。
|
||||
199
docs/build-and-release-guide.md
Normal file
199
docs/build-and-release-guide.md
Normal file
@@ -0,0 +1,199 @@
|
||||
# 构建与发布流程
|
||||
|
||||
本文档说明 ERPAuto Windows 便携版的当前构建与发布方式,包括推荐的一键发布命令、分步命令,以及发布产物在对象存储中的结构。
|
||||
|
||||
## 概览
|
||||
|
||||
当前发布链路分为 3 个阶段:
|
||||
|
||||
1. 构建 Windows 包
|
||||
2. 生成本地发布物料和索引
|
||||
3. 上传到对象存储并校验远端索引
|
||||
|
||||
现在已经提供一键总控脚本:
|
||||
|
||||
```bash
|
||||
npm run release:publish -- --channel stable
|
||||
```
|
||||
|
||||
或:
|
||||
|
||||
```bash
|
||||
npm run release:publish -- --channel preview
|
||||
```
|
||||
|
||||
## 发布前准备
|
||||
|
||||
发布前需要确认:
|
||||
|
||||
1. [package.json](/d:/FileLib/Projects/CodeMigration/ERPAuto/package.json) 和 [package-lock.json](/d:/FileLib/Projects/CodeMigration/ERPAuto/package-lock.json) 的版本号已经改到目标版本
|
||||
2. [config.yaml](/d:/FileLib/Projects/CodeMigration/ERPAuto/config.yaml) 中 `update` 配置正确,且对象存储可访问
|
||||
3. 对应版本的 changelog 已存在于 `docs/releases/`
|
||||
|
||||
changelog 自动查找规则如下:
|
||||
|
||||
1. 优先查找 `docs/releases/<version>-rebuild.md`
|
||||
2. 如果不存在,再查找 `docs/releases/<version>.md`
|
||||
|
||||
例如当前版本是 `1.3.6`,脚本会按顺序尝试:
|
||||
|
||||
```text
|
||||
docs/releases/1.3.6-rebuild.md
|
||||
docs/releases/1.3.6.md
|
||||
```
|
||||
|
||||
## 推荐流程:一键发布
|
||||
|
||||
### 发布 Stable
|
||||
|
||||
```bash
|
||||
npm run release:publish -- --channel stable
|
||||
```
|
||||
|
||||
### 发布 Preview
|
||||
|
||||
```bash
|
||||
npm run release:publish -- --channel preview
|
||||
```
|
||||
|
||||
这个命令会自动完成:
|
||||
|
||||
1. 读取当前 `package.json` 版本号
|
||||
2. 校验 `package.json` / `package-lock.json` 版本一致
|
||||
3. 校验 changelog 文件存在
|
||||
4. 设置 `APP_CHANNEL`
|
||||
5. 执行 `build:win`
|
||||
6. 执行 `release:prepare`
|
||||
7. 执行 `release:upload --verify`
|
||||
8. 输出本次发布摘要
|
||||
|
||||
## 分步流程
|
||||
|
||||
如果需要调试,也可以手工分步执行。
|
||||
|
||||
### 1. 构建
|
||||
|
||||
Stable:
|
||||
|
||||
```bash
|
||||
$env:APP_CHANNEL="stable"
|
||||
npm run build:win
|
||||
```
|
||||
|
||||
Preview:
|
||||
|
||||
```bash
|
||||
$env:APP_CHANNEL="preview"
|
||||
npm run build:win
|
||||
```
|
||||
|
||||
### 2. 生成发布物料
|
||||
|
||||
```bash
|
||||
npm run release:prepare -- --channel stable --changelog docs/releases/1.3.6.md
|
||||
```
|
||||
|
||||
或:
|
||||
|
||||
```bash
|
||||
npm run release:prepare -- --channel preview --changelog docs/releases/1.3.6.md
|
||||
```
|
||||
|
||||
这一步会生成:
|
||||
|
||||
- `release-output/updates/win-portable/<channel>/artifacts/...`
|
||||
- `release-output/updates/win-portable/<channel>/changelogs/...`
|
||||
- `release-output/updates/win-portable/<channel>/index.json`
|
||||
|
||||
### 3. 上传并校验
|
||||
|
||||
```bash
|
||||
npm run release:upload -- --channel stable --verify
|
||||
```
|
||||
|
||||
或:
|
||||
|
||||
```bash
|
||||
npm run release:upload -- --channel preview --verify
|
||||
```
|
||||
|
||||
## 上传策略
|
||||
|
||||
当前上传脚本默认采用“增量上传”:
|
||||
|
||||
- 上传当前版本对应的 `artifact`
|
||||
- 上传当前版本对应的 `changelog`
|
||||
- 上传最新的 `index.json`
|
||||
|
||||
也就是说,它不会再把旧版本的 exe 和旧 changelog 全部重复上传。
|
||||
|
||||
如果确实需要整条通道做一次全量同步,可以显式使用:
|
||||
|
||||
```bash
|
||||
npm run release:upload -- --channel stable --full-sync
|
||||
```
|
||||
|
||||
## 对象存储目录结构
|
||||
|
||||
发布到对象存储后的目录结构如下:
|
||||
|
||||
```text
|
||||
updates/win-portable/
|
||||
├── stable/
|
||||
│ ├── artifacts/
|
||||
│ │ └── erpauto-<version>-stable-portable.exe
|
||||
│ ├── changelogs/
|
||||
│ │ └── <version>.md
|
||||
│ └── index.json
|
||||
└── preview/
|
||||
├── artifacts/
|
||||
│ └── erpauto-<version>-preview-portable.exe
|
||||
├── changelogs/
|
||||
│ └── <version>.md
|
||||
└── index.json
|
||||
```
|
||||
|
||||
## 相关脚本
|
||||
|
||||
- [publish-release.js](/d:/FileLib/Projects/CodeMigration/ERPAuto/scripts/publish-release.js)
|
||||
一键总控脚本,负责串起 build、prepare、upload。
|
||||
- [prepare-release.js](/d:/FileLib/Projects/CodeMigration/ERPAuto/scripts/prepare-release.js)
|
||||
负责整理本地发布物料和生成 `index.json`。
|
||||
- [upload-release.js](/d:/FileLib/Projects/CodeMigration/ERPAuto/scripts/upload-release.js)
|
||||
负责上传当前版本物料和 `index.json`,并可回读远端索引。
|
||||
- [compile-updater.js](/d:/FileLib/Projects/CodeMigration/ERPAuto/scripts/compile-updater.js)
|
||||
负责构建原生 `portable-updater.exe`。
|
||||
|
||||
## 常见问题
|
||||
|
||||
### 1. 缺少 `--channel`
|
||||
|
||||
会直接失败,因为发布必须显式指定 `stable` 或 `preview`。
|
||||
|
||||
### 2. 找不到 changelog
|
||||
|
||||
说明 `docs/releases/` 下没有当前版本对应的 Markdown 文件。
|
||||
先补 changelog,再执行发布。
|
||||
|
||||
### 3. 版本不是当前通道最新
|
||||
|
||||
总控脚本在 `prepare` 后会检查本地生成的 `index.json`。
|
||||
如果当前版本不是该通道索引的第一项,脚本会停止,避免把旧版本误当成当前发布版本。
|
||||
|
||||
### 4. 只想调试某一步
|
||||
|
||||
可以直接使用分步命令:
|
||||
|
||||
- `npm run build:win`
|
||||
- `npm run release:prepare -- ...`
|
||||
- `npm run release:upload -- ...`
|
||||
|
||||
## 建议
|
||||
|
||||
日常发布优先使用:
|
||||
|
||||
```bash
|
||||
npm run release:publish -- --channel <stable|preview>
|
||||
```
|
||||
|
||||
只有在排查问题或需要特殊处理时,再退回分步命令。
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
| 订单号 | 物料代码 | 物料名称 | 行号 | 跳过原因 |
|
||||
| -------- | -------- | -------- | ---- | --------------------------------- |
|
||||
| `PO-001` | `M001` | 物料名称 | 7500 | 行号在 7000-7999 范围内(受保护) |
|
||||
| `PO-001` | `M001` | 物料名称 | 7500 | 行号在 2000-7999 范围内(受保护) |
|
||||
| `PO-001` | `M002` | 物料名称 | 1200 | 累计待发数量不为空 |
|
||||
| `PO-002` | `M003` | 物料名称 | 300 | 物料不在删除清单中 |
|
||||
| ... | ... | ... | ... | ... |
|
||||
|
||||
985
docs/cleaner-order-error-collection.md
Normal file
985
docs/cleaner-order-error-collection.md
Normal file
@@ -0,0 +1,985 @@
|
||||
# 物料清理模块 - 订单错误收集逻辑分析
|
||||
|
||||
本文档详细分析了 ERPAuto 应用中物料清理功能在处理订单过程中的错误收集机制。
|
||||
|
||||
## 一、系统架构概览
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
subgraph Frontend["渲染进程 (Frontend)"]
|
||||
CleanerPage["CleanerPage.tsx<br/>UI 界面"]
|
||||
UseCleaner["useCleaner.ts<br/>状态管理 Hook"]
|
||||
ExecReport["ExecutionReportDialog.tsx<br/>错误报告展示"]
|
||||
end
|
||||
|
||||
subgraph Preload["Preload 脚本"]
|
||||
ContextBridge["window.electron.cleaner<br/>IPC API 桥接"]
|
||||
end
|
||||
|
||||
subgraph Main["主进程 (Main)"]
|
||||
CleanerHandler["cleaner-handler.ts<br/>IPC 处理器"]
|
||||
CleanerService["cleaner.ts<br/>CleanerService"]
|
||||
OrderResolver["order-resolver.ts<br/>订单号解析"]
|
||||
ReportGen["cleaner-report-generator.ts<br/>报告生成"]
|
||||
end
|
||||
|
||||
subgraph Storage["数据存储"]
|
||||
ConfigYAML["config.yaml<br/>ERP URL 配置"]
|
||||
DB[(数据库<br/>dbo_MaterialsToBeDeleted)]
|
||||
end
|
||||
|
||||
CleanerPage --> UseCleaner
|
||||
UseCleaner --> ContextBridge
|
||||
ContextBridge --> CleanerHandler
|
||||
CleanerHandler --> OrderResolver
|
||||
CleanerHandler --> CleanerService
|
||||
CleanerService --> ReportGen
|
||||
CleanerHandler --> ConfigYAML
|
||||
CleanerHandler --> DB
|
||||
|
||||
style CleanerService fill:#e1f5ff
|
||||
style CleanerHandler fill:#fff4e1
|
||||
style ExecReport fill:#f0e1ff
|
||||
```
|
||||
|
||||
## 二、错误收集流程图
|
||||
|
||||
```mermaid
|
||||
sequenceDiagram
|
||||
participant User as 用户
|
||||
participant UI as CleanerPage
|
||||
participant Hook as useCleaner
|
||||
participant IPC as cleaner-handler
|
||||
participant Resolver as OrderNumberResolver
|
||||
participant Service as CleanerService
|
||||
participant ERP as ERP 系统
|
||||
participant Dialog as ExecutionReportDialog
|
||||
|
||||
User->>UI: 点击"正式执行 ERP 清理"
|
||||
UI->>Hook: handleExecuteDeletion()
|
||||
|
||||
Hook->>Hook: 获取 CleanerData<br/>(订单号 + 物料代码)
|
||||
Hook->>IPC: electron.cleaner.runCleaner()
|
||||
|
||||
IPC->>IPC: 验证 ERP 配置
|
||||
IPC->>Resolver: resolve(orderNumbers)
|
||||
|
||||
Note over Resolver: 订单号解析验证
|
||||
Resolver-->>IPC: 返回 mappings + warnings
|
||||
|
||||
alt 存在解析警告
|
||||
IPC->>IPC: 收集 warnings 到错误列表
|
||||
end
|
||||
|
||||
IPC->>Service: new CleanerService()
|
||||
IPC->>Service: clean(input)
|
||||
|
||||
Note over Service: 批量处理订单
|
||||
loop 每个订单批次
|
||||
Service->>ERP: 查询订单列表
|
||||
Service->>ERP: 打开订单详情页
|
||||
|
||||
alt 订单处理成功
|
||||
Service->>Service: 记录删除/跳过统计
|
||||
else 订单处理失败
|
||||
Service->>Service: createErrorDetail()
|
||||
Service->>Service: errors.push(error)
|
||||
end
|
||||
|
||||
alt 订单未出现在查询结果中
|
||||
Service->>Service: 添加"订单未找到"错误
|
||||
end
|
||||
end
|
||||
|
||||
Note over Service: 失败订单重试机制
|
||||
Service->>Service: retryFailedOrders()
|
||||
loop 每个失败订单 (最多 2 次重试)
|
||||
Service->>ERP: 重新查询并处理
|
||||
alt 重试成功
|
||||
Service->>Service: retrySuccess = true
|
||||
Service->>Service: 从错误列表移除
|
||||
else 重试失败
|
||||
Service->>Service: 记录 retryAttempts
|
||||
end
|
||||
end
|
||||
|
||||
Service-->>IPC: 返回 CleanerResult
|
||||
IPC->>IPC: 合并 warnings + errors
|
||||
|
||||
IPC-->>Hook: IpcResult<CleanerResult>
|
||||
Hook->>Hook: 设置 reportData
|
||||
Hook->>Dialog: 打开错误报告对话框
|
||||
|
||||
Dialog->>User: 显示执行结果<br/>+ 错误详情列表
|
||||
```
|
||||
|
||||
## 三、错误类型详解
|
||||
|
||||
### 3.1 错误来源分类(完整版)
|
||||
|
||||
```mermaid
|
||||
mindmap
|
||||
root((订单错误))
|
||||
前置验证错误
|
||||
ERP 配置不完整
|
||||
数据库连接失败
|
||||
ERP 登录失败
|
||||
未登录先调用会话
|
||||
解析阶段错误
|
||||
订单号格式无效
|
||||
格式不识别 (非订单号/总排号)
|
||||
ProductionID 无对应订单
|
||||
数据库查询异常
|
||||
执行阶段错误
|
||||
导航失败
|
||||
弹出窗口等待超时
|
||||
forwardFrame 访问失败
|
||||
mainiframe 访问失败
|
||||
热键区域加载超时
|
||||
查询界面设置失败
|
||||
订单号查询模式切换失败
|
||||
下拉框选择失败
|
||||
订单查询失败
|
||||
查询结果加载超时
|
||||
查询无结果
|
||||
详情页打开失败
|
||||
行元素等待超时 (15s)
|
||||
更多按钮定位失败
|
||||
popup 事件等待超时
|
||||
备料计划菜单定位失败
|
||||
详情页处理失败
|
||||
forwardFrame 访问失败
|
||||
mainiframe 访问失败 (30s)
|
||||
页面标题等待超时 (30s)
|
||||
修改按钮点击失败
|
||||
保存按钮等待超时 (30s/60s)
|
||||
展开按钮点击失败
|
||||
删行按钮点击失败
|
||||
删行后行变化等待失败
|
||||
下一行按钮点击失败
|
||||
收起按钮点击失败
|
||||
重试阶段错误
|
||||
重试查询无结果
|
||||
重试打开详情页失败
|
||||
重试处理异常
|
||||
达到最大重试次数 (2 次)
|
||||
业务规则错误
|
||||
物料不在删除清单
|
||||
行号在保护范围 (2000-7999)
|
||||
累计待发数量不为空
|
||||
收尾错误
|
||||
浏览器关闭失败
|
||||
数据库断开失败
|
||||
报告生成失败
|
||||
```
|
||||
|
||||
### 3.2 错误数据结构
|
||||
|
||||
```typescript
|
||||
// 主结果结构
|
||||
interface CleanerResult {
|
||||
ordersProcessed: number // 成功处理的订单数
|
||||
materialsDeleted: number // 删除的物料数
|
||||
materialsSkipped: number // 跳过的物料数
|
||||
errors: string[] // 错误消息列表
|
||||
details: OrderCleanDetail[] // 每个订单的详细信息
|
||||
retriedOrders: number // 重试的订单数
|
||||
successfulRetries: number // 成功的重试数
|
||||
}
|
||||
|
||||
// 单个订单详情
|
||||
interface OrderCleanDetail {
|
||||
orderNumber: string // 订单号
|
||||
materialsDeleted: number // 该订单删除的物料数
|
||||
materialsSkipped: number // 该订单跳过的物料数
|
||||
errors: string[] // 该订单的错误列表
|
||||
skippedMaterials: SkippedMaterial[] // 跳过的物料详情
|
||||
retryCount: number // 重试次数
|
||||
retryAttempts?: RetryAttempt[] // 每次重试的错误详情
|
||||
retriedAt?: number // 重试时间戳
|
||||
retrySuccess?: boolean // 重试是否成功
|
||||
}
|
||||
|
||||
// 重试尝试记录
|
||||
interface RetryAttempt {
|
||||
attempt: number // 第几次尝试
|
||||
error: string // 错误消息
|
||||
timestamp: number // 时间戳
|
||||
}
|
||||
|
||||
// 跳过物料详情
|
||||
interface SkippedMaterial {
|
||||
materialCode: string // 物料代码
|
||||
materialName: string // 物料名称
|
||||
rowNumber: number // 行号
|
||||
reason: string // 跳过原因
|
||||
}
|
||||
```
|
||||
|
||||
## 四、核心错误收集点(完整版)
|
||||
|
||||
### 4.1 IPC 处理层 (cleaner-handler.ts)
|
||||
|
||||
```typescript
|
||||
// ========== 前置验证错误 ==========
|
||||
|
||||
// 1. ERP 配置验证失败
|
||||
const userConfig = await erpConfigService.getCurrentUserErpConfig()
|
||||
if (!userConfig || !userConfig.username || !userConfig.password) {
|
||||
throw new ValidationError(
|
||||
'ERP 配置不完整。请在设置中配置 ERP 用户名和密码',
|
||||
'VAL_MISSING_REQUIRED'
|
||||
)
|
||||
}
|
||||
|
||||
// 2. 数据库连接失败
|
||||
try {
|
||||
dbService = await getDatabaseService()
|
||||
} catch (error) {
|
||||
throw new DatabaseQueryError(
|
||||
'数据库连接失败',
|
||||
'DB_CONNECTION_FAILED',
|
||||
error instanceof Error ? error : undefined
|
||||
)
|
||||
}
|
||||
|
||||
// 3. 订单号解析后无有效订单
|
||||
if (validOrderNumbers.length === 0) {
|
||||
throw new ValidationError(
|
||||
'没有有效的生产订单号可处理。请检查输入的格式或数据库连接。',
|
||||
'VAL_INVALID_INPUT'
|
||||
)
|
||||
}
|
||||
|
||||
// 4. ERP 登录失败
|
||||
try {
|
||||
await authService.login()
|
||||
} catch (error) {
|
||||
throw new ErpConnectionError(
|
||||
'ERP 登录失败',
|
||||
'ERP_LOGIN_FAILED',
|
||||
error instanceof Error ? error : undefined
|
||||
)
|
||||
}
|
||||
|
||||
// ========== 执行结果合并 ==========
|
||||
|
||||
// 5. 解析警告合并到错误列表
|
||||
if (warnings.length > 0) {
|
||||
log.warn('Resolution warnings', { warnings })
|
||||
result.errors = [...warnings, ...result.errors]
|
||||
}
|
||||
|
||||
// 6. 导出验证错误
|
||||
if (!items || items.length === 0) {
|
||||
throw new ValidationError('没有数据可导出', 'VAL_INVALID_INPUT')
|
||||
}
|
||||
```
|
||||
|
||||
### 4.2 订单号解析层 (order-resolver.ts)
|
||||
|
||||
```typescript
|
||||
// ========== 解析错误 ==========
|
||||
|
||||
// 1. ProductionID 数据库查询失败
|
||||
async mapProductionIdToOrderNumber(productionId: string): Promise<string | null> {
|
||||
try {
|
||||
const result = await this.dbService.query(sql, params)
|
||||
// ...
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : '未知数据库错误'
|
||||
log.error('Failed to map productionID to order number', {
|
||||
productionId,
|
||||
error: message
|
||||
})
|
||||
throw error // 向上抛出
|
||||
}
|
||||
}
|
||||
|
||||
// 2. 批量映射查询失败
|
||||
async mapProductionIdsToOrderNumbers(productionIds: string[]): Promise<Map<string, string>> {
|
||||
try {
|
||||
const result = await this.dbService.query(sql, params)
|
||||
// ...
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : '未知数据库错误'
|
||||
log.error('Failed to map productionIds to order numbers', { error: message })
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
// 3. 单个订单解析失败 - 在 resolve() 中记录
|
||||
for (const input of inputs) {
|
||||
const mapping: OrderMapping = { input, resolved: false }
|
||||
|
||||
if (this.isOrderNumber(input)) {
|
||||
mapping.orderNumber = input
|
||||
mapping.resolved = true
|
||||
} else if (this.isProductionId(input)) {
|
||||
mapping.productionId = input
|
||||
const orderNumber = mappings.get(input)
|
||||
if (orderNumber) {
|
||||
mapping.orderNumber = orderNumber
|
||||
mapping.resolved = true
|
||||
} else {
|
||||
// 错误:ProductionID 在数据库中找不到
|
||||
mapping.error = '未在数据库中找到对应的订单号'
|
||||
}
|
||||
} else {
|
||||
// 错误:格式不识别
|
||||
mapping.error = '格式不识别:既不是有效的生产订单号也不是总排号格式'
|
||||
}
|
||||
|
||||
results.push(mapping)
|
||||
}
|
||||
|
||||
// 4. 警告收集
|
||||
getWarnings(mappings: OrderMapping[]): string[] {
|
||||
return mappings.filter((m) => !m.resolved && m.error).map((m) => `${m.input}: ${m.error}`)
|
||||
}
|
||||
```
|
||||
|
||||
### 4.3 ERP 认证层 (erp-auth.ts)
|
||||
|
||||
```typescript
|
||||
// ========== 登录阶段错误 ==========
|
||||
|
||||
async login(): Promise<ErpSession> {
|
||||
// 1. 浏览器启动失败(隐式抛出)
|
||||
const browser = await chromium.launch({ ... })
|
||||
|
||||
// 2. 上下文创建失败(隐式抛出)
|
||||
const context = await browser.newContext({ ... })
|
||||
|
||||
// 3. 页面创建失败(隐式抛出)
|
||||
const page = await context.newPage()
|
||||
|
||||
// 4. 导航失败(隐式抛出)
|
||||
await page.goto(loginUrl)
|
||||
|
||||
// 5. 页面加载超时
|
||||
await page.waitForLoadState('domcontentloaded', { timeout: PAGE_LOAD_TIMEOUT })
|
||||
|
||||
// 6. iframe 选择器等待超时
|
||||
await page.waitForSelector('#forwardFrame', {
|
||||
state: 'attached',
|
||||
timeout: LOGIN_RESULT_TIMEOUT
|
||||
})
|
||||
|
||||
// 7. forwardFrame content frame 访问失败
|
||||
const contentFrame = await frameLocator.contentFrame()
|
||||
if (!contentFrame) {
|
||||
throw new Error('Failed to access forwardFrame content frame')
|
||||
}
|
||||
|
||||
// 8. 用户名输入框定位失败
|
||||
try {
|
||||
await contentFrame.getByRole('textbox', { name: '用户名' }).fill(this.config.username)
|
||||
} catch (e) {
|
||||
throw new Error(`Failed to find username input: ${e}`)
|
||||
}
|
||||
|
||||
// 9. 密码输入框定位失败
|
||||
try {
|
||||
await contentFrame.getByRole('textbox', { name: '密码' }).fill(this.config.password)
|
||||
} catch (e) {
|
||||
throw new Error(`Failed to find password input: ${e}`)
|
||||
}
|
||||
|
||||
// 10. 登录按钮点击失败
|
||||
try {
|
||||
await contentFrame.getByRole('button', { name: '登录' }).click()
|
||||
} catch (e) {
|
||||
throw new Error(`Failed to click login button: ${e}`)
|
||||
}
|
||||
|
||||
// 11. 登录结果等待 - 多种失败场景
|
||||
await this.waitForLoginResult(mainFrame)
|
||||
}
|
||||
|
||||
// waitForLoginResult 内部错误
|
||||
private async waitForLoginResult(mainFrame: Frame): Promise<void> {
|
||||
// 12. 登录成功图标等待超时
|
||||
// 13. 错误消息等待超时
|
||||
// 14. 强制登录对话框等待超时
|
||||
// 15. 强制登录确认按钮点击失败
|
||||
// 16. 名称或密码错误检测
|
||||
const hasError = await errorLocator.isVisible()
|
||||
if (hasError) {
|
||||
throw new Error('ERP 登录失败:名称或密码错误')
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 4.4 服务层 (cleaner.ts) - 主处理循环
|
||||
|
||||
```typescript
|
||||
// ========== 导航阶段错误 ==========
|
||||
|
||||
async navigateToCleanerPage(session: ErpSession): Promise<{ popupPage: Page; workFrame: FrameLocator }> {
|
||||
// 1. 菜单图标点击失败
|
||||
await mainFrame.locator('i').first().click()
|
||||
|
||||
// 2. 弹出窗口等待超时
|
||||
const popupPromise = page.waitForEvent('popup')
|
||||
|
||||
// 3. 标题定位点击失败
|
||||
await mainFrame.getByTitle('离散生产订单维护', { exact: true }).first().click()
|
||||
const popupPage = await popupPromise
|
||||
|
||||
// 4. forwardFrame 定位失败
|
||||
const forwardFrameLocator = popupPage.locator('#forwardFrame')
|
||||
const fFrame = await forwardFrameLocator.contentFrame()
|
||||
|
||||
// 5. mainiframe 等待超时 (30s)
|
||||
const innerFrameLocator = fFrame.locator('#mainiframe')
|
||||
await innerFrameLocator.waitFor({ state: 'visible', timeout: 30000 })
|
||||
const workFrame = await innerFrameLocator.contentFrame()
|
||||
|
||||
// 6. 热键区域加载超时 (30s)
|
||||
await workFrame.locator('#hot-key-head_list').waitFor({ state: 'visible', timeout: 30000 })
|
||||
}
|
||||
|
||||
// ========== 查询界面设置错误 ==========
|
||||
|
||||
private async setupQueryInterface(innerFrame: FrameLocator): Promise<void> {
|
||||
// 7. 查询模式切换按钮点击失败
|
||||
await innerFrame.locator('.search-name-wrapper > .iconfont').click()
|
||||
|
||||
// 8. 订单号查询选项点击失败
|
||||
await innerFrame.getByText('订单号查询').click()
|
||||
|
||||
// 9. 全部 Tab 点击失败
|
||||
await innerFrame.getByRole('tab', { name: '全部' }).click()
|
||||
|
||||
// 10. 下拉框填充失败
|
||||
const inputEl = innerFrame.locator('#rc_select_0')
|
||||
await inputEl.fill('5000')
|
||||
await inputEl.press('Enter')
|
||||
}
|
||||
|
||||
// ========== 订单查询错误 ==========
|
||||
|
||||
private async queryOrders(workFrame: FrameLocator, orderNumbers: string[]): Promise<void> {
|
||||
// 11. 文本框填充失败
|
||||
const textbox = workFrame.getByRole('textbox', { name: '生产订单号' })
|
||||
await textbox.fill(orderNumbers.join(','))
|
||||
|
||||
// 12. 查询按钮点击失败
|
||||
await workFrame.locator('.search-component-searchBtn').click()
|
||||
}
|
||||
|
||||
// ========== 订单详情打开错误 ==========
|
||||
|
||||
private async openDetailPageFromRow(workFrame: FrameLocator, popupPage: Page, rowIndex: number): Promise<Page> {
|
||||
// 13. 行元素等待超时 (15s)
|
||||
const row = workFrame.locator('tbody tr').nth(rowIndex)
|
||||
await row.waitFor({ state: 'visible', timeout: 15000 })
|
||||
|
||||
// 14. 更多按钮定位失败
|
||||
const moreButton = row.locator('a.row-more').first()
|
||||
await moreButton.scrollIntoViewIfNeeded()
|
||||
|
||||
// 15. popup 事件等待超时
|
||||
const detailPagePromise = popupPage.waitForEvent('popup')
|
||||
|
||||
// 16. 更多按钮点击失败
|
||||
await moreButton.click()
|
||||
|
||||
// 17. 备料计划菜单点击失败(备料计划菜单可能有多套定位策略)
|
||||
await this.clickMaterialPlanMenu(workFrame)
|
||||
|
||||
return await detailPagePromise
|
||||
}
|
||||
|
||||
// 18. 备料计划菜单定位失败 - 遍历 4 套定位器全部失败
|
||||
private async clickMaterialPlanMenu(workFrame: FrameLocator): Promise<void> {
|
||||
const candidates = [/* 4 套定位器 */]
|
||||
for (const candidate of candidates) {
|
||||
try {
|
||||
await target.waitFor({ state: 'visible', timeout: 2000 })
|
||||
await target.click()
|
||||
return
|
||||
} catch { /* 尝试下一个 */ }
|
||||
}
|
||||
throw new Error('无法定位"备料计划"菜单项(可能菜单结构已变化)')
|
||||
}
|
||||
|
||||
// ========== 详情页处理错误 ==========
|
||||
|
||||
private async processDetailPage(params: {...}): Promise<OrderCleanDetail> {
|
||||
try {
|
||||
// 19. forwardFrame 定位失败
|
||||
const detailMainFrame = detailPage.locator('#forwardFrame')
|
||||
const dFrame = await detailMainFrame.contentFrame()
|
||||
if (!dFrame) {
|
||||
throw new Error('Failed to access detail page forward frame')
|
||||
}
|
||||
|
||||
// 20. mainiframe 定位失败
|
||||
const detailInnerLocator = dFrame.locator('#mainiframe')
|
||||
|
||||
// 21. mainiframe 等待超时 (30s)
|
||||
await detailInnerLocator.waitFor({ state: 'visible', timeout: 30000 })
|
||||
const detailInnerFrame = await detailInnerLocator.contentFrame()
|
||||
if (!detailInnerFrame) {
|
||||
throw new Error('Failed to access detail inner frame')
|
||||
}
|
||||
|
||||
// 22. 页面标题等待超时 (30s)
|
||||
await detailInnerFrame.getByText(/^离散备料计划维护:/).waitFor({ state: 'visible', timeout: 30000 })
|
||||
|
||||
// 23. 源订单号提取失败(静默处理,返回空字符串)
|
||||
const sourceOrderNumber = await this.extractSourceOrderNumber(detailInnerFrame)
|
||||
|
||||
// 24. 详细信息计数提取失败(静默处理,返回 0)
|
||||
const detailCountText = await detailInnerFrame.getByText(/^详细信息(\d+)$/).innerText()
|
||||
|
||||
// 25. 备料状态文本提取失败(静默处理,返回空字符串)
|
||||
const statusText = await detailInnerFrame.getByText(/^备料状态:.+$/).innerText()
|
||||
|
||||
if (detailStatus === '审批通过' && detailCount > 0) {
|
||||
// 26. 修改按钮点击失败
|
||||
await detailInnerFrame.getByRole('button', { name: '修改' }).click()
|
||||
|
||||
// 27. 保存按钮等待超时 (30s)
|
||||
const saveButtonLocator = detailInnerFrame.getByRole('button', { name: '保存' })
|
||||
await saveButtonLocator.waitFor({ state: 'visible', timeout: 30000 })
|
||||
|
||||
// 28. 展开按钮点击失败
|
||||
await detailInnerFrame.getByText('展开').first().click()
|
||||
|
||||
// 29. 行号输入值获取失败(静默处理)
|
||||
const currentRow = await this.getInputValue(childForm, /^行号$/)
|
||||
|
||||
// 30. 材料编码输入值获取失败(静默处理)
|
||||
const materialCode = await this.getInputValue(childForm, /^材料编码/)
|
||||
|
||||
// 31. 材料名称输入值获取失败(静默处理)
|
||||
const materialName = await this.getInputValue(childForm, /^材料名称/)
|
||||
|
||||
// 32. 累计待发数量输入值获取失败(静默处理)
|
||||
const pendingQty = await this.getInputValue(childForm, /^累计待发数量$/)
|
||||
|
||||
// 33. 删行按钮点击失败
|
||||
await deleteRowBtn.click()
|
||||
|
||||
// 34. 删行后行变化等待超时 (10s)
|
||||
const deleteSuccess = await this.waitForRowChange(childForm, oldRowNumber, 10000)
|
||||
|
||||
// 35. 下一行按钮点击失败
|
||||
await nextBtn.click()
|
||||
|
||||
// 36. 收起按钮点击失败
|
||||
await collapseBtn.click()
|
||||
|
||||
// 37. 保存按钮点击失败
|
||||
await saveButtonLocator.click()
|
||||
|
||||
// 38. 保存完成等待超时 (60s)
|
||||
await saveButtonLocator.waitFor({ state: 'hidden', timeout: 60000 })
|
||||
}
|
||||
} finally {
|
||||
// 39. 详情页关闭失败(静默处理)
|
||||
await detailPage.close()
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 4.5 重试机制 (cleaner.ts)
|
||||
|
||||
```typescript
|
||||
private async retryFailedOrders(params: {...}): Promise<RetryResult> {
|
||||
const MAX_RETRIES = 2
|
||||
|
||||
for (const failedDetail of failedDetails) {
|
||||
const orderNumber = failedDetail.orderNumber
|
||||
const retryAttempts: RetryAttempt[] = []
|
||||
|
||||
for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
|
||||
try {
|
||||
// 1. 重试查询订单
|
||||
await this.queryOrders(workFrame, [orderNumber])
|
||||
|
||||
// 2. 重试加载等待
|
||||
await this.waitForLoading(workFrame)
|
||||
|
||||
// 3. 重试查询结果验证
|
||||
const rows = workFrame.locator('tbody tr')
|
||||
const rowCount = await rows.count()
|
||||
if (rowCount === 0) {
|
||||
throw new Error('订单重试查询无结果')
|
||||
}
|
||||
|
||||
// 4. 重试打开详情页(从第一行)
|
||||
const detailPage = await this.openDetailPageFromCurrentQuery(workFrame, popupPage)
|
||||
|
||||
// 5. 重试处理详情页
|
||||
const retryDetail = await this.processDetailPage({...})
|
||||
|
||||
// 重试成功
|
||||
result.successfulRetries += 1
|
||||
result.updatedDetails.push({
|
||||
...retryDetail,
|
||||
retryCount: attempt,
|
||||
retriedAt: Date.now(),
|
||||
retrySuccess: true,
|
||||
retryAttempts
|
||||
})
|
||||
break
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : 'Unknown error'
|
||||
log.warn(`Retry attempt ${attempt} failed for order ${orderNumber}: ${message}`)
|
||||
|
||||
// 记录重试失败详情
|
||||
retryAttempts.push({
|
||||
attempt,
|
||||
error: message,
|
||||
timestamp: Date.now()
|
||||
})
|
||||
|
||||
// 达到最大重试次数
|
||||
if (attempt === MAX_RETRIES) {
|
||||
result.updatedDetails.push({
|
||||
...failedDetail,
|
||||
retryCount: MAX_RETRIES,
|
||||
retryAttempts,
|
||||
retriedAt: Date.now(),
|
||||
retrySuccess: false
|
||||
})
|
||||
result.retriedOrders += 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 清理成功的重试错误
|
||||
const successfulRetryOrders = new Set(
|
||||
retryResult.updatedDetails.filter((d) => d.retrySuccess).map((d) => d.orderNumber)
|
||||
)
|
||||
result.errors = result.errors.filter(
|
||||
(err) => !successfulRetryOrders.has(err.split(':')[0].replace('Order ', ''))
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
### 4.6 全局异常捕获 (cleaner.ts - clean 方法)
|
||||
|
||||
```typescript
|
||||
async clean(input: CleanerInput): Promise<CleanerResult> {
|
||||
const result: CleanerResult = { /* ... */ }
|
||||
|
||||
try {
|
||||
// 主处理逻辑
|
||||
// ...
|
||||
} catch (error) {
|
||||
// 全局异常捕获 - 任何未处理的错误都会在这里被捕获
|
||||
const message = error instanceof Error ? error.message : 'Unknown error'
|
||||
log.error('Cleaner failed', { error: message })
|
||||
result.errors.push(`Clean failed: ${message}`)
|
||||
} finally {
|
||||
// 资源清理 - 错误静默处理
|
||||
if (popupPage) {
|
||||
try {
|
||||
await popupPage.close()
|
||||
} catch { /* Ignore close errors */ }
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
```
|
||||
|
||||
## 五、前端错误展示流程
|
||||
|
||||
```mermaid
|
||||
flowchart LR
|
||||
subgraph State["React 状态"]
|
||||
ReportData["reportData state"]
|
||||
IsExecuting["isExecuting state"]
|
||||
Progress["progress state"]
|
||||
end
|
||||
|
||||
subgraph Dialog["ExecutionReportDialog"]
|
||||
ProgressView["进度视图"]
|
||||
ResultView["结果视图"]
|
||||
ErrorList["错误列表渲染"]
|
||||
end
|
||||
|
||||
subgraph Display["UI 展示"]
|
||||
StatsCards["统计卡片"]
|
||||
ErrorItems["错误项"]
|
||||
RetryStats["重试统计"]
|
||||
end
|
||||
|
||||
ReportData --> ResultView
|
||||
IsExecuting --> ProgressView
|
||||
Progress --> ProgressView
|
||||
|
||||
ResultView --> StatsCards
|
||||
ResultView --> ErrorList
|
||||
ResultView --> RetryStats
|
||||
|
||||
ErrorList --> ErrorItems
|
||||
|
||||
style ErrorList fill:#ffe1e1
|
||||
style ErrorItems fill:#ffc0c0
|
||||
```
|
||||
|
||||
### 5.1 错误展示组件 (ExecutionReportDialog.tsx)
|
||||
|
||||
```tsx
|
||||
// 错误列表渲染
|
||||
{
|
||||
hasErrors && (
|
||||
<div className="mt-4 pt-4 border-t border-gray-200">
|
||||
<div className="text-sm font-semibold text-red-600 mb-2">错误详情</div>
|
||||
<div className="flex flex-col gap-2 max-h-40 overflow-y-auto">
|
||||
{errors.map((error, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className="flex items-start gap-2 p-2 bg-red-50 rounded border border-red-200"
|
||||
>
|
||||
<XCircle size={14} className="text-red-600 flex-shrink-0 mt-0.5" />
|
||||
<span className="text-sm text-gray-900 break-words">{error}</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
// 重试统计展示
|
||||
{
|
||||
hasRetries && (
|
||||
<>
|
||||
<div className="bg-gray-50 rounded-lg p-3 flex items-center gap-3">
|
||||
<div className="w-9 h-9 rounded-lg bg-purple-50">
|
||||
<RefreshIcon className="text-purple-600" />
|
||||
</div>
|
||||
<div>
|
||||
<div className="text-xs text-gray-600">重试订单</div>
|
||||
<div className="text-xl font-semibold">{retriedOrders}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="bg-gray-50 rounded-lg p-3 flex items-center gap-3">
|
||||
<div className="w-9 h-9 rounded-lg bg-emerald-50">
|
||||
<CheckCircle className="text-emerald-600" />
|
||||
</div>
|
||||
<div>
|
||||
<div className="text-xs text-gray-600">成功重试</div>
|
||||
<div className="text-xl font-semibold">{successfulRetries}</div>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
## 六、完整数据流
|
||||
|
||||
```mermaid
|
||||
flowchart TB
|
||||
subgraph Input["输入数据"]
|
||||
ProductionIDs["Production IDs<br/>(共享状态)"]
|
||||
MaterialCodes["物料代码<br/>(dbo_MaterialsToBeDeleted)"]
|
||||
end
|
||||
|
||||
subgraph Resolve["解析阶段"]
|
||||
DBQuery["数据库查询<br/>生产订单号"]
|
||||
Validation["格式验证"]
|
||||
Warnings["警告收集"]
|
||||
end
|
||||
|
||||
subgraph Execute["执行阶段"]
|
||||
BatchQuery["批量查询订单"]
|
||||
ProcessDetail["处理订单详情"]
|
||||
SkipLogic["跳过判断逻辑"]
|
||||
end
|
||||
|
||||
subgraph Retry["重试阶段"]
|
||||
FailedList["失败订单列表"]
|
||||
RetryLoop["最多 2 次重试"]
|
||||
UpdateErrors["更新错误列表"]
|
||||
end
|
||||
|
||||
subgraph Output["输出结果"]
|
||||
Stats["统计数据"]
|
||||
Errors["错误列表"]
|
||||
Details["订单详情"]
|
||||
Report["生成报告"]
|
||||
end
|
||||
|
||||
ProductionIDs --> DBQuery
|
||||
MaterialCodes --> Execute
|
||||
DBQuery --> Validation
|
||||
Validation --> Warnings
|
||||
Warnings --> Errors
|
||||
|
||||
Validation --> BatchQuery
|
||||
BatchQuery --> ProcessDetail
|
||||
ProcessDetail --> SkipLogic
|
||||
SkipLogic --> Stats
|
||||
|
||||
ProcessDetail --> FailedList
|
||||
FailedList --> RetryLoop
|
||||
RetryLoop --> UpdateErrors
|
||||
UpdateErrors --> Errors
|
||||
|
||||
Stats --> Output
|
||||
Errors --> Output
|
||||
Details --> Output
|
||||
Output --> Report
|
||||
|
||||
style Warnings fill:#fff4e1
|
||||
style Errors fill:#ffe1e1
|
||||
style UpdateErrors fill:#e1ffe1
|
||||
```
|
||||
|
||||
## 七、关键配置参数
|
||||
|
||||
| 参数 | 默认值 | 范围 | 说明 |
|
||||
| -------------------- | ------ | ----- | ------------------------ |
|
||||
| `queryBatchSize` | 100 | 1-100 | 每批查询的订单数量 |
|
||||
| `processConcurrency` | 1 | 1-20 | 并行处理的订单详情页数量 |
|
||||
| `dryRun` | false | - | 预览模式,不实际删除 |
|
||||
| `headless` | true | - | 后台模式,不显示浏览器 |
|
||||
| `MAX_RETRIES` | 2 | - | 失败订单最大重试次数 |
|
||||
|
||||
## 八、错误处理最佳实践
|
||||
|
||||
### 8.1 已实现的模式
|
||||
|
||||
1. **分层错误收集**: IPC 层、服务层、重试层分别收集
|
||||
2. **错误聚合**: 所有错误最终汇总到 `CleanerResult.errors`
|
||||
3. **重试恢复**: 自动重试失败订单,成功后从错误列表移除
|
||||
4. **详细记录**: 每个订单的 `OrderCleanDetail` 包含独立错误列表
|
||||
5. **审计追踪**: `RetryAttempt[]` 记录每次重试的详细信息
|
||||
|
||||
### 8.2 错误格式规范
|
||||
|
||||
```typescript
|
||||
// 订单级别错误格式
|
||||
;`Order ${orderNumber}: ${errorMessage}`
|
||||
|
||||
// 解析警告直接添加
|
||||
warnings.push(warningMessage)
|
||||
|
||||
// 重试失败记录
|
||||
retryAttempts.push({
|
||||
attempt: 1,
|
||||
error: '具体错误消息',
|
||||
timestamp: Date.now()
|
||||
})
|
||||
```
|
||||
|
||||
## 九、完整错误覆盖清单
|
||||
|
||||
### 错误覆盖完整性审计
|
||||
|
||||
| 层级 | 错误点 | 错误类型 | 是否收集 | 是否可重试 |
|
||||
| --------------- | -------------------------- | ------------------ | -------- | ---------- |
|
||||
| **前置验证** |
|
||||
| cleaner-handler | ERP 配置不完整 | ValidationError | ✅ | ❌ |
|
||||
| cleaner-handler | 数据库连接失败 | DatabaseQueryError | ✅ | ❌ |
|
||||
| cleaner-handler | 无有效订单号 | ValidationError | ✅ | ❌ |
|
||||
| cleaner-handler | ERP 登录失败 | ErpConnectionError | ✅ | ❌ |
|
||||
| **订单解析** |
|
||||
| order-resolver | ProductionID 无对应订单 | 解析警告 | ✅ | ❌ |
|
||||
| order-resolver | 格式不识别 | 解析警告 | ✅ | ❌ |
|
||||
| order-resolver | 数据库查询异常 | 抛出错误 | ✅ | ❌ |
|
||||
| **ERP 认证** |
|
||||
| erp-auth | forwardFrame 访问失败 | Error | ✅ | ❌ |
|
||||
| erp-auth | 用户名输入框找不到 | Error | ✅ | ❌ |
|
||||
| erp-auth | 密码输入框找不到 | Error | ✅ | ❌ |
|
||||
| erp-auth | 登录按钮点击失败 | Error | ✅ | ❌ |
|
||||
| erp-auth | 登录超时 | 隐式超时 | ✅ | ❌ |
|
||||
| erp-auth | 名称或密码错误 | Error | ✅ | ❌ |
|
||||
| **导航阶段** |
|
||||
| cleaner | 弹出窗口等待超时 | Playwright Timeout | ✅ | ✅ |
|
||||
| cleaner | forwardFrame 访问失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | mainiframe 等待超时 (30s) | Playwright Timeout | ✅ | ✅ |
|
||||
| cleaner | 热键区域加载超时 (30s) | Playwright Timeout | ✅ | ✅ |
|
||||
| **查询设置** |
|
||||
| cleaner | 查询模式切换失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | 下拉框填充失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | 查询按钮点击失败 | Playwright Error | ✅ | ✅ |
|
||||
| **订单打开** |
|
||||
| cleaner | 行元素等待超时 (15s) | Playwright Timeout | ✅ | ✅ |
|
||||
| cleaner | 更多按钮定位失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | popup 事件等待超时 | Playwright Timeout | ✅ | ✅ |
|
||||
| cleaner | 备料计划菜单定位失败 | Error | ✅ | ✅ |
|
||||
| **详情处理** |
|
||||
| cleaner | forwardFrame 访问失败 | Error | ✅ | ✅ |
|
||||
| cleaner | mainiframe 访问失败 (30s) | Playwright Timeout | ✅ | ✅ |
|
||||
| cleaner | 页面标题等待超时 (30s) | Playwright Timeout | ✅ | ✅ |
|
||||
| cleaner | 修改按钮点击失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | 保存按钮等待超时 (30s) | Playwright Timeout | ✅ | ✅ |
|
||||
| cleaner | 展开按钮点击失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | 删行按钮点击失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | 删行后行变化等待失败 (10s) | 逻辑超时 | ✅ | ✅ |
|
||||
| cleaner | 下一行按钮点击失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | 收起按钮点击失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | 保存按钮点击失败 | Playwright Error | ✅ | ✅ |
|
||||
| cleaner | 保存完成等待超时 (60s) | Playwright Timeout | ✅ | ✅ |
|
||||
| **重试阶段** |
|
||||
| cleaner | 重试查询无结果 | Error | ✅ | N/A |
|
||||
| cleaner | 重试打开详情页失败 | Playwright Error | ✅ | N/A |
|
||||
| cleaner | 重试处理异常 | Error | ✅ | N/A |
|
||||
| cleaner | 达到最大重试次数 | 逻辑错误 | ✅ | N/A |
|
||||
| **业务规则** |
|
||||
| cleaner | 物料不在删除清单 | 跳过原因 | ✅ | ❌ |
|
||||
| cleaner | 行号在保护范围 | 跳过原因 | ✅ | ❌ |
|
||||
| cleaner | 累计待发数量不为空 | 跳过原因 | ✅ | ❌ |
|
||||
| **收尾阶段** |
|
||||
| cleaner | 浏览器关闭失败 | 静默忽略 | ⚠️ | N/A |
|
||||
| cleaner | 数据库断开失败 | 静默忽略 | ⚠️ | N/A |
|
||||
| cleaner | 报告生成失败 | 静默记录 | ⚠️ | N/A |
|
||||
|
||||
**图例说明**:
|
||||
|
||||
- ✅ = 已收集到 errors 数组
|
||||
- ⚠️ = 仅记录日志,不加入错误列表
|
||||
- ❌ = 不收集(终止性错误或业务跳过)
|
||||
- N/A = 不适用
|
||||
|
||||
### 覆盖率分析
|
||||
|
||||
**总计错误点**: 52 个
|
||||
|
||||
**覆盖情况**:
|
||||
|
||||
- 完全收集 (✅): 43 个 (82.7%)
|
||||
- 静默处理 (⚠️): 3 个 (5.8%) - 资源清理类错误,不影响业务
|
||||
- 不收集 (❌): 9 个 (17.3%) - 终止性错误或业务规则跳过
|
||||
|
||||
**结论**: 错误收集覆盖全面,所有影响业务结果的错误均被正确收集。资源清理类错误采用静默处理是合理的设计决策,不影响用户对执行结果的认知。
|
||||
|
||||
## 十、总结
|
||||
|
||||
物料清理模块的错误收集机制具有以下特点:
|
||||
|
||||
1. **多层防护**: 从解析、执行到重试,每个阶段都有错误捕获
|
||||
2. **自动恢复**: 失败订单自动重试,成功后从错误列表移除
|
||||
3. **详细追踪**: 每个订单、每次重试都有详细记录
|
||||
4. **用户友好**: 前端清晰展示错误类型和统计信息
|
||||
5. **审计完整**: 所有操作记录到数据库和报告文件
|
||||
|
||||
错误处理流程遵循"收集 → 尝试恢复 → 记录 → 报告"的模式,确保用户能够清楚了解每个订单的处理状态和失败原因。
|
||||
|
||||
## 十一、相关源文件
|
||||
|
||||
| 文件路径 | 职责 | 错误收集点数 |
|
||||
| ------------------------------------------------------- | ------------------- | ------------ |
|
||||
| `src/renderer/src/pages/CleanerPage.tsx` | UI 界面 | - |
|
||||
| `src/renderer/src/hooks/useCleaner.ts` | 状态管理与 IPC 调用 | - |
|
||||
| `src/renderer/src/components/ExecutionReportDialog.tsx` | 错误报告展示 | - |
|
||||
| `src/main/ipc/cleaner-handler.ts` | IPC 处理器 | 6 |
|
||||
| `src/main/services/erp/cleaner.ts` | 核心清理服务 | 32 |
|
||||
| `src/main/services/erp/order-resolver.ts` | 订单号解析 | 4 |
|
||||
| `src/main/services/erp/erp-auth.ts` | ERP 认证 | 6 |
|
||||
| `src/main/services/report/cleaner-report-generator.ts` | 报告生成 | - |
|
||||
| `src/main/types/cleaner.types.ts` | 类型定义 | - |
|
||||
| `src/main/types/errors.ts` | 错误类型定义 | - |
|
||||
| `src/main/ipc/validation-handler.ts` | CleanerData 获取 | - |
|
||||
274
docs/portable-auto-update-architecture.md
Normal file
274
docs/portable-auto-update-architecture.md
Normal file
@@ -0,0 +1,274 @@
|
||||
# ERPAuto 便携版自动更新说明
|
||||
|
||||
## 概览
|
||||
|
||||
当前实现的是一套面向 Windows 便携版的自定义更新系统,核心特点如下:
|
||||
|
||||
- 基于 S3 兼容对象存储分发更新包
|
||||
- 按登录用户角色决定更新通道和行为
|
||||
- `User` 只跟随 `Stable`
|
||||
- `Admin` 同时可见 `Stable` 和 `Preview`
|
||||
- 更新包可后台下载,但安装必须由用户触发
|
||||
- 安装阶段使用独立的原生 `portable-updater.exe` 完成 exe 替换
|
||||
|
||||
## 核心组件
|
||||
|
||||
- 主进程更新服务
|
||||
路径:[`src/main/services/update/update-service.ts`](/d:/FileLib/Projects/CodeMigration/ERPAuto/src/main/services/update/update-service.ts)
|
||||
- 更新规则工具
|
||||
路径:[`src/main/services/update/update-utils.ts`](/d:/FileLib/Projects/CodeMigration/ERPAuto/src/main/services/update/update-utils.ts)
|
||||
- 更新 IPC
|
||||
路径:[`src/main/ipc/update-handler.ts`](/d:/FileLib/Projects/CodeMigration/ERPAuto/src/main/ipc/update-handler.ts)
|
||||
- 前端更新弹窗
|
||||
路径:[`src/renderer/src/components/UpdateDialog.tsx`](/d:/FileLib/Projects/CodeMigration/ERPAuto/src/renderer/src/components/UpdateDialog.tsx)
|
||||
- 前端更新入口
|
||||
路径:[`src/renderer/src/App.tsx`](/d:/FileLib/Projects/CodeMigration/ERPAuto/src/renderer/src/App.tsx)
|
||||
- 原生更新器
|
||||
路径:[`build/PortableUpdater.cs`](/d:/FileLib/Projects/CodeMigration/ERPAuto/build/PortableUpdater.cs)
|
||||
- 更新器编译脚本
|
||||
路径:[`scripts/compile-updater.js`](/d:/FileLib/Projects/CodeMigration/ERPAuto/scripts/compile-updater.js)
|
||||
- 发布准备脚本
|
||||
路径:[`scripts/prepare-release.js`](/d:/FileLib/Projects/CodeMigration/ERPAuto/scripts/prepare-release.js)
|
||||
- 发布上传脚本
|
||||
路径:[`scripts/upload-release.js`](/d:/FileLib/Projects/CodeMigration/ERPAuto/scripts/upload-release.js)
|
||||
|
||||
## 角色策略
|
||||
|
||||
### `User`
|
||||
|
||||
- 只读取 `stable/index.json`
|
||||
- 目标版本永远是最新 `Stable`
|
||||
- 如果当前客户端是 `Preview`,即使本地版本号更高,也会被视为“需要更新回稳定版”
|
||||
- 后台会自动下载推荐的 `Stable`
|
||||
- 用户点击后执行安装
|
||||
|
||||
### `Admin`
|
||||
|
||||
- 同时读取 `stable/index.json` 和 `preview/index.json`
|
||||
- 不自动下载
|
||||
- 只展示可选版本和更新说明
|
||||
- 由管理员手动选择版本并触发下载、安装
|
||||
|
||||
## 当前安装包身份
|
||||
|
||||
构建时会注入 `__APP_CHANNEL__`,用于标识当前客户端自身是 `stable` 还是 `preview`。
|
||||
|
||||
这个值的作用非常关键:
|
||||
|
||||
- 决定 `User` 是否需要从 `Preview` 洗回 `Stable`
|
||||
- 决定 `Admin` 当前处于哪条版本线
|
||||
- 决定更新弹窗中当前通道的展示
|
||||
|
||||
相关声明:
|
||||
|
||||
- [`src/shared/app-env.d.ts`](/d:/FileLib/Projects/CodeMigration/ERPAuto/src/shared/app-env.d.ts)
|
||||
- [`src/renderer/src/env.d.ts`](/d:/FileLib/Projects/CodeMigration/ERPAuto/src/renderer/src/env.d.ts)
|
||||
|
||||
## 远端目录结构
|
||||
|
||||
更新目录按通道分开:
|
||||
|
||||
```text
|
||||
updates/win-portable/stable/index.json
|
||||
updates/win-portable/stable/artifacts/erpauto-<version>-stable-portable.exe
|
||||
updates/win-portable/stable/changelogs/<version>.md
|
||||
|
||||
updates/win-portable/preview/index.json
|
||||
updates/win-portable/preview/artifacts/erpauto-<version>-preview-portable.exe
|
||||
updates/win-portable/preview/changelogs/<version>.md
|
||||
```
|
||||
|
||||
`index.json` 的每个条目至少包含:
|
||||
|
||||
- `version`
|
||||
- `channel`
|
||||
- `artifactKey`
|
||||
- `sha256`
|
||||
- `size`
|
||||
- `publishedAt`
|
||||
- `changelogKey`
|
||||
- `notesSummary`
|
||||
|
||||
## 总体架构图
|
||||
|
||||
```mermaid
|
||||
flowchart LR
|
||||
A[Electron Renderer] -->|IPC| B[Update Handler]
|
||||
B --> C[Update Service]
|
||||
C --> D[S3-Compatible Object Storage]
|
||||
C --> E[Local Cache<br/>pending-update]
|
||||
C --> F[portable-updater.exe]
|
||||
F --> G[Replace Old EXE]
|
||||
G --> H[Launch New EXE]
|
||||
```
|
||||
|
||||
## 登录后的更新时序
|
||||
|
||||
```mermaid
|
||||
sequenceDiagram
|
||||
participant U as User/Admin
|
||||
participant R as Renderer
|
||||
participant A as Auth Handler
|
||||
participant S as Update Service
|
||||
participant O as Object Storage
|
||||
|
||||
U->>R: 登录 / 无感登录
|
||||
R->>A: auth.login / auth.silentLogin
|
||||
A->>S: setUserContext(userType)
|
||||
S->>O: 读取 stable/index.json
|
||||
alt Admin
|
||||
S->>O: 读取 preview/index.json
|
||||
end
|
||||
S->>S: 计算推荐版本与状态
|
||||
alt User 且需要更新
|
||||
S->>O: 下载最新 Stable
|
||||
S->>S: 校验 sha256
|
||||
S-->>R: UPDATE_STATUS_CHANGED(downloaded)
|
||||
else Admin
|
||||
S-->>R: UPDATE_STATUS_CHANGED(available)
|
||||
end
|
||||
```
|
||||
|
||||
## `User` 更新决策图
|
||||
|
||||
```mermaid
|
||||
flowchart TD
|
||||
A[当前用户是 User] --> B[读取 stable 最新版本]
|
||||
B --> C{当前通道是 preview?}
|
||||
C -- 是 --> D[强制推荐回 Stable]
|
||||
C -- 否 --> E{当前版本 != 最新 Stable?}
|
||||
E -- 是 --> F[推荐最新 Stable]
|
||||
E -- 否 --> G[不提示更新]
|
||||
D --> H[后台自动下载]
|
||||
F --> H
|
||||
H --> I[校验 sha256]
|
||||
I --> J[导航栏显示 立即更新]
|
||||
```
|
||||
|
||||
## `Admin` 更新决策图
|
||||
|
||||
```mermaid
|
||||
flowchart TD
|
||||
A[当前用户是 Admin] --> B[读取 stable 目录]
|
||||
A --> C[读取 preview 目录]
|
||||
B --> D[合并目录]
|
||||
C --> D
|
||||
D --> E{是否存在更高版本?}
|
||||
E -- 是 --> F[推荐更高版本]
|
||||
E -- 否 --> G{是否存在跨通道可切换版本?}
|
||||
G -- 是 --> H[推荐跨通道版本]
|
||||
G -- 否 --> I[不展示更新]
|
||||
F --> J[打开弹窗后手动下载]
|
||||
H --> J
|
||||
```
|
||||
|
||||
## 安装阶段时序
|
||||
|
||||
```mermaid
|
||||
sequenceDiagram
|
||||
participant R as Renderer
|
||||
participant S as Update Service
|
||||
participant P as portable-updater.exe
|
||||
participant X as Current Portable EXE
|
||||
participant N as New Downloaded EXE
|
||||
|
||||
R->>S: installDownloaded()
|
||||
S->>P: 启动 portable-updater.exe
|
||||
S->>X: app.quit()
|
||||
P->>X: 等待旧进程退出
|
||||
P->>X: 等待文件解锁
|
||||
P->>X: 备份为 .bak
|
||||
P->>N: 移动到目标路径
|
||||
P->>X: 启动新版本
|
||||
P->>X: 删除 .bak
|
||||
```
|
||||
|
||||
## 本地目录与日志
|
||||
|
||||
### 下载缓存
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\pending-update\
|
||||
```
|
||||
|
||||
### 更新器运行文件与日志
|
||||
|
||||
```text
|
||||
%APPDATA%\erpauto\updates\
|
||||
portable-updater.exe
|
||||
portable-update.log
|
||||
portable-launch.log
|
||||
```
|
||||
|
||||
## 发布流程
|
||||
|
||||
### 1. 构建
|
||||
|
||||
```powershell
|
||||
$env:APP_CHANNEL="stable"
|
||||
npm run build:win
|
||||
```
|
||||
|
||||
### 2. 准备发布目录
|
||||
|
||||
```powershell
|
||||
node scripts/prepare-release.js --channel stable --changelog docs/releases/1.3.2-rebuild.md
|
||||
```
|
||||
|
||||
### 3. 上传到对象存储
|
||||
|
||||
```powershell
|
||||
npm run release:upload -- --channel stable --verify
|
||||
```
|
||||
|
||||
## 发布流程图
|
||||
|
||||
```mermaid
|
||||
flowchart TD
|
||||
A[build:win] --> B[生成 dist/erpauto-portable.exe]
|
||||
B --> C[prepare-release]
|
||||
C --> D[复制 artifact]
|
||||
C --> E[复制 changelog]
|
||||
C --> F[生成 index.json]
|
||||
F --> G[release-upload]
|
||||
G --> H[上传到对象存储]
|
||||
H --> I[verify 远端 index.json]
|
||||
```
|
||||
|
||||
## 版本排序规则
|
||||
|
||||
为了避免“后发布低版本覆盖高版本”的问题,当前排序规则是:
|
||||
|
||||
- 优先按版本号降序
|
||||
- 同版本再按 `publishedAt` 降序
|
||||
|
||||
这条规则同时存在于:
|
||||
|
||||
- [`src/main/services/update/update-utils.ts`](/d:/FileLib/Projects/CodeMigration/ERPAuto/src/main/services/update/update-utils.ts)
|
||||
- [`scripts/prepare-release.js`](/d:/FileLib/Projects/CodeMigration/ERPAuto/scripts/prepare-release.js)
|
||||
|
||||
## 失败保护
|
||||
|
||||
当前实现包含这些基本保护:
|
||||
|
||||
- 缺失 `preview/index.json` 时,按空列表处理,不中断整体更新检查
|
||||
- 更新包下载完成后必须校验 `sha256`
|
||||
- `portable-updater.exe` 会等待旧进程退出和目标文件解锁
|
||||
- 替换前先备份旧 exe 为 `.bak`
|
||||
- 替换失败时尝试回滚
|
||||
|
||||
## 当前已验证通过的能力
|
||||
|
||||
- `1.3.1 -> 1.3.2` 的 `Stable` 发布链路已打通
|
||||
- 新分支实现能够成功构建 Windows 便携版
|
||||
- 原生 `portable-updater.exe` 能成功编译并被打包带入资源目录
|
||||
- 本地发布目录生成正常
|
||||
- 上传脚本可将更新包和索引发布到对象存储
|
||||
- 客户端真实升级流程已验证通过
|
||||
|
||||
## 后续可继续优化的点
|
||||
|
||||
- 将 `UpdateService` 进一步拆分,降低文件复杂度
|
||||
- 将日志策略区分成“正式日志”和“诊断日志”
|
||||
- 增加更多针对下载与安装阶段的单测
|
||||
- 将完整构建发布链路整理为一键化脚本
|
||||
11
docs/releases/1.3.1-rebuild.md
Normal file
11
docs/releases/1.3.1-rebuild.md
Normal file
@@ -0,0 +1,11 @@
|
||||
# 1.3.1 Rebuild
|
||||
|
||||
## Highlights
|
||||
|
||||
- Rebuilt the portable auto-update flow on a clean branch.
|
||||
- Added role-aware update catalog handling for `Stable` and `Preview`.
|
||||
- Added native `portable-updater.exe` handoff for portable upgrades.
|
||||
|
||||
## Notes
|
||||
|
||||
- This release is intended for rebuild validation on the new implementation branch.
|
||||
11
docs/releases/1.3.2-rebuild.md
Normal file
11
docs/releases/1.3.2-rebuild.md
Normal file
@@ -0,0 +1,11 @@
|
||||
# 1.3.2 Rebuild
|
||||
|
||||
## Highlights
|
||||
|
||||
- Published the clean-branch portable auto-update implementation.
|
||||
- Added role-aware update checks, changelog loading, and update dialog UI.
|
||||
- Added native `portable-updater.exe` build and packaging flow.
|
||||
|
||||
## Notes
|
||||
|
||||
- This release is intended to validate `1.3.1 -> 1.3.2` upgrade flow on the rebuilt implementation.
|
||||
44
docs/releases/1.4.0.md
Normal file
44
docs/releases/1.4.0.md
Normal file
@@ -0,0 +1,44 @@
|
||||
# 1.4.0
|
||||
|
||||
## 亮点
|
||||
|
||||
- 新增 Windows 便携版自动更新能力,支持 `stable` / `preview` 双通道发布。
|
||||
- 更新策略与登录用户角色联动:
|
||||
- `User` 只接收稳定版更新
|
||||
- `Admin` 可查看并切换稳定版与预览版
|
||||
- 更新包下载完成后,可在应用内查看更新说明并执行自动替换升级。
|
||||
|
||||
## 自动更新
|
||||
|
||||
- 新增便携版更新服务,支持:
|
||||
- 登录后自动检查更新
|
||||
- 后台下载更新包
|
||||
- 展示更新状态与更新日志
|
||||
- 退出后自动替换旧版本并重启
|
||||
- 更新器采用原生 `portable-updater.exe`,不再依赖 PowerShell 脚本。
|
||||
- 支持预览版与稳定版分通道发布,并兼容普通用户从 `preview` 回退到 `stable` 的场景。
|
||||
|
||||
## 界面与交互
|
||||
|
||||
- 顶部导航新增更新入口。
|
||||
- 新增更新对话框,可展示 changelog 并执行安装。
|
||||
- 报告查看器增强了 Markdown 渲染体验,支持 GitHub 风格样式与代码高亮。
|
||||
|
||||
## 发布与维护
|
||||
|
||||
- 新增一键发布命令:
|
||||
|
||||
```bash
|
||||
npm run release:publish -- --channel stable
|
||||
npm run release:publish -- --channel preview
|
||||
```
|
||||
|
||||
- 发布脚本会自动串联构建、整理发布物料、上传和远端索引校验。
|
||||
- 上传逻辑已优化为默认增量上传,只上传当前版本的 artifact、changelog 和 `index.json`。
|
||||
- 补充了构建发布文档和自动更新架构文档,方便后续维护。
|
||||
|
||||
## 文档整理
|
||||
|
||||
- 浏览器部署文档已迁移并整理到 `docs/browser/`。
|
||||
- 新增构建与发布流程说明文档。
|
||||
- 精简了 `CLAUDE.md`,让 AI 代理指导文档更聚焦、更易维护。
|
||||
11
docs/releases/1.4.1.md
Normal file
11
docs/releases/1.4.1.md
Normal file
@@ -0,0 +1,11 @@
|
||||
# 1.4.1
|
||||
|
||||
## 改进
|
||||
|
||||
- 报告查看器的报告选择器升级为可搜索下拉框。
|
||||
- 报表较多时,可以通过输入关键字快速筛选目标报告,减少滚动查找成本。
|
||||
|
||||
## 体验优化
|
||||
|
||||
- 优化了报告选择交互,选择流程更适合长列表场景。
|
||||
- 同步合并 `dev` 分支中已完成的报告查看器可用性改进。
|
||||
@@ -2,6 +2,9 @@ appId: com.electron.app
|
||||
productName: erpauto
|
||||
directories:
|
||||
buildResources: build
|
||||
extraResources:
|
||||
- from: build/bin/portable-updater.exe
|
||||
to: portable-updater.exe
|
||||
files:
|
||||
- '!**/.vscode/*'
|
||||
- '!src/*'
|
||||
@@ -27,7 +30,7 @@ win:
|
||||
- nsis
|
||||
- portable
|
||||
portable:
|
||||
artifactName: ${name}-${version}-portable.${ext}
|
||||
artifactName: ${name}-portable.${ext}
|
||||
# Portable app uses user data directory (AppData), not exe directory
|
||||
# This ensures config persists across app updates
|
||||
nsis:
|
||||
|
||||
@@ -2,16 +2,58 @@ import { resolve } from 'path'
|
||||
import { defineConfig } from 'electron-vite'
|
||||
import react from '@vitejs/plugin-react'
|
||||
import tailwindcss from '@tailwindcss/vite'
|
||||
import { execSync } from 'child_process'
|
||||
import { createRequire } from 'module'
|
||||
|
||||
// Get git hash (first 7 characters)
|
||||
const getGitHash = (): string => {
|
||||
try {
|
||||
return execSync('git rev-parse --short=7 HEAD', { encoding: 'utf-8' }).trim()
|
||||
} catch {
|
||||
return 'unknown'
|
||||
}
|
||||
}
|
||||
|
||||
// Get version from package.json
|
||||
const require = createRequire(import.meta.url)
|
||||
const version = require('./package.json').version
|
||||
const gitHash = getGitHash()
|
||||
const appChannel = process.env.APP_CHANNEL === 'preview' ? 'preview' : 'stable'
|
||||
|
||||
export default defineConfig({
|
||||
main: {},
|
||||
preload: {},
|
||||
main: {
|
||||
define: {
|
||||
__APP_CHANNEL__: JSON.stringify(appChannel)
|
||||
}
|
||||
},
|
||||
preload: {
|
||||
define: {
|
||||
__APP_CHANNEL__: JSON.stringify(appChannel)
|
||||
}
|
||||
},
|
||||
renderer: {
|
||||
define: {
|
||||
__APP_VERSION__: JSON.stringify(version),
|
||||
__GIT_HASH__: JSON.stringify(gitHash),
|
||||
__APP_CHANNEL__: JSON.stringify(appChannel)
|
||||
},
|
||||
resolve: {
|
||||
alias: {
|
||||
'@renderer': resolve('src/renderer/src')
|
||||
}
|
||||
},
|
||||
plugins: [react(), tailwindcss()]
|
||||
plugins: [
|
||||
react(),
|
||||
tailwindcss(),
|
||||
{
|
||||
name: 'update-title',
|
||||
transformIndexHtml(html) {
|
||||
return html.replace(
|
||||
'<title>ERP Auto Tool</title>',
|
||||
`<title>ERPAuto - v${version}(${gitHash})</title>`
|
||||
)
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
})
|
||||
|
||||
3518
package-lock.json
generated
3518
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
26
package.json
26
package.json
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "erpauto",
|
||||
"version": "1.0.0",
|
||||
"version": "1.4.1",
|
||||
"description": "An Electron application with React and TypeScript",
|
||||
"main": "./out/main/index.js",
|
||||
"author": "example.com",
|
||||
@@ -15,10 +15,15 @@
|
||||
"dev": "chcp 65001 && electron-vite dev",
|
||||
"build": "chcp 65001 && npm run typecheck && electron-vite build",
|
||||
"postinstall": "electron-builder install-app-deps",
|
||||
"build:unpack": "chcp 65001 && set PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 && npm run build && electron-builder --dir",
|
||||
"build:win": "chcp 65001 && set PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 && npm run build && electron-builder --win",
|
||||
"build:mac": "chcp 65001 && electron-vite build && electron-builder --mac",
|
||||
"build:linux": "chcp 65001 && electron-vite build && electron-builder --linux",
|
||||
"build:updater": "node scripts/compile-updater.js",
|
||||
"build:unpack": "chcp 65001 && set PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 && npm run build:updater && npm run build && electron-builder --dir",
|
||||
"build:win": "chcp 65001 && set PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1 && npm run prebuild && npm run build && npm run build:updater && electron-builder --win",
|
||||
"build:mac": "chcp 65001 && npm run prebuild && electron-vite build && electron-builder --mac",
|
||||
"build:linux": "chcp 65001 && npm run prebuild && electron-vite build && electron-builder --linux",
|
||||
"release:prepare": "node scripts/prepare-release.js",
|
||||
"release:publish": "node scripts/publish-release.js",
|
||||
"release:upload": "node scripts/upload-release.js",
|
||||
"prebuild": "node -e \"const fs=require('fs');['dist','out'].forEach(d=>{try{fs.rmSync(d,{recursive:true})}catch(e){}})\"",
|
||||
"test": "vitest",
|
||||
"test:run": "vitest run",
|
||||
"test:coverage": "vitest run --coverage",
|
||||
@@ -26,16 +31,20 @@
|
||||
"test:e2e:ui": "playwright test --ui",
|
||||
"test:e2e:report": "playwright show-report",
|
||||
"debug:erp-login": "tsx src/main/tools/erp-login-debug.ts",
|
||||
"debug:config-path": "tsx src/main/tools/config-path-debug.ts"
|
||||
"debug:config-path": "tsx src/main/tools/config-path-debug.ts",
|
||||
"test:rustfs": "tsx src/main/tools/rustfs-test.ts"
|
||||
},
|
||||
"dependencies": {
|
||||
"@aws-sdk/client-s3": "^3.929.0",
|
||||
"@electron-toolkit/preload": "^3.0.2",
|
||||
"@electron-toolkit/utils": "^4.0.0",
|
||||
"@headlessui/react": "^2.2.9",
|
||||
"@tailwindcss/vite": "^4.2.1",
|
||||
"@types/js-yaml": "^4.0.9",
|
||||
"chromium-bidi": "^15.0.0",
|
||||
"date-fns": "^4.1.0",
|
||||
"exceljs": "^4.4.0",
|
||||
"github-markdown-css": "^5.9.0",
|
||||
"js-yaml": "^4.1.1",
|
||||
"lucide-react": "^0.575.0",
|
||||
"mssql": "^12.2.0",
|
||||
@@ -43,7 +52,12 @@
|
||||
"playwright": "^1.58.2",
|
||||
"playwright-core": "^1.58.2",
|
||||
"react-focus-lock": "^2.13.7",
|
||||
"react-markdown": "^10.1.0",
|
||||
"reflect-metadata": "^0.2.2",
|
||||
"rehype-autolink-headings": "^7.1.0",
|
||||
"rehype-highlight": "^7.0.2",
|
||||
"rehype-slug": "^6.0.0",
|
||||
"remark-gfm": "^4.0.1",
|
||||
"typeorm": "^0.3.28",
|
||||
"uuid": "^13.0.0",
|
||||
"winston": "^3.19.0",
|
||||
|
||||
57
scripts/compile-updater.js
Normal file
57
scripts/compile-updater.js
Normal file
@@ -0,0 +1,57 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const { spawnSync } = require('child_process')
|
||||
|
||||
const rootDir = process.cwd()
|
||||
const sourcePath = path.join(rootDir, 'build', 'PortableUpdater.cs')
|
||||
const outputDir = path.join(rootDir, 'build', 'bin')
|
||||
const outputPath = path.join(outputDir, 'portable-updater.exe')
|
||||
|
||||
function findCompiler() {
|
||||
const candidates = [
|
||||
'C:\\Windows\\Microsoft.NET\\Framework64\\v4.0.30319\\csc.exe',
|
||||
'C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\csc.exe'
|
||||
]
|
||||
|
||||
return candidates.find((candidate) => fs.existsSync(candidate)) || null
|
||||
}
|
||||
|
||||
function main() {
|
||||
if (process.platform !== 'win32') {
|
||||
console.log('Skipping updater compilation on non-Windows platform.')
|
||||
return
|
||||
}
|
||||
|
||||
if (!fs.existsSync(sourcePath)) {
|
||||
throw new Error(`Updater source not found: ${sourcePath}`)
|
||||
}
|
||||
|
||||
const compiler = findCompiler()
|
||||
if (!compiler) {
|
||||
throw new Error('Unable to find csc.exe for compiling portable-updater.exe')
|
||||
}
|
||||
|
||||
fs.mkdirSync(outputDir, { recursive: true })
|
||||
|
||||
const compileArgs = ['/nologo', '/target:exe', '/optimize+', `/out:${outputPath}`, sourcePath]
|
||||
|
||||
const result = spawnSync(compiler, compileArgs, {
|
||||
cwd: rootDir,
|
||||
stdio: 'inherit'
|
||||
})
|
||||
|
||||
if (result.status !== 0) {
|
||||
throw new Error(`csc.exe failed with exit code ${result.status}`)
|
||||
}
|
||||
|
||||
console.log(`Portable updater compiled successfully: ${outputPath}`)
|
||||
}
|
||||
|
||||
try {
|
||||
main()
|
||||
} catch (error) {
|
||||
console.error(`compile-updater failed: ${error.message}`)
|
||||
process.exit(1)
|
||||
}
|
||||
193
scripts/prepare-release.js
Normal file
193
scripts/prepare-release.js
Normal file
@@ -0,0 +1,193 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const crypto = require('crypto')
|
||||
|
||||
function printUsage() {
|
||||
console.log(`
|
||||
Usage:
|
||||
node scripts/prepare-release.js --channel <stable|preview> --changelog <file> [options]
|
||||
|
||||
Options:
|
||||
--channel <stable|preview> Release channel. Required.
|
||||
--changelog <file> Markdown changelog file. Required.
|
||||
--artifact <file> Portable exe path. Default: dist/erpauto-portable.exe
|
||||
--version <x.y.z> Release version. Default: package.json version
|
||||
--summary <text> Optional short summary for notesSummary
|
||||
--published-at <ISO date> Optional publish time. Default: current time
|
||||
--base-prefix <prefix> Default: updates/win-portable
|
||||
--output <dir> Default: release-output
|
||||
--existing-index <file> Existing index.json to merge with
|
||||
`)
|
||||
}
|
||||
|
||||
function parseArgs(argv) {
|
||||
const args = {}
|
||||
for (let i = 0; i < argv.length; i += 1) {
|
||||
const token = argv[i]
|
||||
if (!token.startsWith('--')) continue
|
||||
const key = token.slice(2)
|
||||
const value = argv[i + 1]
|
||||
if (!value || value.startsWith('--')) {
|
||||
args[key] = true
|
||||
continue
|
||||
}
|
||||
args[key] = value
|
||||
i += 1
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
function assert(condition, message) {
|
||||
if (!condition) {
|
||||
throw new Error(message)
|
||||
}
|
||||
}
|
||||
|
||||
function readJson(filePath) {
|
||||
return JSON.parse(fs.readFileSync(filePath, 'utf-8'))
|
||||
}
|
||||
|
||||
function ensureDir(dirPath) {
|
||||
fs.mkdirSync(dirPath, { recursive: true })
|
||||
}
|
||||
|
||||
function sha256File(filePath) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const hash = crypto.createHash('sha256')
|
||||
const stream = fs.createReadStream(filePath)
|
||||
stream.on('data', (chunk) => hash.update(chunk))
|
||||
stream.on('error', reject)
|
||||
stream.on('end', () => resolve(hash.digest('hex')))
|
||||
})
|
||||
}
|
||||
|
||||
function loadExistingIndex(existingIndexPath, outputIndexPath) {
|
||||
const candidate = existingIndexPath || (fs.existsSync(outputIndexPath) ? outputIndexPath : null)
|
||||
if (!candidate) {
|
||||
return { releases: [] }
|
||||
}
|
||||
|
||||
const parsed = readJson(candidate)
|
||||
if (!parsed || !Array.isArray(parsed.releases)) {
|
||||
throw new Error(`Invalid index file: ${candidate}`)
|
||||
}
|
||||
|
||||
return parsed
|
||||
}
|
||||
|
||||
function sortReleases(releases) {
|
||||
return [...releases].sort((left, right) => {
|
||||
const leftParts = String(left.version)
|
||||
.split('.')
|
||||
.map((part) => Number.parseInt(part, 10) || 0)
|
||||
const rightParts = String(right.version)
|
||||
.split('.')
|
||||
.map((part) => Number.parseInt(part, 10) || 0)
|
||||
|
||||
const length = Math.max(leftParts.length, rightParts.length)
|
||||
for (let i = 0; i < length; i += 1) {
|
||||
const l = leftParts[i] || 0
|
||||
const r = rightParts[i] || 0
|
||||
if (r !== l) {
|
||||
return r - l
|
||||
}
|
||||
}
|
||||
|
||||
const leftTime = new Date(left.publishedAt).getTime()
|
||||
const rightTime = new Date(right.publishedAt).getTime()
|
||||
if (rightTime !== leftTime) {
|
||||
return rightTime - leftTime
|
||||
}
|
||||
|
||||
return 0
|
||||
})
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const args = parseArgs(process.argv.slice(2))
|
||||
|
||||
if (args.help || args.h) {
|
||||
printUsage()
|
||||
process.exit(0)
|
||||
}
|
||||
|
||||
const packageJson = readJson(path.resolve(process.cwd(), 'package.json'))
|
||||
const version = args.version || packageJson.version
|
||||
const channel = args.channel
|
||||
const changelogPath = args.changelog
|
||||
const artifactPath = path.resolve(process.cwd(), args.artifact || 'dist/erpauto-portable.exe')
|
||||
const basePrefix = args['base-prefix'] || 'updates/win-portable'
|
||||
const outputRoot = path.resolve(process.cwd(), args.output || 'release-output')
|
||||
const publishedAt = args['published-at'] || new Date().toISOString()
|
||||
const summary = args.summary
|
||||
|
||||
assert(channel === 'stable' || channel === 'preview', 'Missing or invalid --channel')
|
||||
assert(changelogPath, 'Missing --changelog')
|
||||
assert(fs.existsSync(artifactPath), `Artifact not found: ${artifactPath}`)
|
||||
|
||||
const resolvedChangelogPath = path.resolve(process.cwd(), changelogPath)
|
||||
assert(fs.existsSync(resolvedChangelogPath), `Changelog not found: ${resolvedChangelogPath}`)
|
||||
|
||||
const artifactStat = fs.statSync(artifactPath)
|
||||
const sha256 = await sha256File(artifactPath)
|
||||
const fileName = `erpauto-${version}-${channel}-portable.exe`
|
||||
const changelogFileName = `${version}.md`
|
||||
|
||||
const channelDir = path.join(outputRoot, basePrefix, channel)
|
||||
const artifactsDir = path.join(channelDir, 'artifacts')
|
||||
const changelogDir = path.join(channelDir, 'changelogs')
|
||||
const outputIndexPath = path.join(channelDir, 'index.json')
|
||||
|
||||
ensureDir(artifactsDir)
|
||||
ensureDir(changelogDir)
|
||||
|
||||
const targetArtifactPath = path.join(artifactsDir, fileName)
|
||||
const targetChangelogPath = path.join(changelogDir, changelogFileName)
|
||||
|
||||
fs.copyFileSync(artifactPath, targetArtifactPath)
|
||||
fs.copyFileSync(resolvedChangelogPath, targetChangelogPath)
|
||||
|
||||
const releaseEntry = {
|
||||
version,
|
||||
channel,
|
||||
artifactKey: `${basePrefix}/${channel}/artifacts/${fileName}`,
|
||||
sha256,
|
||||
size: artifactStat.size,
|
||||
publishedAt,
|
||||
changelogKey: `${basePrefix}/${channel}/changelogs/${changelogFileName}`,
|
||||
...(summary ? { notesSummary: summary } : {})
|
||||
}
|
||||
|
||||
const existingIndex = loadExistingIndex(
|
||||
args['existing-index'] ? path.resolve(process.cwd(), args['existing-index']) : null,
|
||||
outputIndexPath
|
||||
)
|
||||
|
||||
const mergedReleases = sortReleases([
|
||||
releaseEntry,
|
||||
...existingIndex.releases.filter(
|
||||
(item) => !(item.version === version && item.channel === channel)
|
||||
)
|
||||
])
|
||||
|
||||
fs.writeFileSync(
|
||||
outputIndexPath,
|
||||
`${JSON.stringify({ releases: mergedReleases }, null, 2)}\n`,
|
||||
'utf-8'
|
||||
)
|
||||
|
||||
console.log('Release package prepared successfully.')
|
||||
console.log(`Channel: ${channel}`)
|
||||
console.log(`Version: ${version}`)
|
||||
console.log(`Artifact: ${targetArtifactPath}`)
|
||||
console.log(`Changelog: ${targetChangelogPath}`)
|
||||
console.log(`Index: ${outputIndexPath}`)
|
||||
console.log(`SHA256: ${sha256}`)
|
||||
}
|
||||
|
||||
main().catch((error) => {
|
||||
console.error(`prepare-release failed: ${error.message}`)
|
||||
process.exit(1)
|
||||
})
|
||||
229
scripts/publish-release.js
Normal file
229
scripts/publish-release.js
Normal file
@@ -0,0 +1,229 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const yaml = require('js-yaml')
|
||||
const { spawnSync } = require('child_process')
|
||||
|
||||
function usage() {
|
||||
console.log(`
|
||||
Usage:
|
||||
node scripts/publish-release.js --channel <stable|preview> [options]
|
||||
|
||||
Options:
|
||||
--channel <stable|preview> Release channel. Required.
|
||||
--changelog <file> Optional changelog file. Default: auto-resolve from version
|
||||
--config <file> Config file path. Default: config.yaml
|
||||
--help Show this help message
|
||||
`)
|
||||
}
|
||||
|
||||
function parseArgs(argv) {
|
||||
const args = {}
|
||||
for (let i = 0; i < argv.length; i += 1) {
|
||||
const token = argv[i]
|
||||
if (!token.startsWith('--')) continue
|
||||
const key = token.slice(2)
|
||||
const value = argv[i + 1]
|
||||
if (!value || value.startsWith('--')) {
|
||||
args[key] = true
|
||||
continue
|
||||
}
|
||||
args[key] = value
|
||||
i += 1
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
function assert(condition, message) {
|
||||
if (!condition) {
|
||||
throw new Error(message)
|
||||
}
|
||||
}
|
||||
|
||||
function readJson(filePath) {
|
||||
return JSON.parse(fs.readFileSync(filePath, 'utf-8'))
|
||||
}
|
||||
|
||||
function readYaml(filePath) {
|
||||
return yaml.load(fs.readFileSync(filePath, 'utf-8'))
|
||||
}
|
||||
|
||||
function resolveChangelogPath(version, explicitPath) {
|
||||
if (explicitPath) {
|
||||
return path.resolve(process.cwd(), explicitPath)
|
||||
}
|
||||
|
||||
const rebuildPath = path.resolve(process.cwd(), 'docs', 'releases', `${version}-rebuild.md`)
|
||||
if (fs.existsSync(rebuildPath)) {
|
||||
return rebuildPath
|
||||
}
|
||||
|
||||
return path.resolve(process.cwd(), 'docs', 'releases', `${version}.md`)
|
||||
}
|
||||
|
||||
function validateUpdateConfig(configPath) {
|
||||
assert(fs.existsSync(configPath), `Config file not found: ${configPath}`)
|
||||
|
||||
const parsed = readYaml(configPath)
|
||||
const update = parsed && parsed.update
|
||||
|
||||
assert(update, 'Missing update config in config file')
|
||||
assert(update.enabled, 'update.enabled is false')
|
||||
assert(update.endpoint, 'update.endpoint is required')
|
||||
assert(update.accessKey, 'update.accessKey is required')
|
||||
assert(update.secretKey, 'update.secretKey is required')
|
||||
assert(update.bucket, 'update.bucket is required')
|
||||
assert(update.basePrefix, 'update.basePrefix is required')
|
||||
|
||||
return update
|
||||
}
|
||||
|
||||
function hasConflictMarker(filePath) {
|
||||
const content = fs.readFileSync(filePath, 'utf-8')
|
||||
return (
|
||||
content.includes('<<<<<<<') || content.includes('=======') || content.includes('>>>>>>>')
|
||||
)
|
||||
}
|
||||
|
||||
function validateVersionFiles(version) {
|
||||
const packageJsonPath = path.resolve(process.cwd(), 'package.json')
|
||||
const packageLockPath = path.resolve(process.cwd(), 'package-lock.json')
|
||||
|
||||
assert(fs.existsSync(packageLockPath), `package-lock.json not found: ${packageLockPath}`)
|
||||
assert(!hasConflictMarker(packageJsonPath), 'package.json contains merge conflict markers')
|
||||
assert(!hasConflictMarker(packageLockPath), 'package-lock.json contains merge conflict markers')
|
||||
|
||||
const packageLock = readJson(packageLockPath)
|
||||
assert(packageLock.version === version, 'package-lock.json version does not match package.json')
|
||||
|
||||
const rootPackage = packageLock.packages && packageLock.packages['']
|
||||
if (rootPackage && rootPackage.version) {
|
||||
assert(rootPackage.version === version, 'package-lock root package version does not match package.json')
|
||||
}
|
||||
}
|
||||
|
||||
function runStep(name, command, args, envOverrides = {}) {
|
||||
console.log('')
|
||||
console.log(`==> ${name}`)
|
||||
console.log(`$ ${command} ${args.join(' ')}`)
|
||||
|
||||
let result
|
||||
if (process.platform === 'win32') {
|
||||
const shellCommand = [command, ...args]
|
||||
.map((arg) => (/\s|"/.test(arg) ? `"${String(arg).replace(/"/g, '\\"')}"` : arg))
|
||||
.join(' ')
|
||||
|
||||
result = spawnSync(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', shellCommand], {
|
||||
cwd: process.cwd(),
|
||||
env: { ...process.env, ...envOverrides },
|
||||
stdio: 'inherit'
|
||||
})
|
||||
} else {
|
||||
result = spawnSync(command, args, {
|
||||
cwd: process.cwd(),
|
||||
env: { ...process.env, ...envOverrides },
|
||||
stdio: 'inherit'
|
||||
})
|
||||
}
|
||||
|
||||
if (result.error) {
|
||||
throw result.error
|
||||
}
|
||||
|
||||
if (result.status !== 0) {
|
||||
throw new Error(`${name} failed with exit code ${result.status}`)
|
||||
}
|
||||
}
|
||||
|
||||
function readPreparedIndex(channel, basePrefix) {
|
||||
const indexPath = path.resolve(
|
||||
process.cwd(),
|
||||
'release-output',
|
||||
...basePrefix.split('/'),
|
||||
channel,
|
||||
'index.json'
|
||||
)
|
||||
|
||||
assert(fs.existsSync(indexPath), `Prepared index not found: ${indexPath}`)
|
||||
const parsed = readJson(indexPath)
|
||||
assert(parsed && Array.isArray(parsed.releases), `Invalid prepared index: ${indexPath}`)
|
||||
return { indexPath, parsed }
|
||||
}
|
||||
|
||||
function summarizeRelease(version, channel, releaseEntry, indexPath) {
|
||||
console.log('')
|
||||
console.log('Release published successfully.')
|
||||
console.log(`Version: ${version}`)
|
||||
console.log(`Channel: ${channel}`)
|
||||
console.log(`Artifact: ${releaseEntry.artifactKey}`)
|
||||
console.log(`SHA256: ${releaseEntry.sha256}`)
|
||||
console.log(`Changelog: ${releaseEntry.changelogKey}`)
|
||||
console.log(`Prepared Index: ${indexPath}`)
|
||||
console.log(`Published At: ${releaseEntry.publishedAt}`)
|
||||
}
|
||||
|
||||
function main() {
|
||||
const args = parseArgs(process.argv.slice(2))
|
||||
|
||||
if (args.help || args.h) {
|
||||
usage()
|
||||
process.exit(0)
|
||||
}
|
||||
|
||||
const channel = args.channel
|
||||
assert(channel === 'stable' || channel === 'preview', 'Missing or invalid --channel')
|
||||
|
||||
const packageJsonPath = path.resolve(process.cwd(), 'package.json')
|
||||
assert(fs.existsSync(packageJsonPath), `package.json not found: ${packageJsonPath}`)
|
||||
const packageJson = readJson(packageJsonPath)
|
||||
const version = packageJson.version
|
||||
assert(version, 'package.json version is required')
|
||||
|
||||
const configPath = path.resolve(process.cwd(), args.config || 'config.yaml')
|
||||
const updateConfig = validateUpdateConfig(configPath)
|
||||
validateVersionFiles(version)
|
||||
|
||||
const changelogPath = resolveChangelogPath(version, args.changelog)
|
||||
assert(fs.existsSync(changelogPath), `Changelog not found: ${changelogPath}`)
|
||||
|
||||
runStep('Build Windows package', 'npm', ['run', 'build:win'], {
|
||||
APP_CHANNEL: channel
|
||||
})
|
||||
|
||||
runStep('Prepare release package', 'npm', [
|
||||
'run',
|
||||
'release:prepare',
|
||||
'--',
|
||||
'--channel',
|
||||
channel,
|
||||
'--changelog',
|
||||
changelogPath
|
||||
])
|
||||
|
||||
const { indexPath, parsed } = readPreparedIndex(channel, updateConfig.basePrefix)
|
||||
const latestRelease = parsed.releases[0]
|
||||
assert(latestRelease, 'Prepared index does not contain any release entry')
|
||||
assert(
|
||||
latestRelease.version === version && latestRelease.channel === channel,
|
||||
`Prepared index latest entry mismatch: expected ${version}/${channel}, got ${latestRelease.version}/${latestRelease.channel}`
|
||||
)
|
||||
|
||||
runStep('Upload release package', 'npm', [
|
||||
'run',
|
||||
'release:upload',
|
||||
'--',
|
||||
'--channel',
|
||||
channel,
|
||||
'--verify'
|
||||
])
|
||||
|
||||
summarizeRelease(version, channel, latestRelease, indexPath)
|
||||
}
|
||||
|
||||
try {
|
||||
main()
|
||||
} catch (error) {
|
||||
console.error(`publish-release failed: ${error.message}`)
|
||||
process.exit(1)
|
||||
}
|
||||
217
scripts/upload-release.js
Normal file
217
scripts/upload-release.js
Normal file
@@ -0,0 +1,217 @@
|
||||
#!/usr/bin/env node
|
||||
|
||||
const fs = require('fs')
|
||||
const path = require('path')
|
||||
const yaml = require('js-yaml')
|
||||
const { GetObjectCommand, PutObjectCommand, S3Client } = require('@aws-sdk/client-s3')
|
||||
|
||||
function usage() {
|
||||
console.log(`
|
||||
Usage:
|
||||
node scripts/upload-release.js --channel <stable|preview> [options]
|
||||
|
||||
Options:
|
||||
--channel <stable|preview> Release channel. Required.
|
||||
--source <dir> Local release root. Default: release-output
|
||||
--config <file> Config file path. Default: config.yaml
|
||||
--version <x.y.z> Release version. Default: package.json version
|
||||
--full-sync Upload the whole channel directory instead of current release only
|
||||
--verify Read back remote index.json after upload
|
||||
`)
|
||||
}
|
||||
|
||||
function parseArgs(argv) {
|
||||
const args = {}
|
||||
for (let i = 0; i < argv.length; i += 1) {
|
||||
const token = argv[i]
|
||||
if (!token.startsWith('--')) continue
|
||||
const key = token.slice(2)
|
||||
const value = argv[i + 1]
|
||||
if (!value || value.startsWith('--')) {
|
||||
args[key] = true
|
||||
continue
|
||||
}
|
||||
args[key] = value
|
||||
i += 1
|
||||
}
|
||||
return args
|
||||
}
|
||||
|
||||
function assert(condition, message) {
|
||||
if (!condition) {
|
||||
throw new Error(message)
|
||||
}
|
||||
}
|
||||
|
||||
function readJson(filePath) {
|
||||
return JSON.parse(fs.readFileSync(filePath, 'utf-8'))
|
||||
}
|
||||
|
||||
function loadConfig(configPath) {
|
||||
const raw = fs.readFileSync(configPath, 'utf-8')
|
||||
const parsed = yaml.load(raw)
|
||||
const update = parsed && parsed.update
|
||||
|
||||
assert(update, 'Missing update config in config.yaml')
|
||||
assert(update.enabled, 'update.enabled is false')
|
||||
assert(update.endpoint, 'update.endpoint is required')
|
||||
assert(update.accessKey, 'update.accessKey is required')
|
||||
assert(update.secretKey, 'update.secretKey is required')
|
||||
assert(update.bucket, 'update.bucket is required')
|
||||
|
||||
return update
|
||||
}
|
||||
|
||||
function getContentType(filePath) {
|
||||
const ext = path.extname(filePath).toLowerCase()
|
||||
if (ext === '.json') return 'application/json; charset=utf-8'
|
||||
if (ext === '.md') return 'text/markdown; charset=utf-8'
|
||||
if (ext === '.exe') return 'application/vnd.microsoft.portable-executable'
|
||||
return 'application/octet-stream'
|
||||
}
|
||||
|
||||
async function readRemoteText(client, bucket, key) {
|
||||
const response = await client.send(
|
||||
new GetObjectCommand({
|
||||
Bucket: bucket,
|
||||
Key: key
|
||||
})
|
||||
)
|
||||
|
||||
const chunks = []
|
||||
for await (const chunk of response.Body) {
|
||||
chunks.push(Buffer.from(chunk))
|
||||
}
|
||||
return Buffer.concat(chunks).toString('utf-8')
|
||||
}
|
||||
|
||||
function buildFileDescriptor(sourceRoot, absolutePath) {
|
||||
return {
|
||||
absolutePath,
|
||||
relativeKey: path.relative(sourceRoot, absolutePath).replace(/\\/g, '/')
|
||||
}
|
||||
}
|
||||
|
||||
function collectUploadFiles(sourceRoot, channelRoot, channel, version, fullSync, basePrefix) {
|
||||
const indexPath = path.join(channelRoot, 'index.json')
|
||||
assert(fs.existsSync(indexPath), `Index not found: ${indexPath}`)
|
||||
|
||||
if (fullSync) {
|
||||
const results = []
|
||||
const entries = fs.readdirSync(channelRoot, { withFileTypes: true })
|
||||
|
||||
function walk(dirPath) {
|
||||
const dirEntries = fs.readdirSync(dirPath, { withFileTypes: true })
|
||||
for (const entry of dirEntries) {
|
||||
const fullPath = path.join(dirPath, entry.name)
|
||||
if (entry.isDirectory()) {
|
||||
walk(fullPath)
|
||||
} else {
|
||||
results.push(buildFileDescriptor(sourceRoot, fullPath))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (const entry of entries) {
|
||||
const fullPath = path.join(channelRoot, entry.name)
|
||||
if (entry.isDirectory()) {
|
||||
walk(fullPath)
|
||||
} else {
|
||||
results.push(buildFileDescriptor(sourceRoot, fullPath))
|
||||
}
|
||||
}
|
||||
|
||||
return { files: results, indexKey: `${basePrefix}/${channel}/index.json` }
|
||||
}
|
||||
|
||||
const parsedIndex = readJson(indexPath)
|
||||
assert(parsedIndex && Array.isArray(parsedIndex.releases), `Invalid index file: ${indexPath}`)
|
||||
|
||||
const releaseEntry = parsedIndex.releases.find(
|
||||
(release) => release.version === version && release.channel === channel
|
||||
)
|
||||
assert(releaseEntry, `Release entry not found in index for ${channel}/${version}`)
|
||||
|
||||
const artifactPath = path.resolve(sourceRoot, releaseEntry.artifactKey)
|
||||
const changelogPath = path.resolve(sourceRoot, releaseEntry.changelogKey)
|
||||
|
||||
assert(fs.existsSync(artifactPath), `Artifact not found: ${artifactPath}`)
|
||||
assert(fs.existsSync(changelogPath), `Changelog not found: ${changelogPath}`)
|
||||
|
||||
return {
|
||||
files: [
|
||||
buildFileDescriptor(sourceRoot, artifactPath),
|
||||
buildFileDescriptor(sourceRoot, changelogPath),
|
||||
buildFileDescriptor(sourceRoot, indexPath)
|
||||
],
|
||||
indexKey: `${basePrefix}/${channel}/index.json`
|
||||
}
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const args = parseArgs(process.argv.slice(2))
|
||||
if (args.help || args.h) {
|
||||
usage()
|
||||
process.exit(0)
|
||||
}
|
||||
|
||||
const channel = args.channel
|
||||
assert(channel === 'stable' || channel === 'preview', 'Missing or invalid --channel')
|
||||
|
||||
const sourceRoot = path.resolve(process.cwd(), args.source || 'release-output')
|
||||
const configPath = path.resolve(process.cwd(), args.config || 'config.yaml')
|
||||
const updateConfig = loadConfig(configPath)
|
||||
const packageJson = readJson(path.resolve(process.cwd(), 'package.json'))
|
||||
const version = args.version || packageJson.version
|
||||
assert(version, 'Missing release version')
|
||||
|
||||
const channelRoot = path.join(sourceRoot, updateConfig.basePrefix, channel)
|
||||
assert(fs.existsSync(channelRoot), `Upload root not found: ${channelRoot}`)
|
||||
|
||||
const client = new S3Client({
|
||||
region: updateConfig.region || 'us-east-1',
|
||||
endpoint: updateConfig.endpoint,
|
||||
credentials: {
|
||||
accessKeyId: updateConfig.accessKey,
|
||||
secretAccessKey: updateConfig.secretKey
|
||||
},
|
||||
forcePathStyle: true
|
||||
})
|
||||
|
||||
const { files, indexKey } = collectUploadFiles(
|
||||
sourceRoot,
|
||||
channelRoot,
|
||||
channel,
|
||||
version,
|
||||
Boolean(args['full-sync']),
|
||||
updateConfig.basePrefix
|
||||
)
|
||||
assert(files.length > 0, `No files found under ${channelRoot}`)
|
||||
|
||||
for (const file of files) {
|
||||
const body = fs.readFileSync(file.absolutePath)
|
||||
|
||||
await client.send(
|
||||
new PutObjectCommand({
|
||||
Bucket: updateConfig.bucket,
|
||||
Key: file.relativeKey,
|
||||
Body: body,
|
||||
ContentType: getContentType(file.absolutePath)
|
||||
})
|
||||
)
|
||||
|
||||
console.log(`Uploaded: ${file.relativeKey}`)
|
||||
}
|
||||
|
||||
if (args.verify) {
|
||||
const remoteIndex = await readRemoteText(client, updateConfig.bucket, indexKey)
|
||||
console.log('')
|
||||
console.log(`Verified remote index: ${indexKey}`)
|
||||
console.log(remoteIndex)
|
||||
}
|
||||
}
|
||||
|
||||
main().catch((error) => {
|
||||
console.error(`upload-release failed: ${error.message}`)
|
||||
process.exit(1)
|
||||
})
|
||||
@@ -9,6 +9,7 @@ import { logAudit } from './services/logger/audit-logger'
|
||||
import { fileURLToPath } from 'url'
|
||||
import { dirname } from 'path'
|
||||
import fs from 'fs'
|
||||
import { UpdateService } from './services/update/update-service'
|
||||
|
||||
// Set Playwright browsers path BEFORE any playwright import
|
||||
process.env.PLAYWRIGHT_BROWSERS_PATH = join(app.getPath('userData'), 'ms-playwright')
|
||||
@@ -110,6 +111,7 @@ app.whenReady().then(async () => {
|
||||
try {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
await configManager.initialize()
|
||||
UpdateService.getInstance().initialize()
|
||||
} catch (error) {
|
||||
console.error('Failed to initialize ConfigManager:', error)
|
||||
// Continue anyway - default config will be created
|
||||
|
||||
@@ -18,6 +18,7 @@ import type { UserInfo } from '../types/user.types'
|
||||
import { IPC_CHANNELS } from '../../shared/ipc-channels'
|
||||
import { ValidationError } from '../types/errors'
|
||||
import { withErrorHandling, type IpcResult } from './index'
|
||||
import { UpdateService } from '../services/update/update-service'
|
||||
|
||||
const log = createLogger('AuthHandler')
|
||||
|
||||
@@ -70,6 +71,7 @@ export interface CurrentUserResponse {
|
||||
*/
|
||||
export function registerAuthHandlers(): void {
|
||||
const sessionManager = SessionManager.getInstance()
|
||||
const updateService = UpdateService.getInstance()
|
||||
|
||||
/**
|
||||
* Get computer name
|
||||
@@ -93,6 +95,8 @@ export function registerAuthHandlers(): void {
|
||||
const userInfo = sessionManager.getUserInfo()
|
||||
|
||||
if (success && userInfo) {
|
||||
await updateService.setUserContext(userInfo.userType)
|
||||
|
||||
// Check if admin needs user selection
|
||||
const requiresUserSelection = userInfo.userType === 'Admin'
|
||||
|
||||
@@ -119,6 +123,7 @@ export function registerAuthHandlers(): void {
|
||||
}
|
||||
}
|
||||
|
||||
await updateService.setUserContext(null)
|
||||
throw new ValidationError('无感登录失败:未找到匹配用户', 'VAL_INVALID_INPUT')
|
||||
}, 'auth:silentLogin')
|
||||
}
|
||||
@@ -144,6 +149,7 @@ export function registerAuthHandlers(): void {
|
||||
|
||||
if (success && userInfo) {
|
||||
log.info('Login successful', { username, userType: userInfo.userType })
|
||||
await updateService.setUserContext(userInfo.userType)
|
||||
|
||||
// Audit log: LOGIN success (non-blocking)
|
||||
const os = await import('os')
|
||||
@@ -172,6 +178,7 @@ export function registerAuthHandlers(): void {
|
||||
}).catch((err) => log.warn('Failed to write audit log', { err }))
|
||||
|
||||
log.warn('Login failed - invalid credentials', { username })
|
||||
await updateService.setUserContext(null)
|
||||
throw new ValidationError('用户名或密码错误', 'VAL_INVALID_INPUT')
|
||||
}, 'auth:login')
|
||||
}
|
||||
@@ -198,6 +205,7 @@ export function registerAuthHandlers(): void {
|
||||
}
|
||||
|
||||
sessionManager.logout()
|
||||
await updateService.setUserContext(null)
|
||||
}, 'auth:logout')
|
||||
})
|
||||
|
||||
@@ -241,6 +249,7 @@ export function registerAuthHandlers(): void {
|
||||
if (success) {
|
||||
const newUser = sessionManager.getUserInfo()
|
||||
log.info('User switch successful', { newUsername: newUser?.username })
|
||||
await updateService.setUserContext(newUser?.userType ?? null)
|
||||
return {
|
||||
success: true,
|
||||
userInfo: newUser ?? undefined
|
||||
|
||||
@@ -7,6 +7,7 @@ import { SqlServerService } from '../services/database/sql-server'
|
||||
import { ConfigManager } from '../services/config/config-manager'
|
||||
import { ResultExporter } from '../services/excel/result-exporter'
|
||||
import { CleanerReportGenerator } from '../services/report/cleaner-report-generator'
|
||||
import { RustfsService } from '../services/rustfs'
|
||||
import { SessionManager } from '../services/user/session-manager'
|
||||
import { createLogger } from '../services/logger'
|
||||
import { logAudit } from '../services/logger/audit-logger'
|
||||
@@ -210,7 +211,11 @@ export function registerCleanerHandlers(): void {
|
||||
}
|
||||
}
|
||||
|
||||
log.info('Starting cleaning', { orderCount: validOrderNumbers.length })
|
||||
log.info('Starting cleaning', {
|
||||
orderCount: validOrderNumbers.length,
|
||||
queryBatchSize: input.queryBatchSize ?? 100,
|
||||
processConcurrency: input.processConcurrency ?? 1
|
||||
})
|
||||
const result = await cleaner.clean(modifiedInput)
|
||||
|
||||
if (warnings.length > 0) {
|
||||
@@ -249,6 +254,8 @@ export function registerCleanerHandlers(): void {
|
||||
metadata: {
|
||||
orderCount: validOrderNumbers.length,
|
||||
dryRun: input.dryRun ?? false,
|
||||
queryBatchSize: input.queryBatchSize ?? 100,
|
||||
processConcurrency: input.processConcurrency ?? 1,
|
||||
materialsDeleted: result.materialsDeleted,
|
||||
materialsSkipped: result.materialsSkipped,
|
||||
errorCount: result.errors.length
|
||||
@@ -256,7 +263,7 @@ export function registerCleanerHandlers(): void {
|
||||
}).catch((err) => log.warn('Failed to write audit log', { err }))
|
||||
}
|
||||
|
||||
// Generate report (silent, user unaware)
|
||||
// Generate report and upload to RustFS (silent, user unaware)
|
||||
try {
|
||||
const endTime = Date.now()
|
||||
const currentUser = SessionManager.getInstance().getUserInfo()
|
||||
@@ -270,6 +277,47 @@ export function registerCleanerHandlers(): void {
|
||||
endTime
|
||||
})
|
||||
log.info('Report generated', { path: reportPath })
|
||||
|
||||
// Upload to RustFS if enabled
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const config = configManager.getConfig()
|
||||
|
||||
if (config.rustfs?.enabled && config.rustfs.endpoint) {
|
||||
try {
|
||||
const rustfs = new RustfsService({ config: config.rustfs })
|
||||
const reportFileName = reportPath.split(/[\\/]/).pop() || 'report.md'
|
||||
const storageKey = rustfs.generateReportKey(reportFileName, username)
|
||||
|
||||
log.info('Uploading report to RustFS', {
|
||||
localPath: reportPath,
|
||||
storageKey
|
||||
})
|
||||
|
||||
const uploadResult = await rustfs.uploadFile(
|
||||
reportPath,
|
||||
storageKey,
|
||||
'text/markdown; charset=utf-8'
|
||||
)
|
||||
|
||||
if (uploadResult.success) {
|
||||
log.info('Report uploaded to RustFS successfully', {
|
||||
key: storageKey,
|
||||
etag: uploadResult.etag
|
||||
})
|
||||
} else {
|
||||
log.warn('Failed to upload report to RustFS', {
|
||||
error: uploadResult.error,
|
||||
key: storageKey
|
||||
})
|
||||
}
|
||||
} catch (rustfsError) {
|
||||
log.error('RustFS upload failed', {
|
||||
error: rustfsError instanceof Error ? rustfsError.message : String(rustfsError)
|
||||
})
|
||||
}
|
||||
} else {
|
||||
log.debug('RustFS is not enabled, skipping upload')
|
||||
}
|
||||
} catch (reportError) {
|
||||
log.warn('Failed to generate report', {
|
||||
error: reportError instanceof Error ? reportError.message : String(reportError)
|
||||
|
||||
@@ -125,6 +125,9 @@ export function registerExtractorHandlers(): void {
|
||||
const validOrderNumbers = resolver.getValidOrderNumbers(mappings)
|
||||
const warnings = resolver.getWarnings(mappings)
|
||||
|
||||
// Get deduplication report for detailed logging
|
||||
const dedupReport = resolver.getDeduplicationReport(mappings)
|
||||
|
||||
if (warnings.length > 0) {
|
||||
log.warn('Resolution warnings', { warnings })
|
||||
}
|
||||
@@ -137,7 +140,23 @@ export function registerExtractorHandlers(): void {
|
||||
}
|
||||
|
||||
log.info('Resolved order numbers', { count: validOrderNumbers.length })
|
||||
sendLog(sender, 'info', `已解析 ${validOrderNumbers.length} 个有效订单号`)
|
||||
|
||||
// Log deduplication summary
|
||||
sendLog(sender, 'info', dedupReport.summary)
|
||||
|
||||
// Log only merged mappings (where multiple productionIDs map to the same order number)
|
||||
if (dedupReport.inputCount > dedupReport.uniqueOrderNumbersCount) {
|
||||
sendLog(sender, 'info', '重复合并详情:')
|
||||
dedupReport.orderNumberGroups.forEach((productionIds, orderNumber) => {
|
||||
if (productionIds.length > 1) {
|
||||
sendLog(
|
||||
sender,
|
||||
'info',
|
||||
` ${orderNumber} ← ${productionIds.join('、')} (共 ${productionIds.length} 个总排号)`
|
||||
)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// Create auth service and login
|
||||
authService = new ErpAuthService({
|
||||
|
||||
@@ -14,6 +14,8 @@ import { registerSettingsHandlers } from './settings-handler'
|
||||
import { registerMaterialTypeHandlers } from './material-type-handler'
|
||||
import { registerUserErpConfigHandlers } from './user-erp-config-handler'
|
||||
import { registerLoggerHandlers } from './logger-handler'
|
||||
import { registerReportHandlers } from './report-handler'
|
||||
import { registerUpdateHandlers } from './update-handler'
|
||||
import { createLogger, logError } from '../services/logger'
|
||||
import { serializeError, sanitizeError } from '../services/logger/error-utils'
|
||||
import { getErrorMessage, getErrorCode, isBaseError } from '../types/errors'
|
||||
@@ -103,5 +105,7 @@ export function registerIpcHandlers(): void {
|
||||
registerMaterialTypeHandlers()
|
||||
registerUserErpConfigHandlers()
|
||||
registerLoggerHandlers()
|
||||
registerReportHandlers()
|
||||
registerUpdateHandlers()
|
||||
log.info('All IPC handlers registered')
|
||||
}
|
||||
|
||||
183
src/main/ipc/report-handler.ts
Normal file
183
src/main/ipc/report-handler.ts
Normal file
@@ -0,0 +1,183 @@
|
||||
import { ipcMain } from 'electron'
|
||||
import { IPC_CHANNELS } from '../../shared/ipc-channels'
|
||||
import { withErrorHandling, type IpcResult } from './index'
|
||||
import { createLogger } from '../services/logger'
|
||||
import { ConfigManager } from '../services/config/config-manager'
|
||||
import { RustfsService } from '../services/rustfs'
|
||||
import { ListObjectsV2Command, S3Client } from '@aws-sdk/client-s3'
|
||||
|
||||
const log = createLogger('ReportHandler')
|
||||
|
||||
export interface ReportMetadata {
|
||||
key: string
|
||||
filename: string
|
||||
username: string
|
||||
lastModified?: Date
|
||||
size?: number
|
||||
}
|
||||
|
||||
function getRustfsService(): RustfsService | null {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const config = configManager.getConfig()
|
||||
|
||||
if (config.rustfs?.enabled && config.rustfs.endpoint) {
|
||||
return new RustfsService({ config: config.rustfs })
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
export function registerReportHandlers(): void {
|
||||
ipcMain.handle(
|
||||
IPC_CHANNELS.REPORT_LIST_ALL,
|
||||
async (): Promise<IpcResult<ReportMetadata[]>> => {
|
||||
return withErrorHandling(async () => {
|
||||
const rustfs = getRustfsService()
|
||||
if (!rustfs) {
|
||||
throw new Error('RustFS is not configured or enabled')
|
||||
}
|
||||
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const config = configManager.getConfig()
|
||||
|
||||
// Create a direct S3Client since RustfsService doesn't expose listObjects natively easily
|
||||
const client = new S3Client({
|
||||
region: config.rustfs?.region || 'us-east-1',
|
||||
endpoint: config.rustfs?.endpoint || '',
|
||||
credentials: {
|
||||
accessKeyId: config.rustfs?.accessKey || '',
|
||||
secretAccessKey: config.rustfs?.secretKey || ''
|
||||
},
|
||||
forcePathStyle: true
|
||||
})
|
||||
|
||||
log.info('Fetching all reports from RustFS')
|
||||
const input = {
|
||||
Bucket: config.rustfs?.bucket || '',
|
||||
Prefix: 'reports/cleaner/'
|
||||
}
|
||||
|
||||
const command = new ListObjectsV2Command(input)
|
||||
const response = await client.send(command)
|
||||
|
||||
const reports: ReportMetadata[] = []
|
||||
|
||||
if (response.Contents) {
|
||||
for (const item of response.Contents) {
|
||||
if (item.Key && item.Key.endsWith('.md')) {
|
||||
// reports/cleaner/{username}/{filename}
|
||||
const parts = item.Key.split('/')
|
||||
if (parts.length >= 4) {
|
||||
const username = parts[2]
|
||||
const filename = parts.slice(3).join('/')
|
||||
reports.push({
|
||||
key: item.Key,
|
||||
filename,
|
||||
username,
|
||||
lastModified: item.LastModified,
|
||||
size: item.Size
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Sort by lastModified descending
|
||||
reports.sort((a, b) => {
|
||||
if (a.lastModified && b.lastModified) {
|
||||
return b.lastModified.getTime() - a.lastModified.getTime()
|
||||
}
|
||||
return 0
|
||||
})
|
||||
|
||||
return reports
|
||||
}, 'report:listAll')
|
||||
}
|
||||
)
|
||||
|
||||
ipcMain.handle(
|
||||
IPC_CHANNELS.REPORT_LIST_BY_USER,
|
||||
async (_event, username: string): Promise<IpcResult<ReportMetadata[]>> => {
|
||||
return withErrorHandling(async () => {
|
||||
const rustfs = getRustfsService()
|
||||
if (!rustfs) {
|
||||
throw new Error('RustFS is not configured or enabled')
|
||||
}
|
||||
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const config = configManager.getConfig()
|
||||
|
||||
const client = new S3Client({
|
||||
region: config.rustfs?.region || 'us-east-1',
|
||||
endpoint: config.rustfs?.endpoint || '',
|
||||
credentials: {
|
||||
accessKeyId: config.rustfs?.accessKey || '',
|
||||
secretAccessKey: config.rustfs?.secretKey || ''
|
||||
},
|
||||
forcePathStyle: true
|
||||
})
|
||||
|
||||
log.info('Fetching reports from RustFS for user', { username })
|
||||
const input = {
|
||||
Bucket: config.rustfs?.bucket || '',
|
||||
Prefix: `reports/cleaner/${username}/`
|
||||
}
|
||||
|
||||
const command = new ListObjectsV2Command(input)
|
||||
const response = await client.send(command)
|
||||
|
||||
const reports: ReportMetadata[] = []
|
||||
|
||||
if (response.Contents) {
|
||||
for (const item of response.Contents) {
|
||||
if (item.Key && item.Key.endsWith('.md')) {
|
||||
const parts = item.Key.split('/')
|
||||
if (parts.length >= 4) {
|
||||
const itemUsername = parts[2]
|
||||
const filename = parts.slice(3).join('/')
|
||||
reports.push({
|
||||
key: item.Key,
|
||||
filename,
|
||||
username: itemUsername,
|
||||
lastModified: item.LastModified,
|
||||
size: item.Size
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Sort by lastModified descending
|
||||
reports.sort((a, b) => {
|
||||
if (a.lastModified && b.lastModified) {
|
||||
return b.lastModified.getTime() - a.lastModified.getTime()
|
||||
}
|
||||
return 0
|
||||
})
|
||||
|
||||
return reports
|
||||
}, 'report:listByUser')
|
||||
}
|
||||
)
|
||||
|
||||
ipcMain.handle(
|
||||
IPC_CHANNELS.REPORT_DOWNLOAD,
|
||||
async (_event, key: string): Promise<IpcResult<string>> => {
|
||||
return withErrorHandling(async () => {
|
||||
const rustfs = getRustfsService()
|
||||
if (!rustfs) {
|
||||
throw new Error('RustFS is not configured or enabled')
|
||||
}
|
||||
|
||||
log.info('Downloading report from RustFS', { key })
|
||||
const result = await rustfs.downloadFile(key)
|
||||
|
||||
if (!result.success) {
|
||||
throw new Error(result.error || 'Failed to download report')
|
||||
}
|
||||
|
||||
// Convert buffer to string
|
||||
return result.content.toString('utf-8')
|
||||
}, 'report:download')
|
||||
}
|
||||
)
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import type { UserType, ConnectionTestResult, SaveSettingsResult } from '../type
|
||||
import { IPC_CHANNELS } from '../../shared/ipc-channels'
|
||||
import { ValidationError } from '../types/errors'
|
||||
import { withErrorHandling, type IpcResult } from './index'
|
||||
import type { CleanerConfig } from '../types/config.schema'
|
||||
|
||||
const log = createLogger('SettingsHandler')
|
||||
|
||||
@@ -174,4 +175,26 @@ export function registerSettingsHandlers(): void {
|
||||
}, 'settings:testDbConnection')
|
||||
}
|
||||
)
|
||||
|
||||
ipcMain.handle(IPC_CHANNELS.CONFIG_GET_CLEANER, async (): Promise<IpcResult<CleanerConfig>> => {
|
||||
return withErrorHandling(async () => {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const config = configManager.getConfig()
|
||||
return config.cleaner
|
||||
}, 'config:getCleaner')
|
||||
})
|
||||
|
||||
ipcMain.handle(
|
||||
IPC_CHANNELS.CONFIG_UPDATE_CLEANER,
|
||||
async (_event, updates: Partial<CleanerConfig>): Promise<IpcResult<CleanerConfig>> => {
|
||||
return withErrorHandling(async () => {
|
||||
const configManager = ConfigManager.getInstance()
|
||||
const result = await configManager.updateConfig({ cleaner: updates as CleanerConfig })
|
||||
if (!result.success) {
|
||||
throw new Error(result.error)
|
||||
}
|
||||
return configManager.getConfig().cleaner
|
||||
}, 'config:updateCleaner')
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
55
src/main/ipc/update-handler.ts
Normal file
55
src/main/ipc/update-handler.ts
Normal file
@@ -0,0 +1,55 @@
|
||||
import { ipcMain } from 'electron'
|
||||
import { IPC_CHANNELS } from '../../shared/ipc-channels'
|
||||
import { withErrorHandling, type IpcResult } from './index'
|
||||
import { UpdateService } from '../services/update/update-service'
|
||||
import type {
|
||||
DownloadReleaseRequest,
|
||||
UpdateDialogCatalog,
|
||||
UpdateStatus
|
||||
} from '../types/update.types'
|
||||
|
||||
export function registerUpdateHandlers(): void {
|
||||
const updateService = UpdateService.getInstance()
|
||||
|
||||
ipcMain.handle(IPC_CHANNELS.UPDATE_GET_STATUS, async (): Promise<IpcResult<UpdateStatus>> => {
|
||||
return withErrorHandling(async () => updateService.getStatus(), 'update:getStatus')
|
||||
})
|
||||
|
||||
ipcMain.handle(IPC_CHANNELS.UPDATE_CHECK_NOW, async (): Promise<IpcResult<UpdateStatus>> => {
|
||||
return withErrorHandling(async () => updateService.checkForUpdates(), 'update:checkNow')
|
||||
})
|
||||
|
||||
ipcMain.handle(
|
||||
IPC_CHANNELS.UPDATE_GET_CATALOG,
|
||||
async (): Promise<IpcResult<UpdateDialogCatalog>> => {
|
||||
return withErrorHandling(async () => updateService.getCatalog(), 'update:getCatalog')
|
||||
}
|
||||
)
|
||||
|
||||
ipcMain.handle(
|
||||
IPC_CHANNELS.UPDATE_GET_CHANGELOG,
|
||||
async (_event, request: DownloadReleaseRequest): Promise<IpcResult<string>> => {
|
||||
return withErrorHandling(
|
||||
async () => updateService.getChangelog(request),
|
||||
'update:getChangelog'
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
ipcMain.handle(
|
||||
IPC_CHANNELS.UPDATE_DOWNLOAD_RELEASE,
|
||||
async (_event, request: DownloadReleaseRequest): Promise<IpcResult<UpdateStatus>> => {
|
||||
return withErrorHandling(
|
||||
async () => updateService.downloadRelease(request),
|
||||
'update:downloadRelease'
|
||||
)
|
||||
}
|
||||
)
|
||||
|
||||
ipcMain.handle(IPC_CHANNELS.UPDATE_INSTALL_DOWNLOADED, async (): Promise<IpcResult<void>> => {
|
||||
return withErrorHandling(
|
||||
async () => updateService.installDownloadedRelease(),
|
||||
'update:installDownloaded'
|
||||
)
|
||||
})
|
||||
}
|
||||
@@ -296,7 +296,8 @@ export function registerValidationHandlers(): void {
|
||||
if (sourceNumbers.length === 0) {
|
||||
return {
|
||||
success: false,
|
||||
error: '共享的 Production ID 没有找到对应的订单数据。请确保在数据提取页面输入了有效的 Production ID 并成功获取了订单数据。',
|
||||
error:
|
||||
'共享的 Production ID 没有找到对应的订单数据。请确保在数据提取页面输入了有效的 Production ID 并成功获取了订单数据。',
|
||||
stats: {
|
||||
totalRecords: 0,
|
||||
matchedCount: 0,
|
||||
@@ -315,7 +316,8 @@ export function registerValidationHandlers(): void {
|
||||
if (sourceNumbers.length === 0) {
|
||||
return {
|
||||
success: false,
|
||||
error: '文件中的 Production ID 没有找到对应的订单数据。请检查 Production ID 是否正确,或确保数据库中有对应的订单数据。',
|
||||
error:
|
||||
'文件中的 Production ID 没有找到对应的订单数据。请检查 Production ID 是否正确,或确保数据库中有对应的订单数据。',
|
||||
stats: {
|
||||
totalRecords: 0,
|
||||
matchedCount: 0,
|
||||
@@ -755,6 +757,17 @@ export function registerValidationHandlers(): void {
|
||||
}
|
||||
)
|
||||
|
||||
/**
|
||||
* Clear shared Production IDs
|
||||
*/
|
||||
ipcMain.handle(
|
||||
IPC_CHANNELS.VALIDATION_CLEAR_SHARED_PRODUCTION_IDS,
|
||||
async (event): Promise<void> => {
|
||||
log.info('Clearing shared Production IDs')
|
||||
clearSharedProductionIds(event.sender.id)
|
||||
}
|
||||
)
|
||||
|
||||
/**
|
||||
* Get cleaner data (order numbers from shared Production IDs + material codes from MaterialsToBeDeleted)
|
||||
* Filters materials by current user (admin sees all, regular users see only their own)
|
||||
|
||||
@@ -12,7 +12,9 @@ export const CleanerInputSchema = z.object({
|
||||
.array(z.string().min(1, 'Order number cannot be empty'))
|
||||
.min(1, 'At least one order number is required'),
|
||||
materialCodes: z.array(z.string().min(1, 'Material code cannot be empty')),
|
||||
dryRun: z.boolean()
|
||||
dryRun: z.boolean(),
|
||||
queryBatchSize: z.number().int().min(1).max(100).optional().default(100),
|
||||
processConcurrency: z.number().int().min(1).max(20).optional().default(1)
|
||||
// Note: onProgress is a function, not validated via Zod
|
||||
})
|
||||
|
||||
|
||||
@@ -81,6 +81,10 @@ const DEFAULT_CONFIG: FullConfig = {
|
||||
enableCrud: false,
|
||||
defaultManager: ''
|
||||
},
|
||||
cleaner: {
|
||||
queryBatchSize: 100,
|
||||
processConcurrency: 1
|
||||
},
|
||||
orderResolution: {
|
||||
tableName: '',
|
||||
productionIdField: '',
|
||||
@@ -90,6 +94,26 @@ const DEFAULT_CONFIG: FullConfig = {
|
||||
level: 'info',
|
||||
auditRetention: 30,
|
||||
appRetention: 14
|
||||
},
|
||||
rustfs: {
|
||||
enabled: false,
|
||||
endpoint: '',
|
||||
accessKey: '',
|
||||
secretKey: '',
|
||||
bucket: 'erpauto',
|
||||
region: 'us-east-1'
|
||||
},
|
||||
update: {
|
||||
enabled: false,
|
||||
allowDevMode: false,
|
||||
endpoint: '',
|
||||
accessKey: '',
|
||||
secretKey: '',
|
||||
bucket: '',
|
||||
region: 'us-east-1',
|
||||
basePrefix: 'updates/win-portable',
|
||||
checkIntervalMinutes: 30,
|
||||
maxAdminHistoryPerChannel: 10
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,48 @@ import { createLogger } from '../logger'
|
||||
|
||||
const log = createLogger('CleanerService')
|
||||
|
||||
const DEFAULT_QUERY_BATCH_SIZE = 100
|
||||
const MAX_QUERY_BATCH_SIZE = 100
|
||||
const DEFAULT_PROCESS_CONCURRENCY = 1
|
||||
const MAX_PROCESS_CONCURRENCY = 20
|
||||
|
||||
interface RetryResult {
|
||||
retriedOrders: number
|
||||
successfulRetries: number
|
||||
updatedDetails: OrderCleanDetail[]
|
||||
}
|
||||
|
||||
interface ProgressState {
|
||||
completedOrders: number
|
||||
totalOrders: number
|
||||
}
|
||||
|
||||
interface QueryResultRow {
|
||||
rowIndex: number
|
||||
orderNumber: string
|
||||
}
|
||||
|
||||
class AsyncMutex {
|
||||
private queue: Promise<void> = Promise.resolve()
|
||||
|
||||
async runExclusive<T>(task: () => Promise<T>): Promise<T> {
|
||||
let release!: () => void
|
||||
const next = new Promise<void>((resolve) => {
|
||||
release = resolve
|
||||
})
|
||||
|
||||
const previous = this.queue
|
||||
this.queue = this.queue.then(() => next)
|
||||
|
||||
await previous
|
||||
try {
|
||||
return await task()
|
||||
} finally {
|
||||
release()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Cleaner Service Options
|
||||
*/
|
||||
@@ -25,11 +67,58 @@ export interface ShouldDeleteParams {
|
||||
deleteSet: Set<string>
|
||||
}
|
||||
|
||||
function clampNumber(
|
||||
value: number | undefined,
|
||||
fallback: number,
|
||||
min: number,
|
||||
max: number
|
||||
): number {
|
||||
if (!Number.isFinite(value)) {
|
||||
return fallback
|
||||
}
|
||||
return Math.min(max, Math.max(min, Math.trunc(value ?? fallback)))
|
||||
}
|
||||
|
||||
export function createBatches<T>(items: T[], batchSize: number): T[][] {
|
||||
const batches: T[][] = []
|
||||
for (let i = 0; i < items.length; i += batchSize) {
|
||||
batches.push(items.slice(i, i + batchSize))
|
||||
}
|
||||
return batches
|
||||
}
|
||||
|
||||
export function getMissingOrders(inputOrders: string[], processedOrders: Set<string>): string[] {
|
||||
const uniqueInputOrders = Array.from(new Set(inputOrders))
|
||||
return uniqueInputOrders.filter((order) => !processedOrders.has(order))
|
||||
}
|
||||
|
||||
export async function runWithConcurrency<T, R>(
|
||||
items: T[],
|
||||
concurrency: number,
|
||||
worker: (item: T, index: number) => Promise<R>
|
||||
): Promise<R[]> {
|
||||
const results = new Array<R>(items.length)
|
||||
const limit = Math.max(1, Math.trunc(concurrency))
|
||||
let cursor = 0
|
||||
|
||||
const runners = Array.from({ length: Math.min(limit, items.length) }, async () => {
|
||||
while (true) {
|
||||
const current = cursor
|
||||
cursor += 1
|
||||
if (current >= items.length) {
|
||||
return
|
||||
}
|
||||
results[current] = await worker(items[current], current)
|
||||
}
|
||||
})
|
||||
|
||||
await Promise.all(runners)
|
||||
return results
|
||||
}
|
||||
|
||||
/**
|
||||
* ERP Cleaner Service
|
||||
* Deletes specified materials from production orders in ERP system
|
||||
*
|
||||
* Reference: playwrite/utils/discrete_material_plan_cleaner.py
|
||||
*/
|
||||
export class CleanerService {
|
||||
private authService: ErpAuthService
|
||||
@@ -49,27 +138,18 @@ export class CleanerService {
|
||||
|
||||
/**
|
||||
* Determine if a material should be deleted
|
||||
* Reference: Python lines 284-406
|
||||
*
|
||||
* Deletion conditions:
|
||||
* 1. Material code must be in the delete set
|
||||
* 2. Row number must NOT be in range 7000-7999
|
||||
* 3. Pending quantity must be empty
|
||||
*/
|
||||
shouldDeleteMaterial(params: ShouldDeleteParams): boolean {
|
||||
const { rowNumber, pendingQty, materialCode, deleteSet } = params
|
||||
|
||||
// Check if material is in delete list
|
||||
if (!deleteSet.has(materialCode)) {
|
||||
return false
|
||||
}
|
||||
|
||||
// Check row number range (7000-7999 are protected)
|
||||
if (rowNumber >= 7000 && rowNumber < 8000) {
|
||||
if (rowNumber >= 2000 && rowNumber < 8000) {
|
||||
return false
|
||||
}
|
||||
|
||||
// Check pending quantity (must be empty)
|
||||
if (pendingQty && pendingQty.trim() !== '') {
|
||||
return false
|
||||
}
|
||||
@@ -83,8 +163,8 @@ export class CleanerService {
|
||||
if (!deleteSet.has(materialCode)) {
|
||||
return '物料不在删除清单中'
|
||||
}
|
||||
if (rowNumber >= 7000 && rowNumber < 8000) {
|
||||
return '行号在 7000-7999 范围内(受保护)'
|
||||
if (rowNumber >= 2000 && rowNumber < 8000) {
|
||||
return '行号在 2000-7999 范围内(受保护)'
|
||||
}
|
||||
if (pendingQty && pendingQty.trim() !== '') {
|
||||
return '累计待发数量不为空'
|
||||
@@ -92,79 +172,151 @@ export class CleanerService {
|
||||
return '未知原因'
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute the cleaning process
|
||||
* Reference: Python clean() method lines 456-525
|
||||
*/
|
||||
async clean(input: CleanerInput): Promise<CleanerResult> {
|
||||
const result: CleanerResult = {
|
||||
ordersProcessed: 0,
|
||||
materialsDeleted: 0,
|
||||
materialsSkipped: 0,
|
||||
errors: [],
|
||||
details: []
|
||||
details: [],
|
||||
retriedOrders: 0,
|
||||
successfulRetries: 0
|
||||
}
|
||||
|
||||
const totalOrders = input.orderNumbers.length
|
||||
const dryRun = input.dryRun ?? this.dryRun
|
||||
const queryBatchSize = clampNumber(
|
||||
input.queryBatchSize,
|
||||
DEFAULT_QUERY_BATCH_SIZE,
|
||||
1,
|
||||
MAX_QUERY_BATCH_SIZE
|
||||
)
|
||||
const processConcurrency = clampNumber(
|
||||
input.processConcurrency,
|
||||
DEFAULT_PROCESS_CONCURRENCY,
|
||||
1,
|
||||
MAX_PROCESS_CONCURRENCY
|
||||
)
|
||||
|
||||
log.info('Starting cleaner', {
|
||||
totalOrders,
|
||||
materialCount: input.materialCodes.length,
|
||||
dryRun
|
||||
dryRun,
|
||||
queryBatchSize,
|
||||
processConcurrency
|
||||
})
|
||||
|
||||
// Create delete set for O(1) lookup
|
||||
const deleteSet = new Set(input.materialCodes)
|
||||
|
||||
let popupPage: Page | null = null
|
||||
|
||||
try {
|
||||
const session = this.authService.getSession()
|
||||
const navigation = await this.navigateToCleanerPage(session)
|
||||
popupPage = navigation.popupPage
|
||||
const { workFrame } = navigation
|
||||
|
||||
// Navigate to cleaner page
|
||||
const { popupPage, workFrame } = await this.navigateToCleanerPage(session)
|
||||
|
||||
// Setup query interface
|
||||
await this.setupQueryInterface(workFrame)
|
||||
|
||||
// Process each order
|
||||
for (let i = 0; i < totalOrders; i++) {
|
||||
const orderNumber = input.orderNumbers[i]
|
||||
const orderBatches = createBatches(input.orderNumbers, queryBatchSize)
|
||||
const popupMutex = new AsyncMutex()
|
||||
const progressState: ProgressState = {
|
||||
completedOrders: 0,
|
||||
totalOrders
|
||||
}
|
||||
|
||||
try {
|
||||
log.debug('Processing order', { orderNumber, index: i + 1, total: totalOrders })
|
||||
const detail = await this.processOrder({
|
||||
workFrame,
|
||||
popupPage,
|
||||
orderNumber,
|
||||
orderIndex: i,
|
||||
totalOrders,
|
||||
deleteSet,
|
||||
dryRun: input.dryRun ?? this.dryRun,
|
||||
onProgress: input.onProgress
|
||||
for (let batchIndex = 0; batchIndex < orderBatches.length; batchIndex++) {
|
||||
const batchOrders = orderBatches[batchIndex]
|
||||
|
||||
log.info('Processing cleaner batch', {
|
||||
batchIndex: batchIndex + 1,
|
||||
totalBatches: orderBatches.length,
|
||||
batchSize: batchOrders.length
|
||||
})
|
||||
|
||||
await this.queryOrders(workFrame, batchOrders)
|
||||
await this.waitForLoading(workFrame)
|
||||
|
||||
const queriedRows = await this.collectQueryResultRows(workFrame)
|
||||
const queriedOrderNumbersInBatch = new Set(queriedRows.map((row) => row.orderNumber))
|
||||
|
||||
await runWithConcurrency(queriedRows, processConcurrency, async (row) => {
|
||||
const { rowIndex, orderNumber } = row
|
||||
const openedDetailPage = await popupMutex.runExclusive(async () => {
|
||||
return await this.openDetailPageFromRow(workFrame, popupPage!, rowIndex)
|
||||
})
|
||||
|
||||
let detail: OrderCleanDetail
|
||||
try {
|
||||
detail = await this.processDetailPage({
|
||||
detailPage: openedDetailPage,
|
||||
deleteSet,
|
||||
dryRun,
|
||||
expectedOrderNumber: orderNumber,
|
||||
progressState,
|
||||
onProgress: input.onProgress
|
||||
})
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : 'Unknown error'
|
||||
detail = this.createErrorDetail(orderNumber, message)
|
||||
} finally {
|
||||
progressState.completedOrders += 1
|
||||
}
|
||||
|
||||
result.details.push(detail)
|
||||
result.ordersProcessed++
|
||||
|
||||
if (detail.errors.length > 0) {
|
||||
result.errors.push(`Order ${detail.orderNumber}: ${detail.errors.join('; ')}`)
|
||||
return
|
||||
}
|
||||
|
||||
result.ordersProcessed += 1
|
||||
result.materialsDeleted += detail.materialsDeleted
|
||||
result.materialsSkipped += detail.materialsSkipped
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : 'Unknown error'
|
||||
log.error('Order processing failed', { orderNumber, error: message })
|
||||
result.errors.push(`Order ${orderNumber}: ${message}`)
|
||||
})
|
||||
|
||||
// Add error detail
|
||||
result.details.push({
|
||||
orderNumber,
|
||||
materialsDeleted: 0,
|
||||
materialsSkipped: 0,
|
||||
errors: [message],
|
||||
skippedMaterials: []
|
||||
})
|
||||
const missingOrders = getMissingOrders(batchOrders, queriedOrderNumbersInBatch)
|
||||
for (const missingOrder of missingOrders) {
|
||||
const missingMessage = '订单未出现在查询结果中'
|
||||
result.errors.push(`Order ${missingOrder}: ${missingMessage}`)
|
||||
result.details.push(this.createErrorDetail(missingOrder, missingMessage))
|
||||
}
|
||||
}
|
||||
|
||||
// Close popup page
|
||||
await popupPage.close()
|
||||
const retryResult = await this.retryFailedOrders({
|
||||
workFrame,
|
||||
popupPage,
|
||||
failedDetails: result.details.filter(
|
||||
(d) => d.errors.length > 0 && this.isOrderNumber(d.orderNumber)
|
||||
),
|
||||
deleteSet,
|
||||
dryRun,
|
||||
onProgress: input.onProgress
|
||||
})
|
||||
|
||||
result.retriedOrders = retryResult.retriedOrders
|
||||
result.successfulRetries = retryResult.successfulRetries
|
||||
|
||||
retryResult.updatedDetails.forEach((updatedDetail) => {
|
||||
const index = result.details.findIndex((d) => d.orderNumber === updatedDetail.orderNumber)
|
||||
if (index !== -1) {
|
||||
const previousDetail = result.details[index]
|
||||
if (updatedDetail.retrySuccess && previousDetail.errors.length > 0) {
|
||||
result.ordersProcessed += 1
|
||||
result.materialsDeleted += updatedDetail.materialsDeleted
|
||||
result.materialsSkipped += updatedDetail.materialsSkipped
|
||||
}
|
||||
result.details[index] = updatedDetail
|
||||
}
|
||||
})
|
||||
|
||||
const successfulRetryOrders = new Set(
|
||||
retryResult.updatedDetails.filter((d) => d.retrySuccess).map((d) => d.orderNumber)
|
||||
)
|
||||
result.errors = result.errors.filter(
|
||||
(err) => !successfulRetryOrders.has(err.split(':')[0].replace('Order ', ''))
|
||||
)
|
||||
|
||||
log.info('Cleaner completed', {
|
||||
ordersProcessed: result.ordersProcessed,
|
||||
materialsDeleted: result.materialsDeleted,
|
||||
@@ -175,29 +327,30 @@ export class CleanerService {
|
||||
const message = error instanceof Error ? error.message : 'Unknown error'
|
||||
log.error('Cleaner failed', { error: message })
|
||||
result.errors.push(`Clean failed: ${message}`)
|
||||
} finally {
|
||||
if (popupPage) {
|
||||
try {
|
||||
await popupPage.close()
|
||||
} catch {
|
||||
// Ignore close errors
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
/**
|
||||
* Navigate to the discrete production order maintenance page
|
||||
* Reference: Python lines 476-486
|
||||
*/
|
||||
async navigateToCleanerPage(
|
||||
session: ErpSession
|
||||
): Promise<{ popupPage: Page; workFrame: FrameLocator }> {
|
||||
const { page, mainFrame } = session
|
||||
|
||||
// Click menu icon (Python line 476)
|
||||
await mainFrame.locator('i').first().click()
|
||||
|
||||
// Click discrete production order menu item and expect popup (Python lines 477-479)
|
||||
const popupPromise = page.waitForEvent('popup')
|
||||
await mainFrame.getByTitle('离散生产订单维护', { exact: true }).first().click()
|
||||
const popupPage = await popupPromise
|
||||
|
||||
// Get nested frame structure (Python lines 482-486)
|
||||
const forwardFrameLocator = popupPage.locator('#forwardFrame')
|
||||
const fFrame = forwardFrameLocator.contentFrame()
|
||||
|
||||
@@ -205,87 +358,130 @@ export class CleanerService {
|
||||
await innerFrameLocator.waitFor({ state: 'visible', timeout: 30000 })
|
||||
const workFrame = innerFrameLocator.contentFrame()
|
||||
|
||||
// Wait for hot-key-head_list to be visible (Python line 484-486)
|
||||
await workFrame.locator('#hot-key-head_list').waitFor({ state: 'visible', timeout: 30000 })
|
||||
|
||||
return { popupPage, workFrame }
|
||||
}
|
||||
|
||||
/**
|
||||
* Setup query interface
|
||||
* Reference: Python setup_query_interface() lines 445-454
|
||||
*/
|
||||
private async setupQueryInterface(innerFrame: FrameLocator): Promise<void> {
|
||||
// Click search icon (Python line 447)
|
||||
await innerFrame.locator('.search-name-wrapper > .iconfont').click()
|
||||
|
||||
// Click "订单号查询" menu item (Python line 448)
|
||||
await innerFrame.getByText('订单号查询').click()
|
||||
|
||||
// Click "全部" tab (Python line 449)
|
||||
await innerFrame.getByRole('tab', { name: '全部' }).click()
|
||||
|
||||
// Set limit to 5000 (Python lines 451-454)
|
||||
const inputEl = innerFrame.locator('#rc_select_0')
|
||||
await inputEl.fill('5000')
|
||||
await inputEl.press('Enter')
|
||||
}
|
||||
|
||||
/**
|
||||
* Process a single order
|
||||
* Reference: Python process_order() lines 171-443
|
||||
*/
|
||||
private async processOrder(params: {
|
||||
workFrame: FrameLocator
|
||||
private async queryOrders(workFrame: FrameLocator, orderNumbers: string[]): Promise<void> {
|
||||
const textbox = workFrame.getByRole('textbox', { name: '生产订单号' })
|
||||
await textbox.fill(orderNumbers.join(','))
|
||||
await workFrame.locator('.search-component-searchBtn').click()
|
||||
}
|
||||
|
||||
private async collectQueryResultRows(workFrame: FrameLocator): Promise<QueryResultRow[]> {
|
||||
const rows = workFrame.locator('tbody tr')
|
||||
const rowCount = await rows.count()
|
||||
const result: QueryResultRow[] = []
|
||||
|
||||
for (let rowIndex = 0; rowIndex < rowCount; rowIndex++) {
|
||||
const row = rows.nth(rowIndex)
|
||||
const orderNumber = await this.extractOrderNumberFromQueryRow(row)
|
||||
if (!this.isOrderNumber(orderNumber)) {
|
||||
continue
|
||||
}
|
||||
result.push({ rowIndex, orderNumber })
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
|
||||
private async extractOrderNumberFromQueryRow(row: Locator): Promise<string> {
|
||||
try {
|
||||
const cell = row.locator('td[colkey="vbillcode"]')
|
||||
const codeLink = cell.locator('.code-detail-link').first()
|
||||
const rawValue =
|
||||
(await codeLink.count()) > 0 ? await codeLink.innerText() : await cell.innerText()
|
||||
const value = rawValue.trim()
|
||||
const match = value.match(/SC\d{14}/)
|
||||
return match ? match[0] : value
|
||||
} catch {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
|
||||
private async openDetailPageFromRow(
|
||||
workFrame: FrameLocator,
|
||||
popupPage: Page,
|
||||
rowIndex: number
|
||||
): Promise<Page> {
|
||||
const row = workFrame.locator('tbody tr').nth(rowIndex)
|
||||
await row.waitFor({ state: 'visible', timeout: 15000 })
|
||||
|
||||
const moreButton = row.locator('a.row-more').first()
|
||||
await moreButton.scrollIntoViewIfNeeded()
|
||||
|
||||
const detailPagePromise = popupPage.waitForEvent('popup')
|
||||
await moreButton.click()
|
||||
await this.clickMaterialPlanMenu(workFrame)
|
||||
|
||||
return await detailPagePromise
|
||||
}
|
||||
|
||||
private async openDetailPageFromCurrentQuery(
|
||||
workFrame: FrameLocator,
|
||||
popupPage: Page
|
||||
orderNumber: string
|
||||
orderIndex: number
|
||||
totalOrders: number
|
||||
): Promise<Page> {
|
||||
const firstRow = workFrame.locator('tbody tr').first()
|
||||
await firstRow.waitFor({ state: 'visible', timeout: 10000 })
|
||||
|
||||
const moreButton = firstRow.locator('a.row-more').first()
|
||||
const detailPagePromise = popupPage.waitForEvent('popup')
|
||||
await moreButton.click()
|
||||
await this.clickMaterialPlanMenu(workFrame)
|
||||
|
||||
return await detailPagePromise
|
||||
}
|
||||
|
||||
private async clickMaterialPlanMenu(workFrame: FrameLocator): Promise<void> {
|
||||
const candidates = [
|
||||
workFrame.locator('li:visible, a:visible, span:visible, div:visible').filter({
|
||||
hasText: /^备料计划$/
|
||||
}),
|
||||
workFrame.getByRole('menuitem', { name: '备料计划' }),
|
||||
workFrame.getByText('备料计划', { exact: true }),
|
||||
workFrame.getByText('备料计划')
|
||||
]
|
||||
|
||||
for (const candidate of candidates) {
|
||||
const target = candidate.last()
|
||||
try {
|
||||
await target.waitFor({ state: 'visible', timeout: 2000 })
|
||||
await target.click()
|
||||
return
|
||||
} catch {
|
||||
// Try next locator candidate
|
||||
}
|
||||
}
|
||||
|
||||
throw new Error('无法定位“备料计划”菜单项(可能菜单结构已变化)')
|
||||
}
|
||||
|
||||
private async processDetailPage(params: {
|
||||
detailPage: Page
|
||||
deleteSet: Set<string>
|
||||
dryRun: boolean
|
||||
progressState: ProgressState
|
||||
expectedOrderNumber?: string
|
||||
onProgress?: (
|
||||
message: string,
|
||||
progress?: number,
|
||||
extra?: Partial<import('../../types/cleaner.types').CleanerProgress>
|
||||
) => void
|
||||
}): Promise<OrderCleanDetail> {
|
||||
const {
|
||||
workFrame,
|
||||
popupPage,
|
||||
orderNumber,
|
||||
orderIndex,
|
||||
totalOrders,
|
||||
deleteSet,
|
||||
dryRun,
|
||||
onProgress
|
||||
} = params
|
||||
|
||||
const detail: OrderCleanDetail = {
|
||||
orderNumber,
|
||||
materialsDeleted: 0,
|
||||
materialsSkipped: 0,
|
||||
errors: [],
|
||||
skippedMaterials: []
|
||||
}
|
||||
|
||||
// Query the order (Python lines 187-189)
|
||||
const textbox = workFrame.getByRole('textbox', { name: '生产订单号' })
|
||||
await textbox.fill(orderNumber)
|
||||
await workFrame.locator('.search-component-searchBtn').click()
|
||||
|
||||
// Wait for loading (Python lines 192-197)
|
||||
await this.waitForLoading(workFrame)
|
||||
|
||||
// Click "更多" to open menu (Python line 200)
|
||||
await workFrame.locator('#hot-key-head_list').getByText('更多').click()
|
||||
|
||||
// Click "备料计划" and expect popup (Python lines 201-203)
|
||||
const detailPagePromise = popupPage.waitForEvent('popup')
|
||||
await workFrame.getByText('备料计划').click()
|
||||
const detailPage = await detailPagePromise
|
||||
const { detailPage, deleteSet, dryRun, progressState, expectedOrderNumber, onProgress } = params
|
||||
|
||||
try {
|
||||
// Navigate nested frames in detail page (Python lines 206-207)
|
||||
const detailMainFrame = detailPage.locator('#forwardFrame')
|
||||
const dFrame = await detailMainFrame.contentFrame()
|
||||
|
||||
@@ -301,47 +497,58 @@ export class CleanerService {
|
||||
throw new Error('Failed to access detail inner frame')
|
||||
}
|
||||
|
||||
// Wait for plan code (Python lines 210-213)
|
||||
await detailInnerFrame
|
||||
.getByText(/^离散备料计划维护:/)
|
||||
.waitFor({ state: 'visible', timeout: 30000 })
|
||||
|
||||
// Extract detail count (Python lines 215-218)
|
||||
const sourceOrderNumber = await this.extractSourceOrderNumber(detailInnerFrame)
|
||||
const orderNumber = sourceOrderNumber || expectedOrderNumber || 'UNKNOWN_ORDER'
|
||||
|
||||
const detail: OrderCleanDetail = {
|
||||
orderNumber,
|
||||
materialsDeleted: 0,
|
||||
materialsSkipped: 0,
|
||||
errors: [],
|
||||
skippedMaterials: [],
|
||||
retryCount: 0,
|
||||
retryAttempts: [],
|
||||
retriedAt: undefined,
|
||||
retrySuccess: false
|
||||
}
|
||||
|
||||
const detailCountText = await detailInnerFrame.getByText(/^详细信息 \(\d+\)$/).innerText()
|
||||
const detailCountMatch = detailCountText.match(/\((\d+)\)/)
|
||||
const detailCount = detailCountMatch ? parseInt(detailCountMatch[1], 10) : 0
|
||||
|
||||
// Extract status (Python lines 220-225)
|
||||
const statusText = await detailInnerFrame.getByText(/^备料状态:.+$/).innerText()
|
||||
const statusMatch = statusText.replace(/\n/g, '').match(/备料状态:(.+)$/)
|
||||
const detailStatus = statusMatch ? statusMatch[1].trim() : ''
|
||||
|
||||
// Send progress for order start
|
||||
onProgress?.(
|
||||
`开始处理订单 ${orderIndex + 1}/${totalOrders}: ${orderNumber}`,
|
||||
((1 + orderIndex) / (1 + totalOrders)) * 100,
|
||||
`开始处理订单: ${orderNumber}`,
|
||||
this.calculateProgress(
|
||||
progressState.completedOrders,
|
||||
0,
|
||||
detailCount,
|
||||
progressState.totalOrders
|
||||
),
|
||||
{
|
||||
currentOrderIndex: orderIndex + 1,
|
||||
totalOrders,
|
||||
currentOrderIndex: progressState.completedOrders + 1,
|
||||
totalOrders: progressState.totalOrders,
|
||||
currentMaterialIndex: 0,
|
||||
totalMaterialsInOrder: detailCount,
|
||||
currentOrderNumber: orderNumber
|
||||
}
|
||||
)
|
||||
|
||||
// Process based on status (Python lines 228-441)
|
||||
if (detailStatus === '审批通过' && detailCount > 0) {
|
||||
// Click modify button (Python line 235)
|
||||
await detailInnerFrame.getByRole('button', { name: '修改' }).click()
|
||||
|
||||
// Wait for save button (Python lines 238-242)
|
||||
const saveButtonLocator = detailInnerFrame.getByRole('button', { name: '保存' })
|
||||
await saveButtonLocator.waitFor({ state: 'visible', timeout: 30000 })
|
||||
|
||||
// Expand the form (Python line 245)
|
||||
await detailInnerFrame.getByText('展开').first().click()
|
||||
|
||||
// Get form elements (Python lines 247-253)
|
||||
const childForm = detailInnerFrame.locator('.card-table-side-box')
|
||||
const buttonWrapper = childForm.locator('.button-wrapper')
|
||||
const deleteRowBtn = buttonWrapper.getByRole('button', { name: '删行' })
|
||||
@@ -351,11 +558,9 @@ export class CleanerService {
|
||||
let lastRowNumber = ''
|
||||
let materialIdx = 0
|
||||
|
||||
// Process each material row (Python lines 257-423)
|
||||
while (true) {
|
||||
materialIdx++
|
||||
materialIdx += 1
|
||||
|
||||
// Wait for row number to stabilize (Python lines 262-265)
|
||||
const currentRow = await this.getInputValue(childForm, /^行号$/)
|
||||
const rowNumInt = parseInt(currentRow, 10)
|
||||
|
||||
@@ -363,28 +568,29 @@ export class CleanerService {
|
||||
await this.delay(500)
|
||||
}
|
||||
|
||||
// Get material data (Python lines 267-271)
|
||||
const materialCode = await this.getInputValue(childForm, /^材料编码/)
|
||||
const materialName = await this.getInputValue(childForm, /^材料名称/)
|
||||
const pendingQty = await this.getInputValue(childForm, /^累计待发数量$/)
|
||||
|
||||
// Report progress using formula: (1 + i + j/Mᵢ) / (1 + N) × 100
|
||||
// where i = orderIndex (0-based), j = materialIdx (1-based), Mᵢ = detailCount, N = totalOrders
|
||||
const progress = ((1 + orderIndex + materialIdx / detailCount) / (1 + totalOrders)) * 100
|
||||
const progress = this.calculateProgress(
|
||||
progressState.completedOrders,
|
||||
materialIdx,
|
||||
detailCount,
|
||||
progressState.totalOrders
|
||||
)
|
||||
|
||||
onProgress?.(
|
||||
`订单 ${orderIndex + 1}/${totalOrders} - 物料 ${materialIdx}/${detailCount}: ${materialName}`,
|
||||
`订单 ${orderNumber} - 物料 ${materialIdx}/${detailCount}: ${materialName}`,
|
||||
progress,
|
||||
{
|
||||
currentOrderIndex: orderIndex + 1,
|
||||
totalOrders,
|
||||
currentOrderIndex: progressState.completedOrders + 1,
|
||||
totalOrders: progressState.totalOrders,
|
||||
currentMaterialIndex: materialIdx,
|
||||
totalMaterialsInOrder: detailCount,
|
||||
currentOrderNumber: orderNumber
|
||||
}
|
||||
)
|
||||
|
||||
// Check if should delete (Python lines 284-406)
|
||||
if (deleteSet.has(materialCode)) {
|
||||
const shouldDelete = this.shouldDeleteMaterial({
|
||||
rowNumber: rowNumInt,
|
||||
@@ -394,19 +600,19 @@ export class CleanerService {
|
||||
})
|
||||
|
||||
if (shouldDelete && !dryRun) {
|
||||
// Delete the material (Python lines 302-340)
|
||||
const oldRowNumber = currentRow
|
||||
await deleteRowBtn.click()
|
||||
|
||||
// Wait for row number to change (Python lines 306-324)
|
||||
const deleteSuccess = await this.waitForRowChange(childForm, oldRowNumber, 10000)
|
||||
|
||||
if (deleteSuccess) {
|
||||
detail.materialsDeleted++
|
||||
detail.materialsDeleted += 1
|
||||
}
|
||||
continue
|
||||
} else if (!shouldDelete) {
|
||||
detail.materialsSkipped++
|
||||
}
|
||||
|
||||
if (!shouldDelete) {
|
||||
detail.materialsSkipped += 1
|
||||
const reason = this.getSkipReason({
|
||||
rowNumber: rowNumInt,
|
||||
pendingQty,
|
||||
@@ -422,7 +628,6 @@ export class CleanerService {
|
||||
}
|
||||
}
|
||||
|
||||
// Move to next row (Python lines 419-423)
|
||||
const isNextEnabled = await this.isButtonEnabled(nextBtn)
|
||||
if (isNextEnabled) {
|
||||
lastRowNumber = currentRow
|
||||
@@ -432,27 +637,61 @@ export class CleanerService {
|
||||
}
|
||||
}
|
||||
|
||||
// Collapse form (Python line 424)
|
||||
await collapseBtn.click()
|
||||
|
||||
// Save changes (Python lines 427-435)
|
||||
if (!dryRun && detail.materialsDeleted > 0) {
|
||||
await saveButtonLocator.click()
|
||||
await saveButtonLocator.waitFor({ state: 'hidden', timeout: 60000 })
|
||||
}
|
||||
}
|
||||
|
||||
return detail
|
||||
} finally {
|
||||
// Close detail page (Python lines 442-443)
|
||||
await detailPage.close()
|
||||
}
|
||||
|
||||
return detail
|
||||
}
|
||||
|
||||
/**
|
||||
* Wait for loading overlay to disappear
|
||||
* Reference: Python lines 192-197
|
||||
*/
|
||||
private calculateProgress(
|
||||
completedOrders: number,
|
||||
materialIdx: number,
|
||||
detailCount: number,
|
||||
totalOrders: number
|
||||
): number {
|
||||
const materialRatio = detailCount > 0 ? materialIdx / detailCount : 0
|
||||
return ((1 + completedOrders + materialRatio) / (1 + totalOrders)) * 100
|
||||
}
|
||||
|
||||
private async extractSourceOrderNumber(frame: FrameLocator): Promise<string> {
|
||||
try {
|
||||
const sourceOrder = await frame
|
||||
.locator('.vsourcebillcode .code-detail-link')
|
||||
.first()
|
||||
.innerText()
|
||||
const match = sourceOrder.match(/SC\d{14}/)
|
||||
return match ? match[0] : sourceOrder.trim()
|
||||
} catch {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
|
||||
private isOrderNumber(value: string): boolean {
|
||||
return /^SC\d{14}$/.test(value)
|
||||
}
|
||||
|
||||
private createErrorDetail(orderNumber: string, message: string): OrderCleanDetail {
|
||||
return {
|
||||
orderNumber,
|
||||
materialsDeleted: 0,
|
||||
materialsSkipped: 0,
|
||||
errors: [message],
|
||||
skippedMaterials: [],
|
||||
retryCount: 0,
|
||||
retryAttempts: [],
|
||||
retriedAt: undefined,
|
||||
retrySuccess: false
|
||||
}
|
||||
}
|
||||
|
||||
private async waitForLoading(frame: FrameLocator): Promise<void> {
|
||||
const loadingLocator = frame
|
||||
.locator('div')
|
||||
@@ -467,10 +706,6 @@ export class CleanerService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get input value by label regex
|
||||
* Reference: Python _get_input_value() lines 141-148
|
||||
*/
|
||||
private async getInputValue(
|
||||
container: FrameLocator | Locator,
|
||||
labelRegex: RegExp
|
||||
@@ -487,10 +722,6 @@ export class CleanerService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if button is enabled
|
||||
* Reference: Python _is_button_enabled() lines 133-139
|
||||
*/
|
||||
private async isButtonEnabled(button: Locator): Promise<boolean> {
|
||||
try {
|
||||
return await button.isEnabled()
|
||||
@@ -499,10 +730,6 @@ export class CleanerService {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Wait for row number to change after deletion
|
||||
* Reference: Python lines 306-324
|
||||
*/
|
||||
private async waitForRowChange(
|
||||
childForm: FrameLocator | Locator,
|
||||
oldRowNumber: string,
|
||||
@@ -525,10 +752,114 @@ export class CleanerService {
|
||||
return false
|
||||
}
|
||||
|
||||
/**
|
||||
* Delay helper
|
||||
*/
|
||||
private delay(ms: number): Promise<void> {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms))
|
||||
}
|
||||
|
||||
private async retryFailedOrders(params: {
|
||||
workFrame: FrameLocator
|
||||
popupPage: Page
|
||||
failedDetails: OrderCleanDetail[]
|
||||
deleteSet: Set<string>
|
||||
dryRun: boolean
|
||||
onProgress?: (
|
||||
message: string,
|
||||
progress?: number,
|
||||
extra?: Partial<import('../../types/cleaner.types').CleanerProgress>
|
||||
) => void
|
||||
}): Promise<RetryResult> {
|
||||
const { workFrame, popupPage, failedDetails, deleteSet, dryRun, onProgress } = params
|
||||
|
||||
const result: RetryResult = {
|
||||
retriedOrders: 0,
|
||||
successfulRetries: 0,
|
||||
updatedDetails: []
|
||||
}
|
||||
|
||||
if (failedDetails.length === 0) {
|
||||
return result
|
||||
}
|
||||
|
||||
log.info('Starting retry for failed orders', { count: failedDetails.length })
|
||||
|
||||
const MAX_RETRIES = 2
|
||||
|
||||
for (let detailIndex = 0; detailIndex < failedDetails.length; detailIndex++) {
|
||||
const failedDetail = failedDetails[detailIndex]
|
||||
const orderNumber = failedDetail.orderNumber
|
||||
const retryAttempts: import('../../types/cleaner.types').RetryAttempt[] = []
|
||||
|
||||
for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
|
||||
try {
|
||||
log.info(`Retrying order ${orderNumber} (attempt ${attempt}/${MAX_RETRIES})`)
|
||||
|
||||
await this.queryOrders(workFrame, [orderNumber])
|
||||
await this.waitForLoading(workFrame)
|
||||
|
||||
const rows = workFrame.locator('tbody tr')
|
||||
const rowCount = await rows.count()
|
||||
if (rowCount === 0) {
|
||||
throw new Error('订单重试查询无结果')
|
||||
}
|
||||
|
||||
const detailPage = await this.openDetailPageFromCurrentQuery(workFrame, popupPage)
|
||||
const retryDetail = await this.processDetailPage({
|
||||
detailPage,
|
||||
deleteSet,
|
||||
dryRun,
|
||||
expectedOrderNumber: orderNumber,
|
||||
progressState: {
|
||||
completedOrders: detailIndex,
|
||||
totalOrders: failedDetails.length
|
||||
},
|
||||
onProgress: (message, progress, extra) => {
|
||||
onProgress?.(
|
||||
`[重试 ${attempt}/${MAX_RETRIES}] ${message}`,
|
||||
progress,
|
||||
extra ? { ...extra, phase: 'processing' as const } : undefined
|
||||
)
|
||||
}
|
||||
})
|
||||
|
||||
result.successfulRetries += 1
|
||||
result.updatedDetails.push({
|
||||
...retryDetail,
|
||||
retryCount: attempt,
|
||||
retriedAt: Date.now(),
|
||||
retrySuccess: true,
|
||||
retryAttempts
|
||||
})
|
||||
result.retriedOrders += 1
|
||||
break
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : 'Unknown error'
|
||||
log.warn(`Retry attempt ${attempt} failed for order ${orderNumber}: ${message}`)
|
||||
|
||||
retryAttempts.push({
|
||||
attempt,
|
||||
error: message,
|
||||
timestamp: Date.now()
|
||||
})
|
||||
|
||||
if (attempt === MAX_RETRIES) {
|
||||
result.updatedDetails.push({
|
||||
...failedDetail,
|
||||
retryCount: MAX_RETRIES,
|
||||
retryAttempts,
|
||||
retriedAt: Date.now(),
|
||||
retrySuccess: false
|
||||
})
|
||||
result.retriedOrders += 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
log.info('Retry process completed', {
|
||||
retriedOrders: result.retriedOrders,
|
||||
successfulRetries: result.successfulRetries
|
||||
})
|
||||
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,9 +50,10 @@ export interface ResolutionStats {
|
||||
}
|
||||
|
||||
/**
|
||||
* ProductionID pattern: 2 digits + 1 letter + 1-4 digits
|
||||
* ProductionID pattern: 2 digits + 1 letter + 1-6 digits
|
||||
* Examples: 22A1, 22A123, 26B10617
|
||||
*/
|
||||
const PRODUCTION_ID_PATTERN = /^\d{2}[A-Z]\d{1,4}$/i
|
||||
const PRODUCTION_ID_PATTERN = /^\d{2}[A-Z]\d{1,6}$/i
|
||||
|
||||
/**
|
||||
* Production order number pattern: SC + 14 digits
|
||||
@@ -85,9 +86,21 @@ export class OrderNumberResolver {
|
||||
|
||||
/**
|
||||
* Get table name based on database type
|
||||
* Converts MySQL schema_tablename format to SQL Server [schema].[tablename] format
|
||||
* e.g., productionContractData_26年压力表合同数据 -> [productionContractData].[26年压力表合同数据]
|
||||
* dbo_MaterialsToBeDeleted -> [dbo].[MaterialsToBeDeleted]
|
||||
*/
|
||||
private getTableName(tableName: string): string {
|
||||
if (this.dbService.type === 'sqlserver') {
|
||||
// Find the FIRST underscore to split schema and table name
|
||||
// This handles patterns like: schema_tablename
|
||||
const firstUnderscoreIndex = tableName.indexOf('_')
|
||||
if (firstUnderscoreIndex > 0) {
|
||||
const schema = tableName.substring(0, firstUnderscoreIndex)
|
||||
const actualTableName = tableName.substring(firstUnderscoreIndex + 1)
|
||||
return `[${schema}].[${actualTableName}]`
|
||||
}
|
||||
// If no underscore found, default to dbo schema
|
||||
return `[dbo].[${tableName}]`
|
||||
}
|
||||
return tableName
|
||||
@@ -119,10 +132,12 @@ export class OrderNumberResolver {
|
||||
let params: any[]
|
||||
|
||||
if (this.dbService.type === 'sqlserver') {
|
||||
sql = `SELECT TOP 1 [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] = @p0`
|
||||
// 使用 COLLATE 指定不区分大小写的排序规则
|
||||
sql = `SELECT TOP 1 [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] COLLATE SQL_Latin1_General_CP1_CI_AS = @p0`
|
||||
params = [productionId]
|
||||
} else {
|
||||
sql = `SELECT \`${dbConfig.FIELD_ORDER_NUMBER}\` FROM \`${tableName}\` WHERE \`${dbConfig.FIELD_PRODUCTION_ID}\` = ? LIMIT 1`
|
||||
// MySQL 默认不区分大小写,但显式使用 UPPER 确保一致性
|
||||
sql = `SELECT \`${dbConfig.FIELD_ORDER_NUMBER}\` FROM \`${tableName}\` WHERE UPPER(\`${dbConfig.FIELD_PRODUCTION_ID}\`) = UPPER(?) LIMIT 1`
|
||||
params = [productionId]
|
||||
}
|
||||
|
||||
@@ -156,16 +171,23 @@ export class OrderNumberResolver {
|
||||
return new Map()
|
||||
}
|
||||
|
||||
// P1: Deduplicate input productionIds to avoid redundant queries
|
||||
const uniqueProductionIds = [...new Set(productionIds)]
|
||||
|
||||
// Use parameterized query to prevent SQL injection
|
||||
const placeholders = productionIds.map((_, i) => `@p${i}`).join(', ')
|
||||
const params = productionIds
|
||||
const placeholders = uniqueProductionIds.map((_, i) => `@p${i}`).join(', ')
|
||||
const params = uniqueProductionIds
|
||||
|
||||
let sql: string
|
||||
if (this.dbService.type === 'sqlserver') {
|
||||
sql = `SELECT [${dbConfig.FIELD_PRODUCTION_ID}], [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] IN (${placeholders})`
|
||||
// P0: Use DISTINCT to prevent duplicates from one-to-many relationships
|
||||
// 使用 COLLATE 指定不区分大小写的排序规则
|
||||
sql = `SELECT DISTINCT [${dbConfig.FIELD_PRODUCTION_ID}], [${dbConfig.FIELD_ORDER_NUMBER}] FROM ${tableName} WHERE [${dbConfig.FIELD_PRODUCTION_ID}] COLLATE SQL_Latin1_General_CP1_CI_AS IN (${placeholders})`
|
||||
} else {
|
||||
const idPlaceholders = productionIds.map(() => '?').join(', ')
|
||||
sql = `SELECT \`${dbConfig.FIELD_PRODUCTION_ID}\`, \`${dbConfig.FIELD_ORDER_NUMBER}\` FROM \`${tableName}\` WHERE \`${dbConfig.FIELD_PRODUCTION_ID}\` IN (${idPlaceholders})`
|
||||
const idPlaceholders = uniqueProductionIds.map(() => 'UPPER(?)').join(', ')
|
||||
// P0: Use DISTINCT to prevent duplicates from one-to-many relationships
|
||||
// MySQL: 使用 UPPER 确保不区分大小写
|
||||
sql = `SELECT DISTINCT \`${dbConfig.FIELD_PRODUCTION_ID}\`, \`${dbConfig.FIELD_ORDER_NUMBER}\` FROM \`${tableName}\` WHERE UPPER(\`${dbConfig.FIELD_PRODUCTION_ID}\`) IN (${idPlaceholders})`
|
||||
}
|
||||
|
||||
const result = await this.dbService.query(sql, params)
|
||||
@@ -192,11 +214,48 @@ export class OrderNumberResolver {
|
||||
|
||||
/**
|
||||
* Resolve order numbers from mixed input
|
||||
*
|
||||
* Optimized for batch processing with deduplication:
|
||||
* - Multiple productionIDs mapping to the same order number are treated as valid (not errors)
|
||||
* - Returns all mappings with duplicate tracking
|
||||
*/
|
||||
async resolve(inputs: string[]): Promise<OrderMapping[]> {
|
||||
const mappings: OrderMapping[] = []
|
||||
// P1: Deduplicate inputs at the input layer to avoid redundant queries
|
||||
const uniqueInputs = [...new Set(inputs)]
|
||||
|
||||
// Separate productionIds and order numbers
|
||||
const productionIds: string[] = []
|
||||
const orderNumbers: string[] = []
|
||||
|
||||
for (const input of uniqueInputs) {
|
||||
if (this.isOrderNumber(input)) {
|
||||
orderNumbers.push(input)
|
||||
} else if (this.isProductionId(input)) {
|
||||
productionIds.push(input)
|
||||
}
|
||||
}
|
||||
|
||||
// Batch query productionId to order number mappings
|
||||
// 使用小写 key 存储映射,以支持忽略大小写查找
|
||||
const mappings = new Map<string, string>()
|
||||
if (productionIds.length > 0) {
|
||||
const batchMappings = await this.mapProductionIdsToOrderNumbers(productionIds)
|
||||
batchMappings.forEach((orderNum, prodId) => {
|
||||
mappings.set(prodId.toLowerCase(), orderNum)
|
||||
})
|
||||
}
|
||||
|
||||
// Build results while preserving original input order
|
||||
// Note: Multiple productionIDs mapping to the same order number is VALID (not an error)
|
||||
const results: OrderMapping[] = []
|
||||
|
||||
for (const input of inputs) {
|
||||
// Skip if this exact input was already processed
|
||||
const alreadyProcessed = results.some((r) => r.input === input)
|
||||
if (alreadyProcessed) {
|
||||
continue
|
||||
}
|
||||
|
||||
const mapping: OrderMapping = { input, resolved: false }
|
||||
|
||||
if (this.isOrderNumber(input)) {
|
||||
@@ -204,35 +263,35 @@ export class OrderNumberResolver {
|
||||
mapping.orderNumber = input
|
||||
mapping.resolved = true
|
||||
} else if (this.isProductionId(input)) {
|
||||
// Is a productionID, need to lookup
|
||||
// Is a productionID, lookup from batch mappings (使用小写查找以忽略大小写)
|
||||
mapping.productionId = input
|
||||
try {
|
||||
const orderNumber = await this.mapProductionIdToOrderNumber(input)
|
||||
if (orderNumber) {
|
||||
mapping.orderNumber = orderNumber
|
||||
mapping.resolved = true
|
||||
} else {
|
||||
mapping.error = '未在数据库中找到对应的订单号'
|
||||
}
|
||||
} catch (error) {
|
||||
mapping.error = error instanceof Error ? error.message : '数据库查询失败'
|
||||
log.warn('Failed to resolve productionID', { productionId: input, error })
|
||||
const orderNumber = mappings.get(input.toLowerCase())
|
||||
if (orderNumber) {
|
||||
mapping.orderNumber = orderNumber
|
||||
mapping.resolved = true
|
||||
} else {
|
||||
mapping.error = '未在数据库中找到对应的订单号'
|
||||
}
|
||||
} else {
|
||||
mapping.error = '格式不识别:既不是有效的生产订单号也不是总排号格式'
|
||||
}
|
||||
|
||||
mappings.push(mapping)
|
||||
results.push(mapping)
|
||||
}
|
||||
|
||||
return mappings
|
||||
return results
|
||||
}
|
||||
|
||||
/**
|
||||
* Get valid order numbers from mappings
|
||||
* P2: Returns deduplicated order numbers
|
||||
*/
|
||||
getValidOrderNumbers(mappings: OrderMapping[]): string[] {
|
||||
return mappings.filter((m) => m.resolved && m.orderNumber).map((m) => m.orderNumber!)
|
||||
const validNumbers = mappings
|
||||
.filter((m) => m.resolved && m.orderNumber)
|
||||
.map((m) => m.orderNumber!)
|
||||
// P2: Deduplicate before returning
|
||||
return [...new Set(validNumbers)]
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -282,4 +341,47 @@ export class OrderNumberResolver {
|
||||
|
||||
return stats
|
||||
}
|
||||
|
||||
/**
|
||||
* Get deduplication summary for logging
|
||||
* Returns a human-readable report showing:
|
||||
* - Input count
|
||||
* - Unique order numbers count
|
||||
* - Mapping details (which productionIDs map to which order numbers)
|
||||
*/
|
||||
getDeduplicationReport(mappings: OrderMapping[]): {
|
||||
inputCount: number
|
||||
uniqueOrderNumbersCount: number
|
||||
orderNumberGroups: Map<string, string[]>
|
||||
summary: string
|
||||
} {
|
||||
// Group productionIDs by their resolved order number
|
||||
const orderNumberGroups = new Map<string, string[]>()
|
||||
|
||||
for (const mapping of mappings) {
|
||||
if (mapping.resolved && mapping.orderNumber) {
|
||||
const existing = orderNumberGroups.get(mapping.orderNumber) || []
|
||||
existing.push(mapping.input)
|
||||
orderNumberGroups.set(mapping.orderNumber, existing)
|
||||
}
|
||||
}
|
||||
|
||||
const inputCount = mappings.length
|
||||
const uniqueOrderNumbersCount = orderNumberGroups.size
|
||||
|
||||
// Build summary string
|
||||
let summary = `输入 ${inputCount} 个总排号 → 解析为 ${uniqueOrderNumbersCount} 个唯一订单号`
|
||||
|
||||
if (inputCount > uniqueOrderNumbersCount) {
|
||||
const duplicateCount = inputCount - uniqueOrderNumbersCount
|
||||
summary += `(${duplicateCount} 个重复已合并)`
|
||||
}
|
||||
|
||||
return {
|
||||
inputCount,
|
||||
uniqueOrderNumbersCount,
|
||||
orderNumberGroups,
|
||||
summary
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,6 +89,10 @@ export class CleanerReportGenerator {
|
||||
lines.push(`| **删除物料数** | \`${result.materialsDeleted}\``)
|
||||
lines.push(`| **跳过物料数** | \`${result.materialsSkipped}\``)
|
||||
lines.push(`| **错误数量** | \`${result.errors.length}\``)
|
||||
if (result.retriedOrders > 0) {
|
||||
lines.push(`| **重试订单数** | \`${result.retriedOrders}\``)
|
||||
lines.push(`| **成功重试数** | \`${result.successfulRetries}\``)
|
||||
}
|
||||
lines.push(`| **执行耗时** | \`${this.formatDuration(options.startTime, options.endTime)}\``)
|
||||
lines.push('')
|
||||
lines.push('---')
|
||||
@@ -100,6 +104,12 @@ export class CleanerReportGenerator {
|
||||
lines.push('| ----------- | ---- | ------ |')
|
||||
lines.push(`| ✅ 成功订单 | ${stats.successCount} | ${stats.successRate.toFixed(1)}% |`)
|
||||
lines.push(`| ❌ 失败订单 | ${stats.failureCount} | ${(100 - stats.successRate).toFixed(1)}% |`)
|
||||
if (result.retriedOrders > 0) {
|
||||
const retrySuccessRate =
|
||||
result.retriedOrders > 0 ? (result.successfulRetries / result.retriedOrders) * 100 : 0
|
||||
lines.push(`| 🔄 重试订单 | ${result.retriedOrders} | 100% |`)
|
||||
lines.push(`| ✅ 成功重试 | ${result.successfulRetries} | ${retrySuccessRate.toFixed(1)}% |`)
|
||||
}
|
||||
lines.push('')
|
||||
lines.push('---')
|
||||
lines.push('')
|
||||
@@ -111,10 +121,19 @@ export class CleanerReportGenerator {
|
||||
|
||||
result.details.forEach((detail, index) => {
|
||||
const orderNum = index + 1
|
||||
const status = detail.errors.length > 0 ? '❌ 失败' : '✅ 成功'
|
||||
let status = detail.errors.length > 0 ? '❌ 失败' : '✅ 成功'
|
||||
|
||||
// Override status if retry was successful
|
||||
if (detail.retrySuccess) {
|
||||
status = '✅ 重试成功'
|
||||
} else if (detail.retryCount > 0 && !detail.retrySuccess) {
|
||||
status = '❌ 重试失败'
|
||||
}
|
||||
|
||||
const errorMsg = detail.errors.length > 0 ? detail.errors[0] : '-'
|
||||
const retryInfo = detail.retryCount > 0 ? ` [重试${detail.retryCount}次]` : ''
|
||||
lines.push(
|
||||
`| ${orderNum} | \`${detail.orderNumber}\` | ${detail.materialsDeleted} | ${detail.materialsSkipped} | ${status} | \`${errorMsg}\` |`
|
||||
`| ${orderNum} | \`${detail.orderNumber}\` | ${detail.materialsDeleted} | ${detail.materialsSkipped} | ${status}${retryInfo} | \`${errorMsg}\` |`
|
||||
)
|
||||
})
|
||||
|
||||
@@ -175,6 +194,62 @@ export class CleanerReportGenerator {
|
||||
lines.push('')
|
||||
}
|
||||
|
||||
// Add retry details section
|
||||
if (result.retriedOrders > 0) {
|
||||
lines.push('## 重试执行详情')
|
||||
lines.push('')
|
||||
lines.push(
|
||||
`**重试订单总数**: \`${result.retriedOrders}\` | **成功**: \`${result.successfulRetries}\` | **失败**: \`${result.retriedOrders - result.successfulRetries}\``
|
||||
)
|
||||
lines.push('')
|
||||
|
||||
const retriedDetails = result.details.filter((d) => d.retryCount > 0)
|
||||
|
||||
if (retriedDetails.length > 0) {
|
||||
lines.push('### 重试订单列表')
|
||||
lines.push('')
|
||||
lines.push('| 订单号 | 重试次数 | 重试结果 | 重试时间 |')
|
||||
lines.push('| -------- | -------- | -------- | ------------ |')
|
||||
|
||||
retriedDetails.forEach((detail) => {
|
||||
const retryStatus = detail.retrySuccess ? '✅ 成功' : '❌ 失败'
|
||||
const retryTime = detail.retriedAt ? this.formatDateTime(detail.retriedAt) : '-'
|
||||
lines.push(
|
||||
`| \`${detail.orderNumber}\` | ${detail.retryCount} | ${retryStatus} | ${retryTime} |`
|
||||
)
|
||||
})
|
||||
|
||||
lines.push('')
|
||||
lines.push('### 重试尝试详细记录')
|
||||
lines.push('')
|
||||
|
||||
retriedDetails.forEach((detail) => {
|
||||
lines.push(`#### \`${detail.orderNumber}\``)
|
||||
lines.push('')
|
||||
lines.push(`- **重试次数**: ${detail.retryCount}`)
|
||||
lines.push(`- **最终结果**: ${detail.retrySuccess ? '✅ 成功' : '❌ 失败'}`)
|
||||
|
||||
if (detail.retryAttempts && detail.retryAttempts.length > 0) {
|
||||
lines.push('')
|
||||
lines.push('**重试尝试记录**:')
|
||||
lines.push('')
|
||||
detail.retryAttempts.forEach((attempt, idx) => {
|
||||
lines.push(
|
||||
`${idx + 1}. **第${attempt.attempt}次尝试** - ${this.formatDateTime(attempt.timestamp)}`
|
||||
)
|
||||
lines.push(` - 错误:${attempt.error}`)
|
||||
})
|
||||
lines.push('')
|
||||
}
|
||||
|
||||
lines.push('---')
|
||||
lines.push('')
|
||||
})
|
||||
}
|
||||
|
||||
lines.push('')
|
||||
}
|
||||
|
||||
lines.push(`**报告生成时间**: \`${this.formatDateTime(options.endTime)}\``)
|
||||
lines.push('**报表版本**: `v1.0`')
|
||||
|
||||
|
||||
6
src/main/services/rustfs/index.ts
Normal file
6
src/main/services/rustfs/index.ts
Normal file
@@ -0,0 +1,6 @@
|
||||
/**
|
||||
* RustFS Service Module
|
||||
*/
|
||||
|
||||
export { RustfsService } from './rustfs-service'
|
||||
export type { UploadResult, DownloadResult, RustfsServiceOptions } from './rustfs-service'
|
||||
376
src/main/services/rustfs/rustfs-service.ts
Normal file
376
src/main/services/rustfs/rustfs-service.ts
Normal file
@@ -0,0 +1,376 @@
|
||||
/**
|
||||
* RustFS Service
|
||||
*
|
||||
* S3-compatible object storage service for persisting reports and files
|
||||
* Uses AWS SDK for S3 protocol compatibility
|
||||
*/
|
||||
|
||||
import {
|
||||
S3Client,
|
||||
PutObjectCommand,
|
||||
GetObjectCommand,
|
||||
DeleteObjectCommand,
|
||||
ListObjectsV2Command,
|
||||
type PutObjectCommandInput,
|
||||
type GetObjectCommandInput,
|
||||
type DeleteObjectCommandInput
|
||||
} from '@aws-sdk/client-s3'
|
||||
import { createLogger } from '../logger'
|
||||
import type { RustfsConfig } from '../../types/config.schema'
|
||||
import * as fs from 'fs'
|
||||
import * as path from 'path'
|
||||
|
||||
const log = createLogger('RustfsService')
|
||||
|
||||
export interface UploadResult {
|
||||
success: boolean
|
||||
key: string
|
||||
etag?: string
|
||||
error?: string
|
||||
}
|
||||
|
||||
export interface DownloadResult {
|
||||
success: boolean
|
||||
content: Buffer
|
||||
error?: string
|
||||
}
|
||||
|
||||
export interface RustfsServiceOptions {
|
||||
config: RustfsConfig
|
||||
}
|
||||
|
||||
export class RustfsService {
|
||||
private client: S3Client
|
||||
private config: RustfsConfig
|
||||
|
||||
constructor(options: RustfsServiceOptions) {
|
||||
const { config } = options
|
||||
|
||||
this.config = config
|
||||
|
||||
// Configure S3 client for RustFS
|
||||
// RustFS is fully compatible with S3 protocol
|
||||
this.client = new S3Client({
|
||||
region: config.region || 'us-east-1',
|
||||
endpoint: config.endpoint,
|
||||
credentials: {
|
||||
accessKeyId: config.accessKey,
|
||||
secretAccessKey: config.secretKey
|
||||
},
|
||||
forcePathStyle: true // Required for some S3-compatible services
|
||||
})
|
||||
|
||||
log.info('RustFS service initialized', {
|
||||
endpoint: config.endpoint,
|
||||
bucket: config.bucket,
|
||||
region: config.region
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
* Upload a file to RustFS
|
||||
* @param filePath - Local file path to upload
|
||||
* @param key - Object key (path) in the bucket
|
||||
* @param contentType - Optional MIME type
|
||||
*/
|
||||
async uploadFile(filePath: string, key: string, contentType?: string): Promise<UploadResult> {
|
||||
try {
|
||||
// Validate configuration
|
||||
if (!this.config.enabled) {
|
||||
return {
|
||||
success: false,
|
||||
key,
|
||||
error: 'RustFS is not enabled in configuration'
|
||||
}
|
||||
}
|
||||
|
||||
// Check if file exists
|
||||
if (!fs.existsSync(filePath)) {
|
||||
return {
|
||||
success: false,
|
||||
key,
|
||||
error: `File not found: ${filePath}`
|
||||
}
|
||||
}
|
||||
|
||||
// Read file content
|
||||
const fileContent = await fs.promises.readFile(filePath)
|
||||
|
||||
// Determine content type
|
||||
const mimeType = contentType || this.getMimeType(filePath) || 'application/octet-stream'
|
||||
|
||||
log.info('Uploading file to RustFS', {
|
||||
filePath,
|
||||
key,
|
||||
contentType: mimeType,
|
||||
size: fileContent.length
|
||||
})
|
||||
|
||||
const input: PutObjectCommandInput = {
|
||||
Bucket: this.config.bucket,
|
||||
Key: key,
|
||||
Body: fileContent,
|
||||
ContentType: mimeType
|
||||
}
|
||||
|
||||
const command = new PutObjectCommand(input)
|
||||
const response = await this.client.send(command)
|
||||
|
||||
log.info('File uploaded successfully', {
|
||||
key,
|
||||
etag: response.ETag
|
||||
})
|
||||
|
||||
return {
|
||||
success: true,
|
||||
key,
|
||||
etag: response.ETag
|
||||
}
|
||||
} catch (error) {
|
||||
const errorMessage = error instanceof Error ? error.message : 'Unknown upload error'
|
||||
log.error('Failed to upload file to RustFS', {
|
||||
filePath,
|
||||
key,
|
||||
error: errorMessage
|
||||
})
|
||||
|
||||
return {
|
||||
success: false,
|
||||
key,
|
||||
error: errorMessage
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Upload a string content directly to RustFS
|
||||
* @param content - String content to upload
|
||||
* @param key - Object key (path) in the bucket
|
||||
* @param contentType - Optional MIME type
|
||||
*/
|
||||
async uploadString(content: string, key: string, contentType?: string): Promise<UploadResult> {
|
||||
try {
|
||||
if (!this.config.enabled) {
|
||||
return {
|
||||
success: false,
|
||||
key,
|
||||
error: 'RustFS is not enabled in configuration'
|
||||
}
|
||||
}
|
||||
|
||||
const mimeType = contentType || 'text/plain; charset=utf-8'
|
||||
|
||||
log.info('Uploading string content to RustFS', {
|
||||
key,
|
||||
contentType: mimeType,
|
||||
size: content.length
|
||||
})
|
||||
|
||||
const input: PutObjectCommandInput = {
|
||||
Bucket: this.config.bucket,
|
||||
Key: key,
|
||||
Body: Buffer.from(content, 'utf-8'),
|
||||
ContentType: mimeType
|
||||
}
|
||||
|
||||
const command = new PutObjectCommand(input)
|
||||
const response = await this.client.send(command)
|
||||
|
||||
log.info('String content uploaded successfully', {
|
||||
key,
|
||||
etag: response.ETag
|
||||
})
|
||||
|
||||
return {
|
||||
success: true,
|
||||
key,
|
||||
etag: response.ETag
|
||||
}
|
||||
} catch (error) {
|
||||
const errorMessage = error instanceof Error ? error.message : 'Unknown upload error'
|
||||
log.error('Failed to upload string to RustFS', {
|
||||
key,
|
||||
error: errorMessage
|
||||
})
|
||||
|
||||
return {
|
||||
success: false,
|
||||
key,
|
||||
error: errorMessage
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Download a file from RustFS
|
||||
* @param key - Object key (path) in the bucket
|
||||
*/
|
||||
async downloadFile(key: string): Promise<DownloadResult> {
|
||||
try {
|
||||
if (!this.config.enabled) {
|
||||
return {
|
||||
success: false,
|
||||
content: Buffer.alloc(0),
|
||||
error: 'RustFS is not enabled in configuration'
|
||||
}
|
||||
}
|
||||
|
||||
log.info('Downloading file from RustFS', { key })
|
||||
|
||||
const input: GetObjectCommandInput = {
|
||||
Bucket: this.config.bucket,
|
||||
Key: key
|
||||
}
|
||||
|
||||
const command = new GetObjectCommand(input)
|
||||
const response = await this.client.send(command)
|
||||
|
||||
const chunks: Buffer[] = []
|
||||
for await (const chunk of response.Body as any) {
|
||||
chunks.push(Buffer.from(chunk))
|
||||
}
|
||||
|
||||
const content = Buffer.concat(chunks)
|
||||
|
||||
log.info('File downloaded successfully', {
|
||||
key,
|
||||
size: content.length
|
||||
})
|
||||
|
||||
return {
|
||||
success: true,
|
||||
content
|
||||
}
|
||||
} catch (error) {
|
||||
const errorMessage = error instanceof Error ? error.message : 'Unknown download error'
|
||||
log.error('Failed to download file from RustFS', {
|
||||
key,
|
||||
error: errorMessage
|
||||
})
|
||||
|
||||
return {
|
||||
success: false,
|
||||
content: Buffer.alloc(0),
|
||||
error: errorMessage
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete a file from RustFS
|
||||
* @param key - Object key (path) in the bucket
|
||||
*/
|
||||
async deleteFile(key: string): Promise<{ success: boolean; error?: string }> {
|
||||
try {
|
||||
if (!this.config.enabled) {
|
||||
return {
|
||||
success: false,
|
||||
error: 'RustFS is not enabled in configuration'
|
||||
}
|
||||
}
|
||||
|
||||
log.info('Deleting file from RustFS', { key })
|
||||
|
||||
const input: DeleteObjectCommandInput = {
|
||||
Bucket: this.config.bucket,
|
||||
Key: key
|
||||
}
|
||||
|
||||
const command = new DeleteObjectCommand(input)
|
||||
await this.client.send(command)
|
||||
|
||||
log.info('File deleted successfully', { key })
|
||||
|
||||
return {
|
||||
success: true
|
||||
}
|
||||
} catch (error) {
|
||||
const errorMessage = error instanceof Error ? error.message : 'Unknown delete error'
|
||||
log.error('Failed to delete file from RustFS', {
|
||||
key,
|
||||
error: errorMessage
|
||||
})
|
||||
|
||||
return {
|
||||
success: false,
|
||||
error: errorMessage
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate a storage key for cleaner reports
|
||||
* @param reportFileName - Original report file name
|
||||
* @param username - Username who generated the report
|
||||
*/
|
||||
generateReportKey(reportFileName: string, username: string): string {
|
||||
// Organize reports by user for easy access
|
||||
// Format: reports/cleaner/{username}/{filename}
|
||||
return `reports/cleaner/${username}/${reportFileName}`
|
||||
}
|
||||
|
||||
/**
|
||||
* Get MIME type based on file extension
|
||||
*/
|
||||
private getMimeType(filePath: string): string | null {
|
||||
const ext = path.extname(filePath).toLowerCase()
|
||||
const mimeTypes: Record<string, string> = {
|
||||
'.md': 'text/markdown; charset=utf-8',
|
||||
'.txt': 'text/plain; charset=utf-8',
|
||||
'.json': 'application/json; charset=utf-8',
|
||||
'.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||
'.xls': 'application/vnd.ms-excel',
|
||||
'.csv': 'text/csv; charset=utf-8',
|
||||
'.pdf': 'application/pdf',
|
||||
'.png': 'image/png',
|
||||
'.jpg': 'image/jpeg',
|
||||
'.jpeg': 'image/jpeg',
|
||||
'.gif': 'image/gif'
|
||||
}
|
||||
return mimeTypes[ext] || null
|
||||
}
|
||||
|
||||
/**
|
||||
* Test connection to RustFS
|
||||
*/
|
||||
async testConnection(): Promise<{
|
||||
success: boolean
|
||||
message: string
|
||||
error?: string
|
||||
}> {
|
||||
try {
|
||||
log.info('Testing RustFS connection', {
|
||||
endpoint: this.config.endpoint,
|
||||
bucket: this.config.bucket
|
||||
})
|
||||
|
||||
// Try to list objects in the bucket (head bucket operation)
|
||||
const input = {
|
||||
Bucket: this.config.bucket,
|
||||
Prefix: '',
|
||||
MaxKeys: 1
|
||||
}
|
||||
|
||||
const command = new ListObjectsV2Command(input)
|
||||
await this.client.send(command)
|
||||
|
||||
log.info('RustFS connection test successful')
|
||||
|
||||
return {
|
||||
success: true,
|
||||
message: '连接成功'
|
||||
}
|
||||
} catch (error) {
|
||||
const errorMessage = error instanceof Error ? error.message : 'Unknown connection error'
|
||||
log.error('RustFS connection test failed', {
|
||||
error: errorMessage
|
||||
})
|
||||
|
||||
return {
|
||||
success: false,
|
||||
message: '连接失败',
|
||||
error: errorMessage
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
650
src/main/services/update/update-service.ts
Normal file
650
src/main/services/update/update-service.ts
Normal file
@@ -0,0 +1,650 @@
|
||||
import { BrowserWindow, app } from 'electron'
|
||||
import { createHash } from 'crypto'
|
||||
import * as fs from 'fs'
|
||||
import * as path from 'path'
|
||||
import { spawn } from 'child_process'
|
||||
import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3'
|
||||
import { ConfigManager } from '../config/config-manager'
|
||||
import { createLogger } from '../logger'
|
||||
import { IPC_CHANNELS } from '../../../shared/ipc-channels'
|
||||
import type { UpdateConfig } from '../../types/config.schema'
|
||||
import type { UserType } from '../../types/user.types'
|
||||
import type {
|
||||
DownloadReleaseRequest,
|
||||
DownloadedRelease,
|
||||
ReleaseChannel,
|
||||
UpdateCatalog,
|
||||
UpdateDialogCatalog,
|
||||
UpdateRelease,
|
||||
UpdateStatus
|
||||
} from '../../types/update.types'
|
||||
import {
|
||||
compareVersions,
|
||||
limitCatalogHistory,
|
||||
normalizeReleases,
|
||||
resolveAdminDecision,
|
||||
resolveUserDecision
|
||||
} from './update-utils'
|
||||
|
||||
const log = createLogger('UpdateService')
|
||||
|
||||
function appendPortableLaunchLog(logPath: string, message: string, meta?: Record<string, unknown>): void {
|
||||
try {
|
||||
fs.mkdirSync(path.dirname(logPath), { recursive: true })
|
||||
const timestamp = new Date().toISOString()
|
||||
const suffix = meta ? ` ${JSON.stringify(meta)}` : ''
|
||||
fs.appendFileSync(logPath, `${timestamp} ${message}${suffix}\n`, 'utf-8')
|
||||
} catch {
|
||||
// Best-effort debug log only.
|
||||
}
|
||||
}
|
||||
|
||||
function getCurrentAppVersion(): string {
|
||||
return typeof app.getVersion === 'function' ? app.getVersion() : '0.0.0'
|
||||
}
|
||||
|
||||
function getCurrentChannel(): ReleaseChannel {
|
||||
return typeof __APP_CHANNEL__ !== 'undefined' ? __APP_CHANNEL__ : 'stable'
|
||||
}
|
||||
|
||||
function isMissingObjectError(error: unknown): boolean {
|
||||
if (!error || typeof error !== 'object') {
|
||||
return false
|
||||
}
|
||||
|
||||
const candidate = error as {
|
||||
name?: string
|
||||
Code?: string
|
||||
code?: string
|
||||
message?: string
|
||||
}
|
||||
|
||||
return (
|
||||
candidate.name === 'NoSuchKey' ||
|
||||
candidate.Code === 'NoSuchKey' ||
|
||||
candidate.code === 'NoSuchKey' ||
|
||||
candidate.message?.includes('The specified key does not exist') === true
|
||||
)
|
||||
}
|
||||
|
||||
function getSupportState(config: UpdateConfig | null): {
|
||||
supported: boolean
|
||||
reason?: string
|
||||
} {
|
||||
if (process.platform !== 'win32') {
|
||||
return { supported: false, reason: '当前仅支持 Windows 自动更新' }
|
||||
}
|
||||
|
||||
if (app.isPackaged) {
|
||||
return { supported: true }
|
||||
}
|
||||
|
||||
if (config?.allowDevMode) {
|
||||
return { supported: true, reason: '开发模式调试已启用更新检查' }
|
||||
}
|
||||
|
||||
return { supported: false, reason: '开发模式默认禁用自动更新检查' }
|
||||
}
|
||||
|
||||
const DEFAULT_STATUS: UpdateStatus = {
|
||||
enabled: false,
|
||||
supported: false,
|
||||
phase: 'idle',
|
||||
currentVersion: getCurrentAppVersion(),
|
||||
currentChannel: getCurrentChannel(),
|
||||
currentUserType: null
|
||||
}
|
||||
|
||||
class UpdateStorageClient {
|
||||
private client: S3Client
|
||||
private bucket: string
|
||||
|
||||
constructor(config: UpdateConfig) {
|
||||
this.bucket = config.bucket
|
||||
this.client = new S3Client({
|
||||
region: config.region,
|
||||
endpoint: config.endpoint,
|
||||
credentials: {
|
||||
accessKeyId: config.accessKey,
|
||||
secretAccessKey: config.secretKey
|
||||
},
|
||||
forcePathStyle: true
|
||||
})
|
||||
}
|
||||
|
||||
async readText(key: string): Promise<string> {
|
||||
const response = await this.client.send(
|
||||
new GetObjectCommand({
|
||||
Bucket: this.bucket,
|
||||
Key: key
|
||||
})
|
||||
)
|
||||
|
||||
const chunks: Buffer[] = []
|
||||
for await (const chunk of response.Body as AsyncIterable<Uint8Array>) {
|
||||
chunks.push(Buffer.from(chunk))
|
||||
}
|
||||
return Buffer.concat(chunks).toString('utf-8')
|
||||
}
|
||||
|
||||
async downloadToFile(key: string, destination: string): Promise<void> {
|
||||
const response = await this.client.send(
|
||||
new GetObjectCommand({
|
||||
Bucket: this.bucket,
|
||||
Key: key
|
||||
})
|
||||
)
|
||||
|
||||
await fs.promises.mkdir(path.dirname(destination), { recursive: true })
|
||||
const output = fs.createWriteStream(destination)
|
||||
const body = response.Body as NodeJS.ReadableStream
|
||||
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
body.on('error', reject)
|
||||
output.on('error', reject)
|
||||
output.on('finish', resolve)
|
||||
body.pipe(output)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
export class UpdateService {
|
||||
private static instance: UpdateService | null = null
|
||||
|
||||
private config: UpdateConfig | null = null
|
||||
private storageClient: UpdateStorageClient | null = null
|
||||
private status: UpdateStatus = { ...DEFAULT_STATUS }
|
||||
private catalog: UpdateCatalog = { stable: [], preview: [] }
|
||||
private changelogCache = new Map<string, string>()
|
||||
private intervalHandle: NodeJS.Timeout | null = null
|
||||
private initialized = false
|
||||
|
||||
public static getInstance(): UpdateService {
|
||||
if (!UpdateService.instance) {
|
||||
UpdateService.instance = new UpdateService()
|
||||
}
|
||||
|
||||
return UpdateService.instance
|
||||
}
|
||||
|
||||
public initialize(): void {
|
||||
if (this.initialized) {
|
||||
return
|
||||
}
|
||||
|
||||
this.config = ConfigManager.getInstance().getConfig().update ?? null
|
||||
const supportState = getSupportState(this.config)
|
||||
const enabled = Boolean(this.config?.enabled && supportState.supported)
|
||||
|
||||
this.status = {
|
||||
...this.status,
|
||||
enabled,
|
||||
supported: supportState.supported,
|
||||
message: supportState.reason
|
||||
}
|
||||
|
||||
if (enabled && this.config) {
|
||||
this.storageClient = new UpdateStorageClient(this.config)
|
||||
}
|
||||
|
||||
log.info('Update service initialized', {
|
||||
enabled,
|
||||
supported: supportState.supported,
|
||||
currentVersion: this.status.currentVersion,
|
||||
currentChannel: this.status.currentChannel
|
||||
})
|
||||
|
||||
this.initialized = true
|
||||
}
|
||||
|
||||
public getStatus(): UpdateStatus {
|
||||
return { ...this.status }
|
||||
}
|
||||
|
||||
public getCatalog(): UpdateDialogCatalog {
|
||||
const currentUserType = this.status.currentUserType
|
||||
if (!this.status.enabled || !currentUserType || currentUserType === 'Guest') {
|
||||
return { mode: 'disabled' }
|
||||
}
|
||||
|
||||
if (currentUserType === 'User') {
|
||||
return {
|
||||
mode: 'user',
|
||||
recommendedRelease: this.status.recommendedRelease
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
mode: 'admin',
|
||||
recommendedRelease: this.status.recommendedRelease,
|
||||
channels: limitCatalogHistory(
|
||||
this.catalog,
|
||||
this.config?.maxAdminHistoryPerChannel ?? 10
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
public async getChangelog(release: DownloadReleaseRequest): Promise<string> {
|
||||
this.ensureInitialized()
|
||||
if (!this.status.enabled || !this.storageClient) {
|
||||
throw new Error('自动更新不可用')
|
||||
}
|
||||
|
||||
const cacheKey = `${release.channel}:${release.version}`
|
||||
const cached = this.changelogCache.get(cacheKey)
|
||||
if (cached) {
|
||||
return cached
|
||||
}
|
||||
|
||||
const markdown = await this.storageClient.readText(release.changelogKey)
|
||||
this.changelogCache.set(cacheKey, markdown)
|
||||
return markdown
|
||||
}
|
||||
|
||||
public async setUserContext(userType: UserType | null): Promise<void> {
|
||||
this.ensureInitialized()
|
||||
this.status.currentUserType = userType
|
||||
|
||||
if (!this.status.enabled || !userType || userType === 'Guest') {
|
||||
this.clearPolling()
|
||||
this.catalog = { stable: [], preview: [] }
|
||||
this.publishStatus({
|
||||
phase: 'idle',
|
||||
currentUserType: userType,
|
||||
recommendedRelease: undefined,
|
||||
latestVersion: undefined,
|
||||
latestChannel: undefined,
|
||||
downloadedRelease: undefined,
|
||||
progress: undefined,
|
||||
adminHasAnyRelease: false,
|
||||
error: undefined,
|
||||
message: this.status.supported ? undefined : this.status.message
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
await this.checkForUpdates()
|
||||
this.startPolling()
|
||||
}
|
||||
|
||||
public async checkForUpdates(): Promise<UpdateStatus> {
|
||||
this.ensureInitialized()
|
||||
if (!this.status.enabled || !this.storageClient || !this.config) {
|
||||
return this.getStatus()
|
||||
}
|
||||
|
||||
this.publishStatus({
|
||||
phase: 'checking',
|
||||
error: undefined,
|
||||
message: '正在检查更新...'
|
||||
})
|
||||
|
||||
try {
|
||||
const currentUserType = this.status.currentUserType
|
||||
this.catalog = {
|
||||
stable: await this.fetchChannelIndex('stable'),
|
||||
preview: currentUserType === 'Admin' ? await this.fetchChannelIndex('preview') : []
|
||||
}
|
||||
|
||||
if (currentUserType === 'User') {
|
||||
await this.processUserCatalog()
|
||||
} else if (currentUserType === 'Admin') {
|
||||
this.processAdminCatalog()
|
||||
} else {
|
||||
this.publishStatus({
|
||||
phase: 'idle',
|
||||
message: undefined,
|
||||
error: undefined
|
||||
})
|
||||
}
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : '检查更新失败'
|
||||
log.error('Failed to check for updates', { error: message })
|
||||
this.publishStatus({
|
||||
phase: 'error',
|
||||
error: message,
|
||||
message: '检查更新失败'
|
||||
})
|
||||
}
|
||||
|
||||
return this.getStatus()
|
||||
}
|
||||
|
||||
public async downloadRelease(request: DownloadReleaseRequest): Promise<UpdateStatus> {
|
||||
this.ensureInitialized()
|
||||
if (!this.status.enabled || !this.storageClient) {
|
||||
throw new Error('自动更新不可用')
|
||||
}
|
||||
|
||||
this.publishStatus({
|
||||
phase: 'downloading',
|
||||
progress: 0,
|
||||
latestVersion: request.version,
|
||||
latestChannel: request.channel,
|
||||
recommendedRelease: request,
|
||||
message: `正在下载 ${request.channel} ${request.version}...`,
|
||||
error: undefined
|
||||
})
|
||||
|
||||
const downloadPath = this.getDownloadPath(request)
|
||||
await this.storageClient.downloadToFile(request.artifactKey, downloadPath)
|
||||
const hash = await this.calculateSha256(downloadPath)
|
||||
|
||||
if (hash.toLowerCase() !== request.sha256.toLowerCase()) {
|
||||
await fs.promises.rm(downloadPath, { force: true })
|
||||
throw new Error('更新包校验失败,文件哈希不匹配')
|
||||
}
|
||||
|
||||
this.publishStatus({
|
||||
phase: 'downloaded',
|
||||
progress: 100,
|
||||
downloadedRelease: {
|
||||
version: request.version,
|
||||
channel: request.channel,
|
||||
localPath: downloadPath
|
||||
},
|
||||
latestVersion: request.version,
|
||||
latestChannel: request.channel,
|
||||
message: `已下载 ${request.channel} ${request.version}`
|
||||
})
|
||||
|
||||
return this.getStatus()
|
||||
}
|
||||
|
||||
public async installDownloadedRelease(): Promise<void> {
|
||||
this.ensureInitialized()
|
||||
|
||||
const downloaded = this.status.downloadedRelease
|
||||
if (!this.status.enabled || !downloaded) {
|
||||
throw new Error('没有可安装的更新包')
|
||||
}
|
||||
|
||||
const updaterSourcePath = this.resolveUpdaterBinaryPath()
|
||||
const updaterPath = await this.prepareUpdaterBinary(updaterSourcePath)
|
||||
const targetExe = process.env.PORTABLE_EXECUTABLE_FILE || process.execPath
|
||||
const logPath = path.join(app.getPath('userData'), 'updates', 'portable-update.log')
|
||||
const launchLogPath = path.join(app.getPath('userData'), 'updates', 'portable-launch.log')
|
||||
const appArgs = process.argv.slice(1)
|
||||
const argsBase64 =
|
||||
appArgs.length > 0 ? Buffer.from(appArgs.join('\0'), 'utf-8').toString('base64') : ''
|
||||
|
||||
const spawnArgs = [
|
||||
'--targetExe',
|
||||
targetExe,
|
||||
'--downloadedExe',
|
||||
downloaded.localPath,
|
||||
'--parentPid',
|
||||
String(process.pid),
|
||||
'--logPath',
|
||||
logPath
|
||||
]
|
||||
|
||||
if (argsBase64) {
|
||||
spawnArgs.push('--argsBase64', argsBase64)
|
||||
}
|
||||
|
||||
this.publishStatus({
|
||||
phase: 'installing',
|
||||
latestVersion: downloaded.version,
|
||||
latestChannel: downloaded.channel,
|
||||
message: `正在安装 ${downloaded.version}...`,
|
||||
error: undefined
|
||||
})
|
||||
|
||||
appendPortableLaunchLog(launchLogPath, 'Preparing portable updater launch', {
|
||||
updaterSourcePath,
|
||||
updaterPath,
|
||||
targetExe,
|
||||
downloadedExe: downloaded.localPath,
|
||||
parentPid: process.pid,
|
||||
logPath,
|
||||
appArgs,
|
||||
updaterExists: fs.existsSync(updaterPath),
|
||||
spawnArgs
|
||||
})
|
||||
|
||||
const child = spawn(updaterPath, spawnArgs, {
|
||||
detached: true,
|
||||
stdio: 'ignore',
|
||||
windowsHide: true
|
||||
})
|
||||
|
||||
appendPortableLaunchLog(launchLogPath, 'Spawn returned for portable updater', {
|
||||
childPid: child.pid ?? null
|
||||
})
|
||||
|
||||
child.on('error', (error) => {
|
||||
appendPortableLaunchLog(launchLogPath, 'Portable updater executable spawn error', {
|
||||
error: error instanceof Error ? error.message : String(error)
|
||||
})
|
||||
log.error('Failed to launch portable updater executable', {
|
||||
error: error instanceof Error ? error.message : String(error)
|
||||
})
|
||||
})
|
||||
|
||||
child.once('spawn', () => {
|
||||
appendPortableLaunchLog(launchLogPath, 'Portable updater executable spawned', {
|
||||
childPid: child.pid ?? null
|
||||
})
|
||||
})
|
||||
|
||||
child.unref()
|
||||
app.quit()
|
||||
}
|
||||
|
||||
private ensureInitialized(): void {
|
||||
if (!this.initialized) {
|
||||
this.initialize()
|
||||
}
|
||||
}
|
||||
|
||||
private publishStatus(next: Partial<UpdateStatus>): void {
|
||||
this.status = {
|
||||
...this.status,
|
||||
...next
|
||||
}
|
||||
|
||||
BrowserWindow.getAllWindows().forEach((window) => {
|
||||
window.webContents.send(IPC_CHANNELS.UPDATE_STATUS_CHANGED, this.status)
|
||||
})
|
||||
}
|
||||
|
||||
private async fetchChannelIndex(channel: ReleaseChannel): Promise<UpdateRelease[]> {
|
||||
if (!this.storageClient || !this.config) {
|
||||
return []
|
||||
}
|
||||
|
||||
const key = `${this.config.basePrefix}/${channel}/index.json`
|
||||
|
||||
try {
|
||||
const raw = await this.storageClient.readText(key)
|
||||
const parsed = JSON.parse(raw) as unknown
|
||||
return normalizeReleases(parsed, channel)
|
||||
} catch (error) {
|
||||
if (isMissingObjectError(error)) {
|
||||
log.warn('Update channel index not found, treating as empty', { channel, key })
|
||||
return []
|
||||
}
|
||||
|
||||
throw error
|
||||
}
|
||||
}
|
||||
|
||||
private async processUserCatalog(): Promise<void> {
|
||||
const decision = resolveUserDecision({
|
||||
currentVersion: this.status.currentVersion,
|
||||
currentChannel: this.status.currentChannel,
|
||||
catalog: this.catalog
|
||||
})
|
||||
|
||||
if (!decision.recommendedRelease || !decision.shouldOffer) {
|
||||
this.publishStatus({
|
||||
phase: 'idle',
|
||||
recommendedRelease: undefined,
|
||||
latestVersion: undefined,
|
||||
latestChannel: undefined,
|
||||
downloadedRelease: undefined,
|
||||
progress: undefined,
|
||||
adminHasAnyRelease: false,
|
||||
error: undefined,
|
||||
message: undefined
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
const recommended = decision.recommendedRelease
|
||||
this.publishStatus({
|
||||
phase: 'available',
|
||||
recommendedRelease: recommended,
|
||||
latestVersion: recommended.version,
|
||||
latestChannel: recommended.channel,
|
||||
adminHasAnyRelease: false,
|
||||
message:
|
||||
this.status.currentChannel === 'preview'
|
||||
? `当前为预览版,可切换回稳定版 ${recommended.version}`
|
||||
: `发现稳定版 ${recommended.version}`
|
||||
})
|
||||
|
||||
const existing = await this.getValidDownloadedRelease(recommended)
|
||||
if (existing) {
|
||||
this.publishStatus({
|
||||
phase: 'downloaded',
|
||||
progress: 100,
|
||||
downloadedRelease: {
|
||||
version: existing.version,
|
||||
channel: existing.channel,
|
||||
localPath: existing.localPath
|
||||
},
|
||||
message:
|
||||
this.status.currentChannel === 'preview'
|
||||
? `稳定版 ${recommended.version} 已准备安装`
|
||||
: `发现稳定版 ${recommended.version}`
|
||||
})
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
await this.downloadRelease(recommended)
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : '下载更新失败'
|
||||
this.publishStatus({
|
||||
phase: 'error',
|
||||
error: message,
|
||||
message
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
private processAdminCatalog(): void {
|
||||
const decision = resolveAdminDecision({
|
||||
currentVersion: this.status.currentVersion,
|
||||
currentChannel: this.status.currentChannel,
|
||||
catalog: this.catalog,
|
||||
maxHistoryPerChannel: this.config?.maxAdminHistoryPerChannel ?? 10
|
||||
})
|
||||
|
||||
const hasHigherVersion = [...this.catalog.stable, ...this.catalog.preview].some(
|
||||
(release) => compareVersions(release.version, this.status.currentVersion) > 0
|
||||
)
|
||||
const hasCrossChannelOption = [...this.catalog.stable, ...this.catalog.preview].some(
|
||||
(release) => release.channel !== this.status.currentChannel
|
||||
)
|
||||
const shouldOffer = hasHigherVersion || hasCrossChannelOption
|
||||
|
||||
this.publishStatus({
|
||||
phase: shouldOffer ? 'available' : 'idle',
|
||||
recommendedRelease: decision.recommendedRelease,
|
||||
latestVersion: decision.recommendedRelease?.version,
|
||||
latestChannel: decision.recommendedRelease?.channel,
|
||||
adminHasAnyRelease: shouldOffer,
|
||||
downloadedRelease: undefined,
|
||||
progress: undefined,
|
||||
error: undefined,
|
||||
message: shouldOffer ? '发现可用版本' : undefined
|
||||
})
|
||||
}
|
||||
|
||||
private startPolling(): void {
|
||||
this.clearPolling()
|
||||
if (!this.config) {
|
||||
return
|
||||
}
|
||||
|
||||
this.intervalHandle = setInterval(() => {
|
||||
this.checkForUpdates().catch((error) => {
|
||||
log.warn('Periodic update check failed', {
|
||||
error: error instanceof Error ? error.message : String(error)
|
||||
})
|
||||
})
|
||||
}, this.config.checkIntervalMinutes * 60 * 1000)
|
||||
}
|
||||
|
||||
private clearPolling(): void {
|
||||
if (this.intervalHandle) {
|
||||
clearInterval(this.intervalHandle)
|
||||
this.intervalHandle = null
|
||||
}
|
||||
}
|
||||
|
||||
private async getValidDownloadedRelease(
|
||||
release: UpdateRelease
|
||||
): Promise<DownloadedRelease | null> {
|
||||
const downloadPath = this.getDownloadPath(release)
|
||||
if (!fs.existsSync(downloadPath)) {
|
||||
return null
|
||||
}
|
||||
|
||||
const hash = await this.calculateSha256(downloadPath)
|
||||
if (hash.toLowerCase() !== release.sha256.toLowerCase()) {
|
||||
await fs.promises.rm(downloadPath, { force: true })
|
||||
return null
|
||||
}
|
||||
|
||||
return {
|
||||
...release,
|
||||
localPath: downloadPath
|
||||
}
|
||||
}
|
||||
|
||||
private getDownloadPath(release: UpdateRelease): string {
|
||||
return path.join(app.getPath('userData'), 'pending-update', `${release.channel}-${release.version}.exe`)
|
||||
}
|
||||
|
||||
private async calculateSha256(filePath: string): Promise<string> {
|
||||
const hash = createHash('sha256')
|
||||
const input = fs.createReadStream(filePath)
|
||||
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
input.on('data', (chunk) => hash.update(chunk))
|
||||
input.on('error', reject)
|
||||
input.on('end', resolve)
|
||||
})
|
||||
|
||||
return hash.digest('hex')
|
||||
}
|
||||
|
||||
private resolveUpdaterBinaryPath(): string {
|
||||
const packagedPath = path.join(process.resourcesPath, 'portable-updater.exe')
|
||||
const devPath = path.resolve(process.cwd(), 'build', 'bin', 'portable-updater.exe')
|
||||
|
||||
if (fs.existsSync(packagedPath)) {
|
||||
return packagedPath
|
||||
}
|
||||
|
||||
if (fs.existsSync(devPath)) {
|
||||
return devPath
|
||||
}
|
||||
|
||||
throw new Error('未找到便携版更新器')
|
||||
}
|
||||
|
||||
private async prepareUpdaterBinary(sourcePath: string): Promise<string> {
|
||||
const updatesDir = path.join(app.getPath('userData'), 'updates')
|
||||
const stagedPath = path.join(updatesDir, 'portable-updater.exe')
|
||||
|
||||
await fs.promises.mkdir(updatesDir, { recursive: true })
|
||||
await fs.promises.copyFile(sourcePath, stagedPath)
|
||||
|
||||
return stagedPath
|
||||
}
|
||||
}
|
||||
123
src/main/services/update/update-utils.ts
Normal file
123
src/main/services/update/update-utils.ts
Normal file
@@ -0,0 +1,123 @@
|
||||
import type {
|
||||
ReleaseChannel,
|
||||
UpdateCatalog,
|
||||
UpdateDialogCatalog,
|
||||
UpdateRelease
|
||||
} from '../../types/update.types'
|
||||
|
||||
export function compareVersions(left: string, right: string): number {
|
||||
const leftParts = left.split('.').map((part) => Number.parseInt(part, 10) || 0)
|
||||
const rightParts = right.split('.').map((part) => Number.parseInt(part, 10) || 0)
|
||||
const length = Math.max(leftParts.length, rightParts.length)
|
||||
|
||||
for (let index = 0; index < length; index += 1) {
|
||||
const leftValue = leftParts[index] ?? 0
|
||||
const rightValue = rightParts[index] ?? 0
|
||||
|
||||
if (leftValue > rightValue) return 1
|
||||
if (leftValue < rightValue) return -1
|
||||
}
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
export function normalizeReleases(input: unknown, channel: ReleaseChannel): UpdateRelease[] {
|
||||
const list = Array.isArray(input)
|
||||
? input
|
||||
: input && typeof input === 'object' && Array.isArray((input as { releases?: unknown[] }).releases)
|
||||
? (input as { releases: unknown[] }).releases
|
||||
: []
|
||||
|
||||
return list
|
||||
.filter((item): item is Record<string, unknown> => !!item && typeof item === 'object')
|
||||
.map((item) => ({
|
||||
version: String(item.version ?? ''),
|
||||
channel,
|
||||
artifactKey: String(item.artifactKey ?? ''),
|
||||
sha256: String(item.sha256 ?? ''),
|
||||
size: Number(item.size ?? 0),
|
||||
publishedAt: String(item.publishedAt ?? ''),
|
||||
changelogKey: String(item.changelogKey ?? ''),
|
||||
notesSummary: item.notesSummary ? String(item.notesSummary) : undefined
|
||||
}))
|
||||
.filter(
|
||||
(item) =>
|
||||
!!item.version &&
|
||||
!!item.artifactKey &&
|
||||
!!item.sha256 &&
|
||||
!!item.changelogKey &&
|
||||
!!item.publishedAt
|
||||
)
|
||||
}
|
||||
|
||||
export function sortReleases(releases: UpdateRelease[]): UpdateRelease[] {
|
||||
return [...releases].sort((left, right) => {
|
||||
const versionCompare = compareVersions(right.version, left.version)
|
||||
if (versionCompare !== 0) {
|
||||
return versionCompare
|
||||
}
|
||||
|
||||
return new Date(right.publishedAt).getTime() - new Date(left.publishedAt).getTime()
|
||||
})
|
||||
}
|
||||
|
||||
export function pickLatestRelease(releases: UpdateRelease[]): UpdateRelease | undefined {
|
||||
return sortReleases(releases)[0]
|
||||
}
|
||||
|
||||
export function limitCatalogHistory(catalog: UpdateCatalog, maxPerChannel: number): UpdateCatalog {
|
||||
return {
|
||||
stable: sortReleases(catalog.stable).slice(0, maxPerChannel),
|
||||
preview: sortReleases(catalog.preview).slice(0, maxPerChannel)
|
||||
}
|
||||
}
|
||||
|
||||
export function resolveUserDecision(params: {
|
||||
currentVersion: string
|
||||
currentChannel: ReleaseChannel
|
||||
catalog: UpdateCatalog
|
||||
}): {
|
||||
recommendedRelease?: UpdateRelease
|
||||
shouldOffer: boolean
|
||||
} {
|
||||
const latestStable = pickLatestRelease(params.catalog.stable)
|
||||
if (!latestStable) {
|
||||
return { recommendedRelease: undefined, shouldOffer: false }
|
||||
}
|
||||
|
||||
if (params.currentChannel === 'preview') {
|
||||
return { recommendedRelease: latestStable, shouldOffer: true }
|
||||
}
|
||||
|
||||
return {
|
||||
recommendedRelease: latestStable,
|
||||
shouldOffer: params.currentVersion !== latestStable.version
|
||||
}
|
||||
}
|
||||
|
||||
export function resolveAdminDecision(params: {
|
||||
currentVersion: string
|
||||
currentChannel: ReleaseChannel
|
||||
catalog: UpdateCatalog
|
||||
maxHistoryPerChannel: number
|
||||
}): UpdateDialogCatalog {
|
||||
const channels = limitCatalogHistory(params.catalog, params.maxHistoryPerChannel)
|
||||
const allReleases = sortReleases([...channels.stable, ...channels.preview])
|
||||
|
||||
const higherVersionRelease = allReleases.find(
|
||||
(release) => compareVersions(release.version, params.currentVersion) > 0
|
||||
)
|
||||
|
||||
const preferredCrossChannelRelease = allReleases.find(
|
||||
(release) => release.channel !== params.currentChannel
|
||||
)
|
||||
|
||||
return {
|
||||
mode: 'admin',
|
||||
recommendedRelease:
|
||||
higherVersionRelease ??
|
||||
preferredCrossChannelRelease ??
|
||||
pickLatestRelease(channels[params.currentChannel]),
|
||||
channels
|
||||
}
|
||||
}
|
||||
215
src/main/tools/rustfs-test.ts
Normal file
215
src/main/tools/rustfs-test.ts
Normal file
@@ -0,0 +1,215 @@
|
||||
/**
|
||||
* RustFS Integration Test Script
|
||||
*
|
||||
* Tests RustFS connection and upload functionality
|
||||
* Usage: tsx src/main/tools/rustfs-test.ts
|
||||
*
|
||||
* Note: This test runs in standalone mode without Electron
|
||||
*/
|
||||
|
||||
import {
|
||||
S3Client,
|
||||
PutObjectCommand,
|
||||
GetObjectCommand,
|
||||
ListObjectsV2Command,
|
||||
DeleteObjectCommand,
|
||||
type PutObjectCommandInput
|
||||
} from '@aws-sdk/client-s3'
|
||||
import * as path from 'path'
|
||||
import * as fs from 'fs'
|
||||
|
||||
// Simple console logger (standalone mode)
|
||||
const log = {
|
||||
info: (msg: string, data?: any) => console.log(`[INFO] ${msg}`, data ? JSON.stringify(data) : ''),
|
||||
error: (msg: string, data?: any) =>
|
||||
console.error(`[ERROR] ${msg}`, data ? JSON.stringify(data) : ''),
|
||||
warn: (msg: string, data?: any) => console.warn(`[WARN] ${msg}`, data ? JSON.stringify(data) : '')
|
||||
}
|
||||
|
||||
// Test configuration
|
||||
const TEST_CONFIG = {
|
||||
enabled: true,
|
||||
endpoint: 'http://192.168.110.114:9000',
|
||||
accessKey: 'dP4O7ePAzyH8earoXxE9',
|
||||
secretKey: '2vRPLnsh9Zi1KyBDymUtACyDdLHGfsLvw4MkG3cv',
|
||||
bucket: 'erpauto',
|
||||
region: 'us-east-1'
|
||||
}
|
||||
|
||||
function createS3Client(config: typeof TEST_CONFIG) {
|
||||
return new S3Client({
|
||||
region: config.region,
|
||||
endpoint: config.endpoint,
|
||||
credentials: {
|
||||
accessKeyId: config.accessKey,
|
||||
secretAccessKey: config.secretKey
|
||||
},
|
||||
forcePathStyle: true
|
||||
})
|
||||
}
|
||||
|
||||
function getMimeType(filePath: string): string {
|
||||
const ext = path.extname(filePath).toLowerCase()
|
||||
const mimeTypes: Record<string, string> = {
|
||||
'.md': 'text/markdown; charset=utf-8',
|
||||
'.txt': 'text/plain; charset=utf-8',
|
||||
'.json': 'application/json; charset=utf-8',
|
||||
'.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||
'.csv': 'text/csv; charset=utf-8'
|
||||
}
|
||||
return mimeTypes[ext] || 'application/octet-stream'
|
||||
}
|
||||
|
||||
function generateReportKey(reportFileName: string, username: string): string {
|
||||
// Organize reports by user for easy access
|
||||
// Format: reports/cleaner/{username}/{filename}
|
||||
return `reports/cleaner/${username}/${reportFileName}`
|
||||
}
|
||||
|
||||
async function runTests() {
|
||||
console.log('='.repeat(50))
|
||||
console.log('RustFS Integration Test')
|
||||
console.log('='.repeat(50))
|
||||
console.log()
|
||||
|
||||
const client = createS3Client(TEST_CONFIG)
|
||||
|
||||
// Test connection
|
||||
console.log('1. Testing connection...')
|
||||
try {
|
||||
const command = new ListObjectsV2Command({
|
||||
Bucket: TEST_CONFIG.bucket,
|
||||
Prefix: '',
|
||||
MaxKeys: 1
|
||||
})
|
||||
await client.send(command)
|
||||
console.log(' ✓ Connection successful')
|
||||
} catch (error) {
|
||||
console.log(` ✗ Connection failed: ${(error as Error).message}`)
|
||||
return
|
||||
}
|
||||
console.log()
|
||||
|
||||
// Test upload string
|
||||
console.log('2. Testing string upload...')
|
||||
const testContent = `# Test Report
|
||||
Generated at: ${new Date().toISOString()}
|
||||
|
||||
This is a test report to verify RustFS integration.
|
||||
`
|
||||
const testKey = `test/reports/test-${Date.now()}.md`
|
||||
try {
|
||||
const input: PutObjectCommandInput = {
|
||||
Bucket: TEST_CONFIG.bucket,
|
||||
Key: testKey,
|
||||
Body: Buffer.from(testContent, 'utf-8'),
|
||||
ContentType: 'text/markdown; charset=utf-8'
|
||||
}
|
||||
const command = new PutObjectCommand(input)
|
||||
const response = await client.send(command)
|
||||
console.log(' ✓ Upload successful')
|
||||
console.log(` Key: ${testKey}`)
|
||||
console.log(` ETag: ${response.ETag}`)
|
||||
} catch (error) {
|
||||
console.log(' ✗ Upload failed')
|
||||
console.log(` Error: ${(error as Error).message}`)
|
||||
return
|
||||
}
|
||||
console.log()
|
||||
|
||||
// Test download
|
||||
console.log('3. Testing download...')
|
||||
try {
|
||||
const command = new GetObjectCommand({
|
||||
Bucket: TEST_CONFIG.bucket,
|
||||
Key: testKey
|
||||
})
|
||||
const response = await client.send(command)
|
||||
const chunks: Buffer[] = []
|
||||
for await (const chunk of response.Body as any) {
|
||||
chunks.push(Buffer.from(chunk))
|
||||
}
|
||||
const content = Buffer.concat(chunks)
|
||||
console.log(' ✓ Download successful')
|
||||
console.log(` Size: ${content.length} bytes`)
|
||||
console.log(` Content preview: ${content.toString('utf-8').slice(0, 50)}...`)
|
||||
} catch (error) {
|
||||
console.log(' ✗ Download failed')
|
||||
console.log(` Error: ${(error as Error).message}`)
|
||||
}
|
||||
console.log()
|
||||
|
||||
// Test file upload (create a temporary file)
|
||||
console.log('4. Testing file upload...')
|
||||
const tempFilePath = path.join(process.cwd(), `test-file-${Date.now()}.md`)
|
||||
fs.writeFileSync(tempFilePath, testContent, 'utf-8')
|
||||
|
||||
const fileKey = `test/files/test-file-${Date.now()}.md`
|
||||
try {
|
||||
const fileContent = fs.readFileSync(tempFilePath)
|
||||
const input: PutObjectCommandInput = {
|
||||
Bucket: TEST_CONFIG.bucket,
|
||||
Key: fileKey,
|
||||
Body: fileContent,
|
||||
ContentType: getMimeType(tempFilePath)
|
||||
}
|
||||
const command = new PutObjectCommand(input)
|
||||
const response = await client.send(command)
|
||||
console.log(' ✓ File upload successful')
|
||||
console.log(` Key: ${fileKey}`)
|
||||
console.log(` ETag: ${response.ETag}`)
|
||||
} catch (error) {
|
||||
console.log(' ✗ File upload failed')
|
||||
console.log(` Error: ${(error as Error).message}`)
|
||||
}
|
||||
|
||||
// Cleanup temp file
|
||||
try {
|
||||
fs.unlinkSync(tempFilePath)
|
||||
console.log(' ✓ Temporary file cleaned up')
|
||||
} catch (e) {
|
||||
console.log(` ⚠ Could not clean up temp file: ${(e as Error).message}`)
|
||||
}
|
||||
console.log()
|
||||
|
||||
// Test report key generation
|
||||
console.log('5. Testing report key generation...')
|
||||
const reportKey = generateReportKey('cleaner-report-2026-03-17-10-30-00.md', 'admin')
|
||||
console.log(` ✓ Generated key: ${reportKey}`)
|
||||
console.log()
|
||||
|
||||
// Test cleanup (delete test files)
|
||||
console.log('6. Cleaning up test files...')
|
||||
try {
|
||||
const deleteCommand = new DeleteObjectCommand({
|
||||
Bucket: TEST_CONFIG.bucket,
|
||||
Key: testKey
|
||||
})
|
||||
await client.send(deleteCommand)
|
||||
console.log(' ✓ Test string file deleted')
|
||||
} catch (error) {
|
||||
console.log(` ⚠ Could not delete test string file: ${(error as Error).message}`)
|
||||
}
|
||||
|
||||
try {
|
||||
const deleteCommand = new DeleteObjectCommand({
|
||||
Bucket: TEST_CONFIG.bucket,
|
||||
Key: fileKey
|
||||
})
|
||||
await client.send(deleteCommand)
|
||||
console.log(' ✓ Test file deleted')
|
||||
} catch (error) {
|
||||
console.log(` ⚠ Could not delete test file: ${(error as Error).message}`)
|
||||
}
|
||||
console.log()
|
||||
|
||||
console.log('='.repeat(50))
|
||||
console.log('All tests completed!')
|
||||
console.log('='.repeat(50))
|
||||
}
|
||||
|
||||
// Run tests
|
||||
runTests().catch((error) => {
|
||||
console.error('Test failed with error:', error)
|
||||
process.exit(1)
|
||||
})
|
||||
@@ -16,6 +16,8 @@ export interface CleanerInput {
|
||||
materialCodes: string[]
|
||||
dryRun: boolean
|
||||
headless?: boolean
|
||||
queryBatchSize?: number
|
||||
processConcurrency?: number
|
||||
onProgress?: (message: string, progress?: number, extra?: Partial<CleanerProgress>) => void
|
||||
}
|
||||
|
||||
@@ -25,6 +27,9 @@ export interface CleanerResult {
|
||||
materialsSkipped: number
|
||||
errors: string[]
|
||||
details: OrderCleanDetail[]
|
||||
// Retry statistics
|
||||
retriedOrders: number
|
||||
successfulRetries: number
|
||||
}
|
||||
|
||||
export interface SkippedMaterial {
|
||||
@@ -34,12 +39,23 @@ export interface SkippedMaterial {
|
||||
reason: string
|
||||
}
|
||||
|
||||
export interface RetryAttempt {
|
||||
attempt: number
|
||||
error: string
|
||||
timestamp: number
|
||||
}
|
||||
|
||||
export interface OrderCleanDetail {
|
||||
orderNumber: string
|
||||
materialsDeleted: number
|
||||
materialsSkipped: number
|
||||
errors: string[]
|
||||
skippedMaterials: SkippedMaterial[]
|
||||
// Retry-related fields
|
||||
retryCount: number
|
||||
retryAttempts?: RetryAttempt[]
|
||||
retriedAt?: number
|
||||
retrySuccess?: boolean
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -97,6 +97,15 @@ export const validationConfigSchema = z.object({
|
||||
defaultManager: z.string().default('')
|
||||
})
|
||||
|
||||
/**
|
||||
* 清理配置 Schema
|
||||
*/
|
||||
export const cleanerConfigSchema = z.object({
|
||||
queryBatchSize: z.number().int().min(1).max(100).default(100),
|
||||
processConcurrency: z.number().int().min(1).max(20).default(1)
|
||||
})
|
||||
export type CleanerConfig = z.infer<typeof cleanerConfigSchema>
|
||||
|
||||
/**
|
||||
* 订单号解析配置 Schema
|
||||
*/
|
||||
@@ -122,6 +131,34 @@ export const loggingConfigSchema = z.object({
|
||||
appRetention: z.number().int().min(1).max(365).default(14)
|
||||
})
|
||||
|
||||
/**
|
||||
* RustFS 对象存储配置 Schema
|
||||
*/
|
||||
export const rustfsConfigSchema = z.object({
|
||||
enabled: z.boolean().default(false),
|
||||
endpoint: z.string().min(1, 'RustFS endpoint is required'),
|
||||
accessKey: z.string().min(1, 'RustFS access key is required'),
|
||||
secretKey: z.string().min(1, 'RustFS secret key is required'),
|
||||
bucket: z.string().min(1, 'RustFS bucket is required'),
|
||||
region: z.string().default('us-east-1')
|
||||
})
|
||||
|
||||
/**
|
||||
* Update service configuration schema
|
||||
*/
|
||||
export const updateConfigSchema = z.object({
|
||||
enabled: z.boolean().default(false),
|
||||
allowDevMode: z.boolean().default(false),
|
||||
endpoint: z.string().default(''),
|
||||
accessKey: z.string().default(''),
|
||||
secretKey: z.string().default(''),
|
||||
bucket: z.string().default(''),
|
||||
region: z.string().default('us-east-1'),
|
||||
basePrefix: z.string().default('updates/win-portable'),
|
||||
checkIntervalMinutes: z.number().int().min(1).max(1440).default(30),
|
||||
maxAdminHistoryPerChannel: z.number().int().min(1).max(100).default(10)
|
||||
})
|
||||
|
||||
/**
|
||||
* 完整应用配置 Schema
|
||||
*/
|
||||
@@ -131,8 +168,11 @@ export const fullConfigSchema = z.object({
|
||||
paths: pathsConfigSchema,
|
||||
extraction: extractionConfigSchema,
|
||||
validation: validationConfigSchema,
|
||||
cleaner: cleanerConfigSchema,
|
||||
orderResolution: orderResolutionSchema,
|
||||
logging: loggingConfigSchema
|
||||
logging: loggingConfigSchema,
|
||||
rustfs: rustfsConfigSchema.optional(),
|
||||
update: updateConfigSchema.optional()
|
||||
})
|
||||
|
||||
/**
|
||||
@@ -144,6 +184,8 @@ export type MySqlConfig = z.infer<typeof mysqlConfigSchema>
|
||||
export type SqlServerConfig = z.infer<typeof sqlServerConfigSchema>
|
||||
export type ErpSystemConfig = z.infer<typeof erpSystemConfigSchema>
|
||||
export type LoggingConfig = z.infer<typeof loggingConfigSchema>
|
||||
export type RustfsConfig = z.infer<typeof rustfsConfigSchema>
|
||||
export type UpdateConfig = z.infer<typeof updateConfigSchema>
|
||||
|
||||
/**
|
||||
* 验证并解析配置
|
||||
|
||||
@@ -168,3 +168,25 @@ export interface DatabaseAPI {
|
||||
params?: Record<string, unknown>
|
||||
) => Promise<IpcResult<SqlServerQueryResult>>
|
||||
}
|
||||
|
||||
/**
|
||||
* Report service APIs
|
||||
*/
|
||||
export interface ReportAPI {
|
||||
/**
|
||||
* List all reports across all users (Admin only typically)
|
||||
*/
|
||||
listAll: () => Promise<IpcResult<{ key: string; filename: string; username: string; lastModified?: Date; size?: number }[]>>
|
||||
|
||||
/**
|
||||
* List reports for a specific user
|
||||
* @param username - Username to list reports for
|
||||
*/
|
||||
listByUser: (username: string) => Promise<IpcResult<{ key: string; filename: string; username: string; lastModified?: Date; size?: number }[]>>
|
||||
|
||||
/**
|
||||
* Download a specific report by key
|
||||
* @param key - Report object key in RustFS
|
||||
*/
|
||||
download: (key: string) => Promise<IpcResult<string>>
|
||||
}
|
||||
|
||||
66
src/main/types/update.types.ts
Normal file
66
src/main/types/update.types.ts
Normal file
@@ -0,0 +1,66 @@
|
||||
import type { UserType } from './user.types'
|
||||
|
||||
export type ReleaseChannel = 'stable' | 'preview'
|
||||
|
||||
export type UpdatePhase =
|
||||
| 'idle'
|
||||
| 'checking'
|
||||
| 'available'
|
||||
| 'downloading'
|
||||
| 'downloaded'
|
||||
| 'installing'
|
||||
| 'error'
|
||||
|
||||
export interface UpdateRelease {
|
||||
version: string
|
||||
channel: ReleaseChannel
|
||||
artifactKey: string
|
||||
sha256: string
|
||||
size: number
|
||||
publishedAt: string
|
||||
changelogKey: string
|
||||
notesSummary?: string
|
||||
}
|
||||
|
||||
export interface UpdateCatalog {
|
||||
stable: UpdateRelease[]
|
||||
preview: UpdateRelease[]
|
||||
}
|
||||
|
||||
export interface DownloadedRelease extends UpdateRelease {
|
||||
localPath: string
|
||||
}
|
||||
|
||||
export interface UpdateStatus {
|
||||
enabled: boolean
|
||||
supported: boolean
|
||||
phase: UpdatePhase
|
||||
currentVersion: string
|
||||
currentChannel: ReleaseChannel
|
||||
currentUserType: UserType | null
|
||||
message?: string
|
||||
latestVersion?: string
|
||||
latestChannel?: ReleaseChannel
|
||||
progress?: number
|
||||
downloadedRelease?: Pick<DownloadedRelease, 'version' | 'channel' | 'localPath'>
|
||||
recommendedRelease?: UpdateRelease
|
||||
error?: string
|
||||
adminHasAnyRelease?: boolean
|
||||
}
|
||||
|
||||
export interface UpdateDialogCatalog {
|
||||
mode: 'user' | 'admin' | 'disabled'
|
||||
recommendedRelease?: UpdateRelease
|
||||
channels?: UpdateCatalog
|
||||
}
|
||||
|
||||
export interface DownloadReleaseRequest {
|
||||
version: string
|
||||
channel: ReleaseChannel
|
||||
artifactKey: string
|
||||
sha256: string
|
||||
size: number
|
||||
publishedAt: string
|
||||
changelogKey: string
|
||||
notesSummary?: string
|
||||
}
|
||||
27
src/preload/index.d.ts
vendored
27
src/preload/index.d.ts
vendored
@@ -1,4 +1,4 @@
|
||||
import type { FileAPI, ExtractorAPI, CleanerAPI, DatabaseAPI } from '../main/types/ipc-api.types'
|
||||
import type { FileAPI, ExtractorAPI, CleanerAPI, DatabaseAPI, ReportAPI } from '../main/types/ipc-api.types'
|
||||
import type { ResolverInput, ResolverResponse } from '../main/ipc/resolver-handler'
|
||||
import type { UserInfo } from '../main/types/user.types'
|
||||
import type {
|
||||
@@ -21,6 +21,12 @@ import type {
|
||||
} from '../main/types/settings.types'
|
||||
import type { IpcResult } from '../main/ipc'
|
||||
import type { LogLevel } from '../shared/ipc-channels'
|
||||
import type { CleanerConfig } from '../main/types/config.schema'
|
||||
import type {
|
||||
DownloadReleaseRequest,
|
||||
UpdateDialogCatalog,
|
||||
UpdateStatus
|
||||
} from '../main/types/update.types'
|
||||
|
||||
export interface ResolverAPI {
|
||||
resolve: (input: ResolverInput) => Promise<IpcResult<ResolverResponse>>
|
||||
@@ -46,6 +52,7 @@ export interface ValidationAPI {
|
||||
validate: (request: ValidationRequest) => Promise<IpcResult<ValidationResponse>>
|
||||
setSharedProductionIds: (productionIds: string[]) => Promise<IpcResult<void>>
|
||||
getSharedProductionIds: () => Promise<IpcResult<{ productionIds: string[] }>>
|
||||
clearSharedProductionIds: () => Promise<IpcResult<void>>
|
||||
getCleanerData: () => Promise<
|
||||
IpcResult<{
|
||||
orderNumbers: string[]
|
||||
@@ -109,10 +116,25 @@ export interface UserErpConfigAPI {
|
||||
getAll: () => Promise<IpcResult<Array<{ username: string; erpUrl: string; erpUsername: string }>>>
|
||||
}
|
||||
|
||||
export interface ConfigAPI {
|
||||
getCleaner: () => Promise<IpcResult<CleanerConfig>>
|
||||
updateCleaner: (updates: Partial<CleanerConfig>) => Promise<IpcResult<CleanerConfig>>
|
||||
}
|
||||
|
||||
export interface LoggerAPI {
|
||||
log: (level: LogLevel, message: string, context?: Record<string, unknown>) => void
|
||||
}
|
||||
|
||||
export interface UpdateAPI {
|
||||
getStatus: () => Promise<IpcResult<UpdateStatus>>
|
||||
checkNow: () => Promise<IpcResult<UpdateStatus>>
|
||||
getCatalog: () => Promise<IpcResult<UpdateDialogCatalog>>
|
||||
getChangelog: (release: DownloadReleaseRequest) => Promise<IpcResult<string>>
|
||||
downloadRelease: (release: DownloadReleaseRequest) => Promise<IpcResult<UpdateStatus>>
|
||||
installDownloaded: () => Promise<IpcResult<void>>
|
||||
onStatusChanged: (callback: (data: UpdateStatus) => void) => () => void
|
||||
}
|
||||
|
||||
export interface ProcessAPI {
|
||||
versions: {
|
||||
electron: string
|
||||
@@ -136,7 +158,10 @@ declare global {
|
||||
settings: SettingsAPI
|
||||
materialType: MaterialTypeAPI
|
||||
userErpConfig: UserErpConfigAPI
|
||||
config: ConfigAPI
|
||||
logger: LoggerAPI
|
||||
report: ReportAPI
|
||||
update: UpdateAPI
|
||||
}
|
||||
api: unknown
|
||||
}
|
||||
|
||||
@@ -12,6 +12,9 @@ import type {
|
||||
} from '../main/types/validation.types'
|
||||
import type { IpcResult } from '../main/ipc'
|
||||
import { IPC_CHANNELS, type LogLevel } from '../shared/ipc-channels'
|
||||
import type { CleanerConfig } from '../main/types/config.schema'
|
||||
import type { DownloadReleaseRequest, UpdateStatus } from '../main/types/update.types'
|
||||
import type { UpdateDialogCatalog } from '../main/types/update.types'
|
||||
|
||||
type ErpSettingsPayload = {
|
||||
erp?: {
|
||||
@@ -140,6 +143,8 @@ const api = {
|
||||
invokeIpc(IPC_CHANNELS.VALIDATION_SET_SHARED_PRODUCTION_IDS, productionIds),
|
||||
getSharedProductionIds: (): Promise<IpcResult> =>
|
||||
invokeIpc(IPC_CHANNELS.VALIDATION_GET_SHARED_PRODUCTION_IDS),
|
||||
clearSharedProductionIds: (): Promise<IpcResult> =>
|
||||
invokeIpc(IPC_CHANNELS.VALIDATION_CLEAR_SHARED_PRODUCTION_IDS),
|
||||
getCleanerData: (): Promise<IpcResult> => invokeIpc(IPC_CHANNELS.VALIDATION_GET_CLEANER_DATA)
|
||||
},
|
||||
|
||||
@@ -193,6 +198,12 @@ const api = {
|
||||
getAll: (): Promise<IpcResult> => invokeIpc(IPC_CHANNELS.USER_ERP_CONFIG_GET_ALL)
|
||||
},
|
||||
|
||||
config: {
|
||||
getCleaner: (): Promise<IpcResult<CleanerConfig>> => invokeIpc(IPC_CHANNELS.CONFIG_GET_CLEANER),
|
||||
updateCleaner: (updates: Partial<CleanerConfig>): Promise<IpcResult<CleanerConfig>> =>
|
||||
invokeIpc(IPC_CHANNELS.CONFIG_UPDATE_CLEANER, updates)
|
||||
},
|
||||
|
||||
logger: {
|
||||
log: (level: LogLevel, message: string, context?: Record<string, unknown>): void => {
|
||||
ipcRenderer.send(IPC_CHANNELS.LOGGER_FORWARD, {
|
||||
@@ -202,6 +213,32 @@ const api = {
|
||||
timestamp: Date.now()
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
report: {
|
||||
listAll: (): Promise<IpcResult> => invokeIpc(IPC_CHANNELS.REPORT_LIST_ALL),
|
||||
listByUser: (username: string): Promise<IpcResult> =>
|
||||
invokeIpc(IPC_CHANNELS.REPORT_LIST_BY_USER, username),
|
||||
download: (key: string): Promise<IpcResult> => invokeIpc(IPC_CHANNELS.REPORT_DOWNLOAD, key)
|
||||
},
|
||||
|
||||
update: {
|
||||
getStatus: (): Promise<IpcResult<UpdateStatus>> => invokeIpc(IPC_CHANNELS.UPDATE_GET_STATUS),
|
||||
checkNow: (): Promise<IpcResult<UpdateStatus>> => invokeIpc(IPC_CHANNELS.UPDATE_CHECK_NOW),
|
||||
getCatalog: (): Promise<IpcResult<UpdateDialogCatalog>> =>
|
||||
invokeIpc(IPC_CHANNELS.UPDATE_GET_CATALOG),
|
||||
getChangelog: (release: DownloadReleaseRequest): Promise<IpcResult<string>> =>
|
||||
invokeIpc(IPC_CHANNELS.UPDATE_GET_CHANGELOG, release),
|
||||
downloadRelease: (release: DownloadReleaseRequest): Promise<IpcResult<UpdateStatus>> =>
|
||||
invokeIpc(IPC_CHANNELS.UPDATE_DOWNLOAD_RELEASE, release),
|
||||
installDownloaded: (): Promise<IpcResult<void>> =>
|
||||
invokeIpc(IPC_CHANNELS.UPDATE_INSTALL_DOWNLOADED),
|
||||
onStatusChanged: (callback: (data: UpdateStatus) => void) => {
|
||||
const subscription = (_event: Electron.IpcRendererEvent, data: UpdateStatus) =>
|
||||
callback(data)
|
||||
ipcRenderer.on(IPC_CHANNELS.UPDATE_STATUS_CHANGED, subscription)
|
||||
return () => ipcRenderer.removeListener(IPC_CHANNELS.UPDATE_STATUS_CHANGED, subscription)
|
||||
}
|
||||
}
|
||||
} as const
|
||||
|
||||
|
||||
@@ -9,7 +9,17 @@
|
||||
*/
|
||||
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import { LayoutDashboard, Download, Trash2, Settings, Database, User, LogOut } from 'lucide-react'
|
||||
import {
|
||||
LayoutDashboard,
|
||||
Download,
|
||||
Trash2,
|
||||
Settings,
|
||||
Database,
|
||||
User,
|
||||
LogOut,
|
||||
ArrowUpCircle,
|
||||
LoaderCircle
|
||||
} from 'lucide-react'
|
||||
import { useLogger } from './hooks/useLogger'
|
||||
import LoginDialog from './components/LoginDialog'
|
||||
import UserSelectionDialog, {
|
||||
@@ -19,6 +29,12 @@ import { Toast } from './components/ui/Toast'
|
||||
import ExtractorPage from './pages/ExtractorPage'
|
||||
import CleanerPage from './pages/CleanerPage'
|
||||
import SettingsPage from './pages/SettingsPage'
|
||||
import UpdateDialog from './components/UpdateDialog'
|
||||
import type {
|
||||
DownloadReleaseRequest,
|
||||
UpdateDialogCatalog,
|
||||
UpdateStatus
|
||||
} from '../../main/types/update.types'
|
||||
|
||||
type Page = 'home' | 'extractor' | 'cleaner' | 'settings'
|
||||
|
||||
@@ -51,6 +67,9 @@ function App(): React.JSX.Element {
|
||||
|
||||
// Navigation state
|
||||
const [currentPage, setCurrentPage] = useState<Page>('extractor') // Default to extractor for the new layout
|
||||
const [updateStatus, setUpdateStatus] = useState<UpdateStatus | null>(null)
|
||||
const [updateCatalog, setUpdateCatalog] = useState<UpdateDialogCatalog | null>(null)
|
||||
const [showUpdateDialog, setShowUpdateDialog] = useState(false)
|
||||
|
||||
// Load error message from sessionStorage
|
||||
const showError = (message: string) => {
|
||||
@@ -65,6 +84,46 @@ function App(): React.JSX.Element {
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
const unsubscribe = window.electron.update.onStatusChanged((status) => {
|
||||
setUpdateStatus(status)
|
||||
if (status.phase === 'available' || status.phase === 'downloaded' || status.phase === 'idle') {
|
||||
void refreshUpdateCatalog()
|
||||
}
|
||||
})
|
||||
|
||||
void refreshUpdateState()
|
||||
|
||||
return unsubscribe
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
if (isAuthenticated) {
|
||||
void refreshUpdateState()
|
||||
void refreshUpdateCatalog()
|
||||
return
|
||||
}
|
||||
|
||||
setUpdateStatus(null)
|
||||
setUpdateCatalog(null)
|
||||
setShowUpdateDialog(false)
|
||||
}, [isAuthenticated])
|
||||
|
||||
const refreshUpdateState = async () => {
|
||||
const result = await window.electron.update.getStatus()
|
||||
if (result.success && result.data) {
|
||||
setUpdateStatus(result.data)
|
||||
}
|
||||
}
|
||||
|
||||
const refreshUpdateCatalog = async () => {
|
||||
const result = await window.electron.update.getCatalog()
|
||||
if (result.success && result.data) {
|
||||
setUpdateCatalog(result.data)
|
||||
}
|
||||
}
|
||||
|
||||
const initializeAuth = async () => {
|
||||
logger.info('=== Starting initializeAuth ===')
|
||||
try {
|
||||
@@ -195,6 +254,44 @@ function App(): React.JSX.Element {
|
||||
setShowLoginDialog(true)
|
||||
}
|
||||
|
||||
const openUpdateDialog = async () => {
|
||||
await refreshUpdateCatalog()
|
||||
setShowUpdateDialog(true)
|
||||
}
|
||||
|
||||
const handleInstallUserRelease = async () => {
|
||||
if (!updateCatalog?.recommendedRelease) {
|
||||
showError('暂无可安装更新')
|
||||
return
|
||||
}
|
||||
|
||||
if (updateStatus?.phase !== 'downloaded') {
|
||||
const downloadResult = await window.electron.update.downloadRelease(updateCatalog.recommendedRelease)
|
||||
if (!downloadResult.success) {
|
||||
showError(downloadResult.error || '下载更新失败')
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
const installResult = await window.electron.update.installDownloaded()
|
||||
if (!installResult.success) {
|
||||
showError(installResult.error || '启动安装失败')
|
||||
}
|
||||
}
|
||||
|
||||
const handleAdminDownloadAndInstall = async (release: DownloadReleaseRequest) => {
|
||||
const downloadResult = await window.electron.update.downloadRelease(release)
|
||||
if (!downloadResult.success) {
|
||||
showError(downloadResult.error || '下载更新失败')
|
||||
return
|
||||
}
|
||||
|
||||
const installResult = await window.electron.update.installDownloaded()
|
||||
if (!installResult.success) {
|
||||
showError(installResult.error || '启动安装失败')
|
||||
}
|
||||
}
|
||||
|
||||
// Check if should show logout button
|
||||
// Show logout if: user is Admin, OR user was switched by Admin
|
||||
const shouldShowLogout = currentUser?.userType === 'Admin' || isSwitchedByAdmin
|
||||
@@ -317,6 +414,24 @@ function App(): React.JSX.Element {
|
||||
{ id: 'settings', label: '系统设置 (Settings)', icon: <Settings size={18} /> }
|
||||
]
|
||||
|
||||
const showUpdateEntry =
|
||||
!!updateStatus &&
|
||||
((currentUser?.userType === 'User' && updateStatus.phase === 'downloaded') ||
|
||||
(currentUser?.userType === 'Admin' &&
|
||||
(updateStatus.adminHasAnyRelease ||
|
||||
updateStatus.phase === 'downloading' ||
|
||||
updateStatus.phase === 'downloaded' ||
|
||||
updateStatus.phase === 'installing')))
|
||||
|
||||
const updateButtonLabel =
|
||||
currentUser?.userType === 'Admin'
|
||||
? updateStatus?.phase === 'downloading'
|
||||
? '下载更新中...'
|
||||
: '有可用版本'
|
||||
: updateStatus?.phase === 'downloaded'
|
||||
? `发现稳定版 V${updateStatus.latestVersion}`
|
||||
: '发现新版本'
|
||||
|
||||
return (
|
||||
<div className="flex flex-col h-screen bg-slate-50 text-slate-800 font-sans overflow-hidden">
|
||||
{/* ================= 顶部导航与标题栏 ================= */}
|
||||
@@ -332,12 +447,17 @@ function App(): React.JSX.Element {
|
||||
</div>
|
||||
|
||||
<div
|
||||
className="flex items-center gap-2 text-white font-bold text-lg cursor-pointer"
|
||||
className="flex flex-col cursor-pointer"
|
||||
onClick={() => setCurrentPage('home')}
|
||||
style={{ WebkitAppRegion: 'no-drag' } as any}
|
||||
>
|
||||
<LayoutDashboard size={22} className="text-blue-500" />
|
||||
<span>ERP Auto</span>
|
||||
<div className="flex items-center gap-2 text-white font-bold text-lg">
|
||||
<LayoutDashboard size={22} className="text-blue-500" />
|
||||
<span>ERP Auto</span>
|
||||
</div>
|
||||
<span className="text-xs text-slate-400 ml-7">
|
||||
{__APP_VERSION__}({__GIT_HASH__})
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -365,6 +485,20 @@ function App(): React.JSX.Element {
|
||||
className="flex items-center gap-4 text-sm"
|
||||
style={{ WebkitAppRegion: 'no-drag' } as any}
|
||||
>
|
||||
{showUpdateEntry && (
|
||||
<button
|
||||
onClick={() => void openUpdateDialog()}
|
||||
className="inline-flex items-center gap-2 rounded-full border border-blue-500/40 bg-blue-500/10 px-3 py-1.5 text-xs font-medium text-blue-100 transition hover:bg-blue-500/20"
|
||||
title={updateStatus?.message || '查看更新'}
|
||||
>
|
||||
{updateStatus?.phase === 'downloading' || updateStatus?.phase === 'installing' ? (
|
||||
<LoaderCircle size={15} className="animate-spin" />
|
||||
) : (
|
||||
<ArrowUpCircle size={15} />
|
||||
)}
|
||||
<span>{updateButtonLabel}</span>
|
||||
</button>
|
||||
)}
|
||||
<div className="flex items-center gap-2 text-xs bg-slate-800 px-3 py-1.5 rounded-full border border-slate-700">
|
||||
<Database size={14} className="text-green-500" />
|
||||
<span className="text-slate-300">数据库已连接</span>
|
||||
@@ -413,6 +547,22 @@ function App(): React.JSX.Element {
|
||||
|
||||
{/* Toast Notifications */}
|
||||
<Toast />
|
||||
<UpdateDialog
|
||||
isOpen={showUpdateDialog}
|
||||
userType={currentUser?.userType ?? null}
|
||||
status={updateStatus}
|
||||
catalog={updateCatalog}
|
||||
onClose={() => setShowUpdateDialog(false)}
|
||||
onInstallUserRelease={handleInstallUserRelease}
|
||||
onDownloadAndInstallAdminRelease={async (release) =>
|
||||
handleAdminDownloadAndInstall(release)
|
||||
}
|
||||
onRefreshCatalog={async () => {
|
||||
await window.electron.update.checkNow()
|
||||
await refreshUpdateCatalog()
|
||||
await refreshUpdateState()
|
||||
}}
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -34,6 +34,9 @@ interface ExecutionReportDialogProps {
|
||||
progress?: CleanerProgress | null
|
||||
startTime?: number | null
|
||||
triggerRef?: React.RefObject<HTMLElement | null>
|
||||
// Retry-related props
|
||||
retriedOrders?: number
|
||||
successfulRetries?: number
|
||||
}
|
||||
|
||||
export const ExecutionReportDialog: React.FC<ExecutionReportDialogProps> = ({
|
||||
@@ -47,14 +50,18 @@ export const ExecutionReportDialog: React.FC<ExecutionReportDialogProps> = ({
|
||||
isExecuting = false,
|
||||
progress = null,
|
||||
startTime = null,
|
||||
triggerRef
|
||||
triggerRef,
|
||||
retriedOrders = 0,
|
||||
successfulRetries = 0
|
||||
}) => {
|
||||
const [now, setNow] = React.useState(() => Date.now())
|
||||
|
||||
const hasErrors = errors.length > 0
|
||||
const hasRetries = retriedOrders > 0
|
||||
const showProgress = isExecuting && progress
|
||||
const isProgressing = !!showProgress
|
||||
|
||||
// Update timer during progress
|
||||
React.useEffect(() => {
|
||||
if (!showProgress || !startTime) return
|
||||
|
||||
@@ -65,6 +72,27 @@ export const ExecutionReportDialog: React.FC<ExecutionReportDialogProps> = ({
|
||||
return () => clearInterval(interval)
|
||||
}, [showProgress, startTime])
|
||||
|
||||
// Update time when execution completes
|
||||
React.useEffect(() => {
|
||||
if (showProgress === false && startTime && isExecuting === false) {
|
||||
setNow(Date.now())
|
||||
}
|
||||
}, [showProgress, isExecuting, startTime])
|
||||
|
||||
const elapsedTime = React.useMemo(() => {
|
||||
if (!startTime) return null
|
||||
|
||||
const elapsedMs = now - startTime
|
||||
const elapsedSeconds = Math.floor(elapsedMs / 1000)
|
||||
const minutes = Math.floor(elapsedSeconds / 60)
|
||||
const seconds = elapsedSeconds % 60
|
||||
|
||||
return {
|
||||
totalSeconds: elapsedSeconds,
|
||||
formatted: minutes > 0 ? `${minutes}分${seconds}秒` : `${seconds}秒`
|
||||
}
|
||||
}, [startTime, now])
|
||||
|
||||
const estimatedTime = React.useMemo(() => {
|
||||
if (!showProgress || !startTime || !progress) return null
|
||||
|
||||
@@ -110,6 +138,7 @@ export const ExecutionReportDialog: React.FC<ExecutionReportDialogProps> = ({
|
||||
triggerRef={triggerRef}
|
||||
isAlertDialog={isProgressing}
|
||||
disableEscapeKey={isProgressing}
|
||||
disableBackdropClick={isProgressing}
|
||||
ariaDescribedBy={isProgressing ? 'execution-dialog-progress-desc' : undefined}
|
||||
initialFocusSelector={!isProgressing ? '.btn-report-close' : undefined}
|
||||
>
|
||||
@@ -198,6 +227,15 @@ export const ExecutionReportDialog: React.FC<ExecutionReportDialogProps> = ({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{elapsedTime && (
|
||||
<div className="flex flex-col items-center gap-2 p-3 bg-blue-50 rounded-lg border border-blue-200 mb-2">
|
||||
<div className="flex items-center gap-2 text-sm">
|
||||
<span className="text-gray-600">已运行</span>
|
||||
<span className="font-semibold text-blue-600">{elapsedTime.formatted}</span>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{estimatedTime && (
|
||||
<div className="flex flex-col items-center gap-2 p-3 bg-green-50 rounded-lg border border-green-200">
|
||||
<div className="flex items-center gap-2 text-sm">
|
||||
@@ -259,8 +297,71 @@ export const ExecutionReportDialog: React.FC<ExecutionReportDialogProps> = ({
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{hasRetries && (
|
||||
<>
|
||||
<div className="bg-gray-50 rounded-lg p-3 flex items-center gap-3 border border-gray-200">
|
||||
<div className="w-9 h-9 rounded-lg bg-purple-50 flex items-center justify-center flex-shrink-0">
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
width="20"
|
||||
height="20"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="2"
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
className="text-purple-600"
|
||||
>
|
||||
<path d="M21 12a9 9 0 0 0-9-9 9.75 9.75 0 0 0-6.74 2.74L3 8" />
|
||||
<path d="M3 3v5h5" />
|
||||
<path d="M3 12a9 9 0 0 0 9 9 9.75 9.75 0 0 0 6.74-2.74L21 16" />
|
||||
<path d="M16 21h5v-5" />
|
||||
</svg>
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="text-xs text-gray-600">重试订单</div>
|
||||
<div className="text-xl font-semibold text-gray-900">{retriedOrders}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="bg-gray-50 rounded-lg p-3 flex items-center gap-3 border border-gray-200">
|
||||
<div className="w-9 h-9 rounded-lg bg-emerald-50 flex items-center justify-center flex-shrink-0">
|
||||
<CheckCircle size={20} className="text-emerald-600" />
|
||||
</div>
|
||||
<div className="flex-1 min-w-0">
|
||||
<div className="text-xs text-gray-600">成功重试</div>
|
||||
<div className="text-xl font-semibold text-gray-900">{successfulRetries}</div>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{elapsedTime && (
|
||||
<div className="flex items-center justify-center gap-2 p-3 bg-blue-50 rounded-lg border border-blue-200 text-blue-700 text-sm mb-3">
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
width="16"
|
||||
height="16"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
strokeWidth="2"
|
||||
strokeLinecap="round"
|
||||
strokeLinejoin="round"
|
||||
className="flex-shrink-0"
|
||||
>
|
||||
<circle cx="12" cy="12" r="10" />
|
||||
<polyline points="12 6 12 12 16 14" />
|
||||
</svg>
|
||||
<span>
|
||||
总耗时:<span className="font-semibold">{elapsedTime.formatted}</span>
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{hasErrors && (
|
||||
<div className="mt-4 pt-4 border-t border-gray-200">
|
||||
<div className="text-sm font-semibold text-red-600 mb-2">错误详情</div>
|
||||
|
||||
262
src/renderer/src/components/ReportViewerDialog.tsx
Normal file
262
src/renderer/src/components/ReportViewerDialog.tsx
Normal file
@@ -0,0 +1,262 @@
|
||||
import React, { useEffect, useState, useMemo } from 'react'
|
||||
import { X, FileText, Loader2, ChevronDown } from 'lucide-react'
|
||||
import { Combobox, Transition } from '@headlessui/react'
|
||||
import ReactMarkdown from 'react-markdown'
|
||||
import remarkGfm from 'remark-gfm'
|
||||
import rehypeHighlight from 'rehype-highlight'
|
||||
import rehypeSlug from 'rehype-slug'
|
||||
import rehypeAutolinkHeadings from 'rehype-autolink-headings'
|
||||
import 'github-markdown-css/github-markdown-light.css'
|
||||
import 'highlight.js/styles/github.css'
|
||||
|
||||
interface ReportMetadata {
|
||||
key: string
|
||||
filename: string
|
||||
username: string
|
||||
lastModified?: Date
|
||||
size?: number
|
||||
}
|
||||
|
||||
interface ReportViewerDialogProps {
|
||||
isOpen: boolean
|
||||
onClose: () => void
|
||||
isAdmin: boolean
|
||||
currentUsername: string
|
||||
}
|
||||
|
||||
export const ReportViewerDialog: React.FC<ReportViewerDialogProps> = ({
|
||||
isOpen,
|
||||
onClose,
|
||||
isAdmin,
|
||||
currentUsername
|
||||
}) => {
|
||||
const [reports, setReports] = useState<ReportMetadata[]>([])
|
||||
const [selectedReport, setSelectedReport] = useState<ReportMetadata | null>(null)
|
||||
const [reportContent, setReportContent] = useState<string>('')
|
||||
const [isLoadingList, setIsLoadingList] = useState<boolean>(false)
|
||||
const [isLoadingContent, setIsLoadingContent] = useState<boolean>(false)
|
||||
const [error, setError] = useState<string | null>(null)
|
||||
const [query, setQuery] = useState('')
|
||||
|
||||
useEffect(() => {
|
||||
if (isOpen) {
|
||||
loadReports()
|
||||
} else {
|
||||
// Reset state when closed
|
||||
setReports([])
|
||||
setSelectedReport(null)
|
||||
setReportContent('')
|
||||
setError(null)
|
||||
}
|
||||
}, [isOpen, isAdmin, currentUsername])
|
||||
|
||||
const loadReports = async () => {
|
||||
setIsLoadingList(true)
|
||||
setError(null)
|
||||
try {
|
||||
let result
|
||||
if (isAdmin) {
|
||||
result = await window.electron.report.listAll()
|
||||
} else {
|
||||
result = await window.electron.report.listByUser(currentUsername)
|
||||
}
|
||||
|
||||
if (result.success && result.data) {
|
||||
setReports(result.data)
|
||||
} else {
|
||||
setError(result.error || '无法获取报告列表')
|
||||
}
|
||||
} catch (err) {
|
||||
setError('获取报告列表时发生错误')
|
||||
} finally {
|
||||
setIsLoadingList(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleReportChange = async (report: ReportMetadata | null) => {
|
||||
setSelectedReport(report)
|
||||
|
||||
if (!report) {
|
||||
setReportContent('')
|
||||
return
|
||||
}
|
||||
|
||||
setIsLoadingContent(true)
|
||||
setError(null)
|
||||
try {
|
||||
const result = await window.electron.report.download(report.key)
|
||||
if (result.success && result.data) {
|
||||
setReportContent(result.data)
|
||||
} else {
|
||||
setError(result.error || '无法获取报告内容')
|
||||
setReportContent('')
|
||||
}
|
||||
} catch (err) {
|
||||
setError('获取报告内容时发生错误')
|
||||
setReportContent('')
|
||||
} finally {
|
||||
setIsLoadingContent(false)
|
||||
}
|
||||
}
|
||||
|
||||
// Filter reports based on search query
|
||||
const filteredReports = useMemo(() => {
|
||||
if (!query) return reports
|
||||
return reports.filter((report) => report.filename.toLowerCase().includes(query.toLowerCase()))
|
||||
}, [reports, query])
|
||||
|
||||
if (!isOpen) return null
|
||||
|
||||
// Format date to local string
|
||||
const formatDate = (dateString?: Date | string) => {
|
||||
if (!dateString) return '未知时间'
|
||||
const date = typeof dateString === 'string' ? new Date(dateString) : dateString
|
||||
return date.toLocaleString('zh-CN', {
|
||||
year: 'numeric',
|
||||
month: '2-digit',
|
||||
day: '2-digit',
|
||||
hour: '2-digit',
|
||||
minute: '2-digit',
|
||||
second: '2-digit'
|
||||
})
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 z-[100] flex items-center justify-center bg-slate-900/50 backdrop-blur-sm animate-in fade-in duration-200">
|
||||
<div className="bg-white rounded-2xl shadow-2xl w-[900px] max-w-[90vw] h-[80vh] flex flex-col border border-slate-200 overflow-hidden animate-in zoom-in-95 duration-200">
|
||||
{/* Header */}
|
||||
<div className="flex items-center justify-between px-6 py-4 border-b border-slate-200 bg-slate-50 flex-shrink-0">
|
||||
<div className="flex items-center gap-2 text-slate-800">
|
||||
<FileText size={20} className="text-blue-600" />
|
||||
<h2 className="text-lg font-semibold">执行报告浏览器</h2>
|
||||
</div>
|
||||
<button
|
||||
onClick={onClose}
|
||||
className="text-slate-400 hover:text-slate-600 hover:bg-slate-200/50 p-1.5 rounded-lg transition-colors"
|
||||
>
|
||||
<X size={20} />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{/* Controls */}
|
||||
<div className="px-6 py-4 border-b border-slate-200 bg-white flex-shrink-0">
|
||||
<div className="flex items-center gap-4">
|
||||
<label className="text-sm font-medium text-slate-700 flex-shrink-0">选择报告:</label>
|
||||
<div className="relative flex-1 max-w-2xl">
|
||||
<Combobox value={selectedReport} onChange={handleReportChange} nullable>
|
||||
<div className="relative">
|
||||
<Combobox.Input
|
||||
className="w-full bg-slate-50 border border-slate-300 text-slate-700 py-2 pl-3 pr-10 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500/50 focus:border-blue-500 disabled:opacity-50 text-sm"
|
||||
displayValue={(report: ReportMetadata | null) => {
|
||||
if (!report) return '请选择要查看的报告...'
|
||||
return `${isAdmin ? `[${report.username}] ` : ''}${report.filename} (${formatDate(report.lastModified)})`
|
||||
}}
|
||||
onChange={(event) => setQuery(event.target.value)}
|
||||
placeholder="请选择要查看的报告..."
|
||||
disabled={isLoadingList}
|
||||
/>
|
||||
<Combobox.Button className="absolute inset-y-0 right-0 flex items-center px-2 text-slate-500 hover:text-slate-700 transition-colors">
|
||||
<ChevronDown size={20} className="h-5 w-5" />
|
||||
</Combobox.Button>
|
||||
</div>
|
||||
<Transition
|
||||
enter="transition duration-100 ease-out"
|
||||
enterFrom="transform scale-95 opacity-0"
|
||||
enterTo="transform scale-100 opacity-100"
|
||||
leave="transition duration-75 ease-out"
|
||||
leaveFrom="transform scale-100 opacity-100"
|
||||
leaveTo="transform scale-95 opacity-0"
|
||||
>
|
||||
<Combobox.Options className="absolute z-50 w-full mt-1 bg-white border border-slate-200 rounded-lg shadow-lg max-h-60 overflow-auto focus:outline-none">
|
||||
{filteredReports.length === 0 && query ? (
|
||||
<div className="px-4 py-8 text-center text-slate-400 text-sm">
|
||||
未找到匹配的报告
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
{/* Empty option to allow clearing selection */}
|
||||
<Combobox.Option
|
||||
value={null}
|
||||
className={({ active }) =>
|
||||
`px-4 py-2.5 text-sm cursor-pointer ${
|
||||
active ? 'bg-slate-100 text-slate-900' : 'text-slate-500 italic'
|
||||
}`
|
||||
}
|
||||
>
|
||||
请选择要查看的报告...
|
||||
</Combobox.Option>
|
||||
{filteredReports.map((report) => (
|
||||
<Combobox.Option
|
||||
key={report.key}
|
||||
value={report}
|
||||
className={({ active, selected }) =>
|
||||
`px-4 py-2.5 text-sm cursor-pointer transition-colors ${
|
||||
selected
|
||||
? 'bg-blue-500 text-white'
|
||||
: active
|
||||
? 'bg-blue-50 text-blue-700'
|
||||
: 'text-slate-900'
|
||||
}`
|
||||
}
|
||||
>
|
||||
{({ selected }) => (
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="truncate flex-1">
|
||||
{isAdmin ? `[${report.username}] ` : ''}
|
||||
{report.filename}
|
||||
</span>
|
||||
<span
|
||||
className={`ml-2 text-xs ${selected ? 'text-blue-100' : 'text-slate-400'}`}
|
||||
>
|
||||
{formatDate(report.lastModified)}
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
</Combobox.Option>
|
||||
))}
|
||||
</>
|
||||
)}
|
||||
</Combobox.Options>
|
||||
</Transition>
|
||||
</Combobox>
|
||||
</div>
|
||||
{isLoadingList && <Loader2 size={16} className="text-blue-500 animate-spin" />}
|
||||
</div>
|
||||
{error && (
|
||||
<div className="mt-3 text-sm text-red-600 flex items-center gap-1.5 bg-red-50 p-2 rounded">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Content */}
|
||||
<div className="flex-1 bg-slate-50 overflow-hidden relative">
|
||||
{isLoadingContent ? (
|
||||
<div className="absolute inset-0 flex flex-col items-center justify-center text-slate-500 bg-white/80 z-10">
|
||||
<Loader2 size={32} className="animate-spin text-blue-500 mb-4" />
|
||||
<p>正在加载报告内容...</p>
|
||||
</div>
|
||||
) : reportContent ? (
|
||||
<div className="h-full overflow-y-auto p-8">
|
||||
<div className="markdown-body bg-white p-8 rounded-xl shadow-sm border border-slate-200">
|
||||
<ReactMarkdown
|
||||
remarkPlugins={[remarkGfm]}
|
||||
rehypePlugins={[rehypeSlug, rehypeAutolinkHeadings, rehypeHighlight]}
|
||||
>
|
||||
{reportContent}
|
||||
</ReactMarkdown>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<div className="absolute inset-0 flex flex-col items-center justify-center text-slate-400">
|
||||
<FileText size={48} className="mb-4 text-slate-300 opacity-50" />
|
||||
<p>请在上方选择一个报告进行浏览</p>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default ReportViewerDialog
|
||||
267
src/renderer/src/components/UpdateDialog.tsx
Normal file
267
src/renderer/src/components/UpdateDialog.tsx
Normal file
@@ -0,0 +1,267 @@
|
||||
import React, { useEffect, useState } from 'react'
|
||||
import ReactMarkdown from 'react-markdown'
|
||||
import remarkGfm from 'remark-gfm'
|
||||
import { DownloadCloud, LoaderCircle, RefreshCw } from 'lucide-react'
|
||||
import Modal from './ui/Modal'
|
||||
import type { UserType } from '../../../main/types/user.types'
|
||||
import type {
|
||||
DownloadReleaseRequest,
|
||||
UpdateDialogCatalog,
|
||||
UpdateRelease,
|
||||
UpdateStatus
|
||||
} from '../../../main/types/update.types'
|
||||
|
||||
interface UpdateDialogProps {
|
||||
isOpen: boolean
|
||||
userType: UserType | null
|
||||
status: UpdateStatus | null
|
||||
catalog: UpdateDialogCatalog | null
|
||||
onClose: () => void
|
||||
onInstallUserRelease: () => Promise<void>
|
||||
onDownloadAndInstallAdminRelease: (release: DownloadReleaseRequest) => Promise<void>
|
||||
onRefreshCatalog: () => Promise<void>
|
||||
}
|
||||
|
||||
function releaseKey(release: UpdateRelease): string {
|
||||
return `${release.channel}:${release.version}`
|
||||
}
|
||||
|
||||
export default function UpdateDialog({
|
||||
isOpen,
|
||||
userType,
|
||||
status,
|
||||
catalog,
|
||||
onClose,
|
||||
onInstallUserRelease,
|
||||
onDownloadAndInstallAdminRelease,
|
||||
onRefreshCatalog
|
||||
}: UpdateDialogProps): React.JSX.Element {
|
||||
const [selectedRelease, setSelectedRelease] = useState<UpdateRelease | undefined>(undefined)
|
||||
const [changelog, setChangelog] = useState<string>('')
|
||||
const [isLoadingChangelog, setIsLoadingChangelog] = useState(false)
|
||||
|
||||
useEffect(() => {
|
||||
if (!isOpen || !catalog) return
|
||||
|
||||
if (catalog.mode === 'user') {
|
||||
setSelectedRelease(catalog.recommendedRelease)
|
||||
return
|
||||
}
|
||||
|
||||
if (catalog.mode === 'admin') {
|
||||
setSelectedRelease(
|
||||
catalog.recommendedRelease ?? catalog.channels?.stable[0] ?? catalog.channels?.preview[0]
|
||||
)
|
||||
}
|
||||
}, [catalog, isOpen])
|
||||
|
||||
useEffect(() => {
|
||||
if (!isOpen || !selectedRelease) {
|
||||
setChangelog('')
|
||||
return
|
||||
}
|
||||
|
||||
let active = true
|
||||
setIsLoadingChangelog(true)
|
||||
|
||||
window.electron.update
|
||||
.getChangelog(selectedRelease)
|
||||
.then((result) => {
|
||||
if (!active) return
|
||||
setChangelog(result.success && result.data ? result.data : '暂无更新说明。')
|
||||
})
|
||||
.catch(() => {
|
||||
if (!active) return
|
||||
setChangelog('暂无更新说明。')
|
||||
})
|
||||
.finally(() => {
|
||||
if (active) {
|
||||
setIsLoadingChangelog(false)
|
||||
}
|
||||
})
|
||||
|
||||
return () => {
|
||||
active = false
|
||||
}
|
||||
}, [isOpen, selectedRelease])
|
||||
|
||||
const isBusy =
|
||||
status?.phase === 'downloading' || status?.phase === 'installing' || status?.phase === 'checking'
|
||||
|
||||
const renderReleaseList = (title: string, releases: UpdateRelease[]) => {
|
||||
if (releases.length === 0) {
|
||||
return (
|
||||
<div className="rounded-lg border border-dashed border-slate-200 px-3 py-4 text-sm text-slate-500">
|
||||
暂无版本
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="space-y-2">
|
||||
<div className="text-xs font-semibold uppercase tracking-wide text-slate-500">{title}</div>
|
||||
{releases.map((release) => {
|
||||
const selected = selectedRelease && releaseKey(selectedRelease) === releaseKey(release)
|
||||
return (
|
||||
<button
|
||||
key={releaseKey(release)}
|
||||
onClick={() => setSelectedRelease(release)}
|
||||
className={`w-full rounded-lg border px-3 py-3 text-left transition ${
|
||||
selected
|
||||
? 'border-blue-500 bg-blue-50 text-blue-900'
|
||||
: 'border-slate-200 bg-white text-slate-700 hover:border-slate-300'
|
||||
}`}
|
||||
>
|
||||
<div className="flex items-center justify-between gap-3">
|
||||
<span className="font-medium">V{release.version}</span>
|
||||
<span className="rounded-full bg-slate-100 px-2 py-0.5 text-xs uppercase text-slate-600">
|
||||
{release.channel}
|
||||
</span>
|
||||
</div>
|
||||
<div className="mt-1 text-xs text-slate-500">{release.publishedAt}</div>
|
||||
{release.notesSummary && (
|
||||
<div className="mt-2 text-xs text-slate-600">{release.notesSummary}</div>
|
||||
)}
|
||||
</button>
|
||||
)
|
||||
})}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<Modal
|
||||
isOpen={isOpen}
|
||||
onClose={isBusy ? () => undefined : onClose}
|
||||
title="应用更新"
|
||||
size="3xl"
|
||||
disableBackdropClick={isBusy}
|
||||
disableEscapeKey={isBusy}
|
||||
>
|
||||
<div className="space-y-4">
|
||||
<div className="flex items-center justify-between rounded-lg bg-slate-50 px-4 py-3 text-sm">
|
||||
<div className="text-slate-600">
|
||||
当前版本 <span className="font-semibold text-slate-900">V{status?.currentVersion}</span>
|
||||
<span className="ml-2 rounded-full bg-slate-200 px-2 py-0.5 text-xs uppercase text-slate-700">
|
||||
{status?.currentChannel ?? __APP_CHANNEL__}
|
||||
</span>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => void onRefreshCatalog()}
|
||||
className="inline-flex items-center gap-2 rounded-md border border-slate-200 px-3 py-1.5 text-xs text-slate-600 hover:bg-slate-100"
|
||||
disabled={isBusy}
|
||||
>
|
||||
<RefreshCw size={14} />
|
||||
刷新
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{catalog?.mode === 'admin' ? (
|
||||
<div className="grid gap-4 lg:grid-cols-[280px_1fr]">
|
||||
<div className="space-y-4">
|
||||
{renderReleaseList('Stable', catalog.channels?.stable ?? [])}
|
||||
{renderReleaseList('Preview', catalog.channels?.preview ?? [])}
|
||||
</div>
|
||||
<div className="rounded-xl border border-slate-200 bg-white">
|
||||
<div className="border-b border-slate-200 px-4 py-3">
|
||||
<div className="text-sm font-semibold text-slate-900">
|
||||
{selectedRelease
|
||||
? `${selectedRelease.channel.toUpperCase()} V${selectedRelease.version}`
|
||||
: '请选择一个版本'}
|
||||
</div>
|
||||
<div className="mt-1 text-xs text-slate-500">
|
||||
{selectedRelease?.notesSummary ?? '选择版本后可查看详细更新说明。'}
|
||||
</div>
|
||||
</div>
|
||||
<div className="max-h-[420px] overflow-auto px-4 py-4 prose prose-slate max-w-none prose-headings:mb-2 prose-p:my-2 prose-li:my-1">
|
||||
{isLoadingChangelog ? (
|
||||
<div className="flex items-center gap-2 text-sm text-slate-500">
|
||||
<LoaderCircle size={16} className="animate-spin" />
|
||||
正在加载更新说明...
|
||||
</div>
|
||||
) : (
|
||||
<ReactMarkdown remarkPlugins={[remarkGfm]}>
|
||||
{changelog || '暂无更新说明。'}
|
||||
</ReactMarkdown>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
<div className="rounded-xl border border-slate-200 bg-white">
|
||||
<div className="border-b border-slate-200 px-4 py-3">
|
||||
<div className="text-sm font-semibold text-slate-900">
|
||||
{selectedRelease ? `发现稳定版 V${selectedRelease.version}` : '暂无可用更新'}
|
||||
</div>
|
||||
<div className="mt-1 text-xs text-slate-500">
|
||||
{status?.currentChannel === 'preview'
|
||||
? '当前设备正在运行预览版,普通用户将更新回稳定版。'
|
||||
: '更新包已在后台准备完成,确认后将自动关闭并重启应用。'}
|
||||
</div>
|
||||
</div>
|
||||
<div className="max-h-[420px] overflow-auto px-4 py-4 prose prose-slate max-w-none prose-headings:mb-2 prose-p:my-2 prose-li:my-1">
|
||||
{isLoadingChangelog ? (
|
||||
<div className="flex items-center gap-2 text-sm text-slate-500">
|
||||
<LoaderCircle size={16} className="animate-spin" />
|
||||
正在加载更新说明...
|
||||
</div>
|
||||
) : (
|
||||
<ReactMarkdown remarkPlugins={[remarkGfm]}>
|
||||
{changelog || '暂无更新说明。'}
|
||||
</ReactMarkdown>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{status?.error && (
|
||||
<div className="rounded-lg border border-rose-200 bg-rose-50 px-4 py-3 text-sm text-rose-700">
|
||||
{status.error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="flex items-center justify-between border-t border-slate-200 pt-4">
|
||||
<div className="text-sm text-slate-500">{status?.message ?? ' '}</div>
|
||||
<div className="flex items-center gap-3">
|
||||
<button
|
||||
onClick={onClose}
|
||||
className="rounded-md border border-slate-200 px-4 py-2 text-sm text-slate-600 hover:bg-slate-50"
|
||||
disabled={isBusy}
|
||||
>
|
||||
稍后
|
||||
</button>
|
||||
{userType === 'Admin' ? (
|
||||
<button
|
||||
onClick={() =>
|
||||
selectedRelease ? void onDownloadAndInstallAdminRelease(selectedRelease) : undefined
|
||||
}
|
||||
className="inline-flex items-center gap-2 rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 disabled:cursor-not-allowed disabled:bg-blue-300"
|
||||
disabled={!selectedRelease || isBusy}
|
||||
>
|
||||
{isBusy ? (
|
||||
<LoaderCircle size={16} className="animate-spin" />
|
||||
) : (
|
||||
<DownloadCloud size={16} />
|
||||
)}
|
||||
下载并更新
|
||||
</button>
|
||||
) : (
|
||||
<button
|
||||
onClick={() => void onInstallUserRelease()}
|
||||
className="inline-flex items-center gap-2 rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700 disabled:cursor-not-allowed disabled:bg-blue-300"
|
||||
disabled={!selectedRelease || isBusy}
|
||||
>
|
||||
{isBusy ? (
|
||||
<LoaderCircle size={16} className="animate-spin" />
|
||||
) : (
|
||||
<DownloadCloud size={16} />
|
||||
)}
|
||||
立即更新
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
)
|
||||
}
|
||||
@@ -107,11 +107,7 @@ export function ConfirmDialog({
|
||||
<Button variant="secondary" onClick={onCancel}>
|
||||
{cancelText}
|
||||
</Button>
|
||||
<Button
|
||||
data-autofocus="true"
|
||||
variant={styles.buttonVariant}
|
||||
onClick={onConfirm}
|
||||
>
|
||||
<Button data-autofocus="true" variant={styles.buttonVariant} onClick={onConfirm}>
|
||||
{confirmText}
|
||||
</Button>
|
||||
</div>
|
||||
@@ -125,14 +121,14 @@ export function ConfirmDialog({
|
||||
*/
|
||||
export function useConfirmDialog() {
|
||||
const [config, setConfig] = useState<
|
||||
(Omit<ConfirmDialogProps, 'isOpen' | 'onConfirm' | 'onCancel'> & {
|
||||
resolve: (value: boolean) => void
|
||||
}) | null>(null)
|
||||
| (Omit<ConfirmDialogProps, 'isOpen' | 'onConfirm' | 'onCancel'> & {
|
||||
resolve: (value: boolean) => void
|
||||
})
|
||||
| null
|
||||
>(null)
|
||||
|
||||
const confirm = useCallback(
|
||||
(
|
||||
options: Omit<ConfirmDialogProps, 'isOpen' | 'onConfirm' | 'onCancel'>
|
||||
): Promise<boolean> => {
|
||||
(options: Omit<ConfirmDialogProps, 'isOpen' | 'onConfirm' | 'onCancel'>): Promise<boolean> => {
|
||||
return new Promise<boolean>((resolve) => {
|
||||
setConfig({
|
||||
...options,
|
||||
|
||||
@@ -28,6 +28,8 @@ interface ModalProps {
|
||||
isAlertDialog?: boolean
|
||||
/** Whether to disable escape key handling (e.g., during execution) */
|
||||
disableEscapeKey?: boolean
|
||||
/** Whether to disable closing when clicking on backdrop (e.g., during execution) */
|
||||
disableBackdropClick?: boolean
|
||||
}
|
||||
|
||||
const sizeStyles: Record<string, string> = {
|
||||
@@ -51,7 +53,8 @@ export function Modal({
|
||||
initialFocusSelector,
|
||||
ariaDescribedBy,
|
||||
isAlertDialog = false,
|
||||
disableEscapeKey = false
|
||||
disableEscapeKey = false,
|
||||
disableBackdropClick = false
|
||||
}: ModalProps): React.JSX.Element | null {
|
||||
const dialogRef = useRef<HTMLDivElement>(null)
|
||||
const [generatedId] = useState(
|
||||
@@ -87,7 +90,7 @@ export function Modal({
|
||||
{/* Backdrop */}
|
||||
<div
|
||||
className="fixed inset-0 bg-black bg-opacity-50 transition-opacity"
|
||||
onClick={onClose}
|
||||
onClick={disableBackdropClick ? undefined : onClose}
|
||||
aria-hidden="true"
|
||||
/>
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ export function Toast() {
|
||||
if (toasts.length === 0) return null
|
||||
|
||||
return (
|
||||
<div className="fixed bottom-4 right-4 z-50 flex flex-col gap-2">
|
||||
<div className="fixed bottom-4 left-1/2 -translate-x-1/2 z-50 flex flex-col gap-2">
|
||||
{toasts.map((toast) => (
|
||||
<ToastItem
|
||||
key={toast.id}
|
||||
|
||||
4
src/renderer/src/env.d.ts
vendored
4
src/renderer/src/env.d.ts
vendored
@@ -1 +1,5 @@
|
||||
/// <reference types="vite/client" />
|
||||
|
||||
declare const __APP_VERSION__: string
|
||||
declare const __GIT_HASH__: string
|
||||
declare const __APP_CHANNEL__: 'stable' | 'preview'
|
||||
|
||||
@@ -65,6 +65,8 @@ export function useCleaner() {
|
||||
materialsDeleted: number
|
||||
materialsSkipped: number
|
||||
errors: string[]
|
||||
retriedOrders?: number
|
||||
successfulRetries?: number
|
||||
} | null>(null)
|
||||
|
||||
// Progress state
|
||||
@@ -76,6 +78,8 @@ export function useCleaner() {
|
||||
const saved = sessionStorage.getItem('cleaner_headless')
|
||||
return saved ? saved === 'true' : true
|
||||
})
|
||||
const [queryBatchSize, setQueryBatchSize] = useState(100)
|
||||
const [processConcurrency, setProcessConcurrency] = useState(1)
|
||||
const [showSettingsMenu, setShowSettingsMenu] = useState(false)
|
||||
|
||||
// Inline editing state for manager field (Admin only)
|
||||
@@ -160,6 +164,22 @@ export function useCleaner() {
|
||||
}
|
||||
}, [])
|
||||
|
||||
// Load cleaner config from config.yaml on mount
|
||||
useEffect(() => {
|
||||
const loadCleanerConfig = async () => {
|
||||
try {
|
||||
const result = await window.electron.config.getCleaner()
|
||||
if (result.success && result.data) {
|
||||
setQueryBatchSize(result.data.queryBatchSize)
|
||||
setProcessConcurrency(result.data.processConcurrency)
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Failed to load cleaner config:', err)
|
||||
}
|
||||
}
|
||||
loadCleanerConfig()
|
||||
}, [])
|
||||
|
||||
useEffect(() => {
|
||||
sessionStorage.setItem('cleaner_dryRun', dryRun.toString())
|
||||
}, [dryRun])
|
||||
@@ -168,6 +188,16 @@ export function useCleaner() {
|
||||
sessionStorage.setItem('cleaner_headless', headless.toString())
|
||||
}, [headless])
|
||||
|
||||
const updateProcessConcurrency = async (value: number) => {
|
||||
const clamped = Math.max(1, Math.min(20, value))
|
||||
setProcessConcurrency(clamped)
|
||||
try {
|
||||
await window.electron.config.updateCleaner({ processConcurrency: clamped })
|
||||
} catch (err) {
|
||||
console.error('Failed to update cleaner config:', err)
|
||||
}
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
sessionStorage.setItem('cleaner_validationMode', valMode)
|
||||
}, [valMode])
|
||||
@@ -417,7 +447,9 @@ export function useCleaner() {
|
||||
orderNumbers: orderNumberList,
|
||||
materialCodes: materialCodeList,
|
||||
dryRun,
|
||||
headless
|
||||
headless,
|
||||
queryBatchSize,
|
||||
processConcurrency
|
||||
})
|
||||
const cleanerRunData = response.success ? (response.data as any) : null
|
||||
|
||||
@@ -426,7 +458,9 @@ export function useCleaner() {
|
||||
ordersProcessed: cleanerRunData.ordersProcessed,
|
||||
materialsDeleted: cleanerRunData.materialsDeleted,
|
||||
materialsSkipped: cleanerRunData.materialsSkipped,
|
||||
errors: cleanerRunData.errors
|
||||
errors: cleanerRunData.errors,
|
||||
retriedOrders: cleanerRunData.retriedOrders,
|
||||
successfulRetries: cleanerRunData.successfulRetries
|
||||
})
|
||||
} else {
|
||||
throw new Error(response.error || '清理失败')
|
||||
@@ -437,10 +471,15 @@ export function useCleaner() {
|
||||
setIsRunning(false)
|
||||
setIsExecuting(false)
|
||||
setProgress(null)
|
||||
setStartTime(null)
|
||||
// Note: Don't clear startTime here - it's needed for the execution report dialog
|
||||
// startTime will be reset when the dialog closes and a new execution starts
|
||||
}
|
||||
}
|
||||
|
||||
const resetStartTime = useCallback(() => {
|
||||
setStartTime(null)
|
||||
}, [])
|
||||
|
||||
const handleExportResults = async () => {
|
||||
if (filteredResults.length === 0) {
|
||||
showWarning('没有数据可导出')
|
||||
@@ -499,6 +538,11 @@ export function useCleaner() {
|
||||
setIsTypeDialogOpen,
|
||||
headless,
|
||||
setHeadless,
|
||||
queryBatchSize,
|
||||
setQueryBatchSize,
|
||||
processConcurrency,
|
||||
setProcessConcurrency,
|
||||
updateProcessConcurrency,
|
||||
showSettingsMenu,
|
||||
setShowSettingsMenu,
|
||||
filteredResults,
|
||||
@@ -515,6 +559,7 @@ export function useCleaner() {
|
||||
handleAssignManagerOnSelect,
|
||||
progress,
|
||||
startTime,
|
||||
resetStartTime,
|
||||
handleValidation,
|
||||
handleCheckboxToggle,
|
||||
handleConfirmDeletion,
|
||||
|
||||
@@ -239,7 +239,9 @@ export function useDialogFocus(options: UseDialogFocusOptions): UseDialogFocusRe
|
||||
|
||||
if (style.visibility === 'hidden') {
|
||||
if (import.meta.env.DEV) {
|
||||
console.warn('[useDialogFocus] Trigger element is visibility: hidden, cannot restore focus')
|
||||
console.warn(
|
||||
'[useDialogFocus] Trigger element is visibility: hidden, cannot restore focus'
|
||||
)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
@@ -13,10 +13,12 @@ import {
|
||||
Eye,
|
||||
HardDrive,
|
||||
Settings2,
|
||||
FileSpreadsheet
|
||||
FileSpreadsheet,
|
||||
FileText
|
||||
} from 'lucide-react'
|
||||
import MaterialTypeManagementDialog from '../components/MaterialTypeManagementDialog'
|
||||
import ExecutionReportDialog from '../components/ExecutionReportDialog'
|
||||
import ReportViewerDialog from '../components/ReportViewerDialog'
|
||||
import { ConfirmDialog } from '../components/ui/ConfirmDialog'
|
||||
import { useCleaner } from '../hooks/useCleaner'
|
||||
|
||||
@@ -46,6 +48,8 @@ const CleanerPage: React.FC = () => {
|
||||
setIsTypeDialogOpen,
|
||||
headless,
|
||||
setHeadless,
|
||||
processConcurrency,
|
||||
updateProcessConcurrency,
|
||||
showSettingsMenu,
|
||||
setShowSettingsMenu,
|
||||
filteredResults,
|
||||
@@ -62,6 +66,7 @@ const CleanerPage: React.FC = () => {
|
||||
handleAssignManagerOnSelect,
|
||||
progress,
|
||||
startTime,
|
||||
resetStartTime,
|
||||
handleValidation,
|
||||
handleCheckboxToggle,
|
||||
handleConfirmDeletion,
|
||||
@@ -70,6 +75,8 @@ const CleanerPage: React.FC = () => {
|
||||
confirmDialog
|
||||
} = useCleaner()
|
||||
|
||||
const [isReportViewerOpen, setIsReportViewerOpen] = React.useState(false)
|
||||
|
||||
return (
|
||||
<div className="h-full flex flex-col xl:flex-row gap-6 animate-in fade-in slide-in-from-bottom-4 duration-500">
|
||||
{/* 左栏:数据源与执行控制区 (仅 Admin 可见) */}
|
||||
@@ -266,6 +273,12 @@ const CleanerPage: React.FC = () => {
|
||||
>
|
||||
<FileSpreadsheet size={14} /> {isExporting ? '导出中...' : '导出结果'}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => setIsReportViewerOpen(true)}
|
||||
className="text-xs bg-emerald-50 border border-emerald-200 text-emerald-700 px-3 py-1.5 rounded shadow-sm hover:bg-emerald-100 flex items-center gap-1.5 font-medium transition-colors"
|
||||
>
|
||||
<FileText size={14} /> 查看报告
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -458,6 +471,27 @@ const CleanerPage: React.FC = () => {
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div className="border-t border-slate-100 pt-3 space-y-3">
|
||||
<div>
|
||||
<div className="text-sm font-medium text-slate-800">并行处理数量</div>
|
||||
<div className="text-xs text-slate-500 mt-0.5">
|
||||
同时处理详情页数量,范围 1-20
|
||||
</div>
|
||||
<div className="mt-2 flex items-center gap-3">
|
||||
<input
|
||||
type="range"
|
||||
min={1}
|
||||
max={20}
|
||||
value={processConcurrency}
|
||||
onChange={(e) => updateProcessConcurrency(Number(e.target.value))}
|
||||
className="flex-1 h-2 bg-slate-200 rounded-lg appearance-none cursor-pointer accent-blue-600"
|
||||
/>
|
||||
<span className="text-sm font-medium text-slate-700 w-8 text-center">
|
||||
{processConcurrency}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
@@ -486,7 +520,10 @@ const CleanerPage: React.FC = () => {
|
||||
{/* Execution Report Dialog */}
|
||||
<ExecutionReportDialog
|
||||
isOpen={isReportDialogOpen}
|
||||
onClose={() => setIsReportDialogOpen(false)}
|
||||
onClose={() => {
|
||||
setIsReportDialogOpen(false)
|
||||
resetStartTime()
|
||||
}}
|
||||
ordersProcessed={reportData?.ordersProcessed}
|
||||
materialsDeleted={reportData?.materialsDeleted}
|
||||
materialsSkipped={reportData?.materialsSkipped}
|
||||
@@ -496,6 +533,16 @@ const CleanerPage: React.FC = () => {
|
||||
progress={progress}
|
||||
startTime={startTime}
|
||||
triggerRef={executeButtonRef}
|
||||
retriedOrders={reportData?.retriedOrders}
|
||||
successfulRetries={reportData?.successfulRetries}
|
||||
/>
|
||||
|
||||
{/* Report Viewer Dialog */}
|
||||
<ReportViewerDialog
|
||||
isOpen={isReportViewerOpen}
|
||||
onClose={() => setIsReportViewerOpen(false)}
|
||||
isAdmin={isAdmin}
|
||||
currentUsername={currentUsername}
|
||||
/>
|
||||
|
||||
{/* Confirmation Dialog */}
|
||||
|
||||
@@ -30,6 +30,9 @@ const ExtractorPage: React.FC = () => {
|
||||
.map((line) => line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
window.electron.validation.setSharedProductionIds(orderNumberList)
|
||||
} else {
|
||||
// Clear shared Production IDs when input is cleared
|
||||
window.electron.validation.clearSharedProductionIds()
|
||||
}
|
||||
}, [orderNumbers])
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import React, { useState, useEffect } from 'react'
|
||||
import { Settings as SettingsIcon, Save, User, Key } from 'lucide-react'
|
||||
import { showSuccess, showError } from '../stores/useAppStore'
|
||||
|
||||
interface ErpCredentials {
|
||||
username: string
|
||||
@@ -13,10 +14,6 @@ const SettingsPage: React.FC = () => {
|
||||
})
|
||||
const [isModified, setIsModified] = useState(false)
|
||||
const [isLoading, setIsLoading] = useState(true)
|
||||
const [message, setMessage] = useState<{
|
||||
type: 'success' | 'error' | 'info'
|
||||
text: string
|
||||
} | null>(null)
|
||||
|
||||
useEffect(() => {
|
||||
loadCredentials()
|
||||
@@ -38,21 +35,16 @@ const SettingsPage: React.FC = () => {
|
||||
password: config.erp.password || ''
|
||||
})
|
||||
} else if (!response.success) {
|
||||
showMessage('error', response.error || '加载 ERP 配置失败')
|
||||
showError(response.error || '加载 ERP 配置失败')
|
||||
}
|
||||
setIsModified(false)
|
||||
} catch (error) {
|
||||
showMessage('error', '加载 ERP 配置失败')
|
||||
showError('加载 ERP 配置失败')
|
||||
} finally {
|
||||
setIsLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const showMessage = (type: 'success' | 'error' | 'info', text: string) => {
|
||||
setMessage({ type, text })
|
||||
setTimeout(() => setMessage(null), 3000)
|
||||
}
|
||||
|
||||
const handleSaveCredentials = async () => {
|
||||
try {
|
||||
// Save ERP credentials to database (current user's config)
|
||||
@@ -68,12 +60,12 @@ const SettingsPage: React.FC = () => {
|
||||
|
||||
if (result.success && saveData?.success !== false) {
|
||||
setIsModified(false)
|
||||
showMessage('success', 'ERP 账号密码保存成功')
|
||||
showSuccess('ERP 账号密码保存成功')
|
||||
} else {
|
||||
showMessage('error', result.error || saveData?.error || '保存失败')
|
||||
showError(result.error || saveData?.error || '保存失败')
|
||||
}
|
||||
} catch (error) {
|
||||
showMessage('error', '保存配置时发生错误')
|
||||
showError('保存配置时发生错误')
|
||||
}
|
||||
}
|
||||
|
||||
@@ -90,18 +82,6 @@ const SettingsPage: React.FC = () => {
|
||||
|
||||
return (
|
||||
<div className="flex justify-center animate-in fade-in slide-in-from-bottom-4 duration-500 mt-6">
|
||||
{message && (
|
||||
<div
|
||||
className={`fixed top-5 left-1/2 -translate-x-1/2 px-6 py-3 rounded-lg shadow-lg z-[10000] text-sm font-medium transition-all ${
|
||||
message.type === 'success'
|
||||
? 'bg-emerald-50 text-emerald-600 border border-emerald-200'
|
||||
: 'bg-red-50 text-red-600 border border-red-200'
|
||||
}`}
|
||||
>
|
||||
{message.text}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="w-full max-w-xl bg-white rounded-xl shadow-sm border border-slate-200 overflow-hidden">
|
||||
<div className="border-b border-slate-100 bg-slate-50 px-6 py-5">
|
||||
<h2 className="text-lg font-semibold flex items-center gap-2 text-slate-800">
|
||||
|
||||
1
src/shared/app-env.d.ts
vendored
Normal file
1
src/shared/app-env.d.ts
vendored
Normal file
@@ -0,0 +1 @@
|
||||
declare const __APP_CHANNEL__: 'stable' | 'preview'
|
||||
@@ -51,6 +51,7 @@ export const IPC_CHANNELS = {
|
||||
VALIDATION_VALIDATE: 'validation:validate',
|
||||
VALIDATION_SET_SHARED_PRODUCTION_IDS: 'validation:setSharedProductionIds',
|
||||
VALIDATION_GET_SHARED_PRODUCTION_IDS: 'validation:getSharedProductionIds',
|
||||
VALIDATION_CLEAR_SHARED_PRODUCTION_IDS: 'validation:clearSharedProductionIds',
|
||||
VALIDATION_GET_CLEANER_DATA: 'validation:getCleanerData',
|
||||
|
||||
// Materials
|
||||
@@ -83,8 +84,28 @@ export const IPC_CHANNELS = {
|
||||
USER_ERP_CONFIG_TEST_CONNECTION: 'user-erp-config:testConnection',
|
||||
USER_ERP_CONFIG_GET_ALL: 'user-erp-config:getAll',
|
||||
|
||||
// Config
|
||||
CONFIG_GET: 'config:get',
|
||||
CONFIG_UPDATE: 'config:update',
|
||||
CONFIG_GET_CLEANER: 'config:getCleaner',
|
||||
CONFIG_UPDATE_CLEANER: 'config:updateCleaner',
|
||||
|
||||
// Logger
|
||||
LOGGER_FORWARD: 'logger:forward'
|
||||
LOGGER_FORWARD: 'logger:forward',
|
||||
|
||||
// Report
|
||||
REPORT_LIST_ALL: 'report:listAll',
|
||||
REPORT_LIST_BY_USER: 'report:listByUser',
|
||||
REPORT_DOWNLOAD: 'report:download',
|
||||
|
||||
// Update
|
||||
UPDATE_GET_STATUS: 'update:getStatus',
|
||||
UPDATE_CHECK_NOW: 'update:checkNow',
|
||||
UPDATE_GET_CATALOG: 'update:getCatalog',
|
||||
UPDATE_GET_CHANGELOG: 'update:getChangelog',
|
||||
UPDATE_DOWNLOAD_RELEASE: 'update:downloadRelease',
|
||||
UPDATE_INSTALL_DOWNLOADED: 'update:installDownloaded',
|
||||
UPDATE_STATUS_CHANGED: 'update:onStatusChanged'
|
||||
} as const
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
import { describe, it, expect } from 'vitest'
|
||||
import { CleanerService } from '../../src/main/services/erp/cleaner'
|
||||
import {
|
||||
createBatches,
|
||||
getMissingOrders,
|
||||
runWithConcurrency
|
||||
} from '../../src/main/services/erp/cleaner'
|
||||
import type { ShouldDeleteParams } from '../../src/main/services/erp/cleaner'
|
||||
|
||||
describe('Cleaner Service (Unit)', () => {
|
||||
@@ -14,8 +18,8 @@ describe('Cleaner Service (Unit)', () => {
|
||||
return false
|
||||
}
|
||||
|
||||
// Check row number range (7000-7999 are protected)
|
||||
if (rowNumber >= 7000 && rowNumber < 8000) {
|
||||
// Check row number range (2000-7999 are protected)
|
||||
if (rowNumber >= 2000 && rowNumber < 8000) {
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -28,12 +32,12 @@ describe('Cleaner Service (Unit)', () => {
|
||||
}
|
||||
}
|
||||
|
||||
it('should skip materials with row number 7000-7999', () => {
|
||||
it('should skip materials with row number 2000-7999', () => {
|
||||
const testCases = [
|
||||
{ rowNumber: 7000, pendingQty: '', materialCode: 'TEST001', expected: false },
|
||||
{ rowNumber: 7500, pendingQty: '', materialCode: 'TEST001', expected: false },
|
||||
{ rowNumber: 2000, pendingQty: '', materialCode: 'TEST001', expected: false },
|
||||
{ rowNumber: 5000, pendingQty: '', materialCode: 'TEST001', expected: false },
|
||||
{ rowNumber: 7999, pendingQty: '', materialCode: 'TEST001', expected: false },
|
||||
{ rowNumber: 6999, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 1999, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 8000, pendingQty: '', materialCode: 'TEST001', expected: true }
|
||||
]
|
||||
|
||||
@@ -74,7 +78,7 @@ describe('Cleaner Service (Unit)', () => {
|
||||
const testCases = [
|
||||
{ rowNumber: 1, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 100, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 6999, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 1999, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 8000, pendingQty: '', materialCode: 'TEST001', expected: true },
|
||||
{ rowNumber: 10000, pendingQty: '', materialCode: 'TEST001', expected: true }
|
||||
]
|
||||
@@ -132,4 +136,31 @@ describe('Cleaner Service (Unit)', () => {
|
||||
).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('batch and concurrency helpers', () => {
|
||||
it('should split orders into batches', () => {
|
||||
const batches = createBatches(['A', 'B', 'C', 'D', 'E'], 2)
|
||||
expect(batches).toEqual([['A', 'B'], ['C', 'D'], ['E']])
|
||||
})
|
||||
|
||||
it('should identify missing orders', () => {
|
||||
const missing = getMissingOrders(['SC1', 'SC2', 'SC3'], new Set(['SC1', 'SC3']))
|
||||
expect(missing).toEqual(['SC2'])
|
||||
})
|
||||
|
||||
it('should respect concurrency limit', async () => {
|
||||
const items = [1, 2, 3, 4, 5, 6]
|
||||
let running = 0
|
||||
let peak = 0
|
||||
await runWithConcurrency(items, 2, async () => {
|
||||
running += 1
|
||||
peak = Math.max(peak, running)
|
||||
await new Promise((resolve) => setTimeout(resolve, 10))
|
||||
running -= 1
|
||||
return true
|
||||
})
|
||||
|
||||
expect(peak).toBeLessThanOrEqual(2)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
@@ -138,6 +138,34 @@ describe('Cleaner Schema', () => {
|
||||
|
||||
expect(result.success).toBe(false)
|
||||
})
|
||||
|
||||
it('should apply defaults for queryBatchSize and processConcurrency', () => {
|
||||
const input = {
|
||||
orderNumbers: ['SC12345678901234'],
|
||||
materialCodes: ['MAT001'],
|
||||
dryRun: false
|
||||
}
|
||||
|
||||
const result = CleanerInputSchema.safeParse(input)
|
||||
|
||||
expect(result.success).toBe(true)
|
||||
if (result.success) {
|
||||
expect(result.data.queryBatchSize).toBe(100)
|
||||
expect(result.data.processConcurrency).toBe(1)
|
||||
}
|
||||
})
|
||||
|
||||
it('should reject out-of-range processConcurrency', () => {
|
||||
const input = {
|
||||
orderNumbers: ['SC12345678901234'],
|
||||
materialCodes: ['MAT001'],
|
||||
dryRun: false,
|
||||
processConcurrency: 21
|
||||
}
|
||||
|
||||
const result = CleanerInputSchema.safeParse(input)
|
||||
expect(result.success).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
describe('validateCleanerInput', () => {
|
||||
|
||||
217
tests/unit/update-utils.test.ts
Normal file
217
tests/unit/update-utils.test.ts
Normal file
@@ -0,0 +1,217 @@
|
||||
import { describe, expect, it } from 'vitest'
|
||||
import {
|
||||
compareVersions,
|
||||
normalizeReleases,
|
||||
pickLatestRelease,
|
||||
resolveAdminDecision,
|
||||
resolveUserDecision
|
||||
} from '../../src/main/services/update/update-utils'
|
||||
import type { UpdateCatalog } from '../../src/main/types/update.types'
|
||||
|
||||
describe('update-utils', () => {
|
||||
it('compares semver-like numeric versions correctly', () => {
|
||||
expect(compareVersions('1.3.1', '1.3.1')).toBe(0)
|
||||
expect(compareVersions('1.3.2', '1.3.1')).toBe(1)
|
||||
expect(compareVersions('1.10.0', '1.9.9')).toBe(1)
|
||||
expect(compareVersions('1.2.0', '1.3.0')).toBe(-1)
|
||||
})
|
||||
|
||||
it('pads missing version segments with zero', () => {
|
||||
expect(compareVersions('1.3', '1.3.0')).toBe(0)
|
||||
expect(compareVersions('1.3.1', '1.3')).toBe(1)
|
||||
})
|
||||
|
||||
it('normalizes channel indexes and drops invalid entries', () => {
|
||||
const releases = normalizeReleases(
|
||||
{
|
||||
releases: [
|
||||
{
|
||||
version: '1.3.2',
|
||||
artifactKey: 'stable/1.3.2.exe',
|
||||
sha256: 'abc',
|
||||
size: 123,
|
||||
publishedAt: '2026-03-20T10:00:00Z',
|
||||
changelogKey: 'stable/1.3.2.md'
|
||||
},
|
||||
{
|
||||
version: '1.3.1',
|
||||
artifactKey: '',
|
||||
sha256: 'missing',
|
||||
size: 12,
|
||||
publishedAt: '2026-03-19T10:00:00Z',
|
||||
changelogKey: 'stable/1.3.1.md'
|
||||
}
|
||||
]
|
||||
},
|
||||
'stable'
|
||||
)
|
||||
|
||||
expect(releases).toHaveLength(1)
|
||||
expect(releases[0].channel).toBe('stable')
|
||||
expect(releases[0].version).toBe('1.3.2')
|
||||
})
|
||||
|
||||
it('keeps higher version newer even if its publishedAt is older', () => {
|
||||
const latest = pickLatestRelease([
|
||||
{
|
||||
version: '1.3.1',
|
||||
channel: 'stable',
|
||||
artifactKey: 'stable/1.3.1.exe',
|
||||
sha256: 'a',
|
||||
size: 1,
|
||||
publishedAt: '2026-03-20T11:00:00Z',
|
||||
changelogKey: 'stable/1.3.1.md'
|
||||
},
|
||||
{
|
||||
version: '1.3.2',
|
||||
channel: 'stable',
|
||||
artifactKey: 'stable/1.3.2.exe',
|
||||
sha256: 'b',
|
||||
size: 1,
|
||||
publishedAt: '2026-03-20T10:00:00Z',
|
||||
changelogKey: 'stable/1.3.2.md'
|
||||
}
|
||||
])
|
||||
|
||||
expect(latest?.version).toBe('1.3.2')
|
||||
})
|
||||
|
||||
it('forces User on preview back to latest stable', () => {
|
||||
const catalog: UpdateCatalog = {
|
||||
stable: [
|
||||
{
|
||||
version: '1.3.2',
|
||||
channel: 'stable',
|
||||
artifactKey: 'stable/1.3.2.exe',
|
||||
sha256: 'a',
|
||||
size: 1,
|
||||
publishedAt: '2026-03-20T10:00:00Z',
|
||||
changelogKey: 'stable/1.3.2.md'
|
||||
}
|
||||
],
|
||||
preview: [
|
||||
{
|
||||
version: '1.4.0',
|
||||
channel: 'preview',
|
||||
artifactKey: 'preview/1.4.0.exe',
|
||||
sha256: 'b',
|
||||
size: 1,
|
||||
publishedAt: '2026-03-20T11:00:00Z',
|
||||
changelogKey: 'preview/1.4.0.md'
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
const decision = resolveUserDecision({
|
||||
currentVersion: '1.4.0',
|
||||
currentChannel: 'preview',
|
||||
catalog
|
||||
})
|
||||
|
||||
expect(decision.shouldOffer).toBe(true)
|
||||
expect(decision.recommendedRelease?.channel).toBe('stable')
|
||||
expect(decision.recommendedRelease?.version).toBe('1.3.2')
|
||||
})
|
||||
|
||||
it('treats stable version mismatch as update for User', () => {
|
||||
const catalog: UpdateCatalog = {
|
||||
stable: [
|
||||
{
|
||||
version: '1.3.2',
|
||||
channel: 'stable',
|
||||
artifactKey: 'stable/1.3.2.exe',
|
||||
sha256: 'a',
|
||||
size: 1,
|
||||
publishedAt: '2026-03-20T10:00:00Z',
|
||||
changelogKey: 'stable/1.3.2.md'
|
||||
}
|
||||
],
|
||||
preview: []
|
||||
}
|
||||
|
||||
const decision = resolveUserDecision({
|
||||
currentVersion: '1.3.1',
|
||||
currentChannel: 'stable',
|
||||
catalog
|
||||
})
|
||||
|
||||
expect(decision.shouldOffer).toBe(true)
|
||||
expect(decision.recommendedRelease?.version).toBe('1.3.2')
|
||||
})
|
||||
|
||||
it('recommends the highest newer version for Admin', () => {
|
||||
const catalog: UpdateCatalog = {
|
||||
stable: [
|
||||
{
|
||||
version: '1.3.2',
|
||||
channel: 'stable',
|
||||
artifactKey: 'stable/1.3.2.exe',
|
||||
sha256: 'a',
|
||||
size: 1,
|
||||
publishedAt: '2026-03-20T10:00:00Z',
|
||||
changelogKey: 'stable/1.3.2.md'
|
||||
}
|
||||
],
|
||||
preview: [
|
||||
{
|
||||
version: '1.4.0',
|
||||
channel: 'preview',
|
||||
artifactKey: 'preview/1.4.0.exe',
|
||||
sha256: 'b',
|
||||
size: 1,
|
||||
publishedAt: '2026-03-20T09:00:00Z',
|
||||
changelogKey: 'preview/1.4.0.md'
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
const decision = resolveAdminDecision({
|
||||
currentVersion: '1.3.1',
|
||||
currentChannel: 'stable',
|
||||
catalog,
|
||||
maxHistoryPerChannel: 10
|
||||
})
|
||||
|
||||
expect(decision.mode).toBe('admin')
|
||||
expect(decision.recommendedRelease?.channel).toBe('preview')
|
||||
expect(decision.recommendedRelease?.version).toBe('1.4.0')
|
||||
expect(decision.channels?.preview).toHaveLength(1)
|
||||
})
|
||||
|
||||
it('still exposes a cross-channel choice for Admin when no newer version exists', () => {
|
||||
const catalog: UpdateCatalog = {
|
||||
stable: [
|
||||
{
|
||||
version: '1.4.0',
|
||||
channel: 'stable',
|
||||
artifactKey: 'stable/1.4.0.exe',
|
||||
sha256: 'a',
|
||||
size: 1,
|
||||
publishedAt: '2026-03-20T10:00:00Z',
|
||||
changelogKey: 'stable/1.4.0.md'
|
||||
}
|
||||
],
|
||||
preview: [
|
||||
{
|
||||
version: '1.4.0',
|
||||
channel: 'preview',
|
||||
artifactKey: 'preview/1.4.0.exe',
|
||||
sha256: 'b',
|
||||
size: 1,
|
||||
publishedAt: '2026-03-20T09:00:00Z',
|
||||
changelogKey: 'preview/1.4.0.md'
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
const decision = resolveAdminDecision({
|
||||
currentVersion: '1.4.0',
|
||||
currentChannel: 'stable',
|
||||
catalog,
|
||||
maxHistoryPerChannel: 10
|
||||
})
|
||||
|
||||
expect(decision.recommendedRelease?.channel).toBe('preview')
|
||||
expect(decision.recommendedRelease?.version).toBe('1.4.0')
|
||||
})
|
||||
})
|
||||
Reference in New Issue
Block a user