@aiscene/aiserver 1.8.1 → 1.8.3

package/dist/debug/websocket-server.js

@@ -478,10 +478,10 @@ export class DebugWebSocketServer {
         }
     }
     /**
-     * Web 调试主进程内嵌执行（支持 sessionId 复用 + 浏览器/投屏保留 + 30 分钟 TTL）
+     * Web 调试主进程内嵌执行
      * - 首次请求：懒启动浏览器 + PlaywrightAgent + 自动投屏
      * - 复用请求：跳过初始化，直接执行 naturalLanguage
-     * - 执行完不关浏览器，由 startWebSessionGc 按 TTL 自动回收
+     * - 执行完成后自动关闭浏览器，释放资源
      */
     async handleStartDebugWeb(ws, request) {
         // 1) 决定 sessionId（客户端传了就用以复用）
@@ -597,11 +597,19 @@ export class DebugWebSocketServer {
                     const contextOptions = {
                         viewport: request.viewport || { width: 1280, height: 800 },
                     };
-                    const acquired = await webBrowserPool.acquireContext(contextOptions);
-                    browser = acquired.browser;
-                    context = acquired.context;
+                    browser = await playwright.chromium.launch({ headless: false });
+                    context = await browser.newContext(contextOptions);
                     page = await context.newPage();
-                    releaseBrowser = acquired.release;
+                    releaseBrowser = async () => {
+                        try {
+                            await context.close();
+                        }
+                        catch { /* ignore */ }
+                        try {
+                            await browser.close();
+                        }
+                        catch { /* ignore */ }
+                    };
                 }
                 session.browser = browser;
                 session.context = context;
@@ -636,12 +644,6 @@ export class DebugWebSocketServer {
                     page,
                     logPrefix: `[WebDebug ${sessionId}]`,
                 });
-                // 兼容旧版表单登录配置（仅首次启动时执行）
-                if (request.loginConfig && request.loginConfig.loginUrl
-                    && request.loginConfig.loginUsername && request.loginConfig.loginPassword) {
-                    const loginConfig = { ...request.loginConfig, mobileMode: request.mobileMode || false };
-                    await this.performWebLogin(page, loginConfig);
-                }
             }
             else {
                 logger.info(`[WebDebug] Reusing existing session: ${sessionId}`);
@@ -660,7 +662,7 @@ export class DebugWebSocketServer {
             // 5) 若指定了 url，则导航（首启或复用，传了就 goto）
             if (request.url) {
                 try {
-                    await page.goto(request.url, { waitUntil: 'networkidle' });
+                    await this.safeWebGoto(page, request.url, `[WebDebug] Navigate to ${request.url}`);
                     logger.info(`[WebDebug] Navigated to: ${request.url}`);
                 }
                 catch (gotoErr) {
@@ -697,7 +699,7 @@ export class DebugWebSocketServer {
             logger.info(`[WebDebug] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
             const success = !execError;
             sessionManager.updateStatus(sessionId, success ? 'completed' : 'failed');
-            // ★ 关键：不调用 closeWebSession()，浏览器与投屏完全保留，等 TTL 自然回收
+            // 执行完成后自动关闭浏览器，释放资源
             this.sendMessage(ws, {
                 type: 'debug_completed',
                 sessionId,
@@ -705,6 +707,12 @@ export class DebugWebSocketServer {
                 reportUrl,
                 errorMessage: execError,
             });
+            try {
+                await this.closeWebSession(sessionId);
+            }
+            catch (closeErr) {
+                logger.warn(`[WebDebug] Auto close browser failed: ${closeErr.message}`);
+            }
         }
         catch (error) {
             const msg = error.message;
@@ -712,7 +720,13 @@ export class DebugWebSocketServer {
             sessionManager.updateStatus(sessionId, 'failed');
             this.sendMessage(ws, { type: 'debug_error', sessionId, error: msg });
             this.sendMessage(ws, { type: 'debug_completed', sessionId, success: false, errorMessage: msg });
-            // 注：致命错误也不主动关浏览器，避免破坏复用契约；如需销毁让前端发 close_web_session
+            // 致命错误也自动关闭浏览器
+            try {
+                await this.closeWebSession(sessionId);
+            }
+            catch (closeErr) {
+                logger.warn(`[WebDebug] Auto close browser (fatal) failed: ${closeErr.message}`);
+            }
         }
     }
     /**
@@ -792,21 +806,11 @@ export class DebugWebSocketServer {
             skipAppRestart: request.skipAppRestart,
             mobileMode: request.mobileMode,
             deviceName: request.deviceName,
+            loginContext: request.loginContext,
             // 环境代理配置
             proxyPort: request.proxyPort,
             // 公司代理平台账号
             proxyAccount: request.proxyAccount,
-            // 添加登录配置
-            ...(request.loginConfig && {
-                loginUrl: request.loginConfig.loginUrl,
-                loginUsername: request.loginConfig.loginUsername,
-                loginPassword: request.loginConfig.loginPassword,
-                usernameSelector: request.loginConfig.usernameSelector,
-                passwordSelector: request.loginConfig.passwordSelector,
-                loginButtonSelector: request.loginConfig.loginButtonSelector,
-                loginModeSelector: request.loginConfig.loginModeSelector,
-                agreementSelector: request.loginConfig.agreementSelector,
-            }),
         };
         // 注意：proxy-service.jd.com 的规则由前端（浏览器端）设置，后端只负责设备代理 + 抓包
         try {
@@ -919,21 +923,11 @@ export class DebugWebSocketServer {
             nodeId: this.config.task.nodeId,
             modelConfig: fullModelConfig,
             skipAppRestart: request.skipAppRestart,
+            loginContext: request.loginContext,
             // 环境代理配置
             proxyPort: request.proxyPort,
             // 公司代理平台账号
             proxyAccount: request.proxyAccount,
-            // 添加登录配置
-            ...(request.loginConfig && {
-                loginUrl: request.loginConfig.loginUrl,
-                loginUsername: request.loginConfig.loginUsername,
-                loginPassword: request.loginConfig.loginPassword,
-                usernameSelector: request.loginConfig.usernameSelector,
-                passwordSelector: request.loginConfig.passwordSelector,
-                loginButtonSelector: request.loginConfig.loginButtonSelector,
-                loginModeSelector: request.loginConfig.loginModeSelector,
-                agreementSelector: request.loginConfig.agreementSelector,
-            }),
         };
         // 注意：proxy-service.jd.com 的规则由前端（浏览器端）设置，后端只负责设备代理 + 抓包
         // 始终启动请求抓包
@@ -1514,58 +1508,79 @@ export class DebugWebSocketServer {
         }
     }
     // ==================== Execute Web Action (Playwright + Midscene, with screencast) ====================
-    async performWebLogin(page, loginConfig) {
-        if (!loginConfig.loginUrl || !loginConfig.loginUsername || !loginConfig.loginPassword) {
-            logger.warn('Login credentials not provided, skipping login');
-            return;
+    normalizeWebUrl(value) {
+        if (!value)
+            return '';
+        try {
+            const parsed = new URL(value);
+            parsed.hash = '';
+            return parsed.toString().replace(/\/$/, '');
         }
-        logger.info(`Performing web login at: ${loginConfig.loginUrl}`);
+        catch {
+            return String(value).split('#')[0].replace(/\/$/, '');
+        }
+    }
+    getCurrentWebUrl(page) {
         try {
-            // Navigate to login page
-            await page.goto(loginConfig.loginUrl, { waitUntil: 'networkidle' });
-            logger.info(`Navigated to login page: ${loginConfig.loginUrl}`);
-            // Wait for page to load
-            await new Promise(resolve => setTimeout(resolve, loginConfig.mobileMode ? 3000 : 2000));
-            // Click "账号密码登录" button first
-            logger.info('Clicking account password login button');
-            await page.click('span.J_ping.planBLogin:has-text("账号密码登录")');
-            // Wait for login form to appear
-            await new Promise(resolve => setTimeout(resolve, loginConfig.mobileMode ? 2000 : 1000));
-            // Fill username
-            const usernameSelector = loginConfig.usernameSelector || '#username';
-            logger.info(`Filling username with selector: ${usernameSelector}`);
-            await page.fill(usernameSelector, loginConfig.loginUsername);
-            // Fill password
-            const passwordSelector = loginConfig.passwordSelector || '#pwd';
-            logger.info(`Filling password with selector: ${passwordSelector}`);
-            await page.fill(passwordSelector, loginConfig.loginPassword);
-            // Check agreement checkbox - using the specific selector
-            const agreementSelector = loginConfig.agreementSelector || '.policy_tip-checkbox';
-            logger.info(`Checking agreement with selector: ${agreementSelector}`);
-            await page.check(agreementSelector);
-            // Click login button - using the specific selector
-            const loginButtonSelector = loginConfig.loginButtonSelector || 'a.J_ping:has-text("同意协议并登录")';
-            logger.info(`Clicking login button with selector: ${loginButtonSelector}`);
-            await page.click(loginButtonSelector);
-            // Wait for login to complete
-            await new Promise(resolve => setTimeout(resolve, loginConfig.mobileMode ? 8000 : 5000));
-            // Check if login was successful
-            try {
-                const currentUrl = page.url();
-                if (currentUrl !== loginConfig.loginUrl && !currentUrl.includes('login')) {
-                    logger.info('Login appears to be successful');
-                }
-                else {
-                    logger.warn('Still on login page, login may have failed');
-                }
-            }
-            catch (e) {
-                logger.warn('Could not verify login status');
-            }
+            return typeof page?.url === 'function' ? page.url() : '';
+        }
+        catch {
+            return '';
+        }
+    }
+    async waitForWebPageStable(page) {
+        await page.waitForLoadState('domcontentloaded', { timeout: 5000 }).catch(() => undefined);
+        await page.waitForLoadState('networkidle', { timeout: 8000 }).catch(() => undefined);
+    }
+    async safeWebGoto(page, url, label) {
+        const targetUrl = this.normalizeWebUrl(url);
+        const currentUrl = this.normalizeWebUrl(this.getCurrentWebUrl(page));
+        if (currentUrl && targetUrl && currentUrl === targetUrl) {
+            logger.info(`${label}: already at target url, skip duplicate goto`);
+            await this.waitForWebPageStable(page);
+            return null;
+        }
+        try {
+            logger.info(`${label}: ${url}`);
+            const result = await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 45000 });
+            await page.waitForLoadState('networkidle', { timeout: 8000 }).catch(() => undefined);
+            return result;
         }
         catch (error) {
-            logger.error(`Web login failed: ${error.message}`);
-            throw new Error(`Web login failed: ${error.message}`);
+            const message = error.message || '';
+            const latestUrl = this.normalizeWebUrl(this.getCurrentWebUrl(page));
+            // 导航被中断/中止时，检查页面是否已到达目标 URL，若已到达则继续执行
+            const isAborted = message.includes('ERR_ABORTED') || message.includes('is interrupted by another navigation');
+            if (isAborted) {
+                // 短暂等待让页面重定向/跳转完成
+                await new Promise((r) => setTimeout(r, 1500));
+                const settledUrl = this.normalizeWebUrl(this.getCurrentWebUrl(page));
+                if (settledUrl && settledUrl === targetUrl) {
+                    logger.warn(`${label}: navigation aborted but page reached target url, continue`);
+                    await this.waitForWebPageStable(page);
+                    return null;
+                }
+                // URL 不完全匹配但导航被中止，可能是目标页面发生了重定向（登录回调等），
+                // 尝试重新导航一次
+                logger.warn(`${label}: navigation aborted, current=${settledUrl}, retrying goto`);
+                try {
+                    const retryResult = await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 30000 });
+                    await page.waitForLoadState('networkidle', { timeout: 8000 }).catch(() => undefined);
+                    return retryResult;
+                }
+                catch (retryError) {
+                    const retryMessage = retryError.message || '';
+                    const finalUrl = this.normalizeWebUrl(this.getCurrentWebUrl(page));
+                    // 重试后仍报错，但只要页面不在 about:blank 就继续
+                    if (finalUrl && finalUrl !== 'about:blank') {
+                        logger.warn(`${label}: retry goto also failed (${retryMessage.substring(0, 80)}), but page has content at ${finalUrl}, continue`);
+                        await this.waitForWebPageStable(page);
+                        return null;
+                    }
+                    throw retryError;
+                }
+            }
+            throw error;
         }
     }
     async handleExecuteWebAction(ws, request) {
@@ -1642,15 +1657,23 @@ export class DebugWebSocketServer {
                     };
                 }
                 else {
-                    // 桌面模式：走浏览器池，复用已 launch 的 Chromium
+                    // 桌面模式：每次执行独立启动 Chromium，结束后真正关闭，避免残留 Chrome 进程。
                     const contextOptions = {
                         viewport: request.viewport || { width: 1280, height: 800 },
                     };
-                    const acquired = await webBrowserPool.acquireContext(contextOptions);
-                    browser = acquired.browser;
-                    context = acquired.context;
+                    browser = await playwright.chromium.launch({ headless: false });
+                    context = await browser.newContext(contextOptions);
                     page = await context.newPage();
-                    releaseBrowser = acquired.release;
+                    releaseBrowser = async () => {
+                        try {
+                            await context.close();
+                        }
+                        catch { /* ignore */ }
+                        try {
+                            await browser.close();
+                        }
+                        catch { /* ignore */ }
+                    };
                 }
                 // mobileMode 下注入脚本，将 touchstart/touchmove/wheel 事件监听器设为 passive:false
                 // 修复部分移动端网页在 passive listener 中调用 preventDefault 导致点击失效的问题
@@ -1714,20 +1737,25 @@ export class DebugWebSocketServer {
             // 取出 agent / page
             const agent = session.webAgent;
             const page = session.page;
+            // 执行前检查浏览器和页面是否仍然存活，防止在已崩溃的浏览器上操作导致不明错误
+            const browserRef = session.browser;
+            if (browserRef && typeof browserRef.isConnected === 'function' && !browserRef.isConnected()) {
+                throw new Error('Browser has been disconnected before action execution. The browser process may have crashed or been killed.');
+            }
+            if (page && typeof page.isClosed === 'function' && page.isClosed()) {
+                throw new Error('Page has been closed before action execution. The browser context may have been terminated.');
+            }
             // 刷新 web session 活跃时间，避免 TTL 误杀
             this.touchWebSession(sessionId);
+            // 标记 web action 正在执行中，防止 TTL GC 或并发路径误关浏览器
+            session.webActionRunning = true;
             await executeWebLogin({
                 source: request,
                 page,
                 logPrefix: `[WebAction ${sessionId}]`,
             });
-            // 兼容旧版表单登录配置
-            if (request.loginConfig && request.loginConfig.loginUrl && request.loginConfig.loginUsername && request.loginConfig.loginPassword) {
-                const loginConfig = {
-                    ...request.loginConfig,
-                    mobileMode: request.mobileMode || false
-                };
-                await this.performWebLogin(page, loginConfig);
+            if (request.url && request.actionType !== 'goto') {
+                await this.safeWebGoto(page, request.url, `[WebAction] Navigate before action`);
             }
             // ===== 周期 dump（与移动端 handleExecuteAction 行为一致） =====
             const sendDump = (dump) => {
@@ -1765,6 +1793,8 @@ export class DebugWebSocketServer {
                             const intervalDump = agent.dumpDataString({ inlineScreenshots: false });
                             sendDump(intervalDump);
                         }
+                        // 每次 dump 周期刷新活跃时间，防止长时间 aiAct 操作期间被 TTL GC 误杀
+                        this.touchWebSession(sessionId);
                     }
                     catch (dumpError) {
                         logger.warn(`[WebAction] interval dump failed: ${dumpError.message}`);
@@ -1787,7 +1817,7 @@ export class DebugWebSocketServer {
                 case 'goto': {
                     if (!request.url)
                         throw new Error('goto requires url parameter');
-                    result = await page.goto(request.url, { waitUntil: 'networkidle' });
+                    result = await this.safeWebGoto(page, request.url, `[WebAction] goto`);
                     break;
                 }
                 case 'aiAction': {
@@ -1833,11 +1863,6 @@ export class DebugWebSocketServer {
                     const code = request.actionParams?.code || request.code || '';
                     if (!code)
                         throw new Error('runCode requires actionParams.code');
-                    // 如果提供了URL，先导航到指定页面
-                    if (request.url) {
-                        logger.info(`[WebAction] Navigating to URL before runCode: ${request.url}`);
-                        await page.goto(request.url, { waitUntil: 'networkidle' });
-                    }
                     // 行号探针：与真机 runCode 一致，通过 instrumentCode 在每条语句前插入 __lineCallback(line)，
                     // 推送 type='execution_line' 给前端，使 web 与真机调试体验一致
                     const onExecutionLine = (line) => {
@@ -2036,6 +2061,10 @@ export class DebugWebSocketServer {
             });
         }
         finally {
+            // 清除执行中标记，允许后续关闭浏览器
+            if (session) {
+                session.webActionRunning = false;
+            }
             // 不管成功还是失败，web 调试结束后必须关闭浏览器
             try {
                 await this.closeWebSession(sessionId);
@@ -2094,6 +2123,11 @@ export class DebugWebSocketServer {
         const session = sessionManager.get(sessionId);
         if (!session || !session.browser)
             return;
+        // 如果 web action 正在执行中，跳过关闭，防止 TTL GC 或其他并发路径误杀浏览器
+        if (session.webActionRunning) {
+            logger.warn(`[WebSession] Session ${sessionId} has running web action, skipping close to avoid race condition`);
+            return;
+        }
         // 停止周期 dump
         if (session.dumpIntervalId) {
             clearInterval(session.dumpIntervalId);