@aiscene/aiserver 1.9.6 → 1.9.8

package/dist/debug/websocket-server.js

@@ -21,6 +21,7 @@ import { applyAiMemory } from '../core/ai-memory.js';
 import { whistleManager } from '../proxy/whistle-manager.js';
 import { executeAndroidLogin, executeWebLogin, } from '../login/android-login-context.js';
 import { webRecordingManager } from '../recorder/web-recording-manager.js';
+import { resolveTestCaseReferences } from '../task/test-case-reference-resolver.js';
 const logger = createLogger('DebugWebSocket');
 /** 获取本机可用的非内部 IPv4 地址，供客户端连接投屏 WebSocket */
 function getLocalIP() {
@@ -43,6 +44,30 @@ export class DebugWebSocketServer {
     port;
     isStarted = false;
     activeBatchSessionIds = new Set();
+    createHeadlessBatchClient(batchId) {
+        return {
+            OPEN: 1,
+            readyState: 1,
+            bufferedAmount: 0,
+            send: (_payload, callback) => {
+                if (typeof callback === 'function')
+                    callback();
+            },
+            close: () => undefined,
+            terminate: () => undefined,
+        };
+    }
+    runBatchActionInBackground(request) {
+        if (!this.isStarted) {
+            throw new Error('Debug WebSocket server is not started');
+        }
+        const batchId = request?.batchId || 'unknown';
+        const ws = this.createHeadlessBatchClient(batchId);
+        return this.handleBatchAction(ws, request).catch((error) => {
+            logger.error(`[BatchAction] Background batch failed: batchId=${batchId}, error=${error.message}`);
+            throw error;
+        });
+    }
     // 任务日志订阅: taskId -> Set of WebSocket clients
     taskLogSubscribers = new Map();
     // 记录客户端订阅的所有任务（用于断开时清理）
@@ -449,6 +474,24 @@ export class DebugWebSocketServer {
         // 包含 await/this.agent/this.sleep 等 JS 代码特征则视为代码
         return /\bawait\b/.test(text) || /\bthis\.(agent|sleep|page)\b/.test(text);
     }
+    async resolveScriptReferences(script) {
+        if (!script)
+            return script;
+        return resolveTestCaseReferences(script, {
+            apiUrl: this.config.task.apiUrl,
+            logger,
+        });
+    }
+    async resolveActionParamsReferences(actionParams) {
+        if (!actionParams || typeof actionParams.code !== 'string') {
+            return actionParams;
+        }
+        const resolvedCode = await this.resolveScriptReferences(actionParams.code);
+        return {
+            ...actionParams,
+            code: resolvedCode || actionParams.code,
+        };
+    }
     async handleStartDebug(ws, request) {
         // Web 分支：支持 sessionId 复用 + 主进程内嵌执行 + 投屏
         if (request.platform === 'web') {
@@ -460,6 +503,7 @@ export class DebugWebSocketServer {
         const session = sessionManager.create(sessionId, ws, request.deviceId);
         this.sendMessage(ws, { type: 'session_created', sessionId }, request.deviceId);
         try {
+            request.naturalLanguage = await this.resolveScriptReferences(request.naturalLanguage) || request.naturalLanguage;
             sessionManager.updateStatus(sessionId, 'running');
             this.sendMessage(ws, { type: 'debug_started', sessionId }, request.deviceId);
             await executeAndroidLogin({
@@ -536,6 +580,7 @@ export class DebugWebSocketServer {
         }
         this.sendMessage(ws, { type: 'session_created', sessionId });
         try {
+            request.naturalLanguage = await this.resolveScriptReferences(request.naturalLanguage) || request.naturalLanguage;
             sessionManager.updateStatus(sessionId, 'running');
             this.sendMessage(ws, { type: 'debug_started', sessionId, reused: isReuse });
             // 3) 首次启动：申请浏览器 + 创建 agent + 自动投屏
@@ -1098,6 +1143,7 @@ export class DebugWebSocketServer {
         try {
             sessionManager.updateStatus(sessionId, 'running');
             this.sendMessage(ws, { type: 'action_started', sessionId, actionType: request.actionType }, request.deviceId);
+            const resolvedActionParams = await this.resolveActionParamsReferences(request.actionParams);
             await executeAndroidLogin({
                 source: request,
                 deviceId: request.deviceId,
@@ -1124,10 +1170,11 @@ export class DebugWebSocketServer {
                 testName: createDebugReportGroupName(request),
                 actionType: request.actionType,
                 locatePrompt: request.locatePrompt,
-                actionParams: request.actionParams,
+                actionParams: resolvedActionParams,
                 udid: request.deviceId,
                 packageName: request.packageName,
-                testUrl: request.testUrl,
+                testUrl: this.pickWebTargetUrl(request),
+                url: this.pickWebTargetUrl(request),
                 modelConfig: fullModelConfig,
                 aiMemory: request.aiMemory,
                 memory: request.memory,
@@ -1291,7 +1338,7 @@ export class DebugWebSocketServer {
         const fullModelConfig = this.applyModelConfig(request.modelConfig);
         // 始终启动请求抓包
         try {
-            await whistleManager.startCapture(sessionId);
+            await whistleManager.startCapture(sessionId, undefined, 3000, request.proxyAccount);
             logger.info('[AiAct] Whistle request capture started: sessionId=' + sessionId);
         }
         catch (captureErr) {
@@ -1371,6 +1418,7 @@ export class DebugWebSocketServer {
         try {
             sessionManager.updateStatus(sessionId, 'running');
             this.sendMessage(ws, { type: 'ai_act_started', sessionId }, request.deviceId);
+            const resolvedNaturalLanguage = await this.resolveScriptReferences(request.naturalLanguage);
             await executeAndroidLogin({
                 source: request,
                 deviceId: request.deviceId,
@@ -1393,14 +1441,18 @@ export class DebugWebSocketServer {
                 type: request.platform || 'android',
                 testName: createDebugReportGroupName(request),
                 actionType: 'aiAct',
-                naturalLanguage: request.naturalLanguage,
+                naturalLanguage: resolvedNaturalLanguage,
                 udid: request.deviceId,
                 packageName: request.packageName,
+                testUrl: this.pickWebTargetUrl(request),
+                url: this.pickWebTargetUrl(request),
                 modelConfig: fullModelConfig,
                 aiMemory: request.aiMemory,
                 memory: request.memory,
                 memoryScope: request.memoryScope,
                 skipAppRestart: request.skipAppRestart,
+                proxyPort: request.proxyPort,
+                proxyAccount: request.proxyAccount,
                 actionParams: {
                     deepLocate: request.deepLocate,
                     deepThink: request.deepThink,
@@ -1547,9 +1599,92 @@ export class DebugWebSocketServer {
             return String(value).split('#')[0].replace(/\/$/, '');
         }
     }
+    nonEmptyText(value) {
+        if (typeof value !== 'string')
+            return '';
+        const trimmed = value.trim();
+        if (!trimmed)
+            return '';
+        if (trimmed.length >= 2 &&
+            ((trimmed[0] === '"' && trimmed[trimmed.length - 1] === '"') ||
+                (trimmed[0] === "'" && trimmed[trimmed.length - 1] === "'"))) {
+            return trimmed.slice(1, -1).trim();
+        }
+        return trimmed;
+    }
+    pickWebTargetUrlWithSource(source, label = 'source', seen = new WeakSet()) {
+        if (!source || typeof source !== 'object')
+            return { value: '', path: '' };
+        if (seen.has(source))
+            return { value: '', path: '' };
+        seen.add(source);
+        const record = source;
+        const urlKeys = [
+            'testUrl',
+            'test_url',
+            'url',
+            'targetUrl',
+            'target_url',
+            'pageUrl',
+            'page_url',
+            'openUrl',
+            'open_url',
+            'jumpUrl',
+            'jump_url',
+            'deeplink',
+            'deepLink',
+            'deep_link',
+            'schemeUrl',
+            'scheme_url',
+            'schemaUrl',
+            'schema_url',
+            'h5Url',
+            'h5_url',
+            'webUrl',
+            'web_url',
+            'landingUrl',
+            'landing_url',
+        ];
+        for (const key of urlKeys) {
+            const value = this.nonEmptyText(record[key]);
+            if (value)
+                return { value, path: `${label}.${key}` };
+        }
+        const nestedKeys = [
+            'actionParams',
+            'params',
+            'config',
+            'data',
+            'payload',
+            'extra',
+            'case',
+            'testCase',
+            'request',
+            'context',
+        ];
+        for (const key of nestedKeys) {
+            const nested = record[key];
+            if (nested && typeof nested === 'object') {
+                const picked = this.pickWebTargetUrlWithSource(nested, `${label}.${key}`, seen);
+                if (picked.value)
+                    return picked;
+            }
+        }
+        return { value: '', path: '' };
+    }
     pickWebTargetUrl(source) {
-        const value = source?.testUrl || source?.test_url || source?.url;
-        return value && String(value).trim() ? String(value).trim() : '';
+        return this.pickWebTargetUrlWithSource(source).value;
+    }
+    summarizeUrlInputs(source) {
+        if (!source || typeof source !== 'object')
+            return 'none';
+        const record = source;
+        const topLevelKeys = Object.keys(record).filter((key) => /url|link|scheme|schema|deep/i.test(key));
+        const actionParams = record.actionParams;
+        const actionParamKeys = actionParams && typeof actionParams === 'object'
+            ? Object.keys(actionParams).filter((key) => /url|link|scheme|schema|deep/i.test(key))
+            : [];
+        return `top=[${topLevelKeys.join(',') || '-'}], actionParams=[${actionParamKeys.join(',') || '-'}]`;
     }
     pickBatchAiMemorySource(request, tc) {
         return {
@@ -1633,6 +1768,8 @@ export class DebugWebSocketServer {
         }
         try {
             this.sendMessage(ws, { type: 'web_action_started', sessionId, actionType: request.actionType });
+            const resolvedNaturalLanguage = await this.resolveScriptReferences(request.naturalLanguage);
+            const resolvedActionParams = await this.resolveActionParamsReferences(request.actionParams);
             // 始终启动请求抓包
             try {
                 await whistleManager.startCapture(sessionId);
@@ -1860,7 +1997,7 @@ export class DebugWebSocketServer {
                     break;
                 }
                 case 'aiAction': {
-                    const text = request.naturalLanguage || request.locatePrompt || '';
+                    const text = resolvedNaturalLanguage || request.locatePrompt || '';
                     if (!text)
                         throw new Error('aiAction requires naturalLanguage or locatePrompt');
                     result = await agent.aiAct(text);
@@ -1899,7 +2036,7 @@ export class DebugWebSocketServer {
                 }
                 case 'runCode': {
                     // 支持两种方式传递代码：request.code 或 request.actionParams.code
-                    const code = request.actionParams?.code || request.code || '';
+                    const code = resolvedActionParams?.code || request.code || '';
                     if (!code)
                         throw new Error('runCode requires actionParams.code');
                     // 行号探针：与真机 runCode 一致，通过 instrumentCode 在每条语句前插入 __lineCallback(line)，
@@ -2286,7 +2423,12 @@ export class DebugWebSocketServer {
                 callbackOk: callbackFailures.length === 0,
                 callbackFailures: callbackFailures.slice(-10),
             });
-            await this.continueNextLoopBatches(ws, request, finalizeCallback.data);
+            try {
+                await this.continueNextLoopBatches(ws, request, finalizeCallback.data);
+            }
+            catch (error) {
+                logger.error(`[BatchAction] Continue next loop batch failed after finalize: batchId=${batchId}, error=${error.message}`);
+            }
         }
     }
     getNextBatchRequests(callbackData) {
@@ -2342,14 +2484,16 @@ export class DebugWebSocketServer {
         if (!targetUrl) {
             throw new Error('Web 用例缺少测试地址，请先在用例中补充测试地址后再执行');
         }
+        const resolvedNaturalLanguage = await this.resolveScriptReferences(tc.naturalLanguage);
+        const resolvedActionParams = await this.resolveActionParamsReferences(tc.actionParams);
         // 构造单条 WebActionExecuteRequest
         const webActionRequest = {
             type: 'execute_web_action',
             actionType: tc.actionType || 'aiAction',
             url: targetUrl,
             testUrl: targetUrl,
-            naturalLanguage: tc.naturalLanguage,
-            actionParams: tc.actionParams,
+            naturalLanguage: resolvedNaturalLanguage,
+            actionParams: resolvedActionParams,
             sessionId: sharedSessionId || undefined,
             mobileMode: request.mobileMode,
             deviceName: request.deviceName,
@@ -2525,7 +2669,7 @@ export class DebugWebSocketServer {
             // 执行动作
             const actionType = tc.actionType || 'aiAction';
             if (actionType === 'aiAction' || actionType === 'aiAct') {
-                const text = tc.naturalLanguage || '';
+                const text = resolvedNaturalLanguage || '';
                 if (!text)
                     throw new Error('aiAction requires naturalLanguage');
                 await agent.aiAct(text);
@@ -2536,7 +2680,7 @@ export class DebugWebSocketServer {
                 await this.safeWebGoto(page, targetUrl, `${caseLabel} goto`);
             }
             else if (actionType === 'runCode') {
-                const code = tc.actionParams?.code || '';
+                const code = resolvedActionParams?.code || '';
                 if (!code)
                     throw new Error('runCode requires actionParams.code');
                 const AsyncFunctionCtor = async function () { }.constructor;
@@ -2584,6 +2728,11 @@ export class DebugWebSocketServer {
         const effectiveDeviceId = tc.deviceId || request.deviceId;
         const effectivePackageName = tc.packageName || request.packageName;
         const effectiveBundleId = tc.bundleId || request.bundleId;
+        let effectiveTestUrlInfo = this.pickWebTargetUrlWithSource(tc, 'case');
+        if (!effectiveTestUrlInfo.value) {
+            effectiveTestUrlInfo = this.pickWebTargetUrlWithSource(request, 'request');
+        }
+        let effectiveTestUrl = effectiveTestUrlInfo.value;
         const effectiveLoginContext = tc.loginContext || batchLoginContext;
         const caseMemorySource = this.pickBatchAiMemorySource(request, tc);
         const caseSessionId = `batch-${batchId}-case-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
@@ -2631,18 +2780,32 @@ export class DebugWebSocketServer {
             catch (captureErr) {
                 logger.warn(`[BatchAction] Failed to start capture: ${captureErr.message}`);
             }
+            const resolvedNaturalLanguage = await this.resolveScriptReferences(tc.naturalLanguage);
+            const resolvedActionParams = await this.resolveActionParamsReferences(tc.actionParams);
+            if (!effectiveTestUrl && resolvedActionParams && resolvedActionParams !== tc.actionParams) {
+                effectiveTestUrlInfo = this.pickWebTargetUrlWithSource({ actionParams: resolvedActionParams }, 'case');
+                effectiveTestUrl = effectiveTestUrlInfo.value;
+            }
+            if (effectiveTestUrl) {
+                logger.info(`${caseLabel}: resolved test URL from ${effectiveTestUrlInfo.path}`);
+            }
+            else {
+                logger.warn(`${caseLabel}: no test URL resolved; checked case ${this.summarizeUrlInputs(tc)}; request ${this.summarizeUrlInputs(request)}`);
+            }
             // 构造 ExecuteConfig
             const actionType = tc.actionType || 'aiAct';
             const config = {
                 type: platform,
                 testName: tc.title || tc.id || `batch-${batchId}-case-${caseIndex + 1}`,
                 actionType,
-                naturalLanguage: tc.naturalLanguage,
-                locatePrompt: tc.actionParams?.locatePrompt,
-                actionParams: tc.actionParams,
+                naturalLanguage: resolvedNaturalLanguage,
+                locatePrompt: resolvedActionParams?.locatePrompt,
+                actionParams: resolvedActionParams,
                 udid: effectiveDeviceId,
                 packageName: effectivePackageName,
                 bundleId: effectiveBundleId,
+                testUrl: effectiveTestUrl || undefined,
+                url: effectiveTestUrl || undefined,
                 modelConfig: fullModelConfig,
                 aiMemory: caseMemorySource.aiMemory,
                 memory: caseMemorySource.memory,
@@ -3083,7 +3246,7 @@ export class DebugWebSocketServer {
         const token = request.callback?.token?.trim();
         if (token)
             headers.Authorization = token.startsWith('Bearer ') ? token : `Bearer ${token}`;
-        const timeoutMs = Math.max(1000, Math.min(Number(request.callback?.timeoutMs || 10000) || 10000, 60000));
+        const timeoutMs = Math.max(1000, Math.min(Number(request.callback?.timeoutMs || 10000) || 10000, 600000));
         const maxAttempts = 2;
         for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
             const controller = new AbortController();