appium-webdriveragent 15.1.6 → 16.0.1
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 +17 -0
- package/Scripts/build-webdriveragent.mjs +8 -9
- package/Scripts/fetch-prebuilt-wda.mjs +16 -14
- package/Scripts/update-wda-version.mjs +12 -10
- package/WebDriverAgentLib/Info.plist +2 -2
- package/build/lib/check-dependencies.d.ts +1 -1
- package/build/lib/check-dependencies.d.ts.map +1 -1
- package/build/lib/check-dependencies.js +12 -18
- package/build/lib/check-dependencies.js.map +1 -1
- package/build/lib/constants.js +13 -19
- package/build/lib/constants.js.map +1 -1
- package/build/lib/index.d.ts +6 -6
- package/build/lib/index.d.ts.map +1 -1
- package/build/lib/index.js +6 -32
- package/build/lib/index.js.map +1 -1
- package/build/lib/logger.js +2 -5
- package/build/lib/logger.js.map +1 -1
- package/build/lib/no-session-proxy.js +2 -6
- package/build/lib/no-session-proxy.js.map +1 -1
- package/build/lib/types.d.ts.map +1 -1
- package/build/lib/types.js +1 -2
- package/build/lib/utils/index.d.ts +6 -6
- package/build/lib/utils/index.d.ts.map +1 -1
- package/build/lib/utils/index.js +8 -22
- package/build/lib/utils/index.js.map +1 -1
- package/build/lib/utils/module.d.ts.map +1 -1
- package/build/lib/utils/module.js +9 -20
- package/build/lib/utils/module.js.map +1 -1
- package/build/lib/utils/platform.js +3 -6
- package/build/lib/utils/platform.js.map +1 -1
- package/build/lib/utils/processes.d.ts.map +1 -1
- package/build/lib/utils/processes.js +16 -21
- package/build/lib/utils/processes.js.map +1 -1
- package/build/lib/utils/security.d.ts.map +1 -1
- package/build/lib/utils/security.js +7 -10
- package/build/lib/utils/security.js.map +1 -1
- package/build/lib/utils/xctestrun.d.ts +1 -1
- package/build/lib/utils/xctestrun.d.ts.map +1 -1
- package/build/lib/utils/xctestrun.js +26 -37
- package/build/lib/utils/xctestrun.js.map +1 -1
- package/build/lib/wda-strategies.d.ts +3 -3
- package/build/lib/wda-strategies.d.ts.map +1 -1
- package/build/lib/wda-strategies.js +15 -24
- package/build/lib/wda-strategies.js.map +1 -1
- package/build/lib/webdriveragent.d.ts +3 -8
- package/build/lib/webdriveragent.d.ts.map +1 -1
- package/build/lib/webdriveragent.js +45 -63
- package/build/lib/webdriveragent.js.map +1 -1
- package/build/lib/xcodebuild.d.ts +2 -2
- package/build/lib/xcodebuild.d.ts.map +1 -1
- package/build/lib/xcodebuild.js +29 -43
- package/build/lib/xcodebuild.js.map +1 -1
- package/lib/check-dependencies.ts +7 -11
- package/lib/index.ts +6 -6
- package/lib/types.ts +5 -3
- package/lib/utils/index.ts +7 -12
- package/lib/utils/module.ts +2 -7
- package/lib/utils/platform.ts +1 -1
- package/lib/utils/processes.ts +3 -4
- package/lib/utils/security.ts +3 -5
- package/lib/utils/xctestrun.ts +11 -24
- package/lib/wda-strategies.ts +10 -17
- package/lib/webdriveragent.ts +22 -48
- package/lib/xcodebuild.ts +20 -41
- package/package.json +66 -67
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../../lib/utils/platform.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"platform.js","sourceRoot":"","sources":["../../../lib/utils/platform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAEnD;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAC,YAAoB;IACzC,OAAO,YAAY,EAAE,WAAW,EAAE,KAAK,kBAAkB,CAAC,WAAW,EAAE,CAAC;AAC1E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processes.d.ts","sourceRoot":"","sources":["../../../lib/utils/processes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processes.d.ts","sourceRoot":"","sources":["../../../lib/utils/processes.ts"],"names":[],"mappings":"AAKA;;GAEG;AACH,wBAAsB,mBAAmB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA0C7E;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAS1F;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,sBAAsB,CAC1C,IAAI,EAAE,MAAM,GAAG,MAAM,EACrB,aAAa,GAAE,CAAC,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,IAAW,GAC7E,OAAO,CAAC,MAAM,EAAE,CAAC,CAiCnB"}
|
|
@@ -1,15 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
exports.resetTestProcesses = resetTestProcesses;
|
|
5
|
-
exports.getPIDsListeningOnPort = getPIDsListeningOnPort;
|
|
6
|
-
const asyncbox_1 = require("asyncbox");
|
|
7
|
-
const teen_process_1 = require("teen_process");
|
|
8
|
-
const logger_1 = require("../logger");
|
|
1
|
+
import { waitForCondition } from 'asyncbox';
|
|
2
|
+
import { exec } from 'teen_process';
|
|
3
|
+
import { log } from '../logger.js';
|
|
9
4
|
/**
|
|
10
5
|
* Find and terminate all processes matching the given pgrep pattern.
|
|
11
6
|
*/
|
|
12
|
-
async function killAppUsingPattern(pgrepPattern) {
|
|
7
|
+
export async function killAppUsingPattern(pgrepPattern) {
|
|
13
8
|
const signals = [2, 15, 9];
|
|
14
9
|
for (const signal of signals) {
|
|
15
10
|
const matchedPids = await getPIDsUsingPattern(pgrepPattern);
|
|
@@ -18,20 +13,20 @@ async function killAppUsingPattern(pgrepPattern) {
|
|
|
18
13
|
}
|
|
19
14
|
const args = [`-${signal}`, ...matchedPids];
|
|
20
15
|
try {
|
|
21
|
-
await
|
|
16
|
+
await exec('kill', args);
|
|
22
17
|
}
|
|
23
18
|
catch (err) {
|
|
24
|
-
|
|
19
|
+
log.debug(`kill ${args.join(' ')} -> ${err.message}`);
|
|
25
20
|
}
|
|
26
21
|
if (signal === signals[signals.length - 1]) {
|
|
27
22
|
// there is no need to wait after SIGKILL
|
|
28
23
|
return;
|
|
29
24
|
}
|
|
30
25
|
try {
|
|
31
|
-
await
|
|
26
|
+
await waitForCondition(async () => {
|
|
32
27
|
const pidCheckPromises = matchedPids.map(async (pid) => {
|
|
33
28
|
try {
|
|
34
|
-
await
|
|
29
|
+
await exec('kill', ['-0', pid]);
|
|
35
30
|
// the process is still alive
|
|
36
31
|
return false;
|
|
37
32
|
}
|
|
@@ -55,14 +50,14 @@ async function killAppUsingPattern(pgrepPattern) {
|
|
|
55
50
|
/**
|
|
56
51
|
* Kills running XCTest processes for the particular device.
|
|
57
52
|
*/
|
|
58
|
-
async function resetTestProcesses(udid, isSimulator) {
|
|
53
|
+
export async function resetTestProcesses(udid, isSimulator) {
|
|
59
54
|
const processPatterns = [`xcodebuild.*${udid}`];
|
|
60
55
|
if (isSimulator) {
|
|
61
56
|
processPatterns.push(`${udid}.*XCTRunner`);
|
|
62
57
|
// Some XCTest launches might not include xcodebuild in their command line
|
|
63
58
|
processPatterns.push(`xctest.*${udid}`);
|
|
64
59
|
}
|
|
65
|
-
|
|
60
|
+
log.debug(`Killing running processes '${processPatterns.join(', ')}' for the device ${udid}...`);
|
|
66
61
|
await Promise.all(processPatterns.map(killAppUsingPattern));
|
|
67
62
|
}
|
|
68
63
|
/**
|
|
@@ -78,17 +73,17 @@ async function resetTestProcesses(udid, isSimulator) {
|
|
|
78
73
|
* from the resulting array.
|
|
79
74
|
* @returns - the list of matched process ids.
|
|
80
75
|
*/
|
|
81
|
-
async function getPIDsListeningOnPort(port, filteringFunc = null) {
|
|
76
|
+
export async function getPIDsListeningOnPort(port, filteringFunc = null) {
|
|
82
77
|
const result = [];
|
|
83
78
|
try {
|
|
84
79
|
// This only works since Mac OS X El Capitan
|
|
85
|
-
const { stdout } = await
|
|
80
|
+
const { stdout } = await exec('lsof', ['-ti', `tcp:${port}`]);
|
|
86
81
|
result.push(...stdout.trim().split(/\n+/));
|
|
87
82
|
}
|
|
88
83
|
catch (e) {
|
|
89
84
|
if (e.code !== 1) {
|
|
90
85
|
// code 1 means no processes. Other errors need reporting
|
|
91
|
-
|
|
86
|
+
log.debug(`Error getting processes listening on port '${port}': ${e.stderr || e.message}`);
|
|
92
87
|
}
|
|
93
88
|
return result;
|
|
94
89
|
}
|
|
@@ -98,7 +93,7 @@ async function getPIDsListeningOnPort(port, filteringFunc = null) {
|
|
|
98
93
|
const filtered = await Promise.all(result.map(async (pid) => {
|
|
99
94
|
let stdout;
|
|
100
95
|
try {
|
|
101
|
-
({ stdout } = await
|
|
96
|
+
({ stdout } = await exec('ps', ['-p', pid, '-o', 'command']));
|
|
102
97
|
}
|
|
103
98
|
catch (e) {
|
|
104
99
|
if (e.code === 1) {
|
|
@@ -117,7 +112,7 @@ async function getPIDsUsingPattern(pattern) {
|
|
|
117
112
|
pattern,
|
|
118
113
|
];
|
|
119
114
|
try {
|
|
120
|
-
const { stdout } = await
|
|
115
|
+
const { stdout } = await exec('pgrep', args);
|
|
121
116
|
return stdout
|
|
122
117
|
.split(/\s+/)
|
|
123
118
|
.map((x) => parseInt(x, 10))
|
|
@@ -125,7 +120,7 @@ async function getPIDsUsingPattern(pattern) {
|
|
|
125
120
|
.map((x) => `${x}`);
|
|
126
121
|
}
|
|
127
122
|
catch (err) {
|
|
128
|
-
|
|
123
|
+
log.debug(`'pgrep ${args.join(' ')}' didn't detect any matching processes. Return code: ${err.code}`);
|
|
129
124
|
return [];
|
|
130
125
|
}
|
|
131
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processes.js","sourceRoot":"","sources":["../../../lib/utils/processes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"processes.js","sourceRoot":"","sources":["../../../lib/utils/processes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../../../lib/utils/security.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../../../lib/utils/security.ts"],"names":[],"mappings":"AAIA;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,YAAY,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKzG"}
|
|
@@ -1,15 +1,12 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
exports.setRealDeviceSecurity = setRealDeviceSecurity;
|
|
4
|
-
const teen_process_1 = require("teen_process");
|
|
5
|
-
const logger_1 = require("../logger");
|
|
1
|
+
import { exec } from 'teen_process';
|
|
2
|
+
import { log } from '../logger.js';
|
|
6
3
|
/**
|
|
7
4
|
* Configure keychain access required for real-device code signing.
|
|
8
5
|
*/
|
|
9
|
-
async function setRealDeviceSecurity(keychainPath, keychainPassword) {
|
|
10
|
-
|
|
11
|
-
await
|
|
12
|
-
await
|
|
13
|
-
await
|
|
6
|
+
export async function setRealDeviceSecurity(keychainPath, keychainPassword) {
|
|
7
|
+
log.debug('Setting security for iOS device');
|
|
8
|
+
await exec('security', ['-v', 'list-keychains', '-s', keychainPath]);
|
|
9
|
+
await exec('security', ['-v', 'unlock-keychain', '-p', keychainPassword, keychainPath]);
|
|
10
|
+
await exec('security', ['set-keychain-settings', '-t', '3600', '-l', keychainPath]);
|
|
14
11
|
}
|
|
15
12
|
//# sourceMappingURL=security.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../../lib/utils/security.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../../lib/utils/security.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,IAAI,EAAC,MAAM,cAAc,CAAC;AAElC,OAAO,EAAC,GAAG,EAAC,MAAM,cAAc,CAAC;AAEjC;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,YAAoB,EAAE,gBAAwB;IACxF,GAAG,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAC7C,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;IACrE,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;IACxF,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC,uBAAuB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;AACtF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xctestrun.d.ts","sourceRoot":"","sources":["../../../lib/utils/xctestrun.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"xctestrun.d.ts","sourceRoot":"","sources":["../../../lib/utils/xctestrun.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAG5C;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,sBAAsB,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1C;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAc/E;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GAAG,MAAM,EAC9B,YAAY,CAAC,EAAE,MAAM,EACrB,sBAAsB,CAAC,EAAE,MAAM,GAAG,MAAM,GACvC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAYrB;AAED;;;;;GAKG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,CAAC,CAgCjB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAKpF"}
|
|
@@ -1,17 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
};
|
|
5
|
-
|
|
6
|
-
exports.setXctestrunFile = setXctestrunFile;
|
|
7
|
-
exports.getAdditionalRunContent = getAdditionalRunContent;
|
|
8
|
-
exports.getXctestrunFilePath = getXctestrunFilePath;
|
|
9
|
-
exports.getXctestrunFileName = getXctestrunFileName;
|
|
10
|
-
const support_1 = require("@appium/support");
|
|
11
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
12
|
-
const node_os_1 = require("node:os");
|
|
13
|
-
const logger_1 = require("../logger");
|
|
14
|
-
const platform_1 = require("./platform");
|
|
1
|
+
import { arch } from 'node:os';
|
|
2
|
+
import path from 'node:path';
|
|
3
|
+
import { fs, plist, util } from '@appium/support';
|
|
4
|
+
import { log } from '../logger.js';
|
|
5
|
+
import { isTvOS } from './platform.js';
|
|
15
6
|
/**
|
|
16
7
|
* Creates xctestrun file per device & platform version.
|
|
17
8
|
* We expect to have WebDriverAgentRunner_iphoneos${sdkVersion|platformVersion}-arm64.xctestrun for real device
|
|
@@ -26,13 +17,13 @@ const platform_1 = require("./platform");
|
|
|
26
17
|
* or WebDriverAgentRunner_iphonesimulator${sdkVersion|platformVersion}-x86_64.xctestrun for simulator is not found @bootstrapPath,
|
|
27
18
|
* then it will throw a file not found exception
|
|
28
19
|
*/
|
|
29
|
-
async function setXctestrunFile(args) {
|
|
30
|
-
const { deviceInfo, sdkVersion, bootstrapPath, wdaRemotePort, wdaBindingIP, maxHttpRequestBodySize
|
|
20
|
+
export async function setXctestrunFile(args) {
|
|
21
|
+
const { deviceInfo, sdkVersion, bootstrapPath, wdaRemotePort, wdaBindingIP, maxHttpRequestBodySize } = args;
|
|
31
22
|
const xctestrunFilePath = await getXctestrunFilePath(deviceInfo, sdkVersion, bootstrapPath);
|
|
32
|
-
const xctestRunContent = await
|
|
23
|
+
const xctestRunContent = await plist.parsePlistFile(xctestrunFilePath);
|
|
33
24
|
const updateWDAPort = getAdditionalRunContent(deviceInfo.platformName, wdaRemotePort, wdaBindingIP, maxHttpRequestBodySize);
|
|
34
25
|
const newXctestRunContent = mergeObjects(xctestRunContent, updateWDAPort);
|
|
35
|
-
await
|
|
26
|
+
await plist.updatePlistFile(xctestrunFilePath, newXctestRunContent, true);
|
|
36
27
|
return xctestrunFilePath;
|
|
37
28
|
}
|
|
38
29
|
/**
|
|
@@ -43,17 +34,15 @@ async function setXctestrunFile(args) {
|
|
|
43
34
|
* @param maxHttpRequestBodySize - The maximum HTTP request body size in bytes.
|
|
44
35
|
* @return returns a runner object which has USE_PORT and optionally USE_IP
|
|
45
36
|
*/
|
|
46
|
-
function getAdditionalRunContent(platformName, wdaRemotePort, wdaBindingIP, maxHttpRequestBodySize) {
|
|
47
|
-
const runner = `WebDriverAgentRunner${
|
|
37
|
+
export function getAdditionalRunContent(platformName, wdaRemotePort, wdaBindingIP, maxHttpRequestBodySize) {
|
|
38
|
+
const runner = `WebDriverAgentRunner${isTvOS(platformName) ? '_tvOS' : ''}`;
|
|
48
39
|
return {
|
|
49
40
|
[runner]: {
|
|
50
41
|
EnvironmentVariables: {
|
|
51
42
|
// USE_PORT must be 'string'
|
|
52
43
|
USE_PORT: `${wdaRemotePort}`,
|
|
53
44
|
...(wdaBindingIP ? { USE_IP: wdaBindingIP } : {}),
|
|
54
|
-
...(maxHttpRequestBodySize
|
|
55
|
-
? { MAX_HTTP_REQUEST_BODY_SIZE: `${maxHttpRequestBodySize}` }
|
|
56
|
-
: {}),
|
|
45
|
+
...(maxHttpRequestBodySize ? { MAX_HTTP_REQUEST_BODY_SIZE: `${maxHttpRequestBodySize}` } : {}),
|
|
57
46
|
},
|
|
58
47
|
},
|
|
59
48
|
};
|
|
@@ -64,34 +53,34 @@ function getAdditionalRunContent(platformName, wdaRemotePort, wdaBindingIP, maxH
|
|
|
64
53
|
* @param sdkVersion - The Xcode SDK version of OS.
|
|
65
54
|
* @param bootstrapPath - The folder path containing xctestrun file.
|
|
66
55
|
*/
|
|
67
|
-
async function getXctestrunFilePath(deviceInfo, sdkVersion, bootstrapPath) {
|
|
56
|
+
export async function getXctestrunFilePath(deviceInfo, sdkVersion, bootstrapPath) {
|
|
68
57
|
// First try the SDK path, for Xcode 10 (at least)
|
|
69
58
|
const sdkBased = [
|
|
70
|
-
|
|
59
|
+
path.resolve(bootstrapPath, `${deviceInfo.udid}_${sdkVersion}.xctestrun`),
|
|
71
60
|
sdkVersion,
|
|
72
61
|
];
|
|
73
62
|
// Next try Platform path, for earlier Xcode versions
|
|
74
63
|
const platformBased = [
|
|
75
|
-
|
|
64
|
+
path.resolve(bootstrapPath, `${deviceInfo.udid}_${deviceInfo.platformVersion}.xctestrun`),
|
|
76
65
|
deviceInfo.platformVersion,
|
|
77
66
|
];
|
|
78
67
|
for (const [filePath, version] of [sdkBased, platformBased]) {
|
|
79
|
-
if (await
|
|
80
|
-
|
|
68
|
+
if (await fs.exists(filePath)) {
|
|
69
|
+
log.info(`Using '${filePath}' as xctestrun file`);
|
|
81
70
|
return filePath;
|
|
82
71
|
}
|
|
83
|
-
const originalXctestrunFile =
|
|
84
|
-
if (await
|
|
72
|
+
const originalXctestrunFile = path.resolve(bootstrapPath, getXctestrunFileName(deviceInfo, version));
|
|
73
|
+
if (await fs.exists(originalXctestrunFile)) {
|
|
85
74
|
// If this is first time run for given device, then first generate xctestrun file for device.
|
|
86
75
|
// We need to have a xctestrun file **per device** because we cannot have same wda port for all devices.
|
|
87
|
-
await
|
|
88
|
-
|
|
76
|
+
await fs.copyFile(originalXctestrunFile, filePath);
|
|
77
|
+
log.info(`Using '${filePath}' as xctestrun file copied by '${originalXctestrunFile}'`);
|
|
89
78
|
return filePath;
|
|
90
79
|
}
|
|
91
80
|
}
|
|
92
81
|
throw new Error(`If you are using 'useXctestrunFile' capability then you ` +
|
|
93
82
|
`need to have a xctestrun file (expected: ` +
|
|
94
|
-
`'${
|
|
83
|
+
`'${path.resolve(bootstrapPath, getXctestrunFileName(deviceInfo, sdkVersion))}')`);
|
|
95
84
|
}
|
|
96
85
|
/**
|
|
97
86
|
* Return the name of xctestrun file
|
|
@@ -99,17 +88,17 @@ async function getXctestrunFilePath(deviceInfo, sdkVersion, bootstrapPath) {
|
|
|
99
88
|
* @param version - The Xcode SDK version of OS.
|
|
100
89
|
* @return returns xctestrunFilePath for given device
|
|
101
90
|
*/
|
|
102
|
-
function getXctestrunFileName(deviceInfo, version) {
|
|
91
|
+
export function getXctestrunFileName(deviceInfo, version) {
|
|
103
92
|
const archSuffix = deviceInfo.isRealDevice
|
|
104
93
|
? `os${version}-arm64`
|
|
105
|
-
: `simulator${version}-${
|
|
106
|
-
return `WebDriverAgentRunner_${
|
|
94
|
+
: `simulator${version}-${arch() === 'arm64' ? 'arm64' : 'x86_64'}`;
|
|
95
|
+
return `WebDriverAgentRunner_${isTvOS(deviceInfo.platformName) ? 'tvOS_appletv' : 'iphone'}${archSuffix}.xctestrun`;
|
|
107
96
|
}
|
|
108
97
|
function mergeObjects(target, source) {
|
|
109
98
|
const output = { ...target };
|
|
110
99
|
for (const [key, sourceValue] of Object.entries(source)) {
|
|
111
100
|
const targetValue = output[key];
|
|
112
|
-
if (
|
|
101
|
+
if (util.isPlainObject(targetValue) && util.isPlainObject(sourceValue)) {
|
|
113
102
|
output[key] = mergeObjects(targetValue, sourceValue);
|
|
114
103
|
continue;
|
|
115
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xctestrun.js","sourceRoot":"","sources":["../../../lib/utils/xctestrun.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"xctestrun.js","sourceRoot":"","sources":["../../../lib/utils/xctestrun.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AppiumLogger, StringRecord } from '@appium/types';
|
|
2
|
-
import type { NoSessionProxy } from './no-session-proxy';
|
|
3
|
-
import type {
|
|
4
|
-
import type {
|
|
2
|
+
import type { NoSessionProxy } from './no-session-proxy.js';
|
|
3
|
+
import type { AppleDevice, RealDevicePreinstalledHostOps, RealDeviceXcodebuildHostOps, SimulatorHostOps, WdaHostOps, WdaStartupStrategyName } from './types.js';
|
|
4
|
+
import type { XcodeBuild } from './xcodebuild.js';
|
|
5
5
|
export interface WdaStartupStrategy {
|
|
6
6
|
readonly name: WdaStartupStrategyName;
|
|
7
7
|
launch(sessionId: string): Promise<StringRecord | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wda-strategies.d.ts","sourceRoot":"","sources":["../../lib/wda-strategies.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wda-strategies.d.ts","sourceRoot":"","sources":["../../lib/wda-strategies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,6 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
exports.createWdaStartupStrategy = createWdaStartupStrategy;
|
|
5
|
-
exports.createDefaultWdaHostOps = createDefaultWdaHostOps;
|
|
6
|
-
exports.createDefaultSimulatorWdaHostOps = createDefaultSimulatorWdaHostOps;
|
|
7
|
-
exports.createDefaultRealDevicePreinstalledHostOps = createDefaultRealDevicePreinstalledHostOps;
|
|
8
|
-
exports.createDefaultRealDeviceXcodebuildHostOps = createDefaultRealDeviceXcodebuildHostOps;
|
|
9
|
-
const teen_process_1 = require("teen_process");
|
|
10
|
-
const support_1 = require("@appium/support");
|
|
11
|
-
const utils_1 = require("./utils");
|
|
1
|
+
import { fs } from '@appium/support';
|
|
2
|
+
import { exec } from 'teen_process';
|
|
3
|
+
import { getPIDsListeningOnPort, resetTestProcesses } from './utils/index.js';
|
|
12
4
|
const WDA_AGENT_PORT = 8100;
|
|
13
5
|
const HOST_OPS_REQUIRED_MESSAGE = 'Host operations must be provided to launch or terminate preinstalled WebDriverAgent';
|
|
14
6
|
class ExistingWdaUrlStrategy {
|
|
@@ -76,7 +68,7 @@ class RealDevicePreinstalledStrategy {
|
|
|
76
68
|
/**
|
|
77
69
|
* Selects the WDA startup strategy for the provided launch arguments.
|
|
78
70
|
*/
|
|
79
|
-
function selectWdaStartupStrategyName(args) {
|
|
71
|
+
export function selectWdaStartupStrategyName(args) {
|
|
80
72
|
if (args.webDriverAgentUrl) {
|
|
81
73
|
return 'existing-url';
|
|
82
74
|
}
|
|
@@ -91,7 +83,7 @@ function selectWdaStartupStrategyName(args) {
|
|
|
91
83
|
/**
|
|
92
84
|
* Creates a WDA startup strategy for the current facade state.
|
|
93
85
|
*/
|
|
94
|
-
function createWdaStartupStrategy(ctx) {
|
|
86
|
+
export function createWdaStartupStrategy(ctx) {
|
|
95
87
|
const startupStrategy = selectWdaStartupStrategyName({
|
|
96
88
|
realDevice: ctx.isRealDevice,
|
|
97
89
|
webDriverAgentUrl: ctx.webDriverAgentUrl,
|
|
@@ -113,7 +105,7 @@ function createWdaStartupStrategy(ctx) {
|
|
|
113
105
|
/**
|
|
114
106
|
* Creates default host operations for flows the package can own directly.
|
|
115
107
|
*/
|
|
116
|
-
function createDefaultWdaHostOps() {
|
|
108
|
+
export function createDefaultWdaHostOps() {
|
|
117
109
|
return {
|
|
118
110
|
simulator: createDefaultSimulatorWdaHostOps(),
|
|
119
111
|
realDevicePreinstalled: createDefaultRealDevicePreinstalledHostOps(),
|
|
@@ -123,7 +115,7 @@ function createDefaultWdaHostOps() {
|
|
|
123
115
|
/**
|
|
124
116
|
* Creates default simulator host operations.
|
|
125
117
|
*/
|
|
126
|
-
function createDefaultSimulatorWdaHostOps() {
|
|
118
|
+
export function createDefaultSimulatorWdaHostOps() {
|
|
127
119
|
return {
|
|
128
120
|
async launchPreinstalled() {
|
|
129
121
|
throw new Error(HOST_OPS_REQUIRED_MESSAGE);
|
|
@@ -132,14 +124,14 @@ function createDefaultSimulatorWdaHostOps() {
|
|
|
132
124
|
throw new Error(HOST_OPS_REQUIRED_MESSAGE);
|
|
133
125
|
},
|
|
134
126
|
async resetTestProcesses({ udid, isSimulator }) {
|
|
135
|
-
await
|
|
127
|
+
await resetTestProcesses(udid, isSimulator);
|
|
136
128
|
},
|
|
137
129
|
};
|
|
138
130
|
}
|
|
139
131
|
/**
|
|
140
132
|
* Creates default real-device preinstalled host operations.
|
|
141
133
|
*/
|
|
142
|
-
function createDefaultRealDevicePreinstalledHostOps() {
|
|
134
|
+
export function createDefaultRealDevicePreinstalledHostOps() {
|
|
143
135
|
return {
|
|
144
136
|
async launchPreinstalled() {
|
|
145
137
|
throw new Error(HOST_OPS_REQUIRED_MESSAGE);
|
|
@@ -152,16 +144,15 @@ function createDefaultRealDevicePreinstalledHostOps() {
|
|
|
152
144
|
/**
|
|
153
145
|
* Creates default real-device xcodebuild host operations.
|
|
154
146
|
*/
|
|
155
|
-
function createDefaultRealDeviceXcodebuildHostOps() {
|
|
147
|
+
export function createDefaultRealDeviceXcodebuildHostOps() {
|
|
156
148
|
return {
|
|
157
149
|
async resetTestProcesses({ udid, isSimulator }) {
|
|
158
|
-
await
|
|
150
|
+
await resetTestProcesses(udid, isSimulator);
|
|
159
151
|
},
|
|
160
152
|
async cleanupObsoleteProcesses({ udid, port, commandLineIncludes }) {
|
|
161
|
-
const obsoletePids = await
|
|
162
|
-
!cmdLine.toLowerCase().includes(udid.toLowerCase()));
|
|
153
|
+
const obsoletePids = await getPIDsListeningOnPort(port, (cmdLine) => cmdLine.includes(commandLineIncludes) && !cmdLine.toLowerCase().includes(udid.toLowerCase()));
|
|
163
154
|
if (obsoletePids.length > 0) {
|
|
164
|
-
await
|
|
155
|
+
await exec('kill', obsoletePids);
|
|
165
156
|
}
|
|
166
157
|
},
|
|
167
158
|
};
|
|
@@ -169,8 +160,8 @@ function createDefaultRealDeviceXcodebuildHostOps() {
|
|
|
169
160
|
async function launchWithXcodebuild(ctx, sessionId) {
|
|
170
161
|
ctx.log.info('Launching WebDriverAgent on the device');
|
|
171
162
|
ctx.setupProxies(sessionId);
|
|
172
|
-
if (!ctx.useXctestrunFile && !(await
|
|
173
|
-
throw new Error(`Trying to use WebDriverAgent project at '${ctx.agentPath}' but the
|
|
163
|
+
if (!ctx.useXctestrunFile && !(await fs.exists(ctx.agentPath))) {
|
|
164
|
+
throw new Error(`Trying to use WebDriverAgent project at '${ctx.agentPath}' but the file does not exist`);
|
|
174
165
|
}
|
|
175
166
|
if (ctx.useXctestrunFile || ctx.usePrebuiltWDA) {
|
|
176
167
|
ctx.log.info('Skipped WDA project cleanup according to the provided capabilities');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wda-strategies.js","sourceRoot":"","sources":["../../lib/wda-strategies.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"wda-strategies.js","sourceRoot":"","sources":["../../lib/wda-strategies.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { JWProxy } from '@appium/base-driver';
|
|
2
2
|
import type { AppiumLogger, StringRecord } from '@appium/types';
|
|
3
|
-
import { NoSessionProxy } from './no-session-proxy';
|
|
4
|
-
import {
|
|
5
|
-
import
|
|
3
|
+
import { NoSessionProxy } from './no-session-proxy.js';
|
|
4
|
+
import type { WebDriverAgentArgs, AppleDevice, XcodeBuildSettings, RetrieveBuildSettingsOptions } from './types.js';
|
|
5
|
+
import { XcodeBuild } from './xcodebuild.js';
|
|
6
6
|
export declare class WebDriverAgent {
|
|
7
7
|
bootstrapPath: string;
|
|
8
8
|
agentPath: string;
|
|
@@ -137,11 +137,6 @@ export declare class WebDriverAgent {
|
|
|
137
137
|
* @returns Build settings, or `undefined` if xcodebuild is skipped or settings cannot be determined
|
|
138
138
|
*/
|
|
139
139
|
retrieveBuildSettings(options?: RetrieveBuildSettingsOptions): Promise<XcodeBuildSettings | undefined>;
|
|
140
|
-
/**
|
|
141
|
-
* @deprecated Use {@link retrieveBuildSettings} instead. Will be removed in a future release.
|
|
142
|
-
* @returns The derived data path, or `undefined` if xcodebuild is skipped
|
|
143
|
-
*/
|
|
144
|
-
retrieveDerivedDataPath(): Promise<string | undefined>;
|
|
145
140
|
/**
|
|
146
141
|
* Reuse running WDA if it has the same bundle id with updatedWDABundleId.
|
|
147
142
|
* Or reuse it if it has the default id without updatedWDABundleId.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webdriveragent.d.ts","sourceRoot":"","sources":["../../lib/webdriveragent.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"webdriveragent.d.ts","sourceRoot":"","sources":["../../lib/webdriveragent.ts"],"names":[],"mappings":"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"}
|