@midscene/android-playground 0.30.10 → 1.0.0

package/dist/es/bin.mjs

@@ -3,7 +3,7 @@ import { createServer } from "node:net";
 import node_path from "node:path";
 import { promisify } from "node:util";
 import { select as prompts_select } from "@inquirer/prompts";
-import { AndroidAgent, AndroidDevice } from "@midscene/android";
+import { AndroidAgent, AndroidDevice, getConnectedDevices } from "@midscene/android";
 import { PlaygroundServer } from "@midscene/playground";
 import { PLAYGROUND_SERVER_PORT, SCRCPY_SERVER_PORT } from "@midscene/shared/constants";
 import { createReadStream } from "node:fs";
@@ -181,7 +181,7 @@ class ScrcpyServer {
                 } catch (error) {
                     console.error('failed to switch device:', error);
                     socket.emit('error', {
-                        message: `Failed to switch device: ${(null == error ? void 0 : error.message) || 'Unknown error'}`
+                        message: `Failed to switch device: ${error?.message || 'Unknown error'}`
                     });
                 }
             });
@@ -266,11 +266,11 @@ class ScrcpyServer {
                             message: `Video stream processing error: ${error.message}`
                         });
                     }
-                    if (null == scrcpyClient ? void 0 : scrcpyClient.controller) socket.emit('control-ready');
+                    if (scrcpyClient?.controller) socket.emit('control-ready');
                 } catch (error) {
                     console.error('failed to connect device:', error);
                     socket.emit('error', {
-                        message: `Failed to connect device: ${(null == error ? void 0 : error.message) || 'Unknown error'}`
+                        message: `Failed to connect device: ${error?.message || 'Unknown error'}`
                     });
                 }
             });
@@ -363,7 +363,7 @@ class ScrcpyServer {
         this.setupApiRoutes();
     }
 }
-const bin_promiseExec = promisify(exec);
+promisify(exec);
 async function isPortAvailable(port) {
     return new Promise((resolve)=>{
         const server = createServer();
@@ -380,7 +380,7 @@ async function findAvailablePort(startPort) {
     while(!await isPortAvailable(port)){
         attempts++;
         if (attempts >= maxAttempts) {
-            console.error(`\u{274C} Unable to find available port after ${maxAttempts} attempts starting from ${startPort}`);
+            console.error(`❌ Unable to find available port after ${maxAttempts} attempts starting from ${startPort}`);
             process.exit(1);
         }
         port++;
@@ -389,37 +389,30 @@ async function findAvailablePort(startPort) {
 }
 async function getAdbDevices() {
     try {
-        await bin_promiseExec('adb start-server');
-        const { stdout } = await bin_promiseExec('adb devices');
-        const lines = stdout.trim().split('\n').slice(1);
-        const devices = lines.map((line)=>{
-            const parts = line.trim().split('\t');
-            if (parts.length >= 2) return {
-                id: parts[0],
-                status: parts[1],
-                name: parts[0]
-            };
-            return null;
-        }).filter((device)=>null !== device && 'device' === device.status);
-        return devices;
+        const devices = await getConnectedDevices();
+        return devices.filter((device)=>'device' === device.state).map((device)=>({
+                id: device.udid,
+                status: device.state,
+                name: device.udid
+            }));
     } catch (error) {
         console.error('Error getting ADB devices:', error);
         return [];
     }
 }
 async function selectDevice() {
-    console.log("\uD83D\uDD0D Scanning for Android devices...");
+    console.log('🔍 Scanning for Android devices...');
     const devices = await getAdbDevices();
     if (0 === devices.length) {
-        console.error("\u274C No Android devices found!");
-        console.log("\uD83D\uDCF1 Please ensure:");
-        console.log("  \u2022 Your device is connected via USB");
-        console.log("  \u2022 USB debugging is enabled");
-        console.log("  \u2022 Device is authorized for debugging");
+        console.error('❌ No Android devices found!');
+        console.log('📱 Please ensure:');
+        console.log('  • Your device is connected via USB');
+        console.log('  • USB debugging is enabled');
+        console.log('  • Device is authorized for debugging');
         process.exit(1);
     }
     if (1 === devices.length) {
-        console.log(`\u{1F4F1} Found device: ${devices[0].name} (${devices[0].id})`);
+        console.log(`📱 Found device: ${devices[0].name} (${devices[0].id})`);
         return devices[0].id;
     }
     const choices = devices.map((device)=>({
@@ -427,7 +420,7 @@ async function selectDevice() {
             value: device.id
         }));
     const selectedDevice = await prompts_select({
-        message: "\uD83D\uDCF1 Multiple devices found. Please select one:",
+        message: '📱 Multiple devices found. Please select one:',
         choices
     });
     return selectedDevice;
@@ -437,7 +430,7 @@ const main = async ()=>{
     const { default: open } = await import("open");
     try {
         const selectedDeviceId = await selectDevice();
-        console.log(`\u{2705} Selected device: ${selectedDeviceId}`);
+        console.log(`✅ Selected device: ${selectedDeviceId}`);
         const playgroundServer = new PlaygroundServer(async ()=>{
             const device = new AndroidDevice(selectedDeviceId);
             await device.connect();
@@ -445,21 +438,21 @@ const main = async ()=>{
         }, staticDir);
         const scrcpyServer = new ScrcpyServer();
         scrcpyServer.currentDeviceId = selectedDeviceId;
-        console.log("\uD83D\uDE80 Starting servers...");
+        console.log('🚀 Starting servers...');
         const availablePlaygroundPort = await findAvailablePort(PLAYGROUND_SERVER_PORT);
         const availableScrcpyPort = await findAvailablePort(SCRCPY_SERVER_PORT);
-        if (availablePlaygroundPort !== PLAYGROUND_SERVER_PORT) console.log(`\u{26A0}\u{FE0F}  Port ${PLAYGROUND_SERVER_PORT} is busy, using port ${availablePlaygroundPort} instead`);
-        if (availableScrcpyPort !== SCRCPY_SERVER_PORT) console.log(`\u{26A0}\u{FE0F}  Port ${SCRCPY_SERVER_PORT} is busy, using port ${availableScrcpyPort} instead`);
+        if (availablePlaygroundPort !== PLAYGROUND_SERVER_PORT) console.log(`⚠️  Port ${PLAYGROUND_SERVER_PORT} is busy, using port ${availablePlaygroundPort} instead`);
+        if (availableScrcpyPort !== SCRCPY_SERVER_PORT) console.log(`⚠️  Port ${SCRCPY_SERVER_PORT} is busy, using port ${availableScrcpyPort} instead`);
         await Promise.all([
             playgroundServer.launch(availablePlaygroundPort),
             scrcpyServer.launch(availableScrcpyPort)
         ]);
         global.scrcpyServerPort = availableScrcpyPort;
         console.log('');
-        console.log("\u2728 Midscene Android Playground is ready!");
-        console.log(`\u{1F3AE} Playground: http://localhost:${playgroundServer.port}`);
-        console.log(`\u{1F4F1} Device: ${selectedDeviceId}`);
-        console.log(`\u{1F511} Generated Server ID: ${playgroundServer.id}`);
+        console.log('✨ Midscene Android Playground is ready!');
+        console.log(`🎮 Playground: http://localhost:${playgroundServer.port}`);
+        console.log(`📱 Device: ${selectedDeviceId}`);
+        console.log(`🔑 Generated Server ID: ${playgroundServer.id}`);
         console.log('');
         open(`http://localhost:${playgroundServer.port}`);
     } catch (error) {