@aiscene/aiserver 1.9.6 → 1.9.7

package/dist/debug/websocket-server.d.ts

@@ -1,4 +1,5 @@
 import type { DebugSession } from '../core/types.js';
+import type { BatchActionRequest } from './types.js';
 import type { AIServerConfig } from '../config/schema.js';
 export declare class DebugWebSocketServer {
     private wss;
@@ -6,6 +7,8 @@ export declare class DebugWebSocketServer {
     private port;
     private isStarted;
     private activeBatchSessionIds;
+    private createHeadlessBatchClient;
+    runBatchActionInBackground(request: BatchActionRequest): void;
     private taskLogSubscribers;
     private clientTaskSubscriptions;
     /** 当前已启动浏览器的 web session 集合（用于并发计数与 TTL 扫描） */
@@ -53,6 +56,8 @@ export declare class DebugWebSocketServer {
     private handleUnsubscribeTaskLogs;
     /** 判断 naturalLanguage 是否为可执行代码（而非自然语言描述） */
     private isCodeScript;
+    private resolveScriptReferences;
+    private resolveActionParamsReferences;
     private handleStartDebug;
     /**
      * Web 调试主进程内嵌执行

package/dist/debug/websocket-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/debug/websocket-server.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAsBrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA0B1D,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,GAAG,CAAgC;IAC3C,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,qBAAqB,CAA0B;IAGvD,OAAO,CAAC,kBAAkB,CAA0C;IAEpE,OAAO,CAAC,uBAAuB,CAA0C;IAGzE,+CAA+C;IAC/C,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,6DAA6D;IAC7D,OAAO,CAAC,wBAAwB,CAAgE;IAChG,6CAA6C;IAC7C,OAAO,CAAC,uBAAuB,CAA6E;IAC5G,gBAAgB;IAChB,OAAO,CAAC,iBAAiB,CAA+B;gBAE5C,IAAI,GAAE,MAAa;IAI/B,8CAA8C;IAC9C,OAAO,CAAC,eAAe;IAMvB,2CAA2C;IAC3C,OAAO,CAAC,kBAAkB;IAI1B,8BAA8B;IAC9B,OAAO,CAAC,oBAAoB;IAI5B,qCAAqC;IACrC,OAAO,CAAC,iBAAiB;IAenB,KAAK,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA4ElD;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAmB5B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAexB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAcxB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAiB1B;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,uBAAuB;YAuDjB,aAAa;YAuDb,kBAAkB;IAwGhC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,yBAAyB;IAWjC,4CAA4C;IAC5C,OAAO,CAAC,YAAY;YAMN,gBAAgB;IAiD9B;;;;;OAKG;YACW,mBAAmB;IAiQjC;;OAEG;YACW,gBAAgB;IAyC9B,6CAA6C;YAC/B,uBAAuB;IAkJrC,uCAAuC;YACzB,wBAAwB;YAwKxB,mBAAmB;YAuNnB,kBAAkB;IAgQhC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,uBAAuB;IAY/B,OAAO,CAAC,gBAAgB;YAQV,oBAAoB;YAKpB,WAAW;YAmDX,sBAAsB;IAwfpC,OAAO,CAAC,qBAAqB,CAAsC;YAErD,iBAAiB;IAwM/B,OAAO,CAAC,oBAAoB;YAiBd,uBAAuB;IAqCrC,uBAAuB;YACT,mBAAmB;IAiPjC,qCAAqC;YACvB,mBAAmB;YA+InB,eAAe;YAiBf,qBAAqB;YA4BrB,oBAAoB;YAuBpB,eAAe;YAqDf,qBAAqB;YAqBrB,eAAe;YAgIf,aAAa;IAU3B;;OAEG;YACW,gBAAgB;IA2B9B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;YAgFV,iBAAiB;IAiE/B,OAAO,CAAC,WAAW;IA2DnB,OAAO,CAAC,SAAS;IAIjB;;;OAGG;IAEH;;;OAGG;YACW,wBAAwB;YAqCxB,cAAc;IA4B5B,WAAW,IAAI,YAAY,EAAE;IAIvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAa7B"}
+{"version":3,"file":"websocket-server.d.ts","sourceRoot":"","sources":["../../src/debug/websocket-server.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGrD,OAAO,KAAK,EAQV,kBAAkB,EAUnB,MAAM,YAAY,CAAC;AACpB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA2B1D,qBAAa,oBAAoB;IAC/B,OAAO,CAAC,GAAG,CAAgC;IAC3C,OAAO,CAAC,MAAM,CAAkB;IAChC,OAAO,CAAC,IAAI,CAAS;IACrB,OAAO,CAAC,SAAS,CAAkB;IACnC,OAAO,CAAC,qBAAqB,CAA0B;IAEvD,OAAO,CAAC,yBAAyB;IAajC,0BAA0B,CAAC,OAAO,EAAE,kBAAkB,GAAG,IAAI;IAY7D,OAAO,CAAC,kBAAkB,CAA0C;IAEpE,OAAO,CAAC,uBAAuB,CAA0C;IAGzE,+CAA+C;IAC/C,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,6DAA6D;IAC7D,OAAO,CAAC,wBAAwB,CAAgE;IAChG,6CAA6C;IAC7C,OAAO,CAAC,uBAAuB,CAA6E;IAC5G,gBAAgB;IAChB,OAAO,CAAC,iBAAiB,CAA+B;gBAE5C,IAAI,GAAE,MAAa;IAI/B,8CAA8C;IAC9C,OAAO,CAAC,eAAe;IAMvB,2CAA2C;IAC3C,OAAO,CAAC,kBAAkB;IAI1B,8BAA8B;IAC9B,OAAO,CAAC,oBAAoB;IAI5B,qCAAqC;IACrC,OAAO,CAAC,iBAAiB;IAenB,KAAK,CAAC,MAAM,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA4ElD;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAmB5B;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAexB;;OAEG;IACH,OAAO,CAAC,gBAAgB;IAcxB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAiB1B;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,uBAAuB;YAuDjB,aAAa;YAuDb,kBAAkB;IAwGhC,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,yBAAyB;IAWjC,4CAA4C;IAC5C,OAAO,CAAC,YAAY;YAON,uBAAuB;YAQvB,6BAA6B;YAY7B,gBAAgB;IAkD9B;;;;;OAKG;YACW,mBAAmB;IAkQjC;;OAEG;YACW,gBAAgB;IAyC9B,6CAA6C;YAC/B,uBAAuB;IAkJrC,uCAAuC;YACzB,wBAAwB;YAwKxB,mBAAmB;YAyNnB,kBAAkB;IAkQhC,OAAO,CAAC,eAAe;IAWvB,OAAO,CAAC,gBAAgB;IAKxB,OAAO,CAAC,uBAAuB;IAY/B,OAAO,CAAC,gBAAgB;YAQV,oBAAoB;YAKpB,WAAW;YAmDX,sBAAsB;IA2fpC,OAAO,CAAC,qBAAqB,CAAsC;YAErD,iBAAiB;IA8M/B,OAAO,CAAC,oBAAoB;YAiBd,uBAAuB;IAqCrC,uBAAuB;YACT,mBAAmB;IAoPjC,qCAAqC;YACvB,mBAAmB;YAkJnB,eAAe;YAiBf,qBAAqB;YA4BrB,oBAAoB;YAuBpB,eAAe;YAqDf,qBAAqB;YAqBrB,eAAe;YAgIf,aAAa;IAU3B;;OAEG;YACW,gBAAgB;IA2B9B;;;OAGG;IACH,OAAO,CAAC,gBAAgB;YAgFV,iBAAiB;IAiE/B,OAAO,CAAC,WAAW;IA2DnB,OAAO,CAAC,SAAS;IAIjB;;;OAGG;IAEH;;;OAGG;YACW,wBAAwB;YAqCxB,cAAc;IA4B5B,WAAW,IAAI,YAAY,EAAE;IAIvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAa7B"}

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,29 @@ 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);
+        void this.handleBatchAction(ws, request).catch((error) => {
+            logger.error(`[BatchAction] Background batch failed: batchId=${batchId}, error=${error.message}`);
+        });
+    }
     // 任务日志订阅: taskId -> Set of WebSocket clients
     taskLogSubscribers = new Map();
     // 记录客户端订阅的所有任务（用于断开时清理）
@@ -449,6 +473,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 +502,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 +579,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 +1142,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,7 +1169,7 @@ 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,
@@ -1371,6 +1416,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,7 +1439,7 @@ export class DebugWebSocketServer {
                 type: request.platform || 'android',
                 testName: createDebugReportGroupName(request),
                 actionType: 'aiAct',
-                naturalLanguage: request.naturalLanguage,
+                naturalLanguage: resolvedNaturalLanguage,
                 udid: request.deviceId,
                 packageName: request.packageName,
                 modelConfig: fullModelConfig,
@@ -1633,6 +1679,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 +1908,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 +1947,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 +2334,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 +2395,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 +2580,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 +2591,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;
@@ -2631,15 +2686,17 @@ 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);
             // 构造 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,
@@ -3083,7 +3140,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();