@midscene/ios 1.0.1-beta-20251022061922.0 → 1.0.1-beta-20251024064637.0

package/dist/es/index.mjs

@@ -196,19 +196,45 @@ class IOSWebDriverClient extends WebDriverClient {
     }
     async swipe(fromX, fromY, toX, toY, duration = 500) {
         this.ensureSession();
-        try {
-            await this.makeRequest('POST', `/session/${this.sessionId}/wda/dragfromtoforduration`, {
-                fromX,
-                fromY,
-                toX,
-                toY,
-                duration: duration / 1000
-            });
-            debugIOS(`Swiped from (${fromX}, ${fromY}) to (${toX}, ${toY}) in ${duration}ms`);
-        } catch (error) {
-            debugIOS(`Failed to swipe from (${fromX}, ${fromY}) to (${toX}, ${toY}): ${error}`);
-            throw new Error(`Failed to swipe: ${error}`);
-        }
+        const actions = {
+            actions: [
+                {
+                    type: 'pointer',
+                    id: 'finger1',
+                    parameters: {
+                        pointerType: 'touch'
+                    },
+                    actions: [
+                        {
+                            type: 'pointerMove',
+                            duration: 0,
+                            x: fromX,
+                            y: fromY
+                        },
+                        {
+                            type: 'pointerDown',
+                            button: 0
+                        },
+                        {
+                            type: 'pause',
+                            duration: 100
+                        },
+                        {
+                            type: 'pointerMove',
+                            duration,
+                            x: toX,
+                            y: toY
+                        },
+                        {
+                            type: 'pointerUp',
+                            button: 0
+                        }
+                    ]
+                }
+            ]
+        };
+        await this.makeRequest('POST', `/session/${this.sessionId}/actions`, actions);
+        debugIOS(`Swiped using W3C Actions from (${fromX}, ${fromY}) to (${toX}, ${toY}) in ${duration}ms`);
     }
     async longPress(x, y, duration = 1000) {
         this.ensureSession();
@@ -354,8 +380,7 @@ class IOSDevice {
                 await this.swipe(from.center[0], from.center[1], to.center[0], to.center[1]);
             }),
             defineActionKeyboardPress(async (param)=>{
-                const key = param.keyName;
-                await this.pressKey(key);
+                await this.pressKey(param.keyName);
             }),
             defineAction({
                 name: 'IOSHomeButton',
@@ -511,23 +536,23 @@ ScreenSize: ${size.width}x${size.height} (DPR: ${size.scale})
         return '';
     }
     async tap(x, y) {
-        await this.wdaBackend.tap(x, y);
+        await this.wdaBackend.tap(Math.round(x), Math.round(y));
     }
     async mouseClick(x, y) {
         debugDevice(`mouseClick at coordinates (${x}, ${y})`);
         await this.tap(x, y);
     }
     async doubleTap(x, y) {
-        await this.wdaBackend.doubleTap(x, y);
+        await this.wdaBackend.doubleTap(Math.round(x), Math.round(y));
     }
     async tripleTap(x, y) {
-        await this.wdaBackend.tripleTap(x, y);
+        await this.wdaBackend.tripleTap(Math.round(x), Math.round(y));
     }
     async longPress(x, y, duration = 1000) {
-        await this.wdaBackend.longPress(x, y, duration);
+        await this.wdaBackend.longPress(Math.round(x), Math.round(y), duration);
     }
     async swipe(fromX, fromY, toX, toY, duration = 500) {
-        await this.wdaBackend.swipe(fromX, fromY, toX, toY, duration);
+        await this.wdaBackend.swipe(Math.round(fromX), Math.round(fromY), Math.round(toX), Math.round(toY), duration);
     }
     async typeText(text, options) {
         var _this_options;
@@ -550,49 +575,49 @@ ScreenSize: ${size.width}x${size.height} (DPR: ${size.scale})
     async scrollUp(distance, startPoint) {
         const { width, height } = await this.size();
         const start = startPoint ? {
-            x: startPoint.left,
-            y: startPoint.top
+            x: Math.round(startPoint.left),
+            y: Math.round(startPoint.top)
         } : {
-            x: width / 2,
-            y: height / 2
+            x: Math.round(width / 2),
+            y: Math.round(height / 2)
         };
-        const scrollDistance = distance || height / 3;
+        const scrollDistance = Math.round(distance || height / 3);
         await this.swipe(start.x, start.y, start.x, start.y + scrollDistance);
     }
     async scrollDown(distance, startPoint) {
         const { width, height } = await this.size();
         const start = startPoint ? {
-            x: startPoint.left,
-            y: startPoint.top
+            x: Math.round(startPoint.left),
+            y: Math.round(startPoint.top)
         } : {
-            x: width / 2,
-            y: height / 2
+            x: Math.round(width / 2),
+            y: Math.round(height / 2)
         };
-        const scrollDistance = distance || height / 3;
+        const scrollDistance = Math.round(distance || height / 3);
         await this.swipe(start.x, start.y, start.x, start.y - scrollDistance);
     }
     async scrollLeft(distance, startPoint) {
         const { width, height } = await this.size();
         const start = startPoint ? {
-            x: startPoint.left,
-            y: startPoint.top
+            x: Math.round(startPoint.left),
+            y: Math.round(startPoint.top)
         } : {
-            x: width / 2,
-            y: height / 2
+            x: Math.round(width / 2),
+            y: Math.round(height / 2)
         };
-        const scrollDistance = distance || width / 3;
+        const scrollDistance = Math.round(distance || 0.7 * width);
         await this.swipe(start.x, start.y, start.x + scrollDistance, start.y);
     }
     async scrollRight(distance, startPoint) {
         const { width, height } = await this.size();
         const start = startPoint ? {
-            x: startPoint.left,
-            y: startPoint.top
+            x: Math.round(startPoint.left),
+            y: Math.round(startPoint.top)
         } : {
-            x: width / 2,
-            y: height / 2
+            x: Math.round(width / 2),
+            y: Math.round(height / 2)
         };
-        const scrollDistance = distance || width / 3;
+        const scrollDistance = Math.round(distance || 0.7 * width);
         await this.swipe(start.x, start.y, start.x - scrollDistance, start.y);
     }
     async scrollUntilTop(startPoint) {
@@ -633,32 +658,32 @@ ScreenSize: ${size.width}x${size.height} (DPR: ${size.scale})
         const { width, height } = await this.size();
         let start;
         if (startPoint) start = {
-            x: startPoint.left,
-            y: startPoint.top
+            x: Math.round(startPoint.left),
+            y: Math.round(startPoint.top)
         };
         else switch(direction){
             case 'up':
                 start = {
-                    x: width / 2,
-                    y: 0.2 * height
+                    x: Math.round(width / 2),
+                    y: Math.round(0.2 * height)
                 };
                 break;
             case 'down':
                 start = {
-                    x: width / 2,
-                    y: 0.8 * height
+                    x: Math.round(width / 2),
+                    y: Math.round(0.8 * height)
                 };
                 break;
             case 'left':
                 start = {
-                    x: 0.8 * width,
-                    y: height / 2
+                    x: Math.round(0.8 * width),
+                    y: Math.round(height / 2)
                 };
                 break;
             case 'right':
                 start = {
-                    x: 0.2 * width,
-                    y: height / 2
+                    x: Math.round(0.2 * width),
+                    y: Math.round(height / 2)
                 };
                 break;
         }
@@ -685,7 +710,7 @@ ScreenSize: ${size.width}x${size.height} (DPR: ${size.scale})
                 break;
             }
             lastScreenshot = currentScreenshot;
-            const scrollDistance = 'left' === direction || 'right' === direction ? 0.6 * width : 0.6 * height;
+            const scrollDistance = Math.round('left' === direction || 'right' === direction ? 0.6 * width : 0.6 * height);
             debugDevice(`Performing scroll: ${direction}, distance: ${scrollDistance}`);
             switch(direction){
                 case 'up':
@@ -722,9 +747,9 @@ ScreenSize: ${size.width}x${size.height} (DPR: ${size.scale})
         try {
             debugDevice('Triggering app switcher with slow swipe up gesture');
             const { width, height } = await this.size();
-            const centerX = width / 2;
-            const startY = height - 5;
-            const endY = 0.5 * height;
+            const centerX = Math.round(width / 2);
+            const startY = Math.round(height - 5);
+            const endY = Math.round(0.5 * height);
             await this.wdaBackend.swipe(centerX, startY, centerX, endY, 1500);
             await sleep(800);
         } catch (error) {
@@ -742,9 +767,9 @@ ScreenSize: ${size.width}x${size.height} (DPR: ${size.scale})
                 return true;
             }
             const windowSize = await this.wdaBackend.getWindowSize();
-            const centerX = windowSize.width / 2;
-            const startY = 0.33 * windowSize.height;
-            const endY = 0.33 * windowSize.height + 10;
+            const centerX = Math.round(windowSize.width / 2);
+            const startY = Math.round(0.33 * windowSize.height);
+            const endY = Math.round(0.33 * windowSize.height + 10);
             await this.swipe(centerX, startY, centerX, endY, 50);
             debugDevice('Dismissed keyboard with swipe down gesture at screen one-third position');
             await sleep(300);