@midscene/android-playground 1.7.5-beta-20260421061704.0 → 1.7.5

package/dist/es/bin.mjs

@@ -1,7 +1,7 @@
 import node_path from "node:path";
 import { createScrcpyPreviewDescriptor, definePlaygroundPlatform, launchPreparedPlaygroundPlatform } from "@midscene/playground";
 import { AndroidAgent, AndroidDevice, getConnectedDevicesWithDetails } from "@midscene/android";
-import { PLAYGROUND_SERVER_PORT, SCRCPY_PREVIEW_METADATA_TIMEOUT_MS, SCRCPY_PUSH_TIMEOUT_MS, SCRCPY_SERVER_PORT, SCRCPY_START_TIMEOUT_MS, SCRCPY_VIDEO_STREAM_TIMEOUT_MS } from "@midscene/shared/constants";
+import { PLAYGROUND_SERVER_PORT, SCRCPY_ADB_CONNECT_TIMEOUT_MS, SCRCPY_PREVIEW_METADATA_TIMEOUT_MS, SCRCPY_PUSH_TIMEOUT_MS, SCRCPY_SERVER_PORT, SCRCPY_START_TIMEOUT_MS, SCRCPY_VIDEO_STREAM_TIMEOUT_MS } from "@midscene/shared/constants";
 import { findAvailablePort } from "@midscene/shared/node";
 import { exec } from "node:child_process";
 import { createReadStream } from "node:fs";
@@ -219,6 +219,10 @@ function isAllowedOrigin(origin) {
         return false;
     }
 }
+function resolveRequestedDeviceId(options, currentDeviceId) {
+    const requestedDeviceId = 'string' == typeof options?.deviceId ? options.deviceId.trim() : '';
+    return requestedDeviceId || currentDeviceId || void 0;
+}
 class ScrcpyServer {
     setupApiRoutes() {
         this.app.get('/api/devices', async (req, res)=>{
@@ -273,7 +277,7 @@ class ScrcpyServer {
         try {
             if (this.adbClient) debugPage('use existing adb client');
             else {
-                await promiseExec('adb start-server');
+                await withTimeout(promiseExec('adb start-server'), SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out starting adb server after ${Math.round(SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`);
                 debugPage('adb server started');
                 debugPage('initialize adb client');
                 this.adbClient = new AdbServerClient(new AdbServerNodeTcpConnector({
@@ -292,21 +296,21 @@ class ScrcpyServer {
         const { Adb } = await import("@yume-chan/adb");
         try {
             const client = await this.getAdbClient();
-            if (!client) return null;
+            if (!client) throw new Error('Failed to initialize ADB client');
             const targetDeviceId = deviceId || this.currentDeviceId;
             if (targetDeviceId) {
                 this.currentDeviceId = targetDeviceId;
-                return new Adb(await client.createTransport({
+                return new Adb(await withTimeout(client.createTransport({
                     serial: targetDeviceId
-                }));
+                }), SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out connecting to Android device ${targetDeviceId} via ADB after ${Math.round(SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`));
             }
-            const devices = await client.getDevices();
+            const devices = await withTimeout(client.getDevices(), SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out listing Android devices via ADB after ${Math.round(SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`);
             if (0 === devices.length) return null;
             this.currentDeviceId = devices[0].serial;
-            return new Adb(await client.createTransport(devices[0]));
+            return new Adb(await withTimeout(client.createTransport(devices[0]), SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out connecting to Android device ${devices[0].serial} via ADB after ${Math.round(SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`));
         } catch (error) {
             console.error('failed to get adb client:', error);
-            return null;
+            throw error;
         }
     }
     async startScrcpy(adb, options = {}, onProgress) {
@@ -366,7 +370,6 @@ class ScrcpyServer {
                     });
                 }
             };
-            await sendDevicesList();
             socket.on('get-devices', async ()=>{
                 debugPage('received client request to get devices list');
                 await sendDevicesList();
@@ -394,12 +397,14 @@ class ScrcpyServer {
                     });
                 }
             });
-            socket.on('connect-device', async (options)=>{
+            socket.on('connect-device', async (options = {})=>{
                 const { ScrcpyVideoCodecId } = await import("@yume-chan/scrcpy");
                 try {
                     debugPage('received device connection request, options: %s, client id: %s', options, socket.id);
                     emitPreviewStatus('connecting-device');
-                    adb = await this.getAdb(this.currentDeviceId || void 0);
+                    const requestedDeviceId = resolveRequestedDeviceId(options, this.currentDeviceId);
+                    if (requestedDeviceId) this.currentDeviceId = requestedDeviceId;
+                    adb = await this.getAdb(requestedDeviceId);
                     if (!adb) {
                         console.error('no available device found');
                         socket.emit('error', {
@@ -506,6 +511,7 @@ class ScrcpyServer {
                     scrcpyClient = null;
                 }
             });
+            sendDevicesList();
         });
     }
     async launch(port) {

package/dist/es/index.mjs

@@ -1,7 +1,7 @@
 import node_path from "node:path";
 import { AndroidAgent, AndroidDevice, getConnectedDevicesWithDetails } from "@midscene/android";
 import { createScrcpyPreviewDescriptor, definePlaygroundPlatform } from "@midscene/playground";
-import { PLAYGROUND_SERVER_PORT, SCRCPY_PREVIEW_METADATA_TIMEOUT_MS, SCRCPY_PUSH_TIMEOUT_MS, SCRCPY_SERVER_PORT, SCRCPY_START_TIMEOUT_MS, SCRCPY_VIDEO_STREAM_TIMEOUT_MS } from "@midscene/shared/constants";
+import { PLAYGROUND_SERVER_PORT, SCRCPY_ADB_CONNECT_TIMEOUT_MS, SCRCPY_PREVIEW_METADATA_TIMEOUT_MS, SCRCPY_PUSH_TIMEOUT_MS, SCRCPY_SERVER_PORT, SCRCPY_START_TIMEOUT_MS, SCRCPY_VIDEO_STREAM_TIMEOUT_MS } from "@midscene/shared/constants";
 import { findAvailablePort } from "@midscene/shared/node";
 import { exec } from "node:child_process";
 import { createReadStream } from "node:fs";
@@ -219,6 +219,10 @@ function isAllowedOrigin(origin) {
         return false;
     }
 }
+function resolveRequestedDeviceId(options, currentDeviceId) {
+    const requestedDeviceId = 'string' == typeof options?.deviceId ? options.deviceId.trim() : '';
+    return requestedDeviceId || currentDeviceId || void 0;
+}
 class ScrcpyServer {
     setupApiRoutes() {
         this.app.get('/api/devices', async (req, res)=>{
@@ -273,7 +277,7 @@ class ScrcpyServer {
         try {
             if (this.adbClient) debugPage('use existing adb client');
             else {
-                await promiseExec('adb start-server');
+                await withTimeout(promiseExec('adb start-server'), SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out starting adb server after ${Math.round(SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`);
                 debugPage('adb server started');
                 debugPage('initialize adb client');
                 this.adbClient = new AdbServerClient(new AdbServerNodeTcpConnector({
@@ -292,21 +296,21 @@ class ScrcpyServer {
         const { Adb } = await import("@yume-chan/adb");
         try {
             const client = await this.getAdbClient();
-            if (!client) return null;
+            if (!client) throw new Error('Failed to initialize ADB client');
             const targetDeviceId = deviceId || this.currentDeviceId;
             if (targetDeviceId) {
                 this.currentDeviceId = targetDeviceId;
-                return new Adb(await client.createTransport({
+                return new Adb(await withTimeout(client.createTransport({
                     serial: targetDeviceId
-                }));
+                }), SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out connecting to Android device ${targetDeviceId} via ADB after ${Math.round(SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`));
             }
-            const devices = await client.getDevices();
+            const devices = await withTimeout(client.getDevices(), SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out listing Android devices via ADB after ${Math.round(SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`);
             if (0 === devices.length) return null;
             this.currentDeviceId = devices[0].serial;
-            return new Adb(await client.createTransport(devices[0]));
+            return new Adb(await withTimeout(client.createTransport(devices[0]), SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out connecting to Android device ${devices[0].serial} via ADB after ${Math.round(SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`));
         } catch (error) {
             console.error('failed to get adb client:', error);
-            return null;
+            throw error;
         }
     }
     async startScrcpy(adb, options = {}, onProgress) {
@@ -366,7 +370,6 @@ class ScrcpyServer {
                     });
                 }
             };
-            await sendDevicesList();
             socket.on('get-devices', async ()=>{
                 debugPage('received client request to get devices list');
                 await sendDevicesList();
@@ -394,12 +397,14 @@ class ScrcpyServer {
                     });
                 }
             });
-            socket.on('connect-device', async (options)=>{
+            socket.on('connect-device', async (options = {})=>{
                 const { ScrcpyVideoCodecId } = await import("@yume-chan/scrcpy");
                 try {
                     debugPage('received device connection request, options: %s, client id: %s', options, socket.id);
                     emitPreviewStatus('connecting-device');
-                    adb = await this.getAdb(this.currentDeviceId || void 0);
+                    const requestedDeviceId = resolveRequestedDeviceId(options, this.currentDeviceId);
+                    if (requestedDeviceId) this.currentDeviceId = requestedDeviceId;
+                    adb = await this.getAdb(requestedDeviceId);
                     if (!adb) {
                         console.error('no available device found');
                         socket.emit('error', {
@@ -506,6 +511,7 @@ class ScrcpyServer {
                     scrcpyClient = null;
                 }
             });
+            sendDevicesList();
         });
     }
     async launch(port) {

package/dist/lib/bin.js

@@ -245,6 +245,10 @@ function isAllowedOrigin(origin) {
         return false;
     }
 }
+function resolveRequestedDeviceId(options, currentDeviceId) {
+    const requestedDeviceId = 'string' == typeof options?.deviceId ? options.deviceId.trim() : '';
+    return requestedDeviceId || currentDeviceId || void 0;
+}
 class ScrcpyServer {
     setupApiRoutes() {
         this.app.get('/api/devices', async (req, res)=>{
@@ -299,7 +303,7 @@ class ScrcpyServer {
         try {
             if (this.adbClient) debugPage('use existing adb client');
             else {
-                await promiseExec('adb start-server');
+                await withTimeout(promiseExec('adb start-server'), constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out starting adb server after ${Math.round(constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`);
                 debugPage('adb server started');
                 debugPage('initialize adb client');
                 this.adbClient = new AdbServerClient(new AdbServerNodeTcpConnector({
@@ -318,21 +322,21 @@ class ScrcpyServer {
         const { Adb } = await import("@yume-chan/adb");
         try {
             const client = await this.getAdbClient();
-            if (!client) return null;
+            if (!client) throw new Error('Failed to initialize ADB client');
             const targetDeviceId = deviceId || this.currentDeviceId;
             if (targetDeviceId) {
                 this.currentDeviceId = targetDeviceId;
-                return new Adb(await client.createTransport({
+                return new Adb(await withTimeout(client.createTransport({
                     serial: targetDeviceId
-                }));
+                }), constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out connecting to Android device ${targetDeviceId} via ADB after ${Math.round(constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`));
             }
-            const devices = await client.getDevices();
+            const devices = await withTimeout(client.getDevices(), constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out listing Android devices via ADB after ${Math.round(constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`);
             if (0 === devices.length) return null;
             this.currentDeviceId = devices[0].serial;
-            return new Adb(await client.createTransport(devices[0]));
+            return new Adb(await withTimeout(client.createTransport(devices[0]), constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out connecting to Android device ${devices[0].serial} via ADB after ${Math.round(constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`));
         } catch (error) {
             console.error('failed to get adb client:', error);
-            return null;
+            throw error;
         }
     }
     async startScrcpy(adb, options = {}, onProgress) {
@@ -392,7 +396,6 @@ class ScrcpyServer {
                     });
                 }
             };
-            await sendDevicesList();
             socket.on('get-devices', async ()=>{
                 debugPage('received client request to get devices list');
                 await sendDevicesList();
@@ -420,12 +423,14 @@ class ScrcpyServer {
                     });
                 }
             });
-            socket.on('connect-device', async (options)=>{
+            socket.on('connect-device', async (options = {})=>{
                 const { ScrcpyVideoCodecId } = await import("@yume-chan/scrcpy");
                 try {
                     debugPage('received device connection request, options: %s, client id: %s', options, socket.id);
                     emitPreviewStatus('connecting-device');
-                    adb = await this.getAdb(this.currentDeviceId || void 0);
+                    const requestedDeviceId = resolveRequestedDeviceId(options, this.currentDeviceId);
+                    if (requestedDeviceId) this.currentDeviceId = requestedDeviceId;
+                    adb = await this.getAdb(requestedDeviceId);
                     if (!adb) {
                         console.error('no available device found');
                         socket.emit('error', {
@@ -532,6 +537,7 @@ class ScrcpyServer {
                     scrcpyClient = null;
                 }
             });
+            sendDevicesList();
         });
     }
     async launch(port) {

package/dist/lib/index.js

@@ -260,6 +260,10 @@ function isAllowedOrigin(origin) {
         return false;
     }
 }
+function resolveRequestedDeviceId(options, currentDeviceId) {
+    const requestedDeviceId = 'string' == typeof options?.deviceId ? options.deviceId.trim() : '';
+    return requestedDeviceId || currentDeviceId || void 0;
+}
 class ScrcpyServer {
     setupApiRoutes() {
         this.app.get('/api/devices', async (req, res)=>{
@@ -314,7 +318,7 @@ class ScrcpyServer {
         try {
             if (this.adbClient) debugPage('use existing adb client');
             else {
-                await promiseExec('adb start-server');
+                await withTimeout(promiseExec('adb start-server'), constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out starting adb server after ${Math.round(constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`);
                 debugPage('adb server started');
                 debugPage('initialize adb client');
                 this.adbClient = new AdbServerClient(new AdbServerNodeTcpConnector({
@@ -333,21 +337,21 @@ class ScrcpyServer {
         const { Adb } = await import("@yume-chan/adb");
         try {
             const client = await this.getAdbClient();
-            if (!client) return null;
+            if (!client) throw new Error('Failed to initialize ADB client');
             const targetDeviceId = deviceId || this.currentDeviceId;
             if (targetDeviceId) {
                 this.currentDeviceId = targetDeviceId;
-                return new Adb(await client.createTransport({
+                return new Adb(await withTimeout(client.createTransport({
                     serial: targetDeviceId
-                }));
+                }), constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out connecting to Android device ${targetDeviceId} via ADB after ${Math.round(constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`));
             }
-            const devices = await client.getDevices();
+            const devices = await withTimeout(client.getDevices(), constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out listing Android devices via ADB after ${Math.round(constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`);
             if (0 === devices.length) return null;
             this.currentDeviceId = devices[0].serial;
-            return new Adb(await client.createTransport(devices[0]));
+            return new Adb(await withTimeout(client.createTransport(devices[0]), constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS, `Timed out connecting to Android device ${devices[0].serial} via ADB after ${Math.round(constants_namespaceObject.SCRCPY_ADB_CONNECT_TIMEOUT_MS / 1000)}s`));
         } catch (error) {
             console.error('failed to get adb client:', error);
-            return null;
+            throw error;
         }
     }
     async startScrcpy(adb, options = {}, onProgress) {
@@ -407,7 +411,6 @@ class ScrcpyServer {
                     });
                 }
             };
-            await sendDevicesList();
             socket.on('get-devices', async ()=>{
                 debugPage('received client request to get devices list');
                 await sendDevicesList();
@@ -435,12 +438,14 @@ class ScrcpyServer {
                     });
                 }
             });
-            socket.on('connect-device', async (options)=>{
+            socket.on('connect-device', async (options = {})=>{
                 const { ScrcpyVideoCodecId } = await import("@yume-chan/scrcpy");
                 try {
                     debugPage('received device connection request, options: %s, client id: %s', options, socket.id);
                     emitPreviewStatus('connecting-device');
-                    adb = await this.getAdb(this.currentDeviceId || void 0);
+                    const requestedDeviceId = resolveRequestedDeviceId(options, this.currentDeviceId);
+                    if (requestedDeviceId) this.currentDeviceId = requestedDeviceId;
+                    adb = await this.getAdb(requestedDeviceId);
                     if (!adb) {
                         console.error('no available device found');
                         socket.emit('error', {
@@ -547,6 +552,7 @@ class ScrcpyServer {
                     scrcpyClient = null;
                 }
             });
+            sendDevicesList();
         });
     }
     async launch(port) {

package/dist/types/scrcpy-server.d.ts

@@ -3,6 +3,11 @@ import type { AdbServerClient } from '@yume-chan/adb';
 import express from 'express';
 import { Server } from 'socket.io';
 export declare const debugPage: import("@midscene/shared/logger").DebugFunction;
+export interface ScrcpyConnectDeviceRequest {
+    deviceId?: string;
+    maxSize?: number;
+}
+export declare function resolveRequestedDeviceId(options: ScrcpyConnectDeviceRequest | undefined, currentDeviceId: string | null): string | undefined;
 export default class ScrcpyServer {
     app: express.Application;
     httpServer: HttpServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android-playground",
-  "version": "1.7.5-beta-20260421061704.0",
+  "version": "1.7.5",
   "description": "Android playground for Midscene",
   "main": "./dist/lib/index.js",
   "types": "./dist/types/index.d.ts",
@@ -34,10 +34,10 @@
     "express": "^4.21.2",
     "open": "10.1.0",
     "socket.io": "^4.8.1",
-    "@midscene/playground": "1.7.5-beta-20260421061704.0",
-    "@midscene/shared": "1.7.5-beta-20260421061704.0",
-    "@midscene/core": "1.7.5-beta-20260421061704.0",
-    "@midscene/android": "1.7.5-beta-20260421061704.0"
+    "@midscene/android": "1.7.5",
+    "@midscene/core": "1.7.5",
+    "@midscene/playground": "1.7.5",
+    "@midscene/shared": "1.7.5"
   },
   "devDependencies": {
     "@rslib/core": "^0.18.3",

package/static/index.html

@@ -1 +1 @@
-<!doctype html><html><head><title>Midscene Android Playground</title><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><script defer src="/static/js/lib-react.ed140d90.js"></script><script defer src="/static/js/883.91ca0de7.js"></script><script defer src="/static/js/index.827bfdbe.js"></script><link href="/static/css/index.dc500f18.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html><head><title>Midscene Android Playground</title><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><script defer src="/static/js/lib-react.ed140d90.js"></script><script defer src="/static/js/883.91ca0de7.js"></script><script defer src="/static/js/index.860ebe39.js"></script><link href="/static/css/index.dc500f18.css" rel="stylesheet"></head><body><div id="root"></div></body></html>