npm - @midscene/android - Versions diffs - 1.10.1 → 1.10.2-beta-20260706032158.0 - Mend

@midscene/android 1.10.1 → 1.10.2-beta-20260706032158.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/es/cli.mjs CHANGED Viewed

@@ -1300,12 +1300,19 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             x: element.center[0],
             y: element.center[1]
         });
-        await this.ensureYadb();
         const adb = await this.getAdb();
+        const displayArg = this.getDisplayArg();
+        const isNonDefaultDisplay = 'number' == typeof this.options?.displayId && 0 !== this.options.displayId;
         const IME_STRATEGY = (this.options?.imeStrategy || globalConfigManager.getEnvConfigValue(MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
-        if (IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII) await adb.clearTextField(100);
-        else {
-            this.warnYadbOnNonDefaultDisplay('keyboard clear');
+        if (isNonDefaultDisplay) {
+            const keys = [];
+            for(let i = 0; i < 100; i++)keys.push('67', '112');
+            await adb.shell(`input${displayArg} keyevent ${keys.join(' ')}`);
+        } else if (IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII) {
+            await this.ensureYadb();
+            await adb.clearTextField(100);
+        } else {
+            await this.ensureYadb();
             await adb.shell('app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboardClear');
         }
         if (await adb.isSoftKeyboardPresent()) return;
@@ -1477,13 +1484,24 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         const adb = await this.getAdb();
         const IME_STRATEGY = (this.options?.imeStrategy || globalConfigManager.getEnvConfigValue(MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
         const shouldAutoDismissKeyboard = options?.autoDismissKeyboard ?? this.options?.autoDismissKeyboard ?? true;
-        const useYadb = IME_STRATEGY === IME_STRATEGY_ALWAYS_YADB || IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII && this.shouldUseYadbForText(text);
+        const typeDelay = options?.keyboardTypeDelay ?? this.options?.keyboardTypeDelay;
+        const isNonDefaultDisplay = 'number' == typeof this.options?.displayId && 0 !== this.options.displayId;
+        const useYadb = !isNonDefaultDisplay && (IME_STRATEGY === IME_STRATEGY_ALWAYS_YADB || IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII && this.shouldUseYadbForText(text));
         if (useYadb) await this.execYadb(escapeForShell(text));
         else {
+            const displayArg = this.getDisplayArg();
             const segments = text.split('\n');
             for(let i = 0; i < segments.length; i++){
-                if (segments[i].length > 0) await adb.inputText(segments[i]);
-                if (i < segments.length - 1) await adb.keyevent(66);
+                if (segments[i].length > 0) if (typeDelay && typeDelay > 0) for (const ch of segments[i]){
+                    const escaped = ' ' === ch ? '%s' : ch;
+                    await adb.shell(`input${displayArg} text ${escaped}`);
+                    await sleep(typeDelay);
+                }
+                else {
+                    const escaped = segments[i].replace(/ /g, '%s');
+                    await adb.shell(`input${displayArg} text ${escaped}`);
+                }
+                if (i < segments.length - 1) await adb.shell(`input${displayArg} keyevent 66`);
             }
         }
         if (true === shouldAutoDismissKeyboard) await this.hideKeyboard(options);
@@ -1523,12 +1541,13 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             End: 123
         };
         const adb = await this.getAdb();
+        const displayArg = this.getDisplayArg();
         const normalizedKey = this.normalizeKeyName(key);
         const keyCode = keyCodeMap[normalizedKey];
-        if (void 0 !== keyCode) await adb.keyevent(keyCode);
+        if (void 0 !== keyCode) await adb.shell(`input${displayArg} keyevent ${keyCode}`);
         else if (1 === key.length) {
             const asciiCode = key.toUpperCase().charCodeAt(0);
-            if (asciiCode >= 65 && asciiCode <= 90) await adb.keyevent(asciiCode - 36);
+            if (asciiCode >= 65 && asciiCode <= 90) await adb.shell(`input${displayArg} keyevent ${asciiCode - 36}`);
         }
     }
     async tapPoint(point) {
@@ -1722,7 +1741,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             4
         ];
         for (const keyCode of keyCodes){
-            await adb.keyevent(keyCode);
+            await adb.shell(`input${this.getDisplayArg()} keyevent ${keyCode}`);
             const startTime = Date.now();
             const intervalMs = 100;
             while(Date.now() - startTime < timeoutMs){
@@ -2068,7 +2087,7 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
 const tools = new AndroidMidsceneTools();
 runToolsCLI(tools, 'midscene-android', {
     stripPrefix: 'android_',
-    version: "1.10.1",
+    version: "1.10.2-beta-20260706032158.0",
     extraCommands: createReportCliCommands()
 }).catch((e)=>{
     process.exit(reportCLIError(e));

package/dist/es/index.mjs CHANGED Viewed

@@ -1203,12 +1203,19 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             x: element.center[0],
             y: element.center[1]
         });
-        await this.ensureYadb();
         const adb = await this.getAdb();
+        const displayArg = this.getDisplayArg();
+        const isNonDefaultDisplay = 'number' == typeof this.options?.displayId && 0 !== this.options.displayId;
         const IME_STRATEGY = (this.options?.imeStrategy || globalConfigManager.getEnvConfigValue(MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
-        if (IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII) await adb.clearTextField(100);
-        else {
-            this.warnYadbOnNonDefaultDisplay('keyboard clear');
+        if (isNonDefaultDisplay) {
+            const keys = [];
+            for(let i = 0; i < 100; i++)keys.push('67', '112');
+            await adb.shell(`input${displayArg} keyevent ${keys.join(' ')}`);
+        } else if (IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII) {
+            await this.ensureYadb();
+            await adb.clearTextField(100);
+        } else {
+            await this.ensureYadb();
             await adb.shell('app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboardClear');
         }
         if (await adb.isSoftKeyboardPresent()) return;
@@ -1380,13 +1387,24 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         const adb = await this.getAdb();
         const IME_STRATEGY = (this.options?.imeStrategy || globalConfigManager.getEnvConfigValue(MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
         const shouldAutoDismissKeyboard = options?.autoDismissKeyboard ?? this.options?.autoDismissKeyboard ?? true;
-        const useYadb = IME_STRATEGY === IME_STRATEGY_ALWAYS_YADB || IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII && this.shouldUseYadbForText(text);
+        const typeDelay = options?.keyboardTypeDelay ?? this.options?.keyboardTypeDelay;
+        const isNonDefaultDisplay = 'number' == typeof this.options?.displayId && 0 !== this.options.displayId;
+        const useYadb = !isNonDefaultDisplay && (IME_STRATEGY === IME_STRATEGY_ALWAYS_YADB || IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII && this.shouldUseYadbForText(text));
         if (useYadb) await this.execYadb(escapeForShell(text));
         else {
+            const displayArg = this.getDisplayArg();
             const segments = text.split('\n');
             for(let i = 0; i < segments.length; i++){
-                if (segments[i].length > 0) await adb.inputText(segments[i]);
-                if (i < segments.length - 1) await adb.keyevent(66);
+                if (segments[i].length > 0) if (typeDelay && typeDelay > 0) for (const ch of segments[i]){
+                    const escaped = ' ' === ch ? '%s' : ch;
+                    await adb.shell(`input${displayArg} text ${escaped}`);
+                    await sleep(typeDelay);
+                }
+                else {
+                    const escaped = segments[i].replace(/ /g, '%s');
+                    await adb.shell(`input${displayArg} text ${escaped}`);
+                }
+                if (i < segments.length - 1) await adb.shell(`input${displayArg} keyevent 66`);
             }
         }
         if (true === shouldAutoDismissKeyboard) await this.hideKeyboard(options);
@@ -1426,12 +1444,13 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             End: 123
         };
         const adb = await this.getAdb();
+        const displayArg = this.getDisplayArg();
         const normalizedKey = this.normalizeKeyName(key);
         const keyCode = keyCodeMap[normalizedKey];
-        if (void 0 !== keyCode) await adb.keyevent(keyCode);
+        if (void 0 !== keyCode) await adb.shell(`input${displayArg} keyevent ${keyCode}`);
         else if (1 === key.length) {
             const asciiCode = key.toUpperCase().charCodeAt(0);
-            if (asciiCode >= 65 && asciiCode <= 90) await adb.keyevent(asciiCode - 36);
+            if (asciiCode >= 65 && asciiCode <= 90) await adb.shell(`input${displayArg} keyevent ${asciiCode - 36}`);
         }
     }
     async tapPoint(point) {
@@ -1625,7 +1644,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             4
         ];
         for (const keyCode of keyCodes){
-            await adb.keyevent(keyCode);
+            await adb.shell(`input${this.getDisplayArg()} keyevent ${keyCode}`);
             const startTime = Date.now();
             const intervalMs = 100;
             while(Date.now() - startTime < timeoutMs){

package/dist/lib/cli.js CHANGED Viewed

@@ -1315,12 +1315,19 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 x: element.center[0],
                 y: element.center[1]
             });
-            await this.ensureYadb();
             const adb = await this.getAdb();
+            const displayArg = this.getDisplayArg();
+            const isNonDefaultDisplay = 'number' == typeof this.options?.displayId && 0 !== this.options.displayId;
             const IME_STRATEGY = (this.options?.imeStrategy || env_namespaceObject.globalConfigManager.getEnvConfigValue(env_namespaceObject.MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
-            if (IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII) await adb.clearTextField(100);
-            else {
-                this.warnYadbOnNonDefaultDisplay('keyboard clear');
+            if (isNonDefaultDisplay) {
+                const keys = [];
+                for(let i = 0; i < 100; i++)keys.push('67', '112');
+                await adb.shell(`input${displayArg} keyevent ${keys.join(' ')}`);
+            } else if (IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII) {
+                await this.ensureYadb();
+                await adb.clearTextField(100);
+            } else {
+                await this.ensureYadb();
                 await adb.shell('app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboardClear');
             }
             if (await adb.isSoftKeyboardPresent()) return;
@@ -1492,13 +1499,24 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             const adb = await this.getAdb();
             const IME_STRATEGY = (this.options?.imeStrategy || env_namespaceObject.globalConfigManager.getEnvConfigValue(env_namespaceObject.MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
             const shouldAutoDismissKeyboard = options?.autoDismissKeyboard ?? this.options?.autoDismissKeyboard ?? true;
-            const useYadb = IME_STRATEGY === IME_STRATEGY_ALWAYS_YADB || IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII && this.shouldUseYadbForText(text);
+            const typeDelay = options?.keyboardTypeDelay ?? this.options?.keyboardTypeDelay;
+            const isNonDefaultDisplay = 'number' == typeof this.options?.displayId && 0 !== this.options.displayId;
+            const useYadb = !isNonDefaultDisplay && (IME_STRATEGY === IME_STRATEGY_ALWAYS_YADB || IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII && this.shouldUseYadbForText(text));
             if (useYadb) await this.execYadb(escapeForShell(text));
             else {
+                const displayArg = this.getDisplayArg();
                 const segments = text.split('\n');
                 for(let i = 0; i < segments.length; i++){
-                    if (segments[i].length > 0) await adb.inputText(segments[i]);
-                    if (i < segments.length - 1) await adb.keyevent(66);
+                    if (segments[i].length > 0) if (typeDelay && typeDelay > 0) for (const ch of segments[i]){
+                        const escaped = ' ' === ch ? '%s' : ch;
+                        await adb.shell(`input${displayArg} text ${escaped}`);
+                        await (0, core_utils_namespaceObject.sleep)(typeDelay);
+                    }
+                    else {
+                        const escaped = segments[i].replace(/ /g, '%s');
+                        await adb.shell(`input${displayArg} text ${escaped}`);
+                    }
+                    if (i < segments.length - 1) await adb.shell(`input${displayArg} keyevent 66`);
                 }
             }
             if (true === shouldAutoDismissKeyboard) await this.hideKeyboard(options);
@@ -1538,12 +1556,13 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 End: 123
             };
             const adb = await this.getAdb();
+            const displayArg = this.getDisplayArg();
             const normalizedKey = this.normalizeKeyName(key);
             const keyCode = keyCodeMap[normalizedKey];
-            if (void 0 !== keyCode) await adb.keyevent(keyCode);
+            if (void 0 !== keyCode) await adb.shell(`input${displayArg} keyevent ${keyCode}`);
             else if (1 === key.length) {
                 const asciiCode = key.toUpperCase().charCodeAt(0);
-                if (asciiCode >= 65 && asciiCode <= 90) await adb.keyevent(asciiCode - 36);
+                if (asciiCode >= 65 && asciiCode <= 90) await adb.shell(`input${displayArg} keyevent ${asciiCode - 36}`);
             }
         }
         async tapPoint(point) {
@@ -1737,7 +1756,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 4
             ];
             for (const keyCode of keyCodes){
-                await adb.keyevent(keyCode);
+                await adb.shell(`input${this.getDisplayArg()} keyevent ${keyCode}`);
                 const startTime = Date.now();
                 const intervalMs = 100;
                 while(Date.now() - startTime < timeoutMs){
@@ -2083,7 +2102,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     const tools = new AndroidMidsceneTools();
     (0, cli_namespaceObject.runToolsCLI)(tools, 'midscene-android', {
         stripPrefix: 'android_',
-        version: "1.10.1",
+        version: "1.10.2-beta-20260706032158.0",
         extraCommands: (0, core_namespaceObject.createReportCliCommands)()
     }).catch((e)=>{
         process.exit((0, cli_namespaceObject.reportCLIError)(e));

package/dist/lib/index.js CHANGED Viewed

@@ -1236,12 +1236,19 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 x: element.center[0],
                 y: element.center[1]
             });
-            await this.ensureYadb();
             const adb = await this.getAdb();
+            const displayArg = this.getDisplayArg();
+            const isNonDefaultDisplay = 'number' == typeof this.options?.displayId && 0 !== this.options.displayId;
             const IME_STRATEGY = (this.options?.imeStrategy || env_namespaceObject.globalConfigManager.getEnvConfigValue(env_namespaceObject.MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
-            if (IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII) await adb.clearTextField(100);
-            else {
-                this.warnYadbOnNonDefaultDisplay('keyboard clear');
+            if (isNonDefaultDisplay) {
+                const keys = [];
+                for(let i = 0; i < 100; i++)keys.push('67', '112');
+                await adb.shell(`input${displayArg} keyevent ${keys.join(' ')}`);
+            } else if (IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII) {
+                await this.ensureYadb();
+                await adb.clearTextField(100);
+            } else {
+                await this.ensureYadb();
                 await adb.shell('app_process -Djava.class.path=/data/local/tmp/yadb /data/local/tmp com.ysbing.yadb.Main -keyboardClear');
             }
             if (await adb.isSoftKeyboardPresent()) return;
@@ -1413,13 +1420,24 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
             const adb = await this.getAdb();
             const IME_STRATEGY = (this.options?.imeStrategy || env_namespaceObject.globalConfigManager.getEnvConfigValue(env_namespaceObject.MIDSCENE_ANDROID_IME_STRATEGY)) ?? IME_STRATEGY_YADB_FOR_NON_ASCII;
             const shouldAutoDismissKeyboard = options?.autoDismissKeyboard ?? this.options?.autoDismissKeyboard ?? true;
-            const useYadb = IME_STRATEGY === IME_STRATEGY_ALWAYS_YADB || IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII && this.shouldUseYadbForText(text);
+            const typeDelay = options?.keyboardTypeDelay ?? this.options?.keyboardTypeDelay;
+            const isNonDefaultDisplay = 'number' == typeof this.options?.displayId && 0 !== this.options.displayId;
+            const useYadb = !isNonDefaultDisplay && (IME_STRATEGY === IME_STRATEGY_ALWAYS_YADB || IME_STRATEGY === IME_STRATEGY_YADB_FOR_NON_ASCII && this.shouldUseYadbForText(text));
             if (useYadb) await this.execYadb(escapeForShell(text));
             else {
+                const displayArg = this.getDisplayArg();
                 const segments = text.split('\n');
                 for(let i = 0; i < segments.length; i++){
-                    if (segments[i].length > 0) await adb.inputText(segments[i]);
-                    if (i < segments.length - 1) await adb.keyevent(66);
+                    if (segments[i].length > 0) if (typeDelay && typeDelay > 0) for (const ch of segments[i]){
+                        const escaped = ' ' === ch ? '%s' : ch;
+                        await adb.shell(`input${displayArg} text ${escaped}`);
+                        await (0, utils_namespaceObject.sleep)(typeDelay);
+                    }
+                    else {
+                        const escaped = segments[i].replace(/ /g, '%s');
+                        await adb.shell(`input${displayArg} text ${escaped}`);
+                    }
+                    if (i < segments.length - 1) await adb.shell(`input${displayArg} keyevent 66`);
                 }
             }
             if (true === shouldAutoDismissKeyboard) await this.hideKeyboard(options);
@@ -1459,12 +1477,13 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 End: 123
             };
             const adb = await this.getAdb();
+            const displayArg = this.getDisplayArg();
             const normalizedKey = this.normalizeKeyName(key);
             const keyCode = keyCodeMap[normalizedKey];
-            if (void 0 !== keyCode) await adb.keyevent(keyCode);
+            if (void 0 !== keyCode) await adb.shell(`input${displayArg} keyevent ${keyCode}`);
             else if (1 === key.length) {
                 const asciiCode = key.toUpperCase().charCodeAt(0);
-                if (asciiCode >= 65 && asciiCode <= 90) await adb.keyevent(asciiCode - 36);
+                if (asciiCode >= 65 && asciiCode <= 90) await adb.shell(`input${displayArg} keyevent ${asciiCode - 36}`);
             }
         }
         async tapPoint(point) {
@@ -1658,7 +1677,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 4
             ];
             for (const keyCode of keyCodes){
-                await adb.keyevent(keyCode);
+                await adb.shell(`input${this.getDisplayArg()} keyevent ${keyCode}`);
                 const startTime = Date.now();
                 const intervalMs = 100;
                 while(Date.now() - startTime < timeoutMs){

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "1.10.1",
+  "version": "1.10.2-beta-20260706032158.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/web-infra-dev/midscene.git",
@@ -41,8 +41,8 @@
     "@yume-chan/stream-extra": "2.1.0",
     "appium-adb": "12.12.1",
     "sharp": "^0.34.3",
-    "@midscene/shared": "1.10.1",
-    "@midscene/core": "1.10.1"
+    "@midscene/core": "1.10.2-beta-20260706032158.0",
+    "@midscene/shared": "1.10.2-beta-20260706032158.0"
   },
   "optionalDependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0"
@@ -56,7 +56,7 @@
     "undici": "^6.0.0",
     "vitest": "3.0.5",
     "zod": "^3.25.1",
-    "@midscene/playground": "1.10.1"
+    "@midscene/playground": "1.10.2-beta-20260706032158.0"
   },
   "license": "MIT",
   "scripts": {