appium-desktop-driver 1.5.0 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/lib/commands/actions.d.ts +3 -5
- package/build/lib/commands/actions.d.ts.map +1 -1
- package/build/lib/commands/actions.js +86 -81
- package/build/lib/commands/actions.js.map +1 -1
- package/build/lib/commands/element.d.ts +3 -0
- package/build/lib/commands/element.d.ts.map +1 -1
- package/build/lib/commands/element.js +10 -4
- package/build/lib/commands/element.js.map +1 -1
- package/build/lib/commands/index.d.ts +4 -4
- package/build/lib/commands/index.d.ts.map +1 -1
- package/build/lib/commands/vision.d.ts.map +1 -1
- package/build/lib/commands/vision.js +4 -3
- package/build/lib/commands/vision.js.map +1 -1
- package/build/lib/driver.d.ts +1 -0
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +2 -0
- package/build/lib/driver.js.map +1 -1
- package/build/lib/mcp/tools/vision.d.ts.map +1 -1
- package/build/lib/mcp/tools/vision.js +6 -4
- package/build/lib/mcp/tools/vision.js.map +1 -1
- package/build/lib/vision-utils.d.ts +7 -2
- package/build/lib/vision-utils.d.ts.map +1 -1
- package/build/lib/vision-utils.js +116 -6
- package/build/lib/vision-utils.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import { ActionSequence, KeyAction, KeyActionSequence,
|
|
1
|
+
import { ActionSequence, KeyAction, KeyActionSequence, PointerActionSequence, PointerMoveAction, ScrollAction, WheelActionSequence } from '@appium/types';
|
|
2
2
|
import { AppiumDesktopDriver } from '../driver';
|
|
3
3
|
export declare function performActions(this: AppiumDesktopDriver, actionSequences: ActionSequence[]): Promise<void>;
|
|
4
4
|
export declare function handleKeyActionSequence(this: AppiumDesktopDriver, actionSequence: KeyActionSequence): Promise<void>;
|
|
5
|
-
export declare function
|
|
6
|
-
export declare function
|
|
7
|
-
export declare function handleWheelActionSequence(this: AppiumDesktopDriver, actionSequence: WheelActionSequence): Promise<void>;
|
|
8
|
-
export declare function handleNullActionSequence(this: AppiumDesktopDriver, actionSequence: NullActionSequence): Promise<void>;
|
|
5
|
+
export declare function handleSingleMousePointerAction(this: AppiumDesktopDriver, action: PointerActionSequence['actions'][number]): Promise<void>;
|
|
6
|
+
export declare function handleSingleWheelAction(this: AppiumDesktopDriver, action: WheelActionSequence['actions'][number]): Promise<void>;
|
|
9
7
|
export declare function handleMouseMoveAction(this: AppiumDesktopDriver, action: PointerMoveAction | ScrollAction): Promise<void>;
|
|
10
8
|
export declare function handleKeyAction(this: AppiumDesktopDriver, action: KeyAction): Promise<void>;
|
|
11
9
|
export declare function releaseActions(this: AppiumDesktopDriver): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../../lib/commands/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,cAAc,EACd,SAAS,EACT,iBAAiB,
|
|
1
|
+
{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../../lib/commands/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,cAAc,EACd,SAAS,EACT,iBAAiB,EAEjB,qBAAqB,EACrB,iBAAiB,EAEjB,YAAY,EACZ,mBAAmB,EACtB,MAAM,eAAe,CAAC;AAGvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAOhD,wBAAsB,cAAc,CAAC,IAAI,EAAE,mBAAmB,EAAE,eAAe,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAyChH;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,mBAAmB,EAAE,cAAc,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAKzH;AAGD,wBAAsB,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB/I;AAGD,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBtI;AAGD,wBAAsB,qBAAqB,CAAC,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,iBAAiB,GAAG,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA8B9H;AAED,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAuFjG;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6B7E"}
|
|
@@ -2,10 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.performActions = performActions;
|
|
4
4
|
exports.handleKeyActionSequence = handleKeyActionSequence;
|
|
5
|
-
exports.
|
|
6
|
-
exports.
|
|
7
|
-
exports.handleWheelActionSequence = handleWheelActionSequence;
|
|
8
|
-
exports.handleNullActionSequence = handleNullActionSequence;
|
|
5
|
+
exports.handleSingleMousePointerAction = handleSingleMousePointerAction;
|
|
6
|
+
exports.handleSingleWheelAction = handleSingleWheelAction;
|
|
9
7
|
exports.handleMouseMoveAction = handleMouseMoveAction;
|
|
10
8
|
exports.handleKeyAction = handleKeyAction;
|
|
11
9
|
exports.releaseActions = releaseActions;
|
|
@@ -13,26 +11,50 @@ const base_driver_1 = require("@appium/base-driver");
|
|
|
13
11
|
const user32_1 = require("../winapi/user32");
|
|
14
12
|
const util_1 = require("../util");
|
|
15
13
|
const powershell_1 = require("../powershell");
|
|
14
|
+
const element_1 = require("./element");
|
|
16
15
|
const enums_1 = require("../enums");
|
|
17
16
|
async function performActions(actionSequences) {
|
|
17
|
+
// Validate all sequences upfront before executing any actions
|
|
18
18
|
for (const actionSequence of actionSequences) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
break;
|
|
26
|
-
case 'pointer':
|
|
27
|
-
await this.handlePointerActionSequence(actionSequence);
|
|
28
|
-
break;
|
|
29
|
-
case 'none':
|
|
30
|
-
await this.handleNullActionSequence(actionSequence);
|
|
31
|
-
break;
|
|
32
|
-
default:
|
|
33
|
-
throw new base_driver_1.errors.InvalidArgumentError();
|
|
19
|
+
if (actionSequence.type === 'pointer' &&
|
|
20
|
+
(actionSequence.parameters?.pointerType === 'touch' || actionSequence.parameters?.pointerType === 'pen')) {
|
|
21
|
+
throw new base_driver_1.errors.NotImplementedError(`Pointer type ${actionSequence.parameters.pointerType} not implemented yet.`);
|
|
22
|
+
}
|
|
23
|
+
if (!['key', 'pointer', 'wheel', 'none'].includes(actionSequence.type)) {
|
|
24
|
+
throw new base_driver_1.errors.InvalidArgumentError();
|
|
34
25
|
}
|
|
35
26
|
}
|
|
27
|
+
const maxTicks = Math.max(0, ...actionSequences.map((seq) => seq.actions.length));
|
|
28
|
+
for (let tick = 0; tick < maxTicks; tick++) {
|
|
29
|
+
const tickPromises = [];
|
|
30
|
+
for (const actionSequence of actionSequences) {
|
|
31
|
+
const action = actionSequence.actions[tick];
|
|
32
|
+
if (!action) {
|
|
33
|
+
continue;
|
|
34
|
+
}
|
|
35
|
+
;
|
|
36
|
+
switch (actionSequence.type) {
|
|
37
|
+
case 'key':
|
|
38
|
+
tickPromises.push(this.handleKeyAction(action));
|
|
39
|
+
break;
|
|
40
|
+
case 'pointer':
|
|
41
|
+
tickPromises.push(this.handleSingleMousePointerAction(action));
|
|
42
|
+
break;
|
|
43
|
+
case 'wheel':
|
|
44
|
+
tickPromises.push(this.handleSingleWheelAction(action));
|
|
45
|
+
break;
|
|
46
|
+
case 'none': {
|
|
47
|
+
const duration = action.duration;
|
|
48
|
+
if (duration) {
|
|
49
|
+
tickPromises.push((0, util_1.sleep)(duration));
|
|
50
|
+
}
|
|
51
|
+
;
|
|
52
|
+
break;
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
await Promise.all(tickPromises);
|
|
57
|
+
}
|
|
36
58
|
}
|
|
37
59
|
;
|
|
38
60
|
async function handleKeyActionSequence(actionSequence) {
|
|
@@ -41,63 +63,44 @@ async function handleKeyActionSequence(actionSequence) {
|
|
|
41
63
|
await this.handleKeyAction(action);
|
|
42
64
|
}
|
|
43
65
|
}
|
|
44
|
-
async function
|
|
45
|
-
switch (
|
|
46
|
-
case '
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
case '
|
|
66
|
+
async function handleSingleMousePointerAction(action) {
|
|
67
|
+
switch (action.type) {
|
|
68
|
+
case 'pointerMove':
|
|
69
|
+
await this.handleMouseMoveAction(action);
|
|
70
|
+
break;
|
|
71
|
+
case 'pointerDown':
|
|
72
|
+
(0, user32_1.mouseDown)(action.button);
|
|
73
|
+
this.mouseButtonsDown.add(action.button);
|
|
74
|
+
break;
|
|
75
|
+
case 'pointerUp':
|
|
76
|
+
(0, user32_1.mouseUp)(action.button);
|
|
77
|
+
this.mouseButtonsDown.delete(action.button);
|
|
78
|
+
break;
|
|
79
|
+
case 'pause':
|
|
80
|
+
if (action.duration) {
|
|
81
|
+
await (0, util_1.sleep)(action.duration);
|
|
82
|
+
}
|
|
83
|
+
break;
|
|
50
84
|
default:
|
|
51
|
-
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
async function handleMousePointerActionSequence(actionSequence) {
|
|
55
|
-
const actions = actionSequence.actions;
|
|
56
|
-
for (const action of actions) {
|
|
57
|
-
switch (action.type) {
|
|
58
|
-
case 'pointerMove':
|
|
59
|
-
await this.handleMouseMoveAction(action);
|
|
60
|
-
break;
|
|
61
|
-
case 'pointerDown':
|
|
62
|
-
(0, user32_1.mouseDown)(action.button);
|
|
63
|
-
break;
|
|
64
|
-
case 'pointerUp':
|
|
65
|
-
(0, user32_1.mouseUp)(action.button);
|
|
66
|
-
break;
|
|
67
|
-
case 'pause':
|
|
68
|
-
if (action.duration) {
|
|
69
|
-
await (0, util_1.sleep)(action.duration);
|
|
70
|
-
}
|
|
71
|
-
break;
|
|
72
|
-
default:
|
|
73
|
-
throw new base_driver_1.errors.InvalidArgumentError();
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
async function handleWheelActionSequence(actionSequence) {
|
|
78
|
-
const actions = actionSequence.actions;
|
|
79
|
-
for (const action of actions) {
|
|
80
|
-
switch (action.type) {
|
|
81
|
-
case 'scroll':
|
|
82
|
-
await this.handleMouseMoveAction(action);
|
|
83
|
-
(0, user32_1.mouseScroll)(action.deltaX, action.deltaY);
|
|
84
|
-
break;
|
|
85
|
-
case 'pause':
|
|
86
|
-
if (action.duration) {
|
|
87
|
-
await (0, util_1.sleep)(action.duration);
|
|
88
|
-
}
|
|
89
|
-
break;
|
|
90
|
-
default:
|
|
91
|
-
throw new base_driver_1.errors.InvalidArgumentError();
|
|
92
|
-
}
|
|
85
|
+
throw new base_driver_1.errors.InvalidArgumentError();
|
|
93
86
|
}
|
|
94
87
|
}
|
|
95
|
-
async function
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
88
|
+
async function handleSingleWheelAction(action) {
|
|
89
|
+
switch (action.type) {
|
|
90
|
+
case 'scroll':
|
|
91
|
+
await this.handleMouseMoveAction({ ...action, duration: 0 });
|
|
92
|
+
(0, user32_1.mouseScroll)(action.deltaX, action.deltaY);
|
|
93
|
+
if (action.duration) {
|
|
94
|
+
await (0, util_1.sleep)(action.duration);
|
|
95
|
+
}
|
|
96
|
+
break;
|
|
97
|
+
case 'pause':
|
|
98
|
+
if (action.duration) {
|
|
99
|
+
await (0, util_1.sleep)(action.duration);
|
|
100
|
+
}
|
|
101
|
+
break;
|
|
102
|
+
default:
|
|
103
|
+
throw new base_driver_1.errors.InvalidArgumentError();
|
|
101
104
|
}
|
|
102
105
|
}
|
|
103
106
|
async function handleMouseMoveAction(action) {
|
|
@@ -106,6 +109,7 @@ async function handleMouseMoveAction(action) {
|
|
|
106
109
|
case 'pointer':
|
|
107
110
|
await (0, user32_1.mouseMoveRelative)(action.x, action.y, action.duration, easingFunction);
|
|
108
111
|
break;
|
|
112
|
+
case undefined:
|
|
109
113
|
case 'viewport': {
|
|
110
114
|
const rootRectJson = await this.sendPowerShellCommand(powershell_1.AutomationElement.automationRoot.buildGetElementRectCommand());
|
|
111
115
|
const rootRect = JSON.parse(rootRectJson.replaceAll(/(?:infinity)/gi, 0x7FFFFFFF.toString()));
|
|
@@ -115,13 +119,13 @@ async function handleMouseMoveAction(action) {
|
|
|
115
119
|
default:
|
|
116
120
|
if (action.origin?.[base_driver_1.W3C_ELEMENT_KEY]) {
|
|
117
121
|
const element = new powershell_1.FoundAutomationElement(action.origin[base_driver_1.W3C_ELEMENT_KEY]);
|
|
118
|
-
|
|
119
|
-
let rect = JSON.parse(rectJson.replaceAll(/(?:infinity)/gi, 0x7FFFFFFF.toString()));
|
|
122
|
+
let rect = await (0, element_1.fetchElementRect)(this, element);
|
|
120
123
|
if (Object.values(rect).some((x) => x === 0x7FFFFFFF)) {
|
|
121
124
|
await this.sendPowerShellCommand(element.buildScrollIntoViewCommand());
|
|
122
|
-
rect =
|
|
125
|
+
rect = await (0, element_1.fetchElementRect)(this, element);
|
|
123
126
|
}
|
|
124
|
-
|
|
127
|
+
// W3C spec: x and y are offsets from the element's centre point.
|
|
128
|
+
await (0, user32_1.mouseMoveAbsolute)(rect.x + rect.width / 2 + (action.x ?? 0), rect.y + rect.height / 2 + (action.y ?? 0), action.duration, easingFunction);
|
|
125
129
|
break;
|
|
126
130
|
}
|
|
127
131
|
throw new base_driver_1.errors.InvalidArgumentError();
|
|
@@ -193,7 +197,7 @@ async function handleKeyAction(action) {
|
|
|
193
197
|
if (this.keyboardState.alt) {
|
|
194
198
|
await this.handleKeyAction({ type: 'keyUp', value: enums_1.Key.ALT });
|
|
195
199
|
}
|
|
196
|
-
for (const key
|
|
200
|
+
for (const key of Array.from(this.keyboardState.pressed)) {
|
|
197
201
|
(0, user32_1.keyUp)(key);
|
|
198
202
|
this.keyboardState.pressed.delete(key);
|
|
199
203
|
}
|
|
@@ -235,8 +239,9 @@ async function releaseActions() {
|
|
|
235
239
|
(0, user32_1.keyUp)(key);
|
|
236
240
|
}
|
|
237
241
|
this.keyboardState.pressed.clear();
|
|
238
|
-
(
|
|
239
|
-
|
|
240
|
-
|
|
242
|
+
for (const button of this.mouseButtonsDown) {
|
|
243
|
+
(0, user32_1.mouseUp)(button);
|
|
244
|
+
}
|
|
245
|
+
this.mouseButtonsDown.clear();
|
|
241
246
|
}
|
|
242
247
|
//# sourceMappingURL=actions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../lib/commands/actions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Element, Rect } from '@appium/types';
|
|
2
2
|
import { AppiumDesktopDriver } from '../driver';
|
|
3
|
+
import { AutomationElement } from '../powershell';
|
|
3
4
|
export declare function getProperty(this: AppiumDesktopDriver, propertyName: string, elementId: string): Promise<string>;
|
|
4
5
|
export declare function getAttribute(this: AppiumDesktopDriver, propertyName: string, elementId: string): Promise<string>;
|
|
5
6
|
export declare function active(this: AppiumDesktopDriver): Promise<Element>;
|
|
@@ -7,6 +8,8 @@ export declare function getName(this: AppiumDesktopDriver, elementId: string): P
|
|
|
7
8
|
export declare function getText(this: AppiumDesktopDriver, elementId: string): Promise<string>;
|
|
8
9
|
export declare function clear(this: AppiumDesktopDriver, elementId: string): Promise<void>;
|
|
9
10
|
export declare function setValue(this: AppiumDesktopDriver, value: string | string[], elementId: string): Promise<void>;
|
|
11
|
+
declare function fetchElementRect(driver: AppiumDesktopDriver, element: AutomationElement): Promise<Rect>;
|
|
12
|
+
export { fetchElementRect };
|
|
10
13
|
export declare function getElementRect(this: AppiumDesktopDriver, elementId: string): Promise<Rect>;
|
|
11
14
|
export declare function elementDisplayed(this: AppiumDesktopDriver, elementId: string): Promise<boolean>;
|
|
12
15
|
export declare function elementSelected(this: AppiumDesktopDriver, elementId: string): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"element.d.ts","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAEH,iBAAiB,EAWpB,MAAM,eAAe,CAAC;AAMvB,wBAAsB,WAAW,CAAC,IAAI,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAErH;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,mBAGpG;AAED,wBAAsB,MAAM,CAAC,IAAI,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC,CAExE;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE3F;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAE3F;AAED,wBAAsB,KAAK,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEvF;AAED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqHpH;AAED,iBAAe,gBAAgB,CAAC,MAAM,EAAE,mBAAmB,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMtG;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAE5B,wBAAsB,cAAc,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAQhG;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGrG;AAGD,wBAAsB,eAAe,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAQpG;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAGnG;AAED,wBAAsB,KAAK,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CvF;AAeD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAQxG"}
|
|
@@ -7,6 +7,7 @@ exports.getName = getName;
|
|
|
7
7
|
exports.getText = getText;
|
|
8
8
|
exports.clear = clear;
|
|
9
9
|
exports.setValue = setValue;
|
|
10
|
+
exports.fetchElementRect = fetchElementRect;
|
|
10
11
|
exports.getElementRect = getElementRect;
|
|
11
12
|
exports.elementDisplayed = elementDisplayed;
|
|
12
13
|
exports.elementSelected = elementSelected;
|
|
@@ -147,11 +148,16 @@ async function setValue(value, elementId) {
|
|
|
147
148
|
}
|
|
148
149
|
await sendKeysAndResetArray();
|
|
149
150
|
}
|
|
151
|
+
async function fetchElementRect(driver, element) {
|
|
152
|
+
const json = await driver.sendPowerShellCommand(element.buildGetElementRectCommand());
|
|
153
|
+
if (!json) {
|
|
154
|
+
throw new base_driver_1.errors.NoSuchElementError();
|
|
155
|
+
}
|
|
156
|
+
return JSON.parse(json.replaceAll(/(?:infinity)/gi, 0x7FFFFFFF.toString()));
|
|
157
|
+
}
|
|
150
158
|
async function getElementRect(elementId) {
|
|
151
|
-
const
|
|
152
|
-
const
|
|
153
|
-
const rootRect = JSON.parse(rootRectJson.replaceAll(/(?:infinity)/gi, 0x7FFFFFFF.toString()));
|
|
154
|
-
const rect = JSON.parse(result.replaceAll(/(?:infinity)/gi, 0x7FFFFFFF.toString()));
|
|
159
|
+
const rect = await fetchElementRect(this, new powershell_1.FoundAutomationElement(elementId));
|
|
160
|
+
const rootRect = await fetchElementRect(this, powershell_1.AutomationElement.automationRoot);
|
|
155
161
|
rect.x -= rootRect.x;
|
|
156
162
|
rect.y -= rootRect.y;
|
|
157
163
|
rect.x = Math.min(0x7FFFFFFF, rect.x);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":";;AAqBA,kCAEC;AAED,oCAGC;AAED,wBAEC;AAED,0BAEC;AAED,0BAEC;AAED,sBAEC;AAED,4BAqHC;
|
|
1
|
+
{"version":3,"file":"element.js","sourceRoot":"","sources":["../../../lib/commands/element.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import * as element from './element';
|
|
1
2
|
declare const commands: {
|
|
2
3
|
executeFindByVision(this: import("../driver").AppiumDesktopDriver, args: {
|
|
3
4
|
prompt: string;
|
|
@@ -163,16 +164,15 @@ declare const commands: {
|
|
|
163
164
|
elementEnabled(this: import("../driver").AppiumDesktopDriver, elementId: string): Promise<boolean>;
|
|
164
165
|
click(this: import("../driver").AppiumDesktopDriver, elementId: string): Promise<void>;
|
|
165
166
|
getElementScreenshot(this: import("../driver").AppiumDesktopDriver, elementId: string): Promise<string>;
|
|
167
|
+
fetchElementRect: typeof element.fetchElementRect;
|
|
166
168
|
startPowerShellSession(this: import("../driver").AppiumDesktopDriver): Promise<void>;
|
|
167
169
|
sendIsolatedPowerShellCommand(this: import("../driver").AppiumDesktopDriver, command: string): Promise<string>;
|
|
168
170
|
sendPowerShellCommand(this: import("../driver").AppiumDesktopDriver, command: string): Promise<string>;
|
|
169
171
|
terminatePowerShellSession(this: import("../driver").AppiumDesktopDriver): Promise<void>;
|
|
170
172
|
performActions(this: import("../driver").AppiumDesktopDriver, actionSequences: import("@appium/types").ActionSequence[]): Promise<void>;
|
|
171
173
|
handleKeyActionSequence(this: import("../driver").AppiumDesktopDriver, actionSequence: import("@appium/types").KeyActionSequence): Promise<void>;
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
handleWheelActionSequence(this: import("../driver").AppiumDesktopDriver, actionSequence: import("@appium/types").WheelActionSequence): Promise<void>;
|
|
175
|
-
handleNullActionSequence(this: import("../driver").AppiumDesktopDriver, actionSequence: import("@appium/types").NullActionSequence): Promise<void>;
|
|
174
|
+
handleSingleMousePointerAction(this: import("../driver").AppiumDesktopDriver, action: import("@appium/types").PointerActionSequence["actions"][number]): Promise<void>;
|
|
175
|
+
handleSingleWheelAction(this: import("../driver").AppiumDesktopDriver, action: import("@appium/types").WheelActionSequence["actions"][number]): Promise<void>;
|
|
176
176
|
handleMouseMoveAction(this: import("../driver").AppiumDesktopDriver, action: import("@appium/types").PointerMoveAction | import("@appium/types").ScrollAction): Promise<void>;
|
|
177
177
|
handleKeyAction(this: import("../driver").AppiumDesktopDriver, action: import("@appium/types").KeyAction): Promise<void>;
|
|
178
178
|
releaseActions(this: import("../driver").AppiumDesktopDriver): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/commands/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/commands/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,OAAO,MAAM,WAAW,CAAC;AAOrC,QAAA,MAAM,QAAQ;;;aAoB0oB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAqyV,CAAC;;;mBAAyqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;iBAAmiH,CAAC;SAAe,CAAC;SAAe,CAAC;cAAoB,CAAC;oBAA6B,CAAC;kBAA8G,CAAC;aAAmB,CAAC;yBAA+B,CAAC;;;sBAAmtG,CAAC;cAAoB,CAAC;cAAoB,CAAC;oBAA0B,CAAC;YAAkB,CAAC;YAAkB,CAAC;oBAA0B,CAAC;kBAA2F,CAAC;;;iBAA2yH,CAAC;SAAe,CAAC;SAAe,CAAC;cAAoB,CAAC;cAAoB,CAAC;oBAA0B,CAAC;;;kBAA8qF,CAAC;iBAAuB,CAAC;gBAAsB,CAAC;mBAAyB,CAAC;cAAoB,CAAC;qBAA2B,CAAC;qBAA4B,CAAC;kBAAyB,CAAC;oBAA0B,CAAC;;;;;;;;iBAAo5F,CAAC;;;sBAAouB,CAAC;cAAoB,CAAC;cAAoB,CAAC;oBAA0B,CAAC;YAAkB,CAAC;YAAkB,CAAC;oBAA0B,CAAC;kBAA2F,CAAC;cAAoB,CAAC;;;cAAu1I,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;0FAArlgC,wDAAiC;mFAAwtB,sDAA+B;;;;CAVh9F,CAAC;AAEF,KAAK,QAAQ,GAAG;KACX,GAAG,IAAI,MAAM,OAAO,QAAQ,GAAG,OAAO,QAAQ,CAAC,GAAG,CAAC;CACvD,CAAC;AAEF,OAAO,QAAQ,WAAW,CAAC;IACvB,UAAU,mBAAoB,SAAQ,QAAQ;KAAG;CACpD;AAED,eAAe,QAAQ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vision.d.ts","sourceRoot":"","sources":["../../../lib/commands/vision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"vision.d.ts","sourceRoot":"","sources":["../../../lib/commands/vision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AA4ChD,wBAAsB,mBAAmB,CACrC,IAAI,EAAE,mBAAmB,EACzB,IAAI,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAAC;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAqBlD"}
|
|
@@ -15,13 +15,14 @@ async function buildCoordMapping(driver, ssW, ssH) {
|
|
|
15
15
|
return (0, vision_utils_1.computeCoordMapping)(false, rect.x, rect.y, rect.width, rect.height, (0, user32_1.getResolutionScalingFactor)(), ssW, ssH);
|
|
16
16
|
}
|
|
17
17
|
async function executeFindByVision(args) {
|
|
18
|
-
const
|
|
18
|
+
const model = args.model ?? 'claude-opus-4-6';
|
|
19
|
+
const envVar = (0, vision_utils_1.getApiKeyEnvVar)((0, vision_utils_1.getProviderForModel)(model));
|
|
20
|
+
const apiKey = process.env[envVar];
|
|
19
21
|
if (!apiKey) {
|
|
20
|
-
throw new Error(
|
|
22
|
+
throw new Error(`${envVar} environment variable is required for windows: findByVision (model: ${model})`);
|
|
21
23
|
}
|
|
22
24
|
const base64 = await this.getScreenshot();
|
|
23
25
|
const { width: ssW, height: ssH } = (0, util_1.getPngDimensions)(base64);
|
|
24
|
-
const model = args.model ?? 'claude-opus-4-6';
|
|
25
26
|
const raw = await (0, vision_utils_1.callVisionLLM)(base64, (0, vision_utils_1.buildVisionPrompt)(args.prompt, ssW, ssH), model, apiKey);
|
|
26
27
|
const parsed = (0, vision_utils_1.parseVisionCoords)(raw, args.prompt);
|
|
27
28
|
const mapping = await buildCoordMapping(this, ssW, ssH);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vision.js","sourceRoot":"","sources":["../../../lib/commands/vision.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"vision.js","sourceRoot":"","sources":["../../../lib/commands/vision.ts"],"names":[],"mappings":";;AA4CA,kDAwBC;AAnED,kCAA2C;AAC3C,6CAA8D;AAC9D,kDASyB;AAEzB,KAAK,UAAU,iBAAiB,CAC5B,MAA2B,EAC3B,GAAW,EACX,GAAW;IAEX,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,aAAa,EAAE,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IAElC,IAAI,MAAM,EAAE,CAAC;QACT,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,kBAAkB,EAG9C,CAAC;QACH,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC/D,OAAO,IAAA,kCAAmB,EACtB,IAAI,EACJ,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EACvC,CAAC,EAAE,GAAG,EAAE,GAAG,EACX,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAClD,CAAC;IACN,CAAC;IAED,OAAO,IAAA,kCAAmB,EACtB,KAAK,EACL,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EACvC,IAAA,mCAA0B,GAAE,EAC5B,GAAG,EAAE,GAAG,CACX,CAAC;AACN,CAAC;AAEM,KAAK,UAAU,mBAAmB,CAErC,IAAwC;IAExC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,iBAAiB,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAA,8BAAe,EAAC,IAAA,kCAAmB,EAAC,KAAK,CAAC,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,IAAI,CAAC,MAAM,EAAE,CAAC;QACV,MAAM,IAAI,KAAK,CACX,GAAG,MAAM,uEAAuE,KAAK,GAAG,CAC3F,CAAC;IACN,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,uBAAgB,EAAC,MAAM,CAAC,CAAC;IAE7D,MAAM,GAAG,GAAG,MAAM,IAAA,4BAAa,EAAC,MAAM,EAAE,IAAA,gCAAiB,EAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACjG,MAAM,MAAM,GAAG,IAAA,gCAAiB,EAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAEnD,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACxD,OAAO;QACH,GAAG,IAAA,gCAAiB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;QACjD,KAAK,EAAE,MAAM,CAAC,KAAK;KACtB,CAAC;AACN,CAAC"}
|
package/build/lib/driver.d.ts
CHANGED
|
@@ -20,6 +20,7 @@ export declare class AppiumDesktopDriver extends BaseDriver<AppiumDesktopDriverC
|
|
|
20
20
|
powerShellStdErr: string;
|
|
21
21
|
appProcessIds: number[];
|
|
22
22
|
keyboardState: KeyboardState;
|
|
23
|
+
mouseButtonsDown: Set<number>;
|
|
23
24
|
_screenRecorder: ScreenRecorder | null;
|
|
24
25
|
constructor(opts?: InitialOpts, shouldValidateCaps?: boolean);
|
|
25
26
|
findElement(strategy: string, selector: string): Promise<Element>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA2B,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACH,8BAA8B,EAEjC,MAAM,eAAe,CAAC;AAoBvB,OAAO,KAAK,EACR,0BAA0B,EAC1B,UAAU,EACV,OAAO,EACP,WAAW,EACX,YAAY,EACZ,aAAa,EAChB,MAAM,eAAe,CAAC;AAEvB,KAAK,0BAA0B,GAAG,aAAa,CAAC,8BAA8B,CAAC,CAAC;AAChF,KAAK,iCAAiC,GAAG,0BAA0B,CAAC,8BAA8B,CAAC,CAAC;AAEpG,KAAK,aAAa,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;CAChB,CAAA;AAED,QAAA,MAAM,mBAAmB,yGAQd,CAAC;AAEZ,qBAAa,mBAAoB,SAAQ,UAAU,CAAC,8BAA8B,EAAE,YAAY,CAAC;IAC7F,0BAA0B,EAAE,OAAO,CAAS;IAC5C,UAAU,CAAC,EAAE,8BAA8B,CAAC;IAC5C,gBAAgB,EAAE,MAAM,CAAM;IAC9B,gBAAgB,EAAE,MAAM,CAAM;IAC9B,aAAa,EAAE,MAAM,EAAE,CAAM;IAC7B,aAAa,EAAE,aAAa,CAM1B;IACF,eAAe,EAAE,cAAc,GAAG,IAAI,CAAQ;gBAElC,IAAI,GAAE,WAA+B,EAAE,kBAAkB,UAAO;IAa7D,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKjE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAKpE,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK/F,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAKlG,WAAW,CAAC,QAAQ,EAAE,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7H,WAAW,CAAC,QAAQ,EAAE,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA8C5H,aAAa,CACxB,OAAO,EAAE,0BAA0B,EACnC,OAAO,CAAC,EAAE,0BAA0B,EACpC,OAAO,CAAC,EAAE,0BAA0B,EACpC,UAAU,CAAC,EAAE,UAAU,EAAE,GAC1B,OAAO,CAAC,iCAAiC,CAAC;IA0D9B,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA2B,MAAM,qBAAqB,CAAC;AAE1E,OAAO,EAAE,8BAA8B,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EACH,8BAA8B,EAEjC,MAAM,eAAe,CAAC;AAoBvB,OAAO,KAAK,EACR,0BAA0B,EAC1B,UAAU,EACV,OAAO,EACP,WAAW,EACX,YAAY,EACZ,aAAa,EAChB,MAAM,eAAe,CAAC;AAEvB,KAAK,0BAA0B,GAAG,aAAa,CAAC,8BAA8B,CAAC,CAAC;AAChF,KAAK,iCAAiC,GAAG,0BAA0B,CAAC,8BAA8B,CAAC,CAAC;AAEpG,KAAK,aAAa,GAAG;IACjB,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACrB,KAAK,EAAE,OAAO,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,OAAO,CAAC;IACd,GAAG,EAAE,OAAO,CAAC;CAChB,CAAA;AAED,QAAA,MAAM,mBAAmB,yGAQd,CAAC;AAEZ,qBAAa,mBAAoB,SAAQ,UAAU,CAAC,8BAA8B,EAAE,YAAY,CAAC;IAC7F,0BAA0B,EAAE,OAAO,CAAS;IAC5C,UAAU,CAAC,EAAE,8BAA8B,CAAC;IAC5C,gBAAgB,EAAE,MAAM,CAAM;IAC9B,gBAAgB,EAAE,MAAM,CAAM;IAC9B,aAAa,EAAE,MAAM,EAAE,CAAM;IAC7B,aAAa,EAAE,aAAa,CAM1B;IACF,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAC1C,eAAe,EAAE,cAAc,GAAG,IAAI,CAAQ;gBAElC,IAAI,GAAE,WAA+B,EAAE,kBAAkB,UAAO;IAa7D,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKjE,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAKpE,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAK/F,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAKlG,WAAW,CAAC,QAAQ,EAAE,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7H,WAAW,CAAC,QAAQ,EAAE,OAAO,mBAAmB,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA8C5H,aAAa,CACxB,OAAO,EAAE,0BAA0B,EACnC,OAAO,CAAC,EAAE,0BAA0B,EACpC,OAAO,CAAC,EAAE,0BAA0B,EACpC,UAAU,CAAC,EAAE,UAAU,EAAE,GAC1B,OAAO,CAAC,iCAAiC,CAAC;IA0D9B,aAAa,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiClF,OAAO,CAAC,eAAe;CA4B1B"}
|
package/build/lib/driver.js
CHANGED
|
@@ -34,6 +34,7 @@ class AppiumDesktopDriver extends base_driver_1.BaseDriver {
|
|
|
34
34
|
meta: false,
|
|
35
35
|
shift: false,
|
|
36
36
|
};
|
|
37
|
+
mouseButtonsDown = new Set();
|
|
37
38
|
_screenRecorder = null;
|
|
38
39
|
constructor(opts = {}, shouldValidateCaps = true) {
|
|
39
40
|
super(opts, shouldValidateCaps);
|
|
@@ -178,6 +179,7 @@ class AppiumDesktopDriver extends base_driver_1.BaseDriver {
|
|
|
178
179
|
this.log.info('Executing postrun PowerShell script...');
|
|
179
180
|
await this.executePowerShellScript(this.caps.postrun);
|
|
180
181
|
}
|
|
182
|
+
await this.releaseActions();
|
|
181
183
|
await this.terminatePowerShellSession();
|
|
182
184
|
await super.deleteSession(sessionId);
|
|
183
185
|
}
|
package/build/lib/driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vision.d.ts","sourceRoot":"","sources":["../../../../lib/mcp/tools/vision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"vision.d.ts","sourceRoot":"","sources":["../../../../lib/mcp/tools/vision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAGpE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AA4CnD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,GAAG,IAAI,CA6DnF"}
|
|
@@ -31,7 +31,8 @@ function registerVisionTools(server, session) {
|
|
|
31
31
|
'For "coordinates" format, locates a UI element and returns {x,y,label} with actual screen ' +
|
|
32
32
|
'coordinates (DPI-corrected) ready to pass to click tools. ' +
|
|
33
33
|
'For "text" format, answers a general question about the screen in plain text. ' +
|
|
34
|
-
'Requires ANTHROPIC_API_KEY
|
|
34
|
+
'Requires ANTHROPIC_API_KEY (Claude), OPENAI_API_KEY (GPT-4o / o-series), or ' +
|
|
35
|
+
'GEMINI_API_KEY (Gemini) depending on the chosen model.',
|
|
35
36
|
inputSchema: {
|
|
36
37
|
prompt: zod_1.z.string().min(1).describe('Question or instruction about the screenshot'),
|
|
37
38
|
responseFormat: zod_1.z.enum(['coordinates', 'text']).default('coordinates').describe('"coordinates" (default) locates an element and returns JSON {x,y,label} with converted screen coordinates. ' +
|
|
@@ -41,14 +42,15 @@ function registerVisionTools(server, session) {
|
|
|
41
42
|
annotations: { readOnlyHint: true },
|
|
42
43
|
}, async ({ prompt, responseFormat, model }) => {
|
|
43
44
|
try {
|
|
44
|
-
const
|
|
45
|
+
const visionModel = model ?? DEFAULT_MODEL;
|
|
46
|
+
const envVar = (0, vision_utils_1.getApiKeyEnvVar)((0, vision_utils_1.getProviderForModel)(visionModel));
|
|
47
|
+
const apiKey = process.env[envVar];
|
|
45
48
|
if (!apiKey) {
|
|
46
|
-
throw new Error(
|
|
49
|
+
throw new Error(`${envVar} environment variable is required for find_by_vision (model: ${visionModel})`);
|
|
47
50
|
}
|
|
48
51
|
const driver = session.getDriver();
|
|
49
52
|
const base64 = await driver.takeScreenshot();
|
|
50
53
|
const { width: ssW, height: ssH } = (0, util_1.getPngDimensions)(base64);
|
|
51
|
-
const visionModel = model ?? DEFAULT_MODEL;
|
|
52
54
|
if (responseFormat === 'text') {
|
|
53
55
|
const textPrompt = `Answer the following about this screenshot: "${prompt}"\nRespond with plain text.`;
|
|
54
56
|
const text = await (0, vision_utils_1.callVisionLLM)(base64, textPrompt, visionModel, apiKey, 1024);
|