@xenon-device-management/xenon 1.1.18 → 1.1.20

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@xenon-device-management/xenon",
-    "version": "1.1.18",
+    "version": "1.1.20",
     "description": "Xenon - Intelligent Mobile Infrastructure. A self-healing device orchestration platform for Appium.",
     "main": "./lib/src/index.js",
     "exports": {

package/lib/schema.json

@@ -119,6 +119,10 @@
             "type": "boolean",
             "default": false
         },
+        "bootedEmulators": {
+            "type": "boolean",
+            "default": false
+        },
         "removeDevicesFromDatabaseBeforeRunningThePlugin": {
             "type": "boolean",
             "default": false

package/lib/src/app/index.js

@@ -154,7 +154,8 @@ const findPublicPath = () => {
     return fallback;
 };
 const publicPath = findPublicPath();
-logger_1.default.info(`[Xenon] Public assets path resolved to: ${publicPath}`);
+logger_1.default.info(`[Xenon] Dashboard assets path: ${publicPath}`);
+logger_1.default.info(`[Xenon] Dashboard available at: /xenon/ (e.g. http://localhost:4723/xenon/)`);
 // Principal Security: Add permissive CSP and CORS for the dashboard
 router.use((req, res, next) => {
     res.setHeader('Content-Security-Policy', "default-src * 'unsafe-inline' 'unsafe-eval' data: blob:; frame-ancestors 'self';");
@@ -200,13 +201,16 @@ function createRouter(pluginArgs) {
             return res.status(404).json({ error: true, message: 'Not Found' });
         logger_1.default.debug(`[Xenon] UI Fallback triggered for: ${url}. Targeting: ${indexPath}`);
         if (fs_1.default.existsSync(indexPath)) {
-            res.set('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
-            res.sendFile(indexPath, (err) => {
-                if (err && !res.headersSent) {
-                    logger_1.default.error(`[Xenon] res.sendFile failed for ${indexPath}. Error: ${err.message}`);
-                    res.status(404).send(`Xenon UI Asset Error: ${err.message}`);
-                }
-            });
+            try {
+                const html = fs_1.default.readFileSync(indexPath, 'utf-8');
+                res.set('Content-Type', 'text/html');
+                res.set('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
+                return res.send(html);
+            }
+            catch (err) {
+                logger_1.default.error(`[Xenon] UI Fallback read error for ${indexPath}: ${err.message}`);
+                return res.status(500).send(`Xenon UI Asset Error: ${err.message}`);
+            }
         }
         else {
             logger_1.default.error(`[Xenon] UI Fallback failed: index.html not found at ${indexPath}`);
@@ -218,7 +222,7 @@ function createRouter(pluginArgs) {
             catch (e) {
                 logger_1.default.error(`[Xenon] Could not even read directory ${publicPath}: ${e.message}`);
             }
-            res.status(404).send('Xenon UI assets not found. Check installation.');
+            return res.status(404).send('Xenon UI assets not found. Check installation.');
         }
     });
     return router;

package/lib/src/device-managers/AndroidDeviceManager.js

@@ -148,12 +148,24 @@ let AndroidDeviceManager = class AndroidDeviceManager {
                     });
                 }
                 else if (deviceTypes.androidDeviceType === 'simulated') {
-                    return devices.filter((device) => {
+                    const simulated = devices.filter((device) => {
                         return device.deviceType === 'emulator';
                     });
+                    if (this.pluginArgs.bootedEmulators) {
+                        return simulated.filter((device) => device.state === 'device');
+                    }
+                    return simulated;
                     // return both real and simulated (emulated) devices
                 }
                 else {
+                    if (this.pluginArgs.bootedEmulators) {
+                        return devices.filter((device) => {
+                            if (device.deviceType === 'emulator') {
+                                return device.state === 'device';
+                            }
+                            return true;
+                        });
+                    }
                     return devices;
                 }
             }

package/lib/src/device-utils.js

@@ -411,18 +411,15 @@ function updateDeviceList(host, hubArgument, tlsRejectUnauthorized) {
     return __awaiter(this, void 0, void 0, function* () {
         const allExistingDevices = yield (0, device_service_1.getAllDevices)();
         const devices = yield getDeviceManager().getDevices(allExistingDevices);
-        if (devices.length === 0) {
-            logger_1.default.warn('No devices found');
-            return [];
+        if (devices.length > 0) {
+            // first thing first. Update device list in local list
+            yield (0, device_service_1.addNewDevice)(devices, host);
         }
-        // log.debug(`Updating device list with ${JSON.stringify(devices)} devices`);
-        // first thing first. Update device list in local list
-        yield (0, device_service_1.addNewDevice)(devices, host);
         // Prune any devices that are in our local DB for this host but NO LONGER discovered.
         // This automatically cleans up disconnected Android devices safely, or filtered
         // iOS simulators (e.g. when booted-simulators is turned on and a simulator shuts down)
         const discoveredUdids = new Set(devices.map((d) => d.udid));
-        const staleLocalDevices = allExistingDevices.filter((d) => d.host === host && !discoveredUdids.has(d.udid));
+        const staleLocalDevices = allExistingDevices.filter((d) => (d.host === host || d.host.includes(`//${host}:`) || d.host.includes(`//${host}/`)) && !discoveredUdids.has(d.udid));
         if (staleLocalDevices.length > 0) {
             logger_1.default.info(`Removing ${staleLocalDevices.length} stale devices/simulators no longer discovered on this host.`);
             yield (0, device_service_1.removeDevice)(staleLocalDevices.map((d) => ({ udid: d.udid, host: d.host })));

package/lib/src/interfaces/IPluginArgs.js

@@ -34,6 +34,7 @@ exports.DefaultPluginArgs = {
     bindHostOrIp: ip_1.default.address(),
     enableDashboard: false,
     bootedSimulators: false,
+    bootedEmulators: false,
     healthCheckIntervalMs: 86400000,
     healthCheckSchedule: undefined,
     removeDevicesFromDatabaseBeforeRunningThePlugin: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xenon-device-management/xenon",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Xenon - Intelligent Mobile Infrastructure. A self-healing device orchestration platform for Appium.",
   "main": "./lib/src/index.js",
   "exports": {

package/schema.json

@@ -119,6 +119,10 @@
             "type": "boolean",
             "default": false
         },
+        "bootedEmulators": {
+            "type": "boolean",
+            "default": false
+        },
         "removeDevicesFromDatabaseBeforeRunningThePlugin": {
             "type": "boolean",
             "default": false