appium-xcuitest-driver 7.9.1 → 7.9.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.
Files changed (26) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/build/lib/commands/recordscreen.js +1 -1
  3. package/build/lib/commands/recordscreen.js.map +1 -1
  4. package/build/lib/driver.d.ts +3 -2
  5. package/build/lib/driver.d.ts.map +1 -1
  6. package/build/lib/driver.js +26 -23
  7. package/build/lib/driver.js.map +1 -1
  8. package/build/lib/py-ios-device-client.d.ts +1 -1
  9. package/build/lib/py-ios-device-client.d.ts.map +1 -1
  10. package/build/lib/real-device-management.d.ts +6 -0
  11. package/build/lib/real-device-management.d.ts.map +1 -1
  12. package/build/lib/real-device-management.js +22 -1
  13. package/build/lib/real-device-management.js.map +1 -1
  14. package/build/lib/types.d.ts +0 -32
  15. package/build/lib/types.d.ts.map +1 -1
  16. package/build/lib/utils.d.ts +12 -3
  17. package/build/lib/utils.d.ts.map +1 -1
  18. package/build/lib/utils.js +11 -17
  19. package/build/lib/utils.js.map +1 -1
  20. package/lib/commands/recordscreen.js +1 -1
  21. package/lib/driver.js +29 -21
  22. package/lib/real-device-management.js +21 -0
  23. package/lib/types.ts +0 -35
  24. package/lib/utils.js +10 -17
  25. package/npm-shrinkwrap.json +17 -17
  26. package/package.json +2 -2
package/build/lib/real-device-management.js CHANGED
@@ -3,9 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.applySafariStartupArgs = exports.runRealDeviceReset = exports.installToRealDevice = void 0;
6
+ exports.detectUdid = exports.applySafariStartupArgs = exports.runRealDeviceReset = exports.installToRealDevice = void 0;
7
7
  const lodash_1 = __importDefault(require("lodash"));
8
8
  const app_utils_1 = require("./app-utils");
9
+ const appium_ios_device_1 = require("appium-ios-device");
9
10
  /**
10
11
  * @typedef {Object} InstallOptions
11
12
  *
@@ -98,7 +99,27 @@ function applySafariStartupArgs() {
98
99
  return true;
99
100
  }
100
101
  exports.applySafariStartupArgs = applySafariStartupArgs;
102
+ /**
103
+ * @this {XCUITestDriver}
104
+ * @returns {Promise<string>}
105
+ */
106
+ async function detectUdid() {
107
+ this.log.debug('Auto-detecting real device udid...');
108
+ const udids = await appium_ios_device_1.utilities.getConnectedDevices();
109
+ if (lodash_1.default.isEmpty(udids)) {
110
+ throw new Error('No real devices are connected to the host');
111
+ }
112
+ const udid = lodash_1.default.last(udids);
113
+ if (udids.length > 1) {
114
+ this.log.info(`Multiple devices found: ${udids.join(', ')}`);
115
+ this.log.info(`Choosing '${udid}'. Consider settings the 'udid' capability if another device must be selected`);
116
+ }
117
+ this.log.debug(`Detected real device udid: '${udid}'`);
118
+ return udid;
119
+ }
120
+ exports.detectUdid = detectUdid;
101
121
  /**
102
122
  * @typedef {import('./real-device').RealDevice} RealDevice}
123
+ * @typedef {import('./driver').XCUITestDriver} XCUITestDriver
103
124
  */
104
125
  //# sourceMappingURL=real-device-management.js.map
package/build/lib/real-device-management.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"real-device-management.js","sourceRoot":"","sources":["../../lib/real-device-management.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"real-device-management.js","sourceRoot":"","sources":["../../lib/real-device-management.js"],"names":[],"mappings":"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"}
package/build/lib/types.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- import { StringRecord } from '@appium/types';
2
1
  export interface Page {
3
2
  id: number | string;
4
3
  isKey?: boolean;
@@ -11,37 +10,6 @@ export interface AsyncPromise {
11
10
  export interface LifecycleData {
12
11
  createSim?: boolean;
13
12
  }
14
- export interface WDASettings {
15
- elementResponseAttributes: string;
16
- shouldUseCompactResponses: boolean;
17
- mjpegServerScreenshotQuality?: number;
18
- mjpegServerFramerate?: number;
19
- screenshotQuality?: number;
20
- }
21
- /**
22
- * @todo This should likely be shipped by `appium-webdriveragent` instead.
23
- */
24
- export interface WDACapabilities {
25
- bundleId?: string;
26
- initialUrl?: string;
27
- arguments: string[];
28
- environment: Record<string, string>;
29
- eventloopIdleDelaySec: number;
30
- shouldWaitForQuiescence: boolean;
31
- shouldUseTestManagerForVisibilityDetection: boolean;
32
- maxTypingFrequency: number;
33
- shouldUseSingletonTestManager: boolean;
34
- waitForIdleTimeout?: number;
35
- shouldUseCompactResponses?: number;
36
- elementResponseFields?: unknown;
37
- disableAutomaticScreenshots?: boolean;
38
- shouldTerminateApp: boolean;
39
- forceAppLaunch: boolean;
40
- useNativeCachingStrategy: boolean;
41
- forceSimulatorSoftwareKeyboardPresence: boolean;
42
- defaultAlertAction: 'accept' | 'dismiss';
43
- capabilities?: StringRecord<any>;
44
- }
45
13
  export interface CalibrationData {
46
14
  /**
47
15
  * webview x offset in real coordinates
package/build/lib/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAE3C,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,WAAW;IAC1B,yBAAyB,EAAE,MAAM,CAAC;IAClC,yBAAyB,EAAE,OAAO,CAAC;IACnC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,qBAAqB,EAAE,MAAM,CAAC;IAC9B,uBAAuB,EAAE,OAAO,CAAC;IACjC,0CAA0C,EAAE,OAAO,CAAC;IACpD,kBAAkB,EAAE,MAAM,CAAC;IAC3B,6BAA6B,EAAE,OAAO,CAAC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,wBAAwB,EAAE,OAAO,CAAC;IAClC,sCAAsC,EAAE,OAAO,CAAC;IAChD,kBAAkB,EAAE,QAAQ,GAAG,SAAS,CAAC;IACzC,YAAY,CAAC,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../lib/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,IAAI;IACnB,EAAE,EAAE,MAAM,GAAG,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAC9B,MAAM,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB"}
package/build/lib/utils.d.ts CHANGED
@@ -59,7 +59,6 @@ export type DriverInfo = {
59
59
  built: string;
60
60
  };
61
61
  export type XcodeVersion = import('appium-xcode').XcodeVersion;
62
- export function detectUdid(): Promise<any>;
63
62
  /**
64
63
  * @privateRemarks Is the minimum version really Xcode 7.3?
65
64
  * @returns {Promise<XcodeVersion>}
@@ -83,7 +82,13 @@ export const getDriverInfo: (() => Promise<{
83
82
  version: any;
84
83
  }>) & _.MemoizedFunction;
85
84
  export function clearSystemFiles(wda: any): Promise<void>;
86
- export function translateDeviceName(platformVersion: any, deviceName: any): any;
85
+ /**
86
+ *
87
+ * @param {string} platformVersion
88
+ * @param {string} deviceName
89
+ * @returns {string}
90
+ */
91
+ export function translateDeviceName(platformVersion: string, deviceName: string): string;
87
92
  export function normalizeCommandTimeouts(value: any): any;
88
93
  export const DEFAULT_TIMEOUT_KEY: "default";
89
94
  export function markSystemFilesForCleanup(wda: any): Promise<void>;
@@ -150,7 +155,11 @@ export function isLocalHost(urlString: string): boolean;
150
155
  * @throws {Error} if the version number cannot be parsed
151
156
  */
152
157
  export function normalizePlatformVersion(originalVersion: string): string;
153
- export function clearLogs(locations: any): Promise<void>;
158
+ /**
159
+ * @param {string[]} locations
160
+ * @returns {Promise<void>}
161
+ */
162
+ export function clearLogs(locations: string[]): Promise<void>;
154
163
  /**
155
164
  * Assert the presence of particular keys in the given object
156
165
  *
package/build/lib/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"AAwdA;;;;;GAKG;AACH,wCAHW,MAAM,UACN,OAAO,UAAU,EAAE,cAAc,QAM3C;AAED;;;;;GAKG;AACH,qCAHW,MAAM,GAAC,IAAI,GAAC,SAAS,GACnB,OAAO,CAInB;AAED;;;;;GAKG;AACH,oDAHW,MAAM,GAAC,IAAI,GAAC,SAAS,GACnB,MAAM,CAIlB;AAveD,+BAAgC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAyPlB,MAAM;;;;WACN,MAAM;;2BAqQP,OAAO,cAAc,EAAE,YAAY;AAtfhD,2CAaC;AAED;;;GAGG;AACH,2CAFa,QAAQ,YAAY,CAAC,CAmBjC;AAED;;GAEG;AACH,4CAFa,QAAQ,MAAM,GAAC,IAAI,CAAC,CAQhC;AA8JD,yDAMC;AA2BD;;;;GAIG;AAEH;;GAEG;AACH;;;yBASG;AAjHH,0DA4DC;AA/HD,gFAcC;AAwKD,0DAgCC;AAzSD,4CAAsC;AAsItC,mEAcC;AAuJD,2CAOC;AAED;;;;;;;;;;;;GAYG;AACH,6CARW,MAAM,GAAC,MAAM,oCAMX,QAAQ,MAAM,EAAE,CAAC,CAmB7B;AAED;;;;;;;;;;;GAWG;AAEH;;;;;;;;;;;GAWG;AACH,gDAPW,MAAM,0DAGN,aAAa,GACX,QAAQ,MAAM,CAAC,CA0B3B;AAED;;;;;;;GAOG;AACH,0EAFW,MAAM,GAAC,IAAI,iBAWrB;AAED;;;;GAIG;AACH,uCAHW,MAAM,GACJ,OAAO,CAUnB;AAED;;;;;;GAMG;AACH,0DAJW,MAAM,GACL,MAAM,CASjB;AAlVD,yDA4BC;AAwTD;;;;;;GAMG;AACH,sCAJW,MAAM,GAAC,MAAM,MAAM,CAAC,mBAW9B;cAjda,QAAQ"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"AAkdA;;;;;GAKG;AACH,wCAHW,MAAM,UACN,OAAO,UAAU,EAAE,cAAc,QAM3C;AAED;;;;;GAKG;AACH,qCAHW,MAAM,GAAC,IAAI,GAAC,SAAS,GACnB,OAAO,CAInB;AAED;;;;;GAKG;AACH,oDAHW,MAAM,GAAC,IAAI,GAAC,SAAS,GACnB,MAAM,CAIlB;AAleD,+BAAgC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAoPlB,MAAM;;;;WACN,MAAM;;2BAoQP,OAAO,cAAc,EAAE,YAAY;AAhfhD;;;GAGG;AACH,2CAFa,QAAQ,YAAY,CAAC,CAmBjC;AAED;;GAEG;AACH,4CAFa,QAAQ,MAAM,GAAC,IAAI,CAAC,CAQhC;AAwKD,yDAMC;AA2BD;;;;GAIG;AAEH;;GAEG;AACH;;;yBASG;AAjHH,0DA4DC;AAzID;;;;;GAKG;AACH,qDAJW,MAAM,cACN,MAAM,GACJ,MAAM,CAgBlB;AA4KD,0DAgCC;AApSD,4CAAsC;AAiItC,mEAcC;AAuJD,2CAOC;AAED;;;;;;;;;;;;GAYG;AACH,6CARW,MAAM,GAAC,MAAM,oCAMX,QAAQ,MAAM,EAAE,CAAC,CAmB7B;AAED;;;;;;;;;;;GAWG;AAEH;;;;;;;;;;;GAWG;AACH,gDAPW,MAAM,0DAGN,aAAa,GACX,QAAQ,MAAM,CAAC,CA0B3B;AAED;;;;;;;GAOG;AACH,0EAFW,MAAM,GAAC,IAAI,iBAWrB;AAED;;;;GAIG;AACH,uCAHW,MAAM,GACJ,OAAO,CAUnB;AAED;;;;;;GAMG;AACH,0DAJW,MAAM,GACL,MAAM,CASjB;AAtVD;;;GAGG;AACH,qCAHW,MAAM,EAAE,GACN,QAAQ,IAAI,CAAC,CA8BzB;AAwTD;;;;;;GAMG;AACH,sCAJW,MAAM,GAAC,MAAM,MAAM,CAAC,mBAW9B;cA5ca,QAAQ"}
package/build/lib/utils.js CHANGED
@@ -3,8 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.requireArgs = exports.clearLogs = exports.normalizePlatformVersion = exports.isLocalHost = exports.removeAllSessionWebSocketHandlers = exports.encodeBase64OrUpload = exports.getPIDsListeningOnPort = exports.printUser = exports.markSystemFilesForCleanup = exports.DEFAULT_TIMEOUT_KEY = exports.normalizeCommandTimeouts = exports.translateDeviceName = exports.clearSystemFiles = exports.getDriverInfo = exports.checkAppPresent = exports.getAndCheckIosSdkVersion = exports.getAndCheckXcodeVersion = exports.detectUdid = exports.normalizePlatformName = exports.isTvOs = exports.assertSimulator = exports.UDID_AUTO = void 0;
7
- const appium_ios_device_1 = require("appium-ios-device");
6
+ exports.requireArgs = exports.clearLogs = exports.normalizePlatformVersion = exports.isLocalHost = exports.removeAllSessionWebSocketHandlers = exports.encodeBase64OrUpload = exports.getPIDsListeningOnPort = exports.printUser = exports.markSystemFilesForCleanup = exports.DEFAULT_TIMEOUT_KEY = exports.normalizeCommandTimeouts = exports.translateDeviceName = exports.clearSystemFiles = exports.getDriverInfo = exports.checkAppPresent = exports.getAndCheckIosSdkVersion = exports.getAndCheckXcodeVersion = exports.normalizePlatformName = exports.isTvOs = exports.assertSimulator = exports.UDID_AUTO = void 0;
8
7
  const appium_xcode_1 = __importDefault(require("appium-xcode"));
9
8
  const driver_1 = require("appium/driver");
10
9
  const support_1 = require("appium/support");
@@ -27,21 +26,6 @@ const XCTEST_LOG_FILES_PATTERNS = [
27
26
  /^StandardOutputAndStandardError\.txt$/i,
28
27
  ];
29
28
  const XCTEST_LOGS_CACHE_FOLDER_PREFIX = 'com.apple.dt.XCTest';
30
- async function detectUdid() {
31
- logger_1.default.debug('Auto-detecting real device udid...');
32
- const udids = await appium_ios_device_1.utilities.getConnectedDevices();
33
- if (lodash_1.default.isEmpty(udids)) {
34
- throw new Error('No device is connected to the host');
35
- }
36
- const udid = lodash_1.default.last(udids);
37
- if (udids.length > 1) {
38
- logger_1.default.warn(`Multiple devices found: ${udids.join(', ')}`);
39
- logger_1.default.warn(`Choosing '${udid}'. If this is wrong, manually set with 'udid' desired capability`);
40
- }
41
- logger_1.default.debug(`Detected real device udid: '${udid}'`);
42
- return udid;
43
- }
44
- exports.detectUdid = detectUdid;
45
29
  /**
46
30
  * @privateRemarks Is the minimum version really Xcode 7.3?
47
31
  * @returns {Promise<XcodeVersion>}
@@ -101,6 +85,12 @@ function getGenericSimulatorForIosVersion(platformVersion, deviceName) {
101
85
  }
102
86
  return result;
103
87
  }
88
+ /**
89
+ *
90
+ * @param {string} platformVersion
91
+ * @param {string} deviceName
92
+ * @returns {string}
93
+ */
104
94
  function translateDeviceName(platformVersion, deviceName) {
105
95
  if (!deviceName) {
106
96
  return deviceName;
@@ -113,6 +103,10 @@ function translateDeviceName(platformVersion, deviceName) {
113
103
  return deviceNameTranslated;
114
104
  }
115
105
  exports.translateDeviceName = translateDeviceName;
106
+ /**
107
+ * @param {string[]} locations
108
+ * @returns {Promise<void>}
109
+ */
116
110
  async function clearLogs(locations) {
117
111
  logger_1.default.debug('Clearing log files');
118
112
  const cleanupPromises = [];
package/build/lib/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
package/lib/commands/recordscreen.js CHANGED
@@ -252,7 +252,7 @@ export default {
252
252
  }
253
253
 
254
254
  let {mjpegServerScreenshotQuality, mjpegServerFramerate} =
255
- /** @type {import('../types').WDASettings} */ (
255
+ /** @type {import('appium-webdriveragent').WDASettings} */ (
256
256
  await this.proxyCommand('/appium/settings', 'GET')
257
257
  );
258
258
  if (videoQuality) {
package/lib/driver.js CHANGED
@@ -33,6 +33,7 @@ import {
33
33
  installToRealDevice,
34
34
  runRealDeviceReset,
35
35
  applySafariStartupArgs,
36
+ detectUdid,
36
37
  } from './real-device-management';
37
38
  import {
38
39
  RealDevice,
@@ -53,7 +54,6 @@ import {
53
54
  UDID_AUTO,
54
55
  checkAppPresent,
55
56
  clearSystemFiles,
56
- detectUdid,
57
57
  getAndCheckIosSdkVersion,
58
58
  getAndCheckXcodeVersion,
59
59
  getDriverInfo,
@@ -265,6 +265,9 @@ export class XCUITestDriver extends BaseDriver {
265
265
  /** @type {string|null} */
266
266
  _iosSdkVersion;
267
267
 
268
+ /** @type {WebDriverAgent} */
269
+ wda;
270
+
268
271
  /**
269
272
  *
270
273
  * @param {XCUITestDriverOpts} opts
@@ -331,6 +334,7 @@ export class XCUITestDriver extends BaseDriver {
331
334
 
332
335
  resetIos() {
333
336
  this.opts = this.opts || {};
337
+ // @ts-ignore this is ok
334
338
  this.wda = null;
335
339
  this.jwpProxyActive = false;
336
340
  this.proxyReqRes = null;
@@ -431,7 +435,7 @@ export class XCUITestDriver extends BaseDriver {
431
435
  await this.updateSettings({useJSONSource: this.opts.useJSONSource});
432
436
  }
433
437
 
434
- /** @type {import('./types').WDASettings} */
438
+ /** @type {import('appium-webdriveragent').WDASettings} */
435
439
  let wdaSettings = {
436
440
  elementResponseAttributes: DEFAULT_SETTINGS.elementResponseAttributes,
437
441
  shouldUseCompactResponses: DEFAULT_SETTINGS.shouldUseCompactResponses,
@@ -522,6 +526,7 @@ export class XCUITestDriver extends BaseDriver {
522
526
  );
523
527
  this.opts.platformVersion = normalizedVersion;
524
528
  }
529
+ this.caps.platformVersion = this.opts.platformVersion;
525
530
 
526
531
  if (_.isEmpty(this.xcodeVersion) && (this.isXcodebuildNeeded() || this.isSimulator())) {
527
532
  // no `webDriverAgentUrl`, or on a simulator, so we need an Xcode version
@@ -562,6 +567,7 @@ export class XCUITestDriver extends BaseDriver {
562
567
  realDevice: this.isRealDevice(),
563
568
  iosSdkVersion: this._iosSdkVersion,
564
569
  },
570
+ // @ts-ignore this is ok
565
571
  this.log,
566
572
  );
567
573
  // Derived data path retrieval is an expensive operation
@@ -1165,7 +1171,7 @@ export class XCUITestDriver extends BaseDriver {
1165
1171
  this.lifecycleData.createSim = false;
1166
1172
 
1167
1173
  // if we get generic names, translate them
1168
- this.opts.deviceName = translateDeviceName(this.opts.platformVersion, this.opts.deviceName);
1174
+ this.opts.deviceName = translateDeviceName(this.opts.platformVersion ?? '', this.opts.deviceName);
1169
1175
 
1170
1176
  const setupVersionCaps = async () => {
1171
1177
  this._iosSdkVersion = await getAndCheckIosSdkVersion();
@@ -1182,7 +1188,7 @@ export class XCUITestDriver extends BaseDriver {
1182
1188
  if (this.opts.udid) {
1183
1189
  if (this.opts.udid.toLowerCase() === UDID_AUTO) {
1184
1190
  try {
1185
- this.opts.udid = await detectUdid();
1191
+ this.opts.udid = await detectUdid.bind(this)();
1186
1192
  } catch (err) {
1187
1193
  // Trying to find matching UDID for Simulator
1188
1194
  this.log.warn(
@@ -1203,24 +1209,27 @@ export class XCUITestDriver extends BaseDriver {
1203
1209
  } else {
1204
1210
  // If the session specified this.opts.webDriverAgentUrl with a real device,
1205
1211
  // we can assume the user prepared the device properly already.
1206
- if (this.opts.webDriverAgentUrl) {
1207
- this.log.debug('Skipping checking of the device availability since the session specifies appium:webDriverAgentUrl');
1208
- } else {
1209
- // make sure it is a connected device. If not, the udid passed in is invalid
1212
+ let isRealDeviceUdid = false;
1213
+ const shouldCheckAvailableRealDevices = !this.opts.webDriverAgentUrl;
1214
+ if (!shouldCheckAvailableRealDevices) {
1210
1215
  const devices = await getConnectedDevices();
1211
- this.log.debug(`Available devices: ${devices.join(', ')}`);
1212
- if (!devices.includes(this.opts.udid)) {
1213
- // check for a particular simulator
1214
- this.log.debug(`No real device with udid '${this.opts.udid}'. Looking for a simulator`);
1215
- try {
1216
- const device = await getSimulator(this.opts.udid, {
1217
- devicesSetPath: this.opts.simulatorDevicesSetPath,
1218
- logger: this.log,
1219
- });
1220
- return {device, realDevice: false, udid: this.opts.udid};
1221
- } catch (ign) {
1216
+ this.log.debug(`Available real devices: ${devices.join(', ')}`);
1217
+ isRealDeviceUdid = devices.includes(this.opts.udid);
1218
+ }
1219
+ if (!isRealDeviceUdid) {
1220
+ try {
1221
+ const device = await getSimulator(this.opts.udid, {
1222
+ devicesSetPath: this.opts.simulatorDevicesSetPath,
1223
+ logger: this.log,
1224
+ });
1225
+ return {device, realDevice: false, udid: this.opts.udid};
1226
+ } catch {
1227
+ if (shouldCheckAvailableRealDevices) {
1222
1228
  throw new Error(`Unknown device or simulator UDID: '${this.opts.udid}'`);
1223
1229
  }
1230
+ this.log.debug(
1231
+ 'Skipping checking of the real devices availability since the session specifies appium:webDriverAgentUrl'
1232
+ );
1224
1233
  }
1225
1234
  }
1226
1235
  }
@@ -1334,7 +1343,7 @@ export class XCUITestDriver extends BaseDriver {
1334
1343
  }
1335
1344
  }
1336
1345
 
1337
- /** @type {WDACapabilities} */
1346
+ /** @type {import('appium-webdriveragent').WDACapabilities} */
1338
1347
  const wdaCaps = /** @type {any} */ ({
1339
1348
  bundleId: this.opts.autoLaunch === false ? undefined : bundleId,
1340
1349
  arguments: args,
@@ -2262,7 +2271,6 @@ export default XCUITestDriver;
2262
2271
  * @typedef {typeof desiredCapConstraints} XCUITestDriverConstraints
2263
2272
  * @typedef {import('@appium/types').DriverOpts<XCUITestDriverConstraints>} XCUITestDriverOpts
2264
2273
  * @typedef {import('./commands/types').FullContext} FullContext
2265
- * @typedef {import('./types').WDACapabilities} WDACapabilities
2266
2274
  * @typedef {import('appium-xcode').XcodeVersion} XcodeVersion
2267
2275
  * @typedef {import('appium-ios-simulator').Simulator} Simulator
2268
2276
  */
package/lib/real-device-management.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import _ from 'lodash';
2
2
  import {buildSafariPreferences} from './app-utils';
3
+ import {utilities} from 'appium-ios-device';
3
4
 
4
5
  /**
5
6
  * @typedef {Object} InstallOptions
@@ -99,6 +100,26 @@ export function applySafariStartupArgs() {
99
100
  return true;
100
101
  }
101
102
 
103
+ /**
104
+ * @this {XCUITestDriver}
105
+ * @returns {Promise<string>}
106
+ */
107
+ export async function detectUdid() {
108
+ this.log.debug('Auto-detecting real device udid...');
109
+ const udids = await utilities.getConnectedDevices();
110
+ if (_.isEmpty(udids)) {
111
+ throw new Error('No real devices are connected to the host');
112
+ }
113
+ const udid = _.last(udids);
114
+ if (udids.length > 1) {
115
+ this.log.info(`Multiple devices found: ${udids.join(', ')}`);
116
+ this.log.info(`Choosing '${udid}'. Consider settings the 'udid' capability if another device must be selected`);
117
+ }
118
+ this.log.debug(`Detected real device udid: '${udid}'`);
119
+ return udid;
120
+ }
121
+
102
122
  /**
103
123
  * @typedef {import('./real-device').RealDevice} RealDevice}
124
+ * @typedef {import('./driver').XCUITestDriver} XCUITestDriver
104
125
  */
package/lib/types.ts CHANGED
@@ -1,5 +1,3 @@
1
- import {StringRecord} from '@appium/types';
2
-
3
1
  export interface Page {
4
2
  id: number | string;
5
3
  isKey?: boolean;
@@ -15,39 +13,6 @@ export interface LifecycleData {
15
13
  createSim?: boolean;
16
14
  }
17
15
 
18
- export interface WDASettings {
19
- elementResponseAttributes: string;
20
- shouldUseCompactResponses: boolean;
21
- mjpegServerScreenshotQuality?: number;
22
- mjpegServerFramerate?: number;
23
- screenshotQuality?: number;
24
- }
25
-
26
- /**
27
- * @todo This should likely be shipped by `appium-webdriveragent` instead.
28
- */
29
- export interface WDACapabilities {
30
- bundleId?: string;
31
- initialUrl?: string;
32
- arguments: string[];
33
- environment: Record<string, string>;
34
- eventloopIdleDelaySec: number;
35
- shouldWaitForQuiescence: boolean;
36
- shouldUseTestManagerForVisibilityDetection: boolean;
37
- maxTypingFrequency: number;
38
- shouldUseSingletonTestManager: boolean;
39
- waitForIdleTimeout?: number;
40
- shouldUseCompactResponses?: number;
41
- elementResponseFields?: unknown;
42
- disableAutomaticScreenshots?: boolean;
43
- shouldTerminateApp: boolean;
44
- forceAppLaunch: boolean;
45
- useNativeCachingStrategy: boolean;
46
- forceSimulatorSoftwareKeyboardPresence: boolean;
47
- defaultAlertAction: 'accept' | 'dismiss';
48
- capabilities?: StringRecord<any>;
49
- }
50
-
51
16
  export interface CalibrationData {
52
17
  /**
53
18
  * webview x offset in real coordinates
package/lib/utils.js CHANGED
@@ -1,4 +1,3 @@
1
- import {utilities} from 'appium-ios-device';
2
1
  import xcode from 'appium-xcode';
3
2
  import {errors} from 'appium/driver';
4
3
  import {fs, net, util} from 'appium/support';
@@ -22,21 +21,6 @@ const XCTEST_LOG_FILES_PATTERNS = [
22
21
  ];
23
22
  const XCTEST_LOGS_CACHE_FOLDER_PREFIX = 'com.apple.dt.XCTest';
24
23
 
25
- async function detectUdid() {
26
- log.debug('Auto-detecting real device udid...');
27
- const udids = await utilities.getConnectedDevices();
28
- if (_.isEmpty(udids)) {
29
- throw new Error('No device is connected to the host');
30
- }
31
- const udid = _.last(udids);
32
- if (udids.length > 1) {
33
- log.warn(`Multiple devices found: ${udids.join(', ')}`);
34
- log.warn(`Choosing '${udid}'. If this is wrong, manually set with 'udid' desired capability`);
35
- }
36
- log.debug(`Detected real device udid: '${udid}'`);
37
- return udid;
38
- }
39
-
40
24
  /**
41
25
  * @privateRemarks Is the minimum version really Xcode 7.3?
42
26
  * @returns {Promise<XcodeVersion>}
@@ -98,6 +82,12 @@ function getGenericSimulatorForIosVersion(platformVersion, deviceName) {
98
82
  return result;
99
83
  }
100
84
 
85
+ /**
86
+ *
87
+ * @param {string} platformVersion
88
+ * @param {string} deviceName
89
+ * @returns {string}
90
+ */
101
91
  function translateDeviceName(platformVersion, deviceName) {
102
92
  if (!deviceName) {
103
93
  return deviceName;
@@ -114,6 +104,10 @@ function translateDeviceName(platformVersion, deviceName) {
114
104
  return deviceNameTranslated;
115
105
  }
116
106
 
107
+ /**
108
+ * @param {string[]} locations
109
+ * @returns {Promise<void>}
110
+ */
117
111
  async function clearLogs(locations) {
118
112
  log.debug('Clearing log files');
119
113
  const cleanupPromises = [];
@@ -503,7 +497,6 @@ export function normalizePlatformName(platformName) {
503
497
  }
504
498
 
505
499
  export {
506
- detectUdid,
507
500
  getAndCheckXcodeVersion,
508
501
  getAndCheckIosSdkVersion,
509
502
  checkAppPresent,
package/npm-shrinkwrap.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "appium-xcuitest-driver",
3
- "version": "7.9.1",
3
+ "version": "7.9.3",
4
4
  "lockfileVersion": 3,
5
5
  "requires": true,
6
6
  "packages": {
7
7
  "": {
8
8
  "name": "appium-xcuitest-driver",
9
- "version": "7.9.1",
9
+ "version": "7.9.3",
10
10
  "license": "Apache-2.0",
11
11
  "dependencies": {
12
12
  "@colors/colors": "^1.6.0",
@@ -14,7 +14,7 @@
14
14
  "appium-ios-device": "^2.5.4",
15
15
  "appium-ios-simulator": "^6.1.2",
16
16
  "appium-remote-debugger": "^11.0.0",
17
- "appium-webdriveragent": "^8.3.1",
17
+ "appium-webdriveragent": "^8.5.0",
18
18
  "appium-xcode": "^5.1.4",
19
19
  "async-lock": "^1.4.0",
20
20
  "asyncbox": "^3.0.0",
@@ -639,9 +639,9 @@
639
639
  }
640
640
  },
641
641
  "node_modules/@types/express-serve-static-core": {
642
- "version": "4.17.43",
643
- "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.43.tgz",
644
- "integrity": "sha512-oaYtiBirUOPQGSWNGPWnzyAFJ0BP3cwvN4oWZQY+zUBwpVIGsKUkpBpSztp74drYcjavs7SKFZ4DX1V2QeN8rg==",
642
+ "version": "4.19.0",
643
+ "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.0.tgz",
644
+ "integrity": "sha512-bGyep3JqPCRry1wq+O5n7oiBgGWmeIJXPjXXCo8EK0u8duZGSYar7cGqd3ML2JUsLGeB7fmc06KYo9fLGWqPvQ==",
645
645
  "dependencies": {
646
646
  "@types/node": "*",
647
647
  "@types/qs": "*",
@@ -717,9 +717,9 @@
717
717
  }
718
718
  },
719
719
  "node_modules/@types/node": {
720
- "version": "20.12.2",
721
- "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.2.tgz",
722
- "integrity": "sha512-zQ0NYO87hyN6Xrclcqp7f8ZbXNbRfoGWNcMvHTPQp9UUrwI0mI7XBz+cu7/W6/VClYo2g63B0cjull/srU7LgQ==",
720
+ "version": "20.12.5",
721
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.5.tgz",
722
+ "integrity": "sha512-BD+BjQ9LS/D8ST9p5uqBxghlN+S42iuNxjsUGjeZobe/ciXzk2qb1B6IXc6AnRLS+yFJRpN2IPEHMzwspfDJNw==",
723
723
  "dependencies": {
724
724
  "undici-types": "~5.26.4"
725
725
  }
@@ -783,13 +783,13 @@
783
783
  }
784
784
  },
785
785
  "node_modules/@types/serve-static": {
786
- "version": "1.15.5",
787
- "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.5.tgz",
788
- "integrity": "sha512-PDRk21MnK70hja/YF8AHfC7yIsiQHn1rcXx7ijCFBX/k+XQJhQT/gw3xekXKJvx+5SXaMMS8oqQy09Mzvz2TuQ==",
786
+ "version": "1.15.7",
787
+ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
788
+ "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
789
789
  "dependencies": {
790
790
  "@types/http-errors": "*",
791
- "@types/mime": "*",
792
- "@types/node": "*"
791
+ "@types/node": "*",
792
+ "@types/send": "*"
793
793
  }
794
794
  },
795
795
  "node_modules/@types/shell-quote": {
@@ -953,9 +953,9 @@
953
953
  }
954
954
  },
955
955
  "node_modules/appium-webdriveragent": {
956
- "version": "8.3.1",
957
- "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-8.3.1.tgz",
958
- "integrity": "sha512-tofiPgPdutA+A7H380negfUYM5y7EH2zjljtH3+JMrOlsiSYVLTjK2HozWe7A7hkL3LBUinN7dcKPy8wjq1wJg==",
956
+ "version": "8.5.0",
957
+ "resolved": "https://registry.npmjs.org/appium-webdriveragent/-/appium-webdriveragent-8.5.0.tgz",
958
+ "integrity": "sha512-KPdNQaJxQdyr4xXWeAOwRdubyNZo3be9xfTPdxull6bw/uzAenqjT8uA8WuKfGVdvFQHKUo67sUO0slnPGxhyQ==",
959
959
  "dependencies": {
960
960
  "@appium/base-driver": "^9.0.0",
961
961
  "@appium/strongbox": "^0.x",
package/package.json CHANGED
@@ -8,7 +8,7 @@
8
8
  "xcuitest",
9
9
  "xctest"
10
10
  ],
11
- "version": "7.9.1",
11
+ "version": "7.9.3",
12
12
  "author": "Appium Contributors",
13
13
  "license": "Apache-2.0",
14
14
  "repository": {
@@ -81,7 +81,7 @@
81
81
  "appium-ios-device": "^2.5.4",
82
82
  "appium-ios-simulator": "^6.1.2",
83
83
  "appium-remote-debugger": "^11.0.0",
84
- "appium-webdriveragent": "^8.3.1",
84
+ "appium-webdriveragent": "^8.5.0",
85
85
  "appium-xcode": "^5.1.4",
86
86
  "async-lock": "^1.4.0",
87
87
  "asyncbox": "^3.0.0",