@jobshimo/browser-link 0.23.6 → 0.23.8

package/dist/extension/background.js

@@ -631,8 +631,9 @@ async function waitForLoad(tabId, timeoutMs = 20_000) {
 }
 /**
  * `performFind` / `performClick` / `performType` / `performPress` /
- * `performWaitFor` — the extracted bodies of the standalone `find` /
- * `click` / `type` / `press` / `wait_for` cases in `handleTool` below.
+ * `performWaitFor` / `performDrag` — the extracted bodies of the
+ * standalone `find` / `click` / `type` / `press` / `wait_for` / `drag`
+ * cases in `handleTool` below.
  *
  * Both the standalone `case` handlers AND `browser.flow`'s step executor
  * (`runFlow` in `./flow.js`) call these exact functions — there is one
@@ -706,6 +707,8 @@ async function performClick(tabId, params) {
         });
         const settleResult = await runSettle(tabId, settle);
         const result = { clicked: selector, tag: resolved.tag };
+        if (resolved.hit_element)
+            result.hit_element = resolved.hit_element;
         if (settleResult)
             result.settle = settleResult;
         return { ok: true, result };
@@ -862,6 +865,279 @@ async function performWaitFor(tabId, state, params) {
         return { ok: false, error: err instanceof Error ? err.message : String(err) };
     }
 }
+async function performDrag(tabId, params) {
+    try {
+        // Same numeric guard the wire boundary used before this body was
+        // extracted out of `handleDrag`: anything non-finite or negative is
+        // treated as absent, so flow drag steps get identical protection.
+        const num = (v) => typeof v === 'number' && Number.isFinite(v) && v >= 0 ? v : undefined;
+        const clamp = (v, max) => Math.min(v, max);
+        const fromSelector = params.from_selector;
+        const toSelector = params.to_selector;
+        const fromXRaw = num(params.from_x);
+        const fromYRaw = num(params.from_y);
+        const toXRaw = num(params.to_x);
+        const toYRaw = num(params.to_y);
+        // Cap every duration that ends up in a setTimeout to keep CodeQL's
+        // "user-controlled timer duration" check happy and to prevent a
+        // misbehaving agent from parking the bridge for hours on a typo.
+        const durationMs = clamp(num(params.duration_ms) ?? 1500, MAX_DRAG_DURATION_MS);
+        const holdBeforeMoveMs = clamp(num(params.hold_before_move_ms) ?? 0, MAX_DRAG_HOLD_MS);
+        const holdBeforeReleaseMs = clamp(num(params.hold_before_release_ms) ?? 0, MAX_DRAG_HOLD_MS);
+        const hasFromCoords = fromXRaw !== undefined && fromYRaw !== undefined;
+        const hasToCoords = toXRaw !== undefined && toYRaw !== undefined;
+        if (!fromSelector && !hasFromCoords) {
+            return { ok: false, error: 'drag: provide from_selector or both from_x and from_y' };
+        }
+        if (!toSelector && !hasToCoords) {
+            return { ok: false, error: 'drag: provide to_selector or both to_x and to_y' };
+        }
+        const probeExpr = buildDragProbeJs({
+            from_selector: fromSelector,
+            to_selector: toSelector,
+            from_x: fromXRaw,
+            from_y: fromYRaw,
+            to_x: toXRaw,
+            to_y: toYRaw,
+        });
+        const probe = await evaluateInTab(tabId, probeExpr);
+        if (probe.err) {
+            return { ok: false, error: `drag: ${probe.err}` };
+        }
+        if (!probe.from || !probe.to) {
+            return { ok: false, error: 'drag: could not resolve coordinates' };
+        }
+        if (!probe.from.in_viewport) {
+            return {
+                ok: false,
+                error: 'drag: source point is offscreen — scroll first or pass viewport coords',
+            };
+        }
+        if (!probe.to.in_viewport) {
+            return {
+                ok: false,
+                error: 'drag: destination point is offscreen — scroll first or pass viewport coords',
+            };
+        }
+        const fromX = probe.from.x;
+        const fromY = probe.from.y;
+        const toX = probe.to.x;
+        const toY = probe.to.y;
+        const isDraggable = !!probe.draggable;
+        // ~30fps interpolation; minimum 2 steps so the path actually has a midpoint.
+        const steps = durationMs > 0 ? Math.max(2, Math.round(durationMs / 33)) : 1;
+        const stepDelayMs = steps > 0 ? durationMs / steps : 0;
+        const eventsFired = [];
+        // Every branch below reassigns `dragMode` before the final `return`
+        // reads it. (The old `case`-block extraction needed a
+        // no-useless-assignment disable here; inside this try/catch scope the
+        // linter no longer flags the initializer, so the directive is gone.)
+        let dragMode = 'pointer';
+        let interceptReceived = false;
+        const dragStart = Date.now();
+        let interceptionEnabled = false;
+        const interpolate = (t) => ({
+            x: fromX + (toX - fromX) * t,
+            y: fromY + (toY - fromY) * t,
+        });
+        // Mouse move WITH the left button held down. Chrome's HTML5 drag
+        // system only treats movement as a drag when the button state is
+        // signalled on every move after mousePressed; omitting it makes
+        // Blink ignore the move for drag-detection purposes.
+        const moveHeld = (x, y) => cdp(tabId, 'Input.dispatchMouseEvent', {
+            type: 'mouseMoved',
+            x,
+            y,
+            button: 'left',
+            buttons: 1,
+        });
+        // Wiggle distance has to comfortably clear `kDragThreshold` (~5px on
+        // Mac, 4px on Linux/Windows). 5px landed *right* at the boundary and
+        // Chrome did not start the drag — 20px crosses it on every platform.
+        const WIGGLE_PX = 20;
+        // Time to wait for Input.dragIntercepted after the wiggle. 120ms was
+        // enough on local-only synthetic tests but flaky in real Chrome —
+        // 250ms is comfortable without dragging out the overall latency.
+        const INTERCEPT_TIMEOUT_MS = 250;
+        try {
+            if (isDraggable) {
+                try {
+                    await cdp(tabId, 'Input.setInterceptDrags', { enabled: true });
+                    interceptionEnabled = true;
+                }
+                catch {
+                    // setInterceptDrags is experimental — fall back to pointer mode silently.
+                }
+            }
+            if (interceptionEnabled) {
+                // Arm the listener BEFORE the press+wiggle that may trigger it.
+                const interceptPromise = waitForCdpEvent(tabId, 'Input.dragIntercepted', INTERCEPT_TIMEOUT_MS);
+                await cdp(tabId, 'Input.dispatchMouseEvent', {
+                    type: 'mouseMoved',
+                    x: fromX,
+                    y: fromY,
+                });
+                await cdp(tabId, 'Input.dispatchMouseEvent', {
+                    type: 'mousePressed',
+                    x: fromX,
+                    y: fromY,
+                    button: 'left',
+                    clickCount: 1,
+                });
+                if (holdBeforeMoveMs > 0)
+                    await sleep(holdBeforeMoveMs);
+                // Wiggle toward the destination so Chrome's native drag system
+                // crosses its activation threshold. Direction matters for libs
+                // that have direction-sensitive activation constraints.
+                const dx = toX - fromX;
+                const dy = toY - fromY;
+                const len = Math.hypot(dx, dy) || 1;
+                const wx = fromX + (dx / len) * WIGGLE_PX;
+                const wy = fromY + (dy / len) * WIGGLE_PX;
+                await moveHeld(wx, wy);
+                const intercepted = await interceptPromise;
+                if (intercepted) {
+                    dragMode = 'html5';
+                    interceptReceived = true;
+                    eventsFired.push('Input.dragIntercepted');
+                    const dragData = intercepted.data;
+                    for (let i = 1; i <= steps; i++) {
+                        const t = i / steps;
+                        const { x, y } = interpolate(t);
+                        await moveHeld(x, y);
+                        await cdp(tabId, 'Input.dispatchDragEvent', {
+                            type: 'dragOver',
+                            x,
+                            y,
+                            data: dragData,
+                        });
+                        if (i === 1)
+                            eventsFired.push('dragOver');
+                        if (stepDelayMs > 0)
+                            await sleep(stepDelayMs);
+                    }
+                    await cdp(tabId, 'Input.dispatchDragEvent', {
+                        type: 'dragEnter',
+                        x: toX,
+                        y: toY,
+                        data: dragData,
+                    });
+                    eventsFired.push('dragEnter');
+                    await cdp(tabId, 'Input.dispatchDragEvent', {
+                        type: 'dragOver',
+                        x: toX,
+                        y: toY,
+                        data: dragData,
+                    });
+                    if (holdBeforeReleaseMs > 0)
+                        await sleep(holdBeforeReleaseMs);
+                    await cdp(tabId, 'Input.dispatchDragEvent', {
+                        type: 'drop',
+                        x: toX,
+                        y: toY,
+                        data: dragData,
+                    });
+                    eventsFired.push('drop');
+                    await cdp(tabId, 'Input.dispatchMouseEvent', {
+                        type: 'mouseReleased',
+                        x: toX,
+                        y: toY,
+                        button: 'left',
+                        clickCount: 1,
+                    });
+                }
+                else {
+                    // Element was tagged draggable but no native drag fired — the page
+                    // either preventDefault'd dragstart or wires its own pointer logic.
+                    // Continue with pointer-only events from where we already pressed.
+                    dragMode = 'pointer';
+                    for (let i = 1; i <= steps; i++) {
+                        const t = i / steps;
+                        const { x, y } = interpolate(t);
+                        await moveHeld(x, y);
+                        if (stepDelayMs > 0)
+                            await sleep(stepDelayMs);
+                    }
+                    if (holdBeforeReleaseMs > 0)
+                        await sleep(holdBeforeReleaseMs);
+                    await cdp(tabId, 'Input.dispatchMouseEvent', {
+                        type: 'mouseReleased',
+                        x: toX,
+                        y: toY,
+                        button: 'left',
+                        clickCount: 1,
+                    });
+                }
+            }
+            else {
+                // Pointer-only branch: no native drag involvement at all.
+                dragMode = 'pointer';
+                await cdp(tabId, 'Input.dispatchMouseEvent', {
+                    type: 'mouseMoved',
+                    x: fromX,
+                    y: fromY,
+                });
+                await cdp(tabId, 'Input.dispatchMouseEvent', {
+                    type: 'mousePressed',
+                    x: fromX,
+                    y: fromY,
+                    button: 'left',
+                    clickCount: 1,
+                });
+                if (holdBeforeMoveMs > 0)
+                    await sleep(holdBeforeMoveMs);
+                for (let i = 1; i <= steps; i++) {
+                    const t = i / steps;
+                    const { x, y } = interpolate(t);
+                    await moveHeld(x, y);
+                    if (stepDelayMs > 0)
+                        await sleep(stepDelayMs);
+                }
+                if (holdBeforeReleaseMs > 0)
+                    await sleep(holdBeforeReleaseMs);
+                await cdp(tabId, 'Input.dispatchMouseEvent', {
+                    type: 'mouseReleased',
+                    x: toX,
+                    y: toY,
+                    button: 'left',
+                    clickCount: 1,
+                });
+            }
+        }
+        finally {
+            // Critical: leaving interception on would block the human user from
+            // dragging anything in this tab. Best-effort cleanup, swallow errors.
+            if (interceptionEnabled) {
+                try {
+                    await cdp(tabId, 'Input.setInterceptDrags', { enabled: false });
+                }
+                catch {
+                    // ignore
+                }
+            }
+        }
+        return {
+            ok: true,
+            result: {
+                from: { x: fromX, y: fromY, selector: fromSelector ?? null },
+                to: { x: toX, y: toY, selector: toSelector ?? null },
+                duration_ms_actual: Date.now() - dragStart,
+                drag_mode: dragMode,
+                interception_attempted: interceptionEnabled,
+                intercept_received: interceptReceived,
+                events_fired: eventsFired,
+            },
+        };
+    }
+    catch (err) {
+        // The pre-extraction `case 'drag'` let thrown errors bubble to
+        // `handleTool`'s outer catch, which produced this exact same
+        // `err.message` string — converting here instead keeps the standalone
+        // wire behavior identical while giving `runFlow` the `ActionOutcome`
+        // shape it expects from every other perform* function.
+        return { ok: false, error: err instanceof Error ? err.message : String(err) };
+    }
+}
 /**
  * `handlePing` through `handleSetPermission` — the extracted bodies of the
  * remaining standalone tool cases in `handleTool` below that never got the
@@ -958,6 +1234,7 @@ async function handleFlow(tabId, state, msg, p) {
         performType: (params) => performType(tabId, params),
         performPress: (params) => performPress(tabId, params),
         performWaitFor: (params) => performWaitFor(tabId, state, params),
+        performDrag: (params) => performDrag(tabId, params),
         buildRecoverySnapshot: () => evaluateInTab(tabId, buildSnapshotJs({ only_interactive: true, max_interactive: 40 })),
     });
     // The wire-level response is ok:true whenever the flow RAN (even a
@@ -967,285 +1244,29 @@ async function handleFlow(tabId, state, msg, p) {
     return { kind: 'tool.response', id: msg.id, ok: true, result: flowResult };
 }
 async function handleDrag(tabId, msg, p, optStr) {
+    // Thin wire wrapper over performDrag — the same pattern the standalone
+    // click/type/press/wait_for cases use over their perform* functions.
+    // Numbers pass through with a plain typeof check; performDrag applies
+    // the full finite/non-negative guard and the duration/hold clamps.
     const optNum = (key) => {
         const v = p[key];
-        return typeof v === 'number' && Number.isFinite(v) && v >= 0 ? v : undefined;
+        return typeof v === 'number' ? v : undefined;
     };
-    const clamp = (v, max) => Math.min(v, max);
-    const fromSelector = optStr('from_selector');
-    const toSelector = optStr('to_selector');
-    const fromXRaw = optNum('from_x');
-    const fromYRaw = optNum('from_y');
-    const toXRaw = optNum('to_x');
-    const toYRaw = optNum('to_y');
-    // Cap every duration that ends up in a setTimeout to keep CodeQL's
-    // "user-controlled timer duration" check happy and to prevent a
-    // misbehaving agent from parking the bridge for hours on a typo.
-    const durationMs = clamp(optNum('duration_ms') ?? 1500, MAX_DRAG_DURATION_MS);
-    const holdBeforeMoveMs = clamp(optNum('hold_before_move_ms') ?? 0, MAX_DRAG_HOLD_MS);
-    const holdBeforeReleaseMs = clamp(optNum('hold_before_release_ms') ?? 0, MAX_DRAG_HOLD_MS);
-    const hasFromCoords = fromXRaw !== undefined && fromYRaw !== undefined;
-    const hasToCoords = toXRaw !== undefined && toYRaw !== undefined;
-    if (!fromSelector && !hasFromCoords) {
-        return {
-            kind: 'tool.response',
-            id: msg.id,
-            ok: false,
-            error: 'drag: provide from_selector or both from_x and from_y',
-        };
-    }
-    if (!toSelector && !hasToCoords) {
-        return {
-            kind: 'tool.response',
-            id: msg.id,
-            ok: false,
-            error: 'drag: provide to_selector or both to_x and to_y',
-        };
-    }
-    const probeExpr = buildDragProbeJs({
-        from_selector: fromSelector,
-        to_selector: toSelector,
-        from_x: fromXRaw,
-        from_y: fromYRaw,
-        to_x: toXRaw,
-        to_y: toYRaw,
+    const outcome = await performDrag(tabId, {
+        from_selector: optStr('from_selector'),
+        from_x: optNum('from_x'),
+        from_y: optNum('from_y'),
+        to_selector: optStr('to_selector'),
+        to_x: optNum('to_x'),
+        to_y: optNum('to_y'),
+        duration_ms: optNum('duration_ms'),
+        hold_before_move_ms: optNum('hold_before_move_ms'),
+        hold_before_release_ms: optNum('hold_before_release_ms'),
     });
-    const probe = await evaluateInTab(tabId, probeExpr);
-    if (probe.err) {
-        return { kind: 'tool.response', id: msg.id, ok: false, error: `drag: ${probe.err}` };
+    if (!outcome.ok) {
+        return { kind: 'tool.response', id: msg.id, ok: false, error: outcome.error };
     }
-    if (!probe.from || !probe.to) {
-        return {
-            kind: 'tool.response',
-            id: msg.id,
-            ok: false,
-            error: 'drag: could not resolve coordinates',
-        };
-    }
-    if (!probe.from.in_viewport) {
-        return {
-            kind: 'tool.response',
-            id: msg.id,
-            ok: false,
-            error: 'drag: source point is offscreen — scroll first or pass viewport coords',
-        };
-    }
-    if (!probe.to.in_viewport) {
-        return {
-            kind: 'tool.response',
-            id: msg.id,
-            ok: false,
-            error: 'drag: destination point is offscreen — scroll first or pass viewport coords',
-        };
-    }
-    const fromX = probe.from.x;
-    const fromY = probe.from.y;
-    const toX = probe.to.x;
-    const toY = probe.to.y;
-    const isDraggable = !!probe.draggable;
-    // ~30fps interpolation; minimum 2 steps so the path actually has a midpoint.
-    const steps = durationMs > 0 ? Math.max(2, Math.round(durationMs / 33)) : 1;
-    const stepDelayMs = steps > 0 ? durationMs / steps : 0;
-    const eventsFired = [];
-    // Every branch below reassigns `dragMode` before the final `return` reads it.
-    let dragMode = 'pointer'; // eslint-disable-line no-useless-assignment -- see comment above
-    let interceptReceived = false;
-    const dragStart = Date.now();
-    let interceptionEnabled = false;
-    const interpolate = (t) => ({
-        x: fromX + (toX - fromX) * t,
-        y: fromY + (toY - fromY) * t,
-    });
-    // Mouse move WITH the left button held down. Chrome's HTML5 drag
-    // system only treats movement as a drag when the button state is
-    // signalled on every move after mousePressed; omitting it makes
-    // Blink ignore the move for drag-detection purposes.
-    const moveHeld = (x, y) => cdp(tabId, 'Input.dispatchMouseEvent', {
-        type: 'mouseMoved',
-        x,
-        y,
-        button: 'left',
-        buttons: 1,
-    });
-    // Wiggle distance has to comfortably clear `kDragThreshold` (~5px on
-    // Mac, 4px on Linux/Windows). 5px landed *right* at the boundary and
-    // Chrome did not start the drag — 20px crosses it on every platform.
-    const WIGGLE_PX = 20;
-    // Time to wait for Input.dragIntercepted after the wiggle. 120ms was
-    // enough on local-only synthetic tests but flaky in real Chrome —
-    // 250ms is comfortable without dragging out the overall latency.
-    const INTERCEPT_TIMEOUT_MS = 250;
-    try {
-        if (isDraggable) {
-            try {
-                await cdp(tabId, 'Input.setInterceptDrags', { enabled: true });
-                interceptionEnabled = true;
-            }
-            catch {
-                // setInterceptDrags is experimental — fall back to pointer mode silently.
-            }
-        }
-        if (interceptionEnabled) {
-            // Arm the listener BEFORE the press+wiggle that may trigger it.
-            const interceptPromise = waitForCdpEvent(tabId, 'Input.dragIntercepted', INTERCEPT_TIMEOUT_MS);
-            await cdp(tabId, 'Input.dispatchMouseEvent', {
-                type: 'mouseMoved',
-                x: fromX,
-                y: fromY,
-            });
-            await cdp(tabId, 'Input.dispatchMouseEvent', {
-                type: 'mousePressed',
-                x: fromX,
-                y: fromY,
-                button: 'left',
-                clickCount: 1,
-            });
-            if (holdBeforeMoveMs > 0)
-                await sleep(holdBeforeMoveMs);
-            // Wiggle toward the destination so Chrome's native drag system
-            // crosses its activation threshold. Direction matters for libs
-            // that have direction-sensitive activation constraints.
-            const dx = toX - fromX;
-            const dy = toY - fromY;
-            const len = Math.hypot(dx, dy) || 1;
-            const wx = fromX + (dx / len) * WIGGLE_PX;
-            const wy = fromY + (dy / len) * WIGGLE_PX;
-            await moveHeld(wx, wy);
-            const intercepted = await interceptPromise;
-            if (intercepted) {
-                dragMode = 'html5';
-                interceptReceived = true;
-                eventsFired.push('Input.dragIntercepted');
-                const dragData = intercepted.data;
-                for (let i = 1; i <= steps; i++) {
-                    const t = i / steps;
-                    const { x, y } = interpolate(t);
-                    await moveHeld(x, y);
-                    await cdp(tabId, 'Input.dispatchDragEvent', {
-                        type: 'dragOver',
-                        x,
-                        y,
-                        data: dragData,
-                    });
-                    if (i === 1)
-                        eventsFired.push('dragOver');
-                    if (stepDelayMs > 0)
-                        await sleep(stepDelayMs);
-                }
-                await cdp(tabId, 'Input.dispatchDragEvent', {
-                    type: 'dragEnter',
-                    x: toX,
-                    y: toY,
-                    data: dragData,
-                });
-                eventsFired.push('dragEnter');
-                await cdp(tabId, 'Input.dispatchDragEvent', {
-                    type: 'dragOver',
-                    x: toX,
-                    y: toY,
-                    data: dragData,
-                });
-                if (holdBeforeReleaseMs > 0)
-                    await sleep(holdBeforeReleaseMs);
-                await cdp(tabId, 'Input.dispatchDragEvent', {
-                    type: 'drop',
-                    x: toX,
-                    y: toY,
-                    data: dragData,
-                });
-                eventsFired.push('drop');
-                await cdp(tabId, 'Input.dispatchMouseEvent', {
-                    type: 'mouseReleased',
-                    x: toX,
-                    y: toY,
-                    button: 'left',
-                    clickCount: 1,
-                });
-            }
-            else {
-                // Element was tagged draggable but no native drag fired — the page
-                // either preventDefault'd dragstart or wires its own pointer logic.
-                // Continue with pointer-only events from where we already pressed.
-                dragMode = 'pointer';
-                for (let i = 1; i <= steps; i++) {
-                    const t = i / steps;
-                    const { x, y } = interpolate(t);
-                    await moveHeld(x, y);
-                    if (stepDelayMs > 0)
-                        await sleep(stepDelayMs);
-                }
-                if (holdBeforeReleaseMs > 0)
-                    await sleep(holdBeforeReleaseMs);
-                await cdp(tabId, 'Input.dispatchMouseEvent', {
-                    type: 'mouseReleased',
-                    x: toX,
-                    y: toY,
-                    button: 'left',
-                    clickCount: 1,
-                });
-            }
-        }
-        else {
-            // Pointer-only branch: no native drag involvement at all.
-            dragMode = 'pointer';
-            await cdp(tabId, 'Input.dispatchMouseEvent', {
-                type: 'mouseMoved',
-                x: fromX,
-                y: fromY,
-            });
-            await cdp(tabId, 'Input.dispatchMouseEvent', {
-                type: 'mousePressed',
-                x: fromX,
-                y: fromY,
-                button: 'left',
-                clickCount: 1,
-            });
-            if (holdBeforeMoveMs > 0)
-                await sleep(holdBeforeMoveMs);
-            for (let i = 1; i <= steps; i++) {
-                const t = i / steps;
-                const { x, y } = interpolate(t);
-                await moveHeld(x, y);
-                if (stepDelayMs > 0)
-                    await sleep(stepDelayMs);
-            }
-            if (holdBeforeReleaseMs > 0)
-                await sleep(holdBeforeReleaseMs);
-            await cdp(tabId, 'Input.dispatchMouseEvent', {
-                type: 'mouseReleased',
-                x: toX,
-                y: toY,
-                button: 'left',
-                clickCount: 1,
-            });
-        }
-    }
-    finally {
-        // Critical: leaving interception on would block the human user from
-        // dragging anything in this tab. Best-effort cleanup, swallow errors.
-        if (interceptionEnabled) {
-            try {
-                await cdp(tabId, 'Input.setInterceptDrags', { enabled: false });
-            }
-            catch {
-                // ignore
-            }
-        }
-    }
-    return {
-        kind: 'tool.response',
-        id: msg.id,
-        ok: true,
-        result: {
-            from: { x: fromX, y: fromY, selector: fromSelector ?? null },
-            to: { x: toX, y: toY, selector: toSelector ?? null },
-            duration_ms_actual: Date.now() - dragStart,
-            drag_mode: dragMode,
-            interception_attempted: interceptionEnabled,
-            intercept_received: interceptReceived,
-            events_fired: eventsFired,
-        },
-    };
+    return { kind: 'tool.response', id: msg.id, ok: true, result: outcome.result };
 }
 async function handleDialogRespond(tabId, msg, p, optStr) {
     const accept = p.accept === true;