appium-xcuitest-driver 5.2.0 → 5.2.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 +7 -0
- package/build/lib/commands/app-management.js +1 -1
- package/build/lib/commands/app-management.js.map +1 -1
- package/build/lib/commands/performance.d.ts.map +1 -1
- package/build/lib/commands/performance.js +4 -11
- package/build/lib/commands/performance.js.map +1 -1
- package/build/lib/ios-deploy.d.ts +1 -1
- package/build/lib/ios-deploy.d.ts.map +1 -1
- package/build/lib/ios-deploy.js +50 -9
- package/build/lib/ios-deploy.js.map +1 -1
- package/build/lib/xcrun.d.ts +3 -0
- package/build/lib/xcrun.d.ts.map +1 -0
- package/build/lib/xcrun.js +17 -0
- package/build/lib/xcrun.js.map +1 -0
- package/lib/commands/app-management.js +1 -1
- package/lib/commands/performance.js +2 -10
- package/lib/ios-deploy.js +60 -17
- package/lib/xcrun.js +16 -0
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [5.2.1](https://github.com/appium/appium-xcuitest-driver/compare/v5.2.0...v5.2.1) (2023-09-19)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* terminateApp with devicectl for iOS 17 ([#1997](https://github.com/appium/appium-xcuitest-driver/issues/1997)) ([16c7319](https://github.com/appium/appium-xcuitest-driver/commit/16c73198397495f235cc49f6fb978050a9e2f49d))
|
|
7
|
+
|
|
1
8
|
## [5.2.0](https://github.com/appium/appium-xcuitest-driver/compare/v5.1.0...v5.2.0) (2023-09-16)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -129,7 +129,7 @@ exports.default = {
|
|
|
129
129
|
throw new driver_1.errors.UnsupportedOperationError('A real device is required');
|
|
130
130
|
}
|
|
131
131
|
// @ts-expect-error - do not assign arbitrary properties to `this.opts`
|
|
132
|
-
return await this.opts.device.terminateApp(bundleId);
|
|
132
|
+
return await this.opts.device.terminateApp(bundleId, this.opts.platformVersion);
|
|
133
133
|
},
|
|
134
134
|
/**
|
|
135
135
|
* Queries the state of an installed application from the device under test.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"app-management.js","sourceRoot":"","sources":["../../../lib/commands/app-management.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performance.d.ts","sourceRoot":"","sources":["../../../lib/commands/performance.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"performance.d.ts","sourceRoot":"","sources":["../../../lib/commands/performance.js"],"names":[],"mappings":"AA+CA;IAGE,mDAeC;IAjBD,qDAAqD;IACrD,UADW,OAAO,cAAc,EAAE,UAAU,GAAC,IAAI,CACxC;IAGP,0BAA2B;IAC3B,cAAoF;IACpF,kBAA4D;IAC5D,oBAGC;IACD,UAAoB;IACpB,WAAiB;IACjB,8CAEC;IACD,wCAA2B;IAG7B,uBAEC;IAED,yCAEC;IAED,uCAsBC;IAED,qBAEC;IAED,uCA+BC;IAED,uBAmGC;IAED,uCAkBC;CACF;;IAGC;;;;;;;;;;;;;;;;;OAiBG;IACH,+JA2CC;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,2XAiDC;;;6BAIU,OAAO,WAAW,EAAE,cAAc"}
|
|
@@ -9,6 +9,7 @@ const path_1 = __importDefault(require("path"));
|
|
|
9
9
|
const support_1 = require("appium/support");
|
|
10
10
|
const teen_process_1 = require("teen_process");
|
|
11
11
|
const utils_1 = require("../utils");
|
|
12
|
+
const xcrun_1 = require("../xcrun");
|
|
12
13
|
const asyncbox_1 = require("asyncbox");
|
|
13
14
|
const bluebird_1 = __importDefault(require("bluebird"));
|
|
14
15
|
const PERF_RECORD_FEAT_NAME = 'perf_record';
|
|
@@ -22,17 +23,9 @@ const DEFAULT_PROFILE_NAME = 'Activity Monitor';
|
|
|
22
23
|
const DEFAULT_EXT = '.trace';
|
|
23
24
|
const DEFAULT_PID = 'current';
|
|
24
25
|
const INSTRUMENTS = 'instruments';
|
|
25
|
-
const XCRUN = 'xcrun';
|
|
26
26
|
const XCTRACE = 'xctrace';
|
|
27
27
|
async function requireXctrace() {
|
|
28
|
-
|
|
29
|
-
try {
|
|
30
|
-
xcrunPath = await support_1.fs.which(XCRUN);
|
|
31
|
-
}
|
|
32
|
-
catch (e) {
|
|
33
|
-
throw new Error(`${XCRUN} has not been found in PATH. ` +
|
|
34
|
-
`Please make sure XCode development tools are installed`);
|
|
35
|
-
}
|
|
28
|
+
const xcrunPath = await (0, xcrun_1.requireXcrun)();
|
|
36
29
|
try {
|
|
37
30
|
await (0, teen_process_1.exec)(xcrunPath, [XCTRACE, 'help']);
|
|
38
31
|
}
|
|
@@ -138,7 +131,7 @@ class PerfRecorder {
|
|
|
138
131
|
binaryPath = await requireInstruments();
|
|
139
132
|
}
|
|
140
133
|
const args = [];
|
|
141
|
-
const toolName = path_1.default.basename(binaryPath) === XCRUN ? XCTRACE : INSTRUMENTS;
|
|
134
|
+
const toolName = path_1.default.basename(binaryPath) === xcrun_1.XCRUN ? XCTRACE : INSTRUMENTS;
|
|
142
135
|
if (toolName === XCTRACE) {
|
|
143
136
|
args.push(XCTRACE, 'record', '--device', this._udid, '--template', this._profileName, '--output', this._reportPath, '--time-limit', `${this._timeout}ms`);
|
|
144
137
|
if (this._pid) {
|
|
@@ -198,7 +191,7 @@ class PerfRecorder {
|
|
|
198
191
|
}
|
|
199
192
|
catch (e) {
|
|
200
193
|
await this._enforceTermination();
|
|
201
|
-
const listProfilesCommand = toolName === XCTRACE ? `${XCRUN} ${XCTRACE} list templates` : `${INSTRUMENTS} -s`;
|
|
194
|
+
const listProfilesCommand = toolName === XCTRACE ? `${xcrun_1.XCRUN} ${XCTRACE} list templates` : `${INSTRUMENTS} -s`;
|
|
202
195
|
this._logger.errorAndThrow(`There is no ${DEFAULT_EXT} file found for performance profile ` +
|
|
203
196
|
`'${this._profileName}'. Make sure the profile is supported on this device. ` +
|
|
204
197
|
`You could use '${listProfilesCommand}' command to see the list of all available profiles. ` +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../../lib/commands/performance.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"performance.js","sourceRoot":"","sources":["../../../lib/commands/performance.js"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ declare class IOSDeploy {
|
|
|
42
42
|
* if the app is not found.
|
|
43
43
|
*/
|
|
44
44
|
fetchAppInfo(bundleId: string, returnAttributes?: string | string[] | undefined): Promise<any | undefined>;
|
|
45
|
-
terminateApp(bundleId: any): Promise<boolean>;
|
|
45
|
+
terminateApp(bundleId: any, platformVersion: any): Promise<boolean>;
|
|
46
46
|
/**
|
|
47
47
|
* @param {string} bundleName The name of CFBundleName in Info.plist
|
|
48
48
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios-deploy.d.ts","sourceRoot":"","sources":["../../lib/ios-deploy.js"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"ios-deploy.d.ts","sourceRoot":"","sources":["../../lib/ios-deploy.js"],"names":[],"mappings":";AAsBA;IACE,uBAEC;IADC,UAAgB;IAGlB,qCAOC;IAED,wCAEC;IAED;;;;;;OAMG;IACH,aALW,MAAM,2CAEN,YAAY,GAAC,QAAQ,GAAC,UAAU,GAAC,IAAI,iBAoE/C;IAED,wFA8BC;IAED;;;;;OAKG;IACH,gBAJW,MAAM,WACN,MAAM,YACN,YAAY,GAAC,QAAQ,GAAC,UAAU,GAAC,IAAI,iBAI/C;IAED;;;;;;;OAOG;IACH,yBAJW,MAAM,GACL,QAAQ,OAAO,CAAC,CAK3B;IAED;;;;;;;;;;;OAWG;IACH,uBARW,MAAM,qBACN,MAAM,GAAC,MAAM,EAAE,GAAC,SAAS,GAIvB,QAAQ,MAAO,SAAS,CAAC,CAgBrC;IAED,oEAiFC;IAED;;;;;OAKG;IACH,kDALW,MAAM,GAEJ,QAAQ,MAAM,EAAE,CAAC,CAoB7B;IAED,mCAEC;CACF"}
|
package/build/lib/ios-deploy.js
CHANGED
|
@@ -12,6 +12,7 @@ const lodash_1 = __importDefault(require("lodash"));
|
|
|
12
12
|
const teen_process_1 = require("teen_process");
|
|
13
13
|
const app_utils_1 = require("./app-utils");
|
|
14
14
|
const ios_fs_helpers_1 = require("./ios-fs-helpers");
|
|
15
|
+
const xcrun_1 = require("./xcrun");
|
|
15
16
|
const APPLICATION_INSTALLED_NOTIFICATION = 'com.apple.mobile.application_installed';
|
|
16
17
|
const INSTALLATION_STAGING_DIR = 'PublicStaging';
|
|
17
18
|
const APPLICATION_NOTIFICATION_TIMEOUT_MS = 30 * 1000;
|
|
@@ -179,7 +180,7 @@ class IOSDeploy {
|
|
|
179
180
|
service.close();
|
|
180
181
|
}
|
|
181
182
|
}
|
|
182
|
-
async terminateApp(bundleId) {
|
|
183
|
+
async terminateApp(bundleId, platformVersion) {
|
|
183
184
|
let instrumentService;
|
|
184
185
|
let installProxyService;
|
|
185
186
|
try {
|
|
@@ -191,15 +192,54 @@ class IOSDeploy {
|
|
|
191
192
|
}
|
|
192
193
|
const executableName = apps[bundleId].CFBundleExecutable;
|
|
193
194
|
logger_1.default.debug(`The executable name for the bundle id '${bundleId}' was '${executableName}'`);
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
195
|
+
// 'devicectl' has overhead (generally?) than the instrument service via appium-ios-device,
|
|
196
|
+
// so hre uses the 'devicectl' only for iOS 17+.
|
|
197
|
+
if (support_1.util.compareVersions(platformVersion, '>=', '17.0')) {
|
|
198
|
+
logger_1.default.debug(`Calling devicectl to kill the process`);
|
|
199
|
+
// FIXME: replace `devicectl` command with a wrapper later
|
|
200
|
+
// or remove after implementing appium-ios-device for iOS 17+.
|
|
201
|
+
const xcrunBinnaryPath = await (0, xcrun_1.requireXcrun)();
|
|
202
|
+
const { stdout } = await (0, teen_process_1.exec)(xcrunBinnaryPath, [
|
|
203
|
+
'devicectl',
|
|
204
|
+
'device',
|
|
205
|
+
'info',
|
|
206
|
+
'processes',
|
|
207
|
+
`--device`, this.udid
|
|
208
|
+
]);
|
|
209
|
+
// Each line has spaces. devicectl has JSON output option, but it writes it to a file only.
|
|
210
|
+
// Here parse the standard output directly.
|
|
211
|
+
// e.g.:
|
|
212
|
+
// 823 /private/var/containers/Bundle/Application/8E748312-8CBE-4C13-8295-C2EF3ED2C0C1/WebDriverAgentRunner-Runner.app/WebDriverAgentRunner-Runner
|
|
213
|
+
// 824 /Applications/MobileSafari.app/MobileSafari
|
|
214
|
+
// 825 /usr/libexec/debugserver
|
|
215
|
+
const executableLine = stdout.split('\n').find((line) => line.trim().endsWith(executableName));
|
|
216
|
+
if (!executableLine) {
|
|
217
|
+
logger_1.default.info(`The process of the bundle id '${bundleId}' was not running`);
|
|
218
|
+
return false;
|
|
219
|
+
}
|
|
220
|
+
await (0, teen_process_1.exec)(xcrunBinnaryPath, [
|
|
221
|
+
'devicectl',
|
|
222
|
+
'device',
|
|
223
|
+
'process',
|
|
224
|
+
'signal',
|
|
225
|
+
'-s', `2`,
|
|
226
|
+
// e.g.
|
|
227
|
+
// '824 /Applications/MobileSafari.app/MobileSafari '
|
|
228
|
+
// ' 999 /Applications/MobileSafari.app/MobileSafari ' (can include spaces in the top)
|
|
229
|
+
'-p', `${executableLine.trim().split(/\s+/)[0]}`,
|
|
230
|
+
`--device`, this.udid
|
|
231
|
+
]);
|
|
232
|
+
}
|
|
233
|
+
else {
|
|
234
|
+
instrumentService = await appium_ios_device_1.services.startInstrumentService(this.udid);
|
|
235
|
+
const processes = await instrumentService.callChannel(appium_ios_device_1.INSTRUMENT_CHANNEL.DEVICE_INFO, 'runningProcesses');
|
|
236
|
+
const process = processes.selector.find((process) => process.name === executableName);
|
|
237
|
+
if (!process) {
|
|
238
|
+
logger_1.default.info(`The process of the bundle id '${bundleId}' was not running`);
|
|
239
|
+
return false;
|
|
240
|
+
}
|
|
241
|
+
await instrumentService.callChannel(appium_ios_device_1.INSTRUMENT_CHANNEL.PROCESS_CONTROL, 'killPid:', `${process.pid}`);
|
|
200
242
|
}
|
|
201
|
-
await instrumentService.callChannel(appium_ios_device_1.INSTRUMENT_CHANNEL.PROCESS_CONTROL, 'killPid:', `${process.pid}`);
|
|
202
|
-
return true;
|
|
203
243
|
}
|
|
204
244
|
catch (err) {
|
|
205
245
|
logger_1.default.warn(`Failed to kill '${bundleId}'. Original error: ${err.stderr || err.message}`);
|
|
@@ -213,6 +253,7 @@ class IOSDeploy {
|
|
|
213
253
|
instrumentService.close();
|
|
214
254
|
}
|
|
215
255
|
}
|
|
256
|
+
return true;
|
|
216
257
|
}
|
|
217
258
|
/**
|
|
218
259
|
* @param {string} bundleName The name of CFBundleName in Info.plist
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ios-deploy.js","sourceRoot":"","sources":["../../lib/ios-deploy.js"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"ios-deploy.js","sourceRoot":"","sources":["../../lib/ios-deploy.js"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"xcrun.d.ts","sourceRoot":"","sources":["../../lib/xcrun.js"],"names":[],"mappings":"AAIA,gDASC;AAXD,4BAAsB"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.XCRUN = exports.requireXcrun = void 0;
|
|
4
|
+
const support_1 = require("appium/support");
|
|
5
|
+
const XCRUN = 'xcrun';
|
|
6
|
+
exports.XCRUN = XCRUN;
|
|
7
|
+
async function requireXcrun() {
|
|
8
|
+
try {
|
|
9
|
+
return await support_1.fs.which(XCRUN);
|
|
10
|
+
}
|
|
11
|
+
catch (e) {
|
|
12
|
+
throw new Error(`${XCRUN} has not been found in PATH. ` +
|
|
13
|
+
`Please make sure XCode development tools are installed`);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
exports.requireXcrun = requireXcrun;
|
|
17
|
+
//# sourceMappingURL=xcrun.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"xcrun.js","sourceRoot":"","sources":["../../lib/xcrun.js"],"names":[],"mappings":";;;AAAA,4CAAkC;AAElC,MAAM,KAAK,GAAG,OAAO,CAAC;AAaA,sBAAK;AAX3B,KAAK,UAAU,YAAY;IACzB,IAAI;QACF,OAAO,MAAM,YAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAC9B;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,IAAI,KAAK,CACb,GAAG,KAAK,+BAA+B;YACrC,wDAAwD,CAC3D,CAAC;KACH;AACH,CAAC;AAEO,oCAAY"}
|
|
@@ -139,7 +139,7 @@ export default {
|
|
|
139
139
|
}
|
|
140
140
|
|
|
141
141
|
// @ts-expect-error - do not assign arbitrary properties to `this.opts`
|
|
142
|
-
return await this.opts.device.terminateApp(bundleId);
|
|
142
|
+
return await this.opts.device.terminateApp(bundleId, this.opts.platformVersion);
|
|
143
143
|
},
|
|
144
144
|
|
|
145
145
|
/**
|
|
@@ -3,6 +3,7 @@ import path from 'path';
|
|
|
3
3
|
import {fs, zip, logger, util, tempDir} from 'appium/support';
|
|
4
4
|
import {SubProcess, exec} from 'teen_process';
|
|
5
5
|
import {encodeBase64OrUpload} from '../utils';
|
|
6
|
+
import { XCRUN, requireXcrun } from '../xcrun';
|
|
6
7
|
import {waitForCondition} from 'asyncbox';
|
|
7
8
|
import B from 'bluebird';
|
|
8
9
|
|
|
@@ -18,19 +19,10 @@ const DEFAULT_PROFILE_NAME = 'Activity Monitor';
|
|
|
18
19
|
const DEFAULT_EXT = '.trace';
|
|
19
20
|
const DEFAULT_PID = 'current';
|
|
20
21
|
const INSTRUMENTS = 'instruments';
|
|
21
|
-
const XCRUN = 'xcrun';
|
|
22
22
|
const XCTRACE = 'xctrace';
|
|
23
23
|
|
|
24
24
|
async function requireXctrace() {
|
|
25
|
-
|
|
26
|
-
try {
|
|
27
|
-
xcrunPath = await fs.which(XCRUN);
|
|
28
|
-
} catch (e) {
|
|
29
|
-
throw new Error(
|
|
30
|
-
`${XCRUN} has not been found in PATH. ` +
|
|
31
|
-
`Please make sure XCode development tools are installed`,
|
|
32
|
-
);
|
|
33
|
-
}
|
|
25
|
+
const xcrunPath = await requireXcrun();
|
|
34
26
|
try {
|
|
35
27
|
await exec(xcrunPath, [XCTRACE, 'help']);
|
|
36
28
|
} catch (e) {
|
package/lib/ios-deploy.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {fs, timing} from 'appium/support';
|
|
1
|
+
import {fs, timing, util} from 'appium/support';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import {services, utilities, INSTRUMENT_CHANNEL} from 'appium-ios-device';
|
|
4
4
|
import B from 'bluebird';
|
|
@@ -7,6 +7,7 @@ import _ from 'lodash';
|
|
|
7
7
|
import {exec} from 'teen_process';
|
|
8
8
|
import {extractBundleId} from './app-utils';
|
|
9
9
|
import {pushFolder} from './ios-fs-helpers';
|
|
10
|
+
import { requireXcrun } from './xcrun';
|
|
10
11
|
|
|
11
12
|
const APPLICATION_INSTALLED_NOTIFICATION = 'com.apple.mobile.application_installed';
|
|
12
13
|
const INSTALLATION_STAGING_DIR = 'PublicStaging';
|
|
@@ -192,7 +193,7 @@ class IOSDeploy {
|
|
|
192
193
|
}
|
|
193
194
|
}
|
|
194
195
|
|
|
195
|
-
async terminateApp(bundleId) {
|
|
196
|
+
async terminateApp(bundleId, platformVersion) {
|
|
196
197
|
let instrumentService;
|
|
197
198
|
let installProxyService;
|
|
198
199
|
try {
|
|
@@ -204,22 +205,63 @@ class IOSDeploy {
|
|
|
204
205
|
}
|
|
205
206
|
const executableName = apps[bundleId].CFBundleExecutable;
|
|
206
207
|
log.debug(`The executable name for the bundle id '${bundleId}' was '${executableName}'`);
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
208
|
+
|
|
209
|
+
// 'devicectl' has overhead (generally?) than the instrument service via appium-ios-device,
|
|
210
|
+
// so hre uses the 'devicectl' only for iOS 17+.
|
|
211
|
+
if (util.compareVersions(platformVersion, '>=', '17.0')) {
|
|
212
|
+
log.debug(`Calling devicectl to kill the process`);
|
|
213
|
+
|
|
214
|
+
// FIXME: replace `devicectl` command with a wrapper later
|
|
215
|
+
// or remove after implementing appium-ios-device for iOS 17+.
|
|
216
|
+
|
|
217
|
+
const xcrunBinnaryPath = await requireXcrun();
|
|
218
|
+
const {stdout} = await exec(xcrunBinnaryPath, [
|
|
219
|
+
'devicectl',
|
|
220
|
+
'device',
|
|
221
|
+
'info',
|
|
222
|
+
'processes',
|
|
223
|
+
`--device`, this.udid
|
|
224
|
+
]);
|
|
225
|
+
// Each line has spaces. devicectl has JSON output option, but it writes it to a file only.
|
|
226
|
+
// Here parse the standard output directly.
|
|
227
|
+
// e.g.:
|
|
228
|
+
// 823 /private/var/containers/Bundle/Application/8E748312-8CBE-4C13-8295-C2EF3ED2C0C1/WebDriverAgentRunner-Runner.app/WebDriverAgentRunner-Runner
|
|
229
|
+
// 824 /Applications/MobileSafari.app/MobileSafari
|
|
230
|
+
// 825 /usr/libexec/debugserver
|
|
231
|
+
const executableLine = stdout.split('\n').find((line) => line.trim().endsWith(executableName));
|
|
232
|
+
if (!executableLine) {
|
|
233
|
+
log.info(`The process of the bundle id '${bundleId}' was not running`);
|
|
234
|
+
return false;
|
|
235
|
+
}
|
|
236
|
+
await exec(xcrunBinnaryPath, [
|
|
237
|
+
'devicectl',
|
|
238
|
+
'device',
|
|
239
|
+
'process',
|
|
240
|
+
'signal',
|
|
241
|
+
'-s', `2`,
|
|
242
|
+
// e.g.
|
|
243
|
+
// '824 /Applications/MobileSafari.app/MobileSafari '
|
|
244
|
+
// ' 999 /Applications/MobileSafari.app/MobileSafari ' (can include spaces in the top)
|
|
245
|
+
'-p', `${executableLine.trim().split(/\s+/)[0]}`,
|
|
246
|
+
`--device`, this.udid
|
|
247
|
+
]);
|
|
248
|
+
} else {
|
|
249
|
+
instrumentService = await services.startInstrumentService(this.udid);
|
|
250
|
+
const processes = await instrumentService.callChannel(
|
|
251
|
+
INSTRUMENT_CHANNEL.DEVICE_INFO,
|
|
252
|
+
'runningProcesses',
|
|
253
|
+
);
|
|
254
|
+
const process = processes.selector.find((process) => process.name === executableName);
|
|
255
|
+
if (!process) {
|
|
256
|
+
log.info(`The process of the bundle id '${bundleId}' was not running`);
|
|
257
|
+
return false;
|
|
258
|
+
}
|
|
259
|
+
await instrumentService.callChannel(
|
|
260
|
+
INSTRUMENT_CHANNEL.PROCESS_CONTROL,
|
|
261
|
+
'killPid:',
|
|
262
|
+
`${process.pid}`,
|
|
263
|
+
);
|
|
216
264
|
}
|
|
217
|
-
await instrumentService.callChannel(
|
|
218
|
-
INSTRUMENT_CHANNEL.PROCESS_CONTROL,
|
|
219
|
-
'killPid:',
|
|
220
|
-
`${process.pid}`,
|
|
221
|
-
);
|
|
222
|
-
return true;
|
|
223
265
|
} catch (err) {
|
|
224
266
|
log.warn(`Failed to kill '${bundleId}'. Original error: ${err.stderr || err.message}`);
|
|
225
267
|
return false;
|
|
@@ -231,6 +273,7 @@ class IOSDeploy {
|
|
|
231
273
|
instrumentService.close();
|
|
232
274
|
}
|
|
233
275
|
}
|
|
276
|
+
return true;
|
|
234
277
|
}
|
|
235
278
|
|
|
236
279
|
/**
|
package/lib/xcrun.js
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import {fs} from 'appium/support';
|
|
2
|
+
|
|
3
|
+
const XCRUN = 'xcrun';
|
|
4
|
+
|
|
5
|
+
async function requireXcrun() {
|
|
6
|
+
try {
|
|
7
|
+
return await fs.which(XCRUN);
|
|
8
|
+
} catch (e) {
|
|
9
|
+
throw new Error(
|
|
10
|
+
`${XCRUN} has not been found in PATH. ` +
|
|
11
|
+
`Please make sure XCode development tools are installed`,
|
|
12
|
+
);
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export {requireXcrun, XCRUN};
|
package/package.json
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
"xcuitest",
|
|
9
9
|
"xctest"
|
|
10
10
|
],
|
|
11
|
-
"version": "5.2.
|
|
11
|
+
"version": "5.2.1",
|
|
12
12
|
"author": "Appium Contributors",
|
|
13
13
|
"license": "Apache-2.0",
|
|
14
14
|
"repository": {
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
"portscanner": "^2.2.0",
|
|
89
89
|
"semver": "^7.5.4",
|
|
90
90
|
"source-map-support": "^0.x",
|
|
91
|
-
"teen_process": "2.0.
|
|
91
|
+
"teen_process": "2.0.23",
|
|
92
92
|
"ws": "^8.13.0"
|
|
93
93
|
},
|
|
94
94
|
"scripts": {
|