@aiscene/aiserver 1.6.5 → 1.6.6

package/dist/debug/websocket-server.js

@@ -2,7 +2,9 @@ import { WebSocketServer } from 'ws';
 import { fork } from 'child_process';
 import { URL } from 'url';
 import os from 'os';
-import { uploadReportToServer } from '../api/callback.js';
+import { uploadReportToServer, uploadCapturePackageFile } from '../api/callback.js';
+import fs from 'fs';
+import path from 'path';
 import { createLogger } from '../core/logger.js';
 import { eventBus } from '../core/event-bus.js';
 import { sessionManager } from './session-manager.js';
@@ -13,6 +15,7 @@ import { webBrowserPool } from './web-browser-pool.js';
 import { ExecutorFactory } from '../executor/executor-factory.js';
 import { instrumentCode } from '../executor/code-instrument.js';
 import { playwrightSwipe } from '../core/native-swipe.js';
+import { whistleManager } from '../proxy/whistle-manager.js';
 const logger = createLogger('DebugWebSocket');
 /** 获取本机可用的非内部 IPv4 地址，供客户端连接投屏 WebSocket */
 function getLocalIP() {
@@ -661,6 +664,12 @@ export class DebugWebSocketServer {
             executionId: sessionId,
             mobileMode: request.mobileMode,
             deviceName: request.deviceName,
+            // 环境代理配置
+            environmentId: request.environmentId,
+            proxyPort: request.proxyPort || (request.hostMappings && request.hostMappings.length > 0 ? 8899 : undefined),
+            hostMappings: request.hostMappings,
+            // 公司代理平台账号
+            proxyAccount: request.proxyAccount,
             // 添加登录配置
             ...(request.loginConfig && {
                 loginUrl: request.loginConfig.loginUrl,
@@ -673,6 +682,39 @@ export class DebugWebSocketServer {
                 agreementSelector: request.loginConfig.agreementSelector,
             }),
         };
+        // Setup proxy rules: 如果有 proxyAccount，使用公司代理平台；否则走本地 Whistle
+        const whistleApiBase = config.proxyAccount ? `http://proxy-pc.jd.com/account/${config.proxyAccount}` : undefined;
+        if (config.hostMappings && config.hostMappings.length > 0) {
+            try {
+                const envId = config.environmentId || sessionId;
+                const ruleGroupName = whistleManager.generateRuleGroupName(envId);
+                const success = await whistleManager.createRuleGroup(ruleGroupName, config.hostMappings, whistleApiBase);
+                if (success) {
+                    const sess = sessionManager.get(sessionId);
+                    if (sess) {
+                        sess.whistleRuleGroupName = ruleGroupName;
+                        sess.whistleApiBase = whistleApiBase;
+                    }
+                    if (!config.proxyAccount && !config.proxyPort)
+                        config.proxyPort = 8899;
+                    logger.info('[Debug] Whistle proxy setup: ruleGroup=' + ruleGroupName + ', proxyPort=' + config.proxyPort + ', proxyAccount=' + (config.proxyAccount || 'N/A'));
+                    // 开始请求抓包（传入 proxyAccount，自动选择正确的 Whistle 实例）
+                    try {
+                        await whistleManager.startCapture(sessionId, undefined, 3000, config.proxyAccount);
+                        logger.info('[Debug] Whistle request capture started: sessionId=' + sessionId);
+                    }
+                    catch (captureErr) {
+                        logger.warn('[Debug] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+                    }
+                }
+                else {
+                    logger.warn('[Debug] Whistle proxy setup failed, continuing without proxy');
+                }
+            }
+            catch (err) {
+                logger.warn('[Debug] Whistle proxy setup error: ' + (err instanceof Error ? err.message : String(err)));
+            }
+        }
         // 使用 AbortSignal 监听停止请求
         const executePromise = executor.execute(config);
         const abortPromise = new Promise((resolve) => {
@@ -698,6 +740,42 @@ export class DebugWebSocketServer {
         // 清理 executor 引用
         if (session)
             session.executor = undefined;
+        // 停止请求抓包，采集调试期间的所有请求
+        let capturedRequests = [];
+        let captureDataUrl;
+        try {
+            capturedRequests = await whistleManager.stopCapture(sessionId);
+            if (capturedRequests.length > 0) {
+                logger.info('[Debug] Captured ' + capturedRequests.length + ' requests during debug session');
+                // 将抓包数据保存到文件并上传到 OSS
+                try {
+                    const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                    if (uploadResult) {
+                        captureDataUrl = uploadResult;
+                        logger.info('[Debug] Capture data uploaded: ' + captureDataUrl);
+                    }
+                }
+                catch (uploadErr) {
+                    logger.warn('[Debug] Failed to upload capture data: ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                }
+            }
+        }
+        catch (captureErr) {
+            logger.warn('[Debug] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+        }
+        // Teardown Whistle proxy rules if they were set
+        const currentSess = sessionManager.get(sessionId);
+        const whistleRuleName = currentSess ? currentSess.whistleRuleGroupName : undefined;
+        if (whistleRuleName) {
+            whistleManager.removeRuleGroup(whistleRuleName, whistleApiBase).catch((err) => {
+                logger.warn('[Debug] Failed to teardown Whistle proxy: ' + (err instanceof Error ? err.message : String(err)));
+            });
+            if (currentSess) {
+                currentSess.whistleRuleGroupName = undefined;
+                currentSess.whistleApiBase = undefined;
+            }
+            logger.info('[Debug] Whistle proxy teardown: ruleGroup=' + whistleRuleName);
+        }
         sessionManager.updateStatus(sessionId, result.success ? 'completed' : 'failed');
         // 调试：打印 result 内容
         logger.info(`[executeRunCodeInProcess] result: success=${result.success}, reportFile=${result.reportFile || ''}, errorMessage=${result.errorMessage}`);
@@ -714,13 +792,17 @@ export class DebugWebSocketServer {
             reportUrl,
             error: result.errorMessage,
             platform: request.platform || 'android',
+            captureDataUrl,
         }, request.deviceId);
         // 同时发一份 debug_completed，让前端调试面板能正确更新状态
+        // capturedRequests 只发摘要给前端展示，完整数据通过 captureDataUrl (OSS URL) 获取
         this.sendMessage(ws, {
             type: 'debug_completed',
             sessionId,
             success: result.success,
             reportUrl,
+            capturedRequests: capturedRequests.length > 0 ? this.simplifyCapturedRequests(capturedRequests) : undefined,
+            captureDataUrl,
         }, request.deviceId);
     }
     /** 自然语言模式：Fork worker 进程执行 aiAction */
@@ -741,6 +823,12 @@ export class DebugWebSocketServer {
             taskId: sessionId,
             nodeId: this.config.task.nodeId,
             modelConfig: fullModelConfig,
+            // 环境代理配置
+            environmentId: request.environmentId,
+            proxyPort: request.proxyPort || (request.hostMappings && request.hostMappings.length > 0 ? 8899 : undefined),
+            hostMappings: request.hostMappings,
+            // 公司代理平台账号
+            proxyAccount: request.proxyAccount,
             // 添加登录配置
             ...(request.loginConfig && {
                 loginUrl: request.loginConfig.loginUrl,
@@ -753,6 +841,39 @@ export class DebugWebSocketServer {
                 agreementSelector: request.loginConfig.agreementSelector,
             }),
         };
+        // Setup proxy rules: 如果有 proxyAccount，使用公司代理平台；否则走本地 Whistle
+        const workerWhistleApiBase = execConfig.proxyAccount ? `http://proxy-pc.jd.com/account/${execConfig.proxyAccount}` : undefined;
+        if (execConfig.hostMappings && execConfig.hostMappings.length > 0) {
+            try {
+                const envId = execConfig.environmentId || sessionId;
+                const ruleGroupName = whistleManager.generateRuleGroupName(envId);
+                const success = await whistleManager.createRuleGroup(ruleGroupName, execConfig.hostMappings, workerWhistleApiBase);
+                if (success) {
+                    const sess = sessionManager.get(sessionId);
+                    if (sess) {
+                        sess.whistleRuleGroupName = ruleGroupName;
+                        sess.whistleApiBase = workerWhistleApiBase;
+                    }
+                    if (!execConfig.proxyAccount && !execConfig.proxyPort)
+                        execConfig.proxyPort = 8899;
+                    logger.info('[Debug-Worker] Whistle proxy setup: ruleGroup=' + ruleGroupName + ', proxyPort=' + execConfig.proxyPort + ', proxyAccount=' + (execConfig.proxyAccount || 'N/A'));
+                    // 开始请求抓包（传入 proxyAccount，自动选择正确的 Whistle 实例）
+                    try {
+                        await whistleManager.startCapture(sessionId, undefined, 3000, execConfig.proxyAccount);
+                        logger.info('[Debug-Worker] Whistle request capture started: sessionId=' + sessionId);
+                    }
+                    catch (captureErr) {
+                        logger.warn('[Debug-Worker] Failed to start request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+                    }
+                }
+                else {
+                    logger.warn('[Debug-Worker] Whistle proxy setup failed, continuing without proxy');
+                }
+            }
+            catch (err) {
+                logger.warn('[Debug-Worker] Whistle proxy setup error: ' + (err instanceof Error ? err.message : String(err)));
+            }
+        }
         // Fork worker process for long-running debug
         const workerPath = new URL('../executor/worker-entry.js', import.meta.url).pathname;
         // 优先使用 process.env 中已被 applyModelConfig() 设置的值（前端传入的模型配置），
@@ -799,10 +920,51 @@ export class DebugWebSocketServer {
                 return;
             resultHandled = true;
             const success = workerResult.success !== false;
+            // 停止请求抓包，采集调试期间的所有请求
+            let workerCapturedRequests = [];
+            try {
+                workerCapturedRequests = await whistleManager.stopCapture(sessionId);
+                if (workerCapturedRequests.length > 0) {
+                    logger.info('[Debug-Worker] Captured ' + workerCapturedRequests.length + ' requests during debug session');
+                }
+            }
+            catch (captureErr) {
+                logger.warn('[Debug-Worker] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+            }
+            // Teardown Whistle proxy rules if they were set
+            const curSess = sessionManager.get(sessionId);
+            const wRuleName = curSess ? curSess.whistleRuleGroupName : undefined;
+            if (wRuleName) {
+                try {
+                    await whistleManager.removeRuleGroup(wRuleName, workerWhistleApiBase);
+                    if (curSess) {
+                        curSess.whistleRuleGroupName = undefined;
+                        curSess.whistleApiBase = undefined;
+                    }
+                    logger.info('[Debug-Worker] Whistle proxy teardown: ruleGroup=' + wRuleName);
+                }
+                catch (err) {
+                    logger.warn('[Debug-Worker] Failed to teardown Whistle proxy: ' + (err instanceof Error ? err.message : String(err)));
+                }
+            }
             sessionManager.updateStatus(sessionId, success ? 'completed' : 'failed');
             const reportFile = workerResult.reportFile || '';
             const reportUrl = await this.safeUploadReport(reportFile, sessionId);
             logger.info(`[Debug] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
+            // 将 worker 抓包数据保存到文件并上传到 OSS
+            let workerCaptureDataUrl;
+            if (workerCapturedRequests.length > 0) {
+                try {
+                    const uploadResult = await this.saveAndUploadCaptureData(workerCapturedRequests, sessionId);
+                    if (uploadResult) {
+                        workerCaptureDataUrl = uploadResult;
+                        logger.info('[Debug-Worker] Capture data uploaded: ' + workerCaptureDataUrl);
+                    }
+                }
+                catch (uploadErr) {
+                    logger.warn('[Debug-Worker] Failed to upload capture data: ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+                }
+            }
             this.sendMessage(ws, {
                 type: 'debug_completed',
                 sessionId,
@@ -810,6 +972,8 @@ export class DebugWebSocketServer {
                 dump: '',
                 reportUrl,
                 error: workerResult.errorMessage,
+                capturedRequests: workerCapturedRequests.length > 0 ? this.simplifyCapturedRequests(workerCapturedRequests) : undefined,
+                captureDataUrl: workerCaptureDataUrl,
             }, request.deviceId);
         };
         childProcess.on('message', (message) => {
@@ -893,6 +1057,12 @@ export class DebugWebSocketServer {
                 modelConfig: fullModelConfig,
                 executionId: sessionId,
                 skipAppRestart: request.skipAppRestart,
+                // 环境代理配置
+                environmentId: request.environmentId,
+                proxyPort: request.proxyPort,
+                hostMappings: request.hostMappings,
+                // 公司代理平台账号
+                proxyAccount: request.proxyAccount,
             };
             // 使用 AbortSignal 监听停止请求
             const executePromise = executor.execute(config);
@@ -1685,6 +1855,30 @@ export class DebugWebSocketServer {
             return;
         }
         await this.closeWebSession(request.sessionId);
+        // 停止请求抓包
+        try {
+            await whistleManager.stopCapture(request.sessionId);
+        }
+        catch (captureErr) {
+            logger.warn('[CloseWebSession] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+        }
+        // Teardown Whistle proxy rules if they were set
+        const closeSess = sessionManager.get(request.sessionId);
+        const closeWhistleRule = closeSess ? closeSess.whistleRuleGroupName : undefined;
+        if (closeWhistleRule) {
+            try {
+                const closeWhistleApiBase = closeSess ? closeSess.whistleApiBase : undefined;
+                await whistleManager.removeRuleGroup(closeWhistleRule, closeWhistleApiBase);
+                if (closeSess) {
+                    closeSess.whistleRuleGroupName = undefined;
+                    closeSess.whistleApiBase = undefined;
+                }
+                logger.info('[CloseWebSession] Whistle proxy teardown: ruleGroup=' + closeWhistleRule);
+            }
+            catch (err) {
+                logger.warn('[CloseWebSession] Failed to teardown Whistle proxy: ' + (err instanceof Error ? err.message : String(err)));
+            }
+        }
         sessionManager.updateStatus(request.sessionId, 'stopped');
         this.sendMessage(ws, { type: 'web_session_closed', sessionId: request.sessionId });
     }
@@ -1749,15 +1943,59 @@ export class DebugWebSocketServer {
         }
         // 关闭 web 浏览器（如果存在）
         await this.closeWebSession(request.sessionId);
+        // 停止请求抓包，采集调试期间的所有请求
+        let stopCapturedRequests = [];
+        try {
+            stopCapturedRequests = await whistleManager.stopCapture(request.sessionId);
+            if (stopCapturedRequests.length > 0) {
+                logger.info('[StopDebug] Captured ' + stopCapturedRequests.length + ' requests during debug session');
+            }
+        }
+        catch (captureErr) {
+            logger.warn('[StopDebug] Failed to stop request capture: ' + (captureErr instanceof Error ? captureErr.message : String(captureErr)));
+        }
+        // Teardown Whistle proxy rules if they were set
+        const stopSess = sessionManager.get(request.sessionId);
+        const stopWhistleRule = stopSess ? stopSess.whistleRuleGroupName : undefined;
+        if (stopWhistleRule) {
+            try {
+                const stopWhistleApiBase = stopSess ? stopSess.whistleApiBase : undefined;
+                await whistleManager.removeRuleGroup(stopWhistleRule, stopWhistleApiBase);
+                if (stopSess) {
+                    stopSess.whistleRuleGroupName = undefined;
+                    stopSess.whistleApiBase = undefined;
+                }
+                logger.info('[StopDebug] Whistle proxy teardown: ruleGroup=' + stopWhistleRule);
+            }
+            catch (err) {
+                logger.warn('[StopDebug] Failed to teardown Whistle proxy: ' + (err instanceof Error ? err.message : String(err)));
+            }
+        }
         sessionManager.updateStatus(request.sessionId, 'stopped');
         // 上传报告文件到服务端，拿到 reportUrl
         const reportUrl = await this.safeUploadReport(reportFile, request.sessionId);
         logger.info(`[StopDebug] report uploaded: reportUrl=${reportUrl || 'null'}, reportFile=${reportFile}`);
+        // 将停止时的抓包数据保存到文件并上传到 OSS
+        let stopCaptureDataUrl;
+        if (stopCapturedRequests.length > 0) {
+            try {
+                const uploadResult = await this.saveAndUploadCaptureData(stopCapturedRequests, request.sessionId);
+                if (uploadResult) {
+                    stopCaptureDataUrl = uploadResult;
+                    logger.info('[StopDebug] Capture data uploaded: ' + stopCaptureDataUrl);
+                }
+            }
+            catch (uploadErr) {
+                logger.warn('[StopDebug] Failed to upload capture data: ' + (uploadErr instanceof Error ? uploadErr.message : String(uploadErr)));
+            }
+        }
         // 发送带执行数据的停止消息
         this.sendMessage(ws, {
             type: 'debug_stopped',
             sessionId: request.sessionId,
             reportUrl,
+            capturedRequests: stopCapturedRequests.length > 0 ? this.simplifyCapturedRequests(stopCapturedRequests) : undefined,
+            captureDataUrl: stopCaptureDataUrl,
         });
         // 同时发送 action_result，让前端能获取到停止时的执行数据
         this.sendMessage(ws, {
@@ -1774,6 +2012,8 @@ export class DebugWebSocketServer {
             sessionId: request.sessionId,
             success: false,
             reportUrl,
+            capturedRequests: stopCapturedRequests.length > 0 ? this.simplifyCapturedRequests(stopCapturedRequests) : undefined,
+            captureDataUrl: stopCaptureDataUrl,
         });
     }
     // ==================== Get Logs ====================
@@ -1937,6 +2177,97 @@ export class DebugWebSocketServer {
     sendError(ws, error) {
         this.sendMessage(ws, { type: 'error', error });
     }
+    /**
+     * 精简 CapturedRequest 列表，去除大 body 只保留摘要信息，
+     * 避免 WebSocket 消息过大（单条 body 上限 4KB，超出截断）
+     */
+    /**
+     * 将抓包数据保存到本地文件并上传到 OSS
+     * 返回 OSS URL，失败则返回 undefined
+     */
+    async saveAndUploadCaptureData(capturedRequests, sessionId) {
+        if (!capturedRequests || capturedRequests.length === 0)
+            return undefined;
+        try {
+            // 保存到本地临时文件
+            const tmpDir = path.join(process.cwd(), 'tmp', 'captures');
+            if (!fs.existsSync(tmpDir)) {
+                fs.mkdirSync(tmpDir, { recursive: true });
+            }
+            const captureFile = path.join(tmpDir, `capture_${sessionId}_${Date.now()}.json`);
+            fs.writeFileSync(captureFile, JSON.stringify(capturedRequests, null, 2));
+            logger.info(`[CaptureUpload] Saved capture data to: ${captureFile} (${capturedRequests.length} requests)`);
+            // 上传到 OSS
+            const uploadUrl = this.config?.callback?.packageFileUploadUrl;
+            if (!uploadUrl) {
+                logger.warn('[CaptureUpload] packageFileUploadUrl not configured, skip upload');
+                return undefined;
+            }
+            const captureDataUrl = await uploadCapturePackageFile(captureFile, sessionId, uploadUrl);
+            if (captureDataUrl) {
+                // 上传成功后删除本地临时文件
+                try {
+                    fs.unlinkSync(captureFile);
+                }
+                catch { }
+                return captureDataUrl;
+            }
+            return undefined;
+        }
+        catch (err) {
+            logger.error('[CaptureUpload] Failed to save/upload capture data: ' + (err instanceof Error ? err.message : String(err)));
+            return undefined;
+        }
+    }
+    simplifyCapturedRequests(requests) {
+        const MAX_BODY_LENGTH = 4096;
+        return requests.map(req => {
+            const simplified = {
+                id: req.id,
+                url: req.url,
+                method: req.method,
+                statusCode: req.statusCode,
+                clientIp: req.clientIp,
+                startTime: req.startTime,
+                endTime: req.endTime,
+                duration: req.duration,
+                dnsTime: req.dnsTime,
+                requestTime: req.requestTime,
+                responseTime: req.responseTime,
+            };
+            // 请求头只保留 content-type 和 content-length
+            if (req.reqHeaders) {
+                const filteredReqHeaders = {};
+                for (const [k, v] of Object.entries(req.reqHeaders)) {
+                    if (k.toLowerCase() === 'content-type' || k.toLowerCase() === 'content-length') {
+                        filteredReqHeaders[k] = v;
+                    }
+                }
+                simplified.reqHeaders = filteredReqHeaders;
+            }
+            if (req.resHeaders) {
+                const filteredResHeaders = {};
+                for (const [k, v] of Object.entries(req.resHeaders)) {
+                    if (k.toLowerCase() === 'content-type' || k.toLowerCase() === 'content-length') {
+                        filteredResHeaders[k] = v;
+                    }
+                }
+                simplified.resHeaders = filteredResHeaders;
+            }
+            // body 截断
+            if (req.reqBody) {
+                simplified.reqBody = req.reqBody.length > MAX_BODY_LENGTH
+                    ? req.reqBody.substring(0, MAX_BODY_LENGTH) + '...[truncated]'
+                    : req.reqBody;
+            }
+            if (req.resBody) {
+                simplified.resBody = req.resBody.length > MAX_BODY_LENGTH
+                    ? req.resBody.substring(0, MAX_BODY_LENGTH) + '...[truncated]'
+                    : req.resBody;
+            }
+            return simplified;
+        });
+    }
     async cleanupSession(sessionId) {
         // 关闭 web 浏览器（如果存在）
         await this.closeWebSession(sessionId);