From f7bcddc91b15025d95051ebcde499d22a6b33e9b Mon Sep 17 00:00:00 2001 From: foxhui Date: Thu, 22 Jan 2026 04:19:20 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Flow=20=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E9=97=AE=E9=A2=98=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E7=AD=89=E5=BE=85=E7=BB=93=E6=9E=9C=E7=9A=84=E8=B6=85?= =?UTF-8?q?=E6=97=B6=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++ src/backend/adapter/google_flow.js | 14 ++++ src/backend/utils/page.js | 111 ++++++++++++++++++++++++----- 3 files changed, 112 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a2aec9..a8e454c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [3.4.9] - 2026-01-22 +### 🔄 Changed +- **超时优化** + - 等待生成结果的超时时间不再一刀切，根据上游 SEE 动态重置超时计时器 + ### 🐛 Fixed - **LMA 超时问题** - 修复 LMArena 因模型选择界面更新导致的点击超时 +- **Flow 图片上传** + - 修复 Google Flow 因历史上传的图片过多导致上传按钮被顶到不可见区域造成点击超时 - **提示词输入** - 长提示词粘贴之前模拟输入时将回车当换行符使用导致误触发送提示词 diff --git a/src/backend/adapter/google_flow.js b/src/backend/adapter/google_flow.js index 1d1c0fc..d3342e2 100644 --- a/src/backend/adapter/google_flow.js +++ b/src/backend/adapter/google_flow.js @@ -149,6 +149,20 @@ async function generate(context, prompt, imgPaths, modelId, meta = {}) { await addBtn.waitFor({ state: 'visible', timeout: 30000 }); await safeClick(page, addBtn, { bias: 'button' }); + // 5.1.1 清理已有图片，只保留上传按钮，并调整弹出框样式 + await page.evaluate(() => { + const grid = document.querySelector('[class*="virtuoso-grid-list"]'); + if (grid) { + const children = Array.from(grid.children); + children.slice(1).forEach(child => child.remove()); + } + const popper = document.querySelector('[data-radix-popper-content-wrapper]'); + if (popper) { + popper.style.height = '335px'; + popper.style.transform = 'translate(0px, -391px)'; + } + }); + // 5.2 点击 upload 按钮并选择文件（不等待上传完成） const uploadBtn = page.getByRole('button', { name: /^upload/ }); await uploadFilesViaChooser(page, uploadBtn, [imgPath], {}, meta); diff --git a/src/backend/utils/page.js b/src/backend/utils/page.js index 615d02a..8598cf1 100644 --- a/src/backend/utils/page.js +++ b/src/backend/utils/page.js @@ -182,17 +182,26 @@ export async function scrollToElement(page, selectorOrLocator, options = {}) { /** * 等待 API 响应 (带页面关闭监听和错误关键词检测) + * 对于流式响应，每次收到数据时会重置超时计时器 * @param {import('playwright-core').Page} page - Playwright 页面对象 * @param {object} options - 等待选项 * @param {string} options.urlMatch - URL 匹配字符串 * @param {string|string[]} [options.urlContains] - URL 必须额外包含的字符串（可选，可以是数组） * @param {string} [options.method='POST'] - HTTP 方法 - * @param {number} [options.timeout=120000] - 超时时间（毫秒） + * @param {number} [options.timeout=120000] - 超时时间（毫秒），流式响应收到数据时会重置 * @param {string|string[]} [options.errorText] - 错误关键词，页面 UI 或 API 响应体中出现时立即停止并返回错误 + * @param {object} [options.meta={}] - 日志元数据 * @returns {Promise} 响应对象 */ export async function waitApiResponse(page, options = {}) { - const { urlMatch, urlContains, method = 'POST', timeout = TIMEOUTS.API_RESPONSE, errorText } = options; + const { + urlMatch, + urlContains, + method = 'POST', + timeout = TIMEOUTS.API_RESPONSE, + errorText, + meta = {} + } = options; if (!isPageValid(page)) { throw new Error('PAGE_INVALID'); @@ -218,26 +227,93 @@ export async function waitApiResponse(page, options = {}) { } } + // 超时控制 + let timerId = null; + let responseHandler = null; + + const cleanup = () => { + if (timerId) clearTimeout(timerId); + if (responseHandler) page.off('response', responseHandler); + pageWatcher.cleanup(); + }; + try { - const responsePromise = page.waitForResponse( - response => { - const url = response.url(); + const responsePromise = new Promise((resolve, reject) => { + // 超时计时器（流式响应收到数据时会重置） + const resetTimer = () => { + if (timerId) clearTimeout(timerId); + timerId = setTimeout(() => { + reject(new Error(`API_TIMEOUT: 等待响应超时 (${Math.round(timeout / 1000)}秒)`)); + }, timeout); + }; + + // 启动初始超时 + resetTimer(); + + // 监听响应 + responseHandler = async (res) => { + const url = res.url(); // 基础匹配 - if (!url.includes(urlMatch)) return false; + if (!url.includes(urlMatch)) return; // 额外的 URL 包含检查 if (urlContains) { const containsArray = Array.isArray(urlContains) ? urlContains : [urlContains]; - if (!containsArray.every(str => url.includes(str))) return false; + if (!containsArray.every(str => url.includes(str))) return; } // 方法和状态检查 - return response.request().method() === method && - (response.status() === 200 || response.status() >= 400); - }, - { timeout } - ); + const reqMethod = res.request().method(); + const status = res.status(); + if (reqMethod !== method || (status !== 200 && status < 400)) return; + + // 匹配成功，移除监听器（只处理第一个匹配的响应） + page.off('response', responseHandler); + responseHandler = null; + + // 检查是否为流式响应 + const contentType = res.headers()['content-type'] || ''; + const isStreaming = contentType.includes('text/event-stream') || + contentType.includes('application/stream') || + contentType.includes('text/plain'); + + if (isStreaming) { + // 流式响应：取消固定超时，依赖 requestfinished 事件判断完成 + // 因为流式响应可能持续很长时间，固定超时不适用 + if (timerId) { + clearTimeout(timerId); + timerId = null; + } + + const request = res.request(); + + const finishedHandler = (req) => { + if (req === request) { + page.off('requestfinished', finishedHandler); + page.off('requestfailed', failedHandler); + resolve(res); + } + }; + + const failedHandler = (req) => { + if (req === request) { + page.off('requestfinished', finishedHandler); + page.off('requestfailed', failedHandler); + reject(new Error('NETWORK_FAILED: 流式请求失败')); + } + }; + + page.on('requestfinished', finishedHandler); + page.on('requestfailed', failedHandler); + } else { + // 非流式响应，直接返回 + resolve(res); + } + }; + + page.on('response', responseHandler); + }); const promises = [responsePromise, pageWatcher.promise]; if (uiErrorPromise) promises.push(uiErrorPromise); @@ -247,7 +323,6 @@ export async function waitApiResponse(page, options = {}) { // API 响应体错误关键词检测 (在返回前同步检查) if (patterns.length > 0) { try { - // 使用 body() 获取 Buffer，避免 text() 的某些内部状态问题 const bodyBuffer = await response.body(); const body = bodyBuffer.toString('utf-8'); for (const pattern of patterns) { @@ -264,20 +339,18 @@ export async function waitApiResponse(page, options = {}) { return cachedResponse; } catch (e) { if (e.message.startsWith('API_ERROR_DETECTED')) throw e; - // 如果读取响应体失败，直接返回原始 response } } return response; } catch (e) { // 检测超时错误，转换为标准错误类型 - if (e.name === 'TimeoutError' || e.message?.includes('Timeout')) { - const timeoutSec = Math.round(timeout / 1000); - throw new Error(`API_TIMEOUT: 等待响应超时 (${timeoutSec}秒)`); + if (e.name === 'TimeoutError' || e.message?.includes('TIMEOUT')) { + throw new Error(`API_TIMEOUT: ${e.message}`); } - // 其他错误直接重新抛出（如 PAGE_CLOSED, PAGE_CRASHED 等） throw e; } finally { - pageWatcher.cleanup(); + cleanup(); } } +