execbro 2.8.3 → 2.8.4

package/build/pro/tap.js

@@ -87,6 +87,24 @@ export async function analyzeBurstFrames(frames, options) {
         kind
     };
 }
+export function buildLongPressReport(args) {
+    if (args.durationMs === undefined)
+        return undefined;
+    if (args.hasLongPress === undefined) {
+        return { durationMs: args.durationMs, handlerFound: null };
+    }
+    if (args.hasLongPress) {
+        return { durationMs: args.durationMs, handlerFound: true };
+    }
+    const what = args.element ? `<${args.element} />` : "the element";
+    return {
+        durationMs: args.durationMs,
+        handlerFound: false,
+        warning: `Held for ${args.durationMs}ms, but ${what} has no onLongPress handler — ` +
+            `React Native will have fired its onPress on release instead. The gesture was ` +
+            `delivered; if you expected a long-press action, it is not wired to this element.`
+    };
+}
 export function buildQuery(options) {
     const query = {};
     if (options.text !== undefined)
@@ -416,7 +434,7 @@ export function findClosestOcrText(ocrResult, query) {
     }
     return best;
 }
-async function tryFiberStrategy(query, index, maxTraversalDepth, sink, device) {
+async function tryFiberStrategy(query, index, maxTraversalDepth, sink, device, longPress = false) {
     if (sink) {
         sink.fiber.ran = true;
         sink.fiber.metroConnected = connectedApps.size > 0;
@@ -433,7 +451,7 @@ async function tryFiberStrategy(query, index, maxTraversalDepth, sink, device) {
         }
         let lastResult = null;
         for (const depth of depthAttempts) {
-            const result = await tryFiberAtDepth(query, index, depth, device);
+            const result = await tryFiberAtDepth(query, index, depth, device, longPress);
             if (sink && result.matches?.length) {
                 sink.fiber.pressables = result.matches.slice(0, 50).map(m => ({
                     label: m.text || undefined,
@@ -456,7 +474,7 @@ async function tryFiberStrategy(query, index, maxTraversalDepth, sink, device) {
             sink.fiber.durationMs = Date.now() - startedAt;
     }
 }
-async function tryFiberAtDepth(query, index, maxTraversalDepth, device) {
+async function tryFiberAtDepth(query, index, maxTraversalDepth, device, longPress = false) {
     try {
         const result = await pressElement({
             text: query.text,
@@ -464,7 +482,8 @@ async function tryFiberAtDepth(query, index, maxTraversalDepth, device) {
             component: query.component,
             index,
             maxTraversalDepth,
-            device
+            device,
+            longPress
         });
         if (!result.success) {
             return { success: false, reason: result.error || "pressElement failed" };
@@ -508,7 +527,8 @@ async function tryFiberAtDepth(query, index, maxTraversalDepth, device) {
                         x: parsed.nativeTapTarget.x,
                         y: parsed.nativeTapTarget.y,
                         unit: parsed.nativeTapTarget.unit || "points"
-                    }
+                    },
+                    hasLongPress: !!parsed.hasLongPress
                 };
             }
             return {
@@ -528,7 +548,7 @@ async function tryFiberAtDepth(query, index, maxTraversalDepth, device) {
         };
     }
 }
-async function tryAccessibilityStrategy(query, index, platform, udid, sink, signal) {
+async function tryAccessibilityStrategy(query, index, platform, udid, sink, signal, deviceId, duration) {
     if (sink)
         sink.accessibility.ran = true;
     const startedAt = Date.now();
@@ -616,7 +636,7 @@ async function tryAccessibilityStrategy(query, index, platform, udid, sink, sign
                     reason: `Index ${index} out of bounds (${iosEffectiveMatches.length} matches)`
                 };
             }
-            await iosTap(match.center.x, match.center.y, { udid });
+            await iosTap(match.center.x, match.center.y, { udid, duration });
             return {
                 success: true,
                 reason: "Tapped via iOS accessibility",
@@ -635,13 +655,13 @@ async function tryAccessibilityStrategy(query, index, platform, udid, sink, sign
                 searchOptions.textContains = query.text;
             }
             const { androidGetUITree } = await import("../core/android.js");
-            const androidTree = await androidGetUITree(undefined, signal);
-            let result = await androidFindElement(searchOptions, undefined, signal, androidTree);
+            const androidTree = await androidGetUITree(deviceId, signal);
+            let result = await androidFindElement(searchOptions, deviceId, signal, androidTree);
             if (hasTestID && !hasText && (!result.success || !result.allMatches || result.allMatches.length === 0)) {
                 result = await androidFindElement({
                     contentDescContains: query.testID,
                     index
-                }, undefined, signal, androidTree);
+                }, deviceId, signal, androidTree);
             }
             if (sink && result.allMatches?.length) {
                 sink.accessibility.elements = result.allMatches.slice(0, 50).map(el => ({
@@ -683,7 +703,13 @@ async function tryAccessibilityStrategy(query, index, platform, udid, sink, sign
                     reason: `Index ${index} out of bounds (${androidEffectiveMatches.length} matches)`
                 };
             }
-            await androidTap(match.center.x, match.center.y);
+            const a11yTap = await androidTap(match.center.x, match.center.y, deviceId, duration);
+            if (!a11yTap.success) {
+                return {
+                    success: false,
+                    reason: `Accessibility found "${match.text ?? match.contentDesc ?? match.resourceId}" but tap failed: ${a11yTap.error}`
+                };
+            }
             return {
                 success: true,
                 reason: "Tapped via Android accessibility",
@@ -705,7 +731,7 @@ async function tryAccessibilityStrategy(query, index, platform, udid, sink, sign
             sink.accessibility.durationMs = Date.now() - startedAt;
     }
 }
-async function tryOcrStrategy(query, platform, udid, sink, signal) {
+async function tryOcrStrategy(query, platform, udid, sink, signal, deviceId, duration) {
     if (sink)
         sink.ocr.ran = true;
     const ocrStartedAt = Date.now();
@@ -729,7 +755,7 @@ async function tryOcrStrategy(query, platform, udid, sink, signal) {
         }
         else {
             const { androidScreenshot } = await import("../core/android.js");
-            const screenshot = await androidScreenshot(undefined, undefined, signal);
+            const screenshot = await androidScreenshot(undefined, deviceId, signal);
             if (!screenshot.success || !screenshot.data) {
                 return {
                     success: false,
@@ -776,7 +802,7 @@ async function tryOcrStrategy(query, platform, udid, sink, signal) {
         if (platform === "ios") {
             const { getDevicePixelRatio } = await import("../core/ios.js");
             const dpr = await getDevicePixelRatio(udid);
-            const tapResult = await iosTap(Math.round((match.tapCenter.x * scaleFactor) / dpr), Math.round((match.tapCenter.y * scaleFactor) / dpr), { udid });
+            const tapResult = await iosTap(Math.round((match.tapCenter.x * scaleFactor) / dpr), Math.round((match.tapCenter.y * scaleFactor) / dpr), { udid, duration });
             if (!tapResult.success) {
                 return {
                     success: false,
@@ -785,7 +811,13 @@ async function tryOcrStrategy(query, platform, udid, sink, signal) {
             }
         }
         else {
-            await androidTap(Math.round(match.tapCenter.x * scaleFactor), Math.round(match.tapCenter.y * scaleFactor));
+            const ocrTap = await androidTap(Math.round(match.tapCenter.x * scaleFactor), Math.round(match.tapCenter.y * scaleFactor), deviceId, duration);
+            if (!ocrTap.success) {
+                return {
+                    success: false,
+                    reason: `OCR found "${match.text}" but tap failed: ${ocrTap.error}`
+                };
+            }
         }
         return {
             success: true,
@@ -809,7 +841,7 @@ async function tryOcrStrategy(query, platform, udid, sink, signal) {
             sink.ocr.durationMs = Date.now() - ocrStartedAt;
     }
 }
-async function tryCoordinateStrategy(pixelX, pixelY, platform, lastScreenshot, udid) {
+async function tryCoordinateStrategy(pixelX, pixelY, platform, lastScreenshot, udid, deviceId, duration) {
     try {
         if (platform === "ios") {
             const scaleFactor = lastScreenshot?.scaleFactor ?? 1;
@@ -819,7 +851,7 @@ async function tryCoordinateStrategy(pixelX, pixelY, platform, lastScreenshot, u
                 : undefined;
             const devicePixelRatio = await getDevicePixelRatio(udid, dprHint);
             const converted = convertScreenshotToTapCoords(pixelX, pixelY, "ios", devicePixelRatio, scaleFactor);
-            const tapResult = await iosTap(converted.x, converted.y, { udid });
+            const tapResult = await iosTap(converted.x, converted.y, { udid, duration });
             if (!tapResult.success) {
                 return {
                     success: false,
@@ -835,7 +867,13 @@ async function tryCoordinateStrategy(pixelX, pixelY, platform, lastScreenshot, u
         else {
             const scaleFactor = lastScreenshot?.scaleFactor ?? 1;
             const converted = convertScreenshotToTapCoords(pixelX, pixelY, "android", 1, scaleFactor);
-            await androidTap(converted.x, converted.y);
+            const coordTap = await androidTap(converted.x, converted.y, deviceId, duration);
+            if (!coordTap.success) {
+                return {
+                    success: false,
+                    reason: `Coordinate tap failed: ${coordTap.error}`
+                };
+            }
             return {
                 success: true,
                 reason: "Tapped at coordinates (Android)",
@@ -1145,12 +1183,13 @@ export async function tap(options) {
         }
         const platform = nativeResolved.target.platform;
         const nativeUdid = nativeResolved.target.iosUdid;
+        const nativeSerial = nativeResolved.target.androidSerial;
         const nativeShouldScreenshot = options.screenshot !== false;
         const nativeShouldVerify = options.verify !== false;
         let nativeBeforeBuffer = null;
         let nativeScreenshotMeta;
         if (nativeShouldVerify) {
-            const before = await captureScreenshot(platform, nativeUdid);
+            const before = await captureScreenshot(platform, nativeUdid, nativeSerial);
             nativeBeforeBuffer = before?.buffer || null;
             if (before) {
                 nativeScreenshotMeta = {
@@ -1161,7 +1200,7 @@ export async function tap(options) {
             }
         }
         if (!nativeScreenshotMeta) {
-            const ref = await captureScreenshot(platform, nativeUdid);
+            const ref = await captureScreenshot(platform, nativeUdid, nativeSerial);
             if (ref) {
                 nativeScreenshotMeta = {
                     originalWidth: ref.width,
@@ -1175,7 +1214,7 @@ export async function tap(options) {
         }
         let result;
         try {
-            result = await withTimeout(tryCoordinateStrategy(query.x, query.y, platform, nativeScreenshotMeta, nativeUdid), remainingMs(), "native-coordinate");
+            result = await withTimeout(tryCoordinateStrategy(query.x, query.y, platform, nativeScreenshotMeta, nativeUdid, nativeSerial, options.duration), remainingMs(), "native-coordinate");
         }
         catch (err) {
             return formatTapFailure({
@@ -1203,6 +1242,7 @@ export async function tap(options) {
                     platform,
                     beforeBuffer: nativeBeforeBuffer,
                     udid: nativeUdid,
+                    deviceId: nativeSerial,
                     beforeScaleFactor: nativeScreenshotMeta?.scaleFactor,
                     markerPx: nativeMarker
                 }));
@@ -1216,11 +1256,12 @@ export async function tap(options) {
                     shouldScreenshot: nativeShouldScreenshot,
                     beforeBuffer: nativeBeforeBuffer,
                     udid: nativeUdid,
+                    deviceId: nativeSerial,
                     beforeScaleFactor: nativeScreenshotMeta?.scaleFactor,
                     markerPx: nativeMarker
                 }));
             }
-            return formatTapSuccess({
+            const nativeSuccess = formatTapSuccess({
                 method: "native-coordinate",
                 query,
                 pressed: result.pressed,
@@ -1229,6 +1270,10 @@ export async function tap(options) {
                 screenshot,
                 verification
             });
+            const nativeLongPress = buildLongPressReport({ durationMs: options.duration });
+            if (nativeLongPress)
+                nativeSuccess.longPress = nativeLongPress;
+            return nativeSuccess;
         }
         return formatTapFailure({
             query,
@@ -1247,6 +1292,7 @@ export async function tap(options) {
     const deviceNote = resolved.note;
     const platform = resolved.target.platform;
     let targetUdid = resolved.target.iosUdid;
+    const targetSerial = resolved.target.androidSerial;
     const allApps = Array.from(connectedApps.values());
     let hasMetro = allApps.length > 0;
     let app;
@@ -1384,7 +1430,7 @@ export async function tap(options) {
     let beforeScaleFactor;
     let beforeDims;
     {
-        const before = await captureScreenshot(platform, targetUdid);
+        const before = await captureScreenshot(platform, targetUdid, targetSerial);
         beforeBuffer = before?.buffer || null;
         beforeScaleFactor = before?.scaleFactor;
         if (before && before.width > 0 && before.height > 0) {
@@ -1407,13 +1453,13 @@ export async function tap(options) {
         try {
             switch (strat) {
                 case "fiber":
-                    result = await withTimeout(tryFiberStrategy(query, index, maxTraversalDepth, evidence, deviceName), budget, `fiber`);
+                    result = await withTimeout(tryFiberStrategy(query, index, maxTraversalDepth, evidence, deviceName, options.duration !== undefined), budget, `fiber`);
                     break;
                 case "accessibility":
-                    result = await withCancelableTimeout((signal) => tryAccessibilityStrategy(query, index, platform, targetUdid, evidence, signal), budget, `accessibility`);
+                    result = await withCancelableTimeout((signal) => tryAccessibilityStrategy(query, index, platform, targetUdid, evidence, signal, targetSerial, options.duration), budget, `accessibility`);
                     break;
                 case "ocr":
-                    result = await withCancelableTimeout((signal) => tryOcrStrategy(query, platform, targetUdid, evidence, signal), budget, `ocr`);
+                    result = await withCancelableTimeout((signal) => tryOcrStrategy(query, platform, targetUdid, evidence, signal, targetSerial, options.duration), budget, `ocr`);
                     break;
                 case "coordinate":
                     result = await withTimeout(tryCoordinateStrategy(query.x, query.y, platform, beforeScaleFactor != null
@@ -1422,7 +1468,7 @@ export async function tap(options) {
                             originalHeight: beforeDims?.height ?? 0,
                             scaleFactor: beforeScaleFactor
                         }
-                        : app?.lastScreenshot, targetUdid), budget, `coordinate`);
+                        : app?.lastScreenshot, targetUdid, targetSerial, options.duration), budget, `coordinate`);
                     break;
                 default:
                     result = { success: false, reason: `Unknown strategy: ${strat}` };
@@ -1461,6 +1507,7 @@ export async function tap(options) {
                     platform,
                     beforeBuffer,
                     udid: targetUdid,
+                    deviceId: targetSerial,
                     beforeScaleFactor,
                     markerPx: strategyMarker
                 }));
@@ -1474,6 +1521,7 @@ export async function tap(options) {
                     shouldScreenshot: true,
                     beforeBuffer,
                     udid: targetUdid,
+                    deviceId: targetSerial,
                     beforeScaleFactor,
                     markerPx: strategyMarker
                 }));
@@ -1501,6 +1549,13 @@ export async function tap(options) {
                 screenshot,
                 verification
             });
+            const strategyLongPress = buildLongPressReport({
+                durationMs: options.duration,
+                hasLongPress: result.hasLongPress,
+                element: result.pressed
+            });
+            if (strategyLongPress)
+                successResult.longPress = strategyLongPress;
             if (shadowWarning) {
                 successResult.warning = successResult.warning
                     ? `${successResult.warning}\n${shadowWarning}`
@@ -1558,16 +1613,19 @@ export async function tap(options) {
                 if (platform === "ios") {
                     const safeAreaTop = await getIOSSafeAreaTop(targetUdid);
                     const tapY = (safeAreaTop > 0 && coords.y < safeAreaTop) ? coords.y + safeAreaTop : coords.y;
-                    await iosTap(coords.x, tapY, { udid: targetUdid });
+                    await iosTap(coords.x, tapY, { udid: targetUdid, duration: options.duration });
                     coords.y = tapY;
                 }
                 else {
                     const { androidGetDensity } = await import("../core/android.js");
-                    const densityResult = await androidGetDensity();
+                    const densityResult = await androidGetDensity(targetSerial);
                     const densityScale = (densityResult.density || 420) / 160;
                     const pxX = Math.round(coords.x * densityScale);
                     const pxY = Math.round(coords.y * densityScale);
-                    await androidTap(pxX, pxY);
+                    const fiberTap = await androidTap(pxX, pxY, targetSerial, options.duration);
+                    if (!fiberTap.success) {
+                        throw new Error(fiberTap.error || "adb tap failed");
+                    }
                     coords.x = pxX;
                     coords.y = pxY;
                     coords.unit = "pixels";
@@ -1588,7 +1646,7 @@ export async function tap(options) {
                 else {
                     try {
                         const { androidGetDensity } = await import("../core/android.js");
-                        const d = await androidGetDensity();
+                        const d = await androidGetDensity(targetSerial);
                         fnDensity = (d.density || 420) / 160;
                     }
                     catch {
@@ -1608,6 +1666,7 @@ export async function tap(options) {
                         platform,
                         beforeBuffer,
                         udid: targetUdid,
+                        deviceId: targetSerial,
                         beforeScaleFactor,
                         markerPx: fiberMarker
                     }));
@@ -1619,6 +1678,7 @@ export async function tap(options) {
                         shouldScreenshot: true,
                         beforeBuffer,
                         udid: targetUdid,
+                        deviceId: targetSerial,
                         beforeScaleFactor,
                         markerPx: fiberMarker
                     }));
@@ -1632,7 +1692,7 @@ export async function tap(options) {
                         scaleFactor: screenshot.scaleFactor
                     };
                 }
-                return formatTapSuccess({
+                const fiberSuccess = formatTapSuccess({
                     method: "fiber+native",
                     query,
                     pressed: result.pressed,
@@ -1646,13 +1706,21 @@ export async function tap(options) {
                     screenshot,
                     verification
                 });
+                const fiberLongPress = buildLongPressReport({
+                    durationMs: options.duration,
+                    hasLongPress: result.hasLongPress,
+                    element: result.pressed
+                });
+                if (fiberLongPress)
+                    fiberSuccess.longPress = fiberLongPress;
+                return fiberSuccess;
             }
             catch {
             }
         }
         if (result.matches && result.ambiguous) {
             const { screenshot: matchScreenshot } = shouldScreenshot
-                ? await verifyAndCapture({ platform, shouldVerify: false, shouldScreenshot: true, beforeBuffer: null, udid: targetUdid })
+                ? await verifyAndCapture({ platform, shouldVerify: false, shouldScreenshot: true, beforeBuffer: null, udid: targetUdid, deviceId: targetSerial })
                 : { screenshot: undefined };
             if (matchScreenshot && app) {
                 app.lastScreenshot = {
@@ -1685,7 +1753,7 @@ export async function tap(options) {
         suggestion = `All strategies timed out — the element's presence is UNKNOWN. Retry the tap (transient slowness is common on dense screens), or try a different strategy explicitly (e.g. strategy='fiber' if accessibility timed out). ` + suggestion;
     }
     const { screenshot: failScreenshot } = shouldScreenshot
-        ? await verifyAndCapture({ platform, shouldVerify: false, shouldScreenshot: true, beforeBuffer: null, udid: targetUdid })
+        ? await verifyAndCapture({ platform, shouldVerify: false, shouldScreenshot: true, beforeBuffer: null, udid: targetUdid, deviceId: targetSerial })
         : { screenshot: undefined };
     if (failScreenshot && app) {
         app.lastScreenshot = {