@aiscene/aiserver 1.9.8 → 1.9.9

package/dist/debug/websocket-server.js

@@ -3,7 +3,7 @@ import { fork } from 'child_process';
 import { URL } from 'url';
 import os from 'os';
 import { randomUUID } from 'crypto';
-import { uploadReportToServer, uploadCapturePackageFile } from '../api/callback.js';
+import { saveCaptureDataToDatabase, uploadReportToServer, uploadCapturePackageFile } from '../api/callback.js';
 import fs from 'fs';
 import path from 'path';
 import { createLogger } from '../core/logger.js';
@@ -492,6 +492,46 @@ export class DebugWebSocketServer {
             code: resolvedCode || actionParams.code,
         };
     }
+    pickNonEmptyString(...values) {
+        for (const value of values) {
+            if (typeof value === 'string' && value.trim())
+                return value.trim();
+            if (typeof value === 'number' && Number.isFinite(value))
+                return String(value);
+        }
+        return undefined;
+    }
+    buildCaptureDataPersistenceMeta(fallbackBatchId, ...sources) {
+        let batchId;
+        let creator;
+        for (const source of sources) {
+            if (!source || typeof source !== 'object')
+                continue;
+            const data = source;
+            batchId = batchId || this.pickNonEmptyString(data.batchId, data.batch_id, data.executionBatchId);
+            creator = creator || this.pickNonEmptyString(data.creator, data.erp, data.ownerErp, data.ownerERP, data.userErp, data.username, data.userName, data.proxyAccount);
+        }
+        return {
+            batchId: batchId || fallbackBatchId,
+            creator: creator || '',
+        };
+    }
+    rememberCaptureDataPersistenceMeta(sessionId, meta) {
+        const session = sessionManager.get(sessionId);
+        if (!session)
+            return;
+        session.captureDataPersistence = {
+            ...session.captureDataPersistence,
+            ...meta,
+        };
+    }
+    getCaptureDataPersistenceMeta(sessionId) {
+        const session = sessionManager.get(sessionId);
+        return {
+            batchId: session?.captureDataPersistence?.batchId || sessionId,
+            creator: session?.captureDataPersistence?.creator || '',
+        };
+    }
     async handleStartDebug(ws, request) {
         // Web 分支：支持 sessionId 复用 + 主进程内嵌执行 + 投屏
         if (request.platform === 'web') {
@@ -501,6 +541,7 @@ export class DebugWebSocketServer {
         // 真机分支：保持原有 fork worker 逻辑
         const sessionId = `debug-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
         const session = sessionManager.create(sessionId, ws, request.deviceId);
+        this.rememberCaptureDataPersistenceMeta(sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
         this.sendMessage(ws, { type: 'session_created', sessionId }, request.deviceId);
         try {
             request.naturalLanguage = await this.resolveScriptReferences(request.naturalLanguage) || request.naturalLanguage;
@@ -557,6 +598,7 @@ export class DebugWebSocketServer {
             // 复用：更新 client 引用为最新的 ws（旧 ws 可能已断）
             session.client = ws;
         }
+        this.rememberCaptureDataPersistenceMeta(sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
         // 复用时校验浏览器形态参数是否一致：mobileMode/deviceName 在 launch 阶段决定，无法热切
         if (isReuse) {
             const incomingMobile = !!request.mobileMode;
@@ -925,7 +967,7 @@ export class DebugWebSocketServer {
                 logger.info('[Debug] Captured ' + capturedRequests.length + ' requests during debug session');
                 // 将抓包数据保存到文件并上传到 OSS
                 try {
-                    const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                    const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
                     if (uploadResult) {
                         captureDataUrl = uploadResult;
                         logger.info('[Debug] Capture data uploaded: ' + captureDataUrl);
@@ -1069,7 +1111,7 @@ export class DebugWebSocketServer {
             let workerCaptureDataUrl;
             if (workerCapturedRequests.length > 0) {
                 try {
-                    const uploadResult = await this.saveAndUploadCaptureData(workerCapturedRequests, sessionId);
+                    const uploadResult = await this.saveAndUploadCaptureData(workerCapturedRequests, sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
                     if (uploadResult) {
                         workerCaptureDataUrl = uploadResult;
                         logger.info('[Debug-Worker] Capture data uploaded: ' + workerCaptureDataUrl);
@@ -1127,6 +1169,7 @@ export class DebugWebSocketServer {
     async handleExecuteAction(ws, request) {
         const sessionId = `action-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
         const session = sessionManager.create(sessionId, ws, request.deviceId);
+        this.rememberCaptureDataPersistenceMeta(sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
         const abortController = new AbortController();
         session.abortController = abortController;
         // 调试日志：打印收到的模型配置
@@ -1226,7 +1269,7 @@ export class DebugWebSocketServer {
                 if (capturedRequests.length > 0) {
                     logger.info('[Action] Captured ' + capturedRequests.length + ' requests during session');
                     try {
-                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
                         if (uploadResult) {
                             captureDataUrl = uploadResult;
                             logger.info('[Action] Capture data uploaded: ' + captureDataUrl);
@@ -1285,7 +1328,7 @@ export class DebugWebSocketServer {
                 if (capturedRequests.length > 0) {
                     logger.info('[Action] Captured ' + capturedRequests.length + ' requests (error path)');
                     try {
-                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
                         if (uploadResult)
                             captureDataUrl = uploadResult;
                     }
@@ -1332,6 +1375,7 @@ export class DebugWebSocketServer {
     async handleExecuteAiAct(ws, request) {
         const sessionId = `aiact-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
         const session = sessionManager.create(sessionId, ws, request.deviceId);
+        this.rememberCaptureDataPersistenceMeta(sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
         const abortController = new AbortController();
         session.abortController = abortController;
         // 将前端传来的 modelConfig 应用到环境变量，并获取补全后的 modelConfig（含 Planning/Insight）
@@ -1498,7 +1542,7 @@ export class DebugWebSocketServer {
                 if (capturedRequests.length > 0) {
                     logger.info('[AiAct] Captured ' + capturedRequests.length + ' requests during session');
                     try {
-                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
                         if (uploadResult) {
                             captureDataUrl = uploadResult;
                             logger.info('[AiAct] Capture data uploaded: ' + captureDataUrl);
@@ -1545,7 +1589,7 @@ export class DebugWebSocketServer {
                 if (capturedRequests.length > 0) {
                     logger.info('[AiAct] Captured ' + capturedRequests.length + ' requests (error path)');
                     try {
-                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
                         if (uploadResult)
                             captureDataUrl = uploadResult;
                     }
@@ -1766,6 +1810,7 @@ export class DebugWebSocketServer {
             session = sessionManager.create(sessionId, ws);
             session.platform = 'web';
         }
+        this.rememberCaptureDataPersistenceMeta(sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
         try {
             this.sendMessage(ws, { type: 'web_action_started', sessionId, actionType: request.actionType });
             const resolvedNaturalLanguage = await this.resolveScriptReferences(request.naturalLanguage);
@@ -2111,7 +2156,7 @@ export class DebugWebSocketServer {
                 if (capturedRequests.length > 0) {
                     logger.info('[WebAction] Captured ' + capturedRequests.length + ' requests during session');
                     try {
-                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
                         if (uploadResult) {
                             captureDataUrl = uploadResult;
                             logger.info('[WebAction] Capture data uploaded: ' + captureDataUrl);
@@ -2178,7 +2223,7 @@ export class DebugWebSocketServer {
                 if (capturedRequests.length > 0) {
                     logger.info('[WebAction] Captured ' + capturedRequests.length + ' requests (error path)');
                     try {
-                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId);
+                        const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, sessionId, this.buildCaptureDataPersistenceMeta(sessionId, request));
                         if (uploadResult)
                             captureDataUrl = uploadResult;
                     }
@@ -2524,6 +2569,7 @@ export class DebugWebSocketServer {
             webActionRequest.sessionId = sharedSessionId;
         }
         const sessionId = sharedSessionId;
+        this.rememberCaptureDataPersistenceMeta(sessionId, this.buildCaptureDataPersistenceMeta(request.batchId, tc, request));
         const reportGroupName = tc.title || tc.id || `batch-${request.batchId}-case-${caseIndex + 1}`;
         const caseMemorySource = this.pickBatchAiMemorySource(request, tc);
         let session = sessionManager.get(sessionId);
@@ -2532,6 +2578,7 @@ export class DebugWebSocketServer {
             if (!session)
                 session = sessionManager.create(sessionId, ws);
             session.platform = 'web';
+            this.rememberCaptureDataPersistenceMeta(sessionId, this.buildCaptureDataPersistenceMeta(request.batchId, tc, request));
             // 并发上限保护
             if (this.webSessionsActivity.size >= this.webSessionMaxConcurrency) {
                 throw new Error(`Web 调试会话数已达上限 (${this.webSessionMaxConcurrency})，请稍后重试`);
@@ -2646,7 +2693,7 @@ export class DebugWebSocketServer {
             try {
                 const capturedRequests = await whistleManager.stopCapture(sessionId);
                 if (capturedRequests.length > 0) {
-                    const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, `${request.batchId}-${tc.id}`);
+                    const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, `${request.batchId}-${tc.id}`, this.buildCaptureDataPersistenceMeta(request.batchId, tc, request));
                     if (uploadResult)
                         caseCaptureDataUrl = uploadResult;
                 }
@@ -2737,6 +2784,7 @@ export class DebugWebSocketServer {
         const caseMemorySource = this.pickBatchAiMemorySource(request, tc);
         const caseSessionId = `batch-${batchId}-case-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`;
         const session = sessionManager.create(caseSessionId, ws, effectiveDeviceId);
+        this.rememberCaptureDataPersistenceMeta(caseSessionId, this.buildCaptureDataPersistenceMeta(batchId, tc, request));
         this.activeBatchSessionIds.add(caseSessionId);
         const caseAbortController = new AbortController();
         session.abortController = caseAbortController;
@@ -2841,7 +2889,7 @@ export class DebugWebSocketServer {
             try {
                 const capturedRequests = await whistleManager.stopCapture(caseSessionId);
                 if (capturedRequests.length > 0) {
-                    const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, `${batchId}-${tc.id}`);
+                    const uploadResult = await this.saveAndUploadCaptureData(capturedRequests, `${batchId}-${tc.id}`, this.buildCaptureDataPersistenceMeta(batchId, tc, request));
                     if (uploadResult)
                         caseCaptureDataUrl = uploadResult;
                 }
@@ -3077,7 +3125,7 @@ export class DebugWebSocketServer {
         let stopCaptureDataUrl;
         if (stopCapturedRequests.length > 0) {
             try {
-                const uploadResult = await this.saveAndUploadCaptureData(stopCapturedRequests, request.sessionId);
+                const uploadResult = await this.saveAndUploadCaptureData(stopCapturedRequests, request.sessionId, this.getCaptureDataPersistenceMeta(request.sessionId));
                 if (uploadResult) {
                     stopCaptureDataUrl = uploadResult;
                     logger.info('[StopDebug] Capture data uploaded: ' + stopCaptureDataUrl);
@@ -3363,10 +3411,15 @@ export class DebugWebSocketServer {
      * 将抓包数据保存到本地文件并上传到 OSS
      * 返回 OSS URL，失败则返回 undefined
      */
-    async saveAndUploadCaptureData(capturedRequests, sessionId) {
+    async saveAndUploadCaptureData(capturedRequests, sessionId, metadata) {
         if (!capturedRequests || capturedRequests.length === 0)
             return undefined;
         try {
+            const effectiveMetadata = metadata || this.getCaptureDataPersistenceMeta(sessionId);
+            const saveOk = await saveCaptureDataToDatabase(capturedRequests, effectiveMetadata.batchId || sessionId, effectiveMetadata.creator || '');
+            if (!saveOk) {
+                logger.warn(`[CaptureUpload] Save capture data to database failed, continue OSS upload (sessionId=${sessionId})`);
+            }
             // 保存到本地临时文件
             const tmpDir = path.join(process.cwd(), 'tmp', 'captures');
             if (!fs.existsSync(tmpDir)) {