appium-mac2-driver 2.2.1 → 3.0.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/CHANGELOG.md +20 -0
- package/README.md +3 -3
- package/build/lib/commands/app-management.d.ts +2 -2
- package/build/lib/commands/app-management.d.ts.map +1 -1
- package/build/lib/commands/gestures.d.ts +15 -15
- package/build/lib/commands/gestures.d.ts.map +1 -1
- package/build/lib/commands/record-screen.d.ts +1 -2
- package/build/lib/commands/record-screen.d.ts.map +1 -1
- package/build/lib/driver.d.ts +4 -4
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +1 -2
- package/build/lib/driver.js.map +1 -1
- package/build/lib/wda-mac.d.ts +8 -5
- package/build/lib/wda-mac.d.ts.map +1 -1
- package/build/lib/wda-mac.js +7 -2
- package/build/lib/wda-mac.js.map +1 -1
- package/lib/driver.js +1 -2
- package/lib/wda-mac.js +8 -2
- package/npm-shrinkwrap.json +482 -595
- package/package.json +11 -12
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,23 @@
|
|
|
1
|
+
## [3.0.0](https://github.com/appium/appium-mac2-driver/compare/v2.2.2...v3.0.0) (2025-08-17)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### ⚠ BREAKING CHANGES
|
|
5
|
+
|
|
6
|
+
* Required Node.js version has been bumped to ^20.19.0 || ^22.12.0 || >=24.0.0
|
|
7
|
+
* Required npm version has been bumped to >=10
|
|
8
|
+
* Required Appium server version has been bumped to >=3.0.0-rc.2
|
|
9
|
+
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* Update server compatibility ([#342](https://github.com/appium/appium-mac2-driver/issues/342)) ([7aa4858](https://github.com/appium/appium-mac2-driver/commit/7aa4858f61d44adbcf65dbdd888064d3980128bd))
|
|
13
|
+
|
|
14
|
+
## [2.2.2](https://github.com/appium/appium-mac2-driver/compare/v2.2.1...v2.2.2) (2025-02-21)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* Tune session startup ([#335](https://github.com/appium/appium-mac2-driver/issues/335)) ([7dbdbe8](https://github.com/appium/appium-mac2-driver/commit/7dbdbe8dccb74d337c2d9f5381c326803d9d61a4))
|
|
20
|
+
|
|
1
21
|
## [2.2.1](https://github.com/appium/appium-mac2-driver/compare/v2.2.0...v2.2.1) (2025-02-21)
|
|
2
22
|
|
|
3
23
|
|
package/README.md
CHANGED
|
@@ -11,9 +11,9 @@ This is Appium driver for automating macOS applications using Apple's [XCTest](h
|
|
|
11
11
|
The driver operates in scope of [W3C WebDriver protocol](https://www.w3.org/TR/webdriver/) with several custom extensions to cover operating-system specific scenarios.
|
|
12
12
|
The original idea and parts of the source code are borrowed from the Facebook's [WebDriverAgent](https://github.com/facebookarchive/WebDriverAgent) project.
|
|
13
13
|
|
|
14
|
-
> [!
|
|
15
|
-
> Since version
|
|
16
|
-
> command to add it to your
|
|
14
|
+
> [!IMPORTANT]
|
|
15
|
+
> Since major version *2.0.0*, this driver is only compatible with Appium 3. Use the `appium driver install mac2`
|
|
16
|
+
> command to add it to your dist.
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
## Requirements
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* @param {import('@appium/types').StringRecord} [environment] Environment variables mapping.
|
|
14
14
|
* Custom variables are added to the default process environment.
|
|
15
15
|
*/
|
|
16
|
-
export function macosLaunchApp(this: import("../driver").Mac2Driver, bundleId?: string, path?: string, args?: string[], environment?: import("@appium/types").StringRecord): Promise<
|
|
16
|
+
export function macosLaunchApp(this: import("../driver").Mac2Driver, bundleId?: string, path?: string, args?: string[], environment?: import("@appium/types").StringRecord): Promise<any>;
|
|
17
17
|
/**
|
|
18
18
|
* Activate an app with given bundle identifier. An exception is thrown if the
|
|
19
19
|
* app cannot be found or is not running.
|
|
@@ -24,7 +24,7 @@ export function macosLaunchApp(this: import("../driver").Mac2Driver, bundleId?:
|
|
|
24
24
|
* @param {string} [path] Full path to the app bundle. Either this property
|
|
25
25
|
* or `bundleId` must be provided
|
|
26
26
|
*/
|
|
27
|
-
export function macosActivateApp(this: import("../driver").Mac2Driver, bundleId?: string, path?: string): Promise<
|
|
27
|
+
export function macosActivateApp(this: import("../driver").Mac2Driver, bundleId?: string, path?: string): Promise<any>;
|
|
28
28
|
/**
|
|
29
29
|
* Terminate an app with given bundle identifier. An exception is thrown if the
|
|
30
30
|
* app cannot be found.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,gFATW,MAAM,SAEN,MAAM,SAEN,MAAM,EAAE,gBAER,OAAO,eAAe,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"app-management.d.ts","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,gFATW,MAAM,SAEN,MAAM,SAEN,MAAM,EAAE,gBAER,OAAO,eAAe,EAAE,YAAY,gBAe9C;AAED;;;;;;;;;GASG;AACH,kFALW,MAAM,SAEN,MAAM,gBAKhB;AAED;;;;;;;;;;;GAWG;AACH,mFAPW,MAAM,SAEN,MAAM,GAEJ,OAAO,CAAC,OAAO,CAAC,CAO5B;AAED;;;;;;;;;;;;GAYG;AACH,oFARW,MAAM,SAEN,MAAM,GAEJ,OAAO,CAAC,MAAM,CAAC,CAQ3B;yBAGY,OAAO,WAAW,EAAE,UAAU"}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
14
14
|
* for more details.
|
|
15
15
|
*/
|
|
16
|
-
export function macosSetValue(this: import("../driver").Mac2Driver, elementId: string, value?: any, text?: string, keyModifierFlags?: number): Promise<
|
|
16
|
+
export function macosSetValue(this: import("../driver").Mac2Driver, elementId: string, value?: any, text?: string, keyModifierFlags?: number): Promise<any>;
|
|
17
17
|
/**
|
|
18
18
|
* Perform click gesture on an element or by relative/absolute coordinates
|
|
19
19
|
*
|
|
@@ -29,7 +29,7 @@ export function macosSetValue(this: import("../driver").Mac2Driver, elementId: s
|
|
|
29
29
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
30
30
|
* for more details
|
|
31
31
|
*/
|
|
32
|
-
export function macosClick(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<
|
|
32
|
+
export function macosClick(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<any>;
|
|
33
33
|
/**
|
|
34
34
|
* Perform scroll gesture on an element or by relative/absolute coordinates
|
|
35
35
|
*
|
|
@@ -47,7 +47,7 @@ export function macosClick(this: import("../driver").Mac2Driver, elementId?: str
|
|
|
47
47
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
48
48
|
* for more details
|
|
49
49
|
*/
|
|
50
|
-
export function macosScroll(this: import("../driver").Mac2Driver, deltaX: number, deltaY: number, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<
|
|
50
|
+
export function macosScroll(this: import("../driver").Mac2Driver, deltaX: number, deltaY: number, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<any>;
|
|
51
51
|
/**
|
|
52
52
|
* Perform swipe gesture on an element
|
|
53
53
|
*
|
|
@@ -69,7 +69,7 @@ export function macosScroll(this: import("../driver").Mac2Driver, deltaX: number
|
|
|
69
69
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
70
70
|
* for more details
|
|
71
71
|
*/
|
|
72
|
-
export function macosSwipe(this: import("../driver").Mac2Driver, direction: "up" | "down" | "left" | "right", elementId?: string, x?: number, y?: number, velocity?: number, keyModifierFlags?: number): Promise<
|
|
72
|
+
export function macosSwipe(this: import("../driver").Mac2Driver, direction: "up" | "down" | "left" | "right", elementId?: string, x?: number, y?: number, velocity?: number, keyModifierFlags?: number): Promise<any>;
|
|
73
73
|
/**
|
|
74
74
|
* Perform right click gesture on an element or by relative/absolute coordinates
|
|
75
75
|
*
|
|
@@ -85,7 +85,7 @@ export function macosSwipe(this: import("../driver").Mac2Driver, direction: "up"
|
|
|
85
85
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
86
86
|
* for more details
|
|
87
87
|
*/
|
|
88
|
-
export function macosRightClick(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<
|
|
88
|
+
export function macosRightClick(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<any>;
|
|
89
89
|
/**
|
|
90
90
|
* Perform hover gesture on an element or by relative/absolute coordinates
|
|
91
91
|
*
|
|
@@ -101,7 +101,7 @@ export function macosRightClick(this: import("../driver").Mac2Driver, elementId?
|
|
|
101
101
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
102
102
|
* for more details
|
|
103
103
|
*/
|
|
104
|
-
export function macosHover(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<
|
|
104
|
+
export function macosHover(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<any>;
|
|
105
105
|
/**
|
|
106
106
|
* Perform double click gesture on an element or by relative/absolute coordinates
|
|
107
107
|
*
|
|
@@ -117,7 +117,7 @@ export function macosHover(this: import("../driver").Mac2Driver, elementId?: str
|
|
|
117
117
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
118
118
|
* for more details
|
|
119
119
|
*/
|
|
120
|
-
export function macosDoubleClick(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<
|
|
120
|
+
export function macosDoubleClick(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<any>;
|
|
121
121
|
/**
|
|
122
122
|
* Perform long click and drag gesture on an element or by absolute coordinates
|
|
123
123
|
*
|
|
@@ -138,7 +138,7 @@ export function macosDoubleClick(this: import("../driver").Mac2Driver, elementId
|
|
|
138
138
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
139
139
|
* for more details
|
|
140
140
|
*/
|
|
141
|
-
export function macosClickAndDrag(this: import("../driver").Mac2Driver, duration: number, sourceElementId?: string, destinationElementId?: string, startX?: number, startY?: number, endX?: number, endY?: number, keyModifierFlags?: number): Promise<
|
|
141
|
+
export function macosClickAndDrag(this: import("../driver").Mac2Driver, duration: number, sourceElementId?: string, destinationElementId?: string, startX?: number, startY?: number, endX?: number, endY?: number, keyModifierFlags?: number): Promise<any>;
|
|
142
142
|
/**
|
|
143
143
|
* Perform long click, drag and hold gesture on an element or by absolute coordinates
|
|
144
144
|
*
|
|
@@ -163,7 +163,7 @@ export function macosClickAndDrag(this: import("../driver").Mac2Driver, duration
|
|
|
163
163
|
* applied while drag is performed. See
|
|
164
164
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
165
165
|
* for more details */
|
|
166
|
-
export function macosClickAndDragAndHold(this: import("../driver").Mac2Driver, duration: number, holdDuration: number, sourceElementId?: string, destinationElementId?: string, startX?: number, startY?: number, endX?: number, endY?: number, velocity?: number, keyModifierFlags?: number): Promise<
|
|
166
|
+
export function macosClickAndDragAndHold(this: import("../driver").Mac2Driver, duration: number, holdDuration: number, sourceElementId?: string, destinationElementId?: string, startX?: number, startY?: number, endX?: number, endY?: number, velocity?: number, keyModifierFlags?: number): Promise<any>;
|
|
167
167
|
/**
|
|
168
168
|
* Send keys to the given element or to the application under test
|
|
169
169
|
*
|
|
@@ -177,7 +177,7 @@ export function macosClickAndDragAndHold(this: import("../driver").Mac2Driver, d
|
|
|
177
177
|
* If unset then keys are sent to the current application
|
|
178
178
|
* under test.
|
|
179
179
|
*/
|
|
180
|
-
export function macosKeys(this: import("../driver").Mac2Driver, keys: (import("../types").KeyOptions | string)[], elementId?: string): Promise<
|
|
180
|
+
export function macosKeys(this: import("../driver").Mac2Driver, keys: (import("../types").KeyOptions | string)[], elementId?: string): Promise<any>;
|
|
181
181
|
/**
|
|
182
182
|
* Perform tap gesture on a Touch Bar element or by relative/absolute coordinates
|
|
183
183
|
*
|
|
@@ -193,7 +193,7 @@ export function macosKeys(this: import("../driver").Mac2Driver, keys: (import(".
|
|
|
193
193
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
194
194
|
* for more details
|
|
195
195
|
*/
|
|
196
|
-
export function macosTap(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<
|
|
196
|
+
export function macosTap(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<any>;
|
|
197
197
|
/**
|
|
198
198
|
* Perform tap gesture on a Touch Bar element or by relative/absolute coordinates
|
|
199
199
|
*
|
|
@@ -209,7 +209,7 @@ export function macosTap(this: import("../driver").Mac2Driver, elementId?: strin
|
|
|
209
209
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
210
210
|
* for more details
|
|
211
211
|
*/
|
|
212
|
-
export function macosDoubleTap(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<
|
|
212
|
+
export function macosDoubleTap(this: import("../driver").Mac2Driver, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<any>;
|
|
213
213
|
/**
|
|
214
214
|
* Perform press gesture on a Touch Bar element or by relative/absolute coordinates
|
|
215
215
|
*
|
|
@@ -226,7 +226,7 @@ export function macosDoubleTap(this: import("../driver").Mac2Driver, elementId?:
|
|
|
226
226
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
227
227
|
* for more details
|
|
228
228
|
*/
|
|
229
|
-
export function macosPressAndHold(this: import("../driver").Mac2Driver, duration: number, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<
|
|
229
|
+
export function macosPressAndHold(this: import("../driver").Mac2Driver, duration: number, elementId?: string, x?: number, y?: number, keyModifierFlags?: number): Promise<any>;
|
|
230
230
|
/**
|
|
231
231
|
* Perform long press and drag gesture on a Touch Bar element or by absolute coordinates
|
|
232
232
|
*
|
|
@@ -247,7 +247,7 @@ export function macosPressAndHold(this: import("../driver").Mac2Driver, duration
|
|
|
247
247
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
248
248
|
* for more details
|
|
249
249
|
*/
|
|
250
|
-
export function macosPressAndDrag(this: import("../driver").Mac2Driver, duration: number, sourceElementId?: string, destinationElementId?: string, startX?: number, startY?: number, endX?: number, endY?: number, keyModifierFlags?: number): Promise<
|
|
250
|
+
export function macosPressAndDrag(this: import("../driver").Mac2Driver, duration: number, sourceElementId?: string, destinationElementId?: string, startX?: number, startY?: number, endX?: number, endY?: number, keyModifierFlags?: number): Promise<any>;
|
|
251
251
|
/**
|
|
252
252
|
* Perform press, drag and hold gesture on a Touch Bar element or by absolute Touch Bar coordinates
|
|
253
253
|
*
|
|
@@ -273,6 +273,6 @@ export function macosPressAndDrag(this: import("../driver").Mac2Driver, duration
|
|
|
273
273
|
* https://developer.apple.com/documentation/xctest/xcuikeymodifierflags
|
|
274
274
|
* for more details
|
|
275
275
|
*/
|
|
276
|
-
export function macosPressAndDragAndHold(this: import("../driver").Mac2Driver, duration: number, holdDuration: number, sourceElementId?: string, destinationElementId?: string, startX?: number, startY?: number, endX?: number, endY?: number, velocity?: number, keyModifierFlags?: number): Promise<
|
|
276
|
+
export function macosPressAndDragAndHold(this: import("../driver").Mac2Driver, duration: number, holdDuration: number, sourceElementId?: string, destinationElementId?: string, startX?: number, startY?: number, endX?: number, endY?: number, velocity?: number, keyModifierFlags?: number): Promise<any>;
|
|
277
277
|
export type Mac2Driver = import("../driver").Mac2Driver;
|
|
278
278
|
//# sourceMappingURL=gestures.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gestures.d.ts","sourceRoot":"","sources":["../../../lib/commands/gestures.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,+EARW,MAAM,UACN,GAAG,SACH,MAAM,qBACN,MAAM,
|
|
1
|
+
{"version":3,"file":"gestures.d.ts","sourceRoot":"","sources":["../../../lib/commands/gestures.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,+EARW,MAAM,UACN,GAAG,SACH,MAAM,qBACN,MAAM,gBAUhB;AAGD;;;;;;;;;;;;;;GAcG;AACH,6EAXW,MAAM,MAIN,MAAM,MACN,MAAM,qBACN,MAAM,gBAYhB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,0EAbW,MAAM,UACN,MAAM,cACN,MAAM,MAIN,MAAM,MACN,MAAM,qBACN,MAAM,gBAkBhB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,4EAjBW,IAAI,GAAC,MAAM,GAAC,MAAM,GAAC,OAAO,cAC1B,MAAM,MAIN,MAAM,MACN,MAAM,aACN,MAAM,qBAKN,MAAM,gBAoBhB;AAED;;;;;;;;;;;;;;GAcG;AACH,kFAXW,MAAM,MAIN,MAAM,MACN,MAAM,qBACN,MAAM,gBAYhB;AAED;;;;;;;;;;;;;;GAcG;AACH,6EAXW,MAAM,MAIN,MAAM,MACN,MAAM,qBACN,MAAM,gBAYhB;AAED;;;;;;;;;;;;;;GAcG;AACH,mFAXW,MAAM,MAIN,MAAM,MACN,MAAM,qBACN,MAAM,gBAYhB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,kFAhBW,MAAM,oBACN,MAAM,yBAGN,MAAM,WAGN,MAAM,WACN,MAAM,SACN,MAAM,SACN,MAAM,qBACN,MAAM,gBA4BhB;AAED;;;;;;;;;;;;;;;;;;;;;;;sCAuBsC;AACtC,yFApBW,MAAM,gBACN,MAAM,oBACN,MAAM,yBAGN,MAAM,WAGN,MAAM,WACN,MAAM,SACN,MAAM,SACN,MAAM,aACN,MAAM,qBAIN,MAAM,gBA8BhB;AAED;;;;;;;;;;;;GAYG;AACH,sEATW,CAAC,OAAO,UAAU,EAAE,UAAU,GAAG,MAAM,CAAC,EAAE,cAK1C,MAAM,gBAOhB;AAED;;;;;;;;;;;;;;GAcG;AACH,2EAXW,MAAM,MAIN,MAAM,MACN,MAAM,qBACN,MAAM,gBAYhB;AAED;;;;;;;;;;;;;;GAcG;AACH,iFAXW,MAAM,MAIN,MAAM,MACN,MAAM,qBACN,MAAM,gBAYhB;AAED;;;;;;;;;;;;;;;GAeG;AACH,kFAZW,MAAM,cACN,MAAM,MAIN,MAAM,MACN,MAAM,qBACN,MAAM,gBAYhB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,kFAhBW,MAAM,oBACN,MAAM,yBAGN,MAAM,WAGN,MAAM,WACN,MAAM,SACN,MAAM,SACN,MAAM,qBACN,MAAM,gBA4BhB;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,yFArBW,MAAM,gBACN,MAAM,oBACN,MAAM,yBAGN,MAAM,WAGN,MAAM,WACN,MAAM,SACN,MAAM,SACN,MAAM,aACN,MAAM,qBAIN,MAAM,gBA+BhB;yBAwCY,OAAO,WAAW,EAAE,UAAU"}
|
|
@@ -120,7 +120,7 @@ declare class ScreenRecorder {
|
|
|
120
120
|
constructor(videoPath: string, log: import("@appium/types").AppiumLogger, opts: ScreenRecorderOptions);
|
|
121
121
|
_log: import("@appium/types").AppiumLogger;
|
|
122
122
|
_videoPath: string;
|
|
123
|
-
_process:
|
|
123
|
+
_process: any;
|
|
124
124
|
_fps: number;
|
|
125
125
|
_deviceId: string | number;
|
|
126
126
|
_captureCursor: boolean | undefined;
|
|
@@ -134,6 +134,5 @@ declare class ScreenRecorder {
|
|
|
134
134
|
start(): Promise<void>;
|
|
135
135
|
stop(force?: boolean): Promise<any>;
|
|
136
136
|
}
|
|
137
|
-
import { SubProcess } from 'teen_process';
|
|
138
137
|
export {};
|
|
139
138
|
//# sourceMappingURL=record-screen.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"record-screen.d.ts","sourceRoot":"","sources":["../../../lib/commands/record-screen.js"],"names":[],"mappings":"AAgLA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qFA3BW,MAAM,GAAC,MAAM,cAGb,MAAM,GAAC,MAAM,gBAEb,MAAM,QAIN,MAAM,GAAC,MAAM,WAEb,WAAW,GAAC,WAAW,GAAC,UAAU,GAAC,QAAQ,GAAC,MAAM,GAAC,QAAQ,GAAC,MAAM,GAAC,QAAQ,GAAC,UAAU,kBAOtF,OAAO,kBAEP,OAAO,iBAEP,OAAO,iBAkDjB;;IAhFD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkCG;IACH,4DA3BW,MAAM,GAAC,MAAM,cAGb,MAAM,GAAC,MAAM,gBAEb,MAAM,QAIN,MAAM,GAAC,MAAM,WAEb,WAAW,GAAC,WAAW,GAAC,UAAU,GAAC,QAAQ,GAAC,MAAM,GAAC,QAAQ,GAAC,MAAM,GAAC,QAAQ,GAAC,UAAU,kBAOtF,OAAO,kBAEP,OAAO,iBAEP,OAAO,EAkDjB;IArBC,gCAA2B;;AAuB7B;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,uFAtBW,MAAM,SAMN,MAAM,SACN,MAAM,WACN,MAAM,YACN,OAAO,eAAe,EAAE,YAAY,GAAC,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,kBAEpD,MAAM,eAEN,OAAO,eAAe,EAAE,YAAY,GAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAErD,OAAO,CAAC,MAAM,CAAC,CAoC3B;yBAGY,OAAO,WAAW,EAAE,UAAU;;;cAM7B,MAAM,GAAC,MAAM;;;;;;;AAnS3B;IACE;;;;;OAKG;IACH,uBAJW,MAAM,OACN,OAAO,eAAe,EAAE,YAAY,QACpC,qBAAqB,EAe/B;IAZC,2CAAe;IACf,mBAA2B;IAC3B,
|
|
1
|
+
{"version":3,"file":"record-screen.d.ts","sourceRoot":"","sources":["../../../lib/commands/record-screen.js"],"names":[],"mappings":"AAgLA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,qFA3BW,MAAM,GAAC,MAAM,cAGb,MAAM,GAAC,MAAM,gBAEb,MAAM,QAIN,MAAM,GAAC,MAAM,WAEb,WAAW,GAAC,WAAW,GAAC,UAAU,GAAC,QAAQ,GAAC,MAAM,GAAC,QAAQ,GAAC,MAAM,GAAC,QAAQ,GAAC,UAAU,kBAOtF,OAAO,kBAEP,OAAO,iBAEP,OAAO,iBAkDjB;;IAhFD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAkCG;IACH,4DA3BW,MAAM,GAAC,MAAM,cAGb,MAAM,GAAC,MAAM,gBAEb,MAAM,QAIN,MAAM,GAAC,MAAM,WAEb,WAAW,GAAC,WAAW,GAAC,UAAU,GAAC,QAAQ,GAAC,MAAM,GAAC,QAAQ,GAAC,MAAM,GAAC,QAAQ,GAAC,UAAU,kBAOtF,OAAO,kBAEP,OAAO,iBAEP,OAAO,EAkDjB;IArBC,gCAA2B;;AAuB7B;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,uFAtBW,MAAM,SAMN,MAAM,SACN,MAAM,WACN,MAAM,YACN,OAAO,eAAe,EAAE,YAAY,GAAC,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,kBAEpD,MAAM,eAEN,OAAO,eAAe,EAAE,YAAY,GAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAErD,OAAO,CAAC,MAAM,CAAC,CAoC3B;yBAGY,OAAO,WAAW,EAAE,UAAU;;;cAM7B,MAAM,GAAC,MAAM;;;;;;;AAnS3B;IACE;;;;;OAKG;IACH,uBAJW,MAAM,OACN,OAAO,eAAe,EAAE,YAAY,QACpC,qBAAqB,EAe/B;IAZC,2CAAe;IACf,mBAA2B;IAC3B,cAAoB;IACpB,aAA+D;IAC/D,2BAA8B;IAC9B,oCAAwC;IACxC,oCAAwC;IACxC,gBAA4C;IAC5C,iCAAoC;IACpC,mBAEsB;IAGxB,gCAEC;IAED,qBAEC;IAED,uCAaC;IAED,uBAmEC;IAED,oCA4BC;CACF"}
|
package/build/lib/driver.d.ts
CHANGED
|
@@ -252,16 +252,16 @@ export class Mac2Driver extends BaseDriver<any, import("@appium/types").StringRe
|
|
|
252
252
|
};
|
|
253
253
|
};
|
|
254
254
|
settings: DeviceSettings<{}>;
|
|
255
|
-
onSettingsUpdate(key: any, value: any): Promise<
|
|
255
|
+
onSettingsUpdate(key: any, value: any): Promise<any>;
|
|
256
256
|
resetState(): void;
|
|
257
257
|
proxyReqRes: any;
|
|
258
258
|
_screenRecorder: any;
|
|
259
259
|
proxyActive(sessionId: any): boolean;
|
|
260
260
|
getProxyAvoidList(sessionId: any): import("@appium/types").RouteMatcher[];
|
|
261
261
|
canProxy(): boolean;
|
|
262
|
-
proxyCommand(url: any, method: any, body?: null): Promise<
|
|
263
|
-
getStatus(): Promise<
|
|
264
|
-
getWindowRect(): Promise<
|
|
262
|
+
proxyCommand(url: any, method: any, body?: null): Promise<any>;
|
|
263
|
+
getStatus(): Promise<any>;
|
|
264
|
+
getWindowRect(): Promise<any>;
|
|
265
265
|
createSession(...args: any[]): Promise<(string | import("@appium/types").DriverCaps<any>)[]>;
|
|
266
266
|
deleteSession(): Promise<void>;
|
|
267
267
|
macosLaunchApp: typeof appManagemenetCommands.macosLaunchApp;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":"AA8BA;IAUE;;;;;;;;;;;;;;;;;MAAmC;IACnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAA2C;IAE3C,uBAqBC;IAjCD,sBAAsB;IACtB,eADW,OAAO,CACJ;IAEd,+CAA+C;IAC/C,KADW,OAAO,WAAW,EAAE,YAAY,CACvC;IAEJ,yEAAyE;IACzE,yBADW,6BAA6B,CAAC,4BAA4B,CAC7C;IAQtB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAkD;IAiBlD,6BAAwE;IAG1E,
|
|
1
|
+
{"version":3,"file":"driver.d.ts","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":"AA8BA;IAUE;;;;;;;;;;;;;;;;;MAAmC;IACnC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAA2C;IAE3C,uBAqBC;IAjCD,sBAAsB;IACtB,eADW,OAAO,CACJ;IAEd,+CAA+C;IAC/C,KADW,OAAO,WAAW,EAAE,YAAY,CACvC;IAEJ,yEAAyE;IACzE,yBADW,6BAA6B,CAAC,4BAA4B,CAC7C;IAQtB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;MAAkD;IAiBlD,6BAAwE;IAG1E,qDAIC;IAED,mBASC;IANC,iBAAuB;IAKvB,qBAA2B;IAI7B,qCAEC;IAGD,0EAEC;IAED,oBAEC;IAED,+DAEC;IAGD,0BAEC;IAGD,8BAEC;IAGD,6FA0BC;IAED,+BA8BC;IAED,6DAAuD;IACvD,iEAA2D;IAC3D,mEAA6D;IAC7D,qEAA+D;IAE/D,sEAAgE;IAEhE,wCAAkC;IAElC,6CAAuC;IAEvC,qDAA+C;IAC/C,+CAAyC;IACzC,iDAA2C;IAC3C,+CAAyC;IACzC,yDAAmD;IACnD,+CAAyC;IACzC,2DAAqD;IACrD,6DAAuD;IACvD,2EAAqE;IACrE,6CAAuC;IACvC,6DAAuD;IACvD,2CAAqC;IACrC,uDAAiD;IACjD,6DAAuD;IACvD,2EAAqE;IAErE,uDAAiD;IAEjD,uEAAiE;IACjE,qEAA+D;IAE/D,sGAAgG;IAChG,0GAAoG;IACpG,oGAA8F;IAC9F,0EAAoE;IAEpE,6DAAuD;IAEvD,+CAAyC;CAC1C;;2BAnN0C,eAAe;+CAeX,iCAAiC;+BAfrC,eAAe;wCAGlB,2BAA2B;qCAC9B,wBAAwB;iCAC5B,oBAAoB;8BACvB,iBAAiB;kCACb,qBAAqB;oCACnB,uBAAuB;sCACrB,0BAA0B;oCAC5B,wBAAwB;gCAC5B,mBAAmB"}
|
package/build/lib/driver.js
CHANGED
|
@@ -167,8 +167,7 @@ class Mac2Driver extends driver_1.BaseDriver {
|
|
|
167
167
|
logger_1.default.info(`Prerun script output: ${output}`);
|
|
168
168
|
}
|
|
169
169
|
}
|
|
170
|
-
await this.wda.startSession({
|
|
171
|
-
...caps,
|
|
170
|
+
await this.wda.startSession(caps, {
|
|
172
171
|
reqBasePath: this.basePath,
|
|
173
172
|
});
|
|
174
173
|
}
|
package/build/lib/driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAuB;AACvB,0CAA2D;AAC3D,wDAAuC;AACvC,iDAAuD;AACvD,kFAAoE;AACpE,4EAA8D;AAC9D,oEAAsD;AACtD,8DAAgD;AAChD,sEAAwD;AACxD,0EAA4D;AAC5D,+EAAiE;AACjE,2EAA6D;AAC7D,kEAAoD;AACpD,sDAA2B;AAC3B,6CAA4C;AAC5C,6DAAwD;AACxD,+FAAiF;AAEjF,qDAAqD;AACrD,MAAM,QAAQ,GAAG;IACf,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC7C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,wBAAwB,CAAC,CAAC;IAC9C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,0CAA0C,CAAC,CAAC;IAChE,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,4BAA4B,CAAC,CAAC;IAClD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,8BAA8B,CAAC,CAAC;IACpD,CAAC,KAAK,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;IAChD,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC;CAClD,CAAC;AAEF,MAAa,UAAW,SAAQ,mBAAU;IAaxC,YAAa,IAAI,GAAG,EAAE;QACpB,mCAAmC;QACnC,KAAK,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"driver.js","sourceRoot":"","sources":["../../lib/driver.js"],"names":[],"mappings":"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"}
|
package/build/lib/wda-mac.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export class WDAMacProxy extends JWProxy {
|
|
2
2
|
/** @type {boolean|undefined} */
|
|
3
3
|
didProcessExit: boolean | undefined;
|
|
4
|
-
proxyCommand(url: any, method: any, body?: null): Promise<any>;
|
|
4
|
+
proxyCommand(url: any, method: any, body?: null): Promise<[import("@appium/types").ProxyResponse<any>, any]>;
|
|
5
5
|
}
|
|
6
6
|
export class WDAMacServer {
|
|
7
7
|
/** @type {WDAMacProxy} */
|
|
@@ -46,20 +46,24 @@ export class WDAMacServer {
|
|
|
46
46
|
/**
|
|
47
47
|
*
|
|
48
48
|
* @param {import('@appium/types').StringRecord} caps
|
|
49
|
+
* @param {SessionOptions} [opts={}]
|
|
49
50
|
*/
|
|
50
|
-
startSession(caps: import("@appium/types").StringRecord): Promise<void>;
|
|
51
|
+
startSession(caps: import("@appium/types").StringRecord, opts?: SessionOptions): Promise<void>;
|
|
51
52
|
stopSession(): Promise<void>;
|
|
52
53
|
}
|
|
53
54
|
export default WDA_MAC_SERVER;
|
|
55
|
+
export type SessionOptions = {
|
|
56
|
+
reqBasePath?: string | undefined;
|
|
57
|
+
};
|
|
54
58
|
import { JWProxy } from 'appium/driver';
|
|
55
59
|
declare class WDAMacProcess {
|
|
56
60
|
showServerLogs: boolean;
|
|
57
61
|
port: number;
|
|
58
62
|
host: string;
|
|
59
63
|
bootstrapRoot: string;
|
|
60
|
-
proc:
|
|
64
|
+
proc: any;
|
|
61
65
|
get isRunning(): boolean;
|
|
62
|
-
get pid():
|
|
66
|
+
get pid(): any;
|
|
63
67
|
listChildrenPids(): Promise<string[]>;
|
|
64
68
|
cleanupProjectIfFresh(): Promise<void>;
|
|
65
69
|
hasSameOpts({ showServerLogs, systemPort, systemHost, bootstrapRoot }: {
|
|
@@ -73,5 +77,4 @@ declare class WDAMacProcess {
|
|
|
73
77
|
kill(): Promise<void>;
|
|
74
78
|
}
|
|
75
79
|
declare const WDA_MAC_SERVER: WDAMacServer;
|
|
76
|
-
import { SubProcess } from 'teen_process';
|
|
77
80
|
//# sourceMappingURL=wda-mac.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wda-mac.d.ts","sourceRoot":"","sources":["../../lib/wda-mac.js"],"names":[],"mappings":"AAoDA;IACE,gCAAgC;IAChC,gBADW,OAAO,GAAC,SAAS,CACb;IAEf
|
|
1
|
+
{"version":3,"file":"wda-mac.d.ts","sourceRoot":"","sources":["../../lib/wda-mac.js"],"names":[],"mappings":"AAoDA;IACE,gCAAgC;IAChC,gBADW,OAAO,GAAC,SAAS,CACb;IAEf,6GAOC;CACF;AAuOD;IACE,0BAA0B;IAC1B,OADW,WAAW,CAChB;IAGJ,8BAAmB;IACnB,+BAAgD;IAKhD,kCAAqC;IAGvC,sDAcC;IAGD;;;;;;;OAOG;IAEH;;;;;;OAMG;IACH;;;;gBAbc,MAAM;;;;cACN,MAAM;;;;cACN,MAAM;;;;cACN,MAAM;MAuCnB;IAED;;;;OAIG;IACH,mBAHW,OAAO,eAAe,EAAE,YAAY,SACpC,cAAc,iBAsFxB;IAED,6BAaC;CACF;;;;;wBAzd+B,eAAe;AA6D/C;IAEI,wBAA8C;IAC9C,aAA+B;IAC/B,aAA+B;IAC/B,sBAAqC;IACrC,UAAgB;IAGlB,yBAEC;IAED,eAEC;IAED,sCAEC;IAED,uCAyDC;IAED;;;;;gBAmBC;IAED,kCA+FC;IAED,sBAYC;IAED,sBAcC;CACF;AA2LD,2CAA0C"}
|
package/build/lib/wda-mac.js
CHANGED
|
@@ -346,8 +346,9 @@ class WDAMacServer {
|
|
|
346
346
|
/**
|
|
347
347
|
*
|
|
348
348
|
* @param {import('@appium/types').StringRecord} caps
|
|
349
|
+
* @param {SessionOptions} [opts={}]
|
|
349
350
|
*/
|
|
350
|
-
async startSession(caps) {
|
|
351
|
+
async startSession(caps, opts = {}) {
|
|
351
352
|
this.serverStartupTimeoutMs = caps.serverStartupTimeout ?? this.serverStartupTimeoutMs;
|
|
352
353
|
this.isProxyingToRemoteServer = !!caps.webDriverAgentMacUrl;
|
|
353
354
|
let wasProcessInitNecessary;
|
|
@@ -375,7 +376,7 @@ class WDAMacServer {
|
|
|
375
376
|
keepAlive: true,
|
|
376
377
|
};
|
|
377
378
|
if (caps.reqBasePath) {
|
|
378
|
-
proxyOpts.reqBasePath =
|
|
379
|
+
proxyOpts.reqBasePath = opts.reqBasePath;
|
|
379
380
|
}
|
|
380
381
|
this.proxy = new WDAMacProxy(proxyOpts);
|
|
381
382
|
this.proxy.didProcessExit = false;
|
|
@@ -445,4 +446,8 @@ class WDAMacServer {
|
|
|
445
446
|
exports.WDAMacServer = WDAMacServer;
|
|
446
447
|
const WDA_MAC_SERVER = new WDAMacServer();
|
|
447
448
|
exports.default = WDA_MAC_SERVER;
|
|
449
|
+
/**
|
|
450
|
+
* @typedef {Object} SessionOptions
|
|
451
|
+
* @property {string} [reqBasePath]
|
|
452
|
+
*/
|
|
448
453
|
//# sourceMappingURL=wda-mac.js.map
|
package/build/lib/wda-mac.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wda-mac.js","sourceRoot":"","sources":["../../lib/wda-mac.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wda-mac.js","sourceRoot":"","sources":["../../lib/wda-mac.js"],"names":[],"mappings":"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"}
|
package/lib/driver.js
CHANGED
|
@@ -126,8 +126,7 @@ export class Mac2Driver extends BaseDriver {
|
|
|
126
126
|
log.info(`Prerun script output: ${output}`);
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
|
-
await this.wda.startSession({
|
|
130
|
-
...caps,
|
|
129
|
+
await this.wda.startSession(caps, {
|
|
131
130
|
reqBasePath: this.basePath,
|
|
132
131
|
});
|
|
133
132
|
} catch (e) {
|
package/lib/wda-mac.js
CHANGED
|
@@ -374,8 +374,9 @@ export class WDAMacServer {
|
|
|
374
374
|
/**
|
|
375
375
|
*
|
|
376
376
|
* @param {import('@appium/types').StringRecord} caps
|
|
377
|
+
* @param {SessionOptions} [opts={}]
|
|
377
378
|
*/
|
|
378
|
-
async startSession (caps) {
|
|
379
|
+
async startSession (caps, opts = {}) {
|
|
379
380
|
this.serverStartupTimeoutMs = caps.serverStartupTimeout ?? this.serverStartupTimeoutMs;
|
|
380
381
|
|
|
381
382
|
this.isProxyingToRemoteServer = !!caps.webDriverAgentMacUrl;
|
|
@@ -406,7 +407,7 @@ export class WDAMacServer {
|
|
|
406
407
|
keepAlive: true,
|
|
407
408
|
};
|
|
408
409
|
if (caps.reqBasePath) {
|
|
409
|
-
proxyOpts.reqBasePath =
|
|
410
|
+
proxyOpts.reqBasePath = opts.reqBasePath;
|
|
410
411
|
}
|
|
411
412
|
this.proxy = new WDAMacProxy(proxyOpts);
|
|
412
413
|
this.proxy.didProcessExit = false;
|
|
@@ -480,3 +481,8 @@ export class WDAMacServer {
|
|
|
480
481
|
const WDA_MAC_SERVER = new WDAMacServer();
|
|
481
482
|
|
|
482
483
|
export default WDA_MAC_SERVER;
|
|
484
|
+
|
|
485
|
+
/**
|
|
486
|
+
* @typedef {Object} SessionOptions
|
|
487
|
+
* @property {string} [reqBasePath]
|
|
488
|
+
*/
|