appium-mac2-driver 3.3.1 → 3.3.3
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 +12 -0
- package/build/lib/commands/bidi/models.d.ts +6 -0
- package/build/lib/commands/bidi/models.d.ts.map +1 -1
- package/build/lib/commands/bidi/models.js +6 -0
- package/build/lib/commands/bidi/models.js.map +1 -1
- package/build/lib/commands/bidi/types.d.ts +2 -2
- package/build/lib/commands/bidi/types.d.ts.map +1 -1
- package/build/lib/commands/execute.d.ts.map +1 -1
- package/build/lib/commands/execute.js +1 -5
- package/build/lib/commands/execute.js.map +1 -1
- package/build/lib/commands/gestures.d.ts.map +1 -1
- package/build/lib/commands/gestures.js +6 -7
- package/build/lib/commands/gestures.js.map +1 -1
- package/build/lib/commands/helpers.d.ts +9 -0
- package/build/lib/commands/helpers.d.ts.map +1 -1
- package/build/lib/commands/helpers.js +10 -5
- package/build/lib/commands/helpers.js.map +1 -1
- package/build/lib/commands/native-record-screen.d.ts +11 -11
- package/build/lib/commands/native-record-screen.d.ts.map +1 -1
- package/build/lib/commands/native-record-screen.js +6 -8
- package/build/lib/commands/native-record-screen.js.map +1 -1
- package/build/lib/commands/record-screen.d.ts.map +1 -1
- package/build/lib/commands/record-screen.js +15 -15
- package/build/lib/commands/record-screen.js.map +1 -1
- package/build/lib/doctor/optional-checks.d.ts +1 -1
- package/build/lib/doctor/optional-checks.d.ts.map +1 -1
- package/build/lib/doctor/optional-checks.js +1 -1
- package/build/lib/doctor/optional-checks.js.map +1 -1
- package/build/lib/doctor/required-checks.d.ts +1 -1
- package/build/lib/doctor/required-checks.d.ts.map +1 -1
- package/build/lib/doctor/required-checks.js +1 -1
- package/build/lib/doctor/required-checks.js.map +1 -1
- package/build/lib/driver.d.ts +18 -18
- package/build/lib/driver.d.ts.map +1 -1
- package/build/lib/driver.js +51 -52
- package/build/lib/driver.js.map +1 -1
- package/build/lib/utils.d.ts +19 -8
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +48 -10
- package/build/lib/utils.js.map +1 -1
- package/build/lib/wda-mac.d.ts.map +1 -1
- package/build/lib/wda-mac.js +25 -24
- package/build/lib/wda-mac.js.map +1 -1
- package/lib/commands/bidi/models.ts +6 -0
- package/lib/commands/bidi/types.ts +2 -2
- package/lib/commands/execute.ts +1 -2
- package/lib/commands/gestures.ts +8 -4
- package/lib/commands/helpers.ts +10 -2
- package/lib/commands/native-record-screen.ts +19 -23
- package/lib/commands/record-screen.ts +17 -17
- package/lib/doctor/optional-checks.ts +2 -1
- package/lib/doctor/required-checks.ts +2 -1
- package/lib/driver.ts +79 -79
- package/lib/utils.ts +48 -7
- package/lib/wda-mac.ts +33 -32
- package/npm-shrinkwrap.json +118 -100
- package/package.json +1 -3
package/build/lib/wda-mac.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wda-mac.js","sourceRoot":"","sources":["../../lib/wda-mac.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"wda-mac.js","sourceRoot":"","sources":["../../lib/wda-mac.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
import type {NativeVideoChunkAddedEvent} from './types';
|
|
2
2
|
import {NATIVE_VIDEO_CHUNK_ADDED_EVENT} from './constants';
|
|
3
3
|
|
|
4
|
+
/**
|
|
5
|
+
* Converts the given UUID and video chunk payload into a NativeVideoChunkAddedEvent object.
|
|
6
|
+
* @param uuid The unique identifier for the video chunk.
|
|
7
|
+
* @param payload The video chunk data as a Buffer.
|
|
8
|
+
* @returns A NativeVideoChunkAddedEvent object containing the UUID and encoded video chunk.
|
|
9
|
+
*/
|
|
4
10
|
export function toNativeVideoChunkAddedEvent(
|
|
5
11
|
uuid: string,
|
|
6
12
|
payload: Buffer,
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
export interface NativeVideoChunkAddedEvent extends BiDiEvent<NativeVideoChunkAddedParams> {}
|
|
2
|
+
|
|
1
3
|
interface BiDiEvent<TParams> {
|
|
2
4
|
method: string;
|
|
3
5
|
params: TParams;
|
|
@@ -7,5 +9,3 @@ interface NativeVideoChunkAddedParams {
|
|
|
7
9
|
uuid: string;
|
|
8
10
|
payload: string;
|
|
9
11
|
}
|
|
10
|
-
|
|
11
|
-
export interface NativeVideoChunkAddedEvent extends BiDiEvent<NativeVideoChunkAddedParams> {}
|
package/lib/commands/execute.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import type {Mac2Driver} from '../driver';
|
|
3
2
|
import type {StringRecord} from '@appium/types';
|
|
4
3
|
|
|
@@ -29,5 +28,5 @@ export async function execute(
|
|
|
29
28
|
* @returns Preprocessed arguments as StringRecord
|
|
30
29
|
*/
|
|
31
30
|
function preprocessExecuteMethodArgs(args?: readonly any[] | StringRecord): StringRecord {
|
|
32
|
-
return (
|
|
31
|
+
return (Array.isArray(args) ? args[0] : args) ?? {};
|
|
33
32
|
}
|
package/lib/commands/gestures.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import {util} from 'appium/support';
|
|
3
2
|
import {errors} from 'appium/driver';
|
|
4
3
|
import type {Mac2Driver} from '../driver';
|
|
@@ -578,7 +577,7 @@ export async function macosPressAndDragAndHold(
|
|
|
578
577
|
* @param y - Optional Y coordinate
|
|
579
578
|
*/
|
|
580
579
|
function requireElementIdOrXY(elementId?: string, x?: number, y?: number): void {
|
|
581
|
-
if (
|
|
580
|
+
if (typeof elementId !== 'string' && !(typeof x === 'number' && typeof y === 'number')) {
|
|
582
581
|
throw new errors.InvalidArgumentError(`'elementId' or 'x' and 'y' is required.`);
|
|
583
582
|
}
|
|
584
583
|
}
|
|
@@ -602,8 +601,13 @@ function requireSourceDestWithElementsOrCoordinates(
|
|
|
602
601
|
endY?: number,
|
|
603
602
|
): void {
|
|
604
603
|
if (
|
|
605
|
-
!(
|
|
606
|
-
!(
|
|
604
|
+
!(typeof sourceElementId === 'string' && typeof destinationElementId === 'string') &&
|
|
605
|
+
!(
|
|
606
|
+
typeof startX === 'number' &&
|
|
607
|
+
typeof startY === 'number' &&
|
|
608
|
+
typeof endX === 'number' &&
|
|
609
|
+
typeof endY === 'number'
|
|
610
|
+
)
|
|
607
611
|
) {
|
|
608
612
|
throw new errors.InvalidArgumentError(
|
|
609
613
|
`'sourceElementId' and 'destinationElementId' ` +
|
package/lib/commands/helpers.ts
CHANGED
|
@@ -1,15 +1,23 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import {util, fs, net} from 'appium/support';
|
|
3
2
|
import type {Mac2Driver} from '../driver';
|
|
4
3
|
import type {StringRecord} from '@appium/types';
|
|
5
4
|
|
|
5
|
+
/**
|
|
6
|
+
* Uploads the given local file to the specified remote path or returns
|
|
7
|
+
* it as a base64 string if no remote path is provided.
|
|
8
|
+
* @this Mac2Driver The Mac2Driver instance.
|
|
9
|
+
* @param localFile The path to the local file to be uploaded.
|
|
10
|
+
* @param remotePath The remote path where the file should be uploaded. If null, the file will be returned as a base64 string.
|
|
11
|
+
* @param uploadOptions Additional options for the upload, such as authentication and headers.
|
|
12
|
+
* @returns A promise that resolves to a base64 string if no remote path is provided, or an empty string if the file is uploaded.
|
|
13
|
+
*/
|
|
6
14
|
export async function uploadRecordedMedia(
|
|
7
15
|
this: Mac2Driver,
|
|
8
16
|
localFile: string,
|
|
9
17
|
remotePath: string | null,
|
|
10
18
|
uploadOptions: StringRecord = {},
|
|
11
19
|
): Promise<string> {
|
|
12
|
-
if (
|
|
20
|
+
if (remotePath == null || remotePath.length === 0) {
|
|
13
21
|
const {size} = await fs.stat(localFile);
|
|
14
22
|
this.log.debug(
|
|
15
23
|
`The size of the resulting screen recording is ${util.toReadableSizeString(size)}`,
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import B, {TimeoutError} from 'bluebird';
|
|
3
2
|
import path from 'node:path';
|
|
4
3
|
import {fs, util} from 'appium/support';
|
|
@@ -10,12 +9,26 @@ import {waitForCondition} from 'asyncbox';
|
|
|
10
9
|
import {exec} from 'teen_process';
|
|
11
10
|
import {BIDI_EVENT_NAME} from './bidi/constants';
|
|
12
11
|
import {toNativeVideoChunkAddedEvent} from './bidi/models';
|
|
12
|
+
import {isPlainObject} from '../utils';
|
|
13
13
|
|
|
14
14
|
const RECORDING_STARTUP_TIMEOUT_MS = 5000;
|
|
15
15
|
const BUFFER_SIZE = 0xffff;
|
|
16
16
|
const MONITORING_INTERVAL_DURATION_MS = 1000;
|
|
17
17
|
const MAX_MONITORING_DURATION_MS = 24 * 60 * 60 * 1000; // 1 day
|
|
18
18
|
|
|
19
|
+
interface ActiveVideoInfo {
|
|
20
|
+
fps: number;
|
|
21
|
+
codec: number;
|
|
22
|
+
displayId: number;
|
|
23
|
+
uuid: string;
|
|
24
|
+
startedAt: number;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
interface DisplayInfo {
|
|
28
|
+
id: number;
|
|
29
|
+
isMain: boolean;
|
|
30
|
+
}
|
|
31
|
+
|
|
19
32
|
export class NativeVideoChunksBroadcaster {
|
|
20
33
|
private _ee: EventEmitter;
|
|
21
34
|
private _log: AppiumLogger;
|
|
@@ -140,7 +153,7 @@ export class NativeVideoChunksBroadcaster {
|
|
|
140
153
|
}
|
|
141
154
|
clearTimeout(timer);
|
|
142
155
|
|
|
143
|
-
if (
|
|
156
|
+
if (publishingErrors.length > 0) {
|
|
144
157
|
throw new Error(publishingErrors.join('\n'));
|
|
145
158
|
}
|
|
146
159
|
}
|
|
@@ -151,14 +164,14 @@ export class NativeVideoChunksBroadcaster {
|
|
|
151
164
|
}
|
|
152
165
|
|
|
153
166
|
const attachments = await listAttachments();
|
|
154
|
-
if (
|
|
167
|
+
if (attachments.length === 0) {
|
|
155
168
|
return;
|
|
156
169
|
}
|
|
157
170
|
const tasks: Promise<any>[] = attachments
|
|
158
171
|
.map((attachmentPath) => [path.basename(attachmentPath), attachmentPath])
|
|
159
172
|
.filter(([name]) => this._publishers.has(name))
|
|
160
173
|
.map(([, attachmentPath]) => fs.rimraf(attachmentPath));
|
|
161
|
-
if (
|
|
174
|
+
if (tasks.length === 0) {
|
|
162
175
|
return;
|
|
163
176
|
}
|
|
164
177
|
try {
|
|
@@ -256,7 +269,7 @@ export async function macosStopNativeScreenRecording(
|
|
|
256
269
|
'POST',
|
|
257
270
|
{},
|
|
258
271
|
)) as ActiveVideoInfo | null;
|
|
259
|
-
if (!response || !
|
|
272
|
+
if (!response || !isPlainObject(response)) {
|
|
260
273
|
throw new Error(
|
|
261
274
|
'There is no active screen recording, thus nothing to stop. Did you start it before?',
|
|
262
275
|
);
|
|
@@ -280,7 +293,7 @@ export async function macosStopNativeScreenRecording(
|
|
|
280
293
|
return '';
|
|
281
294
|
}
|
|
282
295
|
|
|
283
|
-
const matchedVideoPath =
|
|
296
|
+
const matchedVideoPath = (await listAttachments()).find((name) => name.endsWith(uuid));
|
|
284
297
|
if (!matchedVideoPath) {
|
|
285
298
|
throw new Error(
|
|
286
299
|
`The screen recording identified by ${uuid} cannot be retrieved. ` +
|
|
@@ -311,8 +324,6 @@ export async function macosListDisplays(this: Mac2Driver): Promise<StringRecord<
|
|
|
311
324
|
return (await this.wda.proxy.command('/wda/displays/list', 'GET')) as StringRecord<DisplayInfo>;
|
|
312
325
|
}
|
|
313
326
|
|
|
314
|
-
// #region Private functions
|
|
315
|
-
|
|
316
327
|
async function listAttachments(): Promise<string[]> {
|
|
317
328
|
// The expected path looks like
|
|
318
329
|
// $HOME/Library/Daemon Containers/EFDD24BF-F856-411F-8954-CD5F0D6E6F3E/Data/Attachments/CAE7E5E2-5AC9-4D33-A47B-C491D644DE06
|
|
@@ -331,18 +342,3 @@ async function isFileUsed(fpath: string, userProcessName: string): Promise<boole
|
|
|
331
342
|
const {stdout} = await exec('lsof', [fpath]);
|
|
332
343
|
return stdout.includes(userProcessName);
|
|
333
344
|
}
|
|
334
|
-
|
|
335
|
-
interface ActiveVideoInfo {
|
|
336
|
-
fps: number;
|
|
337
|
-
codec: number;
|
|
338
|
-
displayId: number;
|
|
339
|
-
uuid: string;
|
|
340
|
-
startedAt: number;
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
interface DisplayInfo {
|
|
344
|
-
id: number;
|
|
345
|
-
isMain: boolean;
|
|
346
|
-
}
|
|
347
|
-
|
|
348
|
-
// #endregion
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import {waitForCondition} from 'asyncbox';
|
|
3
2
|
import {util, fs, tempDir} from 'appium/support';
|
|
4
3
|
import {SubProcess} from 'teen_process';
|
|
@@ -58,19 +57,6 @@ interface StopRecordingScreenOptions {
|
|
|
58
57
|
formFields?: StringRecord | [string, string][];
|
|
59
58
|
}
|
|
60
59
|
|
|
61
|
-
/**
|
|
62
|
-
* @param log - Logger instance
|
|
63
|
-
*/
|
|
64
|
-
async function requireFfmpegPath(log: AppiumLogger): Promise<string> {
|
|
65
|
-
try {
|
|
66
|
-
return await fs.which(FFMPEG_BINARY);
|
|
67
|
-
} catch {
|
|
68
|
-
throw log.errorWithException(
|
|
69
|
-
`${FFMPEG_BINARY} has not been found in PATH. ` + `Please make sure it is installed`,
|
|
70
|
-
);
|
|
71
|
-
}
|
|
72
|
-
}
|
|
73
|
-
|
|
74
60
|
export class ScreenRecorder {
|
|
75
61
|
private readonly _log: AppiumLogger;
|
|
76
62
|
private readonly _videoPath: string;
|
|
@@ -149,8 +135,9 @@ export class ScreenRecorder {
|
|
|
149
135
|
this._process = new SubProcess(fullCmd[0], fullCmd.slice(1));
|
|
150
136
|
this._log.debug(`Starting ${FFMPEG_BINARY}: ${util.quote(fullCmd)}`);
|
|
151
137
|
this._process.on('output', (stdout, stderr) => {
|
|
152
|
-
|
|
153
|
-
|
|
138
|
+
const output = stdout ?? stderr ?? '';
|
|
139
|
+
if (output.trim()) {
|
|
140
|
+
this._log.debug(`[${FFMPEG_BINARY}] ${output}`);
|
|
154
141
|
}
|
|
155
142
|
});
|
|
156
143
|
this._process.once('exit', async (code, signal) => {
|
|
@@ -285,7 +272,7 @@ export async function macosStartRecordingScreen(
|
|
|
285
272
|
captureClicks?: boolean,
|
|
286
273
|
forceRestart: boolean = true,
|
|
287
274
|
): Promise<void> {
|
|
288
|
-
if (
|
|
275
|
+
if (deviceId == null) {
|
|
289
276
|
throw new Error(
|
|
290
277
|
`'deviceId' option must be provided. Run 'ffmpeg -f avfoundation -list_devices true -i' ` +
|
|
291
278
|
'to fetch the list of available device ids',
|
|
@@ -419,3 +406,16 @@ export async function stopRecordingScreen(
|
|
|
419
406
|
options.formFields,
|
|
420
407
|
);
|
|
421
408
|
}
|
|
409
|
+
|
|
410
|
+
/**
|
|
411
|
+
* @param log - Logger instance
|
|
412
|
+
*/
|
|
413
|
+
async function requireFfmpegPath(log: AppiumLogger): Promise<string> {
|
|
414
|
+
try {
|
|
415
|
+
return await fs.which(FFMPEG_BINARY);
|
|
416
|
+
} catch {
|
|
417
|
+
throw log.errorWithException(
|
|
418
|
+
`${FFMPEG_BINARY} has not been found in PATH. ` + `Please make sure it is installed`,
|
|
419
|
+
);
|
|
420
|
+
}
|
|
421
|
+
}
|
|
@@ -5,10 +5,11 @@ import type {IDoctorCheck, AppiumLogger, DoctorCheckResult} from '@appium/types'
|
|
|
5
5
|
import '@colors/colors';
|
|
6
6
|
|
|
7
7
|
export class OptionalFfmpegCheck implements IDoctorCheck {
|
|
8
|
-
log!: AppiumLogger;
|
|
9
8
|
static readonly FFMPEG_BINARY = 'ffmpeg';
|
|
10
9
|
static readonly FFMPEG_INSTALL_LINK = 'https://www.ffmpeg.org/download.html';
|
|
11
10
|
|
|
11
|
+
log!: AppiumLogger;
|
|
12
|
+
|
|
12
13
|
async diagnose(): Promise<DoctorCheckResult> {
|
|
13
14
|
const ffmpegPath = await resolveExecutablePath(OptionalFfmpegCheck.FFMPEG_BINARY);
|
|
14
15
|
|
|
@@ -31,10 +31,11 @@ export class XcodeCheck implements IDoctorCheck {
|
|
|
31
31
|
export const xcodeCheck = new XcodeCheck();
|
|
32
32
|
|
|
33
33
|
export class XcodebuildCheck implements IDoctorCheck {
|
|
34
|
-
log!: AppiumLogger;
|
|
35
34
|
static readonly XCODE_VER_PATTERN = /^Xcode\s+([\d.]+)$/m;
|
|
36
35
|
static readonly MIN_XCODE_VERSION = 13;
|
|
37
36
|
|
|
37
|
+
log!: AppiumLogger;
|
|
38
|
+
|
|
38
39
|
async diagnose(): Promise<DoctorCheckResult> {
|
|
39
40
|
let xcodeVerMatch: RegExpExecArray | null;
|
|
40
41
|
let stdout: string;
|
package/lib/driver.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import type {
|
|
3
2
|
RouteMatcher,
|
|
4
3
|
HTTPMethod,
|
|
@@ -42,22 +41,85 @@ const NO_PROXY: RouteMatcher[] = [
|
|
|
42
41
|
['POST', new RegExp('^/session/[^/]+/timeouts$')],
|
|
43
42
|
];
|
|
44
43
|
|
|
44
|
+
interface PrerunCapability {
|
|
45
|
+
command?: string;
|
|
46
|
+
script?: string;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
interface PostrunCapability {
|
|
50
|
+
command?: string;
|
|
51
|
+
script?: string;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
type Mac2DriverOpts = DriverOpts<Mac2Constraints>;
|
|
55
|
+
|
|
56
|
+
type Mac2DriverCaps = DriverCaps<Mac2Constraints>;
|
|
57
|
+
type W3CMac2DriverCaps = W3CDriverCaps<Mac2Constraints>;
|
|
45
58
|
export class Mac2Driver
|
|
46
59
|
extends BaseDriver<Mac2Constraints, StringRecord>
|
|
47
60
|
implements ExternalDriver<Mac2Constraints, string, StringRecord>
|
|
48
61
|
{
|
|
49
|
-
|
|
50
|
-
|
|
62
|
+
static newMethodMap = newMethodMap;
|
|
63
|
+
static executeMethodMap = executeMethodMap;
|
|
64
|
+
|
|
65
|
+
macosLaunchApp = appManagemenetCommands.macosLaunchApp;
|
|
66
|
+
macosActivateApp = appManagemenetCommands.macosActivateApp;
|
|
67
|
+
macosTerminateApp = appManagemenetCommands.macosTerminateApp;
|
|
68
|
+
macosQueryAppState = appManagemenetCommands.macosQueryAppState;
|
|
69
|
+
|
|
70
|
+
macosExecAppleScript = appleScriptCommands.macosExecAppleScript;
|
|
71
|
+
|
|
72
|
+
execute = executeCommands.execute;
|
|
73
|
+
|
|
74
|
+
findElOrEls = findCommands.findElOrEls;
|
|
75
|
+
|
|
76
|
+
macosSetValue = gesturesCommands.macosSetValue;
|
|
77
|
+
macosClick = gesturesCommands.macosClick;
|
|
78
|
+
macosScroll = gesturesCommands.macosScroll;
|
|
79
|
+
macosSwipe = gesturesCommands.macosSwipe;
|
|
80
|
+
macosRightClick = gesturesCommands.macosRightClick;
|
|
81
|
+
macosHover = gesturesCommands.macosHover;
|
|
82
|
+
macosDoubleClick = gesturesCommands.macosDoubleClick;
|
|
83
|
+
macosClickAndDrag = gesturesCommands.macosClickAndDrag;
|
|
84
|
+
macosClickAndDragAndHold = gesturesCommands.macosClickAndDragAndHold;
|
|
85
|
+
macosKeys = gesturesCommands.macosKeys;
|
|
86
|
+
macosPressAndHold = gesturesCommands.macosPressAndHold;
|
|
87
|
+
macosTap = gesturesCommands.macosTap;
|
|
88
|
+
macosDoubleTap = gesturesCommands.macosDoubleTap;
|
|
89
|
+
macosPressAndDrag = gesturesCommands.macosPressAndDrag;
|
|
90
|
+
macosPressAndDragAndHold = gesturesCommands.macosPressAndDragAndHold;
|
|
91
|
+
|
|
92
|
+
macosGetClipboard = clipboardCommands.macosGetClipboard;
|
|
93
|
+
macosSetClipboard = clipboardCommands.macosSetClipboard;
|
|
94
|
+
macosPerformAccessibilityAudit = auditCommands.macosPerformAccessibilityAudit;
|
|
95
|
+
|
|
96
|
+
macosDeepLink = navigationCommands.macosDeepLink;
|
|
97
|
+
|
|
98
|
+
startRecordingScreen = recordScreenCommands.startRecordingScreen;
|
|
99
|
+
stopRecordingScreen = recordScreenCommands.stopRecordingScreen;
|
|
100
|
+
macosStartRecordingScreen = recordScreenCommands.macosStartRecordingScreen;
|
|
101
|
+
macosStopRecordingScreen = recordScreenCommands.macosStopRecordingScreen;
|
|
102
|
+
|
|
103
|
+
macosStartNativeScreenRecording = nativeScreenRecordingCommands.macosStartNativeScreenRecording;
|
|
104
|
+
macosGetNativeScreenRecordingInfo =
|
|
105
|
+
nativeScreenRecordingCommands.macosGetNativeScreenRecordingInfo;
|
|
106
|
+
macosStopNativeScreenRecording = nativeScreenRecordingCommands.macosStopNativeScreenRecording;
|
|
107
|
+
macosListDisplays = nativeScreenRecordingCommands.macosListDisplays;
|
|
108
|
+
|
|
109
|
+
macosScreenshots = screenshotCommands.macosScreenshots;
|
|
110
|
+
|
|
111
|
+
macosSource = sourceCommands.macosSource;
|
|
112
|
+
|
|
51
113
|
_videoChunksBroadcaster: nativeScreenRecordingCommands.NativeVideoChunksBroadcaster;
|
|
52
114
|
_screenRecorder: recordScreenCommands.ScreenRecorder | null;
|
|
53
115
|
public proxyReqRes: (...args: any) => any;
|
|
54
116
|
|
|
55
|
-
|
|
56
|
-
|
|
117
|
+
private isProxyActive: boolean;
|
|
118
|
+
private _wda: WDAMacServer | null;
|
|
57
119
|
|
|
58
120
|
constructor(opts: InitialOpts = {} as InitialOpts) {
|
|
59
121
|
super(opts);
|
|
60
|
-
this.desiredCapConstraints =
|
|
122
|
+
this.desiredCapConstraints = structuredClone(MAC2_CONSTRAINTS);
|
|
61
123
|
this.locatorStrategies = [
|
|
62
124
|
'id',
|
|
63
125
|
'name',
|
|
@@ -77,6 +139,13 @@ export class Mac2Driver
|
|
|
77
139
|
this.settings = new DeviceSettings({}, this.onSettingsUpdate.bind(this));
|
|
78
140
|
}
|
|
79
141
|
|
|
142
|
+
get wda(): WDAMacServer {
|
|
143
|
+
if (!this._wda) {
|
|
144
|
+
throw new Error('WDA server is not initialized');
|
|
145
|
+
}
|
|
146
|
+
return this._wda;
|
|
147
|
+
}
|
|
148
|
+
|
|
80
149
|
async onSettingsUpdate(key: string, value: unknown): Promise<void> {
|
|
81
150
|
if (!this._wda) {
|
|
82
151
|
return;
|
|
@@ -86,13 +155,6 @@ export class Mac2Driver
|
|
|
86
155
|
});
|
|
87
156
|
}
|
|
88
157
|
|
|
89
|
-
get wda(): WDAMacServer {
|
|
90
|
-
if (!this._wda) {
|
|
91
|
-
throw new Error('WDA server is not initialized');
|
|
92
|
-
}
|
|
93
|
-
return this._wda;
|
|
94
|
-
}
|
|
95
|
-
|
|
96
158
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
97
159
|
override proxyActive(sessionId: string): boolean {
|
|
98
160
|
return this.isProxyActive;
|
|
@@ -142,7 +204,7 @@ export class Mac2Driver
|
|
|
142
204
|
try {
|
|
143
205
|
const prerun = caps.prerun as PrerunCapability | undefined;
|
|
144
206
|
if (prerun) {
|
|
145
|
-
if (
|
|
207
|
+
if (typeof prerun.command !== 'string' && typeof prerun.script !== 'string') {
|
|
146
208
|
throw new Error(
|
|
147
209
|
`'prerun' capability value must either contain ` +
|
|
148
210
|
`'script' or 'command' entry of string type`,
|
|
@@ -150,7 +212,7 @@ export class Mac2Driver
|
|
|
150
212
|
}
|
|
151
213
|
log.info('Executing prerun AppleScript');
|
|
152
214
|
const output = await this.macosExecAppleScript(prerun.script, undefined, prerun.command);
|
|
153
|
-
if (
|
|
215
|
+
if (output.trim()) {
|
|
154
216
|
log.info(`Prerun script output: ${output}`);
|
|
155
217
|
}
|
|
156
218
|
}
|
|
@@ -182,7 +244,7 @@ export class Mac2Driver
|
|
|
182
244
|
|
|
183
245
|
const postrun = this.opts.postrun as PostrunCapability | undefined;
|
|
184
246
|
if (postrun) {
|
|
185
|
-
if (
|
|
247
|
+
if (typeof postrun.command !== 'string' && typeof postrun.script !== 'string') {
|
|
186
248
|
log.error(
|
|
187
249
|
`'postrun' capability value must either contain ` +
|
|
188
250
|
`'script' or 'command' entry of string type`,
|
|
@@ -195,7 +257,7 @@ export class Mac2Driver
|
|
|
195
257
|
undefined,
|
|
196
258
|
postrun.command,
|
|
197
259
|
);
|
|
198
|
-
if (
|
|
260
|
+
if (output.trim()) {
|
|
199
261
|
log.info(`Postrun script output: ${output}`);
|
|
200
262
|
}
|
|
201
263
|
} catch (e: any) {
|
|
@@ -218,68 +280,6 @@ export class Mac2Driver
|
|
|
218
280
|
);
|
|
219
281
|
this._screenRecorder = null;
|
|
220
282
|
}
|
|
221
|
-
|
|
222
|
-
macosLaunchApp = appManagemenetCommands.macosLaunchApp;
|
|
223
|
-
macosActivateApp = appManagemenetCommands.macosActivateApp;
|
|
224
|
-
macosTerminateApp = appManagemenetCommands.macosTerminateApp;
|
|
225
|
-
macosQueryAppState = appManagemenetCommands.macosQueryAppState;
|
|
226
|
-
|
|
227
|
-
macosExecAppleScript = appleScriptCommands.macosExecAppleScript;
|
|
228
|
-
|
|
229
|
-
execute = executeCommands.execute;
|
|
230
|
-
|
|
231
|
-
findElOrEls = findCommands.findElOrEls;
|
|
232
|
-
|
|
233
|
-
macosSetValue = gesturesCommands.macosSetValue;
|
|
234
|
-
macosClick = gesturesCommands.macosClick;
|
|
235
|
-
macosScroll = gesturesCommands.macosScroll;
|
|
236
|
-
macosSwipe = gesturesCommands.macosSwipe;
|
|
237
|
-
macosRightClick = gesturesCommands.macosRightClick;
|
|
238
|
-
macosHover = gesturesCommands.macosHover;
|
|
239
|
-
macosDoubleClick = gesturesCommands.macosDoubleClick;
|
|
240
|
-
macosClickAndDrag = gesturesCommands.macosClickAndDrag;
|
|
241
|
-
macosClickAndDragAndHold = gesturesCommands.macosClickAndDragAndHold;
|
|
242
|
-
macosKeys = gesturesCommands.macosKeys;
|
|
243
|
-
macosPressAndHold = gesturesCommands.macosPressAndHold;
|
|
244
|
-
macosTap = gesturesCommands.macosTap;
|
|
245
|
-
macosDoubleTap = gesturesCommands.macosDoubleTap;
|
|
246
|
-
macosPressAndDrag = gesturesCommands.macosPressAndDrag;
|
|
247
|
-
macosPressAndDragAndHold = gesturesCommands.macosPressAndDragAndHold;
|
|
248
|
-
|
|
249
|
-
macosGetClipboard = clipboardCommands.macosGetClipboard;
|
|
250
|
-
macosSetClipboard = clipboardCommands.macosSetClipboard;
|
|
251
|
-
macosPerformAccessibilityAudit = auditCommands.macosPerformAccessibilityAudit;
|
|
252
|
-
|
|
253
|
-
macosDeepLink = navigationCommands.macosDeepLink;
|
|
254
|
-
|
|
255
|
-
startRecordingScreen = recordScreenCommands.startRecordingScreen;
|
|
256
|
-
stopRecordingScreen = recordScreenCommands.stopRecordingScreen;
|
|
257
|
-
macosStartRecordingScreen = recordScreenCommands.macosStartRecordingScreen;
|
|
258
|
-
macosStopRecordingScreen = recordScreenCommands.macosStopRecordingScreen;
|
|
259
|
-
|
|
260
|
-
macosStartNativeScreenRecording = nativeScreenRecordingCommands.macosStartNativeScreenRecording;
|
|
261
|
-
macosGetNativeScreenRecordingInfo =
|
|
262
|
-
nativeScreenRecordingCommands.macosGetNativeScreenRecordingInfo;
|
|
263
|
-
macosStopNativeScreenRecording = nativeScreenRecordingCommands.macosStopNativeScreenRecording;
|
|
264
|
-
macosListDisplays = nativeScreenRecordingCommands.macosListDisplays;
|
|
265
|
-
|
|
266
|
-
macosScreenshots = screenshotCommands.macosScreenshots;
|
|
267
|
-
|
|
268
|
-
macosSource = sourceCommands.macosSource;
|
|
269
283
|
}
|
|
270
284
|
|
|
271
285
|
export default Mac2Driver;
|
|
272
|
-
|
|
273
|
-
interface PrerunCapability {
|
|
274
|
-
command?: string;
|
|
275
|
-
script?: string;
|
|
276
|
-
}
|
|
277
|
-
|
|
278
|
-
interface PostrunCapability {
|
|
279
|
-
command?: string;
|
|
280
|
-
script?: string;
|
|
281
|
-
}
|
|
282
|
-
|
|
283
|
-
type Mac2DriverOpts = DriverOpts<Mac2Constraints>;
|
|
284
|
-
type Mac2DriverCaps = DriverCaps<Mac2Constraints>;
|
|
285
|
-
type W3CMac2DriverCaps = W3CDriverCaps<Mac2Constraints>;
|
package/lib/utils.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import _ from 'lodash';
|
|
2
1
|
import {exec} from 'teen_process';
|
|
3
2
|
import {node} from 'appium/support';
|
|
4
3
|
|
|
@@ -10,13 +9,19 @@ const MODULE_NAME = 'appium-mac2-driver';
|
|
|
10
9
|
* @returns The full path to module root
|
|
11
10
|
* @throws If the current module root folder cannot be determined
|
|
12
11
|
*/
|
|
13
|
-
|
|
12
|
+
let moduleRootCache: string | null = null;
|
|
13
|
+
|
|
14
|
+
export const getModuleRoot = function getModuleRoot(): string {
|
|
15
|
+
if (moduleRootCache) {
|
|
16
|
+
return moduleRootCache;
|
|
17
|
+
}
|
|
14
18
|
const root = node.getModuleRootSync(MODULE_NAME, __filename);
|
|
15
19
|
if (!root) {
|
|
16
20
|
throw new Error(`Cannot find the root folder of the ${MODULE_NAME} Node.js module`);
|
|
17
21
|
}
|
|
18
|
-
|
|
19
|
-
|
|
22
|
+
moduleRootCache = root;
|
|
23
|
+
return moduleRootCache;
|
|
24
|
+
};
|
|
20
25
|
|
|
21
26
|
/**
|
|
22
27
|
* Retrieves process ids of all the children processes created by the given
|
|
@@ -31,11 +36,47 @@ export async function listChildrenProcessIds(parentPid: number | string): Promis
|
|
|
31
36
|
// USER PID %CPU %MEM VSZ RSS TT STAT STARTED TIME COMMAND PPID
|
|
32
37
|
return stdout
|
|
33
38
|
.split('\n')
|
|
34
|
-
.
|
|
39
|
+
.map((line) => line.trim())
|
|
40
|
+
.filter(Boolean)
|
|
35
41
|
.map((line: string) => {
|
|
36
|
-
const [, pid, ...rest] = line.split(/\s+/).filter(
|
|
37
|
-
return [pid,
|
|
42
|
+
const [, pid, ...rest] = line.split(/\s+/).filter(Boolean);
|
|
43
|
+
return [pid, rest.at(-1)];
|
|
38
44
|
})
|
|
39
45
|
.filter(([, ppid]) => ppid === `${parentPid}`)
|
|
40
46
|
.map(([pid]) => String(pid));
|
|
41
47
|
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Clears the content of the given array.
|
|
51
|
+
* @param items The array to clear.
|
|
52
|
+
*/
|
|
53
|
+
export function clearArray<T>(items: T[]): void {
|
|
54
|
+
items.length = 0;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/**
|
|
58
|
+
* Removes all occurrences of the given value from the array.
|
|
59
|
+
* @param items The array to remove the value from.
|
|
60
|
+
* @param value The value to remove.
|
|
61
|
+
*/
|
|
62
|
+
export function removeAllOccurrences<T>(items: T[], value: T): void {
|
|
63
|
+
let index = items.indexOf(value);
|
|
64
|
+
while (index >= 0) {
|
|
65
|
+
items.splice(index, 1);
|
|
66
|
+
index = items.indexOf(value);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
/**
|
|
71
|
+
* Determines whether the given value is a plain object
|
|
72
|
+
* (i.e., an object created by the Object constructor or with a null prototype).
|
|
73
|
+
* @param value The value to check.
|
|
74
|
+
* @returns True if the value is a plain object, false otherwise.
|
|
75
|
+
*/
|
|
76
|
+
export function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
77
|
+
if (value === null || typeof value !== 'object') {
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
const proto = Object.getPrototypeOf(value);
|
|
81
|
+
return proto === Object.prototype || proto === null;
|
|
82
|
+
}
|