@midscene/android 1.7.10-beta-20260507123827.0 → 1.7.10

package/dist/es/cli.mjs

@@ -12,7 +12,7 @@ import { execFile } from "node:child_process";
 import { defineAction, defineActionClearInput, defineActionCursorMove, defineActionDoubleClick, defineActionDragAndDrop, defineActionKeyboardPress, defineActionLongPress, defineActionPinch, defineActionScroll, defineActionSwipe, defineActionTap, normalizeMobileSwipeParam, normalizePinchParam } from "@midscene/core/device";
 import { getTmpFile, sleep } from "@midscene/core/utils";
 import { MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT, MIDSCENE_ANDROID_IME_STRATEGY, globalConfigManager } from "@midscene/shared/env";
-import { createImgBase64ByFormat, isValidImageBuffer } from "@midscene/shared/img";
+import { createImgBase64ByFormat, validateScreenshotBuffer } from "@midscene/shared/img";
 import { ADB as external_appium_adb_ADB } from "appium-adb";
 var __webpack_modules__ = {
     "./src/scrcpy-manager.ts" (__unused_rspack_module, __webpack_exports__, __webpack_require__) {
@@ -1252,25 +1252,21 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 debugDevice('Taking screenshot via adb.takeScreenshot');
                 screenshotBuffer = await adb.takeScreenshot(null);
                 debugDevice('adb.takeScreenshot completed');
-                if (!screenshotBuffer) {
-                    this.takeScreenshotFailCount++;
-                    throw new Error('Failed to capture screenshot: screenshotBuffer is null');
-                }
-                if (!isValidImageBuffer(screenshotBuffer)) {
-                    debugDevice('Invalid image buffer detected: not a valid image format');
+                try {
+                    validateScreenshotBuffer(screenshotBuffer, {
+                        label: 'Screenshot',
+                        minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                    });
+                } catch (validationError) {
+                    debugDevice('Invalid screenshot buffer detected: %s', validationError instanceof Error ? validationError.message : String(validationError));
                     this.takeScreenshotFailCount++;
-                    throw new Error('Screenshot buffer has invalid format: could not find valid image signature');
+                    throw validationError;
                 }
                 this.takeScreenshotFailCount = 0;
             } else {
                 if (this.takeScreenshotFailCount >= AndroidDevice.TAKE_SCREENSHOT_FAIL_THRESHOLD) debugDevice('Skipping takeScreenshot (failed %d consecutive times), using shell screencap directly', this.takeScreenshotFailCount);
                 throw new Error('Using shell screencap directly');
             }
-            const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-            if (validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) {
-                debugDevice(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-                throw new Error(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-            }
         } catch (error) {
             debugDevice(`Taking screenshot via adb.takeScreenshot failed or was skipped: ${error}`);
             const screenshotPath = getTmpFile('png');
@@ -1291,9 +1287,10 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 await adb.pull(androidScreenshotPath, screenshotPath);
                 debugDevice(`adb.pull completed, local path: ${screenshotPath}`);
                 screenshotBuffer = await external_node_fs_["default"].promises.readFile(screenshotPath);
-                const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-                if (!screenshotBuffer || validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) throw new Error(`Fallback screenshot validation failed: buffer size ${screenshotBuffer?.length || 0} bytes (minimum: ${validScreenshotBufferSize})`);
-                if (!isValidImageBuffer(screenshotBuffer)) throw new Error('Fallback screenshot buffer has invalid PNG format');
+                validateScreenshotBuffer(screenshotBuffer, {
+                    label: 'Fallback screenshot',
+                    minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                });
                 debugDevice(`Fallback screenshot validated successfully: ${screenshotBuffer.length} bytes`);
             } finally{
                 const adbPath = adb.executable?.path ?? 'adb';
@@ -1779,6 +1776,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
 }
 device_define_property(AndroidDevice, "TAKE_SCREENSHOT_FAIL_THRESHOLD", 3);
+device_define_property(AndroidDevice, "DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE", 1024);
 const runAdbShellParamSchema = z.object({
     command: z.string().describe('ADB shell command to execute')
 });
@@ -2018,7 +2016,7 @@ class AndroidMidsceneTools extends BaseMidsceneTools {
 const tools = new AndroidMidsceneTools();
 runToolsCLI(tools, 'midscene-android', {
     stripPrefix: 'android_',
-    version: "1.7.10-beta-20260507123827.0",
+    version: "1.7.10",
     extraCommands: createReportCliCommands()
 }).catch((e)=>{
     process.exit(reportCLIError(e));

package/dist/es/index.mjs

@@ -8,7 +8,7 @@ import { getMidsceneLocationSchema, z } from "@midscene/core";
 import { defineAction, defineActionClearInput, defineActionCursorMove, defineActionDoubleClick, defineActionDragAndDrop, defineActionKeyboardPress, defineActionLongPress, defineActionPinch, defineActionScroll, defineActionSwipe, defineActionTap, normalizeMobileSwipeParam, normalizePinchParam } from "@midscene/core/device";
 import { getTmpFile, sleep } from "@midscene/core/utils";
 import { MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT, MIDSCENE_ANDROID_IME_STRATEGY, globalConfigManager, overrideAIConfig } from "@midscene/shared/env";
-import { createImgBase64ByFormat, isValidImageBuffer } from "@midscene/shared/img";
+import { createImgBase64ByFormat, validateScreenshotBuffer } from "@midscene/shared/img";
 import { mergeAndNormalizeAppNameMapping, normalizeForComparison, repeat } from "@midscene/shared/utils";
 import { ADB } from "appium-adb";
 import { Agent } from "@midscene/core/agent";
@@ -1155,25 +1155,21 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 debugDevice('Taking screenshot via adb.takeScreenshot');
                 screenshotBuffer = await adb.takeScreenshot(null);
                 debugDevice('adb.takeScreenshot completed');
-                if (!screenshotBuffer) {
-                    this.takeScreenshotFailCount++;
-                    throw new Error('Failed to capture screenshot: screenshotBuffer is null');
-                }
-                if (!isValidImageBuffer(screenshotBuffer)) {
-                    debugDevice('Invalid image buffer detected: not a valid image format');
+                try {
+                    validateScreenshotBuffer(screenshotBuffer, {
+                        label: 'Screenshot',
+                        minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                    });
+                } catch (validationError) {
+                    debugDevice('Invalid screenshot buffer detected: %s', validationError instanceof Error ? validationError.message : String(validationError));
                     this.takeScreenshotFailCount++;
-                    throw new Error('Screenshot buffer has invalid format: could not find valid image signature');
+                    throw validationError;
                 }
                 this.takeScreenshotFailCount = 0;
             } else {
                 if (this.takeScreenshotFailCount >= AndroidDevice.TAKE_SCREENSHOT_FAIL_THRESHOLD) debugDevice('Skipping takeScreenshot (failed %d consecutive times), using shell screencap directly', this.takeScreenshotFailCount);
                 throw new Error('Using shell screencap directly');
             }
-            const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-            if (validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) {
-                debugDevice(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-                throw new Error(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-            }
         } catch (error) {
             debugDevice(`Taking screenshot via adb.takeScreenshot failed or was skipped: ${error}`);
             const screenshotPath = getTmpFile('png');
@@ -1194,9 +1190,10 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 await adb.pull(androidScreenshotPath, screenshotPath);
                 debugDevice(`adb.pull completed, local path: ${screenshotPath}`);
                 screenshotBuffer = await external_node_fs_["default"].promises.readFile(screenshotPath);
-                const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-                if (!screenshotBuffer || validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) throw new Error(`Fallback screenshot validation failed: buffer size ${screenshotBuffer?.length || 0} bytes (minimum: ${validScreenshotBufferSize})`);
-                if (!isValidImageBuffer(screenshotBuffer)) throw new Error('Fallback screenshot buffer has invalid PNG format');
+                validateScreenshotBuffer(screenshotBuffer, {
+                    label: 'Fallback screenshot',
+                    minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                });
                 debugDevice(`Fallback screenshot validated successfully: ${screenshotBuffer.length} bytes`);
             } finally{
                 const adbPath = adb.executable?.path ?? 'adb';
@@ -1682,6 +1679,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
 }
 device_define_property(AndroidDevice, "TAKE_SCREENSHOT_FAIL_THRESHOLD", 3);
+device_define_property(AndroidDevice, "DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE", 1024);
 const runAdbShellParamSchema = z.object({
     command: z.string().describe('ADB shell command to execute')
 });

package/dist/es/mcp-server.mjs

@@ -11,7 +11,7 @@ import { getMidsceneLocationSchema, z } from "@midscene/core";
 import { defineAction, defineActionClearInput, defineActionCursorMove, defineActionDoubleClick, defineActionDragAndDrop, defineActionKeyboardPress, defineActionLongPress, defineActionPinch, defineActionScroll, defineActionSwipe, defineActionTap, normalizeMobileSwipeParam, normalizePinchParam } from "@midscene/core/device";
 import { getTmpFile, sleep } from "@midscene/core/utils";
 import { MIDSCENE_ADB_PATH, MIDSCENE_ADB_REMOTE_HOST, MIDSCENE_ADB_REMOTE_PORT, MIDSCENE_ANDROID_IME_STRATEGY, globalConfigManager } from "@midscene/shared/env";
-import { createImgBase64ByFormat, isValidImageBuffer } from "@midscene/shared/img";
+import { createImgBase64ByFormat, validateScreenshotBuffer } from "@midscene/shared/img";
 import { ADB as external_appium_adb_ADB } from "appium-adb";
 import { BaseMidsceneTools } from "@midscene/shared/mcp/base-tools";
 var __webpack_modules__ = {
@@ -1252,25 +1252,21 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 debugDevice('Taking screenshot via adb.takeScreenshot');
                 screenshotBuffer = await adb.takeScreenshot(null);
                 debugDevice('adb.takeScreenshot completed');
-                if (!screenshotBuffer) {
-                    this.takeScreenshotFailCount++;
-                    throw new Error('Failed to capture screenshot: screenshotBuffer is null');
-                }
-                if (!isValidImageBuffer(screenshotBuffer)) {
-                    debugDevice('Invalid image buffer detected: not a valid image format');
+                try {
+                    validateScreenshotBuffer(screenshotBuffer, {
+                        label: 'Screenshot',
+                        minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                    });
+                } catch (validationError) {
+                    debugDevice('Invalid screenshot buffer detected: %s', validationError instanceof Error ? validationError.message : String(validationError));
                     this.takeScreenshotFailCount++;
-                    throw new Error('Screenshot buffer has invalid format: could not find valid image signature');
+                    throw validationError;
                 }
                 this.takeScreenshotFailCount = 0;
             } else {
                 if (this.takeScreenshotFailCount >= AndroidDevice.TAKE_SCREENSHOT_FAIL_THRESHOLD) debugDevice('Skipping takeScreenshot (failed %d consecutive times), using shell screencap directly', this.takeScreenshotFailCount);
                 throw new Error('Using shell screencap directly');
             }
-            const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-            if (validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) {
-                debugDevice(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-                throw new Error(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-            }
         } catch (error) {
             debugDevice(`Taking screenshot via adb.takeScreenshot failed or was skipped: ${error}`);
             const screenshotPath = getTmpFile('png');
@@ -1291,9 +1287,10 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                 await adb.pull(androidScreenshotPath, screenshotPath);
                 debugDevice(`adb.pull completed, local path: ${screenshotPath}`);
                 screenshotBuffer = await external_node_fs_["default"].promises.readFile(screenshotPath);
-                const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-                if (!screenshotBuffer || validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) throw new Error(`Fallback screenshot validation failed: buffer size ${screenshotBuffer?.length || 0} bytes (minimum: ${validScreenshotBufferSize})`);
-                if (!isValidImageBuffer(screenshotBuffer)) throw new Error('Fallback screenshot buffer has invalid PNG format');
+                validateScreenshotBuffer(screenshotBuffer, {
+                    label: 'Fallback screenshot',
+                    minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                });
                 debugDevice(`Fallback screenshot validated successfully: ${screenshotBuffer.length} bytes`);
             } finally{
                 const adbPath = adb.executable?.path ?? 'adb';
@@ -1779,6 +1776,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
     }
 }
 device_define_property(AndroidDevice, "TAKE_SCREENSHOT_FAIL_THRESHOLD", 3);
+device_define_property(AndroidDevice, "DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE", 1024);
 const runAdbShellParamSchema = z.object({
     command: z.string().describe('ADB shell command to execute')
 });
@@ -2022,7 +2020,7 @@ class AndroidMCPServer extends BaseMCPServer {
     constructor(toolsManager){
         super({
             name: '@midscene/android-mcp',
-            version: "1.7.10-beta-20260507123827.0",
+            version: "1.7.10",
             description: 'Control the Android device using natural language commands'
         }, toolsManager);
     }

package/dist/lib/cli.js

@@ -1267,25 +1267,21 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                     debugDevice('Taking screenshot via adb.takeScreenshot');
                     screenshotBuffer = await adb.takeScreenshot(null);
                     debugDevice('adb.takeScreenshot completed');
-                    if (!screenshotBuffer) {
-                        this.takeScreenshotFailCount++;
-                        throw new Error('Failed to capture screenshot: screenshotBuffer is null');
-                    }
-                    if (!(0, img_namespaceObject.isValidImageBuffer)(screenshotBuffer)) {
-                        debugDevice('Invalid image buffer detected: not a valid image format');
+                    try {
+                        (0, img_namespaceObject.validateScreenshotBuffer)(screenshotBuffer, {
+                            label: 'Screenshot',
+                            minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                        });
+                    } catch (validationError) {
+                        debugDevice('Invalid screenshot buffer detected: %s', validationError instanceof Error ? validationError.message : String(validationError));
                         this.takeScreenshotFailCount++;
-                        throw new Error('Screenshot buffer has invalid format: could not find valid image signature');
+                        throw validationError;
                     }
                     this.takeScreenshotFailCount = 0;
                 } else {
                     if (this.takeScreenshotFailCount >= AndroidDevice.TAKE_SCREENSHOT_FAIL_THRESHOLD) debugDevice('Skipping takeScreenshot (failed %d consecutive times), using shell screencap directly', this.takeScreenshotFailCount);
                     throw new Error('Using shell screencap directly');
                 }
-                const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-                if (validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) {
-                    debugDevice(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-                    throw new Error(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-                }
             } catch (error) {
                 debugDevice(`Taking screenshot via adb.takeScreenshot failed or was skipped: ${error}`);
                 const screenshotPath = (0, core_utils_namespaceObject.getTmpFile)('png');
@@ -1306,9 +1302,10 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                     await adb.pull(androidScreenshotPath, screenshotPath);
                     debugDevice(`adb.pull completed, local path: ${screenshotPath}`);
                     screenshotBuffer = await external_node_fs_default().promises.readFile(screenshotPath);
-                    const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-                    if (!screenshotBuffer || validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) throw new Error(`Fallback screenshot validation failed: buffer size ${screenshotBuffer?.length || 0} bytes (minimum: ${validScreenshotBufferSize})`);
-                    if (!(0, img_namespaceObject.isValidImageBuffer)(screenshotBuffer)) throw new Error('Fallback screenshot buffer has invalid PNG format');
+                    (0, img_namespaceObject.validateScreenshotBuffer)(screenshotBuffer, {
+                        label: 'Fallback screenshot',
+                        minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                    });
                     debugDevice(`Fallback screenshot validated successfully: ${screenshotBuffer.length} bytes`);
                 } finally{
                     const adbPath = adb.executable?.path ?? 'adb';
@@ -1794,6 +1791,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
     }
     device_define_property(AndroidDevice, "TAKE_SCREENSHOT_FAIL_THRESHOLD", 3);
+    device_define_property(AndroidDevice, "DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE", 1024);
     const runAdbShellParamSchema = core_namespaceObject.z.object({
         command: core_namespaceObject.z.string().describe('ADB shell command to execute')
     });
@@ -2033,7 +2031,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.7.10-beta-20260507123827.0",
+        version: "1.7.10",
         extraCommands: (0, core_namespaceObject.createReportCliCommands)()
     }).catch((e)=>{
         process.exit((0, cli_namespaceObject.reportCLIError)(e));

package/dist/lib/index.js

@@ -1189,25 +1189,21 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                     debugDevice('Taking screenshot via adb.takeScreenshot');
                     screenshotBuffer = await adb.takeScreenshot(null);
                     debugDevice('adb.takeScreenshot completed');
-                    if (!screenshotBuffer) {
-                        this.takeScreenshotFailCount++;
-                        throw new Error('Failed to capture screenshot: screenshotBuffer is null');
-                    }
-                    if (!(0, img_namespaceObject.isValidImageBuffer)(screenshotBuffer)) {
-                        debugDevice('Invalid image buffer detected: not a valid image format');
+                    try {
+                        (0, img_namespaceObject.validateScreenshotBuffer)(screenshotBuffer, {
+                            label: 'Screenshot',
+                            minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                        });
+                    } catch (validationError) {
+                        debugDevice('Invalid screenshot buffer detected: %s', validationError instanceof Error ? validationError.message : String(validationError));
                         this.takeScreenshotFailCount++;
-                        throw new Error('Screenshot buffer has invalid format: could not find valid image signature');
+                        throw validationError;
                     }
                     this.takeScreenshotFailCount = 0;
                 } else {
                     if (this.takeScreenshotFailCount >= AndroidDevice.TAKE_SCREENSHOT_FAIL_THRESHOLD) debugDevice('Skipping takeScreenshot (failed %d consecutive times), using shell screencap directly', this.takeScreenshotFailCount);
                     throw new Error('Using shell screencap directly');
                 }
-                const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-                if (validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) {
-                    debugDevice(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-                    throw new Error(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-                }
             } catch (error) {
                 debugDevice(`Taking screenshot via adb.takeScreenshot failed or was skipped: ${error}`);
                 const screenshotPath = (0, utils_namespaceObject.getTmpFile)('png');
@@ -1228,9 +1224,10 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                     await adb.pull(androidScreenshotPath, screenshotPath);
                     debugDevice(`adb.pull completed, local path: ${screenshotPath}`);
                     screenshotBuffer = await external_node_fs_default().promises.readFile(screenshotPath);
-                    const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-                    if (!screenshotBuffer || validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) throw new Error(`Fallback screenshot validation failed: buffer size ${screenshotBuffer?.length || 0} bytes (minimum: ${validScreenshotBufferSize})`);
-                    if (!(0, img_namespaceObject.isValidImageBuffer)(screenshotBuffer)) throw new Error('Fallback screenshot buffer has invalid PNG format');
+                    (0, img_namespaceObject.validateScreenshotBuffer)(screenshotBuffer, {
+                        label: 'Fallback screenshot',
+                        minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                    });
                     debugDevice(`Fallback screenshot validated successfully: ${screenshotBuffer.length} bytes`);
                 } finally{
                     const adbPath = adb.executable?.path ?? 'adb';
@@ -1716,6 +1713,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
     }
     device_define_property(AndroidDevice, "TAKE_SCREENSHOT_FAIL_THRESHOLD", 3);
+    device_define_property(AndroidDevice, "DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE", 1024);
     const runAdbShellParamSchema = core_namespaceObject.z.object({
         command: core_namespaceObject.z.string().describe('ADB shell command to execute')
     });

package/dist/lib/mcp-server.js

@@ -1282,25 +1282,21 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                     debugDevice('Taking screenshot via adb.takeScreenshot');
                     screenshotBuffer = await adb.takeScreenshot(null);
                     debugDevice('adb.takeScreenshot completed');
-                    if (!screenshotBuffer) {
-                        this.takeScreenshotFailCount++;
-                        throw new Error('Failed to capture screenshot: screenshotBuffer is null');
-                    }
-                    if (!(0, img_namespaceObject.isValidImageBuffer)(screenshotBuffer)) {
-                        debugDevice('Invalid image buffer detected: not a valid image format');
+                    try {
+                        (0, img_namespaceObject.validateScreenshotBuffer)(screenshotBuffer, {
+                            label: 'Screenshot',
+                            minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                        });
+                    } catch (validationError) {
+                        debugDevice('Invalid screenshot buffer detected: %s', validationError instanceof Error ? validationError.message : String(validationError));
                         this.takeScreenshotFailCount++;
-                        throw new Error('Screenshot buffer has invalid format: could not find valid image signature');
+                        throw validationError;
                     }
                     this.takeScreenshotFailCount = 0;
                 } else {
                     if (this.takeScreenshotFailCount >= AndroidDevice.TAKE_SCREENSHOT_FAIL_THRESHOLD) debugDevice('Skipping takeScreenshot (failed %d consecutive times), using shell screencap directly', this.takeScreenshotFailCount);
                     throw new Error('Using shell screencap directly');
                 }
-                const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-                if (validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) {
-                    debugDevice(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-                    throw new Error(`Screenshot buffer too small: ${screenshotBuffer.length} bytes (minimum: ${validScreenshotBufferSize})`);
-                }
             } catch (error) {
                 debugDevice(`Taking screenshot via adb.takeScreenshot failed or was skipped: ${error}`);
                 const screenshotPath = (0, core_utils_namespaceObject.getTmpFile)('png');
@@ -1321,9 +1317,10 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
                     await adb.pull(androidScreenshotPath, screenshotPath);
                     debugDevice(`adb.pull completed, local path: ${screenshotPath}`);
                     screenshotBuffer = await external_node_fs_default().promises.readFile(screenshotPath);
-                    const validScreenshotBufferSize = this.options?.minScreenshotBufferSize ?? 10240;
-                    if (!screenshotBuffer || validScreenshotBufferSize > 0 && screenshotBuffer.length < validScreenshotBufferSize) throw new Error(`Fallback screenshot validation failed: buffer size ${screenshotBuffer?.length || 0} bytes (minimum: ${validScreenshotBufferSize})`);
-                    if (!(0, img_namespaceObject.isValidImageBuffer)(screenshotBuffer)) throw new Error('Fallback screenshot buffer has invalid PNG format');
+                    (0, img_namespaceObject.validateScreenshotBuffer)(screenshotBuffer, {
+                        label: 'Fallback screenshot',
+                        minBufferSize: this.options?.minScreenshotBufferSize ?? AndroidDevice.DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE
+                    });
                     debugDevice(`Fallback screenshot validated successfully: ${screenshotBuffer.length} bytes`);
                 } finally{
                     const adbPath = adb.executable?.path ?? 'adb';
@@ -1809,6 +1806,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         }
     }
     device_define_property(AndroidDevice, "TAKE_SCREENSHOT_FAIL_THRESHOLD", 3);
+    device_define_property(AndroidDevice, "DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE", 1024);
     const runAdbShellParamSchema = core_namespaceObject.z.object({
         command: core_namespaceObject.z.string().describe('ADB shell command to execute')
     });
@@ -2053,7 +2051,7 @@ ${Object.keys(size).filter((key)=>size[key]).map((key)=>`  ${key} size: ${size[k
         constructor(toolsManager){
             super({
                 name: '@midscene/android-mcp',
-                version: "1.7.10-beta-20260507123827.0",
+                version: "1.7.10",
                 description: 'Control the Android device using natural language commands'
             }, toolsManager);
         }

package/dist/types/index.d.ts

@@ -91,6 +91,7 @@ export declare class AndroidDevice implements AbstractInterface {
     private cachedAdjustScale;
     private takeScreenshotFailCount;
     private static readonly TAKE_SCREENSHOT_FAIL_THRESHOLD;
+    private static readonly DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE;
     interfaceType: InterfaceType;
     uri: string | undefined;
     options?: AndroidDeviceOpt;

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

@@ -83,6 +83,7 @@ declare class AndroidDevice implements AbstractInterface {
     private cachedAdjustScale;
     private takeScreenshotFailCount;
     private static readonly TAKE_SCREENSHOT_FAIL_THRESHOLD;
+    private static readonly DEFAULT_MIN_SCREENSHOT_BUFFER_SIZE;
     interfaceType: InterfaceType;
     uri: string | undefined;
     options?: AndroidDeviceOpt;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midscene/android",
-  "version": "1.7.10-beta-20260507123827.0",
+  "version": "1.7.10",
   "description": "Android automation library for Midscene",
   "keywords": [
     "Android UI automation",
@@ -41,8 +41,8 @@
     "@yume-chan/stream-extra": "2.1.0",
     "appium-adb": "12.12.1",
     "sharp": "^0.34.3",
-    "@midscene/core": "1.7.10-beta-20260507123827.0",
-    "@midscene/shared": "1.7.10-beta-20260507123827.0"
+    "@midscene/core": "1.7.10",
+    "@midscene/shared": "1.7.10"
   },
   "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.7.10-beta-20260507123827.0"
+    "@midscene/playground": "1.7.10"
   },
   "license": "MIT",
   "scripts": {