@midscene/computer 1.13.4-beta-20260928083351.0 → 1.14.0

package/dist/es/cli.mjs

@@ -86,24 +86,6 @@ function sendKeyViaAppleScript(key, modifiers = []) {
         script
     ]);
 }
-const desktopPointerPolicy = {
-    uiSettleMs: 100,
-    moveSettleMs: 50,
-    defaultTapHoldMs: 100,
-    tapMoveSteps: 8,
-    tapMoveStepDelayMs: 8,
-    hoverMoveSteps: 10,
-    hoverMoveStepDelayMs: 10
-};
-const desktopKeyboardPolicy = {
-    focusBeforeTypeMs: 300,
-    focusBeforeClearMs: 300,
-    focusBeforeShortcutMs: 50,
-    afterClearMs: 150
-};
-function resolveTapHoldDuration(duration) {
-    return Math.max(0, Math.round(duration ?? desktopPointerPolicy.defaultTapHoldMs));
-}
 function _define_property(obj, key, value) {
     if (key in obj) Object.defineProperty(obj, key, {
         value: value,
@@ -793,9 +775,18 @@ async function captureScreenshot(options) {
         });
     }
 }
+const SMOOTH_MOVE_STEPS_TAP = 8;
+const SMOOTH_MOVE_STEPS_MOUSE_MOVE = 10;
 const SMOOTH_MOVE_STEPS_DRAG = 20;
+const SMOOTH_MOVE_DELAY_TAP = 8;
+const SMOOTH_MOVE_DELAY_MOUSE_MOVE = 10;
 const SMOOTH_MOVE_DELAY_DRAG = 10;
+const MOUSE_MOVE_EFFECT_WAIT = 300;
+const CLICK_SETTLE_DELAY = 50;
+const CLICK_HOLD_DURATION = 100;
 const CLICK_FOCUS_SETTLE_DELAY = 120;
+const INPUT_FOCUS_DELAY = 300;
+const INPUT_CLEAR_DELAY = 150;
 const SCROLL_STEP_DELAY = 100;
 const SCROLL_COMPLETE_DELAY = 500;
 const EDGE_SCROLL_TOTAL_PX = 50000;
@@ -1116,7 +1107,7 @@ function normalizePrimaryKey(key) {
     return KEY_NAME_MAP[lowerKey] || lowerKey;
 }
 class ComputerDevice {
-    async moveGlobalPointer(point, context, options) {
+    async moveGlobalPointer(point, context, smooth) {
         if (this.destroyed) throw new Error('ComputerDevice has been destroyed');
         const target = {
             x: Math.round(point.x),
@@ -1124,21 +1115,21 @@ class ComputerDevice {
         };
         if ('win32' === process.platform) {
             const actual = this.windowsPointerDriver.moveTo(target, {
-                smoothSteps: options?.smoothSteps,
-                smoothDelayMs: options?.smoothDelay
+                smoothSteps: smooth?.smoothSteps,
+                smoothDelayMs: smooth?.smoothDelay
             });
             const drift = windowsPointerDrift(target, actual);
             if (!windowsPointerIsWithinTolerance(drift)) throw new Error(`${context}: expected (${target.x}, ${target.y}), got (${actual.x}, ${actual.y}), drift=(${drift.x}, ${drift.y})`);
-            await this.inputDriver.delay(options?.settleDelayMs ?? desktopPointerPolicy.moveSettleMs);
+            await this.inputDriver.delay(CLICK_SETTLE_DELAY);
             return actual;
         }
-        if (options?.smoothSteps !== void 0 && void 0 !== options.smoothDelay) await this.inputDriver.smoothMoveMouse(target.x, target.y, options.smoothSteps, options.smoothDelay);
+        if (smooth) await this.inputDriver.smoothMoveMouse(target.x, target.y, smooth.smoothSteps, smooth.smoothDelay);
         else this.inputDriver.moveMouse(target.x, target.y);
-        await this.inputDriver.delay(options?.settleDelayMs ?? desktopPointerPolicy.moveSettleMs);
+        await this.inputDriver.delay(CLICK_SETTLE_DELAY);
         return this.inputDriver.getMousePos();
     }
-    moveDisplayPointer(point, context, options) {
-        return this.moveGlobalPointer(this.toGlobalPoint(point), context, options);
+    moveDisplayPointer(point, context, smooth) {
+        return this.moveGlobalPointer(this.toGlobalPoint(point), context, smooth);
     }
     async performPointerDrag(from, to, duration) {
         const screenSize = await this.size();
@@ -1164,9 +1155,7 @@ class ComputerDevice {
             await this.moveDisplayPointer({
                 x,
                 y
-            }, 'Mouse did not reach the keyboard focus target', {
-                settleDelayMs: desktopPointerPolicy.uiSettleMs
-            });
+            }, 'Mouse did not reach the keyboard focus target');
             this.inputDriver.mouseClick('left');
         }
         await this.inputDriver.delay(delayMs);
@@ -1248,7 +1237,7 @@ Available Displays: ${displays.length > 0 ? displays.map((d)=>d.name).join(', ')
     }
     async healthCheck(displays) {
         console.log('[HealthCheck] Starting health check...');
-        console.log("[HealthCheck] @midscene/computer v1.13.4-beta-20260928083351.0");
+        console.log("[HealthCheck] @midscene/computer v1.14.0");
         console.log('[HealthCheck] Taking screenshot...');
         const screenshotTimeout = 15000;
         let timeoutId;
@@ -1286,7 +1275,7 @@ Available Displays: ${displays.length > 0 ? displays.map((d)=>d.name).join(', ')
             console.log(`[HealthCheck] Moving mouse to (${targetX}, ${targetY})...`);
             try {
                 this.inputDriver.moveMouse(targetX, targetY);
-                await sleep(desktopPointerPolicy.moveSettleMs);
+                await sleep(CLICK_SETTLE_DELAY);
                 this.inputDriver.assertMousePosition(targetX, targetY, 'Mouse health check failed');
             } finally{
                 this.inputDriver.moveMouse(startPos.x, startPos.y);
@@ -1521,9 +1510,8 @@ $g.Dispose(); $bmp.Dispose(); $ms.Dispose()
         const screenSize = await this.size();
         if ('win32' === process.platform && this.inputDriver.focusActiveWindow()) await this.inputDriver.delay(CLICK_FOCUS_SETTLE_DELAY);
         const point = this.resolveUntargetedScrollPoint(screenSize);
-        await this.moveGlobalPointer(point, 'Mouse did not reach the scroll viewport', {
-            settleDelayMs: desktopPointerPolicy.uiSettleMs
-        });
+        await this.moveGlobalPointer(point, 'Mouse did not reach the scroll viewport');
+        await this.inputDriver.delay(MOUSE_MOVE_EFFECT_WAIT);
         return screenSize;
     }
     async performScroll(param) {
@@ -1664,7 +1652,7 @@ $g.Dispose(); $bmp.Dispose(); $ms.Dispose()
                     });
                     const targetX = Math.round(target.x);
                     const targetY = Math.round(target.y);
-                    const holdDuration = resolveTapHoldDuration(opts?.duration);
+                    const holdDuration = Math.max(0, Math.round(opts?.duration ?? CLICK_HOLD_DURATION));
                     debugComputerInput('tap start %o', {
                         local: {
                             x,
@@ -1683,9 +1671,8 @@ $g.Dispose(); $bmp.Dispose(); $ms.Dispose()
                         x: targetX,
                         y: targetY
                     }, 'Mouse did not reach the tap target', {
-                        smoothSteps: desktopPointerPolicy.tapMoveSteps,
-                        smoothDelay: desktopPointerPolicy.tapMoveStepDelayMs,
-                        settleDelayMs: desktopPointerPolicy.uiSettleMs
+                        smoothSteps: SMOOTH_MOVE_STEPS_TAP,
+                        smoothDelay: SMOOTH_MOVE_DELAY_TAP
                     });
                     await pressMouseAtGlobalPoint(this.inputDriver, targetX, targetY, current, holdDuration, 'primary');
                     if (frontmostBefore && 'darwin' === process.platform) {
@@ -1701,9 +1688,7 @@ $g.Dispose(); $bmp.Dispose(); $ms.Dispose()
                             const followUpCurrent = await this.moveGlobalPointer({
                                 x: targetX,
                                 y: targetY
-                            }, 'Mouse did not reach the focus follow-up target', {
-                                settleDelayMs: desktopPointerPolicy.uiSettleMs
-                            });
+                            }, 'Mouse did not reach the focus follow-up target');
                             await pressMouseAtGlobalPoint(this.inputDriver, targetX, targetY, followUpCurrent, holdDuration, 'focus-follow-up');
                         }
                     }
@@ -1712,18 +1697,14 @@ $g.Dispose(); $bmp.Dispose(); $ms.Dispose()
                     await this.moveDisplayPointer({
                         x,
                         y
-                    }, 'Mouse did not reach the double-click target', {
-                        settleDelayMs: desktopPointerPolicy.uiSettleMs
-                    });
+                    }, 'Mouse did not reach the double-click target');
                     this.inputDriver.mouseClick('left', true);
                 },
                 rightClick: async ({ x, y })=>{
                     await this.moveDisplayPointer({
                         x,
                         y
-                    }, 'Mouse did not reach the right-click target', {
-                        settleDelayMs: desktopPointerPolicy.uiSettleMs
-                    });
+                    }, 'Mouse did not reach the right-click target');
                     this.inputDriver.mouseClick('right');
                 },
                 hover: async ({ x, y })=>{
@@ -1731,10 +1712,10 @@ $g.Dispose(); $bmp.Dispose(); $ms.Dispose()
                         x,
                         y
                     }, 'Mouse did not reach the hover target', {
-                        smoothSteps: desktopPointerPolicy.hoverMoveSteps,
-                        smoothDelay: desktopPointerPolicy.hoverMoveStepDelayMs,
-                        settleDelayMs: desktopPointerPolicy.uiSettleMs
+                        smoothSteps: SMOOTH_MOVE_STEPS_MOUSE_MOVE,
+                        smoothDelay: SMOOTH_MOVE_DELAY_MOUSE_MOVE
                     });
+                    await this.inputDriver.delay(MOUSE_MOVE_EFFECT_WAIT);
                 },
                 dragAndDrop: async (from, to)=>{
                     await this.performPointerDrag(from, to);
@@ -1749,25 +1730,23 @@ $g.Dispose(); $bmp.Dispose(); $ms.Dispose()
                     const resolvedInputOptions = resolveTextInputOptions(opts, this.options);
                     const element = opts?.target;
                     if (element) {
-                        await this.focusKeyboardTarget(element, desktopKeyboardPolicy.focusBeforeTypeMs);
-                        if (opts?.focusOnly) return;
+                        await this.focusKeyboardTarget(element, INPUT_FOCUS_DELAY);
                         if (opts?.replace !== false) {
                             await this.selectAllAndDelete();
-                            await this.inputDriver.delay(desktopKeyboardPolicy.afterClearMs);
+                            await this.inputDriver.delay(INPUT_CLEAR_DELAY);
                         }
                     }
-                    if (opts?.focusOnly || !value) return;
                     await this.smartTypeString(value, resolvedInputOptions);
                 },
                 keyboardPress: async (keyName, opts)=>{
                     const target = opts?.target;
-                    if (target) await this.focusKeyboardTarget(target, desktopKeyboardPolicy.focusBeforeShortcutMs);
+                    if (target) await this.focusKeyboardTarget(target, 50);
                     await this.pressKeyboardShortcut(keyName);
                 },
                 clearInput: async (target)=>{
-                    if (target) await this.focusKeyboardTarget(target, desktopKeyboardPolicy.focusBeforeClearMs);
+                    if (target) await this.focusKeyboardTarget(target, 100);
                     await this.selectAllAndDelete();
-                    await this.inputDriver.delay(desktopKeyboardPolicy.afterClearMs);
+                    await this.inputDriver.delay(50);
                 }
             },
             scroll: {
@@ -2180,9 +2159,17 @@ function rdp_device_define_property(obj, key, value) {
     return obj;
 }
 const device_debug = getDebug('rdp:device');
+const device_SMOOTH_MOVE_STEPS_TAP = 8;
+const device_SMOOTH_MOVE_STEPS_MOUSE_MOVE = 10;
 const device_SMOOTH_MOVE_STEPS_DRAG = 12;
+const device_SMOOTH_MOVE_DELAY_TAP = 8;
+const device_SMOOTH_MOVE_DELAY_MOUSE_MOVE = 10;
 const device_SMOOTH_MOVE_DELAY_DRAG = 10;
+const device_MOUSE_MOVE_EFFECT_WAIT = 300;
+const device_CLICK_HOLD_DURATION = 50;
 const DRAG_HOLD_DURATION = 100;
+const device_INPUT_FOCUS_DELAY = 300;
+const device_INPUT_CLEAR_DELAY = 150;
 const device_SCROLL_STEP_DELAY = 100;
 const device_SCROLL_COMPLETE_DELAY = 500;
 const DEFAULT_SCROLL_DISTANCE = 480;
@@ -2268,6 +2255,12 @@ class RDPDevice {
     throwIfDestroyed() {
         if (this.destroyed) throw new Error('RDPDevice has been destroyed');
     }
+    async moveToElement(element, options) {
+        this.assertConnected();
+        const targetX = Math.round(element.center[0]);
+        const targetY = Math.round(element.center[1]);
+        await this.movePointer(targetX, targetY, options);
+    }
     async clearInput() {
         if (this.backend.clearInput) return void await this.backend.clearInput();
         await this.backend.keyPress('Control+A');
@@ -2321,8 +2314,8 @@ class RDPDevice {
         const boundedFrom = clampPointerPointToSize(from, screenSize);
         const boundedTo = clampPointerPointToSize(to, screenSize);
         await this.movePointer(Math.round(boundedFrom.x), Math.round(boundedFrom.y), {
-            steps: desktopPointerPolicy.tapMoveSteps,
-            stepDelayMs: desktopPointerPolicy.tapMoveStepDelayMs
+            steps: device_SMOOTH_MOVE_STEPS_TAP,
+            stepDelayMs: device_SMOOTH_MOVE_DELAY_TAP
         });
         await this.backend.mouseButton('left', 'down');
         try {
@@ -2358,40 +2351,34 @@ class RDPDevice {
         rdp_device_define_property(this, "uri", void 0);
         rdp_device_define_property(this, "inputPrimitives", {
             pointer: {
-                tap: async ({ x, y }, opts)=>{
+                tap: async ({ x, y })=>{
                     await this.movePointer(Math.round(x), Math.round(y), {
-                        steps: desktopPointerPolicy.tapMoveSteps,
-                        stepDelayMs: desktopPointerPolicy.tapMoveStepDelayMs,
-                        settleDelayMs: desktopPointerPolicy.uiSettleMs
+                        steps: device_SMOOTH_MOVE_STEPS_TAP,
+                        stepDelayMs: device_SMOOTH_MOVE_DELAY_TAP
                     });
                     await this.backend.mouseButton('left', 'down');
-                    try {
-                        await sleep(resolveTapHoldDuration(opts?.duration));
-                    } finally{
-                        await this.backend.mouseButton('left', 'up');
-                    }
+                    await sleep(device_CLICK_HOLD_DURATION);
+                    await this.backend.mouseButton('left', 'up');
                 },
                 doubleClick: async ({ x, y })=>{
                     await this.movePointer(Math.round(x), Math.round(y), {
-                        steps: desktopPointerPolicy.tapMoveSteps,
-                        stepDelayMs: desktopPointerPolicy.tapMoveStepDelayMs,
-                        settleDelayMs: desktopPointerPolicy.uiSettleMs
+                        steps: device_SMOOTH_MOVE_STEPS_TAP,
+                        stepDelayMs: device_SMOOTH_MOVE_DELAY_TAP
                     });
                     await this.backend.mouseButton('left', 'doubleClick');
                 },
                 rightClick: async ({ x, y })=>{
                     await this.movePointer(Math.round(x), Math.round(y), {
-                        steps: desktopPointerPolicy.tapMoveSteps,
-                        stepDelayMs: desktopPointerPolicy.tapMoveStepDelayMs,
-                        settleDelayMs: desktopPointerPolicy.uiSettleMs
+                        steps: device_SMOOTH_MOVE_STEPS_TAP,
+                        stepDelayMs: device_SMOOTH_MOVE_DELAY_TAP
                     });
                     await this.backend.mouseButton('right', 'click');
                 },
                 hover: async ({ x, y })=>{
                     await this.movePointer(Math.round(x), Math.round(y), {
-                        steps: desktopPointerPolicy.hoverMoveSteps,
-                        stepDelayMs: desktopPointerPolicy.hoverMoveStepDelayMs,
-                        settleDelayMs: desktopPointerPolicy.uiSettleMs
+                        steps: device_SMOOTH_MOVE_STEPS_MOUSE_MOVE,
+                        stepDelayMs: device_SMOOTH_MOVE_DELAY_MOUSE_MOVE,
+                        settleDelayMs: device_MOUSE_MOVE_EFFECT_WAIT
                     });
                 },
                 dragAndDrop: async (from, to)=>{
@@ -2412,12 +2399,11 @@ class RDPDevice {
                             x: target.center[0],
                             y: target.center[1]
                         });
-                        await sleep(desktopKeyboardPolicy.focusBeforeTypeMs);
-                        if (opts?.focusOnly) return;
-                        if (opts?.replace !== false) {
-                            await this.clearInput();
-                            await sleep(desktopKeyboardPolicy.afterClearMs);
-                        }
+                        await sleep(device_INPUT_FOCUS_DELAY);
+                    }
+                    if (opts?.replace !== false) {
+                        await this.clearInput();
+                        await sleep(device_INPUT_CLEAR_DELAY);
                     }
                     if (opts?.focusOnly || !value) return;
                     await this.typeText(value, resolvedInputOptions);
@@ -2430,21 +2416,18 @@ class RDPDevice {
                             x: element.center[0],
                             y: element.center[1]
                         });
-                        await sleep(desktopKeyboardPolicy.focusBeforeClearMs);
+                        await sleep(device_INPUT_FOCUS_DELAY);
                     }
                     await this.clearInput();
-                    await sleep(desktopKeyboardPolicy.afterClearMs);
+                    await sleep(device_INPUT_CLEAR_DELAY);
                 },
                 keyboardPress: async (keyName, opts)=>{
                     this.assertConnected();
                     const target = opts?.target;
-                    if (target) {
-                        await this.inputPrimitives.pointer.tap({
-                            x: target.center[0],
-                            y: target.center[1]
-                        });
-                        await sleep(desktopKeyboardPolicy.focusBeforeShortcutMs);
-                    }
+                    if (target) await this.inputPrimitives.pointer.tap({
+                        x: target.center[0],
+                        y: target.center[1]
+                    });
                     await this.backend.keyPress(keyName);
                 }
             },
@@ -2452,27 +2435,17 @@ class RDPDevice {
                 scroll: async (param)=>{
                     this.assertConnected();
                     const target = param.locate;
-                    let scrollPoint;
-                    if (target) scrollPoint = target.center;
-                    else {
-                        const size = await this.size();
-                        scrollPoint = [
-                            Math.round(size.width / 2),
-                            Math.round(size.height / 2)
-                        ];
-                    }
-                    await this.movePointer(Math.round(scrollPoint[0]), Math.round(scrollPoint[1]), {
-                        steps: desktopPointerPolicy.hoverMoveSteps,
-                        stepDelayMs: desktopPointerPolicy.hoverMoveStepDelayMs,
-                        settleDelayMs: target ? desktopPointerPolicy.moveSettleMs : desktopPointerPolicy.uiSettleMs
+                    if (target) await this.moveToElement(target, {
+                        steps: device_SMOOTH_MOVE_STEPS_MOUSE_MOVE,
+                        stepDelayMs: device_SMOOTH_MOVE_DELAY_MOUSE_MOVE
                     });
                     if (param.scrollType && 'singleAction' !== param.scrollType) {
                         const direction = this.edgeScrollDirection(param.scrollType);
-                        for(let i = 0; i < device_EDGE_SCROLL_STEPS; i++)await this.performWheel(direction, DEFAULT_SCROLL_DISTANCE, scrollPoint[0], scrollPoint[1]);
+                        for(let i = 0; i < device_EDGE_SCROLL_STEPS; i++)await this.performWheel(direction, DEFAULT_SCROLL_DISTANCE, target?.center[0], target?.center[1]);
                         await sleep(device_SCROLL_COMPLETE_DELAY);
                         return;
                     }
-                    await this.performWheel(param.direction || 'down', param.distance || this.defaultScrollDistance(param.direction || 'down'), scrollPoint[0], scrollPoint[1]);
+                    await this.performWheel(param.direction || 'down', param.distance || this.defaultScrollDistance(param.direction || 'down'), target?.center[0], target?.center[1]);
                     await sleep(device_SCROLL_COMPLETE_DELAY);
                 }
             }
@@ -2753,7 +2726,7 @@ const tools = new ComputerMidsceneTools({
 });
 runToolsCLI(tools, 'midscene-computer', {
     stripPrefix: 'computer_',
-    version: "1.13.4-beta-20260928083351.0",
+    version: "1.14.0",
     extraCommands: createReportCliCommands()
 }).catch((e)=>{
     process.exit(reportCLIError(e));