@xenon-device-management/xenon 2.9.2 → 2.10.0

package/lib/src/dashboard/event-manager.js

@@ -64,8 +64,6 @@ const asset_manager_1 = require("./asset-manager");
 const commands_1 = require("./commands");
 const SessionStatus_1 = require("../types/SessionStatus");
 const appium_ios_device_1 = require("appium-ios-device");
-const AndroidAppProfiler_1 = require("../profiling/AndroidAppProfiler");
-const appium_adb_1 = require("appium-adb");
 const config_1 = require("../config");
 const helpers_2 = require("../helpers");
 const typedi_1 = require("typedi");
@@ -80,6 +78,7 @@ const SocketEvents_1 = require("../enums/SocketEvents");
 const types_1 = require("../services/healing/types");
 const SelectorStateService_1 = require("../services/SelectorStateService");
 const recording_store_1 = require("../services/recording/recording-store");
+const SessionMetricsService_1 = require("../services/metrics/SessionMetricsService");
 const typedi_2 = require("typedi");
 /**
  * What a Session row keeps of the capabilities the driver returned. The row
@@ -105,8 +104,6 @@ let DashboardEventManager = class DashboardEventManager {
         this.sessionToUdid = new Map();
         // Map session ID to device info
         this.sessionToDevice = new Map();
-        // Store app profilers for Android sessions
-        this.appProfilers = new Map();
         // Track last log line for each session (for device logs)
         this.lastLogLine = new Map();
         // Track start time for each command to calculate duration
@@ -124,8 +121,10 @@ let DashboardEventManager = class DashboardEventManager {
             };
             // create directory to store screenshots, videos and log files for the session
             (0, asset_manager_1.prepareDirectory)(session.getId());
-            // Initialize app profiling for Android sessions
-            const { is_profiling_available, device_info } = yield this.startAppProfiling(session.getId(), device, session.getCapabilities());
+            // CPU and memory for the session page's Performance panel; sampling
+            // starts once the session's row exists, since the samples point at it.
+            const metrics = typedi_1.Container.get(SessionMetricsService_1.SessionMetricsService);
+            const sampled = metrics.appliesTo(device);
             // If iOS real device, start performance recording (Time Profiler)
             // Note: This only works on real devices with XCUITest driver 4.5+
             let isIosProfilingStarted = false;
@@ -149,10 +148,17 @@ let DashboardEventManager = class DashboardEventManager {
             const sessionResponse = lodash_1.default.assign({}, session.getCapabilities());
             const tracingService = typedi_1.Container.get(TracingService_1.TracingService);
             const traceId = tracingService.getTraceId(session.getId());
-            const createData = Object.assign(Object.assign({ id: session.getId(), build: build.id ? { connect: { id: build.id } } : undefined, name: capabilities[XenonCapabilityManager_1.XENON_CAPABILITIES.SESSION_NAME] || undefined }, storedSessionCapabilities(sessionResponse)), { node_id: device.nodeId || '', has_live_video: session.getLiveVideoUrl() !== null, video_recording_enabled: capabilities[XenonCapabilityManager_1.XENON_CAPABILITIES.VIDEO_RECORDING] === true, is_profiling_available: is_profiling_available || isIosProfilingStarted, device_info: device_info ? JSON.stringify(device_info) : null, device_udid: device.udid || '', device_platform: device.platform || '', device_version: device.sdk || '', device_name: device.name, trace_id: traceId, status: 'running', api_key_id: (_a = session.apiKeyId) !== null && _a !== void 0 ? _a : null, user_id: (_b = session.userId) !== null && _b !== void 0 ? _b : null });
+            const createData = Object.assign(Object.assign({ id: session.getId(), build: build.id ? { connect: { id: build.id } } : undefined, name: capabilities[XenonCapabilityManager_1.XENON_CAPABILITIES.SESSION_NAME] || undefined }, storedSessionCapabilities(sessionResponse)), { node_id: device.nodeId || '', has_live_video: session.getLiveVideoUrl() !== null, video_recording_enabled: capabilities[XenonCapabilityManager_1.XENON_CAPABILITIES.VIDEO_RECORDING] === true, is_profiling_available: sampled || isIosProfilingStarted, device_udid: device.udid || '', device_platform: device.platform || '', device_version: device.sdk || '', device_name: device.name, trace_id: traceId, status: 'running', api_key_id: (_a = session.apiKeyId) !== null && _a !== void 0 ? _a : null, user_id: (_b = session.userId) !== null && _b !== void 0 ? _b : null });
             yield prisma_1.prisma.session.create({
                 data: createData,
             });
+            if (sampled) {
+                metrics.start({
+                    sessionId: session.getId(),
+                    device,
+                    capabilities: session.getCapabilities(),
+                });
+            }
             // Emit session started event
             void typedi_1.Container.get(SocketServer_1.SocketServer).emitToDashboardForDevices(SocketEvents_1.SocketEvents.SESSION_STARTED, Object.assign(Object.assign({}, createData), { status: 'running', build_name: buildName }), { udid: device.udid });
             // Increment Metrics
@@ -198,14 +204,14 @@ let DashboardEventManager = class DashboardEventManager {
             this.stoppingSessionIds.add(sessionId);
             try {
                 logger_1.default.info(`🟢 onSessionStopped called for session ${sessionId}`);
+                // However the session ended, in memory or not, its sampler stops here.
+                yield typedi_1.Container.get(SessionMetricsService_1.SessionMetricsService).stop(sessionId);
                 // Video recording is now handled in plugin.ts deleteSession() before the session is deleted
                 // This ensures we can call stop_recording_screen while the session is still active
                 // Here we just handle the session status update
                 const session = SessionManager_1.SESSION_MANAGER.getSession(sessionId);
                 if (session) {
                     logger_1.default.info(`Session ${sessionId} found in SESSION_MANAGER`);
-                    // Save Android profiling data before cleanup
-                    yield this.saveAppProfilingData(sessionId);
                     // iOS profiling is now handled in plugin.ts deleteSession() before the session is deleted
                     // This ensures we can call mobile: stopPerfRecord while the driver is still alive
                     // Clean up syslog service for real iOS devices
@@ -689,96 +695,6 @@ let DashboardEventManager = class DashboardEventManager {
             }
         });
     }
-    startAppProfiling(sessionId, device, sessionCapabilities) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // Only support Android profiling
-            if (device.platform.toLowerCase() !== 'android') {
-                return { is_profiling_available: false };
-            }
-            // Check if we have an app package
-            const appPackage = (sessionCapabilities === null || sessionCapabilities === void 0 ? void 0 : sessionCapabilities.appPackage) || (sessionCapabilities === null || sessionCapabilities === void 0 ? void 0 : sessionCapabilities['appium:appPackage']);
-            if (!appPackage) {
-                logger_1.default.info(`[Profiling] No app package found for session ${sessionId}, skipping profiling`);
-                return { is_profiling_available: false };
-            }
-            try {
-                // Principal Intelligence: Use the Properly configured ADB from the manager
-                // instead of a naked instance, to avoid 'defaultArgs not iterable' crashes.
-                const deviceManager = typedi_1.Container.get(device_managers_1.XenonManager);
-                const androidManager = (yield deviceManager.deviceInstances()).find((m) => m instanceof AndroidDeviceManager_1.default);
-                let adb;
-                if (androidManager) {
-                    adb = yield androidManager.getAdbForDevice(device.udid);
-                }
-                else {
-                    adb = yield appium_adb_1.ADB.createADB({});
-                }
-                // Create app profiler
-                const profiler = new AndroidAppProfiler_1.AndroidAppProfiler({
-                    adb,
-                    deviceUDID: device.udid,
-                    appPackage,
-                });
-                // Get device info and start capture
-                const device_info = yield profiler.getDeviceInfo();
-                yield profiler.startCapture();
-                // Store profiler for this session
-                this.appProfilers.set(sessionId, profiler);
-                logger_1.default.info(`[Profiling] Started app profiling for session ${sessionId}`);
-                return {
-                    is_profiling_available: true,
-                    device_info,
-                };
-            }
-            catch (err) {
-                logger_1.default.error(`[Profiling] Error initializing app profiler for session ${sessionId}: ${err.message}`);
-                return { is_profiling_available: false };
-            }
-        });
-    }
-    saveAppProfilingData(sessionId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const profiler = this.appProfilers.get(sessionId);
-            if (!profiler) {
-                return;
-            }
-            try {
-                // Stop capture
-                yield profiler.stopCapture();
-                // Get logs
-                const logs = profiler.getLogs();
-                if (logs.length === 0) {
-                    logger_1.default.info(`[Profiling] No profiling data to save for session ${sessionId}`);
-                    return;
-                }
-                // Save to database
-                const profilingEntries = logs.map((log) => ({
-                    session_id: sessionId,
-                    cpu: log.cpu,
-                    memory: log.memory,
-                    total_cpu_used: log.total_cpu_used.toString(),
-                    total_memory_used: log.total_memory_used.toString(),
-                    raw_cpu_log: log.raw_cpu_log,
-                    raw_memory_log: log.raw_memory_log,
-                    timestamp: new Date(log.timestamp),
-                }));
-                // Batch insert profiling data
-                for (const entry of profilingEntries) {
-                    yield prisma_1.prisma.profiling.create({
-                        data: entry,
-                    });
-                }
-                logger_1.default.info(`[Profiling] Saved ${profilingEntries.length} profiling entries for session ${sessionId}`);
-            }
-            catch (err) {
-                logger_1.default.error(`[Profiling] Error saving profiling data for session ${sessionId}: ${err.message}`);
-            }
-            finally {
-                // Clean up profiler
-                this.appProfilers.delete(sessionId);
-            }
-        });
-    }
     // ─── Recording (free-form mosaic) events ─────────────────────────────────
     // Emitted by RecordingOrchestrator. Distinct namespace from SESSION_*; the
     // dashboard listens to both independently. Team-scoped: a group's started