@nbakka/mcp-appium 3.0.25 → 4.0.1

package/lib/android.js

@@ -124,17 +124,19 @@ class AndroidRobot {
         let x0, y0, x1, y1;
         switch (direction) {
             case "up":
+                // Scroll up to reveal content above (swipe down gesture: top to bottom)
                 x0 = x1 = centerX;
-                y0 = Math.floor(screenSize.height * 0.80);
-                y1 = Math.floor(screenSize.height * 0.20);
+                y0 = Math.floor(screenSize.height * 0.20);
+                y1 = Math.floor(screenSize.height * 0.80);
                 break;
             case "down":
+                // Scroll down to reveal content below (swipe up gesture: bottom to top)
                 x0 = x1 = centerX;
-                y0 = Math.floor(screenSize.height * 0.20);
-                y1 = Math.floor(screenSize.height * 0.80);
+                y0 = Math.floor(screenSize.height * 0.80);
+                y1 = Math.floor(screenSize.height * 0.20);
                 break;
             default:
-                throw new robot_1.ActionableError(`Swipe direction "${direction}" is not supported`);
+                throw new robot_1.ActionableError(`Scroll direction "${direction}" is not supported`);
         }
         this.adb("shell", "input", "swipe", `${x0}`, `${y0}`, `${x1}`, `${y1}`, "1000");
     }
@@ -170,12 +172,71 @@ class AndroidRobot {
         }
         return elements;
     }
-    async getElementsOnScreen() {
+    collectSimplifiedElements(node) {
+        const elements = [];
+        
+        // Recursively traverse children first
+        if (node.node) {
+            if (Array.isArray(node.node)) {
+                for (const childNode of node.node) {
+                    elements.push(...this.collectSimplifiedElements(childNode));
+                }
+            }
+            else {
+                elements.push(...this.collectSimplifiedElements(node.node));
+            }
+        }
+        
+        // Only include element if it has at least one useful attribute
+        const hasText = node.text && node.text.trim().length > 0;
+        const hasContentDesc = node["content-desc"] && node["content-desc"].trim().length > 0;
+        const hasResourceId = node["resource-id"] && node["resource-id"].trim().length > 0;
+        
+        if (hasText || hasContentDesc || hasResourceId) {
+            const element = {};
+            
+            // Only include fields that have values
+            if (hasText) {
+                element.text = node.text;
+            }
+            
+            if (node.class) {
+                element.class = node.class;
+            }
+            
+            if (hasResourceId) {
+                element.id = node["resource-id"];
+            }
+            
+            if (hasContentDesc) {
+                element.accessibilityId = node["content-desc"];
+            }
+            
+            if (node.bounds) {
+                element.bounds = node.bounds;
+            }
+            
+            elements.push(element);
+        }
+        
+        return elements;
+    }
+    async getXmlStructure() {
         const parsedXml = await this.getUiAutomatorXml();
-//        const hierarchy = parsedXml.hierarchy;
-//        const elements = this.collectElements(hierarchy.node);
         return parsedXml;
     }
+    async getElementsOnScreen() {
+        const parsedXml = await this.getUiAutomatorXml();
+        const hierarchy = parsedXml.hierarchy;
+        const elements = this.collectElements(hierarchy.node);
+        return elements;
+    }
+    async getSimplifiedElements() {
+        const parsedXml = await this.getUiAutomatorXml();
+        const hierarchy = parsedXml.hierarchy;
+        const elements = this.collectSimplifiedElements(hierarchy.node);
+        return elements;
+    }
     async terminateApp(packageName) {
         this.adb("shell", "am", "force-stop", packageName);
     }

package/lib/ios.js

@@ -124,6 +124,14 @@ class IosRobot {
         const wda = await this.wda();
         return await wda.getElementsOnScreen();
     }
+    async getXmlStructure() {
+        const wda = await this.wda();
+        return await wda.getXmlStructure();
+    }
+    async getSimplifiedElements() {
+        const wda = await this.wda();
+        return await wda.getSimplifiedElements();
+    }
     async getScreenshot() {
         await this.assertTunnelRunning();
         const tmpFilename = path_1.default.join((0, os_1.tmpdir)(), `screenshot-${(0, crypto_1.randomBytes)(8).toString("hex")}.png`);

package/lib/iphone-simulator.js

@@ -136,6 +136,10 @@ class Simctl {
         const wda = await this.wda();
         return wda.getElementsOnScreen();
     }
+    async getSimplifiedElements() {
+        const wda = await this.wda();
+        return wda.getSimplifiedElements();
+    }
     async setOrientation(orientation) {
         const wda = await this.wda();
         return wda.setOrientation(orientation);