Merge pull request #37 from solar2ain/feat/backend-and-webui-enhancements

feat: 后端增强与WebUI请求模型功能

Author: foxhui

src/backend/utils/download.js

@@ -3,37 +3,61 @@
  * @description 图片下载与 Base64 转换
  */
 
+import { logger } from '../../utils/logger.js';
+
+/**
+ * 判断错误是否可重试
+ * @param {string} message - 错误消息
+ * @returns {boolean}
+ */
+function isRetryableError(message) {
+    return /timeout|network|econnreset|econnrefused|etimedout|disconnected|tls|socket/i.test(message);
+}
+
 /**
  * 使用页面上下文下载图片并转换为 Base64
  * 自动继承页面的 Cookie 和 Session，解决鉴权问题
  * @param {string} url - 图片 URL
  * @param {import('playwright-core').Page} page - Playwright 页面对象
  * @param {object} [options] - 可选配置
  * @param {number} [options.timeout=60000] - 超时时间（毫秒）
- * @param {number} [options.retries=0] - 下载失败时的重试次数
- * @returns {Promise<{ image?: string, error?: string }>} 下载结果
+ * @param {number} [options.retries=3] - 最大重试次数
+ * @param {number} [options.retryDelay=1000] - 重试延迟基数（毫秒）
+ * @returns {Promise<{ image?: string, imageUrl?: string, error?: string }>} 下载结果（包含原始 URL）
  */
 export async function useContextDownload(url, page, options = {}) {
-    const { timeout = 60000, retries = 0 } = options;
+    const { timeout = 120000, retries = 3, retryDelay = 1000 } = options;
 
-    for (let attempt = 0; attempt <= retries; attempt++) {
+    for (let attempt = 1; attempt <= retries; attempt++) {
         try {
             const response = await page.request.get(url, { timeout });
 
             if (!response.ok()) {
-                if (attempt < retries) continue;
-                return { error: `下载失败: HTTP ${response.status()}` };
+                const status = response.status();
+                // 5xx 错误可重试
+                if (status >= 500 && attempt < retries) {
+                    logger.warn('下载', `HTTP ${status}，重试 ${attempt}/${retries}...`);
+                    await new Promise(r => setTimeout(r, retryDelay * attempt));
+                    continue;
+                }
+                return { error: `下载失败: HTTP ${status}`, imageUrl: url };
             }
 
             const buffer = await response.body();
             const base64 = buffer.toString('base64');
             const contentType = response.headers()['content-type'] || 'image/png';
             const mimeType = contentType.split(';')[0].trim();
 
-            return { image: `data:${mimeType};base64,${base64}` };
+            return { image: `data:${mimeType};base64,${base64}`, imageUrl: url };
         } catch (e) {
-            if (attempt < retries) continue;
-            return { error: `已获取结果，但图片下载时遇到错误: ${e.message}` };
+            if (isRetryableError(e.message) && attempt < retries) {
+                logger.warn('下载', `${e.message}，重试 ${attempt}/${retries}...`);
+                await new Promise(r => setTimeout(r, retryDelay * attempt));
+                continue;
+            }
+            return { error: `已获取结果，但图片下载时遇到错误: ${e.message}`, imageUrl: url };
         }
     }
+
+    return { error: '下载失败: 已达最大重试次数', imageUrl: url };
 }

src/backend/utils/error.js

@@ -96,6 +96,36 @@ export function normalizePageError(err, meta = {}) {
 export function normalizeHttpError(response, content = null) {
     const status = response.status();
 
+    // 尝试从响应体中提取具体错误信息
+    let detailError = null;
+    if (content) {
+        try {
+            const json = JSON.parse(content);
+            // 格式: {"error": "Request rejected: ..."}
+            if (json.error && typeof json.error === 'string') {
+                detailError = json.error;
+            }
+            // 格式: {"error": {"message": "..."}}
+            else if (json.error?.message) {
+                detailError = json.error.message;
+            }
+        } catch {
+            // 非 JSON 格式，尝试直接使用内容
+            if (content.length < 200) {
+                detailError = content;
+            }
+        }
+    }
+
+    // 检查是否是内容审核拒绝 (通常返回 422 或 429 但含有拒绝信息)
+    const isContentRejection = detailError && (
+        /reject|violat|terms|blocked|forbidden|unsafe|moderat/i.test(detailError) ||
+        detailError === 'prompt failed'
+    );
+    if (isContentRejection) {
+        return { error: `内容被拒绝: ${detailError}`, code: ADAPTER_ERRORS.CONTENT_BLOCKED, retryable: false };
+    }
+
     // 429 限流检查
     if (status === 429 || content?.includes('Too Many Requests')) {
         return { error: '触发限流/上游繁忙', code: ADAPTER_ERRORS.RATE_LIMITED, retryable: true };
@@ -108,12 +138,18 @@ export function normalizeHttpError(response, content = null) {
 
     // 5xx 服务端错误（可重试）
     if (status >= 500) {
-        return { error: `上游服务器错误，HTTP错误码: ${status}`, code: ADAPTER_ERRORS.HTTP_ERROR, retryable: true };
+        const msg = detailError
+            ? `上游服务器错误 (${status}): ${detailError}`
+            : `上游服务器错误，HTTP错误码: ${status}`;
+        return { error: msg, code: ADAPTER_ERRORS.HTTP_ERROR, retryable: true };
     }
 
     // 4xx 客户端错误（不可重试）
     if (status >= 400) {
-        return { error: `请求错误，HTTP错误码: ${status}`, code: ADAPTER_ERRORS.HTTP_ERROR, retryable: false };
+        const msg = detailError
+            ? `请求被拒绝 (${status}): ${detailError}`
+            : `请求错误，HTTP错误���: ${status}`;
+        return { error: msg, code: ADAPTER_ERRORS.HTTP_ERROR, retryable: false };
     }
 
     return null;

src/server/api/admin/routes.js

@@ -36,6 +36,19 @@ import {
 import { registry } from '../../../backend/registry.js';
 import { sendRestartSignal, sendStopSignal, isUnderSupervisor, getVncInfo } from '../../../utils/ipc.js';
 import { getTodayStats, getStatsRange, clearStatsRange } from '../../../utils/stats.js';
+import {
+    getList as getHistoryList,
+    getDetail as getHistoryDetail,
+    deleteRecords as deleteHistoryRecords,
+    deleteByDateRange as deleteHistoryByDateRange,
+    retryMediaDownload,
+    getStats as getHistoryStats,
+    getModelList as getHistoryModelList,
+    getMediaDir
+} from '../../../utils/history.js';
+import path from 'path';
+import fs from 'fs/promises';
+import { useContextDownload } from '../../../backend/utils/download.js';
 
 /**
  * 读取请求体
@@ -458,6 +471,148 @@ export function createAdminRouter(context) {
                 return;
             }
 
+            // ==================== 请求历史 ====================
+
+            // GET /admin/history - 历史记录列表
+            if (method === 'GET' && pathname === '/history') {
+                const url = new URL(req.url, `http://${req.headers.host}`);
+                const page = parseInt(url.searchParams.get('page') || '1', 10);
+                const pageSize = parseInt(url.searchParams.get('pageSize') || '20', 10);
+                const filters = {
+                    status: url.searchParams.get('status') || null,
+                    modelId: url.searchParams.get('model') || null,
+                    search: url.searchParams.get('search') || null,
+                    startDate: url.searchParams.get('startDate') || null,
+                    endDate: url.searchParams.get('endDate') || null
+                };
+
+                const result = getHistoryList(filters, page, pageSize);
+                sendJson(res, 200, result);
+                return;
+            }
+
+            // GET /admin/history/stats - 历史统计摘要
+            if (method === 'GET' && pathname === '/history/stats') {
+                const url = new URL(req.url, `http://${req.headers.host}`);
+                const filters = {
+                    startDate: url.searchParams.get('startDate') || null,
+                    endDate: url.searchParams.get('endDate') || null
+                };
+
+                const stats = getHistoryStats(filters);
+                sendJson(res, 200, stats);
+                return;
+            }
+
+            // GET /admin/history/models - 获取历史中使用过的模型列表
+            if (method === 'GET' && pathname === '/history/models') {
+                const models = getHistoryModelList();
+                sendJson(res, 200, models);
+                return;
+            }
+
+            // GET /admin/history/media/:filename - 静态媒体文件服务
+            if (method === 'GET' && pathname.startsWith('/history/media/')) {
+                const filename = pathname.replace('/history/media/', '');
+                if (!filename || filename.includes('..') || filename.includes('/')) {
+                    sendApiError(res, { code: ERROR_CODES.INVALID_REQUEST_BODY, message: '无效的文件名' });
+                    return;
+                }
+
+                const mediaDir = getMediaDir();
+                const filePath = path.join(mediaDir, filename);
+
+                try {
+                    const data = await fs.readFile(filePath);
+                    const ext = path.extname(filename).toLowerCase();
+                    const mimeTypes = {
+                        '.png': 'image/png',
+                        '.jpg': 'image/jpeg',
+                        '.jpeg': 'image/jpeg',
+                        '.gif': 'image/gif',
+                        '.webp': 'image/webp',
+                        '.mp4': 'video/mp4',
+                        '.webm': 'video/webm'
+                    };
+                    res.writeHead(200, {
+                        'Content-Type': mimeTypes[ext] || 'application/octet-stream',
+                        'Content-Length': data.length,
+                        'Cache-Control': 'public, max-age=31536000'
+                    });
+                    res.end(data);
+                } catch (e) {
+                    sendApiError(res, { code: ERROR_CODES.NOT_FOUND, message: '文件不存在', status: 404 });
+                }
+                return;
+            }
+
+            // GET /admin/history/:id - 单条记录详情
+            const historyDetailMatch = pathname.match(/^\/history\/([^/]+)$/);
+            if (method === 'GET' && historyDetailMatch && !pathname.includes('/retry-media')) {
+                const id = historyDetailMatch[1];
+                const record = getHistoryDetail(id);
+                if (record) {
+                    sendJson(res, 200, record);
+                } else {
+                    sendApiError(res, { code: ERROR_CODES.NOT_FOUND, message: '记录不存在', status: 404 });
+                }
+                return;
+            }
+
+            // POST /admin/history/:id/retry-media - 重试下载媒体
+            const retryMediaMatch = pathname.match(/^\/history\/([^/]+)\/retry-media$/);
+            if (method === 'POST' && retryMediaMatch) {
+                const id = retryMediaMatch[1];
+                const body = await readBody(req);
+                const mediaIndex = body.mediaIndex ?? 0;
+
+                // 使用 Pool 的浏览器下载（如果可用）
+                let downloadFn = null;
+                try {
+                    const poolContext = queueManager?.getPoolContext?.();
+                    const page = poolContext?.getFirstPage?.();
+                    if (page) {
+                        const imgDlCfg = config?.backend?.pool?.failover || {};
+                        downloadFn = (url) => useContextDownload(url, page, {
+                            retries: imgDlCfg.imgDlRetry ? (imgDlCfg.imgDlRetryMaxRetries || 3) : 1
+                        });
+                    }
+                } catch { /* Pool 未初始化，使用后备方案 */ }
+
+                const result = await retryMediaDownload(id, mediaIndex, downloadFn);
+                if (result.success) {
+                    sendJson(res, 200, result);
+                } else {
+                    sendApiError(res, { code: ERROR_CODES.INTERNAL_ERROR, message: result.message });
+                }
+                return;
+            }
+
+            // DELETE /admin/history - 批量删除记录
+            if (method === 'DELETE' && pathname === '/history') {
+                const url = new URL(req.url, `http://${req.headers.host}`);
+                const startDate = url.searchParams.get('startDate');
+                const endDate = url.searchParams.get('endDate');
+
+                // 支持按��期范围删除
+                if (startDate && endDate) {
+                    const deleted = await deleteHistoryByDateRange(startDate, endDate);
+                    sendJson(res, 200, { success: true, deleted });
+                    return;
+                }
+
+                // 支持按 ID 列表删除
+                const body = await readBody(req);
+                if (body.ids && Array.isArray(body.ids)) {
+                    const deleted = await deleteHistoryRecords(body.ids);
+                    sendJson(res, 200, { success: true, deleted });
+                    return;
+                }
+
+                sendApiError(res, { code: ERROR_CODES.INVALID_REQUEST_BODY, message: '缺少 ids 数组或日期范围参数' });
+                return;
+            }
+
             // 404
             res.writeHead(404);
             res.end(JSON.stringify({ error: 'Not Found' }));