Compare commits
35
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 butubb
|
441ff7c7da | ||
|
butubb
|
0b6b000b01 | ||
|
butubb
|
d3ccc4a7a8 | ||
|
butubb
|
88f4d09d4c | ||
|
butubb
|
7276cfe585 | ||
|
butubb
|
1a74372ad9 | ||
|
butubb
|
22ba9272bd | ||
|
butubb
|
ac7997176d | ||
|
butubb
|
b9fab1999d | ||
|
butubb
|
4efe17c1c9 | ||
|
butubb
|
1e39f5490a | ||
|
butubb
|
31a2ae911e | ||
|
butubb
|
90ca2c2100 | ||
|
butubb
|
2a3c748964 | ||
|
butubb
|
5d637bd4f5 | ||
|
butubb
|
81a99e007b | ||
|
butubb
|
f78955f119 | ||
|
butubb
|
27530ff5ac | ||
|
butubb
|
0fab6f4de8 | ||
|
butubb
|
5de87465bc | ||
|
butubb
|
b33ff17c26 | ||
|
butubb
|
c0667c5959 | ||
|
butubb
|
d0cb531c20 | ||
|
butubb
|
42c2820180 | ||
|
butubb
|
a9720e8b81 | ||
|
butubb
|
e0c3373dd1 | ||
|
butubb
|
2adc54b512 | ||
|
butubb
|
a0916ebda2 | ||
|
butubb
|
265e47a1f4 | ||
|
butubb
|
ce47a5b83d | ||
|
butubb
|
e07b339a51 | ||
|
butubb
|
c78f17d72f | ||
|
butubb
|
5543bad0e6 | ||
|
butubb
|
83ba489f57 | ||
|
butubb
|
2d1b10c7f3 |
@@ -45,3 +45,6 @@ bin/adb/*
|
||||
# 数据备份与损坏库（运维临时文件，不入库）
|
||||
data/db_backup_*/
|
||||
data/*.corrupt_*
|
||||
data/users.db*
|
||||
data/users.db-wal
|
||||
data/users.db-shm
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# 设备自动化后台（platform-tools）
|
||||
|
||||
基于 **STF（Smartphone Test Farm）+ uiautomator2 + Flask** 的 Android 多设备自动化任务执行平台。
|
||||
基于 **uiautomator2 + Flask + 自建设备池** 的 Android 多设备自动化任务执行平台（已摘除 OpenSTF 依赖）。
|
||||
|
||||
提供 Web 管理后台，支持多设备并发任务执行、定时调度、设备分组管理、APK 批量安装、UI 元素抓取等功能。内置抖音养号任务和通用步骤任务，可扩展任意 App 的自动化操作。
|
||||
提供 Web 管理后台，支持多设备并发任务执行、定时调度、设备分组管理、设备池管理（新增/停用/删除/型号采集）、APK 批量安装、网页远程看屏（MJPEG 实时流 + 触控）、UI 元素抓取等功能。内置抖音养号任务和通用步骤任务，可扩展任意 App 的自动化操作。
|
||||
|
||||
---
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
### 环境要求
|
||||
|
||||
- **Python 3.10+**（推荐 3.12）
|
||||
- **OpenSTF 服务**：已部署并运行，设备已接入 STF
|
||||
- **Windows / Linux / macOS**均可（adb 二进制需放对应平台版本到 `bin/adb/`）
|
||||
- 设备需开启 **USB 调试**或通过 **adb 网络连接**（IP:5555）接入
|
||||
- 设备需开启 **USB 调试**（USB 连上后 `adb tcpip 5555` 转网络调试），并加入 Tailscale 获得 `100.100.10.x` IP
|
||||
- 新增设备在后台「工具 → 设备池管理」添加 `IP:5555`（自动连接，任务运行时 u2 自动推送 atx-agent）
|
||||
|
||||
### 三步启动
|
||||
|
||||
@@ -36,8 +36,8 @@
|
||||
# 1. 安装依赖
|
||||
pip install -r requirements.txt
|
||||
|
||||
# 2. 修改配置（STF 地址、token、adb 路径等）
|
||||
# 编辑 config.py 中的 STF_URL 和 STF_TOKEN
|
||||
# 2. 修改配置（可选）：USB 设备在 220 上时配置 USB_ADB_HOST/PORT（默认 100.100.10.1:5037 已可用）
|
||||
# 密钥类配置放 .env（WEB_SECRET_KEY / TAILSCALE_API_KEY）
|
||||
|
||||
# 3. 启动 Web 后台
|
||||
python web_server.py
|
||||
@@ -59,11 +59,12 @@ python web_server.py
|
||||
### 首次使用流程
|
||||
|
||||
1. **登录后台** → 用 `admin/admin123` 登录，建议立即修改密码
|
||||
2. **查看设备** → 首页"监控"Tab 自动展示 STF 设备池状态
|
||||
3. **创建分组**（可选）→ "分组"Tab 按批次/项目给设备分组
|
||||
4. **创建任务** → "任务"Tab 新建任务，选择任务类型、目标设备、参数、调度
|
||||
5. **执行任务** → 任务列表点"立即执行"，或在"监控"Tab 勾选设备批量操作
|
||||
6. **查看日志** → "日志"Tab 实时查看运行日志
|
||||
2. **添加设备** → "工具 → 设备池管理"添加设备（serial 形如 `100.100.10.20:5555`，自动连接并采集型号）
|
||||
3. **查看设备** → 首页"监控"Tab 展示设备池状态（在线/型号/任务）
|
||||
4. **创建分组**（可选）→ "分组"Tab 按批次/项目给设备分组
|
||||
5. **创建任务** → "任务"Tab 新建任务，选择任务类型、目标设备、参数、调度
|
||||
6. **执行任务** → 任务列表点"立即执行"，或在"监控"Tab 勾选设备批量操作（亮屏/息屏/停止）
|
||||
7. **查看日志** → "日志"Tab 实时查看运行日志
|
||||
|
||||
---
|
||||
|
||||
@@ -72,21 +73,31 @@ python web_server.py
|
||||
```
|
||||
platform-tools/
|
||||
├── config.py # 根配置（部署配置统一从 .env 读，模板见 .env.example）
|
||||
├── web_server.py # Flask 入口（API + 登录 + 单页应用）
|
||||
├── web_server.py # Flask 入口（app 装配 + 蓝图注册 + 启动，193 行）
|
||||
├── web/ # Web 层蓝图包（按功能域拆分，路由都在这里）
|
||||
│ ├── auth.py # 登录/CSRF/权限装饰器/页面路由（/、/wall）
|
||||
│ ├── monitor.py # 状态/运行控制/设备操作/远程看屏
|
||||
│ ├── tasks_api.py # 任务计划/分组/自定义动作/元素抓取
|
||||
│ ├── admin_api.py # 用户管理/日志
|
||||
│ ├── tools_api.py # adb 终端/剪贴板注入/应用版本
|
||||
│ ├── devices_api.py # 设备池管理
|
||||
│ ├── apks_api.py # 应用管理
|
||||
│ ├── tailscale_api.py # Tailscale 管理
|
||||
│ ├── common.py # 跨模块共享工具（合并设备列表/屏幕状态）
|
||||
│ └── context.py # 共享对象注入（mgr/apk_mgr/device_pool）
|
||||
├── requirements.txt # Python 依赖清单
|
||||
│
|
||||
├── core/ # 核心基础设施层
|
||||
│ ├── logger.py # 统一日志（分文件、10MB 滚动）
|
||||
│ ├── stf_client.py # STF REST API 封装（占用/释放/远程连接）
|
||||
│ ├── device_pool.py # 设备池（SQLite 清单 + adb 在线状态 + 型号采集）
|
||||
│ ├── adb_helper.py # adb 命令封装（全局锁，绝不 kill-server）
|
||||
│ ├── device_worker.py # BaseWorker 基类 + STFDevice + 心跳看门狗
|
||||
│ ├── device_worker.py # BaseWorker 基类 + 设备生命周期 + 心跳看门狗
|
||||
│ ├── task_manager.py # TaskManager 调度器 + 前台App扫描器
|
||||
│ ├── u2_helper.py # uiautomator2 通用辅助函数
|
||||
│ ├── uiauto_helper.py # uiautodev 元素抓取客户端
|
||||
│ ├── apk_manager.py # APK 上传/解析/批量安装
|
||||
│ ├── ocr.py # 屏幕 OCR（RapidOCR，条件判断 OCR 选择器）
|
||||
│ ├── ssh_client.py # SSH 统一执行（paramiko 纯密码 / 免密密钥）
|
||||
│ ├── stf_device_mgmt.py # STF 设备池管理（读写 220 脚本 + adb connect/disconnect）
|
||||
│ ├── ssh_client.py # SSH 统一执行（paramiko 纯密码 / 免密密钥，预留运维用）
|
||||
│ ├── tailscale_client.py # Tailscale API v2 客户端
|
||||
│ ├── models.py # SQLAlchemy 数据模型 + 数据库初始化
|
||||
│ └── actions/ # 全局 Action 框架
|
||||
@@ -99,7 +110,7 @@ platform-tools/
|
||||
│ └── task.py # 步骤执行引擎（open_app/click/swipe/if_el...）
|
||||
│
|
||||
├── templates/admin/ # 前端页面
|
||||
│ ├── monitor.html # 单页应用（监控/任务/分组/日志/用户/维护/工具）
|
||||
│ ├── monitor.html # 单页应用（监控/任务/分组/日志/用户/工具）
|
||||
│ └── login.html # 登录页
|
||||
│
|
||||
├── static/admin/ # 前端 JS 模块（monitor.html 按依赖顺序加载）
|
||||
@@ -108,10 +119,12 @@ platform-tools/
|
||||
│ ├── monitor.js # 监控页（设备表/截图/异常汇总）
|
||||
│ ├── editor.js # 步骤编辑器（拖拽/条件判断/元素抓取）
|
||||
│ ├── tasks.js # 任务 Tab + 自定义动作
|
||||
│ ├── tools.js # 工具 Tab（剪贴板/应用版本/STF设备/adb终端/Tailscale）
|
||||
│ ├── tools.js # 工具 Tab（剪贴板/设备池管理/adb终端/Tailscale/远程看屏）
|
||||
│ ├── apps.js # 工具 Tab-应用管理（APK/设备已装应用）
|
||||
│ ├── admin.js # 管理 Tab（分组/日志/用户）+ 初始化
|
||||
│ └── custom.css # 自定义样式
|
||||
├── static/fonts/ # 自托管字体（Bricolage Grotesque + IBM Plex Mono）
|
||||
│
|
||||
├── data/
|
||||
│
|
||||
├── data/ # 运行时数据
|
||||
│ ├── users.db # SQLite（用户/分组/任务/自定义动作/APK记录）
|
||||
@@ -140,26 +153,24 @@ platform-tools/
|
||||
### 设备生命周期
|
||||
|
||||
```
|
||||
STF occupy（占用设备）
|
||||
设备池选定设备（TaskManager._running 内存锁保证互斥）
|
||||
↓
|
||||
STF remoteConnect（建立远程 ADB 隧道）
|
||||
↓
|
||||
adb connect（连接远程设备）
|
||||
IP:5555 → adb connect 直连；USB（serial 无冒号）→ 本机 adb 或 220 远程 adb server
|
||||
↓
|
||||
u2.connect（连接 uiautomator2，自动推送 atx-agent）
|
||||
↓
|
||||
Worker.run_task（执行业务逻辑）
|
||||
↓
|
||||
adb disconnect + STF release（释放设备）
|
||||
释放（不 disconnect，遵守共享 adb transport 红线）
|
||||
```
|
||||
|
||||
> 直连模式：当设备 serial 为 `IP:5555` 格式时，直接 adb connect，不走 STF 桥接，更稳定。
|
||||
> 单实例部署下互斥由调度器内存锁保证；多实例场景可扩展 SQLite 行锁（见 doc/STF_REMOVAL.md 阶段 4）。
|
||||
|
||||
### Worker — 单设备执行线程
|
||||
|
||||
每台设备对应一个 `Worker` 线程，继承 `BaseWorker`（`core/device_worker.py`）。基类已封装：
|
||||
|
||||
- STF 设备占用/释放（try/finally 保证释放）
|
||||
- 设备获取（IP:5555 直连 / USB 远程 adb server，try/finally 保证释放）
|
||||
- adb 连接 + u2.connect（带 30 秒超时保护）
|
||||
- 状态上报（实时推送到前端监控大屏）
|
||||
- 异常捕获（设备离线不重试，其他异常按策略重试）
|
||||
@@ -225,21 +236,17 @@ self.set_progress(done=5, total=80, unit="视频",
|
||||
|
||||
| 配置项 | 默认值 | 说明 |
|
||||
|-------|--------|------|
|
||||
| `STF_URL` | `http://192.168.20.220:7100` | OpenSTF 服务地址 |
|
||||
| `STF_TOKEN` | （.env 配置） | STF API Token，在 STF 个人设置里生成（密钥类配置统一放 `.env`） |
|
||||
| `ADB_PATH` | 自动识别 | adb 二进制路径，自动区分 Windows/Linux |
|
||||
| `WEB_HOST` | `0.0.0.0` | Web 监听地址（0.0.0.0 支持局域网访问） |
|
||||
| `WEB_PORT` | `18050` | Web 端口（避开 Windows 动态端口范围） |
|
||||
| `DATA_DIR` | `data/` | 持久化数据目录 |
|
||||
| `APK_DIR` | `data/apks/` | APK 文件存储目录 |
|
||||
| `STF_SSH_TARGET` | `[email protected]` | 维护页重启 STF / STF 设备管理的 SSH 目标（需免密） |
|
||||
| `STF_DOCKER_CONTAINER` | `stf` | 220 上 STF Docker 容器名 |
|
||||
| `STF_ADB_CONTAINER` | `adb` | 220 上 adb Docker 容器名（STF 设备管理执行 adb 用） |
|
||||
| `STF_SCRIPT_PATH` | `/mnt/data/openstf/connect_devices.sh` | STF 设备池脚本路径（DEVICES 列表由此维护） |
|
||||
| `USB_ADB_HOST` | `100.100.10.1` | USB 设备所在部署机（220）的 Tailscale IP（USB 设备远程 adb server） |
|
||||
| `USB_ADB_PORT` | `5037` | 220 adb 容器监听端口（host 网络模式） |
|
||||
| `TAILSCALE_API_KEY` | （.env 配置） | Tailscale 管理 API key（Settings → API Access Tokens） |
|
||||
| `TAILSCALE_TAILNET` | 按邮箱前缀 | tailnet 名/ID |
|
||||
|
||||
**必须修改的配置**：`.env` 里的 `STF_TOKEN`（密钥类统一放 `.env`，不入 git）；`STF_URL` 在 `config.py`。
|
||||
**必须修改的配置**：`.env` 里的 `WEB_SECRET_KEY`（会话密钥，不入 git）；其余均为可选（默认值开箱即用）。
|
||||
|
||||
---
|
||||
|
||||
@@ -247,17 +254,16 @@ self.set_progress(done=5, total=80, unit="视频",
|
||||
|
||||
### 页面结构
|
||||
|
||||
单页应用（`templates/admin/monitor.html`），7 个 Tab；任务/工具 Tab 内部再有页内子分栏：
|
||||
单页应用（`templates/admin/monitor.html`），6 个 Tab；任务/工具 Tab 内部再有页内子分栏：
|
||||
|
||||
| Tab | 功能 | 可见性 |
|
||||
|-----|------|--------|
|
||||
| 监控 | 设备状态大屏：在线/离线、运行任务、当前动作、进度条、前台 App、截图、停止 | 所有登录用户（设备操作按钮需"设备控制"权限） |
|
||||
| 监控 | 设备状态大屏：在线/离线、型号、运行任务、当前动作、进度条、前台 App、截图、勾选批量操作（亮屏/息屏/停止）；导航栏「📺 大屏」打开全屏监控墙（/wall，缩略图+统计+时钟，挂墙/电视用） | 所有登录用户（设备操作按钮需"设备控制"权限） |
|
||||
| 任务 | 子分栏：任务计划（CRUD/启用停用/立即执行/下次运行时间/**离线设备自动跳过**）、自定义动作（打包复用） | 所有登录用户可看，写操作需"任务管理"权限 |
|
||||
| 分组 | 设备分组管理：创建/编辑/删除分组 | 所有登录用户可看，写操作需"任务管理"权限 |
|
||||
| 日志 | 实时日志查看：按模块切换（core/task/web/action） | 需"日志查看"权限 |
|
||||
| 用户 | 用户管理：创建/删除/修改密码/分配权限 | 仅管理员 |
|
||||
| 维护 | STF 服务：一键重启容器 | 仅管理员 |
|
||||
| 工具 | 子分栏：剪贴板注入、adb 远程终端（快捷命令/自动 `-s`/卸载 STF agent）、Tailscale 管理（改名/授权/密钥不过期/设置IP/auth key）、应用管理（APK 上传安装）、应用版本管理（按包名查所有设备版本）、设备已装应用、STF 设备管理（读写 220 脚本维护设备池） | 仅管理员 |
|
||||
| 工具 | 子分栏：剪贴板注入、adb 远程终端（快捷命令/自动 `-s`）、**设备池管理**（新增/停用/删除/一键重连/型号采集）、**远程看屏**（MJPEG 实时流 + 点击/滑动/按键/文字）、Tailscale 管理（改名/授权/密钥不过期/设置IP/auth key）、应用管理（APK 上传安装）、应用版本管理（按包名查所有设备版本）、设备已装应用 | 仅管理员 |
|
||||
|
||||
任务/工具 Tab 的子分栏会记住上次选中的位置；无权限的 tab 和按钮自动隐藏。
|
||||
|
||||
@@ -284,10 +290,9 @@ self.set_progress(done=5, total=80, unit="视频",
|
||||
|
||||
| 设备状态 | 处理方式 |
|
||||
|---------|---------|
|
||||
| worker 运行中 | 复用已有 ADB 连接查询 |
|
||||
| 自己占用 | 通过 STF remoteConnect 隧道查询（不 occupy/release） |
|
||||
| 完全空闲 | 返回"空闲"（不主动 adb connect，避免 STF 误判离线） |
|
||||
| 他人占用 | 标记"(他人占用)" |
|
||||
| worker 运行中（IP:5555） | 复用已有 ADB 连接查询 |
|
||||
| worker 运行中（USB） | 经 220 远程 adb server 查询 |
|
||||
| 完全空闲 | 返回"空闲"（不主动 connect，避免扰动共享 adb transport） |
|
||||
|
||||
### 截图功能
|
||||
|
||||
@@ -357,7 +362,7 @@ self.set_progress(done=5, total=80, unit="视频",
|
||||
|
||||
| 文件 | 模块前缀 | 内容 |
|
||||
|------|---------|------|
|
||||
| `logs/core.log` | `core.*` | STF/adb/worker/task_manager 核心程序 |
|
||||
| `logs/core.log` | `core.*` | adb/worker/task_manager/设备池 核心程序 |
|
||||
| `logs/task.log` | `task.*` | 任务执行（worker 业务逻辑） |
|
||||
| `logs/web.log` | `web.*` | Web 请求/管理 |
|
||||
| `logs/action.log` | `action.*` | 操作执行（点赞/评论等） |
|
||||
@@ -396,14 +401,13 @@ netsh interface ipv4 show excludedportrange protocol=tcp
|
||||
|
||||
修改 `config.py` 中的 `WEB_PORT` 到一个不在排除范围内的端口。
|
||||
|
||||
### STF 设备显示离线但实际在线
|
||||
### 设备显示离线
|
||||
|
||||
STF 状态有缓存，`present=True` 不代表设备真在线。用"扫描前台App"按钮复测，或直接尝试执行任务。
|
||||
先确认本机 `adb devices` 能看到设备（工具 → 设备池管理 → 一键重连）；看不到则检查 Tailscale 是否在线、设备是否加入了正确的 tailnet（平台与设备必须在同一 tailnet）。
|
||||
|
||||
### 设备一直被占用无法释放
|
||||
### 新增设备后任务不调度它
|
||||
|
||||
监控页点"**强制释放占用**"按钮释放当前账户占用的所有设备；
|
||||
无人值守场景可在 `.env` 设置 `AUTO_RELEASE_STALE_OCCUPY=true`（单实例）启动自动清理。
|
||||
新设备需在「工具 → 设备池管理」添加（serial 为 `IP:5555`），仅连上 adb 不会进入设备池。添加后自动连接并采集型号，下一轮任务即可调度。
|
||||
|
||||
### u2.connect 卡死
|
||||
|
||||
@@ -442,7 +446,8 @@ finally:
|
||||
| [doc/DEVELOPMENT.md](doc/DEVELOPMENT.md) | **开发手册**：开发流程、git 工作流、技术红线、环境、本地开发 |
|
||||
| [doc/TASK_DEV.md](doc/TASK_DEV.md) | 任务开发指南（新增 App 任务的完整模板和规范） |
|
||||
| [doc/ARCHITECTURE.md](doc/ARCHITECTURE.md) | 架构详解（分层设计、数据流、关键设计决策） |
|
||||
| [doc/DEPLOY.md](doc/DEPLOY.md) | 部署指南（环境准备、STF 配置、生产部署） |
|
||||
| [doc/DEPLOY.md](doc/DEPLOY.md) | 部署指南（环境准备、设备池配置、生产部署） |
|
||||
| [doc/STF_REMOVAL.md](doc/STF_REMOVAL.md) | STF 摘除迁移记录（阶段 0-3 已完成，含多实例锁方案） |
|
||||
| [doc/API.md](doc/API.md) | API 接口文档（全部 HTTP 接口说明） |
|
||||
|
||||
> **注意**：所有 git 操作（含 push 到 dev）都需负责人确认后才能执行，详见开发手册。修改 `core/`、`tasks/`、`templates/` 后需重启服务/强刷浏览器才生效。
|
||||
@@ -459,4 +464,4 @@ finally:
|
||||
| uiautomator2 | Android UI 自动化 |
|
||||
| uiautodev | UI 元素抓取（步骤编辑器"抓取元素"） |
|
||||
| pyaxmlparser | APK 元信息解析 |
|
||||
| OpenSTF | 设备农场管理（占用/释放/远程 ADB） |
|
||||
| 自建设备池 | 设备清单/在线状态/型号（SQLite + adb） |
|
||||
|
||||
@@ -82,3 +82,10 @@ USB_ADB_PORT = int(_env("USB_ADB_PORT", "5037"))
|
||||
# 安全：密钥用环境变量/.env 注入，不要写死在代码或提交到 git。
|
||||
TAILSCALE_API_KEY = _env("TAILSCALE_API_KEY", "") # 写入 .env，不要提交到 git
|
||||
TAILSCALE_TAILNET = _env("TAILSCALE_TAILNET", "")
|
||||
|
||||
# ================== 设备自动发现 ==================
|
||||
# 定时扫描网段中开放 adb 5555 的设备 → 待连接池（用户确认后才加入正式池）。
|
||||
# 网段默认：局域网 + Tailscale；可在工具页设备池面板修改（存 app_meta）。
|
||||
DISCOVERY_PORT = int(_env("DISCOVERY_PORT", "5555"))
|
||||
DISCOVERY_SUBNETS = ["192.168.20.0/24", "100.100.10.0/24"]
|
||||
DISCOVERY_INTERVAL = int(_env("DISCOVERY_INTERVAL", "60"))
|
||||
|
||||
+9
-6
@@ -19,17 +19,18 @@ _ADB_LOCK = threading.Lock()
|
||||
_ADB_TIMEOUT = 30
|
||||
|
||||
|
||||
def _adb(*args):
|
||||
def _adb(*args, timeout=_ADB_TIMEOUT):
|
||||
"""执行 adb 命令，返回 (stdout+stderr) 文本。不用 shell=True，避免子进程环境问题。
|
||||
|
||||
用 bytes 模式自己解码（Windows 下 subprocess text=True 会用 GBK 读 adb 输出，
|
||||
遇到非 GBK 字节会崩溃）。
|
||||
带 30s 超时：adb connect 到不可达地址可能挂很久，超时返回空串由调用方处理。
|
||||
timeout 可覆盖（扫描验证等非关键路径用短超时快速失败）。
|
||||
"""
|
||||
try:
|
||||
r = subprocess.run([ADB_PATH, *args], capture_output=True, timeout=_ADB_TIMEOUT)
|
||||
r = subprocess.run([ADB_PATH, *args], capture_output=True, timeout=timeout)
|
||||
except subprocess.TimeoutExpired:
|
||||
_log.warning(f"adb {' '.join(args)} 超时 {_ADB_TIMEOUT}s")
|
||||
_log.warning(f"adb {' '.join(args)} 超时 {timeout}s")
|
||||
return ""
|
||||
return _decode(r)
|
||||
|
||||
@@ -157,16 +158,18 @@ def _try_connect(remote_adb_url, retries):
|
||||
return False
|
||||
|
||||
|
||||
def adb_connect_light(remote_adb_url):
|
||||
"""轻量 adb connect（扫描专用）：单次尝试，不重试，绝不 kill-server。
|
||||
def adb_connect_light(remote_adb_url, timeout=5):
|
||||
"""轻量 adb connect（扫描/验证专用）：单次尝试，不重试，绝不 kill-server。
|
||||
|
||||
与 adb_connect 的区别：
|
||||
- 不重试：失败立即返回 False
|
||||
- 不 kill-server：避免断开其他 worker 正在使用的 ADB 连接
|
||||
- 短超时（默认 5s）：验证场景（设备发现）连不上的主机快速放弃，
|
||||
避免每台卡 30s 拖慢整轮发现并长时间占用全局 adb 锁
|
||||
用于前台 App 扫描等非关键路径，连不上就跳过，不影响正在运行的任务。
|
||||
"""
|
||||
with _ADB_LOCK:
|
||||
out = _adb("connect", remote_adb_url)
|
||||
out = _adb("connect", remote_adb_url, timeout=timeout)
|
||||
if "connected" in out.lower() and "failed" not in out.lower():
|
||||
return True
|
||||
return False
|
||||
|
||||
@@ -0,0 +1,69 @@
|
||||
"""剪贴板注入公共模块（ClipInject APK 通道）。
|
||||
|
||||
背景：Android 10+ 禁止后台（atx-agent/shell）写剪贴板——u2.set_clipboard
|
||||
调用"成功"但内容被系统静默丢弃（Android 12/13 实测）。ClipInject
|
||||
（com.example.clipinject，用户自研 APK）通过 am start 启动透明 Activity，
|
||||
窗口聚焦后 setPrimaryClip；shell 身份启动 Activity 不受后台启动限制
|
||||
（广播方式在 MIUI 会被 Background activity start 拦截，必须用 am start）。
|
||||
|
||||
工具页（web/tools_api.py）与任务执行器（tasks/generic/task.py）共用本模块。
|
||||
"""
|
||||
import base64
|
||||
import subprocess
|
||||
import time
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
|
||||
from config import ADB_PATH
|
||||
from core.adb_helper import adb_connect
|
||||
from core.logger import get_logger
|
||||
|
||||
_log = get_logger("core.clip")
|
||||
|
||||
_CLIP_PACKAGE = "com.example.clipinject"
|
||||
_CLIP_ACTIVITY = "com.example.clipinject/.ClipActivity"
|
||||
|
||||
|
||||
def inject_clipboard(serial, text, d=None):
|
||||
"""向设备剪贴板注入文字，返回 (ok, msg)。
|
||||
|
||||
- d：可选，任务执行器已持有 u2 Device 时传入复用（跳过重复连接），
|
||||
读回验证直接用它；不传则临时 u2.connect（工具页场景，带超时保护）
|
||||
- IP:port 设备先 adb connect（已连接自动跳过；绝不 disconnect，红线）
|
||||
- 未装 ClipInject / 读回不一致都会明确报错（不再静默失败）
|
||||
"""
|
||||
import uiautomator2 as u2
|
||||
if ":" in serial:
|
||||
try:
|
||||
adb_connect(serial)
|
||||
except Exception as e:
|
||||
return False, f"adb 连接失败: {e}"
|
||||
b64 = base64.b64encode(text.encode("utf-8")).decode()
|
||||
# 1. am start 透明 Activity 写剪贴板（shell 身份，不受后台启动限制）
|
||||
try:
|
||||
r = subprocess.run(
|
||||
[ADB_PATH, "-s", serial, "shell", "am", "start",
|
||||
"-n", _CLIP_ACTIVITY, "--es", "text_b64", b64],
|
||||
capture_output=True, timeout=30)
|
||||
out = ((r.stdout or b"") + (r.stderr or b"")).decode(errors="replace")
|
||||
if "does not exist" in out or "unable to resolve Intent" in out:
|
||||
return False, f"设备未安装 ClipInject（{_CLIP_PACKAGE}），请先安装"
|
||||
if "Error" in out or ("Starting" not in out and r.returncode != 0):
|
||||
return False, f"am start 失败: {out.strip()[:120]}"
|
||||
except subprocess.TimeoutExpired:
|
||||
return False, "am start 超时（adb 无响应）"
|
||||
except Exception as e:
|
||||
return False, f"{type(e).__name__}: {str(e)[:120]}"
|
||||
# 2. 读回验证（等透明 Activity 完成写入；u2 读剪贴板在 Android 12 实测可用）
|
||||
time.sleep(0.5)
|
||||
try:
|
||||
if d is None:
|
||||
with ThreadPoolExecutor(max_workers=1) as pool:
|
||||
d = pool.submit(u2.connect, serial).result(timeout=30)
|
||||
with ThreadPoolExecutor(max_workers=1) as pool:
|
||||
got = pool.submit(lambda: d.clipboard).result(timeout=15)
|
||||
if got == text:
|
||||
return True, "已注入"
|
||||
return False, f"剪贴板读回不一致（写入可能被拒）: {str(got)[:60]!r}"
|
||||
except Exception as e:
|
||||
# 读回不可用（旧版 u2/连接失败）时按写入成功处理，避免误报，但带上具体原因
|
||||
return True, f"已注入（读回验证不可用: {type(e).__name__}: {str(e)[:80]}）"
|
||||
@@ -0,0 +1,340 @@
|
||||
"""设备自动发现：扫描网段中开放 adb 5555 的设备 → 待连接池（pending）。
|
||||
|
||||
流程：socket 并发探测 5555（标准库，不碰 adb）→ 剔除已在设备池的 serial →
|
||||
串行 adb 验证（adb_connect_light，内部全局锁）→ 用 `adb devices` 的
|
||||
state=="device" 过滤（排除 unauthorized/offline，connect 输出不可信）→
|
||||
写入 pending_device 表。**扫描只验证、不自动连接入池**——用户在前端确认后
|
||||
才调 device_pool.add_device + adb_connect（见 web/devices_api.py）。
|
||||
|
||||
安全红线：绝不 kill-server / 绝不 disconnect（与全项目一致）。
|
||||
|
||||
配置存 app_meta KV 表（discovery_enabled/subnets/interval/port），定时线程
|
||||
每轮重读，开关/周期/网段改动即时生效无需重启。
|
||||
"""
|
||||
import ipaddress
|
||||
import json
|
||||
import socket
|
||||
import threading
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
from datetime import datetime
|
||||
|
||||
from config import (USB_ADB_HOST,
|
||||
DISCOVERY_PORT, DISCOVERY_SUBNETS, DISCOVERY_INTERVAL)
|
||||
from core.adb_helper import _adb, adb_connect_light
|
||||
from core.logger import get_logger
|
||||
from core.models import db, PendingDevice
|
||||
|
||||
_log = get_logger("core.disc")
|
||||
|
||||
# 扫描配置键（app_meta）
|
||||
_K_ENABLED = "discovery_enabled"
|
||||
_K_SUBNETS = "discovery_subnets"
|
||||
_K_INTERVAL = "discovery_interval"
|
||||
_K_PORT = "discovery_port"
|
||||
|
||||
# 单网段主机数上限（防误配 /8 之类），超过截断并告警
|
||||
_MAX_HOSTS_PER_SUBNET = 1024
|
||||
# socket 探测并发数与单 IP 超时
|
||||
_PROBE_WORKERS = 64
|
||||
_PROBE_TIMEOUT = 0.4
|
||||
|
||||
_app = None
|
||||
_scan_lock = threading.Lock() # 定时/手动扫描互斥
|
||||
_stop_event = threading.Event() # shutdown 用
|
||||
_scanning = False # 状态快照（API/前端）
|
||||
_last_scan = None # (时间串, 开放数, 可连数, 新增数)
|
||||
_last_error = ""
|
||||
|
||||
|
||||
def _ctx():
|
||||
"""后台线程访问 db 时自行推 app context（仿 device_pool._ctx）。"""
|
||||
return _app.app_context() if _app else None
|
||||
|
||||
|
||||
def _fmt(ts=None):
|
||||
return (ts or datetime.now()).strftime("%Y-%m-%d %H:%M")
|
||||
|
||||
|
||||
# ================== 配置读写 ==================
|
||||
def get_settings():
|
||||
"""读发现配置（app_meta，缺键用 config 默认值补齐）。"""
|
||||
with _ctx():
|
||||
def _get(key, default):
|
||||
v = db.session.execute(
|
||||
db.text("SELECT value FROM app_meta WHERE key=:k"), {"k": key}).scalar()
|
||||
return v if v is not None else default
|
||||
try:
|
||||
subnets = json.loads(_get(_K_SUBNETS, "[]")) or DISCOVERY_SUBNETS
|
||||
except Exception:
|
||||
subnets = DISCOVERY_SUBNETS
|
||||
return {
|
||||
"enabled": _get(_K_ENABLED, "1") == "1", # 默认开启
|
||||
"subnets": subnets,
|
||||
"interval": int(_get(_K_INTERVAL, str(DISCOVERY_INTERVAL)) or DISCOVERY_INTERVAL),
|
||||
"port": int(_get(_K_PORT, str(DISCOVERY_PORT)) or DISCOVERY_PORT),
|
||||
}
|
||||
|
||||
|
||||
def save_settings(enabled=None, subnets=None, interval=None, port=None):
|
||||
"""写发现配置（部分字段更新）。subnets 逐项校验 CIDR，非法返回 (False, 原因)。"""
|
||||
if subnets is not None:
|
||||
clean = []
|
||||
for s in subnets:
|
||||
s = (s or "").strip()
|
||||
if not s:
|
||||
continue
|
||||
try:
|
||||
ipaddress.ip_network(s, strict=False)
|
||||
except ValueError:
|
||||
return False, f"网段格式错误: {s}"
|
||||
clean.append(s)
|
||||
subnets = clean
|
||||
try:
|
||||
if interval is not None and (int(interval) < 10 or int(interval) > 3600):
|
||||
return False, "扫描周期需在 10-3600 秒之间"
|
||||
if port is not None and (int(port) < 1 or int(port) > 65535):
|
||||
return False, "端口不合法"
|
||||
except (TypeError, ValueError):
|
||||
return False, "参数不合法"
|
||||
with _ctx():
|
||||
def _put(key, value):
|
||||
db.session.execute(
|
||||
db.text("INSERT OR REPLACE INTO app_meta(key,value) VALUES(:k,:v)"),
|
||||
{"k": key, "v": str(value)})
|
||||
if enabled is not None:
|
||||
_put(_K_ENABLED, "1" if enabled else "0")
|
||||
if subnets is not None:
|
||||
_put(_K_SUBNETS, json.dumps(subnets))
|
||||
if interval is not None:
|
||||
_put(_K_INTERVAL, str(int(interval)))
|
||||
if port is not None:
|
||||
_put(_K_PORT, str(int(port)))
|
||||
db.session.commit()
|
||||
return True, "已保存"
|
||||
|
||||
|
||||
# ================== 网段展开与端口探测 ==================
|
||||
def _expand_subnets(subnets, max_hosts=_MAX_HOSTS_PER_SUBNET):
|
||||
"""CIDR 列表 → IP 列表。排除 220 自身（USB_ADB_HOST）与本机 IP；
|
||||
非法网段跳过记日志；单网段超过 max_hosts 截断并告警。"""
|
||||
self_ips = {USB_ADB_HOST}
|
||||
try: # 本机自身 IP（接口枚举，尽力而为；无 hostname -I 的平台跳过）
|
||||
import subprocess
|
||||
out = subprocess.run(["hostname", "-I"], capture_output=True, text=True,
|
||||
timeout=3).stdout or ""
|
||||
self_ips.update(p for p in out.split() if p)
|
||||
except Exception:
|
||||
pass
|
||||
ips = []
|
||||
for cidr in subnets:
|
||||
try:
|
||||
net = ipaddress.ip_network((cidr or "").strip(), strict=False)
|
||||
except ValueError:
|
||||
_log.warning(f"发现: 跳过非法网段 {cidr}")
|
||||
continue
|
||||
hosts = [str(h) for h in net.hosts()
|
||||
if str(h) not in self_ips]
|
||||
if len(hosts) > max_hosts:
|
||||
_log.warning(f"发现: 网段 {cidr} 主机数 {len(hosts)} 超过上限，截断前 {max_hosts}")
|
||||
hosts = hosts[:max_hosts]
|
||||
ips.extend(hosts)
|
||||
return ips
|
||||
|
||||
|
||||
def _probe_port(ip, port, timeout=_PROBE_TIMEOUT):
|
||||
"""单 IP 端口探测（标准库 socket，超时/拒绝/不可达一律 False）。"""
|
||||
try:
|
||||
with socket.create_connection((ip, port), timeout=timeout):
|
||||
return True
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
|
||||
def _probe_open(ips, port, workers=_PROBE_WORKERS):
|
||||
"""并发探测，返回开放端口的主机列表。"""
|
||||
if not ips:
|
||||
return []
|
||||
with ThreadPoolExecutor(max_workers=workers) as ex:
|
||||
results = list(ex.map(lambda ip: (ip, _probe_port(ip, port)), ips))
|
||||
return [ip for ip, ok in results if ok]
|
||||
|
||||
|
||||
# ================== adb devices 解析 ==================
|
||||
def _parse_adb_devices(out):
|
||||
"""解析 `adb devices` 输出 → state=="device" 的 serial 集合。
|
||||
|
||||
只看 connect 输出不可靠（未授权设备也返回 connected），必须用 state 过滤。
|
||||
"""
|
||||
devices = set()
|
||||
for line in (out or "").splitlines()[1:]:
|
||||
parts = line.split()
|
||||
if len(parts) >= 2 and parts[0] and not parts[0].startswith("*"):
|
||||
if parts[1] == "device":
|
||||
devices.add(parts[0])
|
||||
return devices
|
||||
|
||||
|
||||
# ================== 扫描 ==================
|
||||
def scan_once(manual=False):
|
||||
"""执行一轮扫描。返回 (ok, result_dict)；后台线程/API 调用。"""
|
||||
global _scanning, _last_scan, _last_error
|
||||
if not _scan_lock.acquire(blocking=False):
|
||||
return False, {"error": "扫描进行中"}
|
||||
_scanning = True
|
||||
try:
|
||||
settings = get_settings()
|
||||
port = settings["port"]
|
||||
subnets = settings["subnets"]
|
||||
if not subnets:
|
||||
_last_error = "未配置扫描网段"
|
||||
return True, {"found": 0, "verified": 0, "new": 0, "error": _last_error}
|
||||
|
||||
# 1. socket 并发探测（不碰 adb，把几百台缩小到开放端口量级）
|
||||
open_ips = _probe_open(_expand_subnets(subnets), port)
|
||||
candidates = {f"{ip}:{port}" for ip in open_ips}
|
||||
|
||||
with _ctx():
|
||||
# 2. 剔除已在正式设备池的 serial
|
||||
configured = set(device_pool_list_configured())
|
||||
candidates -= configured
|
||||
|
||||
# 3. 串行 adb 验证：已连接的直接跳过（零成本），其余 adb_connect_light
|
||||
already = _parse_adb_devices(_adb("devices"))
|
||||
for serial in candidates - already:
|
||||
adb_connect_light(serial) # 内部全局锁串行；失败无妨，下面按 state 过滤
|
||||
|
||||
# 4. state==device 过滤（排除 unauthorized/offline）
|
||||
verified = _parse_adb_devices(_adb("devices")) & candidates
|
||||
|
||||
# 5. 写 pending：新 → 插入；已有 → 更新 last_seen
|
||||
now = _fmt()
|
||||
existing = {p.serial for p in PendingDevice.query.all()}
|
||||
added = 0
|
||||
for serial in verified:
|
||||
source = "tailscale" if serial.split(":")[0].startswith("100.") else "lan"
|
||||
if serial in existing:
|
||||
PendingDevice.query.filter_by(serial=serial).update(
|
||||
{"last_seen": now})
|
||||
else:
|
||||
db.session.add(PendingDevice(serial=serial, source=source,
|
||||
first_seen=now, last_seen=now))
|
||||
added += 1
|
||||
db.session.commit()
|
||||
_log.info(f"发现: 探测开放 {len(open_ips)} 台，可连 {len(verified)} 台，"
|
||||
f"新增待连接 {added} 台")
|
||||
_last_scan = (now, len(open_ips), len(verified), added)
|
||||
_last_error = ""
|
||||
return True, {"found": len(open_ips), "verified": len(verified), "new": added}
|
||||
except Exception as e:
|
||||
_log.warning(f"发现扫描异常: {e}")
|
||||
_last_error = str(e)[:200]
|
||||
return False, {"error": _last_error}
|
||||
finally:
|
||||
_scanning = False
|
||||
_scan_lock.release()
|
||||
|
||||
|
||||
def device_pool_list_configured():
|
||||
"""设备池已配置 serial（延迟 import 避免循环依赖）。"""
|
||||
from core import device_pool
|
||||
return device_pool.list_configured()
|
||||
|
||||
|
||||
# ================== 定时扫描线程 ==================
|
||||
def _discovery_loop():
|
||||
"""定时扫描 daemon 线程。每轮重读配置（开关/周期即时生效）。
|
||||
|
||||
启动先 sleep 15s 避让 web_server 预连接线程（两者都抢 adb 全局锁）。
|
||||
等待用 30s 切片（_stop_event.wait），关停/改周期 ≤30s 生效。
|
||||
"""
|
||||
try:
|
||||
_stop_event.wait(15)
|
||||
while not _stop_event.is_set():
|
||||
try:
|
||||
settings = get_settings()
|
||||
if settings["enabled"]:
|
||||
scan_once()
|
||||
except Exception as e:
|
||||
_log.warning(f"发现定时扫描异常: {e}")
|
||||
wait_s = max(10, settings.get("interval", 60))
|
||||
waited = 0
|
||||
while waited < wait_s and not _stop_event.is_set():
|
||||
_stop_event.wait(min(30, wait_s - waited))
|
||||
waited += min(30, wait_s - waited)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def init_app(app):
|
||||
"""web_server 启动时调用：绑 app + 起定时扫描 daemon 线程。"""
|
||||
global _app
|
||||
_app = app
|
||||
_stop_event.clear()
|
||||
t = threading.Thread(target=_discovery_loop, name="device-discovery", daemon=True)
|
||||
t.start()
|
||||
_log.info("设备自动发现线程已启动（默认 60s 扫描一次）")
|
||||
|
||||
|
||||
def shutdown():
|
||||
"""优雅退出：置 stop_event，等待中的循环在切片边界退出。"""
|
||||
_stop_event.set()
|
||||
|
||||
|
||||
# ================== 对外查询与确认 ==================
|
||||
def get_status():
|
||||
"""API 状态快照：配置 + 扫描状态 + 最近一轮结果 + 待连接数量。"""
|
||||
settings = get_settings()
|
||||
with _ctx():
|
||||
pending = PendingDevice.query.count()
|
||||
return {
|
||||
"enabled": settings["enabled"],
|
||||
"subnets": settings["subnets"],
|
||||
"interval": settings["interval"],
|
||||
"port": settings["port"],
|
||||
"scanning": _scanning,
|
||||
"last_scan": _last_scan[0] if _last_scan else "",
|
||||
"last_result": ({"found": _last_scan[1], "verified": _last_scan[2],
|
||||
"new": _last_scan[3]} if _last_scan else None),
|
||||
"last_error": _last_error,
|
||||
"pending_count": pending,
|
||||
}
|
||||
|
||||
|
||||
def list_pending():
|
||||
"""待连接列表：只返回当前在线的设备（离线候选不可确认，不展示）。
|
||||
|
||||
后端直接过滤（2026-09-04）：不依赖前端 JS 版本，任何客户端都拿不到
|
||||
离线条目；设备恢复在线后扫描自动更新 last_seen 并重新出现在列表。
|
||||
"""
|
||||
online = _parse_adb_devices(_adb("devices"))
|
||||
with _ctx():
|
||||
rows = [p.to_dict() for p in PendingDevice.query.order_by(
|
||||
PendingDevice.first_seen.desc()).all()]
|
||||
return [dict(r, online=True) for r in rows if r["serial"] in online]
|
||||
|
||||
|
||||
def confirm_pending(serial, name=""):
|
||||
"""确认连接：pending 行 → 正式设备池（add_device upsert）→ 删 pending。
|
||||
|
||||
返回 (ok, msg, is_new)。adb_connect + 采型号由 API 层后台线程做。
|
||||
"""
|
||||
with _ctx():
|
||||
row = PendingDevice.query.get(serial)
|
||||
if not row:
|
||||
return False, "设备不在待连接列表", False
|
||||
from core import device_pool
|
||||
is_new = device_pool.add_device(serial, name=name or "")
|
||||
PendingDevice.query.filter_by(serial=serial).delete()
|
||||
db.session.commit()
|
||||
return True, "已加入设备池" + ("" if is_new else "（已存在，信息已更新）"), is_new
|
||||
|
||||
|
||||
def ignore_pending(serial):
|
||||
"""忽略：删除 pending 行（下轮扫描可能再次发现）。"""
|
||||
with _ctx():
|
||||
row = PendingDevice.query.get(serial)
|
||||
if not row:
|
||||
return False, "设备不在待连接列表"
|
||||
PendingDevice.query.filter_by(serial=serial).delete()
|
||||
db.session.commit()
|
||||
return True, "已忽略"
|
||||
@@ -238,6 +238,21 @@ class Device(db.Model):
|
||||
return f"<Device {self.serial}>"
|
||||
|
||||
|
||||
class PendingDevice(db.Model):
|
||||
"""自动发现待连接池：扫描验证通过的设备，等待用户确认后才入正式池。
|
||||
|
||||
与 Device 表的区别：只代表"被扫描到、可连接"，不参与任务调度。
|
||||
"""
|
||||
serial = db.Column(db.String(120), primary_key=True) # 如 192.168.20.5:5555
|
||||
source = db.Column(db.String(20), default="") # lan / tailscale
|
||||
first_seen = db.Column(db.String(20), default="") # 首次发现时间
|
||||
last_seen = db.Column(db.String(20), default="") # 最近一次扫描仍可见的时间
|
||||
|
||||
def to_dict(self):
|
||||
return {"serial": self.serial, "source": self.source or "",
|
||||
"first_seen": self.first_seen or "", "last_seen": self.last_seen or ""}
|
||||
|
||||
|
||||
# 版本化 schema 迁移：新增结构变更时在此追加 (版本号, 说明, SQL)
|
||||
# 版本号单调递增，只执行比当前 schema_version 新的迁移。
|
||||
SCHEMA_MIGRATIONS = [
|
||||
@@ -252,6 +267,12 @@ SCHEMA_MIGRATIONS = [
|
||||
"created_at VARCHAR(20) DEFAULT '')"),
|
||||
(3, "设备池：device 表新增 model 列（型号，在线时自动采集）",
|
||||
"ALTER TABLE device ADD COLUMN model TEXT DEFAULT ''"),
|
||||
(4, "自动发现：pending_device 待连接池表（扫描发现的设备，用户确认后才入正式池）",
|
||||
"CREATE TABLE IF NOT EXISTS pending_device ("
|
||||
"serial VARCHAR(120) PRIMARY KEY,"
|
||||
"source VARCHAR(20) DEFAULT '',"
|
||||
"first_seen VARCHAR(20) DEFAULT '',"
|
||||
"last_seen VARCHAR(20) DEFAULT '')"),
|
||||
]
|
||||
|
||||
|
||||
|
||||
+33
-10
@@ -154,12 +154,24 @@ class TaskJob:
|
||||
elif mode == "group":
|
||||
g = manager.groups.get(self.target.get("group_name"))
|
||||
serials = list(g.serials) if g else []
|
||||
# 分组应引用设备池内设备：不在池内的（如手动填的旧 IP）不参与调度，
|
||||
# 与 all/preempt 模式口径一致（2026-09-01）
|
||||
try:
|
||||
configured = set(device_pool.list_configured())
|
||||
serials = [s for s in serials if s in configured]
|
||||
except Exception:
|
||||
pass
|
||||
else:
|
||||
# all：默认返回池内在线设备（单实例互斥由 _run_with_retry 的 _running 保证）；
|
||||
# 抢占模式返回全部在线设备（含运行中，执行时抢占）
|
||||
if self.params.get("preempt"):
|
||||
try:
|
||||
return device_pool.list_online()
|
||||
# 抢占模式：只抢设备池内的在线设备——
|
||||
# list_online() 会包含待连接/未入池设备（如自动发现验证时连上的），
|
||||
# 它们不在设备池就不该被任务调度（2026-09-01 修复）
|
||||
online = set(device_pool.list_online())
|
||||
configured = set(device_pool.list_configured())
|
||||
return [s for s in device_pool.list_online() if s in configured]
|
||||
except Exception:
|
||||
return []
|
||||
try:
|
||||
@@ -337,7 +349,12 @@ class TaskManager:
|
||||
def __init__(self, app=None):
|
||||
self.app = app # Flask app，用于 db context
|
||||
self.scheduler = BackgroundScheduler(timezone="Asia/Shanghai")
|
||||
self.scheduler.start()
|
||||
if os.environ.get("DISABLE_SCHEDULER"):
|
||||
# 测试/回归模式：不启动 cron 调度器，避免 test_client 加载任务后
|
||||
# 按 cron 真的跑任务（干扰回归、占用设备）。add_job 仍可调用不报错。
|
||||
_log.info("DISABLE_SCHEDULER=1：跳过 cron 调度器（测试/回归模式）")
|
||||
else:
|
||||
self.scheduler.start()
|
||||
start_watchdog() # 启动心跳看门狗
|
||||
self.groups = {} # name -> DeviceGroup(内存业务对象)
|
||||
self.jobs = {} # id -> TaskJob(内存业务对象)
|
||||
@@ -587,14 +604,10 @@ class TaskManager:
|
||||
return _next_run_time(job.schedule)
|
||||
|
||||
def run_job_now(self, job_id):
|
||||
"""立即执行任务（手动触发）。运行窗口外拒绝启动。"""
|
||||
"""立即执行任务（手动触发）。运行窗口只约束定时触发，手动执行不受限制。"""
|
||||
job = self.jobs.get(job_id)
|
||||
if not job:
|
||||
return {"ok": False, "error": "任务不存在"}
|
||||
if not _in_run_window(job.schedule):
|
||||
win = job.schedule.get("window") or {}
|
||||
return {"ok": False,
|
||||
"error": f"当前不在运行窗口内（{win.get('start', '')}-{win.get('end', '')}），任务未启动"}
|
||||
# 在独立线程跑，不阻塞调用方
|
||||
t = threading.Thread(target=self._run_job, args=(job,), daemon=True)
|
||||
t.start()
|
||||
@@ -636,6 +649,9 @@ class TaskManager:
|
||||
# 错峰启动：在各自线程内等待，分摊批量启动的连接/占用压力
|
||||
if start_delay > 0:
|
||||
time.sleep(start_delay)
|
||||
# 被抢占的原任务 id（抢占结束后归还）——必须在循环外：
|
||||
# 重试时若重置为 None，finally 归还逻辑会丢失信息，被抢占任务永不恢复
|
||||
preempted_job = None
|
||||
try:
|
||||
for attempt in range(1, max_attempts + 1):
|
||||
# 用户已请求停止 → 不再启动新 attempt
|
||||
@@ -645,7 +661,6 @@ class TaskManager:
|
||||
return
|
||||
# 同一 serial 同时只能一个 worker；不同任务可配置抢占
|
||||
preempt = False
|
||||
preempted_job = None # 被抢占的原任务 id（抢占结束后归还）
|
||||
with self._lock:
|
||||
if serial in self._running:
|
||||
cur = self._running[serial]
|
||||
@@ -658,7 +673,8 @@ class TaskManager:
|
||||
_log.warning(f"{serial} 已有任务在跑，跳过 (job={job.name})")
|
||||
return
|
||||
preempt = True
|
||||
preempted_job = cur.get("job_id")
|
||||
if not preempted_job:
|
||||
preempted_job = cur.get("job_id")
|
||||
if preempt:
|
||||
# 抢占：锁外停止该设备上的其他任务（stop_device 内部拿同一把锁，
|
||||
# 在锁内调用会死锁！），等其释放后接管
|
||||
@@ -749,6 +765,10 @@ class TaskManager:
|
||||
if j and j.enabled:
|
||||
_log.info(f"{serial} 抢占任务 {job.name} 结束，归还设备给任务 {j.name}")
|
||||
threading.Thread(target=self._run_job, args=(j,), daemon=True).start()
|
||||
else:
|
||||
# 打日志便于排查：被抢占任务已删除/停用时不会归还，但要知道原因
|
||||
_log.info(f"{serial} 抢占任务 {job.name} 结束，"
|
||||
f"被抢占任务 {preempted_job} {'已停用，不归还' if j else '已不存在，不归还'}")
|
||||
|
||||
# ---- 运行控制 ----
|
||||
def stop_device(self, serial):
|
||||
@@ -878,4 +898,7 @@ class TaskManager:
|
||||
self.stop_all()
|
||||
self._fg_scanner.stop()
|
||||
stop_watchdog()
|
||||
self.scheduler.shutdown(wait=False)
|
||||
try:
|
||||
self.scheduler.shutdown(wait=False)
|
||||
except Exception:
|
||||
pass # DISABLE_SCHEDULER 模式下 scheduler 未 start，shutdown 会抛异常
|
||||
|
||||
+17
-5
@@ -190,9 +190,14 @@ def _extract(root, out):
|
||||
desc = props.get("content-desc", "")
|
||||
cls = props.get("class", "")
|
||||
tag = cls.split(".")[-1] if cls else "*"
|
||||
# 始终带同 class 兄弟序号（含 [1]），结构路径才精确无歧义
|
||||
seg = f"{tag}[{tag_index}]"
|
||||
own_tag_path = f"{tag_path}/{seg}" if tag_path else seg
|
||||
# 始终带同 class 兄弟序号（含 [1]），结构路径才精确无歧义；
|
||||
# class 为空的层（tag=*）不参与结构路径，避免 //*[N] 前缀污染导致选择器定位到任意节点
|
||||
if tag != "*":
|
||||
seg = f"{tag}[{tag_index}]"
|
||||
own_tag_path = f"{tag_path}/{seg}" if tag_path else seg
|
||||
else:
|
||||
seg = ""
|
||||
own_tag_path = tag_path
|
||||
|
||||
# ---- 推荐选择器：唯一属性 > 锚点祖先限定 > 全结构路径 ----
|
||||
if rid:
|
||||
@@ -206,8 +211,15 @@ def _extract(root, out):
|
||||
suggested = {"type": "xpath", "value": val}
|
||||
child_ctx = val
|
||||
else:
|
||||
# 无唯一属性且无锚点祖先：用从根开始的结构路径（脆弱，标记 broad 让前端提示）
|
||||
suggested = {"type": "xpath", "value": f"//{own_tag_path}", "broad": True}
|
||||
if tag == "*":
|
||||
# class 也为空的元素：结构路径 //*[N] 无意义（匹配到文档任意节点），
|
||||
# 标记 invalid，前端提示不可选，避免回填垃圾选择器导致"点击不到"
|
||||
suggested = {"type": "xpath", "value": "",
|
||||
"invalid": True,
|
||||
"reason": "该元素无可用属性（id/文本/class），无法生成可靠选择器"}
|
||||
else:
|
||||
# 无唯一属性且无锚点祖先：用从根开始的结构路径（脆弱，标记 broad 让前端提示）
|
||||
suggested = {"type": "xpath", "value": f"//{own_tag_path}", "broad": True}
|
||||
child_ctx = None
|
||||
|
||||
out.append({
|
||||
|
||||
Binary file not shown.
+86
-48
@@ -343,7 +343,7 @@
|
||||
|
||||
（权限：设备控制）
|
||||
|
||||
释放当前账户占用的所有 STF 设备（清理用）。
|
||||
（已随 STF 摘除移除，此接口不再存在；设备互斥由调度器内存锁保证）
|
||||
|
||||
**响应**：
|
||||
```json
|
||||
@@ -557,7 +557,7 @@
|
||||
|
||||
### GET /api/apks/install/devices
|
||||
|
||||
可安装设备列表：STF 在线设备池 + 本机 adb 设备（**含 USB 有线连接**，serial 无冒号标记 `usb`）。
|
||||
可安装设备列表：设备池在线设备（标记 `pool`）+ 本机 adb 设备（**含 USB 有线连接**，serial 无冒号标记 `usb`）。
|
||||
安装弹窗用此列表，USB 设备安装时跳过 adb connect 直接安装。
|
||||
|
||||
**响应**：
|
||||
@@ -598,26 +598,94 @@
|
||||
## 13. 维护 / 工具（仅管理员）
|
||||
|
||||
以下接口都**仅管理员可用**（普通用户即使有业务权限也访问不了，返回 403）。
|
||||
维护页现仅含 STF 服务管理；adb 终端、Tailscale 管理、应用管理、STF 设备管理等
|
||||
已集中到"工具"页（页内子分栏），API 不变。
|
||||
设备池管理、远程看屏、adb 终端等集中在"工具"页（页内子分栏）。
|
||||
|
||||
### POST /api/stf/restart
|
||||
### GET /api/devices/pool
|
||||
|
||||
一键重启 STF Docker 容器。通过 SSH 到部署机执行 `docker restart`，随后轮询 STF API 确认恢复。
|
||||
|
||||
- 目标与容器名：`STF_SSH_TARGET`（默认 `[email protected]`）、`STF_DOCKER_CONTAINER`（默认 `stf`）环境变量配置
|
||||
- 前置条件：本机可免密 SSH 到部署机
|
||||
- **有任务在运行时返回 409 拒绝执行**（STF 重启会重置设备占用状态）
|
||||
- 失败返回 502（SSH 不可达/容器名错误）；执行超时返回 408
|
||||
设备池清单（SQLite devices 表），含实时在线状态。**权限**：`devices`。
|
||||
|
||||
**响应**：
|
||||
```json
|
||||
{"ok": true, "msg": "STF 容器已重启", "detail": "stf: Up 3 seconds", "api_alive": true}
|
||||
{"ok": true, "devices": [
|
||||
{"serial": "100.100.10.20:5555", "name": "", "model": "22120RN86C",
|
||||
"enabled": true, "online": true, "note": "", "created_at": "2026-08-17 11:10"}
|
||||
]}
|
||||
```
|
||||
|
||||
### POST /api/devices/pool/add
|
||||
|
||||
添加/更新设备（upsert）。**权限**：`devices`。
|
||||
**请求**（JSON）：`{"serial": "100.100.10.20:5555", "name": "备注", "note": ""}`
|
||||
IP:5555 设备添加后立即尝试 adb connect，并后台采集型号（getprop ro.product.model）。
|
||||
|
||||
### POST /api/devices/pool/toggle
|
||||
|
||||
启用/停用设备（停用后不参与任务调度）。**权限**：`devices`。
|
||||
**请求**（JSON）：`{"serial": "...", "enabled": false}`
|
||||
|
||||
### POST /api/devices/pool/remove
|
||||
|
||||
从设备池删除（不再参与调度，不影响设备本身）。**权限**：`devices`。
|
||||
**请求**（JSON）：`{"serial": "..."}`
|
||||
|
||||
### POST /api/devices/pool/reconnect
|
||||
|
||||
一键重连：并发 adb connect 池内全部 IP:5555 设备（后台执行），完成后自动批量刷新型号。**权限**：`devices`。
|
||||
|
||||
### POST /api/devices/pool/refresh_models
|
||||
|
||||
批量采集池内在线设备的型号（后台执行）。**权限**：`devices`。
|
||||
|
||||
### GET /api/screen/stream
|
||||
|
||||
远程看屏：MJPEG 实时画面流（`multipart/x-mixed-replace`）。**权限**：`devices`。
|
||||
|
||||
`?serial=xxx` 指定设备；浏览器 `<img src>` 直接渲染，客户端断开自动停止。数据源 u2（atx-agent minicap，约 3-6 帧/秒）。
|
||||
|
||||
### GET /api/screen/thumb
|
||||
|
||||
大屏缩略图：单张 JPEG（360px 宽，质量 55）。**权限**：`devices`。
|
||||
|
||||
`?serial=xxx` 指定设备。监控大屏按设备每 ~2.5s 轮询一帧（页面不可见时暂停）；
|
||||
一次性请求（非流），与任务并发安全（与任务截图同走 u2 minicap）。
|
||||
|
||||
### GET /wall
|
||||
|
||||
监控大屏页面（全屏深色控制室风格，登录后可访问）：设备卡片网格（缩略图/型号/
|
||||
状态/当前动作/进度）、顶部统计与时钟；状态每 5s 刷新、缩略图每 2.5s 轮询。
|
||||
20 台设备整体开销约 0.2 核 CPU + 100KB/s 带宽，普通电脑无压力。
|
||||
|
||||
### POST /api/screen/tap
|
||||
|
||||
点击设备屏幕。**权限**：`devices`。
|
||||
**请求**（JSON）：`{"serial": "...", "x": 360, "y": 800}`（设备原生分辨率坐标）
|
||||
|
||||
### POST /api/screen/swipe
|
||||
|
||||
滑动。**请求**（JSON）：`{"serial": "...", "x1": 360, "y1": 1200, "x2": 360, "y2": 600, "duration": 0.2}`
|
||||
|
||||
### POST /api/screen/key
|
||||
|
||||
按键。**请求**（JSON）：`{"serial": "...", "key": "back"}`。
|
||||
支持：back/home/recent/menu/power/volume_up/volume_down/enter/delete/search/camera
|
||||
|
||||
### POST /api/screen/text
|
||||
|
||||
输入文字（需焦点在输入框）。**请求**（JSON）：`{"serial": "...", "text": "你好"}`
|
||||
|
||||
### POST /api/device/screen_all
|
||||
|
||||
批量亮屏/息屏（并发）。**权限**：`devices`。
|
||||
|
||||
**请求**（JSON）：
|
||||
```json
|
||||
{"mode": "on", "serials": ["100.100.10.11:5555"]}
|
||||
```
|
||||
`serials` 可选：指定设备（离线自动过滤）；不带则作用于全部在线设备。息屏会中断运行中的任务，前端有确认提示。
|
||||
|
||||
### GET /api/adb/devices
|
||||
|
||||
维护终端设备列表：本地 adb 已连接（含 offline）+ STF 在线设备池（标记 `stf`）。
|
||||
维护终端设备列表：本地 adb 已连接（含 offline）+ 设备池已配置设备（标记 `pool`）。
|
||||
供终端设备选择器使用——选中后前端自动附加 `-s <serial>`。
|
||||
|
||||
**响应**：
|
||||
@@ -639,7 +707,7 @@ adb 远程终端：用平台 adb 二进制执行任意 adb 命令（20s 超时
|
||||
```
|
||||
（开头的 `adb` 前缀可省略）
|
||||
|
||||
**安全红线**：包含 `kill-server` / `disconnect` 的命令直接拒绝（400）——会断开 STF provider 共享的 adb transport，导致全部设备被 STF 误判离线。
|
||||
**安全红线**：包含 `kill-server` / `disconnect` 的命令直接拒绝（400）——会断开共享的 adb transport，导致全部设备连接重建。
|
||||
|
||||
**响应**：
|
||||
```json
|
||||
@@ -653,7 +721,7 @@ adb 远程终端：用平台 adb 二进制执行任意 adb 命令（20s 超时
|
||||
### POST /api/steps/test
|
||||
|
||||
在指定设备上单步试执行（步骤编辑器"测试此步骤"按钮），验证选择器是否命中。
|
||||
只读连接（adb connect + u2），不占用/释放 STF，与运行中任务互不干扰。
|
||||
只读连接（adb connect + u2），与运行中任务互不干扰。
|
||||
|
||||
**请求**（JSON）：
|
||||
```json
|
||||
@@ -721,7 +789,7 @@ adb 远程终端：用平台 adb 二进制执行任意 adb 命令（20s 超时
|
||||
{"ipv4": "100.100.10.16"}
|
||||
```
|
||||
|
||||
⚠ 改 IP 会断开设备当前 tailscale 会话；平台设备池 serial 随之变化，需同步更新 STF 设备池/分组/任务目标。
|
||||
⚠ 改 IP 会断开设备当前 tailscale 会话；平台设备池 serial 随之变化，需同步更新设备池/分组/任务目标。
|
||||
|
||||
### DELETE /api/tailscale/devices/:device_id
|
||||
|
||||
@@ -746,7 +814,7 @@ adb 远程终端：用平台 adb 二进制执行任意 adb 命令（20s 超时
|
||||
|
||||
## 16. 工具（仅管理员）
|
||||
|
||||
工具页（剪贴板注入 / 应用版本管理 / STF 设备管理）接口，均仅管理员可用。
|
||||
工具页（剪贴板注入 / 应用版本管理 / 设备池管理）接口，均仅管理员可用。
|
||||
|
||||
### POST /api/tools/clipboard/set
|
||||
|
||||
@@ -756,7 +824,7 @@ adb 远程终端：用平台 adb 二进制执行任意 adb 命令（20s 超时
|
||||
```json
|
||||
{"serials": ["100.100.10.11:5555", "0123456789ABCDEF"], "text": "要注入的文字"}
|
||||
```
|
||||
设备来源与维护终端一致（本地 adb 含 USB + STF 池）。
|
||||
设备来源与维护终端一致（本地 adb 含 USB + 设备池）。
|
||||
实现：u2 `jsonrpc.setClipboard`（实测 `cmd clipboard` 在 MIUI 上不存在），支持中文/引号/换行；
|
||||
IP 设备先 adb connect（已连接跳过，绝不 disconnect），USB 设备首次自动推送 atx-agent。
|
||||
|
||||
@@ -781,33 +849,3 @@ IP 设备先 adb connect（已连接跳过，绝不 disconnect），USB 设备
|
||||
"results": {"100.100.10.11:5555": {"installed": true, "version_name": "28.5.0", "version_code": "280500"}}}
|
||||
```
|
||||
未安装返回 `installed: false`；查询失败的设备带 `error` 字段。
|
||||
|
||||
### GET /api/stf/devmgmt/status
|
||||
|
||||
STF 设备管理状态：connect_devices.sh 脚本配置的 IP 列表 + 220 上 adb 实际连接状态。
|
||||
|
||||
**响应**：
|
||||
```json
|
||||
{"ok": true,
|
||||
"configured": ["100.100.10.10", "100.100.10.11"],
|
||||
"connected": [{"serial": "100.100.10.10:5555", "state": "device"}]}
|
||||
```
|
||||
|
||||
### POST /api/stf/devmgmt/add
|
||||
|
||||
添加设备：写入 220 上 `connect_devices.sh` 的 DEVICES 列表 + 立即 `docker exec adb adb connect`。
|
||||
设备不可达时 connect 会 15 秒超时兜底（220 侧 `timeout`），但仍保留在脚本中，cron 每 5 分钟自动重试。
|
||||
|
||||
**请求**（JSON）：`{"ip": "100.100.10.20"}`（可带 `:5555`，自动归一化）
|
||||
|
||||
**响应**：
|
||||
```json
|
||||
{"ok": true, "msgs": ["已写入脚本 /mnt/data/openstf/connect_devices.sh", "连接超时（设备当前不可达），已保留在脚本中，cron 会每 5 分钟自动重试"]}
|
||||
```
|
||||
|
||||
### POST /api/stf/devmgmt/remove
|
||||
|
||||
移除设备：从脚本 DEVICES 删除 + `adb disconnect`（设备从 STF 池下线，任务不再分配）。
|
||||
注意：断开的是 220（STF provider 侧）的 adb 连接，与本机任务直连的 adb 相互独立。
|
||||
|
||||
**请求**（JSON）：`{"ip": "100.100.10.20"}`
|
||||
|
||||
+30
-30
@@ -10,8 +10,8 @@
|
||||
|
||||
| 层 | 路径 | 职责 |
|
||||
|----|------|------|
|
||||
| 配置层 | `config.py` | 项目根配置：STF 地址、adb 路径、web 端口等基础设施。**不放任务参数** |
|
||||
| 核心层 | `core/` | 框架运行时：日志、STF 客户端、adb 操作、Worker 基类、任务管理器、u2 辅助、Action 基类 |
|
||||
| 配置层 | `config.py` | 项目根配置：adb 路径、web 端口、USB 远程 adb server 等基础设施。**不放任务参数** |
|
||||
| 核心层 | `core/` | 框架运行时：日志、设备池、adb 操作、Worker 基类、任务管理器、u2 辅助、Action 基类 |
|
||||
| 任务层 | `tasks/` | 每个 App 一个子包，自包含 `task.py` + `actions/`，互不依赖 |
|
||||
| 前端层 | `templates/admin/` | 单页应用（纯 HTML+CSS+JS，无框架） |
|
||||
| 数据层 | `data/` | SQLite 持久化 |
|
||||
@@ -39,7 +39,7 @@
|
||||
│ JSON API │ ┌─────────────────┐
|
||||
▼ ┌──────────────┐ │ 设备 adb │
|
||||
┌──────────────┐ │ 看门狗监控 │ │ (IP:5555 直连 │
|
||||
│ web_server │ └──────────────┘ │ / USB 远程) │
|
||||
│ web/ 蓝图包 │ └──────────────┘ │ / USB 远程) │
|
||||
│ (Flask API) │ └─────────────────┘
|
||||
└──────────────┘
|
||||
│
|
||||
@@ -137,7 +137,7 @@ run() 主循环（不要重写）：
|
||||
|
||||
**并发控制**：同一 serial 同时只允许一个 worker，避免冲突。
|
||||
|
||||
**状态缓存**：`get_status()` 带 5 秒缓存，STF 请求慢时不阻塞前端。
|
||||
**状态缓存**：`get_status()` 带 5 秒缓存，避免每次 /api/status 都查库/adb 阻塞前端。
|
||||
|
||||
### 3.4 前台 App 扫描器（`_ForegroundScanner`）
|
||||
|
||||
@@ -145,12 +145,11 @@ run() 主循环（不要重写）：
|
||||
|
||||
| 设备状态 | 处理方式 | 是否打扰 |
|
||||
|---------|---------|---------|
|
||||
| worker 运行中 | 复用已有 ADB 连接查询 | 否 |
|
||||
| 自己占用无 worker | STF remoteConnect 隧道查询 | 否 |
|
||||
| 完全空闲 | 返回"空闲"（不 adb connect，避免 STF 误判离线） | 否 |
|
||||
| 他人占用 | 标记"(他人占用)" | 否 |
|
||||
| worker 运行中（IP:5555） | 复用已有 ADB 连接查询 | 否 |
|
||||
| worker 运行中（USB） | 经 220 远程 adb server 查询 | 否 |
|
||||
| 完全空闲 | 返回"空闲"（不主动 connect） | 否 |
|
||||
|
||||
> **为什么不扫描空闲设备的前台 App**：STF provider 内部通过 IP:5555 维持 adb 连接。外部 adb connect/disconnect 会让 adb server 断开该 transport，连带 STF provider 的连接断开，STF 误判设备 offline 并触发重连。
|
||||
> **为什么不扫描空闲设备的前台 App**：IP:5555 的 adb transport 是共享的（历史与 STF provider 共用），外部 connect/disconnect 会扰动共享连接，遵守既有红线。
|
||||
|
||||
### 3.5 ADB 操作（`core/adb_helper.py`）
|
||||
|
||||
@@ -158,8 +157,8 @@ run() 主循环（不要重写）：
|
||||
|
||||
**铁律：绝不 kill-server**：
|
||||
- `adb kill-server` 会断开所有设备的 adb transport
|
||||
- 导致 STF provider 对全部设备误判离线并触发重连
|
||||
- 影响所有运行中的任务
|
||||
- 全部设备连接被重建，影响所有运行中的任务
|
||||
- 同理绝不 disconnect IP:5555（共享 transport 红线，见 DEVELOPMENT.md）
|
||||
|
||||
| 函数 | 说明 |
|
||||
|------|------|
|
||||
@@ -191,9 +190,9 @@ SQLAlchemy 模型，存于 `data/users.db`：
|
||||
### 权限模型
|
||||
|
||||
- `User.perms` 存业务权限位 JSON 数组（`tasks`/`devices`/`apks`/`logs`），`is_admin=true` 拥有全部权限（`has_perm` 短路）
|
||||
- 后端统一用 `@perm_required(PERM_X)` / `@admin_required` 装饰器拦截（web_server.py），无权限返回 403；
|
||||
查看类 GET 接口只要求登录；用户管理、维护接口（STF 重启 `/api/stf/restart`、adb 终端 `/api/adb/cmd`）强制 `admin_required`
|
||||
- adb 终端安全红线：拒绝 `kill-server` / `disconnect`（STF provider 共享 adb transport，断开会误判全设备离线）
|
||||
- 后端统一用 `@perm_required(PERM_X)` / `@admin_required` 装饰器拦截（web/auth.py），无权限返回 403；
|
||||
查看类 GET 接口只要求登录；用户管理、adb 终端（`/api/adb/cmd`）强制 `admin_required`
|
||||
- adb 终端安全红线：拒绝 `kill-server` / `disconnect`（共享 adb transport）
|
||||
- 前端 `loadMe()` 拉取 `/api/me`，用 `data-perm` 属性隐藏无权限的 tab/按钮，行内按钮用 `_can(perm)` 判断
|
||||
- 安全兜底：**前端隐藏只是 UX，权限强制在后端**；新增路由时按"写操作必须带权限装饰器"的约定
|
||||
|
||||
@@ -201,10 +200,10 @@ SQLAlchemy 模型，存于 `data/users.db`：
|
||||
|
||||
APK 上传/解析/批量安装。
|
||||
|
||||
**设备连接策略（直连，绕过 STF）**：
|
||||
**设备连接策略（直连）**：
|
||||
- 直接 `adb connect serial`（serial 是 IP:5555）
|
||||
- 不经过 STF occupy/release，避免 STF release 触发 agent 清理卸载 app
|
||||
- 安装后不主动 disconnect（STF provider 共享该 adb transport）
|
||||
- 不经过占用/释放（单实例互斥由调度器内存锁保证）
|
||||
- 安装后不主动 disconnect（共享 adb transport 红线）
|
||||
|
||||
**安装流程**：
|
||||
1. 上传 APK → 保存到 `data/apks/` → pyaxmlparser 解析包名/版本 → 入库
|
||||
@@ -232,23 +231,24 @@ APK 上传/解析/批量安装。
|
||||
- 引擎懒加载单例 + 并发加锁（识别约 0.2-0.5s/次）
|
||||
- 返回坐标约定：像素、原点左上
|
||||
|
||||
### 3.10 STF 设备管理（`core/stf_device_mgmt.py`）
|
||||
### 3.10 Web 层蓝图包（`web/`）
|
||||
|
||||
工具页"STF 设备管理"：维护 220 上 OpenSTF 设备池。
|
||||
路由按功能域拆分（模块化开发底线，便于定位问题）：
|
||||
|
||||
背景：220 的 adb 跑在 Docker 容器（`STF_ADB_CONTAINER`，默认 `adb`）里，设备池由
|
||||
`/mnt/data/openstf/connect_devices.sh`（`STF_SCRIPT_PATH`）的 `DEVICES` 数组维护，cron 每 5 分钟补连。
|
||||
|
||||
| 函数 | 说明 |
|
||||
| 模块 | 职责 |
|
||||
|------|------|
|
||||
| `status()` | 脚本配置 IP + 220 adb 实际连接状态 |
|
||||
| `add_device(ip)` | 用 220 的 python3 精确改脚本 DEVICES 块 + `docker exec adb adb connect` |
|
||||
| `remove_device(ip)` | 脚本删条目 + `adb disconnect` |
|
||||
| `auth.py` | 登录/登出/CSRF/权限装饰器/页面路由（/、/wall） |
|
||||
| `monitor.py` | 状态/运行控制/设备操作/远程看屏（流+缩略图+触控） |
|
||||
| `tasks_api.py` | 任务计划/分组/自定义动作/元素抓取/步骤测试 |
|
||||
| `admin_api.py` | 用户管理/日志 |
|
||||
| `tools_api.py` | adb 终端/剪贴板注入/应用版本 |
|
||||
| `devices_api.py` | 设备池管理（增删停用/重连/型号采集） |
|
||||
| `apks_api.py` | 应用管理 |
|
||||
| `tailscale_api.py` | Tailscale 管理 |
|
||||
| `common.py` | 跨模块共享（合并设备列表/屏幕状态） |
|
||||
| `context.py` | 共享对象注入（mgr/apk_mgr/device_pool） |
|
||||
|
||||
关键点：
|
||||
- 脚本编辑用 python3 行级增删（sed 处理多行数组易误伤）
|
||||
- `adb connect` 到不可达 IP 会挂 40s+，220 侧用 `timeout 15` 兜底，超时保留在脚本由 cron 重试
|
||||
- 断开的是 220（STF provider 侧）的 adb 连接，与本机任务直连的 adb 相互独立
|
||||
`web_server.py` 只保留：app 创建、数据库初始化、蓝图注册、uiautodev 生命周期、启动（193 行）。
|
||||
|
||||
---
|
||||
|
||||
|
||||
+17
-15
@@ -13,7 +13,7 @@
|
||||
| `dev` | **开发分支**，所有新功能/修复都在这里开发 |
|
||||
| `main` | **生产分支**（主分支），只放已确认的稳定版本 |
|
||||
|
||||
生产环境 = STF 主机 `192.168.20.220` 的 `/mnt/data/openstf/auto_control`（python-app 容器运行 `web_server.py`）。
|
||||
生产环境 = 部署机 `192.168.20.220` 的 `/mnt/data/openstf/auto_control`（python-app 容器运行 `web_server.py`）。
|
||||
|
||||
### 1.2 git 操作铁律（重要）
|
||||
|
||||
@@ -42,47 +42,49 @@
|
||||
| 环境 | 位置 | 说明 |
|
||||
|------|------|------|
|
||||
| 开发机 | 本机（192.168.20.57） | `.venv` + 本地运行 `web_server.py` |
|
||||
| 生产机 | STF 主机 220 的 `auto_control` | python-app 容器，`network_mode: host` |
|
||||
| STF 服务 | `192.168.20.220:7100` | 设备农场（REST API） |
|
||||
| 设备 | Tailscale `100.100.10.x:5555` | 5 台 Xiaomi，本机 `100.100.10.2` 在 tailnet 内 |
|
||||
| 生产机 | 部署机 220 的 `auto_control` | python-app 容器，`network_mode: host` |
|
||||
| STF 服务 | ~~`192.168.20.220:7100`~~ | 已停用（2026-08-18 `docker stop stf`，代码已摘除依赖） |
|
||||
| adb 容器 | 220 上 `adb`（host 网络 5037） | USB 设备远程 adb server；网络设备补连用 |
|
||||
| 设备 | Tailscale `100.100.10.x:5555` | Xiaomi 舰队，本机 `100.100.10.2` 在 tailnet 内 |
|
||||
| uiautodev | 本机 `20242` | 元素抓取服务（web_server 自动拉起） |
|
||||
|
||||
### 2.1 adb key（关键）
|
||||
|
||||
- 本机 `~/.android/adbkey` 已换成 **STF adb 容器的 key**（5 台设备都信任）
|
||||
- 本机 `~/.android/adbkey` 沿用历史 key（原取自 STF adb 容器，全部设备都信任）
|
||||
- **不要随意更换 key**——设备会变 unauthorized 连不上
|
||||
- 旧 key 备份在 `~/.android/adbkey.local.bak`
|
||||
- 生产环境的容器也需要用这把 key（部署时处理）
|
||||
|
||||
### 2.2 设备连接方式
|
||||
|
||||
- 设备 serial 是 `IP:5555`（Tailscale 地址），**直连**优先
|
||||
- STF 桥接（remoteConnect）在此环境**不可用**（隧道 adb key 认证失败，显示 unauthorized）
|
||||
- 设备 serial 是 `IP:5555`（Tailscale 地址），**直连**优先（只 connect、绝不 disconnect）
|
||||
- USB 设备（serial 无冒号）：插本机走本地 adb；插 220 走远程 adb server（`USB_ADB_HOST:5037`）
|
||||
- 本机已在 tailnet 内，直连可靠且快（<1s）
|
||||
- 设备加入/退出平台：工具 → 设备池管理（SQLite 清单，自动连接 + 型号采集）
|
||||
|
||||
---
|
||||
|
||||
## 3. 技术红线（开发限制）—— 违反会打断 STF，需人工恢复
|
||||
## 3. 技术红线（开发限制）—— 违反会打断共享 adb transport，需人工恢复
|
||||
|
||||
这些是踩过坑后总结的，**任何修改都不能引入**。违反任何一条都会导致设备被 STF 误判离线、需人工处理：
|
||||
这些是踩过坑后总结的，**任何修改都不能引入**。违反任何一条都会导致设备连接被全部重建（历史原因：STF provider 共享同一 adb transport，摘除 STF 后仍保留此约束）：
|
||||
|
||||
1. **绝不 `adb kill-server`**
|
||||
- 会断开所有设备的 adb transport，STF 对全网设备误判离线并触发重连
|
||||
- 会断开所有设备的 adb transport，全部设备连接被重建，运行中任务中断
|
||||
- 见 `core/adb_helper.py`
|
||||
|
||||
2. **绝不对 `IP:5555` 设备 `adb disconnect`**
|
||||
- STF provider 共享该地址的 adb transport，disconnect 会断 STF
|
||||
- 该地址的 adb transport 是共享的（历史与 STF provider 共用），disconnect 会断掉全部相关连接
|
||||
- 直连模式下 `release()` 不 disconnect
|
||||
- 见 `core/device_worker.py` `STFDevice.release()`
|
||||
|
||||
3. **空闲设备扫描不主动 connect/disconnect**
|
||||
- STF provider 内部通过 IP:5555 维持连接，外部 connect/disconnect 会让 STF 误判离线
|
||||
- IP:5555 的 transport 由多方共享（历史与 STF provider 共用），外部 connect/disconnect 会扰动共享连接
|
||||
- `_ForegroundScanner._scan_free` 对空闲设备直接返回"空闲"，不碰 adb
|
||||
- 见 `core/task_manager.py`
|
||||
|
||||
4. **adb key 保持为 STF 容器的 key**（见 2.1）
|
||||
4. **adb key 保持历史 key 不变**（见 2.1，设备信任该 key）
|
||||
|
||||
5. **直连优先，不引入 STF 桥接**（见 2.2）
|
||||
5. **直连优先，不引入第三方桥接**（见 2.2）
|
||||
|
||||
### 3.1 其他开发限制
|
||||
|
||||
@@ -92,7 +94,7 @@
|
||||
- **数据库是 SQLite**（`data/users.db`，WAL 模式）：运行时数据不提交 git
|
||||
- **前端 JS 在 `static/admin/monitor.js`**（已从 HTML 拆分），HTML 里用 `<script src>` 引用
|
||||
- **监控页/大列表已加分页**：100 台设备也只渲染 10 行/页，不要移除分页逻辑
|
||||
- **任务批量触发已错峰**（`_START_STAGGER_SEC`）：避免大量设备同时启动造成 adb/STF 风暴，不要移除
|
||||
- **任务批量触发已错峰**（`_START_STAGGER_SEC`）：避免大量设备同时启动造成 adb 连接风暴，不要移除
|
||||
|
||||
---
|
||||
|
||||
|
||||
+5
-3
@@ -15,10 +15,10 @@ Flask-SQLAlchemy>=3.0,<4.0
|
||||
# 定时任务调度
|
||||
APScheduler>=3.10,<4.0
|
||||
|
||||
# HTTP 客户端（STF API 调用）
|
||||
# HTTP 客户端
|
||||
requests>=2.28
|
||||
|
||||
# SSH 远程执行（STF 重启 / STF 设备管理；.env 配 STF_SSH_PASSWORD 时走密码认证，
|
||||
# SSH 远程执行（预留运维用；.env 配 STF_SSH_PASSWORD 时走密码认证，
|
||||
# 跨平台无需 sshpass；未配置则退回系统 ssh 免密密钥）
|
||||
paramiko>=3.0
|
||||
|
||||
@@ -29,8 +29,10 @@ uiautomator2>=3.0
|
||||
uiautodev>=0.14
|
||||
|
||||
# 屏幕 OCR（条件判断的 OCR识别 选择器，ONNX 推理，跨平台：Windows/Linux/macOS，
|
||||
# 中英文模型随包内置；服务器无显示器环境建议把 opencv-python 换成 opencv-python-headless）
|
||||
# 中英文模型随包内置；服务器/容器环境必须用 headless 版 opencv——
|
||||
# opencv-python 依赖 X11 库（libxcb），slim 容器里 import cv2 直接崩，OCR 步骤任务失败退出）
|
||||
rapidocr_onnxruntime>=1.4
|
||||
opencv-python-headless>=4.8,<5 # 锁定 4.x：5.x wheel 打包异常（无 cv2 模块）
|
||||
|
||||
# APK 元信息解析（应用管理功能：自动读取包名/版本/应用名）
|
||||
pyaxmlparser>=0.3.27
|
||||
|
||||
@@ -0,0 +1,167 @@
|
||||
"""全量路由回归测试：启动后遍历所有 API 路由发请求，抓 500/异常。
|
||||
|
||||
用法（项目根目录）：
|
||||
.venv/bin/python scripts/regression_test.py
|
||||
|
||||
设计：
|
||||
- 用 Flask test_client（不占用 18050，不影响运行中的服务）
|
||||
- GET 路由全量请求（路径参数自动替换）；流式/二进制接口跳过
|
||||
- 写操作（POST/PUT/DELETE）发空 body 探测：期望 400/403/404（参数校验），
|
||||
返回 500 = 代码缺陷（import 遗漏/引用错误），立即报出
|
||||
- 关键业务 POST 用真实参数验证（亮屏/剪贴板/测试步骤/设备池增删）
|
||||
- 退出码：有失败返回 1（可接入检查流程）
|
||||
|
||||
背景：web/ 蓝图拆分后多次出现 import 遗漏导致接口 500（ADB_PATH/_log/常量等），
|
||||
每次都是线上报错才暴露。此脚本让这类问题在改动后 30 秒内现形。
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import signal
|
||||
|
||||
# 项目根加入 sys.path（脚本在 scripts/ 下运行，保证可 import web_server/config）
|
||||
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||
|
||||
# 测试模式：禁用 cron 调度器（否则 test_client 会按 DB 里的任务 cron 真跑任务，
|
||||
# 干扰回归/占用设备——实测 ocr关键字任务每 30 分钟触发导致回归超时）
|
||||
os.environ["DISABLE_SCHEDULER"] = "1"
|
||||
|
||||
# 单接口超时保护：adb 相关接口可能慢（连接/查询设备），给足时间
|
||||
signal.alarm(300)
|
||||
|
||||
from web_server import app # noqa: E402 （导入即完成 app 装配，与生产一致）
|
||||
|
||||
|
||||
# 流式/二进制接口：无法用普通 GET 断言，跳过（已有单独验证路径）
|
||||
_SKIP_PREFIXES = (
|
||||
"/api/screen/stream", "/api/screen/thumb",
|
||||
"/api/uiauto/screenshot", "/api/device/screenshot",
|
||||
)
|
||||
# 关键业务 POST：用真实参数验证（这些覆盖了核心链路）
|
||||
_KEY_POSTS = [
|
||||
("一键亮屏", "/api/device/screen_all", {"mode": "on"}),
|
||||
("一键息屏", "/api/device/screen_all", {"mode": "off"}),
|
||||
("剪贴板注入", "/api/tools/clipboard/set",
|
||||
{"serials": ["100.100.10.11:5555"], "text": "回归测试"}),
|
||||
("测试步骤(wait)", "/api/steps/test",
|
||||
{"serial": "100.100.10.11:5555",
|
||||
"step": {"type": "wait", "label": "等待", "params": {"max": 1, "min": 1, "probability": 100}}}),
|
||||
("adb 终端执行", "/api/adb/cmd", {"cmd": "adb devices"}),
|
||||
("adb 红线拦截", "/api/adb/cmd", {"cmd": "adb kill-server"}),
|
||||
("应用版本查询", "/api/tools/appver", {"pkg": "jp.co.cyberagent.stf"}),
|
||||
]
|
||||
# 红线接口：期望被拒绝（不是 ok）
|
||||
_EXPECT_REJECT = {"/api/adb/cmd"}
|
||||
|
||||
|
||||
def _fill_path_params(rule):
|
||||
"""把路由路径参数 <xxx> 替换为测试值（serial 用真实设备）。"""
|
||||
url = rule
|
||||
url = url.replace("<serial>", "100.100.10.11:5555")
|
||||
url = url.replace("<apk_id>", "x")
|
||||
url = url.replace("<action_id>", "x")
|
||||
url = url.replace("<device_id>", "x")
|
||||
url = url.replace("<uid>", "1")
|
||||
return url
|
||||
|
||||
|
||||
def main():
|
||||
c = app.test_client()
|
||||
# 登录 + CSRF
|
||||
r = c.post("/login", data={"username": "admin", "password": "admin123"})
|
||||
if r.status_code != 302:
|
||||
print("❌ 登录失败（请检查 admin 账号）")
|
||||
sys.exit(1)
|
||||
token = c.get("/api/csrf").get_json()["token"]
|
||||
H = {"X-CSRF-Token": token}
|
||||
|
||||
fails = []
|
||||
warns = []
|
||||
passed = 0
|
||||
|
||||
# ========== 1. GET 全量 ==========
|
||||
rules = sorted({r.rule for r in app.url_map.iter_rules()
|
||||
if r.rule.startswith("/api") and "GET" in r.methods})
|
||||
for rule in rules:
|
||||
if rule.startswith(_SKIP_PREFIXES):
|
||||
continue
|
||||
url = _fill_path_params(rule)
|
||||
try:
|
||||
r = c.get(url)
|
||||
if r.status_code == 500:
|
||||
fails.append(f"GET {rule} -> HTTP 500（代码缺陷）")
|
||||
elif r.status_code >= 502:
|
||||
warns.append(f"GET {rule} -> HTTP {r.status_code}（业务错误，如未配置/设备离线）")
|
||||
else:
|
||||
passed += 1
|
||||
except Exception as e:
|
||||
fails.append(f"GET {rule} -> {type(e).__name__}: {e}")
|
||||
print(f"GET 路由: {len(rules)} 个（跳过 {len([r for r in rules if r.startswith(_SKIP_PREFIXES)])} 个流式/二进制）")
|
||||
|
||||
# ========== 1.5 未登录访问（登录重定向链路） ==========
|
||||
try:
|
||||
r = c.get("/")
|
||||
if r.status_code == 302 and "login" in (r.headers.get("Location") or ""):
|
||||
passed += 1
|
||||
elif r.status_code == 200:
|
||||
passed += 1 # 已登录态也可能 200（测试客户端无 cookie 时走 302）
|
||||
else:
|
||||
fails.append(f"未登录访问 / -> HTTP {r.status_code}（应 302 到登录页）")
|
||||
except Exception as e:
|
||||
fails.append(f"未登录访问 / -> {type(e).__name__}: {e}")
|
||||
|
||||
# ========== 2. 写操作空 body 探测（抓 import 遗漏/引用错误） ==========
|
||||
write_rules = sorted({r.rule for r in app.url_map.iter_rules()
|
||||
if r.rule.startswith("/api")
|
||||
and (r.methods & {"POST", "PUT", "DELETE"})})
|
||||
for rule in write_rules:
|
||||
url = _fill_path_params(rule)
|
||||
try:
|
||||
methods = {m for r2 in app.url_map.iter_rules() if r2.rule == rule for m in r2.methods}
|
||||
if "DELETE" in methods:
|
||||
r = c.delete(url, headers=H)
|
||||
elif "PUT" in methods:
|
||||
r = c.put(url, json={}, headers=H)
|
||||
else:
|
||||
r = c.post(url, json={}, headers=H)
|
||||
# 空 body 期望 400（参数校验）；403=权限/404=路径参数、500=代码缺陷
|
||||
if r.status_code == 500:
|
||||
fails.append(f"写操作 {rule} -> HTTP 500（空 body 应 400，500=代码缺陷）")
|
||||
elif r.status_code >= 502:
|
||||
warns.append(f"写操作 {rule} -> HTTP {r.status_code}（业务错误，如未配置/设备离线）")
|
||||
else:
|
||||
passed += 1
|
||||
except Exception as e:
|
||||
fails.append(f"写操作 {rule} -> {type(e).__name__}: {e}")
|
||||
print(f"写操作路由: {len(write_rules)} 个（空 body 探测）")
|
||||
|
||||
# ========== 3. 关键业务 POST（真实参数） ==========
|
||||
for name, url, body in _KEY_POSTS:
|
||||
try:
|
||||
r = c.post(url, json=body, headers=H)
|
||||
j = r.get_json() if r.is_json else None
|
||||
is_reject = url in _EXPECT_REJECT and "kill" in (body.get("cmd") or "")
|
||||
good = (not j.get("ok")) if is_reject else bool(j and j.get("ok") is not False)
|
||||
if good:
|
||||
passed += 1
|
||||
print(f" ✅ {name}: {r.status_code}")
|
||||
else:
|
||||
fails.append(f"关键 POST {name} -> HTTP {r.status_code} {str(j)[:80]}")
|
||||
except Exception as e:
|
||||
fails.append(f"关键 POST {name} -> {type(e).__name__}: {e}")
|
||||
|
||||
# ========== 汇总 ==========
|
||||
print("-" * 50)
|
||||
if warns:
|
||||
print(f"⚠ 业务性提示 {len(warns)} 个（非代码缺陷）：")
|
||||
for w in warns:
|
||||
print(" ", w)
|
||||
if fails:
|
||||
print(f"❌ 发现 {len(fails)} 个代码缺陷：")
|
||||
for f in fails:
|
||||
print(" ", f)
|
||||
sys.exit(1)
|
||||
print(f"✅ 全部通过（{passed} 项检查，含 {len(rules)} GET + {len(write_rules)} 写操作探测 + {len(_KEY_POSTS)} 关键业务）")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Executable
+49
@@ -0,0 +1,49 @@
|
||||
#!/bin/bash
|
||||
# 容器启动脚本：安装依赖 + 环境修复 + 启动 web_server。
|
||||
# compose 的 python-app 服务 command 指向本脚本。
|
||||
#
|
||||
# 为什么需要环境修复（必须在 pip install 之后）：
|
||||
# rapidocr_onnxruntime 的依赖声明是 opencv-python（GUI 版），pip 解析依赖时
|
||||
# 会强制装回它；而 GUI 版依赖 X11 库（libxcb），python:slim 容器里 import cv2
|
||||
# 直接崩溃 → RapidOCR 不可用 → 条件判断的 OCR 步骤抛异常 → 任务失败退出。
|
||||
# 因此在安装完 requirements 后，最后强制卸载 GUI 版并装 headless（幂等）。
|
||||
# 本地 Mac 有 GUI 环境不受影响。
|
||||
if [ -f requirements.txt ]; then
|
||||
pip install --no-cache-dir -i https://pypi.tuna.tsinghua.edu.cn/simple -r requirements.txt
|
||||
fi
|
||||
|
||||
# 环境修复：最后强制 headless（覆盖 rapidocr 拉回的 GUI 版）
|
||||
pip uninstall -y -q opencv-python 2>/dev/null || true
|
||||
pip install -q -i https://pypi.tuna.tsinghua.edu.cn/simple "opencv-python-headless>=4.8,<5" # 5.x wheel 无 cv2 模块，锁定 4.x
|
||||
|
||||
# pip 24.0 解压 abi3 wheel 偶发丢根文件（4.14.0.94 实测 site-packages/cv2 只剩子目录，
|
||||
# cv2.abi3.so / __init__.py 缺失 → import cv2 成空壳，OCR 全挂）→ 空壳检测 + wheel 手动解压兜底（幂等）
|
||||
python3 - <<'PY'
|
||||
import glob, os, shutil, site, subprocess, sys, zipfile
|
||||
|
||||
def cv2_ok():
|
||||
try:
|
||||
import cv2
|
||||
return hasattr(cv2, "__version__") and cv2.__file__ is not None
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
if cv2_ok():
|
||||
sys.exit(0)
|
||||
print("cv2 空壳，wheel 手动解压修复...")
|
||||
r = subprocess.run(["pip", "download", "--no-deps", "-q",
|
||||
"-i", "https://pypi.tuna.tsinghua.edu.cn/simple",
|
||||
"-d", "/tmp/ocv", "opencv-python-headless>=4.8,<5"], capture_output=True)
|
||||
if r.returncode != 0:
|
||||
sys.exit(1)
|
||||
w = sorted(glob.glob("/tmp/ocv/opencv_python_headless*.whl"))[-1]
|
||||
with zipfile.ZipFile(w) as z:
|
||||
z.extractall("/tmp/ocv")
|
||||
dst = os.path.join(site.getsitepackages()[0], "cv2")
|
||||
shutil.rmtree(dst, ignore_errors=True)
|
||||
shutil.copytree("/tmp/ocv/cv2", dst)
|
||||
import cv2
|
||||
print(f"cv2 {cv2.__version__} 手动解压修复完成")
|
||||
PY
|
||||
|
||||
exec python -u web_server.py
|
||||
+22
-6
@@ -87,16 +87,18 @@ function showTab(name){
|
||||
_activeTab=name;
|
||||
document.querySelectorAll('.tab-panel').forEach(p=>p.classList.remove('active'));
|
||||
document.querySelectorAll('.navbar .tab').forEach(t=>t.classList.remove('active'));
|
||||
document.getElementById('tab-'+name).classList.add('active');
|
||||
document.querySelectorAll('.navbar .tab')[['monitor','tasks','groups','logs','users','maintenance','tools'].indexOf(name)].classList.add('active');
|
||||
const panel=document.getElementById('tab-'+name);
|
||||
if(panel)panel.classList.add('active');
|
||||
const btn=document.querySelector('.navbar .tab[data-tab="'+name+'"]');
|
||||
if(btn)btn.classList.add('active');
|
||||
// 停止所有定时器
|
||||
if(_monitorTimer){clearInterval(_monitorTimer);_monitorTimer=null;}
|
||||
if(_logTimer){clearInterval(_logTimer);_logTimer=null;}
|
||||
if(_discoveryTimer){clearInterval(_discoveryTimer);_discoveryTimer=null;}
|
||||
// 按需加载数据
|
||||
if(name==='monitor'){loadMonitor();_monitorTimer=setInterval(loadMonitor,5000);}
|
||||
if(name==='tasks'){showSubTab('tasks',_activeSubs.tasks);loadTasks();loadCustomActions();}
|
||||
if(name==='tools'){showSubTab('tools',_activeSubs.tools);loadToolsDevices();loadAdbDevices();loadTailscaleDevices();loadApks();loadStfDevMgmt();}
|
||||
if(name==='groups')loadGroups();
|
||||
if(name==='tools'){showSubTab('tools',_activeSubs.tools);loadToolsDevices();loadAdbDevices();loadTailscaleDevices();loadApks();}
|
||||
if(name==='logs'){loadLogs();if(document.getElementById('log-auto').checked)_logTimer=setInterval(loadLogs,3000);}
|
||||
if(name==='users')loadUsers();
|
||||
}
|
||||
@@ -104,14 +106,22 @@ function showTab(name){
|
||||
// ================== 页内子分栏（任务/工具 通用） ==================
|
||||
// 每个带子分栏的 Tab 记住上次选中的子分栏，切走再切回来保持原位
|
||||
let _activeSubs = {tasks: 'plan', tools: 'clipboard'};
|
||||
let _discoveryTimer = null; // 设备自动发现 10s 轮询（仅 devpool 子分栏激活时）
|
||||
|
||||
function showSubTab(tabId, name){
|
||||
_activeSubs[tabId] = name;
|
||||
const tab = document.getElementById('tab-'+tabId);
|
||||
tab.querySelectorAll('.sub-tab').forEach(b=>b.classList.toggle('active', b.dataset.sub===name));
|
||||
tab.querySelectorAll('.sub-panel').forEach(p=>p.classList.toggle('active', p.id===tabId+'-sub-'+name));
|
||||
if(name==='screen' && typeof loadScreenDevices==='function') loadScreenDevices();
|
||||
if(name==='devpool' && typeof loadDevPool==='function') loadDevPool();
|
||||
if(name==='groups' && typeof loadGroups==='function') loadGroups();
|
||||
if(name==='devpool' && typeof loadDevPool==='function'){
|
||||
loadDevPool();
|
||||
if(typeof loadDiscovery==='function'){
|
||||
loadDiscovery();
|
||||
if(_discoveryTimer){clearInterval(_discoveryTimer);_discoveryTimer=null;}
|
||||
_discoveryTimer=setInterval(loadDiscovery,10000); // 10s 轮询：扫完自动出新结果
|
||||
}
|
||||
} else if(_discoveryTimer){clearInterval(_discoveryTimer);_discoveryTimer=null;}
|
||||
}
|
||||
|
||||
// ================== 模态框 ==================
|
||||
@@ -131,6 +141,12 @@ function closeModal(){
|
||||
}catch(e){console.warn('closeModal cleanup error:',e);}
|
||||
}
|
||||
|
||||
// 测试此步骤弹窗关闭（editor.js 的测试按钮用；曾随 STF 清理误删）
|
||||
function closeTestModal(){
|
||||
const ov=document.getElementById('test-overlay');
|
||||
if(ov)ov.classList.remove('show');
|
||||
}
|
||||
|
||||
// 关闭元素抓取弹窗（不影响任务编辑窗口）
|
||||
function closeElPicker(){
|
||||
var ov=document.getElementById('el-picker-overlay');
|
||||
|
||||
@@ -998,6 +998,7 @@ var _stepEditor={
|
||||
if(el.description)attrs.push('<span>desc:'+esc(el.description)+'</span>');
|
||||
var indent=' '.repeat(Math.min(el.depth||0,6));
|
||||
var sg=el.suggested||{};
|
||||
if(sg.invalid)attrs.push('<span style="color:#dc2626">⚠ '+esc(sg.reason||'无可用属性')+'</span>');
|
||||
return '<div class="el-picker-item" data-idx="'+idx+'" title="点击填入: '+esc(sg.value||'')+'" onclick="_stepEditor._pickEl('+idx+')">'+
|
||||
'<span class="ep-depth">'+(el.depth||0)+'</span>'+
|
||||
'<div class="ep-info"><div class="ep-name">'+indent+esc(el.name||el.class||'')+'</div>'+
|
||||
@@ -1022,6 +1023,10 @@ var _stepEditor={
|
||||
_pickEl:function(i){
|
||||
var el=this._elData[i];
|
||||
if(!el||!this._elTargetInput)return;
|
||||
if(el.suggested&&el.suggested.invalid){
|
||||
showToast(el.suggested.reason||'该元素无法生成选择器','error');
|
||||
return;
|
||||
}
|
||||
// 填入推荐选择器值，并切换选择器类型
|
||||
this._elTargetInput.value=el.suggested.value;
|
||||
var sel=this._elTargetInput.closest('.sc-body').querySelector('[data-key="selector_type"]');
|
||||
@@ -1077,7 +1082,7 @@ async function saveTask(jobId){
|
||||
cron:buildCronFromFreq(),
|
||||
stop_cron:(parseInt(st[1])||0)+' '+(parseInt(st[0])||0)+' * * *'};
|
||||
}
|
||||
// 运行窗口：窗口外（定时触发 + 手动执行）不启动
|
||||
// 运行窗口：只约束定时触发（窗口外定时不启动），手动执行不受限制
|
||||
if(document.getElementById('f-window_enable').checked){
|
||||
schedule.window={
|
||||
start:document.getElementById('f-window_start').value||'09:00',
|
||||
|
||||
+15
-4
@@ -94,9 +94,13 @@ async function stopLocate(serial){
|
||||
}
|
||||
|
||||
// 批量亮屏/息屏所有在线设备（息屏会中断运行中任务，前端已确认）
|
||||
// 亮屏/息屏：优先作用于勾选设备；未勾选则作用于全部在线设备
|
||||
async function screenAllDevices(mode){
|
||||
if(mode==='off'&&!confirm('确定让所有在线设备息屏？\n\n运行中的任务会因屏幕熄灭而中断，请谨慎操作。'))return;
|
||||
const r=await apiPost('/api/device/screen_all',{mode:mode});
|
||||
const label=(mode==='on'?'亮屏':'息屏');
|
||||
const selected=Array.from(_selectedSerials);
|
||||
const target=selected.length?('选中设备 '+selected.length+' 台'):'全部在线设备';
|
||||
if(!confirm(label+'：将作用于'+target+'。\n\n'+(mode==='off'?'息屏会中断运行中的任务（u2 无法操作），':'')+'确认继续吗？'))return;
|
||||
const r=await apiPost('/api/device/screen_all',{mode:mode,serials:selected.length?selected:undefined});
|
||||
if(!r)return;
|
||||
if(r.ok)showToast((mode==='off'?'已息屏':'已亮屏')+' '+r.success+'/'+r.total+' 台设备','success');
|
||||
else showToast(r.error||'操作失败','error');
|
||||
@@ -298,12 +302,19 @@ function renderDevices(){
|
||||
// 5秒自动刷新时若设备数据/分页/搜索/排序/定位状态都没变化，跳过整表重渲染（避免DOM抖动）
|
||||
const _st=_lp('devices');
|
||||
const _sig=JSON.stringify({d:_statusData.devices,p:_st.page,k:_st.kw,s:_st.sort,
|
||||
l:[..._locatingSerials].sort().join(',')});
|
||||
l:[..._locatingSerials].sort().join(','),
|
||||
sel:[..._selectedSerials].sort().join(',')});
|
||||
if(_sig===_devicesSig)return;
|
||||
_devicesSig=_sig;
|
||||
// 排序由 applyListPager 统一处理（sortValue + _lpSort）
|
||||
// 「只看在线」勾选时过滤离线设备（默认勾选）
|
||||
const onlyOnline=document.getElementById('monitor-filter-online')
|
||||
? document.getElementById('monitor-filter-online').checked : true;
|
||||
setListPager('devices',{
|
||||
data:()=>_statusData.devices||[],
|
||||
data:()=>{
|
||||
const all=_statusData.devices||[];
|
||||
return onlyOnline? all.filter(d=>d.present) : all;
|
||||
},
|
||||
filter:(dev,kw)=>((dev.serial||'').toLowerCase().includes(kw)||(dev.model||'').toLowerCase().includes(kw)||(dev.foreground_app||'').toLowerCase().includes(kw)||(dev.task_job||'').toLowerCase().includes(kw)||(dev.current_action||'').toLowerCase().includes(kw)),
|
||||
sortValue:_sortValue,
|
||||
render:renderDeviceRow,
|
||||
|
||||
@@ -141,7 +141,7 @@ function openTaskModal(jobId){
|
||||
'<div class="form-group"><label>允许运行·开始</label><input type="time" class="form-control" id="f-window_start" value="'+esc(winStart)+'"></div>'+
|
||||
'<div class="form-group"><label>允许运行·结束</label><input type="time" class="form-control" id="f-window_end" value="'+esc(winEnd)+'"></div>'+
|
||||
'</div>'+
|
||||
'<div class="help" id="f-window_help" style="display:'+(win?'block':'none')+'">窗口外任务不会启动（定时触发和手动执行都受约束）。跨午夜示例：21:00-09:00 = 晚 9 点到次日早 9 点允许运行</div>'+
|
||||
'<div class="help" id="f-window_help" style="display:'+(win?'block':'none')+'">窗口只约束定时触发：窗口外定时不会启动，手动执行不受限制。跨午夜示例：21:00-09:00 = 晚 9 点到次日早 9 点允许运行</div>'+
|
||||
'<div class="form-row">'+
|
||||
'<div class="form-group"><label>重试次数</label><input type="number" class="form-control" id="f-retry_attempts" value="'+j.retry.max_attempts+'" min="1" max="10"></div>'+
|
||||
'<div class="form-group"><label>重试间隔(秒)</label><input type="number" class="form-control" id="f-retry_delay" value="'+j.retry.delay+'" min="10" max="3600"></div>'+
|
||||
|
||||
+120
-124
@@ -21,7 +21,9 @@ async function loadToolsDevices(force){
|
||||
const list = await _fetchAdbDevices(force);
|
||||
const status = document.getElementById('clip-status');
|
||||
if(list === null){status.textContent='加载失败';showToast('加载设备失败','error');return;}
|
||||
_clipDevices = list;
|
||||
// 剪贴板注入只对在线设备有意义：过滤掉设备池未连接(pool)/离线条目；
|
||||
// adb 终端面板保留全部（重连设备需要），它用自己的渲染逻辑不受影响
|
||||
_clipDevices = list.filter(d=>d.state==='device');
|
||||
const wrap = document.getElementById('clip-devices');
|
||||
if(!_clipDevices.length){
|
||||
wrap.innerHTML='<div class="empty" style="padding:20px">无可用设备（本地 adb 或设备池均无）</div>';
|
||||
@@ -39,11 +41,119 @@ async function loadToolsDevices(force){
|
||||
status.textContent = '共 '+_clipDevices.length+' 台设备';
|
||||
}
|
||||
|
||||
// ================== 设备自动发现（扫描 → 待连接池 → 确认） ==================
|
||||
function loadDiscovery(){
|
||||
apiGet('/api/devices/discovery').then(r=>{
|
||||
if(!r||!r.ok)return;
|
||||
const status=document.getElementById('discovery-status');
|
||||
const enabled=document.getElementById('discovery-enabled');
|
||||
const interval=document.getElementById('discovery-interval');
|
||||
const subnets=document.getElementById('discovery-subnets');
|
||||
if(!enabled)return; // 面板未渲染（离开子分栏）
|
||||
enabled.checked=!!r.enabled;
|
||||
interval.value=r.interval||60;
|
||||
subnets.value=(r.subnets||[]).join(', ');
|
||||
// 状态行
|
||||
if(r.scanning){status.textContent='扫描中...';}
|
||||
else if(r.last_scan){
|
||||
let txt='上次扫描 '+esc(r.last_scan)+' · 开放 '+r.last_result.found+' · 可连 '
|
||||
+(r.last_result.verified||0)+' · 新增 '+(r.last_result.new||0);
|
||||
if(r.last_error)txt+=' · ⚠ '+esc(r.last_error);
|
||||
status.textContent=txt;
|
||||
}else{status.textContent='尚未扫描';}
|
||||
// 待连接表格：只显示在线设备（离线候选不可确认连接，隐藏；恢复在线后自动出现）
|
||||
const rows=(r.pending||[]).filter(x=>x.online);
|
||||
const tb=document.getElementById('tb-discovery');
|
||||
if(!tb)return;
|
||||
if(!rows.length){
|
||||
tb.innerHTML='<tr><td colspan="6" class="empty">待连接池为空（扫描到的设备会出现在这里）</td></tr>';
|
||||
}else{
|
||||
tb.innerHTML=rows.map(x=>{
|
||||
const src=x.source==='tailscale'
|
||||
?'<span class="label label-info">Tailscale</span>'
|
||||
:'<span class="label label-warning">局域网</span>';
|
||||
const onl=x.online
|
||||
?'<span class="label label-success">在线</span>'
|
||||
:'<span class="label label-warning">离线</span>';
|
||||
return '<tr><td style="font-family:monospace">'+esc(x.serial)+'</td>'
|
||||
+'<td>'+src+'</td><td>'+esc(x.first_seen)+'</td><td>'+esc(x.last_seen)+'</td><td>'+onl+'</td>'
|
||||
+'<td><button class="btn btn-primary btn-xs" data-serial="'+esc(x.serial)+'" onclick="confirmDiscoveryDev(this.dataset.serial)">确认添加</button> '
|
||||
+'<button class="btn btn-xs" data-serial="'+esc(x.serial)+'" onclick="ignoreDiscoveryDev(this.dataset.serial)">忽略</button></td></tr>';
|
||||
}).join('');
|
||||
}
|
||||
});
|
||||
}
|
||||
function toggleDiscovery(checked){
|
||||
apiPost('/api/devices/discovery/settings',{enabled:checked}).then(r=>{
|
||||
if(r&&r.ok)showToast('定时扫描已'+(checked?'开启':'关闭'),'success');
|
||||
else showToast('设置失败: '+((r&&r.error)||''),'error');
|
||||
});
|
||||
}
|
||||
function saveDiscoverySettings(){
|
||||
const subnets=(document.getElementById('discovery-subnets').value||'')
|
||||
.split(',').map(s=>s.trim()).filter(Boolean);
|
||||
const interval=parseInt(document.getElementById('discovery-interval').value)||60;
|
||||
apiPost('/api/devices/discovery/settings',{subnets,interval}).then(r=>{
|
||||
if(r&&r.ok)showToast('设置已保存','success');
|
||||
else showToast('保存失败: '+((r&&r.error)||''),'error');
|
||||
});
|
||||
}
|
||||
function runDiscoveryScan(){
|
||||
apiPost('/api/devices/discovery/scan',{}).then(r=>{
|
||||
if(r&&r.ok){showToast(r.msg||'扫描已启动','success');setTimeout(loadDiscovery,3000);}
|
||||
else showToast('扫描失败: '+((r&&r.error)||''),'error');
|
||||
});
|
||||
}
|
||||
function confirmDiscoveryDev(serial){
|
||||
const name=prompt('备注名（可选，留空直接添加）','');
|
||||
if(name===null)return;
|
||||
apiPost('/api/devices/discovery/confirm',{serial,name}).then(r=>{
|
||||
if(r&&r.ok){
|
||||
showToast('已加入设备池'+(r.is_new?'':'（已存在，已更新）'),'success');
|
||||
loadDevPool();loadDiscovery();
|
||||
}else showToast('确认失败: '+((r&&r.error)||''),'error');
|
||||
});
|
||||
}
|
||||
function ignoreDiscoveryDev(serial){
|
||||
if(!confirm('忽略 '+serial+'？下轮扫描可能再次发现'))return;
|
||||
apiPost('/api/devices/discovery/ignore',{serial}).then(r=>{
|
||||
if(r&&r.ok){showToast('已忽略','success');loadDiscovery();}
|
||||
else showToast('操作失败: '+((r&&r.error)||''),'error');
|
||||
});
|
||||
}
|
||||
|
||||
function toggleClipDevice(cb){
|
||||
if(cb.checked)_clipSelected.add(cb.value);
|
||||
else _clipSelected.delete(cb.value);
|
||||
}
|
||||
|
||||
// 注入剪贴板（ClipInject APK 通道，Android 10+ 可用）：
|
||||
// am start 透明 Activity 写入 + u2 读回比对验证；结果逐台渲染 + toast 汇总
|
||||
function injectClipboard(){
|
||||
const text = document.getElementById('clip-text').value;
|
||||
const serials = [..._clipSelected];
|
||||
if(!serials.length){showToast('请先勾选目标设备','error');return;}
|
||||
if(!text.trim()){showToast('请输入注入内容','error');return;}
|
||||
const btn = Array.from(document.querySelectorAll('#tools-sub-clipboard .btn-primary'))
|
||||
.find(b=>b.textContent.includes('注入剪贴板'));
|
||||
if(btn){btn.disabled = true; const old = btn.textContent; btn.textContent = '注入中...'; btn._old = old;}
|
||||
apiPost('/api/tools/clipboard/set', {serials, text}).then(r=>{
|
||||
if(!r){showToast('请求失败','error');return;}
|
||||
const rows = Object.entries(r.results||{}).map(([s,v])=>{
|
||||
const ok = !!v.ok;
|
||||
return '<tr><td style="font-family:monospace">'+esc(s)+'</td>'
|
||||
+'<td><span class="label '+(ok?'label-success':'label-danger')+'">'
|
||||
+(ok?'成功':'失败')+'</span> '+esc(v.msg||'')+'</td></tr>';
|
||||
}).join('');
|
||||
document.getElementById('clip-result').innerHTML = rows;
|
||||
document.getElementById('clip-result-wrap').style.display='block';
|
||||
const okc = r.ok_count||0, fail = r.fail_count||0;
|
||||
if(fail>0) showToast(okc+' 台成功，'+fail+' 台失败','error');
|
||||
else showToast(okc+' 台设备注入成功','success');
|
||||
}).catch(e=>{showToast('注入异常: '+e,'error');})
|
||||
.finally(()=>{ if(btn){btn.disabled=false; btn.textContent=btn._old;} });
|
||||
}
|
||||
|
||||
// ================== 工具：应用版本管理 ==================
|
||||
let _appVerRows = []; // [{serial, installed, version_name, version_code, error}]
|
||||
|
||||
@@ -277,127 +387,6 @@ function copyTsKey(){
|
||||
}
|
||||
|
||||
|
||||
// ================== Tab: 工具 - 远程看屏（MJPEG 流 + u2 触控） ==================
|
||||
let _screenViewOn = false;
|
||||
|
||||
async function loadScreenDevices(force){
|
||||
const sel=document.getElementById('screen-device');
|
||||
if(!sel)return;
|
||||
const list=await _fetchAdbDevices(force);
|
||||
if(list===null)return;
|
||||
const cur=sel.value;
|
||||
const stateTxt={device:'在线',offline:'离线',pool:'设备池(未连接)'};
|
||||
sel.innerHTML=list.map(d=>
|
||||
'<option value="'+esc(d.serial)+'">'+esc(d.serial)+' ('+(stateTxt[d.state]||d.state)+')</option>'
|
||||
).join('');
|
||||
if(cur)sel.value=cur;
|
||||
}
|
||||
|
||||
function _screenSerial(){
|
||||
const sel=document.getElementById('screen-device');
|
||||
return sel?sel.value:'';
|
||||
}
|
||||
|
||||
function startScreenView(){
|
||||
const serial=_screenSerial();
|
||||
if(!serial){showToast('请先选择设备','error');return;}
|
||||
stopScreenView();
|
||||
const img=document.getElementById('screen-img');
|
||||
const loading=document.getElementById('screen-loading');
|
||||
loading.style.display='flex';
|
||||
document.getElementById('screen-status').textContent='';
|
||||
img.src='/api/screen/stream?serial='+encodeURIComponent(serial);
|
||||
img.onload=()=>{loading.style.display='none';_screenViewOn=true;document.getElementById('screen-status').textContent='观看中';};
|
||||
img.onerror=()=>{loading.style.display='none';_screenViewOn=false;showToast('画面流中断（设备离线或已停止）','error');};
|
||||
}
|
||||
|
||||
function stopScreenView(){
|
||||
const img=document.getElementById('screen-img');
|
||||
if(img)img.src='';
|
||||
_screenViewOn=false;
|
||||
const loading=document.getElementById('screen-loading');
|
||||
if(loading)loading.style.display='none';
|
||||
const st=document.getElementById('screen-status');
|
||||
if(st)st.textContent='';
|
||||
}
|
||||
|
||||
// 显示尺寸 -> 设备原生分辨率（img.naturalWidth/Height 即设备分辨率）
|
||||
function _screenCoords(ev){
|
||||
const img=document.getElementById('screen-img');
|
||||
if(!img.naturalWidth)return [null,null];
|
||||
const r=img.getBoundingClientRect();
|
||||
return [
|
||||
Math.round((ev.clientX-r.left)/r.width*img.naturalWidth),
|
||||
Math.round((ev.clientY-r.top)/r.height*img.naturalHeight),
|
||||
];
|
||||
}
|
||||
|
||||
function _screenTap(x,y){
|
||||
const serial=_screenSerial();
|
||||
if(!serial||x==null||y==null)return;
|
||||
apiPost('/api/screen/tap',{serial,x,y}).then(r=>{if(r&&!r.ok)showToast(r.error,'error');});
|
||||
}
|
||||
|
||||
function _screenSwipe(x1,y1,x2,y2){
|
||||
const serial=_screenSerial();
|
||||
if(!serial||x1==null)return;
|
||||
apiPost('/api/screen/swipe',{serial,x1,y1,x2,y2}).then(r=>{if(r&&!r.ok)showToast(r.error,'error');});
|
||||
}
|
||||
|
||||
function screenKey(key){
|
||||
const serial=_screenSerial();
|
||||
if(!serial){showToast('请先选择设备','error');return;}
|
||||
apiPost('/api/screen/key',{serial,key}).then(r=>{if(r&&!r.ok)showToast(r.error,'error');});
|
||||
}
|
||||
|
||||
function screenSendText(){
|
||||
const serial=_screenSerial();
|
||||
const inp=document.getElementById('screen-text');
|
||||
const text=(inp.value||'').trim();
|
||||
if(!serial){showToast('请先选择设备','error');return;}
|
||||
if(!text){showToast('请输入文字','error');return;}
|
||||
apiPost('/api/screen/text',{serial,text}).then(r=>{
|
||||
if(r&&!r.ok)showToast(r.error,'error');
|
||||
else inp.value='';
|
||||
});
|
||||
}
|
||||
|
||||
// 鼠标 + 触控：拖拽=滑动，点按=轻触
|
||||
(function(){
|
||||
const img=document.getElementById('screen-img');
|
||||
if(!img)return;
|
||||
let dragging=false, sx=0, sy=0;
|
||||
|
||||
function onDown(ev){
|
||||
if(!_screenViewOn)return;
|
||||
ev.preventDefault();
|
||||
dragging=true;
|
||||
const [x,y]=_screenCoords(ev);
|
||||
sx=x; sy=y;
|
||||
}
|
||||
function onUp(ev){
|
||||
if(!dragging)return;
|
||||
dragging=false;
|
||||
const [x,y]=_screenCoords(ev);
|
||||
if(x==null)return;
|
||||
if(Math.abs(x-sx)<8 && Math.abs(y-sy)<8){
|
||||
_screenTap(x,y); // 位移小 → 点击
|
||||
}else{
|
||||
_screenSwipe(sx,sy,x,y); // 有位移 → 滑动
|
||||
}
|
||||
}
|
||||
|
||||
img.addEventListener('mousedown',onDown);
|
||||
img.addEventListener('mousemove',ev=>{if(dragging)ev.preventDefault();});
|
||||
window.addEventListener('mouseup',onUp);
|
||||
img.addEventListener('touchstart',onDown,{passive:false});
|
||||
img.addEventListener('touchend',ev=>{
|
||||
if(!dragging)return;
|
||||
const t=ev.changedTouches[0];
|
||||
onUp({clientX:t.clientX,clientY:t.clientY,preventDefault(){}});
|
||||
},{passive:false});
|
||||
})();
|
||||
|
||||
// ================== Tab: 工具 - 设备池管理（本地 SQLite 清单） ==================
|
||||
async function loadDevPool(){
|
||||
const tb=document.getElementById('tb-devpool');
|
||||
@@ -406,9 +395,16 @@ async function loadDevPool(){
|
||||
tb.innerHTML='<tr><td colspan="7" class="empty">加载中...</td></tr>';
|
||||
const r=await apiGet('/api/devices/pool');
|
||||
if(!r||!r.ok){tb.innerHTML='<tr><td colspan="7" class="empty">加载失败</td></tr>';return;}
|
||||
const rows=r.devices||[];
|
||||
let rows=r.devices||[];
|
||||
// 在线优先排序；「只看在线」勾选时过滤掉离线（IP 换了/长期离线的旧条目不再碍眼）
|
||||
const onlyOnline=document.getElementById('devpool-filter-online')
|
||||
? document.getElementById('devpool-filter-online').checked : false;
|
||||
rows.sort((a,b)=>(b.online?1:0)-(a.online?1:0));
|
||||
if(onlyOnline)rows=rows.filter(x=>x.online);
|
||||
const onlineCnt=rows.filter(x=>x.online).length;
|
||||
status.textContent='共 '+rows.length+' 台，在线 '+onlineCnt+' 台';
|
||||
status.textContent=onlyOnline
|
||||
? '在线 '+rows.length+' 台（共 '+(r.devices||[]).length+' 台配置）'
|
||||
: '共 '+rows.length+' 台，在线 '+onlineCnt+' 台';
|
||||
tb.innerHTML=rows.map(d=>{
|
||||
const st= d.enabled
|
||||
? '<span class="label label-success">启用</span>'
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+22
-11
@@ -478,26 +478,37 @@ class GenericStepsWorker(BaseWorker):
|
||||
return found # 命中结果，"测试此步骤"用
|
||||
|
||||
def _exec_clipboard(self, d, params, depth=0):
|
||||
"""剪贴板注入：写入指定内容到剪贴板，可选立即粘贴到当前聚焦的输入框。
|
||||
"""剪贴板注入（ClipInject 通道，Android 10+ 可用），可选立即粘贴。
|
||||
|
||||
批量发链接场景：先聚焦评论区输入框 → 注入+粘贴链接1 → 换链接 → 注入+粘贴链接2……
|
||||
粘贴模式复用 u2 send_keys（内部 setClipboard + pasteClipboard，与"输入文字"同机制）。
|
||||
粘贴模式：ClipInject 写入剪贴板后调 atx-agent pasteClipboard 粘贴到当前
|
||||
焦点输入框；动作失败时兜底 u2 set_text 直接设置聚焦输入框文本（不依赖
|
||||
剪贴板，与"输入文字"兜底同机制）。
|
||||
"""
|
||||
text = str(params.get("text", "") or "")
|
||||
if not text:
|
||||
_log.warning(f"[{self.serial}] clipboard 内容为空，跳过")
|
||||
return False
|
||||
from core.clipboard_helper import inject_clipboard
|
||||
ok, msg = inject_clipboard(self.serial, text, d=d)
|
||||
if not ok:
|
||||
_log.warning(f"[{self.serial}] 剪贴板注入失败: {msg}")
|
||||
return False
|
||||
_log.info(f"[{self.serial}] 剪贴板注入: {text[:60]}（{msg}）")
|
||||
if not params.get("paste"):
|
||||
return True
|
||||
try:
|
||||
if params.get("paste"):
|
||||
d.send_keys(text) # setClipboard + pasteClipboard
|
||||
_log.info(f"[{self.serial}] 剪贴板注入并粘贴: {text[:60]}")
|
||||
else:
|
||||
d.set_clipboard(text)
|
||||
_log.info(f"[{self.serial}] 剪贴板注入(不粘贴): {text[:60]}")
|
||||
d.jsonrpc.pasteClipboard()
|
||||
_log.info(f"[{self.serial}] 已粘贴: {text[:60]}")
|
||||
return True
|
||||
except Exception as e:
|
||||
_log.warning(f"[{self.serial}] 剪贴板注入异常: {e}")
|
||||
return False
|
||||
try:
|
||||
d(focused=True).set_text(text)
|
||||
_log.info(f"[{self.serial}] 粘贴兜底 set_text: {text[:60]}")
|
||||
return True
|
||||
except Exception as e2:
|
||||
_log.warning(f"[{self.serial}] 粘贴失败: {e} / {e2}")
|
||||
return True # 剪贴板已写入，粘贴失败不致命
|
||||
|
||||
def _exec_wait(self, d, params, depth=0):
|
||||
min_s = float(params.get("min", 1.0))
|
||||
@@ -645,7 +656,7 @@ def test_step(serial, step):
|
||||
if d is None:
|
||||
return False, "u2 连接超时", None
|
||||
try:
|
||||
w = GenericStepsWorker(None, serial, {})
|
||||
w = GenericStepsWorker(serial, {})
|
||||
result = w._exec_one(d, step)
|
||||
return True, f"步骤已执行（{step.get('label') or step.get('type')}）", result
|
||||
except Exception as e:
|
||||
|
||||
+252
-232
@@ -5,210 +5,246 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>设备自动化后台</title>
|
||||
<style>
|
||||
/* ========== 仪表控制台主题（Instrument Console） ==========
|
||||
自托管字体：Bricolage Grotesque（展示/数字）+ IBM Plex Mono（数据/串号）
|
||||
配色：暖纸底 + 墨色文字 + 深青主色；状态色 = 绿/红/琥珀/靛 */
|
||||
@font-face{font-family:'Bricolage Grotesque';font-style:normal;font-weight:500;font-display:swap;src:url('/static/fonts/bricolage-500.woff2') format('woff2')}
|
||||
@font-face{font-family:'Bricolage Grotesque';font-style:normal;font-weight:700;font-display:swap;src:url('/static/fonts/bricolage-700.woff2') format('woff2')}
|
||||
@font-face{font-family:'Bricolage Grotesque';font-style:normal;font-weight:800;font-display:swap;src:url('/static/fonts/bricolage-800.woff2') format('woff2')}
|
||||
@font-face{font-family:'IBM Plex Mono';font-style:normal;font-weight:400;font-display:swap;src:url('/static/fonts/plexmono-400.woff2') format('woff2')}
|
||||
@font-face{font-family:'IBM Plex Mono';font-style:normal;font-weight:500;font-display:swap;src:url('/static/fonts/plexmono-500.woff2') format('woff2')}
|
||||
@font-face{font-family:'IBM Plex Mono';font-style:normal;font-weight:600;font-display:swap;src:url('/static/fonts/plexmono-600.woff2') format('woff2')}
|
||||
|
||||
:root{
|
||||
--primary:#3b82f6; --primary-dark:#2563eb; --success:#10b981; --danger:#ef4444;
|
||||
--warning:#f59e0b; --bg:#f8fafc; --card:#ffffff; --border:#e2e8f0;
|
||||
--text:#1e293b; --text-muted:#64748b; --text-light:#94a3b8;
|
||||
--primary:#0f766e; --primary-dark:#115e59; --primary-soft:#e6f4f1;
|
||||
--success:#16a34a; --success-soft:#e8f7ee;
|
||||
--danger:#dc2626; --danger-soft:#fdecec;
|
||||
--warning:#d97706; --warning-soft:#fdf3e3;
|
||||
--info:#4f46e5; --info-soft:#ecebfb;
|
||||
--bg:#f5f4ef; --card:#ffffff; --border:#e6e3da; --border-strong:#d8d4c8;
|
||||
--text:#1b1e24; --text-muted:#69707c; --text-light:#9aa1ab;
|
||||
--ink:#14161a; --ink-2:#1e2127; --ink-line:#2a2e37;
|
||||
--display:'Bricolage Grotesque','PingFang SC','Microsoft YaHei',sans-serif;
|
||||
--mono:'IBM Plex Mono','SF Mono',Menlo,Consolas,monospace;
|
||||
--body:-apple-system,'PingFang SC','Microsoft YaHei','Segoe UI',sans-serif;
|
||||
--shadow-sm:0 1px 2px rgba(27,30,36,.05),0 1px 3px rgba(27,30,36,.06);
|
||||
--shadow-md:0 4px 14px rgba(27,30,36,.08),0 2px 4px rgba(27,30,36,.05);
|
||||
--shadow-lg:0 20px 50px rgba(20,22,26,.18);
|
||||
--radius:10px;
|
||||
}
|
||||
*{box-sizing:border-box;margin:0;padding:0}
|
||||
body{background:var(--bg);font-family:-apple-system,"Segoe UI",Roboto,"PingFang SC","Microsoft YaHei",sans-serif;color:var(--text);font-size:14px}
|
||||
html{-webkit-font-smoothing:antialiased}
|
||||
body{background:var(--bg);font-family:var(--body);color:var(--text);font-size:14px;line-height:1.5}
|
||||
::-webkit-scrollbar{width:9px;height:9px}
|
||||
::-webkit-scrollbar-thumb{background:#c9c5b9;border-radius:5px;border:2px solid var(--bg)}
|
||||
::-webkit-scrollbar-thumb:hover{background:#b0ab9d}
|
||||
::-webkit-scrollbar-track{background:transparent}
|
||||
|
||||
/* 顶部导航 */
|
||||
.navbar{background:linear-gradient(135deg,#1e293b 0%,#334155 100%);padding:0 28px;display:flex;align-items:center;height:56px;box-shadow:0 2px 8px rgba(0,0,0,.15)}
|
||||
.navbar .brand{color:#fff;font-weight:700;font-size:16px;margin-right:32px;white-space:nowrap}
|
||||
.navbar .tabs{display:flex;gap:4px;flex:1}
|
||||
.navbar .tab{padding:8px 18px;color:#cbd5e1;font-size:14px;font-weight:500;cursor:pointer;border-radius:8px;transition:all .15s;border:none;background:none}
|
||||
.navbar .tab:hover{color:#fff;background:rgba(255,255,255,.08)}
|
||||
.navbar .tab.active{background:rgba(59,130,246,.25);color:#fff}
|
||||
.navbar .user-info{color:#94a3b8;font-size:13px;display:flex;align-items:center;gap:12px}
|
||||
.navbar .user-info a{color:#cbd5e1;text-decoration:none;font-size:13px}
|
||||
/* 顶部导航：墨色 + 顶部青线 + 品牌脉冲点 */
|
||||
.navbar{background:linear-gradient(180deg,#1a1d23 0%,#14161a 100%);border-top:3px solid var(--primary);padding:0 28px;display:flex;align-items:center;height:58px;box-shadow:0 2px 10px rgba(0,0,0,.2);position:sticky;top:0;z-index:500}
|
||||
.navbar .brand{color:#f3f4f6;font-family:var(--display);font-weight:700;font-size:16px;letter-spacing:.3px;margin-right:34px;white-space:nowrap;display:flex;align-items:center;gap:9px}
|
||||
.brand-dot{width:9px;height:9px;border-radius:50%;background:var(--primary);box-shadow:0 0 0 0 rgba(15,118,110,.6);animation:brandPulse 2.4s infinite}
|
||||
@keyframes brandPulse{0%{box-shadow:0 0 0 0 rgba(15,118,110,.45)}70%{box-shadow:0 0 0 8px rgba(15,118,110,0)}100%{box-shadow:0 0 0 0 rgba(15,118,110,0)}}
|
||||
.navbar .tabs{display:flex;gap:2px;flex:1;align-self:stretch}
|
||||
.navbar .tab{position:relative;padding:0 18px;color:#9aa3af;font-size:14px;font-weight:500;cursor:pointer;border:none;background:none;transition:color .15s;letter-spacing:.2px}
|
||||
.navbar .tab::after{content:"";position:absolute;left:14px;right:14px;bottom:0;height:2px;border-radius:2px;background:var(--primary);transform:scaleX(0);transition:transform .18s}
|
||||
.navbar .tab:hover{color:#e5e7eb}
|
||||
.navbar .tab.active{color:#fff}
|
||||
.navbar .tab.active::after{transform:scaleX(1)}
|
||||
.navbar .user-info{color:#8a93a0;font-size:13px;display:flex;align-items:center;gap:14px}
|
||||
.navbar .user-info a{color:#c2c9d3;text-decoration:none;font-size:13px;transition:color .15s}
|
||||
.navbar .user-info a:hover{color:#fff}
|
||||
|
||||
/* 内容区 */
|
||||
.content{max-width:1600px;margin:0 auto;padding:24px 28px}
|
||||
.content{max-width:1600px;margin:0 auto;padding:26px 30px 60px}
|
||||
.tab-panel{display:none}
|
||||
.tab-panel.active{display:block}
|
||||
.page-title{font-size:20px;font-weight:700;color:var(--text);margin:0 0 4px}
|
||||
.page-sub{font-size:13px;color:var(--text-light);margin-bottom:20px}
|
||||
.tab-panel.active{display:block;animation:panelIn .22s ease-out}
|
||||
@keyframes panelIn{from{opacity:0;transform:translateY(6px)}to{opacity:1;transform:none}}
|
||||
.page-title{font-family:var(--display);font-size:21px;font-weight:800;letter-spacing:.2px;color:var(--text);margin:0 0 4px}
|
||||
.page-sub{font-size:13px;color:var(--text-light);margin-bottom:22px}
|
||||
|
||||
/* 统计卡片 */
|
||||
.stats-row{display:grid;grid-template-columns:repeat(auto-fit,minmax(130px,1fr));gap:14px;margin-bottom:24px}
|
||||
.stat-card{background:var(--card);border-radius:12px;padding:14px 16px;box-shadow:0 1px 3px rgba(0,0,0,.06);border:1px solid var(--border);position:relative;overflow:hidden}
|
||||
.stat-card::before{content:"";position:absolute;left:0;top:0;bottom:0;width:4px;background:var(--accent,#3b82f6)}
|
||||
.stat-card .stat-num{font-size:24px;font-weight:700;line-height:1;margin-bottom:4px;color:var(--accent,#3b82f6)}
|
||||
.stat-card .stat-lbl{font-size:12px;color:var(--text-muted);font-weight:500}
|
||||
/* 统计卡片：左侧色条 + 等宽数字 */
|
||||
.stats-row{display:grid;grid-template-columns:repeat(auto-fit,minmax(140px,1fr));gap:14px;margin-bottom:26px}
|
||||
.stat-card{background:var(--card);border-radius:var(--radius);padding:15px 18px;box-shadow:var(--shadow-sm);border:1px solid var(--border);position:relative;overflow:hidden;transition:transform .15s,box-shadow .15s}
|
||||
.stat-card:hover{transform:translateY(-2px);box-shadow:var(--shadow-md)}
|
||||
.stat-card::before{content:"";position:absolute;left:0;top:0;bottom:0;width:4px;background:var(--accent,#0f766e);border-radius:0 3px 3px 0}
|
||||
.stat-card .stat-num{font-family:var(--mono);font-size:25px;font-weight:600;line-height:1.1;margin-bottom:5px;color:var(--accent,#0f766e);font-variant-numeric:tabular-nums}
|
||||
.stat-card .stat-lbl{font-size:12px;color:var(--text-muted);font-weight:500;letter-spacing:.2px}
|
||||
|
||||
/* 工具栏 */
|
||||
.toolbar{display:flex;gap:10px;margin-bottom:16px;align-items:center;flex-wrap:wrap}
|
||||
.toolbar .hint{color:var(--text-light);font-size:12px;margin-left:auto}
|
||||
|
||||
/* 按钮 */
|
||||
.btn{border-radius:8px;font-weight:500;border:1px solid var(--border);padding:7px 16px;font-size:13px;transition:all .15s;cursor:pointer;background:var(--card);color:var(--text)}
|
||||
.btn:hover{background:#f1f5f9;border-color:#cbd5e1}
|
||||
.btn-primary{background:var(--primary);border-color:var(--primary);color:#fff}
|
||||
.btn-primary:hover{background:var(--primary-dark)}
|
||||
.btn-danger{background:var(--danger);border-color:var(--danger);color:#fff}
|
||||
.btn-danger:hover{background:#dc2626}
|
||||
.btn{border-radius:8px;font-weight:500;border:1px solid var(--border-strong);padding:7px 16px;font-size:13px;transition:all .15s;cursor:pointer;background:var(--card);color:var(--text);box-shadow:var(--shadow-sm)}
|
||||
.btn:hover{background:#faf9f5;border-color:#c4bfb2;transform:translateY(-1px)}
|
||||
.btn:active{transform:none}
|
||||
.btn:disabled{opacity:.5;cursor:not-allowed;transform:none}
|
||||
.btn-primary{background:var(--primary);border-color:var(--primary);color:#fff;box-shadow:0 1px 4px rgba(15,118,110,.35)}
|
||||
.btn-primary:hover{background:var(--primary-dark);border-color:var(--primary-dark)}
|
||||
.btn-danger{background:var(--danger);border-color:var(--danger);color:#fff;box-shadow:0 1px 4px rgba(220,38,38,.3)}
|
||||
.btn-danger:hover{background:#b91c1c;border-color:#b91c1c}
|
||||
.btn-success{background:var(--success);border-color:var(--success);color:#fff}
|
||||
.btn-success:hover{background:#059669}
|
||||
.btn-success:hover{background:#15803d;border-color:#15803d}
|
||||
.btn-sm{padding:4px 12px;font-size:12px}
|
||||
.btn-xs{padding:3px 10px;font-size:12px}
|
||||
.btn-xs{padding:3px 10px;font-size:12px;border-radius:6px}
|
||||
|
||||
/* 表单 */
|
||||
.form-control{background:#fff;border:1px solid var(--border-strong);border-radius:8px;padding:7px 12px;font-size:13px;color:var(--text);transition:border-color .15s,box-shadow .15s;outline:none;font-family:var(--body)}
|
||||
.form-control:focus{border-color:var(--primary);box-shadow:0 0 0 3px rgba(15,118,110,.12)}
|
||||
.form-control::placeholder{color:var(--text-light)}
|
||||
.form-group{margin-bottom:12px}
|
||||
.form-group label{display:block;font-size:12px;font-weight:600;color:var(--text-muted);margin-bottom:5px}
|
||||
.form-row{display:grid;grid-template-columns:1fr 1fr;gap:12px}
|
||||
.form-check{display:flex;align-items:center;gap:7px;cursor:pointer;font-size:13px}
|
||||
.form-check input{width:15px;height:15px;accent-color:var(--primary);cursor:pointer}
|
||||
|
||||
/* 通用列表分页栏 */
|
||||
.list-pager{display:flex;align-items:center;gap:6px;flex-wrap:wrap;margin:8px 0 20px}
|
||||
.list-pager{display:flex;align-items:center;gap:6px;flex-wrap:wrap;margin:10px 0 22px}
|
||||
.list-pager .lp-total{font-size:12px;color:var(--text-light);margin-right:auto}
|
||||
.list-search{width:240px}
|
||||
.adb-console{background:#0f172a;color:#e2e8f0;font-family:monospace;font-size:12px;padding:12px;border-radius:8px;min-height:200px;max-height:420px;overflow:auto;white-space:pre-wrap;word-break:break-all}
|
||||
|
||||
/* 控制台/日志（墨色终端） */
|
||||
.adb-console{background:var(--ink);color:#d5dae1;font-family:var(--mono);font-size:12.5px;padding:14px;border-radius:10px;min-height:200px;max-height:420px;overflow:auto;white-space:pre-wrap;word-break:break-all;box-shadow:inset 0 1px 6px rgba(0,0,0,.4);border:1px solid var(--ink-line)}
|
||||
.log-content{background:var(--ink);color:#d5dae1;border-radius:10px;padding:16px;font-family:var(--mono);font-size:12.5px;line-height:1.65;max-height:600px;overflow-y:auto;white-space:pre-wrap;word-break:break-all;border:1px solid var(--ink-line);box-shadow:inset 0 1px 6px rgba(0,0,0,.4)}
|
||||
.log-content .log-err{color:#f87171}
|
||||
.log-content .log-warn{color:#fbbf24}
|
||||
.log-content .log-info{color:#67e8f9}
|
||||
.log-toolbar{display:flex;gap:10px;margin-bottom:12px;align-items:center}
|
||||
|
||||
/* 区块标题 */
|
||||
.section-title{font-size:15px;font-weight:600;color:var(--text);margin:0 0 12px;padding-bottom:8px;border-bottom:2px solid var(--primary);display:inline-block}
|
||||
.section-title{font-family:var(--display);font-size:15px;font-weight:700;color:var(--text);margin:0 0 12px;padding-bottom:8px;border-bottom:2px solid var(--primary);display:inline-block;letter-spacing:.2px}
|
||||
|
||||
/* 页内子分栏（维护页用） */
|
||||
.sub-tabs{display:flex;gap:4px;margin-bottom:16px;border-bottom:2px solid var(--border)}
|
||||
.sub-tab{padding:9px 16px;font-size:13px;font-weight:600;color:var(--text-muted);background:none;border:none;cursor:pointer;border-radius:8px 8px 0 0;transition:all .15s;position:relative}
|
||||
.sub-tab:hover{color:var(--text);background:#f1f5f9}
|
||||
.sub-tab.active{color:var(--primary);background:#eff6ff}
|
||||
.sub-tab.active::after{content:"";position:absolute;left:10px;right:10px;bottom:-2px;height:2px;background:var(--primary);border-radius:1px}
|
||||
/* 页内子分栏 */
|
||||
.sub-tabs{display:flex;gap:2px;margin-bottom:18px;border-bottom:1px solid var(--border-strong)}
|
||||
.sub-tab{padding:10px 16px;font-size:13px;font-weight:600;color:var(--text-muted);background:none;border:none;cursor:pointer;border-radius:8px 8px 0 0;transition:all .15s;position:relative}
|
||||
.sub-tab:hover{color:var(--text);background:#efede6}
|
||||
.sub-tab.active{color:var(--primary)}
|
||||
.sub-tab.active::after{content:"";position:absolute;left:10px;right:10px;bottom:-1px;height:2px;background:var(--primary);border-radius:2px}
|
||||
.sub-panel{display:none}
|
||||
.sub-panel.active{display:block}
|
||||
.sub-panel.active{display:block;animation:panelIn .2s ease-out}
|
||||
|
||||
/* 表格 */
|
||||
.table{background:var(--card);border-radius:12px;overflow:hidden;box-shadow:0 1px 3px rgba(0,0,0,.06);border:1px solid var(--border);width:100%;border-collapse:collapse;margin-bottom:24px}
|
||||
.table thead th{background:#f1f5f9;border-bottom:2px solid var(--border);font-weight:600;color:var(--text-muted);font-size:12px;letter-spacing:.3px;padding:12px 14px;text-align:left}
|
||||
.table tbody td{padding:10px 14px;border-bottom:1px solid var(--border);vertical-align:middle;font-size:13px}
|
||||
.table{background:var(--card);border-radius:var(--radius);overflow:hidden;box-shadow:var(--shadow-sm);border:1px solid var(--border);width:100%;border-collapse:collapse;margin-bottom:26px}
|
||||
.table thead th{background:#faf9f5;border-bottom:1px solid var(--border-strong);font-weight:600;color:var(--text-muted);font-size:12px;letter-spacing:.4px;padding:12px 14px;text-align:left;white-space:nowrap}
|
||||
.table tbody td{padding:11px 14px;border-bottom:1px solid var(--border);vertical-align:middle;font-size:13px}
|
||||
.table tbody tr:last-child td{border-bottom:none}
|
||||
.table tbody tr:hover td{background:#f8fafc}
|
||||
.table tbody tr{transition:background .1s}
|
||||
.table tbody tr:hover td{background:#faf9f4}
|
||||
.table thead th.sortable{cursor:pointer;user-select:none}
|
||||
.table thead th.sortable:hover{background:#f3f1e9}
|
||||
.table thead th.sortable::after{content:" ⇅";color:#c6c1b4;font-weight:400;font-size:11px}
|
||||
.table thead th.sortable.sort-asc::after{content:" ↑";color:var(--primary);font-weight:700}
|
||||
.table thead th.sortable.sort-desc::after{content:" ↓";color:var(--primary);font-weight:700}
|
||||
.table tbody tr.row-checked td{background:var(--primary-soft)}
|
||||
.table .col-cb{width:38px;text-align:center}
|
||||
.table .col-cb input,.form-check input[type=checkbox],.device-list input{width:15px;height:15px;accent-color:var(--primary);cursor:pointer}
|
||||
|
||||
/* 徽章 */
|
||||
.label{padding:3px 10px;border-radius:6px;font-size:11px;font-weight:600;display:inline-block}
|
||||
.label-success{background:#dcfce7;color:#166534}
|
||||
.label-default{background:#f1f5f9;color:#64748b}
|
||||
.label-warning{background:#fef3c7;color:#92400e}
|
||||
.label-primary{background:#dbeafe;color:#1e40af}
|
||||
.label-info{background:#e0e7ff;color:#3730a3}
|
||||
.label-danger{background:#fee2e2;color:#991b1b}
|
||||
/* 徽章（柔和底 + 深色字） */
|
||||
.label{padding:3px 10px;border-radius:999px;font-size:11px;font-weight:600;display:inline-block;line-height:1.5;letter-spacing:.2px}
|
||||
.label-success{background:var(--success-soft);color:#15803d}
|
||||
.label-default{background:#f1efe8;color:var(--text-muted)}
|
||||
.label-warning{background:var(--warning-soft);color:#b45309}
|
||||
.label-primary{background:var(--primary-soft);color:#0f766e}
|
||||
.label-info{background:var(--info-soft);color:#4338ca}
|
||||
.label-danger{background:var(--danger-soft);color:#b91c1c}
|
||||
|
||||
/* 进度条 */
|
||||
.progress{background:#e2e8f0;border-radius:4px;height:6px;overflow:hidden;display:inline-block;vertical-align:middle;width:70px}
|
||||
.progress-bar{background:var(--primary);height:100%;border-radius:4px;transition:width .3s}
|
||||
.progress{background:#e9e6dd;border-radius:99px;height:6px;overflow:hidden;display:inline-block;vertical-align:middle;width:70px}
|
||||
.progress-bar{background:var(--primary);height:100%;border-radius:99px;transition:width .3s}
|
||||
|
||||
/* 圆点 */
|
||||
.dot{display:inline-block;width:8px;height:8px;border-radius:50%;margin-right:4px}
|
||||
.dot-on{background:var(--success);box-shadow:0 0 6px rgba(16,185,129,.5)}
|
||||
.dot-off{background:var(--danger);opacity:.5}
|
||||
.dot{display:inline-block;width:8px;height:8px;border-radius:50%;margin-right:5px}
|
||||
.dot-on{background:var(--success);box-shadow:0 0 6px rgba(22,163,74,.55)}
|
||||
.dot-off{background:var(--danger);opacity:.55}
|
||||
|
||||
/* 任务卡片 */
|
||||
.jobs-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(340px,1fr));gap:14px}
|
||||
.job-card{background:var(--card);border:1px solid var(--border);border-radius:12px;padding:14px;box-shadow:0 1px 3px rgba(0,0,0,.06);transition:all .15s}
|
||||
.job-card:hover{box-shadow:0 4px 12px rgba(0,0,0,.08);transform:translateY(-2px)}
|
||||
.job-card.running{border-color:var(--success);box-shadow:0 0 0 1px var(--success)}
|
||||
.job-card .job-head{display:flex;justify-content:space-between;align-items:flex-start;margin-bottom:8px}
|
||||
.jobs-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(350px,1fr));gap:14px}
|
||||
.job-card{background:var(--card);border:1px solid var(--border);border-radius:var(--radius);padding:15px 16px;box-shadow:var(--shadow-sm);transition:all .18s;position:relative}
|
||||
.job-card:hover{box-shadow:var(--shadow-md);transform:translateY(-2px)}
|
||||
.job-card.running{border-color:rgba(22,163,74,.55);box-shadow:0 0 0 1px rgba(22,163,74,.35),var(--shadow-sm)}
|
||||
.job-card .job-head{display:flex;justify-content:space-between;align-items:flex-start;margin-bottom:9px}
|
||||
.job-card .job-name{font-size:14px;font-weight:600;color:var(--text)}
|
||||
.job-card .job-type{font-size:11px;color:var(--text-light);background:#f1f5f9;padding:2px 8px;border-radius:4px;margin-top:2px;display:inline-block}
|
||||
.job-card .job-body{font-size:12px;color:var(--text-muted);margin-bottom:10px;line-height:1.6}
|
||||
.job-card .job-body .kv{display:inline-block;background:#f8fafc;border:1px solid var(--border);border-radius:4px;padding:1px 6px;margin:2px 2px 0 0}
|
||||
.job-card .job-type{font-size:11px;color:var(--text-muted);background:#f1efe8;padding:2px 8px;border-radius:99px;margin-top:3px;display:inline-block;font-weight:500}
|
||||
.job-card .job-body{font-size:12px;color:var(--text-muted);margin-bottom:11px;line-height:1.65}
|
||||
.job-card .job-body .kv{display:inline-block;background:#faf9f5;border:1px solid var(--border);border-radius:6px;padding:1px 7px;margin:2px 3px 0 0;font-family:var(--mono);font-size:11px}
|
||||
.job-card .job-actions{display:flex;gap:6px;flex-wrap:wrap}
|
||||
|
||||
/* 空状态 */
|
||||
.empty{text-align:center;padding:40px;color:var(--text-light)}
|
||||
/* 空状态 / 辅助文本 */
|
||||
.empty{text-align:center;padding:42px;color:var(--text-light);font-size:13px}
|
||||
.text-muted{color:var(--text-light)!important}
|
||||
.err-text{color:var(--danger);font-size:12px;max-width:200px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
|
||||
.pulse{animation:pulse 2s infinite}
|
||||
@keyframes pulse{0%,100%{opacity:1}50%{opacity:.5}}
|
||||
@keyframes pulse{0%,100%{opacity:1}50%{opacity:.45}}
|
||||
.help{font-size:12px;color:var(--text-light);line-height:1.7;background:#faf9f4;border:1px dashed var(--border-strong);border-radius:8px;padding:10px 12px;margin:10px 0}
|
||||
.help code{font-family:var(--mono);background:#f1efe8;padding:1px 5px;border-radius:4px;font-size:11px;color:var(--primary-dark)}
|
||||
|
||||
/* 模态框 */
|
||||
.modal-overlay{display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,.4);z-index:1000;justify-content:center;align-items:flex-start;padding:40px 20px;overflow-y:auto}
|
||||
.modal-overlay{display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(20,22,26,.5);backdrop-filter:blur(2px);z-index:1000;justify-content:center;align-items:flex-start;padding:40px 20px;overflow-y:auto}
|
||||
.modal-overlay.show{display:flex}
|
||||
.modal{background:var(--card);border-radius:14px;box-shadow:0 20px 60px rgba(0,0,0,.2);width:100%;max-width:640px;margin-bottom:40px}
|
||||
.modal{background:var(--card);border-radius:14px;box-shadow:var(--shadow-lg);width:100%;max-width:640px;margin-bottom:40px;border:1px solid var(--border);animation:modalIn .18s ease-out}
|
||||
@keyframes modalIn{from{opacity:0;transform:translateY(10px) scale(.985)}to{opacity:1;transform:none}}
|
||||
.modal-header{padding:18px 24px;border-bottom:1px solid var(--border);display:flex;justify-content:space-between;align-items:center}
|
||||
.modal-header h3{font-size:17px;font-weight:700;color:var(--text)}
|
||||
.modal-header .close{background:none;border:none;font-size:22px;color:var(--text-light);cursor:pointer;padding:0;width:28px;height:28px;line-height:1}
|
||||
.modal-header .close:hover{color:var(--text)}
|
||||
.modal-body{padding:24px;max-height:60vh;overflow-y:auto}
|
||||
.modal-footer{padding:16px 24px;border-top:1px solid var(--border);display:flex;justify-content:flex-end;gap:10px}
|
||||
|
||||
/* 表单 */
|
||||
.form-group{margin-bottom:16px}
|
||||
.form-group label{display:block;font-size:13px;font-weight:600;color:var(--text);margin-bottom:6px}
|
||||
.form-group .help{font-size:12px;color:var(--text-light);margin-top:4px}
|
||||
.form-control{width:100%;padding:8px 12px;border:1px solid var(--border);border-radius:8px;font-size:13px;font-family:inherit;background:#fff;color:var(--text);transition:all .15s}
|
||||
.form-control:focus{outline:none;border-color:var(--primary);box-shadow:0 0 0 3px rgba(59,130,246,.1)}
|
||||
textarea.form-control{font-family:monospace;resize:vertical;min-height:100px}
|
||||
select.form-control{cursor:pointer}
|
||||
.form-row{display:grid;grid-template-columns:1fr 1fr;gap:16px}
|
||||
.form-check{display:flex;align-items:center;gap:8px}
|
||||
.form-check input{width:16px;height:16px;cursor:pointer}
|
||||
.form-check label{margin:0;cursor:pointer}
|
||||
|
||||
/* 设备多选列表 */
|
||||
.device-list{max-height:200px;overflow-y:auto;border:1px solid var(--border);border-radius:8px;padding:8px}
|
||||
.device-list label{display:flex;align-items:center;gap:6px;padding:4px 8px;font-size:13px;font-weight:400;cursor:pointer;border-radius:4px}
|
||||
.device-list label:hover{background:#f1f5f9}
|
||||
.device-list input{width:14px;height:14px}
|
||||
|
||||
/* 日志 */
|
||||
.log-toolbar{display:flex;gap:10px;margin-bottom:12px;align-items:center}
|
||||
.log-content{background:#1e293b;color:#e2e8f0;border-radius:10px;padding:16px;font-family:"Cascadia Code",Consolas,monospace;font-size:12px;line-height:1.6;max-height:600px;overflow-y:auto;white-space:pre-wrap;word-break:break-all}
|
||||
.log-content .log-err{color:#fca5a5}
|
||||
.log-content .log-warn{color:#fcd34d}
|
||||
.log-content .log-info{color:#93c5fd}
|
||||
|
||||
/* Toast */
|
||||
.toast{position:fixed;top:20px;right:20px;z-index:2000;padding:12px 20px;border-radius:8px;font-size:14px;font-weight:500;box-shadow:0 4px 12px rgba(0,0,0,.15);display:none;max-width:400px}
|
||||
.toast.show{display:block}
|
||||
.toast-success{background:#dcfce7;color:#166534;border:1px solid #86efac}
|
||||
.toast-error{background:#fee2e2;color:#991b1b;border:1px solid #fca5a5}
|
||||
|
||||
/* 截图弹窗 */
|
||||
.modal-header h3{font-size:17px;font-weight:700;color:var(--text);font-family:var(--display)}
|
||||
.modal-header .btn{background:none;border:none;font-size:20px;color:var(--text-light);padding:0 6px;box-shadow:none}
|
||||
.modal-header .btn:hover{color:var(--text)}
|
||||
.modal-body{padding:20px 24px}
|
||||
.modal-footer{padding:14px 24px;border-top:1px solid var(--border);display:flex;justify-content:flex-end;gap:8px}
|
||||
.shot-modal{max-width:none;width:min(440px,95vw)}
|
||||
/* 宽弹窗（任务编辑器：步骤编辑需要横向空间） */
|
||||
.wide-modal{max-width:1000px}
|
||||
.shot-modal .modal-body{text-align:center;padding:14px}
|
||||
.shot-img{max-width:100%;max-height:calc(100vh - 240px);width:auto;height:auto;border-radius:8px;box-shadow:0 2px 8px rgba(0,0,0,.15);background:#1e293b;min-height:200px;display:block;margin:0 auto}
|
||||
.shot-img{max-width:100%;max-height:calc(100vh - 240px);width:auto;height:auto;border-radius:8px;box-shadow:0 2px 10px rgba(0,0,0,.2);background:var(--ink);min-height:200px;display:block;margin:0 auto}
|
||||
.shot-loading{color:var(--text-light);padding:60px 0;font-size:13px}
|
||||
.shot-err{color:var(--danger);padding:40px 0;font-size:13px;white-space:pre-wrap;word-break:break-all}
|
||||
.shot-info{font-size:12px;color:var(--text-muted);margin-top:10px}
|
||||
.shot-toolbar{display:flex;gap:8px;justify-content:center;align-items:center;margin-top:12px;flex-wrap:wrap}
|
||||
.shot-toolbar .auto-label{font-size:12px;color:var(--text-muted);display:flex;align-items:center;gap:4px}
|
||||
.shot-toolbar .auto-label input{width:14px;height:14px}
|
||||
|
||||
/* 表头排序 */
|
||||
.table thead th.sortable{cursor:pointer;user-select:none;white-space:nowrap}
|
||||
.table thead th.sortable:hover{background:#e2e8f0}
|
||||
.table thead th.sortable::after{content:" ⇅";color:#cbd5e1;font-weight:400;font-size:11px}
|
||||
.table thead th.sortable.sort-asc::after{content:" ↑";color:var(--primary);font-weight:700}
|
||||
.table thead th.sortable.sort-desc::after{content:" ↓";color:var(--primary);font-weight:700}
|
||||
.table tbody tr.row-checked td{background:#eff6ff}
|
||||
.table .col-cb{width:36px;text-align:center}
|
||||
.table .col-cb input{width:14px;height:14px;cursor:pointer;vertical-align:middle}
|
||||
/* Toast */
|
||||
.toast{position:fixed;top:20px;right:20px;z-index:2000;padding:12px 20px;border-radius:10px;font-size:14px;font-weight:500;box-shadow:var(--shadow-lg);display:none;max-width:400px;border-left:4px solid;animation:toastIn .18s ease-out}
|
||||
.toast.show{display:block}
|
||||
@keyframes toastIn{from{opacity:0;transform:translateX(14px)}to{opacity:1;transform:none}}
|
||||
.toast-success{background:#f0faf4;color:#166534;border-color:var(--success)}
|
||||
.toast-error{background:#fef2f2;color:#991b1b;border-color:var(--danger)}
|
||||
|
||||
/* 设备多选列表 */
|
||||
.device-list{max-height:200px;overflow-y:auto;border:1px solid var(--border-strong);border-radius:8px;padding:8px;background:#fff}
|
||||
.device-list label{display:flex;align-items:center;gap:6px;padding:4px 8px;font-size:13px;font-weight:400;cursor:pointer;border-radius:6px}
|
||||
.device-list label:hover{background:#f5f3ec}
|
||||
|
||||
/* 步骤编辑器 */
|
||||
.step-editor{display:none;border:1px solid var(--border);border-radius:10px;overflow:hidden;margin-top:8px}
|
||||
.step-editor{display:none;border:1px solid var(--border);border-radius:12px;overflow:hidden;margin-top:8px;background:#fff;box-shadow:var(--shadow-sm)}
|
||||
.step-editor.show{display:block}
|
||||
.step-editor .se-head{background:#f1f5f9;padding:10px 14px;font-weight:600;font-size:13px;display:flex;justify-content:space-between;align-items:center}
|
||||
.step-editor .se-head{background:#faf9f5;padding:10px 14px;font-weight:600;font-size:13px;display:flex;justify-content:space-between;align-items:center;border-bottom:1px solid var(--border)}
|
||||
.step-editor .se-body{display:grid;grid-template-columns:200px 1fr;min-height:280px}
|
||||
.step-editor .se-lib{border-right:1px solid var(--border);padding:8px;background:#f8fafc;overflow-y:auto;max-height:520px}
|
||||
.step-editor .se-lib .lib-title{font-size:11px;color:var(--text-light);font-weight:600;margin-bottom:6px;text-transform:uppercase;letter-spacing:.5px}
|
||||
.step-editor .se-lib{border-right:1px solid var(--border);padding:8px;background:#faf9f4;overflow-y:auto;max-height:520px}
|
||||
.step-editor .se-lib .lib-title{font-size:11px;color:var(--text-light);font-weight:600;margin-bottom:6px;text-transform:uppercase;letter-spacing:.6px}
|
||||
.step-editor .se-lib .lib-item{padding:6px 8px;border-radius:6px;cursor:grab;font-size:12px;color:var(--text);display:flex;align-items:center;gap:6px;margin-bottom:2px;transition:background .1s;white-space:nowrap;overflow:hidden}
|
||||
.step-editor .se-lib .lib-item span:last-child{overflow:hidden;text-overflow:ellipsis}
|
||||
.step-editor .se-lib .lib-item:hover{background:#e2e8f0}
|
||||
.step-editor .se-lib .lib-item:hover{background:#ece9e0}
|
||||
.step-editor .se-lib .lib-item:active{cursor:grabbing}
|
||||
.step-editor .se-lib .lib-item .ico{width:18px;height:18px;display:inline-flex;align-items:center;justify-content:center;background:var(--primary);color:#fff;border-radius:4px;font-size:11px;flex-shrink:0}
|
||||
.step-editor .se-lib .lib-item .ico{width:18px;height:18px;display:inline-flex;align-items:center;justify-content:center;background:var(--primary);color:#fff;border-radius:5px;font-size:11px;flex-shrink:0}
|
||||
.step-editor .se-lib .lib-section{margin-top:8px;padding-top:6px;border-top:1px solid var(--border)}
|
||||
.step-editor .se-lib .lib-item.custom .ico{background:#7c3aed}
|
||||
.step-editor .se-lib .lib-item.custom .del-btn{margin-left:auto;background:none;border:none;color:var(--text-light);cursor:pointer;font-size:13px;padding:0 2px}
|
||||
.step-editor .se-lib .lib-item.custom .del-btn:hover{color:var(--danger)}
|
||||
.step-editor .se-canvas{padding:8px;overflow-y:auto;max-height:480px}
|
||||
.step-editor .se-empty{text-align:center;color:var(--text-light);padding:40px 20px;font-size:13px}
|
||||
.step-editor .se-empty .hint{font-size:11px;margin-top:4px}
|
||||
.se-toolbar{display:flex;gap:6px;padding:6px 8px;border-bottom:1px solid var(--border);background:#faf9f5}
|
||||
.se-toolbar .btn{padding:4px 10px;font-size:12px}
|
||||
.step-card{background:#fff;border:1px solid var(--border);border-radius:8px;margin-bottom:6px;transition:box-shadow .15s}
|
||||
.step-card.drag-over{border-color:var(--primary);box-shadow:0 0 0 2px rgba(59,130,246,.15)}
|
||||
.step-card.drag-over{border-color:var(--primary);box-shadow:0 0 0 2px rgba(15,118,110,.18)}
|
||||
.step-card.dragging{opacity:.5}
|
||||
.step-card .sc-head{display:flex;align-items:center;gap:8px;padding:7px 10px;cursor:grab}
|
||||
.step-card .sc-head:active{cursor:grabbing}
|
||||
.step-card .sc-ico{width:22px;height:22px;display:inline-flex;align-items:center;justify-content:center;background:var(--primary);color:#fff;border-radius:5px;font-size:12px;flex-shrink:0}
|
||||
.step-card .sc-ico{width:22px;height:22px;display:inline-flex;align-items:center;justify-content:center;background:var(--primary);color:#fff;border-radius:6px;font-size:12px;flex-shrink:0}
|
||||
.step-card .sc-label{flex:1;font-size:13px;font-weight:500;color:var(--text)}
|
||||
.step-card .sc-type{font-size:11px;color:var(--text-light);background:#f1f5f9;padding:1px 6px;border-radius:3px}
|
||||
.step-card .sc-type{font-size:11px;color:var(--text-light);background:#f1efe8;padding:1px 6px;border-radius:4px}
|
||||
.step-card .sc-actions{display:flex;gap:2px}
|
||||
.step-card .sc-actions button{background:none;border:none;color:var(--text-light);cursor:pointer;padding:2px 5px;font-size:14px;border-radius:3px;line-height:1}
|
||||
.step-card .sc-actions button:hover{background:#f1f5f9;color:var(--text)}
|
||||
.step-card .sc-body{display:none;padding:8px 10px;border-top:1px solid var(--border);background:#f8fafc}
|
||||
.step-card .sc-actions button{background:none;border:none;color:var(--text-light);cursor:pointer;padding:2px 5px;font-size:14px;border-radius:4px;line-height:1}
|
||||
.step-card .sc-actions button:hover{background:#f1efe8;color:var(--text)}
|
||||
.step-card .sc-body{display:none;padding:8px 10px;border-top:1px solid var(--border);background:#faf9f4}
|
||||
.step-card.expanded .sc-body{display:block}
|
||||
.step-card .sc-body .form-row{grid-template-columns:1fr 1fr 1fr;gap:8px}
|
||||
.step-card .sc-body .form-group{margin-bottom:8px}
|
||||
@@ -216,84 +252,74 @@ select.form-control{cursor:pointer}
|
||||
.step-card .sc-body .form-control{padding:5px 8px;font-size:12px}
|
||||
.step-card.loop-block{border-left:3px solid var(--success)}
|
||||
.step-card.loop-block .sc-ico{background:var(--success)}
|
||||
.step-card.group-block{border-left:3px solid #8b5cf6}
|
||||
.step-card.group-block .sc-ico{background:#8b5cf6}
|
||||
.step-card.if-block{border-left:3px solid #f59e0b}
|
||||
.step-card.if-block .sc-ico{background:#f59e0b}
|
||||
.step-card.selected{border-color:var(--primary);box-shadow:0 0 0 2px rgba(59,130,246,.2)}
|
||||
.step-children{margin-left:20px;margin-top:6px;border-left:2px dashed var(--border);padding-left:8px}
|
||||
.step-card.group-block{border-left:3px solid #7c3aed}
|
||||
.step-card.group-block .sc-ico{background:#7c3aed}
|
||||
.step-card.if-block{border-left:3px solid var(--warning)}
|
||||
.step-card.if-block .sc-ico{background:var(--warning)}
|
||||
.step-card.selected{border-color:var(--primary);box-shadow:0 0 0 2px rgba(15,118,110,.22)}
|
||||
.step-children{margin-left:20px;margin-top:6px;border-left:2px dashed var(--border-strong);padding-left:8px}
|
||||
.if-branch{margin-top:6px}
|
||||
.if-branch .branch-title{font-size:11px;font-weight:600;padding:3px 10px;border-radius:4px;margin-bottom:4px;display:inline-block}
|
||||
.if-branch .branch-title.then{color:#166534;background:#dcfce7}
|
||||
.if-branch .branch-title.else{color:#991b1b;background:#fee2e2}
|
||||
.step-children.drag-over{border-left-color:var(--primary);background:rgba(59,130,246,.06);border-radius:6px}
|
||||
.if-branch .branch-title.then{color:#15803d;background:var(--success-soft)}
|
||||
.if-branch .branch-title.else{color:#b91c1c;background:var(--danger-soft)}
|
||||
.step-children.drag-over{border-left-color:var(--primary);background:rgba(15,118,110,.06);border-radius:6px}
|
||||
#se-canvas.drag-over{outline:2px dashed var(--primary);outline-offset:2px;border-radius:8px}
|
||||
.sel-picker{display:flex;gap:4px;align-items:center}
|
||||
.sel-picker input{flex:1}
|
||||
.sel-picker .btn-pick{padding:5px 8px;font-size:11px;white-space:nowrap}
|
||||
.se-lib .lib-section{margin-top:8px;padding-top:6px;border-top:1px solid var(--border)}
|
||||
.se-lib .lib-item.custom .ico{background:#8b5cf6}
|
||||
.se-lib .lib-item.custom .del-btn{margin-left:auto;background:none;border:none;color:var(--text-light);cursor:pointer;font-size:13px;padding:0 2px}
|
||||
.se-lib .lib-item.custom .del-btn:hover{color:var(--danger)}
|
||||
.se-toolbar{display:flex;gap:6px;padding:6px 8px;border-bottom:1px solid var(--border);background:#f8fafc}
|
||||
.se-toolbar .btn{padding:4px 10px;font-size:12px}
|
||||
|
||||
/* 元素抓取弹窗（独立模态框，样式已内联在 HTML 中）*/
|
||||
/* 设备选择页 */
|
||||
/* 元素抓取弹窗 */
|
||||
.el-device-grid{padding:16px;overflow-y:auto;flex:1}
|
||||
.el-device-grid .egd-title{font-size:14px;font-weight:600;margin-bottom:12px;color:var(--text)}
|
||||
.el-device-card{background:var(--card);border:1px solid var(--border);border-radius:10px;padding:14px;cursor:pointer;transition:all .15s;display:flex;align-items:center;gap:12px;margin-bottom:8px}
|
||||
.el-device-card:hover{border-color:var(--primary);box-shadow:0 2px 8px rgba(59,130,246,.12)}
|
||||
.el-device-card .edc-icon{width:36px;height:36px;background:#f1f5f9;border-radius:8px;display:flex;align-items:center;justify-content:center;font-size:18px;flex-shrink:0}
|
||||
.el-device-card{background:var(--card);border:1px solid var(--border);border-radius:10px;padding:14px;cursor:pointer;transition:all .15s;display:flex;align-items:center;gap:12px;margin-bottom:8px;box-shadow:var(--shadow-sm)}
|
||||
.el-device-card:hover{border-color:var(--primary);box-shadow:var(--shadow-md);transform:translateY(-1px)}
|
||||
.el-device-card .edc-icon{width:36px;height:36px;background:#f1efe8;border-radius:8px;display:flex;align-items:center;justify-content:center;font-size:18px;flex-shrink:0}
|
||||
.el-device-card .edc-info{flex:1}
|
||||
.el-device-card .edc-serial{font-size:13px;font-weight:600;color:var(--text)}
|
||||
.el-device-card .edc-serial{font-size:13px;font-weight:600;color:var(--text);font-family:var(--mono)}
|
||||
.el-device-card .edc-model{font-size:12px;color:var(--text-light);margin-top:2px}
|
||||
.el-device-card .edc-status{font-size:11px;padding:2px 8px;border-radius:4px;background:#dcfce7;color:#166534;flex-shrink:0}
|
||||
/* 截图+元素树页 */
|
||||
.el-device-card .edc-status{font-size:11px;padding:2px 10px;border-radius:99px;background:var(--success-soft);color:#15803d;flex-shrink:0;font-weight:600}
|
||||
.el-picker-main{display:flex;flex:1;overflow:hidden}
|
||||
.el-shot-wrap{flex:0 0 320px;border-right:1px solid var(--border);background:#1e293b;display:flex;flex-direction:column}
|
||||
.el-shot-toolbar{padding:6px 10px;background:#334155;display:flex;gap:6px;align-items:center}
|
||||
.el-shot-toolbar .btn{padding:3px 10px;font-size:12px;background:#475569;color:#fff;border:none}
|
||||
.el-shot-toolbar .btn:hover{background:#64748b}
|
||||
.el-shot-toolbar .el-shot-info{color:#cbd5e1;font-size:11px;flex:1}
|
||||
.el-shot-wrap{flex:0 0 320px;border-right:1px solid var(--border);background:var(--ink);display:flex;flex-direction:column}
|
||||
.el-shot-toolbar{padding:6px 10px;background:var(--ink-2);display:flex;gap:6px;align-items:center;border-bottom:1px solid var(--ink-line)}
|
||||
.el-shot-toolbar .btn{padding:3px 10px;font-size:12px;background:#39414d;color:#e5e7eb;border:none;box-shadow:none}
|
||||
.el-shot-toolbar .btn:hover{background:#4b5563}
|
||||
.el-shot-toolbar .el-shot-info{color:#9aa3af;font-size:11px;flex:1}
|
||||
.el-shot-container{flex:1;overflow:auto;display:flex;align-items:flex-start;justify-content:center;padding:8px;position:relative}
|
||||
.el-shot-container img{max-width:100%;height:auto;border-radius:4px;display:block}
|
||||
.el-shot-container .el-shot-loading{color:#94a3b8;font-size:13px;padding:40px}
|
||||
.el-shot-overlay{position:absolute;border:1px solid rgba(59,130,246,.3);background:transparent;cursor:pointer;border-radius:2px;transition:all .1s}
|
||||
.el-shot-overlay:hover{border-color:#3b82f6;background:rgba(59,130,246,.2)}
|
||||
.el-shot-overlay.active{border:2px solid #ef4444;background:rgba(239,68,68,.2)}
|
||||
/* 右侧元素列表 */
|
||||
.el-shot-container .el-shot-loading{color:#8a93a0;font-size:13px;padding:40px}
|
||||
.el-shot-overlay{position:absolute;border:1px solid rgba(103,232,249,.35);background:transparent;cursor:pointer;border-radius:2px;transition:all .1s}
|
||||
.el-shot-overlay:hover{border-color:#67e8f9;background:rgba(103,232,249,.18)}
|
||||
.el-shot-overlay.active{border:2px solid #f87171;background:rgba(248,113,113,.22)}
|
||||
.el-list-wrap{flex:1;display:flex;flex-direction:column;overflow:hidden}
|
||||
.el-picker-search{width:100%;padding:8px 12px;border:none;border-bottom:1px solid var(--border);font-size:13px;outline:none}
|
||||
.el-picker-search{width:100%;padding:8px 12px;border:none;border-bottom:1px solid var(--border);font-size:13px;outline:none;font-family:var(--body)}
|
||||
.el-picker-list{flex:1;overflow-y:auto}
|
||||
.el-picker-item{padding:8px 12px;border-bottom:1px solid var(--border);cursor:pointer;font-size:12px;display:flex;gap:8px;align-items:flex-start}
|
||||
.el-picker-item:hover{background:#eff6ff}
|
||||
.el-picker-item.active{background:#dbeafe}
|
||||
.el-picker-item:hover{background:var(--primary-soft)}
|
||||
.el-picker-item.active{background:var(--primary-soft);border-left:3px solid var(--primary)}
|
||||
.el-picker-item:last-child{border-bottom:none}
|
||||
.el-picker-item .ep-depth{color:var(--text-light);font-family:monospace;flex-shrink:0;width:28px}
|
||||
.el-picker-item .ep-depth{color:var(--text-light);font-family:var(--mono);flex-shrink:0;width:28px}
|
||||
.el-picker-item .ep-info{flex:1;min-width:0}
|
||||
.el-picker-item .ep-info .ep-name{color:var(--text);font-weight:500;word-break:break-all}
|
||||
.el-picker-item .ep-info .ep-attrs{color:var(--text-light);font-size:11px;margin-top:2px;word-break:break-all}
|
||||
.el-picker-item .ep-info .ep-attrs span{margin-right:8px}
|
||||
.el-picker-item .ep-sel{font-size:10px;color:var(--primary);background:#dbeafe;padding:1px 6px;border-radius:3px;flex-shrink:0}
|
||||
.el-picker-item .ep-sel{font-size:10px;color:#fff;background:var(--primary);padding:1px 7px;border-radius:99px;flex-shrink:0;font-weight:600}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
||||
<!-- 顶部导航 -->
|
||||
<nav class="navbar">
|
||||
<div class="brand">设备自动化后台</div>
|
||||
<div class="brand"><span class="brand-dot"></span>设备自动化后台</div>
|
||||
<div class="tabs">
|
||||
<button class="tab active" onclick="showTab('monitor')">监控</button>
|
||||
<button class="tab" onclick="showTab('tasks')">任务</button>
|
||||
<button class="tab" onclick="showTab('groups')">分组</button>
|
||||
<button class="tab" onclick="showTab('logs')" data-perm="logs">日志</button>
|
||||
<button class="tab" onclick="showTab('users')" data-perm="admin">用户</button>
|
||||
<button class="tab" onclick="showTab('maintenance')" data-perm="admin">维护</button>
|
||||
<button class="tab" onclick="showTab('tools')" data-perm="admin">工具</button>
|
||||
<button class="tab active" data-tab="monitor" onclick="showTab('monitor')">监控</button>
|
||||
<button class="tab" data-tab="tasks" onclick="showTab('tasks')">任务</button>
|
||||
<button class="tab" data-tab="logs" onclick="showTab('logs')" data-perm="logs">日志</button>
|
||||
<button class="tab" data-tab="users" onclick="showTab('users')" data-perm="admin">用户</button>
|
||||
<button class="tab" data-tab="tools" onclick="showTab('tools')" data-perm="admin">工具</button>
|
||||
</div>
|
||||
<div class="user-info">
|
||||
<span id="me-username">...</span>
|
||||
<a href="/wall" target="_blank" title="监控大屏（全屏，挂墙/电视用）">📺 大屏</a>
|
||||
<a href="/logout">退出</a>
|
||||
</div>
|
||||
</nav>
|
||||
@@ -316,6 +342,9 @@ select.form-control{cursor:pointer}
|
||||
<button class="btn" onclick="screenAllDevices('on')" data-perm="devices" title="所有在线设备亮屏并解锁">一键亮屏</button>
|
||||
<button class="btn" onclick="screenAllDevices('off')" data-perm="devices" title="所有在线设备息屏（运行中任务会中断）">一键息屏</button>
|
||||
<button class="btn" onclick="loadMonitor()">刷新</button>
|
||||
<label style="display:inline-flex;align-items:center;gap:4px;margin:0 6px">
|
||||
<input type="checkbox" id="monitor-filter-online" checked onchange="loadMonitor()"> 只看在线
|
||||
</label>
|
||||
<input class="form-control list-search" id="search-devices" placeholder="搜索设备/型号/App/任务...">
|
||||
<span class="hint"><span id="fg-status"></span> · 每 5 秒自动刷新 · <span id="srvTime"></span> · <span id="sel-count">未选中</span></span>
|
||||
</div>
|
||||
@@ -393,23 +422,6 @@ select.form-control{cursor:pointer}
|
||||
</div>
|
||||
|
||||
<!-- ========== Tab 3: 分组 ========== -->
|
||||
<div id="tab-groups" class="tab-panel">
|
||||
<div class="page-title">设备分组管理</div>
|
||||
<div class="page-sub">管理设备分组，用于任务按分组执行</div>
|
||||
<div class="toolbar">
|
||||
<button class="btn btn-primary" onclick="openGroupModal()" data-perm="tasks">新建分组</button>
|
||||
<button class="btn" onclick="loadGroups()">刷新</button>
|
||||
<input class="form-control list-search" id="search-groups" placeholder="搜索分组名/描述...">
|
||||
</div>
|
||||
<table class="table">
|
||||
<thead><tr>
|
||||
<th data-sort="name" onclick="_lpSort('groups','name')">分组名</th><th>描述</th><th data-sort="count" onclick="_lpSort('groups','count')">设备数</th><th>设备列表</th><th>操作</th>
|
||||
</tr></thead>
|
||||
<tbody id="tb-groups"></tbody>
|
||||
</table>
|
||||
<div class="list-pager" id="pager-groups"></div>
|
||||
</div>
|
||||
|
||||
<!-- ========== Tab 4: 日志 ========== -->
|
||||
<div id="tab-logs" class="tab-panel">
|
||||
<div class="page-title">日志查看</div>
|
||||
@@ -467,7 +479,7 @@ select.form-control{cursor:pointer}
|
||||
<button class="sub-tab" data-sub="appver" onclick="showSubTab('tools','appver')">应用版本管理</button>
|
||||
<button class="sub-tab" data-sub="devapps" onclick="showSubTab('tools','devapps')">设备已装应用</button>
|
||||
<button class="sub-tab" data-sub="devpool" onclick="showSubTab('tools','devpool')">设备池管理</button>
|
||||
<button class="sub-tab" data-sub="screen" onclick="showSubTab('tools','screen')">远程看屏</button>
|
||||
<button class="sub-tab" data-sub="groups" onclick="showSubTab('tools','groups')">设备分组</button>
|
||||
</div>
|
||||
|
||||
<!-- 子分栏 1：剪贴板注入 -->
|
||||
@@ -487,7 +499,7 @@ select.form-control{cursor:pointer}
|
||||
<button class="btn btn-primary" onclick="injectClipboard()">注入剪贴板</button>
|
||||
<span class="hint">注入后需在目标 App 的输入框长按选择"粘贴"</span>
|
||||
</div>
|
||||
<div class="help">实现：u2 setClipboard（jsonrpc 直连 atx-agent），实测支持中文、引号、换行；USB 设备首次连接会自动推送 atx-agent。</div>
|
||||
<div class="help">实现：ClipInject APK 透明 Activity 写入剪贴板（Android 10+ 可用，u2 setClipboard 在 Android 12/13 会被系统丢弃）；设备需先安装 com.example.clipinject，注入后自动读回比对验证。</div>
|
||||
</div>
|
||||
<div style="flex:1;min-width:280px">
|
||||
<div class="form-group">
|
||||
@@ -623,6 +635,28 @@ select.form-control{cursor:pointer}
|
||||
|
||||
<!-- 子分栏 6：设备池管理（本地 SQLite 清单，任务调度的数据源） -->
|
||||
<div class="sub-panel" id="tools-sub-devpool">
|
||||
<!-- 自动发现：扫描网段 → 待连接池，确认后才加入正式池 -->
|
||||
<div style="border-bottom:1px solid var(--border);margin-bottom:10px;padding-bottom:10px">
|
||||
<div class="toolbar" style="flex-wrap:wrap">
|
||||
<label style="display:inline-flex;align-items:center;gap:4px">
|
||||
<input type="checkbox" id="discovery-enabled" onchange="toggleDiscovery(this.checked)"> 定时扫描
|
||||
</label>
|
||||
<span class="text-muted" style="margin-left:8px">周期</span>
|
||||
<input type="number" id="discovery-interval" style="width:70px" min="10">
|
||||
<span class="text-muted">秒 · 网段</span>
|
||||
<input type="text" id="discovery-subnets" class="form-control" style="width:300px;font-family:monospace"
|
||||
placeholder="192.168.20.0/24, 100.100.10.0/24" title="逗号分隔的 CIDR 网段">
|
||||
<button class="btn" onclick="saveDiscoverySettings()">保存设置</button>
|
||||
<button class="btn btn-primary" onclick="runDiscoveryScan()">立即扫描</button>
|
||||
<span id="discovery-status" class="text-muted"></span>
|
||||
</div>
|
||||
<table class="table table-hover table-sm" style="margin-top:8px">
|
||||
<thead><tr><th>serial</th><th>来源</th><th>首次发现</th><th>最近发现</th><th>在线</th><th>操作</th></tr></thead>
|
||||
<tbody id="tb-discovery"><tr><td colspan="6" class="empty">尚未扫描</td></tr></tbody>
|
||||
</table>
|
||||
<div class="help">扫描局域网/Tailscale 网段中开放 adb 5555 的设备进入<b>待连接池</b>；
|
||||
<b>确认后才加入正式设备池</b>（不自动连接、不参与任务调度）。未授权设备（手机未接受 RSA 弹窗）不会出现。</div>
|
||||
</div>
|
||||
<div class="toolbar">
|
||||
<input type="text" id="devpool-serial" class="form-control" style="width:220px;font-family:monospace"
|
||||
placeholder="serial，如 100.100.10.20:5555" onkeydown="if(event.key==='Enter')addPoolDev()">
|
||||
@@ -632,6 +666,9 @@ select.form-control{cursor:pointer}
|
||||
<button class="btn" onclick="reconnectPoolDevices()" title="并发 adb connect 池内全部设备">一键重连</button>
|
||||
<button class="btn" onclick="refreshPoolModels()" title="采集池内在线设备的型号（getprop）">采集型号</button>
|
||||
<button class="btn" onclick="loadDevPool()">刷新</button>
|
||||
<label style="display:inline-flex;align-items:center;gap:4px;margin:0 6px">
|
||||
<input type="checkbox" id="devpool-filter-online" checked onchange="loadDevPool()"> 只看在线
|
||||
</label>
|
||||
<span id="devpool-status" class="text-muted"></span>
|
||||
</div>
|
||||
<table class="table table-hover table-sm" style="margin-top:8px">
|
||||
@@ -647,47 +684,30 @@ select.form-control{cursor:pointer}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 子分栏 7：远程看屏（MJPEG 实时流 + 触控） -->
|
||||
<div class="sub-panel" id="tools-sub-screen">
|
||||
<!-- 子分栏：设备分组（原顶级 tab，移到工具页） -->
|
||||
<div class="sub-panel" id="tools-sub-groups">
|
||||
<div class="toolbar">
|
||||
<select id="screen-device" class="form-control" style="width:300px;font-family:monospace"></select>
|
||||
<button class="btn btn-primary" onclick="startScreenView()">开始看屏</button>
|
||||
<button class="btn" onclick="stopScreenView()">停止</button>
|
||||
<button class="btn" onclick="loadScreenDevices(true)">刷新设备</button>
|
||||
<span id="screen-status" class="text-muted"></span>
|
||||
</div>
|
||||
<div style="display:flex;gap:16px;align-items:flex-start;flex-wrap:wrap">
|
||||
<div style="position:relative" id="screen-stage">
|
||||
<img id="screen-img" alt="远程画面"
|
||||
style="max-width:420px;border-radius:12px;border:1px solid var(--border);background:#000;cursor:crosshair;user-select:none">
|
||||
<div id="screen-loading" class="empty" style="position:absolute;inset:0;display:flex;align-items:center;justify-content:center;background:rgba(0,0,0,.6);color:#fff;border-radius:12px">连接中（首次连接需推送 atx-agent，最长约 30 秒）...</div>
|
||||
</div>
|
||||
<div style="display:flex;flex-direction:column;gap:6px;min-width:200px">
|
||||
<div style="font-size:12px;color:var(--text-light)">操作（鼠标拖拽=滑动，点击=轻触）</div>
|
||||
<div style="display:flex;gap:6px;flex-wrap:wrap">
|
||||
<button class="btn btn-xs" onclick="screenKey('back')">◀ 返回</button>
|
||||
<button class="btn btn-xs" onclick="screenKey('home')">🏠 主页</button>
|
||||
<button class="btn btn-xs" onclick="screenKey('recent')">📋 最近</button>
|
||||
<button class="btn btn-xs" onclick="screenKey('menu')">☰ 菜单</button>
|
||||
<button class="btn btn-xs" onclick="screenKey('power')">⏻ 电源</button>
|
||||
<button class="btn btn-xs" onclick="screenKey('volume_up')">🔊 音量+</button>
|
||||
<button class="btn btn-xs" onclick="screenKey('volume_down')">🔉 音量-</button>
|
||||
</div>
|
||||
<div style="display:flex;gap:6px;margin-top:4px">
|
||||
<input type="text" id="screen-text" class="form-control" style="flex:1" placeholder="输入文字（需光标在输入框）"
|
||||
onkeydown="if(event.key==='Enter')screenSendText()">
|
||||
<button class="btn btn-xs" onclick="screenSendText()">发送</button>
|
||||
</div>
|
||||
<div class="help" style="margin-top:6px">画面为设备原生分辨率 JPEG 流（约 3-6 帧/秒）。设备息屏时画面为黑，可先点电源/亮屏。</div>
|
||||
</div>
|
||||
<button class="btn btn-primary" onclick="openGroupModal()" data-perm="tasks">新建分组</button>
|
||||
<button class="btn" onclick="loadGroups()">刷新</button>
|
||||
<input class="form-control list-search" id="search-groups" placeholder="搜索分组名/描述...">
|
||||
<span id="groups-status" class="text-muted"></span>
|
||||
</div>
|
||||
<table class="table table-hover table-sm" style="margin-top:8px">
|
||||
<thead><tr>
|
||||
<th data-sort="name" onclick="_lpSort('groups','name')">分组名</th><th>描述</th><th data-sort="count" onclick="_lpSort('groups','count')">设备数</th><th>设备列表</th><th>操作</th>
|
||||
</tr></thead>
|
||||
<tbody id="tb-groups"></tbody>
|
||||
</table>
|
||||
<div class="list-pager" id="pager-groups"></div>
|
||||
<div class="help">管理设备分组，用于任务按分组执行。分组内的设备需先在<b>设备池管理</b>中确认（不在池内的设备不参与调度）。</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div><!-- /.content -->
|
||||
|
||||
<!-- ========== 测试此步骤弹窗 ========== -->
|
||||
<div id="test-overlay" class="modal-overlay" onclick="if(event.target===this)closeTestModal()">
|
||||
<div id="test-overlay" class="modal-overlay" style="z-index:1200" onclick="if(event.target===this)closeTestModal()">
|
||||
<div class="modal" id="test-modal-box">
|
||||
<div class="modal-header">
|
||||
<h3 id="test-modal-title">测试步骤</h3>
|
||||
|
||||
@@ -0,0 +1,481 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<title>设备监控大屏</title>
|
||||
<style>
|
||||
/* ========== 监控大屏：深色控制室风格 ========== */
|
||||
@font-face{font-family:'Bricolage Grotesque';font-style:normal;font-weight:700;font-display:swap;src:url('/static/fonts/bricolage-700.woff2') format('woff2')}
|
||||
@font-face{font-family:'Bricolage Grotesque';font-style:normal;font-weight:800;font-display:swap;src:url('/static/fonts/bricolage-800.woff2') format('woff2')}
|
||||
@font-face{font-family:'IBM Plex Mono';font-style:normal;font-weight:400;font-display:swap;src:url('/static/fonts/plexmono-400.woff2') format('woff2')}
|
||||
@font-face{font-family:'IBM Plex Mono';font-style:normal;font-weight:600;font-display:swap;src:url('/static/fonts/plexmono-600.woff2') format('woff2')}
|
||||
:root{
|
||||
--bg:#0d0f13; --card:#14181f; --card-line:#232936; --ink-line:#2a303c;
|
||||
--text:#e8ecf2; --muted:#8b93a3; --faint:#5c6472;
|
||||
--teal:#2dd4bf; --green:#34d399; --red:#f87171; --amber:#fbbf24; --indigo:#818cf8;
|
||||
--display:'Bricolage Grotesque','PingFang SC','Microsoft YaHei',sans-serif;
|
||||
--mono:'IBM Plex Mono',Menlo,Consolas,monospace;
|
||||
--body:-apple-system,'PingFang SC','Microsoft YaHei',sans-serif;
|
||||
}
|
||||
*{box-sizing:border-box;margin:0;padding:0}
|
||||
html,body{height:100%}
|
||||
body{background:var(--bg);font-family:var(--body);color:var(--text);overflow:hidden}
|
||||
body::before{content:"";position:fixed;inset:0;pointer-events:none;
|
||||
background-image:linear-gradient(rgba(45,212,191,.035) 1px,transparent 1px),
|
||||
linear-gradient(90deg,rgba(45,212,191,.035) 1px,transparent 1px);
|
||||
background-size:42px 42px}
|
||||
/* 顶部栏 */
|
||||
header{display:flex;align-items:center;gap:24px;padding:14px 26px 12px;border-bottom:1px solid var(--ink-line);background:rgba(13,15,19,.85);backdrop-filter:blur(6px);position:relative;z-index:5}
|
||||
header .title{font-family:var(--display);font-size:21px;font-weight:800;letter-spacing:1px;color:#fff;display:flex;align-items:center;gap:12px;white-space:nowrap}
|
||||
header .title::before{content:"";width:10px;height:10px;border-radius:50%;background:var(--teal);box-shadow:0 0 0 0 rgba(45,212,191,.55);animation:pulse 2.2s infinite}
|
||||
@keyframes pulse{0%{box-shadow:0 0 0 0 rgba(45,212,191,.5)}70%{box-shadow:0 0 0 9px rgba(45,212,191,0)}100%{box-shadow:0 0 0 0 rgba(45,212,191,0)}}
|
||||
header .stats{display:flex;gap:10px;flex:1}
|
||||
header .stat{background:var(--card);border:1px solid var(--card-line);border-radius:10px;padding:6px 16px;text-align:center;min-width:84px}
|
||||
header .stat .n{font-family:var(--mono);font-size:20px;font-weight:600;line-height:1.15}
|
||||
header .stat .l{font-size:11px;color:var(--faint);margin-top:2px;letter-spacing:.4px}
|
||||
header .stat.online .n{color:var(--green)}
|
||||
header .stat.running .n{color:var(--teal)}
|
||||
header .stat.error .n{color:var(--red)}
|
||||
header .wall-btn{background:var(--card);border:1px solid var(--card-line);color:var(--teal);border-radius:10px;padding:8px 18px;font-size:13px;font-weight:600;cursor:pointer;transition:all .15s;font-family:var(--body)}
|
||||
header .wall-btn:hover{background:#1a2029;border-color:var(--teal);transform:translateY(-1px)}
|
||||
header .wall-btn:disabled{opacity:.5;cursor:not-allowed}
|
||||
header .clock{font-family:var(--mono);font-size:18px;color:var(--muted);text-align:right;line-height:1.2;white-space:nowrap}
|
||||
header .clock .date{font-size:11px;color:var(--faint)}
|
||||
/* 设备网格 */
|
||||
main{position:relative;z-index:2;height:calc(100vh - 88px);overflow-y:auto;padding:16px 24px 30px;display:grid;grid-template-columns:repeat(auto-fill,minmax(200px,1fr));gap:14px;align-content:start}
|
||||
/* 设备卡片（可点击进操作） */
|
||||
.card{background:var(--card);border:1px solid var(--card-line);border-radius:14px;overflow:hidden;position:relative;animation:cardIn .4s ease-out backwards;cursor:pointer;transition:border-color .2s,box-shadow .2s,transform .15s}
|
||||
.card:hover{transform:translateY(-3px);box-shadow:0 8px 22px rgba(0,0,0,.4)}
|
||||
@keyframes cardIn{from{opacity:0;transform:translateY(10px)}to{opacity:1;transform:none}}
|
||||
.card.running{border-color:rgba(45,212,191,.55);box-shadow:0 0 18px rgba(45,212,191,.12),inset 0 0 0 1px rgba(45,212,191,.2)}
|
||||
.card.error{border-color:rgba(248,113,113,.5)}
|
||||
.card.offline{opacity:.62}
|
||||
.card .thumb{aspect-ratio:9/16;background:#0a0c10;position:relative;overflow:hidden}
|
||||
.card .thumb img{width:100%;height:100%;object-fit:cover;display:block;transition:opacity .2s}
|
||||
.card.offline .thumb img{display:none}
|
||||
.card .thumb .ph{position:absolute;inset:0;display:none;flex-direction:column;align-items:center;justify-content:center;gap:8px;color:var(--faint);font-size:12px;background:repeating-linear-gradient(45deg,#0c0e12,#0c0e12 12px,#0f1218 12px,#0f1218 24px)}
|
||||
.card .thumb .ph .ico{font-size:26px;opacity:.6}
|
||||
/* 状态角标 */
|
||||
.card .badge{position:absolute;top:8px;left:8px;display:flex;align-items:center;gap:6px;background:rgba(13,15,19,.8);backdrop-filter:blur(4px);border-radius:99px;padding:3px 10px;font-size:11px;font-weight:600;color:var(--muted);border:1px solid var(--ink-line)}
|
||||
.card.running .badge{color:var(--teal);border-color:rgba(45,212,191,.4)}
|
||||
.card.error .badge{color:var(--red)}
|
||||
.card .badge .dot{width:7px;height:7px;border-radius:50%;background:var(--faint)}
|
||||
.card.running .badge .dot{background:var(--teal);box-shadow:0 0 7px rgba(45,212,191,.8);animation:pulse 1.6s infinite}
|
||||
.card.error .badge .dot{background:var(--red);box-shadow:0 0 6px rgba(248,113,113,.7)}
|
||||
.card.offline .badge .dot{background:var(--faint)}
|
||||
/* 熄屏角标（右上） */
|
||||
.card .screen-tag{position:absolute;top:8px;right:8px;background:rgba(13,15,19,.8);backdrop-filter:blur(4px);border-radius:99px;padding:3px 10px;font-size:11px;font-weight:600;border:1px solid var(--ink-line)}
|
||||
.card .screen-tag.on{color:var(--green)}
|
||||
.card .screen-tag.off{color:var(--faint)}
|
||||
/* 信息区 */
|
||||
.card .info{padding:9px 12px 11px}
|
||||
.card .info .name{font-size:13.5px;font-weight:700;color:#f1f4f8;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
|
||||
.card .info .ip{font-family:var(--mono);font-size:12px;color:var(--muted);margin-top:2px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
|
||||
.card .info .model{font-size:10.5px;color:var(--faint);margin-top:2px}
|
||||
.card .info .action{font-size:11.5px;color:var(--muted);margin-top:6px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;min-height:16px}
|
||||
.card .info .action b{color:var(--amber);font-weight:600}
|
||||
.card .info .prog{margin-top:7px;height:4px;background:#1d242e;border-radius:99px;overflow:hidden}
|
||||
.card .info .prog i{display:block;height:100%;background:linear-gradient(90deg,var(--teal),#5eead4);border-radius:99px;transition:width .5s}
|
||||
.card .info .prog-txt{font-size:10px;color:var(--faint);margin-top:3px;font-family:var(--mono)}
|
||||
.card .info .hint{font-size:10px;color:var(--faint);margin-top:5px;text-align:center;opacity:0;transition:opacity .2s}
|
||||
.card:hover .info .hint{opacity:.8}
|
||||
/* 空状态 */
|
||||
.empty-wall{grid-column:1/-1;text-align:center;color:var(--faint);padding:80px 0;font-size:14px}
|
||||
/* 设备操作弹窗 */
|
||||
.ctrl-overlay{display:none;position:fixed;inset:0;background:rgba(5,7,10,.78);backdrop-filter:blur(3px);z-index:100;justify-content:center;align-items:center;padding:26px}
|
||||
.ctrl-overlay.show{display:flex}
|
||||
.ctrl-box{background:var(--card);border:1px solid var(--card-line);border-radius:16px;width:min(420px,94vw);max-height:94vh;display:flex;flex-direction:column;overflow:hidden;box-shadow:0 24px 70px rgba(0,0,0,.6);animation:modalIn .18s ease-out}
|
||||
@keyframes modalIn{from{opacity:0;transform:translateY(12px) scale(.98)}to{opacity:1;transform:none}}
|
||||
.ctrl-head{padding:12px 16px;border-bottom:1px solid var(--ink-line);display:flex;align-items:center;gap:12px;background:#11151c}
|
||||
.ctrl-head .info{flex:1;min-width:0}
|
||||
.ctrl-head .name{font-size:15px;font-weight:700;color:#f1f4f8;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
|
||||
.ctrl-head .sub{font-family:var(--mono);font-size:11.5px;color:var(--faint);margin-top:1px}
|
||||
.ctrl-head .close{background:none;border:none;color:var(--faint);font-size:22px;cursor:pointer;padding:0 6px;line-height:1;border-radius:6px}
|
||||
.ctrl-head .close:hover{color:#fff;background:#1d242e}
|
||||
.ctrl-body{flex:1;overflow-y:auto;padding:12px;background:#0a0c10}
|
||||
.ctrl-body .screen{position:relative;border-radius:10px;overflow:hidden;background:#000;cursor:crosshair;user-select:none;touch-action:none}
|
||||
.ctrl-body .screen img{width:100%;display:block;max-height:62vh;object-fit:contain;background:#000}
|
||||
.ctrl-body .screen .loading{position:absolute;inset:0;display:flex;align-items:center;justify-content:center;background:rgba(0,0,0,.55);color:var(--muted);font-size:12px;border-radius:10px}
|
||||
.ctrl-tools{display:flex;gap:6px;flex-wrap:wrap;padding:10px 12px 12px;border-top:1px solid var(--ink-line);background:#11151c}
|
||||
.ctrl-tools .btn{background:#1a2029;border:1px solid var(--card-line);color:var(--muted);border-radius:8px;padding:6px 12px;font-size:12px;cursor:pointer;transition:all .12s;font-family:var(--body)}
|
||||
.ctrl-tools .btn:hover{color:var(--teal);border-color:var(--teal)}
|
||||
.ctrl-tools .btn.wake{color:var(--green);border-color:rgba(52,211,153,.4)}
|
||||
.ctrl-tools .btn.wake:hover{border-color:var(--green)}
|
||||
.ctrl-tools .btn.sleep{color:var(--faint)}
|
||||
.ctrl-tools .text-row{display:flex;gap:6px;flex:1 0 100%;margin-top:2px}
|
||||
.ctrl-tools .text-row input{flex:1;background:#0d1117;border:1px solid var(--card-line);border-radius:8px;padding:6px 10px;font-size:12px;color:var(--text);outline:none;font-family:var(--body)}
|
||||
.ctrl-tools .text-row input:focus{border-color:var(--teal)}
|
||||
/* 滚动条 */
|
||||
::-webkit-scrollbar{width:8px}
|
||||
::-webkit-scrollbar-thumb{background:#232936;border-radius:4px}
|
||||
::-webkit-scrollbar-track{background:transparent}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
<div class="title">设备监控大屏</div>
|
||||
<div class="stats" id="wall-stats"></div>
|
||||
<label class="wall-btn" style="display:inline-flex;align-items:center;gap:4px;cursor:pointer">
|
||||
<input type="checkbox" id="wall-filter-online" checked onchange="refreshStatus()"> 只看在线
|
||||
</label>
|
||||
<button class="wall-btn" id="btn-wake-all" onclick="wakeAll()">💡 一键亮屏</button>
|
||||
<div class="clock"><span id="wall-clock">--:--:--</span><div class="date" id="wall-date"></div></div>
|
||||
</header>
|
||||
<main id="wall-grid"></main>
|
||||
|
||||
<!-- 设备操作弹窗（看屏 + 触控） -->
|
||||
<div class="ctrl-overlay" id="ctrl-overlay">
|
||||
<div class="ctrl-box">
|
||||
<div class="ctrl-head">
|
||||
<div class="info">
|
||||
<div class="name" id="ctrl-name">设备</div>
|
||||
<div class="sub" id="ctrl-sub">--</div>
|
||||
</div>
|
||||
<button class="close" onclick="closeCtrl()">×</button>
|
||||
</div>
|
||||
<div class="ctrl-body">
|
||||
<div class="screen" id="ctrl-screen">
|
||||
<img id="ctrl-img" alt="">
|
||||
<div class="loading" id="ctrl-loading">连接中（首次需推送 atx-agent，最长约 30 秒）...</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ctrl-tools">
|
||||
<button class="btn wake" onclick="ctrlWake()">💡 亮屏</button>
|
||||
<button class="btn sleep" onclick="ctrlSleep()">🌙 息屏</button>
|
||||
<button class="btn" onclick="ctrlKey('back')">◀ 返回</button>
|
||||
<button class="btn" onclick="ctrlKey('home')">🏠 主页</button>
|
||||
<button class="btn" onclick="ctrlKey('recent')">📋 最近</button>
|
||||
<button class="btn" onclick="ctrlKey('menu')">☰ 菜单</button>
|
||||
<button class="btn" onclick="ctrlKey('power')">⏻ 电源</button>
|
||||
<div class="text-row">
|
||||
<input type="text" id="ctrl-text" placeholder="输入文字（需光标在输入框）" onkeydown="if(event.key==='Enter')ctrlSendText()">
|
||||
<button class="btn" onclick="ctrlSendText()">发送</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// ================== 监控大屏（深色控制室） ==================
|
||||
// 状态每 5s 刷新；缩略图每 2.5s 轮询（页面不可见时暂停）
|
||||
// 缩略图走 fetch 读取 X-Screen-State 头，卡片显示 亮屏中/熄屏中
|
||||
const STATUS_MAP={idle:'空闲',connecting:'连接中',running:'运行中',done:'完成',error:'异常',released:'已释放',failed:'失败'};
|
||||
const APP_NAMES={'com.ss.android.ugc.aweme':'抖音','com.ss.android.ugc.aweme.lite':'抖音极速版','com.smile.gifmaker':'快手','com.kuaishou.nebula':'快手极速版','com.tencent.mm':'微信','com.tencent.mobileqq':'QQ','com.miui.home':'桌面','com.android.launcher':'桌面','com.android.settings':'设置','com.android.systemui':'系统'};
|
||||
let _devices=[];
|
||||
let _ctrlSerial=''; // 操作弹窗当前设备
|
||||
let _ctrlTimer=null; // 弹窗状态刷新定时器
|
||||
let _screenState={}; // serial -> on/off（来自缩略图响应头）
|
||||
|
||||
function esc(s){return String(s||'').replace(/[&<>"']/g,c=>({'&':'&','<':'<','>':'>','"':'"',"'":'''}[c]));}
|
||||
// CSRF：独立页面需先取 token，POST 必须携带（与主后台 base.js 一致）
|
||||
let _csrfToken='';
|
||||
async function initCsrf(){
|
||||
try{const r=await fetch('/api/csrf');const d=await r.json();_csrfToken=d.token||'';}catch(e){}
|
||||
}
|
||||
async function apiGet(url){
|
||||
try{
|
||||
const r=await fetch(url);
|
||||
if(r.status===401){window.location='/login';return null;}
|
||||
return await r.json();
|
||||
}catch(e){return null;}
|
||||
}
|
||||
async function apiPost(url,body){
|
||||
try{
|
||||
const r=await fetch(url,{method:'POST',headers:{'Content-Type':'application/json','X-CSRF-Token':_csrfToken},body:JSON.stringify(body||{})});
|
||||
if(r.status===401){window.location='/login';return null;}
|
||||
return await r.json();
|
||||
}catch(e){return null;}
|
||||
}
|
||||
|
||||
// 时钟
|
||||
function tickClock(){
|
||||
const now=new Date();
|
||||
document.getElementById('wall-clock').textContent=
|
||||
String(now.getHours()).padStart(2,'0')+':'+String(now.getMinutes()).padStart(2,'0')+':'+String(now.getSeconds()).padStart(2,'0');
|
||||
document.getElementById('wall-date').textContent=
|
||||
now.getFullYear()+'-'+String(now.getMonth()+1).padStart(2,'0')+'-'+String(now.getDate()).padStart(2,'0')+' '+['周日','周一','周二','周三','周四','周五','周六'][now.getDay()];
|
||||
}
|
||||
|
||||
// 状态刷新（5s）
|
||||
async function refreshStatus(){
|
||||
const r=await apiGet('/api/status');
|
||||
if(!r||!r.ok)return;
|
||||
const devs=(r.devices||[]).sort((a,b)=>a.serial.localeCompare(b.serial));
|
||||
const changed=JSON.stringify(devs.map(d=>[d.serial,d.present,d.worker_status,d.task_job,d.current_action,d.progress,d.device_name,d.model]))!==
|
||||
JSON.stringify(_devices.map(d=>[d.serial,d.present,d.worker_status,d.task_job,d.current_action,d.progress,d.device_name,d.model]));
|
||||
_devices=devs;
|
||||
renderStats(devs);
|
||||
if(changed)renderGrid(visibleDevs(devs));
|
||||
// 操作弹窗打开时同步刷新其标题状态
|
||||
if(_ctrlSerial)updateCtrlHead();
|
||||
}
|
||||
|
||||
// 「只看在线」勾选时过滤离线设备（默认勾选）
|
||||
function visibleDevs(devs){
|
||||
const onlyOnline=document.getElementById('wall-filter-online')
|
||||
? document.getElementById('wall-filter-online').checked : true;
|
||||
return onlyOnline? devs.filter(d=>d.present) : devs;
|
||||
}
|
||||
|
||||
function renderStats(devs){
|
||||
const online=devs.filter(d=>d.present).length;
|
||||
const running=devs.filter(d=>['running','connecting'].includes(d.worker_status)).length;
|
||||
const error=devs.filter(d=>['error','failed'].includes(d.worker_status)).length;
|
||||
document.getElementById('wall-stats').innerHTML=
|
||||
'<div class="stat"><div class="n">'+devs.length+'</div><div class="l">设备总数</div></div>'+
|
||||
'<div class="stat online"><div class="n">'+online+'</div><div class="l">在线</div></div>'+
|
||||
'<div class="stat running"><div class="n">'+running+'</div><div class="l">运行中</div></div>'+
|
||||
'<div class="stat error"><div class="n">'+error+'</div><div class="l">异常</div></div>';
|
||||
}
|
||||
|
||||
function cardCls(d){
|
||||
if(['error','failed'].includes(d.worker_status))return 'error';
|
||||
if(['running','connecting'].includes(d.worker_status))return 'running';
|
||||
return d.present?'online':'offline';
|
||||
}
|
||||
// 状态角标文案：运行中/异常优先，其次熄屏/亮屏状态
|
||||
function badgeText(d){
|
||||
if(['running','connecting'].includes(d.worker_status))return STATUS_MAP[d.worker_status]||d.worker_status;
|
||||
if(['error','failed'].includes(d.worker_status))return STATUS_MAP[d.worker_status]||d.worker_status;
|
||||
if(!d.present)return '离线';
|
||||
return _screenState[d.serial]==='off'?'熄屏中':'亮屏中';
|
||||
}
|
||||
function fmtProgress(p){
|
||||
if(!p||!p.total)return '';
|
||||
const pct=Math.min(100,Math.round((p.done||0)/p.total*100));
|
||||
return '<div class="prog"><i style="width:'+pct+'%"></i></div>'+
|
||||
'<div class="prog-txt">'+(p.done||0)+'/'+p.total+(p.unit?' '+esc(p.unit):'')+' · '+pct+'%</div>';
|
||||
}
|
||||
function shortIp(serial){return String(serial||'').replace(/:5555$/,'');}
|
||||
|
||||
function cardHtml(d, i){
|
||||
const cls=cardCls(d);
|
||||
const serial=esc(d.serial);
|
||||
const name=esc(d.device_name||d.model||'设备');
|
||||
const ip=esc(shortIp(d.serial));
|
||||
const st=badgeText(d);
|
||||
const stTag=_screenState[d.serial]==='off'?'<div class="screen-tag off">🌙</div>':'';
|
||||
const action=d.current_action
|
||||
?'<div class="action">'+(d.task_job?'<b>'+esc(d.task_job)+'</b> · ':'')+esc(d.current_action)+'</div>'
|
||||
:(d.task_job?'<div class="action"><b>'+esc(d.task_job)+'</b></div>':'<div class="action"></div>');
|
||||
return '<div class="card '+cls+'" data-serial="'+serial+'" style="animation-delay:'+(i*30)+'ms" onclick="openCtrl(\''+serial+'\')">'+
|
||||
'<div class="thumb">'+
|
||||
'<img data-thumb="'+serial+'" alt="">'+
|
||||
'<div class="ph"><span class="ico">📱</span><span>'+serial+'</span></div>'+
|
||||
'<div class="badge"><span class="dot"></span>'+st+'</div>'+stTag+
|
||||
'</div>'+
|
||||
'<div class="info">'+
|
||||
'<div class="name">'+name+'</div>'+
|
||||
'<div class="ip">'+ip+'</div>'+
|
||||
'<div class="model">'+esc(d.model||'')+'</div>'+
|
||||
action+fmtProgress(d.progress)+
|
||||
'<div class="hint">点击进入设备操作</div>'+
|
||||
'</div>'+
|
||||
'</div>';
|
||||
}
|
||||
|
||||
// 增量渲染：已有卡片只更新信息区（不重建 img，缩略图不闪不重载）；增删设备才动 DOM
|
||||
function renderGrid(devs){
|
||||
const grid=document.getElementById('wall-grid');
|
||||
if(!devs.length){
|
||||
grid.innerHTML='<div class="empty-wall">设备池为空，请到「工具 → 设备池管理」添加设备</div>';
|
||||
return;
|
||||
}
|
||||
const existing={};
|
||||
grid.querySelectorAll('.card').forEach(c=>{existing[c.dataset.serial]=c;});
|
||||
// 1. 移除已不存在的卡片
|
||||
Object.keys(existing).forEach(s=>{
|
||||
if(!devs.find(d=>d.serial===s))existing[s].remove();
|
||||
});
|
||||
// 2. 更新/新建
|
||||
devs.forEach((d,i)=>{
|
||||
const serial=d.serial;
|
||||
const card=existing[serial];
|
||||
if(card){
|
||||
// 已有卡片：只更新状态类信息（badge/class/信息区），不动 img
|
||||
card.className='card '+cardCls(d);
|
||||
const badge=card.querySelector('.badge');
|
||||
const bt=badgeText(d);
|
||||
if(badge&&badge.textContent!==bt)badge.innerHTML='<span class="dot"></span>'+bt;
|
||||
// 熄屏角标
|
||||
const tag=card.querySelector('.screen-tag');
|
||||
if(_screenState[serial]==='off'&&!tag)card.querySelector('.thumb').insertAdjacentHTML('beforeend','<div class="screen-tag off">🌙</div>');
|
||||
else if(_screenState[serial]!=='off'&&tag)tag.remove();
|
||||
// 信息区
|
||||
card.querySelector('.name').textContent=d.device_name||d.model||'设备';
|
||||
card.querySelector('.ip').textContent=shortIp(serial);
|
||||
card.querySelector('.model').textContent=d.model||'';
|
||||
const action=d.current_action
|
||||
?(d.task_job?'<b>'+esc(d.task_job)+'</b> · ':'')+esc(d.current_action)
|
||||
:(d.task_job?'<b>'+esc(d.task_job)+'</b>':'');
|
||||
card.querySelector('.action').innerHTML=action;
|
||||
// 进度
|
||||
const progWrap=card.querySelector('.prog-wrap');
|
||||
if(progWrap)progWrap.innerHTML=fmtProgress(d.progress);
|
||||
else if(d.progress&&d.progress.total)card.querySelector('.info').insertAdjacentHTML('beforeend','<div class="prog-wrap">'+fmtProgress(d.progress)+'</div>');
|
||||
// 离线占位切换
|
||||
const img=card.querySelector('img[data-thumb]');
|
||||
const ph=card.querySelector('.ph');
|
||||
if(d.present){if(img)img.style.display='block';if(ph)ph.style.display='none';}
|
||||
else{if(img)img.style.display='none';if(ph)ph.style.display='flex';}
|
||||
}else{
|
||||
grid.insertAdjacentHTML('beforeend',cardHtml(d,i));
|
||||
const nc=grid.lastElementChild;
|
||||
if(!d.present)nc.querySelector('.ph').style.display='flex';
|
||||
}
|
||||
});
|
||||
refreshThumbs();
|
||||
}
|
||||
|
||||
// 缩略图轮询（2.5s）：fetch 读取 X-Screen-State 头 → blob 喂 img
|
||||
async function refreshThumbs(){
|
||||
// 进入设备操作弹窗后：停止全部缩略图获取，资源全部给当前设备的高清流
|
||||
if(_ctrlSerial)return;
|
||||
if(document.visibilityState!=='visible')return;
|
||||
const now=Date.now();
|
||||
const imgs=[...document.querySelectorAll('img[data-thumb]')];
|
||||
await Promise.all(imgs.map(async img=>{
|
||||
const serial=img.dataset.thumb;
|
||||
try{
|
||||
const r=await fetch('/api/screen/thumb?serial='+encodeURIComponent(serial)+'&t='+now);
|
||||
if(!r.ok)return;
|
||||
_screenState[serial]=r.headers.get('X-Screen-State')||'unknown';
|
||||
const blob=await r.blob();
|
||||
if(blob.size>0)img.src=URL.createObjectURL(blob);
|
||||
// 状态角标变化时更新（熄屏中/亮屏中）
|
||||
const card=img.closest('.card');
|
||||
if(card){
|
||||
const d=_devices.find(x=>x.serial===serial);
|
||||
if(d&&d.present&&!(['running','connecting','error','failed'].includes(d.worker_status))){
|
||||
const badge=card.querySelector('.badge');
|
||||
const txt=badgeText(d);
|
||||
if(badge&&badge.textContent!==txt)badge.innerHTML='<span class="dot"></span>'+txt;
|
||||
const tag=card.querySelector('.screen-tag');
|
||||
if(_screenState[serial]==='off'&&!tag)card.querySelector('.thumb').insertAdjacentHTML('beforeend','<div class="screen-tag off">🌙</div>');
|
||||
else if(_screenState[serial]!=='off'&&tag)tag.remove();
|
||||
}
|
||||
}
|
||||
}catch(e){}
|
||||
}));
|
||||
}
|
||||
|
||||
// ================== 一键亮屏 ==================
|
||||
async function wakeAll(){
|
||||
const btn=document.getElementById('btn-wake-all');
|
||||
btn.disabled=true;btn.textContent='亮屏中...';
|
||||
const r=await apiPost('/api/device/screen_all',{mode:'on'});
|
||||
btn.disabled=false;btn.textContent='💡 一键亮屏';
|
||||
if(r&&r.ok){refreshStatus();setTimeout(refreshThumbs,800);}
|
||||
}
|
||||
|
||||
// ================== 设备操作弹窗（看屏 + 触控） ==================
|
||||
function openCtrl(serial){
|
||||
const d=_devices.find(x=>x.serial===serial);
|
||||
if(!d)return;
|
||||
_ctrlSerial=serial;
|
||||
document.getElementById('ctrl-name').textContent=d.device_name||d.model||shortIp(serial);
|
||||
document.getElementById('ctrl-sub').textContent=serial;
|
||||
document.getElementById('ctrl-overlay').classList.add('show');
|
||||
const img=document.getElementById('ctrl-img');
|
||||
img.src='';
|
||||
document.getElementById('ctrl-loading').style.display='flex';
|
||||
img.onload=()=>{document.getElementById('ctrl-loading').style.display='none';};
|
||||
img.onerror=()=>{document.getElementById('ctrl-loading').style.display='none';};
|
||||
startCtrlStream();
|
||||
}
|
||||
function closeCtrl(){
|
||||
_ctrlSerial='';
|
||||
document.getElementById('ctrl-overlay').classList.remove('show');
|
||||
document.getElementById('ctrl-img').src='';
|
||||
}
|
||||
function startCtrlStream(){
|
||||
if(!_ctrlSerial)return;
|
||||
const img=document.getElementById('ctrl-img');
|
||||
img.src='/api/screen/stream?serial='+encodeURIComponent(_ctrlSerial)+'&q=85&fps=10&t='+Date.now(); // 弹窗高清高帧
|
||||
}
|
||||
function updateCtrlHead(){
|
||||
const d=_devices.find(x=>x.serial===_ctrlSerial);
|
||||
if(!d)return;
|
||||
document.getElementById('ctrl-name').textContent=d.device_name||d.model||shortIp(_ctrlSerial);
|
||||
document.getElementById('ctrl-sub').textContent=_ctrlSerial+(d.present?'':'（离线）');
|
||||
}
|
||||
// 坐标映射：显示尺寸 -> 设备原生分辨率
|
||||
// 图片 object-fit:contain 时实际绘制区域小于盒子（居中留黑边），
|
||||
// 必须按绘制区域换算，否则黑边/偏移导致点击错位
|
||||
function ctrlCoords(ev){
|
||||
const img=document.getElementById('ctrl-img');
|
||||
if(!img.naturalWidth||!img.naturalHeight)return[null,null];
|
||||
const r=img.getBoundingClientRect();
|
||||
const scale=Math.min(r.width/img.naturalWidth,r.height/img.naturalHeight);
|
||||
const drawW=img.naturalWidth*scale, drawH=img.naturalHeight*scale;
|
||||
const ox=(r.width-drawW)/2, oy=(r.height-drawH)/2; // contain 偏移
|
||||
const px=ev.clientX-r.left, py=ev.clientY-r.top;
|
||||
if(px<ox||px>ox+drawW||py<oy||py>oy+drawH)return[null,null]; // 黑边点击忽略
|
||||
return[Math.round((px-ox)/scale),Math.round((py-oy)/scale)];
|
||||
}
|
||||
function ctrlTap(x,y){
|
||||
if(x==null||!x)return;
|
||||
apiPost('/api/screen/tap',{serial:_ctrlSerial,x,y});
|
||||
}
|
||||
function ctrlSwipe(x1,y1,x2,y2){
|
||||
if(x1==null)return;
|
||||
apiPost('/api/screen/swipe',{serial:_ctrlSerial,x1,y1,x2,y2});
|
||||
}
|
||||
function ctrlKey(key){
|
||||
if(!_ctrlSerial)return;
|
||||
apiPost('/api/screen/key',{serial:_ctrlSerial,key});
|
||||
}
|
||||
function ctrlWake(){if(_ctrlSerial)apiPost('/api/device/screen_all',{mode:'on',serials:[_ctrlSerial]});}
|
||||
function ctrlSleep(){if(_ctrlSerial)apiPost('/api/device/screen_all',{mode:'off',serials:[_ctrlSerial]});}
|
||||
function ctrlSendText(){
|
||||
const inp=document.getElementById('ctrl-text');
|
||||
const text=(inp.value||'').trim();
|
||||
if(!_ctrlSerial||!text)return;
|
||||
apiPost('/api/screen/text',{serial:_ctrlSerial,text}).then(r=>{if(r&&r.ok)inp.value='';});
|
||||
}
|
||||
// 鼠标/触控：拖拽=滑动，点按=轻触
|
||||
(function(){
|
||||
const screen=document.getElementById('ctrl-screen');
|
||||
let dragging=false,sx=0,sy=0;
|
||||
screen.addEventListener('mousedown',ev=>{
|
||||
if(!_ctrlSerial)return;
|
||||
ev.preventDefault();dragging=true;
|
||||
const[x,y]=ctrlCoords(ev);sx=x;sy=y;
|
||||
});
|
||||
screen.addEventListener('mousemove',ev=>{if(dragging)ev.preventDefault();});
|
||||
window.addEventListener('mouseup',ev=>{
|
||||
if(!dragging)return;dragging=false;
|
||||
const[x,y]=ctrlCoords(ev);
|
||||
if(x==null)return;
|
||||
if(Math.abs(x-sx)<8&&Math.abs(y-sy)<8)ctrlTap(x,y);
|
||||
else ctrlSwipe(sx,sy,x,y);
|
||||
});
|
||||
screen.addEventListener('touchstart',ev=>{
|
||||
if(!_ctrlSerial)return;
|
||||
ev.preventDefault();const t=ev.touches[0];dragging=true;
|
||||
const[x,y]=ctrlCoords(t);sx=x;sy=y;
|
||||
},{passive:false});
|
||||
screen.addEventListener('touchend',ev=>{
|
||||
if(!dragging)return;dragging=false;
|
||||
const t=ev.changedTouches[0];
|
||||
const[x,y]=ctrlCoords(t);
|
||||
if(x==null)return;
|
||||
if(Math.abs(x-sx)<8&&Math.abs(y-sy)<8)ctrlTap(x,y);
|
||||
else ctrlSwipe(sx,sy,x,y);
|
||||
},{passive:false});
|
||||
})();
|
||||
|
||||
// 定时器
|
||||
setInterval(()=>{if(document.visibilityState==='visible')refreshThumbs();},5000); // 网格低帧率（省资源）
|
||||
setInterval(()=>{if(document.visibilityState==='visible')refreshStatus();},5000);
|
||||
|
||||
// 初始化
|
||||
initCsrf();tickClock();setInterval(tickClock,1000);
|
||||
refreshStatus();
|
||||
document.addEventListener('visibilitychange',()=>{
|
||||
if(document.visibilityState==='visible'){refreshStatus();refreshThumbs();}
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,28 @@
|
||||
"""Web 层蓝图包：web_server.py 只保留 app 初始化与装配，路由按功能域拆分。
|
||||
|
||||
模块划分（按功能定位问题）：
|
||||
auth — 登录/登出/CSRF/权限装饰器/页面路由（/、/wall）
|
||||
monitor — 状态/运行控制/设备操作/远程看屏
|
||||
tasks — 任务计划/分组/自定义动作/元素抓取/步骤测试
|
||||
admin — 用户管理/日志
|
||||
tools — adb 终端/剪贴板注入/应用版本
|
||||
devices — 设备池管理
|
||||
apks — 应用管理
|
||||
tailscale — Tailscale 管理
|
||||
"""
|
||||
from flask import Blueprint
|
||||
|
||||
|
||||
def register_blueprints(app):
|
||||
"""注册全部蓝图（url_prefix 为空，路由路径保持原样）。"""
|
||||
from .auth import bp as auth_bp
|
||||
from .monitor import bp as monitor_bp
|
||||
from .tasks_api import bp as tasks_bp
|
||||
from .admin_api import bp as admin_bp
|
||||
from .tools_api import bp as tools_bp
|
||||
from .devices_api import bp as devices_bp
|
||||
from .apks_api import bp as apks_bp
|
||||
from .tailscale_api import bp as tailscale_bp
|
||||
for bp in (auth_bp, monitor_bp, tasks_bp, admin_bp, tools_bp,
|
||||
devices_bp, apks_bp, tailscale_bp):
|
||||
app.register_blueprint(bp)
|
||||
@@ -0,0 +1,101 @@
|
||||
"""管理域 API：用户管理/日志查看。"""
|
||||
import os
|
||||
import time
|
||||
|
||||
from flask import Blueprint, jsonify, request
|
||||
from flask_login import current_user
|
||||
from flask import session
|
||||
|
||||
from core.logger import _LOG_DIR, _MODULE_FILES
|
||||
from core.models import db, User
|
||||
from web import context
|
||||
from web.auth import (admin_required, perm_required, _validate_perms,
|
||||
PERM_LOGS)
|
||||
|
||||
bp = Blueprint("admin", __name__)
|
||||
|
||||
@bp.route("/api/users")
|
||||
@admin_required
|
||||
def api_users_list():
|
||||
users = [{"id": u.id, "username": u.username,
|
||||
"is_admin": u.is_admin, "perms": u.get_perms()} for u in User.query.all()]
|
||||
return jsonify({"ok": True, "users": users})
|
||||
|
||||
@bp.route("/api/users", methods=["POST"])
|
||||
@admin_required
|
||||
def api_users_create():
|
||||
data = request.json or {}
|
||||
username = (data.get("username") or "").strip()
|
||||
password = data.get("password", "")
|
||||
if not username or not password:
|
||||
return jsonify({"ok": False, "error": "用户名和密码不能为空"}), 400
|
||||
if User.query.filter_by(username=username).first():
|
||||
return jsonify({"ok": False, "error": "用户名已存在"}), 400
|
||||
# 默认普通用户（最小权限）；管理员由 is_admin 决定，权限位照常保存（降级后生效）
|
||||
u = User(username=username, is_admin=bool(data.get("is_admin", False)))
|
||||
u.set_perms(_validate_perms(data.get("perms") or []))
|
||||
u.set_password(password)
|
||||
db.session.add(u)
|
||||
db.session.commit()
|
||||
_log.info(f"创建用户 {username} (admin={u.is_admin}, perms={u.get_perms()})")
|
||||
return jsonify({"ok": True, "msg": "用户已创建"})
|
||||
|
||||
@bp.route("/api/users/<int:uid>", methods=["PUT"])
|
||||
@admin_required
|
||||
def api_users_update(uid):
|
||||
u = User.query.get(uid)
|
||||
if not u:
|
||||
return jsonify({"ok": False, "error": "用户不存在"}), 404
|
||||
data = request.json or {}
|
||||
if "password" in data and data["password"]:
|
||||
u.set_password(data["password"])
|
||||
if "is_admin" in data:
|
||||
new_admin = bool(data["is_admin"])
|
||||
if u.is_admin and not new_admin and User.query.filter_by(is_admin=True).count() <= 1:
|
||||
return jsonify({"ok": False, "error": "不能取消最后一个管理员"}), 400
|
||||
u.is_admin = new_admin
|
||||
if "perms" in data:
|
||||
u.set_perms(_validate_perms(data["perms"]))
|
||||
db.session.commit()
|
||||
_log.info(f"更新用户 {u.username} (admin={u.is_admin}, perms={u.get_perms()})")
|
||||
return jsonify({"ok": True, "msg": "用户已更新"})
|
||||
|
||||
@bp.route("/api/users/<int:uid>", methods=["DELETE"])
|
||||
@admin_required
|
||||
def api_users_delete(uid):
|
||||
u = User.query.get(uid)
|
||||
if not u:
|
||||
return jsonify({"ok": False, "error": "用户不存在"}), 404
|
||||
if u.username == "admin":
|
||||
return jsonify({"ok": False, "error": "不能删除默认管理员"}), 400
|
||||
if u.id == current_user.id:
|
||||
return jsonify({"ok": False, "error": "不能删除当前登录用户"}), 400
|
||||
if u.is_admin and User.query.filter_by(is_admin=True).count() <= 1:
|
||||
return jsonify({"ok": False, "error": "不能删除最后一个管理员"}), 400
|
||||
db.session.delete(u)
|
||||
db.session.commit()
|
||||
_log.info(f"删除用户 {u.username}")
|
||||
return jsonify({"ok": True, "msg": "用户已删除"})
|
||||
|
||||
|
||||
# ================== API：日志查看 ==================
|
||||
|
||||
@bp.route("/api/logs")
|
||||
@perm_required(PERM_LOGS)
|
||||
def api_logs():
|
||||
files = list(_MODULE_FILES.values())
|
||||
current = request.args.get("file", "core.log")
|
||||
lines = int(request.args.get("lines", 300))
|
||||
content = ""
|
||||
path = os.path.join(_LOG_DIR, current)
|
||||
if os.path.exists(path):
|
||||
try:
|
||||
with open(path, encoding="utf-8") as f:
|
||||
content = "".join(f.readlines()[-lines:])
|
||||
except Exception as e:
|
||||
content = f"读取失败: {e}"
|
||||
return jsonify({"ok": True, "content": content, "file": current, "files": files})
|
||||
|
||||
|
||||
# ================== API：运行控制 ==================
|
||||
|
||||
+123
@@ -0,0 +1,123 @@
|
||||
"""应用管理 API（APK 上传/安装/删除/设备已装应用）。"""
|
||||
import re
|
||||
import shlex
|
||||
import subprocess
|
||||
|
||||
from flask import Blueprint, jsonify, request
|
||||
from flask_login import login_required
|
||||
|
||||
from core import device_pool
|
||||
from core.adb_helper import adb_connect_light, _adb
|
||||
from web import context
|
||||
from web.auth import perm_required, PERM_APKS
|
||||
from web.common import _merged_device_list
|
||||
|
||||
bp = Blueprint("apks", __name__)
|
||||
|
||||
@bp.route("/api/apks")
|
||||
@login_required
|
||||
def api_apks_list():
|
||||
"""列出所有已上传的 APK。"""
|
||||
return jsonify({"ok": True, "apks": context.apk_mgr.list_all()})
|
||||
|
||||
@bp.route("/api/apks/upload", methods=["POST"])
|
||||
@perm_required(PERM_APKS)
|
||||
def api_apks_upload():
|
||||
"""上传 APK 文件（multipart/form-data，字段名 file）。"""
|
||||
file = request.files.get("file")
|
||||
if not file or not file.filename:
|
||||
return jsonify({"ok": False, "error": "未选择文件"}), 400
|
||||
info = context.apk_mgr.upload(file)
|
||||
if info:
|
||||
return jsonify({"ok": True, "apk": info,
|
||||
"msg": f"上传成功: {info['display_name']}"})
|
||||
return jsonify({"ok": False, "error": "上传失败，请检查文件格式"}), 500
|
||||
|
||||
@bp.route("/api/apks/<apk_id>", methods=["DELETE"])
|
||||
@perm_required(PERM_APKS)
|
||||
def api_apks_delete(apk_id):
|
||||
"""删除 APK 文件和记录。"""
|
||||
ok, msg = context.apk_mgr.delete(apk_id)
|
||||
if ok:
|
||||
return jsonify({"ok": True, "msg": msg})
|
||||
return jsonify({"ok": False, "error": msg}), 400
|
||||
|
||||
@bp.route("/api/apks/install/devices")
|
||||
@perm_required(PERM_APKS)
|
||||
def api_apks_install_devices():
|
||||
"""可安装设备列表（应用管理）：设备池在线设备 + 本机 adb 设备（含 USB 有线连接）。
|
||||
|
||||
source: pool=设备池 / usb=本机有线 adb / adb=本机网络 adb。
|
||||
"""
|
||||
devices, seen = [], set()
|
||||
try:
|
||||
online = set(device_pool.list_online())
|
||||
for serial in device_pool.list_configured():
|
||||
if serial in online:
|
||||
devices.append({"serial": serial, "model": "", "source": "pool"})
|
||||
seen.add(serial)
|
||||
except Exception:
|
||||
pass
|
||||
out = _adb("devices")
|
||||
for line in (out or "").splitlines()[1:]:
|
||||
parts = line.split()
|
||||
if len(parts) >= 2 and parts[0] and parts[0] not in seen:
|
||||
devices.append({"serial": parts[0], "model": "",
|
||||
"source": "usb" if ":" not in parts[0] else "adb"})
|
||||
seen.add(parts[0])
|
||||
return jsonify({"ok": True, "devices": devices})
|
||||
|
||||
@bp.route("/api/apks/install", methods=["POST"])
|
||||
@perm_required(PERM_APKS)
|
||||
def api_apks_install():
|
||||
"""批量安装 APK 到指定设备。参数: {apk_id, serials:[]}"""
|
||||
data = request.json or {}
|
||||
apk_id = data.get("apk_id", "")
|
||||
serials = data.get("serials", [])
|
||||
ok, msg = context.apk_mgr.install(apk_id, serials)
|
||||
if ok:
|
||||
return jsonify({"ok": True, "msg": msg})
|
||||
return jsonify({"ok": False, "error": msg}), 400
|
||||
|
||||
@bp.route("/api/apks/install/status")
|
||||
@login_required
|
||||
def api_apks_install_status():
|
||||
"""获取安装任务实时状态。"""
|
||||
status = context.apk_mgr.get_install_status()
|
||||
return jsonify({"ok": True, "status": status})
|
||||
|
||||
|
||||
# ================== API：维护（仅管理员） ==================
|
||||
# 维护功能：STF 容器一键重启 + adb 远程终端。两个接口都仅管理员可用。
|
||||
# adb 终端安全红线（技术约束）：绝不 kill-server / 绝不 disconnect IP:5555——
|
||||
# STF provider 共享该 adb transport，断开会让 STF 误判全部设备离线并触发重连。
|
||||
_ADB_BLOCKED_PATTERNS = ("kill-server", "disconnect")
|
||||
|
||||
|
||||
def _blocked_adb_cmd(cmd):
|
||||
"""命中红线的 adb 命令（kill-server / disconnect）直接拒绝。"""
|
||||
low = cmd.lower()
|
||||
return any(p in low for p in _ADB_BLOCKED_PATTERNS)
|
||||
|
||||
|
||||
def _merged_device_list():
|
||||
"""本地 adb（含 USB）+ 设备池的合并列表（[{serial, state}]）。
|
||||
|
||||
供维护终端/剪贴板注入/应用版本管理等设备选择场景共用。
|
||||
状态：device/offline=本机 adb 实际状态；pool=设备池已配置但本机未连接；
|
||||
stf_not_ready=STF agent 未就绪（迁移期保留，阶段 3 摘除 STF 后删除）。
|
||||
"""
|
||||
states = {}
|
||||
out = _adb("devices")
|
||||
for line in (out or "").splitlines()[1:]:
|
||||
parts = line.split()
|
||||
if len(parts) >= 2 and parts[0] and not parts[0].startswith("*"):
|
||||
states[parts[0]] = parts[1]
|
||||
try:
|
||||
for serial in device_pool.list_configured():
|
||||
if serial not in states:
|
||||
states[serial] = "pool"
|
||||
except Exception:
|
||||
pass
|
||||
return [{"serial": s, "state": st} for s, st in sorted(states.items())]
|
||||
|
||||
+157
@@ -0,0 +1,157 @@
|
||||
"""认证与页面路由：登录/登出/CSRF/权限装饰器/页面（/、/wall）。
|
||||
|
||||
CSRF 的 before_request 由 web_server 注册（app 级），本模块提供实现。
|
||||
"""
|
||||
import functools
|
||||
import secrets
|
||||
|
||||
from flask import (Blueprint, jsonify, request, redirect, url_for,
|
||||
render_template, make_response, session)
|
||||
from flask_login import (login_user, logout_user, login_required, current_user)
|
||||
|
||||
from core.logger import get_logger
|
||||
from core.models import User
|
||||
|
||||
_log = get_logger("web")
|
||||
|
||||
bp = Blueprint("auth", __name__)
|
||||
|
||||
|
||||
# ================== CSRF ==================
|
||||
def _csrf_token():
|
||||
"""获取或生成当前会话的 CSRF token（非 GET 请求需在 X-CSRF-Token 头携带）。"""
|
||||
if "csrf_token" not in session:
|
||||
session["csrf_token"] = secrets.token_hex(16)
|
||||
return session["csrf_token"]
|
||||
|
||||
|
||||
def _csrf_protect():
|
||||
"""非安全方法（POST/PUT/DELETE/PATCH）校验 X-CSRF-Token 请求头。"""
|
||||
if request.method not in ("POST", "PUT", "DELETE", "PATCH"):
|
||||
return
|
||||
# 登录表单（未登录，尚无 token）和静态文件跳过
|
||||
if request.endpoint in ("login", "static"):
|
||||
return
|
||||
sess = session.get("csrf_token", "")
|
||||
header = request.headers.get("X-CSRF-Token", "")
|
||||
if not sess or header != sess:
|
||||
return jsonify({"ok": False, "error": "CSRF 校验失败"}), 403
|
||||
|
||||
|
||||
@bp.route("/api/csrf")
|
||||
@login_required
|
||||
def api_csrf():
|
||||
"""获取 CSRF token（前端非 GET 请求需携带 X-CSRF-Token 头）。"""
|
||||
return jsonify({"ok": True, "token": _csrf_token()})
|
||||
|
||||
|
||||
# ================== 权限控制 ==================
|
||||
PERM_TASKS = "tasks"
|
||||
PERM_DEVICES = "devices"
|
||||
PERM_APKS = "apks"
|
||||
PERM_LOGS = "logs"
|
||||
ALL_PERMS = (PERM_TASKS, PERM_DEVICES, PERM_APKS, PERM_LOGS)
|
||||
_PERM_LABELS = {PERM_TASKS: "任务管理", PERM_DEVICES: "设备控制",
|
||||
PERM_APKS: "应用管理", PERM_LOGS: "日志查看"}
|
||||
|
||||
|
||||
def _has_perm(perm):
|
||||
"""当前用户是否拥有指定权限。管理员恒为 True。"""
|
||||
u = current_user
|
||||
return bool(u and (u.is_admin or u.has_perm(perm)))
|
||||
|
||||
|
||||
def _validate_perms(raw):
|
||||
"""校验权限位列表：只保留合法值、去重。返回合法列表。"""
|
||||
valid = set(ALL_PERMS)
|
||||
out = []
|
||||
for p in raw or []:
|
||||
if p in valid and p not in out:
|
||||
out.append(p)
|
||||
return out
|
||||
|
||||
|
||||
def perm_required(perm):
|
||||
"""路由装饰器：要求登录且拥有指定业务权限，否则 403。"""
|
||||
def deco(fn):
|
||||
@functools.wraps(fn)
|
||||
@login_required
|
||||
def wrapper(*args, **kwargs):
|
||||
if not _has_perm(perm):
|
||||
return jsonify({"ok": False,
|
||||
"error": f"无权限执行此操作（需要权限: {_PERM_LABELS.get(perm, perm)}）"}), 403
|
||||
return fn(*args, **kwargs)
|
||||
return wrapper
|
||||
return deco
|
||||
|
||||
|
||||
def admin_required(fn):
|
||||
"""路由装饰器：仅管理员可用（用户管理类接口），否则 403。"""
|
||||
@functools.wraps(fn)
|
||||
@login_required
|
||||
def wrapper(*args, **kwargs):
|
||||
if not current_user.is_admin:
|
||||
return jsonify({"ok": False, "error": "仅管理员可执行此操作"}), 403
|
||||
return fn(*args, **kwargs)
|
||||
return wrapper
|
||||
|
||||
|
||||
@bp.route("/api/me")
|
||||
@login_required
|
||||
def api_me():
|
||||
"""当前登录用户信息（含权限位），前端据此隐藏无权限的功能入口。"""
|
||||
u = current_user
|
||||
return jsonify({"ok": True, "user": {
|
||||
"id": u.id,
|
||||
"username": u.username,
|
||||
"is_admin": bool(u.is_admin),
|
||||
# 管理员返回全部权限位，前端统一用 perms 判断
|
||||
"perms": list(ALL_PERMS) if u.is_admin else u.get_perms(),
|
||||
}})
|
||||
|
||||
|
||||
# ================== 页面路由 ==================
|
||||
@bp.route("/")
|
||||
@login_required
|
||||
def index():
|
||||
"""单页应用首页。"""
|
||||
resp = make_response(render_template("admin/monitor.html"))
|
||||
resp.headers["Cache-Control"] = "no-store, no-cache, must-revalidate, max-age=0"
|
||||
resp.headers["Pragma"] = "no-cache"
|
||||
return resp
|
||||
|
||||
|
||||
@bp.route("/wall")
|
||||
@login_required
|
||||
def wall():
|
||||
"""监控大屏（独立全屏页面，供挂墙/电视展示）。
|
||||
|
||||
深色控制室风格；设备缩略图按需轮询（每设备 ~5s 一帧），
|
||||
20 台设备整体开销约 0.1 核 CPU + 50KB/s，普通电脑无压力。
|
||||
"""
|
||||
resp = make_response(render_template("admin/wall.html"))
|
||||
resp.headers["Cache-Control"] = "no-store, no-cache, must-revalidate, max-age=0"
|
||||
return resp
|
||||
|
||||
|
||||
@bp.route("/login", methods=["GET", "POST"])
|
||||
def login():
|
||||
if request.method == "POST":
|
||||
username = request.form.get("username", "")
|
||||
password = request.form.get("password", "")
|
||||
user = User.query.filter_by(username=username).first()
|
||||
if user and user.check_password(password):
|
||||
login_user(user)
|
||||
_csrf_token() # 建立 CSRF token，前端通过 /api/csrf 获取
|
||||
_log.info(f"用户 {username} 登录")
|
||||
return redirect(request.args.get("next") or url_for("auth.index"))
|
||||
return render_template("admin/login.html", error="用户名或密码错误")
|
||||
return render_template("admin/login.html", error=None)
|
||||
|
||||
|
||||
@bp.route("/logout")
|
||||
@login_required
|
||||
def logout():
|
||||
_log.info(f"用户 {current_user.username} 登出")
|
||||
logout_user()
|
||||
return redirect(url_for("auth.login"))
|
||||
@@ -0,0 +1,46 @@
|
||||
"""跨模块共享工具（web 层）。"""
|
||||
from core import device_pool
|
||||
from core.adb_helper import _adb
|
||||
from core.logger import get_logger
|
||||
|
||||
_log = get_logger("web")
|
||||
|
||||
|
||||
def _merged_device_list():
|
||||
"""本地 adb（含 USB）+ 设备池的合并列表（[{serial, state}]）。
|
||||
|
||||
供维护终端/剪贴板注入/应用版本管理等设备选择场景共用。
|
||||
状态：device/offline=本机 adb 实际状态；pool=设备池已配置但本机未连接。
|
||||
"""
|
||||
states = {}
|
||||
out = _adb("devices")
|
||||
for line in (out or "").splitlines()[1:]:
|
||||
parts = line.split()
|
||||
if len(parts) >= 2 and parts[0] and not parts[0].startswith("*"):
|
||||
states[parts[0]] = parts[1]
|
||||
try:
|
||||
for serial in device_pool.list_configured():
|
||||
if serial not in states:
|
||||
states[serial] = "pool"
|
||||
except Exception:
|
||||
pass
|
||||
return [{"serial": s, "state": st} for s, st in sorted(states.items())]
|
||||
|
||||
|
||||
def _device_screen_state(serial):
|
||||
"""设备屏幕状态：on/off/unknown（dumpsys power 只读查询）。
|
||||
|
||||
用 mWakefulness 判断（Asleep=熄屏）：MIUI 的 dumpsys display 没有
|
||||
mScreenState 字段，power 字段全机型存在。USB 设备查询失败返回 unknown。
|
||||
"""
|
||||
try:
|
||||
if ":" not in serial:
|
||||
return "unknown"
|
||||
out = _adb("-s", serial, "shell", "dumpsys", "power") or ""
|
||||
import re
|
||||
m = re.search(r"mWakefulness=(\w+)", out)
|
||||
if m:
|
||||
return "off" if m.group(1).lower() == "asleep" else "on"
|
||||
except Exception:
|
||||
pass
|
||||
return "unknown"
|
||||
@@ -0,0 +1,12 @@
|
||||
"""共享上下文：web_server 启动时注入全局对象，各蓝图模块从这里取。
|
||||
|
||||
避免蓝图模块与 web_server 循环 import。
|
||||
"""
|
||||
mgr = None # core.task_manager.TaskManager
|
||||
apk_mgr = None # core.apk_manager.ApkManager
|
||||
device_pool = None # core.device_pool
|
||||
|
||||
|
||||
def init(mgr_, apk_mgr_, device_pool_):
|
||||
global mgr, apk_mgr, device_pool
|
||||
mgr, apk_mgr, device_pool = mgr_, apk_mgr_, device_pool_
|
||||
@@ -0,0 +1,203 @@
|
||||
"""设备池管理 API（本地 SQLite 清单）。"""
|
||||
import threading
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
|
||||
from flask import Blueprint, jsonify, request
|
||||
|
||||
from core import device_pool, device_discovery
|
||||
from core.adb_helper import adb_connect
|
||||
from core.logger import get_logger
|
||||
from web.auth import perm_required, PERM_DEVICES
|
||||
|
||||
_log = get_logger("web")
|
||||
bp = Blueprint("devices", __name__)
|
||||
|
||||
@bp.route("/api/devices/pool", methods=["GET"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_pool_list():
|
||||
"""设备池清单（SQLite，含实时在线状态）。"""
|
||||
try:
|
||||
online = set(device_pool.list_online())
|
||||
except Exception:
|
||||
online = set()
|
||||
rows = device_pool.list_devices()
|
||||
for r in rows:
|
||||
r["online"] = r["serial"] in online
|
||||
return jsonify({"ok": True, "devices": rows})
|
||||
|
||||
@bp.route("/api/devices/pool/add", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_pool_add():
|
||||
"""添加/更新设备：{serial, name?, note?}。
|
||||
|
||||
IP:5555 设备添加后立即尝试 adb connect（不可达显示离线，不影响其他设备）。
|
||||
"""
|
||||
data = request.json or {}
|
||||
serial = (data.get("serial") or "").strip()
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "请输入设备 serial（如 100.100.10.20:5555）"}), 400
|
||||
is_new = device_pool.add_device(serial,
|
||||
name=(data.get("name") or "").strip(),
|
||||
note=(data.get("note") or "").strip())
|
||||
msg = "已添加" if is_new else "已更新"
|
||||
if ":" in serial:
|
||||
try:
|
||||
adb_connect(serial)
|
||||
except Exception:
|
||||
pass
|
||||
# 后台采集型号（不阻塞添加响应）
|
||||
import threading
|
||||
threading.Thread(target=device_pool.refresh_model, args=(serial,),
|
||||
daemon=True).start()
|
||||
_log.info(f"设备池管理: {msg} {serial}")
|
||||
return jsonify({"ok": True, "msg": msg, "is_new": is_new})
|
||||
|
||||
@bp.route("/api/devices/pool/remove", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_pool_remove():
|
||||
"""从设备池删除（不再参与调度；不影响其他系统）。"""
|
||||
serial = (request.json or {}).get("serial", "").strip()
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
ok = device_pool.remove_device(serial)
|
||||
if not ok:
|
||||
return jsonify({"ok": False, "error": "设备不存在"}), 404
|
||||
return jsonify({"ok": True, "msg": "已删除"})
|
||||
|
||||
@bp.route("/api/devices/pool/toggle", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_pool_toggle():
|
||||
"""启用/停用设备（停用后不参与调度）。"""
|
||||
data = request.json or {}
|
||||
serial = (data.get("serial") or "").strip()
|
||||
enabled = data.get("enabled")
|
||||
if not serial or enabled is None:
|
||||
return jsonify({"ok": False, "error": "缺少参数"}), 400
|
||||
ok = device_pool.set_enabled(serial, bool(enabled))
|
||||
if not ok:
|
||||
return jsonify({"ok": False, "error": "设备不存在"}), 404
|
||||
return jsonify({"ok": True, "msg": "已" + ("启用" if enabled else "停用")})
|
||||
|
||||
@bp.route("/api/devices/pool/reconnect", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_pool_reconnect():
|
||||
"""一键重连：并发 adb connect 池内全部 IP:5555 设备（后台执行，不阻塞）。"""
|
||||
def _run():
|
||||
try:
|
||||
serials = [s for s in device_pool.list_configured() if ":" in s]
|
||||
except Exception:
|
||||
return
|
||||
if not serials:
|
||||
return
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
with ThreadPoolExecutor(max_workers=10) as pool:
|
||||
futures = {pool.submit(adb_connect, s): s for s in serials}
|
||||
for _ in as_completed(futures):
|
||||
pass
|
||||
_log.info(f"设备池一键重连完成（{len(serials)} 台）")
|
||||
# 重连后顺手刷新型号
|
||||
try:
|
||||
device_pool.refresh_all_models()
|
||||
except Exception:
|
||||
pass
|
||||
import threading
|
||||
threading.Thread(target=_run, daemon=True).start()
|
||||
return jsonify({"ok": True, "msg": "重连已启动（后台并发，约 10-20 秒）"})
|
||||
|
||||
@bp.route("/api/devices/pool/refresh_models", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_pool_refresh_models():
|
||||
"""批量采集池内在线设备的型号（后台执行，不阻塞）。"""
|
||||
import threading
|
||||
threading.Thread(target=device_pool.refresh_all_models, daemon=True).start()
|
||||
return jsonify({"ok": True, "msg": "型号采集已启动（后台并发，约 10 秒）"})
|
||||
|
||||
|
||||
# ================== API：设备自动发现（扫描 → 待连接池 → 确认） ==================
|
||||
# 扫描只把设备放进待连接池（pending），用户确认后才加入正式设备池并连接。
|
||||
@bp.route("/api/devices/discovery", methods=["GET"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_discovery():
|
||||
"""发现状态 + 待连接列表（前端 10s 轮询一次请求）。"""
|
||||
try:
|
||||
status = device_discovery.get_status()
|
||||
pending = device_discovery.list_pending()
|
||||
except Exception as e:
|
||||
_log.warning(f"discovery 状态获取失败: {e}")
|
||||
return jsonify({"ok": False, "error": str(e)[:120]}), 503
|
||||
status["pending"] = pending
|
||||
return jsonify({"ok": True, **status})
|
||||
|
||||
|
||||
@bp.route("/api/devices/discovery/scan", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_discovery_scan():
|
||||
"""手动触发一轮扫描（后台执行，约 5-30 秒）。"""
|
||||
ok, result = device_discovery.scan_once(manual=True)
|
||||
if not ok:
|
||||
return jsonify({"ok": False, "error": result.get("error", "扫描失败")}), 409
|
||||
if "error" in result:
|
||||
return jsonify({"ok": False, "error": result["error"]}), 400
|
||||
return jsonify({"ok": True, "msg": "扫描已启动（后台执行，约 5-30 秒）",
|
||||
"result": result})
|
||||
|
||||
|
||||
@bp.route("/api/devices/discovery/confirm", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_discovery_confirm():
|
||||
"""确认连接：待连接 → 正式设备池 + 后台 adb connect + 采型号。"""
|
||||
data = request.json or {}
|
||||
serial = (data.get("serial") or "").strip()
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
ok, msg, is_new = device_discovery.confirm_pending(
|
||||
serial, name=(data.get("name") or "").strip())
|
||||
if not ok:
|
||||
return jsonify({"ok": False, "error": msg}), 404
|
||||
if ":" in serial:
|
||||
def _connect():
|
||||
try:
|
||||
adb_connect(serial)
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
device_pool.refresh_model(serial)
|
||||
except Exception:
|
||||
pass
|
||||
threading.Thread(target=_connect, daemon=True).start()
|
||||
_log.info(f"设备池管理: 发现确认 {serial}")
|
||||
return jsonify({"ok": True, "msg": msg, "is_new": is_new})
|
||||
|
||||
|
||||
@bp.route("/api/devices/discovery/ignore", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_discovery_ignore():
|
||||
"""忽略：从待连接池删除（下轮扫描可能再次发现）。"""
|
||||
serial = (request.json or {}).get("serial", "").strip()
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
ok, msg = device_discovery.ignore_pending(serial)
|
||||
if not ok:
|
||||
return jsonify({"ok": False, "error": msg}), 404
|
||||
return jsonify({"ok": True, "msg": msg})
|
||||
|
||||
|
||||
@bp.route("/api/devices/discovery/settings", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_devices_discovery_settings():
|
||||
"""保存发现配置（部分字段更新）：{enabled?, subnets?, interval?, port?}。"""
|
||||
data = request.json or {}
|
||||
ok, msg = device_discovery.save_settings(
|
||||
enabled=data.get("enabled"),
|
||||
subnets=data.get("subnets"),
|
||||
interval=data.get("interval"),
|
||||
port=data.get("port"))
|
||||
if not ok:
|
||||
return jsonify({"ok": False, "error": msg}), 400
|
||||
return jsonify({"ok": True, "msg": msg})
|
||||
|
||||
|
||||
# ================== API：Tailscale 管理（仅管理员） ==================
|
||||
# 通过 Tailscale 官方 API v2 管理 tailnet 设备（列表/改名/授权/密钥不过期/删除/生成 auth key）。
|
||||
# 设备 IP 由 tailnet 自动分配，API 无法修改，列表只读展示。
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN"><head><meta charset="UTF-8"><title>设备监控大屏</title>
|
||||
<style>
|
||||
*{box-sizing:border-box} body{font-family:-apple-system,"Segoe UI",Roboto,sans-serif;margin:0;background:#f0f2f5;color:#2c3e50}
|
||||
.header{background:#fff;padding:14px 24px;box-shadow:0 1px 4px rgba(0,0,0,.08);display:flex;align-items:center;gap:16px}
|
||||
.header h1{font-size:18px;margin:0} .header .ts{color:#95a5a6;font-size:12px;margin-left:auto}
|
||||
.header a{color:#1890ff;text-decoration:none;font-size:13px}
|
||||
.header a:hover{text-decoration:underline}
|
||||
.content{padding:20px 24px;max-width:1400px;margin:0 auto}
|
||||
.bar{display:flex;gap:8px;margin-bottom:16px;align-items:center;flex-wrap:wrap}
|
||||
button{padding:7px 16px;border:1px solid #d9d9d9;border-radius:4px;cursor:pointer;font-size:13px;background:#fff;color:#595959}
|
||||
button:hover{border-color:#40a9ff;color:#40a9ff} button.primary{background:#1890ff;color:#fff;border-color:#1890ff}
|
||||
button.primary:hover{background:#40a9ff} button.danger{color:#ff4d4f;border-color:#ff4d4f}
|
||||
button.danger:hover{background:#ff4d4f;color:#fff} button.sm{padding:3px 10px;font-size:12px}
|
||||
table{width:100%;border-collapse:collapse;background:#fff;border-radius:6px;overflow:hidden;box-shadow:0 1px 3px rgba(0,0,0,.08)}
|
||||
th,td{padding:9px 10px;text-align:left;border-bottom:1px solid #f0f0f0;font-size:13px}
|
||||
th{background:#fafafa;font-weight:600;color:#595959} tr:hover td{background:#fafafa}
|
||||
.badge{padding:2px 8px;border-radius:10px;font-size:11px;color:#fff}
|
||||
.b-running{background:#52c41a}.b-connecting{background:#faad14}.b-error{background:#ff4d4f}
|
||||
.b-done{background:#1890ff}.b-idle{background:#bfbfbf;color:#595959}.b-released{background:#8c8c8c}.b-failed{background:#ff4d4f}
|
||||
.ok{color:#52c41a}.no{color:#ff4d4f}.muted{color:#8c8c8c;font-size:12px}
|
||||
.err{color:#ff4d4f;font-size:12px;max-width:180px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
|
||||
.progress{width:70px;height:5px;background:#f0f0f0;border-radius:3px;overflow:hidden;display:inline-block;vertical-align:middle}
|
||||
.progress>div{height:100%;background:#1890ff}
|
||||
.tag{display:inline-block;background:#e6f7ff;color:#1890ff;padding:1px 8px;border-radius:3px;font-size:11px;margin:1px}
|
||||
.kv{display:inline-block;background:#f5f5f5;border-radius:3px;padding:0 6px;margin:1px;font-size:11px;color:#595959}
|
||||
.stats{display:flex;gap:16px;margin-bottom:16px}
|
||||
.stat-card{background:#fff;padding:14px 20px;border-radius:6px;box-shadow:0 1px 3px rgba(0,0,0,.08);min-width:120px}
|
||||
.stat-card .num{font-size:24px;font-weight:600;color:#1890ff}
|
||||
.stat-card .lbl{font-size:12px;color:#8c8c8c;margin-top:2px}
|
||||
</style></head><body>
|
||||
<div class="header">
|
||||
<h1>设备监控大屏</h1>
|
||||
<span class="muted" id="devCount"></span>
|
||||
<span class="ts" id="srvTime"></span>
|
||||
<a href="/admin" target="_blank">管理后台 →</a>
|
||||
</div>
|
||||
<div class="content">
|
||||
<div class="stats" id="stats"></div>
|
||||
<div class="bar">
|
||||
<button class="primary" onclick="doPost('/api/jobs/_quick/run')" title="快速启动：对全部空闲设备跑默认抖音养号">快速启动全部</button>
|
||||
<button class="danger" onclick="doPost('/api/stop_all')">停止全部</button>
|
||||
<button onclick="doPost('/api/release')">强制释放占用</button>
|
||||
<button onclick="loadStatus()">刷新</button>
|
||||
<span class="muted">每 5 秒自动刷新 · 分组/任务管理请到 <a href="/admin" target="_blank">管理后台</a></span>
|
||||
</div>
|
||||
<table><thead><tr>
|
||||
<th>设备</th><th>型号</th><th>STF</th><th>任务状态</th><th>抖音</th><th>进度</th>
|
||||
<th>任务名称</th><th>当前动作</th><th>操作计数</th><th>最近错误</th><th>操作</th>
|
||||
</tr></thead><tbody id="tb-devices"></tbody></table>
|
||||
</div>
|
||||
<script>
|
||||
const ACTION_LABELS={like:'点赞',comment:'评论',follow:'关注',share:'分享'};
|
||||
function doPost(url,body){return fetch(url,{method:'POST',headers:{'Content-Type':'application/json'},body:body?JSON.stringify(body):'{}'}).then(r=>r.json()).then(d=>{alert(JSON.stringify(d,null,1));loadStatus();}).catch(e=>alert(e));}
|
||||
function fmtActionCounts(c){
|
||||
if(!c||!Object.keys(c).length)return '<span class="muted">-</span>';
|
||||
const parts=Object.entries(c).filter(([_,v])=>v>0).map(([k,v])=>'<span class="kv">'+(ACTION_LABELS[k]||k)+v+'</span>');
|
||||
return parts.length?parts.join(''):'<span class="muted">-</span>';
|
||||
}
|
||||
async function loadStatus(){
|
||||
try{
|
||||
const r=await fetch('/api/status');const d=await r.json();if(!d.ok)return;
|
||||
document.getElementById('devCount').textContent='设备 '+d.devices.length;
|
||||
document.getElementById('srvTime').textContent=new Date(d.server_time*1000).toLocaleTimeString();
|
||||
// 统计卡片
|
||||
const running=d.devices.filter(x=>x.worker_status==='running').length;
|
||||
const idle=d.devices.filter(x=>x.worker_status==='idle').length;
|
||||
const error=d.devices.filter(x=>['error','failed'].includes(x.worker_status)).length;
|
||||
const occupied=d.devices.filter(x=>x.stf_occupied).length;
|
||||
document.getElementById('stats').innerHTML=
|
||||
'<div class="stat-card"><div class="num" style="color:#52c41a">'+running+'</div><div class="lbl">运行中</div></div>'+
|
||||
'<div class="stat-card"><div class="num" style="color:#1890ff">'+occupied+'</div><div class="lbl">STF占用</div></div>'+
|
||||
'<div class="stat-card"><div class="num" style="color:#bfbfbf">'+idle+'</div><div class="lbl">空闲</div></div>'+
|
||||
'<div class="stat-card"><div class="num" style="color:#ff4d4f">'+error+'</div><div class="lbl">异常</div></div>';
|
||||
// 设备表格
|
||||
document.getElementById('tb-devices').innerHTML=d.devices.map(dev=>{
|
||||
const stf=dev.stf_occupied?'<span class="badge b-running">占用</span>':'<span class="badge b-idle">空闲</span>';
|
||||
if(!dev.present)stf+=' <span class="no">离线</span>';
|
||||
const ws=dev.worker_status;
|
||||
const wb='<span class="badge b-'+ws+'">'+({idle:'未启动',connecting:'连接中',running:'运行中',done:'完成',error:'异常',released:'已释放',failed:'失败'}[ws]||ws)+'</span>';
|
||||
const dy=dev.douyin_running?'<span class="ok">●</span>':'<span class="no">○</span>';
|
||||
const pct=Math.round(dev.videos_watched/80*100);
|
||||
const prog='<span class="progress"><div style="width:'+pct+'%"></div></span> '+dev.videos_watched;
|
||||
const tname=dev.task_job?'<span class="tag">'+dev.task_job+'</span>':'<span class="muted">-</span>';
|
||||
const retry=dev.attempt>0?' <span class="muted">'+dev.attempt+'次</span>':'';
|
||||
const btn=dev.worker_status==='running'||dev.worker_status==='connecting'?'<button class="danger sm" onclick="doPost(\'/api/stop_device\',{serial:\''+dev.serial+'\'})">停止</button>':'';
|
||||
return '<tr><td>'+dev.serial+'</td><td>'+dev.model+'</td><td>'+stf+'</td><td>'+wb+'</td><td>'+dy+'</td><td>'+prog+'</td><td>'+tname+retry+'</td><td class="muted">'+(dev.current_action||'-')+'</td><td>'+fmtActionCounts(dev.action_counts)+'</td><td class="err" title="'+(dev.last_error||'')+'">'+(dev.last_error||'-')+'</td><td>'+btn+'</td></tr>';
|
||||
}).join('');
|
||||
}catch(e){console.error(e);}
|
||||
}
|
||||
loadStatus();
|
||||
setInterval(loadStatus,5000);
|
||||
</script>
|
||||
</body></html>
|
||||
+586
@@ -0,0 +1,586 @@
|
||||
"""监控域 API：状态/运行控制/设备操作/远程看屏。"""
|
||||
import time
|
||||
import threading
|
||||
import subprocess
|
||||
import shlex
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
|
||||
from flask import (Blueprint, jsonify, request, Response, render_template)
|
||||
from flask_login import login_required
|
||||
|
||||
from core import device_pool
|
||||
from core.adb_helper import (screenshot, list_installed_apps, adb_connect,
|
||||
adb_connect_light, _ADB_LOCK, _adb)
|
||||
from core.device_worker import (get_all_worker_status, clear_worker_error,
|
||||
clear_all_worker_errors)
|
||||
from web import context
|
||||
from web.auth import perm_required, PERM_DEVICES
|
||||
from web.common import _merged_device_list, _device_screen_state
|
||||
from config import ADB_PATH
|
||||
from core.logger import get_logger
|
||||
|
||||
_log = get_logger("web")
|
||||
|
||||
bp = Blueprint("monitor", __name__)
|
||||
|
||||
# 远程看屏参数
|
||||
_SCREEN_JPEG_QUALITY = 65
|
||||
_SCREEN_FRAME_GAP = 0.05
|
||||
|
||||
@bp.route("/api/health")
|
||||
def api_health():
|
||||
"""轻量健康检查：返回进程/设备/任务摘要，不暴露敏感信息，供运维探活。"""
|
||||
try:
|
||||
devices, err = context.mgr.get_status()
|
||||
devs = devices or []
|
||||
return jsonify({
|
||||
"ok": True,
|
||||
"status": "up",
|
||||
"time": time.time(),
|
||||
"device_total": len(devs),
|
||||
"device_online": sum(1 for d in devs if d.get("present")),
|
||||
"device_running": sum(1 for d in devs
|
||||
if d.get("worker_status") in ("running", "connecting")),
|
||||
"device_error": sum(1 for d in devs
|
||||
if d.get("worker_status") in ("error", "failed")),
|
||||
"jobs": len(context.mgr.jobs),
|
||||
})
|
||||
except Exception as e:
|
||||
return jsonify({"ok": False, "status": "down", "error": str(e)}), 500
|
||||
|
||||
|
||||
# ================== API：失败任务汇总 ==================
|
||||
|
||||
@bp.route("/api/summary")
|
||||
@login_required
|
||||
def api_summary():
|
||||
"""失败/异常任务汇总：各状态计数 + 异常设备列表（last_error / 重试次数）。
|
||||
|
||||
供监控页"异常汇总"面板使用，便于长期运行观察设备健康度。
|
||||
"""
|
||||
try:
|
||||
sts = get_all_worker_status()
|
||||
# 已删除/不在当前 STF 设备池的设备，其陈旧失败记录不应展示。
|
||||
# 复用 get_status 缓存（顺带触发上面的状态清理），STF 异常时不隐藏任何记录。
|
||||
try:
|
||||
devices, derr = context.mgr.get_status()
|
||||
if not derr:
|
||||
present = {d.get("serial") for d in devices}
|
||||
sts = [s for s in sts if s.get("serial") in present]
|
||||
except Exception:
|
||||
pass
|
||||
counts = {"total": 0, "running": 0, "done": 0,
|
||||
"error": 0, "failed": 0, "idle": 0}
|
||||
errors = []
|
||||
for s in sts:
|
||||
st = s.get("status", "idle")
|
||||
counts["total"] += 1
|
||||
if st in counts:
|
||||
counts[st] += 1
|
||||
if st in ("error", "failed") and s.get("last_error"):
|
||||
errors.append({
|
||||
"serial": s.get("serial"),
|
||||
"model": s.get("model", ""),
|
||||
"status": st,
|
||||
"last_error": s.get("last_error", ""),
|
||||
"task": s.get("task_job", ""),
|
||||
"attempt": s.get("attempt", 0),
|
||||
"updated": s.get("last_heartbeat", 0),
|
||||
})
|
||||
errors.sort(key=lambda x: x.get("updated", 0), reverse=True)
|
||||
return jsonify({"ok": True, "counts": counts, "errors": errors[:50]})
|
||||
except Exception as e:
|
||||
return jsonify({"ok": False, "error": str(e)}), 500
|
||||
|
||||
|
||||
# ================== API：状态（监控大屏用）==================
|
||||
|
||||
@bp.route("/api/status")
|
||||
@login_required
|
||||
def api_status():
|
||||
devices, err = context.mgr.get_status()
|
||||
if err:
|
||||
return jsonify({"ok": False, "error": err}), 500
|
||||
return jsonify({
|
||||
"ok": True, "devices": devices, "server_time": time.time(),
|
||||
"fg_scanning": context.mgr._fg_scanner.is_scanning,
|
||||
"fg_last_scan": context.mgr._fg_scanner.last_scan_time,
|
||||
})
|
||||
|
||||
@bp.route("/api/scan_foreground", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_scan_foreground():
|
||||
"""手动触发前台 App 扫描（不打扰设备）。"""
|
||||
started = context.mgr._fg_scanner.scan_once()
|
||||
if started:
|
||||
return jsonify({"ok": True, "msg": "扫描已启动"})
|
||||
return jsonify({"ok": False, "error": "已有扫描在进行中"})
|
||||
|
||||
@bp.route("/api/stop_device", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_stop_device():
|
||||
serial = (request.json or {}).get("serial", "")
|
||||
if context.mgr.stop_device(serial):
|
||||
return jsonify({"ok": True, "msg": f"已发送停止信号给 {serial}"})
|
||||
return jsonify({"ok": False, "error": f"{serial} 没有运行中的任务"}), 400
|
||||
|
||||
@bp.route("/locate")
|
||||
def locate_page():
|
||||
"""设备端定位页（免登录）：点亮后浏览器打开，大字显示设备 IP/序列号。
|
||||
|
||||
只展示 serial 文本，无任何平台数据，免登录可接受。
|
||||
"""
|
||||
serial = request.args.get("serial", "")
|
||||
return render_template_string(
|
||||
"""<!DOCTYPE html><html><head><meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<title>设备定位</title><style>
|
||||
body{margin:0;background:#000;color:#fff;display:flex;flex-direction:column;
|
||||
align-items:center;justify-content:center;height:100vh;font-family:monospace}
|
||||
.serial{font-size:min(9vw,72px);font-weight:700;color:#ffd700;word-break:break-all;padding:0 20px;text-align:center}
|
||||
.ip{font-size:min(5vw,36px);color:#7dd3fc;margin-top:24px;word-break:break-all;padding:0 20px;text-align:center}
|
||||
.hint{font-size:min(3vw,16px);color:#64748b;margin-top:40px}
|
||||
</style></head><body>
|
||||
<div class="serial">{{ serial }}</div>
|
||||
<div class="ip">{{ ip }}</div>
|
||||
<div class="hint">定位完成 · 按返回键退出</div>
|
||||
</body></html>""",
|
||||
serial=_esc(serial), ip=_esc(serial.split(":")[0]))
|
||||
|
||||
|
||||
# 常见浏览器包名（结束定位时 force-stop 用）
|
||||
_BROWSER_PKGS = {"com.android.browser", "com.miui.browser", "com.android.chrome",
|
||||
"com.brave.browser", "com.opera.browser", "org.mozilla.firefox",
|
||||
"com.UCMobile", "com.tencent.mtt", "com.baidu.browser.apps"}
|
||||
# 定位时启动的浏览器：serial -> 包名（结束定位时无论前后台都关闭它）
|
||||
_locate_browsers = {}
|
||||
_locate_lock = threading.Lock()
|
||||
|
||||
|
||||
def _current_focus_pkg(serial):
|
||||
"""取设备当前前台包名（dumpsys window 解析，失败返回空串）。"""
|
||||
try:
|
||||
r = subprocess.run([ADB_PATH, "-s", serial, "shell", "dumpsys", "window"],
|
||||
capture_output=True, timeout=20)
|
||||
out = (r.stdout or b"").decode("utf-8", errors="replace")
|
||||
m = re.search(r"mCurrentFocus=.*?([\w.]+)/", out)
|
||||
return m.group(1) if m else ""
|
||||
except Exception:
|
||||
return ""
|
||||
|
||||
@bp.route("/api/device/locate/stop", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_device_locate_stop():
|
||||
"""结束定位：关闭定位启动的浏览器（无论当前是否前台）。
|
||||
|
||||
优先 force-stop 定位时记录下的浏览器包名（切到后台也能关掉）；
|
||||
无记录时退回：前台是浏览器 → force-stop；否则按返回键（不误杀任务应用）。
|
||||
"""
|
||||
serial = str((request.json or {}).get("serial", "")).strip()
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少设备 serial"}), 400
|
||||
try:
|
||||
if ":" in serial:
|
||||
adb_connect(serial)
|
||||
# 1. 优先关闭定位时启动的浏览器（无论前后台）
|
||||
with _locate_lock:
|
||||
started = _locate_browsers.pop(serial, None)
|
||||
if started:
|
||||
subprocess.run([ADB_PATH, "-s", serial, "shell", "am", "force-stop", started],
|
||||
capture_output=True, timeout=20)
|
||||
msg = f"已关闭定位浏览器 {started}"
|
||||
else:
|
||||
# 2. 退回：前台是浏览器则关闭，否则返回键轻量退出
|
||||
pkg = _current_focus_pkg(serial)
|
||||
if pkg in _BROWSER_PKGS:
|
||||
subprocess.run([ADB_PATH, "-s", serial, "shell", "am", "force-stop", pkg],
|
||||
capture_output=True, timeout=20)
|
||||
msg = f"已关闭浏览器 {pkg}"
|
||||
else:
|
||||
subprocess.run([ADB_PATH, "-s", serial, "shell", "input", "keyevent", "4"],
|
||||
capture_output=True, timeout=15) # BACK 轻量退出
|
||||
msg = "已按返回键退出" + (f"（前台 {pkg}）" if pkg else "")
|
||||
_log.info(f"结束定位 {serial}: {msg}")
|
||||
return jsonify({"ok": True, "msg": msg})
|
||||
except Exception as e:
|
||||
return jsonify({"ok": False, "error": f"结束定位失败: {e}"}), 502
|
||||
|
||||
@bp.route("/api/device/screen_all", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_device_screen_all():
|
||||
"""批量亮屏/息屏（并发）。mode: on=亮屏解锁 / off=息屏。
|
||||
|
||||
请求可带 serials 指定设备（前端勾选）；不带则作用于全部在线设备。
|
||||
息屏会中断运行中的任务（u2 无法操作），前端已有确认提示。
|
||||
"""
|
||||
data = request.json or {}
|
||||
mode = data.get("mode", "on")
|
||||
try:
|
||||
online = set(device_pool.list_online())
|
||||
except Exception as e:
|
||||
return jsonify({"ok": False, "error": f"获取设备列表失败: {e}"}), 502
|
||||
serials = data.get("serials") or []
|
||||
if serials:
|
||||
# 指定设备：过滤掉不在线的（离线设备操作无意义，直接跳过）
|
||||
serials = [s for s in serials if s in online]
|
||||
else:
|
||||
serials = list(online)
|
||||
if not serials:
|
||||
return jsonify({"ok": False, "error": "无在线设备"}), 400
|
||||
|
||||
def _do(serial):
|
||||
try:
|
||||
if ":" in serial:
|
||||
adb_connect(serial)
|
||||
if mode == "off":
|
||||
subprocess.run([ADB_PATH, "-s", serial, "shell", "input", "keyevent", "26"],
|
||||
capture_output=True, timeout=15) # KEYCODE_POWER 息屏
|
||||
else:
|
||||
subprocess.run([ADB_PATH, "-s", serial, "shell", "input", "keyevent", "224"],
|
||||
capture_output=True, timeout=15) # WAKEUP
|
||||
subprocess.run([ADB_PATH, "-s", serial, "shell", "wm", "dismiss-keyguard"],
|
||||
capture_output=True, timeout=15)
|
||||
return True
|
||||
except Exception:
|
||||
return False
|
||||
|
||||
with ThreadPoolExecutor(max_workers=min(10, len(serials))) as pool:
|
||||
results = list(pool.map(_do, serials))
|
||||
ok_n = sum(1 for x in results if x)
|
||||
_log.info(f"批量{'息屏' if mode == 'off' else '亮屏'}: 成功 {ok_n}/{len(serials)}")
|
||||
return jsonify({"ok": True, "success": ok_n, "total": len(serials)})
|
||||
|
||||
@bp.route("/api/device/locate", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_device_locate():
|
||||
"""定位设备：点亮屏幕并解除锁屏，可选打开大字定位页（查找设备用）。
|
||||
|
||||
请求 {"serial": "...", "show": true}：show=true 时额外用浏览器打开
|
||||
平台 /locate 定位页，全屏大字显示设备 IP（更醒目，但会切换前台，
|
||||
任务运行中慎用）。点亮组合：WAKEUP → dismiss-keyguard → MENU 兜底。
|
||||
绝不 disconnect，红线。
|
||||
"""
|
||||
data = request.json or {}
|
||||
serial = str(data.get("serial", "")).strip()
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少设备 serial"}), 400
|
||||
try:
|
||||
if ":" in serial:
|
||||
adb_connect(serial)
|
||||
for cmd in (["shell", "input", "keyevent", "224"],
|
||||
["shell", "wm", "dismiss-keyguard"],
|
||||
["shell", "input", "keyevent", "82"]):
|
||||
try:
|
||||
subprocess.run([ADB_PATH, "-s", serial, *cmd],
|
||||
capture_output=True, timeout=15)
|
||||
except Exception:
|
||||
pass # 单步失败不阻塞，继续下一步
|
||||
msgs = ["屏幕已点亮"]
|
||||
if data.get("show"):
|
||||
# 用设备浏览器打开定位页（设备走 tailnet 访问本机 100.100.10.2:18050）
|
||||
locate_url = f"http://100.100.10.2:18050/locate?serial={urllib.parse.quote(serial)}"
|
||||
r = subprocess.run([ADB_PATH, "-s", serial, "shell", "am", "start",
|
||||
"-a", "android.intent.action.VIEW", "-d", locate_url],
|
||||
capture_output=True, timeout=20)
|
||||
out = ((r.stdout or b"") + (r.stderr or b"")).decode("utf-8", errors="replace")
|
||||
if "error" in out.lower() or "exception" in out.lower():
|
||||
msgs.append(f"打开定位页失败: {out.strip()[:80]}")
|
||||
else:
|
||||
msgs.append("已打开大字定位页（按返回键退出）")
|
||||
# 记录启动的浏览器包名：结束定位时无论前后台都关闭它。
|
||||
# 优先从 am start 输出解析 pkg=（浏览器可能尚未到前台，前台检测会扑空）
|
||||
pkg = ""
|
||||
m2 = re.search(r"pkg=([\w.]+)", out)
|
||||
if m2 and m2.group(1) in _BROWSER_PKGS:
|
||||
pkg = m2.group(1)
|
||||
else:
|
||||
time.sleep(1.5) # 等浏览器切到前台再查
|
||||
pkg = _current_focus_pkg(serial)
|
||||
if pkg in _BROWSER_PKGS:
|
||||
with _locate_lock:
|
||||
_locate_browsers[serial] = pkg
|
||||
_log.info(f"定位设备 {serial}: {'; '.join(msgs)}")
|
||||
return jsonify({"ok": True, "msg": f"{serial} {'；'.join(msgs)}"})
|
||||
except Exception as e:
|
||||
return jsonify({"ok": False, "error": f"定位失败: {e}"}), 502
|
||||
|
||||
@bp.route("/api/stop_all", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_stop_all():
|
||||
stopped = context.mgr.stop_all()
|
||||
return jsonify({"ok": True, "stopped": stopped})
|
||||
|
||||
@bp.route("/api/device/clear_error", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_device_clear_error():
|
||||
"""清除单台设备的异常状态（error/failed → idle），供设备列表"清除异常"按钮使用。"""
|
||||
serial = (request.json or {}).get("serial", "")
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
if serial in context.mgr.get_running():
|
||||
return jsonify({"ok": False, "error": "设备正在运行或等待重试，无法清除"}), 400
|
||||
if not clear_worker_error(serial):
|
||||
return jsonify({"ok": False, "error": "设备正在运行任务，无法清除"}), 400
|
||||
_log.info(f"清除设备 {serial} 的异常状态")
|
||||
return jsonify({"ok": True, "msg": f"已清除 {serial} 的异常状态"})
|
||||
|
||||
@bp.route("/api/device/clear_all_errors", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_device_clear_all_errors():
|
||||
"""一键清除所有异常/失败设备（跳过正在运行/等待重试的）。"""
|
||||
running = set(context.mgr.get_running())
|
||||
cleared = clear_all_worker_errors(exclude=running)
|
||||
_log.info(f"一键清除异常：共清除 {cleared} 台")
|
||||
return jsonify({"ok": True, "cleared": cleared,
|
||||
"msg": f"已清除 {cleared} 台设备的异常状态"})
|
||||
|
||||
@bp.route("/api/device/screenshot")
|
||||
@login_required
|
||||
def api_device_screenshot():
|
||||
"""获取设备当前画面截图（PNG）。
|
||||
|
||||
用 adb exec-out screencap -p，只读操作，不抢占 u2 的 atx-agent 通道，
|
||||
任务运行中调用安全。直接返回 image/png，前端用 <img> 加载。
|
||||
?serial=xxx 设备 serial
|
||||
?t=123 时间戳，避免浏览器缓存（前端自动加）
|
||||
"""
|
||||
serial = request.args.get("serial", "")
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
ok, data = screenshot(serial)
|
||||
if ok:
|
||||
return Response(data, mimetype="image/png",
|
||||
headers={"Cache-Control": "no-store"})
|
||||
return jsonify({"ok": False, "error": data}), 500
|
||||
|
||||
@bp.route("/api/devices/<serial>/apps")
|
||||
@login_required
|
||||
def api_device_apps(serial):
|
||||
"""获取指定设备上已安装的应用列表（包名 + versionCode + versionName + 路径）。"""
|
||||
ok, data = list_installed_apps(serial)
|
||||
if ok:
|
||||
return jsonify({"ok": True, "apps": data})
|
||||
return jsonify({"ok": False, "error": data}), 500
|
||||
|
||||
|
||||
# ================== 自定义动作（步骤打包） ==================
|
||||
|
||||
@bp.route("/api/screen/stream")
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_screen_stream():
|
||||
"""远程看屏：MJPEG 实时画面流（multipart/x-mixed-replace）。
|
||||
|
||||
?serial=xxx 设备 serial
|
||||
浏览器 <img> 直接渲染；客户端断开（GeneratorExit）自动停止，不占资源。
|
||||
设备离线/atx-agent 无响应时流自然结束，前端提示重新连接。
|
||||
"""
|
||||
serial = request.args.get("serial", "")
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
|
||||
# 参数：q=JPEG 质量（大屏弹窗用 85 更清晰）；fps=目标帧率（0=默认节流）
|
||||
try:
|
||||
quality = max(30, min(95, int(request.args.get("q", _SCREEN_JPEG_QUALITY))))
|
||||
fps = float(request.args.get("fps", 0) or 0)
|
||||
except ValueError:
|
||||
quality, fps = _SCREEN_JPEG_QUALITY, 0
|
||||
gap = (1.0 / fps) if fps > 0 else _SCREEN_FRAME_GAP
|
||||
|
||||
def generate():
|
||||
import io
|
||||
import uiautomator2 as u2
|
||||
try:
|
||||
d = u2.connect(serial)
|
||||
except Exception as e:
|
||||
_log.warning(f"远程看屏 {serial} u2 连接失败: {e}")
|
||||
return
|
||||
while True:
|
||||
try:
|
||||
img = d.screenshot()
|
||||
if img is None:
|
||||
break
|
||||
if img.mode != "RGB":
|
||||
img = img.convert("RGB")
|
||||
buf = io.BytesIO()
|
||||
img.save(buf, "JPEG", quality=quality)
|
||||
yield (b"--frame\r\nContent-Type: image/jpeg\r\n\r\n"
|
||||
+ buf.getvalue() + b"\r\n")
|
||||
except GeneratorExit:
|
||||
break
|
||||
except Exception as e:
|
||||
_log.debug(f"远程看屏 {serial} 流中断: {e}")
|
||||
break
|
||||
time.sleep(gap)
|
||||
|
||||
return Response(generate(),
|
||||
mimetype="multipart/x-mixed-replace; boundary=frame")
|
||||
|
||||
|
||||
_screen_u2_cache = {} # serial -> (ts, device)：大屏高频触控复用连接（60s TTL）
|
||||
|
||||
|
||||
def _screen_get_device(serial):
|
||||
"""远程看屏用的 u2 连接（60s 缓存复用，避免每次 tap/swipe 都重建连接）。
|
||||
|
||||
大屏高频操作（点击/滑动/按键）每次 u2.connect 有 1-3s 握手开销（atx-agent
|
||||
探测），体验卡顿。缓存 60s 内复用；连接失败（设备离线/重启）时清缓存重建，
|
||||
由调用方把异常转 503。
|
||||
"""
|
||||
import time
|
||||
import uiautomator2 as u2
|
||||
now = time.time()
|
||||
cached = _screen_u2_cache.get(serial)
|
||||
if cached and now - cached[0] < 60:
|
||||
return cached[1]
|
||||
d = u2.connect(serial)
|
||||
_screen_u2_cache[serial] = (now, d)
|
||||
if len(_screen_u2_cache) > 30: # 惰性清理过期项
|
||||
for k in list(_screen_u2_cache):
|
||||
if now - _screen_u2_cache[k][0] >= 60:
|
||||
del _screen_u2_cache[k]
|
||||
return d
|
||||
|
||||
|
||||
def _screen_invalidate(serial):
|
||||
"""u2 调用失败时清掉缓存（设备离线/atx-agent 重启），下次请求重新连接。"""
|
||||
_screen_u2_cache.pop(serial, None)
|
||||
|
||||
@bp.route("/api/screen/thumb")
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_screen_thumb():
|
||||
"""大屏缩略图：单张 JPEG（360px 宽，质量 55），供监控大屏轮询。
|
||||
|
||||
一次性请求（非流），与任务并发安全（与任务截图同走 u2 minicap）。
|
||||
大屏按需轮询：每设备约 2.5s 一帧，20 台 ≈ 0.2 核 CPU + 100KB/s。
|
||||
响应头 X-Screen-State: on/off/unknown —— 大屏据此显示「亮屏中/熄屏中」。
|
||||
"""
|
||||
serial = request.args.get("serial", "")
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
import io
|
||||
import uiautomator2 as u2
|
||||
try:
|
||||
d = u2.connect(serial)
|
||||
img = d.screenshot()
|
||||
if img is None:
|
||||
return jsonify({"ok": False, "error": "截图失败"}), 503
|
||||
if img.width > 360:
|
||||
ratio = 360 / img.width
|
||||
img = img.resize((360, int(img.height * ratio)))
|
||||
buf = io.BytesIO()
|
||||
img.convert("RGB").save(buf, "JPEG", quality=55)
|
||||
return Response(buf.getvalue(), mimetype="image/jpeg",
|
||||
headers={"Cache-Control": "no-store",
|
||||
"X-Screen-State": _device_screen_state(serial)})
|
||||
except Exception as e:
|
||||
return jsonify({"ok": False, "error": str(e)}), 503
|
||||
|
||||
|
||||
@bp.route("/api/screen/tap", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_screen_tap():
|
||||
"""点击：{serial, x, y}（设备原生分辨率坐标）。"""
|
||||
data = request.json or {}
|
||||
serial, x, y = data.get("serial", ""), data.get("x"), data.get("y")
|
||||
if not serial or x is None or y is None:
|
||||
return jsonify({"ok": False, "error": "缺少 serial/x/y"}), 400
|
||||
try:
|
||||
_screen_get_device(serial).click(int(x), int(y))
|
||||
return jsonify({"ok": True})
|
||||
except Exception as e:
|
||||
_screen_invalidate(serial)
|
||||
return jsonify({"ok": False, "error": f"点击失败: {e}"}), 503
|
||||
|
||||
@bp.route("/api/screen/swipe", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_screen_swipe():
|
||||
"""滑动：{serial, x1, y1, x2, y2, duration?}（设备原生分辨率坐标）。"""
|
||||
data = request.json or {}
|
||||
serial = data.get("serial", "")
|
||||
x1, y1, x2, y2 = (data.get(k) for k in ("x1", "y1", "x2", "y2"))
|
||||
if not serial or None in (x1, y1, x2, y2):
|
||||
return jsonify({"ok": False, "error": "缺少 serial/x1/y1/x2/y2"}), 400
|
||||
try:
|
||||
_screen_get_device(serial).swipe(int(x1), int(y1), int(x2), int(y2),
|
||||
duration=float(data.get("duration", 0.2)))
|
||||
return jsonify({"ok": True})
|
||||
except Exception as e:
|
||||
_screen_invalidate(serial)
|
||||
return jsonify({"ok": False, "error": f"滑动失败: {e}"}), 503
|
||||
|
||||
|
||||
_SCREEN_KEYS = {"back", "home", "recent", "menu", "power", "volume_up",
|
||||
"volume_down", "enter", "delete", "search", "camera"}
|
||||
|
||||
@bp.route("/api/screen/key", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_screen_key():
|
||||
"""按键：{serial, key}（back/home/recent/menu/power 等，见 _SCREEN_KEYS）。"""
|
||||
data = request.json or {}
|
||||
serial, key = data.get("serial", ""), (data.get("key") or "").strip().lower()
|
||||
if not serial or key not in _SCREEN_KEYS:
|
||||
return jsonify({"ok": False, "error": "缺少 serial 或不支持的按键"}), 400
|
||||
try:
|
||||
_screen_get_device(serial).press(key)
|
||||
return jsonify({"ok": True})
|
||||
except Exception as e:
|
||||
_screen_invalidate(serial)
|
||||
return jsonify({"ok": False, "error": f"按键失败: {e}"}), 503
|
||||
|
||||
@bp.route("/api/screen/text", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_screen_text():
|
||||
"""输入文字：{serial, text}（需焦点在输入框，u2 send_keys）。"""
|
||||
data = request.json or {}
|
||||
serial, text = data.get("serial", ""), (data.get("text") or "").strip()
|
||||
if not serial or not text:
|
||||
return jsonify({"ok": False, "error": "缺少 serial/text"}), 400
|
||||
try:
|
||||
_screen_get_device(serial).send_keys(text)
|
||||
return jsonify({"ok": True})
|
||||
except Exception as e:
|
||||
return jsonify({"ok": False, "error": f"输入失败: {e}"}), 503
|
||||
|
||||
|
||||
# ================== API：应用管理（APK 上传/安装）==================
|
||||
|
||||
def _current_focus_pkg(serial):
|
||||
"""取设备当前前台包名（dumpsys window 解析，失败返回空串）。"""
|
||||
try:
|
||||
r = subprocess.run([ADB_PATH, "-s", serial, "shell", "dumpsys", "window"],
|
||||
capture_output=True, timeout=20)
|
||||
out = (r.stdout or b"").decode("utf-8", errors="replace")
|
||||
m = re.search(r"mCurrentFocus=.*?([\w.]+)/", out)
|
||||
return m.group(1) if m else ""
|
||||
except Exception:
|
||||
return ""
|
||||
|
||||
_screen_u2_cache = {} # serial -> (ts, device)：大屏高频触控复用连接（60s TTL）
|
||||
|
||||
|
||||
def _screen_get_device(serial):
|
||||
"""远程看屏用的 u2 连接（60s 缓存复用，避免每次 tap/swipe 都重建连接）。
|
||||
|
||||
大屏高频操作（点击/滑动/按键）每次 u2.connect 有 1-3s 握手开销（atx-agent
|
||||
探测），体验卡顿。缓存 60s 内复用；连接失败（设备离线/重启）时清缓存重建，
|
||||
由调用方把异常转 503。
|
||||
"""
|
||||
import time
|
||||
import uiautomator2 as u2
|
||||
now = time.time()
|
||||
cached = _screen_u2_cache.get(serial)
|
||||
if cached and now - cached[0] < 60:
|
||||
return cached[1]
|
||||
d = u2.connect(serial)
|
||||
_screen_u2_cache[serial] = (now, d)
|
||||
if len(_screen_u2_cache) > 30: # 惰性清理过期项
|
||||
for k in list(_screen_u2_cache):
|
||||
if now - _screen_u2_cache[k][0] >= 60:
|
||||
del _screen_u2_cache[k]
|
||||
return d
|
||||
|
||||
|
||||
def _screen_invalidate(serial):
|
||||
"""u2 调用失败时清掉缓存（设备离线/atx-agent 重启），下次请求重新连接。"""
|
||||
_screen_u2_cache.pop(serial, None)
|
||||
|
||||
@@ -0,0 +1,98 @@
|
||||
"""Tailscale 管理 API（仅管理员）。"""
|
||||
import re
|
||||
|
||||
from flask import Blueprint, jsonify, request
|
||||
|
||||
from core import tailscale_client
|
||||
from core.tailscale_client import TailscaleError
|
||||
from core.logger import get_logger
|
||||
|
||||
_log = get_logger("web")
|
||||
from web.auth import admin_required
|
||||
|
||||
bp = Blueprint("tailscale", __name__)
|
||||
|
||||
@bp.route("/api/tailscale/status")
|
||||
@admin_required
|
||||
def api_tailscale_status():
|
||||
"""Tailscale 管理配置状态（API key / tailnet 是否已配置）。"""
|
||||
c = tailscale_client.tailscale
|
||||
return jsonify({"ok": True, "configured": c.is_configured(),
|
||||
"hint": c.config_hint() if not c.is_configured() else ""})
|
||||
|
||||
@bp.route("/api/tailscale/devices")
|
||||
@admin_required
|
||||
def api_tailscale_devices():
|
||||
"""列出 tailnet 全部设备。"""
|
||||
try:
|
||||
return jsonify({"ok": True, "devices": tailscale_client.tailscale.list_devices()})
|
||||
except TailscaleError as e:
|
||||
return jsonify({"ok": False, "error": str(e)}), 502
|
||||
|
||||
@bp.route("/api/tailscale/devices/<device_id>", methods=["POST"])
|
||||
@admin_required
|
||||
def api_tailscale_device_update(device_id):
|
||||
"""更新设备：按传入字段分发到专属端点（改名 /name、授权 /authorized、密钥 /key）。"""
|
||||
data = request.json or {}
|
||||
c = tailscale_client.tailscale
|
||||
try:
|
||||
if "name" in data:
|
||||
c.set_device_name(device_id, data.get("name"))
|
||||
if "authorized" in data:
|
||||
c.set_device_authorized(device_id, data.get("authorized"))
|
||||
if "key_expiry_disabled" in data:
|
||||
c.set_device_key_expiry(device_id, data.get("key_expiry_disabled"))
|
||||
_log.info(f"Tailscale 设备更新 {device_id}: {data}")
|
||||
return jsonify({"ok": True, "msg": "设备已更新"})
|
||||
except TailscaleError as e:
|
||||
return jsonify({"ok": False, "error": str(e)}), 502
|
||||
|
||||
@bp.route("/api/tailscale/devices/<device_id>/ip", methods=["POST"])
|
||||
@admin_required
|
||||
def api_tailscale_device_ip(device_id):
|
||||
"""设置设备 IPv4 地址（未公开端点，实测可用）。
|
||||
|
||||
⚠ 改 IP 会断开设备当前 tailscale 会话，且平台设备池 serial 随之变化，
|
||||
改完需同步更新 STF 设备池（分组/任务目标里的旧 IP 会失效）。
|
||||
"""
|
||||
data = request.json or {}
|
||||
ipv4 = (data.get("ipv4") or "").strip()
|
||||
if not ipv4:
|
||||
return jsonify({"ok": False, "error": "缺少 ipv4"}), 400
|
||||
try:
|
||||
tailscale_client.tailscale.set_device_ip(device_id, ipv4)
|
||||
_log.info(f"Tailscale 设备 {device_id} IP 已设置为 {ipv4}")
|
||||
return jsonify({"ok": True, "msg": f"设备 IP 已设置为 {ipv4}"})
|
||||
except TailscaleError as e:
|
||||
return jsonify({"ok": False, "error": str(e)}), 502
|
||||
|
||||
@bp.route("/api/tailscale/devices/<device_id>", methods=["DELETE"])
|
||||
@admin_required
|
||||
def api_tailscale_device_delete(device_id):
|
||||
"""从 tailnet 移除设备。"""
|
||||
try:
|
||||
tailscale_client.tailscale.delete_device(device_id)
|
||||
_log.info(f"Tailscale 设备已移除: {device_id}")
|
||||
return jsonify({"ok": True, "msg": "设备已从 tailnet 移除"})
|
||||
except TailscaleError as e:
|
||||
return jsonify({"ok": False, "error": str(e)}), 502
|
||||
|
||||
@bp.route("/api/tailscale/authkey", methods=["POST"])
|
||||
@admin_required
|
||||
def api_tailscale_authkey():
|
||||
"""生成设备接入 auth key（key 只显示一次）。"""
|
||||
data = request.json or {}
|
||||
try:
|
||||
# Tailscale 要求 description 仅 ASCII（中文会 400）
|
||||
desc = re.sub(r"[^\x20-\x7e]", "", (data.get("description") or "").strip())
|
||||
key = tailscale_client.tailscale.create_auth_key(
|
||||
description=desc or "auto_control",
|
||||
reusable=bool(data.get("reusable", False)),
|
||||
ephemeral=bool(data.get("ephemeral", False)),
|
||||
preauthorized=data.get("preauthorized", True),
|
||||
expiry_seconds=int(data.get("expiry_seconds", 3600)))
|
||||
_log.info(f"Tailscale auth key 已生成: {key['id']}")
|
||||
return jsonify({"ok": True, "key": key["key"], "id": key["id"],
|
||||
"expires": key["expires"]})
|
||||
except TailscaleError as e:
|
||||
return jsonify({"ok": False, "error": str(e)}), 502
|
||||
@@ -0,0 +1,339 @@
|
||||
"""任务域 API：任务计划/分组/自定义动作/元素抓取/步骤测试。"""
|
||||
import re
|
||||
import time
|
||||
import uuid
|
||||
import threading
|
||||
from datetime import datetime
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed, TimeoutError as FuturesTimeout
|
||||
|
||||
from flask import (Blueprint, jsonify, request, Response)
|
||||
from flask_login import login_required
|
||||
|
||||
from core import device_pool, uiauto_helper
|
||||
from core.adb_helper import adb_connect_light
|
||||
from core.models import db, DeviceGroup, TaskJob, CustomAction
|
||||
from core.logger import get_logger
|
||||
|
||||
_log = get_logger("web")
|
||||
from web import context
|
||||
from web.auth import perm_required, PERM_DEVICES, PERM_TASKS
|
||||
from tasks import list_task_types, get_task_class
|
||||
from web.common import _merged_device_list
|
||||
|
||||
bp = Blueprint("tasks", __name__)
|
||||
|
||||
@bp.route("/api/task_types")
|
||||
@login_required
|
||||
def api_task_types():
|
||||
return jsonify({"ok": True, "task_types": list_task_types()})
|
||||
|
||||
@bp.route("/api/actions")
|
||||
@login_required
|
||||
def api_actions():
|
||||
"""返回指定任务类型支持的专属操作。"""
|
||||
task_type = request.args.get("task_type", "")
|
||||
task_cls = get_task_class(task_type)
|
||||
if not task_cls:
|
||||
return jsonify({"ok": False, "error": "未知任务类型", "actions": []})
|
||||
actions = task_cls.list_action_types()
|
||||
return jsonify({"ok": True, "actions": actions})
|
||||
|
||||
@bp.route("/api/devices")
|
||||
@login_required
|
||||
def api_devices():
|
||||
"""返回所有在线设备 serial（供分组表单勾选用）。"""
|
||||
try:
|
||||
return jsonify({"ok": True, "devices": context.mgr.list_all_serials()})
|
||||
except Exception as e:
|
||||
return jsonify({"ok": False, "error": str(e)}), 500
|
||||
|
||||
|
||||
# ================== API：任务计划 CRUD ==================
|
||||
def _job_next_run(job):
|
||||
"""任务下次执行时间，格式化为 "YYYY-MM-DD HH:MM"（Flask 序列化 aware datetime 会变 GMT 格式）。"""
|
||||
nr = context.mgr.next_run_of(job)
|
||||
return nr.strftime("%Y-%m-%d %H:%M") if nr else None
|
||||
|
||||
@bp.route("/api/jobs")
|
||||
@login_required
|
||||
def api_jobs_list():
|
||||
jobs = []
|
||||
for j in context.mgr.jobs.values():
|
||||
d = j.to_dict()
|
||||
d["next_run"] = _job_next_run(j)
|
||||
jobs.append(d)
|
||||
return jsonify({"ok": True, "jobs": jobs,
|
||||
"task_types": list_task_types()})
|
||||
|
||||
@bp.route("/api/jobs", methods=["POST"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_jobs_create():
|
||||
data = request.json or {}
|
||||
name = (data.get("name") or "").strip()
|
||||
if not name:
|
||||
return jsonify({"ok": False, "error": "任务名不能为空"}), 400
|
||||
task_type = data.get("task_type", "douyin_nurture")
|
||||
if not get_task_class(task_type):
|
||||
return jsonify({"ok": False, "error": f"未知任务类型: {task_type}"}), 400
|
||||
job = context.mgr.add_job(
|
||||
name=name, task_type=task_type,
|
||||
target=data.get("target", {"mode": "all"}),
|
||||
params=data.get("params", {}),
|
||||
schedule=data.get("schedule", {"mode": "once"}),
|
||||
retry=data.get("retry", {"max_attempts": 1, "delay": 60}),
|
||||
enabled=data.get("enabled", True))
|
||||
d = job.to_dict()
|
||||
d["next_run"] = _job_next_run(job)
|
||||
return jsonify({"ok": True, "msg": "任务已创建", "job": d})
|
||||
|
||||
@bp.route("/api/jobs/<job_id>", methods=["PUT"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_jobs_update(job_id):
|
||||
job = context.mgr.jobs.get(job_id)
|
||||
if not job:
|
||||
return jsonify({"ok": False, "error": "任务不存在"}), 404
|
||||
data = request.json or {}
|
||||
fields = {}
|
||||
for k in ("name", "task_type", "target", "params", "schedule", "retry", "enabled"):
|
||||
if k in data:
|
||||
fields[k] = data[k]
|
||||
if "task_type" in fields and not get_task_class(fields["task_type"]):
|
||||
return jsonify({"ok": False, "error": f"未知任务类型: {fields['task_type']}"}), 400
|
||||
context.mgr.update_job(job_id, **fields)
|
||||
d = job.to_dict()
|
||||
d["next_run"] = _job_next_run(job)
|
||||
return jsonify({"ok": True, "msg": "任务已更新", "job": d})
|
||||
|
||||
@bp.route("/api/jobs/<job_id>", methods=["DELETE"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_jobs_delete(job_id):
|
||||
if context.mgr.delete_job(job_id):
|
||||
return jsonify({"ok": True, "msg": "任务已删除"})
|
||||
return jsonify({"ok": False, "error": "任务不存在"}), 404
|
||||
|
||||
@bp.route("/api/jobs/<job_id>/run", methods=["POST"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_jobs_run(job_id):
|
||||
return jsonify(context.mgr.run_job_now(job_id))
|
||||
|
||||
@bp.route("/api/jobs/<job_id>/toggle", methods=["POST"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_jobs_toggle(job_id):
|
||||
enabled = (request.json or {}).get("enabled", True)
|
||||
job = context.mgr.toggle_job(job_id, enabled)
|
||||
if not job:
|
||||
return jsonify({"ok": False, "error": "任务不存在"}), 404
|
||||
return jsonify({"ok": True, "msg": f"任务已{'启用' if enabled else '停用'}"})
|
||||
|
||||
|
||||
# ================== API：设备分组 CRUD ==================
|
||||
|
||||
@bp.route("/api/groups")
|
||||
@login_required
|
||||
def api_groups_list():
|
||||
return jsonify({"ok": True, "groups": [g.to_dict() for g in context.mgr.groups.values()]})
|
||||
|
||||
@bp.route("/api/groups", methods=["POST"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_groups_create():
|
||||
data = request.json or {}
|
||||
name = (data.get("name") or "").strip()
|
||||
if not name:
|
||||
return jsonify({"ok": False, "error": "分组名不能为空"}), 400
|
||||
if name in context.mgr.groups:
|
||||
return jsonify({"ok": False, "error": "分组名已存在"}), 400
|
||||
context.mgr.add_group(name, data.get("serials", []), data.get("description", ""))
|
||||
return jsonify({"ok": True, "msg": "分组已创建"})
|
||||
|
||||
@bp.route("/api/groups/<name>", methods=["PUT"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_groups_update(name):
|
||||
if name not in context.mgr.groups:
|
||||
return jsonify({"ok": False, "error": "分组不存在"}), 404
|
||||
data = request.json or {}
|
||||
context.mgr.update_group(name,
|
||||
serials=data.get("serials"),
|
||||
description=data.get("description"))
|
||||
return jsonify({"ok": True, "msg": "分组已更新"})
|
||||
|
||||
@bp.route("/api/groups/<name>", methods=["DELETE"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_groups_delete(name):
|
||||
if context.mgr.delete_group(name):
|
||||
return jsonify({"ok": True, "msg": "分组已删除"})
|
||||
return jsonify({"ok": False, "error": "分组不存在"}), 404
|
||||
|
||||
|
||||
# ================== API：用户管理 CRUD ==================
|
||||
|
||||
@bp.route("/api/custom_actions")
|
||||
@login_required
|
||||
def api_custom_actions_list():
|
||||
rows = CustomAction.query.order_by(CustomAction.created_at.desc()).all()
|
||||
return jsonify({"ok": True, "actions": [r.to_dict() for r in rows]})
|
||||
|
||||
@bp.route("/api/custom_actions", methods=["POST"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_custom_actions_create():
|
||||
data = request.json or {}
|
||||
name = (data.get("name") or "").strip()
|
||||
if not name:
|
||||
return jsonify({"ok": False, "error": "动作名不能为空"}), 400
|
||||
steps = data.get("steps", [])
|
||||
if not steps:
|
||||
return jsonify({"ok": False, "error": "至少需要1个步骤"}), 400
|
||||
row = CustomAction(id=uuid.uuid4().hex[:8], name=name,
|
||||
icon=data.get("icon") or "📦",
|
||||
created_at=datetime.now().strftime("%Y-%m-%d %H:%M"))
|
||||
row.set_steps(steps)
|
||||
db.session.add(row)
|
||||
db.session.commit()
|
||||
return jsonify({"ok": True, "msg": "动作已保存", "action": row.to_dict()})
|
||||
|
||||
@bp.route("/api/custom_actions/<action_id>", methods=["PUT"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_custom_actions_update(action_id):
|
||||
row = CustomAction.query.get(action_id)
|
||||
if not row:
|
||||
return jsonify({"ok": False, "error": "动作不存在"}), 404
|
||||
data = request.json or {}
|
||||
if "name" in data:
|
||||
name = (data["name"] or "").strip()
|
||||
if not name:
|
||||
return jsonify({"ok": False, "error": "动作名不能为空"}), 400
|
||||
row.name = name
|
||||
if "icon" in data:
|
||||
row.icon = data["icon"] or "📦"
|
||||
if "steps" in data:
|
||||
if not data["steps"]:
|
||||
return jsonify({"ok": False, "error": "至少需要1个步骤"}), 400
|
||||
row.set_steps(data["steps"])
|
||||
db.session.commit()
|
||||
return jsonify({"ok": True, "msg": "已更新", "action": row.to_dict()})
|
||||
|
||||
@bp.route("/api/custom_actions/<action_id>", methods=["DELETE"])
|
||||
@perm_required(PERM_TASKS)
|
||||
def api_custom_actions_delete(action_id):
|
||||
row = CustomAction.query.get(action_id)
|
||||
if not row:
|
||||
return jsonify({"ok": False, "error": "动作不存在"}), 404
|
||||
db.session.delete(row)
|
||||
db.session.commit()
|
||||
return jsonify({"ok": True, "msg": "已删除"})
|
||||
|
||||
@bp.route("/api/uiauto/elements")
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_uiauto_elements():
|
||||
"""获取设备当前 UI 元素树（供步骤编辑器"抓取元素"用）。
|
||||
|
||||
依赖本地运行的 uiautodev 服务（端口 20242）。
|
||||
?serial=xxx 设备 serial
|
||||
返回：
|
||||
200 — {ok:true, elements:[...]}
|
||||
503 — {ok:false, error:"..."}（uiauto2 未启动）
|
||||
"""
|
||||
serial = request.args.get("serial", "")
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
ok, data = uiauto_helper.get_elements(serial)
|
||||
if ok:
|
||||
return jsonify({"ok": True, "elements": data})
|
||||
return jsonify({"ok": False, "error": data}), 503
|
||||
|
||||
@bp.route("/api/uiauto/status")
|
||||
@login_required
|
||||
def api_uiauto_status():
|
||||
"""探测 uiauto2 本地服务是否运行（前端按钮禁启用）。"""
|
||||
return jsonify({"ok": True, "running": uiauto_helper.is_running()})
|
||||
|
||||
@bp.route("/api/steps/test", methods=["POST"])
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_steps_test():
|
||||
"""测试单个步骤：在指定设备上试执行，验证选择器是否命中（步骤编辑器"测试此步骤"）。
|
||||
|
||||
请求: {"serial": "100.100.10.11:5555", "step": {"type": "click", "params": {...}}}
|
||||
只读连接（adb connect + u2），与运行中任务互不干扰。
|
||||
返回 result: "命中" / "未找到" / "已执行"。
|
||||
"""
|
||||
data = request.json or {}
|
||||
serial = (data.get("serial") or "").strip()
|
||||
step = data.get("step") or {}
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
if not step.get("type"):
|
||||
return jsonify({"ok": False, "error": "缺少步骤类型"}), 400
|
||||
from tasks.generic.task import test_step
|
||||
ok, msg, result = test_step(serial, step)
|
||||
res_txt = {True: "命中", False: "未找到"}.get(result, "已执行")
|
||||
_log.info(f"测试步骤 {step.get('type')} @ {serial}: {res_txt} ({msg})")
|
||||
return jsonify({"ok": ok, "msg": msg, "result": res_txt})
|
||||
|
||||
@bp.route("/api/uiauto/devices")
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_uiauto_devices():
|
||||
"""获取可选设备列表（抓取元素用）。
|
||||
|
||||
uiautodev 只认识本地 adb 已连接的设备；设备池里在线但未本地连接的设备
|
||||
在这里补全，并先做一次轻量 adb connect（单次尝试，绝不 kill-server），
|
||||
让它们可被 uiautodev 抓取。
|
||||
"""
|
||||
ok, data = uiauto_helper.list_devices()
|
||||
if not ok:
|
||||
return jsonify({"ok": False, "error": data}), 503
|
||||
seen = {d.get("serial") for d in data}
|
||||
try:
|
||||
online = set(device_pool.list_online())
|
||||
pool = [s for s in device_pool.list_configured() if s in online]
|
||||
except Exception:
|
||||
pool = []
|
||||
added = 0
|
||||
for serial in pool:
|
||||
if not serial or serial in seen:
|
||||
continue
|
||||
# 轻量连接（单次尝试，不重试不 kill-server）；连不上也照样列出，
|
||||
# 前端抓取时会报明确错误，不影响其他设备的连接
|
||||
adb_connect_light(serial)
|
||||
data.append({
|
||||
"serial": serial,
|
||||
"model": "",
|
||||
"product": "",
|
||||
"name": serial,
|
||||
"status": "device",
|
||||
"enabled": True,
|
||||
})
|
||||
seen.add(serial)
|
||||
added += 1
|
||||
if added:
|
||||
_log.info(f"抓取元素设备列表补全 {added} 台在线设备: {list(seen)}")
|
||||
return jsonify({"ok": True, "devices": data})
|
||||
|
||||
@bp.route("/api/uiauto/screenshot")
|
||||
@perm_required(PERM_DEVICES)
|
||||
def api_uiauto_screenshot():
|
||||
"""通过 uiauto2 获取设备截图（供抓取元素时显示设备画面）。
|
||||
|
||||
?serial=xxx 设备 serial
|
||||
直接返回 image/jpeg，前端用 <img> 加载。
|
||||
"""
|
||||
serial = request.args.get("serial", "")
|
||||
if not serial:
|
||||
return jsonify({"ok": False, "error": "缺少 serial"}), 400
|
||||
ok, data = uiauto_helper.get_screenshot(serial)
|
||||
if ok:
|
||||
return Response(data, mimetype="image/jpeg",
|
||||
headers={"Cache-Control": "no-store"})
|
||||
return jsonify({"ok": False, "error": data}), 503
|
||||
|
||||
|
||||
# ================== API：远程看屏（阶段 2） ==================
|
||||
# MJPEG 实时画面流 + u2 触控注入。数据源 u2（atx-agent minicap 截图，单帧 ~200ms），
|
||||
# 零新依赖（原计划 ws-scrcpy 不在 npm 分发，GitHub 下载在国内不可靠，改自建）。
|
||||
# 坐标约定：前端以 <img> 显示尺寸归一化后映射到设备原生分辨率（naturalWidth/Height）。
|
||||
_SCREEN_JPEG_QUALITY = 65
|
||||
_SCREEN_FRAME_GAP = 0.05 # 帧间最小间隔（秒），防止空转烧 CPU
|
||||
|
||||
def _job_next_run(job):
|
||||
"""任务下次执行时间，格式化为 "YYYY-MM-DD HH:MM"（Flask 序列化 aware datetime 会变 GMT 格式）。"""
|
||||
nr = context.mgr.next_run_of(job)
|
||||
return nr.strftime("%Y-%m-%d %H:%M") if nr else None
|
||||
|
||||
@@ -0,0 +1,249 @@
|
||||
"""工具域 API：adb 终端/剪贴板注入/应用版本。"""
|
||||
import re
|
||||
import subprocess
|
||||
import shlex
|
||||
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||
|
||||
from flask import Blueprint, jsonify, request
|
||||
|
||||
from core import device_pool
|
||||
from core.adb_helper import adb_connect, adb_connect_light, _ADB_LOCK, _adb
|
||||
from config import ADB_PATH
|
||||
from core.logger import get_logger
|
||||
from web import context
|
||||
from web.auth import admin_required, perm_required
|
||||
from web.common import _merged_device_list
|
||||
|
||||
_log = get_logger("web")
|
||||
bp = Blueprint("tools", __name__)
|
||||
|
||||
# adb 终端安全红线：绝不 kill-server / 绝不 disconnect IP:5555——
|
||||
# 共享 adb transport，断开会让全部设备连接重建（历史与 STF provider 共用）。
|
||||
_ADB_BLOCKED_PATTERNS = ("kill-server", "disconnect")
|
||||
|
||||
@bp.route("/api/adb/devices")
|
||||
@admin_required
|
||||
def api_adb_devices():
|
||||
"""维护终端设备列表（仅管理员）：本地 adb 已连接 + 设备池（SQLite）。
|
||||
|
||||
状态：device/offline=本机 adb 实际状态；pool=设备池已配置但本机未连接。
|
||||
供终端设备选择器使用——选中后自动附加 `-s <serial>`，
|
||||
离线/未连接的设备也可选，配合"重连设备"按钮恢复。
|
||||
"""
|
||||
return jsonify({"ok": True, "devices": _merged_device_list()})
|
||||
|
||||
@bp.route("/api/adb/cmd", methods=["POST"])
|
||||
@admin_required
|
||||
def api_adb_cmd():
|
||||
"""维护终端：执行 adb 命令（仅管理员）。
|
||||
|
||||
请求: {"cmd": "adb -s 100.100.10.11:5555 shell ls /sdcard"}
|
||||
用平台 adb 二进制执行（config.ADB_PATH），带 20s 超时。
|
||||
"""
|
||||
data = request.json or {}
|
||||
cmd = (data.get("cmd") or "").strip()
|
||||
if not cmd:
|
||||
return jsonify({"ok": False, "error": "命令不能为空"}), 400
|
||||
if _blocked_adb_cmd(cmd):
|
||||
return jsonify({"ok": False,
|
||||
"error": "禁止执行 kill-server / disconnect（会中断 STF 设备监控，影响所有任务）"}), 400
|
||||
tokens = shlex.split(cmd)
|
||||
if tokens and tokens[0] == "adb":
|
||||
tokens = tokens[1:]
|
||||
if not tokens:
|
||||
return jsonify({"ok": False, "error": "命令不能为空"}), 400
|
||||
try:
|
||||
# 与 worker 的 adb 调用共用锁，避免并发操作同一 adb server
|
||||
with _ADB_LOCK:
|
||||
r = subprocess.run([ADB_PATH, *tokens], capture_output=True, timeout=20)
|
||||
out = (r.stdout or b"").decode("utf-8", errors="replace")
|
||||
err = (r.stderr or b"").decode("utf-8", errors="replace")
|
||||
_log.info(f"维护终端执行 adb {' '.join(tokens)} -> exit {r.returncode}")
|
||||
return jsonify({"ok": True, "stdout": out, "stderr": err, "code": r.returncode})
|
||||
except subprocess.TimeoutExpired:
|
||||
return jsonify({"ok": False, "error": "命令执行超时（20s）"}), 408
|
||||
except Exception as e:
|
||||
_log.warning(f"维护终端 adb 执行异常: {e}")
|
||||
return jsonify({"ok": False, "error": f"执行失败: {e}"}), 500
|
||||
|
||||
@bp.route("/api/tools/clipboard/set", methods=["POST"])
|
||||
@admin_required
|
||||
def api_tools_clipboard_set():
|
||||
"""工具-剪贴板注入：把指定文字写入一台或多台设备的剪贴板。
|
||||
|
||||
请求: {"serials": ["100.100.10.11:5555", ...], "text": "要注入的文字"}
|
||||
设备来源与维护终端一致：本地 adb 已连接设备（含 USB）+ 设备池。
|
||||
实现：u2 jsonrpc.setClipboard（实测 cmd clipboard 在 MIUI 上不存在）。
|
||||
"""
|
||||
data = request.json or {}
|
||||
serials = data.get("serials") or []
|
||||
text = (data.get("text") or "").strip()
|
||||
if not isinstance(serials, list) or not serials:
|
||||
return jsonify({"ok": False, "error": "未选择设备"}), 400
|
||||
if not text:
|
||||
return jsonify({"ok": False, "error": "注入内容不能为空"}), 400
|
||||
results = {}
|
||||
for serial in serials:
|
||||
ok, msg = _set_device_clipboard(serial, text)
|
||||
results[serial] = {"ok": ok, "msg": msg}
|
||||
ok_count = sum(1 for v in results.values() if v["ok"])
|
||||
fail_count = len(results) - ok_count
|
||||
return jsonify({"ok": True, "results": results,
|
||||
"ok_count": ok_count, "fail_count": fail_count,
|
||||
"error": None if ok_count == len(results) else f"{fail_count} 台设备注入失败"})
|
||||
|
||||
|
||||
def _set_device_clipboard(serial, text):
|
||||
"""向单台设备注入剪贴板文字（ClipInject 通道，见 core.clipboard_helper）。"""
|
||||
from core.clipboard_helper import inject_clipboard
|
||||
return inject_clipboard(serial, text)
|
||||
|
||||
|
||||
def _app_ver_on_device(serial, pkg):
|
||||
"""单设备包版本查询：pm path 检查安装 → dumpsys 取 versionName/versionCode。
|
||||
|
||||
IP:port 设备先轻量 adb connect（单次尝试，绝不 disconnect，红线）。
|
||||
查询是只读 shell 命令，无需 adb server 锁（锁只保护 connect/kill-server 类操作）。
|
||||
"""
|
||||
if ":" in serial:
|
||||
try:
|
||||
adb_connect_light(serial)
|
||||
except Exception as e:
|
||||
return {"installed": False, "error": f"adb 连接失败: {e}"}
|
||||
try:
|
||||
r = subprocess.run([ADB_PATH, "-s", serial, "shell", "pm", "path", pkg],
|
||||
capture_output=True, timeout=15)
|
||||
if b"package:" not in (r.stdout or b""):
|
||||
return {"installed": False, "version_name": "", "version_code": ""}
|
||||
r2 = subprocess.run([ADB_PATH, "-s", serial, "shell", "dumpsys", "package", pkg],
|
||||
capture_output=True, timeout=20)
|
||||
out2 = (r2.stdout or b"").decode("utf-8", errors="replace")
|
||||
vm = re.search(r"versionName=(\S+)", out2)
|
||||
vc = re.search(r"versionCode=(\d+)", out2)
|
||||
return {"installed": True,
|
||||
"version_name": vm.group(1) if vm else "",
|
||||
"version_code": vc.group(1) if vc else ""}
|
||||
except subprocess.TimeoutExpired:
|
||||
return {"installed": False, "error": "查询超时"}
|
||||
except Exception as e:
|
||||
return {"installed": False, "error": str(e)}
|
||||
|
||||
@bp.route("/api/tools/appver", methods=["POST"])
|
||||
@admin_required
|
||||
def api_tools_appver():
|
||||
"""工具-应用版本管理：查询所有设备上指定包名的安装情况与版本号。
|
||||
|
||||
请求: {"pkg": "com.ss.android.ugc.aweme"}
|
||||
设备来源：本地 adb（含 USB）+ 设备池，并发查询（最多 10 台同时）。
|
||||
"""
|
||||
pkg = (request.json or {}).get("pkg", "").strip()
|
||||
if not re.match(r"^[A-Za-z0-9_.]+$", pkg or ""):
|
||||
return jsonify({"ok": False, "error": "包名格式不正确（仅字母/数字/._）"}), 400
|
||||
# 只查在线设备：池内离线条目（如陈旧记录）不连，避免 connect 重试拖慢查询
|
||||
try:
|
||||
online = set(device_pool.list_online())
|
||||
devices = [d for d in _merged_device_list() if d["serial"] in online]
|
||||
except Exception:
|
||||
devices = []
|
||||
if not devices:
|
||||
return jsonify({"ok": False, "error": "无在线设备"}), 404
|
||||
results = {}
|
||||
with ThreadPoolExecutor(max_workers=min(10, len(devices))) as pool:
|
||||
futures = {pool.submit(_app_ver_on_device, d["serial"], pkg): d for d in devices}
|
||||
for fut in as_completed(futures, timeout=90):
|
||||
d = futures[fut]
|
||||
try:
|
||||
results[d["serial"]] = fut.result()
|
||||
except Exception as e:
|
||||
results[d["serial"]] = {"installed": False, "error": str(e)}
|
||||
fail = sum(1 for v in results.values() if v.get("error"))
|
||||
return jsonify({"ok": True, "results": results, "fail": fail,
|
||||
"total": len(results)})
|
||||
|
||||
def _blocked_adb_cmd(cmd):
|
||||
"""命中红线的 adb 命令（kill-server / disconnect）直接拒绝。"""
|
||||
low = cmd.lower()
|
||||
return any(p in low for p in _ADB_BLOCKED_PATTERNS)
|
||||
|
||||
def _set_device_clipboard(serial, text):
|
||||
"""向单台设备注入剪贴板文字（ClipInject APK：透明 Activity 聚焦后写入）。
|
||||
|
||||
Android 10+ 禁止后台（atx-agent/shell）写剪贴板，u2.set_clipboard 在
|
||||
Android 12/13 上调用"成功"但内容被系统静默丢弃。ClipInject
|
||||
（com.example.clipinject）通过 am start 启动透明 Activity，窗口聚焦后
|
||||
setPrimaryClip，shell 启动 Activity 不受后台启动限制（广播方式在 MIUI
|
||||
会被 Background activity start 拦截，必须用 am start）。
|
||||
|
||||
- IP:port 设备：先 adb connect（已连接自动跳过；绝不 disconnect，红线）
|
||||
- 设备未装 ClipInject：am start 返回 unable to resolve Intent，明确报错
|
||||
- 注入后 u2 读回比对验证（后台读剪贴板实测可用），不一致也明确报错
|
||||
"""
|
||||
import base64
|
||||
import time
|
||||
import uiautomator2 as u2
|
||||
if ":" in serial:
|
||||
try:
|
||||
adb_connect(serial)
|
||||
except Exception as e:
|
||||
return False, f"adb 连接失败: {e}"
|
||||
b64 = base64.b64encode(text.encode("utf-8")).decode()
|
||||
# 1. am start 透明 Activity 写剪贴板（shell 身份启动，不受后台启动限制）
|
||||
try:
|
||||
r = subprocess.run(
|
||||
[ADB_PATH, "-s", serial, "shell", "am", "start",
|
||||
"-n", "com.example.clipinject/.ClipActivity",
|
||||
"--es", "text_b64", b64],
|
||||
capture_output=True, timeout=30)
|
||||
out = ((r.stdout or b"") + (r.stderr or b"")).decode(errors="replace")
|
||||
if "does not exist" in out or "unable to resolve Intent" in out:
|
||||
return False, ("设备未安装 ClipInject（com.example.clipinject），"
|
||||
f"请先安装: {out.strip()[:100]}")
|
||||
if "Error" in out or ("Starting" not in out and r.returncode != 0):
|
||||
return False, f"am start 失败: {out.strip()[:120]}"
|
||||
except subprocess.TimeoutExpired:
|
||||
return False, "am start 超时（adb 无响应）"
|
||||
except Exception as e:
|
||||
return False, f"{type(e).__name__}: {str(e)[:120]}"
|
||||
# 2. 读回验证（等透明 Activity 完成写入；u2 读剪贴板在 Android 12 实测可用）
|
||||
time.sleep(0.5)
|
||||
try:
|
||||
with ThreadPoolExecutor(max_workers=1) as pool:
|
||||
d = pool.submit(u2.connect, serial).result(timeout=30)
|
||||
with ThreadPoolExecutor(max_workers=1) as pool:
|
||||
got = pool.submit(lambda: d.clipboard).result(timeout=15)
|
||||
if got == text:
|
||||
return True, "已注入"
|
||||
return False, f"剪贴板读回不一致（写入可能被拒）: {str(got)[:60]!r}"
|
||||
except Exception as e:
|
||||
# 读回不可用（旧版 u2/连接失败）时按写入成功处理，避免误报，但带上具体原因
|
||||
return True, f"已注入（读回验证不可用: {type(e).__name__}: {str(e)[:80]}）"
|
||||
|
||||
def _app_ver_on_device(serial, pkg):
|
||||
"""单设备包版本查询：pm path 检查安装 → dumpsys 取 versionName/versionCode。
|
||||
|
||||
IP:port 设备先轻量 adb connect（单次尝试，绝不 disconnect，红线）。
|
||||
查询是只读 shell 命令，无需 adb server 锁（锁只保护 connect/kill-server 类操作）。
|
||||
"""
|
||||
if ":" in serial:
|
||||
try:
|
||||
adb_connect_light(serial)
|
||||
except Exception as e:
|
||||
return {"installed": False, "error": f"adb 连接失败: {e}"}
|
||||
try:
|
||||
r = subprocess.run([ADB_PATH, "-s", serial, "shell", "pm", "path", pkg],
|
||||
capture_output=True, timeout=15)
|
||||
if b"package:" not in (r.stdout or b""):
|
||||
return {"installed": False, "version_name": "", "version_code": ""}
|
||||
r2 = subprocess.run([ADB_PATH, "-s", serial, "shell", "dumpsys", "package", pkg],
|
||||
capture_output=True, timeout=20)
|
||||
out2 = (r2.stdout or b"").decode("utf-8", errors="replace")
|
||||
vm = re.search(r"versionName=(\S+)", out2)
|
||||
vc = re.search(r"versionCode=(\d+)", out2)
|
||||
return {"installed": True,
|
||||
"version_name": vm.group(1) if vm else "",
|
||||
"version_code": vc.group(1) if vc else ""}
|
||||
except subprocess.TimeoutExpired:
|
||||
return {"installed": False, "error": "查询超时"}
|
||||
except Exception as e:
|
||||
return {"installed": False, "error": str(e)}
|
||||
|
||||
+53
-1553
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user